From ae520a8c2cfac9702f3cc1c87d504faf5232d95f Mon Sep 17 00:00:00 2001
From: Arnold Szabo <szaboaarnold@gmail.com>
Date: Wed, 25 Jul 2018 01:29:07 +0300
Subject: [PATCH 001/832] #4306 - Extract tags from SubRip subtitles, add
 support for alignment tags based on SSA v4+

---
 .../exoplayer2/text/subrip/SubripDecoder.java | 201 +++++++++++++++++-
 .../src/test/assets/subrip/typical_with_tags  |  20 ++
 .../text/subrip/SubripDecoderTest.java        |  22 ++
 3 files changed, 241 insertions(+), 2 deletions(-)
 create mode 100644 library/core/src/test/assets/subrip/typical_with_tags

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
index 6cce902e87..96c065973e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
@@ -15,7 +15,9 @@
  */
 package com.google.android.exoplayer2.text.subrip;
 
+import android.support.annotation.StringDef;
 import android.text.Html;
+import android.text.Layout;
 import android.text.Spanned;
 import android.text.TextUtils;
 import android.util.Log;
@@ -23,7 +25,11 @@ import com.google.android.exoplayer2.text.Cue;
 import com.google.android.exoplayer2.text.SimpleSubtitleDecoder;
 import com.google.android.exoplayer2.util.LongArray;
 import com.google.android.exoplayer2.util.ParsableByteArray;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -38,6 +44,33 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
   private static final Pattern SUBRIP_TIMING_LINE =
       Pattern.compile("\\s*(" + SUBRIP_TIMECODE + ")\\s*-->\\s*(" + SUBRIP_TIMECODE + ")?\\s*");
 
+  private static final Pattern SUBRIP_TAG_PATTERN = Pattern.compile("\\{\\\\.*?\\}");
+  private static final String SUBRIP_ALIGNMENT_TAG = "\\{\\\\an[1-9]\\}";
+
+  private static final float DEFAULT_START_FRACTION = 0.08f;
+  private static final float DEFAULT_END_FRACTION = 1 - DEFAULT_START_FRACTION;
+  private static final float DEFAULT_MID_FRACTION = 0.5f;
+
+  @Retention(RetentionPolicy.SOURCE)
+  @StringDef({
+      ALIGN_BOTTOM_LEFT, ALIGN_BOTTOM_MID, ALIGN_BOTTOM_RIGHT,
+      ALIGN_MID_LEFT, ALIGN_MID_MID, ALIGN_MID_RIGHT,
+      ALIGN_TOP_LEFT, ALIGN_TOP_MID, ALIGN_TOP_RIGHT
+  })
+
+  private @interface SubRipTag {}
+
+  // Possible valid alignment tags based on SSA v4+ specs
+  private static final String ALIGN_BOTTOM_LEFT  = "{\\an1}";
+  private static final String ALIGN_BOTTOM_MID   = "{\\an2}";
+  private static final String ALIGN_BOTTOM_RIGHT = "{\\an3}";
+  private static final String ALIGN_MID_LEFT     = "{\\an4}";
+  private static final String ALIGN_MID_MID      = "{\\an5}";
+  private static final String ALIGN_MID_RIGHT    = "{\\an6}";
+  private static final String ALIGN_TOP_LEFT     = "{\\an7}";
+  private static final String ALIGN_TOP_MID      = "{\\an8}";
+  private static final String ALIGN_TOP_RIGHT    = "{\\an9}";
+
   private final StringBuilder textBuilder;
 
   public SubripDecoder() {
@@ -95,8 +128,36 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
         textBuilder.append(currentLine.trim());
       }
 
-      Spanned text = Html.fromHtml(textBuilder.toString());
-      cues.add(new Cue(text));
+      // Extract tags
+      SubtitleTagResult tagResult = extractTags(textBuilder);
+      Spanned text = Html.fromHtml(tagResult.cue);
+
+      Cue cue = null;
+
+      // Check if tags are present
+      if (tagResult.tags.length > 0) {
+
+        boolean alignTagFound = false;
+
+        // At end of this loop the clue must be created with the applied tags
+        for (String tag : tagResult.tags) {
+
+          // Check if the tag is an alignment tag
+          if (tag.matches(SUBRIP_ALIGNMENT_TAG)) {
+
+            // Based on the specs, in case of the alignment tags only the first appearance counts
+            if (alignTagFound) continue;
+            alignTagFound = true;
+
+            AlignmentResult alignmentResult = getAlignmentValues(tag);
+            cue = new Cue(text, Layout.Alignment.ALIGN_NORMAL, alignmentResult.line, Cue.LINE_TYPE_FRACTION,
+                alignmentResult.lineAnchor, alignmentResult.position, alignmentResult.positionAnchor, Cue.DIMEN_UNSET);
+          }
+        }
+      }
+
+      cues.add(cue == null ? new Cue(text) : cue);
+
       if (haveEndTimecode) {
         cues.add(null);
       }
@@ -108,6 +169,111 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
     return new SubripSubtitle(cuesArray, cueTimesUsArray);
   }
 
+  /**
+   * Extracts the tags from the given {@code cue}
+   * The pattern that is used to extract the tags is specified in SSA v4+ specs and
+   * has the following form: "{\...}".
+   * <p>
+   * "All override codes appear within braces {}"
+   * "All override codes are always preceded by a backslash \"
+   *
+   * @param cue Cue text
+   * @return {@link SubtitleTagResult} that holds new cue and also the extracted tags
+   */
+  private SubtitleTagResult extractTags(StringBuilder cue) {
+    StringBuilder cueCopy = new StringBuilder(cue.toString());
+    List<String> tags = new ArrayList<>();
+
+    int replacedCharacters = 0;
+
+    Matcher matcher = SUBRIP_TAG_PATTERN.matcher(cue.toString());
+    while (matcher.find()) {
+      String tag = matcher.group();
+      tags.add(tag);
+      cueCopy.replace(matcher.start() - replacedCharacters, matcher.end() - replacedCharacters, "");
+      replacedCharacters += tag.length();
+    }
+
+    return new SubtitleTagResult(tags.toArray(new String[tags.size()]), cueCopy.toString());
+  }
+
+  /**
+   * Match the alignment tag and calculate the line, position, position anchor accordingly
+   *
+   * Based on SSA v4+ specs the alignment tag can have the following form: {\an[1-9},
+   * where the number specifies the direction (based on the numpad layout).
+   * Note. older SSA scripts may contain tags like {\a1[1-9]} but these are based on
+   * other direction rules, but multiple sources says that these are deprecated, so no support here either
+   *
+   * @param tag Alignment tag
+   * @return {@link AlignmentResult} that holds the line, position, position anchor values
+   */
+  private AlignmentResult getAlignmentValues(String tag) {
+    // Default values used for positioning the subtitle in case of align tags
+    float line = DEFAULT_END_FRACTION, position = DEFAULT_MID_FRACTION;
+    @Cue.AnchorType int positionAnchor = Cue.ANCHOR_TYPE_MIDDLE;
+    @Cue.AnchorType int lineAnchor = Cue.ANCHOR_TYPE_END;
+
+    switch (tag) {
+      case ALIGN_BOTTOM_LEFT:
+        line = DEFAULT_END_FRACTION;
+        position = DEFAULT_START_FRACTION;
+        positionAnchor = Cue.ANCHOR_TYPE_START;
+        lineAnchor = Cue.ANCHOR_TYPE_END;
+        break;
+      case ALIGN_BOTTOM_MID:
+        line = DEFAULT_END_FRACTION;
+        position = DEFAULT_MID_FRACTION;
+        positionAnchor = Cue.ANCHOR_TYPE_MIDDLE;
+        lineAnchor = Cue.ANCHOR_TYPE_END;
+        break;
+      case ALIGN_BOTTOM_RIGHT:
+        line = DEFAULT_END_FRACTION;
+        position = DEFAULT_END_FRACTION;
+        positionAnchor = Cue.ANCHOR_TYPE_END;
+        lineAnchor = Cue.ANCHOR_TYPE_END;
+        break;
+      case ALIGN_MID_LEFT:
+        line = DEFAULT_MID_FRACTION;
+        position = DEFAULT_START_FRACTION;
+        positionAnchor = Cue.ANCHOR_TYPE_START;
+        lineAnchor = Cue.ANCHOR_TYPE_MIDDLE;
+        break;
+      case ALIGN_MID_MID:
+        line = DEFAULT_MID_FRACTION;
+        position = DEFAULT_MID_FRACTION;
+        positionAnchor = Cue.ANCHOR_TYPE_MIDDLE;
+        lineAnchor = Cue.ANCHOR_TYPE_MIDDLE;
+        break;
+      case ALIGN_MID_RIGHT:
+        line = DEFAULT_MID_FRACTION;
+        position = DEFAULT_END_FRACTION;
+        positionAnchor = Cue.ANCHOR_TYPE_END;
+        lineAnchor = Cue.ANCHOR_TYPE_MIDDLE;
+        break;
+      case ALIGN_TOP_LEFT:
+        line = DEFAULT_START_FRACTION;
+        position = DEFAULT_START_FRACTION;
+        positionAnchor = Cue.ANCHOR_TYPE_START;
+        lineAnchor = Cue.ANCHOR_TYPE_START;
+        break;
+      case ALIGN_TOP_MID:
+        line = DEFAULT_START_FRACTION;
+        position = DEFAULT_MID_FRACTION;
+        positionAnchor = Cue.ANCHOR_TYPE_MIDDLE;
+        lineAnchor = Cue.ANCHOR_TYPE_START;
+        break;
+      case ALIGN_TOP_RIGHT:
+        line = DEFAULT_START_FRACTION;
+        position = DEFAULT_END_FRACTION;
+        positionAnchor = Cue.ANCHOR_TYPE_END;
+        lineAnchor = Cue.ANCHOR_TYPE_START;
+        break;
+    }
+
+    return new AlignmentResult(positionAnchor, position, lineAnchor, line);
+  }
+
   private static long parseTimecode(Matcher matcher, int groupOffset) {
     long timestampMs = Long.parseLong(matcher.group(groupOffset + 1)) * 60 * 60 * 1000;
     timestampMs += Long.parseLong(matcher.group(groupOffset + 2)) * 60 * 1000;
@@ -116,4 +282,35 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
     return timestampMs * 1000;
   }
 
+  /**
+   * Class that holds the tags, new clue after the tag extraction
+   */
+  private static final class SubtitleTagResult {
+    public final String[] tags;
+    public final String cue;
+
+    public SubtitleTagResult(String[] tags, String cue) {
+      this.tags = tags;
+      this.cue = cue;
+    }
+  }
+
+  /**
+   * Class that holds the parsed and mapped alignment values (such as line,
+   * position and anchor type of line)
+   */
+  private static final class AlignmentResult {
+
+    public @Cue.AnchorType int positionAnchor;
+    public @Cue.AnchorType int lineAnchor;
+    public float position, line;
+
+    public AlignmentResult(@Cue.AnchorType int positionAnchor, float position, @Cue.AnchorType int lineAnchor, float line) {
+      this.positionAnchor = positionAnchor;
+      this.position = position;
+      this.line = line;
+      this.lineAnchor = lineAnchor;
+    }
+  }
+
 }
diff --git a/library/core/src/test/assets/subrip/typical_with_tags b/library/core/src/test/assets/subrip/typical_with_tags
new file mode 100644
index 0000000000..02e1ffbcd9
--- /dev/null
+++ b/library/core/src/test/assets/subrip/typical_with_tags
@@ -0,0 +1,20 @@
+1
+00:00:00,000 --> 00:00:01,234
+This is {\an1} the first subtitle.
+
+2
+00:00:02,345 --> 00:00:03,456
+This is the second subtitle.
+Second {\ an 2} subtitle with second line.
+
+3
+00:00:04,567 --> 00:00:08,901
+This {\an2} is the third {\ tag} subtitle.
+
+4
+00:00:09,567 --> 00:00:12,901
+This { \an2} is the fourth subtitle.
+
+5
+00:00:013,567 --> 00:00:14,901
+This {\an2} is the fifth subtitle with multiple {\xyz} valid {\qwe} tags.
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
index e9abaca075..a9d69076c2 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
@@ -36,6 +36,7 @@ public final class SubripDecoderTest {
   private static final String TYPICAL_MISSING_SEQUENCE = "subrip/typical_missing_sequence";
   private static final String TYPICAL_NEGATIVE_TIMESTAMPS = "subrip/typical_negative_timestamps";
   private static final String TYPICAL_UNEXPECTED_END = "subrip/typical_unexpected_end";
+  private static final String TYPICAL_WITH_TAGS = "subrip/typical_with_tags";
   private static final String NO_END_TIMECODES_FILE = "subrip/no_end_timecodes";
 
   @Test
@@ -154,6 +155,27 @@ public final class SubripDecoderTest {
         .isEqualTo("Or to the end of the media.");
   }
 
+  @Test
+  public void testDecodeCueWithTag() throws IOException{
+    SubripDecoder decoder = new SubripDecoder();
+    byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, TYPICAL_WITH_TAGS);
+    SubripSubtitle subtitle = decoder.decode(bytes, bytes.length, false);
+    assertThat(subtitle.getCues(subtitle.getEventTime(0)).get(0).text.toString())
+        .isEqualTo("This is the first subtitle.");
+    assertThat(subtitle.getCues(subtitle.getEventTime(2)).get(0).text.toString())
+        .isEqualTo("This is the second subtitle.\nSecond subtitle with second line.");
+    assertThat(subtitle.getCues(subtitle.getEventTime(4)).get(0).text.toString())
+        .isEqualTo("This is the third subtitle.");
+
+    // Based on the SSA v4+ specs the curly bracket must be followed by a backslash, so this is
+    // not a valid tag (won't be parsed / replaced)
+    assertThat(subtitle.getCues(subtitle.getEventTime(6)).get(0).text.toString())
+        .isEqualTo("This { \\an2} is the fourth subtitle.");
+
+    assertThat(subtitle.getCues(subtitle.getEventTime(8)).get(0).text.toString())
+        .isEqualTo("This is the fifth subtitle with multiple valid tags.");
+  }
+
   private static void assertTypicalCue1(SubripSubtitle subtitle, int eventIndex) {
     assertThat(subtitle.getEventTime(eventIndex)).isEqualTo(0);
     assertThat(subtitle.getCues(subtitle.getEventTime(eventIndex)).get(0).text.toString())

From 4f834e7e1ae8cc119b9e8e24e51b7b427ab74339 Mon Sep 17 00:00:00 2001
From: Nicklas Lundin <nicklas.lundin@comhem.com>
Date: Thu, 6 Sep 2018 11:11:59 +0200
Subject: [PATCH 002/832] added maxFrameRate to parameters and use it in the
 adaptive track selection filtering

---
 .../trackselection/DefaultTrackSelector.java  | 43 +++++++++++++------
 .../DefaultTrackSelectorTest.java             |  3 +-
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
index a5c4123b10..58abddc677 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -181,6 +181,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     private int viewportHeight;
     private boolean viewportOrientationMayChange;
     private int tunnelingAudioSessionId;
+    private int maxFrameRate;
 
     /** Creates a builder with default initial values. */
     public ParametersBuilder() {
@@ -211,6 +212,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       viewportHeight = initialValues.viewportHeight;
       viewportOrientationMayChange = initialValues.viewportOrientationMayChange;
       tunnelingAudioSessionId = initialValues.tunnelingAudioSessionId;
+      maxFrameRate = initialValues.maxFrameRate;
     }
 
     /**
@@ -544,7 +546,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           viewportWidth,
           viewportHeight,
           viewportOrientationMayChange,
-          tunnelingAudioSessionId);
+          tunnelingAudioSessionId,
+          maxFrameRate);
     }
 
     private static SparseArray<Map<TrackGroupArray, SelectionOverride>> cloneSelectionOverrides(
@@ -641,6 +644,10 @@ public class DefaultTrackSelector extends MappingTrackSelector {
      * The default value is {@code true}.
      */
     public final boolean viewportOrientationMayChange;
+    /**
+     * Maximum video frame rate. The default value is {@link Integer#MAX_VALUE} (i.e. no constraint).
+     */
+    public final int maxFrameRate;
 
     // General
     /**
@@ -700,7 +707,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           /* viewportWidth= */ Integer.MAX_VALUE,
           /* viewportHeight= */ Integer.MAX_VALUE,
           /* viewportOrientationMayChange= */ true,
-          /* tunnelingAudioSessionId= */ C.AUDIO_SESSION_ID_UNSET);
+          /* tunnelingAudioSessionId= */ C.AUDIO_SESSION_ID_UNSET,
+          /* maxFrameRate= */ Integer.MAX_VALUE);
     }
 
     /* package */ Parameters(
@@ -722,7 +730,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
         int viewportWidth,
         int viewportHeight,
         boolean viewportOrientationMayChange,
-        int tunnelingAudioSessionId) {
+        int tunnelingAudioSessionId,
+        int maxFrameRate) {
       this.selectionOverrides = selectionOverrides;
       this.rendererDisabledFlags = rendererDisabledFlags;
       this.preferredAudioLanguage = Util.normalizeLanguageCode(preferredAudioLanguage);
@@ -742,6 +751,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       this.viewportHeight = viewportHeight;
       this.viewportOrientationMayChange = viewportOrientationMayChange;
       this.tunnelingAudioSessionId = tunnelingAudioSessionId;
+      this.maxFrameRate = maxFrameRate;
     }
 
     /* package */ Parameters(Parcel in) {
@@ -764,6 +774,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       this.viewportHeight = in.readInt();
       this.viewportOrientationMayChange = Util.readBoolean(in);
       this.tunnelingAudioSessionId = in.readInt();
+      this.maxFrameRate = in.readInt();
     }
 
     /**
@@ -832,6 +843,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           && viewportHeight == other.viewportHeight
           && maxVideoBitrate == other.maxVideoBitrate
           && tunnelingAudioSessionId == other.tunnelingAudioSessionId
+          && maxFrameRate == other.maxFrameRate
           && TextUtils.equals(preferredAudioLanguage, other.preferredAudioLanguage)
           && TextUtils.equals(preferredTextLanguage, other.preferredTextLanguage)
           && areRendererDisabledFlagsEqual(rendererDisabledFlags, other.rendererDisabledFlags)
@@ -855,6 +867,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       result = 31 * result + viewportHeight;
       result = 31 * result + maxVideoBitrate;
       result = 31 * result + tunnelingAudioSessionId;
+      result = 31 * result + maxFrameRate;
       result =
           31 * result + (preferredAudioLanguage == null ? 0 : preferredAudioLanguage.hashCode());
       result = 31 * result + (preferredTextLanguage == null ? 0 : preferredTextLanguage.hashCode());
@@ -889,6 +902,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       dest.writeInt(viewportHeight);
       Util.writeBoolean(dest, viewportOrientationMayChange);
       dest.writeInt(tunnelingAudioSessionId);
+      dest.writeInt(maxFrameRate);
     }
 
     public static final Parcelable.Creator<Parameters> CREATOR =
@@ -1418,7 +1432,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       TrackGroup group = groups.get(i);
       int[] adaptiveTracks = getAdaptiveVideoTracksForGroup(group, formatSupport[i],
           allowMixedMimeTypes, requiredAdaptiveSupport, params.maxVideoWidth, params.maxVideoHeight,
-          params.maxVideoBitrate, params.viewportWidth, params.viewportHeight,
+          params.maxVideoBitrate, params.maxFrameRate, params.viewportWidth, params.viewportHeight,
           params.viewportOrientationMayChange);
       if (adaptiveTracks.length > 0) {
         return Assertions.checkNotNull(adaptiveTrackSelectionFactory)
@@ -1430,8 +1444,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
 
   private static int[] getAdaptiveVideoTracksForGroup(TrackGroup group, int[] formatSupport,
       boolean allowMixedMimeTypes, int requiredAdaptiveSupport, int maxVideoWidth,
-      int maxVideoHeight, int maxVideoBitrate, int viewportWidth, int viewportHeight,
-      boolean viewportOrientationMayChange) {
+      int maxVideoHeight, int maxVideoBitrate, int maxFrameRate, int viewportWidth,
+      int viewportHeight, boolean viewportOrientationMayChange) {
     if (group.length < 2) {
       return NO_TRACKS;
     }
@@ -1453,7 +1467,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
         if (seenMimeTypes.add(sampleMimeType)) {
           int countForMimeType = getAdaptiveVideoTrackCountForMimeType(group, formatSupport,
               requiredAdaptiveSupport, sampleMimeType, maxVideoWidth, maxVideoHeight,
-              maxVideoBitrate, selectedTrackIndices);
+              maxVideoBitrate, maxFrameRate, selectedTrackIndices);
           if (countForMimeType > selectedMimeTypeTrackCount) {
             selectedMimeType = sampleMimeType;
             selectedMimeTypeTrackCount = countForMimeType;
@@ -1464,7 +1478,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
 
     // Filter by the selected mime type.
     filterAdaptiveVideoTrackCountForMimeType(group, formatSupport, requiredAdaptiveSupport,
-        selectedMimeType, maxVideoWidth, maxVideoHeight, maxVideoBitrate, selectedTrackIndices);
+        selectedMimeType, maxVideoWidth, maxVideoHeight, maxVideoBitrate, maxFrameRate,
+        selectedTrackIndices);
 
     return selectedTrackIndices.size() < 2 ? NO_TRACKS : Util.toArray(selectedTrackIndices);
   }
@@ -1477,13 +1492,14 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       int maxVideoWidth,
       int maxVideoHeight,
       int maxVideoBitrate,
+      int maxFrameRate,
       List<Integer> selectedTrackIndices) {
     int adaptiveTrackCount = 0;
     for (int i = 0; i < selectedTrackIndices.size(); i++) {
       int trackIndex = selectedTrackIndices.get(i);
       if (isSupportedAdaptiveVideoTrack(group.getFormat(trackIndex), mimeType,
           formatSupport[trackIndex], requiredAdaptiveSupport, maxVideoWidth, maxVideoHeight,
-          maxVideoBitrate)) {
+          maxVideoBitrate, maxFrameRate)) {
         adaptiveTrackCount++;
       }
     }
@@ -1498,12 +1514,13 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       int maxVideoWidth,
       int maxVideoHeight,
       int maxVideoBitrate,
+      int maxFrameRate,
       List<Integer> selectedTrackIndices) {
     for (int i = selectedTrackIndices.size() - 1; i >= 0; i--) {
       int trackIndex = selectedTrackIndices.get(i);
       if (!isSupportedAdaptiveVideoTrack(group.getFormat(trackIndex), mimeType,
           formatSupport[trackIndex], requiredAdaptiveSupport, maxVideoWidth, maxVideoHeight,
-          maxVideoBitrate)) {
+          maxVideoBitrate, maxFrameRate)) {
         selectedTrackIndices.remove(i);
       }
     }
@@ -1516,12 +1533,14 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       int requiredAdaptiveSupport,
       int maxVideoWidth,
       int maxVideoHeight,
-      int maxVideoBitrate) {
+      int maxVideoBitrate,
+      int maxFrameRate) {
     return isSupported(formatSupport, false) && ((formatSupport & requiredAdaptiveSupport) != 0)
         && (mimeType == null || Util.areEqual(format.sampleMimeType, mimeType))
         && (format.width == Format.NO_VALUE || format.width <= maxVideoWidth)
         && (format.height == Format.NO_VALUE || format.height <= maxVideoHeight)
-        && (format.bitrate == Format.NO_VALUE || format.bitrate <= maxVideoBitrate);
+        && (format.bitrate == Format.NO_VALUE || format.bitrate <= maxVideoBitrate)
+        && (format.frameRate == Format.NO_VALUE || format.frameRate <= maxFrameRate);
   }
 
   private static @Nullable TrackSelection selectFixedVideoTrack(
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
index 86d810989f..98c4e134dc 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
@@ -158,7 +158,8 @@ public final class DefaultTrackSelectorTest {
             /* viewportWidth= */ 4,
             /* viewportHeight= */ 5,
             /* viewportOrientationMayChange= */ false,
-            /* tunnelingAudioSessionId= */ C.AUDIO_SESSION_ID_UNSET);
+            /* tunnelingAudioSessionId= */ C.AUDIO_SESSION_ID_UNSET,
+            /* maxFrameRate= */ 6);
 
     Parcel parcel = Parcel.obtain();
     parametersToParcel.writeToParcel(parcel, 0);

From 4c0041f93680827358c2fbf6f0f0198422b10260 Mon Sep 17 00:00:00 2001
From: Nicklas Lundin <nicklas.lundin@comhem.com>
Date: Thu, 6 Sep 2018 11:13:03 +0200
Subject: [PATCH 003/832] added maxFrameRate to the filtering done when
 selecting a fixed video track

---
 .../exoplayer2/trackselection/DefaultTrackSelector.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
index 58abddc677..2e3147ca33 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -1562,7 +1562,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           boolean isWithinConstraints = selectedTrackIndices.contains(trackIndex)
               && (format.width == Format.NO_VALUE || format.width <= params.maxVideoWidth)
               && (format.height == Format.NO_VALUE || format.height <= params.maxVideoHeight)
-              && (format.bitrate == Format.NO_VALUE || format.bitrate <= params.maxVideoBitrate);
+              && (format.bitrate == Format.NO_VALUE || format.bitrate <= params.maxVideoBitrate)
+              && (format.frameRate == Format.NO_VALUE || format.frameRate <= params.maxFrameRate);
           if (!isWithinConstraints && !params.exceedVideoConstraintsIfNecessary) {
             // Track should not be selected.
             continue;

From 14f7b6111b99fb5507a60b40584bac1ce5db49dd Mon Sep 17 00:00:00 2001
From: Nicklas Lundin <nicklas.lundin@comhem.com>
Date: Thu, 6 Sep 2018 16:17:27 +0200
Subject: [PATCH 004/832] Added setMaxFrameRate to ParametersBuilder

---
 .../trackselection/DefaultTrackSelector.java           | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
index 2e3147ca33..54018aedb5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -523,6 +523,16 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       return this;
     }
 
+    /**
+     * See {@link Parameters#maxFrameRate}.
+     *
+     * @return This builder.
+     */
+    public ParametersBuilder setMaxFrameRate(int maxFrameRate) {
+      this.maxFrameRate = maxFrameRate;
+      return this;
+    }
+
     /**
      * Builds a {@link Parameters} instance with the selected values.
      */

From b07eef6d440740163c09a6cc9f5a68d2d9e0b689 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 19 Sep 2018 10:27:11 -0700
Subject: [PATCH 005/832] Fix drm nullability warnings.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=213650027
---
 .../exoplayer2/drm/DefaultDrmSession.java     | 84 ++++++++++-------
 .../drm/DefaultDrmSessionManager.java         | 94 ++++++++++---------
 .../android/exoplayer2/drm/DrmInitData.java   | 31 +++---
 .../android/exoplayer2/drm/DrmSession.java    | 13 ++-
 .../exoplayer2/drm/ErrorStateDrmSession.java  |  9 +-
 .../exoplayer2/drm/FrameworkMediaDrm.java     | 14 +--
 .../exoplayer2/drm/HttpMediaDrmCallback.java  | 16 +++-
 .../exoplayer2/drm/OfflineLicenseHelper.java  | 31 +++---
 .../android/exoplayer2/drm/WidevineUtil.java  |  4 +-
 .../drm/OfflineLicenseHelperTest.java         |  9 +-
 10 files changed, 179 insertions(+), 126 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
index 0b1b4ba380..25546acb95 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
@@ -28,14 +28,19 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 import com.google.android.exoplayer2.drm.ExoMediaDrm.KeyRequest;
 import com.google.android.exoplayer2.drm.ExoMediaDrm.ProvisionRequest;
+import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.EventDispatcher;
 import com.google.android.exoplayer2.util.Log;
+import com.google.android.exoplayer2.util.Util;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf;
+import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
+import org.checkerframework.checker.nullness.qual.RequiresNonNull;
 
 /**
  * A {@link DrmSession} that supports playbacks using {@link ExoMediaDrm}.
@@ -84,7 +89,7 @@ import java.util.UUID;
   private final ExoMediaDrm<T> mediaDrm;
   private final ProvisioningManager<T> provisioningManager;
   private final @DefaultDrmSessionManager.Mode int mode;
-  private final HashMap<String, String> optionalKeyRequestParameters;
+  private final @Nullable HashMap<String, String> optionalKeyRequestParameters;
   private final EventDispatcher<DefaultDrmSessionEventListener> eventDispatcher;
   private final int initialDrmRequestRetryCount;
 
@@ -96,13 +101,13 @@ import java.util.UUID;
   private int openCount;
   private HandlerThread requestHandlerThread;
   private PostRequestHandler postRequestHandler;
-  private T mediaCrypto;
-  private DrmSessionException lastException;
-  private byte[] sessionId;
-  private @Nullable byte[] offlineLicenseKeySetId;
+  private @Nullable T mediaCrypto;
+  private @Nullable DrmSessionException lastException;
+  private byte @MonotonicNonNull [] sessionId;
+  private byte @MonotonicNonNull [] offlineLicenseKeySetId;
 
-  private KeyRequest currentKeyRequest;
-  private ProvisionRequest currentProvisionRequest;
+  private @Nullable KeyRequest currentKeyRequest;
+  private @Nullable ProvisionRequest currentProvisionRequest;
 
   /**
    * Instantiates a new DRM session.
@@ -129,18 +134,25 @@ import java.util.UUID;
       @Nullable List<SchemeData> schemeDatas,
       @DefaultDrmSessionManager.Mode int mode,
       @Nullable byte[] offlineLicenseKeySetId,
-      HashMap<String, String> optionalKeyRequestParameters,
+      @Nullable HashMap<String, String> optionalKeyRequestParameters,
       MediaDrmCallback callback,
       Looper playbackLooper,
       EventDispatcher<DefaultDrmSessionEventListener> eventDispatcher,
       int initialDrmRequestRetryCount) {
+    if (mode == DefaultDrmSessionManager.MODE_QUERY
+        || mode == DefaultDrmSessionManager.MODE_RELEASE) {
+      Assertions.checkNotNull(offlineLicenseKeySetId);
+    }
     this.uuid = uuid;
     this.provisioningManager = provisioningManager;
     this.mediaDrm = mediaDrm;
     this.mode = mode;
-    this.offlineLicenseKeySetId = offlineLicenseKeySetId;
-    this.schemeDatas =
-        offlineLicenseKeySetId == null ? Collections.unmodifiableList(schemeDatas) : null;
+    if (offlineLicenseKeySetId != null) {
+      this.offlineLicenseKeySetId = offlineLicenseKeySetId;
+      this.schemeDatas = null;
+    } else {
+      this.schemeDatas = Collections.unmodifiableList(Assertions.checkNotNull(schemeDatas));
+    }
     this.optionalKeyRequestParameters = optionalKeyRequestParameters;
     this.callback = callback;
     this.initialDrmRequestRetryCount = initialDrmRequestRetryCount;
@@ -166,9 +178,9 @@ import java.util.UUID;
     }
   }
 
-  /**
-   * @return True if the session is closed and cleaned up, false otherwise.
-   */
+  /** @return True if the session is closed and cleaned up, false otherwise. */
+  // Assigning null to various non-null variables for clean-up. Class won't be used after release.
+  @SuppressWarnings("assignment.type.incompatible")
   public boolean release() {
     if (--openCount == 0) {
       state = STATE_RELEASED;
@@ -245,33 +257,35 @@ import java.util.UUID;
   }
 
   @Override
-  public final DrmSessionException getError() {
+  public final @Nullable DrmSessionException getError() {
     return state == STATE_ERROR ? lastException : null;
   }
 
   @Override
-  public final T getMediaCrypto() {
+  public final @Nullable T getMediaCrypto() {
     return mediaCrypto;
   }
 
   @Override
-  public Map<String, String> queryKeyStatus() {
+  public @Nullable Map<String, String> queryKeyStatus() {
     return sessionId == null ? null : mediaDrm.queryKeyStatus(sessionId);
   }
 
   @Override
-  public byte[] getOfflineLicenseKeySetId() {
+  public @Nullable byte[] getOfflineLicenseKeySetId() {
     return offlineLicenseKeySetId;
   }
 
   // Internal methods.
 
   /**
-   *  Try to open a session, do provisioning if necessary.
-   *  @param allowProvisioning if provisioning is allowed, set this to false when calling from
-   *      processing provision response.
-   *  @return true on success, false otherwise.
+   * Try to open a session, do provisioning if necessary.
+   *
+   * @param allowProvisioning if provisioning is allowed, set this to false when calling from
+   *     processing provision response.
+   * @return true on success, false otherwise.
    */
+  @EnsuresNonNullIf(result = true, expression = "sessionId")
   private boolean openInternal(boolean allowProvisioning) {
     if (isOpen()) {
       // Already opened
@@ -319,19 +333,20 @@ import java.util.UUID;
     provisioningManager.onProvisionCompleted();
   }
 
+  @RequiresNonNull("sessionId")
   private void doLicense(boolean allowRetry) {
     switch (mode) {
       case DefaultDrmSessionManager.MODE_PLAYBACK:
       case DefaultDrmSessionManager.MODE_QUERY:
         if (offlineLicenseKeySetId == null) {
-          postKeyRequest(ExoMediaDrm.KEY_TYPE_STREAMING, allowRetry);
+          postKeyRequest(sessionId, ExoMediaDrm.KEY_TYPE_STREAMING, allowRetry);
         } else if (state == STATE_OPENED_WITH_KEYS || restoreKeys()) {
           long licenseDurationRemainingSec = getLicenseDurationRemainingSec();
           if (mode == DefaultDrmSessionManager.MODE_PLAYBACK
               && licenseDurationRemainingSec <= MAX_LICENSE_DURATION_TO_RENEW) {
             Log.d(TAG, "Offline license has expired or will expire soon. "
                 + "Remaining seconds: " + licenseDurationRemainingSec);
-            postKeyRequest(ExoMediaDrm.KEY_TYPE_OFFLINE, allowRetry);
+            postKeyRequest(sessionId, ExoMediaDrm.KEY_TYPE_OFFLINE, allowRetry);
           } else if (licenseDurationRemainingSec <= 0) {
             onError(new KeysExpiredException());
           } else {
@@ -342,19 +357,20 @@ import java.util.UUID;
         break;
       case DefaultDrmSessionManager.MODE_DOWNLOAD:
         if (offlineLicenseKeySetId == null) {
-          postKeyRequest(ExoMediaDrm.KEY_TYPE_OFFLINE, allowRetry);
+          postKeyRequest(sessionId, ExoMediaDrm.KEY_TYPE_OFFLINE, allowRetry);
         } else {
           // Renew
           if (restoreKeys()) {
-            postKeyRequest(ExoMediaDrm.KEY_TYPE_OFFLINE, allowRetry);
+            postKeyRequest(sessionId, ExoMediaDrm.KEY_TYPE_OFFLINE, allowRetry);
           }
         }
         break;
       case DefaultDrmSessionManager.MODE_RELEASE:
+        Assertions.checkNotNull(offlineLicenseKeySetId);
         // It's not necessary to restore the key (and open a session to do that) before releasing it
         // but this serves as a good sanity/fast-failure check.
         if (restoreKeys()) {
-          postKeyRequest(ExoMediaDrm.KEY_TYPE_RELEASE, allowRetry);
+          postKeyRequest(offlineLicenseKeySetId, ExoMediaDrm.KEY_TYPE_RELEASE, allowRetry);
         }
         break;
       default:
@@ -362,6 +378,7 @@ import java.util.UUID;
     }
   }
 
+  @RequiresNonNull({"sessionId", "offlineLicenseKeySetId"})
   private boolean restoreKeys() {
     try {
       mediaDrm.restoreKeys(sessionId, offlineLicenseKeySetId);
@@ -377,12 +394,12 @@ import java.util.UUID;
     if (!C.WIDEVINE_UUID.equals(uuid)) {
       return Long.MAX_VALUE;
     }
-    Pair<Long, Long> pair = WidevineUtil.getLicenseDurationRemainingSec(this);
+    Pair<Long, Long> pair =
+        Assertions.checkNotNull(WidevineUtil.getLicenseDurationRemainingSec(this));
     return Math.min(pair.first, pair.second);
   }
 
-  private void postKeyRequest(int type, boolean allowRetry) {
-    byte[] scope = type == ExoMediaDrm.KEY_TYPE_RELEASE ? offlineLicenseKeySetId : sessionId;
+  private void postKeyRequest(byte[] scope, int type, boolean allowRetry) {
     try {
       currentKeyRequest =
           mediaDrm.getKeyRequest(scope, schemeDatas, type, optionalKeyRequestParameters);
@@ -407,7 +424,7 @@ import java.util.UUID;
     try {
       byte[] responseData = (byte[]) response;
       if (mode == DefaultDrmSessionManager.MODE_RELEASE) {
-        mediaDrm.provideKeyResponse(offlineLicenseKeySetId, responseData);
+        mediaDrm.provideKeyResponse(Util.castNonNull(offlineLicenseKeySetId), responseData);
         eventDispatcher.dispatch(DefaultDrmSessionEventListener::onDrmKeysRestored);
       } else {
         byte[] keySetId = mediaDrm.provideKeyResponse(sessionId, responseData);
@@ -447,6 +464,8 @@ import java.util.UUID;
     }
   }
 
+  @EnsuresNonNullIf(result = true, expression = "sessionId")
+  @SuppressWarnings("contracts.conditional.postcondition.not.satisfied")
   private boolean isOpen() {
     return state == STATE_OPENED || state == STATE_OPENED_WITH_KEYS;
   }
@@ -461,8 +480,9 @@ import java.util.UUID;
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public void handleMessage(Message msg) {
-      Pair<?, ?> requestAndResponse = (Pair<?, ?>) msg.obj;
+      Pair<Object, Object> requestAndResponse = (Pair<Object, Object>) msg.obj;
       Object request = requestAndResponse.first;
       Object response = requestAndResponse.second;
       switch (msg.what) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
index 0e751ca49e..03269f0caa 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
@@ -21,7 +21,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.drm.DefaultDrmSession.ProvisioningManager;
@@ -94,7 +94,7 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
   private final UUID uuid;
   private final ExoMediaDrm<T> mediaDrm;
   private final MediaDrmCallback callback;
-  private final HashMap<String, String> optionalKeyRequestParameters;
+  private final @Nullable HashMap<String, String> optionalKeyRequestParameters;
   private final EventDispatcher<DefaultDrmSessionEventListener> eventDispatcher;
   private final boolean multiSession;
   private final int initialDrmRequestRetryCount;
@@ -102,11 +102,11 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
   private final List<DefaultDrmSession<T>> sessions;
   private final List<DefaultDrmSession<T>> provisioningSessions;
 
-  private Looper playbackLooper;
+  private @Nullable Looper playbackLooper;
   private int mode;
-  private byte[] offlineLicenseKeySetId;
+  private @Nullable byte[] offlineLicenseKeySetId;
 
-  /* package */ volatile MediaDrmHandler mediaDrmHandler;
+  /* package */ volatile @Nullable MediaDrmHandler mediaDrmHandler;
 
   /**
    * @deprecated Use {@link #newWidevineInstance(MediaDrmCallback, HashMap)} and {@link
@@ -115,9 +115,9 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
   @Deprecated
   public static DefaultDrmSessionManager<FrameworkMediaCrypto> newWidevineInstance(
       MediaDrmCallback callback,
-      HashMap<String, String> optionalKeyRequestParameters,
-      Handler eventHandler,
-      DefaultDrmSessionEventListener eventListener)
+      @Nullable HashMap<String, String> optionalKeyRequestParameters,
+      @Nullable Handler eventHandler,
+      @Nullable DefaultDrmSessionEventListener eventListener)
       throws UnsupportedDrmException {
     DefaultDrmSessionManager<FrameworkMediaCrypto> drmSessionManager =
         newWidevineInstance(callback, optionalKeyRequestParameters);
@@ -136,7 +136,7 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
    * @throws UnsupportedDrmException If the specified DRM scheme is not supported.
    */
   public static DefaultDrmSessionManager<FrameworkMediaCrypto> newWidevineInstance(
-      MediaDrmCallback callback, HashMap<String, String> optionalKeyRequestParameters)
+      MediaDrmCallback callback, @Nullable HashMap<String, String> optionalKeyRequestParameters)
       throws UnsupportedDrmException {
     return newFrameworkInstance(C.WIDEVINE_UUID, callback, optionalKeyRequestParameters);
   }
@@ -148,9 +148,9 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
   @Deprecated
   public static DefaultDrmSessionManager<FrameworkMediaCrypto> newPlayReadyInstance(
       MediaDrmCallback callback,
-      String customData,
-      Handler eventHandler,
-      DefaultDrmSessionEventListener eventListener)
+      @Nullable String customData,
+      @Nullable Handler eventHandler,
+      @Nullable DefaultDrmSessionEventListener eventListener)
       throws UnsupportedDrmException {
     DefaultDrmSessionManager<FrameworkMediaCrypto> drmSessionManager =
         newPlayReadyInstance(callback, customData);
@@ -171,7 +171,7 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
    * @throws UnsupportedDrmException If the specified DRM scheme is not supported.
    */
   public static DefaultDrmSessionManager<FrameworkMediaCrypto> newPlayReadyInstance(
-      MediaDrmCallback callback, String customData) throws UnsupportedDrmException {
+      MediaDrmCallback callback, @Nullable String customData) throws UnsupportedDrmException {
     HashMap<String, String> optionalKeyRequestParameters;
     if (!TextUtils.isEmpty(customData)) {
       optionalKeyRequestParameters = new HashMap<>();
@@ -190,9 +190,9 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
   public static DefaultDrmSessionManager<FrameworkMediaCrypto> newFrameworkInstance(
       UUID uuid,
       MediaDrmCallback callback,
-      HashMap<String, String> optionalKeyRequestParameters,
-      Handler eventHandler,
-      DefaultDrmSessionEventListener eventListener)
+      @Nullable HashMap<String, String> optionalKeyRequestParameters,
+      @Nullable Handler eventHandler,
+      @Nullable DefaultDrmSessionEventListener eventListener)
       throws UnsupportedDrmException {
     DefaultDrmSessionManager<FrameworkMediaCrypto> drmSessionManager =
         newFrameworkInstance(uuid, callback, optionalKeyRequestParameters);
@@ -212,7 +212,9 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
    * @throws UnsupportedDrmException If the specified DRM scheme is not supported.
    */
   public static DefaultDrmSessionManager<FrameworkMediaCrypto> newFrameworkInstance(
-      UUID uuid, MediaDrmCallback callback, HashMap<String, String> optionalKeyRequestParameters)
+      UUID uuid,
+      MediaDrmCallback callback,
+      @Nullable HashMap<String, String> optionalKeyRequestParameters)
       throws UnsupportedDrmException {
     return new DefaultDrmSessionManager<>(
         uuid,
@@ -228,13 +230,14 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
    *     and {@link #addListener(Handler, DefaultDrmSessionEventListener)}.
    */
   @Deprecated
+  @SuppressWarnings("method.invocation.invalid")
   public DefaultDrmSessionManager(
       UUID uuid,
       ExoMediaDrm<T> mediaDrm,
       MediaDrmCallback callback,
-      HashMap<String, String> optionalKeyRequestParameters,
-      Handler eventHandler,
-      DefaultDrmSessionEventListener eventListener) {
+      @Nullable HashMap<String, String> optionalKeyRequestParameters,
+      @Nullable Handler eventHandler,
+      @Nullable DefaultDrmSessionEventListener eventListener) {
     this(uuid, mediaDrm, callback, optionalKeyRequestParameters);
     if (eventHandler != null && eventListener != null) {
       addListener(eventHandler, eventListener);
@@ -252,7 +255,7 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
       UUID uuid,
       ExoMediaDrm<T> mediaDrm,
       MediaDrmCallback callback,
-      HashMap<String, String> optionalKeyRequestParameters) {
+      @Nullable HashMap<String, String> optionalKeyRequestParameters) {
     this(
         uuid,
         mediaDrm,
@@ -267,13 +270,14 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
    *     boolean)} and {@link #addListener(Handler, DefaultDrmSessionEventListener)}.
    */
   @Deprecated
+  @SuppressWarnings("method.invocation.invalid")
   public DefaultDrmSessionManager(
       UUID uuid,
       ExoMediaDrm<T> mediaDrm,
       MediaDrmCallback callback,
-      HashMap<String, String> optionalKeyRequestParameters,
-      Handler eventHandler,
-      DefaultDrmSessionEventListener eventListener,
+      @Nullable HashMap<String, String> optionalKeyRequestParameters,
+      @Nullable Handler eventHandler,
+      @Nullable DefaultDrmSessionEventListener eventListener,
       boolean multiSession) {
     this(uuid, mediaDrm, callback, optionalKeyRequestParameters, multiSession);
     if (eventHandler != null && eventListener != null) {
@@ -294,7 +298,7 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
       UUID uuid,
       ExoMediaDrm<T> mediaDrm,
       MediaDrmCallback callback,
-      HashMap<String, String> optionalKeyRequestParameters,
+      @Nullable HashMap<String, String> optionalKeyRequestParameters,
       boolean multiSession) {
     this(
         uuid,
@@ -310,13 +314,14 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
    *     boolean, int)} and {@link #addListener(Handler, DefaultDrmSessionEventListener)}.
    */
   @Deprecated
+  @SuppressWarnings("method.invocation.invalid")
   public DefaultDrmSessionManager(
       UUID uuid,
       ExoMediaDrm<T> mediaDrm,
       MediaDrmCallback callback,
-      HashMap<String, String> optionalKeyRequestParameters,
-      Handler eventHandler,
-      DefaultDrmSessionEventListener eventListener,
+      @Nullable HashMap<String, String> optionalKeyRequestParameters,
+      @Nullable Handler eventHandler,
+      @Nullable DefaultDrmSessionEventListener eventListener,
       boolean multiSession,
       int initialDrmRequestRetryCount) {
     this(
@@ -346,7 +351,7 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
       UUID uuid,
       ExoMediaDrm<T> mediaDrm,
       MediaDrmCallback callback,
-      HashMap<String, String> optionalKeyRequestParameters,
+      @Nullable HashMap<String, String> optionalKeyRequestParameters,
       boolean multiSession,
       int initialDrmRequestRetryCount) {
     Assertions.checkNotNull(uuid);
@@ -443,21 +448,22 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
    * required.
    *
    * <p>{@code mode} must be one of these:
+   *
    * <ul>
-   * <li>{@link #MODE_PLAYBACK}: If {@code offlineLicenseKeySetId} is null, a streaming license is
-   *     requested otherwise the offline license is restored.
-   * <li>{@link #MODE_QUERY}: {@code offlineLicenseKeySetId} can not be null. The offline license
-   *     is restored.
-   * <li>{@link #MODE_DOWNLOAD}: If {@code offlineLicenseKeySetId} is null, an offline license is
-   *     requested otherwise the offline license is renewed.
-   * <li>{@link #MODE_RELEASE}: {@code offlineLicenseKeySetId} can not be null. The offline license
-   *     is released.
+   *   <li>{@link #MODE_PLAYBACK}: If {@code offlineLicenseKeySetId} is null, a streaming license is
+   *       requested otherwise the offline license is restored.
+   *   <li>{@link #MODE_QUERY}: {@code offlineLicenseKeySetId} can not be null. The offline license
+   *       is restored.
+   *   <li>{@link #MODE_DOWNLOAD}: If {@code offlineLicenseKeySetId} is null, an offline license is
+   *       requested otherwise the offline license is renewed.
+   *   <li>{@link #MODE_RELEASE}: {@code offlineLicenseKeySetId} can not be null. The offline
+   *       license is released.
    * </ul>
    *
    * @param mode The mode to be set.
    * @param offlineLicenseKeySetId The key set id of the license to be used with the given mode.
    */
-  public void setMode(@Mode int mode, byte[] offlineLicenseKeySetId) {
+  public void setMode(@Mode int mode, @Nullable byte[] offlineLicenseKeySetId) {
     Assertions.checkState(sessions.isEmpty());
     if (mode == MODE_QUERY || mode == MODE_RELEASE) {
       Assertions.checkNotNull(offlineLicenseKeySetId);
@@ -469,7 +475,7 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
   // DrmSessionManager implementation.
 
   @Override
-  public boolean canAcquireSession(@NonNull DrmInitData drmInitData) {
+  public boolean canAcquireSession(DrmInitData drmInitData) {
     if (offlineLicenseKeySetId != null) {
       // An offline license can be restored so a session can always be acquired.
       return true;
@@ -650,10 +656,14 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
   private class MediaDrmEventListener implements OnEventListener<T> {
 
     @Override
-    public void onEvent(ExoMediaDrm<? extends T> md, byte[] sessionId, int event, int extra,
-        byte[] data) {
+    public void onEvent(
+        ExoMediaDrm<? extends T> md,
+        byte[] sessionId,
+        int event,
+        int extra,
+        @Nullable byte[] data) {
       if (mode == DefaultDrmSessionManager.MODE_PLAYBACK) {
-        mediaDrmHandler.obtainMessage(event, sessionId).sendToTarget();
+        Assertions.checkNotNull(mediaDrmHandler).obtainMessage(event, sessionId).sendToTarget();
       }
     }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
index b9415c74af..ef96c7ae75 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
@@ -85,10 +85,8 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
   // Lazily initialized hashcode.
   private int hashCode;
 
-  /**
-   * The protection scheme type, or null if not applicable or unknown.
-   */
-  @Nullable public final String schemeType;
+  /** The protection scheme type, or null if not applicable or unknown. */
+  public final @Nullable String schemeType;
 
   /**
    * Number of {@link SchemeData}s.
@@ -106,7 +104,7 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
    * @param schemeType See {@link #schemeType}.
    * @param schemeDatas Scheme initialization data for possibly multiple DRM schemes.
    */
-  public DrmInitData(String schemeType, List<SchemeData> schemeDatas) {
+  public DrmInitData(@Nullable String schemeType, List<SchemeData> schemeDatas) {
     this(schemeType, false, schemeDatas.toArray(new SchemeData[schemeDatas.size()]));
   }
 
@@ -131,11 +129,11 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
     if (cloneSchemeDatas) {
       schemeDatas = schemeDatas.clone();
     }
-    // Sorting ensures that universal scheme data (i.e. data that applies to all schemes) is matched
-    // last. It's also required by the equals and hashcode implementations.
-    Arrays.sort(schemeDatas, this);
     this.schemeDatas = schemeDatas;
     schemeDataCount = schemeDatas.length;
+    // Sorting ensures that universal scheme data (i.e. data that applies to all schemes) is matched
+    // last. It's also required by the equals and hashcode implementations.
+    Arrays.sort(this.schemeDatas, this);
   }
 
   /* package */ DrmInitData(Parcel in) {
@@ -152,7 +150,7 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
    * @return The initialization data for the scheme, or null if the scheme is not supported.
    */
   @Deprecated
-  public SchemeData get(UUID uuid) {
+  public @Nullable SchemeData get(UUID uuid) {
     for (SchemeData schemeData : schemeDatas) {
       if (schemeData.matches(uuid)) {
         return schemeData;
@@ -270,10 +268,8 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
     public final @Nullable String licenseServerUrl;
     /** The mimeType of {@link #data}. */
     public final String mimeType;
-    /**
-     * The initialization data. May be null for scheme support checks only.
-     */
-    public final byte[] data;
+    /** The initialization data. May be null for scheme support checks only. */
+    public final @Nullable byte[] data;
     /**
      * Whether secure decryption is required.
      */
@@ -285,7 +281,7 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
      * @param mimeType See {@link #mimeType}.
      * @param data See {@link #data}.
      */
-    public SchemeData(UUID uuid, String mimeType, byte[] data) {
+    public SchemeData(UUID uuid, String mimeType, @Nullable byte[] data) {
       this(uuid, mimeType, data, false);
     }
 
@@ -296,7 +292,8 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
      * @param data See {@link #data}.
      * @param requiresSecureDecryption See {@link #requiresSecureDecryption}.
      */
-    public SchemeData(UUID uuid, String mimeType, byte[] data, boolean requiresSecureDecryption) {
+    public SchemeData(
+        UUID uuid, String mimeType, @Nullable byte[] data, boolean requiresSecureDecryption) {
       this(uuid, /* licenseServerUrl= */ null, mimeType, data, requiresSecureDecryption);
     }
 
@@ -312,7 +309,7 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
         UUID uuid,
         @Nullable String licenseServerUrl,
         String mimeType,
-        byte[] data,
+        @Nullable byte[] data,
         boolean requiresSecureDecryption) {
       this.uuid = Assertions.checkNotNull(uuid);
       this.licenseServerUrl = licenseServerUrl;
@@ -324,7 +321,7 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
     /* package */ SchemeData(Parcel in) {
       uuid = new UUID(in.readLong(), in.readLong());
       licenseServerUrl = in.readString();
-      mimeType = in.readString();
+      mimeType = Util.castNonNull(in.readString());
       data = in.createByteArray();
       requiresSecureDecryption = in.readByte() != 0;
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java
index bed3545d78..698f6fdb25 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.drm;
 import android.annotation.TargetApi;
 import android.media.MediaDrm;
 import android.support.annotation.IntDef;
+import android.support.annotation.Nullable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Map;
@@ -75,21 +76,24 @@ public interface DrmSession<T extends ExoMediaCrypto> {
   @State int getState();
 
   /**
-   * Returns the cause of the error state.
+   * Returns the cause of the error state, or null if {@link #getState()} is not {@link
+   * #STATE_ERROR}.
    */
+  @Nullable
   DrmSessionException getError();
 
   /**
    * Returns a {@link ExoMediaCrypto} for the open session, or null if called before the session has
    * been opened or after it's been released.
    */
+  @Nullable
   T getMediaCrypto();
 
   /**
    * Returns a map describing the key status for the session, or null if called before the session
    * has been opened or after it's been released.
-   * <p>
-   * Since DRM license policies vary by vendor, the specific status field names are determined by
+   *
+   * <p>Since DRM license policies vary by vendor, the specific status field names are determined by
    * each DRM vendor. Refer to your DRM provider documentation for definitions of the field names
    * for a particular DRM engine plugin.
    *
@@ -97,12 +101,13 @@ public interface DrmSession<T extends ExoMediaCrypto> {
    *     has been opened or after it's been released.
    * @see MediaDrm#queryKeyStatus(byte[])
    */
+  @Nullable
   Map<String, String> queryKeyStatus();
 
   /**
    * Returns the key set id of the offline license loaded into this session, or null if there isn't
    * one.
    */
+  @Nullable
   byte[] getOfflineLicenseKeySetId();
-
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/ErrorStateDrmSession.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/ErrorStateDrmSession.java
index d30e670c3f..f0335b50c9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/ErrorStateDrmSession.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/ErrorStateDrmSession.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.drm;
 
+import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.util.Assertions;
 import java.util.Map;
 
@@ -33,22 +34,22 @@ public final class ErrorStateDrmSession<T extends ExoMediaCrypto> implements Drm
   }
 
   @Override
-  public DrmSessionException getError() {
+  public @Nullable DrmSessionException getError() {
     return error;
   }
 
   @Override
-  public T getMediaCrypto() {
+  public @Nullable T getMediaCrypto() {
     return null;
   }
 
   @Override
-  public Map<String, String> queryKeyStatus() {
+  public @Nullable Map<String, String> queryKeyStatus() {
     return null;
   }
 
   @Override
-  public byte[] getOfflineLicenseKeySetId() {
+  public @Nullable byte[] getOfflineLicenseKeySetId() {
     return null;
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
index 254b524b30..1f862546ae 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
@@ -131,7 +131,7 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
     String mimeType = null;
     if (schemeDatas != null) {
       schemeData = getSchemeData(uuid, schemeDatas);
-      initData = adjustRequestInitData(uuid, schemeData.data);
+      initData = adjustRequestInitData(uuid, Assertions.checkNotNull(schemeData.data));
       mimeType = adjustRequestMimeType(uuid, schemeData.mimeType);
     }
     MediaDrm.KeyRequest request =
@@ -229,11 +229,12 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
       boolean canConcatenateData = true;
       for (int i = 0; i < schemeDatas.size(); i++) {
         SchemeData schemeData = schemeDatas.get(i);
+        byte[] schemeDataData = Util.castNonNull(schemeData.data);
         if (schemeData.requiresSecureDecryption == firstSchemeData.requiresSecureDecryption
             && Util.areEqual(schemeData.mimeType, firstSchemeData.mimeType)
             && Util.areEqual(schemeData.licenseServerUrl, firstSchemeData.licenseServerUrl)
-            && PsshAtomUtil.isPsshAtom(schemeData.data)) {
-          concatenatedDataLength += schemeData.data.length;
+            && PsshAtomUtil.isPsshAtom(schemeDataData)) {
+          concatenatedDataLength += schemeDataData.length;
         } else {
           canConcatenateData = false;
           break;
@@ -244,9 +245,10 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
         int concatenatedDataPosition = 0;
         for (int i = 0; i < schemeDatas.size(); i++) {
           SchemeData schemeData = schemeDatas.get(i);
-          int schemeDataLength = schemeData.data.length;
+          byte[] schemeDataData = Util.castNonNull(schemeData.data);
+          int schemeDataLength = schemeDataData.length;
           System.arraycopy(
-              schemeData.data, 0, concatenatedData, concatenatedDataPosition, schemeDataLength);
+              schemeDataData, 0, concatenatedData, concatenatedDataPosition, schemeDataLength);
           concatenatedDataPosition += schemeDataLength;
         }
         return firstSchemeData.copyWithData(concatenatedData);
@@ -257,7 +259,7 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
     // the first V0 box.
     for (int i = 0; i < schemeDatas.size(); i++) {
       SchemeData schemeData = schemeDatas.get(i);
-      int version = PsshAtomUtil.parseVersion(schemeData.data);
+      int version = PsshAtomUtil.parseVersion(Util.castNonNull(schemeData.data));
       if (Util.SDK_INT < 23 && version == 0) {
         return schemeData;
       } else if (Util.SDK_INT >= 23 && version == 1) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java
index 8b8c3bec99..4ff0af3c0e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.drm;
 
 import android.annotation.TargetApi;
 import android.net.Uri;
+import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.drm.ExoMediaDrm.KeyRequest;
@@ -135,8 +136,12 @@ public final class HttpMediaDrmCallback implements MediaDrmCallback {
     return executePost(dataSourceFactory, url, request.getData(), requestProperties);
   }
 
-  private static byte[] executePost(HttpDataSource.Factory dataSourceFactory, String url,
-      byte[] data, Map<String, String> requestProperties) throws IOException {
+  private static byte[] executePost(
+      HttpDataSource.Factory dataSourceFactory,
+      String url,
+      byte[] data,
+      @Nullable Map<String, String> requestProperties)
+      throws IOException {
     HttpDataSource dataSource = dataSourceFactory.createDataSource();
     if (requestProperties != null) {
       for (Map.Entry<String, String> requestProperty : requestProperties.entrySet()) {
@@ -164,17 +169,18 @@ public final class HttpMediaDrmCallback implements MediaDrmCallback {
         boolean manuallyRedirect =
             (e.responseCode == 307 || e.responseCode == 308)
                 && manualRedirectCount++ < MAX_MANUAL_REDIRECTS;
-        url = manuallyRedirect ? getRedirectUrl(e) : null;
-        if (url == null) {
+        String redirectUrl = manuallyRedirect ? getRedirectUrl(e) : null;
+        if (redirectUrl == null) {
           throw e;
         }
+        url = redirectUrl;
       } finally {
         Util.closeQuietly(inputStream);
       }
     }
   }
 
-  private static String getRedirectUrl(InvalidResponseCodeException exception) {
+  private static @Nullable String getRedirectUrl(InvalidResponseCodeException exception) {
     Map<String, List<String>> headerFields = exception.headerFields;
     if (headerFields != null) {
       List<String> locationHeaders = headerFields.get("Location");
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/OfflineLicenseHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/OfflineLicenseHelper.java
index 9298c16cb0..d596b4ab90 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/OfflineLicenseHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/OfflineLicenseHelper.java
@@ -19,6 +19,7 @@ import android.media.MediaDrm;
 import android.os.ConditionVariable;
 import android.os.Handler;
 import android.os.HandlerThread;
+import android.support.annotation.Nullable;
 import android.util.Pair;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.drm.DefaultDrmSessionManager.Mode;
@@ -34,6 +35,8 @@ import java.util.UUID;
  */
 public final class OfflineLicenseHelper<T extends ExoMediaCrypto> {
 
+  private static final DrmInitData DUMMY_DRM_INIT_DATA = new DrmInitData();
+
   private final ConditionVariable conditionVariable;
   private final DefaultDrmSessionManager<T> drmSessionManager;
   private final HandlerThread handlerThread;
@@ -95,7 +98,7 @@ public final class OfflineLicenseHelper<T extends ExoMediaCrypto> {
       String defaultLicenseUrl,
       boolean forceDefaultLicenseUrl,
       Factory httpDataSourceFactory,
-      HashMap<String, String> optionalKeyRequestParameters)
+      @Nullable HashMap<String, String> optionalKeyRequestParameters)
       throws UnsupportedDrmException {
     return new OfflineLicenseHelper<>(C.WIDEVINE_UUID,
         FrameworkMediaDrm.newInstance(C.WIDEVINE_UUID),
@@ -118,7 +121,7 @@ public final class OfflineLicenseHelper<T extends ExoMediaCrypto> {
       UUID uuid,
       ExoMediaDrm<T> mediaDrm,
       MediaDrmCallback callback,
-      HashMap<String, String> optionalKeyRequestParameters) {
+      @Nullable HashMap<String, String> optionalKeyRequestParameters) {
     handlerThread = new HandlerThread("OfflineLicenseHelper");
     handlerThread.start();
     conditionVariable = new ConditionVariable();
@@ -199,7 +202,8 @@ public final class OfflineLicenseHelper<T extends ExoMediaCrypto> {
   public synchronized byte[] renewLicense(byte[] offlineLicenseKeySetId)
       throws DrmSessionException {
     Assertions.checkNotNull(offlineLicenseKeySetId);
-    return blockingKeyRequest(DefaultDrmSessionManager.MODE_DOWNLOAD, offlineLicenseKeySetId, null);
+    return blockingKeyRequest(
+        DefaultDrmSessionManager.MODE_DOWNLOAD, offlineLicenseKeySetId, DUMMY_DRM_INIT_DATA);
   }
 
   /**
@@ -211,7 +215,8 @@ public final class OfflineLicenseHelper<T extends ExoMediaCrypto> {
   public synchronized void releaseLicense(byte[] offlineLicenseKeySetId)
       throws DrmSessionException {
     Assertions.checkNotNull(offlineLicenseKeySetId);
-    blockingKeyRequest(DefaultDrmSessionManager.MODE_RELEASE, offlineLicenseKeySetId, null);
+    blockingKeyRequest(
+        DefaultDrmSessionManager.MODE_RELEASE, offlineLicenseKeySetId, DUMMY_DRM_INIT_DATA);
   }
 
   /**
@@ -224,8 +229,9 @@ public final class OfflineLicenseHelper<T extends ExoMediaCrypto> {
   public synchronized Pair<Long, Long> getLicenseDurationRemainingSec(byte[] offlineLicenseKeySetId)
       throws DrmSessionException {
     Assertions.checkNotNull(offlineLicenseKeySetId);
-    DrmSession<T> drmSession = openBlockingKeyRequest(DefaultDrmSessionManager.MODE_QUERY,
-        offlineLicenseKeySetId, null);
+    DrmSession<T> drmSession =
+        openBlockingKeyRequest(
+            DefaultDrmSessionManager.MODE_QUERY, offlineLicenseKeySetId, DUMMY_DRM_INIT_DATA);
     DrmSessionException error = drmSession.getError();
     Pair<Long, Long> licenseDurationRemainingSec =
         WidevineUtil.getLicenseDurationRemainingSec(drmSession);
@@ -236,7 +242,7 @@ public final class OfflineLicenseHelper<T extends ExoMediaCrypto> {
       }
       throw error;
     }
-    return licenseDurationRemainingSec;
+    return Assertions.checkNotNull(licenseDurationRemainingSec);
   }
 
   /**
@@ -246,8 +252,9 @@ public final class OfflineLicenseHelper<T extends ExoMediaCrypto> {
     handlerThread.quit();
   }
 
-  private byte[] blockingKeyRequest(@Mode int licenseMode, byte[] offlineLicenseKeySetId,
-      DrmInitData drmInitData) throws DrmSessionException {
+  private byte[] blockingKeyRequest(
+      @Mode int licenseMode, @Nullable byte[] offlineLicenseKeySetId, DrmInitData drmInitData)
+      throws DrmSessionException {
     DrmSession<T> drmSession = openBlockingKeyRequest(licenseMode, offlineLicenseKeySetId,
         drmInitData);
     DrmSessionException error = drmSession.getError();
@@ -256,11 +263,11 @@ public final class OfflineLicenseHelper<T extends ExoMediaCrypto> {
     if (error != null) {
       throw error;
     }
-    return keySetId;
+    return Assertions.checkNotNull(keySetId);
   }
 
-  private DrmSession<T> openBlockingKeyRequest(@Mode int licenseMode, byte[] offlineLicenseKeySetId,
-      DrmInitData drmInitData) {
+  private DrmSession<T> openBlockingKeyRequest(
+      @Mode int licenseMode, @Nullable byte[] offlineLicenseKeySetId, DrmInitData drmInitData) {
     drmSessionManager.setMode(licenseMode, offlineLicenseKeySetId);
     conditionVariable.close();
     DrmSession<T> drmSession = drmSessionManager.acquireSession(handlerThread.getLooper(),
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/WidevineUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/WidevineUtil.java
index 45c38b3609..b8b80490a1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/WidevineUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/WidevineUtil.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.drm;
 
+import android.support.annotation.Nullable;
 import android.util.Pair;
 import com.google.android.exoplayer2.C;
 import java.util.Map;
@@ -38,7 +39,8 @@ public final class WidevineUtil {
    * @return A {@link Pair} consisting of the remaining license and playback durations in seconds,
    *     or null if called before the session has been opened or after it's been released.
    */
-  public static Pair<Long, Long> getLicenseDurationRemainingSec(DrmSession<?> drmSession) {
+  public static @Nullable Pair<Long, Long> getLicenseDurationRemainingSec(
+      DrmSession<?> drmSession) {
     Map<String, String> keyStatus = drmSession.queryKeyStatus();
     if (keyStatus == null) {
       return null;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java b/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
index 6f62b7fcfc..bba487f321 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
@@ -92,9 +92,12 @@ public class OfflineLicenseHelperTest {
   public void testDownloadLicenseFailsIfNoKeySetIdIsReturned() throws Exception {
     setStubLicenseAndPlaybackDurationValues(1000, 200);
 
-    byte[] offlineLicenseKeySetId = offlineLicenseHelper.downloadLicense(newDrmInitData());
-
-    assertThat(offlineLicenseKeySetId).isNull();
+    try {
+      offlineLicenseHelper.downloadLicense(newDrmInitData());
+      fail();
+    } catch (Exception e) {
+      // Expected.
+    }
   }
 
   @Test

From 4b33d3c8a235dfca892d987618d577ff20967e98 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Thu, 20 Sep 2018 12:46:31 +0100
Subject: [PATCH 006/832] Cleanup

---
 .../trackselection/DefaultTrackSelector.java  | 165 ++++++++++++------
 .../DefaultTrackSelectorTest.java             |  10 +-
 2 files changed, 112 insertions(+), 63 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
index dd382d77b1..f5a347b351 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -174,6 +174,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     private boolean allowNonSeamlessAdaptiveness;
     private int maxVideoWidth;
     private int maxVideoHeight;
+    private int maxVideoFrameRate;
     private int maxVideoBitrate;
     private boolean exceedVideoConstraintsIfNecessary;
     private boolean exceedRendererCapabilitiesIfNecessary;
@@ -181,7 +182,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     private int viewportHeight;
     private boolean viewportOrientationMayChange;
     private int tunnelingAudioSessionId;
-    private int maxFrameRate;
 
     /** Creates a builder with default initial values. */
     public ParametersBuilder() {
@@ -205,6 +205,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       allowNonSeamlessAdaptiveness = initialValues.allowNonSeamlessAdaptiveness;
       maxVideoWidth = initialValues.maxVideoWidth;
       maxVideoHeight = initialValues.maxVideoHeight;
+      maxVideoFrameRate = initialValues.maxVideoFrameRate;
       maxVideoBitrate = initialValues.maxVideoBitrate;
       exceedVideoConstraintsIfNecessary = initialValues.exceedVideoConstraintsIfNecessary;
       exceedRendererCapabilitiesIfNecessary = initialValues.exceedRendererCapabilitiesIfNecessary;
@@ -212,7 +213,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       viewportHeight = initialValues.viewportHeight;
       viewportOrientationMayChange = initialValues.viewportOrientationMayChange;
       tunnelingAudioSessionId = initialValues.tunnelingAudioSessionId;
-      maxFrameRate = initialValues.maxFrameRate;
     }
 
     /**
@@ -326,6 +326,16 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       return this;
     }
 
+    /**
+     * See {@link Parameters#maxVideoFrameRate}.
+     *
+     * @return This builder.
+     */
+    public ParametersBuilder setMaxVideoFrameRate(int maxVideoFrameRate) {
+      this.maxVideoFrameRate = maxVideoFrameRate;
+      return this;
+    }
+
     /**
      * See {@link Parameters#maxVideoBitrate}.
      *
@@ -523,16 +533,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       return this;
     }
 
-    /**
-     * See {@link Parameters#maxFrameRate}.
-     *
-     * @return This builder.
-     */
-    public ParametersBuilder setMaxFrameRate(int maxFrameRate) {
-      this.maxFrameRate = maxFrameRate;
-      return this;
-    }
-
     /**
      * Builds a {@link Parameters} instance with the selected values.
      */
@@ -550,14 +550,14 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           allowNonSeamlessAdaptiveness,
           maxVideoWidth,
           maxVideoHeight,
+          maxVideoFrameRate,
           maxVideoBitrate,
           exceedVideoConstraintsIfNecessary,
           exceedRendererCapabilitiesIfNecessary,
           viewportWidth,
           viewportHeight,
           viewportOrientationMayChange,
-          tunnelingAudioSessionId,
-          maxFrameRate);
+          tunnelingAudioSessionId);
     }
 
     private static SparseArray<Map<TrackGroupArray, SelectionOverride>> cloneSelectionOverrides(
@@ -626,6 +626,11 @@ public class DefaultTrackSelector extends MappingTrackSelector {
      * #viewportHeight} and {@link #viewportOrientationMayChange}) instead.
      */
     public final int maxVideoHeight;
+    /**
+     * Maximum allowed video frame rate. The default value is {@link Integer#MAX_VALUE} (i.e. no
+     * constraint).
+     */
+    public final int maxVideoFrameRate;
     /**
      * Maximum video bitrate. The default value is {@link Integer#MAX_VALUE} (i.e. no constraint).
      */
@@ -654,10 +659,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
      * The default value is {@code true}.
      */
     public final boolean viewportOrientationMayChange;
-    /**
-     * Maximum video frame rate. The default value is {@link Integer#MAX_VALUE} (i.e. no constraint).
-     */
-    public final int maxFrameRate;
 
     // General
     /**
@@ -711,14 +712,14 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           /* allowNonSeamlessAdaptiveness= */ true,
           /* maxVideoWidth= */ Integer.MAX_VALUE,
           /* maxVideoHeight= */ Integer.MAX_VALUE,
+          /* maxVideoFrameRate= */ Integer.MAX_VALUE,
           /* maxVideoBitrate= */ Integer.MAX_VALUE,
           /* exceedVideoConstraintsIfNecessary= */ true,
           /* exceedRendererCapabilitiesIfNecessary= */ true,
           /* viewportWidth= */ Integer.MAX_VALUE,
           /* viewportHeight= */ Integer.MAX_VALUE,
           /* viewportOrientationMayChange= */ true,
-          /* tunnelingAudioSessionId= */ C.AUDIO_SESSION_ID_UNSET,
-          /* maxFrameRate= */ Integer.MAX_VALUE);
+          /* tunnelingAudioSessionId= */ C.AUDIO_SESSION_ID_UNSET);
     }
 
     /* package */ Parameters(
@@ -734,14 +735,14 @@ public class DefaultTrackSelector extends MappingTrackSelector {
         boolean allowNonSeamlessAdaptiveness,
         int maxVideoWidth,
         int maxVideoHeight,
+        int maxVideoFrameRate,
         int maxVideoBitrate,
         boolean exceedVideoConstraintsIfNecessary,
         boolean exceedRendererCapabilitiesIfNecessary,
         int viewportWidth,
         int viewportHeight,
         boolean viewportOrientationMayChange,
-        int tunnelingAudioSessionId,
-        int maxFrameRate) {
+        int tunnelingAudioSessionId) {
       this.selectionOverrides = selectionOverrides;
       this.rendererDisabledFlags = rendererDisabledFlags;
       this.preferredAudioLanguage = Util.normalizeLanguageCode(preferredAudioLanguage);
@@ -754,6 +755,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       this.allowNonSeamlessAdaptiveness = allowNonSeamlessAdaptiveness;
       this.maxVideoWidth = maxVideoWidth;
       this.maxVideoHeight = maxVideoHeight;
+      this.maxVideoFrameRate = maxVideoFrameRate;
       this.maxVideoBitrate = maxVideoBitrate;
       this.exceedVideoConstraintsIfNecessary = exceedVideoConstraintsIfNecessary;
       this.exceedRendererCapabilitiesIfNecessary = exceedRendererCapabilitiesIfNecessary;
@@ -761,7 +763,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       this.viewportHeight = viewportHeight;
       this.viewportOrientationMayChange = viewportOrientationMayChange;
       this.tunnelingAudioSessionId = tunnelingAudioSessionId;
-      this.maxFrameRate = maxFrameRate;
     }
 
     /* package */ Parameters(Parcel in) {
@@ -777,6 +778,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       this.allowNonSeamlessAdaptiveness = Util.readBoolean(in);
       this.maxVideoWidth = in.readInt();
       this.maxVideoHeight = in.readInt();
+      this.maxVideoFrameRate = in.readInt();
       this.maxVideoBitrate = in.readInt();
       this.exceedVideoConstraintsIfNecessary = Util.readBoolean(in);
       this.exceedRendererCapabilitiesIfNecessary = Util.readBoolean(in);
@@ -784,7 +786,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       this.viewportHeight = in.readInt();
       this.viewportOrientationMayChange = Util.readBoolean(in);
       this.tunnelingAudioSessionId = in.readInt();
-      this.maxFrameRate = in.readInt();
     }
 
     /**
@@ -846,6 +847,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           && allowNonSeamlessAdaptiveness == other.allowNonSeamlessAdaptiveness
           && maxVideoWidth == other.maxVideoWidth
           && maxVideoHeight == other.maxVideoHeight
+          && maxVideoFrameRate == other.maxVideoFrameRate
           && exceedVideoConstraintsIfNecessary == other.exceedVideoConstraintsIfNecessary
           && exceedRendererCapabilitiesIfNecessary == other.exceedRendererCapabilitiesIfNecessary
           && viewportOrientationMayChange == other.viewportOrientationMayChange
@@ -853,7 +855,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           && viewportHeight == other.viewportHeight
           && maxVideoBitrate == other.maxVideoBitrate
           && tunnelingAudioSessionId == other.tunnelingAudioSessionId
-          && maxFrameRate == other.maxFrameRate
           && TextUtils.equals(preferredAudioLanguage, other.preferredAudioLanguage)
           && TextUtils.equals(preferredTextLanguage, other.preferredTextLanguage)
           && areRendererDisabledFlagsEqual(rendererDisabledFlags, other.rendererDisabledFlags)
@@ -870,6 +871,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       result = 31 * result + (allowNonSeamlessAdaptiveness ? 1 : 0);
       result = 31 * result + maxVideoWidth;
       result = 31 * result + maxVideoHeight;
+      result = 31 * result + maxVideoFrameRate;
       result = 31 * result + (exceedVideoConstraintsIfNecessary ? 1 : 0);
       result = 31 * result + (exceedRendererCapabilitiesIfNecessary ? 1 : 0);
       result = 31 * result + (viewportOrientationMayChange ? 1 : 0);
@@ -877,7 +879,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       result = 31 * result + viewportHeight;
       result = 31 * result + maxVideoBitrate;
       result = 31 * result + tunnelingAudioSessionId;
-      result = 31 * result + maxFrameRate;
       result =
           31 * result + (preferredAudioLanguage == null ? 0 : preferredAudioLanguage.hashCode());
       result = 31 * result + (preferredTextLanguage == null ? 0 : preferredTextLanguage.hashCode());
@@ -905,6 +906,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       Util.writeBoolean(dest, allowNonSeamlessAdaptiveness);
       dest.writeInt(maxVideoWidth);
       dest.writeInt(maxVideoHeight);
+      dest.writeInt(maxVideoFrameRate);
       dest.writeInt(maxVideoBitrate);
       Util.writeBoolean(dest, exceedVideoConstraintsIfNecessary);
       Util.writeBoolean(dest, exceedRendererCapabilitiesIfNecessary);
@@ -912,7 +914,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       dest.writeInt(viewportHeight);
       Util.writeBoolean(dest, viewportOrientationMayChange);
       dest.writeInt(tunnelingAudioSessionId);
-      dest.writeInt(maxFrameRate);
     }
 
     public static final Parcelable.Creator<Parameters> CREATOR =
@@ -1457,10 +1458,19 @@ public class DefaultTrackSelector extends MappingTrackSelector {
             && (mixedMimeTypeAdaptationSupports & requiredAdaptiveSupport) != 0;
     for (int i = 0; i < groups.length; i++) {
       TrackGroup group = groups.get(i);
-      int[] adaptiveTracks = getAdaptiveVideoTracksForGroup(group, formatSupport[i],
-          allowMixedMimeTypes, requiredAdaptiveSupport, params.maxVideoWidth, params.maxVideoHeight,
-          params.maxVideoBitrate, params.maxFrameRate, params.viewportWidth, params.viewportHeight,
-          params.viewportOrientationMayChange);
+      int[] adaptiveTracks =
+          getAdaptiveVideoTracksForGroup(
+              group,
+              formatSupport[i],
+              allowMixedMimeTypes,
+              requiredAdaptiveSupport,
+              params.maxVideoWidth,
+              params.maxVideoHeight,
+              params.maxVideoFrameRate,
+              params.maxVideoBitrate,
+              params.viewportWidth,
+              params.viewportHeight,
+              params.viewportOrientationMayChange);
       if (adaptiveTracks.length > 0) {
         return Assertions.checkNotNull(adaptiveTrackSelectionFactory)
             .createTrackSelection(group, bandwidthMeter, adaptiveTracks);
@@ -1469,10 +1479,18 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     return null;
   }
 
-  private static int[] getAdaptiveVideoTracksForGroup(TrackGroup group, int[] formatSupport,
-      boolean allowMixedMimeTypes, int requiredAdaptiveSupport, int maxVideoWidth,
-      int maxVideoHeight, int maxVideoBitrate, int maxFrameRate, int viewportWidth,
-      int viewportHeight, boolean viewportOrientationMayChange) {
+  private static int[] getAdaptiveVideoTracksForGroup(
+      TrackGroup group,
+      int[] formatSupport,
+      boolean allowMixedMimeTypes,
+      int requiredAdaptiveSupport,
+      int maxVideoWidth,
+      int maxVideoHeight,
+      int maxVideoFrameRate,
+      int maxVideoBitrate,
+      int viewportWidth,
+      int viewportHeight,
+      boolean viewportOrientationMayChange) {
     if (group.length < 2) {
       return NO_TRACKS;
     }
@@ -1492,9 +1510,17 @@ public class DefaultTrackSelector extends MappingTrackSelector {
         int trackIndex = selectedTrackIndices.get(i);
         String sampleMimeType = group.getFormat(trackIndex).sampleMimeType;
         if (seenMimeTypes.add(sampleMimeType)) {
-          int countForMimeType = getAdaptiveVideoTrackCountForMimeType(group, formatSupport,
-              requiredAdaptiveSupport, sampleMimeType, maxVideoWidth, maxVideoHeight,
-              maxVideoBitrate, maxFrameRate, selectedTrackIndices);
+          int countForMimeType =
+              getAdaptiveVideoTrackCountForMimeType(
+                  group,
+                  formatSupport,
+                  requiredAdaptiveSupport,
+                  sampleMimeType,
+                  maxVideoWidth,
+                  maxVideoHeight,
+                  maxVideoFrameRate,
+                  maxVideoBitrate,
+                  selectedTrackIndices);
           if (countForMimeType > selectedMimeTypeTrackCount) {
             selectedMimeType = sampleMimeType;
             selectedMimeTypeTrackCount = countForMimeType;
@@ -1504,8 +1530,15 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     }
 
     // Filter by the selected mime type.
-    filterAdaptiveVideoTrackCountForMimeType(group, formatSupport, requiredAdaptiveSupport,
-        selectedMimeType, maxVideoWidth, maxVideoHeight, maxVideoBitrate, maxFrameRate,
+    filterAdaptiveVideoTrackCountForMimeType(
+        group,
+        formatSupport,
+        requiredAdaptiveSupport,
+        selectedMimeType,
+        maxVideoWidth,
+        maxVideoHeight,
+        maxVideoFrameRate,
+        maxVideoBitrate,
         selectedTrackIndices);
 
     return selectedTrackIndices.size() < 2 ? NO_TRACKS : Util.toArray(selectedTrackIndices);
@@ -1518,15 +1551,21 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       @Nullable String mimeType,
       int maxVideoWidth,
       int maxVideoHeight,
+      int maxVideoFrameRate,
       int maxVideoBitrate,
-      int maxFrameRate,
       List<Integer> selectedTrackIndices) {
     int adaptiveTrackCount = 0;
     for (int i = 0; i < selectedTrackIndices.size(); i++) {
       int trackIndex = selectedTrackIndices.get(i);
-      if (isSupportedAdaptiveVideoTrack(group.getFormat(trackIndex), mimeType,
-          formatSupport[trackIndex], requiredAdaptiveSupport, maxVideoWidth, maxVideoHeight,
-          maxVideoBitrate, maxFrameRate)) {
+      if (isSupportedAdaptiveVideoTrack(
+          group.getFormat(trackIndex),
+          mimeType,
+          formatSupport[trackIndex],
+          requiredAdaptiveSupport,
+          maxVideoWidth,
+          maxVideoHeight,
+          maxVideoFrameRate,
+          maxVideoBitrate)) {
         adaptiveTrackCount++;
       }
     }
@@ -1540,14 +1579,20 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       @Nullable String mimeType,
       int maxVideoWidth,
       int maxVideoHeight,
+      int maxVideoFrameRate,
       int maxVideoBitrate,
-      int maxFrameRate,
       List<Integer> selectedTrackIndices) {
     for (int i = selectedTrackIndices.size() - 1; i >= 0; i--) {
       int trackIndex = selectedTrackIndices.get(i);
-      if (!isSupportedAdaptiveVideoTrack(group.getFormat(trackIndex), mimeType,
-          formatSupport[trackIndex], requiredAdaptiveSupport, maxVideoWidth, maxVideoHeight,
-          maxVideoBitrate, maxFrameRate)) {
+      if (!isSupportedAdaptiveVideoTrack(
+          group.getFormat(trackIndex),
+          mimeType,
+          formatSupport[trackIndex],
+          requiredAdaptiveSupport,
+          maxVideoWidth,
+          maxVideoHeight,
+          maxVideoFrameRate,
+          maxVideoBitrate)) {
         selectedTrackIndices.remove(i);
       }
     }
@@ -1560,14 +1605,15 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       int requiredAdaptiveSupport,
       int maxVideoWidth,
       int maxVideoHeight,
-      int maxVideoBitrate,
-      int maxFrameRate) {
-    return isSupported(formatSupport, false) && ((formatSupport & requiredAdaptiveSupport) != 0)
+      int maxVideoFrameRate,
+      int maxVideoBitrate) {
+    return isSupported(formatSupport, false)
+        && ((formatSupport & requiredAdaptiveSupport) != 0)
         && (mimeType == null || Util.areEqual(format.sampleMimeType, mimeType))
         && (format.width == Format.NO_VALUE || format.width <= maxVideoWidth)
         && (format.height == Format.NO_VALUE || format.height <= maxVideoHeight)
-        && (format.bitrate == Format.NO_VALUE || format.bitrate <= maxVideoBitrate)
-        && (format.frameRate == Format.NO_VALUE || format.frameRate <= maxFrameRate);
+        && (format.frameRate == Format.NO_VALUE || format.frameRate <= maxVideoFrameRate)
+        && (format.bitrate == Format.NO_VALUE || format.bitrate <= maxVideoBitrate);
   }
 
   private static @Nullable TrackSelection selectFixedVideoTrack(
@@ -1586,11 +1632,14 @@ public class DefaultTrackSelector extends MappingTrackSelector {
         if (isSupported(trackFormatSupport[trackIndex],
             params.exceedRendererCapabilitiesIfNecessary)) {
           Format format = trackGroup.getFormat(trackIndex);
-          boolean isWithinConstraints = selectedTrackIndices.contains(trackIndex)
-              && (format.width == Format.NO_VALUE || format.width <= params.maxVideoWidth)
-              && (format.height == Format.NO_VALUE || format.height <= params.maxVideoHeight)
-              && (format.bitrate == Format.NO_VALUE || format.bitrate <= params.maxVideoBitrate)
-              && (format.frameRate == Format.NO_VALUE || format.frameRate <= params.maxFrameRate);
+          boolean isWithinConstraints =
+              selectedTrackIndices.contains(trackIndex)
+                  && (format.width == Format.NO_VALUE || format.width <= params.maxVideoWidth)
+                  && (format.height == Format.NO_VALUE || format.height <= params.maxVideoHeight)
+                  && (format.frameRate == Format.NO_VALUE
+                      || format.frameRate <= params.maxVideoFrameRate)
+                  && (format.bitrate == Format.NO_VALUE
+                      || format.bitrate <= params.maxVideoBitrate);
           if (!isWithinConstraints && !params.exceedVideoConstraintsIfNecessary) {
             // Track should not be selected.
             continue;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
index 62ae60da85..94f6abd87b 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
@@ -130,14 +130,14 @@ public final class DefaultTrackSelectorTest {
             /* allowNonSeamlessAdaptiveness= */ true,
             /* maxVideoWidth= */ 1,
             /* maxVideoHeight= */ 2,
-            /* maxVideoBitrate= */ 3,
+            /* maxVideoFrameRate= */ 3,
+            /* maxVideoBitrate= */ 4,
             /* exceedVideoConstraintsIfNecessary= */ false,
             /* exceedRendererCapabilitiesIfNecessary= */ true,
-            /* viewportWidth= */ 4,
-            /* viewportHeight= */ 5,
+            /* viewportWidth= */ 5,
+            /* viewportHeight= */ 6,
             /* viewportOrientationMayChange= */ false,
-            /* tunnelingAudioSessionId= */ C.AUDIO_SESSION_ID_UNSET,
-            /* maxFrameRate= */ 6);
+            /* tunnelingAudioSessionId= */ C.AUDIO_SESSION_ID_UNSET);
 
     Parcel parcel = Parcel.obtain();
     parametersToParcel.writeToParcel(parcel, 0);

From a0ab96623acfad89468a70677fee2c36b2e4d9ed Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 20 Sep 2018 08:40:19 -0700
Subject: [PATCH 007/832] Compensate for trimmed audio in buffer time check

After a period transition the first buffer queued has the sum of previous period
durations added to its source presentation timestamp. These durations take into
account gapless edits, but the check on the timestamp was based on the submitted
frame count, not the frame count after trimming.

This change fixes an issue where audio/video would gradually drift apart due to
accumulated error in the audio track position, which could lead to freezing due
to the audio renderer stopping being ready and switching to the standalone media
clock.

Issue: #4559

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=213819908
---
 RELEASENOTES.md                               |  3 ++
 .../exoplayer2/audio/DefaultAudioSink.java    |  5 +-
 .../audio/TrimmingAudioProcessor.java         | 53 +++++++++++++++++--
 3 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 9edde561b5..ed1eff0233 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -4,6 +4,9 @@
 
 * Allow setting log level for ExoPlayer logcat output
   ([#4665](https://github.com/google/ExoPlayer/issues/4665)).
+* Fix an issue where audio and video would desynchronize when playing
+  concatenations of gapless content
+  ([#4559](https://github.com/google/ExoPlayer/issues/4559)).
 
 ### 2.9.0 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
index b20d2ab4bb..fbd5b027c1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
@@ -632,7 +632,9 @@ public final class DefaultAudioSink implements AudioSink {
       } else {
         // Sanity check that presentationTimeUs is consistent with the expected value.
         long expectedPresentationTimeUs =
-            startMediaTimeUs + inputFramesToDurationUs(getSubmittedFrames());
+            startMediaTimeUs
+                + inputFramesToDurationUs(
+                    getSubmittedFrames() - trimmingAudioProcessor.getTrimmedFrameCount());
         if (startMediaTimeState == START_IN_SYNC
             && Math.abs(expectedPresentationTimeUs - presentationTimeUs) > 200000) {
           Log.e(TAG, "Discontinuity detected [expected " + expectedPresentationTimeUs + ", got "
@@ -955,6 +957,7 @@ public final class DefaultAudioSink implements AudioSink {
       playbackParametersCheckpoints.clear();
       playbackParametersOffsetUs = 0;
       playbackParametersPositionUs = 0;
+      trimmingAudioProcessor.resetTrimmedFrameCount();
       inputBuffer = null;
       outputBuffer = null;
       flushAudioProcessors();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
index ab097821c4..ee452cb649 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
@@ -25,11 +25,14 @@ import java.nio.ByteOrder;
 /** Audio processor for trimming samples from the start/end of data. */
 /* package */ final class TrimmingAudioProcessor implements AudioProcessor {
 
+  private static final int OUTPUT_ENCODING = C.ENCODING_PCM_16BIT;
+
   private boolean isActive;
   private int trimStartFrames;
   private int trimEndFrames;
   private int channelCount;
   private int sampleRateHz;
+  private int bytesPerFrame;
 
   private int pendingTrimStartBytes;
   private ByteBuffer buffer;
@@ -37,6 +40,7 @@ import java.nio.ByteOrder;
   private byte[] endBuffer;
   private int endBufferSize;
   private boolean inputEnded;
+  private long trimmedFrameCount;
 
   /** Creates a new audio processor for trimming samples from the start/end of data. */
   public TrimmingAudioProcessor() {
@@ -61,17 +65,34 @@ import java.nio.ByteOrder;
     this.trimEndFrames = trimEndFrames;
   }
 
+  /** Sets the trimmed frame count returned by {@link #getTrimmedFrameCount()} to zero. */
+  public void resetTrimmedFrameCount() {
+    trimmedFrameCount = 0;
+  }
+
+  /**
+   * Returns the number of audio frames trimmed since the last call to {@link
+   * #resetTrimmedFrameCount()}.
+   */
+  public long getTrimmedFrameCount() {
+    return trimmedFrameCount;
+  }
+
   @Override
   public boolean configure(int sampleRateHz, int channelCount, @Encoding int encoding)
       throws UnhandledFormatException {
-    if (encoding != C.ENCODING_PCM_16BIT) {
+    if (encoding != OUTPUT_ENCODING) {
       throw new UnhandledFormatException(sampleRateHz, channelCount, encoding);
     }
+    if (endBufferSize > 0) {
+      trimmedFrameCount += endBufferSize / bytesPerFrame;
+    }
     this.channelCount = channelCount;
     this.sampleRateHz = sampleRateHz;
-    endBuffer = new byte[trimEndFrames * channelCount * 2];
+    bytesPerFrame = Util.getPcmFrameSize(OUTPUT_ENCODING, channelCount);
+    endBuffer = new byte[trimEndFrames * bytesPerFrame];
     endBufferSize = 0;
-    pendingTrimStartBytes = trimStartFrames * channelCount * 2;
+    pendingTrimStartBytes = trimStartFrames * bytesPerFrame;
     boolean wasActive = isActive;
     isActive = trimStartFrames != 0 || trimEndFrames != 0;
     return wasActive != isActive;
@@ -89,7 +110,7 @@ import java.nio.ByteOrder;
 
   @Override
   public int getOutputEncoding() {
-    return C.ENCODING_PCM_16BIT;
+    return OUTPUT_ENCODING;
   }
 
   @Override
@@ -103,8 +124,13 @@ import java.nio.ByteOrder;
     int limit = inputBuffer.limit();
     int remaining = limit - position;
 
+    if (remaining == 0) {
+      return;
+    }
+
     // Trim any pending start bytes from the input buffer.
     int trimBytes = Math.min(remaining, pendingTrimStartBytes);
+    trimmedFrameCount += trimBytes / bytesPerFrame;
     pendingTrimStartBytes -= trimBytes;
     inputBuffer.position(position + trimBytes);
     if (pendingTrimStartBytes > 0) {
@@ -151,9 +177,26 @@ import java.nio.ByteOrder;
     inputEnded = true;
   }
 
+  @SuppressWarnings("ReferenceEquality")
   @Override
   public ByteBuffer getOutput() {
     ByteBuffer outputBuffer = this.outputBuffer;
+    if (inputEnded && endBufferSize > 0 && outputBuffer == EMPTY_BUFFER) {
+      // Because audio processors may be drained in the middle of the stream we assume that the
+      // contents of the end buffer need to be output. Gapless transitions don't involve a call to
+      // queueEndOfStream so won't be affected. When audio is actually ending we play the padding
+      // data which is incorrect. This behavior can be fixed once we have the timestamps associated
+      // with input buffers.
+      if (buffer.capacity() < endBufferSize) {
+        buffer = ByteBuffer.allocateDirect(endBufferSize).order(ByteOrder.nativeOrder());
+      } else {
+        buffer.clear();
+      }
+      buffer.put(endBuffer, 0, endBufferSize);
+      endBufferSize = 0;
+      buffer.flip();
+      outputBuffer = buffer;
+    }
     this.outputBuffer = EMPTY_BUFFER;
     return outputBuffer;
   }
@@ -161,7 +204,7 @@ import java.nio.ByteOrder;
   @SuppressWarnings("ReferenceEquality")
   @Override
   public boolean isEnded() {
-    return inputEnded && outputBuffer == EMPTY_BUFFER;
+    return inputEnded && endBufferSize == 0 && outputBuffer == EMPTY_BUFFER;
   }
 
   @Override

From e90d36cb699083a4ee74b27d0960df7e2352e1bc Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 20 Sep 2018 09:07:45 -0700
Subject: [PATCH 008/832] Fix ImaAdsLoaderTest

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=213824217
---
 .../com/google/android/exoplayer2/ext/ima/FakePlayer.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakePlayer.java b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakePlayer.java
index c7026bab5f..0c35c9b66d 100644
--- a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakePlayer.java
+++ b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakePlayer.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.ext.ima;
 
+import android.os.Looper;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
@@ -110,6 +111,11 @@ import java.util.ArrayList;
 
   // ExoPlayer methods. Other methods are unsupported.
 
+  @Override
+  public Looper getApplicationLooper() {
+    return Looper.getMainLooper();
+  }
+
   @Override
   public void addListener(Player.EventListener listener) {
     listeners.add(listener);

From d0fb4b4729b9247bb1b17a14aea5b605e0e0dfa8 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 20 Sep 2018 09:34:14 -0700
Subject: [PATCH 009/832] Add IMA tests to presubmit

Also fix internal build by adding some methods.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=213828434
---
 .../google/android/exoplayer2/ext/ima/FakeAd.java    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeAd.java b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeAd.java
index 873a1b1d09..b626a08780 100644
--- a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeAd.java
+++ b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeAd.java
@@ -64,6 +64,18 @@ import java.util.Set;
         };
   }
 
+  public int getVastMediaWidth() {
+    throw new UnsupportedOperationException();
+  }
+
+  public int getVastMediaHeight() {
+    throw new UnsupportedOperationException();
+  }
+
+  public int getVastMediaBitrate() {
+    throw new UnsupportedOperationException();
+  }
+
   @Override
   public boolean isSkippable() {
     return skippable;

From 300dc05e85605218d958a36e95cbc666b7962364 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 20 Sep 2018 09:34:44 -0700
Subject: [PATCH 010/832] Reset start trim only if input was queued

Before this change we would reset the start trim to zero after initial
configuration (at the start of playback) and after seeking to any position. The
fact that no trimming was applied at the start of playback meant that after the
first period transition we'd see a mismatch between the next buffer timestamp
(equal to the duration of the period taking into account edits) and the duration
of audio submitted to the sink.

This change modifies the behavior so that we reset the start trim to zero only
if some audio was queued since configuration. This is incorrect in the case of
starting playback at a non-zero position, but fixes the common case of starting
at zero. As before, a later seek to any position is handled via a flush and
resets the trim as required.

Transitions from one period to the next are unaffected by this change.

One way to implement start trimming correctly would be to provide the input
buffer timestamp to the audio processors and only trim when handling audio from
the start of the stream, but that is a larger change so left for later.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=213828511
---
 .../exoplayer2/audio/TrimmingAudioProcessor.java   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
index ee452cb649..7b66bd63d2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
@@ -33,6 +33,7 @@ import java.nio.ByteOrder;
   private int channelCount;
   private int sampleRateHz;
   private int bytesPerFrame;
+  private boolean receivedInputSinceConfigure;
 
   private int pendingTrimStartBytes;
   private ByteBuffer buffer;
@@ -95,6 +96,7 @@ import java.nio.ByteOrder;
     pendingTrimStartBytes = trimStartFrames * bytesPerFrame;
     boolean wasActive = isActive;
     isActive = trimStartFrames != 0 || trimEndFrames != 0;
+    receivedInputSinceConfigure = false;
     return wasActive != isActive;
   }
 
@@ -127,6 +129,7 @@ import java.nio.ByteOrder;
     if (remaining == 0) {
       return;
     }
+    receivedInputSinceConfigure = true;
 
     // Trim any pending start bytes from the input buffer.
     int trimBytes = Math.min(remaining, pendingTrimStartBytes);
@@ -211,9 +214,14 @@ import java.nio.ByteOrder;
   public void flush() {
     outputBuffer = EMPTY_BUFFER;
     inputEnded = false;
-    // It's no longer necessary to trim any media from the start, but it is necessary to clear the
-    // end buffer and refill it.
-    pendingTrimStartBytes = 0;
+    if (receivedInputSinceConfigure) {
+      // Audio processors are flushed after initial configuration, so we leave the pending trim
+      // start byte count unmodified if the processor was just configured. Otherwise we (possibly
+      // incorrectly) assume that this is a seek to a non-zero position. We should instead check the
+      // timestamp of the first input buffer queued after flushing to decide whether to trim (see
+      // also [Internal: b/77292509]).
+      pendingTrimStartBytes = 0;
+    }
     endBufferSize = 0;
   }
 

From 03fe503f1c4744848a1a2a68950b96d81c2f845c Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 20 Sep 2018 09:48:44 -0700
Subject: [PATCH 011/832] Propagate output format in tunneling mode

From API 23 this uses the timed format queue. Before API 23 the
format is notified as soon as the buffer is queued.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=213830729
---
 .../mediacodec/MediaCodecRenderer.java        | 19 +++--
 .../video/MediaCodecVideoRenderer.java        | 71 ++++++++++++-------
 2 files changed, 61 insertions(+), 29 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index 54c2b23c3b..7e933e9474 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -497,6 +497,20 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     return false;
   }
 
+  /**
+   * Polls the pending output format queue for a given buffer timestamp. If a format is present, it
+   * is removed and returned. Otherwise returns {@code null}. Subclasses should only call this
+   * method if they are taking over responsibility for output format propagation (e.g., when using
+   * video tunneling).
+   */
+  protected final @Nullable Format updateOutputFormatForTime(long presentationTimeUs) {
+    Format format = formatQueue.pollFloor(presentationTimeUs);
+    if (format != null) {
+      outputFormat = format;
+    }
+    return format;
+  }
+
   protected final MediaCodec getCodec() {
     return codec;
   }
@@ -1297,10 +1311,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
         outputBuffer.limit(outputBufferInfo.offset + outputBufferInfo.size);
       }
       shouldSkipOutputBuffer = shouldSkipOutputBuffer(outputBufferInfo.presentationTimeUs);
-      Format format = formatQueue.pollFloor(outputBufferInfo.presentationTimeUs);
-      if (format != null) {
-        outputFormat = format;
-      }
+      updateOutputFormatForTime(outputBufferInfo.presentationTimeUs);
     }
 
     boolean processedOutputBuffer;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index 35121829a3..d217b47785 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -566,7 +566,9 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
     buffersInCodecCount++;
     lastInputTimeUs = Math.max(buffer.timeUs, lastInputTimeUs);
     if (Util.SDK_INT < 23 && tunneling) {
-      maybeNotifyRenderedFirstFrame();
+      // In tunneled mode before API 23 we don't have a way to know when the buffer is output, so
+      // treat it as if it were output immediately.
+      onProcessedTunneledBuffer(buffer.timeUs);
     }
   }
 
@@ -575,29 +577,15 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
     boolean hasCrop = outputFormat.containsKey(KEY_CROP_RIGHT)
         && outputFormat.containsKey(KEY_CROP_LEFT) && outputFormat.containsKey(KEY_CROP_BOTTOM)
         && outputFormat.containsKey(KEY_CROP_TOP);
-    currentWidth = hasCrop
-        ? outputFormat.getInteger(KEY_CROP_RIGHT) - outputFormat.getInteger(KEY_CROP_LEFT) + 1
-        : outputFormat.getInteger(MediaFormat.KEY_WIDTH);
-    currentHeight = hasCrop
-        ? outputFormat.getInteger(KEY_CROP_BOTTOM) - outputFormat.getInteger(KEY_CROP_TOP) + 1
-        : outputFormat.getInteger(MediaFormat.KEY_HEIGHT);
-    currentPixelWidthHeightRatio = pendingPixelWidthHeightRatio;
-    if (Util.SDK_INT >= 21) {
-      // On API level 21 and above the decoder applies the rotation when rendering to the surface.
-      // Hence currentUnappliedRotation should always be 0. For 90 and 270 degree rotations, we need
-      // to flip the width, height and pixel aspect ratio to reflect the rotation that was applied.
-      if (pendingRotationDegrees == 90 || pendingRotationDegrees == 270) {
-        int rotatedHeight = currentWidth;
-        currentWidth = currentHeight;
-        currentHeight = rotatedHeight;
-        currentPixelWidthHeightRatio = 1 / currentPixelWidthHeightRatio;
-      }
-    } else {
-      // On API level 20 and below the decoder does not apply the rotation.
-      currentUnappliedRotationDegrees = pendingRotationDegrees;
-    }
-    // Must be applied each time the output format changes.
-    codec.setVideoScalingMode(scalingMode);
+    int width =
+        hasCrop
+            ? outputFormat.getInteger(KEY_CROP_RIGHT) - outputFormat.getInteger(KEY_CROP_LEFT) + 1
+            : outputFormat.getInteger(MediaFormat.KEY_WIDTH);
+    int height =
+        hasCrop
+            ? outputFormat.getInteger(KEY_CROP_BOTTOM) - outputFormat.getInteger(KEY_CROP_TOP) + 1
+            : outputFormat.getInteger(MediaFormat.KEY_HEIGHT);
+    processOutputFormat(codec, width, height);
   }
 
   @Override
@@ -705,6 +693,28 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
     return false;
   }
 
+  private void processOutputFormat(MediaCodec codec, int width, int height) {
+    currentWidth = width;
+    currentHeight = height;
+    currentPixelWidthHeightRatio = pendingPixelWidthHeightRatio;
+    if (Util.SDK_INT >= 21) {
+      // On API level 21 and above the decoder applies the rotation when rendering to the surface.
+      // Hence currentUnappliedRotation should always be 0. For 90 and 270 degree rotations, we need
+      // to flip the width, height and pixel aspect ratio to reflect the rotation that was applied.
+      if (pendingRotationDegrees == 90 || pendingRotationDegrees == 270) {
+        int rotatedHeight = currentWidth;
+        currentWidth = currentHeight;
+        currentHeight = rotatedHeight;
+        currentPixelWidthHeightRatio = 1 / currentPixelWidthHeightRatio;
+      }
+    } else {
+      // On API level 20 and below the decoder does not apply the rotation.
+      currentUnappliedRotationDegrees = pendingRotationDegrees;
+    }
+    // Must be applied each time the output format changes.
+    codec.setVideoScalingMode(scalingMode);
+  }
+
   private void notifyFrameMetadataListener(
       long presentationTimeUs, long releaseTimeNs, Format format) {
     if (frameMetadataListener != null) {
@@ -722,6 +732,17 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
     return outputStreamOffsetUs;
   }
 
+  /** Called when a buffer was processed in tunneling mode. */
+  protected void onProcessedTunneledBuffer(long presentationTimeUs) {
+    @Nullable Format format = updateOutputFormatForTime(presentationTimeUs);
+    if (format != null) {
+      processOutputFormat(getCodec(), format.width, format.height);
+    }
+    maybeNotifyVideoSizeChanged();
+    maybeNotifyRenderedFirstFrame();
+    onProcessedOutputBuffer(presentationTimeUs);
+  }
+
   /**
    * Called when an output buffer is successfully processed.
    *
@@ -1463,7 +1484,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
         // Stale event.
         return;
       }
-      maybeNotifyRenderedFirstFrame();
+      onProcessedTunneledBuffer(presentationTimeUs);
     }
 
   }

From bd3bf3fc8db6b757d974ae73f98efe20cf589663 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 21 Sep 2018 01:29:49 -0700
Subject: [PATCH 012/832] Fix broken Javadoc

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=213951977
---
 .../exoplayer2/ext/mediasession/MediaSessionConnector.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
index 4a2464fdaa..0915ee4b03 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
@@ -401,7 +401,7 @@ public final class MediaSessionConnector {
    * <p>The order in which any {@link CustomActionProvider}s are passed determines the order of the
    * actions published with the playback state of the session.
    *
-   * @param player The player to be connected to the {@code MediaSession}, or {@link null} to
+   * @param player The player to be connected to the {@code MediaSession}, or {@code null} to
    *     disconnect the current player.
    * @param playbackPreparer An optional {@link PlaybackPreparer} for preparing the player.
    * @param customActionProviders Optional {@link CustomActionProvider}s to publish and handle

From d411ace97d0e41eb2ce172e8ef1c15fb81358aaa Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 21 Sep 2018 03:02:09 -0700
Subject: [PATCH 013/832] Add missing calls to LoadControl.onTracksSelected.

This method needs to be called whenever the track selection of the current
loading period changes, but also when the loading period itself (and thus
the "loading track selection") changes. These are the same situations in which
we update the loading media period id and thus we can move both updates in
a common helper method.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=213959982
---
 .../exoplayer2/ExoPlayerImplInternal.java     | 40 +++++++++++--------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index 329e2c671a..d861020d26 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -428,7 +428,7 @@ import java.util.Collections;
     if (!queue.updateRepeatMode(repeatMode)) {
       seekToCurrentPosition(/* sendDiscontinuity= */ true);
     }
-    updateLoadingMediaPeriodId();
+    handleLoadingMediaPeriodChanged(/* loadingTrackSelectionChanged= */ false);
   }
 
   private void setShuffleModeEnabledInternal(boolean shuffleModeEnabled)
@@ -437,7 +437,7 @@ import java.util.Collections;
     if (!queue.updateShuffleModeEnabled(shuffleModeEnabled)) {
       seekToCurrentPosition(/* sendDiscontinuity= */ true);
     }
-    updateLoadingMediaPeriodId();
+    handleLoadingMediaPeriodChanged(/* loadingTrackSelectionChanged= */ false);
   }
 
   private void seekToCurrentPosition(boolean sendDiscontinuity) throws ExoPlaybackException {
@@ -706,7 +706,7 @@ import java.util.Collections;
       resetRendererPosition(periodPositionUs);
     }
 
-    updateLoadingMediaPeriodId();
+    handleLoadingMediaPeriodChanged(/* loadingTrackSelectionChanged= */ false);
     handler.sendEmptyMessage(MSG_DO_SOME_WORK);
     return periodPositionUs;
   }
@@ -1018,8 +1018,6 @@ import java.util.Collections;
       long periodPositionUs =
           playingPeriodHolder.applyTrackSelection(
               playbackInfo.positionUs, recreateStreams, streamResetFlags);
-      updateLoadControlTrackSelection(
-          playingPeriodHolder.trackGroups, playingPeriodHolder.trackSelectorResult);
       if (playbackInfo.playbackState != Player.STATE_ENDED
           && periodPositionUs != playbackInfo.positionUs) {
         playbackInfo = playbackInfo.fromNewPosition(playbackInfo.periodId, periodPositionUs,
@@ -1059,10 +1057,9 @@ import java.util.Collections;
             Math.max(
                 periodHolder.info.startPositionUs, periodHolder.toPeriodTime(rendererPositionUs));
         periodHolder.applyTrackSelection(loadingPeriodPositionUs, false);
-        updateLoadControlTrackSelection(periodHolder.trackGroups, periodHolder.trackSelectorResult);
       }
     }
-    updateLoadingMediaPeriodId();
+    handleLoadingMediaPeriodChanged(/* loadingTrackSelectionChanged= */ true);
     if (playbackInfo.playbackState != Player.STATE_ENDED) {
       maybeContinueLoading();
       updatePlaybackPositions();
@@ -1070,11 +1067,6 @@ import java.util.Collections;
     }
   }
 
-  private void updateLoadControlTrackSelection(
-      TrackGroupArray trackGroups, TrackSelectorResult trackSelectorResult) {
-    loadControl.onTracksSelected(renderers, trackGroups, trackSelectorResult.selections);
-  }
-
   private void updateTrackSelectionPlaybackSpeed(float playbackSpeed) {
     MediaPeriodHolder periodHolder = queue.getFrontPeriod();
     while (periodHolder != null) {
@@ -1278,7 +1270,7 @@ import java.util.Collections;
     if (!queue.updateQueuedPeriods(playingPeriodId, rendererPositionUs)) {
       seekToCurrentPosition(/* sendDiscontinuity= */ false);
     }
-    updateLoadingMediaPeriodId();
+    handleLoadingMediaPeriodChanged(/* loadingTrackSelectionChanged= */ false);
   }
 
   private void handleSourceInfoRefreshEndedPlayback() {
@@ -1528,7 +1520,7 @@ import java.util.Collections;
                 info);
         mediaPeriod.prepare(this, info.startPositionUs);
         setIsLoading(true);
-        updateLoadingMediaPeriodId();
+        handleLoadingMediaPeriodChanged(/* loadingTrackSelectionChanged= */ false);
       }
     }
   }
@@ -1666,14 +1658,28 @@ import java.util.Collections;
         && renderer.hasReadStreamToEnd();
   }
 
-  private void updateLoadingMediaPeriodId() {
+  private void handleLoadingMediaPeriodChanged(boolean loadingTrackSelectionChanged) {
     MediaPeriodHolder loadingMediaPeriodHolder = queue.getLoadingPeriod();
     MediaPeriodId loadingMediaPeriodId =
         loadingMediaPeriodHolder == null ? playbackInfo.periodId : loadingMediaPeriodHolder.info.id;
-    playbackInfo = playbackInfo.copyWithLoadingMediaPeriodId(loadingMediaPeriodId);
+    boolean loadingMediaPeriodChanged =
+        !playbackInfo.loadingMediaPeriodId.equals(loadingMediaPeriodId);
+    if (loadingMediaPeriodChanged) {
+      playbackInfo = playbackInfo.copyWithLoadingMediaPeriodId(loadingMediaPeriodId);
+    }
+    if ((loadingMediaPeriodChanged || loadingTrackSelectionChanged)
+        && loadingMediaPeriodHolder != null
+        && loadingMediaPeriodHolder.prepared) {
+      updateLoadControlTrackSelection(
+          loadingMediaPeriodHolder.trackGroups, loadingMediaPeriodHolder.trackSelectorResult);
+    }
+  }
+
+  private void updateLoadControlTrackSelection(
+      TrackGroupArray trackGroups, TrackSelectorResult trackSelectorResult) {
+    loadControl.onTracksSelected(renderers, trackGroups, trackSelectorResult.selections);
   }
 
-  @NonNull
   private static Format[] getFormats(TrackSelection newSelection) {
     // Build an array of formats contained by the selection.
     int length = newSelection != null ? newSelection.length() : 0;

From 876080ed1a70762d06ab97fbafda7ac7575487bc Mon Sep 17 00:00:00 2001
From: Arnold Szabo <szaboaarnold@gmail.com>
Date: Fri, 21 Sep 2018 15:05:43 +0300
Subject: [PATCH 014/832] #4306 - code review fixes

---
 .../exoplayer2/text/subrip/SubripDecoder.java | 101 ++++++------------
 1 file changed, 33 insertions(+), 68 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
index 96c065973e..492eb60bfc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
@@ -29,7 +29,6 @@ import com.google.android.exoplayer2.util.ParsableByteArray;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -81,6 +80,7 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
   @Override
   protected SubripSubtitle decode(byte[] bytes, int length, boolean reset) {
     ArrayList<Cue> cues = new ArrayList<>();
+    ArrayList<String> tags = new ArrayList<>();
     LongArray cueTimesUs = new LongArray();
     ParsableByteArray subripData = new ParsableByteArray(bytes, length);
     String currentLine;
@@ -125,34 +125,25 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
         if (textBuilder.length() > 0) {
           textBuilder.append("<br>");
         }
-        textBuilder.append(currentLine.trim());
+        textBuilder.append(processLine(currentLine, tags));
       }
 
-      // Extract tags
-      SubtitleTagResult tagResult = extractTags(textBuilder);
-      Spanned text = Html.fromHtml(tagResult.cue);
-
+      Spanned text = Html.fromHtml(textBuilder.toString());
       Cue cue = null;
 
-      // Check if tags are present
-      if (tagResult.tags.length > 0) {
+      boolean alignTagFound = false;
 
-        boolean alignTagFound = false;
+      // At end of this loop the clue must be created with the applied tags
+      for (String tag : tags) {
 
-        // At end of this loop the clue must be created with the applied tags
-        for (String tag : tagResult.tags) {
+        // Check if the tag is an alignment tag
+        if (tag.matches(SUBRIP_ALIGNMENT_TAG)) {
 
-          // Check if the tag is an alignment tag
-          if (tag.matches(SUBRIP_ALIGNMENT_TAG)) {
+          // Based on the specs, in case of the alignment tags only the first appearance counts
+          if (alignTagFound) continue;
+          alignTagFound = true;
 
-            // Based on the specs, in case of the alignment tags only the first appearance counts
-            if (alignTagFound) continue;
-            alignTagFound = true;
-
-            AlignmentResult alignmentResult = getAlignmentValues(tag);
-            cue = new Cue(text, Layout.Alignment.ALIGN_NORMAL, alignmentResult.line, Cue.LINE_TYPE_FRACTION,
-                alignmentResult.lineAnchor, alignmentResult.position, alignmentResult.positionAnchor, Cue.DIMEN_UNSET);
-          }
+          cue = buildCue(text, tag);
         }
       }
 
@@ -170,51 +161,57 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
   }
 
   /**
-   * Extracts the tags from the given {@code cue}
+   * Process the given line by first trimming it then extracting the tags from it
+   * <p>
    * The pattern that is used to extract the tags is specified in SSA v4+ specs and
    * has the following form: "{\...}".
    * <p>
    * "All override codes appear within braces {}"
    * "All override codes are always preceded by a backslash \"
    *
-   * @param cue Cue text
-   * @return {@link SubtitleTagResult} that holds new cue and also the extracted tags
+   * @param currentLine Current line
+   * @param tags        Extracted tags will be stored in this array list
+   * @return Processed line
    */
-  private SubtitleTagResult extractTags(StringBuilder cue) {
-    StringBuilder cueCopy = new StringBuilder(cue.toString());
-    List<String> tags = new ArrayList<>();
+  private String processLine(String currentLine, ArrayList<String> tags) {
+    // Trim line
+    String trimmedLine = currentLine.trim();
 
+    // Extract tags
     int replacedCharacters = 0;
+    StringBuilder processedLine = new StringBuilder(trimmedLine);
+    Matcher matcher = SUBRIP_TAG_PATTERN.matcher(processedLine);
 
-    Matcher matcher = SUBRIP_TAG_PATTERN.matcher(cue.toString());
     while (matcher.find()) {
       String tag = matcher.group();
       tags.add(tag);
-      cueCopy.replace(matcher.start() - replacedCharacters, matcher.end() - replacedCharacters, "");
+      processedLine.replace(matcher.start() - replacedCharacters, matcher.end() - replacedCharacters, "");
       replacedCharacters += tag.length();
     }
 
-    return new SubtitleTagResult(tags.toArray(new String[tags.size()]), cueCopy.toString());
+    return processedLine.toString();
   }
 
   /**
+   * Build a {@link Cue} based on the given text and tag
+   * <p>
    * Match the alignment tag and calculate the line, position, position anchor accordingly
-   *
+   * <p>
    * Based on SSA v4+ specs the alignment tag can have the following form: {\an[1-9},
    * where the number specifies the direction (based on the numpad layout).
    * Note. older SSA scripts may contain tags like {\a1[1-9]} but these are based on
    * other direction rules, but multiple sources says that these are deprecated, so no support here either
    *
-   * @param tag Alignment tag
-   * @return {@link AlignmentResult} that holds the line, position, position anchor values
+   * @param alignmentTag Alignment tag
+   * @return Built cue
    */
-  private AlignmentResult getAlignmentValues(String tag) {
+  private Cue buildCue(Spanned text, String alignmentTag) {
     // Default values used for positioning the subtitle in case of align tags
     float line = DEFAULT_END_FRACTION, position = DEFAULT_MID_FRACTION;
     @Cue.AnchorType int positionAnchor = Cue.ANCHOR_TYPE_MIDDLE;
     @Cue.AnchorType int lineAnchor = Cue.ANCHOR_TYPE_END;
 
-    switch (tag) {
+    switch (alignmentTag) {
       case ALIGN_BOTTOM_LEFT:
         line = DEFAULT_END_FRACTION;
         position = DEFAULT_START_FRACTION;
@@ -271,7 +268,7 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
         break;
     }
 
-    return new AlignmentResult(positionAnchor, position, lineAnchor, line);
+    return new Cue(text, Layout.Alignment.ALIGN_NORMAL, line, Cue.LINE_TYPE_FRACTION, lineAnchor, position, positionAnchor, Cue.DIMEN_UNSET);
   }
 
   private static long parseTimecode(Matcher matcher, int groupOffset) {
@@ -281,36 +278,4 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
     timestampMs += Long.parseLong(matcher.group(groupOffset + 4));
     return timestampMs * 1000;
   }
-
-  /**
-   * Class that holds the tags, new clue after the tag extraction
-   */
-  private static final class SubtitleTagResult {
-    public final String[] tags;
-    public final String cue;
-
-    public SubtitleTagResult(String[] tags, String cue) {
-      this.tags = tags;
-      this.cue = cue;
-    }
-  }
-
-  /**
-   * Class that holds the parsed and mapped alignment values (such as line,
-   * position and anchor type of line)
-   */
-  private static final class AlignmentResult {
-
-    public @Cue.AnchorType int positionAnchor;
-    public @Cue.AnchorType int lineAnchor;
-    public float position, line;
-
-    public AlignmentResult(@Cue.AnchorType int positionAnchor, float position, @Cue.AnchorType int lineAnchor, float line) {
-      this.positionAnchor = positionAnchor;
-      this.position = position;
-      this.line = line;
-      this.lineAnchor = lineAnchor;
-    }
-  }
-
 }

From 275cfd9e772aedf6d8f6db2130628c482fe42ea4 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 21 Sep 2018 06:49:26 -0700
Subject: [PATCH 015/832] Fix broken Javadoc

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=213979058
---
 .../com/google/android/exoplayer2/Player.java    |  6 +++---
 .../com/google/android/exoplayer2/util/Log.java  | 16 ++++++++--------
 .../exoplayer2/video/spherical/Projection.java   |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Player.java b/library/core/src/main/java/com/google/android/exoplayer2/Player.java
index a120ab1305..d4b965dbd6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Player.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Player.java
@@ -144,13 +144,13 @@ public interface Player {
   interface VideoComponent {
 
     /**
-     * Sets the {@link @VideoScalingMode}.
+     * Sets the {@link VideoScalingMode}.
      *
-     * @param videoScalingMode The {@link @VideoScalingMode}.
+     * @param videoScalingMode The {@link VideoScalingMode}.
      */
     void setVideoScalingMode(@VideoScalingMode int videoScalingMode);
 
-    /** Returns the {@link @VideoScalingMode}. */
+    /** Returns the {@link VideoScalingMode}. */
     @VideoScalingMode
     int getVideoScalingMode();
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Log.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Log.java
index f2dd54af12..6a1e686dec 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/Log.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Log.java
@@ -75,14 +75,14 @@ public final class Log {
     Log.logStackTraces = logStackTraces;
   }
 
-  /** @see android.util.Log#d(String, String). */
+  /** @see android.util.Log#d(String, String) */
   public static void d(String tag, String message) {
     if (logLevel == LOG_LEVEL_ALL) {
       android.util.Log.d(tag, message);
     }
   }
 
-  /** @see android.util.Log#d(String, String, Throwable). */
+  /** @see android.util.Log#d(String, String, Throwable) */
   public static void d(String tag, String message, @Nullable Throwable throwable) {
     if (!logStackTraces) {
       d(tag, appendThrowableMessage(message, throwable));
@@ -92,14 +92,14 @@ public final class Log {
     }
   }
 
-  /** @see android.util.Log#i(String, String). */
+  /** @see android.util.Log#i(String, String) */
   public static void i(String tag, String message) {
     if (logLevel <= LOG_LEVEL_INFO) {
       android.util.Log.i(tag, message);
     }
   }
 
-  /** @see android.util.Log#i(String, String, Throwable). */
+  /** @see android.util.Log#i(String, String, Throwable) */
   public static void i(String tag, String message, @Nullable Throwable throwable) {
     if (!logStackTraces) {
       i(tag, appendThrowableMessage(message, throwable));
@@ -109,14 +109,14 @@ public final class Log {
     }
   }
 
-  /** @see android.util.Log#w(String, String). */
+  /** @see android.util.Log#w(String, String) */
   public static void w(String tag, String message) {
     if (logLevel <= LOG_LEVEL_WARNING) {
       android.util.Log.w(tag, message);
     }
   }
 
-  /** @see android.util.Log#w(String, String, Throwable). */
+  /** @see android.util.Log#w(String, String, Throwable) */
   public static void w(String tag, String message, @Nullable Throwable throwable) {
     if (!logStackTraces) {
       w(tag, appendThrowableMessage(message, throwable));
@@ -126,14 +126,14 @@ public final class Log {
     }
   }
 
-  /** @see android.util.Log#e(String, String). */
+  /** @see android.util.Log#e(String, String) */
   public static void e(String tag, String message) {
     if (logLevel <= LOG_LEVEL_ERROR) {
       android.util.Log.e(tag, message);
     }
   }
 
-  /** @see android.util.Log#e(String, String, Throwable). */
+  /** @see android.util.Log#e(String, String, Throwable) */
   public static void e(String tag, String message, @Nullable Throwable throwable) {
     if (!logStackTraces) {
       e(tag, appendThrowableMessage(message, throwable));
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/Projection.java b/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/Projection.java
index 3a585ccd64..0a9d04bf0f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/Projection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/Projection.java
@@ -59,9 +59,9 @@ public final class Projection {
   /**
    * Generates an equirectangular projection.
    *
-   * @param radius Size of the sphere. Must be > 0.
-   * @param latitudes Number of rows that make up the sphere. Must be >= 1.
-   * @param longitudes Number of columns that make up the sphere. Must be >= 1.
+   * @param radius Size of the sphere. Must be &gt; 0.
+   * @param latitudes Number of rows that make up the sphere. Must be &gt;= 1.
+   * @param longitudes Number of columns that make up the sphere. Must be &gt;= 1.
    * @param verticalFovDegrees Total latitudinal degrees that are covered by the sphere. Must be in
    *     (0, 180].
    * @param horizontalFovDegrees Total longitudinal degrees that are covered by the sphere.Must be

From 56f4717465d56de6bdb22f7526066d8c899c66be Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 24 Sep 2018 01:17:21 -0700
Subject: [PATCH 016/832] Update README for libvpx 1.7.0

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=214227045
---
 extensions/vp9/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/vp9/README.md b/extensions/vp9/README.md
index 9601829c91..306f04d0e2 100644
--- a/extensions/vp9/README.md
+++ b/extensions/vp9/README.md
@@ -49,7 +49,7 @@ git clone https://chromium.googlesource.com/libyuv/libyuv libyuv
 
 ```
 cd "${VP9_EXT_PATH}/jni/libvpx" && \
-git checkout tags/v1.6.1 -b v1.6.1 && \
+git checkout tags/v1.7.0 -b v1.7.0 && \
 cd "${VP9_EXT_PATH}/jni/libyuv" && \
 git checkout 996a2bbd
 ```

From 34c37596ddb2dc7d953fc3b9b1ed241cfd1930ec Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 24 Sep 2018 06:00:38 -0700
Subject: [PATCH 017/832] Allow configuration of DefaultLoadControl back buffer

Issue: #4857

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=214254231
---
 RELEASENOTES.md                               |  2 +
 .../exoplayer2/DefaultLoadControl.java        | 89 +++++++++++++++----
 2 files changed, 76 insertions(+), 15 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index ed1eff0233..97f3b29c3e 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -112,6 +112,8 @@
     ([#4791](https://github.com/google/ExoPlayer/issues/4791)).
 * MPEG-TS: Support CEA-608/708 in H262
   ([#2565](https://github.com/google/ExoPlayer/issues/2565)).
+* Allow configuration of the back buffer in `DefaultLoadControl.Builder`
+  ([#4857](https://github.com/google/ExoPlayer/issues/4857)).
 * Allow apps to pass a `CacheKeyFactory` for setting custom cache keys when
   creating a `CacheDataSource`.
 * Provide additional information for adaptive track selection.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java b/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
index c466815c79..97a56b844c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
@@ -52,14 +52,20 @@ public class DefaultLoadControl implements LoadControl {
   public static final int DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS = 5000;
 
   /**
-   * The default target buffer size in bytes. When set to {@link C#LENGTH_UNSET}, the load control
-   * automatically determines its target buffer size.
+   * The default target buffer size in bytes. The value ({@link C#LENGTH_UNSET}) means that the load
+   * control will calculate the target buffer size based on the selected tracks.
    */
   public static final int DEFAULT_TARGET_BUFFER_BYTES = C.LENGTH_UNSET;
 
   /** The default prioritization of buffer time constraints over size constraints. */
   public static final boolean DEFAULT_PRIORITIZE_TIME_OVER_SIZE_THRESHOLDS = true;
 
+  /** The default back buffer duration in milliseconds. */
+  public static final int DEFAULT_BACK_BUFFER_DURATION_MS = 0;
+
+  /** The default for whether the back buffer is retained from the previous keyframe. */
+  public static final boolean DEFAULT_RETAIN_BACK_BUFFER_FROM_KEYFRAME = false;
+
   /** Builder for {@link DefaultLoadControl}. */
   public static final class Builder {
 
@@ -71,6 +77,8 @@ public class DefaultLoadControl implements LoadControl {
     private int targetBufferBytes;
     private boolean prioritizeTimeOverSizeThresholds;
     private PriorityTaskManager priorityTaskManager;
+    private int backBufferDurationMs;
+    private boolean retainBackBufferFromKeyframe;
 
     /** Constructs a new instance. */
     public Builder() {
@@ -82,6 +90,8 @@ public class DefaultLoadControl implements LoadControl {
       targetBufferBytes = DEFAULT_TARGET_BUFFER_BYTES;
       prioritizeTimeOverSizeThresholds = DEFAULT_PRIORITIZE_TIME_OVER_SIZE_THRESHOLDS;
       priorityTaskManager = null;
+      backBufferDurationMs = DEFAULT_BACK_BUFFER_DURATION_MS;
+      retainBackBufferFromKeyframe = DEFAULT_RETAIN_BACK_BUFFER_FROM_KEYFRAME;
     }
 
     /**
@@ -123,8 +133,7 @@ public class DefaultLoadControl implements LoadControl {
 
     /**
      * Sets the target buffer size in bytes. If set to {@link C#LENGTH_UNSET}, the target buffer
-     * size will be calculated using {@link #calculateTargetBufferSize(Renderer[],
-     * TrackSelectionArray)}.
+     * size will be calculated based on the selected tracks.
      *
      * @param targetBufferBytes The target buffer size in bytes.
      * @return This builder, for convenience.
@@ -147,14 +156,33 @@ public class DefaultLoadControl implements LoadControl {
       return this;
     }
 
-    /** Sets the {@link PriorityTaskManager} to use. */
+    /**
+     * Sets the {@link PriorityTaskManager} to use.
+     *
+     * @param priorityTaskManager The {@link PriorityTaskManager} to use.
+     * @return This builder, for convenience.
+     */
     public Builder setPriorityTaskManager(PriorityTaskManager priorityTaskManager) {
       this.priorityTaskManager = priorityTaskManager;
       return this;
     }
 
+    /**
+     * Sets the back buffer duration, and whether the back buffer is retained from the previous
+     * keyframe.
+     *
+     * @param backBufferDurationMs The back buffer duration in milliseconds.
+     * @param retainBackBufferFromKeyframe Whether the back buffer is retained from the previous
+     *     keyframe.
+     * @return This builder, for convenience.
+     */
+    public Builder setBackBuffer(int backBufferDurationMs, boolean retainBackBufferFromKeyframe) {
+      this.backBufferDurationMs = backBufferDurationMs;
+      this.retainBackBufferFromKeyframe = retainBackBufferFromKeyframe;
+      return this;
+    }
+
     /** Creates a {@link DefaultLoadControl}. */
-    @SuppressWarnings("deprecation")
     public DefaultLoadControl createDefaultLoadControl() {
       if (allocator == null) {
         allocator = new DefaultAllocator(true, C.DEFAULT_BUFFER_SEGMENT_SIZE);
@@ -167,7 +195,9 @@ public class DefaultLoadControl implements LoadControl {
           bufferForPlaybackAfterRebufferMs,
           targetBufferBytes,
           prioritizeTimeOverSizeThresholds,
-          priorityTaskManager);
+          priorityTaskManager,
+          backBufferDurationMs,
+          retainBackBufferFromKeyframe);
     }
   }
 
@@ -180,6 +210,8 @@ public class DefaultLoadControl implements LoadControl {
   private final int targetBufferBytesOverwrite;
   private final boolean prioritizeTimeOverSizeThresholds;
   private final PriorityTaskManager priorityTaskManager;
+  private final long backBufferDurationUs;
+  private final boolean retainBackBufferFromKeyframe;
 
   private int targetBufferSize;
   private boolean isBuffering;
@@ -223,7 +255,7 @@ public class DefaultLoadControl implements LoadControl {
         bufferForPlaybackAfterRebufferMs,
         targetBufferBytes,
         prioritizeTimeOverSizeThresholds,
-        null);
+        /* priorityTaskManager= */ null);
   }
 
   /** @deprecated Use {@link Builder} instead. */
@@ -237,6 +269,30 @@ public class DefaultLoadControl implements LoadControl {
       int targetBufferBytes,
       boolean prioritizeTimeOverSizeThresholds,
       PriorityTaskManager priorityTaskManager) {
+    this(
+        allocator,
+        minBufferMs,
+        maxBufferMs,
+        bufferForPlaybackMs,
+        bufferForPlaybackAfterRebufferMs,
+        targetBufferBytes,
+        prioritizeTimeOverSizeThresholds,
+        priorityTaskManager,
+        DEFAULT_BACK_BUFFER_DURATION_MS,
+        DEFAULT_RETAIN_BACK_BUFFER_FROM_KEYFRAME);
+  }
+
+  protected DefaultLoadControl(
+      DefaultAllocator allocator,
+      int minBufferMs,
+      int maxBufferMs,
+      int bufferForPlaybackMs,
+      int bufferForPlaybackAfterRebufferMs,
+      int targetBufferBytes,
+      boolean prioritizeTimeOverSizeThresholds,
+      PriorityTaskManager priorityTaskManager,
+      int backBufferDurationMs,
+      boolean retainBackBufferFromKeyframe) {
     assertGreaterOrEqual(bufferForPlaybackMs, 0, "bufferForPlaybackMs", "0");
     assertGreaterOrEqual(
         bufferForPlaybackAfterRebufferMs, 0, "bufferForPlaybackAfterRebufferMs", "0");
@@ -247,15 +303,18 @@ public class DefaultLoadControl implements LoadControl {
         "minBufferMs",
         "bufferForPlaybackAfterRebufferMs");
     assertGreaterOrEqual(maxBufferMs, minBufferMs, "maxBufferMs", "minBufferMs");
+    assertGreaterOrEqual(backBufferDurationMs, 0, "backBufferDurationMs", "0");
 
     this.allocator = allocator;
-    minBufferUs = minBufferMs * 1000L;
-    maxBufferUs = maxBufferMs * 1000L;
-    bufferForPlaybackUs = bufferForPlaybackMs * 1000L;
-    bufferForPlaybackAfterRebufferUs = bufferForPlaybackAfterRebufferMs * 1000L;
-    targetBufferBytesOverwrite = targetBufferBytes;
+    this.minBufferUs = C.msToUs(minBufferMs);
+    this.maxBufferUs = C.msToUs(maxBufferMs);
+    this.bufferForPlaybackUs = C.msToUs(bufferForPlaybackMs);
+    this.bufferForPlaybackAfterRebufferUs = C.msToUs(bufferForPlaybackAfterRebufferMs);
+    this.targetBufferBytesOverwrite = targetBufferBytes;
     this.prioritizeTimeOverSizeThresholds = prioritizeTimeOverSizeThresholds;
     this.priorityTaskManager = priorityTaskManager;
+    this.backBufferDurationUs = C.msToUs(backBufferDurationMs);
+    this.retainBackBufferFromKeyframe = retainBackBufferFromKeyframe;
   }
 
   @Override
@@ -290,12 +349,12 @@ public class DefaultLoadControl implements LoadControl {
 
   @Override
   public long getBackBufferDurationUs() {
-    return 0;
+    return backBufferDurationUs;
   }
 
   @Override
   public boolean retainBackBufferFromKeyframe() {
-    return false;
+    return retainBackBufferFromKeyframe;
   }
 
   @Override

From c934ce744dbc55ddd6dbde29037c441afde7671c Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 24 Sep 2018 06:34:12 -0700
Subject: [PATCH 018/832] Don't request session sharing on CDMs that don't
 support it

Issue: #4834

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=214258163
---
 RELEASENOTES.md                                             | 3 +++
 .../android/exoplayer2/drm/DefaultDrmSessionManager.java    | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 97f3b29c3e..55ad062859 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -145,6 +145,9 @@
   looping ([#3829](https://github.com/google/ExoPlayer/issues/3829)).
 * Fix issue where `player.getCurrentTag()` throws an `IndexOutOfBoundsException`
   ([#4822](https://github.com/google/ExoPlayer/issues/4822)).
+* Fix bug preventing use of multiple key session support (`multiSession=true`)
+  for non-Widevine `DefaultDrmSessionManager` instances
+  ([#4834](https://github.com/google/ExoPlayer/issues/4834)).
 * IMA extension:
   * Refine the previous fix for empty ad groups to avoid discarding ad breaks
     unnecessarily ([#4030](https://github.com/google/ExoPlayer/issues/4030) and
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
index 03269f0caa..460ee357ea 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
@@ -367,7 +367,11 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
     mode = MODE_PLAYBACK;
     sessions = new ArrayList<>();
     provisioningSessions = new ArrayList<>();
-    if (multiSession) {
+    if (multiSession && C.WIDEVINE_UUID.equals(uuid) && Util.SDK_INT >= 19) {
+      // TODO: Enabling session sharing probably doesn't do anything useful here. It would only be
+      // useful if DefaultDrmSession instances were aware of one another's state, which is not
+      // implemented. Or if custom renderers are being used that allow playback to proceed before
+      // keys, which seems unlikely to be true in practice.
       mediaDrm.setPropertyString("sessionSharing", "enable");
     }
     mediaDrm.setOnEventListener(new MediaDrmEventListener());

From e86d5efb2147c1f99074311ee3852cca307823ad Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Mon, 24 Sep 2018 07:09:26 -0700
Subject: [PATCH 019/832] Recenter SphericalSurfaceView view on startup

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=214261973
---
 .../video/spherical/FrameRotationQueue.java   |   7 +-
 .../exoplayer2/ui/spherical/GlUtil.java       |   4 +-
 .../ui/spherical/OrientationListener.java     | 126 ++++++++++++++++++
 .../ui/spherical/ProjectionRenderer.java      |   4 +-
 .../ui/spherical/SceneRenderer.java           |   2 +-
 .../ui/spherical/SphericalSurfaceView.java    |  88 ++----------
 .../exoplayer2/ui/spherical/TouchTracker.java |  11 +-
 7 files changed, 152 insertions(+), 90 deletions(-)
 create mode 100644 library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/OrientationListener.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/FrameRotationQueue.java b/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/FrameRotationQueue.java
index d7404cbce4..d464bf04fa 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/FrameRotationQueue.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/FrameRotationQueue.java
@@ -61,7 +61,7 @@ public final class FrameRotationQueue {
    * timestamp to {@code matrix}. Removes all older rotations and the returned one from the queue.
    * Does nothing if there is no such rotation.
    *
-   * @param matrix A float array to hold the rotation matrix.
+   * @param matrix The rotation matrix.
    * @param timestampUs The time in microseconds to query the rotation.
    * @return Whether a rotation matrix is copied to {@code matrix}.
    */
@@ -83,8 +83,11 @@ public final class FrameRotationQueue {
   /**
    * Computes a recentering matrix from the given angle-axis rotation only accounting for yaw. Roll
    * and tilt will not be compensated.
+   *
+   * @param recenterMatrix The recenter matrix.
+   * @param rotationMatrix The rotation matrix.
    */
-  private static void computeRecenterMatrix(float[] recenterMatrix, float[] rotationMatrix) {
+  public static void computeRecenterMatrix(float[] recenterMatrix, float[] rotationMatrix) {
     // The re-centering matrix is computed as follows:
     // recenter.row(2) = temp.col(2).transpose();
     // recenter.row(0) = recenter.row(1).cross(recenter.row(2)).normalized();
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/GlUtil.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/GlUtil.java
index 8fd5d64e1c..68a85938a3 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/GlUtil.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/GlUtil.java
@@ -30,7 +30,7 @@ import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 
 /** GL utility methods. */
-/*package*/ final class GlUtil {
+/* package */ final class GlUtil {
   private static final String TAG = "Spherical.Utils";
 
   /** Class only contains static methods. */
@@ -79,7 +79,9 @@ import java.nio.IntBuffer;
 
     int program = GLES20.glCreateProgram();
     GLES20.glAttachShader(program, vertexShader);
+    GLES20.glDeleteShader(vertexShader);
     GLES20.glAttachShader(program, fragmentShader);
+    GLES20.glDeleteShader(fragmentShader);
 
     // Link and check for errors.
     GLES20.glLinkProgram(program);
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/OrientationListener.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/OrientationListener.java
new file mode 100644
index 0000000000..2371f6f65c
--- /dev/null
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/OrientationListener.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.ui.spherical;
+
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.opengl.Matrix;
+import android.support.annotation.BinderThread;
+import android.view.Display;
+import android.view.Surface;
+import com.google.android.exoplayer2.video.spherical.FrameRotationQueue;
+
+/**
+ * Listens for orientation sensor events, converts event data to rotation matrix and roll value, and
+ * notifies its own listeners.
+ */
+/* package */ final class OrientationListener implements SensorEventListener {
+  /** A listener for orientation changes. */
+  public interface Listener {
+    /**
+     * Called on device orientation change.
+     *
+     * @param deviceOrientationMatrix A 4x4 matrix defining device orientation.
+     * @param deviceRoll Device roll value, in radians. The range of values is -&pi;/2 to &pi;/2.
+     */
+    void onOrientationChange(float[] deviceOrientationMatrix, float deviceRoll);
+  }
+
+  private final float[] deviceOrientationMatrix4x4 = new float[16];
+  private final float[] tempMatrix4x4 = new float[16];
+  private final float[] recenterMatrix4x4 = new float[16];
+  private final float[] angles = new float[3];
+  private final Display display;
+  private final Listener[] listeners;
+  private boolean recenterMatrixComputed;
+
+  public OrientationListener(Display display, Listener... listeners) {
+    this.display = display;
+    this.listeners = listeners;
+  }
+
+  @Override
+  @BinderThread
+  public void onSensorChanged(SensorEvent event) {
+    SensorManager.getRotationMatrixFromVector(deviceOrientationMatrix4x4, event.values);
+    rotateAroundZ(deviceOrientationMatrix4x4, display.getRotation());
+    float roll = extractRoll(deviceOrientationMatrix4x4);
+    // Rotation vector sensor assumes Y is parallel to the ground.
+    rotateYtoSky(deviceOrientationMatrix4x4);
+    recenter(deviceOrientationMatrix4x4);
+    notifyListeners(deviceOrientationMatrix4x4, roll);
+  }
+
+  @Override
+  public void onAccuracyChanged(Sensor sensor, int accuracy) {
+    // Do nothing.
+  }
+
+  private void notifyListeners(float[] deviceOrientationMatrix, float roll) {
+    for (Listener listener : listeners) {
+      listener.onOrientationChange(deviceOrientationMatrix, roll);
+    }
+  }
+
+  private void recenter(float[] matrix) {
+    if (!recenterMatrixComputed) {
+      FrameRotationQueue.computeRecenterMatrix(recenterMatrix4x4, matrix);
+      recenterMatrixComputed = true;
+    }
+    System.arraycopy(matrix, 0, tempMatrix4x4, 0, tempMatrix4x4.length);
+    Matrix.multiplyMM(matrix, 0, tempMatrix4x4, 0, recenterMatrix4x4, 0);
+  }
+
+  private float extractRoll(float[] matrix) {
+    // Remapping is required since we need the calculated roll of the phone to be independent of the
+    // phone's pitch & yaw.
+    SensorManager.remapCoordinateSystem(
+        matrix, SensorManager.AXIS_X, SensorManager.AXIS_MINUS_Z, tempMatrix4x4);
+    SensorManager.getOrientation(tempMatrix4x4, angles);
+    return angles[2];
+  }
+
+  private void rotateAroundZ(float[] matrix, int rotation) {
+    int xAxis;
+    int yAxis;
+    switch (rotation) {
+      case Surface.ROTATION_270:
+        xAxis = SensorManager.AXIS_MINUS_Y;
+        yAxis = SensorManager.AXIS_X;
+        break;
+      case Surface.ROTATION_180:
+        xAxis = SensorManager.AXIS_MINUS_X;
+        yAxis = SensorManager.AXIS_MINUS_Y;
+        break;
+      case Surface.ROTATION_90:
+        xAxis = SensorManager.AXIS_Y;
+        yAxis = SensorManager.AXIS_MINUS_X;
+        break;
+      case Surface.ROTATION_0:
+        return;
+      default:
+        throw new IllegalStateException();
+    }
+    System.arraycopy(matrix, 0, tempMatrix4x4, 0, tempMatrix4x4.length);
+    SensorManager.remapCoordinateSystem(tempMatrix4x4, xAxis, yAxis, matrix);
+  }
+
+  private static void rotateYtoSky(float[] matrix) {
+    Matrix.rotateM(matrix, 0, 90, 1, 0, 0);
+  }
+}
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/ProjectionRenderer.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/ProjectionRenderer.java
index a52a25d085..b0760ec2bd 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/ProjectionRenderer.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/ProjectionRenderer.java
@@ -30,10 +30,10 @@ import org.checkerframework.checker.nullness.qual.Nullable;
  * thread when ready.
  */
 @TargetApi(15)
-/*package*/ final class ProjectionRenderer {
+/* package */ final class ProjectionRenderer {
 
   /** Defines the constants identifying the current eye type. */
-  /*package*/ interface EyeType {
+  /* package */ interface EyeType {
     /** Single eye in monocular rendering. */
     int MONOCULAR = 0;
 
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java
index a8d4abcf07..ff3641135c 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java
@@ -36,7 +36,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 /** Renders a GL Scene. */
-/*package*/ class SceneRenderer implements VideoFrameMetadataListener, CameraMotionListener {
+/* package */ class SceneRenderer implements VideoFrameMetadataListener, CameraMotionListener {
 
   private final AtomicBoolean frameAvailable;
   private final AtomicBoolean resetRotationAtNextFrame;
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java
index c6ddb8148b..9139137af4 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java
@@ -20,8 +20,6 @@ import android.content.Context;
 import android.graphics.PointF;
 import android.graphics.SurfaceTexture;
 import android.hardware.Sensor;
-import android.hardware.SensorEvent;
-import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.opengl.GLES20;
 import android.opengl.GLSurfaceView;
@@ -79,11 +77,11 @@ public final class SphericalSurfaceView extends GLSurfaceView {
   // TODO Calculate this depending on surface size and field of view.
   private static final float PX_PER_DEGREES = 25;
 
-  /*package*/ static final float UPRIGHT_ROLL = (float) Math.PI;
+  /* package */ static final float UPRIGHT_ROLL = (float) Math.PI;
 
   private final SensorManager sensorManager;
   private final @Nullable Sensor orientationSensor;
-  private final PhoneOrientationListener phoneOrientationListener;
+  private final OrientationListener orientationListener;
   private final Renderer renderer;
   private final Handler mainHandler;
   private final TouchTracker touchTracker;
@@ -117,7 +115,7 @@ public final class SphericalSurfaceView extends GLSurfaceView {
     touchTracker = new TouchTracker(context, renderer, PX_PER_DEGREES);
     WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
     Display display = Assertions.checkNotNull(windowManager).getDefaultDisplay();
-    phoneOrientationListener = new PhoneOrientationListener(display, touchTracker, renderer);
+    orientationListener = new OrientationListener(display, touchTracker, renderer);
 
     setEGLContextClientVersion(2);
     setRenderer(renderer);
@@ -173,14 +171,14 @@ public final class SphericalSurfaceView extends GLSurfaceView {
     super.onResume();
     if (orientationSensor != null) {
       sensorManager.registerListener(
-          phoneOrientationListener, orientationSensor, SensorManager.SENSOR_DELAY_FASTEST);
+          orientationListener, orientationSensor, SensorManager.SENSOR_DELAY_FASTEST);
     }
   }
 
   @Override
   public void onPause() {
     if (orientationSensor != null) {
-      sensorManager.unregisterListener(phoneOrientationListener);
+      sensorManager.unregisterListener(orientationListener);
     }
     super.onPause();
   }
@@ -229,82 +227,13 @@ public final class SphericalSurfaceView extends GLSurfaceView {
     }
   }
 
-  /** Detects sensor events and saves them as a matrix. */
-  private static class PhoneOrientationListener implements SensorEventListener {
-    private final float[] phoneInWorldSpaceMatrix = new float[16];
-    private final float[] remappedPhoneMatrix = new float[16];
-    private final float[] angles = new float[3];
-    private final Display display;
-    private final TouchTracker touchTracker;
-    private final Renderer renderer;
-
-    public PhoneOrientationListener(Display display, TouchTracker touchTracker, Renderer renderer) {
-      this.display = display;
-      this.touchTracker = touchTracker;
-      this.renderer = renderer;
-    }
-
-    @Override
-    @BinderThread
-    public void onSensorChanged(SensorEvent event) {
-      SensorManager.getRotationMatrixFromVector(remappedPhoneMatrix, event.values);
-
-      // If we're not in upright portrait mode, remap the axes of the coordinate system according to
-      // the display rotation.
-      int xAxis;
-      int yAxis;
-      switch (display.getRotation()) {
-        case Surface.ROTATION_270:
-          xAxis = SensorManager.AXIS_MINUS_Y;
-          yAxis = SensorManager.AXIS_X;
-          break;
-        case Surface.ROTATION_180:
-          xAxis = SensorManager.AXIS_MINUS_X;
-          yAxis = SensorManager.AXIS_MINUS_Y;
-          break;
-        case Surface.ROTATION_90:
-          xAxis = SensorManager.AXIS_Y;
-          yAxis = SensorManager.AXIS_MINUS_X;
-          break;
-        case Surface.ROTATION_0:
-        default:
-          xAxis = SensorManager.AXIS_X;
-          yAxis = SensorManager.AXIS_Y;
-          break;
-      }
-      SensorManager.remapCoordinateSystem(
-          remappedPhoneMatrix, xAxis, yAxis, phoneInWorldSpaceMatrix);
-
-      // Extract the phone's roll and pass it on to touchTracker & renderer. Remapping is required
-      // since we need the calculated roll of the phone to be independent of the phone's pitch &
-      // yaw. Any operation that decomposes rotation to Euler angles needs to be performed
-      // carefully.
-      SensorManager.remapCoordinateSystem(
-          phoneInWorldSpaceMatrix,
-          SensorManager.AXIS_X,
-          SensorManager.AXIS_MINUS_Z,
-          remappedPhoneMatrix);
-      SensorManager.getOrientation(remappedPhoneMatrix, angles);
-      float roll = angles[2];
-      touchTracker.setRoll(roll);
-
-      // Rotate from Android coordinates to OpenGL coordinates. Android's coordinate system
-      // assumes Y points North and Z points to the sky. OpenGL has Y pointing up and Z pointing
-      // toward the user.
-      Matrix.rotateM(phoneInWorldSpaceMatrix, 0, 90, 1, 0, 0);
-      renderer.setDeviceOrientation(phoneInWorldSpaceMatrix, roll);
-    }
-
-    @Override
-    public void onAccuracyChanged(Sensor sensor, int accuracy) {}
-  }
-
   /**
    * Standard GL Renderer implementation. The notable code is the matrix multiplication in
    * onDrawFrame and updatePitchMatrix.
    */
   // @VisibleForTesting
-  /*package*/ class Renderer implements GLSurfaceView.Renderer, TouchTracker.Listener {
+  /* package */ class Renderer
+      implements GLSurfaceView.Renderer, TouchTracker.Listener, OrientationListener.Listener {
     private final SceneRenderer scene;
     private final float[] projectionMatrix = new float[16];
 
@@ -362,8 +291,9 @@ public final class SphericalSurfaceView extends GLSurfaceView {
     }
 
     /** Adjusts the GL camera's rotation based on device rotation. Runs on the sensor thread. */
+    @Override
     @BinderThread
-    public synchronized void setDeviceOrientation(float[] matrix, float deviceRoll) {
+    public synchronized void onOrientationChange(float[] matrix, float deviceRoll) {
       System.arraycopy(matrix, 0, deviceOrientationMatrix, 0, deviceOrientationMatrix.length);
       this.deviceRoll = -deviceRoll;
       updatePitchMatrix();
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/TouchTracker.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/TouchTracker.java
index 335f611b58..2da913fc32 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/TouchTracker.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/TouchTracker.java
@@ -45,16 +45,16 @@ import android.view.View;
  * Mesh as the user moves their finger. However, that requires quaternion interpolation.
  */
 // @VisibleForTesting
-/*package*/ class TouchTracker extends GestureDetector.SimpleOnGestureListener
-    implements View.OnTouchListener {
+/* package */ class TouchTracker extends GestureDetector.SimpleOnGestureListener
+    implements View.OnTouchListener, OrientationListener.Listener {
 
-  /*package*/ interface Listener {
+  /* package */ interface Listener {
     void onScrollChange(PointF scrollOffsetDegrees);
   }
 
   // Touch input won't change the pitch beyond +/- 45 degrees. This reduces awkward situations
   // where the touch-based pitch and gyro-based pitch interact badly near the poles.
-  /*package*/ static final float MAX_PITCH_DEGREES = 45;
+  /* package */ static final float MAX_PITCH_DEGREES = 45;
 
   // With every touch event, update the accumulated degrees offset by the new pixel amount.
   private final PointF previousTouchPointPx = new PointF();
@@ -132,8 +132,9 @@ import android.view.View;
     return false;
   }
 
+  @Override
   @BinderThread
-  public void setRoll(float roll) {
+  public void onOrientationChange(float[] deviceOrientationMatrix, float roll) {
     // We compensate for roll by rotating in the opposite direction.
     this.roll = -roll;
   }

From 083350b7dbae4569a1c2a5838715b968929c3510 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Mon, 24 Sep 2018 09:15:41 -0700
Subject: [PATCH 020/832] Do not retry failed loads whose error is
 FileNotFoundException

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=214277073
---
 RELEASENOTES.md                                          | 1 +
 .../upstream/DefaultLoadErrorHandlingPolicy.java         | 8 +++++---
 .../upstream/DefaultLoadErrorHandlingPolicyTest.java     | 9 ++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 55ad062859..032596a425 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,6 +2,7 @@
 
 ### dev-v2 (not yet released) ###
 
+* Do not retry failed loads whose error is `FileNotFoundException`.
 * Allow setting log level for ExoPlayer logcat output
   ([#4665](https://github.com/google/ExoPlayer/issues/4665)).
 * Fix an issue where audio and video would desynchronize when playing
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicy.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicy.java
index 4eec495cab..8d8f156951 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicy.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicy.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.upstream;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.upstream.HttpDataSource.InvalidResponseCodeException;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 
 /** Default implementation of {@link LoadErrorHandlingPolicy}. */
@@ -76,13 +77,14 @@ public final class DefaultLoadErrorHandlingPolicy implements LoadErrorHandlingPo
   }
 
   /**
-   * Retries for any exception that is not a subclass of {@link ParserException}. The retry delay is
-   * calculated as {@code Math.min((errorCount - 1) * 1000, 5000)}.
+   * Retries for any exception that is not a subclass of {@link ParserException} or {@link
+   * FileNotFoundException}. The retry delay is calculated as {@code Math.min((errorCount - 1) *
+   * 1000, 5000)}.
    */
   @Override
   public long getRetryDelayMsFor(
       int dataType, long loadDurationMs, IOException exception, int errorCount) {
-    return exception instanceof ParserException
+    return exception instanceof ParserException || exception instanceof FileNotFoundException
         ? C.TIME_UNSET
         : Math.min((errorCount - 1) * 1000, 5000);
   }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicyTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicyTest.java
index e1700e3b20..0c2b938a64 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicyTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicyTest.java
@@ -21,7 +21,6 @@ import android.net.Uri;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.upstream.HttpDataSource.InvalidResponseCodeException;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Collections;
 import org.junit.Test;
@@ -57,7 +56,7 @@ public final class DefaultLoadErrorHandlingPolicyTest {
 
   @Test
   public void getBlacklistDurationMsFor_dontBlacklistUnexpectedExceptions() {
-    FileNotFoundException exception = new FileNotFoundException();
+    IOException exception = new IOException();
     assertThat(getDefaultPolicyBlacklistOutputFor(exception)).isEqualTo(C.TIME_UNSET);
   }
 
@@ -69,9 +68,9 @@ public final class DefaultLoadErrorHandlingPolicyTest {
 
   @Test
   public void getRetryDelayMsFor_successiveRetryDelays() {
-    assertThat(getDefaultPolicyRetryDelayOutputFor(new FileNotFoundException(), 3)).isEqualTo(2000);
-    assertThat(getDefaultPolicyRetryDelayOutputFor(new FileNotFoundException(), 5)).isEqualTo(4000);
-    assertThat(getDefaultPolicyRetryDelayOutputFor(new FileNotFoundException(), 9)).isEqualTo(5000);
+    assertThat(getDefaultPolicyRetryDelayOutputFor(new IOException(), 3)).isEqualTo(2000);
+    assertThat(getDefaultPolicyRetryDelayOutputFor(new IOException(), 5)).isEqualTo(4000);
+    assertThat(getDefaultPolicyRetryDelayOutputFor(new IOException(), 9)).isEqualTo(5000);
   }
 
   private static long getDefaultPolicyBlacklistOutputFor(IOException exception) {

From b2e0a365d35feb5e5edb6439293f056ab022432c Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 26 Sep 2018 03:27:52 -0700
Subject: [PATCH 021/832] Add convenience methods player.next() and
 player.previous()

This simplifies code skipping items in a playlist programatically.

Issue:#4863

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=214580742
---
 RELEASENOTES.md                               |  3 ++
 .../exoplayer2/ext/cast/CastPlayer.java       | 26 ++++++++++++++++
 .../android/exoplayer2/ExoPlayerImpl.java     | 26 ++++++++++++++++
 .../com/google/android/exoplayer2/Player.java | 26 ++++++++++++++++
 .../android/exoplayer2/SimpleExoPlayer.java   | 30 +++++++++++++++++++
 .../exoplayer2/testutil/StubExoPlayer.java    | 20 +++++++++++++
 6 files changed, 131 insertions(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 032596a425..bcf05590bf 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -8,6 +8,9 @@
 * Fix an issue where audio and video would desynchronize when playing
   concatenations of gapless content
   ([#4559](https://github.com/google/ExoPlayer/issues/4559)).
+* Add convenience methods `Player.next`, `Player.previous`, `Player.hasNext`
+  and `Player.hasPrevious`
+  ([#4863](https://github.com/google/ExoPlayer/issues/4863)).
 
 ### 2.9.0 ###
 
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
index 97b05e3f0a..f630ea1628 100644
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
@@ -382,6 +382,32 @@ public final class CastPlayer implements Player {
     }
   }
 
+  @Override
+  public boolean hasPrevious() {
+    return getPreviousWindowIndex() != C.INDEX_UNSET;
+  }
+
+  @Override
+  public void previous() {
+    int previousWindowIndex = getPreviousWindowIndex();
+    if (previousWindowIndex != C.INDEX_UNSET) {
+      seekToDefaultPosition(previousWindowIndex);
+    }
+  }
+
+  @Override
+  public boolean hasNext() {
+    return getNextWindowIndex() != C.INDEX_UNSET;
+  }
+
+  @Override
+  public void next() {
+    int nextWindowIndex = getPreviousWindowIndex();
+    if (nextWindowIndex != C.INDEX_UNSET) {
+      seekToDefaultPosition(nextWindowIndex);
+    }
+  }
+
   @Override
   public void setPlaybackParameters(@Nullable PlaybackParameters playbackParameters) {
     // Unsupported by the RemoteMediaClient API. Do nothing.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index 027f316493..83854ffca9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -348,6 +348,32 @@ import java.util.concurrent.CopyOnWriteArraySet;
     }
   }
 
+  @Override
+  public boolean hasPrevious() {
+    return getPreviousWindowIndex() != C.INDEX_UNSET;
+  }
+
+  @Override
+  public void previous() {
+    int previousWindowIndex = getPreviousWindowIndex();
+    if (previousWindowIndex != C.INDEX_UNSET) {
+      seekToDefaultPosition(previousWindowIndex);
+    }
+  }
+
+  @Override
+  public boolean hasNext() {
+    return getNextWindowIndex() != C.INDEX_UNSET;
+  }
+
+  @Override
+  public void next() {
+    int nextWindowIndex = getPreviousWindowIndex();
+    if (nextWindowIndex != C.INDEX_UNSET) {
+      seekToDefaultPosition(nextWindowIndex);
+    }
+  }
+
   @Override
   public void setPlaybackParameters(@Nullable PlaybackParameters playbackParameters) {
     if (playbackParameters == null) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Player.java b/library/core/src/main/java/com/google/android/exoplayer2/Player.java
index d4b965dbd6..3640928c54 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Player.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Player.java
@@ -655,6 +655,32 @@ public interface Player {
    */
   void seekTo(int windowIndex, long positionMs);
 
+  /**
+   * Returns whether a previous window exists, which may depend on the current repeat mode and
+   * whether shuffle mode is enabled.
+   */
+  boolean hasPrevious();
+
+  /**
+   * Seeks to the default position of the previous window in the timeline, which may depend on the
+   * current repeat mode and whether shuffle mode is enabled. Does nothing if {@link #hasPrevious()}
+   * is {@code false}.
+   */
+  void previous();
+
+  /**
+   * Returns whether a next window exists, which may depend on the current repeat mode and whether
+   * shuffle mode is enabled.
+   */
+  boolean hasNext();
+
+  /**
+   * Seeks to the default position of the next window in the timeline, which may depend on the
+   * current repeat mode and whether shuffle mode is enabled. Does nothing if {@link #hasNext()} is
+   * {@code false}.
+   */
+  void next();
+
   /**
    * Attempts to set the playback parameters. Passing {@code null} sets the parameters to the
    * default, {@link PlaybackParameters#DEFAULT}, which means there is no speed or pitch adjustment.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index 39f1655ab5..7e5feec024 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -955,6 +955,36 @@ public class SimpleExoPlayer
     player.seekTo(windowIndex, positionMs);
   }
 
+  @Override
+  public boolean hasPrevious() {
+    verifyApplicationThread();
+    return getPreviousWindowIndex() != C.INDEX_UNSET;
+  }
+
+  @Override
+  public void previous() {
+    verifyApplicationThread();
+    if (hasPrevious()) {
+      analyticsCollector.notifySeekStarted();
+      player.previous();
+    }
+  }
+
+  @Override
+  public boolean hasNext() {
+    verifyApplicationThread();
+    return getNextWindowIndex() != C.INDEX_UNSET;
+  }
+
+  @Override
+  public void next() {
+    verifyApplicationThread();
+    if (hasNext()) {
+      analyticsCollector.notifySeekStarted();
+      player.next();
+    }
+  }
+
   @Override
   public void setPlaybackParameters(@Nullable PlaybackParameters playbackParameters) {
     verifyApplicationThread();
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
index f1349c1158..7882c7d16c 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
@@ -149,6 +149,26 @@ public abstract class StubExoPlayer implements ExoPlayer {
     throw new UnsupportedOperationException();
   }
 
+  @Override
+  public boolean hasPrevious() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public void previous() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public boolean hasNext() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public void next() {
+    throw new UnsupportedOperationException();
+  }
+
   @Override
   public void setPlaybackParameters(PlaybackParameters playbackParameters) {
     throw new UnsupportedOperationException();

From c9ebaacae01d1e2afbb95850e4f8f0d6791243a1 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 26 Sep 2018 03:47:54 -0700
Subject: [PATCH 022/832] Use GlUtil class to share GL methods

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=214582295
---
 .../exoplayer2/ext/vp9/VpxRenderer.java       | 81 +++--------------
 .../exoplayer2/util/EGLSurfaceTexture.java    |  5 +-
 .../android/exoplayer2/util}/GlUtil.java      | 86 +++++++++++--------
 .../ui/spherical/ProjectionRenderer.java      |  3 +-
 .../ui/spherical/SceneRenderer.java           |  3 +-
 5 files changed, 68 insertions(+), 110 deletions(-)
 rename library/{ui/src/main/java/com/google/android/exoplayer2/ui/spherical => core/src/main/java/com/google/android/exoplayer2/util}/GlUtil.java (63%)

diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxRenderer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxRenderer.java
index 837539593e..d82f5a6071 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxRenderer.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxRenderer.java
@@ -17,8 +17,7 @@ package com.google.android.exoplayer2.ext.vp9;
 
 import android.opengl.GLES20;
 import android.opengl.GLSurfaceView;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
+import com.google.android.exoplayer2.util.GlUtil;
 import java.nio.FloatBuffer;
 import java.util.concurrent.atomic.AtomicReference;
 import javax.microedition.khronos.egl.EGLConfig;
@@ -72,11 +71,8 @@ import javax.microedition.khronos.opengles.GL10;
       + "  gl_FragColor = vec4(mColorConversion * yuv, 1.0);\n"
       + "}\n";
 
-  private static final FloatBuffer TEXTURE_VERTICES = nativeFloatBuffer(
-      -1.0f, 1.0f,
-      -1.0f, -1.0f,
-      1.0f, 1.0f,
-      1.0f, -1.0f);
+  private static final FloatBuffer TEXTURE_VERTICES =
+      GlUtil.createBuffer(new float[] {-1.0f, 1.0f, -1.0f, -1.0f, 1.0f, 1.0f, 1.0f, -1.0f});
   private final int[] yuvTextures = new int[3];
   private final AtomicReference<VpxOutputBuffer> pendingOutputBufferReference;
 
@@ -114,21 +110,7 @@ import javax.microedition.khronos.opengles.GL10;
 
   @Override
   public void onSurfaceCreated(GL10 unused, EGLConfig config) {
-    // Create the GL program.
-    program = GLES20.glCreateProgram();
-
-    // Add the vertex and fragment shaders.
-    addShader(GLES20.GL_VERTEX_SHADER, VERTEX_SHADER, program);
-    addShader(GLES20.GL_FRAGMENT_SHADER, FRAGMENT_SHADER, program);
-
-    // Link the GL program.
-    GLES20.glLinkProgram(program);
-    int[] result = new int[] {
-        GLES20.GL_FALSE
-    };
-    result[0] = GLES20.GL_FALSE;
-    GLES20.glGetProgramiv(program, GLES20.GL_LINK_STATUS, result, 0);
-    abortUnless(result[0] == GLES20.GL_TRUE, GLES20.glGetProgramInfoLog(program));
+    program = GlUtil.compileProgram(VERTEX_SHADER, FRAGMENT_SHADER);
     GLES20.glUseProgram(program);
     int posLocation = GLES20.glGetAttribLocation(program, "in_pos");
     GLES20.glEnableVertexAttribArray(posLocation);
@@ -136,11 +118,11 @@ import javax.microedition.khronos.opengles.GL10;
         posLocation, 2, GLES20.GL_FLOAT, false, 0, TEXTURE_VERTICES);
     texLocation = GLES20.glGetAttribLocation(program, "in_tc");
     GLES20.glEnableVertexAttribArray(texLocation);
-    checkNoGLES2Error();
+    GlUtil.checkGlError();
     colorMatrixLocation = GLES20.glGetUniformLocation(program, "mColorConversion");
-    checkNoGLES2Error();
+    GlUtil.checkGlError();
     setupTextures();
-    checkNoGLES2Error();
+    GlUtil.checkGlError();
   }
 
   @Override
@@ -191,11 +173,8 @@ import javax.microedition.khronos.opengles.GL10;
       float crop = (float) outputBuffer.width / outputBuffer.yuvStrides[0];
       // This buffer is consumed during each call to glDrawArrays. It needs to be a member variable
       // rather than a local variable to ensure that it doesn't get garbage collected.
-      textureCoords = nativeFloatBuffer(
-          0.0f, 0.0f,
-          0.0f, 1.0f,
-          crop, 0.0f,
-          crop, 1.0f);
+      textureCoords =
+          GlUtil.createBuffer(new float[] {0.0f, 0.0f, 0.0f, 1.0f, crop, 0.0f, crop, 1.0f});
       GLES20.glVertexAttribPointer(
           texLocation, 2, GLES20.GL_FLOAT, false, 0, textureCoords);
       previousWidth = outputBuffer.width;
@@ -203,23 +182,7 @@ import javax.microedition.khronos.opengles.GL10;
     }
     GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
     GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, 0, 4);
-    checkNoGLES2Error();
-  }
-
-  private void addShader(int type, String source, int program) {
-    int[] result = new int[] {
-        GLES20.GL_FALSE
-    };
-    int shader = GLES20.glCreateShader(type);
-    GLES20.glShaderSource(shader, source);
-    GLES20.glCompileShader(shader);
-    GLES20.glGetShaderiv(shader, GLES20.GL_COMPILE_STATUS, result, 0);
-    abortUnless(result[0] == GLES20.GL_TRUE,
-        GLES20.glGetShaderInfoLog(shader) + ", source: " + source);
-    GLES20.glAttachShader(program, shader);
-    GLES20.glDeleteShader(shader);
-
-    checkNoGLES2Error();
+    GlUtil.checkGlError();
   }
 
   private void setupTextures() {
@@ -237,28 +200,6 @@ import javax.microedition.khronos.opengles.GL10;
       GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D,
           GLES20.GL_TEXTURE_WRAP_T, GLES20.GL_CLAMP_TO_EDGE);
     }
-    checkNoGLES2Error();
+    GlUtil.checkGlError();
   }
-
-  private void abortUnless(boolean condition, String msg) {
-    if (!condition) {
-      throw new RuntimeException(msg);
-    }
-  }
-
-  private void checkNoGLES2Error() {
-    int error = GLES20.glGetError();
-    if (error != GLES20.GL_NO_ERROR) {
-      throw new RuntimeException("GLES20 error: " + error);
-    }
-  }
-
-  private static FloatBuffer nativeFloatBuffer(float... array) {
-    FloatBuffer buffer = ByteBuffer.allocateDirect(array.length * 4).order(
-        ByteOrder.nativeOrder()).asFloatBuffer();
-    buffer.put(array);
-    buffer.flip();
-    return buffer;
-  }
-
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java b/library/core/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java
index 90e37de828..bf4d78ee10 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java
@@ -305,9 +305,6 @@ public final class EGLSurfaceTexture implements SurfaceTexture.OnFrameAvailableL
 
   private static void generateTextureIds(int[] textureIdHolder) {
     GLES20.glGenTextures(/* n= */ 1, textureIdHolder, /* offset= */ 0);
-    int errorCode = GLES20.glGetError();
-    if (errorCode != GLES20.GL_NO_ERROR) {
-      throw new GlException("glGenTextures failed. Error: " + Integer.toHexString(errorCode));
-    }
+    GlUtil.checkGlError();
   }
 }
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/GlUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/util/GlUtil.java
similarity index 63%
rename from library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/GlUtil.java
rename to library/core/src/main/java/com/google/android/exoplayer2/util/GlUtil.java
index 68a85938a3..72a782c2ac 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/GlUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/GlUtil.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.ui.spherical;
+package com.google.android.exoplayer2.util;
 
 import static android.opengl.GLU.gluErrorString;
 
@@ -23,15 +23,14 @@ import android.opengl.GLES20;
 import android.text.TextUtils;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
-import com.google.android.exoplayer2.util.Log;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 
 /** GL utility methods. */
-/* package */ final class GlUtil {
-  private static final String TAG = "Spherical.Utils";
+public final class GlUtil {
+  private static final String TAG = "GlUtil";
 
   /** Class only contains static methods. */
   private GlUtil() {}
@@ -57,42 +56,39 @@ import java.nio.IntBuffer;
   }
 
   /**
-   * Builds a GL shader program from vertex & fragment shader code. The vertex and fragment shaders
-   * are passed as arrays of strings in order to make debugging compilation issues easier.
+   * Builds a GL shader program from vertex & fragment shader code.
+   *
+   * @param vertexCode GLES20 vertex shader program as arrays of strings. Strings are joined by
+   *     adding a new line character in between each of them.
+   * @param fragmentCode GLES20 fragment shader program as arrays of strings. Strings are joined by
+   *     adding a new line character in between each of them.
+   * @return GLES20 program id.
+   */
+  public static int compileProgram(String[] vertexCode, String[] fragmentCode) {
+    return compileProgram(TextUtils.join("\n", vertexCode), TextUtils.join("\n", fragmentCode));
+  }
+
+  /**
+   * Builds a GL shader program from vertex & fragment shader code.
    *
    * @param vertexCode GLES20 vertex shader program.
    * @param fragmentCode GLES20 fragment shader program.
    * @return GLES20 program id.
    */
-  public static int compileProgram(String[] vertexCode, String[] fragmentCode) {
-    checkGlError();
-    // prepare shaders and OpenGL program
-    int vertexShader = GLES20.glCreateShader(GLES20.GL_VERTEX_SHADER);
-    GLES20.glShaderSource(vertexShader, TextUtils.join("\n", vertexCode));
-    GLES20.glCompileShader(vertexShader);
-    checkGlError();
-
-    int fragmentShader = GLES20.glCreateShader(GLES20.GL_FRAGMENT_SHADER);
-    GLES20.glShaderSource(fragmentShader, TextUtils.join("\n", fragmentCode));
-    GLES20.glCompileShader(fragmentShader);
-    checkGlError();
-
+  public static int compileProgram(String vertexCode, String fragmentCode) {
     int program = GLES20.glCreateProgram();
-    GLES20.glAttachShader(program, vertexShader);
-    GLES20.glDeleteShader(vertexShader);
-    GLES20.glAttachShader(program, fragmentShader);
-    GLES20.glDeleteShader(fragmentShader);
+    checkGlError();
+
+    // Add the vertex and fragment shaders.
+    addShader(GLES20.GL_VERTEX_SHADER, vertexCode, program);
+    addShader(GLES20.GL_FRAGMENT_SHADER, fragmentCode, program);
 
     // Link and check for errors.
     GLES20.glLinkProgram(program);
-    int[] linkStatus = new int[1];
+    int[] linkStatus = new int[] {GLES20.GL_FALSE};
     GLES20.glGetProgramiv(program, GLES20.GL_LINK_STATUS, linkStatus, 0);
     if (linkStatus[0] != GLES20.GL_TRUE) {
-      String errorMsg = "Unable to link shader program: \n" + GLES20.glGetProgramInfoLog(program);
-      Log.e(TAG, errorMsg);
-      if (ExoPlayerLibraryInfo.GL_ASSERTIONS_ENABLED) {
-        throw new RuntimeException(errorMsg);
-      }
+      throwGlError("Unable to link shader program: \n" + GLES20.glGetProgramInfoLog(program));
     }
     checkGlError();
 
@@ -101,12 +97,11 @@ import java.nio.IntBuffer;
 
   /** Allocates a FloatBuffer with the given data. */
   public static FloatBuffer createBuffer(float[] data) {
-    ByteBuffer bb = ByteBuffer.allocateDirect(data.length * C.BYTES_PER_FLOAT);
-    bb.order(ByteOrder.nativeOrder());
-    FloatBuffer buffer = bb.asFloatBuffer();
+    ByteBuffer byteBuffer = ByteBuffer.allocateDirect(data.length * C.BYTES_PER_FLOAT);
+    byteBuffer.order(ByteOrder.nativeOrder());
+    FloatBuffer buffer = byteBuffer.asFloatBuffer();
     buffer.put(data);
-    buffer.position(0);
-
+    buffer.flip();
     return buffer;
   }
 
@@ -130,4 +125,27 @@ import java.nio.IntBuffer;
     checkGlError();
     return texId[0];
   }
+
+  private static void addShader(int type, String source, int program) {
+    int shader = GLES20.glCreateShader(type);
+    GLES20.glShaderSource(shader, source);
+    GLES20.glCompileShader(shader);
+
+    int[] result = new int[] {GLES20.GL_FALSE};
+    GLES20.glGetShaderiv(shader, GLES20.GL_COMPILE_STATUS, result, 0);
+    if (result[0] != GLES20.GL_TRUE) {
+      throwGlError(GLES20.glGetShaderInfoLog(shader) + ", source: " + source);
+    }
+
+    GLES20.glAttachShader(program, shader);
+    GLES20.glDeleteShader(shader);
+    checkGlError();
+  }
+
+  private static void throwGlError(String errorMsg) {
+    Log.e(TAG, errorMsg);
+    if (ExoPlayerLibraryInfo.GL_ASSERTIONS_ENABLED) {
+      throw new RuntimeException(errorMsg);
+    }
+  }
 }
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/ProjectionRenderer.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/ProjectionRenderer.java
index b0760ec2bd..47515b023a 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/ProjectionRenderer.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/ProjectionRenderer.java
@@ -15,12 +15,13 @@
  */
 package com.google.android.exoplayer2.ui.spherical;
 
-import static com.google.android.exoplayer2.ui.spherical.GlUtil.checkGlError;
+import static com.google.android.exoplayer2.util.GlUtil.checkGlError;
 
 import android.annotation.TargetApi;
 import android.opengl.GLES11Ext;
 import android.opengl.GLES20;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.util.GlUtil;
 import com.google.android.exoplayer2.video.spherical.Projection;
 import java.nio.FloatBuffer;
 import org.checkerframework.checker.nullness.qual.Nullable;
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java
index ff3641135c..048c346781 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.ui.spherical;
 
-import static com.google.android.exoplayer2.ui.spherical.GlUtil.checkGlError;
+import static com.google.android.exoplayer2.util.GlUtil.checkGlError;
 
 import android.graphics.SurfaceTexture;
 import android.opengl.GLES20;
@@ -25,6 +25,7 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ui.spherical.ProjectionRenderer.EyeType;
 import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.GlUtil;
 import com.google.android.exoplayer2.util.TimedValueQueue;
 import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
 import com.google.android.exoplayer2.video.spherical.CameraMotionListener;

From a8efa27fabf18dcbfb61d5375c58d6aada0dfbb6 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 26 Sep 2018 04:22:36 -0700
Subject: [PATCH 023/832] Make DefaultLoadErrorHandlingPolicy non-final

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=214584874
---
 .../exoplayer2/upstream/DefaultLoadErrorHandlingPolicy.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicy.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicy.java
index 8d8f156951..720a8b08d4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicy.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicy.java
@@ -22,7 +22,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 
 /** Default implementation of {@link LoadErrorHandlingPolicy}. */
-public final class DefaultLoadErrorHandlingPolicy implements LoadErrorHandlingPolicy {
+public class DefaultLoadErrorHandlingPolicy implements LoadErrorHandlingPolicy {
 
   /** The default minimum number of times to retry loading data prior to propagating the error. */
   public static final int DEFAULT_MIN_LOADABLE_RETRY_COUNT = 3;

From 776ad20a507048edd848e99b4b3f9c5a27c42a7a Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 26 Sep 2018 06:55:17 -0700
Subject: [PATCH 024/832] Add a MediaQueue abstraction to the cast extension

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=214598078
---
 .../exoplayer2/castdemo/PlayerManager.java    |   3 +-
 extensions/cast/build.gradle                  |   2 +
 .../exoplayer2/ext/cast/CastPlayer.java       |  35 +--
 .../exoplayer2/ext/cast/MediaItem.java        | 293 ++++++++++++++++++
 .../exoplayer2/ext/cast/MediaItemQueue.java   |  85 +++++
 .../exoplayer2/ext/cast/RemotePlayer.java     |  45 +++
 .../exoplayer2/ext/cast/MediaItemTest.java    |  92 ++++++
 7 files changed, 528 insertions(+), 27 deletions(-)
 create mode 100644 extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java
 create mode 100644 extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItemQueue.java
 create mode 100644 extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/RemotePlayer.java
 create mode 100644 extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/MediaItemTest.java

diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
index d188469de8..0c69e40164 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
@@ -33,6 +33,7 @@ import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.Timeline.Period;
 import com.google.android.exoplayer2.castdemo.DemoUtil.Sample;
 import com.google.android.exoplayer2.ext.cast.CastPlayer;
+import com.google.android.exoplayer2.ext.cast.RemotePlayer;
 import com.google.android.exoplayer2.source.ConcatenatingMediaSource;
 import com.google.android.exoplayer2.source.ExtractorMediaSource;
 import com.google.android.exoplayer2.source.MediaSource;
@@ -51,7 +52,7 @@ import java.util.ArrayList;
 
 /** Manages players and an internal media queue for the ExoPlayer/Cast demo app. */
 /* package */ final class PlayerManager
-    implements EventListener, CastPlayer.SessionAvailabilityListener {
+    implements EventListener, RemotePlayer.SessionAvailabilityListener {
 
   /**
    * Listener for changes in the media queue playback position.
diff --git a/extensions/cast/build.gradle b/extensions/cast/build.gradle
index bee73cac12..ab14b4034a 100644
--- a/extensions/cast/build.gradle
+++ b/extensions/cast/build.gradle
@@ -32,6 +32,8 @@ android {
 
 dependencies {
     api 'com.google.android.gms:play-services-cast-framework:16.0.1'
+    compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
+    compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion
     implementation project(modulePrefix + 'library-core')
     implementation project(modulePrefix + 'library-ui')
     testImplementation project(modulePrefix + 'testutils')
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
index f630ea1628..ecaa56427f 100644
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
@@ -52,35 +52,18 @@ import java.util.concurrent.CopyOnWriteArraySet;
  * {@link Player} implementation that communicates with a Cast receiver app.
  *
  * <p>The behavior of this class depends on the underlying Cast session, which is obtained from the
- * Cast context passed to {@link #CastPlayer}. To keep track of the session,
- * {@link #isCastSessionAvailable()} can be queried and {@link SessionAvailabilityListener} can be
- * implemented and attached to the player.</p>
+ * Cast context passed to {@link #CastPlayer}. To keep track of the session, {@link
+ * #isCastSessionAvailable()} can be queried and {@link RemotePlayer.SessionAvailabilityListener}
+ * can be implemented and attached to the player.
  *
- * <p> If no session is available, the player state will remain unchanged and calls to methods that
+ * <p>If no session is available, the player state will remain unchanged and calls to methods that
  * alter it will be ignored. Querying the player state is possible even when no session is
- * available, in which case, the last observed receiver app state is reported.</p>
+ * available, in which case, the last observed receiver app state is reported.
  *
- * <p>Methods should be called on the application's main thread.</p>
+ * <p>Methods should be called on the application's main thread.
  */
 public final class CastPlayer implements Player {
 
-  /**
-   * Listener of changes in the cast session availability.
-   */
-  public interface SessionAvailabilityListener {
-
-    /**
-     * Called when a cast session becomes available to the player.
-     */
-    void onCastSessionAvailable();
-
-    /**
-     * Called when the cast session becomes unavailable.
-     */
-    void onCastSessionUnavailable();
-
-  }
-
   private static final String TAG = "CastPlayer";
 
   private static final int RENDERER_COUNT = 3;
@@ -106,7 +89,7 @@ public final class CastPlayer implements Player {
 
   // Listeners.
   private final CopyOnWriteArraySet<EventListener> listeners;
-  private SessionAvailabilityListener sessionAvailabilityListener;
+  private RemotePlayer.SessionAvailabilityListener sessionAvailabilityListener;
 
   // Internal state.
   private CastTimeline currentTimeline;
@@ -276,9 +259,9 @@ public final class CastPlayer implements Player {
   /**
    * Sets a listener for updates on the cast session availability.
    *
-   * @param listener The {@link SessionAvailabilityListener}.
+   * @param listener The {@link RemotePlayer.SessionAvailabilityListener}.
    */
-  public void setSessionAvailabilityListener(SessionAvailabilityListener listener) {
+  public void setSessionAvailabilityListener(RemotePlayer.SessionAvailabilityListener listener) {
     sessionAvailabilityListener = listener;
   }
 
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java
new file mode 100644
index 0000000000..67428e8af4
--- /dev/null
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java
@@ -0,0 +1,293 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.ext.cast;
+
+import android.net.Uri;
+import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.util.Assertions;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.checkerframework.checker.initialization.qual.UnknownInitialization;
+import org.checkerframework.checker.nullness.qual.EnsuresNonNull;
+
+/** Representation of an item that can be played by a media player. */
+public final class MediaItem {
+
+  /** A builder for {@link MediaItem} instances. */
+  public static final class Builder {
+
+    @Nullable private UUID uuid;
+    private String title;
+    private String description;
+    private MediaItem.UriBundle media;
+    @Nullable private Object attachment;
+    private List<MediaItem.DrmScheme> drmSchemes;
+    private long startPositionUs;
+    private long endPositionUs;
+    private String mimeType;
+
+    /** Creates an builder with default field values. */
+    public Builder() {
+      clearInternal();
+    }
+
+    /** See {@link MediaItem#uuid}. */
+    public Builder setUuid(UUID uuid) {
+      this.uuid = uuid;
+      return this;
+    }
+
+    /** See {@link MediaItem#title}. */
+    public Builder setTitle(String title) {
+      this.title = title;
+      return this;
+    }
+
+    /** See {@link MediaItem#description}. */
+    public Builder setDescription(String description) {
+      this.description = description;
+      return this;
+    }
+
+    /** Equivalent to {@link #setMedia(UriBundle) setMedia(new UriBundle(uri))}. */
+    public Builder setMedia(String uri) {
+      return setMedia(new UriBundle(uri));
+    }
+
+    /** See {@link MediaItem#media}. */
+    public Builder setMedia(UriBundle media) {
+      this.media = media;
+      return this;
+    }
+
+    /** See {@link MediaItem#attachment}. */
+    public Builder setAttachment(Object attachment) {
+      this.attachment = attachment;
+      return this;
+    }
+
+    /** See {@link MediaItem#drmSchemes}. */
+    public Builder setDrmSchemes(List<MediaItem.DrmScheme> drmSchemes) {
+      this.drmSchemes = Collections.unmodifiableList(new ArrayList<>(drmSchemes));
+      return this;
+    }
+
+    /** See {@link MediaItem#startPositionUs}. */
+    public Builder setStartPositionUs(long startPositionUs) {
+      this.startPositionUs = startPositionUs;
+      return this;
+    }
+
+    /** See {@link MediaItem#endPositionUs}. */
+    public Builder setEndPositionUs(long endPositionUs) {
+      Assertions.checkArgument(endPositionUs != C.TIME_END_OF_SOURCE);
+      this.endPositionUs = endPositionUs;
+      return this;
+    }
+
+    /** See {@link MediaItem#mimeType}. */
+    public Builder setMimeType(String mimeType) {
+      this.mimeType = mimeType;
+      return this;
+    }
+
+    /**
+     * Equivalent to {@link #build()}, except it also calls {@link #clear()} after creating the
+     * {@link MediaItem}.
+     */
+    public MediaItem buildAndClear() {
+      MediaItem item = build();
+      clearInternal();
+      return item;
+    }
+
+    /** Returns the builder to default values. */
+    public Builder clear() {
+      clearInternal();
+      return this;
+    }
+
+    /**
+     * Returns a new {@link MediaItem} instance with the current builder values. This method also
+     * clears any values passed to {@link #setUuid(UUID)}.
+     */
+    public MediaItem build() {
+      UUID uuid = this.uuid;
+      this.uuid = null;
+      return new MediaItem(
+          uuid != null ? uuid : UUID.randomUUID(),
+          title,
+          description,
+          media,
+          attachment,
+          drmSchemes,
+          startPositionUs,
+          endPositionUs,
+          mimeType);
+    }
+
+    @EnsuresNonNull({"title", "description", "media", "drmSchemes", "mimeType"})
+    private void clearInternal(@UnknownInitialization Builder this) {
+      uuid = null;
+      title = "";
+      description = "";
+      media = UriBundle.EMPTY;
+      attachment = null;
+      drmSchemes = Collections.emptyList();
+      startPositionUs = C.TIME_UNSET;
+      endPositionUs = C.TIME_UNSET;
+      mimeType = "";
+    }
+  }
+
+  /** Bundles a resource's URI with headers to attach to any request to that URI. */
+  public static final class UriBundle {
+
+    /** An empty {@link UriBundle}. */
+    public static final UriBundle EMPTY = new UriBundle("");
+
+    /** A URI. */
+    public final Uri uri;
+
+    /** The headers to attach to any request for the given URI. */
+    public final Map<String, String> requestHeaders;
+
+    /**
+     * Creates an instance from the given string with no request headers.
+     *
+     * @param uriString See {@link #uri}.
+     */
+    public UriBundle(String uriString) {
+      this(Uri.parse(uriString), Collections.emptyMap());
+    }
+
+    /**
+     * Creates an instance with the given URI and request headers.
+     *
+     * @param uri See {@link #uri}.
+     * @param requestHeaders See {@link #requestHeaders}.
+     */
+    public UriBundle(Uri uri, Map<String, String> requestHeaders) {
+      this.uri = uri;
+      this.requestHeaders = Collections.unmodifiableMap(new HashMap<>(requestHeaders));
+    }
+  }
+
+  /**
+   * Represents a DRM protection scheme, and optionally provides information about how to acquire
+   * the license for the media.
+   */
+  public static final class DrmScheme {
+
+    /** The UUID of the protection scheme. */
+    public final UUID uuid;
+
+    /**
+     * A optional {@link UriBundle} for the license server. If no license server is provided, the
+     * server must be provided by the media.
+     */
+    @Nullable public final UriBundle licenseServerUri;
+
+    /**
+     * Creates an instance.
+     *
+     * @param uuid See {@link #uuid}.
+     * @param licenseServerUri See {@link #licenseServerUri}.
+     */
+    public DrmScheme(UUID uuid, @Nullable UriBundle licenseServerUri) {
+      this.uuid = uuid;
+      this.licenseServerUri = licenseServerUri;
+    }
+  }
+
+  /**
+   * A UUID that identifies this item, potentially across different devices. The default value is
+   * obtained by calling {@link UUID#randomUUID()}.
+   */
+  public final UUID uuid;
+
+  /** The title of the item. The default value is an empty string. */
+  public final String title;
+
+  /** A description for the item. The default value is an empty string. */
+  public final String description;
+
+  /**
+   * A {@link UriBundle} to fetch the media content. The default value is {@link UriBundle#EMPTY}.
+   */
+  public final UriBundle media;
+
+  /**
+   * An optional opaque object to attach to the media item. Handling of this attachment is
+   * implementation specific. The default value is null.
+   */
+  @Nullable public final Object attachment;
+
+  /**
+   * Immutable list of {@link DrmScheme} instances sorted in decreasing order of preference. The
+   * default value is an empty list.
+   */
+  public final List<DrmScheme> drmSchemes;
+
+  /**
+   * The position in microseconds at which playback of this media item should start. {@link
+   * C#TIME_UNSET} if playback should start at the default position. The default value is {@link
+   * C#TIME_UNSET}.
+   */
+  public final long startPositionUs;
+
+  /**
+   * The position in microseconds at which playback of this media item should end. {@link
+   * C#TIME_UNSET} if playback should end at the end of the media. The default value is {@link
+   * C#TIME_UNSET}.
+   */
+  public final long endPositionUs;
+
+  /**
+   * The mime type of this media item. The default value is an empty string.
+   *
+   * <p>The usage of this mime type is optional and player implementation specific.
+   */
+  public final String mimeType;
+
+  // TODO: Add support for sideloaded tracks, artwork, icon, and subtitle.
+
+  private MediaItem(
+      UUID uuid,
+      String title,
+      String description,
+      UriBundle media,
+      @Nullable Object attachment,
+      List<DrmScheme> drmSchemes,
+      long startPositionUs,
+      long endPositionUs,
+      String mimeType) {
+    this.uuid = uuid;
+    this.title = title;
+    this.description = description;
+    this.media = media;
+    this.attachment = attachment;
+    this.drmSchemes = drmSchemes;
+    this.startPositionUs = startPositionUs;
+    this.endPositionUs = endPositionUs;
+    this.mimeType = mimeType;
+  }
+}
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItemQueue.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItemQueue.java
new file mode 100644
index 0000000000..184e347e1c
--- /dev/null
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItemQueue.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.ext.cast;
+
+/** Represents a sequence of {@link MediaItem MediaItems}. */
+public interface MediaItemQueue {
+
+  /**
+   * Returns the item at the given index.
+   *
+   * @param index The index of the item to retrieve.
+   * @return The item at the given index.
+   * @throws IndexOutOfBoundsException If {@code index < 0 || index >= getSize()}.
+   */
+  MediaItem get(int index);
+
+  /** Returns the number of items in this queue. */
+  int getSize();
+
+  /**
+   * Appends the given sequence of items to the queue.
+   *
+   * @param items The sequence of items to append.
+   */
+  void add(MediaItem... items);
+
+  /**
+   * Adds the given sequence of items to the queue at the given position, so that the first of
+   * {@code items} is placed at the given index.
+   *
+   * @param index The index at which {@code items} will be inserted.
+   * @param items The sequence of items to append.
+   * @throws IndexOutOfBoundsException If {@code index < 0 || index > getSize()}.
+   */
+  void add(int index, MediaItem... items);
+
+  /**
+   * Moves an existing item within the playlist.
+   *
+   * <p>Calling this method is equivalent to removing the item at position {@code indexFrom} and
+   * immediately inserting it at position {@code indexTo}. If the moved item is being played at the
+   * moment of the invocation, playback will stick with the moved item.
+   *
+   * @param indexFrom The index of the item to move.
+   * @param indexTo The index at which the item will be placed after this operation.
+   * @throws IndexOutOfBoundsException If for either index, {@code index < 0 || index >= getSize()}.
+   */
+  void move(int indexFrom, int indexTo);
+
+  /**
+   * Removes an item from the queue.
+   *
+   * @param index The index of the item to remove from the queue.
+   * @throws IndexOutOfBoundsException If {@code index < 0 || index >= getSize()}.
+   */
+  void remove(int index);
+
+  /**
+   * Removes a range of items from the queue.
+   *
+   * <p>Does nothing if an empty range ({@code from == exclusiveTo}) is passed.
+   *
+   * @param from The inclusive index at which the range to remove starts.
+   * @param exclusiveTo The exclusive index at which the range to remove ends.
+   * @throws IndexOutOfBoundsException If {@code from < 0 || exclusiveTo > getSize() || from >
+   *     exclusiveTo}.
+   */
+  void removeRange(int from, int exclusiveTo);
+
+  /** Removes all items in the queue. */
+  void clear();
+}
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/RemotePlayer.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/RemotePlayer.java
new file mode 100644
index 0000000000..98d5895db8
--- /dev/null
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/RemotePlayer.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.ext.cast;
+
+import com.google.android.exoplayer2.Player;
+
+/** A {@link Player} for playing media remotely using the Google Cast framework. */
+public interface RemotePlayer extends Player {
+
+  /** Listener of changes in the cast session availability. */
+  interface SessionAvailabilityListener {
+
+    /** Called when a cast session becomes available to the player. */
+    void onCastSessionAvailable();
+
+    /** Called when the cast session becomes unavailable. */
+    void onCastSessionUnavailable();
+  }
+
+  /** Returns whether a cast session is available. */
+  boolean isCastSessionAvailable();
+
+  /**
+   * Sets a listener for updates on the cast session availability.
+   *
+   * @param listener The {@link SessionAvailabilityListener}.
+   */
+  void setSessionAvailabilityListener(SessionAvailabilityListener listener);
+
+  /** Returns the {@link MediaItemQueue} associated to this player. */
+  MediaItemQueue getMediaItemQueue();
+}
diff --git a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/MediaItemTest.java b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/MediaItemTest.java
new file mode 100644
index 0000000000..3c7ec6cab3
--- /dev/null
+++ b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/MediaItemTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.ext.cast;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.net.Uri;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.util.MimeTypes;
+import java.util.UUID;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Test for {@link MediaItem}. */
+@RunWith(RobolectricTestRunner.class)
+public class MediaItemTest {
+
+  @Test
+  public void buildMediaItem_resetsUuid() {
+    MediaItem.Builder builder = new MediaItem.Builder();
+    UUID uuid = new UUID(1, 1);
+    MediaItem item1 = builder.setUuid(uuid).build();
+    MediaItem item2 = builder.build();
+    MediaItem item3 = builder.build();
+    assertThat(item1.uuid).isEqualTo(uuid);
+    assertThat(item2.uuid).isNotEqualTo(uuid);
+    assertThat(item3.uuid).isNotEqualTo(item2.uuid);
+    assertThat(item3.uuid).isNotEqualTo(uuid);
+  }
+
+  @Test
+  public void buildMediaItem_doesNotChangeState() {
+    MediaItem.Builder builder = new MediaItem.Builder();
+    MediaItem item1 =
+        builder
+            .setMedia("http://example.com")
+            .setTitle("title")
+            .setMimeType(MimeTypes.AUDIO_MP4)
+            .setStartPositionUs(3)
+            .setEndPositionUs(4)
+            .build();
+    MediaItem item2 = builder.build();
+    assertThat(item1.title).isEqualTo(item2.title);
+    assertThat(item1.media.uri).isEqualTo(item2.media.uri);
+    assertThat(item1.mimeType).isEqualTo(item2.mimeType);
+    assertThat(item1.startPositionUs).isEqualTo(item2.startPositionUs);
+    assertThat(item1.endPositionUs).isEqualTo(item2.endPositionUs);
+  }
+
+  @Test
+  public void buildMediaItem_assertDefaultValues() {
+    assertDefaultValues(new MediaItem.Builder().build());
+  }
+
+  @Test
+  public void buildMediaItem_testClear() {
+    MediaItem.Builder builder = new MediaItem.Builder();
+    builder
+        .setMedia("http://example.com")
+        .setTitle("title")
+        .setMimeType(MimeTypes.AUDIO_MP4)
+        .setStartPositionUs(3)
+        .setEndPositionUs(4)
+        .buildAndClear();
+    assertDefaultValues(builder.build());
+  }
+
+  private static void assertDefaultValues(MediaItem item) {
+    assertThat(item.title).isEmpty();
+    assertThat(item.description).isEmpty();
+    assertThat(item.media.uri).isEqualTo(Uri.EMPTY);
+    assertThat(item.attachment).isNull();
+    assertThat(item.drmSchemes).isEmpty();
+    assertThat(item.startPositionUs).isEqualTo(C.TIME_UNSET);
+    assertThat(item.endPositionUs).isEqualTo(C.TIME_UNSET);
+    assertThat(item.mimeType).isEmpty();
+  }
+}

From 3073d38a5af0b61c5029957f3a730dd667fbdcc1 Mon Sep 17 00:00:00 2001
From: cblay <cblay@google.com>
Date: Wed, 26 Sep 2018 11:31:44 -0700
Subject: [PATCH 025/832] Pass MediaPeriodId to TrackSelector.selectTracks()

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=214638939
---
 .../android/exoplayer2/ExoPlayerImpl.java     |   2 +-
 .../android/exoplayer2/MediaPeriodHolder.java |   2 +-
 .../trackselection/MappingTrackSelector.java  |   8 +-
 .../trackselection/TrackSelector.java         |  35 ++-
 .../DefaultTrackSelectorTest.java             | 273 ++++++++++++------
 .../MappingTrackSelectorTest.java             |   8 +-
 .../trackselection/TrackSelectorTest.java     |  23 +-
 7 files changed, 225 insertions(+), 126 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index 83854ffca9..96e7703559 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -51,7 +51,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
    * This empty track selector result can only be used for {@link PlaybackInfo#trackSelectorResult}
    * when the player does not have any track selection made (such as when player is reset, or when
    * player seeks to an unprepared period). It will not be used as result of any {@link
-   * TrackSelector#selectTracks(RendererCapabilities[], TrackGroupArray)} operation.
+   * TrackSelector#selectTracks(RendererCapabilities[], TrackGroupArray, MediaPeriodId)} operation.
    */
   /* package */ final TrackSelectorResult emptyTrackSelectorResult;
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
index 4941b4efc6..70c9354e71 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
@@ -162,7 +162,7 @@ import com.google.android.exoplayer2.util.Log;
 
   public boolean selectTracks(float playbackSpeed) throws ExoPlaybackException {
     TrackSelectorResult selectorResult =
-        trackSelector.selectTracks(rendererCapabilities, trackGroups);
+        trackSelector.selectTracks(rendererCapabilities, trackGroups, info.id);
     if (selectorResult.isEquivalent(periodTrackSelectorResult)) {
       return false;
     }
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 c2fda67728..ce5dff8556 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
@@ -23,6 +23,7 @@ import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.Renderer;
 import com.google.android.exoplayer2.RendererCapabilities;
 import com.google.android.exoplayer2.RendererConfiguration;
+import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.util.Util;
@@ -326,8 +327,11 @@ public abstract class MappingTrackSelector extends TrackSelector {
   }
 
   @Override
-  public final TrackSelectorResult selectTracks(RendererCapabilities[] rendererCapabilities,
-      TrackGroupArray trackGroups) throws ExoPlaybackException {
+  public final TrackSelectorResult selectTracks(
+      RendererCapabilities[] rendererCapabilities,
+      TrackGroupArray trackGroups,
+      MediaPeriodId periodId)
+      throws ExoPlaybackException {
     // Structures into which data will be written during the selection. The extra item at the end
     // of each array is to store data associated with track groups that cannot be associated with
     // any renderer.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java
index 3bb603318f..bc2460036c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java
@@ -21,6 +21,7 @@ import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Renderer;
 import com.google.android.exoplayer2.RendererCapabilities;
 import com.google.android.exoplayer2.RendererConfiguration;
+import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.upstream.BandwidthMeter;
 import com.google.android.exoplayer2.util.Assertions;
@@ -40,9 +41,9 @@ import com.google.android.exoplayer2.util.Assertions;
  *   <li>When the player is created it will initialize the track selector by calling {@link
  *       #init(InvalidationListener, BandwidthMeter)}.
  *   <li>When the player needs to make a track selection it will call {@link
- *       #selectTracks(RendererCapabilities[], TrackGroupArray)}. This typically occurs at the start
- *       of playback, when the player starts to buffer a new period of the media being played, and
- *       when the track selector invalidates its previous selections.
+ *       #selectTracks(RendererCapabilities[], TrackGroupArray, MediaPeriodId)}. This typically
+ *       occurs at the start of playback, when the player starts to buffer a new period of the media
+ *       being played, and when the track selector invalidates its previous selections.
  *   <li>The player may perform a track selection well in advance of the selected tracks becoming
  *       active, where active is defined to mean that the renderers are actually consuming media
  *       corresponding to the selection that was made. For example when playing media containing
@@ -66,14 +67,14 @@ import com.google.android.exoplayer2.util.Assertions;
  * <h3>Renderer configuration</h3>
  *
  * The {@link TrackSelectorResult} returned by {@link #selectTracks(RendererCapabilities[],
- * TrackGroupArray)} contains not only {@link TrackSelection}s for each renderer, but also {@link
- * RendererConfiguration}s defining configuration parameters that the renderers should apply when
- * consuming the corresponding media. Whilst it may seem counter-intuitive for a track selector to
- * also specify renderer configuration information, in practice the two are tightly bound together.
- * It may only be possible to play a certain combination tracks if the renderers are configured in a
- * particular way. Equally, it may only be possible to configure renderers in a particular way if
- * certain tracks are selected. Hence it makes sense to determined the track selection and
- * corresponding renderer configurations in a single step.
+ * TrackGroupArray, MediaPeriodId)} contains not only {@link TrackSelection}s for each renderer, but
+ * also {@link RendererConfiguration}s defining configuration parameters that the renderers should
+ * apply when consuming the corresponding media. Whilst it may seem counter-intuitive for a track
+ * selector to also specify renderer configuration information, in practice the two are tightly
+ * bound together. It may only be possible to play a certain combination tracks if the renderers are
+ * configured in a particular way. Equally, it may only be possible to configure renderers in a
+ * particular way if certain tracks are selected. Hence it makes sense to determined the track
+ * selection and corresponding renderer configurations in a single step.
  *
  * <h3>Threading model</h3>
  *
@@ -117,15 +118,19 @@ public abstract class TrackSelector {
    * @param rendererCapabilities The {@link RendererCapabilities} of the renderers for which tracks
    *     are to be selected.
    * @param trackGroups The available track groups.
+   * @param periodId The {@link MediaPeriodId} of the period for which tracks are to be selected.
    * @return A {@link TrackSelectorResult} describing the track selections.
    * @throws ExoPlaybackException If an error occurs selecting tracks.
    */
-  public abstract TrackSelectorResult selectTracks(RendererCapabilities[] rendererCapabilities,
-      TrackGroupArray trackGroups) throws ExoPlaybackException;
+  public abstract TrackSelectorResult selectTracks(
+      RendererCapabilities[] rendererCapabilities,
+      TrackGroupArray trackGroups,
+      MediaPeriodId periodId)
+      throws ExoPlaybackException;
 
   /**
-   * Called by the player when a {@link TrackSelectorResult} previously generated by
-   * {@link #selectTracks(RendererCapabilities[], TrackGroupArray)} is activated.
+   * Called by the player when a {@link TrackSelectorResult} previously generated by {@link
+   * #selectTracks(RendererCapabilities[], TrackGroupArray, MediaPeriodId)} is activated.
    *
    * @param info The value of {@link TrackSelectorResult#info} in the activated selection.
    */
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
index 94f6abd87b..4b1357c1a6 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
@@ -37,6 +37,7 @@ import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.RendererCapabilities;
 import com.google.android.exoplayer2.RendererConfiguration;
+import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.Parameters;
@@ -90,6 +91,7 @@ public final class DefaultTrackSelectorTest {
       };
   private static final TrackSelection[] TRACK_SELECTIONS_WITH_NO_SAMPLE_RENDERER =
       new TrackSelection[] {new FixedTrackSelection(VIDEO_TRACK_GROUP, 0), null};
+  private static final MediaPeriodId PERIOD_ID = new MediaPeriodId(/* periodUid= */ new Object());
 
   @Mock
   private InvalidationListener invalidationListener;
@@ -176,7 +178,8 @@ public final class DefaultTrackSelectorTest {
         trackSelector
             .buildUponParameters()
             .setSelectionOverride(0, new TrackGroupArray(VIDEO_TRACK_GROUP), null));
-    TrackSelectorResult result = trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS);
+    TrackSelectorResult result =
+        trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS, PERIOD_ID);
     assertTrackSelections(result, new TrackSelection[] {null, TRACK_SELECTIONS[1]});
     assertThat(result.rendererConfigurations)
         .isEqualTo(new RendererConfiguration[] {null, DEFAULT});
@@ -192,7 +195,8 @@ public final class DefaultTrackSelectorTest {
             .buildUponParameters()
             .setSelectionOverride(0, new TrackGroupArray(VIDEO_TRACK_GROUP), null)
             .clearSelectionOverride(0, new TrackGroupArray(VIDEO_TRACK_GROUP)));
-    TrackSelectorResult result = trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS);
+    TrackSelectorResult result =
+        trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS, PERIOD_ID);
     assertTrackSelections(result, TRACK_SELECTIONS);
     assertThat(result.rendererConfigurations)
         .isEqualTo(new RendererConfiguration[] {DEFAULT, DEFAULT});
@@ -210,7 +214,8 @@ public final class DefaultTrackSelectorTest {
     TrackSelectorResult result =
         trackSelector.selectTracks(
             RENDERER_CAPABILITIES,
-            new TrackGroupArray(VIDEO_TRACK_GROUP, AUDIO_TRACK_GROUP, VIDEO_TRACK_GROUP));
+            new TrackGroupArray(VIDEO_TRACK_GROUP, AUDIO_TRACK_GROUP, VIDEO_TRACK_GROUP),
+            PERIOD_ID);
     assertTrackSelections(result, TRACK_SELECTIONS);
     assertThat(result.rendererConfigurations)
         .isEqualTo(new RendererConfiguration[] {DEFAULT, DEFAULT});
@@ -222,7 +227,8 @@ public final class DefaultTrackSelectorTest {
     DefaultTrackSelector trackSelector = new DefaultTrackSelector();
     trackSelector.init(invalidationListener, bandwidthMeter);
     trackSelector.setParameters(trackSelector.buildUponParameters().setRendererDisabled(1, true));
-    TrackSelectorResult result = trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS);
+    TrackSelectorResult result =
+        trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS, PERIOD_ID);
     assertTrackSelections(result, new TrackSelection[] {TRACK_SELECTIONS[0], null});
     assertThat(new RendererConfiguration[] {DEFAULT, null})
         .isEqualTo(result.rendererConfigurations);
@@ -238,7 +244,8 @@ public final class DefaultTrackSelectorTest {
             .buildUponParameters()
             .setRendererDisabled(1, true)
             .setRendererDisabled(1, false));
-    TrackSelectorResult result = trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS);
+    TrackSelectorResult result =
+        trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS, PERIOD_ID);
     assertTrackSelections(result, TRACK_SELECTIONS);
     assertThat(new RendererConfiguration[] {DEFAULT, DEFAULT})
         .isEqualTo(result.rendererConfigurations);
@@ -250,7 +257,8 @@ public final class DefaultTrackSelectorTest {
     DefaultTrackSelector trackSelector = new DefaultTrackSelector();
     trackSelector.init(invalidationListener, bandwidthMeter);
     TrackSelectorResult result =
-        trackSelector.selectTracks(RENDERER_CAPABILITIES_WITH_NO_SAMPLE_RENDERER, TRACK_GROUPS);
+        trackSelector.selectTracks(
+            RENDERER_CAPABILITIES_WITH_NO_SAMPLE_RENDERER, TRACK_GROUPS, PERIOD_ID);
     assertTrackSelections(result, TRACK_SELECTIONS_WITH_NO_SAMPLE_RENDERER);
     assertThat(new RendererConfiguration[] {DEFAULT, DEFAULT})
         .isEqualTo(result.rendererConfigurations);
@@ -263,7 +271,8 @@ public final class DefaultTrackSelectorTest {
     trackSelector.init(invalidationListener, bandwidthMeter);
     trackSelector.setParameters(trackSelector.buildUponParameters().setRendererDisabled(1, true));
     TrackSelectorResult result =
-        trackSelector.selectTracks(RENDERER_CAPABILITIES_WITH_NO_SAMPLE_RENDERER, TRACK_GROUPS);
+        trackSelector.selectTracks(
+            RENDERER_CAPABILITIES_WITH_NO_SAMPLE_RENDERER, TRACK_GROUPS, PERIOD_ID);
     assertTrackSelections(result, TRACK_SELECTIONS_WITH_NO_SAMPLE_RENDERER);
     assertThat(new RendererConfiguration[] {DEFAULT, null})
         .isEqualTo(result.rendererConfigurations);
@@ -322,9 +331,11 @@ public final class DefaultTrackSelectorTest {
     Format formatWithSelectionFlag =
         buildAudioFormat("audio", /* language= */ null, C.SELECTION_FLAG_DEFAULT);
 
-    TrackSelectorResult result = trackSelector.selectTracks(
-        new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
-        singleTrackGroup(formatWithSelectionFlag, audioFormat));
+    TrackSelectorResult result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
+            singleTrackGroup(formatWithSelectionFlag, audioFormat),
+            PERIOD_ID);
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(formatWithSelectionFlag);
   }
 
@@ -347,7 +358,8 @@ public final class DefaultTrackSelectorTest {
     TrackSelectorResult result =
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
-            wrapFormats(frAudioFormat, enAudioFormat));
+            wrapFormats(frAudioFormat, enAudioFormat),
+            PERIOD_ID);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(enAudioFormat);
   }
@@ -368,9 +380,11 @@ public final class DefaultTrackSelectorTest {
         Format.createAudioSampleFormat("audio", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
             Format.NO_VALUE, 2, 44100, null, null, 0, "eng");
 
-    TrackSelectorResult result = trackSelector.selectTracks(
-        new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
-        wrapFormats(frAudioFormat, enAudioFormat));
+    TrackSelectorResult result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
+            wrapFormats(frAudioFormat, enAudioFormat),
+            PERIOD_ID);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(enAudioFormat);
   }
@@ -390,9 +404,11 @@ public final class DefaultTrackSelectorTest {
     RendererCapabilities mappedAudioRendererCapabilities =
         new FakeMappedRendererCapabilities(C.TRACK_TYPE_AUDIO, mappedCapabilities);
 
-    TrackSelectorResult result = trackSelector.selectTracks(
-        new RendererCapabilities[] {mappedAudioRendererCapabilities},
-        singleTrackGroup(exceededFormat, supportedFormat));
+    TrackSelectorResult result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {mappedAudioRendererCapabilities},
+            singleTrackGroup(exceededFormat, supportedFormat),
+            PERIOD_ID);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(supportedFormat);
   }
@@ -407,9 +423,11 @@ public final class DefaultTrackSelectorTest {
     Format audioFormat =
         Format.createAudioSampleFormat("audio", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
             Format.NO_VALUE, 2, 44100, null, null, 0, null);
-    TrackSelectorResult result = trackSelector.selectTracks(
-        new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
-        singleTrackGroup(audioFormat));
+    TrackSelectorResult result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
+            singleTrackGroup(audioFormat),
+            PERIOD_ID);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(audioFormat);
   }
@@ -428,9 +446,11 @@ public final class DefaultTrackSelectorTest {
     Format audioFormat =
         Format.createAudioSampleFormat("audio", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
             Format.NO_VALUE, 2, 44100, null, null, 0, null);
-    TrackSelectorResult result = trackSelector.selectTracks(
-        new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
-        singleTrackGroup(audioFormat));
+    TrackSelectorResult result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
+            singleTrackGroup(audioFormat),
+            PERIOD_ID);
 
     assertThat(result.selections.get(0)).isNull();
   }
@@ -455,9 +475,11 @@ public final class DefaultTrackSelectorTest {
     RendererCapabilities mappedAudioRendererCapabilities =
         new FakeMappedRendererCapabilities(C.TRACK_TYPE_AUDIO, mappedCapabilities);
 
-    TrackSelectorResult result = trackSelector.selectTracks(
-        new RendererCapabilities[] {mappedAudioRendererCapabilities},
-        singleTrackGroup(exceededWithSelectionFlagFormat, supportedFormat));
+    TrackSelectorResult result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {mappedAudioRendererCapabilities},
+            singleTrackGroup(exceededWithSelectionFlagFormat, supportedFormat),
+            PERIOD_ID);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(supportedFormat);
   }
@@ -485,9 +507,11 @@ public final class DefaultTrackSelectorTest {
     RendererCapabilities mappedAudioRendererCapabilities =
         new FakeMappedRendererCapabilities(C.TRACK_TYPE_AUDIO, mappedCapabilities);
 
-    TrackSelectorResult result = trackSelector.selectTracks(
-        new RendererCapabilities[] {mappedAudioRendererCapabilities},
-        singleTrackGroup(exceededEnFormat, supportedFrFormat));
+    TrackSelectorResult result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {mappedAudioRendererCapabilities},
+            singleTrackGroup(exceededEnFormat, supportedFrFormat),
+            PERIOD_ID);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(supportedFrFormat);
   }
@@ -515,9 +539,11 @@ public final class DefaultTrackSelectorTest {
     RendererCapabilities mappedAudioRendererCapabilities =
         new FakeMappedRendererCapabilities(C.TRACK_TYPE_AUDIO, mappedCapabilities);
 
-    TrackSelectorResult result = trackSelector.selectTracks(
-        new RendererCapabilities[] {mappedAudioRendererCapabilities},
-        singleTrackGroup(exceededDefaultSelectionEnFormat, supportedFrFormat));
+    TrackSelectorResult result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {mappedAudioRendererCapabilities},
+            singleTrackGroup(exceededDefaultSelectionEnFormat, supportedFrFormat),
+            PERIOD_ID);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(supportedFrFormat);
   }
@@ -536,9 +562,11 @@ public final class DefaultTrackSelectorTest {
         Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
             Format.NO_VALUE, 6, 44100, null, null, 0, null);
 
-    TrackSelectorResult result = trackSelector.selectTracks(
-        new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
-        singleTrackGroup(higherChannelFormat, lowerChannelFormat));
+    TrackSelectorResult result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
+            singleTrackGroup(higherChannelFormat, lowerChannelFormat),
+            PERIOD_ID);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(higherChannelFormat);
   }
@@ -557,9 +585,11 @@ public final class DefaultTrackSelectorTest {
         Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
             Format.NO_VALUE, 2, 22050, null, null, 0, null);
 
-    TrackSelectorResult result = trackSelector.selectTracks(
-        new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
-        singleTrackGroup(higherSampleRateFormat, lowerSampleRateFormat));
+    TrackSelectorResult result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
+            singleTrackGroup(higherSampleRateFormat, lowerSampleRateFormat),
+            PERIOD_ID);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(higherSampleRateFormat);
   }
@@ -578,9 +608,11 @@ public final class DefaultTrackSelectorTest {
         Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, 30000,
             Format.NO_VALUE, 2, 44100, null, null, 0, null);
 
-    TrackSelectorResult result = trackSelector.selectTracks(
-        new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
-        singleTrackGroup(lowerBitrateFormat, higherBitrateFormat));
+    TrackSelectorResult result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
+            singleTrackGroup(lowerBitrateFormat, higherBitrateFormat),
+            PERIOD_ID);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(higherBitrateFormat);
   }
@@ -600,9 +632,12 @@ public final class DefaultTrackSelectorTest {
         Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
             Format.NO_VALUE, 6, 22050, null, null, 0, null);
 
-    TrackSelectorResult result = trackSelector.selectTracks(
-        new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
-        singleTrackGroup(higherChannelLowerSampleRateFormat, lowerChannelHigherSampleRateFormat));
+    TrackSelectorResult result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
+            singleTrackGroup(
+                higherChannelLowerSampleRateFormat, lowerChannelHigherSampleRateFormat),
+            PERIOD_ID);
 
     assertThat(result.selections.get(0).getSelectedFormat())
         .isEqualTo(higherChannelLowerSampleRateFormat);
@@ -623,9 +658,12 @@ public final class DefaultTrackSelectorTest {
         Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, 30000,
             Format.NO_VALUE, 2, 22050, null, null, 0, null);
 
-    TrackSelectorResult result = trackSelector.selectTracks(
-        new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
-        singleTrackGroup(higherSampleRateLowerBitrateFormat, lowerSampleRateHigherBitrateFormat));
+    TrackSelectorResult result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
+            singleTrackGroup(
+                higherSampleRateLowerBitrateFormat, lowerSampleRateHigherBitrateFormat),
+            PERIOD_ID);
 
     assertThat(result.selections.get(0).getSelectedFormat())
         .isEqualTo(higherSampleRateLowerBitrateFormat);
@@ -645,9 +683,11 @@ public final class DefaultTrackSelectorTest {
         Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
             Format.NO_VALUE, 6, 44100, null, null, 0, null);
 
-    TrackSelectorResult result = trackSelector.selectTracks(
-        new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
-        singleTrackGroup(higherChannelFormat, lowerChannelFormat));
+    TrackSelectorResult result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
+            singleTrackGroup(higherChannelFormat, lowerChannelFormat),
+            PERIOD_ID);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(lowerChannelFormat);
   }
@@ -666,9 +706,11 @@ public final class DefaultTrackSelectorTest {
         Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
             Format.NO_VALUE, 2, 44100, null, null, 0, null);
 
-    TrackSelectorResult result = trackSelector.selectTracks(
-        new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
-        singleTrackGroup(higherSampleRateFormat, lowerSampleRateFormat));
+    TrackSelectorResult result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
+            singleTrackGroup(higherSampleRateFormat, lowerSampleRateFormat),
+            PERIOD_ID);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(lowerSampleRateFormat);
   }
@@ -687,9 +729,11 @@ public final class DefaultTrackSelectorTest {
         Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, 30000,
             Format.NO_VALUE, 2, 44100, null, null, 0, null);
 
-    TrackSelectorResult result = trackSelector.selectTracks(
-        new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
-        singleTrackGroup(lowerBitrateFormat, higherBitrateFormat));
+    TrackSelectorResult result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
+            singleTrackGroup(lowerBitrateFormat, higherBitrateFormat),
+            PERIOD_ID);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(lowerBitrateFormat);
   }
@@ -709,9 +753,12 @@ public final class DefaultTrackSelectorTest {
         Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
             Format.NO_VALUE, 6, 22050, null, null, 0, null);
 
-    TrackSelectorResult result = trackSelector.selectTracks(
-        new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
-        singleTrackGroup(higherChannelLowerSampleRateFormat, lowerChannelHigherSampleRateFormat));
+    TrackSelectorResult result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
+            singleTrackGroup(
+                higherChannelLowerSampleRateFormat, lowerChannelHigherSampleRateFormat),
+            PERIOD_ID);
 
     assertThat(result.selections.get(0).getSelectedFormat())
         .isEqualTo(lowerChannelHigherSampleRateFormat);
@@ -732,9 +779,12 @@ public final class DefaultTrackSelectorTest {
         Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, 30000,
             Format.NO_VALUE, 2, 22050, null, null, 0, null);
 
-    TrackSelectorResult result = trackSelector.selectTracks(
-        new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
-        singleTrackGroup(higherSampleRateLowerBitrateFormat, lowerSampleRateHigherBitrateFormat));
+    TrackSelectorResult result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
+            singleTrackGroup(
+                higherSampleRateLowerBitrateFormat, lowerSampleRateHigherBitrateFormat),
+            PERIOD_ID);
 
     assertThat(result.selections.get(0).getSelectedFormat())
         .isEqualTo(lowerSampleRateHigherBitrateFormat);
@@ -756,18 +806,22 @@ public final class DefaultTrackSelectorTest {
     // There is no text language preference, the first track flagged as default should be selected.
     TrackSelectorResult result =
         trackSelector.selectTracks(
-            textRendererCapabilities, wrapFormats(forcedOnly, forcedDefault, defaultOnly, noFlag));
+            textRendererCapabilities,
+            wrapFormats(forcedOnly, forcedDefault, defaultOnly, noFlag),
+            PERIOD_ID);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(forcedDefault);
 
     // Ditto.
     result =
         trackSelector.selectTracks(
-            textRendererCapabilities, wrapFormats(forcedOnly, noFlag, defaultOnly));
+            textRendererCapabilities, wrapFormats(forcedOnly, noFlag, defaultOnly), PERIOD_ID);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(defaultOnly);
 
     // With no language preference and no text track flagged as default, the first forced should be
     // selected.
-    result = trackSelector.selectTracks(textRendererCapabilities, wrapFormats(forcedOnly, noFlag));
+    result =
+        trackSelector.selectTracks(
+            textRendererCapabilities, wrapFormats(forcedOnly, noFlag), PERIOD_ID);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(forcedOnly);
 
     trackSelector.setParameters(
@@ -779,7 +833,9 @@ public final class DefaultTrackSelectorTest {
     // Default flags are disabled, so the first track flagged as forced should be selected.
     result =
         trackSelector.selectTracks(
-            textRendererCapabilities, wrapFormats(defaultOnly, noFlag, forcedOnly, forcedDefault));
+            textRendererCapabilities,
+            wrapFormats(defaultOnly, noFlag, forcedOnly, forcedDefault),
+            PERIOD_ID);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(forcedOnly);
 
     trackSelector.setParameters(
@@ -790,7 +846,8 @@ public final class DefaultTrackSelectorTest {
     result =
         trackSelector.selectTracks(
             textRendererCapabilities,
-            wrapFormats(forcedDefault, forcedOnly, defaultOnly, noFlag, forcedOnlySpanish));
+            wrapFormats(forcedDefault, forcedOnly, defaultOnly, noFlag, forcedOnlySpanish),
+            PERIOD_ID);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(forcedOnlySpanish);
 
     trackSelector.setParameters(
@@ -804,7 +861,9 @@ public final class DefaultTrackSelectorTest {
     // selected.
     result =
         trackSelector.selectTracks(
-            textRendererCapabilities, wrapFormats(forcedOnly, forcedDefault, defaultOnly, noFlag));
+            textRendererCapabilities,
+            wrapFormats(forcedOnly, forcedDefault, defaultOnly, noFlag),
+            PERIOD_ID);
     assertThat(result.selections.get(0)).isNull();
 
     trackSelector.setParameters(
@@ -814,7 +873,9 @@ public final class DefaultTrackSelectorTest {
     // be selected.
     result =
         trackSelector.selectTracks(
-            textRendererCapabilities, wrapFormats(forcedOnly, forcedDefault, defaultOnly, noFlag));
+            textRendererCapabilities,
+            wrapFormats(forcedOnly, forcedDefault, defaultOnly, noFlag),
+            PERIOD_ID);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(forcedDefault);
 
     trackSelector.setParameters(
@@ -829,7 +890,9 @@ public final class DefaultTrackSelectorTest {
     // forced subtitles.
     result =
         trackSelector.selectTracks(
-            textRendererCapabilities, wrapFormats(noFlag, forcedOnly, forcedDefault, defaultOnly));
+            textRendererCapabilities,
+            wrapFormats(noFlag, forcedOnly, forcedDefault, defaultOnly),
+            PERIOD_ID);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(noFlag);
   }
 
@@ -851,35 +914,49 @@ public final class DefaultTrackSelectorTest {
     TrackSelectorResult result =
         trackSelector.selectTracks(
             textRendererCapabilites,
-            wrapFormats(spanish, german, undeterminedUnd, undeterminedNull));
+            wrapFormats(spanish, german, undeterminedUnd, undeterminedNull),
+            PERIOD_ID);
     assertThat(result.selections.get(0)).isNull();
 
     trackSelector.setParameters(
         new ParametersBuilder().setSelectUndeterminedTextLanguage(true).build());
-    result = trackSelector.selectTracks(textRendererCapabilites,
-        wrapFormats(spanish, german, undeterminedUnd, undeterminedNull));
+    result =
+        trackSelector.selectTracks(
+            textRendererCapabilites,
+            wrapFormats(spanish, german, undeterminedUnd, undeterminedNull),
+            PERIOD_ID);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(undeterminedUnd);
 
     ParametersBuilder builder = new ParametersBuilder().setPreferredTextLanguage("spa");
     trackSelector.setParameters(builder.build());
-    result = trackSelector.selectTracks(textRendererCapabilites,
-        wrapFormats(spanish, german, undeterminedUnd, undeterminedNull));
+    result =
+        trackSelector.selectTracks(
+            textRendererCapabilites,
+            wrapFormats(spanish, german, undeterminedUnd, undeterminedNull),
+            PERIOD_ID);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(spanish);
 
-    result = trackSelector.selectTracks(textRendererCapabilites,
-        wrapFormats(german, undeterminedUnd, undeterminedNull));
+    result =
+        trackSelector.selectTracks(
+            textRendererCapabilites,
+            wrapFormats(german, undeterminedUnd, undeterminedNull),
+            PERIOD_ID);
     assertThat(result.selections.get(0)).isNull();
 
     trackSelector.setParameters(builder.setSelectUndeterminedTextLanguage(true).build());
-    result = trackSelector.selectTracks(textRendererCapabilites,
-        wrapFormats(german, undeterminedUnd, undeterminedNull));
+    result =
+        trackSelector.selectTracks(
+            textRendererCapabilites,
+            wrapFormats(german, undeterminedUnd, undeterminedNull),
+            PERIOD_ID);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(undeterminedUnd);
 
-    result = trackSelector.selectTracks(textRendererCapabilites,
-        wrapFormats(german, undeterminedNull));
+    result =
+        trackSelector.selectTracks(
+            textRendererCapabilites, wrapFormats(german, undeterminedNull), PERIOD_ID);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(undeterminedNull);
 
-    result = trackSelector.selectTracks(textRendererCapabilites, wrapFormats(german));
+    result = trackSelector.selectTracks(textRendererCapabilites, wrapFormats(german), PERIOD_ID);
     assertThat(result.selections.get(0)).isNull();
   }
 
@@ -908,19 +985,21 @@ public final class DefaultTrackSelectorTest {
 
     // Without an explicit language preference, nothing should be selected.
     TrackSelectorResult result =
-        trackSelector.selectTracks(rendererCapabilities, wrapFormats(english, german));
+        trackSelector.selectTracks(rendererCapabilities, wrapFormats(english, german), PERIOD_ID);
     assertThat(result.selections.get(0)).isNull();
     assertThat(result.selections.get(1)).isNull();
 
     // Explicit language preference for english. First renderer should be used.
     trackSelector.setParameters(trackSelector.buildUponParameters().setPreferredTextLanguage("en"));
-    result = trackSelector.selectTracks(rendererCapabilities, wrapFormats(english, german));
+    result =
+        trackSelector.selectTracks(rendererCapabilities, wrapFormats(english, german), PERIOD_ID);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(english);
     assertThat(result.selections.get(1)).isNull();
 
     // Explicit language preference for German. Second renderer should be used.
     trackSelector.setParameters(trackSelector.buildUponParameters().setPreferredTextLanguage("de"));
-    result = trackSelector.selectTracks(rendererCapabilities, wrapFormats(english, german));
+    result =
+        trackSelector.selectTracks(rendererCapabilities, wrapFormats(english, german), PERIOD_ID);
     assertThat(result.selections.get(0)).isNull();
     assertThat(result.selections.get(1).getFormat(0)).isSameAs(german);
   }
@@ -941,9 +1020,11 @@ public final class DefaultTrackSelectorTest {
         Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, 30000,
             Format.NO_VALUE, 2, 44100, null, null, 0, null);
 
-    TrackSelectorResult result = trackSelector.selectTracks(
-        new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
-        singleTrackGroup(lowerBitrateFormat, higherBitrateFormat));
+    TrackSelectorResult result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
+            singleTrackGroup(lowerBitrateFormat, higherBitrateFormat),
+            PERIOD_ID);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(lowerBitrateFormat);
   }
@@ -962,7 +1043,7 @@ public final class DefaultTrackSelectorTest {
     TrackGroupArray trackGroupArray = singleTrackGroup(AUDIO_FORMAT, AUDIO_FORMAT);
     TrackSelectorResult result =
         trackSelector.selectTracks(
-            new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroupArray);
+            new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroupArray, PERIOD_ID);
 
     assertThat(result.length).isEqualTo(1);
     assertThat(result.selections.get(0)).isEqualTo(adaptiveTrackSelection);
@@ -991,7 +1072,7 @@ public final class DefaultTrackSelectorTest {
                 new SelectionOverride(/* groupIndex= */ 0, /* tracks= */ 1, 2)));
     TrackSelectorResult result =
         trackSelector.selectTracks(
-            new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroupArray);
+            new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroupArray, PERIOD_ID);
 
     assertThat(result.length).isEqualTo(1);
     assertThat(result.selections.get(0)).isEqualTo(adaptiveTrackSelection);
@@ -1024,21 +1105,23 @@ public final class DefaultTrackSelectorTest {
 
     // Without an explicit language preference, prefer the first renderer.
     TrackSelectorResult result =
-        trackSelector.selectTracks(rendererCapabilities, wrapFormats(english, german));
+        trackSelector.selectTracks(rendererCapabilities, wrapFormats(english, german), PERIOD_ID);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(english);
     assertThat(result.selections.get(1)).isNull();
 
     // Explicit language preference for english. First renderer should be used.
     trackSelector.setParameters(
         trackSelector.buildUponParameters().setPreferredAudioLanguage("en"));
-    result = trackSelector.selectTracks(rendererCapabilities, wrapFormats(english, german));
+    result =
+        trackSelector.selectTracks(rendererCapabilities, wrapFormats(english, german), PERIOD_ID);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(english);
     assertThat(result.selections.get(1)).isNull();
 
     // Explicit language preference for German. Second renderer should be used.
     trackSelector.setParameters(
         trackSelector.buildUponParameters().setPreferredAudioLanguage("de"));
-    result = trackSelector.selectTracks(rendererCapabilities, wrapFormats(english, german));
+    result =
+        trackSelector.selectTracks(rendererCapabilities, wrapFormats(english, german), PERIOD_ID);
     assertThat(result.selections.get(0)).isNull();
     assertThat(result.selections.get(1).getFormat(0)).isSameAs(german);
   }
@@ -1057,7 +1140,7 @@ public final class DefaultTrackSelectorTest {
     TrackGroupArray trackGroupArray = singleTrackGroup(VIDEO_FORMAT, VIDEO_FORMAT);
     TrackSelectorResult result =
         trackSelector.selectTracks(
-            new RendererCapabilities[] {VIDEO_CAPABILITIES}, trackGroupArray);
+            new RendererCapabilities[] {VIDEO_CAPABILITIES}, trackGroupArray, PERIOD_ID);
 
     assertThat(result.length).isEqualTo(1);
     assertThat(result.selections.get(0)).isEqualTo(adaptiveTrackSelection);
@@ -1086,7 +1169,7 @@ public final class DefaultTrackSelectorTest {
                 new SelectionOverride(/* groupIndex= */ 0, /* tracks= */ 1, 2)));
     TrackSelectorResult result =
         trackSelector.selectTracks(
-            new RendererCapabilities[] {VIDEO_CAPABILITIES}, trackGroupArray);
+            new RendererCapabilities[] {VIDEO_CAPABILITIES}, trackGroupArray, PERIOD_ID);
 
     assertThat(result.length).isEqualTo(1);
     assertThat(result.selections.get(0)).isEqualTo(adaptiveTrackSelection);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java
index fa3d74b15f..3899ebfd37 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java
@@ -23,6 +23,7 @@ import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.RendererCapabilities;
 import com.google.android.exoplayer2.RendererConfiguration;
+import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.util.MimeTypes;
@@ -51,6 +52,7 @@ public final class MappingTrackSelectorTest {
           Format.NO_VALUE, 2, 44100, null, null, 0, null));
   private static final TrackGroupArray TRACK_GROUPS = new TrackGroupArray(
       VIDEO_TRACK_GROUP, AUDIO_TRACK_GROUP);
+  private static final MediaPeriodId PERIOD_ID = new MediaPeriodId(/* periodUid= */ new Object());
 
   /**
    * Tests that the video and audio track groups are mapped onto the correct renderers.
@@ -58,7 +60,7 @@ public final class MappingTrackSelectorTest {
   @Test
   public void testMapping() throws ExoPlaybackException {
     FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector();
-    trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS);
+    trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS, PERIOD_ID);
     trackSelector.assertMappedTrackGroups(0, VIDEO_TRACK_GROUP);
     trackSelector.assertMappedTrackGroups(1, AUDIO_TRACK_GROUP);
   }
@@ -72,7 +74,7 @@ public final class MappingTrackSelectorTest {
     FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector();
     RendererCapabilities[] reverseOrderRendererCapabilities = new RendererCapabilities[] {
         AUDIO_CAPABILITIES, VIDEO_CAPABILITIES};
-    trackSelector.selectTracks(reverseOrderRendererCapabilities, TRACK_GROUPS);
+    trackSelector.selectTracks(reverseOrderRendererCapabilities, TRACK_GROUPS, PERIOD_ID);
     trackSelector.assertMappedTrackGroups(0, AUDIO_TRACK_GROUP);
     trackSelector.assertMappedTrackGroups(1, VIDEO_TRACK_GROUP);
   }
@@ -86,7 +88,7 @@ public final class MappingTrackSelectorTest {
     FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector();
     TrackGroupArray multiTrackGroups = new TrackGroupArray(VIDEO_TRACK_GROUP, AUDIO_TRACK_GROUP,
         VIDEO_TRACK_GROUP);
-    trackSelector.selectTracks(RENDERER_CAPABILITIES, multiTrackGroups);
+    trackSelector.selectTracks(RENDERER_CAPABILITIES, multiTrackGroups, PERIOD_ID);
     trackSelector.assertMappedTrackGroups(0, VIDEO_TRACK_GROUP, VIDEO_TRACK_GROUP);
     trackSelector.assertMappedTrackGroups(1, AUDIO_TRACK_GROUP);
   }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectorTest.java
index 615f680bb5..781f2b4fc9 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectorTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.fail;
 
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.RendererCapabilities;
+import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.trackselection.TrackSelector.InvalidationListener;
 import com.google.android.exoplayer2.upstream.BandwidthMeter;
@@ -37,16 +38,20 @@ public class TrackSelectorTest {
 
   @Before
   public void setUp() {
-    trackSelector = new TrackSelector() {
-      @Override
-      public TrackSelectorResult selectTracks(RendererCapabilities[] rendererCapabilities,
-          TrackGroupArray trackGroups) throws ExoPlaybackException {
-        throw new UnsupportedOperationException();
-      }
+    trackSelector =
+        new TrackSelector() {
+          @Override
+          public TrackSelectorResult selectTracks(
+              RendererCapabilities[] rendererCapabilities,
+              TrackGroupArray trackGroups,
+              MediaPeriodId periodId)
+              throws ExoPlaybackException {
+            throw new UnsupportedOperationException();
+          }
 
-      @Override
-      public void onSelectionActivated(Object info) {}
-    };
+          @Override
+          public void onSelectionActivated(Object info) {}
+        };
   }
 
   @Test

From d487b599f8404a6af0a50f606e8acff237e45d1e Mon Sep 17 00:00:00 2001
From: cblay <cblay@google.com>
Date: Wed, 26 Sep 2018 12:36:47 -0700
Subject: [PATCH 026/832] Also plumb new Timeline through to
 TrackSelector.selectTracks() so periodId is useful

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=214650418
---
 .../android/exoplayer2/ExoPlayerImpl.java     |   3 +-
 .../exoplayer2/ExoPlayerImplInternal.java     |   5 +-
 .../android/exoplayer2/MediaPeriodHolder.java |   8 +-
 .../trackselection/MappingTrackSelector.java  |   4 +-
 .../trackselection/TrackSelector.java         |  29 ++--
 .../DefaultTrackSelectorTest.java             | 162 ++++++++++++------
 .../MappingTrackSelectorTest.java             |  18 +-
 .../trackselection/TrackSelectorTest.java     |   4 +-
 8 files changed, 152 insertions(+), 81 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index 96e7703559..5d565cdc90 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -51,7 +51,8 @@ import java.util.concurrent.CopyOnWriteArraySet;
    * This empty track selector result can only be used for {@link PlaybackInfo#trackSelectorResult}
    * when the player does not have any track selection made (such as when player is reset, or when
    * player seeks to an unprepared period). It will not be used as result of any {@link
-   * TrackSelector#selectTracks(RendererCapabilities[], TrackGroupArray, MediaPeriodId)} operation.
+   * TrackSelector#selectTracks(RendererCapabilities[], TrackGroupArray, MediaPeriodId, Timeline)}
+   * operation.
    */
   /* package */ final TrackSelectorResult emptyTrackSelectorResult;
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index d861020d26..1d5125384f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -998,7 +998,7 @@ import java.util.Collections;
         // The reselection did not change any prepared periods.
         return;
       }
-      if (periodHolder.selectTracks(playbackSpeed)) {
+      if (periodHolder.selectTracks(playbackSpeed, playbackInfo.timeline)) {
         // Selected tracks have changed for this period.
         break;
       }
@@ -1531,7 +1531,8 @@ import java.util.Collections;
       return;
     }
     MediaPeriodHolder loadingPeriodHolder = queue.getLoadingPeriod();
-    loadingPeriodHolder.handlePrepared(mediaClock.getPlaybackParameters().speed);
+    loadingPeriodHolder.handlePrepared(
+        mediaClock.getPlaybackParameters().speed, playbackInfo.timeline);
     updateLoadControlTrackSelection(
         loadingPeriodHolder.trackGroups, loadingPeriodHolder.trackSelectorResult);
     if (!queue.hasPlayingPeriod()) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
index 70c9354e71..a59ee61088 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
@@ -140,10 +140,10 @@ import com.google.android.exoplayer2.util.Log;
     return !prepared ? 0 : mediaPeriod.getNextLoadPositionUs();
   }
 
-  public void handlePrepared(float playbackSpeed) throws ExoPlaybackException {
+  public void handlePrepared(float playbackSpeed, Timeline timeline) throws ExoPlaybackException {
     prepared = true;
     trackGroups = mediaPeriod.getTrackGroups();
-    selectTracks(playbackSpeed);
+    selectTracks(playbackSpeed, timeline);
     long newStartPositionUs = applyTrackSelection(info.startPositionUs, false);
     rendererPositionOffsetUs += info.startPositionUs - newStartPositionUs;
     info = info.copyWithStartPositionUs(newStartPositionUs);
@@ -160,9 +160,9 @@ import com.google.android.exoplayer2.util.Log;
     mediaPeriod.continueLoading(loadingPeriodPositionUs);
   }
 
-  public boolean selectTracks(float playbackSpeed) throws ExoPlaybackException {
+  public boolean selectTracks(float playbackSpeed, Timeline timeline) throws ExoPlaybackException {
     TrackSelectorResult selectorResult =
-        trackSelector.selectTracks(rendererCapabilities, trackGroups, info.id);
+        trackSelector.selectTracks(rendererCapabilities, trackGroups, info.id, timeline);
     if (selectorResult.isEquivalent(periodTrackSelectorResult)) {
       return false;
     }
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 ce5dff8556..81fbc16630 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
@@ -23,6 +23,7 @@ import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.Renderer;
 import com.google.android.exoplayer2.RendererCapabilities;
 import com.google.android.exoplayer2.RendererConfiguration;
+import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
@@ -330,7 +331,8 @@ public abstract class MappingTrackSelector extends TrackSelector {
   public final TrackSelectorResult selectTracks(
       RendererCapabilities[] rendererCapabilities,
       TrackGroupArray trackGroups,
-      MediaPeriodId periodId)
+      MediaPeriodId periodId,
+      Timeline timeline)
       throws ExoPlaybackException {
     // Structures into which data will be written during the selection. The extra item at the end
     // of each array is to store data associated with track groups that cannot be associated with
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java
index bc2460036c..2a66186b29 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java
@@ -21,6 +21,7 @@ import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Renderer;
 import com.google.android.exoplayer2.RendererCapabilities;
 import com.google.android.exoplayer2.RendererConfiguration;
+import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.upstream.BandwidthMeter;
@@ -41,9 +42,9 @@ import com.google.android.exoplayer2.util.Assertions;
  *   <li>When the player is created it will initialize the track selector by calling {@link
  *       #init(InvalidationListener, BandwidthMeter)}.
  *   <li>When the player needs to make a track selection it will call {@link
- *       #selectTracks(RendererCapabilities[], TrackGroupArray, MediaPeriodId)}. This typically
- *       occurs at the start of playback, when the player starts to buffer a new period of the media
- *       being played, and when the track selector invalidates its previous selections.
+ *       #selectTracks(RendererCapabilities[], TrackGroupArray, MediaPeriodId, Timeline)}. This
+ *       typically occurs at the start of playback, when the player starts to buffer a new period of
+ *       the media being played, and when the track selector invalidates its previous selections.
  *   <li>The player may perform a track selection well in advance of the selected tracks becoming
  *       active, where active is defined to mean that the renderers are actually consuming media
  *       corresponding to the selection that was made. For example when playing media containing
@@ -67,14 +68,14 @@ import com.google.android.exoplayer2.util.Assertions;
  * <h3>Renderer configuration</h3>
  *
  * The {@link TrackSelectorResult} returned by {@link #selectTracks(RendererCapabilities[],
- * TrackGroupArray, MediaPeriodId)} contains not only {@link TrackSelection}s for each renderer, but
- * also {@link RendererConfiguration}s defining configuration parameters that the renderers should
- * apply when consuming the corresponding media. Whilst it may seem counter-intuitive for a track
- * selector to also specify renderer configuration information, in practice the two are tightly
- * bound together. It may only be possible to play a certain combination tracks if the renderers are
- * configured in a particular way. Equally, it may only be possible to configure renderers in a
- * particular way if certain tracks are selected. Hence it makes sense to determined the track
- * selection and corresponding renderer configurations in a single step.
+ * TrackGroupArray, MediaPeriodId, Timeline)} contains not only {@link TrackSelection}s for each
+ * renderer, but also {@link RendererConfiguration}s defining configuration parameters that the
+ * renderers should apply when consuming the corresponding media. Whilst it may seem counter-
+ * intuitive for a track selector to also specify renderer configuration information, in practice
+ * the two are tightly bound together. It may only be possible to play a certain combination tracks
+ * if the renderers are configured in a particular way. Equally, it may only be possible to
+ * configure renderers in a particular way if certain tracks are selected. Hence it makes sense to
+ * determined the track selection and corresponding renderer configurations in a single step.
  *
  * <h3>Threading model</h3>
  *
@@ -119,18 +120,20 @@ public abstract class TrackSelector {
    *     are to be selected.
    * @param trackGroups The available track groups.
    * @param periodId The {@link MediaPeriodId} of the period for which tracks are to be selected.
+   * @param timeline The {@link Timeline} holding the period for which tracks are to be selected.
    * @return A {@link TrackSelectorResult} describing the track selections.
    * @throws ExoPlaybackException If an error occurs selecting tracks.
    */
   public abstract TrackSelectorResult selectTracks(
       RendererCapabilities[] rendererCapabilities,
       TrackGroupArray trackGroups,
-      MediaPeriodId periodId)
+      MediaPeriodId periodId,
+      Timeline timeline)
       throws ExoPlaybackException;
 
   /**
    * Called by the player when a {@link TrackSelectorResult} previously generated by {@link
-   * #selectTracks(RendererCapabilities[], TrackGroupArray, MediaPeriodId)} is activated.
+   * #selectTracks(RendererCapabilities[], TrackGroupArray, MediaPeriodId, Timeline)} is activated.
    *
    * @param info The value of {@link TrackSelectorResult#info} in the activated selection.
    */
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
index 4b1357c1a6..ee3d2cf9b0 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
@@ -37,9 +37,11 @@ import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.RendererCapabilities;
 import com.google.android.exoplayer2.RendererConfiguration;
+import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.testutil.FakeTimeline;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.Parameters;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.ParametersBuilder;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.SelectionOverride;
@@ -49,6 +51,7 @@ import com.google.android.exoplayer2.util.MimeTypes;
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -91,14 +94,20 @@ public final class DefaultTrackSelectorTest {
       };
   private static final TrackSelection[] TRACK_SELECTIONS_WITH_NO_SAMPLE_RENDERER =
       new TrackSelection[] {new FixedTrackSelection(VIDEO_TRACK_GROUP, 0), null};
-  private static final MediaPeriodId PERIOD_ID = new MediaPeriodId(/* periodUid= */ new Object());
+  private static final Timeline TIMELINE = new FakeTimeline(/* windowCount= */ 1);
 
-  @Mock
-  private InvalidationListener invalidationListener;
+  private static MediaPeriodId periodId;
+
+  @Mock private InvalidationListener invalidationListener;
   @Mock private BandwidthMeter bandwidthMeter;
 
   private DefaultTrackSelector trackSelector;
 
+  @BeforeClass
+  public static void setUpBeforeClass() {
+    periodId = new MediaPeriodId(TIMELINE.getUidOfPeriod(/* periodIndex= */ 0));
+  }
+
   @Before
   public void setUp() {
     initMocks(this);
@@ -179,7 +188,7 @@ public final class DefaultTrackSelectorTest {
             .buildUponParameters()
             .setSelectionOverride(0, new TrackGroupArray(VIDEO_TRACK_GROUP), null));
     TrackSelectorResult result =
-        trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS, PERIOD_ID);
+        trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS, periodId, TIMELINE);
     assertTrackSelections(result, new TrackSelection[] {null, TRACK_SELECTIONS[1]});
     assertThat(result.rendererConfigurations)
         .isEqualTo(new RendererConfiguration[] {null, DEFAULT});
@@ -196,7 +205,7 @@ public final class DefaultTrackSelectorTest {
             .setSelectionOverride(0, new TrackGroupArray(VIDEO_TRACK_GROUP), null)
             .clearSelectionOverride(0, new TrackGroupArray(VIDEO_TRACK_GROUP)));
     TrackSelectorResult result =
-        trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS, PERIOD_ID);
+        trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS, periodId, TIMELINE);
     assertTrackSelections(result, TRACK_SELECTIONS);
     assertThat(result.rendererConfigurations)
         .isEqualTo(new RendererConfiguration[] {DEFAULT, DEFAULT});
@@ -215,7 +224,8 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             RENDERER_CAPABILITIES,
             new TrackGroupArray(VIDEO_TRACK_GROUP, AUDIO_TRACK_GROUP, VIDEO_TRACK_GROUP),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
     assertTrackSelections(result, TRACK_SELECTIONS);
     assertThat(result.rendererConfigurations)
         .isEqualTo(new RendererConfiguration[] {DEFAULT, DEFAULT});
@@ -228,7 +238,7 @@ public final class DefaultTrackSelectorTest {
     trackSelector.init(invalidationListener, bandwidthMeter);
     trackSelector.setParameters(trackSelector.buildUponParameters().setRendererDisabled(1, true));
     TrackSelectorResult result =
-        trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS, PERIOD_ID);
+        trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS, periodId, TIMELINE);
     assertTrackSelections(result, new TrackSelection[] {TRACK_SELECTIONS[0], null});
     assertThat(new RendererConfiguration[] {DEFAULT, null})
         .isEqualTo(result.rendererConfigurations);
@@ -245,7 +255,7 @@ public final class DefaultTrackSelectorTest {
             .setRendererDisabled(1, true)
             .setRendererDisabled(1, false));
     TrackSelectorResult result =
-        trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS, PERIOD_ID);
+        trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS, periodId, TIMELINE);
     assertTrackSelections(result, TRACK_SELECTIONS);
     assertThat(new RendererConfiguration[] {DEFAULT, DEFAULT})
         .isEqualTo(result.rendererConfigurations);
@@ -258,7 +268,7 @@ public final class DefaultTrackSelectorTest {
     trackSelector.init(invalidationListener, bandwidthMeter);
     TrackSelectorResult result =
         trackSelector.selectTracks(
-            RENDERER_CAPABILITIES_WITH_NO_SAMPLE_RENDERER, TRACK_GROUPS, PERIOD_ID);
+            RENDERER_CAPABILITIES_WITH_NO_SAMPLE_RENDERER, TRACK_GROUPS, periodId, TIMELINE);
     assertTrackSelections(result, TRACK_SELECTIONS_WITH_NO_SAMPLE_RENDERER);
     assertThat(new RendererConfiguration[] {DEFAULT, DEFAULT})
         .isEqualTo(result.rendererConfigurations);
@@ -272,7 +282,7 @@ public final class DefaultTrackSelectorTest {
     trackSelector.setParameters(trackSelector.buildUponParameters().setRendererDisabled(1, true));
     TrackSelectorResult result =
         trackSelector.selectTracks(
-            RENDERER_CAPABILITIES_WITH_NO_SAMPLE_RENDERER, TRACK_GROUPS, PERIOD_ID);
+            RENDERER_CAPABILITIES_WITH_NO_SAMPLE_RENDERER, TRACK_GROUPS, periodId, TIMELINE);
     assertTrackSelections(result, TRACK_SELECTIONS_WITH_NO_SAMPLE_RENDERER);
     assertThat(new RendererConfiguration[] {DEFAULT, null})
         .isEqualTo(result.rendererConfigurations);
@@ -335,7 +345,8 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
             singleTrackGroup(formatWithSelectionFlag, audioFormat),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(formatWithSelectionFlag);
   }
 
@@ -359,7 +370,8 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
             wrapFormats(frAudioFormat, enAudioFormat),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(enAudioFormat);
   }
@@ -384,7 +396,8 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
             wrapFormats(frAudioFormat, enAudioFormat),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(enAudioFormat);
   }
@@ -408,7 +421,8 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             new RendererCapabilities[] {mappedAudioRendererCapabilities},
             singleTrackGroup(exceededFormat, supportedFormat),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(supportedFormat);
   }
@@ -427,7 +441,8 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
             singleTrackGroup(audioFormat),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(audioFormat);
   }
@@ -450,7 +465,8 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
             singleTrackGroup(audioFormat),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
 
     assertThat(result.selections.get(0)).isNull();
   }
@@ -479,7 +495,8 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             new RendererCapabilities[] {mappedAudioRendererCapabilities},
             singleTrackGroup(exceededWithSelectionFlagFormat, supportedFormat),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(supportedFormat);
   }
@@ -511,7 +528,8 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             new RendererCapabilities[] {mappedAudioRendererCapabilities},
             singleTrackGroup(exceededEnFormat, supportedFrFormat),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(supportedFrFormat);
   }
@@ -543,7 +561,8 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             new RendererCapabilities[] {mappedAudioRendererCapabilities},
             singleTrackGroup(exceededDefaultSelectionEnFormat, supportedFrFormat),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(supportedFrFormat);
   }
@@ -566,7 +585,8 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
             singleTrackGroup(higherChannelFormat, lowerChannelFormat),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(higherChannelFormat);
   }
@@ -589,7 +609,8 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
             singleTrackGroup(higherSampleRateFormat, lowerSampleRateFormat),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(higherSampleRateFormat);
   }
@@ -612,7 +633,8 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
             singleTrackGroup(lowerBitrateFormat, higherBitrateFormat),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(higherBitrateFormat);
   }
@@ -637,7 +659,8 @@ public final class DefaultTrackSelectorTest {
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
             singleTrackGroup(
                 higherChannelLowerSampleRateFormat, lowerChannelHigherSampleRateFormat),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
 
     assertThat(result.selections.get(0).getSelectedFormat())
         .isEqualTo(higherChannelLowerSampleRateFormat);
@@ -663,7 +686,8 @@ public final class DefaultTrackSelectorTest {
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
             singleTrackGroup(
                 higherSampleRateLowerBitrateFormat, lowerSampleRateHigherBitrateFormat),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
 
     assertThat(result.selections.get(0).getSelectedFormat())
         .isEqualTo(higherSampleRateLowerBitrateFormat);
@@ -687,7 +711,8 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
             singleTrackGroup(higherChannelFormat, lowerChannelFormat),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(lowerChannelFormat);
   }
@@ -710,7 +735,8 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
             singleTrackGroup(higherSampleRateFormat, lowerSampleRateFormat),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(lowerSampleRateFormat);
   }
@@ -733,7 +759,8 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
             singleTrackGroup(lowerBitrateFormat, higherBitrateFormat),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(lowerBitrateFormat);
   }
@@ -758,7 +785,8 @@ public final class DefaultTrackSelectorTest {
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
             singleTrackGroup(
                 higherChannelLowerSampleRateFormat, lowerChannelHigherSampleRateFormat),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
 
     assertThat(result.selections.get(0).getSelectedFormat())
         .isEqualTo(lowerChannelHigherSampleRateFormat);
@@ -784,7 +812,8 @@ public final class DefaultTrackSelectorTest {
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
             singleTrackGroup(
                 higherSampleRateLowerBitrateFormat, lowerSampleRateHigherBitrateFormat),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
 
     assertThat(result.selections.get(0).getSelectedFormat())
         .isEqualTo(lowerSampleRateHigherBitrateFormat);
@@ -808,20 +837,24 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             textRendererCapabilities,
             wrapFormats(forcedOnly, forcedDefault, defaultOnly, noFlag),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(forcedDefault);
 
     // Ditto.
     result =
         trackSelector.selectTracks(
-            textRendererCapabilities, wrapFormats(forcedOnly, noFlag, defaultOnly), PERIOD_ID);
+            textRendererCapabilities,
+            wrapFormats(forcedOnly, noFlag, defaultOnly),
+            periodId,
+            TIMELINE);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(defaultOnly);
 
     // With no language preference and no text track flagged as default, the first forced should be
     // selected.
     result =
         trackSelector.selectTracks(
-            textRendererCapabilities, wrapFormats(forcedOnly, noFlag), PERIOD_ID);
+            textRendererCapabilities, wrapFormats(forcedOnly, noFlag), periodId, TIMELINE);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(forcedOnly);
 
     trackSelector.setParameters(
@@ -835,7 +868,8 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             textRendererCapabilities,
             wrapFormats(defaultOnly, noFlag, forcedOnly, forcedDefault),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(forcedOnly);
 
     trackSelector.setParameters(
@@ -847,7 +881,8 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             textRendererCapabilities,
             wrapFormats(forcedDefault, forcedOnly, defaultOnly, noFlag, forcedOnlySpanish),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(forcedOnlySpanish);
 
     trackSelector.setParameters(
@@ -863,7 +898,8 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             textRendererCapabilities,
             wrapFormats(forcedOnly, forcedDefault, defaultOnly, noFlag),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
     assertThat(result.selections.get(0)).isNull();
 
     trackSelector.setParameters(
@@ -875,7 +911,8 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             textRendererCapabilities,
             wrapFormats(forcedOnly, forcedDefault, defaultOnly, noFlag),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(forcedDefault);
 
     trackSelector.setParameters(
@@ -892,7 +929,8 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             textRendererCapabilities,
             wrapFormats(noFlag, forcedOnly, forcedDefault, defaultOnly),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(noFlag);
   }
 
@@ -915,7 +953,8 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             textRendererCapabilites,
             wrapFormats(spanish, german, undeterminedUnd, undeterminedNull),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
     assertThat(result.selections.get(0)).isNull();
 
     trackSelector.setParameters(
@@ -924,7 +963,8 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             textRendererCapabilites,
             wrapFormats(spanish, german, undeterminedUnd, undeterminedNull),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(undeterminedUnd);
 
     ParametersBuilder builder = new ParametersBuilder().setPreferredTextLanguage("spa");
@@ -933,14 +973,16 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             textRendererCapabilites,
             wrapFormats(spanish, german, undeterminedUnd, undeterminedNull),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(spanish);
 
     result =
         trackSelector.selectTracks(
             textRendererCapabilites,
             wrapFormats(german, undeterminedUnd, undeterminedNull),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
     assertThat(result.selections.get(0)).isNull();
 
     trackSelector.setParameters(builder.setSelectUndeterminedTextLanguage(true).build());
@@ -948,15 +990,18 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             textRendererCapabilites,
             wrapFormats(german, undeterminedUnd, undeterminedNull),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(undeterminedUnd);
 
     result =
         trackSelector.selectTracks(
-            textRendererCapabilites, wrapFormats(german, undeterminedNull), PERIOD_ID);
+            textRendererCapabilites, wrapFormats(german, undeterminedNull), periodId, TIMELINE);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(undeterminedNull);
 
-    result = trackSelector.selectTracks(textRendererCapabilites, wrapFormats(german), PERIOD_ID);
+    result =
+        trackSelector.selectTracks(
+            textRendererCapabilites, wrapFormats(german), periodId, TIMELINE);
     assertThat(result.selections.get(0)).isNull();
   }
 
@@ -985,21 +1030,24 @@ public final class DefaultTrackSelectorTest {
 
     // Without an explicit language preference, nothing should be selected.
     TrackSelectorResult result =
-        trackSelector.selectTracks(rendererCapabilities, wrapFormats(english, german), PERIOD_ID);
+        trackSelector.selectTracks(
+            rendererCapabilities, wrapFormats(english, german), periodId, TIMELINE);
     assertThat(result.selections.get(0)).isNull();
     assertThat(result.selections.get(1)).isNull();
 
     // Explicit language preference for english. First renderer should be used.
     trackSelector.setParameters(trackSelector.buildUponParameters().setPreferredTextLanguage("en"));
     result =
-        trackSelector.selectTracks(rendererCapabilities, wrapFormats(english, german), PERIOD_ID);
+        trackSelector.selectTracks(
+            rendererCapabilities, wrapFormats(english, german), periodId, TIMELINE);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(english);
     assertThat(result.selections.get(1)).isNull();
 
     // Explicit language preference for German. Second renderer should be used.
     trackSelector.setParameters(trackSelector.buildUponParameters().setPreferredTextLanguage("de"));
     result =
-        trackSelector.selectTracks(rendererCapabilities, wrapFormats(english, german), PERIOD_ID);
+        trackSelector.selectTracks(
+            rendererCapabilities, wrapFormats(english, german), periodId, TIMELINE);
     assertThat(result.selections.get(0)).isNull();
     assertThat(result.selections.get(1).getFormat(0)).isSameAs(german);
   }
@@ -1024,7 +1072,8 @@ public final class DefaultTrackSelectorTest {
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
             singleTrackGroup(lowerBitrateFormat, higherBitrateFormat),
-            PERIOD_ID);
+            periodId,
+            TIMELINE);
 
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(lowerBitrateFormat);
   }
@@ -1043,7 +1092,7 @@ public final class DefaultTrackSelectorTest {
     TrackGroupArray trackGroupArray = singleTrackGroup(AUDIO_FORMAT, AUDIO_FORMAT);
     TrackSelectorResult result =
         trackSelector.selectTracks(
-            new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroupArray, PERIOD_ID);
+            new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroupArray, periodId, TIMELINE);
 
     assertThat(result.length).isEqualTo(1);
     assertThat(result.selections.get(0)).isEqualTo(adaptiveTrackSelection);
@@ -1072,7 +1121,7 @@ public final class DefaultTrackSelectorTest {
                 new SelectionOverride(/* groupIndex= */ 0, /* tracks= */ 1, 2)));
     TrackSelectorResult result =
         trackSelector.selectTracks(
-            new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroupArray, PERIOD_ID);
+            new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroupArray, periodId, TIMELINE);
 
     assertThat(result.length).isEqualTo(1);
     assertThat(result.selections.get(0)).isEqualTo(adaptiveTrackSelection);
@@ -1105,7 +1154,8 @@ public final class DefaultTrackSelectorTest {
 
     // Without an explicit language preference, prefer the first renderer.
     TrackSelectorResult result =
-        trackSelector.selectTracks(rendererCapabilities, wrapFormats(english, german), PERIOD_ID);
+        trackSelector.selectTracks(
+            rendererCapabilities, wrapFormats(english, german), periodId, TIMELINE);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(english);
     assertThat(result.selections.get(1)).isNull();
 
@@ -1113,7 +1163,8 @@ public final class DefaultTrackSelectorTest {
     trackSelector.setParameters(
         trackSelector.buildUponParameters().setPreferredAudioLanguage("en"));
     result =
-        trackSelector.selectTracks(rendererCapabilities, wrapFormats(english, german), PERIOD_ID);
+        trackSelector.selectTracks(
+            rendererCapabilities, wrapFormats(english, german), periodId, TIMELINE);
     assertThat(result.selections.get(0).getFormat(0)).isSameAs(english);
     assertThat(result.selections.get(1)).isNull();
 
@@ -1121,7 +1172,8 @@ public final class DefaultTrackSelectorTest {
     trackSelector.setParameters(
         trackSelector.buildUponParameters().setPreferredAudioLanguage("de"));
     result =
-        trackSelector.selectTracks(rendererCapabilities, wrapFormats(english, german), PERIOD_ID);
+        trackSelector.selectTracks(
+            rendererCapabilities, wrapFormats(english, german), periodId, TIMELINE);
     assertThat(result.selections.get(0)).isNull();
     assertThat(result.selections.get(1).getFormat(0)).isSameAs(german);
   }
@@ -1140,7 +1192,7 @@ public final class DefaultTrackSelectorTest {
     TrackGroupArray trackGroupArray = singleTrackGroup(VIDEO_FORMAT, VIDEO_FORMAT);
     TrackSelectorResult result =
         trackSelector.selectTracks(
-            new RendererCapabilities[] {VIDEO_CAPABILITIES}, trackGroupArray, PERIOD_ID);
+            new RendererCapabilities[] {VIDEO_CAPABILITIES}, trackGroupArray, periodId, TIMELINE);
 
     assertThat(result.length).isEqualTo(1);
     assertThat(result.selections.get(0)).isEqualTo(adaptiveTrackSelection);
@@ -1169,7 +1221,7 @@ public final class DefaultTrackSelectorTest {
                 new SelectionOverride(/* groupIndex= */ 0, /* tracks= */ 1, 2)));
     TrackSelectorResult result =
         trackSelector.selectTracks(
-            new RendererCapabilities[] {VIDEO_CAPABILITIES}, trackGroupArray, PERIOD_ID);
+            new RendererCapabilities[] {VIDEO_CAPABILITIES}, trackGroupArray, periodId, TIMELINE);
 
     assertThat(result.length).isEqualTo(1);
     assertThat(result.selections.get(0)).isEqualTo(adaptiveTrackSelection);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java
index 3899ebfd37..140a9733b3 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java
@@ -23,10 +23,13 @@ import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.RendererCapabilities;
 import com.google.android.exoplayer2.RendererConfiguration;
+import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.testutil.FakeTimeline;
 import com.google.android.exoplayer2.util.MimeTypes;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -52,7 +55,14 @@ public final class MappingTrackSelectorTest {
           Format.NO_VALUE, 2, 44100, null, null, 0, null));
   private static final TrackGroupArray TRACK_GROUPS = new TrackGroupArray(
       VIDEO_TRACK_GROUP, AUDIO_TRACK_GROUP);
-  private static final MediaPeriodId PERIOD_ID = new MediaPeriodId(/* periodUid= */ new Object());
+  private static final Timeline TIMELINE = new FakeTimeline(/* windowCount= */ 1);
+
+  private static MediaPeriodId periodId;
+
+  @BeforeClass
+  public static void setUpBeforeClass() {
+    periodId = new MediaPeriodId(TIMELINE.getUidOfPeriod(/* periodIndex= */ 0));
+  }
 
   /**
    * Tests that the video and audio track groups are mapped onto the correct renderers.
@@ -60,7 +70,7 @@ public final class MappingTrackSelectorTest {
   @Test
   public void testMapping() throws ExoPlaybackException {
     FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector();
-    trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS, PERIOD_ID);
+    trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS, periodId, TIMELINE);
     trackSelector.assertMappedTrackGroups(0, VIDEO_TRACK_GROUP);
     trackSelector.assertMappedTrackGroups(1, AUDIO_TRACK_GROUP);
   }
@@ -74,7 +84,7 @@ public final class MappingTrackSelectorTest {
     FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector();
     RendererCapabilities[] reverseOrderRendererCapabilities = new RendererCapabilities[] {
         AUDIO_CAPABILITIES, VIDEO_CAPABILITIES};
-    trackSelector.selectTracks(reverseOrderRendererCapabilities, TRACK_GROUPS, PERIOD_ID);
+    trackSelector.selectTracks(reverseOrderRendererCapabilities, TRACK_GROUPS, periodId, TIMELINE);
     trackSelector.assertMappedTrackGroups(0, AUDIO_TRACK_GROUP);
     trackSelector.assertMappedTrackGroups(1, VIDEO_TRACK_GROUP);
   }
@@ -88,7 +98,7 @@ public final class MappingTrackSelectorTest {
     FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector();
     TrackGroupArray multiTrackGroups = new TrackGroupArray(VIDEO_TRACK_GROUP, AUDIO_TRACK_GROUP,
         VIDEO_TRACK_GROUP);
-    trackSelector.selectTracks(RENDERER_CAPABILITIES, multiTrackGroups, PERIOD_ID);
+    trackSelector.selectTracks(RENDERER_CAPABILITIES, multiTrackGroups, periodId, TIMELINE);
     trackSelector.assertMappedTrackGroups(0, VIDEO_TRACK_GROUP, VIDEO_TRACK_GROUP);
     trackSelector.assertMappedTrackGroups(1, AUDIO_TRACK_GROUP);
   }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectorTest.java
index 781f2b4fc9..3b88c00e2e 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectorTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.fail;
 
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.RendererCapabilities;
+import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.trackselection.TrackSelector.InvalidationListener;
@@ -44,7 +45,8 @@ public class TrackSelectorTest {
           public TrackSelectorResult selectTracks(
               RendererCapabilities[] rendererCapabilities,
               TrackGroupArray trackGroups,
-              MediaPeriodId periodId)
+              MediaPeriodId periodId,
+              Timeline timeline)
               throws ExoPlaybackException {
             throw new UnsupportedOperationException();
           }

From 2a50621118df38a88232ea2d2f3d887ec2bfde10 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 27 Sep 2018 03:42:40 -0700
Subject: [PATCH 027/832] Use media item in the cast demo app

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=214750185
---
 .../android/exoplayer2/castdemo/DemoUtil.java | 84 ++++++++-----------
 .../exoplayer2/castdemo/MainActivity.java     | 22 +++--
 .../exoplayer2/castdemo/PlayerManager.java    | 39 +++++----
 .../exoplayer2/ext/cast/CastTimeline.java     |  2 +-
 .../exoplayer2/ext/cast/MediaItem.java        | 14 ++--
 5 files changed, 80 insertions(+), 81 deletions(-)

diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
index 26ab5eb0dd..0ff2e09a39 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
@@ -15,8 +15,8 @@
  */
 package com.google.android.exoplayer2.castdemo;
 
+import com.google.android.exoplayer2.ext.cast.MediaItem;
 import com.google.android.exoplayer2.util.MimeTypes;
-import com.google.android.gms.cast.MediaInfo;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -31,57 +31,45 @@ import java.util.List;
   public static final String MIME_TYPE_SS = MimeTypes.APPLICATION_SS;
   public static final String MIME_TYPE_VIDEO_MP4 = MimeTypes.VIDEO_MP4;
 
-  /**
-   * The list of samples available in the cast demo app.
-   */
-  public static final List<Sample> SAMPLES;
-
-  /**
-   * Represents a media sample.
-   */
-  public static final class Sample {
-
-    /**
-     * The uri from which the media sample is obtained.
-     */
-    public final String uri;
-    /**
-     * A descriptive name for the sample.
-     */
-    public final String name;
-    /**
-     * The mime type of the media sample, as required by {@link MediaInfo#setContentType}.
-     */
-    public final String mimeType;
-
-    /**
-     * @param uri See {@link #uri}.
-     * @param name See {@link #name}.
-     * @param mimeType See {@link #mimeType}.
-     */
-    public Sample(String uri, String name, String mimeType) {
-      this.uri = uri;
-      this.name = name;
-      this.mimeType = mimeType;
-    }
-
-    @Override
-    public String toString() {
-      return name;
-    }
-
-  }
+  /** The list of samples available in the cast demo app. */
+  public static final List<MediaItem> SAMPLES;
 
   static {
     // App samples.
-    ArrayList<Sample> samples = new ArrayList<>();
-    samples.add(new Sample("https://storage.googleapis.com/wvmedia/clear/h264/tears/tears.mpd",
-        "DASH (clear,MP4,H264)", MIME_TYPE_DASH));
-    samples.add(new Sample("https://commondatastorage.googleapis.com/gtv-videos-bucket/CastVideos/"
-        + "hls/TearsOfSteel.m3u8", "Tears of Steel (HLS)", MIME_TYPE_HLS));
-    samples.add(new Sample("https://html5demos.com/assets/dizzy.mp4", "Dizzy (MP4)",
-        MIME_TYPE_VIDEO_MP4));
+    ArrayList<MediaItem> samples = new ArrayList<>();
+    MediaItem.Builder sampleBuilder = new MediaItem.Builder();
 
+    samples.add(
+        sampleBuilder
+            .setTitle("DASH (clear,MP4,H264)")
+            .setMimeType(MIME_TYPE_DASH)
+            .setMedia("https://storage.googleapis.com/wvmedia/clear/h264/tears/tears.mpd")
+            .buildAndClear());
+
+    samples.add(
+        sampleBuilder
+            .setTitle("Tears of Steel (HLS)")
+            .setMimeType(MIME_TYPE_HLS)
+            .setMedia(
+                "https://commondatastorage.googleapis.com/gtv-videos-bucket/CastVideos/"
+                    + "hls/TearsOfSteel.m3u8")
+            .buildAndClear());
+
+    samples.add(
+        sampleBuilder
+            .setTitle("HLS Basic (TS)")
+            .setMimeType(MIME_TYPE_HLS)
+            .setMedia(
+                "https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_4x3"
+                    + "/bipbop_4x3_variant.m3u8")
+            .buildAndClear());
+
+    samples.add(
+        sampleBuilder
+            .setTitle("Dizzy (MP4)")
+            .setMimeType(MIME_TYPE_VIDEO_MP4)
+            .setMedia("https://html5demos.com/assets/dizzy.mp4")
+            .buildAndClear());
 
     SAMPLES = Collections.unmodifiableList(samples);
 
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
index 30968b8f85..44305afb5b 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.castdemo;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.support.v4.graphics.ColorUtils;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
@@ -35,18 +36,18 @@ import android.widget.ListView;
 import android.widget.TextView;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.SimpleExoPlayer;
-import com.google.android.exoplayer2.castdemo.DemoUtil.Sample;
-import com.google.android.exoplayer2.ext.cast.CastPlayer;
+import com.google.android.exoplayer2.ext.cast.MediaItem;
 import com.google.android.exoplayer2.ui.PlayerControlView;
 import com.google.android.exoplayer2.ui.PlayerView;
 import com.google.android.gms.cast.framework.CastButtonFactory;
 import com.google.android.gms.cast.framework.CastContext;
 
 /**
- * An activity that plays video using {@link SimpleExoPlayer} and {@link CastPlayer}.
+ * An activity that plays video using {@link SimpleExoPlayer} and supports casting using ExoPlayer's
+ * Cast extension.
  */
-public class MainActivity extends AppCompatActivity implements OnClickListener,
-    PlayerManager.QueuePositionListener {
+public class MainActivity extends AppCompatActivity
+    implements OnClickListener, PlayerManager.QueuePositionListener {
 
   private PlayerView localPlayerView;
   private PlayerControlView castControlView;
@@ -181,7 +182,7 @@ public class MainActivity extends AppCompatActivity implements OnClickListener,
     @Override
     public void onBindViewHolder(QueueItemViewHolder holder, int position) {
       TextView view = holder.textView;
-      view.setText(playerManager.getItem(position).name);
+      view.setText(playerManager.getItem(position).title);
       // TODO: Solve coloring using the theme's ColorStateList.
       view.setTextColor(ColorUtils.setAlphaComponent(view.getCurrentTextColor(),
            position == playerManager.getCurrentItemIndex() ? 255 : 100));
@@ -244,12 +245,19 @@ public class MainActivity extends AppCompatActivity implements OnClickListener,
 
   }
 
-  private static final class SampleListAdapter extends ArrayAdapter<Sample> {
+  private static final class SampleListAdapter extends ArrayAdapter<MediaItem> {
 
     public SampleListAdapter(Context context) {
       super(context, android.R.layout.simple_list_item_1, DemoUtil.SAMPLES);
     }
 
+    @Override
+    public View getView(int position, @Nullable View convertView, ViewGroup parent) {
+      TextView view = (TextView) super.getView(position, convertView, parent);
+      MediaItem sample = DemoUtil.SAMPLES.get(position);
+      view.setText(sample.title);
+      return view;
+    }
   }
 
 }
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
index 0c69e40164..eb4808d1ed 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
@@ -31,8 +31,8 @@ import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.Timeline.Period;
-import com.google.android.exoplayer2.castdemo.DemoUtil.Sample;
 import com.google.android.exoplayer2.ext.cast.CastPlayer;
+import com.google.android.exoplayer2.ext.cast.MediaItem;
 import com.google.android.exoplayer2.ext.cast.RemotePlayer;
 import com.google.android.exoplayer2.source.ConcatenatingMediaSource;
 import com.google.android.exoplayer2.source.ExtractorMediaSource;
@@ -74,7 +74,7 @@ import java.util.ArrayList;
   private final PlayerControlView castControlView;
   private final SimpleExoPlayer exoPlayer;
   private final CastPlayer castPlayer;
-  private final ArrayList<DemoUtil.Sample> mediaQueue;
+  private final ArrayList<MediaItem> mediaQueue;
   private final QueuePositionListener queuePositionListener;
   private final ConcatenatingMediaSource concatenatingMediaSource;
 
@@ -146,15 +146,15 @@ import java.util.ArrayList;
   }
 
   /**
-   * Appends {@code sample} to the media queue.
+   * Appends {@code item} to the media queue.
    *
-   * @param sample The {@link Sample} to append.
+   * @param item The {@link MediaItem} to append.
    */
-  public void addItem(Sample sample) {
-    mediaQueue.add(sample);
-    concatenatingMediaSource.addMediaSource(buildMediaSource(sample));
+  public void addItem(MediaItem item) {
+    mediaQueue.add(item);
+    concatenatingMediaSource.addMediaSource(buildMediaSource(item));
     if (currentPlayer == castPlayer) {
-      castPlayer.addItems(buildMediaQueueItem(sample));
+      castPlayer.addItems(buildMediaQueueItem(item));
     }
   }
 
@@ -171,7 +171,7 @@ import java.util.ArrayList;
    * @param position The index of the item.
    * @return The item at the given index in the media queue.
    */
-  public Sample getItem(int position) {
+  public MediaItem getItem(int position) {
     return mediaQueue.get(position);
   }
 
@@ -388,9 +388,9 @@ import java.util.ArrayList;
     }
   }
 
-  private static MediaSource buildMediaSource(DemoUtil.Sample sample) {
-    Uri uri = Uri.parse(sample.uri);
-    switch (sample.mimeType) {
+  private static MediaSource buildMediaSource(MediaItem item) {
+    Uri uri = item.media.uri;
+    switch (item.mimeType) {
       case DemoUtil.MIME_TYPE_SS:
         return new SsMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
       case DemoUtil.MIME_TYPE_DASH:
@@ -400,17 +400,20 @@ import java.util.ArrayList;
       case DemoUtil.MIME_TYPE_VIDEO_MP4:
         return new ExtractorMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
       default: {
-        throw new IllegalStateException("Unsupported type: " + sample.mimeType);
+          throw new IllegalStateException("Unsupported type: " + item.mimeType);
       }
     }
   }
 
-  private static MediaQueueItem buildMediaQueueItem(DemoUtil.Sample sample) {
+  private static MediaQueueItem buildMediaQueueItem(MediaItem item) {
     MediaMetadata movieMetadata = new MediaMetadata(MediaMetadata.MEDIA_TYPE_MOVIE);
-    movieMetadata.putString(MediaMetadata.KEY_TITLE, sample.name);
-    MediaInfo mediaInfo = new MediaInfo.Builder(sample.uri)
-        .setStreamType(MediaInfo.STREAM_TYPE_BUFFERED).setContentType(sample.mimeType)
-        .setMetadata(movieMetadata).build();
+    movieMetadata.putString(MediaMetadata.KEY_TITLE, item.title);
+    MediaInfo mediaInfo =
+        new MediaInfo.Builder(item.media.uri.toString())
+            .setStreamType(MediaInfo.STREAM_TYPE_BUFFERED)
+            .setContentType(item.mimeType)
+            .setMetadata(movieMetadata)
+            .build();
     return new MediaQueueItem.Builder(mediaInfo).build();
   }
 
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java
index 4939e62a2b..d86c4b3ebf 100644
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java
@@ -108,7 +108,7 @@ import java.util.Map;
   }
 
   @Override
-  public Object getUidOfPeriod(int periodIndex) {
+  public Integer getUidOfPeriod(int periodIndex) {
     return ids[periodIndex];
   }
 
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java
index 67428e8af4..f9188e08be 100644
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java
@@ -67,9 +67,9 @@ public final class MediaItem {
       return this;
     }
 
-    /** Equivalent to {@link #setMedia(UriBundle) setMedia(new UriBundle(uri))}. */
+    /** Equivalent to {@link #setMedia(UriBundle) setMedia(new UriBundle(Uri.parse(uri)))}. */
     public Builder setMedia(String uri) {
-      return setMedia(new UriBundle(uri));
+      return setMedia(new UriBundle(Uri.parse(uri)));
     }
 
     /** See {@link MediaItem#media}. */
@@ -162,7 +162,7 @@ public final class MediaItem {
   public static final class UriBundle {
 
     /** An empty {@link UriBundle}. */
-    public static final UriBundle EMPTY = new UriBundle("");
+    public static final UriBundle EMPTY = new UriBundle(Uri.EMPTY);
 
     /** A URI. */
     public final Uri uri;
@@ -171,12 +171,12 @@ public final class MediaItem {
     public final Map<String, String> requestHeaders;
 
     /**
-     * Creates an instance from the given string with no request headers.
+     * Creates an instance with no request headers.
      *
-     * @param uriString See {@link #uri}.
+     * @param uri See {@link #uri}.
      */
-    public UriBundle(String uriString) {
-      this(Uri.parse(uriString), Collections.emptyMap());
+    public UriBundle(Uri uri) {
+      this(uri, Collections.emptyMap());
     }
 
     /**

From e50214a5a1fd378d66db0ab088f1d9a4f2ccb2d9 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 27 Sep 2018 07:37:39 -0700
Subject: [PATCH 028/832] Add constructor for adding payload reader factory
 flags

Issue:#4861

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=214772527
---
 RELEASENOTES.md                               |  3 ++
 .../ts/DefaultTsPayloadReaderFactory.java     | 26 ++++++++++++
 .../hls/DefaultHlsExtractorFactory.java       | 42 +++++++++++++++----
 3 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index bcf05590bf..a1e70fa018 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -11,6 +11,9 @@
 * Add convenience methods `Player.next`, `Player.previous`, `Player.hasNext`
   and `Player.hasPrevious`
   ([#4863](https://github.com/google/ExoPlayer/issues/4863)).
+* HLS:
+  * Add constructor to `DefaultHlsExtractorFactory` for adding TS payload reader
+    factory flags ([#4861](https://github.com/google/ExoPlayer/issues/4861)).
 
 ### 2.9.0 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java
index 06a60776c2..7353b25e9c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java
@@ -52,11 +52,37 @@ public final class DefaultTsPayloadReaderFactory implements TsPayloadReader.Fact
       })
   public @interface Flags {}
 
+  /**
+   * When extracting H.264 samples, whether to treat samples consisting of non-IDR I slices as
+   * synchronization samples (key-frames).
+   */
   public static final int FLAG_ALLOW_NON_IDR_KEYFRAMES = 1;
+  /**
+   * Prevents the creation of {@link AdtsReader} and {@link LatmReader} instances. This flag should
+   * be enabled if the transport stream contains no packets for an AAC elementary stream that is
+   * declared in the PMT.
+   */
   public static final int FLAG_IGNORE_AAC_STREAM = 1 << 1;
+  /**
+   * Prevents the creation of {@link H264Reader} instances. This flag should be enabled if the
+   * transport stream contains no packets for an H.264 elementary stream that is declared in the
+   * PMT.
+   */
   public static final int FLAG_IGNORE_H264_STREAM = 1 << 2;
+  /**
+   * When extracting H.264 samples, whether to split the input stream into access units (samples)
+   * based on slice headers. This flag should be disabled if the stream contains access unit
+   * delimiters (AUDs).
+   */
   public static final int FLAG_DETECT_ACCESS_UNITS = 1 << 3;
+  /** Prevents the creation of {@link SpliceInfoSectionReader} instances. */
   public static final int FLAG_IGNORE_SPLICE_INFO_STREAM = 1 << 4;
+  /**
+   * Whether the list of {@code closedCaptionFormats} passed to {@link
+   * DefaultTsPayloadReaderFactory#DefaultTsPayloadReaderFactory(int, List)} should be used in spite
+   * of any closed captions service descriptors. If this flag is disabled, {@code
+   * closedCaptionFormats} will be ignored if the PMT contains closed captions service descriptors.
+   */
   public static final int FLAG_OVERRIDE_CAPTION_DESCRIPTORS = 1 << 5;
 
   private static final int DESCRIPTOR_TAG_CAPTION_SERVICE = 0x86;
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
index 951e6c95e0..3d75923553 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
@@ -51,6 +51,24 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
   public static final String VTT_FILE_EXTENSION = ".vtt";
   public static final String WEBVTT_FILE_EXTENSION = ".webvtt";
 
+  @DefaultTsPayloadReaderFactory.Flags private final int payloadReaderFactoryFlags;
+
+  /** Creates a factory for HLS segment extractors. */
+  public DefaultHlsExtractorFactory() {
+    this(/* payloadReaderFactoryFlags= */ 0);
+  }
+
+  /**
+   * Creates a factory for HLS segment extractors.
+   *
+   * @param payloadReaderFactoryFlags Flags to add when constructing any {@link
+   *     DefaultTsPayloadReaderFactory} instances. Other flags may be added on top of {@code
+   *     payloadReaderFactoryFlags} when creating {@link DefaultTsPayloadReaderFactory}.
+   */
+  public DefaultHlsExtractorFactory(int payloadReaderFactoryFlags) {
+    this.payloadReaderFactoryFlags = payloadReaderFactoryFlags;
+  }
+
   @Override
   public Pair<Extractor, Boolean> createExtractor(
       Extractor previousExtractor,
@@ -138,7 +156,9 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
     }
 
     if (!(extractorByFileExtension instanceof TsExtractor)) {
-      TsExtractor tsExtractor = createTsExtractor(format, muxedCaptionFormats, timestampAdjuster);
+      TsExtractor tsExtractor =
+          createTsExtractor(
+              payloadReaderFactoryFlags, format, muxedCaptionFormats, timestampAdjuster);
       if (sniffQuietly(tsExtractor, extractorInput)) {
         return buildResult(tsExtractor);
       }
@@ -180,17 +200,23 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
           muxedCaptionFormats != null ? muxedCaptionFormats : Collections.emptyList());
     } else {
       // For any other file extension, we assume TS format.
-      return createTsExtractor(format, muxedCaptionFormats, timestampAdjuster);
+      return createTsExtractor(
+          payloadReaderFactoryFlags, format, muxedCaptionFormats, timestampAdjuster);
     }
   }
 
   private static TsExtractor createTsExtractor(
-      Format format, List<Format> muxedCaptionFormats, TimestampAdjuster timestampAdjuster) {
+      @DefaultTsPayloadReaderFactory.Flags int userProvidedPayloadReaderFactoryFlags,
+      Format format,
+      List<Format> muxedCaptionFormats,
+      TimestampAdjuster timestampAdjuster) {
     @DefaultTsPayloadReaderFactory.Flags
-    int esReaderFactoryFlags = DefaultTsPayloadReaderFactory.FLAG_IGNORE_SPLICE_INFO_STREAM;
+    int payloadReaderFactoryFlags =
+        DefaultTsPayloadReaderFactory.FLAG_IGNORE_SPLICE_INFO_STREAM
+            | userProvidedPayloadReaderFactoryFlags;
     if (muxedCaptionFormats != null) {
       // The playlist declares closed caption renditions, we should ignore descriptors.
-      esReaderFactoryFlags |= DefaultTsPayloadReaderFactory.FLAG_OVERRIDE_CAPTION_DESCRIPTORS;
+      payloadReaderFactoryFlags |= DefaultTsPayloadReaderFactory.FLAG_OVERRIDE_CAPTION_DESCRIPTORS;
     } else {
       // The playlist does not provide any closed caption information. We preemptively declare a
       // closed caption track on channel 0.
@@ -208,17 +234,17 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
       // exist. If we know from the codec attribute that they don't exist, then we can
       // explicitly ignore them even if they're declared.
       if (!MimeTypes.AUDIO_AAC.equals(MimeTypes.getAudioMediaMimeType(codecs))) {
-        esReaderFactoryFlags |= DefaultTsPayloadReaderFactory.FLAG_IGNORE_AAC_STREAM;
+        payloadReaderFactoryFlags |= DefaultTsPayloadReaderFactory.FLAG_IGNORE_AAC_STREAM;
       }
       if (!MimeTypes.VIDEO_H264.equals(MimeTypes.getVideoMediaMimeType(codecs))) {
-        esReaderFactoryFlags |= DefaultTsPayloadReaderFactory.FLAG_IGNORE_H264_STREAM;
+        payloadReaderFactoryFlags |= DefaultTsPayloadReaderFactory.FLAG_IGNORE_H264_STREAM;
       }
     }
 
     return new TsExtractor(
         TsExtractor.MODE_HLS,
         timestampAdjuster,
-        new DefaultTsPayloadReaderFactory(esReaderFactoryFlags, muxedCaptionFormats));
+        new DefaultTsPayloadReaderFactory(payloadReaderFactoryFlags, muxedCaptionFormats));
   }
 
   private static Pair<Extractor, Boolean> buildResult(Extractor extractor) {

From a394ab7be31e403c6fc214b75c2fd49ae9d513bd Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 27 Sep 2018 09:16:37 -0700
Subject: [PATCH 029/832] Update release notes for 2.9.0

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=214784773
---
 RELEASENOTES.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index a1e70fa018..234a4a1664 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -3,11 +3,6 @@
 ### dev-v2 (not yet released) ###
 
 * Do not retry failed loads whose error is `FileNotFoundException`.
-* Allow setting log level for ExoPlayer logcat output
-  ([#4665](https://github.com/google/ExoPlayer/issues/4665)).
-* Fix an issue where audio and video would desynchronize when playing
-  concatenations of gapless content
-  ([#4559](https://github.com/google/ExoPlayer/issues/4559)).
 * Add convenience methods `Player.next`, `Player.previous`, `Player.hasNext`
   and `Player.hasPrevious`
   ([#4863](https://github.com/google/ExoPlayer/issues/4863)).
@@ -33,6 +28,8 @@
 * Allow passing a `Looper`, which specifies the thread that must be used to
   access the player, when instantiating player instances using
   `ExoPlayerFactory` ([#4278](https://github.com/google/ExoPlayer/issues/4278)).
+* Allow setting log level for ExoPlayer logcat output
+  ([#4665](https://github.com/google/ExoPlayer/issues/4665)).
 * Simplify `BandwidthMeter` injection: The `BandwidthMeter` should now be
   passed directly to `ExoPlayerFactory`, instead of to `TrackSelection.Factory`
   and `DataSource.Factory`. The `BandwidthMeter` is passed to the components
@@ -155,6 +152,9 @@
 * Fix bug preventing use of multiple key session support (`multiSession=true`)
   for non-Widevine `DefaultDrmSessionManager` instances
   ([#4834](https://github.com/google/ExoPlayer/issues/4834)).
+* Fix issue where audio and video would desynchronize when playing
+  concatenations of gapless content
+  ([#4559](https://github.com/google/ExoPlayer/issues/4559)).
 * IMA extension:
   * Refine the previous fix for empty ad groups to avoid discarding ad breaks
     unnecessarily ([#4030](https://github.com/google/ExoPlayer/issues/4030) and

From 827ea636571998b4d97a43d564410e1c6251b146 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 27 Sep 2018 09:33:36 -0700
Subject: [PATCH 030/832] Fix issue with stale createPeriod events in
 ConcatenatingMediaSource.

If a source is removed from the playlist, the player may still call createPeriod
for a period of the removed source as long as the new timeline hasn't been handled
by the player. These events are stale and can be ignored by using a dummy media
source. The stale media period will be released when the player handles the updated
timeline.

Issue:#4871

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=214787090
---
 RELEASENOTES.md                               |  2 +
 .../source/ConcatenatingMediaSource.java      | 39 ++++++++++++++++++-
 .../android/exoplayer2/ExoPlayerTest.java     | 27 +++++++++++++
 3 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 234a4a1664..db9f5254ef 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -138,6 +138,8 @@
 * Fix bugs reporting events for multi-period media sources
   ([#4492](https://github.com/google/ExoPlayer/issues/4492) and
   [#4634](https://github.com/google/ExoPlayer/issues/4634)).
+* Fix issue where removing looping media from a playlist throws an exception
+  ([#4871](https://github.com/google/ExoPlayer/issues/4871).
 * Fix issue where the preferred audio or text track would not be selected if
   mapped onto a secondary renderer of the corresponding type
   ([#4711](http://github.com/google/ExoPlayer/issues/4711)).
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
index 30e764dfe5..e0b7da8506 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
@@ -474,7 +474,12 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
   @Override
   public final MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
     Object mediaSourceHolderUid = getMediaSourceHolderUid(id.periodUid);
-    MediaSourceHolder holder = Assertions.checkNotNull(mediaSourceByUid.get(mediaSourceHolderUid));
+    MediaSourceHolder holder = mediaSourceByUid.get(mediaSourceHolderUid);
+    if (holder == null) {
+      // Stale event. The media source has already been removed.
+      holder = new MediaSourceHolder(new DummyMediaSource());
+      holder.hasStartedPreparing = true;
+    }
     DeferredMediaPeriod mediaPeriod = new DeferredMediaPeriod(holder.mediaSource, id, allocator);
     mediaSourceByMediaPeriod.put(mediaPeriod, holder);
     holder.activeMediaPeriods.add(mediaPeriod);
@@ -994,5 +999,37 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
       return DeferredTimeline.DUMMY_ID;
     }
   }
+
+  /** Dummy media source which does nothing and does not support creating periods. */
+  private static final class DummyMediaSource extends BaseMediaSource {
+
+    @Override
+    protected void prepareSourceInternal(
+        ExoPlayer player,
+        boolean isTopLevelSource,
+        @Nullable TransferListener mediaTransferListener) {
+      // Do nothing.
+    }
+
+    @Override
+    protected void releaseSourceInternal() {
+      // Do nothing.
+    }
+
+    @Override
+    public void maybeThrowSourceInfoRefreshError() throws IOException {
+      // Do nothing.
+    }
+
+    @Override
+    public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
+      throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void releasePeriod(MediaPeriod mediaPeriod) {
+      // Do nothing.
+    }
+  }
 }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
index d42d3ee9a7..8414be1588 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
@@ -2419,6 +2419,33 @@ public final class ExoPlayerTest {
     assertThat(renderer.hasReadStreamToEnd()).isTrue();
   }
 
+  @Test
+  public void removingLoopingLastPeriodFromPlaylistDoesNotThrow() throws Exception {
+    Timeline timeline =
+        new FakeTimeline(
+            new TimelineWindowDefinition(
+                /* isSeekable= */ true, /* isDynamic= */ true, /* durationUs= */ 100_000));
+    MediaSource mediaSource = new FakeMediaSource(timeline, /* manifest= */ null);
+    ConcatenatingMediaSource concatenatingMediaSource = new ConcatenatingMediaSource(mediaSource);
+    ActionSchedule actionSchedule =
+        new ActionSchedule.Builder("removingLoopingLastPeriodFromPlaylistDoesNotThrow")
+            .pause()
+            .waitForPlaybackState(Player.STATE_READY)
+            // Play almost to end to ensure the current period is fully buffered.
+            .playUntilPosition(/* windowIndex= */ 0, /* positionMs= */ 90)
+            // Enable repeat mode to trigger the creation of new media periods.
+            .setRepeatMode(Player.REPEAT_MODE_ALL)
+            // Remove the media source.
+            .executeRunnable(concatenatingMediaSource::clear)
+            .build();
+    new Builder()
+        .setMediaSource(concatenatingMediaSource)
+        .setActionSchedule(actionSchedule)
+        .build(context)
+        .start()
+        .blockUntilEnded(TIMEOUT_MS);
+  }
+
   // Internal methods.
 
   private static ActionSchedule.Builder addSurfaceSwitch(ActionSchedule.Builder builder) {

From 028f3e6438be5c9f2a44c259e159600b9c8c6abb Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 27 Sep 2018 10:02:21 -0700
Subject: [PATCH 031/832] Don't recreate the audio decoder if Format is
 unchanged

More specifically, if the parts of the Format that are used
for decoder configuration are unchanged.

Issue: #2826

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=214791234
---
 .../audio/MediaCodecAudioRenderer.java        |  42 +++++--
 .../mediacodec/MediaCodecRenderer.java        | 105 ++++++++++++------
 2 files changed, 103 insertions(+), 44 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
index 624e698ad6..89d2ee16b2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
@@ -346,7 +346,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
     codecMaxInputSize = getCodecMaxInputSize(codecInfo, format, getStreamFormats());
     codecNeedsDiscardChannelsWorkaround = codecNeedsDiscardChannelsWorkaround(codecInfo.name);
     passthroughEnabled = codecInfo.passthrough;
-    String codecMimeType = codecInfo.mimeType == null ? MimeTypes.AUDIO_RAW : codecInfo.mimeType;
+    String codecMimeType = passthroughEnabled ? MimeTypes.AUDIO_RAW : codecInfo.mimeType;
     MediaFormat mediaFormat =
         getMediaFormat(format, codecMimeType, codecMaxInputSize, codecOperatingRate);
     codec.configure(mediaFormat, /* surface= */ null, crypto, /* flags= */ 0);
@@ -362,14 +362,22 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
   @Override
   protected @KeepCodecResult int canKeepCodec(
       MediaCodec codec, MediaCodecInfo codecInfo, Format oldFormat, Format newFormat) {
-    if (getCodecMaxInputSize(codecInfo, newFormat) <= codecMaxInputSize
-        && codecInfo.isSeamlessAdaptationSupported(
-            oldFormat, newFormat, /* isNewFormatComplete= */ true)
-        && oldFormat.encoderDelay == 0
-        && oldFormat.encoderPadding == 0
-        && newFormat.encoderDelay == 0
-        && newFormat.encoderPadding == 0) {
+    // TODO: We currently rely on recreating the codec when encoder delay or padding is non-zero.
+    // Re-creating the codec is necessary to guarantee that onOutputFormatChanged is called, which
+    // is where encoder delay and padding are propagated to the sink. We should find a better way to
+    // propagate these values, and then allow the codec to be re-used in cases where this would
+    // otherwise be possible.
+    if (getCodecMaxInputSize(codecInfo, newFormat) > codecMaxInputSize
+        || oldFormat.encoderDelay != 0
+        || oldFormat.encoderPadding != 0
+        || newFormat.encoderDelay != 0
+        || newFormat.encoderPadding != 0) {
+      return KEEP_CODEC_RESULT_NO;
+    } else if (codecInfo.isSeamlessAdaptationSupported(
+        oldFormat, newFormat, /* isNewFormatComplete= */ true)) {
       return KEEP_CODEC_RESULT_YES_WITHOUT_RECONFIGURATION;
+    } else if (areCodecConfigurationCompatible(oldFormat, newFormat)) {
+      return KEEP_CODEC_RESULT_YES_WITH_FLUSH;
     } else {
       return KEEP_CODEC_RESULT_NO;
     }
@@ -720,6 +728,24 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
     return format.maxInputSize;
   }
 
+  /**
+   * Returns whether two {@link Format}s will cause the same codec to be configured in an identical
+   * way, excluding {@link MediaFormat#KEY_MAX_INPUT_SIZE} and configuration that does not come from
+   * the {@link Format}.
+   *
+   * @param oldFormat The first format.
+   * @param newFormat The second format.
+   * @return Whether the two formats will cause a codec to be configured in an identical way,
+   *     excluding {@link MediaFormat#KEY_MAX_INPUT_SIZE} and configuration that does not come from
+   *     the {@link Format}.
+   */
+  protected boolean areCodecConfigurationCompatible(Format oldFormat, Format newFormat) {
+    return Util.areEqual(oldFormat.sampleMimeType, newFormat.sampleMimeType)
+        && oldFormat.channelCount == newFormat.channelCount
+        && oldFormat.sampleRate == newFormat.sampleRate
+        && oldFormat.initializationDataEquals(newFormat);
+  }
+
   /**
    * Returns the framework {@link MediaFormat} that can be used to configure a {@link MediaCodec}
    * for decoding the given {@link Format} for playback.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index 7e933e9474..bd77f32f5b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -185,19 +185,22 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     KEEP_CODEC_RESULT_NO,
-    KEEP_CODEC_RESULT_YES_WITHOUT_RECONFIGURATION,
-    KEEP_CODEC_RESULT_YES_WITH_RECONFIGURATION
+    KEEP_CODEC_RESULT_YES_WITH_FLUSH,
+    KEEP_CODEC_RESULT_YES_WITH_RECONFIGURATION,
+    KEEP_CODEC_RESULT_YES_WITHOUT_RECONFIGURATION
   })
   protected @interface KeepCodecResult {}
   /** The codec cannot be kept. */
   protected static final int KEEP_CODEC_RESULT_NO = 0;
-  /** The codec can be kept. No reconfiguration is required. */
-  protected static final int KEEP_CODEC_RESULT_YES_WITHOUT_RECONFIGURATION = 1;
+  /** The codec can be kept, but must be flushed. */
+  protected static final int KEEP_CODEC_RESULT_YES_WITH_FLUSH = 1;
   /**
-   * The codec can be kept, but must be reconfigured by prefixing the next input buffer with the new
-   * format's configuration data.
+   * The codec can be kept. It does not need to be flushed, but must be reconfigured by prefixing
+   * the next input buffer with the new format's configuration data.
    */
-  protected static final int KEEP_CODEC_RESULT_YES_WITH_RECONFIGURATION = 3;
+  protected static final int KEEP_CODEC_RESULT_YES_WITH_RECONFIGURATION = 2;
+  /** The codec can be kept. It does not need to be flushed and no reconfiguration is required. */
+  protected static final int KEEP_CODEC_RESULT_YES_WITHOUT_RECONFIGURATION = 3;
 
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({RECONFIGURATION_STATE_NONE, RECONFIGURATION_STATE_WRITE_PENDING,
@@ -309,6 +312,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   private boolean codecReconfigured;
   private @ReconfigurationState int codecReconfigurationState;
   private @ReinitializationState int codecReinitializationState;
+  private boolean codecReinitializationIsRelease;
   private boolean codecReceivedBuffers;
   private boolean codecReceivedEos;
 
@@ -587,6 +591,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     codecReceivedEos = false;
     codecReconfigurationState = RECONFIGURATION_STATE_NONE;
     codecReinitializationState = REINITIALIZATION_STATE_NONE;
+    codecReinitializationIsRelease = false;
     codecConfiguredWithOperatingRate = false;
     if (codec != null) {
       decoderCounters.decoderReleaseCount++;
@@ -682,10 +687,16 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
       releaseCodec();
       maybeInitCodec();
     } else if (codecReinitializationState != REINITIALIZATION_STATE_NONE) {
-      // We're already waiting to release and re-initialize the codec. Since we're now flushing,
-      // there's no need to wait any longer.
-      releaseCodec();
-      maybeInitCodec();
+      // We're already waiting to re-initialize the codec. Since we're now flushing, there's no need
+      // to wait any longer.
+      if (codecReinitializationIsRelease) {
+        releaseCodec();
+        maybeInitCodec();
+      } else {
+        codec.flush();
+        codecReceivedBuffers = false;
+        codecReinitializationState = REINITIALIZATION_STATE_NONE;
+      }
     } else {
       // We can flush and re-use the existing decoder.
       codec.flush();
@@ -865,7 +876,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   private boolean feedInputBuffer() throws ExoPlaybackException {
     if (codec == null || codecReinitializationState == REINITIALIZATION_STATE_WAIT_END_OF_STREAM
         || inputStreamEnded) {
-      // We need to reinitialize the codec or the input stream has ended.
+      // We need to re-initialize the codec or the input stream has ended.
       return false;
     }
 
@@ -1043,7 +1054,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
    * Called when a new format is read from the upstream {@link MediaPeriod}.
    *
    * @param newFormat The new format.
-   * @throws ExoPlaybackException If an error occurs reinitializing the {@link MediaCodec}.
+   * @throws ExoPlaybackException If an error occurs re-initializing the {@link MediaCodec}.
    */
   protected void onInputFormatChanged(Format newFormat) throws ExoPlaybackException {
     Format oldFormat = format;
@@ -1067,18 +1078,28 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
       }
     }
 
-    boolean keepingCodec = false;
-    if (pendingDrmSession == drmSession && codec != null) {
+    if (codec == null) {
+      maybeInitCodec();
+      return;
+    }
+
+    // We have an existing codec that we may need to reconfigure or re-initialize. If the existing
+    // codec instance is being kept then its operating rate may need to be updated.
+    if (pendingDrmSession != drmSession) {
+      reinitializeCodec(/* release= */ true);
+    } else {
       switch (canKeepCodec(codec, codecInfo, oldFormat, format)) {
         case KEEP_CODEC_RESULT_NO:
-          // Do nothing.
+          reinitializeCodec(/* release= */ true);
           break;
-        case KEEP_CODEC_RESULT_YES_WITHOUT_RECONFIGURATION:
-          keepingCodec = true;
+        case KEEP_CODEC_RESULT_YES_WITH_FLUSH:
+          reinitializeCodec(/* release= */ false);
+          updateCodecOperatingRate();
           break;
         case KEEP_CODEC_RESULT_YES_WITH_RECONFIGURATION:
-          if (!codecNeedsReconfigureWorkaround) {
-            keepingCodec = true;
+          if (codecNeedsReconfigureWorkaround) {
+            reinitializeCodec(/* release= */ true);
+          } else {
             codecReconfigured = true;
             codecReconfigurationState = RECONFIGURATION_STATE_WRITE_PENDING;
             codecNeedsAdaptationWorkaroundBuffer =
@@ -1086,18 +1107,16 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
                     || (codecAdaptationWorkaroundMode == ADAPTATION_WORKAROUND_MODE_SAME_RESOLUTION
                         && format.width == oldFormat.width
                         && format.height == oldFormat.height);
+            updateCodecOperatingRate();
           }
           break;
+        case KEEP_CODEC_RESULT_YES_WITHOUT_RECONFIGURATION:
+          updateCodecOperatingRate();
+          break;
         default:
           throw new IllegalStateException(); // Never happens.
       }
     }
-
-    if (!keepingCodec) {
-      reinitializeCodec();
-    } else {
-      updateCodecOperatingRate();
-    }
   }
 
   /**
@@ -1211,13 +1230,15 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     }
 
     this.codecOperatingRate = codecOperatingRate;
-    if (codec == null || codecReinitializationState != REINITIALIZATION_STATE_NONE) {
-      // Either no codec, or it's about to be reinitialized anyway.
+    if (codec == null
+        || (codecReinitializationState != REINITIALIZATION_STATE_NONE
+            && codecReinitializationIsRelease)) {
+      // Either no codec, or it's about to be released due to re-initialization anyway.
     } else if (codecOperatingRate == CODEC_OPERATING_RATE_UNSET
         && codecConfiguredWithOperatingRate) {
       // We need to clear the operating rate. The only way to do so is to instantiate a new codec
       // instance. See [Internal ref: b/71987865].
-      reinitializeCodec();
+      reinitializeCodec(/* release= */ true);
     } else if (codecOperatingRate != CODEC_OPERATING_RATE_UNSET
         && (codecConfiguredWithOperatingRate
             || codecOperatingRate > assumedMinimumCodecOperatingRate)) {
@@ -1231,18 +1252,26 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   }
 
   /**
-   * Starts the process of releasing the existing codec and initializing a new one. This may occur
-   * immediately, or be deferred until any final output buffers have been dequeued.
+   * Starts the process of re-initializing the codec. This may occur immediately, or be deferred
+   * until any final output buffers have been dequeued.
    *
+   * @param release Whether re-initialization requires fully releasing the codec and instantiating a
+   *     new instance, as opposed to flushing and reusing the current instance.
    * @throws ExoPlaybackException If an error occurs releasing or initializing a codec.
    */
-  private void reinitializeCodec() throws ExoPlaybackException {
+  private void reinitializeCodec(boolean release) throws ExoPlaybackException {
     availableCodecInfos = null;
     if (codecReceivedBuffers) {
       // Signal end of stream and wait for any final output buffers before re-initialization.
       codecReinitializationState = REINITIALIZATION_STATE_SIGNAL_END_OF_STREAM;
-    } else {
-      // There aren't any final output buffers, so perform re-initialization immediately.
+      codecReinitializationIsRelease = release;
+      return;
+    }
+
+    // Nothing has been queued to the decoder. If we need to fully release the codec and instantiate
+    // a new instance, do so immediately. If only a flush is required then we can do nothing, since
+    // flushing will be a no-op.
+    if (release) {
       releaseCodec();
       maybeInitCodec();
     }
@@ -1449,8 +1478,12 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   private void processEndOfStream() throws ExoPlaybackException {
     if (codecReinitializationState == REINITIALIZATION_STATE_WAIT_END_OF_STREAM) {
       // We're waiting to re-initialize the codec, and have now processed all final buffers.
-      releaseCodec();
-      maybeInitCodec();
+      if (codecReinitializationIsRelease) {
+        releaseCodec();
+        maybeInitCodec();
+      } else {
+        flushCodec();
+      }
     } else {
       outputStreamEnded = true;
       renderToEndOfStream();

From 47ce263bee3505206c51d2446843d47090d254c6 Mon Sep 17 00:00:00 2001
From: hacker1024 <joshleivenzon@outlook.com>
Date: Fri, 28 Sep 2018 08:10:57 +1000
Subject: [PATCH 032/832] Call rating with extras

---
 .../ext/mediasession/MediaSessionConnector.java        | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
index 0915ee4b03..d0cde5f693 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
@@ -259,6 +259,9 @@ public final class MediaSessionConnector {
 
     /** See {@link MediaSessionCompat.Callback#onSetRating(RatingCompat)}. */
     void onSetRating(Player player, RatingCompat rating);
+    
+    /** See {@link MediaSessionCompat.Callback#onSetRating(RatingCompat, Bundle)}. */
+    void onSetRating(Player player, RatingCompat rating, Bundle extras);
   }
 
   /**
@@ -1002,6 +1005,13 @@ public final class MediaSessionConnector {
         ratingCallback.onSetRating(player, rating);
       }
     }
+    
+    @Override
+    public void onSetRating(RatingCompat rating, Bundle extras) {
+      if (canDispatchToRatingCallback(PlaybackStateCompat.ACTION_SET_RATING)) {
+        ratingCallback.onSetRating(player, rating, extras);
+      }
+    }
 
     @Override
     public void onAddQueueItem(MediaDescriptionCompat description) {

From 9b111fbd95c56221e75fa20e408ed7f978c5ae79 Mon Sep 17 00:00:00 2001
From: Andrew Shu <talklittle@gmail.com>
Date: Thu, 27 Sep 2018 18:34:49 -0700
Subject: [PATCH 033/832] Make DefaultTrackSelector.AudioTrackScore protected

This allows selectAudioTrack() to be overridden.
---
 .../android/exoplayer2/trackselection/DefaultTrackSelector.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
index f5a347b351..4a75b6f722 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -2141,7 +2141,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
   }
 
   /** Represents how well an audio track matches the selection {@link Parameters}. */
-  private static final class AudioTrackScore implements Comparable<AudioTrackScore> {
+  protected static final class AudioTrackScore implements Comparable<AudioTrackScore> {
 
     private final Parameters parameters;
     private final int withinRendererCapabilitiesScore;

From 5c8dabade63769b4cdb289a87d7ae003cb78376a Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 28 Sep 2018 10:04:14 -0700
Subject: [PATCH 034/832] Add @Documented to @IntDef and @StringDef
 annotations.

This makes the annotations appear in the generated JavaDoc.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=214952419
---
 .../ext/cronet/CronetEngineWrapper.java       |  2 ++
 .../exoplayer2/ext/flac/FlacExtractor.java    |  2 ++
 .../exoplayer2/ext/ima/ImaAdsLoader.java      |  2 ++
 .../ext/vp9/LibvpxVideoRenderer.java          |  9 +++++--
 .../java/com/google/android/exoplayer2/C.java | 18 +++++++++++++
 .../exoplayer2/DefaultRenderersFactory.java   |  2 ++
 .../exoplayer2/ExoPlaybackException.java      |  2 ++
 .../com/google/android/exoplayer2/Player.java |  4 +++
 .../google/android/exoplayer2/Renderer.java   |  2 ++
 .../android/exoplayer2/audio/Ac3Util.java     |  2 ++
 .../exoplayer2/audio/AudioFocusManager.java   |  3 +++
 .../audio/AudioTimestampPoller.java           |  2 ++
 .../audio/AudioTrackPositionTracker.java      |  2 ++
 .../exoplayer2/audio/DefaultAudioSink.java    |  7 ++---
 .../audio/SilenceSkippingAudioProcessor.java  |  2 ++
 .../audio/SimpleDecoderAudioRenderer.java     |  9 +++++--
 .../decoder/DecoderInputBuffer.java           |  2 ++
 .../drm/DefaultDrmSessionManager.java         |  2 ++
 .../android/exoplayer2/drm/DrmSession.java    |  2 ++
 .../drm/UnsupportedDrmException.java          |  2 ++
 .../extractor/BinarySearchSeeker.java         |  2 ++
 .../exoplayer2/extractor/Extractor.java       |  2 ++
 .../extractor/amr/AmrExtractor.java           |  2 ++
 .../extractor/flv/FlvExtractor.java           | 15 +++++++----
 .../extractor/mkv/DefaultEbmlReader.java      |  2 ++
 .../extractor/mkv/EbmlReaderOutput.java       |  2 ++
 .../extractor/mkv/MatroskaExtractor.java      |  2 ++
 .../extractor/mp3/Mp3Extractor.java           |  2 ++
 .../extractor/mp4/FragmentedMp4Extractor.java |  2 ++
 .../extractor/mp4/Mp4Extractor.java           |  8 +++---
 .../exoplayer2/extractor/mp4/Track.java       |  2 ++
 .../exoplayer2/extractor/ts/Ac3Reader.java    |  3 +++
 .../extractor/ts/AdtsExtractor.java           |  2 ++
 .../ts/DefaultTsPayloadReaderFactory.java     |  2 ++
 .../exoplayer2/extractor/ts/TsExtractor.java  |  2 ++
 .../mediacodec/MediaCodecRenderer.java        | 26 ++++++++++++++-----
 .../exoplayer2/offline/DownloadManager.java   |  3 +++
 .../exoplayer2/scheduler/Requirements.java    |  2 ++
 .../source/ClippingMediaSource.java           |  2 ++
 .../exoplayer2/source/MergingMediaSource.java |  2 ++
 .../source/ads/AdPlaybackState.java           |  2 ++
 .../exoplayer2/source/ads/AdsMediaSource.java |  2 ++
 .../exoplayer2/text/CaptionStyleCompat.java   |  2 ++
 .../google/android/exoplayer2/text/Cue.java   |  4 +++
 .../android/exoplayer2/text/TextRenderer.java |  9 +++++--
 .../exoplayer2/text/ttml/TtmlStyle.java       | 12 +++++++--
 .../text/webvtt/WebvttCssStyle.java           |  5 ++++
 .../trackselection/MappingTrackSelector.java  |  2 ++
 .../android/exoplayer2/upstream/DataSpec.java |  3 +++
 .../exoplayer2/upstream/HttpDataSource.java   |  3 +++
 .../android/exoplayer2/upstream/Loader.java   |  2 ++
 .../upstream/cache/CacheDataSource.java       |  3 +++
 .../exoplayer2/util/EGLSurfaceTexture.java    |  2 ++
 .../google/android/exoplayer2/util/Log.java   |  2 ++
 .../exoplayer2/util/NotificationUtil.java     |  2 ++
 .../exoplayer2/util/RepeatModeUtil.java       |  2 ++
 .../video/spherical/Projection.java           |  2 ++
 .../source/dash/DashMediaPeriod.java          |  2 ++
 .../source/hls/playlist/HlsMediaPlaylist.java |  2 ++
 .../exoplayer2/ui/AspectRatioFrameLayout.java |  2 ++
 .../ui/PlayerNotificationManager.java         |  3 +++
 .../android/exoplayer2/ui/PlayerView.java     |  2 ++
 62 files changed, 208 insertions(+), 25 deletions(-)

diff --git a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetEngineWrapper.java b/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetEngineWrapper.java
index dd39ea2822..829b53f863 100644
--- a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetEngineWrapper.java
+++ b/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetEngineWrapper.java
@@ -19,6 +19,7 @@ import android.content.Context;
 import android.support.annotation.IntDef;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.Field;
@@ -43,6 +44,7 @@ public final class CronetEngineWrapper {
    * Source of {@link CronetEngine}. One of {@link #SOURCE_NATIVE}, {@link #SOURCE_GMS}, {@link
    * #SOURCE_UNKNOWN}, {@link #SOURCE_USER_PROVIDED} or {@link #SOURCE_UNAVAILABLE}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({SOURCE_NATIVE, SOURCE_GMS, SOURCE_UNKNOWN, SOURCE_USER_PROVIDED, SOURCE_UNAVAILABLE})
   public @interface CronetEngineSource {}
diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java
index a1fbcc69d6..8f5dcef16b 100644
--- a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java
+++ b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java
@@ -37,6 +37,7 @@ import com.google.android.exoplayer2.util.FlacStreamInfo;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import java.io.IOException;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.nio.ByteBuffer;
@@ -54,6 +55,7 @@ public final class FlacExtractor implements Extractor {
    * Flags controlling the behavior of the extractor. Possible flag value is {@link
    * #FLAG_DISABLE_ID3_METADATA}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef(
       flag = true,
diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
index 224f5aa6ee..95a3a588b4 100644
--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
+++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
@@ -60,6 +60,7 @@ import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
@@ -230,6 +231,7 @@ public final class ImaAdsLoader
   private static final int TIMEOUT_UNSET = -1;
 
   /** The state of ad playback. */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({IMA_AD_STATE_NONE, IMA_AD_STATE_PLAYING, IMA_AD_STATE_PAUSED})
   private @interface ImaAdState {}
diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
index c09d2fe55a..e3081cd2d2 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
@@ -45,6 +45,7 @@ import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
 import com.google.android.exoplayer2.video.VideoRendererEventListener;
 import com.google.android.exoplayer2.video.VideoRendererEventListener.EventDispatcher;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -64,9 +65,13 @@ import java.lang.annotation.RetentionPolicy;
  */
 public class LibvpxVideoRenderer extends BaseRenderer {
 
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({REINITIALIZATION_STATE_NONE, REINITIALIZATION_STATE_SIGNAL_END_OF_STREAM,
-      REINITIALIZATION_STATE_WAIT_END_OF_STREAM})
+  @IntDef({
+    REINITIALIZATION_STATE_NONE,
+    REINITIALIZATION_STATE_SIGNAL_END_OF_STREAM,
+    REINITIALIZATION_STATE_WAIT_END_OF_STREAM
+  })
   private @interface ReinitializationState {}
   /**
    * The decoder does not need to be re-initialized.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/C.java b/library/core/src/main/java/com/google/android/exoplayer2/C.java
index 0cbdc14b1c..6c72dd8d0a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/C.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/C.java
@@ -28,6 +28,7 @@ import com.google.android.exoplayer2.audio.AuxEffectInfo;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
 import com.google.android.exoplayer2.video.spherical.CameraMotionListener;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.UUID;
@@ -114,6 +115,7 @@ public final class C {
    * Crypto modes for a codec. One of {@link #CRYPTO_MODE_UNENCRYPTED}, {@link #CRYPTO_MODE_AES_CTR}
    * or {@link #CRYPTO_MODE_AES_CBC}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({CRYPTO_MODE_UNENCRYPTED, CRYPTO_MODE_AES_CTR, CRYPTO_MODE_AES_CBC})
   public @interface CryptoMode {}
@@ -144,6 +146,7 @@ public final class C {
    * #ENCODING_E_AC3}, {@link #ENCODING_DTS}, {@link #ENCODING_DTS_HD} or {@link
    * #ENCODING_DOLBY_TRUEHD}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     Format.NO_VALUE,
@@ -169,6 +172,7 @@ public final class C {
    * #ENCODING_PCM_24BIT}, {@link #ENCODING_PCM_32BIT}, {@link #ENCODING_PCM_FLOAT}, {@link
    * #ENCODING_PCM_MU_LAW} or {@link #ENCODING_PCM_A_LAW}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     Format.NO_VALUE,
@@ -215,6 +219,7 @@ public final class C {
    * #STREAM_TYPE_RING}, {@link #STREAM_TYPE_SYSTEM}, {@link #STREAM_TYPE_VOICE_CALL} or {@link
    * #STREAM_TYPE_USE_DEFAULT}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     STREAM_TYPE_ALARM,
@@ -269,6 +274,7 @@ public final class C {
    * #CONTENT_TYPE_MOVIE}, {@link #CONTENT_TYPE_MUSIC}, {@link #CONTENT_TYPE_SONIFICATION}, {@link
    * #CONTENT_TYPE_SPEECH} or {@link #CONTENT_TYPE_UNKNOWN}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     CONTENT_TYPE_MOVIE,
@@ -309,6 +315,7 @@ public final class C {
    * <p>Note that {@code FLAG_HW_AV_SYNC} is not available because the player takes care of setting
    * the flag when tunneling is enabled via a track selector.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef(
       flag = true,
@@ -331,6 +338,7 @@ public final class C {
    * #USAGE_UNKNOWN}, {@link #USAGE_VOICE_COMMUNICATION} or {@link
    * #USAGE_VOICE_COMMUNICATION_SIGNALLING}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     USAGE_ALARM,
@@ -427,6 +435,7 @@ public final class C {
    * #AUDIOFOCUS_GAIN_TRANSIENT}, {@link #AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK} or {@link
    * #AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     AUDIOFOCUS_NONE,
@@ -454,6 +463,7 @@ public final class C {
    * #BUFFER_FLAG_KEY_FRAME}, {@link #BUFFER_FLAG_END_OF_STREAM}, {@link #BUFFER_FLAG_ENCRYPTED} and
    * {@link #BUFFER_FLAG_DECODE_ONLY}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef(
       flag = true,
@@ -482,6 +492,7 @@ public final class C {
    * Video scaling modes for {@link MediaCodec}-based {@link Renderer}s. One of {@link
    * #VIDEO_SCALING_MODE_SCALE_TO_FIT} or {@link #VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef(value = {VIDEO_SCALING_MODE_SCALE_TO_FIT, VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING})
   public @interface VideoScalingMode {}
@@ -504,6 +515,7 @@ public final class C {
    * Track selection flags. Possible flag values are {@link #SELECTION_FLAG_DEFAULT}, {@link
    * #SELECTION_FLAG_FORCED} and {@link #SELECTION_FLAG_AUTOSELECT}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef(
       flag = true,
@@ -530,6 +542,7 @@ public final class C {
    * Represents a streaming or other media type. One of {@link #TYPE_DASH}, {@link #TYPE_SS}, {@link
    * #TYPE_HLS} or {@link #TYPE_OTHER}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({TYPE_DASH, TYPE_SS, TYPE_HLS, TYPE_OTHER})
   public @interface ContentType {}
@@ -796,6 +809,7 @@ public final class C {
    * #STEREO_MODE_MONO}, {@link #STEREO_MODE_TOP_BOTTOM}, {@link #STEREO_MODE_LEFT_RIGHT} or {@link
    * #STEREO_MODE_STEREO_MESH}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     Format.NO_VALUE,
@@ -827,6 +841,7 @@ public final class C {
    * Video colorspaces. One of {@link Format#NO_VALUE}, {@link #COLOR_SPACE_BT709}, {@link
    * #COLOR_SPACE_BT601} or {@link #COLOR_SPACE_BT2020}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({Format.NO_VALUE, COLOR_SPACE_BT709, COLOR_SPACE_BT601, COLOR_SPACE_BT2020})
   public @interface ColorSpace {}
@@ -847,6 +862,7 @@ public final class C {
    * Video color transfer characteristics. One of {@link Format#NO_VALUE}, {@link
    * #COLOR_TRANSFER_SDR}, {@link #COLOR_TRANSFER_ST2084} or {@link #COLOR_TRANSFER_HLG}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({Format.NO_VALUE, COLOR_TRANSFER_SDR, COLOR_TRANSFER_ST2084, COLOR_TRANSFER_HLG})
   public @interface ColorTransfer {}
@@ -867,6 +883,7 @@ public final class C {
    * Video color range. One of {@link Format#NO_VALUE}, {@link #COLOR_RANGE_LIMITED} or {@link
    * #COLOR_RANGE_FULL}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({Format.NO_VALUE, COLOR_RANGE_LIMITED, COLOR_RANGE_FULL})
   public @interface ColorRange {}
@@ -899,6 +916,7 @@ public final class C {
    * #NETWORK_TYPE_4G}, {@link #NETWORK_TYPE_CELLULAR_UNKNOWN}, {@link #NETWORK_TYPE_ETHERNET} or
    * {@link #NETWORK_TYPE_OTHER}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     NETWORK_TYPE_UNKNOWN,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
index 4e69bc316e..cc16c43b05 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
@@ -36,6 +36,7 @@ import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.video.MediaCodecVideoRenderer;
 import com.google.android.exoplayer2.video.VideoRendererEventListener;
 import com.google.android.exoplayer2.video.spherical.CameraMotionRenderer;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.Constructor;
@@ -56,6 +57,7 @@ public class DefaultRenderersFactory implements RenderersFactory {
    * Modes for using extension renderers. One of {@link #EXTENSION_RENDERER_MODE_OFF}, {@link
    * #EXTENSION_RENDERER_MODE_ON} or {@link #EXTENSION_RENDERER_MODE_PREFER}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({EXTENSION_RENDERER_MODE_OFF, EXTENSION_RENDERER_MODE_ON, EXTENSION_RENDERER_MODE_PREFER})
   public @interface ExtensionRendererMode {}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
index d591876a51..6b84245141 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
@@ -19,6 +19,7 @@ import android.support.annotation.IntDef;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -31,6 +32,7 @@ public final class ExoPlaybackException extends Exception {
    * The type of source that produced the error. One of {@link #TYPE_SOURCE}, {@link #TYPE_RENDERER}
    * or {@link #TYPE_UNEXPECTED}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({TYPE_SOURCE, TYPE_RENDERER, TYPE_UNEXPECTED})
   public @interface Type {}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Player.java b/library/core/src/main/java/com/google/android/exoplayer2/Player.java
index 3640928c54..16f8aa2878 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Player.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Player.java
@@ -33,6 +33,7 @@ import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
 import com.google.android.exoplayer2.video.VideoListener;
 import com.google.android.exoplayer2.video.spherical.CameraMotionListener;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -446,6 +447,7 @@ public interface Player {
    * Repeat modes for playback. One of {@link #REPEAT_MODE_OFF}, {@link #REPEAT_MODE_ONE} or {@link
    * #REPEAT_MODE_ALL}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({REPEAT_MODE_OFF, REPEAT_MODE_ONE, REPEAT_MODE_ALL})
   @interface RepeatMode {}
@@ -467,6 +469,7 @@ public interface Player {
    * {@link #DISCONTINUITY_REASON_SEEK}, {@link #DISCONTINUITY_REASON_SEEK_ADJUSTMENT}, {@link
    * #DISCONTINUITY_REASON_AD_INSERTION} or {@link #DISCONTINUITY_REASON_INTERNAL}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     DISCONTINUITY_REASON_PERIOD_TRANSITION,
@@ -497,6 +500,7 @@ public interface Player {
    * Reasons for timeline and/or manifest changes. One of {@link #TIMELINE_CHANGE_REASON_PREPARED},
    * {@link #TIMELINE_CHANGE_REASON_RESET} or {@link #TIMELINE_CHANGE_REASON_DYNAMIC}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     TIMELINE_CHANGE_REASON_PREPARED,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java b/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java
index d1e1541cdc..c6456e5f7f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java
@@ -19,6 +19,7 @@ import android.support.annotation.IntDef;
 import com.google.android.exoplayer2.source.SampleStream;
 import com.google.android.exoplayer2.util.MediaClock;
 import java.io.IOException;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -38,6 +39,7 @@ public interface Renderer extends PlayerMessage.Target {
    * The renderer states. One of {@link #STATE_DISABLED}, {@link #STATE_ENABLED} or {@link
    * #STATE_STARTED}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({STATE_DISABLED, STATE_ENABLED, STATE_STARTED})
   @interface State {}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java
index 3e00bcc902..230b96d01f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java
@@ -23,6 +23,7 @@ import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.ParsableBitArray;
 import com.google.android.exoplayer2.util.ParsableByteArray;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.nio.ByteBuffer;
@@ -40,6 +41,7 @@ public final class Ac3Util {
      * AC3 stream types. See also ETSI TS 102 366 E.1.3.1.1. One of {@link #STREAM_TYPE_UNDEFINED},
      * {@link #STREAM_TYPE_TYPE0}, {@link #STREAM_TYPE_TYPE1} or {@link #STREAM_TYPE_TYPE2}.
      */
+    @Documented
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({STREAM_TYPE_UNDEFINED, STREAM_TYPE_TYPE0, STREAM_TYPE_TYPE1, STREAM_TYPE_TYPE2})
     public @interface StreamType {}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java
index 5fb571d195..ca4e0c299e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java
@@ -28,6 +28,7 @@ import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
@@ -56,6 +57,7 @@ public final class AudioFocusManager {
    * Player commands. One of {@link #PLAYER_COMMAND_DO_NOT_PLAY}, {@link
    * #PLAYER_COMMAND_WAIT_FOR_CALLBACK} or {@link #PLAYER_COMMAND_PLAY_WHEN_READY}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     PLAYER_COMMAND_DO_NOT_PLAY,
@@ -71,6 +73,7 @@ public final class AudioFocusManager {
   public static final int PLAYER_COMMAND_PLAY_WHEN_READY = 1;
 
   /** Audio focus state. */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     AUDIO_FOCUS_STATE_LOST_FOCUS,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTimestampPoller.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTimestampPoller.java
index 47120e7375..569260efeb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTimestampPoller.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTimestampPoller.java
@@ -22,6 +22,7 @@ import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Util;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -45,6 +46,7 @@ import java.lang.annotation.RetentionPolicy;
 /* package */ final class AudioTimestampPoller {
 
   /** Timestamp polling states. */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     STATE_INITIALIZING,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java
index 0095001299..62b120f00a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java
@@ -25,6 +25,7 @@ import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.Method;
@@ -97,6 +98,7 @@ import java.lang.reflect.Method;
   }
 
   /** {@link AudioTrack} playback states. */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({PLAYSTATE_STOPPED, PLAYSTATE_PAUSED, PLAYSTATE_PLAYING})
   private @interface PlayState {}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
index fbd5b027c1..4ce34ad41a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
@@ -30,6 +30,7 @@ import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.nio.ByteBuffer;
@@ -195,12 +196,12 @@ public final class DefaultAudioSink implements AudioSink {
 
   private static final String TAG = "AudioTrack";
 
-  /**
-   * Represents states of the {@link #startMediaTimeUs} value.
-   */
+  /** Represents states of the {@link #startMediaTimeUs} value. */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({START_NOT_SET, START_IN_SYNC, START_NEED_SYNC})
   private @interface StartMediaTimeState {}
+
   private static final int START_NOT_SET = 0;
   private static final int START_IN_SYNC = 1;
   private static final int START_NEED_SYNC = 2;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java
index 7c4eacecfb..a1ff7028c1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java
@@ -19,6 +19,7 @@ import android.support.annotation.IntDef;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.util.Util;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.nio.ByteBuffer;
@@ -54,6 +55,7 @@ public final class SilenceSkippingAudioProcessor implements AudioProcessor {
   private static final byte SILENCE_THRESHOLD_LEVEL_MSB = (SILENCE_THRESHOLD_LEVEL + 128) >> 8;
 
   /** Trimming states. */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     STATE_NOISY,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
index a527a58be4..cecb17d96c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
@@ -43,6 +43,7 @@ import com.google.android.exoplayer2.util.MediaClock;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.TraceUtil;
 import com.google.android.exoplayer2.util.Util;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -65,9 +66,13 @@ import java.lang.annotation.RetentionPolicy;
  */
 public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements MediaClock {
 
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({REINITIALIZATION_STATE_NONE, REINITIALIZATION_STATE_SIGNAL_END_OF_STREAM,
-      REINITIALIZATION_STATE_WAIT_END_OF_STREAM})
+  @IntDef({
+    REINITIALIZATION_STATE_NONE,
+    REINITIALIZATION_STATE_SIGNAL_END_OF_STREAM,
+    REINITIALIZATION_STATE_WAIT_END_OF_STREAM
+  })
   private @interface ReinitializationState {}
   /**
    * The decoder does not need to be re-initialized.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java b/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java
index 7a32ef128b..983c96f89d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.decoder;
 
 import android.support.annotation.IntDef;
 import com.google.android.exoplayer2.C;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.nio.ByteBuffer;
@@ -31,6 +32,7 @@ public class DecoderInputBuffer extends Buffer {
    * #BUFFER_REPLACEMENT_MODE_DISABLED}, {@link #BUFFER_REPLACEMENT_MODE_NORMAL} or {@link
    * #BUFFER_REPLACEMENT_MODE_DIRECT}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     BUFFER_REPLACEMENT_MODE_DISABLED,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
index 460ee357ea..d71c6fc64c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
@@ -32,6 +32,7 @@ import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.EventDispatcher;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
@@ -70,6 +71,7 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
    * Determines the action to be done after a session acquired. One of {@link #MODE_PLAYBACK},
    * {@link #MODE_QUERY}, {@link #MODE_DOWNLOAD} or {@link #MODE_RELEASE}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({MODE_PLAYBACK, MODE_QUERY, MODE_DOWNLOAD, MODE_RELEASE})
   public @interface Mode {}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java
index 698f6fdb25..a68415287e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java
@@ -19,6 +19,7 @@ import android.annotation.TargetApi;
 import android.media.MediaDrm;
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Map;
@@ -44,6 +45,7 @@ public interface DrmSession<T extends ExoMediaCrypto> {
    * The state of the DRM session. One of {@link #STATE_RELEASED}, {@link #STATE_ERROR}, {@link
    * #STATE_OPENING}, {@link #STATE_OPENED} or {@link #STATE_OPENED_WITH_KEYS}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({STATE_RELEASED, STATE_ERROR, STATE_OPENING, STATE_OPENED, STATE_OPENED_WITH_KEYS})
   @interface State {}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/UnsupportedDrmException.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/UnsupportedDrmException.java
index 5bea83d020..7f4a0f5f03 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/UnsupportedDrmException.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/UnsupportedDrmException.java
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2.drm;
 
 import android.support.annotation.IntDef;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -28,6 +29,7 @@ public final class UnsupportedDrmException extends Exception {
    * The reason for the exception. One of {@link #REASON_UNSUPPORTED_SCHEME} or {@link
    * #REASON_INSTANTIATION_ERROR}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({REASON_UNSUPPORTED_SCHEME, REASON_INSTANTIATION_ERROR})
   public @interface Reason {}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java
index 435fb13648..3b0b834427 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java
@@ -21,6 +21,7 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.nio.ByteBuffer;
@@ -437,6 +438,7 @@ public abstract class BinarySearchSeeker {
     public static final int RESULT_POSITION_UNDERESTIMATED = -2;
     public static final int RESULT_NO_TIMESTAMP = -3;
 
+    @Documented
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({
       RESULT_TARGET_TIMESTAMP_FOUND,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java
index 26d0788b33..05f5d98d3c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.extractor;
 import android.support.annotation.IntDef;
 import com.google.android.exoplayer2.C;
 import java.io.IOException;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -48,6 +49,7 @@ public interface Extractor {
    * Result values that can be returned by {@link #read(ExtractorInput, PositionHolder)}. One of
    * {@link #RESULT_CONTINUE}, {@link #RESULT_SEEK} or {@link #RESULT_END_OF_INPUT}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef(value = {RESULT_CONTINUE, RESULT_SEEK, RESULT_END_OF_INPUT})
   @interface ReadResult {}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java
index dfdce02450..b93969acfe 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java
@@ -32,6 +32,7 @@ import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.Util;
 import java.io.EOFException;
 import java.io.IOException;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Arrays;
@@ -51,6 +52,7 @@ public final class AmrExtractor implements Extractor {
    * Flags controlling the behavior of the extractor. Possible flag value is {@link
    * #FLAG_ENABLE_CONSTANT_BITRATE_SEEKING}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef(
       flag = true,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java
index 604a520526..4211cab489 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java
@@ -26,6 +26,7 @@ import com.google.android.exoplayer2.extractor.SeekMap;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -37,13 +38,17 @@ public final class FlvExtractor implements Extractor {
   /** Factory for {@link FlvExtractor} instances. */
   public static final ExtractorsFactory FACTORY = () -> new Extractor[] {new FlvExtractor()};
 
-  /**
-   * Extractor states.
-   */
+  /** Extractor states. */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({STATE_READING_FLV_HEADER, STATE_SKIPPING_TO_TAG_HEADER, STATE_READING_TAG_HEADER,
-      STATE_READING_TAG_DATA})
+  @IntDef({
+    STATE_READING_FLV_HEADER,
+    STATE_SKIPPING_TO_TAG_HEADER,
+    STATE_READING_TAG_HEADER,
+    STATE_READING_TAG_DATA
+  })
   private @interface States {}
+
   private static final int STATE_READING_FLV_HEADER = 1;
   private static final int STATE_SKIPPING_TO_TAG_HEADER = 2;
   private static final int STATE_READING_TAG_HEADER = 3;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java
index c0494e1ee0..0987bc473f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java
@@ -22,6 +22,7 @@ import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.util.Assertions;
 import java.io.EOFException;
 import java.io.IOException;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayDeque;
@@ -31,6 +32,7 @@ import java.util.ArrayDeque;
  */
 /* package */ final class DefaultEbmlReader implements EbmlReader {
 
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({ELEMENT_STATE_READ_ID, ELEMENT_STATE_READ_CONTENT_SIZE, ELEMENT_STATE_READ_CONTENT})
   private @interface ElementState {}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReaderOutput.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReaderOutput.java
index 067c88b552..cc17af5632 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReaderOutput.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReaderOutput.java
@@ -19,6 +19,7 @@ import android.support.annotation.IntDef;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
 import java.io.IOException;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -31,6 +32,7 @@ import java.lang.annotation.RetentionPolicy;
    * EBML element types. One of {@link #TYPE_UNKNOWN}, {@link #TYPE_MASTER}, {@link
    * #TYPE_UNSIGNED_INT}, {@link #TYPE_STRING}, {@link #TYPE_BINARY} or {@link #TYPE_FLOAT}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({TYPE_UNKNOWN, TYPE_MASTER, TYPE_UNSIGNED_INT, TYPE_STRING, TYPE_BINARY, TYPE_FLOAT})
   @interface ElementType {}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
index 35b6969084..63fee48771 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
@@ -45,6 +45,7 @@ import com.google.android.exoplayer2.video.AvcConfig;
 import com.google.android.exoplayer2.video.ColorInfo;
 import com.google.android.exoplayer2.video.HevcConfig;
 import java.io.IOException;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.nio.ByteBuffer;
@@ -68,6 +69,7 @@ public final class MatroskaExtractor implements Extractor {
    * Flags controlling the behavior of the extractor. Possible flag value is {@link
    * #FLAG_DISABLE_SEEK_FOR_CUES}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef(
       flag = true,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java
index 26a8bcce75..92cf590a49 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java
@@ -35,6 +35,7 @@ import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.Util;
 import java.io.EOFException;
 import java.io.IOException;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -50,6 +51,7 @@ public final class Mp3Extractor implements Extractor {
    * Flags controlling the behavior of the extractor. Possible flag values are {@link
    * #FLAG_ENABLE_CONSTANT_BITRATE_SEEKING} and {@link #FLAG_DISABLE_ID3_METADATA}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef(
       flag = true,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
index d8adcde28c..0f1fd8f649 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
@@ -43,6 +43,7 @@ import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.TimestampAdjuster;
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayDeque;
@@ -67,6 +68,7 @@ public final class FragmentedMp4Extractor implements Extractor {
    * {@link #FLAG_ENABLE_EMSG_TRACK}, {@link #FLAG_SIDELOADED} and {@link
    * #FLAG_WORKAROUND_IGNORE_EDIT_LISTS}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef(
       flag = true,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
index 7cf61b4ff3..17c82c2c5b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
@@ -35,6 +35,7 @@ import com.google.android.exoplayer2.util.NalUnitUtil;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayDeque;
@@ -53,6 +54,7 @@ public final class Mp4Extractor implements Extractor, SeekMap {
    * Flags controlling the behavior of the extractor. Possible flag value is {@link
    * #FLAG_WORKAROUND_IGNORE_EDIT_LISTS}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef(
       flag = true,
@@ -63,12 +65,12 @@ public final class Mp4Extractor implements Extractor, SeekMap {
    */
   public static final int FLAG_WORKAROUND_IGNORE_EDIT_LISTS = 1;
 
-  /**
-   * Parser states.
-   */
+  /** Parser states. */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({STATE_READING_ATOM_HEADER, STATE_READING_ATOM_PAYLOAD, STATE_READING_SAMPLE})
   private @interface State {}
+
   private static final int STATE_READING_ATOM_HEADER = 0;
   private static final int STATE_READING_ATOM_PAYLOAD = 1;
   private static final int STATE_READING_SAMPLE = 2;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java
index 867e037f4b..59cd602209 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java
@@ -19,6 +19,7 @@ import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -31,6 +32,7 @@ public final class Track {
    * The transformation to apply to samples in the track, if any. One of {@link
    * #TRANSFORMATION_NONE} or {@link #TRANSFORMATION_CEA608_CDAT}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({TRANSFORMATION_NONE, TRANSFORMATION_CEA608_CDAT})
   public @interface Transformation {}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java
index 4141f83370..2ef9704a7a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java
@@ -25,6 +25,7 @@ import com.google.android.exoplayer2.extractor.TrackOutput;
 import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.TrackIdGenerator;
 import com.google.android.exoplayer2.util.ParsableBitArray;
 import com.google.android.exoplayer2.util.ParsableByteArray;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -33,9 +34,11 @@ import java.lang.annotation.RetentionPolicy;
  */
 public final class Ac3Reader implements ElementaryStreamReader {
 
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({STATE_FINDING_SYNC, STATE_READING_HEADER, STATE_READING_SAMPLE})
   private @interface State {}
+
   private static final int STATE_FINDING_SYNC = 0;
   private static final int STATE_READING_HEADER = 1;
   private static final int STATE_READING_SAMPLE = 2;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java
index 0c2a0545dc..04a6b571bd 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java
@@ -32,6 +32,7 @@ import com.google.android.exoplayer2.util.ParsableBitArray;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -47,6 +48,7 @@ public final class AdtsExtractor implements Extractor {
    * Flags controlling the behavior of the extractor. Possible flag value is {@link
    * #FLAG_ENABLE_CONSTANT_BITRATE_SEEKING}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef(
       flag = true,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java
index 7353b25e9c..a5506e2cfb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java
@@ -22,6 +22,7 @@ import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.EsInfo;
 import com.google.android.exoplayer2.text.cea.Cea708InitializationData;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.ParsableByteArray;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
@@ -39,6 +40,7 @@ public final class DefaultTsPayloadReaderFactory implements TsPayloadReader.Fact
    * #FLAG_IGNORE_H264_STREAM}, {@link #FLAG_DETECT_ACCESS_UNITS}, {@link
    * #FLAG_IGNORE_SPLICE_INFO_STREAM} and {@link #FLAG_OVERRIDE_CAPTION_DESCRIPTORS}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef(
       flag = true,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java
index 978b1e8813..f47a481d7e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java
@@ -38,6 +38,7 @@ import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.TimestampAdjuster;
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
@@ -57,6 +58,7 @@ public final class TsExtractor implements Extractor {
    * Modes for the extractor. One of {@link #MODE_MULTI_PMT}, {@link #MODE_SINGLE_PMT} or {@link
    * #MODE_HLS}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({MODE_MULTI_PMT, MODE_SINGLE_PMT, MODE_HLS})
   public @interface Mode {}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index bd77f32f5b..87d56fdf3d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -46,6 +46,7 @@ import com.google.android.exoplayer2.util.NalUnitUtil;
 import com.google.android.exoplayer2.util.TimedValueQueue;
 import com.google.android.exoplayer2.util.TraceUtil;
 import com.google.android.exoplayer2.util.Util;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.nio.ByteBuffer;
@@ -182,6 +183,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
    * The possible return values for {@link #canKeepCodec(MediaCodec, MediaCodecInfo, Format,
    * Format)}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     KEEP_CODEC_RESULT_NO,
@@ -202,9 +204,13 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   /** The codec can be kept. It does not need to be flushed and no reconfiguration is required. */
   protected static final int KEEP_CODEC_RESULT_YES_WITHOUT_RECONFIGURATION = 3;
 
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({RECONFIGURATION_STATE_NONE, RECONFIGURATION_STATE_WRITE_PENDING,
-      RECONFIGURATION_STATE_QUEUE_PENDING})
+  @IntDef({
+    RECONFIGURATION_STATE_NONE,
+    RECONFIGURATION_STATE_WRITE_PENDING,
+    RECONFIGURATION_STATE_QUEUE_PENDING
+  })
   private @interface ReconfigurationState {}
   /**
    * There is no pending adaptive reconfiguration work.
@@ -220,9 +226,13 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
    */
   private static final int RECONFIGURATION_STATE_QUEUE_PENDING = 2;
 
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({REINITIALIZATION_STATE_NONE, REINITIALIZATION_STATE_SIGNAL_END_OF_STREAM,
-      REINITIALIZATION_STATE_WAIT_END_OF_STREAM})
+  @IntDef({
+    REINITIALIZATION_STATE_NONE,
+    REINITIALIZATION_STATE_SIGNAL_END_OF_STREAM,
+    REINITIALIZATION_STATE_WAIT_END_OF_STREAM
+  })
   private @interface ReinitializationState {}
   /**
    * The codec does not need to be re-initialized.
@@ -241,9 +251,13 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
    */
   private static final int REINITIALIZATION_STATE_WAIT_END_OF_STREAM = 2;
 
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({ADAPTATION_WORKAROUND_MODE_NEVER, ADAPTATION_WORKAROUND_MODE_SAME_RESOLUTION,
-      ADAPTATION_WORKAROUND_MODE_ALWAYS})
+  @IntDef({
+    ADAPTATION_WORKAROUND_MODE_NEVER,
+    ADAPTATION_WORKAROUND_MODE_SAME_RESOLUTION,
+    ADAPTATION_WORKAROUND_MODE_ALWAYS
+  })
   private @interface AdaptationWorkaroundMode {}
   /**
    * The adaptation workaround is never used.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 3b26741897..409f79f30b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -37,6 +37,7 @@ import com.google.android.exoplayer2.util.Util;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
@@ -532,6 +533,7 @@ public final class DownloadManager {
      *                    -&gt; failed
      * </pre>
      */
+    @Documented
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({STATE_QUEUED, STATE_STARTED, STATE_COMPLETED, STATE_CANCELED, STATE_FAILED})
     public @interface State {}
@@ -621,6 +623,7 @@ public final class DownloadManager {
      * +-----------+------+-------+---------+-----------+-----------+--------+--------+------+
      * </pre>
      */
+    @Documented
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({
       STATE_QUEUED,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
index 0ee8d76bc7..4d6dbd83be 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
@@ -27,6 +27,7 @@ import android.os.PowerManager;
 import android.support.annotation.IntDef;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -39,6 +40,7 @@ public final class Requirements {
    * Network types. One of {@link #NETWORK_TYPE_NONE}, {@link #NETWORK_TYPE_ANY}, {@link
    * #NETWORK_TYPE_UNMETERED}, {@link #NETWORK_TYPE_NOT_ROAMING} or {@link #NETWORK_TYPE_METERED}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     NETWORK_TYPE_NONE,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
index 88e98e811f..5f80725805 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
@@ -24,6 +24,7 @@ import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.upstream.TransferListener;
 import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
@@ -41,6 +42,7 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> {
      * The reason clipping failed. One of {@link #REASON_INVALID_PERIOD_COUNT}, {@link
      * #REASON_NOT_SEEKABLE_TO_START} or {@link #REASON_START_EXCEEDS_END}.
      */
+    @Documented
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({REASON_INVALID_PERIOD_COUNT, REASON_NOT_SEEKABLE_TO_START, REASON_START_EXCEEDS_END})
     public @interface Reason {}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java
index 746af5719e..ecb4b10c6a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java
@@ -22,6 +22,7 @@ import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.upstream.TransferListener;
 import java.io.IOException;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
@@ -41,6 +42,7 @@ public final class MergingMediaSource extends CompositeMediaSource<Integer> {
   public static final class IllegalMergeException extends IOException {
 
     /** The reason the merge failed. One of {@link #REASON_PERIOD_COUNT_MISMATCH}. */
+    @Documented
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({REASON_PERIOD_COUNT_MISMATCH})
     public @interface Reason {}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdPlaybackState.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdPlaybackState.java
index 72fc162bc3..41adb78906 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdPlaybackState.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdPlaybackState.java
@@ -20,6 +20,7 @@ import android.support.annotation.CheckResult;
 import android.support.annotation.IntDef;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Arrays;
@@ -239,6 +240,7 @@ public final class AdPlaybackState {
    * #AD_STATE_AVAILABLE}, {@link #AD_STATE_SKIPPED}, {@link #AD_STATE_PLAYED} or {@link
    * #AD_STATE_ERROR}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     AD_STATE_UNAVAILABLE,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
index 3d5c41e8bc..7fc0f22bf3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
@@ -39,6 +39,7 @@ import com.google.android.exoplayer2.upstream.DataSpec;
 import com.google.android.exoplayer2.upstream.TransferListener;
 import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
@@ -87,6 +88,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
      * Types of ad load exceptions. One of {@link #TYPE_AD}, {@link #TYPE_AD_GROUP}, {@link
      * #TYPE_ALL_ADS} or {@link #TYPE_UNEXPECTED}.
      */
+    @Documented
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({TYPE_AD, TYPE_AD_GROUP, TYPE_ALL_ADS, TYPE_UNEXPECTED})
     public @interface Type {}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/CaptionStyleCompat.java b/library/core/src/main/java/com/google/android/exoplayer2/text/CaptionStyleCompat.java
index 87dcb97a81..e7bb0e16bf 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/CaptionStyleCompat.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/CaptionStyleCompat.java
@@ -22,6 +22,7 @@ import android.support.annotation.IntDef;
 import android.view.accessibility.CaptioningManager;
 import android.view.accessibility.CaptioningManager.CaptionStyle;
 import com.google.android.exoplayer2.util.Util;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -35,6 +36,7 @@ public final class CaptionStyleCompat {
    * #EDGE_TYPE_OUTLINE}, {@link #EDGE_TYPE_DROP_SHADOW}, {@link #EDGE_TYPE_RAISED} or {@link
    * #EDGE_TYPE_DEPRESSED}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     EDGE_TYPE_NONE,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/Cue.java b/library/core/src/main/java/com/google/android/exoplayer2/text/Cue.java
index e1305acd14..a5c666c44a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/Cue.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/Cue.java
@@ -19,6 +19,7 @@ import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.support.annotation.IntDef;
 import android.text.Layout.Alignment;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -36,6 +37,7 @@ public class Cue {
    * The type of anchor, which may be unset. One of {@link #TYPE_UNSET}, {@link #ANCHOR_TYPE_START},
    * {@link #ANCHOR_TYPE_MIDDLE} or {@link #ANCHOR_TYPE_END}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({TYPE_UNSET, ANCHOR_TYPE_START, ANCHOR_TYPE_MIDDLE, ANCHOR_TYPE_END})
   public @interface AnchorType {}
@@ -66,6 +68,7 @@ public class Cue {
    * The type of line, which may be unset. One of {@link #TYPE_UNSET}, {@link #LINE_TYPE_FRACTION}
    * or {@link #LINE_TYPE_NUMBER}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({TYPE_UNSET, LINE_TYPE_FRACTION, LINE_TYPE_NUMBER})
   public @interface LineType {}
@@ -85,6 +88,7 @@ public class Cue {
    * {@link #TEXT_SIZE_TYPE_FRACTIONAL}, {@link #TEXT_SIZE_TYPE_FRACTIONAL_IGNORE_PADDING} or {@link
    * #TEXT_SIZE_TYPE_ABSOLUTE}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     TYPE_UNSET,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java
index 5b74bd1505..16f82a7293 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java
@@ -29,6 +29,7 @@ import com.google.android.exoplayer2.FormatHolder;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.Util;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Collections;
@@ -49,9 +50,13 @@ public final class TextRenderer extends BaseRenderer implements Callback {
   @Deprecated
   public interface Output extends TextOutput {}
 
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({REPLACEMENT_STATE_NONE, REPLACEMENT_STATE_SIGNAL_END_OF_STREAM,
-      REPLACEMENT_STATE_WAIT_END_OF_STREAM})
+  @IntDef({
+    REPLACEMENT_STATE_NONE,
+    REPLACEMENT_STATE_SIGNAL_END_OF_STREAM,
+    REPLACEMENT_STATE_WAIT_END_OF_STREAM
+  })
   private @interface ReplacementState {}
   /**
    * The decoder does not need to be replaced.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java
index 90f93d5b21..a4f0cca955 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java
@@ -19,6 +19,7 @@ import android.graphics.Typeface;
 import android.support.annotation.IntDef;
 import android.text.Layout;
 import com.google.android.exoplayer2.util.Assertions;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -29,25 +30,32 @@ import java.lang.annotation.RetentionPolicy;
 
   public static final int UNSPECIFIED = -1;
 
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef(flag = true, value = {UNSPECIFIED, STYLE_NORMAL, STYLE_BOLD, STYLE_ITALIC,
-      STYLE_BOLD_ITALIC})
+  @IntDef(
+      flag = true,
+      value = {UNSPECIFIED, STYLE_NORMAL, STYLE_BOLD, STYLE_ITALIC, STYLE_BOLD_ITALIC})
   public @interface StyleFlags {}
+
   public static final int STYLE_NORMAL = Typeface.NORMAL;
   public static final int STYLE_BOLD = Typeface.BOLD;
   public static final int STYLE_ITALIC = Typeface.ITALIC;
   public static final int STYLE_BOLD_ITALIC = Typeface.BOLD_ITALIC;
 
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({UNSPECIFIED, FONT_SIZE_UNIT_PIXEL, FONT_SIZE_UNIT_EM, FONT_SIZE_UNIT_PERCENT})
   public @interface FontSizeUnit {}
+
   public static final int FONT_SIZE_UNIT_PIXEL = 1;
   public static final int FONT_SIZE_UNIT_EM = 2;
   public static final int FONT_SIZE_UNIT_PERCENT = 3;
 
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({UNSPECIFIED, OFF, ON})
   private @interface OptionalBoolean {}
+
   private static final int OFF = 0;
   private static final int ON = 1;
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java
index 0e46fa0d2f..fe274a6241 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java
@@ -19,6 +19,7 @@ import android.graphics.Typeface;
 import android.support.annotation.IntDef;
 import android.text.Layout;
 import com.google.android.exoplayer2.util.Util;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Arrays;
@@ -39,6 +40,7 @@ public final class WebvttCssStyle {
    * Style flag enum. Possible flag values are {@link #UNSPECIFIED}, {@link #STYLE_NORMAL}, {@link
    * #STYLE_BOLD}, {@link #STYLE_ITALIC} and {@link #STYLE_BOLD_ITALIC}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef(
       flag = true,
@@ -54,6 +56,7 @@ public final class WebvttCssStyle {
    * Font size unit enum. One of {@link #UNSPECIFIED}, {@link #FONT_SIZE_UNIT_PIXEL}, {@link
    * #FONT_SIZE_UNIT_EM} or {@link #FONT_SIZE_UNIT_PERCENT}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({UNSPECIFIED, FONT_SIZE_UNIT_PIXEL, FONT_SIZE_UNIT_EM, FONT_SIZE_UNIT_PERCENT})
   public @interface FontSizeUnit {}
@@ -62,9 +65,11 @@ public final class WebvttCssStyle {
   public static final int FONT_SIZE_UNIT_EM = 2;
   public static final int FONT_SIZE_UNIT_PERCENT = 3;
 
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({UNSPECIFIED, OFF, ON})
   private @interface OptionalBoolean {}
+
   private static final int OFF = 0;
   private static final int ON = 1;
 
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 81fbc16630..f9c63805f2 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
@@ -28,6 +28,7 @@ import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.util.Util;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Arrays;
@@ -50,6 +51,7 @@ public abstract class MappingTrackSelector extends TrackSelector {
      * {@link #RENDERER_SUPPORT_NO_TRACKS}, {@link #RENDERER_SUPPORT_UNSUPPORTED_TRACKS}, {@link
      * #RENDERER_SUPPORT_EXCEEDS_CAPABILITIES_TRACKS} or {@link #RENDERER_SUPPORT_PLAYABLE_TRACKS}.
      */
+    @Documented
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({
       RENDERER_SUPPORT_NO_TRACKS,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java
index c968921822..4a4cc021f4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java
@@ -20,6 +20,7 @@ import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Arrays;
@@ -33,6 +34,7 @@ public final class DataSpec {
    * The flags that apply to any request for data. Possible flag values are {@link #FLAG_ALLOW_GZIP}
    * and {@link #FLAG_ALLOW_CACHING_UNKNOWN_LENGTH}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef(
       flag = true,
@@ -61,6 +63,7 @@ public final class DataSpec {
    * The set of HTTP methods that are supported by ExoPlayer {@link HttpDataSource}s. One of {@link
    * #HTTP_METHOD_GET}, {@link #HTTP_METHOD_POST} or {@link #HTTP_METHOD_HEAD}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({HTTP_METHOD_GET, HTTP_METHOD_POST, HTTP_METHOD_HEAD})
   public @interface HttpMethod {}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
index daf5d3281a..0be7b857df 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
@@ -20,6 +20,7 @@ import android.text.TextUtils;
 import com.google.android.exoplayer2.util.Predicate;
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Collections;
@@ -226,9 +227,11 @@ public interface HttpDataSource extends DataSource {
    */
   class HttpDataSourceException extends IOException {
 
+    @Documented
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({TYPE_OPEN, TYPE_READ, TYPE_CLOSE})
     public @interface Type {}
+
     public static final int TYPE_OPEN = 1;
     public static final int TYPE_READ = 2;
     public static final int TYPE_CLOSE = 3;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/Loader.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/Loader.java
index 03219380c7..ac3b3c5c5e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/Loader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/Loader.java
@@ -28,6 +28,7 @@ import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.TraceUtil;
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.concurrent.ExecutorService;
@@ -136,6 +137,7 @@ public final class Loader implements LoaderErrorThrower {
   }
 
   /** Types of action that can be taken in response to a load error. */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     ACTION_TYPE_RETRY,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
index a91e3246cc..fa2068b99d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
@@ -31,6 +31,7 @@ import com.google.android.exoplayer2.upstream.cache.Cache.CacheException;
 import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
 import java.io.InterruptedIOException;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.List;
@@ -59,6 +60,7 @@ public final class CacheDataSource implements DataSource {
    * Flags controlling the cache's behavior. Possible flag values are {@link #FLAG_BLOCK_ON_CACHE},
    * {@link #FLAG_IGNORE_CACHE_ON_ERROR} and {@link #FLAG_IGNORE_CACHE_FOR_UNSET_LENGTH_REQUESTS}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef(
       flag = true,
@@ -91,6 +93,7 @@ public final class CacheDataSource implements DataSource {
    * Reasons the cache may be ignored. One of {@link #CACHE_IGNORED_REASON_ERROR} or {@link
    * #CACHE_IGNORED_REASON_UNSET_LENGTH}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({CACHE_IGNORED_REASON_ERROR, CACHE_IGNORED_REASON_UNSET_LENGTH})
   public @interface CacheIgnoredReason {}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java b/library/core/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java
index bf4d78ee10..216ddb3c4e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java
@@ -26,6 +26,7 @@ import android.opengl.GLES20;
 import android.os.Handler;
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -43,6 +44,7 @@ public final class EGLSurfaceTexture implements SurfaceTexture.OnFrameAvailableL
    * Secure mode to be used by the EGL surface and context. One of {@link #SECURE_MODE_NONE}, {@link
    * #SECURE_MODE_SURFACELESS_CONTEXT} or {@link #SECURE_MODE_PROTECTED_PBUFFER}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({SECURE_MODE_NONE, SECURE_MODE_SURFACELESS_CONTEXT, SECURE_MODE_PROTECTED_PBUFFER})
   public @interface SecureMode {}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Log.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Log.java
index 6a1e686dec..34fb684d25 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/Log.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Log.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.util;
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -28,6 +29,7 @@ public final class Log {
    * Log level for ExoPlayer logcat logging. One of {@link #LOG_LEVEL_ALL}, {@link #LOG_LEVEL_INFO},
    * {@link #LOG_LEVEL_WARNING}, {@link #LOG_LEVEL_ERROR} or {@link #LOG_LEVEL_OFF}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({LOG_LEVEL_ALL, LOG_LEVEL_INFO, LOG_LEVEL_WARNING, LOG_LEVEL_ERROR, LOG_LEVEL_OFF})
   @interface LogLevel {}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/NotificationUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/util/NotificationUtil.java
index e70f576754..e45ab0952e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/NotificationUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/NotificationUtil.java
@@ -24,6 +24,7 @@ import android.content.Intent;
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -36,6 +37,7 @@ public final class NotificationUtil {
    * #IMPORTANCE_NONE}, {@link #IMPORTANCE_MIN}, {@link #IMPORTANCE_LOW}, {@link
    * #IMPORTANCE_DEFAULT} or {@link #IMPORTANCE_HIGH}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     IMPORTANCE_UNSPECIFIED,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/RepeatModeUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/util/RepeatModeUtil.java
index de92e1ad93..5816e40623 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/RepeatModeUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/RepeatModeUtil.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.util;
 
 import android.support.annotation.IntDef;
 import com.google.android.exoplayer2.Player;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -30,6 +31,7 @@ public final class RepeatModeUtil {
    * {@link #REPEAT_TOGGLE_MODE_NONE}, {@link #REPEAT_TOGGLE_MODE_ONE} and {@link
    * #REPEAT_TOGGLE_MODE_ALL}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef(
       flag = true,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/Projection.java b/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/Projection.java
index 0a9d04bf0f..3d4879d50a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/Projection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/Projection.java
@@ -19,6 +19,7 @@ import android.support.annotation.IntDef;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.C.StereoMode;
 import com.google.android.exoplayer2.util.Assertions;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -26,6 +27,7 @@ import java.lang.annotation.RetentionPolicy;
 public final class Projection {
 
   /** Enforces allowed (sub) mesh draw modes. */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({DRAW_MODE_TRIANGLES, DRAW_MODE_TRIANGLES_STRIP, DRAW_MODE_TRIANGLES_FAN})
   public @interface DrawMode {}
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java
index a501435262..5c9a933508 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java
@@ -47,6 +47,7 @@ import com.google.android.exoplayer2.upstream.LoaderErrorThrower;
 import com.google.android.exoplayer2.upstream.TransferListener;
 import com.google.android.exoplayer2.util.MimeTypes;
 import java.io.IOException;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
@@ -660,6 +661,7 @@ import java.util.List;
 
   private static final class TrackGroupInfo {
 
+    @Documented
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({CATEGORY_PRIMARY, CATEGORY_EMBEDDED, CATEGORY_MANIFEST_EVENTS})
     public @interface TrackGroupCategory {}
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java
index a29808933b..81d4e7a818 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java
@@ -21,6 +21,7 @@ import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.offline.StreamKey;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Collections;
@@ -157,6 +158,7 @@ public final class HlsMediaPlaylist extends HlsPlaylist {
    * Type of the playlist, as defined by #EXT-X-PLAYLIST-TYPE. One of {@link
    * #PLAYLIST_TYPE_UNKNOWN}, {@link #PLAYLIST_TYPE_VOD} or {@link #PLAYLIST_TYPE_EVENT}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({PLAYLIST_TYPE_UNKNOWN, PLAYLIST_TYPE_VOD, PLAYLIST_TYPE_EVENT})
   public @interface PlaylistType {}
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java
index 9d977d63b3..0d4c6a4038 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java
@@ -20,6 +20,7 @@ import android.content.res.TypedArray;
 import android.support.annotation.IntDef;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -50,6 +51,7 @@ public final class AspectRatioFrameLayout extends FrameLayout {
    * #RESIZE_MODE_FIXED_WIDTH}, {@link #RESIZE_MODE_FIXED_HEIGHT}, {@link #RESIZE_MODE_FILL} or
    * {@link #RESIZE_MODE_ZOOM}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     RESIZE_MODE_FIT,
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
index 778f81375e..47025d9bba 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
@@ -42,6 +42,7 @@ import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.NotificationUtil;
 import com.google.android.exoplayer2.util.Util;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
@@ -250,6 +251,7 @@ public class PlayerNotificationManager {
    * NotificationCompat#VISIBILITY_PRIVATE}, {@link NotificationCompat#VISIBILITY_PUBLIC} or {@link
    * NotificationCompat#VISIBILITY_SECRET}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     NotificationCompat.VISIBILITY_PRIVATE,
@@ -264,6 +266,7 @@ public class PlayerNotificationManager {
    * NotificationCompat#PRIORITY_HIGH}, {@link NotificationCompat#PRIORITY_LOW }or {@link
    * NotificationCompat#PRIORITY_MIN}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     NotificationCompat.PRIORITY_DEFAULT,
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
index 8127fd617a..e429f5bfa0 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
@@ -67,6 +67,7 @@ import com.google.android.exoplayer2.util.ErrorMessageProvider;
 import com.google.android.exoplayer2.util.RepeatModeUtil;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.video.VideoListener;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.List;
@@ -249,6 +250,7 @@ public class PlayerView extends FrameLayout {
    * Determines when the buffering view is shown. One of {@link #SHOW_BUFFERING_NEVER}, {@link
    * #SHOW_BUFFERING_WHEN_PLAYING} or {@link #SHOW_BUFFERING_ALWAYS}.
    */
+  @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({SHOW_BUFFERING_NEVER, SHOW_BUFFERING_WHEN_PLAYING, SHOW_BUFFERING_ALWAYS})
   public @interface ShowBuffering {}

From 5d5b641c1dec222eb4e504391fc021c35d73f6fd Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 28 Sep 2018 13:33:23 -0700
Subject: [PATCH 035/832] Extend physical display size workaround for ATVs

Extend Sony workaround up to and including Oreo.

Due to a platform issue the Display API couldn't report 1080p UI
and 4k SurfaceView support until Oreo. Since Oreo it is still
common for devices to misreport their display sizes via Display,
so this change switches to using system properties up to and
including Pie.

On Pie treble may prevent writing sys.display-size so check for
vendor.display-size instead.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=214987203
---
 .../audio/MediaCodecAudioRenderer.java        | 22 ++---
 .../google/android/exoplayer2/util/Util.java  | 86 ++++++++++++-------
 2 files changed, 61 insertions(+), 47 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
index 89d2ee16b2..a68ee5b727 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.audio;
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Context;
-import android.content.pm.PackageManager;
 import android.media.MediaCodec;
 import android.media.MediaCrypto;
 import android.media.MediaFormat;
@@ -707,21 +706,12 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
    *     be determined.
    */
   private int getCodecMaxInputSize(MediaCodecInfo codecInfo, Format format) {
-    if (Util.SDK_INT < 24 && "OMX.google.raw.decoder".equals(codecInfo.name)) {
-      // OMX.google.raw.decoder didn't resize its output buffers correctly prior to N, so there's no
-      // point requesting a non-default input size. Doing so may cause a native crash, where-as not
-      // doing so will cause a more controlled failure when attempting to fill an input buffer. See:
-      // https://github.com/google/ExoPlayer/issues/4057.
-      boolean needsRawDecoderWorkaround = true;
-      if (Util.SDK_INT == 23) {
-        PackageManager packageManager = context.getPackageManager();
-        if (packageManager != null
-            && packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {
-          // The workaround is not required for AndroidTV devices running M.
-          needsRawDecoderWorkaround = false;
-        }
-      }
-      if (needsRawDecoderWorkaround) {
+    if ("OMX.google.raw.decoder".equals(codecInfo.name)) {
+      // OMX.google.raw.decoder didn't resize its output buffers correctly prior to N, except on
+      // Android TV running M, so there's no point requesting a non-default input size. Doing so may
+      // cause a native crash, whereas not doing so will cause a more controlled failure when
+      // attempting to fill an input buffer. See: https://github.com/google/ExoPlayer/issues/4057.
+      if (Util.SDK_INT < 24 && !(Util.SDK_INT == 23 && Util.isAndroidTv(context))) {
         return Format.NO_VALUE;
       }
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
index eafb05226c..33c8dc5643 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
@@ -1728,6 +1728,18 @@ public final class Util {
     }
   }
 
+  /**
+   * Returns whether the device is an Android TV.
+   *
+   * @param context Any context.
+   * @return Whether the device is an Android TV.
+   */
+  public static boolean isAndroidTv(Context context) {
+    PackageManager packageManager = context.getPackageManager();
+    return packageManager != null
+        && packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK);
+  }
+
   /**
    * Gets the physical size of the default display, in pixels.
    *
@@ -1747,43 +1759,42 @@ public final class Util {
    * @return The physical display size, in pixels.
    */
   public static Point getPhysicalDisplaySize(Context context, Display display) {
-    if (Util.SDK_INT < 25 && display.getDisplayId() == Display.DEFAULT_DISPLAY) {
-      // Before API 25 the Display object does not provide a working way to identify Android TVs
-      // that can show 4k resolution in a SurfaceView, so check for supported devices here.
-      if ("Sony".equals(Util.MANUFACTURER) && Util.MODEL.startsWith("BRAVIA")
+    if (Util.SDK_INT <= 28
+        && display.getDisplayId() == Display.DEFAULT_DISPLAY
+        && Util.isAndroidTv(context)) {
+      // On Android TVs it is common for the UI to be configured for a lower resolution than
+      // SurfaceViews can output. Before API 26 the Display object does not provide a way to
+      // identify this case, and up to and including API 28 many devices still do not correctly set
+      // their hardware compositor output size.
+
+      // Sony Android TVs advertise support for 4k output via a system feature.
+      if ("Sony".equals(Util.MANUFACTURER)
+          && Util.MODEL.startsWith("BRAVIA")
           && context.getPackageManager().hasSystemFeature("com.sony.dtv.hardware.panel.qfhd")) {
         return new Point(3840, 2160);
-      } else if (("NVIDIA".equals(Util.MANUFACTURER) && Util.MODEL.contains("SHIELD"))
-          || ("philips".equals(Util.toLowerInvariant(Util.MANUFACTURER))
-              && (Util.MODEL.startsWith("QM1")
-                  || Util.MODEL.equals("QV151E")
-                  || Util.MODEL.equals("TPM171E")))) {
-        // Attempt to read sys.display-size.
-        String sysDisplaySize = null;
+      }
+
+      // Otherwise check the system property for display size. From API 28 treble may prevent the
+      // system from writing sys.display-size so we check vendor.display-size instead.
+      String displaySize =
+          Util.SDK_INT < 28
+              ? getSystemProperty("sys.display-size")
+              : getSystemProperty("vendor.display-size");
+      // If we managed to read the display size, attempt to parse it.
+      if (!TextUtils.isEmpty(displaySize)) {
         try {
-          @SuppressLint("PrivateApi")
-          Class<?> systemProperties = Class.forName("android.os.SystemProperties");
-          Method getMethod = systemProperties.getMethod("get", String.class);
-          sysDisplaySize = (String) getMethod.invoke(systemProperties, "sys.display-size");
-        } catch (Exception e) {
-          Log.e(TAG, "Failed to read sys.display-size", e);
-        }
-        // If we managed to read sys.display-size, attempt to parse it.
-        if (!TextUtils.isEmpty(sysDisplaySize)) {
-          try {
-            String[] sysDisplaySizeParts = split(sysDisplaySize.trim(), "x");
-            if (sysDisplaySizeParts.length == 2) {
-              int width = Integer.parseInt(sysDisplaySizeParts[0]);
-              int height = Integer.parseInt(sysDisplaySizeParts[1]);
-              if (width > 0 && height > 0) {
-                return new Point(width, height);
-              }
+          String[] displaySizeParts = split(displaySize.trim(), "x");
+          if (displaySizeParts.length == 2) {
+            int width = Integer.parseInt(displaySizeParts[0]);
+            int height = Integer.parseInt(displaySizeParts[1]);
+            if (width > 0 && height > 0) {
+              return new Point(width, height);
             }
-          } catch (NumberFormatException e) {
-            // Do nothing.
           }
-          Log.e(TAG, "Invalid sys.display-size: " + sysDisplaySize);
+        } catch (NumberFormatException e) {
+          // Do nothing.
         }
+        Log.e(TAG, "Invalid display size: " + displaySize);
       }
     }
 
@@ -1800,6 +1811,19 @@ public final class Util {
     return displaySize;
   }
 
+  @Nullable
+  private static String getSystemProperty(String name) {
+    try {
+      @SuppressLint("PrivateApi")
+      Class<?> systemProperties = Class.forName("android.os.SystemProperties");
+      Method getMethod = systemProperties.getMethod("get", String.class);
+      return (String) getMethod.invoke(systemProperties, name);
+    } catch (Exception e) {
+      Log.e(TAG, "Failed to read system property " + name, e);
+      return null;
+    }
+  }
+
   @TargetApi(23)
   private static void getDisplaySizeV23(Display display, Point outSize) {
     Display.Mode mode = display.getMode();

From f59f557704cb0406a4bfa4e542b4914e977171d2 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 1 Oct 2018 01:50:07 -0700
Subject: [PATCH 036/832] Use recommended way of checking for TV

Switch to the recommended way of checking whether the app is running on a TV
device.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215177587
---
 .../audio/MediaCodecAudioRenderer.java        |  2 +-
 .../google/android/exoplayer2/util/Util.java  | 32 +++++++++++--------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
index a68ee5b727..59a077dff8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
@@ -711,7 +711,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
       // Android TV running M, so there's no point requesting a non-default input size. Doing so may
       // cause a native crash, whereas not doing so will cause a more controlled failure when
       // attempting to fill an input buffer. See: https://github.com/google/ExoPlayer/issues/4057.
-      if (Util.SDK_INT < 24 && !(Util.SDK_INT == 23 && Util.isAndroidTv(context))) {
+      if (Util.SDK_INT < 24 && !(Util.SDK_INT == 23 && Util.isTv(context))) {
         return Format.NO_VALUE;
       }
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
index 33c8dc5643..2d3a0aeb78 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
@@ -15,16 +15,20 @@
  */
 package com.google.android.exoplayer2.util;
 
+import static android.content.Context.UI_MODE_SERVICE;
+
 import android.Manifest.permission;
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Activity;
+import android.app.UiModeManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.Configuration;
 import android.graphics.Point;
 import android.media.AudioFormat;
 import android.net.ConnectivityManager;
@@ -173,7 +177,7 @@ public final class Util {
       return false;
     }
     for (Uri uri : uris) {
-      if (Util.isLocalFileUri(uri)) {
+      if (isLocalFileUri(uri)) {
         if (activity.checkSelfPermission(permission.READ_EXTERNAL_STORAGE)
             != PackageManager.PERMISSION_GRANTED) {
           activity.requestPermissions(new String[] {permission.READ_EXTERNAL_STORAGE}, 0);
@@ -242,7 +246,7 @@ public final class Util {
    */
   public static boolean contains(Object[] items, Object item) {
     for (Object arrayItem : items) {
-      if (Util.areEqual(arrayItem, item)) {
+      if (areEqual(arrayItem, item)) {
         return true;
       }
     }
@@ -1352,7 +1356,7 @@ public final class Util {
    * @return The derived {@link UUID}, or {@code null} if one could not be derived.
    */
   public static @Nullable UUID getDrmUuid(String drmScheme) {
-    switch (Util.toLowerInvariant(drmScheme)) {
+    switch (toLowerInvariant(drmScheme)) {
       case "widevine":
         return C.WIDEVINE_UUID;
       case "playready":
@@ -1402,7 +1406,7 @@ public final class Util {
    */
   @C.ContentType
   public static int inferContentType(String fileName) {
-    fileName = Util.toLowerInvariant(fileName);
+    fileName = toLowerInvariant(fileName);
     if (fileName.endsWith(".mpd")) {
       return C.TYPE_DASH;
     } else if (fileName.endsWith(".m3u8")) {
@@ -1565,7 +1569,7 @@ public final class Util {
    * and is not declared to be thrown.
    */
   public static void sneakyThrow(Throwable t) {
-    Util.sneakyThrowInternal(t);
+    sneakyThrowInternal(t);
   }
 
   @SuppressWarnings("unchecked")
@@ -1729,15 +1733,17 @@ public final class Util {
   }
 
   /**
-   * Returns whether the device is an Android TV.
+   * Returns whether the app is running on a TV device.
    *
    * @param context Any context.
-   * @return Whether the device is an Android TV.
+   * @return Whether the app is running on a TV device.
    */
-  public static boolean isAndroidTv(Context context) {
-    PackageManager packageManager = context.getPackageManager();
-    return packageManager != null
-        && packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK);
+  public static boolean isTv(Context context) {
+    // See https://developer.android.com/training/tv/start/hardware.html#runtime-check.
+    UiModeManager uiModeManager =
+        (UiModeManager) context.getApplicationContext().getSystemService(UI_MODE_SERVICE);
+    return uiModeManager != null
+        && uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION;
   }
 
   /**
@@ -1759,9 +1765,7 @@ public final class Util {
    * @return The physical display size, in pixels.
    */
   public static Point getPhysicalDisplaySize(Context context, Display display) {
-    if (Util.SDK_INT <= 28
-        && display.getDisplayId() == Display.DEFAULT_DISPLAY
-        && Util.isAndroidTv(context)) {
+    if (Util.SDK_INT <= 28 && display.getDisplayId() == Display.DEFAULT_DISPLAY && isTv(context)) {
       // On Android TVs it is common for the UI to be configured for a lower resolution than
       // SurfaceViews can output. Before API 26 the Display object does not provide a way to
       // identify this case, and up to and including API 28 many devices still do not correctly set

From d97d289b6b3d2021bdb0340c47083079453bc2f0 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 1 Oct 2018 05:45:24 -0700
Subject: [PATCH 037/832] Clarify and improve TrackSelection .enable() and
 .disable() calls.

These two methods are meant to indicate to the track selection that it's
started or stopped being used. This is helpful to schedule background tasks
related to track selection (e.g. register network change listeners etc.).
This intention is not clearly stated in the method docs.

Also, all track selections of all prebuffered periods stay enabled in
parallel at the moment. As the whole purpose of these methods is to know
whether dynamic updates via updateSelectedTrack may happen, it's better to
only enable track selections of the current loading media period. That's
similar to how we always forward the loading track selections to the
LoadControl.

This change:
 1. Improves the JavaDoc of TrackSelection.
 2. Disables track selections if loading moves to another period.
 3. Reenables track selection if loading moves back to a previous period.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215199987
---
 .../exoplayer2/ExoPlayerImplInternal.java     | 28 +++++-----
 .../android/exoplayer2/MediaPeriodHolder.java | 54 ++++++++++++-------
 .../android/exoplayer2/MediaPeriodQueue.java  | 38 ++++++-------
 .../trackselection/TrackSelection.java        | 21 +++++---
 4 files changed, 84 insertions(+), 57 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index 1d5125384f..df822a3867 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -1006,7 +1006,7 @@ import java.util.Collections;
         // The track reselection didn't affect any period that has been read.
         selectionsChangedForReadPeriod = false;
       }
-      periodHolder = periodHolder.next;
+      periodHolder = periodHolder.getNext();
     }
 
     if (selectionsChangedForReadPeriod) {
@@ -1078,7 +1078,7 @@ import java.util.Collections;
           }
         }
       }
-      periodHolder = periodHolder.next;
+      periodHolder = periodHolder.getNext();
     }
   }
 
@@ -1107,11 +1107,12 @@ import java.util.Collections;
 
   private boolean isTimelineReady() {
     MediaPeriodHolder playingPeriodHolder = queue.getPlayingPeriod();
+    MediaPeriodHolder nextPeriodHolder = playingPeriodHolder.getNext();
     long playingPeriodDurationUs = playingPeriodHolder.info.durationUs;
     return playingPeriodDurationUs == C.TIME_UNSET
         || playbackInfo.positionUs < playingPeriodDurationUs
-        || (playingPeriodHolder.next != null
-            && (playingPeriodHolder.next.prepared || playingPeriodHolder.next.info.id.isAd()));
+        || (nextPeriodHolder != null
+            && (nextPeriodHolder.prepared || nextPeriodHolder.info.id.isAd()));
   }
 
   private void maybeThrowSourceInfoRefreshError() throws IOException {
@@ -1130,8 +1131,9 @@ import java.util.Collections;
   private void maybeThrowPeriodPrepareError() throws IOException {
     MediaPeriodHolder loadingPeriodHolder = queue.getLoadingPeriod();
     MediaPeriodHolder readingPeriodHolder = queue.getReadingPeriod();
-    if (loadingPeriodHolder != null && !loadingPeriodHolder.prepared
-        && (readingPeriodHolder == null || readingPeriodHolder.next == loadingPeriodHolder)) {
+    if (loadingPeriodHolder != null
+        && !loadingPeriodHolder.prepared
+        && (readingPeriodHolder == null || readingPeriodHolder.getNext() == loadingPeriodHolder)) {
       for (Renderer renderer : enabledRenderers) {
         if (!renderer.hasReadStreamToEnd()) {
           return;
@@ -1241,8 +1243,8 @@ import java.util.Collections;
       MediaPeriodId periodId = queue.resolveMediaPeriodIdForAds(newPeriodUid, contentPositionUs);
       if (periodHolder != null) {
         // Update the new playing media period info if it already exists.
-        while (periodHolder.next != null) {
-          periodHolder = periodHolder.next;
+        while (periodHolder.getNext() != null) {
+          periodHolder = periodHolder.getNext();
           if (periodHolder.info.id.equals(periodId)) {
             periodHolder.info = queue.getUpdatedMediaPeriodInfo(periodHolder.info);
           }
@@ -1404,7 +1406,7 @@ import java.util.Collections;
     boolean advancedPlayingPeriod = false;
     while (playWhenReady
         && playingPeriodHolder != readingPeriodHolder
-        && rendererPositionUs >= playingPeriodHolder.next.getStartPositionRendererTime()) {
+        && rendererPositionUs >= playingPeriodHolder.getNext().getStartPositionRendererTime()) {
       // All enabled renderers' streams have been read to the end, and the playback position reached
       // the end of the playing period, so advance playback to the next period.
       if (advancedPlayingPeriod) {
@@ -1440,7 +1442,7 @@ import java.util.Collections;
     }
 
     // Advance the reading period if necessary.
-    if (readingPeriodHolder.next == null) {
+    if (readingPeriodHolder.getNext() == null) {
       // We don't have a successor to advance the reading period to.
       return;
     }
@@ -1455,7 +1457,7 @@ import java.util.Collections;
       }
     }
 
-    if (!readingPeriodHolder.next.prepared) {
+    if (!readingPeriodHolder.getNext().prepared) {
       // The successor is not prepared yet.
       maybeThrowPeriodPrepareError();
       return;
@@ -1655,8 +1657,8 @@ import java.util.Collections;
 
   private boolean rendererWaitingForNextStream(Renderer renderer) {
     MediaPeriodHolder readingPeriodHolder = queue.getReadingPeriod();
-    return readingPeriodHolder.next != null && readingPeriodHolder.next.prepared
-        && renderer.hasReadStreamToEnd();
+    MediaPeriodHolder nextPeriodHolder = readingPeriodHolder.getNext();
+    return nextPeriodHolder != null && nextPeriodHolder.prepared && renderer.hasReadStreamToEnd();
   }
 
   private void handleLoadingMediaPeriodChanged(boolean loadingTrackSelectionChanged) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
index a59ee61088..526ad63768 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2;
 
+import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.source.ClippingMediaPeriod;
 import com.google.android.exoplayer2.source.EmptySampleStream;
 import com.google.android.exoplayer2.source.MediaPeriod;
@@ -42,7 +43,6 @@ import com.google.android.exoplayer2.util.Log;
   public boolean prepared;
   public boolean hasEnabledTracks;
   public MediaPeriodInfo info;
-  public MediaPeriodHolder next;
   public TrackGroupArray trackGroups;
   public TrackSelectorResult trackSelectorResult;
 
@@ -50,6 +50,7 @@ import com.google.android.exoplayer2.util.Log;
   private final TrackSelector trackSelector;
   private final MediaSource mediaSource;
 
+  private MediaPeriodHolder next;
   private long rendererPositionOffsetUs;
   private TrackSelectorResult periodTrackSelectorResult;
 
@@ -190,7 +191,9 @@ import com.google.android.exoplayer2.util.Log;
     // Undo the effect of previous call to associate no-sample renderers with empty tracks
     // so the mediaPeriod receives back whatever it sent us before.
     disassociateNoSampleRenderersWithEmptySampleStream(sampleStreams);
-    updatePeriodTrackSelectorResult(trackSelectorResult);
+    disableTrackSelectionsInResult();
+    periodTrackSelectorResult = trackSelectorResult;
+    enableTrackSelectionsInResult();
     // Disable streams on the period and get new streams for updated/newly-enabled tracks.
     TrackSelectionArray trackSelections = trackSelectorResult.selections;
     positionUs =
@@ -219,7 +222,8 @@ import com.google.android.exoplayer2.util.Log;
   }
 
   public void release() {
-    updatePeriodTrackSelectorResult(null);
+    disableTrackSelectionsInResult();
+    periodTrackSelectorResult = null;
     try {
       if (info.id.endPositionUs != C.TIME_END_OF_SOURCE) {
         mediaSource.releasePeriod(((ClippingMediaPeriod) mediaPeriod).mediaPeriod);
@@ -232,30 +236,40 @@ import com.google.android.exoplayer2.util.Log;
     }
   }
 
-  private void updatePeriodTrackSelectorResult(TrackSelectorResult trackSelectorResult) {
-    if (periodTrackSelectorResult != null) {
-      disableTrackSelectionsInResult(periodTrackSelectorResult);
-    }
-    periodTrackSelectorResult = trackSelectorResult;
-    if (periodTrackSelectorResult != null) {
-      enableTrackSelectionsInResult(periodTrackSelectorResult);
+  public void setNext(@Nullable MediaPeriodHolder nextMediaPeriodHolder) {
+    if (nextMediaPeriodHolder == next) {
+      return;
     }
+    disableTrackSelectionsInResult();
+    next = nextMediaPeriodHolder;
+    enableTrackSelectionsInResult();
   }
 
-  private void enableTrackSelectionsInResult(TrackSelectorResult trackSelectorResult) {
-    for (int i = 0; i < trackSelectorResult.length; i++) {
-      boolean rendererEnabled = trackSelectorResult.isRendererEnabled(i);
-      TrackSelection trackSelection = trackSelectorResult.selections.get(i);
+  @Nullable
+  public MediaPeriodHolder getNext() {
+    return next;
+  }
+
+  private void enableTrackSelectionsInResult() {
+    if (!isLoadingMediaPeriod() || periodTrackSelectorResult == null) {
+      return;
+    }
+    for (int i = 0; i < periodTrackSelectorResult.length; i++) {
+      boolean rendererEnabled = periodTrackSelectorResult.isRendererEnabled(i);
+      TrackSelection trackSelection = periodTrackSelectorResult.selections.get(i);
       if (rendererEnabled && trackSelection != null) {
         trackSelection.enable();
       }
     }
   }
 
-  private void disableTrackSelectionsInResult(TrackSelectorResult trackSelectorResult) {
-    for (int i = 0; i < trackSelectorResult.length; i++) {
-      boolean rendererEnabled = trackSelectorResult.isRendererEnabled(i);
-      TrackSelection trackSelection = trackSelectorResult.selections.get(i);
+  private void disableTrackSelectionsInResult() {
+    if (!isLoadingMediaPeriod() || periodTrackSelectorResult == null) {
+      return;
+    }
+    for (int i = 0; i < periodTrackSelectorResult.length; i++) {
+      boolean rendererEnabled = periodTrackSelectorResult.isRendererEnabled(i);
+      TrackSelection trackSelection = periodTrackSelectorResult.selections.get(i);
       if (rendererEnabled && trackSelection != null) {
         trackSelection.disable();
       }
@@ -286,4 +300,8 @@ import com.google.android.exoplayer2.util.Log;
       }
     }
   }
+
+  private boolean isLoadingMediaPeriod() {
+    return next == null;
+  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
index 2edf7bb8c6..6370299334 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
@@ -156,7 +156,7 @@ import com.google.android.exoplayer2.util.Assertions;
             info);
     if (loading != null) {
       Assertions.checkState(hasPlayingPeriod());
-      loading.next = newPeriodHolder;
+      loading.setNext(newPeriodHolder);
     }
     oldFrontPeriodUid = null;
     loading = newPeriodHolder;
@@ -207,8 +207,8 @@ import com.google.android.exoplayer2.util.Assertions;
    * @return The updated reading period holder.
    */
   public MediaPeriodHolder advanceReadingPeriod() {
-    Assertions.checkState(reading != null && reading.next != null);
-    reading = reading.next;
+    Assertions.checkState(reading != null && reading.getNext() != null);
+    reading = reading.getNext();
     return reading;
   }
 
@@ -222,7 +222,7 @@ import com.google.android.exoplayer2.util.Assertions;
   public MediaPeriodHolder advancePlayingPeriod() {
     if (playing != null) {
       if (playing == reading) {
-        reading = playing.next;
+        reading = playing.getNext();
       }
       playing.release();
       length--;
@@ -231,7 +231,7 @@ import com.google.android.exoplayer2.util.Assertions;
         oldFrontPeriodUid = playing.uid;
         oldFrontPeriodWindowSequenceNumber = playing.info.id.windowSequenceNumber;
       }
-      playing = playing.next;
+      playing = playing.getNext();
     } else {
       playing = loading;
       reading = loading;
@@ -251,8 +251,8 @@ import com.google.android.exoplayer2.util.Assertions;
     Assertions.checkState(mediaPeriodHolder != null);
     boolean removedReading = false;
     loading = mediaPeriodHolder;
-    while (mediaPeriodHolder.next != null) {
-      mediaPeriodHolder = mediaPeriodHolder.next;
+    while (mediaPeriodHolder.getNext() != null) {
+      mediaPeriodHolder = mediaPeriodHolder.getNext();
       if (mediaPeriodHolder == reading) {
         reading = playing;
         removedReading = true;
@@ -260,7 +260,7 @@ import com.google.android.exoplayer2.util.Assertions;
       mediaPeriodHolder.release();
       length--;
     }
-    loading.next = null;
+    loading.setNext(null);
     return removedReading;
   }
 
@@ -337,7 +337,7 @@ import com.google.android.exoplayer2.util.Assertions;
       }
 
       previousPeriodHolder = periodHolder;
-      periodHolder = periodHolder.next;
+      periodHolder = periodHolder.getNext();
     }
     return true;
   }
@@ -439,7 +439,7 @@ import com.google.android.exoplayer2.util.Assertions;
         // Reuse window sequence number of first exact period match.
         return mediaPeriodHolder.info.id.windowSequenceNumber;
       }
-      mediaPeriodHolder = mediaPeriodHolder.next;
+      mediaPeriodHolder = mediaPeriodHolder.getNext();
     }
     mediaPeriodHolder = getFrontPeriod();
     while (mediaPeriodHolder != null) {
@@ -451,7 +451,7 @@ import com.google.android.exoplayer2.util.Assertions;
           return mediaPeriodHolder.info.id.windowSequenceNumber;
         }
       }
-      mediaPeriodHolder = mediaPeriodHolder.next;
+      mediaPeriodHolder = mediaPeriodHolder.getNext();
     }
     // If no match is found, create new sequence number.
     return nextWindowSequenceNumber++;
@@ -482,19 +482,20 @@ import com.google.android.exoplayer2.util.Assertions;
       int nextPeriodIndex =
           timeline.getNextPeriodIndex(
               currentPeriodIndex, period, window, repeatMode, shuffleModeEnabled);
-      while (lastValidPeriodHolder.next != null
+      while (lastValidPeriodHolder.getNext() != null
           && !lastValidPeriodHolder.info.isLastInTimelinePeriod) {
-        lastValidPeriodHolder = lastValidPeriodHolder.next;
+        lastValidPeriodHolder = lastValidPeriodHolder.getNext();
       }
 
-      if (nextPeriodIndex == C.INDEX_UNSET || lastValidPeriodHolder.next == null) {
+      MediaPeriodHolder nextMediaPeriodHolder = lastValidPeriodHolder.getNext();
+      if (nextPeriodIndex == C.INDEX_UNSET || nextMediaPeriodHolder == null) {
         break;
       }
-      int nextPeriodHolderPeriodIndex = timeline.getIndexOfPeriod(lastValidPeriodHolder.next.uid);
+      int nextPeriodHolderPeriodIndex = timeline.getIndexOfPeriod(nextMediaPeriodHolder.uid);
       if (nextPeriodHolderPeriodIndex != nextPeriodIndex) {
         break;
       }
-      lastValidPeriodHolder = lastValidPeriodHolder.next;
+      lastValidPeriodHolder = nextMediaPeriodHolder;
       currentPeriodIndex = nextPeriodIndex;
     }
 
@@ -567,8 +568,9 @@ import com.google.android.exoplayer2.util.Assertions;
         }
         nextPeriodUid = defaultPosition.first;
         startPositionUs = defaultPosition.second;
-        if (mediaPeriodHolder.next != null && mediaPeriodHolder.next.uid.equals(nextPeriodUid)) {
-          windowSequenceNumber = mediaPeriodHolder.next.info.id.windowSequenceNumber;
+        MediaPeriodHolder nextMediaPeriodHolder = mediaPeriodHolder.getNext();
+        if (nextMediaPeriodHolder != null && nextMediaPeriodHolder.uid.equals(nextPeriodUid)) {
+          windowSequenceNumber = nextMediaPeriodHolder.info.id.windowSequenceNumber;
         } else {
           windowSequenceNumber = nextWindowSequenceNumber++;
         }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java
index 78d052ac3c..a7c0658708 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java
@@ -29,8 +29,9 @@ import java.util.List;
  * TrackGroup}, and a possibly varying individual selected track from the subset.
  *
  * <p>Tracks belonging to the subset are exposed in decreasing bandwidth order. The individual
- * selected track may change as a result of calling {@link #updateSelectedTrack(long, long, long,
- * List, MediaChunkIterator[])}.
+ * selected track may change dynamically as a result of calling {@link #updateSelectedTrack(long,
+ * long, long, List, MediaChunkIterator[])} or {@link #evaluateQueueSize(long, List)}. This only
+ * happens between calls to {@link #enable()} and {@link #disable()}.
  */
 public interface TrackSelection {
 
@@ -53,16 +54,20 @@ public interface TrackSelection {
   }
 
   /**
-   * Enables the track selection.
-   * <p>
-   * This method may not be called when the track selection is already enabled.
+   * Enables the track selection. Dynamic changes via {@link #updateSelectedTrack(long, long, long,
+   * List, MediaChunkIterator[])} or {@link #evaluateQueueSize(long, List)} will only happen after
+   * this call.
+   *
+   * <p>This method may not be called when the track selection is already enabled.
    */
   void enable();
 
   /**
-   * Disables this track selection.
-   * <p>
-   * This method may only be called when the track selection is already enabled.
+   * Disables this track selection. No further dynamic changes via {@link #updateSelectedTrack(long,
+   * long, long, List, MediaChunkIterator[])} or {@link #evaluateQueueSize(long, List)} will happen
+   * after this call.
+   *
+   * <p>This method may only be called when the track selection is already enabled.
    */
   void disable();
 

From 90ca3716aabb38a813e68c56cd2d416368256b9e Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 1 Oct 2018 06:44:49 -0700
Subject: [PATCH 038/832] Improve MediaPeriodHolder documentation and member
 access.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215205796
---
 .../exoplayer2/ExoPlayerImplInternal.java     |  46 ++--
 .../android/exoplayer2/MediaPeriodHolder.java | 198 ++++++++++++++----
 .../source/ExtractorMediaPeriod.java          |   2 +-
 .../exoplayer2/source/MediaPeriod.java        |   5 +-
 .../trackselection/TrackSelectorResult.java   |   5 +-
 5 files changed, 187 insertions(+), 69 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index df822a3867..6810c86558 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -993,12 +993,14 @@ import java.util.Collections;
     MediaPeriodHolder periodHolder = queue.getPlayingPeriod();
     MediaPeriodHolder readingPeriodHolder = queue.getReadingPeriod();
     boolean selectionsChangedForReadPeriod = true;
+    TrackSelectorResult newTrackSelectorResult = null;
     while (true) {
       if (periodHolder == null || !periodHolder.prepared) {
         // The reselection did not change any prepared periods.
         return;
       }
-      if (periodHolder.selectTracks(playbackSpeed, playbackInfo.timeline)) {
+      newTrackSelectorResult = periodHolder.selectTracks(playbackSpeed, playbackInfo.timeline);
+      if (newTrackSelectorResult != null) {
         // Selected tracks have changed for this period.
         break;
       }
@@ -1017,7 +1019,7 @@ import java.util.Collections;
       boolean[] streamResetFlags = new boolean[renderers.length];
       long periodPositionUs =
           playingPeriodHolder.applyTrackSelection(
-              playbackInfo.positionUs, recreateStreams, streamResetFlags);
+              newTrackSelectorResult, playbackInfo.positionUs, recreateStreams, streamResetFlags);
       if (playbackInfo.playbackState != Player.STATE_ENDED
           && periodPositionUs != playbackInfo.positionUs) {
         playbackInfo = playbackInfo.fromNewPosition(playbackInfo.periodId, periodPositionUs,
@@ -1047,7 +1049,7 @@ import java.util.Collections;
       }
       playbackInfo =
           playbackInfo.copyWithTrackInfo(
-              playingPeriodHolder.trackGroups, playingPeriodHolder.trackSelectorResult);
+              playingPeriodHolder.getTrackGroups(), playingPeriodHolder.getTrackSelectorResult());
       enableRenderers(rendererWasEnabledFlags, enabledRendererCount);
     } else {
       // Release and re-prepare/buffer periods after the one whose selection changed.
@@ -1056,7 +1058,7 @@ import java.util.Collections;
         long loadingPeriodPositionUs =
             Math.max(
                 periodHolder.info.startPositionUs, periodHolder.toPeriodTime(rendererPositionUs));
-        periodHolder.applyTrackSelection(loadingPeriodPositionUs, false);
+        periodHolder.applyTrackSelection(newTrackSelectorResult, loadingPeriodPositionUs, false);
       }
     }
     handleLoadingMediaPeriodChanged(/* loadingTrackSelectionChanged= */ true);
@@ -1069,13 +1071,11 @@ import java.util.Collections;
 
   private void updateTrackSelectionPlaybackSpeed(float playbackSpeed) {
     MediaPeriodHolder periodHolder = queue.getFrontPeriod();
-    while (periodHolder != null) {
-      if (periodHolder.trackSelectorResult != null) {
-        TrackSelection[] trackSelections = periodHolder.trackSelectorResult.selections.getAll();
-        for (TrackSelection trackSelection : trackSelections) {
-          if (trackSelection != null) {
-            trackSelection.onPlaybackSpeed(playbackSpeed);
-          }
+    while (periodHolder != null && periodHolder.prepared) {
+      TrackSelection[] trackSelections = periodHolder.getTrackSelectorResult().selections.getAll();
+      for (TrackSelection trackSelection : trackSelections) {
+        if (trackSelection != null) {
+          trackSelection.onPlaybackSpeed(playbackSpeed);
         }
       }
       periodHolder = periodHolder.getNext();
@@ -1463,9 +1463,9 @@ import java.util.Collections;
       return;
     }
 
-    TrackSelectorResult oldTrackSelectorResult = readingPeriodHolder.trackSelectorResult;
+    TrackSelectorResult oldTrackSelectorResult = readingPeriodHolder.getTrackSelectorResult();
     readingPeriodHolder = queue.advanceReadingPeriod();
-    TrackSelectorResult newTrackSelectorResult = readingPeriodHolder.trackSelectorResult;
+    TrackSelectorResult newTrackSelectorResult = readingPeriodHolder.getTrackSelectorResult();
 
     boolean initialDiscontinuity =
         readingPeriodHolder.mediaPeriod.readDiscontinuity() != C.TIME_UNSET;
@@ -1536,7 +1536,7 @@ import java.util.Collections;
     loadingPeriodHolder.handlePrepared(
         mediaClock.getPlaybackParameters().speed, playbackInfo.timeline);
     updateLoadControlTrackSelection(
-        loadingPeriodHolder.trackGroups, loadingPeriodHolder.trackSelectorResult);
+        loadingPeriodHolder.getTrackGroups(), loadingPeriodHolder.getTrackSelectorResult());
     if (!queue.hasPlayingPeriod()) {
       // This is the first prepared period, so start playing it.
       MediaPeriodHolder playingPeriodHolder = queue.advancePlayingPeriod();
@@ -1596,11 +1596,11 @@ import java.util.Collections;
     for (int i = 0; i < renderers.length; i++) {
       Renderer renderer = renderers[i];
       rendererWasEnabledFlags[i] = renderer.getState() != Renderer.STATE_DISABLED;
-      if (newPlayingPeriodHolder.trackSelectorResult.isRendererEnabled(i)) {
+      if (newPlayingPeriodHolder.getTrackSelectorResult().isRendererEnabled(i)) {
         enabledRendererCount++;
       }
       if (rendererWasEnabledFlags[i]
-          && (!newPlayingPeriodHolder.trackSelectorResult.isRendererEnabled(i)
+          && (!newPlayingPeriodHolder.getTrackSelectorResult().isRendererEnabled(i)
               || (renderer.isCurrentStreamFinal()
                   && renderer.getStream() == oldPlayingPeriodHolder.sampleStreams[i]))) {
         // The renderer should be disabled before playing the next period, either because it's not
@@ -1611,7 +1611,8 @@ import java.util.Collections;
     }
     playbackInfo =
         playbackInfo.copyWithTrackInfo(
-            newPlayingPeriodHolder.trackGroups, newPlayingPeriodHolder.trackSelectorResult);
+            newPlayingPeriodHolder.getTrackGroups(),
+            newPlayingPeriodHolder.getTrackSelectorResult());
     enableRenderers(rendererWasEnabledFlags, enabledRendererCount);
   }
 
@@ -1621,7 +1622,7 @@ import java.util.Collections;
     int enabledRendererCount = 0;
     MediaPeriodHolder playingPeriodHolder = queue.getPlayingPeriod();
     for (int i = 0; i < renderers.length; i++) {
-      if (playingPeriodHolder.trackSelectorResult.isRendererEnabled(i)) {
+      if (playingPeriodHolder.getTrackSelectorResult().isRendererEnabled(i)) {
         enableRenderer(i, rendererWasEnabledFlags[i], enabledRendererCount++);
       }
     }
@@ -1634,10 +1635,10 @@ import java.util.Collections;
     Renderer renderer = renderers[rendererIndex];
     enabledRenderers[enabledRendererIndex] = renderer;
     if (renderer.getState() == Renderer.STATE_DISABLED) {
+      TrackSelectorResult trackSelectorResult = playingPeriodHolder.getTrackSelectorResult();
       RendererConfiguration rendererConfiguration =
-          playingPeriodHolder.trackSelectorResult.rendererConfigurations[rendererIndex];
-      TrackSelection newSelection = playingPeriodHolder.trackSelectorResult.selections.get(
-          rendererIndex);
+          trackSelectorResult.rendererConfigurations[rendererIndex];
+      TrackSelection newSelection = trackSelectorResult.selections.get(rendererIndex);
       Format[] formats = getFormats(newSelection);
       // The renderer needs enabling with its new track selection.
       boolean playing = playWhenReady && playbackInfo.playbackState == Player.STATE_READY;
@@ -1674,7 +1675,8 @@ import java.util.Collections;
         && loadingMediaPeriodHolder != null
         && loadingMediaPeriodHolder.prepared) {
       updateLoadControlTrackSelection(
-          loadingMediaPeriodHolder.trackGroups, loadingMediaPeriodHolder.trackSelectorResult);
+          loadingMediaPeriodHolder.getTrackGroups(),
+          loadingMediaPeriodHolder.getTrackSelectorResult());
     }
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
index 526ad63768..3ba96d2b80 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
@@ -29,30 +29,38 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
+import org.checkerframework.checker.nullness.compatqual.NullableType;
 
 /** Holds a {@link MediaPeriod} with information required to play it as part of a timeline. */
 /* package */ final class MediaPeriodHolder {
 
   private static final String TAG = "MediaPeriodHolder";
 
+  /** The {@link MediaPeriod} wrapped by this class. */
   public final MediaPeriod mediaPeriod;
+  /** The unique timeline period identifier the media period belongs to. */
   public final Object uid;
-  public final SampleStream[] sampleStreams;
-  public final boolean[] mayRetainStreamFlags;
+  /**
+   * The sample streams for each renderer associated with this period. May contain null elements.
+   */
+  public final @NullableType SampleStream[] sampleStreams;
 
+  /** Whether the media period has finished preparing. */
   public boolean prepared;
+  /** Whether any of the tracks of this media period are enabled. */
   public boolean hasEnabledTracks;
+  /** {@link MediaPeriodInfo} about this media period. */
   public MediaPeriodInfo info;
-  public TrackGroupArray trackGroups;
-  public TrackSelectorResult trackSelectorResult;
 
+  private final boolean[] mayRetainStreamFlags;
   private final RendererCapabilities[] rendererCapabilities;
   private final TrackSelector trackSelector;
   private final MediaSource mediaSource;
 
-  private MediaPeriodHolder next;
+  @Nullable private MediaPeriodHolder next;
+  @Nullable private TrackGroupArray trackGroups;
+  @Nullable private TrackSelectorResult trackSelectorResult;
   private long rendererPositionOffsetUs;
-  private TrackSelectorResult periodTrackSelectorResult;
 
   /**
    * Creates a new holder with information required to play it as part of a timeline.
@@ -76,7 +84,7 @@ import com.google.android.exoplayer2.util.Log;
     this.rendererPositionOffsetUs = rendererPositionOffsetUs - info.startPositionUs;
     this.trackSelector = trackSelector;
     this.mediaSource = mediaSource;
-    this.uid = Assertions.checkNotNull(info.id.periodUid);
+    this.uid = info.id.periodUid;
     this.info = info;
     sampleStreams = new SampleStream[rendererCapabilities.length];
     mayRetainStreamFlags = new boolean[rendererCapabilities.length];
@@ -92,31 +100,38 @@ import com.google.android.exoplayer2.util.Log;
     this.mediaPeriod = mediaPeriod;
   }
 
+  /**
+   * Converts time relative to the start of the period to the respective renderer time using {@link
+   * #getRendererOffset()}, in microseconds.
+   */
   public long toRendererTime(long periodTimeUs) {
     return periodTimeUs + getRendererOffset();
   }
 
+  /**
+   * Converts renderer time to the respective time relative to the start of the period using {@link
+   * #getRendererOffset()}, in microseconds.
+   */
   public long toPeriodTime(long rendererTimeUs) {
     return rendererTimeUs - getRendererOffset();
   }
 
+  /** Returns the renderer time of the start of the period, in microseconds. */
   public long getRendererOffset() {
     return rendererPositionOffsetUs;
   }
 
+  /** Returns start position of period in renderer time. */
   public long getStartPositionRendererTime() {
     return info.startPositionUs + rendererPositionOffsetUs;
   }
 
+  /** Returns whether the period is fully buffered. */
   public boolean isFullyBuffered() {
     return prepared
         && (!hasEnabledTracks || mediaPeriod.getBufferedPositionUs() == C.TIME_END_OF_SOURCE);
   }
 
-  public long getDurationUs() {
-    return info.durationUs;
-  }
-
   /**
    * Returns the buffered position in microseconds. If the period is buffered to the end then
    * {@link C#TIME_END_OF_SOURCE} is returned unless {@code convertEosToDuration} is true, in which
@@ -137,65 +152,132 @@ import com.google.android.exoplayer2.util.Log;
         : bufferedPositionUs;
   }
 
+  /**
+   * Returns the next load time relative to the start of the period, or {@link C#TIME_END_OF_SOURCE}
+   * if loading has finished.
+   */
   public long getNextLoadPositionUs() {
     return !prepared ? 0 : mediaPeriod.getNextLoadPositionUs();
   }
 
+  /**
+   * Handles period preparation.
+   *
+   * @param playbackSpeed The current playback speed.
+   * @param timeline The current {@link Timeline}.
+   * @throws ExoPlaybackException If an error occurs during track selection.
+   */
   public void handlePrepared(float playbackSpeed, Timeline timeline) throws ExoPlaybackException {
     prepared = true;
     trackGroups = mediaPeriod.getTrackGroups();
-    selectTracks(playbackSpeed, timeline);
-    long newStartPositionUs = applyTrackSelection(info.startPositionUs, false);
+    TrackSelectorResult selectorResult =
+        Assertions.checkNotNull(selectTracks(playbackSpeed, timeline));
+    long newStartPositionUs =
+        applyTrackSelection(
+            selectorResult, info.startPositionUs, /* forceRecreateStreams= */ false);
     rendererPositionOffsetUs += info.startPositionUs - newStartPositionUs;
     info = info.copyWithStartPositionUs(newStartPositionUs);
   }
 
+  /**
+   * Reevaluates the buffer of the media period at the given renderer position. Should only be
+   * called if this is the loading media period.
+   *
+   * @param rendererPositionUs The playing position in renderer time, in microseconds.
+   */
   public void reevaluateBuffer(long rendererPositionUs) {
+    Assertions.checkState(isLoadingMediaPeriod());
     if (prepared) {
       mediaPeriod.reevaluateBuffer(toPeriodTime(rendererPositionUs));
     }
   }
 
+  /**
+   * Continues loading the media period at the given renderer position. Should only be called if
+   * this is the loading media period.
+   *
+   * @param rendererPositionUs The load position in renderer time, in microseconds.
+   */
   public void continueLoading(long rendererPositionUs) {
+    Assertions.checkState(isLoadingMediaPeriod());
     long loadingPeriodPositionUs = toPeriodTime(rendererPositionUs);
     mediaPeriod.continueLoading(loadingPeriodPositionUs);
   }
 
-  public boolean selectTracks(float playbackSpeed, Timeline timeline) throws ExoPlaybackException {
+  /**
+   * Selects tracks for the period and returns the new result if the selection changed. Must only be
+   * called if {@link #prepared} is {@code true}.
+   *
+   * @param playbackSpeed The current playback speed.
+   * @param timeline The current {@link Timeline}.
+   * @return The {@link TrackSelectorResult} if the result changed. Or null if nothing changed.
+   * @throws ExoPlaybackException If an error occurs during track selection.
+   */
+  @Nullable
+  public TrackSelectorResult selectTracks(float playbackSpeed, Timeline timeline)
+      throws ExoPlaybackException {
     TrackSelectorResult selectorResult =
-        trackSelector.selectTracks(rendererCapabilities, trackGroups, info.id, timeline);
-    if (selectorResult.isEquivalent(periodTrackSelectorResult)) {
-      return false;
+        trackSelector.selectTracks(rendererCapabilities, getTrackGroups(), info.id, timeline);
+    if (selectorResult.isEquivalent(trackSelectorResult)) {
+      return null;
     }
-    trackSelectorResult = selectorResult;
-    for (TrackSelection trackSelection : trackSelectorResult.selections.getAll()) {
+    for (TrackSelection trackSelection : selectorResult.selections.getAll()) {
       if (trackSelection != null) {
         trackSelection.onPlaybackSpeed(playbackSpeed);
       }
     }
-    return true;
-  }
-
-  public long applyTrackSelection(long positionUs, boolean forceRecreateStreams) {
-    return applyTrackSelection(
-        positionUs, forceRecreateStreams, new boolean[rendererCapabilities.length]);
+    return selectorResult;
   }
 
+  /**
+   * Applies a {@link TrackSelectorResult} to the period.
+   *
+   * @param trackSelectorResult The {@link TrackSelectorResult} to apply.
+   * @param positionUs The position relative to the start of the period at which to apply the new
+   *     track selections, in microseconds.
+   * @param forceRecreateStreams Whether all streams are forced to be recreated.
+   * @return The actual position relative to the start of the period at which the new track
+   *     selections are applied.
+   */
   public long applyTrackSelection(
-      long positionUs, boolean forceRecreateStreams, boolean[] streamResetFlags) {
-    for (int i = 0; i < trackSelectorResult.length; i++) {
+      TrackSelectorResult trackSelectorResult, long positionUs, boolean forceRecreateStreams) {
+    return applyTrackSelection(
+        trackSelectorResult,
+        positionUs,
+        forceRecreateStreams,
+        new boolean[rendererCapabilities.length]);
+  }
+
+  /**
+   * Applies a {@link TrackSelectorResult} to the period.
+   *
+   * @param newTrackSelectorResult The {@link TrackSelectorResult} to apply.
+   * @param positionUs The position relative to the start of the period at which to apply the new
+   *     track selections, in microseconds.
+   * @param forceRecreateStreams Whether all streams are forced to be recreated.
+   * @param streamResetFlags Will be populated to indicate which streams have been reset or were
+   *     newly created.
+   * @return The actual position relative to the start of the period at which the new track
+   *     selections are applied.
+   */
+  public long applyTrackSelection(
+      TrackSelectorResult newTrackSelectorResult,
+      long positionUs,
+      boolean forceRecreateStreams,
+      boolean[] streamResetFlags) {
+    for (int i = 0; i < newTrackSelectorResult.length; i++) {
       mayRetainStreamFlags[i] =
-          !forceRecreateStreams && trackSelectorResult.isEquivalent(periodTrackSelectorResult, i);
+          !forceRecreateStreams && newTrackSelectorResult.isEquivalent(trackSelectorResult, i);
     }
 
     // Undo the effect of previous call to associate no-sample renderers with empty tracks
     // so the mediaPeriod receives back whatever it sent us before.
     disassociateNoSampleRenderersWithEmptySampleStream(sampleStreams);
     disableTrackSelectionsInResult();
-    periodTrackSelectorResult = trackSelectorResult;
+    trackSelectorResult = newTrackSelectorResult;
     enableTrackSelectionsInResult();
     // Disable streams on the period and get new streams for updated/newly-enabled tracks.
-    TrackSelectionArray trackSelections = trackSelectorResult.selections;
+    TrackSelectionArray trackSelections = newTrackSelectorResult.selections;
     positionUs =
         mediaPeriod.selectTracks(
             trackSelections.getAll(),
@@ -209,7 +291,7 @@ import com.google.android.exoplayer2.util.Log;
     hasEnabledTracks = false;
     for (int i = 0; i < sampleStreams.length; i++) {
       if (sampleStreams[i] != null) {
-        Assertions.checkState(trackSelectorResult.isRendererEnabled(i));
+        Assertions.checkState(newTrackSelectorResult.isRendererEnabled(i));
         // hasEnabledTracks should be true only when non-empty streams exists.
         if (rendererCapabilities[i].getTrackType() != C.TRACK_TYPE_NONE) {
           hasEnabledTracks = true;
@@ -221,9 +303,10 @@ import com.google.android.exoplayer2.util.Log;
     return positionUs;
   }
 
+  /** Releases the media period. No other method should be called after the release. */
   public void release() {
     disableTrackSelectionsInResult();
-    periodTrackSelectorResult = null;
+    trackSelectorResult = null;
     try {
       if (info.id.endPositionUs != C.TIME_END_OF_SOURCE) {
         mediaSource.releasePeriod(((ClippingMediaPeriod) mediaPeriod).mediaPeriod);
@@ -236,6 +319,12 @@ import com.google.android.exoplayer2.util.Log;
     }
   }
 
+  /**
+   * Sets the next media period holder in the queue.
+   *
+   * @param nextMediaPeriodHolder The next holder, or null if this will be the new loading media
+   *     period holder at the end of the queue.
+   */
   public void setNext(@Nullable MediaPeriodHolder nextMediaPeriodHolder) {
     if (nextMediaPeriodHolder == next) {
       return;
@@ -245,18 +334,39 @@ import com.google.android.exoplayer2.util.Log;
     enableTrackSelectionsInResult();
   }
 
+  /**
+   * Returns the next media period holder in the queue, or null if this is the last media period
+   * (and thus the loading media period).
+   */
   @Nullable
   public MediaPeriodHolder getNext() {
     return next;
   }
 
+  /**
+   * Returns the {@link TrackGroupArray} exposed by this media period. Must only be called if {@link
+   * #prepared} is {@code true}.
+   */
+  public TrackGroupArray getTrackGroups() {
+    return Assertions.checkNotNull(trackGroups);
+  }
+
+  /**
+   * Returns the {@link TrackSelectorResult} which is currently applied. Must only be called if
+   * {@link #prepared} is {@code true}.
+   */
+  public TrackSelectorResult getTrackSelectorResult() {
+    return Assertions.checkNotNull(trackSelectorResult);
+  }
+
   private void enableTrackSelectionsInResult() {
-    if (!isLoadingMediaPeriod() || periodTrackSelectorResult == null) {
+    TrackSelectorResult trackSelectorResult = this.trackSelectorResult;
+    if (!isLoadingMediaPeriod() || trackSelectorResult == null) {
       return;
     }
-    for (int i = 0; i < periodTrackSelectorResult.length; i++) {
-      boolean rendererEnabled = periodTrackSelectorResult.isRendererEnabled(i);
-      TrackSelection trackSelection = periodTrackSelectorResult.selections.get(i);
+    for (int i = 0; i < trackSelectorResult.length; i++) {
+      boolean rendererEnabled = trackSelectorResult.isRendererEnabled(i);
+      TrackSelection trackSelection = trackSelectorResult.selections.get(i);
       if (rendererEnabled && trackSelection != null) {
         trackSelection.enable();
       }
@@ -264,12 +374,13 @@ import com.google.android.exoplayer2.util.Log;
   }
 
   private void disableTrackSelectionsInResult() {
-    if (!isLoadingMediaPeriod() || periodTrackSelectorResult == null) {
+    TrackSelectorResult trackSelectorResult = this.trackSelectorResult;
+    if (!isLoadingMediaPeriod() || trackSelectorResult == null) {
       return;
     }
-    for (int i = 0; i < periodTrackSelectorResult.length; i++) {
-      boolean rendererEnabled = periodTrackSelectorResult.isRendererEnabled(i);
-      TrackSelection trackSelection = periodTrackSelectorResult.selections.get(i);
+    for (int i = 0; i < trackSelectorResult.length; i++) {
+      boolean rendererEnabled = trackSelectorResult.isRendererEnabled(i);
+      TrackSelection trackSelection = trackSelectorResult.selections.get(i);
       if (rendererEnabled && trackSelection != null) {
         trackSelection.disable();
       }
@@ -280,7 +391,8 @@ import com.google.android.exoplayer2.util.Log;
    * For each renderer of type {@link C#TRACK_TYPE_NONE}, we will remove the dummy {@link
    * EmptySampleStream} that was associated with it.
    */
-  private void disassociateNoSampleRenderersWithEmptySampleStream(SampleStream[] sampleStreams) {
+  private void disassociateNoSampleRenderersWithEmptySampleStream(
+      @NullableType SampleStream[] sampleStreams) {
     for (int i = 0; i < rendererCapabilities.length; i++) {
       if (rendererCapabilities[i].getTrackType() == C.TRACK_TYPE_NONE) {
         sampleStreams[i] = null;
@@ -292,7 +404,9 @@ import com.google.android.exoplayer2.util.Log;
    * For each renderer of type {@link C#TRACK_TYPE_NONE} that was enabled, we will associate it with
    * a dummy {@link EmptySampleStream}.
    */
-  private void associateNoSampleRenderersWithEmptySampleStream(SampleStream[] sampleStreams) {
+  private void associateNoSampleRenderersWithEmptySampleStream(
+      @NullableType SampleStream[] sampleStreams) {
+    TrackSelectorResult trackSelectorResult = Assertions.checkNotNull(this.trackSelectorResult);
     for (int i = 0; i < rendererCapabilities.length; i++) {
       if (rendererCapabilities[i].getTrackType() == C.TRACK_TYPE_NONE
           && trackSelectorResult.isRendererEnabled(i)) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java
index 31daf65d38..49209023e6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java
@@ -215,7 +215,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 
   @Override
   public long selectTracks(
-      TrackSelection[] selections,
+      @NullableType TrackSelection[] selections,
       boolean[] mayRetainStreamFlags,
       @NullableType SampleStream[] streams,
       boolean[] streamResetFlags,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java
index 997f94bbfe..b7f5a07b60 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java
@@ -21,6 +21,7 @@ import com.google.android.exoplayer2.SeekParameters;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
 import java.io.IOException;
+import org.checkerframework.checker.nullness.compatqual.NullableType;
 
 /**
  * Loads media corresponding to a {@link Timeline.Period}, and allows that media to be read. All
@@ -108,9 +109,9 @@ public interface MediaPeriod extends SequenceableLoader {
    * @return The actual position at which the tracks were enabled, in microseconds.
    */
   long selectTracks(
-      TrackSelection[] selections,
+      @NullableType TrackSelection[] selections,
       boolean[] mayRetainStreamFlags,
-      SampleStream[] streams,
+      @NullableType SampleStream[] streams,
       boolean[] streamResetFlags,
       long positionUs);
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectorResult.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectorResult.java
index f1136f0be5..4bc4975a1c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectorResult.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectorResult.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.trackselection;
 
+import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.RendererConfiguration;
 import com.google.android.exoplayer2.util.Util;
 import org.checkerframework.checker.nullness.compatqual.NullableType;
@@ -70,7 +71,7 @@ public final class TrackSelectorResult {
    *     will be returned.
    * @return Whether this result is equivalent to {@code other} for all renderers.
    */
-  public boolean isEquivalent(TrackSelectorResult other) {
+  public boolean isEquivalent(@Nullable TrackSelectorResult other) {
     if (other == null || other.selections.length != selections.length) {
       return false;
     }
@@ -93,7 +94,7 @@ public final class TrackSelectorResult {
    * @return Whether this result is equivalent to {@code other} for the renderer at the specified
    *     index.
    */
-  public boolean isEquivalent(TrackSelectorResult other, int index) {
+  public boolean isEquivalent(@Nullable TrackSelectorResult other, int index) {
     if (other == null) {
       return false;
     }

From 46731cdd1dc5ac940f95414ad28a18910431a644 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 1 Oct 2018 07:50:26 -0700
Subject: [PATCH 039/832] Fix prepare position of DeferredMediaPeriods for
 windows with non-zero offset.

If we prepare a deferred media period before the actual timeline is available,
we either prepare with position zero (= the default) or with a non-zero
initial seek position.

So far, the zero (default) position got replaced by the actual default position
(including any potential non-zero window offset) when the timeline became known.

However, a non-zero initial seek position was not corrected by the non-zero
window offset. This is fixed by this change.

Related to that, we always assumed that the deferred media period will the
first period in the actual timeline. This is not true if we prepare with an
offset (either because of an initial seek position or because of a default
window position). So, we also determine the actual first period when the
timeline becomes known.

Issue:#4873

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215213030
---
 RELEASENOTES.md                               |  3 +
 .../source/ConcatenatingMediaSource.java      | 89 +++++++++++++----
 .../source/DeferredMediaPeriod.java           | 30 +++---
 .../android/exoplayer2/ExoPlayerTest.java     | 98 ++++++++++++++++++-
 .../analytics/AnalyticsCollectorTest.java     |  2 +-
 .../exoplayer2/testutil/ActionSchedule.java   | 11 ++-
 6 files changed, 192 insertions(+), 41 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index db9f5254ef..adfec3dacc 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -9,6 +9,9 @@
 * HLS:
   * Add constructor to `DefaultHlsExtractorFactory` for adding TS payload reader
     factory flags ([#4861](https://github.com/google/ExoPlayer/issues/4861)).
+* Fix an issue with blind seeking to windows with non-zero offset in a
+  `ConcatenatingMediaSource`
+  ([#4873](https://github.com/google/ExoPlayer/issues/4873)).
 
 ### 2.9.0 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
index e0b7da8506..7418e84449 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.source;
 import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.util.Pair;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayer;
@@ -65,6 +66,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
   private final boolean isAtomic;
   private final boolean useLazyPreparation;
   private final Timeline.Window window;
+  private final Timeline.Period period;
 
   private @Nullable ExoPlayer player;
   private @Nullable Handler playerApplicationHandler;
@@ -131,6 +133,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
     this.isAtomic = isAtomic;
     this.useLazyPreparation = useLazyPreparation;
     window = new Timeline.Window();
+    period = new Timeline.Period();
     addMediaSources(Arrays.asList(mediaSources));
   }
 
@@ -684,21 +687,53 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
           windowOffsetUpdate,
           periodOffsetUpdate);
     }
-    mediaSourceHolder.timeline = deferredTimeline.cloneWithNewTimeline(timeline);
-    if (!mediaSourceHolder.isPrepared && !timeline.isEmpty()) {
-      timeline.getWindow(/* windowIndex= */ 0, window);
-      long defaultPeriodPositionUs =
-          window.getPositionInFirstPeriodUs() + window.getDefaultPositionUs();
-      for (int i = 0; i < mediaSourceHolder.activeMediaPeriods.size(); i++) {
-        DeferredMediaPeriod deferredMediaPeriod = mediaSourceHolder.activeMediaPeriods.get(i);
-        deferredMediaPeriod.setDefaultPreparePositionUs(defaultPeriodPositionUs);
+    if (mediaSourceHolder.isPrepared) {
+      mediaSourceHolder.timeline = deferredTimeline.cloneWithUpdatedTimeline(timeline);
+    } else if (timeline.isEmpty()) {
+      mediaSourceHolder.timeline =
+          DeferredTimeline.createWithRealTimeline(timeline, DeferredTimeline.DUMMY_ID);
+    } else {
+      // We should have at most one deferred media period for the DummyTimeline because the duration
+      // is unset and we don't load beyond periods with unset duration. We need to figure out how to
+      // handle the prepare positions of multiple deferred media periods, should that ever change.
+      Assertions.checkState(mediaSourceHolder.activeMediaPeriods.size() <= 1);
+      DeferredMediaPeriod deferredMediaPeriod =
+          mediaSourceHolder.activeMediaPeriods.isEmpty()
+              ? null
+              : mediaSourceHolder.activeMediaPeriods.get(0);
+      // Determine first period and the start position.
+      // This will be:
+      //  1. The default window start position if no deferred period has been created yet.
+      //  2. The non-zero prepare position of the deferred period under the assumption that this is
+      //     a non-zero initial seek position in the window.
+      //  3. The default window start position if the deferred period has a prepare position of zero
+      //     under the assumption that the prepare position of zero was used because it's the
+      //     default position of the DummyTimeline window. Note that this will override an
+      //     intentional seek to zero for a window with a non-zero default position. This is
+      //     unlikely to be a problem as a non-zero default position usually only occurs for live
+      //     playbacks and seeking to zero in a live window would cause BehindLiveWindowExceptions
+      //     anyway.
+      long windowStartPositionUs = window.getDefaultPositionUs();
+      if (deferredMediaPeriod != null) {
+        long periodPreparePositionUs = deferredMediaPeriod.getPreparePositionUs();
+        if (periodPreparePositionUs != 0) {
+          windowStartPositionUs = periodPreparePositionUs;
+        }
+      }
+      Pair<Object, Long> periodPosition =
+          timeline.getPeriodPosition(window, period, /* windowIndex= */ 0, windowStartPositionUs);
+      Object periodUid = periodPosition.first;
+      long periodPositionUs = periodPosition.second;
+      mediaSourceHolder.timeline = DeferredTimeline.createWithRealTimeline(timeline, periodUid);
+      if (deferredMediaPeriod != null) {
+        deferredMediaPeriod.overridePreparePositionUs(periodPositionUs);
         MediaPeriodId idInSource =
             deferredMediaPeriod.id.copyWithPeriodUid(
                 getChildPeriodUid(mediaSourceHolder, deferredMediaPeriod.id.periodUid));
         deferredMediaPeriod.createPeriod(idInSource);
       }
-      mediaSourceHolder.isPrepared = true;
     }
+    mediaSourceHolder.isPrepared = true;
     scheduleListenerNotification(/* actionOnCompletion= */ null);
   }
 
@@ -897,18 +932,32 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
   }
 
   /**
-   * Timeline used as placeholder for an unprepared media source. After preparation, a copy of the
-   * DeferredTimeline is used to keep the originally assigned first period ID.
+   * Timeline used as placeholder for an unprepared media source. After preparation, a
+   * DeferredTimeline is used to keep the originally assigned dummy period ID.
    */
   private static final class DeferredTimeline extends ForwardingTimeline {
 
     private static final Object DUMMY_ID = new Object();
-    private static final DummyTimeline dummyTimeline = new DummyTimeline();
+    private static final DummyTimeline DUMMY_TIMELINE = new DummyTimeline();
 
     private final Object replacedId;
 
+    /**
+     * Returns an instance with a real timeline, replacing the provided period ID with the already
+     * assigned dummy period ID.
+     *
+     * @param timeline The real timeline.
+     * @param firstPeriodUid The period UID in the timeline which will be replaced by the already
+     *     assigned dummy period UID.
+     */
+    public static DeferredTimeline createWithRealTimeline(
+        Timeline timeline, Object firstPeriodUid) {
+      return new DeferredTimeline(timeline, firstPeriodUid);
+    }
+
+    /** Creates deferred timeline exposing a {@link DummyTimeline}. */
     public DeferredTimeline() {
-      this(dummyTimeline, DUMMY_ID);
+      this(DUMMY_TIMELINE, DUMMY_ID);
     }
 
     private DeferredTimeline(Timeline timeline, Object replacedId) {
@@ -916,14 +965,16 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
       this.replacedId = replacedId;
     }
 
-    public DeferredTimeline cloneWithNewTimeline(Timeline timeline) {
-      return new DeferredTimeline(
-          timeline,
-          replacedId == DUMMY_ID && timeline.getPeriodCount() > 0
-              ? timeline.getUidOfPeriod(0)
-              : replacedId);
+    /**
+     * Returns a copy with an updated timeline. This keeps the existing period replacement.
+     *
+     * @param timeline The new timeline.
+     */
+    public DeferredTimeline cloneWithUpdatedTimeline(Timeline timeline) {
+      return new DeferredTimeline(timeline, replacedId);
     }
 
+    /** Returns wrapped timeline. */
     public Timeline getTimeline() {
       return timeline;
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/DeferredMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/DeferredMediaPeriod.java
index 5f84731b8d..26c25a749e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/DeferredMediaPeriod.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/DeferredMediaPeriod.java
@@ -79,23 +79,19 @@ public final class DeferredMediaPeriod implements MediaPeriod, MediaPeriod.Callb
     this.listener = listener;
   }
 
+  /** Returns the position at which the deferred media period was prepared, in microseconds. */
+  public long getPreparePositionUs() {
+    return preparePositionUs;
+  }
+
   /**
-   * Sets the default prepare position at which to prepare the media period. This value is only used
-   * if the call to {@link MediaPeriod#prepare(Callback, long)} is being deferred and the call was
-   * made with a (presumably default) prepare position of 0.
+   * Overrides the default prepare position at which to prepare the media period. This value is only
+   * used if the call to {@link MediaPeriod#prepare(Callback, long)} is being deferred.
    *
-   * <p>Note that this will override an intentional seek to zero in the corresponding non-seekable
-   * timeline window. This is unlikely to be a problem as a non-zero default position usually only
-   * occurs for live playbacks and seeking to zero in a live window would cause
-   * BehindLiveWindowExceptions anyway.
-   *
-   * @param defaultPreparePositionUs The actual default prepare position, in microseconds.
+   * @param defaultPreparePositionUs The default prepare position to use, in microseconds.
    */
-  public void setDefaultPreparePositionUs(long defaultPreparePositionUs) {
-    if (preparePositionUs == 0 && defaultPreparePositionUs != 0) {
-      preparePositionOverrideUs = defaultPreparePositionUs;
-      preparePositionUs = defaultPreparePositionUs;
-    }
+  public void overridePreparePositionUs(long defaultPreparePositionUs) {
+    preparePositionOverrideUs = defaultPreparePositionUs;
   }
 
   /**
@@ -108,6 +104,10 @@ public final class DeferredMediaPeriod implements MediaPeriod, MediaPeriod.Callb
   public void createPeriod(MediaPeriodId id) {
     mediaPeriod = mediaSource.createPeriod(id, allocator);
     if (callback != null) {
+      long preparePositionUs =
+          preparePositionOverrideUs != C.TIME_UNSET
+              ? preparePositionOverrideUs
+              : this.preparePositionUs;
       mediaPeriod.prepare(this, preparePositionUs);
     }
   }
@@ -157,7 +157,7 @@ public final class DeferredMediaPeriod implements MediaPeriod, MediaPeriod.Callb
   @Override
   public long selectTracks(TrackSelection[] selections, boolean[] mayRetainStreamFlags,
       SampleStream[] streams, boolean[] streamResetFlags, long positionUs) {
-    if (preparePositionOverrideUs != C.TIME_UNSET && positionUs == 0) {
+    if (preparePositionOverrideUs != C.TIME_UNSET && positionUs == preparePositionUs) {
       positionUs = preparePositionOverrideUs;
       preparePositionOverrideUs = C.TIME_UNSET;
     }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
index 8414be1588..407e9a3827 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
@@ -60,6 +60,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 import org.junit.Before;
 import org.junit.Test;
@@ -1346,7 +1347,7 @@ public final class ExoPlayerTest {
                 () ->
                     concatenatingMediaSource.addMediaSources(
                         Arrays.asList(mediaSource, mediaSource)))
-            .waitForTimelineChanged(null)
+            .waitForTimelineChanged()
             .executeRunnable(
                 new PlayerRunnable() {
                   @Override
@@ -2192,14 +2193,14 @@ public final class ExoPlayerTest {
             startPositionUs + expectedDurationUs);
     Clock clock = new AutoAdvancingFakeClock();
     AtomicReference<Player> playerReference = new AtomicReference<>();
-    AtomicReference<Long> positionAtDiscontinuityMs = new AtomicReference<>();
-    AtomicReference<Long> clockAtStartMs = new AtomicReference<>();
-    AtomicReference<Long> clockAtDiscontinuityMs = new AtomicReference<>();
+    AtomicLong positionAtDiscontinuityMs = new AtomicLong(C.TIME_UNSET);
+    AtomicLong clockAtStartMs = new AtomicLong(C.TIME_UNSET);
+    AtomicLong clockAtDiscontinuityMs = new AtomicLong(C.TIME_UNSET);
     EventListener eventListener =
         new EventListener() {
           @Override
           public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
-            if (playbackState == Player.STATE_READY && clockAtStartMs.get() == null) {
+            if (playbackState == Player.STATE_READY && clockAtStartMs.get() == C.TIME_UNSET) {
               clockAtStartMs.set(clock.elapsedRealtime());
             }
           }
@@ -2446,6 +2447,93 @@ public final class ExoPlayerTest {
         .blockUntilEnded(TIMEOUT_MS);
   }
 
+  @Test
+  public void seekToUnpreparedWindowWithNonZeroOffsetInConcatenationStartsAtCorrectPosition()
+      throws Exception {
+    Timeline timeline = new FakeTimeline(/* windowCount= */ 1);
+    FakeMediaSource mediaSource = new FakeMediaSource(/* timeline= */ null, /* manifest= */ null);
+    MediaSource clippedMediaSource =
+        new ClippingMediaSource(
+            mediaSource,
+            /* startPositionUs= */ 3 * C.MICROS_PER_SECOND,
+            /* endPositionUs= */ C.TIME_END_OF_SOURCE);
+    MediaSource concatenatedMediaSource = new ConcatenatingMediaSource(clippedMediaSource);
+    AtomicLong positionWhenReady = new AtomicLong();
+    ActionSchedule actionSchedule =
+        new ActionSchedule.Builder("seekToUnpreparedWindowWithNonZeroOffsetInConcatenation")
+            .pause()
+            .waitForPlaybackState(Player.STATE_BUFFERING)
+            .seek(/* positionMs= */ 10)
+            .waitForTimelineChanged()
+            .executeRunnable(() -> mediaSource.setNewSourceInfo(timeline, /* newManifest= */ null))
+            .waitForTimelineChanged()
+            .waitForPlaybackState(Player.STATE_READY)
+            .executeRunnable(
+                new PlayerRunnable() {
+                  @Override
+                  public void run(SimpleExoPlayer player) {
+                    positionWhenReady.set(player.getContentPosition());
+                  }
+                })
+            .play()
+            .build();
+    new Builder()
+        .setMediaSource(concatenatedMediaSource)
+        .setActionSchedule(actionSchedule)
+        .build(context)
+        .start()
+        .blockUntilEnded(TIMEOUT_MS);
+
+    assertThat(positionWhenReady.get()).isEqualTo(10);
+  }
+
+  @Test
+  public void seekToUnpreparedWindowWithMultiplePeriodsInConcatenationStartsAtCorrectPeriod()
+      throws Exception {
+    long periodDurationMs = 5000;
+    Timeline timeline =
+        new FakeTimeline(
+            new TimelineWindowDefinition(
+                /* periodCount =*/ 2,
+                /* id= */ new Object(),
+                /* isSeekable= */ true,
+                /* isDynamic= */ false,
+                /* durationUs= */ 2 * periodDurationMs * 1000));
+    FakeMediaSource mediaSource = new FakeMediaSource(/* timeline= */ null, /* manifest= */ null);
+    MediaSource concatenatedMediaSource = new ConcatenatingMediaSource(mediaSource);
+    AtomicInteger periodIndexWhenReady = new AtomicInteger();
+    AtomicLong positionWhenReady = new AtomicLong();
+    ActionSchedule actionSchedule =
+        new ActionSchedule.Builder("seekToUnpreparedWindowWithMultiplePeriodsInConcatenation")
+            .pause()
+            .waitForPlaybackState(Player.STATE_BUFFERING)
+            // Seek 10ms into the second period.
+            .seek(/* positionMs= */ periodDurationMs + 10)
+            .waitForTimelineChanged()
+            .executeRunnable(() -> mediaSource.setNewSourceInfo(timeline, /* newManifest= */ null))
+            .waitForTimelineChanged()
+            .waitForPlaybackState(Player.STATE_READY)
+            .executeRunnable(
+                new PlayerRunnable() {
+                  @Override
+                  public void run(SimpleExoPlayer player) {
+                    periodIndexWhenReady.set(player.getCurrentPeriodIndex());
+                    positionWhenReady.set(player.getContentPosition());
+                  }
+                })
+            .play()
+            .build();
+    new Builder()
+        .setMediaSource(concatenatedMediaSource)
+        .setActionSchedule(actionSchedule)
+        .build(context)
+        .start()
+        .blockUntilEnded(TIMEOUT_MS);
+
+    assertThat(periodIndexWhenReady.get()).isEqualTo(1);
+    assertThat(positionWhenReady.get()).isEqualTo(periodDurationMs + 10);
+  }
+
   // Internal methods.
 
   private static ActionSchedule.Builder addSurfaceSwitch(ActionSchedule.Builder builder) {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
index e0feae6f49..3649685f3e 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
@@ -585,7 +585,7 @@ public final class AnalyticsCollectorTest {
                 () ->
                     concatenatedMediaSource.moveMediaSource(
                         /* currentIndex= */ 0, /* newIndex= */ 1))
-            .waitForTimelineChanged(/* expectedTimeline= */ null)
+            .waitForTimelineChanged()
             .play()
             .build();
     TestAnalyticsListener listener = runAnalyticsTest(concatenatedMediaSource, actionSchedule);
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ActionSchedule.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ActionSchedule.java
index 6e37d7d070..54d97fb905 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ActionSchedule.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ActionSchedule.java
@@ -375,6 +375,15 @@ public final class ActionSchedule {
       return apply(new SendMessages(tag, target, windowIndex, positionMs, deleteAfterDelivery));
     }
 
+    /**
+     * Schedules a delay until any timeline change.
+     *
+     * @return The builder, for convenience.
+     */
+    public Builder waitForTimelineChanged() {
+      return apply(new WaitForTimelineChanged(tag, /* expectedTimeline= */ null));
+    }
+
     /**
      * Schedules a delay until the timeline changed to a specified expected timeline.
      *
@@ -382,7 +391,7 @@ public final class ActionSchedule {
      *     change.
      * @return The builder, for convenience.
      */
-    public Builder waitForTimelineChanged(@Nullable Timeline expectedTimeline) {
+    public Builder waitForTimelineChanged(Timeline expectedTimeline) {
       return apply(new WaitForTimelineChanged(tag, expectedTimeline));
     }
 

From 7940fdfc5ed7ea1e358b0b166ec8f70db78f03e5 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Mon, 1 Oct 2018 07:52:26 -0700
Subject: [PATCH 040/832] Fix DownloadManager.TaskState javadoc

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215213255
---
 .../exoplayer2/offline/DownloadManager.java   | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 409f79f30b..3757517f5d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -528,9 +528,9 @@ public final class DownloadManager {
      * <p>Transition diagram:
      *
      * <pre>
-     *                    -&gt; canceled
-     * queued &lt;-&gt; started -&gt; completed
-     *                    -&gt; failed
+     *    ┌────────┬─────→ canceled
+     * queued ↔ started ┬→ completed
+     *                  └→ failed
      * </pre>
      */
     @Documented
@@ -609,18 +609,15 @@ public final class DownloadManager {
      * {@link #STATE_QUEUED_CANCELING}, {@link #STATE_STARTED_CANCELING} or {@link
      * #STATE_STARTED_STOPPING}.
      *
-     * <p>Transition map (vertical states are source states):
+     * <p>Transition diagram:
      *
      * <pre>
-     *             +------+-------+---------+-----------+-----------+--------+--------+------+
-     *             |queued|started|completed|q_canceling|s_canceling|canceled|stopping|failed|
-     * +-----------+------+-------+---------+-----------+-----------+--------+--------+------+
-     * |queued     |      |   X   |         |     X     |           |        |        |      |
-     * |started    |      |       |    X    |           |     X     |        |   X    |   X  |
-     * |q_canceling|      |       |         |           |           |   X    |        |      |
-     * |s_canceling|      |       |         |           |           |   X    |        |      |
-     * |stopping   |   X  |       |         |           |           |        |        |      |
-     * +-----------+------+-------+---------+-----------+-----------+--------+--------+------+
+     *    ┌───→ q_canceling ┬→ canceled
+     *    │     s_canceling ┘
+     *    │         ↑
+     * queued → started ────┬→ completed
+     *    ↑         ↓       └→ failed
+     *    └──── s_stopping
      * </pre>
      */
     @Documented

From 6cc049f6efca7227b92670e32ab5cb223f763996 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Mon, 1 Oct 2018 08:05:01 -0700
Subject: [PATCH 041/832] Increase supported libflac version to 1.3.2

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215214894
---
 extensions/flac/README.md                   | 9 +++++----
 extensions/flac/src/main/jni/Android.mk     | 4 ++--
 extensions/flac/src/main/jni/Application.mk | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/extensions/flac/README.md b/extensions/flac/README.md
index fda5f0085d..54701eea1d 100644
--- a/extensions/flac/README.md
+++ b/extensions/flac/README.md
@@ -28,18 +28,19 @@ EXOPLAYER_ROOT="$(pwd)"
 FLAC_EXT_PATH="${EXOPLAYER_ROOT}/extensions/flac/src/main"
 ```
 
-* Download the [Android NDK][] and set its location in an environment variable:
+* Download the [Android NDK][] (version <= 17c) and set its location in an
+  environment variable:
 
 ```
 NDK_PATH="<path to Android NDK>"
 ```
 
-* Download and extract flac-1.3.1 as "${FLAC_EXT_PATH}/jni/flac" folder:
+* Download and extract flac-1.3.2 as "${FLAC_EXT_PATH}/jni/flac" folder:
 
 ```
 cd "${FLAC_EXT_PATH}/jni" && \
-curl https://ftp.osuosl.org/pub/xiph/releases/flac/flac-1.3.1.tar.xz | tar xJ && \
-mv flac-1.3.1 flac
+curl https://ftp.osuosl.org/pub/xiph/releases/flac/flac-1.3.2.tar.xz | tar xJ && \
+mv flac-1.3.2 flac
 ```
 
 * Build the JNI native libraries from the command line:
diff --git a/extensions/flac/src/main/jni/Android.mk b/extensions/flac/src/main/jni/Android.mk
index ff54c1b3c0..69520a16e5 100644
--- a/extensions/flac/src/main/jni/Android.mk
+++ b/extensions/flac/src/main/jni/Android.mk
@@ -30,9 +30,9 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/flac/src/libFLAC/include
 LOCAL_SRC_FILES := $(FLAC_SOURCES)
 
-LOCAL_CFLAGS += '-DVERSION="1.3.1"' -DFLAC__NO_MD5 -DFLAC__INTEGER_ONLY_LIBRARY -DFLAC__NO_ASM
+LOCAL_CFLAGS += '-DPACKAGE_VERSION="1.3.2"' -DFLAC__NO_MD5 -DFLAC__INTEGER_ONLY_LIBRARY
 LOCAL_CFLAGS += -D_REENTRANT -DPIC -DU_COMMON_IMPLEMENTATION -fPIC -DHAVE_SYS_PARAM_H
-LOCAL_CFLAGS += -O3 -funroll-loops -finline-functions
+LOCAL_CFLAGS += -O3 -funroll-loops -finline-functions -DFLAC__NO_ASM '-DFLAC__HAS_OGG=0'
 
 LOCAL_LDLIBS := -llog -lz -lm
 include $(BUILD_SHARED_LIBRARY)
diff --git a/extensions/flac/src/main/jni/Application.mk b/extensions/flac/src/main/jni/Application.mk
index 59bf5f8f87..eba20352f4 100644
--- a/extensions/flac/src/main/jni/Application.mk
+++ b/extensions/flac/src/main/jni/Application.mk
@@ -17,4 +17,4 @@
 APP_OPTIM := release
 APP_STL := gnustl_static
 APP_CPPFLAGS := -frtti
-APP_PLATFORM := android-9
+APP_PLATFORM := android-14

From fc5eb12e7955e1272f52a90ec25a1a385429a47c Mon Sep 17 00:00:00 2001
From: Arnold Szabo <szaboaarnold@gmail.com>
Date: Mon, 1 Oct 2018 22:45:15 +0300
Subject: [PATCH 042/832] #4306 - breaking after the first alignment tag is
 found

---
 .../exoplayer2/text/subrip/SubripDecoder.java        | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
index 492eb60bfc..e50184e403 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
@@ -80,7 +80,6 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
   @Override
   protected SubripSubtitle decode(byte[] bytes, int length, boolean reset) {
     ArrayList<Cue> cues = new ArrayList<>();
-    ArrayList<String> tags = new ArrayList<>();
     LongArray cueTimesUs = new LongArray();
     ParsableByteArray subripData = new ParsableByteArray(bytes, length);
     String currentLine;
@@ -120,6 +119,7 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
       }
 
       // Read and parse the text.
+      ArrayList<String> tags = new ArrayList<>();
       textBuilder.setLength(0);
       while (!TextUtils.isEmpty(currentLine = subripData.readLine())) {
         if (textBuilder.length() > 0) {
@@ -131,19 +131,15 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
       Spanned text = Html.fromHtml(textBuilder.toString());
       Cue cue = null;
 
-      boolean alignTagFound = false;
-
       // At end of this loop the clue must be created with the applied tags
       for (String tag : tags) {
 
         // Check if the tag is an alignment tag
         if (tag.matches(SUBRIP_ALIGNMENT_TAG)) {
-
-          // Based on the specs, in case of the alignment tags only the first appearance counts
-          if (alignTagFound) continue;
-          alignTagFound = true;
-
           cue = buildCue(text, tag);
+
+          // Based on the specs, in case of alignment tags only the first appearance counts, so break
+          break;
         }
       }
 

From 75a7385bbb4a2e6940f6a97ba8d5814e2dcd6049 Mon Sep 17 00:00:00 2001
From: Arnold Szabo <szaboaarnold@gmail.com>
Date: Mon, 1 Oct 2018 23:16:48 +0300
Subject: [PATCH 043/832] #4306 - extends test case with line and position
 anchor verifications

---
 .../exoplayer2/text/subrip/SubripDecoder.java |  2 +-
 .../src/test/assets/subrip/typical_with_tags  | 36 ++++++++++
 .../text/subrip/SubripDecoderTest.java        | 67 +++++++++++++++++++
 3 files changed, 104 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
index e50184e403..63887906c6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
@@ -176,7 +176,7 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
     // Extract tags
     int replacedCharacters = 0;
     StringBuilder processedLine = new StringBuilder(trimmedLine);
-    Matcher matcher = SUBRIP_TAG_PATTERN.matcher(processedLine);
+    Matcher matcher = SUBRIP_TAG_PATTERN.matcher(trimmedLine);
 
     while (matcher.find()) {
       String tag = matcher.group();
diff --git a/library/core/src/test/assets/subrip/typical_with_tags b/library/core/src/test/assets/subrip/typical_with_tags
index 02e1ffbcd9..af196f8a04 100644
--- a/library/core/src/test/assets/subrip/typical_with_tags
+++ b/library/core/src/test/assets/subrip/typical_with_tags
@@ -18,3 +18,39 @@ This { \an2} is the fourth subtitle.
 5
 00:00:013,567 --> 00:00:14,901
 This {\an2} is the fifth subtitle with multiple {\xyz} valid {\qwe} tags.
+
+6
+00:00:015,567 --> 00:00:15,901
+This {\an1} is a lines.
+
+7
+00:00:016,567 --> 00:00:16,901
+This {\an2} is a line.
+
+8
+00:00:017,567 --> 00:00:17,901
+This {\an3} is a line.
+
+9
+00:00:018,567 --> 00:00:18,901
+This {\an4} is a line.
+
+10
+00:00:019,567 --> 00:00:19,901
+This {\an5} is a line.
+
+11
+00:00:020,567 --> 00:00:20,901
+This {\an6} is a line.
+
+12
+00:00:021,567 --> 00:00:22,901
+This {\an7} is a line.
+
+13
+00:00:023,567 --> 00:00:23,901
+This {\an8} is a line.
+
+14
+00:00:024,567 --> 00:00:24,901
+This {\an9} is a line.
\ No newline at end of file
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
index a9d69076c2..554184da5d 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
@@ -18,6 +18,8 @@ package com.google.android.exoplayer2.text.subrip;
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.android.exoplayer2.testutil.TestUtil;
+import com.google.android.exoplayer2.text.Cue;
+
 import java.io.IOException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -174,6 +176,71 @@ public final class SubripDecoderTest {
 
     assertThat(subtitle.getCues(subtitle.getEventTime(8)).get(0).text.toString())
         .isEqualTo("This is the fifth subtitle with multiple valid tags.");
+
+    // Verify positions
+
+    // {/an1}
+    assertThat(subtitle.getCues(subtitle.getEventTime(10)).get(0).positionAnchor)
+        .isEqualTo(Cue.ANCHOR_TYPE_START);
+
+    assertThat(subtitle.getCues(subtitle.getEventTime(10)).get(0).lineAnchor)
+        .isEqualTo(Cue.ANCHOR_TYPE_END);
+
+    // {/an2}
+    assertThat(subtitle.getCues(subtitle.getEventTime(12)).get(0).positionAnchor)
+        .isEqualTo(Cue.ANCHOR_TYPE_MIDDLE);
+
+    assertThat(subtitle.getCues(subtitle.getEventTime(12)).get(0).lineAnchor)
+        .isEqualTo(Cue.ANCHOR_TYPE_END);
+
+    // {/an3}
+    assertThat(subtitle.getCues(subtitle.getEventTime(14)).get(0).positionAnchor)
+        .isEqualTo(Cue.ANCHOR_TYPE_END);
+
+    assertThat(subtitle.getCues(subtitle.getEventTime(14)).get(0).lineAnchor)
+        .isEqualTo(Cue.ANCHOR_TYPE_END);
+
+    // {/an4}
+    assertThat(subtitle.getCues(subtitle.getEventTime(16)).get(0).positionAnchor)
+        .isEqualTo(Cue.ANCHOR_TYPE_START);
+
+    assertThat(subtitle.getCues(subtitle.getEventTime(16)).get(0).lineAnchor)
+        .isEqualTo(Cue.ANCHOR_TYPE_MIDDLE);
+
+    // {/an5}
+    assertThat(subtitle.getCues(subtitle.getEventTime(18)).get(0).positionAnchor)
+        .isEqualTo(Cue.ANCHOR_TYPE_MIDDLE);
+
+    assertThat(subtitle.getCues(subtitle.getEventTime(18)).get(0).lineAnchor)
+        .isEqualTo(Cue.ANCHOR_TYPE_MIDDLE);
+
+    // {/an6}
+    assertThat(subtitle.getCues(subtitle.getEventTime(20)).get(0).positionAnchor)
+        .isEqualTo(Cue.ANCHOR_TYPE_END);
+
+    assertThat(subtitle.getCues(subtitle.getEventTime(20)).get(0).lineAnchor)
+        .isEqualTo(Cue.ANCHOR_TYPE_MIDDLE);
+
+    // {/an7}
+    assertThat(subtitle.getCues(subtitle.getEventTime(22)).get(0).positionAnchor)
+        .isEqualTo(Cue.ANCHOR_TYPE_START);
+
+    assertThat(subtitle.getCues(subtitle.getEventTime(22)).get(0).lineAnchor)
+        .isEqualTo(Cue.ANCHOR_TYPE_START);
+
+    // {/an8}
+    assertThat(subtitle.getCues(subtitle.getEventTime(24)).get(0).positionAnchor)
+        .isEqualTo(Cue.ANCHOR_TYPE_MIDDLE);
+
+    assertThat(subtitle.getCues(subtitle.getEventTime(24)).get(0).lineAnchor)
+        .isEqualTo(Cue.ANCHOR_TYPE_START);
+
+    // {/an9}
+    assertThat(subtitle.getCues(subtitle.getEventTime(26)).get(0).positionAnchor)
+        .isEqualTo(Cue.ANCHOR_TYPE_END);
+
+    assertThat(subtitle.getCues(subtitle.getEventTime(26)).get(0).lineAnchor)
+        .isEqualTo(Cue.ANCHOR_TYPE_START);
   }
 
   private static void assertTypicalCue1(SubripSubtitle subtitle, int eventIndex) {

From 56c7e1ff475ea6b9a7fb06ad9dd14303b1104e26 Mon Sep 17 00:00:00 2001
From: Arnold Szabo <szaboaarnold@gmail.com>
Date: Tue, 2 Oct 2018 18:45:06 +0300
Subject: [PATCH 044/832] #4306 - grouping line/lineAnchor and
 position/positionAnchor assignments, setting Cue's textAlignment to def value
 - null

---
 .../exoplayer2/text/subrip/SubripDecoder.java | 80 +++++++++----------
 1 file changed, 37 insertions(+), 43 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
index 63887906c6..cf2d3c11bc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
@@ -202,69 +202,63 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
    * @return Built cue
    */
   private Cue buildCue(Spanned text, String alignmentTag) {
-    // Default values used for positioning the subtitle in case of align tags
-    float line = DEFAULT_END_FRACTION, position = DEFAULT_MID_FRACTION;
-    @Cue.AnchorType int positionAnchor = Cue.ANCHOR_TYPE_MIDDLE;
-    @Cue.AnchorType int lineAnchor = Cue.ANCHOR_TYPE_END;
+    float line, position;
+    @Cue.AnchorType int positionAnchor;
+    @Cue.AnchorType int lineAnchor;
 
+    // Set position and position anchor (horizontal alignment)
     switch (alignmentTag) {
       case ALIGN_BOTTOM_LEFT:
-        line = DEFAULT_END_FRACTION;
+      case ALIGN_MID_LEFT:
+      case ALIGN_TOP_LEFT:
         position = DEFAULT_START_FRACTION;
         positionAnchor = Cue.ANCHOR_TYPE_START;
-        lineAnchor = Cue.ANCHOR_TYPE_END;
         break;
       case ALIGN_BOTTOM_MID:
-        line = DEFAULT_END_FRACTION;
+      case ALIGN_MID_MID:
+      case ALIGN_TOP_MID:
         position = DEFAULT_MID_FRACTION;
         positionAnchor = Cue.ANCHOR_TYPE_MIDDLE;
-        lineAnchor = Cue.ANCHOR_TYPE_END;
         break;
       case ALIGN_BOTTOM_RIGHT:
-        line = DEFAULT_END_FRACTION;
-        position = DEFAULT_END_FRACTION;
-        positionAnchor = Cue.ANCHOR_TYPE_END;
-        lineAnchor = Cue.ANCHOR_TYPE_END;
-        break;
-      case ALIGN_MID_LEFT:
-        line = DEFAULT_MID_FRACTION;
-        position = DEFAULT_START_FRACTION;
-        positionAnchor = Cue.ANCHOR_TYPE_START;
-        lineAnchor = Cue.ANCHOR_TYPE_MIDDLE;
-        break;
-      case ALIGN_MID_MID:
-        line = DEFAULT_MID_FRACTION;
-        position = DEFAULT_MID_FRACTION;
-        positionAnchor = Cue.ANCHOR_TYPE_MIDDLE;
-        lineAnchor = Cue.ANCHOR_TYPE_MIDDLE;
-        break;
       case ALIGN_MID_RIGHT:
-        line = DEFAULT_MID_FRACTION;
+      case ALIGN_TOP_RIGHT:
         position = DEFAULT_END_FRACTION;
         positionAnchor = Cue.ANCHOR_TYPE_END;
-        lineAnchor = Cue.ANCHOR_TYPE_MIDDLE;
         break;
-      case ALIGN_TOP_LEFT:
-        line = DEFAULT_START_FRACTION;
-        position = DEFAULT_START_FRACTION;
-        positionAnchor = Cue.ANCHOR_TYPE_START;
-        lineAnchor = Cue.ANCHOR_TYPE_START;
-        break;
-      case ALIGN_TOP_MID:
-        line = DEFAULT_START_FRACTION;
+      default:
         position = DEFAULT_MID_FRACTION;
         positionAnchor = Cue.ANCHOR_TYPE_MIDDLE;
-        lineAnchor = Cue.ANCHOR_TYPE_START;
-        break;
-      case ALIGN_TOP_RIGHT:
-        line = DEFAULT_START_FRACTION;
-        position = DEFAULT_END_FRACTION;
-        positionAnchor = Cue.ANCHOR_TYPE_END;
-        lineAnchor = Cue.ANCHOR_TYPE_START;
         break;
     }
 
-    return new Cue(text, Layout.Alignment.ALIGN_NORMAL, line, Cue.LINE_TYPE_FRACTION, lineAnchor, position, positionAnchor, Cue.DIMEN_UNSET);
+    // Set line and line anchor (vertical alignment)
+    switch (alignmentTag) {
+      case ALIGN_BOTTOM_LEFT:
+      case ALIGN_BOTTOM_MID:
+      case ALIGN_BOTTOM_RIGHT:
+        line = DEFAULT_END_FRACTION;
+        lineAnchor = Cue.ANCHOR_TYPE_END;
+        break;
+      case ALIGN_MID_LEFT:
+      case ALIGN_MID_MID:
+      case ALIGN_MID_RIGHT:
+        line = DEFAULT_MID_FRACTION;
+        lineAnchor = Cue.ANCHOR_TYPE_MIDDLE;
+        break;
+      case ALIGN_TOP_LEFT:
+      case ALIGN_TOP_MID:
+      case ALIGN_TOP_RIGHT:
+        line = DEFAULT_START_FRACTION;
+        lineAnchor = Cue.ANCHOR_TYPE_START;
+        break;
+      default:
+        line = DEFAULT_END_FRACTION;
+        lineAnchor = Cue.ANCHOR_TYPE_END;
+        break;
+    }
+
+    return new Cue(text, null, line, Cue.LINE_TYPE_FRACTION, lineAnchor, position, positionAnchor, Cue.DIMEN_UNSET);
   }
 
   private static long parseTimecode(Matcher matcher, int groupOffset) {

From 687756ed31090e91cc57d26dd13e2593c4d4e343 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 1 Oct 2018 12:40:42 -0700
Subject: [PATCH 045/832] Update moe equivalence

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215261807
---
 .../mediasession/MediaSessionConnector.java   |   4 +-
 .../CountryAndNetworkTypeBandwidthMeter.java  | 592 ++++++++++++++++++
 ...untryAndNetworkTypeBandwidthMeterTest.java | 534 ++++++++++++++++
 3 files changed, 1128 insertions(+), 2 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/upstream/CountryAndNetworkTypeBandwidthMeter.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/upstream/CountryAndNetworkTypeBandwidthMeterTest.java

diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
index d0cde5f693..c4110a10f7 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
@@ -259,7 +259,7 @@ public final class MediaSessionConnector {
 
     /** See {@link MediaSessionCompat.Callback#onSetRating(RatingCompat)}. */
     void onSetRating(Player player, RatingCompat rating);
-    
+
     /** See {@link MediaSessionCompat.Callback#onSetRating(RatingCompat, Bundle)}. */
     void onSetRating(Player player, RatingCompat rating, Bundle extras);
   }
@@ -1005,7 +1005,7 @@ public final class MediaSessionConnector {
         ratingCallback.onSetRating(player, rating);
       }
     }
-    
+
     @Override
     public void onSetRating(RatingCompat rating, Bundle extras) {
       if (canDispatchToRatingCallback(PlaybackStateCompat.ACTION_SET_RATING)) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/CountryAndNetworkTypeBandwidthMeter.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/CountryAndNetworkTypeBandwidthMeter.java
new file mode 100644
index 0000000000..7dce8a5049
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/CountryAndNetworkTypeBandwidthMeter.java
@@ -0,0 +1,592 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.upstream;
+
+import android.content.Context;
+import android.os.Handler;
+import android.support.annotation.Nullable;
+import android.util.SparseArray;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.Clock;
+import com.google.android.exoplayer2.util.ClosedSource;
+import com.google.android.exoplayer2.util.EventDispatcher;
+import com.google.android.exoplayer2.util.SlidingPercentile;
+import com.google.android.exoplayer2.util.Util;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Estimates bandwidth by listening to data transfers.
+ *
+ * <p>The bandwidth estimate is calculated using a {@link SlidingPercentile} and is updated each
+ * time a transfer ends. The initial estimate is based on the current operator's network country
+ * code or the locale of the user, as well as the network connection type. This can be configured in
+ * the {@link Builder}.
+ */
+@ClosedSource(reason = "Needs testing")
+public final class CountryAndNetworkTypeBandwidthMeter implements BandwidthMeter, TransferListener {
+
+  /**
+   * Country groups used to determine the default initial bitrate estimate. The group assignment for
+   * each country is an array of group indices for [Wifi, 2G, 3G, 4G].
+   */
+  public static final Map<String, int[]> DEFAULT_INITIAL_BITRATE_COUNTRY_GROUPS =
+      createInitialBitrateCountryGroupAssignment();
+
+  /** Default initial Wifi bitrate estimate in bits per second. */
+  public static final long[] DEFAULT_INITIAL_BITRATE_ESTIMATES_WIFI =
+      new long[] {5_700_000, 3_400_000, 1_900_000, 1_000_000, 400_000};
+
+  /** Default initial 2G bitrate estimates in bits per second. */
+  public static final long[] DEFAULT_INITIAL_BITRATE_ESTIMATES_2G =
+      new long[] {169_000, 129_000, 114_000, 102_000, 87_000};
+
+  /** Default initial 3G bitrate estimates in bits per second. */
+  public static final long[] DEFAULT_INITIAL_BITRATE_ESTIMATES_3G =
+      new long[] {2_100_000, 1_300_000, 950_000, 700_000, 400_000};
+
+  /** Default initial 4G bitrate estimates in bits per second. */
+  public static final long[] DEFAULT_INITIAL_BITRATE_ESTIMATES_4G =
+      new long[] {6_900_000, 4_300_000, 2_700_000, 1_600_000, 450_000};
+
+  /**
+   * Default initial bitrate estimate used when the device is offline or the network type cannot be
+   * determined, in bits per second.
+   */
+  public static final long DEFAULT_INITIAL_BITRATE_ESTIMATE = 1_000_000;
+
+  /** Default maximum weight for the sliding window. */
+  public static final int DEFAULT_SLIDING_WINDOW_MAX_WEIGHT = 2000;
+
+  /** Builder for a bandwidth meter. */
+  public static final class Builder {
+
+    private final @Nullable Context context;
+
+    private @Nullable Handler eventHandler;
+    private @Nullable EventListener eventListener;
+    private SparseArray<Long> initialBitrateEstimates;
+    private int slidingWindowMaxWeight;
+    private Clock clock;
+
+    /** @deprecated Use {@link #Builder(Context)} instead. */
+    @Deprecated
+    public Builder() {
+      this(/* context= */ null);
+    }
+
+    /**
+     * Creates a builder with default parameters and without listener.
+     *
+     * @param context A context.
+     */
+    public Builder(@Nullable Context context) {
+      this.context = context == null ? null : context.getApplicationContext();
+      initialBitrateEstimates = getInitialBitrateEstimatesForCountry(Util.getCountryCode(context));
+      slidingWindowMaxWeight = DEFAULT_SLIDING_WINDOW_MAX_WEIGHT;
+      clock = Clock.DEFAULT;
+    }
+
+    /**
+     * Sets an event listener for new bandwidth estimates.
+     *
+     * @param eventHandler A handler for events.
+     * @param eventListener A listener of events.
+     * @return This builder.
+     * @throws IllegalArgumentException If the event handler or listener are null.
+     */
+    public Builder setEventListener(Handler eventHandler, EventListener eventListener) {
+      Assertions.checkArgument(eventHandler != null && eventListener != null);
+      this.eventHandler = eventHandler;
+      this.eventListener = eventListener;
+      return this;
+    }
+
+    /**
+     * Sets the maximum weight for the sliding window.
+     *
+     * @param slidingWindowMaxWeight The maximum weight for the sliding window.
+     * @return This builder.
+     */
+    public Builder setSlidingWindowMaxWeight(int slidingWindowMaxWeight) {
+      this.slidingWindowMaxWeight = slidingWindowMaxWeight;
+      return this;
+    }
+
+    /**
+     * Sets the initial bitrate estimate in bits per second that should be assumed when a bandwidth
+     * estimate is unavailable.
+     *
+     * @param initialBitrateEstimate The initial bitrate estimate in bits per second.
+     * @return This builder.
+     */
+    public Builder setInitialBitrateEstimate(long initialBitrateEstimate) {
+      for (int i = 0; i < initialBitrateEstimates.size(); i++) {
+        initialBitrateEstimates.setValueAt(i, initialBitrateEstimate);
+      }
+      return this;
+    }
+
+    /**
+     * Sets the initial bitrate estimate in bits per second for a network type that should be
+     * assumed when a bandwidth estimate is unavailable and the current network connection is of the
+     * specified type.
+     *
+     * @param networkType The {@link C.NetworkType} this initial estimate is for.
+     * @param initialBitrateEstimate The initial bitrate estimate in bits per second.
+     * @return This builder.
+     */
+    public Builder setInitialBitrateEstimate(
+        @C.NetworkType int networkType, long initialBitrateEstimate) {
+      initialBitrateEstimates.put(networkType, initialBitrateEstimate);
+      return this;
+    }
+
+    /**
+     * Sets the initial bitrate estimates to the default values of the specified country. The
+     * initial estimates are used when a bandwidth estimate is unavailable.
+     *
+     * @param countryCode The ISO 3166-1 alpha-2 country code of the country whose default bitrate
+     *     estimates should be used.
+     * @return This builder.
+     */
+    public Builder setInitialBitrateEstimate(String countryCode) {
+      initialBitrateEstimates =
+          getInitialBitrateEstimatesForCountry(Util.toUpperInvariant(countryCode));
+      return this;
+    }
+
+    /**
+     * Sets the clock used to estimate bandwidth from data transfers. Should only be set for testing
+     * purposes.
+     *
+     * @param clock The clock used to estimate bandwidth from data transfers.
+     * @return This builder.
+     */
+    public Builder setClock(Clock clock) {
+      this.clock = clock;
+      return this;
+    }
+
+    /**
+     * Builds the bandwidth meter.
+     *
+     * @return A bandwidth meter with the configured properties.
+     */
+    public CountryAndNetworkTypeBandwidthMeter build() {
+      Long initialBitrateEstimate = initialBitrateEstimates.get(Util.getNetworkType(context));
+      if (initialBitrateEstimate == null) {
+        initialBitrateEstimate = initialBitrateEstimates.get(C.NETWORK_TYPE_UNKNOWN);
+      }
+      CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
+          new CountryAndNetworkTypeBandwidthMeter(
+              initialBitrateEstimate, slidingWindowMaxWeight, clock);
+      if (eventHandler != null && eventListener != null) {
+        bandwidthMeter.addEventListener(eventHandler, eventListener);
+      }
+      return bandwidthMeter;
+    }
+
+    private static SparseArray<Long> getInitialBitrateEstimatesForCountry(String countryCode) {
+      int[] groupIndices = getCountryGroupIndices(countryCode);
+      SparseArray<Long> result = new SparseArray<>(/* initialCapacity= */ 6);
+      result.append(C.NETWORK_TYPE_UNKNOWN, DEFAULT_INITIAL_BITRATE_ESTIMATE);
+      result.append(C.NETWORK_TYPE_WIFI, DEFAULT_INITIAL_BITRATE_ESTIMATES_WIFI[groupIndices[0]]);
+      result.append(C.NETWORK_TYPE_2G, DEFAULT_INITIAL_BITRATE_ESTIMATES_2G[groupIndices[1]]);
+      result.append(C.NETWORK_TYPE_3G, DEFAULT_INITIAL_BITRATE_ESTIMATES_3G[groupIndices[2]]);
+      result.append(C.NETWORK_TYPE_4G, DEFAULT_INITIAL_BITRATE_ESTIMATES_4G[groupIndices[3]]);
+      // Assume default Wifi bitrate for Ethernet to prevent using the slower fallback bitrate.
+      result.append(
+          C.NETWORK_TYPE_ETHERNET, DEFAULT_INITIAL_BITRATE_ESTIMATES_WIFI[groupIndices[0]]);
+      return result;
+    }
+
+    private static int[] getCountryGroupIndices(String countryCode) {
+      int[] groupIndices = DEFAULT_INITIAL_BITRATE_COUNTRY_GROUPS.get(countryCode);
+      // Assume median group if not found.
+      return groupIndices == null ? new int[] {2, 2, 2, 2} : groupIndices;
+    }
+  }
+
+  private static final int ELAPSED_MILLIS_FOR_ESTIMATE = 2000;
+  private static final int BYTES_TRANSFERRED_FOR_ESTIMATE = 512 * 1024;
+
+  private final EventDispatcher<EventListener> eventDispatcher;
+  private final SlidingPercentile slidingPercentile;
+  private final Clock clock;
+
+  private int streamCount;
+  private long sampleStartTimeMs;
+  private long sampleBytesTransferred;
+
+  private long totalElapsedTimeMs;
+  private long totalBytesTransferred;
+  private long bitrateEstimate;
+
+  /** Creates a bandwidth meter with default parameters. */
+  public CountryAndNetworkTypeBandwidthMeter() {
+    this(DEFAULT_INITIAL_BITRATE_ESTIMATE, DEFAULT_SLIDING_WINDOW_MAX_WEIGHT, Clock.DEFAULT);
+  }
+
+  /** @deprecated Use {@link Builder} instead. */
+  @Deprecated
+  public CountryAndNetworkTypeBandwidthMeter(Handler eventHandler, EventListener eventListener) {
+    this(DEFAULT_INITIAL_BITRATE_ESTIMATE, DEFAULT_SLIDING_WINDOW_MAX_WEIGHT, Clock.DEFAULT);
+    if (eventHandler != null && eventListener != null) {
+      addEventListener(eventHandler, eventListener);
+    }
+  }
+
+  /** @deprecated Use {@link Builder} instead. */
+  @Deprecated
+  public CountryAndNetworkTypeBandwidthMeter(
+      Handler eventHandler, EventListener eventListener, int maxWeight) {
+    this(DEFAULT_INITIAL_BITRATE_ESTIMATE, maxWeight, Clock.DEFAULT);
+    if (eventHandler != null && eventListener != null) {
+      addEventListener(eventHandler, eventListener);
+    }
+  }
+
+  private CountryAndNetworkTypeBandwidthMeter(
+      long initialBitrateEstimate, int maxWeight, Clock clock) {
+    this.eventDispatcher = new EventDispatcher<>();
+    this.slidingPercentile = new SlidingPercentile(maxWeight);
+    this.clock = clock;
+    bitrateEstimate = initialBitrateEstimate;
+  }
+
+  @Override
+  public synchronized long getBitrateEstimate() {
+    return bitrateEstimate;
+  }
+
+  @Override
+  public @Nullable TransferListener getTransferListener() {
+    return this;
+  }
+
+  @Override
+  public void addEventListener(Handler eventHandler, EventListener eventListener) {
+    eventDispatcher.addListener(eventHandler, eventListener);
+  }
+
+  @Override
+  public void removeEventListener(EventListener eventListener) {
+    eventDispatcher.removeListener(eventListener);
+  }
+
+  @Override
+  public void onTransferInitializing(DataSource source, DataSpec dataSpec, boolean isNetwork) {
+    // Do nothing.
+  }
+
+  @Override
+  public synchronized void onTransferStart(
+      DataSource source, DataSpec dataSpec, boolean isNetwork) {
+    if (!isNetwork) {
+      return;
+    }
+    if (streamCount == 0) {
+      sampleStartTimeMs = clock.elapsedRealtime();
+    }
+    streamCount++;
+  }
+
+  @Override
+  public synchronized void onBytesTransferred(
+      DataSource source, DataSpec dataSpec, boolean isNetwork, int bytes) {
+    if (!isNetwork) {
+      return;
+    }
+    sampleBytesTransferred += bytes;
+  }
+
+  @Override
+  public synchronized void onTransferEnd(DataSource source, DataSpec dataSpec, boolean isNetwork) {
+    if (!isNetwork) {
+      return;
+    }
+    Assertions.checkState(streamCount > 0);
+    long nowMs = clock.elapsedRealtime();
+    int sampleElapsedTimeMs = (int) (nowMs - sampleStartTimeMs);
+    totalElapsedTimeMs += sampleElapsedTimeMs;
+    totalBytesTransferred += sampleBytesTransferred;
+    if (sampleElapsedTimeMs > 0) {
+      float bitsPerSecond = (sampleBytesTransferred * 8000) / sampleElapsedTimeMs;
+      slidingPercentile.addSample((int) Math.sqrt(sampleBytesTransferred), bitsPerSecond);
+      if (totalElapsedTimeMs >= ELAPSED_MILLIS_FOR_ESTIMATE
+          || totalBytesTransferred >= BYTES_TRANSFERRED_FOR_ESTIMATE) {
+        bitrateEstimate = (long) slidingPercentile.getPercentile(0.5f);
+      }
+    }
+    notifyBandwidthSample(sampleElapsedTimeMs, sampleBytesTransferred, bitrateEstimate);
+    if (--streamCount > 0) {
+      sampleStartTimeMs = nowMs;
+    }
+    sampleBytesTransferred = 0;
+  }
+
+  private void notifyBandwidthSample(int elapsedMs, long bytes, long bitrate) {
+    eventDispatcher.dispatch(listener -> listener.onBandwidthSample(elapsedMs, bytes, bitrate));
+  }
+
+  private static Map<String, int[]> createInitialBitrateCountryGroupAssignment() {
+    HashMap<String, int[]> countryGroupAssignment = new HashMap<>();
+    countryGroupAssignment.put("AD", new int[] {1, 0, 0, 0});
+    countryGroupAssignment.put("AE", new int[] {1, 3, 4, 4});
+    countryGroupAssignment.put("AF", new int[] {4, 4, 3, 2});
+    countryGroupAssignment.put("AG", new int[] {3, 2, 1, 2});
+    countryGroupAssignment.put("AI", new int[] {1, 0, 0, 2});
+    countryGroupAssignment.put("AL", new int[] {1, 1, 1, 1});
+    countryGroupAssignment.put("AM", new int[] {2, 2, 4, 3});
+    countryGroupAssignment.put("AO", new int[] {2, 4, 2, 0});
+    countryGroupAssignment.put("AR", new int[] {2, 3, 2, 3});
+    countryGroupAssignment.put("AS", new int[] {3, 4, 4, 1});
+    countryGroupAssignment.put("AT", new int[] {0, 1, 0, 0});
+    countryGroupAssignment.put("AU", new int[] {0, 3, 0, 0});
+    countryGroupAssignment.put("AW", new int[] {1, 1, 0, 4});
+    countryGroupAssignment.put("AX", new int[] {0, 1, 0, 0});
+    countryGroupAssignment.put("AZ", new int[] {3, 3, 2, 2});
+    countryGroupAssignment.put("BA", new int[] {1, 1, 1, 2});
+    countryGroupAssignment.put("BB", new int[] {0, 1, 0, 0});
+    countryGroupAssignment.put("BD", new int[] {2, 1, 3, 2});
+    countryGroupAssignment.put("BE", new int[] {0, 0, 0, 0});
+    countryGroupAssignment.put("BF", new int[] {4, 4, 4, 1});
+    countryGroupAssignment.put("BG", new int[] {0, 0, 0, 1});
+    countryGroupAssignment.put("BH", new int[] {2, 1, 3, 4});
+    countryGroupAssignment.put("BI", new int[] {4, 3, 4, 4});
+    countryGroupAssignment.put("BJ", new int[] {4, 3, 4, 3});
+    countryGroupAssignment.put("BL", new int[] {1, 0, 1, 2});
+    countryGroupAssignment.put("BM", new int[] {1, 0, 0, 0});
+    countryGroupAssignment.put("BN", new int[] {4, 3, 3, 3});
+    countryGroupAssignment.put("BO", new int[] {2, 2, 1, 2});
+    countryGroupAssignment.put("BQ", new int[] {1, 1, 2, 4});
+    countryGroupAssignment.put("BR", new int[] {2, 3, 2, 2});
+    countryGroupAssignment.put("BS", new int[] {1, 1, 0, 2});
+    countryGroupAssignment.put("BT", new int[] {3, 0, 2, 1});
+    countryGroupAssignment.put("BW", new int[] {4, 4, 2, 3});
+    countryGroupAssignment.put("BY", new int[] {1, 1, 1, 1});
+    countryGroupAssignment.put("BZ", new int[] {2, 3, 3, 1});
+    countryGroupAssignment.put("CA", new int[] {0, 2, 2, 3});
+    countryGroupAssignment.put("CD", new int[] {4, 4, 2, 1});
+    countryGroupAssignment.put("CF", new int[] {4, 4, 3, 3});
+    countryGroupAssignment.put("CG", new int[] {4, 4, 4, 4});
+    countryGroupAssignment.put("CH", new int[] {0, 0, 0, 0});
+    countryGroupAssignment.put("CI", new int[] {4, 4, 4, 4});
+    countryGroupAssignment.put("CK", new int[] {2, 4, 2, 0});
+    countryGroupAssignment.put("CL", new int[] {2, 2, 2, 3});
+    countryGroupAssignment.put("CM", new int[] {3, 4, 3, 1});
+    countryGroupAssignment.put("CN", new int[] {2, 0, 1, 2});
+    countryGroupAssignment.put("CO", new int[] {2, 3, 2, 1});
+    countryGroupAssignment.put("CR", new int[] {2, 2, 4, 4});
+    countryGroupAssignment.put("CU", new int[] {4, 4, 4, 1});
+    countryGroupAssignment.put("CV", new int[] {2, 2, 2, 4});
+    countryGroupAssignment.put("CW", new int[] {1, 1, 0, 0});
+    countryGroupAssignment.put("CX", new int[] {1, 2, 2, 2});
+    countryGroupAssignment.put("CY", new int[] {1, 1, 0, 0});
+    countryGroupAssignment.put("CZ", new int[] {0, 1, 0, 0});
+    countryGroupAssignment.put("DE", new int[] {0, 2, 2, 2});
+    countryGroupAssignment.put("DJ", new int[] {3, 4, 4, 0});
+    countryGroupAssignment.put("DK", new int[] {0, 0, 0, 0});
+    countryGroupAssignment.put("DM", new int[] {2, 0, 3, 4});
+    countryGroupAssignment.put("DO", new int[] {3, 3, 4, 4});
+    countryGroupAssignment.put("DZ", new int[] {3, 3, 4, 4});
+    countryGroupAssignment.put("EC", new int[] {2, 3, 3, 1});
+    countryGroupAssignment.put("EE", new int[] {0, 0, 0, 0});
+    countryGroupAssignment.put("EG", new int[] {3, 3, 1, 1});
+    countryGroupAssignment.put("EH", new int[] {2, 0, 2, 3});
+    countryGroupAssignment.put("ER", new int[] {4, 2, 2, 2});
+    countryGroupAssignment.put("ES", new int[] {0, 0, 1, 1});
+    countryGroupAssignment.put("ET", new int[] {4, 4, 4, 0});
+    countryGroupAssignment.put("FI", new int[] {0, 0, 1, 0});
+    countryGroupAssignment.put("FJ", new int[] {3, 2, 3, 3});
+    countryGroupAssignment.put("FK", new int[] {3, 4, 2, 1});
+    countryGroupAssignment.put("FM", new int[] {4, 2, 4, 0});
+    countryGroupAssignment.put("FO", new int[] {0, 0, 0, 1});
+    countryGroupAssignment.put("FR", new int[] {1, 0, 2, 1});
+    countryGroupAssignment.put("GA", new int[] {3, 3, 2, 1});
+    countryGroupAssignment.put("GB", new int[] {0, 1, 3, 2});
+    countryGroupAssignment.put("GD", new int[] {2, 0, 3, 0});
+    countryGroupAssignment.put("GE", new int[] {1, 1, 0, 3});
+    countryGroupAssignment.put("GF", new int[] {1, 2, 4, 4});
+    countryGroupAssignment.put("GG", new int[] {0, 1, 0, 0});
+    countryGroupAssignment.put("GH", new int[] {3, 2, 2, 2});
+    countryGroupAssignment.put("GI", new int[] {0, 0, 0, 1});
+    countryGroupAssignment.put("GL", new int[] {2, 4, 1, 4});
+    countryGroupAssignment.put("GM", new int[] {4, 3, 3, 0});
+    countryGroupAssignment.put("GN", new int[] {4, 4, 3, 4});
+    countryGroupAssignment.put("GP", new int[] {2, 2, 1, 3});
+    countryGroupAssignment.put("GQ", new int[] {4, 4, 3, 1});
+    countryGroupAssignment.put("GR", new int[] {1, 1, 0, 1});
+    countryGroupAssignment.put("GT", new int[] {3, 2, 3, 4});
+    countryGroupAssignment.put("GU", new int[] {1, 0, 4, 4});
+    countryGroupAssignment.put("GW", new int[] {4, 4, 4, 0});
+    countryGroupAssignment.put("GY", new int[] {3, 4, 1, 0});
+    countryGroupAssignment.put("HK", new int[] {0, 2, 3, 4});
+    countryGroupAssignment.put("HN", new int[] {3, 3, 2, 2});
+    countryGroupAssignment.put("HR", new int[] {1, 0, 0, 2});
+    countryGroupAssignment.put("HT", new int[] {3, 3, 3, 3});
+    countryGroupAssignment.put("HU", new int[] {0, 0, 1, 0});
+    countryGroupAssignment.put("ID", new int[] {2, 3, 3, 4});
+    countryGroupAssignment.put("IE", new int[] {0, 0, 1, 1});
+    countryGroupAssignment.put("IL", new int[] {0, 1, 1, 3});
+    countryGroupAssignment.put("IM", new int[] {0, 1, 0, 1});
+    countryGroupAssignment.put("IN", new int[] {2, 3, 3, 4});
+    countryGroupAssignment.put("IO", new int[] {4, 2, 2, 2});
+    countryGroupAssignment.put("IQ", new int[] {3, 3, 4, 3});
+    countryGroupAssignment.put("IR", new int[] {3, 2, 4, 4});
+    countryGroupAssignment.put("IS", new int[] {0, 0, 0, 0});
+    countryGroupAssignment.put("IT", new int[] {1, 0, 1, 3});
+    countryGroupAssignment.put("JE", new int[] {0, 0, 0, 1});
+    countryGroupAssignment.put("JM", new int[] {3, 3, 3, 2});
+    countryGroupAssignment.put("JO", new int[] {1, 1, 1, 2});
+    countryGroupAssignment.put("JP", new int[] {0, 1, 1, 2});
+    countryGroupAssignment.put("KE", new int[] {3, 3, 3, 3});
+    countryGroupAssignment.put("KG", new int[] {2, 2, 3, 3});
+    countryGroupAssignment.put("KH", new int[] {1, 0, 4, 4});
+    countryGroupAssignment.put("KI", new int[] {4, 4, 4, 4});
+    countryGroupAssignment.put("KM", new int[] {4, 4, 2, 2});
+    countryGroupAssignment.put("KN", new int[] {1, 0, 1, 3});
+    countryGroupAssignment.put("KP", new int[] {1, 2, 2, 2});
+    countryGroupAssignment.put("KR", new int[] {0, 4, 0, 2});
+    countryGroupAssignment.put("KW", new int[] {1, 2, 1, 2});
+    countryGroupAssignment.put("KY", new int[] {1, 1, 0, 2});
+    countryGroupAssignment.put("KZ", new int[] {1, 2, 2, 3});
+    countryGroupAssignment.put("LA", new int[] {3, 2, 2, 2});
+    countryGroupAssignment.put("LB", new int[] {3, 2, 0, 0});
+    countryGroupAssignment.put("LC", new int[] {2, 2, 1, 0});
+    countryGroupAssignment.put("LI", new int[] {0, 0, 1, 2});
+    countryGroupAssignment.put("LK", new int[] {1, 1, 2, 2});
+    countryGroupAssignment.put("LR", new int[] {3, 4, 3, 1});
+    countryGroupAssignment.put("LS", new int[] {3, 3, 2, 0});
+    countryGroupAssignment.put("LT", new int[] {0, 0, 0, 1});
+    countryGroupAssignment.put("LU", new int[] {0, 0, 1, 0});
+    countryGroupAssignment.put("LV", new int[] {0, 0, 0, 0});
+    countryGroupAssignment.put("LY", new int[] {4, 4, 4, 4});
+    countryGroupAssignment.put("MA", new int[] {2, 1, 2, 2});
+    countryGroupAssignment.put("MC", new int[] {1, 0, 1, 0});
+    countryGroupAssignment.put("MD", new int[] {1, 1, 0, 0});
+    countryGroupAssignment.put("ME", new int[] {1, 2, 2, 3});
+    countryGroupAssignment.put("MF", new int[] {1, 4, 3, 3});
+    countryGroupAssignment.put("MG", new int[] {3, 4, 1, 2});
+    countryGroupAssignment.put("MH", new int[] {4, 0, 2, 3});
+    countryGroupAssignment.put("MK", new int[] {1, 0, 0, 1});
+    countryGroupAssignment.put("ML", new int[] {4, 4, 4, 4});
+    countryGroupAssignment.put("MM", new int[] {2, 3, 1, 2});
+    countryGroupAssignment.put("MN", new int[] {2, 2, 2, 4});
+    countryGroupAssignment.put("MO", new int[] {0, 1, 4, 4});
+    countryGroupAssignment.put("MP", new int[] {0, 0, 4, 4});
+    countryGroupAssignment.put("MQ", new int[] {1, 1, 1, 3});
+    countryGroupAssignment.put("MR", new int[] {4, 2, 4, 2});
+    countryGroupAssignment.put("MS", new int[] {1, 2, 1, 2});
+    countryGroupAssignment.put("MT", new int[] {0, 0, 0, 0});
+    countryGroupAssignment.put("MU", new int[] {2, 2, 4, 4});
+    countryGroupAssignment.put("MV", new int[] {4, 2, 0, 1});
+    countryGroupAssignment.put("MW", new int[] {3, 2, 1, 1});
+    countryGroupAssignment.put("MX", new int[] {2, 4, 3, 1});
+    countryGroupAssignment.put("MY", new int[] {2, 3, 3, 3});
+    countryGroupAssignment.put("MZ", new int[] {3, 3, 2, 4});
+    countryGroupAssignment.put("NA", new int[] {4, 2, 1, 1});
+    countryGroupAssignment.put("NC", new int[] {2, 1, 3, 3});
+    countryGroupAssignment.put("NE", new int[] {4, 4, 4, 4});
+    countryGroupAssignment.put("NF", new int[] {0, 2, 2, 2});
+    countryGroupAssignment.put("NG", new int[] {3, 4, 2, 2});
+    countryGroupAssignment.put("NI", new int[] {3, 4, 3, 3});
+    countryGroupAssignment.put("NL", new int[] {0, 1, 3, 2});
+    countryGroupAssignment.put("NO", new int[] {0, 0, 1, 0});
+    countryGroupAssignment.put("NP", new int[] {2, 3, 2, 2});
+    countryGroupAssignment.put("NR", new int[] {4, 3, 4, 1});
+    countryGroupAssignment.put("NU", new int[] {4, 2, 2, 2});
+    countryGroupAssignment.put("NZ", new int[] {0, 0, 0, 1});
+    countryGroupAssignment.put("OM", new int[] {2, 2, 1, 3});
+    countryGroupAssignment.put("PA", new int[] {1, 3, 2, 3});
+    countryGroupAssignment.put("PE", new int[] {2, 2, 4, 4});
+    countryGroupAssignment.put("PF", new int[] {2, 2, 0, 1});
+    countryGroupAssignment.put("PG", new int[] {4, 4, 4, 4});
+    countryGroupAssignment.put("PH", new int[] {3, 0, 4, 4});
+    countryGroupAssignment.put("PK", new int[] {3, 3, 3, 3});
+    countryGroupAssignment.put("PL", new int[] {1, 0, 1, 3});
+    countryGroupAssignment.put("PM", new int[] {0, 2, 2, 3});
+    countryGroupAssignment.put("PR", new int[] {2, 3, 4, 3});
+    countryGroupAssignment.put("PS", new int[] {2, 3, 0, 4});
+    countryGroupAssignment.put("PT", new int[] {1, 1, 1, 1});
+    countryGroupAssignment.put("PW", new int[] {3, 2, 3, 0});
+    countryGroupAssignment.put("PY", new int[] {2, 1, 3, 3});
+    countryGroupAssignment.put("QA", new int[] {2, 3, 1, 2});
+    countryGroupAssignment.put("RE", new int[] {1, 1, 2, 2});
+    countryGroupAssignment.put("RO", new int[] {0, 1, 1, 3});
+    countryGroupAssignment.put("RS", new int[] {1, 1, 0, 0});
+    countryGroupAssignment.put("RU", new int[] {0, 1, 1, 1});
+    countryGroupAssignment.put("RW", new int[] {3, 4, 3, 1});
+    countryGroupAssignment.put("SA", new int[] {3, 2, 2, 3});
+    countryGroupAssignment.put("SB", new int[] {4, 4, 3, 0});
+    countryGroupAssignment.put("SC", new int[] {4, 2, 0, 1});
+    countryGroupAssignment.put("SD", new int[] {3, 4, 4, 4});
+    countryGroupAssignment.put("SE", new int[] {0, 0, 0, 0});
+    countryGroupAssignment.put("SG", new int[] {1, 2, 3, 3});
+    countryGroupAssignment.put("SH", new int[] {4, 2, 2, 2});
+    countryGroupAssignment.put("SI", new int[] {0, 1, 0, 0});
+    countryGroupAssignment.put("SJ", new int[] {3, 2, 0, 2});
+    countryGroupAssignment.put("SK", new int[] {0, 1, 0, 1});
+    countryGroupAssignment.put("SL", new int[] {4, 3, 2, 4});
+    countryGroupAssignment.put("SM", new int[] {1, 0, 1, 1});
+    countryGroupAssignment.put("SN", new int[] {4, 4, 4, 2});
+    countryGroupAssignment.put("SO", new int[] {4, 4, 4, 3});
+    countryGroupAssignment.put("SR", new int[] {3, 2, 2, 3});
+    countryGroupAssignment.put("SS", new int[] {4, 3, 4, 2});
+    countryGroupAssignment.put("ST", new int[] {3, 2, 2, 2});
+    countryGroupAssignment.put("SV", new int[] {2, 3, 2, 3});
+    countryGroupAssignment.put("SX", new int[] {2, 4, 2, 0});
+    countryGroupAssignment.put("SY", new int[] {4, 4, 2, 0});
+    countryGroupAssignment.put("SZ", new int[] {3, 4, 1, 1});
+    countryGroupAssignment.put("TC", new int[] {2, 1, 2, 1});
+    countryGroupAssignment.put("TD", new int[] {4, 4, 4, 3});
+    countryGroupAssignment.put("TG", new int[] {3, 2, 2, 0});
+    countryGroupAssignment.put("TH", new int[] {1, 3, 4, 4});
+    countryGroupAssignment.put("TJ", new int[] {4, 4, 4, 4});
+    countryGroupAssignment.put("TL", new int[] {4, 2, 4, 4});
+    countryGroupAssignment.put("TM", new int[] {4, 1, 3, 3});
+    countryGroupAssignment.put("TN", new int[] {2, 2, 1, 2});
+    countryGroupAssignment.put("TO", new int[] {2, 3, 3, 1});
+    countryGroupAssignment.put("TR", new int[] {1, 2, 0, 2});
+    countryGroupAssignment.put("TT", new int[] {2, 1, 1, 0});
+    countryGroupAssignment.put("TV", new int[] {4, 2, 2, 4});
+    countryGroupAssignment.put("TW", new int[] {0, 0, 0, 1});
+    countryGroupAssignment.put("TZ", new int[] {3, 3, 3, 2});
+    countryGroupAssignment.put("UA", new int[] {0, 2, 1, 3});
+    countryGroupAssignment.put("UG", new int[] {4, 3, 2, 2});
+    countryGroupAssignment.put("US", new int[] {0, 1, 3, 3});
+    countryGroupAssignment.put("UY", new int[] {2, 1, 2, 2});
+    countryGroupAssignment.put("UZ", new int[] {4, 3, 2, 4});
+    countryGroupAssignment.put("VA", new int[] {1, 2, 2, 2});
+    countryGroupAssignment.put("VC", new int[] {2, 0, 3, 2});
+    countryGroupAssignment.put("VE", new int[] {3, 4, 4, 3});
+    countryGroupAssignment.put("VG", new int[] {3, 1, 3, 4});
+    countryGroupAssignment.put("VI", new int[] {1, 0, 2, 4});
+    countryGroupAssignment.put("VN", new int[] {0, 2, 4, 4});
+    countryGroupAssignment.put("VU", new int[] {4, 1, 3, 2});
+    countryGroupAssignment.put("WS", new int[] {3, 2, 3, 0});
+    countryGroupAssignment.put("XK", new int[] {1, 2, 1, 0});
+    countryGroupAssignment.put("YE", new int[] {4, 4, 4, 2});
+    countryGroupAssignment.put("YT", new int[] {3, 1, 1, 2});
+    countryGroupAssignment.put("ZA", new int[] {2, 3, 1, 2});
+    countryGroupAssignment.put("ZM", new int[] {3, 3, 3, 1});
+    countryGroupAssignment.put("ZW", new int[] {3, 3, 2, 1});
+    return Collections.unmodifiableMap(countryGroupAssignment);
+  }
+}
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/CountryAndNetworkTypeBandwidthMeterTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/CountryAndNetworkTypeBandwidthMeterTest.java
new file mode 100644
index 0000000000..2549e004e5
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/CountryAndNetworkTypeBandwidthMeterTest.java
@@ -0,0 +1,534 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.upstream;
+
+import static android.Manifest.permission.ACCESS_NETWORK_STATE;
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.net.NetworkInfo.DetailedState;
+import android.telephony.TelephonyManager;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.util.ClosedSource;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
+import org.robolectric.shadows.ShadowNetworkInfo;
+
+/** Unit test for {@link CountryAndNetworkTypeBandwidthMeter}. */
+@ClosedSource(reason = "Not ready yet")
+@RunWith(RobolectricTestRunner.class)
+public final class CountryAndNetworkTypeBandwidthMeterTest {
+
+  private static final String FAST_COUNTRY_ISO = "EE";
+  private static final String SLOW_COUNTRY_ISO = "PG";
+
+  private TelephonyManager telephonyManager;
+  private ConnectivityManager connectivityManager;
+  private NetworkInfo networkInfoOffline;
+  private NetworkInfo networkInfoWifi;
+  private NetworkInfo networkInfo2g;
+  private NetworkInfo networkInfo3g;
+  private NetworkInfo networkInfo4g;
+  private NetworkInfo networkInfoEthernet;
+
+  @Before
+  public void setUp() {
+    connectivityManager =
+        (ConnectivityManager)
+            RuntimeEnvironment.application.getSystemService(Context.CONNECTIVITY_SERVICE);
+    telephonyManager =
+        (TelephonyManager)
+            RuntimeEnvironment.application.getSystemService(Context.TELEPHONY_SERVICE);
+    Shadows.shadowOf(telephonyManager).setNetworkCountryIso(FAST_COUNTRY_ISO);
+    networkInfoOffline =
+        ShadowNetworkInfo.newInstance(
+            DetailedState.DISCONNECTED,
+            ConnectivityManager.TYPE_WIFI,
+            /* subType= */ 0,
+            /* isAvailable= */ false,
+            /* isConnected= */ false);
+    networkInfoWifi =
+        ShadowNetworkInfo.newInstance(
+            DetailedState.CONNECTED,
+            ConnectivityManager.TYPE_WIFI,
+            /* subType= */ 0,
+            /* isAvailable= */ true,
+            /* isConnected= */ true);
+    networkInfo2g =
+        ShadowNetworkInfo.newInstance(
+            DetailedState.CONNECTED,
+            ConnectivityManager.TYPE_MOBILE,
+            TelephonyManager.NETWORK_TYPE_GPRS,
+            /* isAvailable= */ true,
+            /* isConnected= */ true);
+    networkInfo3g =
+        ShadowNetworkInfo.newInstance(
+            DetailedState.CONNECTED,
+            ConnectivityManager.TYPE_MOBILE,
+            TelephonyManager.NETWORK_TYPE_HSDPA,
+            /* isAvailable= */ true,
+            /* isConnected= */ true);
+    networkInfo4g =
+        ShadowNetworkInfo.newInstance(
+            DetailedState.CONNECTED,
+            ConnectivityManager.TYPE_MOBILE,
+            TelephonyManager.NETWORK_TYPE_LTE,
+            /* isAvailable= */ true,
+            /* isConnected= */ true);
+    networkInfoEthernet =
+        ShadowNetworkInfo.newInstance(
+            DetailedState.CONNECTED,
+            ConnectivityManager.TYPE_ETHERNET,
+            /* subType= */ 0,
+            /* isAvailable= */ true,
+            /* isConnected= */ true);
+  }
+  
+  @Test
+  public void defaultInitialBitrateEstimate_forWifi_isGreaterThanEstimateFor2G() {
+    setActiveNetworkInfo(networkInfoWifi);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeterWifi =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimateWifi = bandwidthMeterWifi.getBitrateEstimate();
+
+    setActiveNetworkInfo(networkInfo2g);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeter2g =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimate2g = bandwidthMeter2g.getBitrateEstimate();
+
+    assertThat(initialEstimateWifi).isGreaterThan(initialEstimate2g);
+  }
+
+  @Test
+  public void defaultInitialBitrateEstimate_forWifi_isGreaterThanEstimateFor3G() {
+    setActiveNetworkInfo(networkInfoWifi);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeterWifi =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimateWifi = bandwidthMeterWifi.getBitrateEstimate();
+
+    setActiveNetworkInfo(networkInfo3g);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeter3g =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimate3g = bandwidthMeter3g.getBitrateEstimate();
+
+    assertThat(initialEstimateWifi).isGreaterThan(initialEstimate3g);
+  }
+
+  @Test
+  public void defaultInitialBitrateEstimate_forEthernet_isGreaterThanEstimateFor2G() {
+    setActiveNetworkInfo(networkInfoEthernet);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeterEthernet =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimateEthernet = bandwidthMeterEthernet.getBitrateEstimate();
+
+    setActiveNetworkInfo(networkInfo2g);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeter2g =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimate2g = bandwidthMeter2g.getBitrateEstimate();
+
+    assertThat(initialEstimateEthernet).isGreaterThan(initialEstimate2g);
+  }
+
+  @Test
+  public void defaultInitialBitrateEstimate_forEthernet_isGreaterThanEstimateFor3G() {
+    setActiveNetworkInfo(networkInfoEthernet);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeterEthernet =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimateEthernet = bandwidthMeterEthernet.getBitrateEstimate();
+
+    setActiveNetworkInfo(networkInfo3g);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeter3g =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimate3g = bandwidthMeter3g.getBitrateEstimate();
+
+    assertThat(initialEstimateEthernet).isGreaterThan(initialEstimate3g);
+  }
+
+  @Test
+  public void defaultInitialBitrateEstimate_for4G_isGreaterThanEstimateFor2G() {
+    setActiveNetworkInfo(networkInfo4g);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeter4g =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimate4g = bandwidthMeter4g.getBitrateEstimate();
+
+    setActiveNetworkInfo(networkInfo2g);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeter2g =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimate2g = bandwidthMeter2g.getBitrateEstimate();
+
+    assertThat(initialEstimate4g).isGreaterThan(initialEstimate2g);
+  }
+
+  @Test
+  public void defaultInitialBitrateEstimate_for4G_isGreaterThanEstimateFor3G() {
+    setActiveNetworkInfo(networkInfo4g);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeter4g =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimate4g = bandwidthMeter4g.getBitrateEstimate();
+
+    setActiveNetworkInfo(networkInfo3g);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeter3g =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimate3g = bandwidthMeter3g.getBitrateEstimate();
+
+    assertThat(initialEstimate4g).isGreaterThan(initialEstimate3g);
+  }
+
+  @Test
+  public void defaultInitialBitrateEstimate_for3G_isGreaterThanEstimateFor2G() {
+    setActiveNetworkInfo(networkInfo3g);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeter3g =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimate3g = bandwidthMeter3g.getBitrateEstimate();
+
+    setActiveNetworkInfo(networkInfo2g);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeter2g =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimate2g = bandwidthMeter2g.getBitrateEstimate();
+
+    assertThat(initialEstimate3g).isGreaterThan(initialEstimate2g);
+  }
+
+  @Test
+  public void defaultInitialBitrateEstimate_forOffline_isReasonable() {
+    setActiveNetworkInfo(networkInfoOffline);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimate = bandwidthMeter.getBitrateEstimate();
+
+    assertThat(initialEstimate).isGreaterThan(100_000L);
+    assertThat(initialEstimate).isLessThan(50_000_000L);
+  }
+
+  @Test
+  public void
+      defaultInitialBitrateEstimate_forWifi_forFastCountry_isGreaterThanEstimateForSlowCountry() {
+    setActiveNetworkInfo(networkInfoWifi);
+    setNetworkCountryIso(FAST_COUNTRY_ISO);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeterFast =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimateFast = bandwidthMeterFast.getBitrateEstimate();
+
+    setNetworkCountryIso(SLOW_COUNTRY_ISO);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeterSlow =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimateSlow = bandwidthMeterSlow.getBitrateEstimate();
+
+    assertThat(initialEstimateFast).isGreaterThan(initialEstimateSlow);
+  }
+
+  @Test
+  public void
+      defaultInitialBitrateEstimate_forEthernet_forFastCountry_isGreaterThanEstimateForSlowCountry() {
+    setActiveNetworkInfo(networkInfoEthernet);
+    setNetworkCountryIso(FAST_COUNTRY_ISO);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeterFast =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimateFast = bandwidthMeterFast.getBitrateEstimate();
+
+    setNetworkCountryIso(SLOW_COUNTRY_ISO);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeterSlow =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimateSlow = bandwidthMeterSlow.getBitrateEstimate();
+
+    assertThat(initialEstimateFast).isGreaterThan(initialEstimateSlow);
+  }
+
+  @Test
+  public void
+      defaultInitialBitrateEstimate_for2G_forFastCountry_isGreaterThanEstimateForSlowCountry() {
+    setActiveNetworkInfo(networkInfo2g);
+    setNetworkCountryIso(FAST_COUNTRY_ISO);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeterFast =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimateFast = bandwidthMeterFast.getBitrateEstimate();
+
+    setNetworkCountryIso(SLOW_COUNTRY_ISO);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeterSlow =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimateSlow = bandwidthMeterSlow.getBitrateEstimate();
+
+    assertThat(initialEstimateFast).isGreaterThan(initialEstimateSlow);
+  }
+
+  @Test
+  public void
+      defaultInitialBitrateEstimate_for3G_forFastCountry_isGreaterThanEstimateForSlowCountry() {
+    setActiveNetworkInfo(networkInfo3g);
+    setNetworkCountryIso(FAST_COUNTRY_ISO);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeterFast =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimateFast = bandwidthMeterFast.getBitrateEstimate();
+
+    setNetworkCountryIso(SLOW_COUNTRY_ISO);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeterSlow =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimateSlow = bandwidthMeterSlow.getBitrateEstimate();
+
+    assertThat(initialEstimateFast).isGreaterThan(initialEstimateSlow);
+  }
+
+  @Test
+  public void
+      defaultInitialBitrateEstimate_for4g_forFastCountry_isGreaterThanEstimateForSlowCountry() {
+    setActiveNetworkInfo(networkInfo4g);
+    setNetworkCountryIso(FAST_COUNTRY_ISO);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeterFast =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimateFast = bandwidthMeterFast.getBitrateEstimate();
+
+    setNetworkCountryIso(SLOW_COUNTRY_ISO);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeterSlow =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimateSlow = bandwidthMeterSlow.getBitrateEstimate();
+
+    assertThat(initialEstimateFast).isGreaterThan(initialEstimateSlow);
+  }
+
+  @Test
+  public void initialBitrateEstimateOverwrite_whileConnectedToNetwork_setsInitialEstimate() {
+    setActiveNetworkInfo(networkInfoWifi);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+            .setInitialBitrateEstimate(123456789)
+            .build();
+    long initialEstimate = bandwidthMeter.getBitrateEstimate();
+
+    assertThat(initialEstimate).isEqualTo(123456789);
+  }
+
+  @Test
+  public void initialBitrateEstimateOverwrite_whileOffline_setsInitialEstimate() {
+    setActiveNetworkInfo(networkInfoOffline);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+            .setInitialBitrateEstimate(123456789)
+            .build();
+    long initialEstimate = bandwidthMeter.getBitrateEstimate();
+
+    assertThat(initialEstimate).isEqualTo(123456789);
+  }
+
+  @Test
+  public void initialBitrateEstimateOverwrite_forWifi_whileConnectedToWifi_setsInitialEstimate() {
+    setActiveNetworkInfo(networkInfoWifi);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+            .setInitialBitrateEstimate(C.NETWORK_TYPE_WIFI, 123456789)
+            .build();
+    long initialEstimate = bandwidthMeter.getBitrateEstimate();
+
+    assertThat(initialEstimate).isEqualTo(123456789);
+  }
+
+  @Test
+  public void
+      initialBitrateEstimateOverwrite_forWifi_whileConnectedToOtherNetwork_doesNotSetInitialEstimate() {
+    setActiveNetworkInfo(networkInfo2g);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+            .setInitialBitrateEstimate(C.NETWORK_TYPE_WIFI, 123456789)
+            .build();
+    long initialEstimate = bandwidthMeter.getBitrateEstimate();
+
+    assertThat(initialEstimate).isNotEqualTo(123456789);
+  }
+
+  @Test
+  public void
+      initialBitrateEstimateOverwrite_forEthernet_whileConnectedToEthernet_setsInitialEstimate() {
+    setActiveNetworkInfo(networkInfoEthernet);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+            .setInitialBitrateEstimate(C.NETWORK_TYPE_ETHERNET, 123456789)
+            .build();
+    long initialEstimate = bandwidthMeter.getBitrateEstimate();
+
+    assertThat(initialEstimate).isEqualTo(123456789);
+  }
+
+  @Test
+  public void
+      initialBitrateEstimateOverwrite_forEthernet_whileConnectedToOtherNetwork_doesNotSetInitialEstimate() {
+    setActiveNetworkInfo(networkInfo2g);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+            .setInitialBitrateEstimate(C.NETWORK_TYPE_WIFI, 123456789)
+            .build();
+    long initialEstimate = bandwidthMeter.getBitrateEstimate();
+
+    assertThat(initialEstimate).isNotEqualTo(123456789);
+  }
+
+  @Test
+  public void initialBitrateEstimateOverwrite_for2G_whileConnectedTo2G_setsInitialEstimate() {
+    setActiveNetworkInfo(networkInfo2g);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+            .setInitialBitrateEstimate(C.NETWORK_TYPE_2G, 123456789)
+            .build();
+    long initialEstimate = bandwidthMeter.getBitrateEstimate();
+
+    assertThat(initialEstimate).isEqualTo(123456789);
+  }
+
+  @Test
+  public void
+      initialBitrateEstimateOverwrite_for2G_whileConnectedToOtherNetwork_doesNotSetInitialEstimate() {
+    setActiveNetworkInfo(networkInfoWifi);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+            .setInitialBitrateEstimate(C.NETWORK_TYPE_2G, 123456789)
+            .build();
+    long initialEstimate = bandwidthMeter.getBitrateEstimate();
+
+    assertThat(initialEstimate).isNotEqualTo(123456789);
+  }
+
+  @Test
+  public void initialBitrateEstimateOverwrite_for3G_whileConnectedTo3G_setsInitialEstimate() {
+    setActiveNetworkInfo(networkInfo3g);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+            .setInitialBitrateEstimate(C.NETWORK_TYPE_3G, 123456789)
+            .build();
+    long initialEstimate = bandwidthMeter.getBitrateEstimate();
+
+    assertThat(initialEstimate).isEqualTo(123456789);
+  }
+
+  @Test
+  public void
+      initialBitrateEstimateOverwrite_for3G_whileConnectedToOtherNetwork_doesNotSetInitialEstimate() {
+    setActiveNetworkInfo(networkInfoWifi);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+            .setInitialBitrateEstimate(C.NETWORK_TYPE_3G, 123456789)
+            .build();
+    long initialEstimate = bandwidthMeter.getBitrateEstimate();
+
+    assertThat(initialEstimate).isNotEqualTo(123456789);
+  }
+
+  @Test
+  public void initialBitrateEstimateOverwrite_for4G_whileConnectedTo4G_setsInitialEstimate() {
+    setActiveNetworkInfo(networkInfo4g);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+            .setInitialBitrateEstimate(C.NETWORK_TYPE_4G, 123456789)
+            .build();
+    long initialEstimate = bandwidthMeter.getBitrateEstimate();
+
+    assertThat(initialEstimate).isEqualTo(123456789);
+  }
+
+  @Test
+  public void
+      initialBitrateEstimateOverwrite_for4G_whileConnectedToOtherNetwork_doesNotSetInitialEstimate() {
+    setActiveNetworkInfo(networkInfoWifi);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+            .setInitialBitrateEstimate(C.NETWORK_TYPE_4G, 123456789)
+            .build();
+    long initialEstimate = bandwidthMeter.getBitrateEstimate();
+
+    assertThat(initialEstimate).isNotEqualTo(123456789);
+  }
+
+  @Test
+  public void initialBitrateEstimateOverwrite_forOffline_whileOffline_setsInitialEstimate() {
+    setActiveNetworkInfo(networkInfoOffline);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+            .setInitialBitrateEstimate(C.NETWORK_TYPE_OFFLINE, 123456789)
+            .build();
+    long initialEstimate = bandwidthMeter.getBitrateEstimate();
+
+    assertThat(initialEstimate).isEqualTo(123456789);
+  }
+
+  @Test
+  public void
+      initialBitrateEstimateOverwrite_forOffline_whileConnectedToNetwork_doesNotSetInitialEstimate() {
+    setActiveNetworkInfo(networkInfoWifi);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+            .setInitialBitrateEstimate(C.NETWORK_TYPE_OFFLINE, 123456789)
+            .build();
+    long initialEstimate = bandwidthMeter.getBitrateEstimate();
+
+    assertThat(initialEstimate).isNotEqualTo(123456789);
+  }
+
+  @Test
+  public void initialBitrateEstimateOverwrite_forCountry_usesDefaultValuesForCountry() {
+    setNetworkCountryIso(SLOW_COUNTRY_ISO);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeterSlow =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimateSlow = bandwidthMeterSlow.getBitrateEstimate();
+
+    setNetworkCountryIso(FAST_COUNTRY_ISO);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeterFastWithSlowOverwrite =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+            .setInitialBitrateEstimate(SLOW_COUNTRY_ISO)
+            .build();
+    long initialEstimateFastWithSlowOverwrite =
+        bandwidthMeterFastWithSlowOverwrite.getBitrateEstimate();
+
+    assertThat(initialEstimateFastWithSlowOverwrite).isEqualTo(initialEstimateSlow);
+  }
+
+  @Test
+  public void defaultInitialBitrateEstimate_withoutContext_isReasonable() {
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeterWithBuilder =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(/* context= */ null).build();
+    long initialEstimateWithBuilder = bandwidthMeterWithBuilder.getBitrateEstimate();
+
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeterWithoutBuilder =
+        new CountryAndNetworkTypeBandwidthMeter();
+    long initialEstimateWithoutBuilder = bandwidthMeterWithoutBuilder.getBitrateEstimate();
+
+    assertThat(initialEstimateWithBuilder).isGreaterThan(100_000L);
+    assertThat(initialEstimateWithBuilder).isLessThan(50_000_000L);
+    assertThat(initialEstimateWithoutBuilder).isGreaterThan(100_000L);
+    assertThat(initialEstimateWithoutBuilder).isLessThan(50_000_000L);
+  }
+
+  @Test
+  public void defaultInitialBitrateEstimate_withoutAccessNetworkStatePermission_isReasonable() {
+    Shadows.shadowOf(RuntimeEnvironment.application).denyPermissions(ACCESS_NETWORK_STATE);
+    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
+        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimate = bandwidthMeter.getBitrateEstimate();
+
+    assertThat(initialEstimate).isGreaterThan(100_000L);
+    assertThat(initialEstimate).isLessThan(50_000_000L);
+  }
+
+  private void setActiveNetworkInfo(NetworkInfo networkInfo) {
+    Shadows.shadowOf(connectivityManager).setActiveNetworkInfo(networkInfo);
+  }
+
+  private void setNetworkCountryIso(String countryIso) {
+    Shadows.shadowOf(telephonyManager).setNetworkCountryIso(countryIso);
+  }
+}

From 8b2d99844069d61f694ded113a169cede05358ba Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 2 Oct 2018 03:52:27 -0700
Subject: [PATCH 046/832] Remove deprecated ExoPlayer members with same name as
 non-deprecated version.

For example, using ExoPlayer.STATE_IDLE falls back to the Player.STATE_IDLE
automatically and thus there is no need to keep the deprecated members.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215363841
---
 .../google/android/exoplayer2/ExoPlayer.java  | 43 -------------------
 1 file changed, 43 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
index 0e8c176486..96ddb2eb9c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
@@ -117,12 +117,6 @@ import com.google.android.exoplayer2.video.MediaCodecVideoRenderer;
  */
 public interface ExoPlayer extends Player {
 
-  /**
-   * @deprecated Use {@link Player.EventListener} instead.
-   */
-  @Deprecated
-  interface EventListener extends Player.EventListener {}
-
   /** @deprecated Use {@link PlayerMessage.Target} instead. */
   @Deprecated
   interface ExoPlayerComponent extends PlayerMessage.Target {}
@@ -147,43 +141,6 @@ public interface ExoPlayer extends Player {
     }
   }
 
-  /**
-   * @deprecated Use {@link Player#STATE_IDLE} instead.
-   */
-  @Deprecated
-  int STATE_IDLE = Player.STATE_IDLE;
-  /**
-   * @deprecated Use {@link Player#STATE_BUFFERING} instead.
-   */
-  @Deprecated
-  int STATE_BUFFERING = Player.STATE_BUFFERING;
-  /**
-   * @deprecated Use {@link Player#STATE_READY} instead.
-   */
-  @Deprecated
-  int STATE_READY = Player.STATE_READY;
-  /**
-   * @deprecated Use {@link Player#STATE_ENDED} instead.
-   */
-  @Deprecated
-  int STATE_ENDED = Player.STATE_ENDED;
-
-  /**
-   * @deprecated Use {@link Player#REPEAT_MODE_OFF} instead.
-   */
-  @Deprecated
-  @RepeatMode int REPEAT_MODE_OFF = Player.REPEAT_MODE_OFF;
-  /**
-   * @deprecated Use {@link Player#REPEAT_MODE_ONE} instead.
-   */
-  @Deprecated
-  @RepeatMode int REPEAT_MODE_ONE = Player.REPEAT_MODE_ONE;
-  /**
-   * @deprecated Use {@link Player#REPEAT_MODE_ALL} instead.
-   */
-  @Deprecated
-  @RepeatMode int REPEAT_MODE_ALL = Player.REPEAT_MODE_ALL;
-
   /** Returns the {@link Looper} associated with the playback thread. */
   Looper getPlaybackLooper();
 

From a8b851ce34e2932172bce0bae3b71e176ceb3929 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 2 Oct 2018 05:52:56 -0700
Subject: [PATCH 047/832] Add BasePlayer to avoid code duplication for common
 convenience methods.

A lot of methods just forward to other methods and there is no conceivable
way a player should implement it another way. Moving these methods to a
base player class allows to remove duplicated code across our player
implementations.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215374192
---
 .../exoplayer2/ext/cast/CastPlayer.java       | 101 +-------------
 .../exoplayer2/ext/ima/FakePlayer.java        |  12 --
 .../google/android/exoplayer2/BasePlayer.java | 132 ++++++++++++++++++
 .../android/exoplayer2/ExoPlayerImpl.java     | 104 +-------------
 .../android/exoplayer2/SimpleExoPlayer.java   | 100 +------------
 .../exoplayer2/testutil/StubExoPlayer.java    |  79 +----------
 6 files changed, 140 insertions(+), 388 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java

diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
index ecaa56427f..e5832f3b31 100644
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.ext.cast;
 import android.os.Looper;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.BasePlayer;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.PlaybackParameters;
@@ -31,7 +32,6 @@ import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.MimeTypes;
-import com.google.android.exoplayer2.util.Util;
 import com.google.android.gms.cast.CastStatusCodes;
 import com.google.android.gms.cast.MediaInfo;
 import com.google.android.gms.cast.MediaQueueItem;
@@ -62,7 +62,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
  *
  * <p>Methods should be called on the application's main thread.
  */
-public final class CastPlayer implements Player {
+public final class CastPlayer extends BasePlayer {
 
   private static final String TAG = "CastPlayer";
 
@@ -78,7 +78,6 @@ public final class CastPlayer implements Player {
   private final CastContext castContext;
   // TODO: Allow custom implementations of CastTimelineTracker.
   private final CastTimelineTracker timelineTracker;
-  private final Timeline.Window window;
   private final Timeline.Period period;
 
   private RemoteMediaClient remoteMediaClient;
@@ -111,7 +110,6 @@ public final class CastPlayer implements Player {
   public CastPlayer(CastContext castContext) {
     this.castContext = castContext;
     timelineTracker = new CastTimelineTracker();
-    window = new Timeline.Window();
     period = new Timeline.Period();
     statusListener = new StatusListener();
     seekResultCallback = new SeekResultCallback();
@@ -324,21 +322,6 @@ public final class CastPlayer implements Player {
     return playWhenReady;
   }
 
-  @Override
-  public void seekToDefaultPosition() {
-    seekTo(0);
-  }
-
-  @Override
-  public void seekToDefaultPosition(int windowIndex) {
-    seekTo(windowIndex, 0);
-  }
-
-  @Override
-  public void seekTo(long positionMs) {
-    seekTo(getCurrentWindowIndex(), positionMs);
-  }
-
   @Override
   public void seekTo(int windowIndex, long positionMs) {
     MediaStatus mediaStatus = getMediaStatus();
@@ -365,32 +348,6 @@ public final class CastPlayer implements Player {
     }
   }
 
-  @Override
-  public boolean hasPrevious() {
-    return getPreviousWindowIndex() != C.INDEX_UNSET;
-  }
-
-  @Override
-  public void previous() {
-    int previousWindowIndex = getPreviousWindowIndex();
-    if (previousWindowIndex != C.INDEX_UNSET) {
-      seekToDefaultPosition(previousWindowIndex);
-    }
-  }
-
-  @Override
-  public boolean hasNext() {
-    return getNextWindowIndex() != C.INDEX_UNSET;
-  }
-
-  @Override
-  public void next() {
-    int nextWindowIndex = getPreviousWindowIndex();
-    if (nextWindowIndex != C.INDEX_UNSET) {
-      seekToDefaultPosition(nextWindowIndex);
-    }
-  }
-
   @Override
   public void setPlaybackParameters(@Nullable PlaybackParameters playbackParameters) {
     // Unsupported by the RemoteMediaClient API. Do nothing.
@@ -401,11 +358,6 @@ public final class CastPlayer implements Player {
     return PlaybackParameters.DEFAULT;
   }
 
-  @Override
-  public void stop() {
-    stop(/* reset= */ false);
-  }
-
   @Override
   public void stop(boolean reset) {
     playbackState = STATE_IDLE;
@@ -495,32 +447,11 @@ public final class CastPlayer implements Player {
     return pendingSeekWindowIndex != C.INDEX_UNSET ? pendingSeekWindowIndex : currentWindowIndex;
   }
 
-  @Override
-  public int getNextWindowIndex() {
-    return currentTimeline.isEmpty() ? C.INDEX_UNSET
-        : currentTimeline.getNextWindowIndex(getCurrentWindowIndex(), repeatMode, false);
-  }
-
-  @Override
-  public int getPreviousWindowIndex() {
-    return currentTimeline.isEmpty() ? C.INDEX_UNSET
-        : currentTimeline.getPreviousWindowIndex(getCurrentWindowIndex(), repeatMode, false);
-  }
-
-  @Override
-  public @Nullable Object getCurrentTag() {
-    int windowIndex = getCurrentWindowIndex();
-    return windowIndex >= currentTimeline.getWindowCount()
-        ? null
-        : currentTimeline.getWindow(windowIndex, window, /* setTag= */ true).tag;
-  }
-
   // TODO: Fill the cast timeline information with ProgressListener's duration updates.
   // See [Internal: b/65152553].
   @Override
   public long getDuration() {
-    return currentTimeline.isEmpty() ? C.TIME_UNSET
-        : currentTimeline.getWindow(getCurrentWindowIndex(), window).getDurationMs();
+    return getContentDuration();
   }
 
   @Override
@@ -537,15 +468,6 @@ public final class CastPlayer implements Player {
     return getCurrentPosition();
   }
 
-  @Override
-  public int getBufferedPercentage() {
-    long position = getBufferedPosition();
-    long duration = getDuration();
-    return position == C.TIME_UNSET || duration == C.TIME_UNSET
-        ? 0
-        : duration == 0 ? 100 : Util.constrainValue((int) ((position * 100) / duration), 0, 100);
-  }
-
   @Override
   public long getTotalBufferedDuration() {
     long bufferedPosition = getBufferedPosition();
@@ -555,18 +477,6 @@ public final class CastPlayer implements Player {
         : bufferedPosition - currentPosition;
   }
 
-  @Override
-  public boolean isCurrentWindowDynamic() {
-    return !currentTimeline.isEmpty()
-        && currentTimeline.getWindow(getCurrentWindowIndex(), window).isDynamic;
-  }
-
-  @Override
-  public boolean isCurrentWindowSeekable() {
-    return !currentTimeline.isEmpty()
-        && currentTimeline.getWindow(getCurrentWindowIndex(), window).isSeekable;
-  }
-
   @Override
   public boolean isPlayingAd() {
     return false;
@@ -582,11 +492,6 @@ public final class CastPlayer implements Player {
     return C.INDEX_UNSET;
   }
 
-  @Override
-  public long getContentDuration() {
-    return getDuration();
-  }
-
   @Override
   public boolean isLoading() {
     return false;
diff --git a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakePlayer.java b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakePlayer.java
index 0c35c9b66d..b8024d6534 100644
--- a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakePlayer.java
+++ b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakePlayer.java
@@ -26,7 +26,6 @@ import java.util.ArrayList;
 /* package */ final class FakePlayer extends StubExoPlayer {
 
   private final ArrayList<Player.EventListener> listeners;
-  private final Timeline.Window window;
   private final Timeline.Period period;
   private final Timeline timeline;
 
@@ -41,7 +40,6 @@ import java.util.ArrayList;
 
   public FakePlayer() {
     listeners = new ArrayList<>();
-    window = new Timeline.Window();
     period = new Timeline.Period();
     state = Player.STATE_IDLE;
     playWhenReady = true;
@@ -151,16 +149,6 @@ import java.util.ArrayList;
     return 0;
   }
 
-  @Override
-  public int getNextWindowIndex() {
-    return C.INDEX_UNSET;
-  }
-
-  @Override
-  public int getPreviousWindowIndex() {
-    return C.INDEX_UNSET;
-  }
-
   @Override
   public long getDuration() {
     if (timeline.isEmpty()) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java
new file mode 100644
index 0000000000..6ff0853d9b
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2;
+
+import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.util.Util;
+
+/** Abstract base {@link Player} which implements common implementation independent methods. */
+public abstract class BasePlayer implements Player {
+
+  protected final Timeline.Window window;
+
+  public BasePlayer() {
+    window = new Timeline.Window();
+  }
+
+  @Override
+  public final void seekToDefaultPosition() {
+    seekToDefaultPosition(getCurrentWindowIndex());
+  }
+
+  @Override
+  public final void seekToDefaultPosition(int windowIndex) {
+    seekTo(windowIndex, /* positionMs= */ C.TIME_UNSET);
+  }
+
+  @Override
+  public final void seekTo(long positionMs) {
+    seekTo(getCurrentWindowIndex(), positionMs);
+  }
+
+  @Override
+  public final boolean hasPrevious() {
+    return getPreviousWindowIndex() != C.INDEX_UNSET;
+  }
+
+  @Override
+  public final void previous() {
+    int previousWindowIndex = getPreviousWindowIndex();
+    if (previousWindowIndex != C.INDEX_UNSET) {
+      seekToDefaultPosition(previousWindowIndex);
+    }
+  }
+
+  @Override
+  public final boolean hasNext() {
+    return getNextWindowIndex() != C.INDEX_UNSET;
+  }
+
+  @Override
+  public final void next() {
+    int nextWindowIndex = getPreviousWindowIndex();
+    if (nextWindowIndex != C.INDEX_UNSET) {
+      seekToDefaultPosition(nextWindowIndex);
+    }
+  }
+
+  @Override
+  public final void stop() {
+    stop(/* reset= */ false);
+  }
+
+  @Override
+  public final int getNextWindowIndex() {
+    Timeline timeline = getCurrentTimeline();
+    return timeline.isEmpty()
+        ? C.INDEX_UNSET
+        : timeline.getNextWindowIndex(
+            getCurrentWindowIndex(), getRepeatMode(), getShuffleModeEnabled());
+  }
+
+  @Override
+  public final int getPreviousWindowIndex() {
+    Timeline timeline = getCurrentTimeline();
+    return timeline.isEmpty()
+        ? C.INDEX_UNSET
+        : timeline.getPreviousWindowIndex(
+            getCurrentWindowIndex(), getRepeatMode(), getShuffleModeEnabled());
+  }
+
+  @Override
+  @Nullable
+  public final Object getCurrentTag() {
+    int windowIndex = getCurrentWindowIndex();
+    Timeline timeline = getCurrentTimeline();
+    return windowIndex >= timeline.getWindowCount()
+        ? null
+        : timeline.getWindow(windowIndex, window, /* setTag= */ true).tag;
+  }
+
+  @Override
+  public final int getBufferedPercentage() {
+    long position = getBufferedPosition();
+    long duration = getDuration();
+    return position == C.TIME_UNSET || duration == C.TIME_UNSET
+        ? 0
+        : duration == 0 ? 100 : Util.constrainValue((int) ((position * 100) / duration), 0, 100);
+  }
+
+  @Override
+  public final boolean isCurrentWindowDynamic() {
+    Timeline timeline = getCurrentTimeline();
+    return !timeline.isEmpty() && timeline.getWindow(getCurrentWindowIndex(), window).isDynamic;
+  }
+
+  @Override
+  public final boolean isCurrentWindowSeekable() {
+    Timeline timeline = getCurrentTimeline();
+    return !timeline.isEmpty() && timeline.getWindow(getCurrentWindowIndex(), window).isSeekable;
+  }
+
+  @Override
+  public final long getContentDuration() {
+    Timeline timeline = getCurrentTimeline();
+    return timeline.isEmpty()
+        ? C.TIME_UNSET
+        : timeline.getWindow(getCurrentWindowIndex(), window).getDurationMs();
+  }
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index 5d565cdc90..5fb6202d2f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -40,10 +40,8 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-/**
- * An {@link ExoPlayer} implementation. Instances can be obtained from {@link ExoPlayerFactory}.
- */
-/* package */ final class ExoPlayerImpl implements ExoPlayer {
+/** An {@link ExoPlayer} implementation. Instances can be obtained from {@link ExoPlayerFactory}. */
+/* package */ final class ExoPlayerImpl extends BasePlayer implements ExoPlayer {
 
   private static final String TAG = "ExoPlayerImpl";
 
@@ -62,7 +60,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
   private final ExoPlayerImplInternal internalPlayer;
   private final Handler internalPlayerHandler;
   private final CopyOnWriteArraySet<Player.EventListener> listeners;
-  private final Timeline.Window window;
   private final Timeline.Period period;
   private final ArrayDeque<PlaybackInfoUpdate> pendingPlaybackInfoUpdates;
 
@@ -119,7 +116,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
             new RendererConfiguration[renderers.length],
             new TrackSelection[renderers.length],
             null);
-    window = new Timeline.Window();
     period = new Timeline.Period();
     playbackParameters = PlaybackParameters.DEFAULT;
     seekParameters = SeekParameters.DEFAULT;
@@ -294,21 +290,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
     return playbackInfo.isLoading;
   }
 
-  @Override
-  public void seekToDefaultPosition() {
-    seekToDefaultPosition(getCurrentWindowIndex());
-  }
-
-  @Override
-  public void seekToDefaultPosition(int windowIndex) {
-    seekTo(windowIndex, C.TIME_UNSET);
-  }
-
-  @Override
-  public void seekTo(long positionMs) {
-    seekTo(getCurrentWindowIndex(), positionMs);
-  }
-
   @Override
   public void seekTo(int windowIndex, long positionMs) {
     Timeline timeline = playbackInfo.timeline;
@@ -349,32 +330,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
     }
   }
 
-  @Override
-  public boolean hasPrevious() {
-    return getPreviousWindowIndex() != C.INDEX_UNSET;
-  }
-
-  @Override
-  public void previous() {
-    int previousWindowIndex = getPreviousWindowIndex();
-    if (previousWindowIndex != C.INDEX_UNSET) {
-      seekToDefaultPosition(previousWindowIndex);
-    }
-  }
-
-  @Override
-  public boolean hasNext() {
-    return getNextWindowIndex() != C.INDEX_UNSET;
-  }
-
-  @Override
-  public void next() {
-    int nextWindowIndex = getPreviousWindowIndex();
-    if (nextWindowIndex != C.INDEX_UNSET) {
-      seekToDefaultPosition(nextWindowIndex);
-    }
-  }
-
   @Override
   public void setPlaybackParameters(@Nullable PlaybackParameters playbackParameters) {
     if (playbackParameters == null) {
@@ -404,19 +359,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
     return seekParameters;
   }
 
-  @Override
-  public @Nullable Object getCurrentTag() {
-    int windowIndex = getCurrentWindowIndex();
-    return windowIndex >= playbackInfo.timeline.getWindowCount()
-        ? null
-        : playbackInfo.timeline.getWindow(windowIndex, window, /* setTag= */ true).tag;
-  }
-
-  @Override
-  public void stop() {
-    stop(/* reset= */ false);
-  }
-
   @Override
   public void stop(boolean reset) {
     if (reset) {
@@ -521,20 +463,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
     }
   }
 
-  @Override
-  public int getNextWindowIndex() {
-    Timeline timeline = playbackInfo.timeline;
-    return timeline.isEmpty() ? C.INDEX_UNSET
-        : timeline.getNextWindowIndex(getCurrentWindowIndex(), repeatMode, shuffleModeEnabled);
-  }
-
-  @Override
-  public int getPreviousWindowIndex() {
-    Timeline timeline = playbackInfo.timeline;
-    return timeline.isEmpty() ? C.INDEX_UNSET
-        : timeline.getPreviousWindowIndex(getCurrentWindowIndex(), repeatMode, shuffleModeEnabled);
-  }
-
   @Override
   public long getDuration() {
     if (isPlayingAd()) {
@@ -567,32 +495,11 @@ import java.util.concurrent.CopyOnWriteArraySet;
     return getContentBufferedPosition();
   }
 
-  @Override
-  public int getBufferedPercentage() {
-    long position = getBufferedPosition();
-    long duration = getDuration();
-    return position == C.TIME_UNSET || duration == C.TIME_UNSET
-        ? 0
-        : (duration == 0 ? 100 : Util.constrainValue((int) ((position * 100) / duration), 0, 100));
-  }
-
   @Override
   public long getTotalBufferedDuration() {
     return Math.max(0, C.usToMs(playbackInfo.totalBufferedDurationUs));
   }
 
-  @Override
-  public boolean isCurrentWindowDynamic() {
-    Timeline timeline = playbackInfo.timeline;
-    return !timeline.isEmpty() && timeline.getWindow(getCurrentWindowIndex(), window).isDynamic;
-  }
-
-  @Override
-  public boolean isCurrentWindowSeekable() {
-    Timeline timeline = playbackInfo.timeline;
-    return !timeline.isEmpty() && timeline.getWindow(getCurrentWindowIndex(), window).isSeekable;
-  }
-
   @Override
   public boolean isPlayingAd() {
     return !shouldMaskPosition() && playbackInfo.periodId.isAd();
@@ -608,13 +515,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
     return isPlayingAd() ? playbackInfo.periodId.adIndexInAdGroup : C.INDEX_UNSET;
   }
 
-  @Override
-  public long getContentDuration() {
-    return playbackInfo.timeline.isEmpty()
-        ? C.TIME_UNSET
-        : playbackInfo.timeline.getWindow(getCurrentWindowIndex(), window).getDurationMs();
-  }
-
   @Override
   public long getContentPosition() {
     if (isPlayingAd()) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index 7e5feec024..8517556887 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -64,7 +64,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
  * be obtained from {@link ExoPlayerFactory}.
  */
 @TargetApi(16)
-public class SimpleExoPlayer
+public class SimpleExoPlayer extends BasePlayer
     implements ExoPlayer, Player.AudioComponent, Player.VideoComponent, Player.TextComponent {
 
   /** @deprecated Use {@link com.google.android.exoplayer2.video.VideoListener}. */
@@ -927,27 +927,6 @@ public class SimpleExoPlayer
     return player.isLoading();
   }
 
-  @Override
-  public void seekToDefaultPosition() {
-    verifyApplicationThread();
-    analyticsCollector.notifySeekStarted();
-    player.seekToDefaultPosition();
-  }
-
-  @Override
-  public void seekToDefaultPosition(int windowIndex) {
-    verifyApplicationThread();
-    analyticsCollector.notifySeekStarted();
-    player.seekToDefaultPosition(windowIndex);
-  }
-
-  @Override
-  public void seekTo(long positionMs) {
-    verifyApplicationThread();
-    analyticsCollector.notifySeekStarted();
-    player.seekTo(positionMs);
-  }
-
   @Override
   public void seekTo(int windowIndex, long positionMs) {
     verifyApplicationThread();
@@ -955,36 +934,6 @@ public class SimpleExoPlayer
     player.seekTo(windowIndex, positionMs);
   }
 
-  @Override
-  public boolean hasPrevious() {
-    verifyApplicationThread();
-    return getPreviousWindowIndex() != C.INDEX_UNSET;
-  }
-
-  @Override
-  public void previous() {
-    verifyApplicationThread();
-    if (hasPrevious()) {
-      analyticsCollector.notifySeekStarted();
-      player.previous();
-    }
-  }
-
-  @Override
-  public boolean hasNext() {
-    verifyApplicationThread();
-    return getNextWindowIndex() != C.INDEX_UNSET;
-  }
-
-  @Override
-  public void next() {
-    verifyApplicationThread();
-    if (hasNext()) {
-      analyticsCollector.notifySeekStarted();
-      player.next();
-    }
-  }
-
   @Override
   public void setPlaybackParameters(@Nullable PlaybackParameters playbackParameters) {
     verifyApplicationThread();
@@ -1009,17 +958,6 @@ public class SimpleExoPlayer
     return player.getSeekParameters();
   }
 
-  @Override
-  public @Nullable Object getCurrentTag() {
-    verifyApplicationThread();
-    return player.getCurrentTag();
-  }
-
-  @Override
-  public void stop() {
-    stop(/* reset= */ false);
-  }
-
   @Override
   public void stop(boolean reset) {
     verifyApplicationThread();
@@ -1122,18 +1060,6 @@ public class SimpleExoPlayer
     return player.getCurrentWindowIndex();
   }
 
-  @Override
-  public int getNextWindowIndex() {
-    verifyApplicationThread();
-    return player.getNextWindowIndex();
-  }
-
-  @Override
-  public int getPreviousWindowIndex() {
-    verifyApplicationThread();
-    return player.getPreviousWindowIndex();
-  }
-
   @Override
   public long getDuration() {
     verifyApplicationThread();
@@ -1152,30 +1078,12 @@ public class SimpleExoPlayer
     return player.getBufferedPosition();
   }
 
-  @Override
-  public int getBufferedPercentage() {
-    verifyApplicationThread();
-    return player.getBufferedPercentage();
-  }
-
   @Override
   public long getTotalBufferedDuration() {
     verifyApplicationThread();
     return player.getTotalBufferedDuration();
   }
 
-  @Override
-  public boolean isCurrentWindowDynamic() {
-    verifyApplicationThread();
-    return player.isCurrentWindowDynamic();
-  }
-
-  @Override
-  public boolean isCurrentWindowSeekable() {
-    verifyApplicationThread();
-    return player.isCurrentWindowSeekable();
-  }
-
   @Override
   public boolean isPlayingAd() {
     verifyApplicationThread();
@@ -1194,12 +1102,6 @@ public class SimpleExoPlayer
     return player.getCurrentAdIndexInAdGroup();
   }
 
-  @Override
-  public long getContentDuration() {
-    verifyApplicationThread();
-    return player.getContentDuration();
-  }
-
   @Override
   public long getContentPosition() {
     verifyApplicationThread();
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
index 7882c7d16c..156b573df8 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.testutil;
 
 import android.os.Looper;
-import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.BasePlayer;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.PlaybackParameters;
@@ -32,7 +32,7 @@ import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
  * An abstract {@link ExoPlayer} implementation that throws {@link UnsupportedOperationException}
  * from every method.
  */
-public abstract class StubExoPlayer implements ExoPlayer {
+public abstract class StubExoPlayer extends BasePlayer implements ExoPlayer {
 
   @Override
   public AudioComponent getAudioComponent() {
@@ -129,46 +129,11 @@ public abstract class StubExoPlayer implements ExoPlayer {
     throw new UnsupportedOperationException();
   }
 
-  @Override
-  public void seekToDefaultPosition() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void seekToDefaultPosition(int windowIndex) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void seekTo(long positionMs) {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public void seekTo(int windowIndex, long positionMs) {
     throw new UnsupportedOperationException();
   }
 
-  @Override
-  public boolean hasPrevious() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void previous() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public boolean hasNext() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void next() {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public void setPlaybackParameters(PlaybackParameters playbackParameters) {
     throw new UnsupportedOperationException();
@@ -189,16 +154,6 @@ public abstract class StubExoPlayer implements ExoPlayer {
     throw new UnsupportedOperationException();
   }
 
-  @Override
-  public @Nullable Object getCurrentTag() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void stop() {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public void stop(boolean resetStateAndPosition) {
     throw new UnsupportedOperationException();
@@ -268,16 +223,6 @@ public abstract class StubExoPlayer implements ExoPlayer {
     throw new UnsupportedOperationException();
   }
 
-  @Override
-  public int getNextWindowIndex() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public int getPreviousWindowIndex() {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public long getDuration() {
     throw new UnsupportedOperationException();
@@ -293,26 +238,11 @@ public abstract class StubExoPlayer implements ExoPlayer {
     throw new UnsupportedOperationException();
   }
 
-  @Override
-  public int getBufferedPercentage() {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public long getTotalBufferedDuration() {
     throw new UnsupportedOperationException();
   }
 
-  @Override
-  public boolean isCurrentWindowDynamic() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public boolean isCurrentWindowSeekable() {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public boolean isPlayingAd() {
     throw new UnsupportedOperationException();
@@ -328,11 +258,6 @@ public abstract class StubExoPlayer implements ExoPlayer {
     throw new UnsupportedOperationException();
   }
 
-  @Override
-  public long getContentDuration() {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public long getContentPosition() {
     throw new UnsupportedOperationException();

From 34c286682e19d11d7989d94c346eb00b425f78de Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Tue, 2 Oct 2018 08:04:50 -0700
Subject: [PATCH 048/832] Extract PlayerManager interface in the Cast demo app

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215389291
---
 .../DefaultReceiverPlayerManager.java         | 408 ++++++++++++++++++
 .../exoplayer2/castdemo/MainActivity.java     |  23 +-
 .../exoplayer2/castdemo/PlayerManager.java    | 406 ++---------------
 3 files changed, 449 insertions(+), 388 deletions(-)
 create mode 100644 demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java

diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java
new file mode 100644
index 0000000000..f30d3e602f
--- /dev/null
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java
@@ -0,0 +1,408 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.castdemo;
+
+import android.content.Context;
+import android.net.Uri;
+import android.support.annotation.Nullable;
+import android.view.KeyEvent;
+import android.view.View;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.DefaultRenderersFactory;
+import com.google.android.exoplayer2.ExoPlayerFactory;
+import com.google.android.exoplayer2.Player;
+import com.google.android.exoplayer2.Player.DiscontinuityReason;
+import com.google.android.exoplayer2.Player.EventListener;
+import com.google.android.exoplayer2.Player.TimelineChangeReason;
+import com.google.android.exoplayer2.RenderersFactory;
+import com.google.android.exoplayer2.SimpleExoPlayer;
+import com.google.android.exoplayer2.Timeline;
+import com.google.android.exoplayer2.Timeline.Period;
+import com.google.android.exoplayer2.ext.cast.CastPlayer;
+import com.google.android.exoplayer2.ext.cast.MediaItem;
+import com.google.android.exoplayer2.ext.cast.RemotePlayer;
+import com.google.android.exoplayer2.source.ConcatenatingMediaSource;
+import com.google.android.exoplayer2.source.ExtractorMediaSource;
+import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.dash.DashMediaSource;
+import com.google.android.exoplayer2.source.hls.HlsMediaSource;
+import com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
+import com.google.android.exoplayer2.ui.PlayerControlView;
+import com.google.android.exoplayer2.ui.PlayerView;
+import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
+import com.google.android.gms.cast.MediaInfo;
+import com.google.android.gms.cast.MediaMetadata;
+import com.google.android.gms.cast.MediaQueueItem;
+import com.google.android.gms.cast.framework.CastContext;
+import java.util.ArrayList;
+
+/** Manages players and an internal media queue for the ExoPlayer/Cast demo app. */
+/* package */ class DefaultReceiverPlayerManager
+    implements EventListener, RemotePlayer.SessionAvailabilityListener, PlayerManager {
+
+  private static final String USER_AGENT = "ExoCastDemoPlayer";
+  private static final DefaultHttpDataSourceFactory DATA_SOURCE_FACTORY =
+      new DefaultHttpDataSourceFactory(USER_AGENT);
+
+  private final PlayerView localPlayerView;
+  private final PlayerControlView castControlView;
+  private final SimpleExoPlayer exoPlayer;
+  private final CastPlayer castPlayer;
+  private final ArrayList<MediaItem> mediaQueue;
+  private final QueuePositionListener queuePositionListener;
+  private final ConcatenatingMediaSource concatenatingMediaSource;
+
+  private boolean castMediaQueueCreationPending;
+  private int currentItemIndex;
+  private Player currentPlayer;
+
+  /**
+   * @param queuePositionListener A {@link QueuePositionListener} for queue position changes.
+   * @param localPlayerView The {@link PlayerView} for local playback.
+   * @param castControlView The {@link PlayerControlView} to control remote playback.
+   * @param context A {@link Context}.
+   * @param castContext The {@link CastContext}.
+   */
+  public static DefaultReceiverPlayerManager createPlayerManager(
+      QueuePositionListener queuePositionListener,
+      PlayerView localPlayerView,
+      PlayerControlView castControlView,
+      Context context,
+      CastContext castContext) {
+    DefaultReceiverPlayerManager defaultReceiverPlayerManager =
+        new DefaultReceiverPlayerManager(
+            queuePositionListener, localPlayerView, castControlView, context, castContext);
+    defaultReceiverPlayerManager.init();
+    return defaultReceiverPlayerManager;
+  }
+
+  private DefaultReceiverPlayerManager(
+      QueuePositionListener queuePositionListener,
+      PlayerView localPlayerView,
+      PlayerControlView castControlView,
+      Context context,
+      CastContext castContext) {
+    this.queuePositionListener = queuePositionListener;
+    this.localPlayerView = localPlayerView;
+    this.castControlView = castControlView;
+    mediaQueue = new ArrayList<>();
+    currentItemIndex = C.INDEX_UNSET;
+    concatenatingMediaSource = new ConcatenatingMediaSource();
+
+    DefaultTrackSelector trackSelector = new DefaultTrackSelector();
+    RenderersFactory renderersFactory = new DefaultRenderersFactory(context);
+    exoPlayer = ExoPlayerFactory.newSimpleInstance(context, renderersFactory, trackSelector);
+    exoPlayer.addListener(this);
+    localPlayerView.setPlayer(exoPlayer);
+
+    castPlayer = new CastPlayer(castContext);
+    castPlayer.addListener(this);
+    castPlayer.setSessionAvailabilityListener(this);
+    castControlView.setPlayer(castPlayer);
+  }
+
+  // Queue manipulation methods.
+
+  /**
+   * Plays a specified queue item in the current player.
+   *
+   * @param itemIndex The index of the item to play.
+   */
+  public void selectQueueItem(int itemIndex) {
+    setCurrentItem(itemIndex, C.TIME_UNSET, true);
+  }
+
+  /**
+   * Returns the index of the currently played item.
+   */
+  public int getCurrentItemIndex() {
+    return currentItemIndex;
+  }
+
+  /**
+   * Appends {@code item} to the media queue.
+   *
+   * @param item The {@link MediaItem} to append.
+   */
+  public void addItem(MediaItem item) {
+    mediaQueue.add(item);
+    concatenatingMediaSource.addMediaSource(buildMediaSource(item));
+    if (currentPlayer == castPlayer) {
+      castPlayer.addItems(buildMediaQueueItem(item));
+    }
+  }
+
+  /**
+   * Returns the size of the media queue.
+   */
+  public int getMediaQueueSize() {
+    return mediaQueue.size();
+  }
+
+  /**
+   * Returns the item at the given index in the media queue.
+   *
+   * @param position The index of the item.
+   * @return The item at the given index in the media queue.
+   */
+  public MediaItem getItem(int position) {
+    return mediaQueue.get(position);
+  }
+
+  /**
+   * Removes the item at the given index from the media queue.
+   *
+   * @param itemIndex The index of the item to remove.
+   * @return Whether the removal was successful.
+   */
+  public boolean removeItem(int itemIndex) {
+    concatenatingMediaSource.removeMediaSource(itemIndex);
+    if (currentPlayer == castPlayer) {
+      if (castPlayer.getPlaybackState() != Player.STATE_IDLE) {
+        Timeline castTimeline = castPlayer.getCurrentTimeline();
+        if (castTimeline.getPeriodCount() <= itemIndex) {
+          return false;
+        }
+        castPlayer.removeItem((int) castTimeline.getPeriod(itemIndex, new Period()).id);
+      }
+    }
+    mediaQueue.remove(itemIndex);
+    if (itemIndex == currentItemIndex && itemIndex == mediaQueue.size()) {
+      maybeSetCurrentItemAndNotify(C.INDEX_UNSET);
+    } else if (itemIndex < currentItemIndex) {
+      maybeSetCurrentItemAndNotify(currentItemIndex - 1);
+    }
+    return true;
+  }
+
+  /**
+   * Moves an item within the queue.
+   *
+   * @param fromIndex The index of the item to move.
+   * @param toIndex The target index of the item in the queue.
+   * @return Whether the item move was successful.
+   */
+  public boolean moveItem(int fromIndex, int toIndex) {
+    // Player update.
+    concatenatingMediaSource.moveMediaSource(fromIndex, toIndex);
+    if (currentPlayer == castPlayer && castPlayer.getPlaybackState() != Player.STATE_IDLE) {
+      Timeline castTimeline = castPlayer.getCurrentTimeline();
+      int periodCount = castTimeline.getPeriodCount();
+      if (periodCount <= fromIndex || periodCount <= toIndex) {
+        return false;
+      }
+      int elementId = (int) castTimeline.getPeriod(fromIndex, new Period()).id;
+      castPlayer.moveItem(elementId, toIndex);
+    }
+
+    mediaQueue.add(toIndex, mediaQueue.remove(fromIndex));
+
+    // Index update.
+    if (fromIndex == currentItemIndex) {
+      maybeSetCurrentItemAndNotify(toIndex);
+    } else if (fromIndex < currentItemIndex && toIndex >= currentItemIndex) {
+      maybeSetCurrentItemAndNotify(currentItemIndex - 1);
+    } else if (fromIndex > currentItemIndex && toIndex <= currentItemIndex) {
+      maybeSetCurrentItemAndNotify(currentItemIndex + 1);
+    }
+
+    return true;
+  }
+
+  // Miscellaneous methods.
+
+  /**
+   * Dispatches a given {@link KeyEvent} to the corresponding view of the current player.
+   *
+   * @param event The {@link KeyEvent}.
+   * @return Whether the event was handled by the target view.
+   */
+  public boolean dispatchKeyEvent(KeyEvent event) {
+    if (currentPlayer == exoPlayer) {
+      return localPlayerView.dispatchKeyEvent(event);
+    } else /* currentPlayer == castPlayer */ {
+      return castControlView.dispatchKeyEvent(event);
+    }
+  }
+
+  /**
+   * Releases the manager and the players that it holds.
+   */
+  public void release() {
+    currentItemIndex = C.INDEX_UNSET;
+    mediaQueue.clear();
+    concatenatingMediaSource.clear();
+    castPlayer.setSessionAvailabilityListener(null);
+    castPlayer.release();
+    localPlayerView.setPlayer(null);
+    exoPlayer.release();
+  }
+
+  // Player.EventListener implementation.
+
+  @Override
+  public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
+    updateCurrentItemIndex();
+  }
+
+  @Override
+  public void onPositionDiscontinuity(@DiscontinuityReason int reason) {
+    updateCurrentItemIndex();
+  }
+
+  @Override
+  public void onTimelineChanged(
+      Timeline timeline, @Nullable Object manifest, @TimelineChangeReason int reason) {
+    updateCurrentItemIndex();
+    if (timeline.isEmpty()) {
+      castMediaQueueCreationPending = true;
+    }
+  }
+
+  // CastPlayer.SessionAvailabilityListener implementation.
+
+  @Override
+  public void onCastSessionAvailable() {
+    setCurrentPlayer(castPlayer);
+  }
+
+  @Override
+  public void onCastSessionUnavailable() {
+    setCurrentPlayer(exoPlayer);
+  }
+
+  // Internal methods.
+
+  private void init() {
+    setCurrentPlayer(castPlayer.isCastSessionAvailable() ? castPlayer : exoPlayer);
+  }
+
+  private void updateCurrentItemIndex() {
+    int playbackState = currentPlayer.getPlaybackState();
+    maybeSetCurrentItemAndNotify(
+        playbackState != Player.STATE_IDLE && playbackState != Player.STATE_ENDED
+        ? currentPlayer.getCurrentWindowIndex() : C.INDEX_UNSET);
+  }
+
+  private void setCurrentPlayer(Player currentPlayer) {
+    if (this.currentPlayer == currentPlayer) {
+      return;
+    }
+
+    // View management.
+    if (currentPlayer == exoPlayer) {
+      localPlayerView.setVisibility(View.VISIBLE);
+      castControlView.hide();
+    } else /* currentPlayer == castPlayer */ {
+      localPlayerView.setVisibility(View.GONE);
+      castControlView.show();
+    }
+
+    // Player state management.
+    long playbackPositionMs = C.TIME_UNSET;
+    int windowIndex = C.INDEX_UNSET;
+    boolean playWhenReady = false;
+    if (this.currentPlayer != null) {
+      int playbackState = this.currentPlayer.getPlaybackState();
+      if (playbackState != Player.STATE_ENDED) {
+        playbackPositionMs = this.currentPlayer.getCurrentPosition();
+        playWhenReady = this.currentPlayer.getPlayWhenReady();
+        windowIndex = this.currentPlayer.getCurrentWindowIndex();
+        if (windowIndex != currentItemIndex) {
+          playbackPositionMs = C.TIME_UNSET;
+          windowIndex = currentItemIndex;
+        }
+      }
+      this.currentPlayer.stop(true);
+    } else {
+      // This is the initial setup. No need to save any state.
+    }
+
+    this.currentPlayer = currentPlayer;
+
+    // Media queue management.
+    castMediaQueueCreationPending = currentPlayer == castPlayer;
+    if (currentPlayer == exoPlayer) {
+      exoPlayer.prepare(concatenatingMediaSource);
+    }
+
+    // Playback transition.
+    if (windowIndex != C.INDEX_UNSET) {
+      setCurrentItem(windowIndex, playbackPositionMs, playWhenReady);
+    }
+  }
+
+  /**
+   * Starts playback of the item at the given position.
+   *
+   * @param itemIndex The index of the item to play.
+   * @param positionMs The position at which playback should start.
+   * @param playWhenReady Whether the player should proceed when ready to do so.
+   */
+  private void setCurrentItem(int itemIndex, long positionMs, boolean playWhenReady) {
+    maybeSetCurrentItemAndNotify(itemIndex);
+    if (castMediaQueueCreationPending) {
+      MediaQueueItem[] items = new MediaQueueItem[mediaQueue.size()];
+      for (int i = 0; i < items.length; i++) {
+        items[i] = buildMediaQueueItem(mediaQueue.get(i));
+      }
+      castMediaQueueCreationPending = false;
+      castPlayer.loadItems(items, itemIndex, positionMs, Player.REPEAT_MODE_OFF);
+    } else {
+      currentPlayer.seekTo(itemIndex, positionMs);
+      currentPlayer.setPlayWhenReady(playWhenReady);
+    }
+  }
+
+  private void maybeSetCurrentItemAndNotify(int currentItemIndex) {
+    if (this.currentItemIndex != currentItemIndex) {
+      int oldIndex = this.currentItemIndex;
+      this.currentItemIndex = currentItemIndex;
+      queuePositionListener.onQueuePositionChanged(oldIndex, currentItemIndex);
+    }
+  }
+
+  private static MediaSource buildMediaSource(MediaItem item) {
+    Uri uri = item.media.uri;
+    switch (item.mimeType) {
+      case DemoUtil.MIME_TYPE_SS:
+        return new SsMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
+      case DemoUtil.MIME_TYPE_DASH:
+        return new DashMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
+      case DemoUtil.MIME_TYPE_HLS:
+        return new HlsMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
+      case DemoUtil.MIME_TYPE_VIDEO_MP4:
+        return new ExtractorMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
+      default: {
+          throw new IllegalStateException("Unsupported type: " + item.mimeType);
+      }
+    }
+  }
+
+  private static MediaQueueItem buildMediaQueueItem(MediaItem item) {
+    MediaMetadata movieMetadata = new MediaMetadata(MediaMetadata.MEDIA_TYPE_MOVIE);
+    movieMetadata.putString(MediaMetadata.KEY_TITLE, item.title);
+    MediaInfo mediaInfo =
+        new MediaInfo.Builder(item.media.uri.toString())
+            .setStreamType(MediaInfo.STREAM_TYPE_BUFFERED)
+            .setContentType(item.mimeType)
+            .setMetadata(movieMetadata)
+            .build();
+    return new MediaQueueItem.Builder(mediaInfo).build();
+  }
+
+}
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
index 44305afb5b..8ebfee1294 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
@@ -39,6 +39,7 @@ import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.ext.cast.MediaItem;
 import com.google.android.exoplayer2.ui.PlayerControlView;
 import com.google.android.exoplayer2.ui.PlayerView;
+import com.google.android.gms.cast.CastMediaControlIntent;
 import com.google.android.gms.cast.framework.CastButtonFactory;
 import com.google.android.gms.cast.framework.CastContext;
 
@@ -92,13 +93,20 @@ public class MainActivity extends AppCompatActivity
   @Override
   public void onResume() {
     super.onResume();
-    playerManager =
-        PlayerManager.createPlayerManager(
-            /* queuePositionListener= */ this,
-            localPlayerView,
-            castControlView,
-            /* context= */ this,
-            castContext);
+    String applicationId = castContext.getCastOptions().getReceiverApplicationId();
+    switch (applicationId) {
+      case CastMediaControlIntent.DEFAULT_MEDIA_RECEIVER_APPLICATION_ID:
+        playerManager =
+            DefaultReceiverPlayerManager.createPlayerManager(
+                /* queuePositionListener= */ this,
+                localPlayerView,
+                castControlView,
+                /* context= */ this,
+                castContext);
+        break;
+      default:
+        throw new IllegalStateException("Illegal receiver app id: " + applicationId);
+    }
     mediaQueueList.setAdapter(mediaQueueListAdapter);
   }
 
@@ -108,6 +116,7 @@ public class MainActivity extends AppCompatActivity
     mediaQueueListAdapter.notifyItemRangeRemoved(0, mediaQueueListAdapter.getItemCount());
     mediaQueueList.setAdapter(null);
     playerManager.release();
+    playerManager = null;
   }
 
   // Activity input.
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
index eb4808d1ed..c56f0eb855 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 The Android Open Source Project
+ * Copyright (C) 2018 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,49 +15,15 @@
  */
 package com.google.android.exoplayer2.castdemo;
 
-import android.content.Context;
-import android.net.Uri;
-import android.support.annotation.Nullable;
 import android.view.KeyEvent;
-import android.view.View;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.DefaultRenderersFactory;
-import com.google.android.exoplayer2.ExoPlayerFactory;
-import com.google.android.exoplayer2.Player;
-import com.google.android.exoplayer2.Player.DiscontinuityReason;
-import com.google.android.exoplayer2.Player.EventListener;
-import com.google.android.exoplayer2.Player.TimelineChangeReason;
-import com.google.android.exoplayer2.RenderersFactory;
-import com.google.android.exoplayer2.SimpleExoPlayer;
-import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.Timeline.Period;
-import com.google.android.exoplayer2.ext.cast.CastPlayer;
 import com.google.android.exoplayer2.ext.cast.MediaItem;
-import com.google.android.exoplayer2.ext.cast.RemotePlayer;
-import com.google.android.exoplayer2.source.ConcatenatingMediaSource;
-import com.google.android.exoplayer2.source.ExtractorMediaSource;
-import com.google.android.exoplayer2.source.MediaSource;
-import com.google.android.exoplayer2.source.dash.DashMediaSource;
-import com.google.android.exoplayer2.source.hls.HlsMediaSource;
-import com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource;
-import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
-import com.google.android.exoplayer2.ui.PlayerControlView;
-import com.google.android.exoplayer2.ui.PlayerView;
-import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
-import com.google.android.gms.cast.MediaInfo;
-import com.google.android.gms.cast.MediaMetadata;
-import com.google.android.gms.cast.MediaQueueItem;
-import com.google.android.gms.cast.framework.CastContext;
-import java.util.ArrayList;
 
-/** Manages players and an internal media queue for the ExoPlayer/Cast demo app. */
-/* package */ final class PlayerManager
-    implements EventListener, RemotePlayer.SessionAvailabilityListener {
+/** Manages the players in the Cast demo app. */
+interface PlayerManager {
 
-  /**
-   * Listener for changes in the media queue playback position.
-   */
-  public interface QueuePositionListener {
+  /** Listener for changes in the media queue playback position. */
+  interface QueuePositionListener {
 
     /**
      * Called when the currently played item of the media queue changes.
@@ -66,355 +32,33 @@ import java.util.ArrayList;
 
   }
 
-  private static final String USER_AGENT = "ExoCastDemoPlayer";
-  private static final DefaultHttpDataSourceFactory DATA_SOURCE_FACTORY =
-      new DefaultHttpDataSourceFactory(USER_AGENT);
+  /** Redirects the given {@code keyEvent} to the active player. */
+  boolean dispatchKeyEvent(KeyEvent keyEvent);
 
-  private final PlayerView localPlayerView;
-  private final PlayerControlView castControlView;
-  private final SimpleExoPlayer exoPlayer;
-  private final CastPlayer castPlayer;
-  private final ArrayList<MediaItem> mediaQueue;
-  private final QueuePositionListener queuePositionListener;
-  private final ConcatenatingMediaSource concatenatingMediaSource;
+  /** Appends the given {@link MediaItem} to the media queue. */
+  void addItem(MediaItem mediaItem);
 
-  private boolean castMediaQueueCreationPending;
-  private int currentItemIndex;
-  private Player currentPlayer;
+  /** Returns the number of items in the media queue. */
+  int getMediaQueueSize();
+
+  /** Selects the item at the given position for playback. */
+  void selectQueueItem(int position);
 
   /**
-   * @param queuePositionListener A {@link QueuePositionListener} for queue position changes.
-   * @param localPlayerView The {@link PlayerView} for local playback.
-   * @param castControlView The {@link PlayerControlView} to control remote playback.
-   * @param context A {@link Context}.
-   * @param castContext The {@link CastContext}.
+   * Returns the position of the item currently being played, or {@link C#INDEX_UNSET} if no item is
+   * being played.
    */
-  public static PlayerManager createPlayerManager(
-      QueuePositionListener queuePositionListener,
-      PlayerView localPlayerView,
-      PlayerControlView castControlView,
-      Context context,
-      CastContext castContext) {
-    PlayerManager playerManager =
-        new PlayerManager(
-            queuePositionListener, localPlayerView, castControlView, context, castContext);
-    playerManager.init();
-    return playerManager;
-  }
+  int getCurrentItemIndex();
 
-  private PlayerManager(
-      QueuePositionListener queuePositionListener,
-      PlayerView localPlayerView,
-      PlayerControlView castControlView,
-      Context context,
-      CastContext castContext) {
-    this.queuePositionListener = queuePositionListener;
-    this.localPlayerView = localPlayerView;
-    this.castControlView = castControlView;
-    mediaQueue = new ArrayList<>();
-    currentItemIndex = C.INDEX_UNSET;
-    concatenatingMediaSource = new ConcatenatingMediaSource();
+  /** Returns the {@link MediaItem} at the given {@code position}. */
+  MediaItem getItem(int position);
 
-    DefaultTrackSelector trackSelector = new DefaultTrackSelector();
-    RenderersFactory renderersFactory = new DefaultRenderersFactory(context);
-    exoPlayer = ExoPlayerFactory.newSimpleInstance(context, renderersFactory, trackSelector);
-    exoPlayer.addListener(this);
-    localPlayerView.setPlayer(exoPlayer);
+  /** Moves the item at position {@code from} to position {@code to}. */
+  boolean moveItem(int from, int to);
 
-    castPlayer = new CastPlayer(castContext);
-    castPlayer.addListener(this);
-    castPlayer.setSessionAvailabilityListener(this);
-    castControlView.setPlayer(castPlayer);
-  }
-
-  // Queue manipulation methods.
-
-  /**
-   * Plays a specified queue item in the current player.
-   *
-   * @param itemIndex The index of the item to play.
-   */
-  public void selectQueueItem(int itemIndex) {
-    setCurrentItem(itemIndex, C.TIME_UNSET, true);
-  }
-
-  /**
-   * Returns the index of the currently played item.
-   */
-  public int getCurrentItemIndex() {
-    return currentItemIndex;
-  }
-
-  /**
-   * Appends {@code item} to the media queue.
-   *
-   * @param item The {@link MediaItem} to append.
-   */
-  public void addItem(MediaItem item) {
-    mediaQueue.add(item);
-    concatenatingMediaSource.addMediaSource(buildMediaSource(item));
-    if (currentPlayer == castPlayer) {
-      castPlayer.addItems(buildMediaQueueItem(item));
-    }
-  }
-
-  /**
-   * Returns the size of the media queue.
-   */
-  public int getMediaQueueSize() {
-    return mediaQueue.size();
-  }
-
-  /**
-   * Returns the item at the given index in the media queue.
-   *
-   * @param position The index of the item.
-   * @return The item at the given index in the media queue.
-   */
-  public MediaItem getItem(int position) {
-    return mediaQueue.get(position);
-  }
-
-  /**
-   * Removes the item at the given index from the media queue.
-   *
-   * @param itemIndex The index of the item to remove.
-   * @return Whether the removal was successful.
-   */
-  public boolean removeItem(int itemIndex) {
-    concatenatingMediaSource.removeMediaSource(itemIndex);
-    if (currentPlayer == castPlayer) {
-      if (castPlayer.getPlaybackState() != Player.STATE_IDLE) {
-        Timeline castTimeline = castPlayer.getCurrentTimeline();
-        if (castTimeline.getPeriodCount() <= itemIndex) {
-          return false;
-        }
-        castPlayer.removeItem((int) castTimeline.getPeriod(itemIndex, new Period()).id);
-      }
-    }
-    mediaQueue.remove(itemIndex);
-    if (itemIndex == currentItemIndex && itemIndex == mediaQueue.size()) {
-      maybeSetCurrentItemAndNotify(C.INDEX_UNSET);
-    } else if (itemIndex < currentItemIndex) {
-      maybeSetCurrentItemAndNotify(currentItemIndex - 1);
-    }
-    return true;
-  }
-
-  /**
-   * Moves an item within the queue.
-   *
-   * @param fromIndex The index of the item to move.
-   * @param toIndex The target index of the item in the queue.
-   * @return Whether the item move was successful.
-   */
-  public boolean moveItem(int fromIndex, int toIndex) {
-    // Player update.
-    concatenatingMediaSource.moveMediaSource(fromIndex, toIndex);
-    if (currentPlayer == castPlayer && castPlayer.getPlaybackState() != Player.STATE_IDLE) {
-      Timeline castTimeline = castPlayer.getCurrentTimeline();
-      int periodCount = castTimeline.getPeriodCount();
-      if (periodCount <= fromIndex || periodCount <= toIndex) {
-        return false;
-      }
-      int elementId = (int) castTimeline.getPeriod(fromIndex, new Period()).id;
-      castPlayer.moveItem(elementId, toIndex);
-    }
-
-    mediaQueue.add(toIndex, mediaQueue.remove(fromIndex));
-
-    // Index update.
-    if (fromIndex == currentItemIndex) {
-      maybeSetCurrentItemAndNotify(toIndex);
-    } else if (fromIndex < currentItemIndex && toIndex >= currentItemIndex) {
-      maybeSetCurrentItemAndNotify(currentItemIndex - 1);
-    } else if (fromIndex > currentItemIndex && toIndex <= currentItemIndex) {
-      maybeSetCurrentItemAndNotify(currentItemIndex + 1);
-    }
-
-    return true;
-  }
-
-  // Miscellaneous methods.
-
-  /**
-   * Dispatches a given {@link KeyEvent} to the corresponding view of the current player.
-   *
-   * @param event The {@link KeyEvent}.
-   * @return Whether the event was handled by the target view.
-   */
-  public boolean dispatchKeyEvent(KeyEvent event) {
-    if (currentPlayer == exoPlayer) {
-      return localPlayerView.dispatchKeyEvent(event);
-    } else /* currentPlayer == castPlayer */ {
-      return castControlView.dispatchKeyEvent(event);
-    }
-  }
-
-  /**
-   * Releases the manager and the players that it holds.
-   */
-  public void release() {
-    currentItemIndex = C.INDEX_UNSET;
-    mediaQueue.clear();
-    concatenatingMediaSource.clear();
-    castPlayer.setSessionAvailabilityListener(null);
-    castPlayer.release();
-    localPlayerView.setPlayer(null);
-    exoPlayer.release();
-  }
-
-  // Player.EventListener implementation.
-
-  @Override
-  public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
-    updateCurrentItemIndex();
-  }
-
-  @Override
-  public void onPositionDiscontinuity(@DiscontinuityReason int reason) {
-    updateCurrentItemIndex();
-  }
-
-  @Override
-  public void onTimelineChanged(
-      Timeline timeline, @Nullable Object manifest, @TimelineChangeReason int reason) {
-    updateCurrentItemIndex();
-    if (timeline.isEmpty()) {
-      castMediaQueueCreationPending = true;
-    }
-  }
-
-  // CastPlayer.SessionAvailabilityListener implementation.
-
-  @Override
-  public void onCastSessionAvailable() {
-    setCurrentPlayer(castPlayer);
-  }
-
-  @Override
-  public void onCastSessionUnavailable() {
-    setCurrentPlayer(exoPlayer);
-  }
-
-  // Internal methods.
-
-  private void init() {
-    setCurrentPlayer(castPlayer.isCastSessionAvailable() ? castPlayer : exoPlayer);
-  }
-
-  private void updateCurrentItemIndex() {
-    int playbackState = currentPlayer.getPlaybackState();
-    maybeSetCurrentItemAndNotify(
-        playbackState != Player.STATE_IDLE && playbackState != Player.STATE_ENDED
-        ? currentPlayer.getCurrentWindowIndex() : C.INDEX_UNSET);
-  }
-
-  private void setCurrentPlayer(Player currentPlayer) {
-    if (this.currentPlayer == currentPlayer) {
-      return;
-    }
-
-    // View management.
-    if (currentPlayer == exoPlayer) {
-      localPlayerView.setVisibility(View.VISIBLE);
-      castControlView.hide();
-    } else /* currentPlayer == castPlayer */ {
-      localPlayerView.setVisibility(View.GONE);
-      castControlView.show();
-    }
-
-    // Player state management.
-    long playbackPositionMs = C.TIME_UNSET;
-    int windowIndex = C.INDEX_UNSET;
-    boolean playWhenReady = false;
-    if (this.currentPlayer != null) {
-      int playbackState = this.currentPlayer.getPlaybackState();
-      if (playbackState != Player.STATE_ENDED) {
-        playbackPositionMs = this.currentPlayer.getCurrentPosition();
-        playWhenReady = this.currentPlayer.getPlayWhenReady();
-        windowIndex = this.currentPlayer.getCurrentWindowIndex();
-        if (windowIndex != currentItemIndex) {
-          playbackPositionMs = C.TIME_UNSET;
-          windowIndex = currentItemIndex;
-        }
-      }
-      this.currentPlayer.stop(true);
-    } else {
-      // This is the initial setup. No need to save any state.
-    }
-
-    this.currentPlayer = currentPlayer;
-
-    // Media queue management.
-    castMediaQueueCreationPending = currentPlayer == castPlayer;
-    if (currentPlayer == exoPlayer) {
-      exoPlayer.prepare(concatenatingMediaSource);
-    }
-
-    // Playback transition.
-    if (windowIndex != C.INDEX_UNSET) {
-      setCurrentItem(windowIndex, playbackPositionMs, playWhenReady);
-    }
-  }
-
-  /**
-   * Starts playback of the item at the given position.
-   *
-   * @param itemIndex The index of the item to play.
-   * @param positionMs The position at which playback should start.
-   * @param playWhenReady Whether the player should proceed when ready to do so.
-   */
-  private void setCurrentItem(int itemIndex, long positionMs, boolean playWhenReady) {
-    maybeSetCurrentItemAndNotify(itemIndex);
-    if (castMediaQueueCreationPending) {
-      MediaQueueItem[] items = new MediaQueueItem[mediaQueue.size()];
-      for (int i = 0; i < items.length; i++) {
-        items[i] = buildMediaQueueItem(mediaQueue.get(i));
-      }
-      castMediaQueueCreationPending = false;
-      castPlayer.loadItems(items, itemIndex, positionMs, Player.REPEAT_MODE_OFF);
-    } else {
-      currentPlayer.seekTo(itemIndex, positionMs);
-      currentPlayer.setPlayWhenReady(playWhenReady);
-    }
-  }
-
-  private void maybeSetCurrentItemAndNotify(int currentItemIndex) {
-    if (this.currentItemIndex != currentItemIndex) {
-      int oldIndex = this.currentItemIndex;
-      this.currentItemIndex = currentItemIndex;
-      queuePositionListener.onQueuePositionChanged(oldIndex, currentItemIndex);
-    }
-  }
-
-  private static MediaSource buildMediaSource(MediaItem item) {
-    Uri uri = item.media.uri;
-    switch (item.mimeType) {
-      case DemoUtil.MIME_TYPE_SS:
-        return new SsMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
-      case DemoUtil.MIME_TYPE_DASH:
-        return new DashMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
-      case DemoUtil.MIME_TYPE_HLS:
-        return new HlsMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
-      case DemoUtil.MIME_TYPE_VIDEO_MP4:
-        return new ExtractorMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
-      default: {
-          throw new IllegalStateException("Unsupported type: " + item.mimeType);
-      }
-    }
-  }
-
-  private static MediaQueueItem buildMediaQueueItem(MediaItem item) {
-    MediaMetadata movieMetadata = new MediaMetadata(MediaMetadata.MEDIA_TYPE_MOVIE);
-    movieMetadata.putString(MediaMetadata.KEY_TITLE, item.title);
-    MediaInfo mediaInfo =
-        new MediaInfo.Builder(item.media.uri.toString())
-            .setStreamType(MediaInfo.STREAM_TYPE_BUFFERED)
-            .setContentType(item.mimeType)
-            .setMetadata(movieMetadata)
-            .build();
-    return new MediaQueueItem.Builder(mediaInfo).build();
-  }
+  /** Removes the item at position {@code index}. */
+  boolean removeItem(int index);
 
+  /** Releases any acquired resources. */
+  void release();
 }

From 4386d5d4660d26965f99de1b6247dff7f2215c11 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 2 Oct 2018 09:41:59 -0700
Subject: [PATCH 049/832] Replace DefaultBandwidthMeter with
 CountryAndNetworkTypeBandwidthMeter.

This removes the experimental bandwidth meter and uses it as the new default.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215404065
---
 RELEASENOTES.md                               |   2 +
 .../CountryAndNetworkTypeBandwidthMeter.java  | 592 ------------------
 .../upstream/DefaultBandwidthMeter.java       | 376 ++++++++++-
 ...st.java => DefaultBandwidthMeterTest.java} | 181 +++---
 4 files changed, 453 insertions(+), 698 deletions(-)
 delete mode 100644 library/core/src/main/java/com/google/android/exoplayer2/upstream/CountryAndNetworkTypeBandwidthMeter.java
 rename library/core/src/test/java/com/google/android/exoplayer2/upstream/{CountryAndNetworkTypeBandwidthMeterTest.java => DefaultBandwidthMeterTest.java} (69%)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index adfec3dacc..2e42b9a709 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,6 +2,8 @@
 
 ### dev-v2 (not yet released) ###
 
+* Improve initial bandwidth meter estimates using the current country and
+  network type.
 * Do not retry failed loads whose error is `FileNotFoundException`.
 * Add convenience methods `Player.next`, `Player.previous`, `Player.hasNext`
   and `Player.hasPrevious`
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/CountryAndNetworkTypeBandwidthMeter.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/CountryAndNetworkTypeBandwidthMeter.java
deleted file mode 100644
index 7dce8a5049..0000000000
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/CountryAndNetworkTypeBandwidthMeter.java
+++ /dev/null
@@ -1,592 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.upstream;
-
-import android.content.Context;
-import android.os.Handler;
-import android.support.annotation.Nullable;
-import android.util.SparseArray;
-import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.util.Assertions;
-import com.google.android.exoplayer2.util.Clock;
-import com.google.android.exoplayer2.util.ClosedSource;
-import com.google.android.exoplayer2.util.EventDispatcher;
-import com.google.android.exoplayer2.util.SlidingPercentile;
-import com.google.android.exoplayer2.util.Util;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Estimates bandwidth by listening to data transfers.
- *
- * <p>The bandwidth estimate is calculated using a {@link SlidingPercentile} and is updated each
- * time a transfer ends. The initial estimate is based on the current operator's network country
- * code or the locale of the user, as well as the network connection type. This can be configured in
- * the {@link Builder}.
- */
-@ClosedSource(reason = "Needs testing")
-public final class CountryAndNetworkTypeBandwidthMeter implements BandwidthMeter, TransferListener {
-
-  /**
-   * Country groups used to determine the default initial bitrate estimate. The group assignment for
-   * each country is an array of group indices for [Wifi, 2G, 3G, 4G].
-   */
-  public static final Map<String, int[]> DEFAULT_INITIAL_BITRATE_COUNTRY_GROUPS =
-      createInitialBitrateCountryGroupAssignment();
-
-  /** Default initial Wifi bitrate estimate in bits per second. */
-  public static final long[] DEFAULT_INITIAL_BITRATE_ESTIMATES_WIFI =
-      new long[] {5_700_000, 3_400_000, 1_900_000, 1_000_000, 400_000};
-
-  /** Default initial 2G bitrate estimates in bits per second. */
-  public static final long[] DEFAULT_INITIAL_BITRATE_ESTIMATES_2G =
-      new long[] {169_000, 129_000, 114_000, 102_000, 87_000};
-
-  /** Default initial 3G bitrate estimates in bits per second. */
-  public static final long[] DEFAULT_INITIAL_BITRATE_ESTIMATES_3G =
-      new long[] {2_100_000, 1_300_000, 950_000, 700_000, 400_000};
-
-  /** Default initial 4G bitrate estimates in bits per second. */
-  public static final long[] DEFAULT_INITIAL_BITRATE_ESTIMATES_4G =
-      new long[] {6_900_000, 4_300_000, 2_700_000, 1_600_000, 450_000};
-
-  /**
-   * Default initial bitrate estimate used when the device is offline or the network type cannot be
-   * determined, in bits per second.
-   */
-  public static final long DEFAULT_INITIAL_BITRATE_ESTIMATE = 1_000_000;
-
-  /** Default maximum weight for the sliding window. */
-  public static final int DEFAULT_SLIDING_WINDOW_MAX_WEIGHT = 2000;
-
-  /** Builder for a bandwidth meter. */
-  public static final class Builder {
-
-    private final @Nullable Context context;
-
-    private @Nullable Handler eventHandler;
-    private @Nullable EventListener eventListener;
-    private SparseArray<Long> initialBitrateEstimates;
-    private int slidingWindowMaxWeight;
-    private Clock clock;
-
-    /** @deprecated Use {@link #Builder(Context)} instead. */
-    @Deprecated
-    public Builder() {
-      this(/* context= */ null);
-    }
-
-    /**
-     * Creates a builder with default parameters and without listener.
-     *
-     * @param context A context.
-     */
-    public Builder(@Nullable Context context) {
-      this.context = context == null ? null : context.getApplicationContext();
-      initialBitrateEstimates = getInitialBitrateEstimatesForCountry(Util.getCountryCode(context));
-      slidingWindowMaxWeight = DEFAULT_SLIDING_WINDOW_MAX_WEIGHT;
-      clock = Clock.DEFAULT;
-    }
-
-    /**
-     * Sets an event listener for new bandwidth estimates.
-     *
-     * @param eventHandler A handler for events.
-     * @param eventListener A listener of events.
-     * @return This builder.
-     * @throws IllegalArgumentException If the event handler or listener are null.
-     */
-    public Builder setEventListener(Handler eventHandler, EventListener eventListener) {
-      Assertions.checkArgument(eventHandler != null && eventListener != null);
-      this.eventHandler = eventHandler;
-      this.eventListener = eventListener;
-      return this;
-    }
-
-    /**
-     * Sets the maximum weight for the sliding window.
-     *
-     * @param slidingWindowMaxWeight The maximum weight for the sliding window.
-     * @return This builder.
-     */
-    public Builder setSlidingWindowMaxWeight(int slidingWindowMaxWeight) {
-      this.slidingWindowMaxWeight = slidingWindowMaxWeight;
-      return this;
-    }
-
-    /**
-     * Sets the initial bitrate estimate in bits per second that should be assumed when a bandwidth
-     * estimate is unavailable.
-     *
-     * @param initialBitrateEstimate The initial bitrate estimate in bits per second.
-     * @return This builder.
-     */
-    public Builder setInitialBitrateEstimate(long initialBitrateEstimate) {
-      for (int i = 0; i < initialBitrateEstimates.size(); i++) {
-        initialBitrateEstimates.setValueAt(i, initialBitrateEstimate);
-      }
-      return this;
-    }
-
-    /**
-     * Sets the initial bitrate estimate in bits per second for a network type that should be
-     * assumed when a bandwidth estimate is unavailable and the current network connection is of the
-     * specified type.
-     *
-     * @param networkType The {@link C.NetworkType} this initial estimate is for.
-     * @param initialBitrateEstimate The initial bitrate estimate in bits per second.
-     * @return This builder.
-     */
-    public Builder setInitialBitrateEstimate(
-        @C.NetworkType int networkType, long initialBitrateEstimate) {
-      initialBitrateEstimates.put(networkType, initialBitrateEstimate);
-      return this;
-    }
-
-    /**
-     * Sets the initial bitrate estimates to the default values of the specified country. The
-     * initial estimates are used when a bandwidth estimate is unavailable.
-     *
-     * @param countryCode The ISO 3166-1 alpha-2 country code of the country whose default bitrate
-     *     estimates should be used.
-     * @return This builder.
-     */
-    public Builder setInitialBitrateEstimate(String countryCode) {
-      initialBitrateEstimates =
-          getInitialBitrateEstimatesForCountry(Util.toUpperInvariant(countryCode));
-      return this;
-    }
-
-    /**
-     * Sets the clock used to estimate bandwidth from data transfers. Should only be set for testing
-     * purposes.
-     *
-     * @param clock The clock used to estimate bandwidth from data transfers.
-     * @return This builder.
-     */
-    public Builder setClock(Clock clock) {
-      this.clock = clock;
-      return this;
-    }
-
-    /**
-     * Builds the bandwidth meter.
-     *
-     * @return A bandwidth meter with the configured properties.
-     */
-    public CountryAndNetworkTypeBandwidthMeter build() {
-      Long initialBitrateEstimate = initialBitrateEstimates.get(Util.getNetworkType(context));
-      if (initialBitrateEstimate == null) {
-        initialBitrateEstimate = initialBitrateEstimates.get(C.NETWORK_TYPE_UNKNOWN);
-      }
-      CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
-          new CountryAndNetworkTypeBandwidthMeter(
-              initialBitrateEstimate, slidingWindowMaxWeight, clock);
-      if (eventHandler != null && eventListener != null) {
-        bandwidthMeter.addEventListener(eventHandler, eventListener);
-      }
-      return bandwidthMeter;
-    }
-
-    private static SparseArray<Long> getInitialBitrateEstimatesForCountry(String countryCode) {
-      int[] groupIndices = getCountryGroupIndices(countryCode);
-      SparseArray<Long> result = new SparseArray<>(/* initialCapacity= */ 6);
-      result.append(C.NETWORK_TYPE_UNKNOWN, DEFAULT_INITIAL_BITRATE_ESTIMATE);
-      result.append(C.NETWORK_TYPE_WIFI, DEFAULT_INITIAL_BITRATE_ESTIMATES_WIFI[groupIndices[0]]);
-      result.append(C.NETWORK_TYPE_2G, DEFAULT_INITIAL_BITRATE_ESTIMATES_2G[groupIndices[1]]);
-      result.append(C.NETWORK_TYPE_3G, DEFAULT_INITIAL_BITRATE_ESTIMATES_3G[groupIndices[2]]);
-      result.append(C.NETWORK_TYPE_4G, DEFAULT_INITIAL_BITRATE_ESTIMATES_4G[groupIndices[3]]);
-      // Assume default Wifi bitrate for Ethernet to prevent using the slower fallback bitrate.
-      result.append(
-          C.NETWORK_TYPE_ETHERNET, DEFAULT_INITIAL_BITRATE_ESTIMATES_WIFI[groupIndices[0]]);
-      return result;
-    }
-
-    private static int[] getCountryGroupIndices(String countryCode) {
-      int[] groupIndices = DEFAULT_INITIAL_BITRATE_COUNTRY_GROUPS.get(countryCode);
-      // Assume median group if not found.
-      return groupIndices == null ? new int[] {2, 2, 2, 2} : groupIndices;
-    }
-  }
-
-  private static final int ELAPSED_MILLIS_FOR_ESTIMATE = 2000;
-  private static final int BYTES_TRANSFERRED_FOR_ESTIMATE = 512 * 1024;
-
-  private final EventDispatcher<EventListener> eventDispatcher;
-  private final SlidingPercentile slidingPercentile;
-  private final Clock clock;
-
-  private int streamCount;
-  private long sampleStartTimeMs;
-  private long sampleBytesTransferred;
-
-  private long totalElapsedTimeMs;
-  private long totalBytesTransferred;
-  private long bitrateEstimate;
-
-  /** Creates a bandwidth meter with default parameters. */
-  public CountryAndNetworkTypeBandwidthMeter() {
-    this(DEFAULT_INITIAL_BITRATE_ESTIMATE, DEFAULT_SLIDING_WINDOW_MAX_WEIGHT, Clock.DEFAULT);
-  }
-
-  /** @deprecated Use {@link Builder} instead. */
-  @Deprecated
-  public CountryAndNetworkTypeBandwidthMeter(Handler eventHandler, EventListener eventListener) {
-    this(DEFAULT_INITIAL_BITRATE_ESTIMATE, DEFAULT_SLIDING_WINDOW_MAX_WEIGHT, Clock.DEFAULT);
-    if (eventHandler != null && eventListener != null) {
-      addEventListener(eventHandler, eventListener);
-    }
-  }
-
-  /** @deprecated Use {@link Builder} instead. */
-  @Deprecated
-  public CountryAndNetworkTypeBandwidthMeter(
-      Handler eventHandler, EventListener eventListener, int maxWeight) {
-    this(DEFAULT_INITIAL_BITRATE_ESTIMATE, maxWeight, Clock.DEFAULT);
-    if (eventHandler != null && eventListener != null) {
-      addEventListener(eventHandler, eventListener);
-    }
-  }
-
-  private CountryAndNetworkTypeBandwidthMeter(
-      long initialBitrateEstimate, int maxWeight, Clock clock) {
-    this.eventDispatcher = new EventDispatcher<>();
-    this.slidingPercentile = new SlidingPercentile(maxWeight);
-    this.clock = clock;
-    bitrateEstimate = initialBitrateEstimate;
-  }
-
-  @Override
-  public synchronized long getBitrateEstimate() {
-    return bitrateEstimate;
-  }
-
-  @Override
-  public @Nullable TransferListener getTransferListener() {
-    return this;
-  }
-
-  @Override
-  public void addEventListener(Handler eventHandler, EventListener eventListener) {
-    eventDispatcher.addListener(eventHandler, eventListener);
-  }
-
-  @Override
-  public void removeEventListener(EventListener eventListener) {
-    eventDispatcher.removeListener(eventListener);
-  }
-
-  @Override
-  public void onTransferInitializing(DataSource source, DataSpec dataSpec, boolean isNetwork) {
-    // Do nothing.
-  }
-
-  @Override
-  public synchronized void onTransferStart(
-      DataSource source, DataSpec dataSpec, boolean isNetwork) {
-    if (!isNetwork) {
-      return;
-    }
-    if (streamCount == 0) {
-      sampleStartTimeMs = clock.elapsedRealtime();
-    }
-    streamCount++;
-  }
-
-  @Override
-  public synchronized void onBytesTransferred(
-      DataSource source, DataSpec dataSpec, boolean isNetwork, int bytes) {
-    if (!isNetwork) {
-      return;
-    }
-    sampleBytesTransferred += bytes;
-  }
-
-  @Override
-  public synchronized void onTransferEnd(DataSource source, DataSpec dataSpec, boolean isNetwork) {
-    if (!isNetwork) {
-      return;
-    }
-    Assertions.checkState(streamCount > 0);
-    long nowMs = clock.elapsedRealtime();
-    int sampleElapsedTimeMs = (int) (nowMs - sampleStartTimeMs);
-    totalElapsedTimeMs += sampleElapsedTimeMs;
-    totalBytesTransferred += sampleBytesTransferred;
-    if (sampleElapsedTimeMs > 0) {
-      float bitsPerSecond = (sampleBytesTransferred * 8000) / sampleElapsedTimeMs;
-      slidingPercentile.addSample((int) Math.sqrt(sampleBytesTransferred), bitsPerSecond);
-      if (totalElapsedTimeMs >= ELAPSED_MILLIS_FOR_ESTIMATE
-          || totalBytesTransferred >= BYTES_TRANSFERRED_FOR_ESTIMATE) {
-        bitrateEstimate = (long) slidingPercentile.getPercentile(0.5f);
-      }
-    }
-    notifyBandwidthSample(sampleElapsedTimeMs, sampleBytesTransferred, bitrateEstimate);
-    if (--streamCount > 0) {
-      sampleStartTimeMs = nowMs;
-    }
-    sampleBytesTransferred = 0;
-  }
-
-  private void notifyBandwidthSample(int elapsedMs, long bytes, long bitrate) {
-    eventDispatcher.dispatch(listener -> listener.onBandwidthSample(elapsedMs, bytes, bitrate));
-  }
-
-  private static Map<String, int[]> createInitialBitrateCountryGroupAssignment() {
-    HashMap<String, int[]> countryGroupAssignment = new HashMap<>();
-    countryGroupAssignment.put("AD", new int[] {1, 0, 0, 0});
-    countryGroupAssignment.put("AE", new int[] {1, 3, 4, 4});
-    countryGroupAssignment.put("AF", new int[] {4, 4, 3, 2});
-    countryGroupAssignment.put("AG", new int[] {3, 2, 1, 2});
-    countryGroupAssignment.put("AI", new int[] {1, 0, 0, 2});
-    countryGroupAssignment.put("AL", new int[] {1, 1, 1, 1});
-    countryGroupAssignment.put("AM", new int[] {2, 2, 4, 3});
-    countryGroupAssignment.put("AO", new int[] {2, 4, 2, 0});
-    countryGroupAssignment.put("AR", new int[] {2, 3, 2, 3});
-    countryGroupAssignment.put("AS", new int[] {3, 4, 4, 1});
-    countryGroupAssignment.put("AT", new int[] {0, 1, 0, 0});
-    countryGroupAssignment.put("AU", new int[] {0, 3, 0, 0});
-    countryGroupAssignment.put("AW", new int[] {1, 1, 0, 4});
-    countryGroupAssignment.put("AX", new int[] {0, 1, 0, 0});
-    countryGroupAssignment.put("AZ", new int[] {3, 3, 2, 2});
-    countryGroupAssignment.put("BA", new int[] {1, 1, 1, 2});
-    countryGroupAssignment.put("BB", new int[] {0, 1, 0, 0});
-    countryGroupAssignment.put("BD", new int[] {2, 1, 3, 2});
-    countryGroupAssignment.put("BE", new int[] {0, 0, 0, 0});
-    countryGroupAssignment.put("BF", new int[] {4, 4, 4, 1});
-    countryGroupAssignment.put("BG", new int[] {0, 0, 0, 1});
-    countryGroupAssignment.put("BH", new int[] {2, 1, 3, 4});
-    countryGroupAssignment.put("BI", new int[] {4, 3, 4, 4});
-    countryGroupAssignment.put("BJ", new int[] {4, 3, 4, 3});
-    countryGroupAssignment.put("BL", new int[] {1, 0, 1, 2});
-    countryGroupAssignment.put("BM", new int[] {1, 0, 0, 0});
-    countryGroupAssignment.put("BN", new int[] {4, 3, 3, 3});
-    countryGroupAssignment.put("BO", new int[] {2, 2, 1, 2});
-    countryGroupAssignment.put("BQ", new int[] {1, 1, 2, 4});
-    countryGroupAssignment.put("BR", new int[] {2, 3, 2, 2});
-    countryGroupAssignment.put("BS", new int[] {1, 1, 0, 2});
-    countryGroupAssignment.put("BT", new int[] {3, 0, 2, 1});
-    countryGroupAssignment.put("BW", new int[] {4, 4, 2, 3});
-    countryGroupAssignment.put("BY", new int[] {1, 1, 1, 1});
-    countryGroupAssignment.put("BZ", new int[] {2, 3, 3, 1});
-    countryGroupAssignment.put("CA", new int[] {0, 2, 2, 3});
-    countryGroupAssignment.put("CD", new int[] {4, 4, 2, 1});
-    countryGroupAssignment.put("CF", new int[] {4, 4, 3, 3});
-    countryGroupAssignment.put("CG", new int[] {4, 4, 4, 4});
-    countryGroupAssignment.put("CH", new int[] {0, 0, 0, 0});
-    countryGroupAssignment.put("CI", new int[] {4, 4, 4, 4});
-    countryGroupAssignment.put("CK", new int[] {2, 4, 2, 0});
-    countryGroupAssignment.put("CL", new int[] {2, 2, 2, 3});
-    countryGroupAssignment.put("CM", new int[] {3, 4, 3, 1});
-    countryGroupAssignment.put("CN", new int[] {2, 0, 1, 2});
-    countryGroupAssignment.put("CO", new int[] {2, 3, 2, 1});
-    countryGroupAssignment.put("CR", new int[] {2, 2, 4, 4});
-    countryGroupAssignment.put("CU", new int[] {4, 4, 4, 1});
-    countryGroupAssignment.put("CV", new int[] {2, 2, 2, 4});
-    countryGroupAssignment.put("CW", new int[] {1, 1, 0, 0});
-    countryGroupAssignment.put("CX", new int[] {1, 2, 2, 2});
-    countryGroupAssignment.put("CY", new int[] {1, 1, 0, 0});
-    countryGroupAssignment.put("CZ", new int[] {0, 1, 0, 0});
-    countryGroupAssignment.put("DE", new int[] {0, 2, 2, 2});
-    countryGroupAssignment.put("DJ", new int[] {3, 4, 4, 0});
-    countryGroupAssignment.put("DK", new int[] {0, 0, 0, 0});
-    countryGroupAssignment.put("DM", new int[] {2, 0, 3, 4});
-    countryGroupAssignment.put("DO", new int[] {3, 3, 4, 4});
-    countryGroupAssignment.put("DZ", new int[] {3, 3, 4, 4});
-    countryGroupAssignment.put("EC", new int[] {2, 3, 3, 1});
-    countryGroupAssignment.put("EE", new int[] {0, 0, 0, 0});
-    countryGroupAssignment.put("EG", new int[] {3, 3, 1, 1});
-    countryGroupAssignment.put("EH", new int[] {2, 0, 2, 3});
-    countryGroupAssignment.put("ER", new int[] {4, 2, 2, 2});
-    countryGroupAssignment.put("ES", new int[] {0, 0, 1, 1});
-    countryGroupAssignment.put("ET", new int[] {4, 4, 4, 0});
-    countryGroupAssignment.put("FI", new int[] {0, 0, 1, 0});
-    countryGroupAssignment.put("FJ", new int[] {3, 2, 3, 3});
-    countryGroupAssignment.put("FK", new int[] {3, 4, 2, 1});
-    countryGroupAssignment.put("FM", new int[] {4, 2, 4, 0});
-    countryGroupAssignment.put("FO", new int[] {0, 0, 0, 1});
-    countryGroupAssignment.put("FR", new int[] {1, 0, 2, 1});
-    countryGroupAssignment.put("GA", new int[] {3, 3, 2, 1});
-    countryGroupAssignment.put("GB", new int[] {0, 1, 3, 2});
-    countryGroupAssignment.put("GD", new int[] {2, 0, 3, 0});
-    countryGroupAssignment.put("GE", new int[] {1, 1, 0, 3});
-    countryGroupAssignment.put("GF", new int[] {1, 2, 4, 4});
-    countryGroupAssignment.put("GG", new int[] {0, 1, 0, 0});
-    countryGroupAssignment.put("GH", new int[] {3, 2, 2, 2});
-    countryGroupAssignment.put("GI", new int[] {0, 0, 0, 1});
-    countryGroupAssignment.put("GL", new int[] {2, 4, 1, 4});
-    countryGroupAssignment.put("GM", new int[] {4, 3, 3, 0});
-    countryGroupAssignment.put("GN", new int[] {4, 4, 3, 4});
-    countryGroupAssignment.put("GP", new int[] {2, 2, 1, 3});
-    countryGroupAssignment.put("GQ", new int[] {4, 4, 3, 1});
-    countryGroupAssignment.put("GR", new int[] {1, 1, 0, 1});
-    countryGroupAssignment.put("GT", new int[] {3, 2, 3, 4});
-    countryGroupAssignment.put("GU", new int[] {1, 0, 4, 4});
-    countryGroupAssignment.put("GW", new int[] {4, 4, 4, 0});
-    countryGroupAssignment.put("GY", new int[] {3, 4, 1, 0});
-    countryGroupAssignment.put("HK", new int[] {0, 2, 3, 4});
-    countryGroupAssignment.put("HN", new int[] {3, 3, 2, 2});
-    countryGroupAssignment.put("HR", new int[] {1, 0, 0, 2});
-    countryGroupAssignment.put("HT", new int[] {3, 3, 3, 3});
-    countryGroupAssignment.put("HU", new int[] {0, 0, 1, 0});
-    countryGroupAssignment.put("ID", new int[] {2, 3, 3, 4});
-    countryGroupAssignment.put("IE", new int[] {0, 0, 1, 1});
-    countryGroupAssignment.put("IL", new int[] {0, 1, 1, 3});
-    countryGroupAssignment.put("IM", new int[] {0, 1, 0, 1});
-    countryGroupAssignment.put("IN", new int[] {2, 3, 3, 4});
-    countryGroupAssignment.put("IO", new int[] {4, 2, 2, 2});
-    countryGroupAssignment.put("IQ", new int[] {3, 3, 4, 3});
-    countryGroupAssignment.put("IR", new int[] {3, 2, 4, 4});
-    countryGroupAssignment.put("IS", new int[] {0, 0, 0, 0});
-    countryGroupAssignment.put("IT", new int[] {1, 0, 1, 3});
-    countryGroupAssignment.put("JE", new int[] {0, 0, 0, 1});
-    countryGroupAssignment.put("JM", new int[] {3, 3, 3, 2});
-    countryGroupAssignment.put("JO", new int[] {1, 1, 1, 2});
-    countryGroupAssignment.put("JP", new int[] {0, 1, 1, 2});
-    countryGroupAssignment.put("KE", new int[] {3, 3, 3, 3});
-    countryGroupAssignment.put("KG", new int[] {2, 2, 3, 3});
-    countryGroupAssignment.put("KH", new int[] {1, 0, 4, 4});
-    countryGroupAssignment.put("KI", new int[] {4, 4, 4, 4});
-    countryGroupAssignment.put("KM", new int[] {4, 4, 2, 2});
-    countryGroupAssignment.put("KN", new int[] {1, 0, 1, 3});
-    countryGroupAssignment.put("KP", new int[] {1, 2, 2, 2});
-    countryGroupAssignment.put("KR", new int[] {0, 4, 0, 2});
-    countryGroupAssignment.put("KW", new int[] {1, 2, 1, 2});
-    countryGroupAssignment.put("KY", new int[] {1, 1, 0, 2});
-    countryGroupAssignment.put("KZ", new int[] {1, 2, 2, 3});
-    countryGroupAssignment.put("LA", new int[] {3, 2, 2, 2});
-    countryGroupAssignment.put("LB", new int[] {3, 2, 0, 0});
-    countryGroupAssignment.put("LC", new int[] {2, 2, 1, 0});
-    countryGroupAssignment.put("LI", new int[] {0, 0, 1, 2});
-    countryGroupAssignment.put("LK", new int[] {1, 1, 2, 2});
-    countryGroupAssignment.put("LR", new int[] {3, 4, 3, 1});
-    countryGroupAssignment.put("LS", new int[] {3, 3, 2, 0});
-    countryGroupAssignment.put("LT", new int[] {0, 0, 0, 1});
-    countryGroupAssignment.put("LU", new int[] {0, 0, 1, 0});
-    countryGroupAssignment.put("LV", new int[] {0, 0, 0, 0});
-    countryGroupAssignment.put("LY", new int[] {4, 4, 4, 4});
-    countryGroupAssignment.put("MA", new int[] {2, 1, 2, 2});
-    countryGroupAssignment.put("MC", new int[] {1, 0, 1, 0});
-    countryGroupAssignment.put("MD", new int[] {1, 1, 0, 0});
-    countryGroupAssignment.put("ME", new int[] {1, 2, 2, 3});
-    countryGroupAssignment.put("MF", new int[] {1, 4, 3, 3});
-    countryGroupAssignment.put("MG", new int[] {3, 4, 1, 2});
-    countryGroupAssignment.put("MH", new int[] {4, 0, 2, 3});
-    countryGroupAssignment.put("MK", new int[] {1, 0, 0, 1});
-    countryGroupAssignment.put("ML", new int[] {4, 4, 4, 4});
-    countryGroupAssignment.put("MM", new int[] {2, 3, 1, 2});
-    countryGroupAssignment.put("MN", new int[] {2, 2, 2, 4});
-    countryGroupAssignment.put("MO", new int[] {0, 1, 4, 4});
-    countryGroupAssignment.put("MP", new int[] {0, 0, 4, 4});
-    countryGroupAssignment.put("MQ", new int[] {1, 1, 1, 3});
-    countryGroupAssignment.put("MR", new int[] {4, 2, 4, 2});
-    countryGroupAssignment.put("MS", new int[] {1, 2, 1, 2});
-    countryGroupAssignment.put("MT", new int[] {0, 0, 0, 0});
-    countryGroupAssignment.put("MU", new int[] {2, 2, 4, 4});
-    countryGroupAssignment.put("MV", new int[] {4, 2, 0, 1});
-    countryGroupAssignment.put("MW", new int[] {3, 2, 1, 1});
-    countryGroupAssignment.put("MX", new int[] {2, 4, 3, 1});
-    countryGroupAssignment.put("MY", new int[] {2, 3, 3, 3});
-    countryGroupAssignment.put("MZ", new int[] {3, 3, 2, 4});
-    countryGroupAssignment.put("NA", new int[] {4, 2, 1, 1});
-    countryGroupAssignment.put("NC", new int[] {2, 1, 3, 3});
-    countryGroupAssignment.put("NE", new int[] {4, 4, 4, 4});
-    countryGroupAssignment.put("NF", new int[] {0, 2, 2, 2});
-    countryGroupAssignment.put("NG", new int[] {3, 4, 2, 2});
-    countryGroupAssignment.put("NI", new int[] {3, 4, 3, 3});
-    countryGroupAssignment.put("NL", new int[] {0, 1, 3, 2});
-    countryGroupAssignment.put("NO", new int[] {0, 0, 1, 0});
-    countryGroupAssignment.put("NP", new int[] {2, 3, 2, 2});
-    countryGroupAssignment.put("NR", new int[] {4, 3, 4, 1});
-    countryGroupAssignment.put("NU", new int[] {4, 2, 2, 2});
-    countryGroupAssignment.put("NZ", new int[] {0, 0, 0, 1});
-    countryGroupAssignment.put("OM", new int[] {2, 2, 1, 3});
-    countryGroupAssignment.put("PA", new int[] {1, 3, 2, 3});
-    countryGroupAssignment.put("PE", new int[] {2, 2, 4, 4});
-    countryGroupAssignment.put("PF", new int[] {2, 2, 0, 1});
-    countryGroupAssignment.put("PG", new int[] {4, 4, 4, 4});
-    countryGroupAssignment.put("PH", new int[] {3, 0, 4, 4});
-    countryGroupAssignment.put("PK", new int[] {3, 3, 3, 3});
-    countryGroupAssignment.put("PL", new int[] {1, 0, 1, 3});
-    countryGroupAssignment.put("PM", new int[] {0, 2, 2, 3});
-    countryGroupAssignment.put("PR", new int[] {2, 3, 4, 3});
-    countryGroupAssignment.put("PS", new int[] {2, 3, 0, 4});
-    countryGroupAssignment.put("PT", new int[] {1, 1, 1, 1});
-    countryGroupAssignment.put("PW", new int[] {3, 2, 3, 0});
-    countryGroupAssignment.put("PY", new int[] {2, 1, 3, 3});
-    countryGroupAssignment.put("QA", new int[] {2, 3, 1, 2});
-    countryGroupAssignment.put("RE", new int[] {1, 1, 2, 2});
-    countryGroupAssignment.put("RO", new int[] {0, 1, 1, 3});
-    countryGroupAssignment.put("RS", new int[] {1, 1, 0, 0});
-    countryGroupAssignment.put("RU", new int[] {0, 1, 1, 1});
-    countryGroupAssignment.put("RW", new int[] {3, 4, 3, 1});
-    countryGroupAssignment.put("SA", new int[] {3, 2, 2, 3});
-    countryGroupAssignment.put("SB", new int[] {4, 4, 3, 0});
-    countryGroupAssignment.put("SC", new int[] {4, 2, 0, 1});
-    countryGroupAssignment.put("SD", new int[] {3, 4, 4, 4});
-    countryGroupAssignment.put("SE", new int[] {0, 0, 0, 0});
-    countryGroupAssignment.put("SG", new int[] {1, 2, 3, 3});
-    countryGroupAssignment.put("SH", new int[] {4, 2, 2, 2});
-    countryGroupAssignment.put("SI", new int[] {0, 1, 0, 0});
-    countryGroupAssignment.put("SJ", new int[] {3, 2, 0, 2});
-    countryGroupAssignment.put("SK", new int[] {0, 1, 0, 1});
-    countryGroupAssignment.put("SL", new int[] {4, 3, 2, 4});
-    countryGroupAssignment.put("SM", new int[] {1, 0, 1, 1});
-    countryGroupAssignment.put("SN", new int[] {4, 4, 4, 2});
-    countryGroupAssignment.put("SO", new int[] {4, 4, 4, 3});
-    countryGroupAssignment.put("SR", new int[] {3, 2, 2, 3});
-    countryGroupAssignment.put("SS", new int[] {4, 3, 4, 2});
-    countryGroupAssignment.put("ST", new int[] {3, 2, 2, 2});
-    countryGroupAssignment.put("SV", new int[] {2, 3, 2, 3});
-    countryGroupAssignment.put("SX", new int[] {2, 4, 2, 0});
-    countryGroupAssignment.put("SY", new int[] {4, 4, 2, 0});
-    countryGroupAssignment.put("SZ", new int[] {3, 4, 1, 1});
-    countryGroupAssignment.put("TC", new int[] {2, 1, 2, 1});
-    countryGroupAssignment.put("TD", new int[] {4, 4, 4, 3});
-    countryGroupAssignment.put("TG", new int[] {3, 2, 2, 0});
-    countryGroupAssignment.put("TH", new int[] {1, 3, 4, 4});
-    countryGroupAssignment.put("TJ", new int[] {4, 4, 4, 4});
-    countryGroupAssignment.put("TL", new int[] {4, 2, 4, 4});
-    countryGroupAssignment.put("TM", new int[] {4, 1, 3, 3});
-    countryGroupAssignment.put("TN", new int[] {2, 2, 1, 2});
-    countryGroupAssignment.put("TO", new int[] {2, 3, 3, 1});
-    countryGroupAssignment.put("TR", new int[] {1, 2, 0, 2});
-    countryGroupAssignment.put("TT", new int[] {2, 1, 1, 0});
-    countryGroupAssignment.put("TV", new int[] {4, 2, 2, 4});
-    countryGroupAssignment.put("TW", new int[] {0, 0, 0, 1});
-    countryGroupAssignment.put("TZ", new int[] {3, 3, 3, 2});
-    countryGroupAssignment.put("UA", new int[] {0, 2, 1, 3});
-    countryGroupAssignment.put("UG", new int[] {4, 3, 2, 2});
-    countryGroupAssignment.put("US", new int[] {0, 1, 3, 3});
-    countryGroupAssignment.put("UY", new int[] {2, 1, 2, 2});
-    countryGroupAssignment.put("UZ", new int[] {4, 3, 2, 4});
-    countryGroupAssignment.put("VA", new int[] {1, 2, 2, 2});
-    countryGroupAssignment.put("VC", new int[] {2, 0, 3, 2});
-    countryGroupAssignment.put("VE", new int[] {3, 4, 4, 3});
-    countryGroupAssignment.put("VG", new int[] {3, 1, 3, 4});
-    countryGroupAssignment.put("VI", new int[] {1, 0, 2, 4});
-    countryGroupAssignment.put("VN", new int[] {0, 2, 4, 4});
-    countryGroupAssignment.put("VU", new int[] {4, 1, 3, 2});
-    countryGroupAssignment.put("WS", new int[] {3, 2, 3, 0});
-    countryGroupAssignment.put("XK", new int[] {1, 2, 1, 0});
-    countryGroupAssignment.put("YE", new int[] {4, 4, 4, 2});
-    countryGroupAssignment.put("YT", new int[] {3, 1, 1, 2});
-    countryGroupAssignment.put("ZA", new int[] {2, 3, 1, 2});
-    countryGroupAssignment.put("ZM", new int[] {3, 3, 3, 1});
-    countryGroupAssignment.put("ZW", new int[] {3, 3, 2, 1});
-    return Collections.unmodifiableMap(countryGroupAssignment);
-  }
-}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
index 6e0fba27ae..e9f70ec92a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
@@ -15,20 +15,57 @@
  */
 package com.google.android.exoplayer2.upstream;
 
+import android.content.Context;
 import android.os.Handler;
 import android.support.annotation.Nullable;
+import android.util.SparseArray;
+import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Clock;
 import com.google.android.exoplayer2.util.EventDispatcher;
 import com.google.android.exoplayer2.util.SlidingPercentile;
+import com.google.android.exoplayer2.util.Util;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
- * Estimates bandwidth by listening to data transfers. The bandwidth estimate is calculated using a
- * {@link SlidingPercentile} and is updated each time a transfer ends.
+ * Estimates bandwidth by listening to data transfers.
+ *
+ * <p>The bandwidth estimate is calculated using a {@link SlidingPercentile} and is updated each
+ * time a transfer ends. The initial estimate is based on the current operator's network country
+ * code or the locale of the user, as well as the network connection type. This can be configured in
+ * the {@link Builder}.
  */
 public final class DefaultBandwidthMeter implements BandwidthMeter, TransferListener {
 
-  /** Default initial bitrate estimate in bits per second. */
+  /**
+   * Country groups used to determine the default initial bitrate estimate. The group assignment for
+   * each country is an array of group indices for [Wifi, 2G, 3G, 4G].
+   */
+  public static final Map<String, int[]> DEFAULT_INITIAL_BITRATE_COUNTRY_GROUPS =
+      createInitialBitrateCountryGroupAssignment();
+
+  /** Default initial Wifi bitrate estimate in bits per second. */
+  public static final long[] DEFAULT_INITIAL_BITRATE_ESTIMATES_WIFI =
+      new long[] {5_700_000, 3_400_000, 1_900_000, 1_000_000, 400_000};
+
+  /** Default initial 2G bitrate estimates in bits per second. */
+  public static final long[] DEFAULT_INITIAL_BITRATE_ESTIMATES_2G =
+      new long[] {169_000, 129_000, 114_000, 102_000, 87_000};
+
+  /** Default initial 3G bitrate estimates in bits per second. */
+  public static final long[] DEFAULT_INITIAL_BITRATE_ESTIMATES_3G =
+      new long[] {2_100_000, 1_300_000, 950_000, 700_000, 400_000};
+
+  /** Default initial 4G bitrate estimates in bits per second. */
+  public static final long[] DEFAULT_INITIAL_BITRATE_ESTIMATES_4G =
+      new long[] {6_900_000, 4_300_000, 2_700_000, 1_600_000, 450_000};
+
+  /**
+   * Default initial bitrate estimate used when the device is offline or the network type cannot be
+   * determined, in bits per second.
+   */
   public static final long DEFAULT_INITIAL_BITRATE_ESTIMATE = 1_000_000;
 
   /** Default maximum weight for the sliding window. */
@@ -37,15 +74,28 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
   /** Builder for a bandwidth meter. */
   public static final class Builder {
 
-    private @Nullable Handler eventHandler;
-    private @Nullable EventListener eventListener;
-    private long initialBitrateEstimate;
+    @Nullable private final Context context;
+
+    @Nullable private Handler eventHandler;
+    @Nullable private EventListener eventListener;
+    private SparseArray<Long> initialBitrateEstimates;
     private int slidingWindowMaxWeight;
     private Clock clock;
 
-    /** Creates a builder with default parameters and without listener. */
+    /** @deprecated Use {@link #Builder(Context)} instead. */
+    @Deprecated
     public Builder() {
-      initialBitrateEstimate = DEFAULT_INITIAL_BITRATE_ESTIMATE;
+      this(/* context= */ null);
+    }
+
+    /**
+     * Creates a builder with default parameters and without listener.
+     *
+     * @param context A context.
+     */
+    public Builder(@Nullable Context context) {
+      this.context = context == null ? null : context.getApplicationContext();
+      initialBitrateEstimates = getInitialBitrateEstimatesForCountry(Util.getCountryCode(context));
       slidingWindowMaxWeight = DEFAULT_SLIDING_WINDOW_MAX_WEIGHT;
       clock = Clock.DEFAULT;
     }
@@ -84,7 +134,38 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
      * @return This builder.
      */
     public Builder setInitialBitrateEstimate(long initialBitrateEstimate) {
-      this.initialBitrateEstimate = initialBitrateEstimate;
+      for (int i = 0; i < initialBitrateEstimates.size(); i++) {
+        initialBitrateEstimates.setValueAt(i, initialBitrateEstimate);
+      }
+      return this;
+    }
+
+    /**
+     * Sets the initial bitrate estimate in bits per second for a network type that should be
+     * assumed when a bandwidth estimate is unavailable and the current network connection is of the
+     * specified type.
+     *
+     * @param networkType The {@link C.NetworkType} this initial estimate is for.
+     * @param initialBitrateEstimate The initial bitrate estimate in bits per second.
+     * @return This builder.
+     */
+    public Builder setInitialBitrateEstimate(
+        @C.NetworkType int networkType, long initialBitrateEstimate) {
+      initialBitrateEstimates.put(networkType, initialBitrateEstimate);
+      return this;
+    }
+
+    /**
+     * Sets the initial bitrate estimates to the default values of the specified country. The
+     * initial estimates are used when a bandwidth estimate is unavailable.
+     *
+     * @param countryCode The ISO 3166-1 alpha-2 country code of the country whose default bitrate
+     *     estimates should be used.
+     * @return This builder.
+     */
+    public Builder setInitialBitrateEstimate(String countryCode) {
+      initialBitrateEstimates =
+          getInitialBitrateEstimatesForCountry(Util.toUpperInvariant(countryCode));
       return this;
     }
 
@@ -106,6 +187,10 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
      * @return A bandwidth meter with the configured properties.
      */
     public DefaultBandwidthMeter build() {
+      Long initialBitrateEstimate = initialBitrateEstimates.get(Util.getNetworkType(context));
+      if (initialBitrateEstimate == null) {
+        initialBitrateEstimate = initialBitrateEstimates.get(C.NETWORK_TYPE_UNKNOWN);
+      }
       DefaultBandwidthMeter bandwidthMeter =
           new DefaultBandwidthMeter(initialBitrateEstimate, slidingWindowMaxWeight, clock);
       if (eventHandler != null && eventListener != null) {
@@ -113,6 +198,26 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
       }
       return bandwidthMeter;
     }
+
+    private static SparseArray<Long> getInitialBitrateEstimatesForCountry(String countryCode) {
+      int[] groupIndices = getCountryGroupIndices(countryCode);
+      SparseArray<Long> result = new SparseArray<>(/* initialCapacity= */ 6);
+      result.append(C.NETWORK_TYPE_UNKNOWN, DEFAULT_INITIAL_BITRATE_ESTIMATE);
+      result.append(C.NETWORK_TYPE_WIFI, DEFAULT_INITIAL_BITRATE_ESTIMATES_WIFI[groupIndices[0]]);
+      result.append(C.NETWORK_TYPE_2G, DEFAULT_INITIAL_BITRATE_ESTIMATES_2G[groupIndices[1]]);
+      result.append(C.NETWORK_TYPE_3G, DEFAULT_INITIAL_BITRATE_ESTIMATES_3G[groupIndices[2]]);
+      result.append(C.NETWORK_TYPE_4G, DEFAULT_INITIAL_BITRATE_ESTIMATES_4G[groupIndices[3]]);
+      // Assume default Wifi bitrate for Ethernet to prevent using the slower fallback bitrate.
+      result.append(
+          C.NETWORK_TYPE_ETHERNET, DEFAULT_INITIAL_BITRATE_ESTIMATES_WIFI[groupIndices[0]]);
+      return result;
+    }
+
+    private static int[] getCountryGroupIndices(String countryCode) {
+      int[] groupIndices = DEFAULT_INITIAL_BITRATE_COUNTRY_GROUPS.get(countryCode);
+      // Assume median group if not found.
+      return groupIndices == null ? new int[] {2, 2, 2, 2} : groupIndices;
+    }
   }
 
   private static final int ELAPSED_MILLIS_FOR_ESTIMATE = 2000;
@@ -153,10 +258,7 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
     }
   }
 
-  private DefaultBandwidthMeter(
-      long initialBitrateEstimate,
-      int maxWeight,
-      Clock clock) {
+  private DefaultBandwidthMeter(long initialBitrateEstimate, int maxWeight, Clock clock) {
     this.eventDispatcher = new EventDispatcher<>();
     this.slidingPercentile = new SlidingPercentile(maxWeight);
     this.clock = clock;
@@ -169,7 +271,8 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
   }
 
   @Override
-  public @Nullable TransferListener getTransferListener() {
+  @Nullable
+  public TransferListener getTransferListener() {
     return this;
   }
 
@@ -237,4 +340,249 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
   private void notifyBandwidthSample(int elapsedMs, long bytes, long bitrate) {
     eventDispatcher.dispatch(listener -> listener.onBandwidthSample(elapsedMs, bytes, bitrate));
   }
+
+  private static Map<String, int[]> createInitialBitrateCountryGroupAssignment() {
+    HashMap<String, int[]> countryGroupAssignment = new HashMap<>();
+    countryGroupAssignment.put("AD", new int[] {1, 0, 0, 0});
+    countryGroupAssignment.put("AE", new int[] {1, 3, 4, 4});
+    countryGroupAssignment.put("AF", new int[] {4, 4, 3, 2});
+    countryGroupAssignment.put("AG", new int[] {3, 2, 1, 2});
+    countryGroupAssignment.put("AI", new int[] {1, 0, 0, 2});
+    countryGroupAssignment.put("AL", new int[] {1, 1, 1, 1});
+    countryGroupAssignment.put("AM", new int[] {2, 2, 4, 3});
+    countryGroupAssignment.put("AO", new int[] {2, 4, 2, 0});
+    countryGroupAssignment.put("AR", new int[] {2, 3, 2, 3});
+    countryGroupAssignment.put("AS", new int[] {3, 4, 4, 1});
+    countryGroupAssignment.put("AT", new int[] {0, 1, 0, 0});
+    countryGroupAssignment.put("AU", new int[] {0, 3, 0, 0});
+    countryGroupAssignment.put("AW", new int[] {1, 1, 0, 4});
+    countryGroupAssignment.put("AX", new int[] {0, 1, 0, 0});
+    countryGroupAssignment.put("AZ", new int[] {3, 3, 2, 2});
+    countryGroupAssignment.put("BA", new int[] {1, 1, 1, 2});
+    countryGroupAssignment.put("BB", new int[] {0, 1, 0, 0});
+    countryGroupAssignment.put("BD", new int[] {2, 1, 3, 2});
+    countryGroupAssignment.put("BE", new int[] {0, 0, 0, 0});
+    countryGroupAssignment.put("BF", new int[] {4, 4, 4, 1});
+    countryGroupAssignment.put("BG", new int[] {0, 0, 0, 1});
+    countryGroupAssignment.put("BH", new int[] {2, 1, 3, 4});
+    countryGroupAssignment.put("BI", new int[] {4, 3, 4, 4});
+    countryGroupAssignment.put("BJ", new int[] {4, 3, 4, 3});
+    countryGroupAssignment.put("BL", new int[] {1, 0, 1, 2});
+    countryGroupAssignment.put("BM", new int[] {1, 0, 0, 0});
+    countryGroupAssignment.put("BN", new int[] {4, 3, 3, 3});
+    countryGroupAssignment.put("BO", new int[] {2, 2, 1, 2});
+    countryGroupAssignment.put("BQ", new int[] {1, 1, 2, 4});
+    countryGroupAssignment.put("BR", new int[] {2, 3, 2, 2});
+    countryGroupAssignment.put("BS", new int[] {1, 1, 0, 2});
+    countryGroupAssignment.put("BT", new int[] {3, 0, 2, 1});
+    countryGroupAssignment.put("BW", new int[] {4, 4, 2, 3});
+    countryGroupAssignment.put("BY", new int[] {1, 1, 1, 1});
+    countryGroupAssignment.put("BZ", new int[] {2, 3, 3, 1});
+    countryGroupAssignment.put("CA", new int[] {0, 2, 2, 3});
+    countryGroupAssignment.put("CD", new int[] {4, 4, 2, 1});
+    countryGroupAssignment.put("CF", new int[] {4, 4, 3, 3});
+    countryGroupAssignment.put("CG", new int[] {4, 4, 4, 4});
+    countryGroupAssignment.put("CH", new int[] {0, 0, 0, 0});
+    countryGroupAssignment.put("CI", new int[] {4, 4, 4, 4});
+    countryGroupAssignment.put("CK", new int[] {2, 4, 2, 0});
+    countryGroupAssignment.put("CL", new int[] {2, 2, 2, 3});
+    countryGroupAssignment.put("CM", new int[] {3, 4, 3, 1});
+    countryGroupAssignment.put("CN", new int[] {2, 0, 1, 2});
+    countryGroupAssignment.put("CO", new int[] {2, 3, 2, 1});
+    countryGroupAssignment.put("CR", new int[] {2, 2, 4, 4});
+    countryGroupAssignment.put("CU", new int[] {4, 4, 4, 1});
+    countryGroupAssignment.put("CV", new int[] {2, 2, 2, 4});
+    countryGroupAssignment.put("CW", new int[] {1, 1, 0, 0});
+    countryGroupAssignment.put("CX", new int[] {1, 2, 2, 2});
+    countryGroupAssignment.put("CY", new int[] {1, 1, 0, 0});
+    countryGroupAssignment.put("CZ", new int[] {0, 1, 0, 0});
+    countryGroupAssignment.put("DE", new int[] {0, 2, 2, 2});
+    countryGroupAssignment.put("DJ", new int[] {3, 4, 4, 0});
+    countryGroupAssignment.put("DK", new int[] {0, 0, 0, 0});
+    countryGroupAssignment.put("DM", new int[] {2, 0, 3, 4});
+    countryGroupAssignment.put("DO", new int[] {3, 3, 4, 4});
+    countryGroupAssignment.put("DZ", new int[] {3, 3, 4, 4});
+    countryGroupAssignment.put("EC", new int[] {2, 3, 3, 1});
+    countryGroupAssignment.put("EE", new int[] {0, 0, 0, 0});
+    countryGroupAssignment.put("EG", new int[] {3, 3, 1, 1});
+    countryGroupAssignment.put("EH", new int[] {2, 0, 2, 3});
+    countryGroupAssignment.put("ER", new int[] {4, 2, 2, 2});
+    countryGroupAssignment.put("ES", new int[] {0, 0, 1, 1});
+    countryGroupAssignment.put("ET", new int[] {4, 4, 4, 0});
+    countryGroupAssignment.put("FI", new int[] {0, 0, 1, 0});
+    countryGroupAssignment.put("FJ", new int[] {3, 2, 3, 3});
+    countryGroupAssignment.put("FK", new int[] {3, 4, 2, 1});
+    countryGroupAssignment.put("FM", new int[] {4, 2, 4, 0});
+    countryGroupAssignment.put("FO", new int[] {0, 0, 0, 1});
+    countryGroupAssignment.put("FR", new int[] {1, 0, 2, 1});
+    countryGroupAssignment.put("GA", new int[] {3, 3, 2, 1});
+    countryGroupAssignment.put("GB", new int[] {0, 1, 3, 2});
+    countryGroupAssignment.put("GD", new int[] {2, 0, 3, 0});
+    countryGroupAssignment.put("GE", new int[] {1, 1, 0, 3});
+    countryGroupAssignment.put("GF", new int[] {1, 2, 4, 4});
+    countryGroupAssignment.put("GG", new int[] {0, 1, 0, 0});
+    countryGroupAssignment.put("GH", new int[] {3, 2, 2, 2});
+    countryGroupAssignment.put("GI", new int[] {0, 0, 0, 1});
+    countryGroupAssignment.put("GL", new int[] {2, 4, 1, 4});
+    countryGroupAssignment.put("GM", new int[] {4, 3, 3, 0});
+    countryGroupAssignment.put("GN", new int[] {4, 4, 3, 4});
+    countryGroupAssignment.put("GP", new int[] {2, 2, 1, 3});
+    countryGroupAssignment.put("GQ", new int[] {4, 4, 3, 1});
+    countryGroupAssignment.put("GR", new int[] {1, 1, 0, 1});
+    countryGroupAssignment.put("GT", new int[] {3, 2, 3, 4});
+    countryGroupAssignment.put("GU", new int[] {1, 0, 4, 4});
+    countryGroupAssignment.put("GW", new int[] {4, 4, 4, 0});
+    countryGroupAssignment.put("GY", new int[] {3, 4, 1, 0});
+    countryGroupAssignment.put("HK", new int[] {0, 2, 3, 4});
+    countryGroupAssignment.put("HN", new int[] {3, 3, 2, 2});
+    countryGroupAssignment.put("HR", new int[] {1, 0, 0, 2});
+    countryGroupAssignment.put("HT", new int[] {3, 3, 3, 3});
+    countryGroupAssignment.put("HU", new int[] {0, 0, 1, 0});
+    countryGroupAssignment.put("ID", new int[] {2, 3, 3, 4});
+    countryGroupAssignment.put("IE", new int[] {0, 0, 1, 1});
+    countryGroupAssignment.put("IL", new int[] {0, 1, 1, 3});
+    countryGroupAssignment.put("IM", new int[] {0, 1, 0, 1});
+    countryGroupAssignment.put("IN", new int[] {2, 3, 3, 4});
+    countryGroupAssignment.put("IO", new int[] {4, 2, 2, 2});
+    countryGroupAssignment.put("IQ", new int[] {3, 3, 4, 3});
+    countryGroupAssignment.put("IR", new int[] {3, 2, 4, 4});
+    countryGroupAssignment.put("IS", new int[] {0, 0, 0, 0});
+    countryGroupAssignment.put("IT", new int[] {1, 0, 1, 3});
+    countryGroupAssignment.put("JE", new int[] {0, 0, 0, 1});
+    countryGroupAssignment.put("JM", new int[] {3, 3, 3, 2});
+    countryGroupAssignment.put("JO", new int[] {1, 1, 1, 2});
+    countryGroupAssignment.put("JP", new int[] {0, 1, 1, 2});
+    countryGroupAssignment.put("KE", new int[] {3, 3, 3, 3});
+    countryGroupAssignment.put("KG", new int[] {2, 2, 3, 3});
+    countryGroupAssignment.put("KH", new int[] {1, 0, 4, 4});
+    countryGroupAssignment.put("KI", new int[] {4, 4, 4, 4});
+    countryGroupAssignment.put("KM", new int[] {4, 4, 2, 2});
+    countryGroupAssignment.put("KN", new int[] {1, 0, 1, 3});
+    countryGroupAssignment.put("KP", new int[] {1, 2, 2, 2});
+    countryGroupAssignment.put("KR", new int[] {0, 4, 0, 2});
+    countryGroupAssignment.put("KW", new int[] {1, 2, 1, 2});
+    countryGroupAssignment.put("KY", new int[] {1, 1, 0, 2});
+    countryGroupAssignment.put("KZ", new int[] {1, 2, 2, 3});
+    countryGroupAssignment.put("LA", new int[] {3, 2, 2, 2});
+    countryGroupAssignment.put("LB", new int[] {3, 2, 0, 0});
+    countryGroupAssignment.put("LC", new int[] {2, 2, 1, 0});
+    countryGroupAssignment.put("LI", new int[] {0, 0, 1, 2});
+    countryGroupAssignment.put("LK", new int[] {1, 1, 2, 2});
+    countryGroupAssignment.put("LR", new int[] {3, 4, 3, 1});
+    countryGroupAssignment.put("LS", new int[] {3, 3, 2, 0});
+    countryGroupAssignment.put("LT", new int[] {0, 0, 0, 1});
+    countryGroupAssignment.put("LU", new int[] {0, 0, 1, 0});
+    countryGroupAssignment.put("LV", new int[] {0, 0, 0, 0});
+    countryGroupAssignment.put("LY", new int[] {4, 4, 4, 4});
+    countryGroupAssignment.put("MA", new int[] {2, 1, 2, 2});
+    countryGroupAssignment.put("MC", new int[] {1, 0, 1, 0});
+    countryGroupAssignment.put("MD", new int[] {1, 1, 0, 0});
+    countryGroupAssignment.put("ME", new int[] {1, 2, 2, 3});
+    countryGroupAssignment.put("MF", new int[] {1, 4, 3, 3});
+    countryGroupAssignment.put("MG", new int[] {3, 4, 1, 2});
+    countryGroupAssignment.put("MH", new int[] {4, 0, 2, 3});
+    countryGroupAssignment.put("MK", new int[] {1, 0, 0, 1});
+    countryGroupAssignment.put("ML", new int[] {4, 4, 4, 4});
+    countryGroupAssignment.put("MM", new int[] {2, 3, 1, 2});
+    countryGroupAssignment.put("MN", new int[] {2, 2, 2, 4});
+    countryGroupAssignment.put("MO", new int[] {0, 1, 4, 4});
+    countryGroupAssignment.put("MP", new int[] {0, 0, 4, 4});
+    countryGroupAssignment.put("MQ", new int[] {1, 1, 1, 3});
+    countryGroupAssignment.put("MR", new int[] {4, 2, 4, 2});
+    countryGroupAssignment.put("MS", new int[] {1, 2, 1, 2});
+    countryGroupAssignment.put("MT", new int[] {0, 0, 0, 0});
+    countryGroupAssignment.put("MU", new int[] {2, 2, 4, 4});
+    countryGroupAssignment.put("MV", new int[] {4, 2, 0, 1});
+    countryGroupAssignment.put("MW", new int[] {3, 2, 1, 1});
+    countryGroupAssignment.put("MX", new int[] {2, 4, 3, 1});
+    countryGroupAssignment.put("MY", new int[] {2, 3, 3, 3});
+    countryGroupAssignment.put("MZ", new int[] {3, 3, 2, 4});
+    countryGroupAssignment.put("NA", new int[] {4, 2, 1, 1});
+    countryGroupAssignment.put("NC", new int[] {2, 1, 3, 3});
+    countryGroupAssignment.put("NE", new int[] {4, 4, 4, 4});
+    countryGroupAssignment.put("NF", new int[] {0, 2, 2, 2});
+    countryGroupAssignment.put("NG", new int[] {3, 4, 2, 2});
+    countryGroupAssignment.put("NI", new int[] {3, 4, 3, 3});
+    countryGroupAssignment.put("NL", new int[] {0, 1, 3, 2});
+    countryGroupAssignment.put("NO", new int[] {0, 0, 1, 0});
+    countryGroupAssignment.put("NP", new int[] {2, 3, 2, 2});
+    countryGroupAssignment.put("NR", new int[] {4, 3, 4, 1});
+    countryGroupAssignment.put("NU", new int[] {4, 2, 2, 2});
+    countryGroupAssignment.put("NZ", new int[] {0, 0, 0, 1});
+    countryGroupAssignment.put("OM", new int[] {2, 2, 1, 3});
+    countryGroupAssignment.put("PA", new int[] {1, 3, 2, 3});
+    countryGroupAssignment.put("PE", new int[] {2, 2, 4, 4});
+    countryGroupAssignment.put("PF", new int[] {2, 2, 0, 1});
+    countryGroupAssignment.put("PG", new int[] {4, 4, 4, 4});
+    countryGroupAssignment.put("PH", new int[] {3, 0, 4, 4});
+    countryGroupAssignment.put("PK", new int[] {3, 3, 3, 3});
+    countryGroupAssignment.put("PL", new int[] {1, 0, 1, 3});
+    countryGroupAssignment.put("PM", new int[] {0, 2, 2, 3});
+    countryGroupAssignment.put("PR", new int[] {2, 3, 4, 3});
+    countryGroupAssignment.put("PS", new int[] {2, 3, 0, 4});
+    countryGroupAssignment.put("PT", new int[] {1, 1, 1, 1});
+    countryGroupAssignment.put("PW", new int[] {3, 2, 3, 0});
+    countryGroupAssignment.put("PY", new int[] {2, 1, 3, 3});
+    countryGroupAssignment.put("QA", new int[] {2, 3, 1, 2});
+    countryGroupAssignment.put("RE", new int[] {1, 1, 2, 2});
+    countryGroupAssignment.put("RO", new int[] {0, 1, 1, 3});
+    countryGroupAssignment.put("RS", new int[] {1, 1, 0, 0});
+    countryGroupAssignment.put("RU", new int[] {0, 1, 1, 1});
+    countryGroupAssignment.put("RW", new int[] {3, 4, 3, 1});
+    countryGroupAssignment.put("SA", new int[] {3, 2, 2, 3});
+    countryGroupAssignment.put("SB", new int[] {4, 4, 3, 0});
+    countryGroupAssignment.put("SC", new int[] {4, 2, 0, 1});
+    countryGroupAssignment.put("SD", new int[] {3, 4, 4, 4});
+    countryGroupAssignment.put("SE", new int[] {0, 0, 0, 0});
+    countryGroupAssignment.put("SG", new int[] {1, 2, 3, 3});
+    countryGroupAssignment.put("SH", new int[] {4, 2, 2, 2});
+    countryGroupAssignment.put("SI", new int[] {0, 1, 0, 0});
+    countryGroupAssignment.put("SJ", new int[] {3, 2, 0, 2});
+    countryGroupAssignment.put("SK", new int[] {0, 1, 0, 1});
+    countryGroupAssignment.put("SL", new int[] {4, 3, 2, 4});
+    countryGroupAssignment.put("SM", new int[] {1, 0, 1, 1});
+    countryGroupAssignment.put("SN", new int[] {4, 4, 4, 2});
+    countryGroupAssignment.put("SO", new int[] {4, 4, 4, 3});
+    countryGroupAssignment.put("SR", new int[] {3, 2, 2, 3});
+    countryGroupAssignment.put("SS", new int[] {4, 3, 4, 2});
+    countryGroupAssignment.put("ST", new int[] {3, 2, 2, 2});
+    countryGroupAssignment.put("SV", new int[] {2, 3, 2, 3});
+    countryGroupAssignment.put("SX", new int[] {2, 4, 2, 0});
+    countryGroupAssignment.put("SY", new int[] {4, 4, 2, 0});
+    countryGroupAssignment.put("SZ", new int[] {3, 4, 1, 1});
+    countryGroupAssignment.put("TC", new int[] {2, 1, 2, 1});
+    countryGroupAssignment.put("TD", new int[] {4, 4, 4, 3});
+    countryGroupAssignment.put("TG", new int[] {3, 2, 2, 0});
+    countryGroupAssignment.put("TH", new int[] {1, 3, 4, 4});
+    countryGroupAssignment.put("TJ", new int[] {4, 4, 4, 4});
+    countryGroupAssignment.put("TL", new int[] {4, 2, 4, 4});
+    countryGroupAssignment.put("TM", new int[] {4, 1, 3, 3});
+    countryGroupAssignment.put("TN", new int[] {2, 2, 1, 2});
+    countryGroupAssignment.put("TO", new int[] {2, 3, 3, 1});
+    countryGroupAssignment.put("TR", new int[] {1, 2, 0, 2});
+    countryGroupAssignment.put("TT", new int[] {2, 1, 1, 0});
+    countryGroupAssignment.put("TV", new int[] {4, 2, 2, 4});
+    countryGroupAssignment.put("TW", new int[] {0, 0, 0, 1});
+    countryGroupAssignment.put("TZ", new int[] {3, 3, 3, 2});
+    countryGroupAssignment.put("UA", new int[] {0, 2, 1, 3});
+    countryGroupAssignment.put("UG", new int[] {4, 3, 2, 2});
+    countryGroupAssignment.put("US", new int[] {0, 1, 3, 3});
+    countryGroupAssignment.put("UY", new int[] {2, 1, 2, 2});
+    countryGroupAssignment.put("UZ", new int[] {4, 3, 2, 4});
+    countryGroupAssignment.put("VA", new int[] {1, 2, 2, 2});
+    countryGroupAssignment.put("VC", new int[] {2, 0, 3, 2});
+    countryGroupAssignment.put("VE", new int[] {3, 4, 4, 3});
+    countryGroupAssignment.put("VG", new int[] {3, 1, 3, 4});
+    countryGroupAssignment.put("VI", new int[] {1, 0, 2, 4});
+    countryGroupAssignment.put("VN", new int[] {0, 2, 4, 4});
+    countryGroupAssignment.put("VU", new int[] {4, 1, 3, 2});
+    countryGroupAssignment.put("WS", new int[] {3, 2, 3, 0});
+    countryGroupAssignment.put("XK", new int[] {1, 2, 1, 0});
+    countryGroupAssignment.put("YE", new int[] {4, 4, 4, 2});
+    countryGroupAssignment.put("YT", new int[] {3, 1, 1, 2});
+    countryGroupAssignment.put("ZA", new int[] {2, 3, 1, 2});
+    countryGroupAssignment.put("ZM", new int[] {3, 3, 3, 1});
+    countryGroupAssignment.put("ZW", new int[] {3, 3, 2, 1});
+    return Collections.unmodifiableMap(countryGroupAssignment);
+  }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/CountryAndNetworkTypeBandwidthMeterTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeterTest.java
similarity index 69%
rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/CountryAndNetworkTypeBandwidthMeterTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeterTest.java
index 2549e004e5..ebdb45909b 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/CountryAndNetworkTypeBandwidthMeterTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeterTest.java
@@ -24,7 +24,6 @@ import android.net.NetworkInfo;
 import android.net.NetworkInfo.DetailedState;
 import android.telephony.TelephonyManager;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.util.ClosedSource;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -33,10 +32,9 @@ import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.shadows.ShadowNetworkInfo;
 
-/** Unit test for {@link CountryAndNetworkTypeBandwidthMeter}. */
-@ClosedSource(reason = "Not ready yet")
+/** Unit test for {@link DefaultBandwidthMeter}. */
 @RunWith(RobolectricTestRunner.class)
-public final class CountryAndNetworkTypeBandwidthMeterTest {
+public final class DefaultBandwidthMeterTest {
 
   private static final String FAST_COUNTRY_ISO = "EE";
   private static final String SLOW_COUNTRY_ISO = "PG";
@@ -106,13 +104,13 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
   @Test
   public void defaultInitialBitrateEstimate_forWifi_isGreaterThanEstimateFor2G() {
     setActiveNetworkInfo(networkInfoWifi);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeterWifi =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeterWifi =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimateWifi = bandwidthMeterWifi.getBitrateEstimate();
 
     setActiveNetworkInfo(networkInfo2g);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeter2g =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeter2g =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimate2g = bandwidthMeter2g.getBitrateEstimate();
 
     assertThat(initialEstimateWifi).isGreaterThan(initialEstimate2g);
@@ -121,13 +119,13 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
   @Test
   public void defaultInitialBitrateEstimate_forWifi_isGreaterThanEstimateFor3G() {
     setActiveNetworkInfo(networkInfoWifi);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeterWifi =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeterWifi =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimateWifi = bandwidthMeterWifi.getBitrateEstimate();
 
     setActiveNetworkInfo(networkInfo3g);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeter3g =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeter3g =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimate3g = bandwidthMeter3g.getBitrateEstimate();
 
     assertThat(initialEstimateWifi).isGreaterThan(initialEstimate3g);
@@ -136,13 +134,13 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
   @Test
   public void defaultInitialBitrateEstimate_forEthernet_isGreaterThanEstimateFor2G() {
     setActiveNetworkInfo(networkInfoEthernet);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeterEthernet =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeterEthernet =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimateEthernet = bandwidthMeterEthernet.getBitrateEstimate();
 
     setActiveNetworkInfo(networkInfo2g);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeter2g =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeter2g =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimate2g = bandwidthMeter2g.getBitrateEstimate();
 
     assertThat(initialEstimateEthernet).isGreaterThan(initialEstimate2g);
@@ -151,13 +149,13 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
   @Test
   public void defaultInitialBitrateEstimate_forEthernet_isGreaterThanEstimateFor3G() {
     setActiveNetworkInfo(networkInfoEthernet);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeterEthernet =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeterEthernet =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimateEthernet = bandwidthMeterEthernet.getBitrateEstimate();
 
     setActiveNetworkInfo(networkInfo3g);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeter3g =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeter3g =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimate3g = bandwidthMeter3g.getBitrateEstimate();
 
     assertThat(initialEstimateEthernet).isGreaterThan(initialEstimate3g);
@@ -166,13 +164,13 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
   @Test
   public void defaultInitialBitrateEstimate_for4G_isGreaterThanEstimateFor2G() {
     setActiveNetworkInfo(networkInfo4g);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeter4g =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeter4g =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimate4g = bandwidthMeter4g.getBitrateEstimate();
 
     setActiveNetworkInfo(networkInfo2g);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeter2g =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeter2g =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimate2g = bandwidthMeter2g.getBitrateEstimate();
 
     assertThat(initialEstimate4g).isGreaterThan(initialEstimate2g);
@@ -181,13 +179,13 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
   @Test
   public void defaultInitialBitrateEstimate_for4G_isGreaterThanEstimateFor3G() {
     setActiveNetworkInfo(networkInfo4g);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeter4g =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeter4g =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimate4g = bandwidthMeter4g.getBitrateEstimate();
 
     setActiveNetworkInfo(networkInfo3g);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeter3g =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeter3g =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimate3g = bandwidthMeter3g.getBitrateEstimate();
 
     assertThat(initialEstimate4g).isGreaterThan(initialEstimate3g);
@@ -196,13 +194,13 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
   @Test
   public void defaultInitialBitrateEstimate_for3G_isGreaterThanEstimateFor2G() {
     setActiveNetworkInfo(networkInfo3g);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeter3g =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeter3g =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimate3g = bandwidthMeter3g.getBitrateEstimate();
 
     setActiveNetworkInfo(networkInfo2g);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeter2g =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeter2g =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimate2g = bandwidthMeter2g.getBitrateEstimate();
 
     assertThat(initialEstimate3g).isGreaterThan(initialEstimate2g);
@@ -211,8 +209,8 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
   @Test
   public void defaultInitialBitrateEstimate_forOffline_isReasonable() {
     setActiveNetworkInfo(networkInfoOffline);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeter =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
 
     assertThat(initialEstimate).isGreaterThan(100_000L);
@@ -224,13 +222,13 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
       defaultInitialBitrateEstimate_forWifi_forFastCountry_isGreaterThanEstimateForSlowCountry() {
     setActiveNetworkInfo(networkInfoWifi);
     setNetworkCountryIso(FAST_COUNTRY_ISO);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeterFast =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeterFast =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimateFast = bandwidthMeterFast.getBitrateEstimate();
 
     setNetworkCountryIso(SLOW_COUNTRY_ISO);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeterSlow =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeterSlow =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimateSlow = bandwidthMeterSlow.getBitrateEstimate();
 
     assertThat(initialEstimateFast).isGreaterThan(initialEstimateSlow);
@@ -241,13 +239,13 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
       defaultInitialBitrateEstimate_forEthernet_forFastCountry_isGreaterThanEstimateForSlowCountry() {
     setActiveNetworkInfo(networkInfoEthernet);
     setNetworkCountryIso(FAST_COUNTRY_ISO);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeterFast =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeterFast =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimateFast = bandwidthMeterFast.getBitrateEstimate();
 
     setNetworkCountryIso(SLOW_COUNTRY_ISO);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeterSlow =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeterSlow =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimateSlow = bandwidthMeterSlow.getBitrateEstimate();
 
     assertThat(initialEstimateFast).isGreaterThan(initialEstimateSlow);
@@ -258,13 +256,13 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
       defaultInitialBitrateEstimate_for2G_forFastCountry_isGreaterThanEstimateForSlowCountry() {
     setActiveNetworkInfo(networkInfo2g);
     setNetworkCountryIso(FAST_COUNTRY_ISO);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeterFast =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeterFast =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimateFast = bandwidthMeterFast.getBitrateEstimate();
 
     setNetworkCountryIso(SLOW_COUNTRY_ISO);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeterSlow =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeterSlow =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimateSlow = bandwidthMeterSlow.getBitrateEstimate();
 
     assertThat(initialEstimateFast).isGreaterThan(initialEstimateSlow);
@@ -275,13 +273,13 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
       defaultInitialBitrateEstimate_for3G_forFastCountry_isGreaterThanEstimateForSlowCountry() {
     setActiveNetworkInfo(networkInfo3g);
     setNetworkCountryIso(FAST_COUNTRY_ISO);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeterFast =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeterFast =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimateFast = bandwidthMeterFast.getBitrateEstimate();
 
     setNetworkCountryIso(SLOW_COUNTRY_ISO);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeterSlow =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeterSlow =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimateSlow = bandwidthMeterSlow.getBitrateEstimate();
 
     assertThat(initialEstimateFast).isGreaterThan(initialEstimateSlow);
@@ -292,13 +290,13 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
       defaultInitialBitrateEstimate_for4g_forFastCountry_isGreaterThanEstimateForSlowCountry() {
     setActiveNetworkInfo(networkInfo4g);
     setNetworkCountryIso(FAST_COUNTRY_ISO);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeterFast =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeterFast =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimateFast = bandwidthMeterFast.getBitrateEstimate();
 
     setNetworkCountryIso(SLOW_COUNTRY_ISO);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeterSlow =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeterSlow =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimateSlow = bandwidthMeterSlow.getBitrateEstimate();
 
     assertThat(initialEstimateFast).isGreaterThan(initialEstimateSlow);
@@ -307,8 +305,8 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
   @Test
   public void initialBitrateEstimateOverwrite_whileConnectedToNetwork_setsInitialEstimate() {
     setActiveNetworkInfo(networkInfoWifi);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+    DefaultBandwidthMeter bandwidthMeter =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
             .setInitialBitrateEstimate(123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -319,8 +317,8 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
   @Test
   public void initialBitrateEstimateOverwrite_whileOffline_setsInitialEstimate() {
     setActiveNetworkInfo(networkInfoOffline);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+    DefaultBandwidthMeter bandwidthMeter =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
             .setInitialBitrateEstimate(123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -331,8 +329,8 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
   @Test
   public void initialBitrateEstimateOverwrite_forWifi_whileConnectedToWifi_setsInitialEstimate() {
     setActiveNetworkInfo(networkInfoWifi);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+    DefaultBandwidthMeter bandwidthMeter =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
             .setInitialBitrateEstimate(C.NETWORK_TYPE_WIFI, 123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -344,8 +342,8 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
   public void
       initialBitrateEstimateOverwrite_forWifi_whileConnectedToOtherNetwork_doesNotSetInitialEstimate() {
     setActiveNetworkInfo(networkInfo2g);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+    DefaultBandwidthMeter bandwidthMeter =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
             .setInitialBitrateEstimate(C.NETWORK_TYPE_WIFI, 123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -357,8 +355,8 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
   public void
       initialBitrateEstimateOverwrite_forEthernet_whileConnectedToEthernet_setsInitialEstimate() {
     setActiveNetworkInfo(networkInfoEthernet);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+    DefaultBandwidthMeter bandwidthMeter =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
             .setInitialBitrateEstimate(C.NETWORK_TYPE_ETHERNET, 123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -370,8 +368,8 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
   public void
       initialBitrateEstimateOverwrite_forEthernet_whileConnectedToOtherNetwork_doesNotSetInitialEstimate() {
     setActiveNetworkInfo(networkInfo2g);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+    DefaultBandwidthMeter bandwidthMeter =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
             .setInitialBitrateEstimate(C.NETWORK_TYPE_WIFI, 123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -382,8 +380,8 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
   @Test
   public void initialBitrateEstimateOverwrite_for2G_whileConnectedTo2G_setsInitialEstimate() {
     setActiveNetworkInfo(networkInfo2g);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+    DefaultBandwidthMeter bandwidthMeter =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
             .setInitialBitrateEstimate(C.NETWORK_TYPE_2G, 123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -395,8 +393,8 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
   public void
       initialBitrateEstimateOverwrite_for2G_whileConnectedToOtherNetwork_doesNotSetInitialEstimate() {
     setActiveNetworkInfo(networkInfoWifi);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+    DefaultBandwidthMeter bandwidthMeter =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
             .setInitialBitrateEstimate(C.NETWORK_TYPE_2G, 123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -407,8 +405,8 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
   @Test
   public void initialBitrateEstimateOverwrite_for3G_whileConnectedTo3G_setsInitialEstimate() {
     setActiveNetworkInfo(networkInfo3g);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+    DefaultBandwidthMeter bandwidthMeter =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
             .setInitialBitrateEstimate(C.NETWORK_TYPE_3G, 123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -420,8 +418,8 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
   public void
       initialBitrateEstimateOverwrite_for3G_whileConnectedToOtherNetwork_doesNotSetInitialEstimate() {
     setActiveNetworkInfo(networkInfoWifi);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+    DefaultBandwidthMeter bandwidthMeter =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
             .setInitialBitrateEstimate(C.NETWORK_TYPE_3G, 123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -432,8 +430,8 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
   @Test
   public void initialBitrateEstimateOverwrite_for4G_whileConnectedTo4G_setsInitialEstimate() {
     setActiveNetworkInfo(networkInfo4g);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+    DefaultBandwidthMeter bandwidthMeter =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
             .setInitialBitrateEstimate(C.NETWORK_TYPE_4G, 123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -445,8 +443,8 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
   public void
       initialBitrateEstimateOverwrite_for4G_whileConnectedToOtherNetwork_doesNotSetInitialEstimate() {
     setActiveNetworkInfo(networkInfoWifi);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+    DefaultBandwidthMeter bandwidthMeter =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
             .setInitialBitrateEstimate(C.NETWORK_TYPE_4G, 123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -457,8 +455,8 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
   @Test
   public void initialBitrateEstimateOverwrite_forOffline_whileOffline_setsInitialEstimate() {
     setActiveNetworkInfo(networkInfoOffline);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+    DefaultBandwidthMeter bandwidthMeter =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
             .setInitialBitrateEstimate(C.NETWORK_TYPE_OFFLINE, 123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -470,8 +468,8 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
   public void
       initialBitrateEstimateOverwrite_forOffline_whileConnectedToNetwork_doesNotSetInitialEstimate() {
     setActiveNetworkInfo(networkInfoWifi);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+    DefaultBandwidthMeter bandwidthMeter =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
             .setInitialBitrateEstimate(C.NETWORK_TYPE_OFFLINE, 123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -482,13 +480,13 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
   @Test
   public void initialBitrateEstimateOverwrite_forCountry_usesDefaultValuesForCountry() {
     setNetworkCountryIso(SLOW_COUNTRY_ISO);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeterSlow =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeterSlow =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimateSlow = bandwidthMeterSlow.getBitrateEstimate();
 
     setNetworkCountryIso(FAST_COUNTRY_ISO);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeterFastWithSlowOverwrite =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application)
+    DefaultBandwidthMeter bandwidthMeterFastWithSlowOverwrite =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
             .setInitialBitrateEstimate(SLOW_COUNTRY_ISO)
             .build();
     long initialEstimateFastWithSlowOverwrite =
@@ -499,12 +497,11 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
 
   @Test
   public void defaultInitialBitrateEstimate_withoutContext_isReasonable() {
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeterWithBuilder =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(/* context= */ null).build();
+    DefaultBandwidthMeter bandwidthMeterWithBuilder =
+        new DefaultBandwidthMeter.Builder(/* context= */ null).build();
     long initialEstimateWithBuilder = bandwidthMeterWithBuilder.getBitrateEstimate();
 
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeterWithoutBuilder =
-        new CountryAndNetworkTypeBandwidthMeter();
+    DefaultBandwidthMeter bandwidthMeterWithoutBuilder = new DefaultBandwidthMeter();
     long initialEstimateWithoutBuilder = bandwidthMeterWithoutBuilder.getBitrateEstimate();
 
     assertThat(initialEstimateWithBuilder).isGreaterThan(100_000L);
@@ -516,8 +513,8 @@ public final class CountryAndNetworkTypeBandwidthMeterTest {
   @Test
   public void defaultInitialBitrateEstimate_withoutAccessNetworkStatePermission_isReasonable() {
     Shadows.shadowOf(RuntimeEnvironment.application).denyPermissions(ACCESS_NETWORK_STATE);
-    CountryAndNetworkTypeBandwidthMeter bandwidthMeter =
-        new CountryAndNetworkTypeBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    DefaultBandwidthMeter bandwidthMeter =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
 
     assertThat(initialEstimate).isGreaterThan(100_000L);

From 43c01562d15782d68c06b9d438f96e05780833ea Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 3 Oct 2018 02:33:50 -0700
Subject: [PATCH 050/832] Fix positioning of subtitles.

SubtitleView forwards the cue box position to SubtitlePainter. This should be
the position relative to the canvas of the SubtitleView. Currently, however,
we forward the position relative to the parent of SubtitleView. That causes
problems if SubtitleView has a non-zero offset position to its parent.

Issue:#4788

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215535281
---
 RELEASENOTES.md                                    |  3 +++
 .../google/android/exoplayer2/ui/SubtitleView.java | 14 ++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 2e42b9a709..9d9d1fa0c6 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -14,6 +14,9 @@
 * Fix an issue with blind seeking to windows with non-zero offset in a
   `ConcatenatingMediaSource`
   ([#4873](https://github.com/google/ExoPlayer/issues/4873)).
+* Fix issue where subtitles have a wrong position if SubtitleView has a non-zero
+  offset to its parent
+  ([#4788](https://github.com/google/ExoPlayer/issues/4788)).
 
 ### 2.9.0 ###
 
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java
index 7426671041..50a923bced 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java
@@ -247,19 +247,17 @@ public final class SubtitleView extends View implements TextOutput {
   @Override
   public void dispatchDraw(Canvas canvas) {
     int cueCount = (cues == null) ? 0 : cues.size();
-    int rawTop = getTop();
-    int rawBottom = getBottom();
+    int rawViewHeight = getHeight();
 
-    // Calculate the bounds after padding is taken into account.
-    int left = getLeft() + getPaddingLeft();
-    int top = rawTop + getPaddingTop();
-    int right = getRight() - getPaddingRight();
-    int bottom = rawBottom - getPaddingBottom();
+    // Calculate the cue box bounds relative to the canvas after padding is taken into account.
+    int left = getPaddingLeft();
+    int top = getPaddingTop();
+    int right = getWidth() - getPaddingRight();
+    int bottom = rawViewHeight - getPaddingBottom();
     if (bottom <= top || right <= left) {
       // No space to draw subtitles.
       return;
     }
-    int rawViewHeight = rawBottom - rawTop;
     int viewHeightMinusPadding = bottom - top;
 
     float defaultViewTextSizePx =

From f0e0a7cf57323b41f44de611e2e52f865f760f01 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 3 Oct 2018 02:33:53 -0700
Subject: [PATCH 051/832] Fix left position for subtitles.

When SubtitlePainter positions the cues centred in the given box, it must add
the left offset of the box to get the correct position.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215535289
---
 .../java/com/google/android/exoplayer2/ui/SubtitlePainter.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java
index d8c61f5e05..4f22362de6 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java
@@ -310,7 +310,7 @@ import com.google.android.exoplayer2.util.Util;
       textLeft = Math.max(textLeft, parentLeft);
       textRight = Math.min(textLeft + textWidth, parentRight);
     } else {
-      textLeft = (parentWidth - textWidth) / 2;
+      textLeft = (parentWidth - textWidth) / 2 + parentLeft;
       textRight = textLeft + textWidth;
     }
 

From 9f8c22d7195d55eccca6a1d9b35cef23a3d3dce8 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 3 Oct 2018 03:45:00 -0700
Subject: [PATCH 052/832] Make it possible to use CacheKeyFactory with
 CacheDataSourceFactory and DownloaderConstructorHelper

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215541062
---
 .../offline/DownloaderConstructorHelper.java  | 137 ++++++++++++------
 .../offline/ProgressiveDownloader.java        |   2 +-
 .../exoplayer2/offline/SegmentDownloader.java |   4 +-
 .../upstream/cache/CacheDataSource.java       |  16 +-
 .../cache/CacheDataSourceFactory.java         |  96 ++++++++----
 5 files changed, 175 insertions(+), 80 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java
index 18387b9d92..28e898216d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java
@@ -19,55 +19,116 @@ import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.upstream.DataSink;
 import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.upstream.DataSource.Factory;
 import com.google.android.exoplayer2.upstream.DummyDataSource;
-import com.google.android.exoplayer2.upstream.FileDataSource;
-import com.google.android.exoplayer2.upstream.PriorityDataSource;
+import com.google.android.exoplayer2.upstream.FileDataSourceFactory;
+import com.google.android.exoplayer2.upstream.PriorityDataSourceFactory;
 import com.google.android.exoplayer2.upstream.cache.Cache;
-import com.google.android.exoplayer2.upstream.cache.CacheDataSink;
+import com.google.android.exoplayer2.upstream.cache.CacheDataSinkFactory;
 import com.google.android.exoplayer2.upstream.cache.CacheDataSource;
-import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.upstream.cache.CacheDataSourceFactory;
+import com.google.android.exoplayer2.upstream.cache.CacheKeyFactory;
 import com.google.android.exoplayer2.util.PriorityTaskManager;
 
 /** A helper class that holds necessary parameters for {@link Downloader} construction. */
 public final class DownloaderConstructorHelper {
 
   private final Cache cache;
-  private final Factory upstreamDataSourceFactory;
-  private final Factory cacheReadDataSourceFactory;
-  private final DataSink.Factory cacheWriteDataSinkFactory;
-  private final PriorityTaskManager priorityTaskManager;
+  @Nullable private final PriorityTaskManager priorityTaskManager;
+  private final CacheDataSourceFactory onlineCacheDataSourceFactory;
+  private final CacheDataSourceFactory offlineCacheDataSourceFactory;
 
   /**
    * @param cache Cache instance to be used to store downloaded data.
-   * @param upstreamDataSourceFactory A {@link Factory} for downloading data.
+   * @param upstreamFactory A {@link DataSource.Factory} for creating {@link DataSource}s for
+   *     downloading data.
    */
-  public DownloaderConstructorHelper(Cache cache, Factory upstreamDataSourceFactory) {
-    this(cache, upstreamDataSourceFactory, null, null, null);
+  public DownloaderConstructorHelper(Cache cache, DataSource.Factory upstreamFactory) {
+    this(
+        cache,
+        upstreamFactory,
+        /* cacheReadDataSourceFactory= */ null,
+        /* cacheWriteDataSinkFactory= */ null,
+        /* priorityTaskManager= */ null);
   }
 
   /**
    * @param cache Cache instance to be used to store downloaded data.
-   * @param upstreamDataSourceFactory A {@link Factory} for downloading data.
-   * @param cacheReadDataSourceFactory A {@link Factory} for reading data from the cache. If null
-   *     then standard {@link FileDataSource} instances will be used.
-   * @param cacheWriteDataSinkFactory A {@link DataSink.Factory} for writing data to the cache. If
-   *     null then standard {@link CacheDataSink} instances will be used.
+   * @param upstreamFactory A {@link DataSource.Factory} for creating {@link DataSource}s for
+   *     downloading data.
+   * @param cacheReadDataSourceFactory A {@link DataSource.Factory} for creating {@link DataSource}s
+   *     for reading data from the cache. If null then a {@link FileDataSourceFactory} will be used.
+   * @param cacheWriteDataSinkFactory A {@link DataSink.Factory} for creating {@link DataSource}s
+   *     for writing data to the cache. If null then a {@link CacheDataSinkFactory} will be used.
    * @param priorityTaskManager A {@link PriorityTaskManager} to use when downloading. If non-null,
    *     downloaders will register as tasks with priority {@link C#PRIORITY_DOWNLOAD} whilst
    *     downloading.
    */
   public DownloaderConstructorHelper(
       Cache cache,
-      Factory upstreamDataSourceFactory,
-      @Nullable Factory cacheReadDataSourceFactory,
+      DataSource.Factory upstreamFactory,
+      @Nullable DataSource.Factory cacheReadDataSourceFactory,
       @Nullable DataSink.Factory cacheWriteDataSinkFactory,
       @Nullable PriorityTaskManager priorityTaskManager) {
-    Assertions.checkNotNull(upstreamDataSourceFactory);
+    this(
+        cache,
+        upstreamFactory,
+        cacheReadDataSourceFactory,
+        cacheWriteDataSinkFactory,
+        priorityTaskManager,
+        /* cacheKeyFactory= */ null);
+  }
+
+  /**
+   * @param cache Cache instance to be used to store downloaded data.
+   * @param upstreamFactory A {@link DataSource.Factory} for creating {@link DataSource}s for
+   *     downloading data.
+   * @param cacheReadDataSourceFactory A {@link DataSource.Factory} for creating {@link DataSource}s
+   *     for reading data from the cache. If null then a {@link FileDataSourceFactory} will be used.
+   * @param cacheWriteDataSinkFactory A {@link DataSink.Factory} for creating {@link DataSource}s
+   *     for writing data to the cache. If null then a {@link CacheDataSinkFactory} will be used.
+   * @param priorityTaskManager A {@link PriorityTaskManager} to use when downloading. If non-null,
+   *     downloaders will register as tasks with priority {@link C#PRIORITY_DOWNLOAD} whilst
+   *     downloading.
+   * @param cacheKeyFactory An optional factory for cache keys.
+   */
+  public DownloaderConstructorHelper(
+      Cache cache,
+      DataSource.Factory upstreamFactory,
+      @Nullable DataSource.Factory cacheReadDataSourceFactory,
+      @Nullable DataSink.Factory cacheWriteDataSinkFactory,
+      @Nullable PriorityTaskManager priorityTaskManager,
+      @Nullable CacheKeyFactory cacheKeyFactory) {
+    if (priorityTaskManager != null) {
+      upstreamFactory =
+          new PriorityDataSourceFactory(upstreamFactory, priorityTaskManager, C.PRIORITY_DOWNLOAD);
+    }
+    DataSource.Factory readDataSourceFactory =
+        cacheReadDataSourceFactory != null
+            ? cacheReadDataSourceFactory
+            : new FileDataSourceFactory();
+    DataSink.Factory writeDataSinkFactory =
+        cacheWriteDataSinkFactory != null
+            ? cacheWriteDataSinkFactory
+            : new CacheDataSinkFactory(cache, CacheDataSource.DEFAULT_MAX_CACHE_FILE_SIZE);
+    onlineCacheDataSourceFactory =
+        new CacheDataSourceFactory(
+            cache,
+            upstreamFactory,
+            readDataSourceFactory,
+            writeDataSinkFactory,
+            CacheDataSource.FLAG_BLOCK_ON_CACHE,
+            /* eventListener= */ null,
+            cacheKeyFactory);
+    offlineCacheDataSourceFactory =
+        new CacheDataSourceFactory(
+            cache,
+            DummyDataSource.FACTORY,
+            readDataSourceFactory,
+            null,
+            CacheDataSource.FLAG_BLOCK_ON_CACHE,
+            /* eventListener= */ null,
+            cacheKeyFactory);
     this.cache = cache;
-    this.upstreamDataSourceFactory = upstreamDataSourceFactory;
-    this.cacheReadDataSourceFactory = cacheReadDataSourceFactory;
-    this.cacheWriteDataSinkFactory = cacheWriteDataSinkFactory;
     this.priorityTaskManager = priorityTaskManager;
   }
 
@@ -83,26 +144,16 @@ public final class DownloaderConstructorHelper {
     return priorityTaskManager != null ? priorityTaskManager : new PriorityTaskManager();
   }
 
-  /**
-   * Returns a new {@link CacheDataSource} instance. If {@code offline} is true, it can only read
-   * data from the cache.
-   */
-  public CacheDataSource buildCacheDataSource(boolean offline) {
-    DataSource cacheReadDataSource = cacheReadDataSourceFactory != null
-        ? cacheReadDataSourceFactory.createDataSource() : new FileDataSource();
-    if (offline) {
-      return new CacheDataSource(cache, DummyDataSource.INSTANCE,
-          cacheReadDataSource, null, CacheDataSource.FLAG_BLOCK_ON_CACHE, null);
-    } else {
-      DataSink cacheWriteDataSink = cacheWriteDataSinkFactory != null
-          ? cacheWriteDataSinkFactory.createDataSink()
-          : new CacheDataSink(cache, CacheDataSource.DEFAULT_MAX_CACHE_FILE_SIZE);
-      DataSource upstream = upstreamDataSourceFactory.createDataSource();
-      upstream = priorityTaskManager == null ? upstream
-          : new PriorityDataSource(upstream, priorityTaskManager, C.PRIORITY_DOWNLOAD);
-      return new CacheDataSource(cache, upstream, cacheReadDataSource,
-          cacheWriteDataSink, CacheDataSource.FLAG_BLOCK_ON_CACHE, null);
-    }
+  /** Returns a new {@link CacheDataSource} instance. */
+  public CacheDataSource createCacheDataSource() {
+    return onlineCacheDataSourceFactory.createDataSource();
   }
 
+  /**
+   * Returns a new {@link CacheDataSource} instance which accesses cache read-only and throws an
+   * exception on cache miss.
+   */
+  public CacheDataSource createOfflineCacheDataSource() {
+    return offlineCacheDataSourceFactory.createDataSource();
+  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
index 8c80a23d67..adb1c80b0e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
@@ -50,7 +50,7 @@ public final class ProgressiveDownloader implements Downloader {
       Uri uri, String customCacheKey, DownloaderConstructorHelper constructorHelper) {
     this.dataSpec = new DataSpec(uri, 0, C.LENGTH_UNSET, customCacheKey, 0);
     this.cache = constructorHelper.getCache();
-    this.dataSource = constructorHelper.buildCacheDataSource(false);
+    this.dataSource = constructorHelper.createCacheDataSource();
     this.priorityTaskManager = constructorHelper.getPriorityTaskManager();
     cachingCounters = new CachingCounters();
     isCanceled = new AtomicBoolean();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
index 625ec4f5e7..2fdaaa4cbd 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
@@ -84,8 +84,8 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
     this.manifestUri = manifestUri;
     this.streamKeys = new ArrayList<>(streamKeys);
     this.cache = constructorHelper.getCache();
-    this.dataSource = constructorHelper.buildCacheDataSource(false);
-    this.offlineDataSource = constructorHelper.buildCacheDataSource(true);
+    this.dataSource = constructorHelper.createCacheDataSource();
+    this.offlineDataSource = constructorHelper.createOfflineCacheDataSource();
     this.priorityTaskManager = constructorHelper.getPriorityTaskManager();
     totalSegments = C.LENGTH_UNSET;
     isCanceled = new AtomicBoolean();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
index fa2068b99d..37bc0aca37 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
@@ -57,8 +57,9 @@ public final class CacheDataSource implements DataSource {
   public static final long DEFAULT_MAX_CACHE_FILE_SIZE = 2 * 1024 * 1024;
 
   /**
-   * Flags controlling the cache's behavior. Possible flag values are {@link #FLAG_BLOCK_ON_CACHE},
-   * {@link #FLAG_IGNORE_CACHE_ON_ERROR} and {@link #FLAG_IGNORE_CACHE_FOR_UNSET_LENGTH_REQUESTS}.
+   * Flags controlling the CacheDataSource's behavior. Possible flag values are {@link
+   * #FLAG_BLOCK_ON_CACHE}, {@link #FLAG_IGNORE_CACHE_ON_ERROR} and {@link
+   * #FLAG_IGNORE_CACHE_FOR_UNSET_LENGTH_REQUESTS}.
    */
   @Documented
   @Retention(RetentionPolicy.SOURCE)
@@ -219,8 +220,13 @@ public final class CacheDataSource implements DataSource {
    *     and {@link #FLAG_IGNORE_CACHE_FOR_UNSET_LENGTH_REQUESTS}, or 0.
    * @param eventListener An optional {@link EventListener} to receive events.
    */
-  public CacheDataSource(Cache cache, DataSource upstream, DataSource cacheReadDataSource,
-      DataSink cacheWriteDataSink, @Flags int flags, @Nullable EventListener eventListener) {
+  public CacheDataSource(
+      Cache cache,
+      DataSource upstream,
+      DataSource cacheReadDataSource,
+      @Nullable DataSink cacheWriteDataSink,
+      @Flags int flags,
+      @Nullable EventListener eventListener) {
     this(
         cache,
         upstream,
@@ -250,7 +256,7 @@ public final class CacheDataSource implements DataSource {
       Cache cache,
       DataSource upstream,
       DataSource cacheReadDataSource,
-      DataSink cacheWriteDataSink,
+      @Nullable DataSink cacheWriteDataSink,
       @Flags int flags,
       @Nullable EventListener eventListener,
       @Nullable CacheKeyFactory cacheKeyFactory) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceFactory.java
index f0285da274..d9f9470fe3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceFactory.java
@@ -15,69 +15,107 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
+import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.upstream.DataSink;
 import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.upstream.DataSource.Factory;
 import com.google.android.exoplayer2.upstream.FileDataSourceFactory;
-import com.google.android.exoplayer2.upstream.cache.CacheDataSource.EventListener;
 
-/**
- * A {@link DataSource.Factory} that produces {@link CacheDataSource}.
- */
+/** A {@link DataSource.Factory} that produces {@link CacheDataSource}. */
 public final class CacheDataSourceFactory implements DataSource.Factory {
 
   private final Cache cache;
   private final DataSource.Factory upstreamFactory;
   private final DataSource.Factory cacheReadDataSourceFactory;
-  private final DataSink.Factory cacheWriteDataSinkFactory;
-  private final int flags;
-  private final EventListener eventListener;
+  @CacheDataSource.Flags private final int flags;
+  @Nullable private final DataSink.Factory cacheWriteDataSinkFactory;
+  @Nullable private final CacheDataSource.EventListener eventListener;
+  @Nullable private final CacheKeyFactory cacheKeyFactory;
 
   /**
-   * @see CacheDataSource#CacheDataSource(Cache, DataSource)
+   * Constructs a factory which creates {@link CacheDataSource} instances with default {@link
+   * DataSource} and {@link DataSink} instances for reading and writing the cache.
+   *
+   * @param cache The cache.
+   * @param upstreamFactory A {@link DataSource.Factory} for creating upstream {@link DataSource}s
+   *     for reading data not in the cache.
    */
   public CacheDataSourceFactory(Cache cache, DataSource.Factory upstreamFactory) {
-    this(cache, upstreamFactory, 0);
+    this(cache, upstreamFactory, /* flags= */ 0);
   }
 
-  /**
-   * @see CacheDataSource#CacheDataSource(Cache, DataSource, int)
-   */
-  public CacheDataSourceFactory(Cache cache, DataSource.Factory upstreamFactory,
-      @CacheDataSource.Flags int flags) {
+  /** @see CacheDataSource#CacheDataSource(Cache, DataSource, int) */
+  public CacheDataSourceFactory(
+      Cache cache, DataSource.Factory upstreamFactory, @CacheDataSource.Flags int flags) {
     this(cache, upstreamFactory, flags, CacheDataSource.DEFAULT_MAX_CACHE_FILE_SIZE);
   }
 
-  /**
-   * @see CacheDataSource#CacheDataSource(Cache, DataSource, int, long)
-   */
-  public CacheDataSourceFactory(Cache cache, DataSource.Factory upstreamFactory,
-      @CacheDataSource.Flags int flags, long maxCacheFileSize) {
-    this(cache, upstreamFactory, new FileDataSourceFactory(),
-        new CacheDataSinkFactory(cache, maxCacheFileSize), flags, null);
+  /** @see CacheDataSource#CacheDataSource(Cache, DataSource, int, long) */
+  public CacheDataSourceFactory(
+      Cache cache,
+      DataSource.Factory upstreamFactory,
+      @CacheDataSource.Flags int flags,
+      long maxCacheFileSize) {
+    this(
+        cache,
+        upstreamFactory,
+        new FileDataSourceFactory(),
+        new CacheDataSinkFactory(cache, maxCacheFileSize),
+        flags,
+        /* eventListener= */ null);
   }
 
   /**
    * @see CacheDataSource#CacheDataSource(Cache, DataSource, DataSource, DataSink, int,
-   *     EventListener)
+   *     CacheDataSource.EventListener)
    */
-  public CacheDataSourceFactory(Cache cache, Factory upstreamFactory,
-      Factory cacheReadDataSourceFactory, DataSink.Factory cacheWriteDataSinkFactory,
-      @CacheDataSource.Flags int flags, EventListener eventListener) {
+  public CacheDataSourceFactory(
+      Cache cache,
+      DataSource.Factory upstreamFactory,
+      DataSource.Factory cacheReadDataSourceFactory,
+      @Nullable DataSink.Factory cacheWriteDataSinkFactory,
+      @CacheDataSource.Flags int flags,
+      @Nullable CacheDataSource.EventListener eventListener) {
+    this(
+        cache,
+        upstreamFactory,
+        cacheReadDataSourceFactory,
+        cacheWriteDataSinkFactory,
+        flags,
+        eventListener,
+        /* cacheKeyFactory= */ null);
+  }
+
+  /**
+   * @see CacheDataSource#CacheDataSource(Cache, DataSource, DataSource, DataSink, int,
+   *     CacheDataSource.EventListener, CacheKeyFactory)
+   */
+  public CacheDataSourceFactory(
+      Cache cache,
+      DataSource.Factory upstreamFactory,
+      DataSource.Factory cacheReadDataSourceFactory,
+      @Nullable DataSink.Factory cacheWriteDataSinkFactory,
+      @CacheDataSource.Flags int flags,
+      @Nullable CacheDataSource.EventListener eventListener,
+      @Nullable CacheKeyFactory cacheKeyFactory) {
     this.cache = cache;
     this.upstreamFactory = upstreamFactory;
     this.cacheReadDataSourceFactory = cacheReadDataSourceFactory;
     this.cacheWriteDataSinkFactory = cacheWriteDataSinkFactory;
     this.flags = flags;
     this.eventListener = eventListener;
+    this.cacheKeyFactory = cacheKeyFactory;
   }
 
   @Override
   public CacheDataSource createDataSource() {
-    return new CacheDataSource(cache, upstreamFactory.createDataSource(),
+    return new CacheDataSource(
+        cache,
+        upstreamFactory.createDataSource(),
         cacheReadDataSourceFactory.createDataSource(),
-        cacheWriteDataSinkFactory != null ? cacheWriteDataSinkFactory.createDataSink() : null,
-        flags, eventListener);
+        cacheWriteDataSinkFactory == null ? null : cacheWriteDataSinkFactory.createDataSink(),
+        flags,
+        eventListener,
+        cacheKeyFactory);
   }
 
 }

From 645f08af73f4e69fa42a5256e64c11ae504ae2b8 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 3 Oct 2018 06:04:16 -0700
Subject: [PATCH 053/832] Prevent binding to DownloadService

DownloadService isn't designed to be bound.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215552423
---
 .../google/android/exoplayer2/offline/DownloadService.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index 5c6cf88b48..e9492f6b87 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -303,10 +303,11 @@ public abstract class DownloadService extends Service {
     maybeStopWatchingRequirements();
   }
 
+  /** DownloadService isn't designed to be bound. */
   @Nullable
   @Override
-  public IBinder onBind(Intent intent) {
-    return null;
+  public final IBinder onBind(Intent intent) {
+    throw new UnsupportedOperationException();
   }
 
   /**

From e91065c4b070d239d17b1a5d22e4c5bf3ac27222 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 3 Oct 2018 07:56:51 -0700
Subject: [PATCH 054/832] Remove ProjectionRenderer.EyeType

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215562599
---
 .../ui/spherical/ProjectionRenderer.java      | 23 +++++--------------
 .../ui/spherical/SceneRenderer.java           |  8 +++----
 .../ui/spherical/SphericalSurfaceView.java    |  3 +--
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/ProjectionRenderer.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/ProjectionRenderer.java
index 47515b023a..5e8a6d71d2 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/ProjectionRenderer.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/ProjectionRenderer.java
@@ -33,18 +33,6 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 @TargetApi(15)
 /* package */ final class ProjectionRenderer {
 
-  /** Defines the constants identifying the current eye type. */
-  /* package */ interface EyeType {
-    /** Single eye in monocular rendering. */
-    int MONOCULAR = 0;
-
-    /** The left eye in stereo rendering. */
-    int LEFT = 1;
-
-    /** The right eye in stereo rendering. */
-    int RIGHT = 2;
-  }
-
   /**
    * Returns whether {@code projection} is supported. At least it should have left mesh and there
    * should be only one sub mesh per mesh.
@@ -148,10 +136,11 @@ import org.checkerframework.checker.nullness.qual.Nullable;
    *
    * @param textureId GL_TEXTURE_EXTERNAL_OES used for this mesh.
    * @param mvpMatrix The Model View Projection matrix.
-   * @param eyeType An {@link EyeType} value.
+   * @param rightEye Whether the right eye view should be drawn. If {@code false}, the left eye view
+   *     is drawn.
    */
-  /* package */ void draw(int textureId, float[] mvpMatrix, int eyeType) {
-    MeshData meshData = eyeType == EyeType.RIGHT ? rightMeshData : leftMeshData;
+  /* package */ void draw(int textureId, float[] mvpMatrix, boolean rightEye) {
+    MeshData meshData = rightEye ? rightMeshData : leftMeshData;
     if (meshData == null) {
       return;
     }
@@ -166,9 +155,9 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 
     float[] texMatrix;
     if (stereoMode == C.STEREO_MODE_TOP_BOTTOM) {
-      texMatrix = eyeType == EyeType.RIGHT ? TEX_MATRIX_BOTTOM : TEX_MATRIX_TOP;
+      texMatrix = rightEye ? TEX_MATRIX_BOTTOM : TEX_MATRIX_TOP;
     } else if (stereoMode == C.STEREO_MODE_LEFT_RIGHT) {
-      texMatrix = eyeType == EyeType.RIGHT ? TEX_MATRIX_RIGHT : TEX_MATRIX_LEFT;
+      texMatrix = rightEye ? TEX_MATRIX_RIGHT : TEX_MATRIX_LEFT;
     } else {
       texMatrix = TEX_MATRIX_WHOLE;
     }
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java
index 048c346781..5099b2187d 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java
@@ -23,7 +23,6 @@ import android.opengl.Matrix;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
-import com.google.android.exoplayer2.ui.spherical.ProjectionRenderer.EyeType;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.GlUtil;
 import com.google.android.exoplayer2.util.TimedValueQueue;
@@ -103,9 +102,10 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
    * Draws the scene with a given eye pose and type.
    *
    * @param viewProjectionMatrix 16 element GL matrix.
-   * @param eyeType An {@link EyeType} value
+   * @param rightEye Whether the right eye view should be drawn. If {@code false}, the left eye view
+   *     is drawn.
    */
-  public void drawFrame(float[] viewProjectionMatrix, int eyeType) {
+  public void drawFrame(float[] viewProjectionMatrix, boolean rightEye) {
     // glClear isn't strictly necessary when rendering fully spherical panoramas, but it can improve
     // performance on tiled renderers by causing the GPU to discard previous data.
     GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
@@ -128,7 +128,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
       }
     }
     Matrix.multiplyMM(tempMatrix, 0, viewProjectionMatrix, 0, rotationMatrix, 0);
-    projectionRenderer.draw(textureId, tempMatrix, eyeType);
+    projectionRenderer.draw(textureId, tempMatrix, rightEye);
   }
 
   // Methods called on playback thread.
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java
index 9139137af4..bae29a6858 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java
@@ -36,7 +36,6 @@ import android.view.Surface;
 import android.view.WindowManager;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Player;
-import com.google.android.exoplayer2.ui.spherical.ProjectionRenderer.EyeType;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
 import javax.microedition.khronos.egl.EGLConfig;
@@ -287,7 +286,7 @@ public final class SphericalSurfaceView extends GLSurfaceView {
       }
 
       Matrix.multiplyMM(viewProjectionMatrix, 0, projectionMatrix, 0, viewMatrix, 0);
-      scene.drawFrame(viewProjectionMatrix, EyeType.MONOCULAR);
+      scene.drawFrame(viewProjectionMatrix, /* rightEye= */ false);
     }
 
     /** Adjusts the GL camera's rotation based on device rotation. Runs on the sensor thread. */

From 7849a5eb52a434883a0c0d33f0b9a9ab20067679 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Wed, 3 Oct 2018 22:19:13 +0100
Subject: [PATCH 055/832] Subrip cleanup

---
 RELEASENOTES.md                               |   2 +
 .../exoplayer2/text/subrip/SubripDecoder.java | 171 ++++++++----------
 .../src/test/assets/subrip/typical_with_tags  |   4 +-
 .../text/subrip/SubripDecoderTest.java        | 105 +++--------
 4 files changed, 111 insertions(+), 171 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 9d9d1fa0c6..0510055942 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -17,6 +17,8 @@
 * Fix issue where subtitles have a wrong position if SubtitleView has a non-zero
   offset to its parent
   ([#4788](https://github.com/google/ExoPlayer/issues/4788)).
+* SubRip: Add support for alignment tags, and remove tags from the displayed
+  captions ([#4306](https://github.com/google/ExoPlayer/issues/4306)).
 
 ### 2.9.0 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
index 182f1cf4b0..3b039061b0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
@@ -15,9 +15,8 @@
  */
 package com.google.android.exoplayer2.text.subrip;
 
-import android.support.annotation.StringDef;
+import android.support.annotation.Nullable;
 import android.text.Html;
-import android.text.Layout;
 import android.text.Spanned;
 import android.text.TextUtils;
 import com.google.android.exoplayer2.text.Cue;
@@ -25,9 +24,6 @@ import com.google.android.exoplayer2.text.SimpleSubtitleDecoder;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.LongArray;
 import com.google.android.exoplayer2.util.ParsableByteArray;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -37,6 +33,11 @@ import java.util.regex.Pattern;
  */
 public final class SubripDecoder extends SimpleSubtitleDecoder {
 
+  // Fractional positions for use when alignment tags are present.
+  /* package */ static final float START_FRACTION = 0.08f;
+  /* package */ static final float END_FRACTION = 1 - START_FRACTION;
+  /* package */ static final float MID_FRACTION = 0.5f;
+
   private static final String TAG = "SubripDecoder";
 
   private static final String SUBRIP_TIMECODE = "(?:(\\d+):)?(\\d+):(\\d+),(\\d+)";
@@ -46,35 +47,24 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
   private static final Pattern SUBRIP_TAG_PATTERN = Pattern.compile("\\{\\\\.*?\\}");
   private static final String SUBRIP_ALIGNMENT_TAG = "\\{\\\\an[1-9]\\}";
 
-  private static final float DEFAULT_START_FRACTION = 0.08f;
-  private static final float DEFAULT_END_FRACTION = 1 - DEFAULT_START_FRACTION;
-  private static final float DEFAULT_MID_FRACTION = 0.5f;
-
-  @Retention(RetentionPolicy.SOURCE)
-  @StringDef({
-      ALIGN_BOTTOM_LEFT, ALIGN_BOTTOM_MID, ALIGN_BOTTOM_RIGHT,
-      ALIGN_MID_LEFT, ALIGN_MID_MID, ALIGN_MID_RIGHT,
-      ALIGN_TOP_LEFT, ALIGN_TOP_MID, ALIGN_TOP_RIGHT
-  })
-
-  private @interface SubRipTag {}
-
-  // Possible valid alignment tags based on SSA v4+ specs
-  private static final String ALIGN_BOTTOM_LEFT  = "{\\an1}";
-  private static final String ALIGN_BOTTOM_MID   = "{\\an2}";
+  // Alignment tags for SSA V4+.
+  private static final String ALIGN_BOTTOM_LEFT = "{\\an1}";
+  private static final String ALIGN_BOTTOM_MID = "{\\an2}";
   private static final String ALIGN_BOTTOM_RIGHT = "{\\an3}";
-  private static final String ALIGN_MID_LEFT     = "{\\an4}";
-  private static final String ALIGN_MID_MID      = "{\\an5}";
-  private static final String ALIGN_MID_RIGHT    = "{\\an6}";
-  private static final String ALIGN_TOP_LEFT     = "{\\an7}";
-  private static final String ALIGN_TOP_MID      = "{\\an8}";
-  private static final String ALIGN_TOP_RIGHT    = "{\\an9}";
+  private static final String ALIGN_MID_LEFT = "{\\an4}";
+  private static final String ALIGN_MID_MID = "{\\an5}";
+  private static final String ALIGN_MID_RIGHT = "{\\an6}";
+  private static final String ALIGN_TOP_LEFT = "{\\an7}";
+  private static final String ALIGN_TOP_MID = "{\\an8}";
+  private static final String ALIGN_TOP_RIGHT = "{\\an9}";
 
   private final StringBuilder textBuilder;
+  private final ArrayList<String> tags;
 
   public SubripDecoder() {
     super("SubripDecoder");
     textBuilder = new StringBuilder();
+    tags = new ArrayList<>();
   }
 
   @Override
@@ -118,9 +108,9 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
         continue;
       }
 
-      // Read and parse the text.
-      ArrayList<String> tags = new ArrayList<>();
+      // Read and parse the text and tags.
       textBuilder.setLength(0);
+      tags.clear();
       while (!TextUtils.isEmpty(currentLine = subripData.readLine())) {
         if (textBuilder.length() > 0) {
           textBuilder.append("<br>");
@@ -129,21 +119,17 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
       }
 
       Spanned text = Html.fromHtml(textBuilder.toString());
-      Cue cue = null;
 
-      // At end of this loop the clue must be created with the applied tags
-      for (String tag : tags) {
-
-        // Check if the tag is an alignment tag
+      String alignmentTag = null;
+      for (int i = 0; i < tags.size(); i++) {
+        String tag = tags.get(i);
         if (tag.matches(SUBRIP_ALIGNMENT_TAG)) {
-          cue = buildCue(text, tag);
-
-          // Based on the specs, in case of alignment tags only the first appearance counts, so break
+          alignmentTag = tag;
+          // Subsequent alignment tags should be ignored.
           break;
         }
       }
-
-      cues.add(cue == null ? new Cue(text) : cue);
+      cues.add(buildCue(text, alignmentTag));
 
       if (haveEndTimecode) {
         cues.add(null);
@@ -157,108 +143,93 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
   }
 
   /**
-   * Process the given line by first trimming it then extracting the tags from it
-   * <p>
-   * The pattern that is used to extract the tags is specified in SSA v4+ specs and
-   * has the following form: "{\...}".
-   * <p>
-   * "All override codes appear within braces {}"
-   * "All override codes are always preceded by a backslash \"
+   * Trims and removes tags from the given line. The removed tags are added to {@code tags}.
    *
-   * @param currentLine Current line
-   * @param tags        Extracted tags will be stored in this array list
-   * @return Processed line
+   * @param line The line to process.
+   * @param tags A list to which removed tags will be added.
+   * @return The processed line.
    */
-  private String processLine(String currentLine, ArrayList<String> tags) {
-    // Trim line
-    String trimmedLine = currentLine.trim();
-
-    // Extract tags
-    int replacedCharacters = 0;
-    StringBuilder processedLine = new StringBuilder(trimmedLine);
-    Matcher matcher = SUBRIP_TAG_PATTERN.matcher(trimmedLine);
+  private String processLine(String line, ArrayList<String> tags) {
+    line = line.trim();
 
+    int removedCharacterCount = 0;
+    StringBuilder processedLine = new StringBuilder(line);
+    Matcher matcher = SUBRIP_TAG_PATTERN.matcher(line);
     while (matcher.find()) {
       String tag = matcher.group();
       tags.add(tag);
-      processedLine.replace(matcher.start() - replacedCharacters, matcher.end() - replacedCharacters, "");
-      replacedCharacters += tag.length();
+      int start = matcher.start() - removedCharacterCount;
+      int tagLength = tag.length();
+      processedLine.replace(start, /* end= */ start + tagLength, /* str= */ "");
+      removedCharacterCount += tagLength;
     }
 
     return processedLine.toString();
   }
 
   /**
-   * Build a {@link Cue} based on the given text and tag
-   * <p>
-   * Match the alignment tag and calculate the line, position, position anchor accordingly
-   * <p>
-   * Based on SSA v4+ specs the alignment tag can have the following form: {\an[1-9},
-   * where the number specifies the direction (based on the numpad layout).
-   * Note. older SSA scripts may contain tags like {\a1[1-9]} but these are based on
-   * other direction rules, but multiple sources says that these are deprecated, so no support here either
+   * Build a {@link Cue} based on the given text and alignment tag.
    *
-   * @param alignmentTag Alignment tag
+   * @param text The text.
+   * @param alignmentTag The alignment tag, or {@code null} if no alignment tag is available.
    * @return Built cue
    */
-  private Cue buildCue(Spanned text, String alignmentTag) {
-    float line, position;
-    @Cue.AnchorType int positionAnchor;
-    @Cue.AnchorType int lineAnchor;
+  private Cue buildCue(Spanned text, @Nullable String alignmentTag) {
+    if (alignmentTag == null) {
+      return new Cue(text);
+    }
 
-    // Set position and position anchor (horizontal alignment)
+    // Horizontal alignment.
+    @Cue.AnchorType int positionAnchor;
     switch (alignmentTag) {
       case ALIGN_BOTTOM_LEFT:
       case ALIGN_MID_LEFT:
       case ALIGN_TOP_LEFT:
-        position = DEFAULT_START_FRACTION;
         positionAnchor = Cue.ANCHOR_TYPE_START;
         break;
-      case ALIGN_BOTTOM_MID:
-      case ALIGN_MID_MID:
-      case ALIGN_TOP_MID:
-        position = DEFAULT_MID_FRACTION;
-        positionAnchor = Cue.ANCHOR_TYPE_MIDDLE;
-        break;
       case ALIGN_BOTTOM_RIGHT:
       case ALIGN_MID_RIGHT:
       case ALIGN_TOP_RIGHT:
-        position = DEFAULT_END_FRACTION;
         positionAnchor = Cue.ANCHOR_TYPE_END;
         break;
+      case ALIGN_BOTTOM_MID:
+      case ALIGN_MID_MID:
+      case ALIGN_TOP_MID:
       default:
-        position = DEFAULT_MID_FRACTION;
         positionAnchor = Cue.ANCHOR_TYPE_MIDDLE;
         break;
     }
 
-    // Set line and line anchor (vertical alignment)
+    // Vertical alignment.
+    @Cue.AnchorType int lineAnchor;
     switch (alignmentTag) {
       case ALIGN_BOTTOM_LEFT:
       case ALIGN_BOTTOM_MID:
       case ALIGN_BOTTOM_RIGHT:
-        line = DEFAULT_END_FRACTION;
         lineAnchor = Cue.ANCHOR_TYPE_END;
         break;
-      case ALIGN_MID_LEFT:
-      case ALIGN_MID_MID:
-      case ALIGN_MID_RIGHT:
-        line = DEFAULT_MID_FRACTION;
-        lineAnchor = Cue.ANCHOR_TYPE_MIDDLE;
-        break;
       case ALIGN_TOP_LEFT:
       case ALIGN_TOP_MID:
       case ALIGN_TOP_RIGHT:
-        line = DEFAULT_START_FRACTION;
         lineAnchor = Cue.ANCHOR_TYPE_START;
         break;
+      case ALIGN_MID_LEFT:
+      case ALIGN_MID_MID:
+      case ALIGN_MID_RIGHT:
       default:
-        line = DEFAULT_END_FRACTION;
-        lineAnchor = Cue.ANCHOR_TYPE_END;
+        lineAnchor = Cue.ANCHOR_TYPE_MIDDLE;
         break;
     }
 
-    return new Cue(text, null, line, Cue.LINE_TYPE_FRACTION, lineAnchor, position, positionAnchor, Cue.DIMEN_UNSET);
+    return new Cue(
+        text,
+        /* textAlignment= */ null,
+        getFractionalPositionForAnchorType(lineAnchor),
+        Cue.LINE_TYPE_FRACTION,
+        lineAnchor,
+        getFractionalPositionForAnchorType(positionAnchor),
+        positionAnchor,
+        Cue.DIMEN_UNSET);
   }
 
   private static long parseTimecode(Matcher matcher, int groupOffset) {
@@ -268,4 +239,16 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
     timestampMs += Long.parseLong(matcher.group(groupOffset + 4));
     return timestampMs * 1000;
   }
+
+  /* package */ static float getFractionalPositionForAnchorType(@Cue.AnchorType int anchorType) {
+    switch (anchorType) {
+      case Cue.ANCHOR_TYPE_START:
+        return SubripDecoder.START_FRACTION;
+      case Cue.ANCHOR_TYPE_MIDDLE:
+        return SubripDecoder.MID_FRACTION;
+      case Cue.ANCHOR_TYPE_END:
+      default:
+        return SubripDecoder.END_FRACTION;
+    }
+  }
 }
diff --git a/library/core/src/test/assets/subrip/typical_with_tags b/library/core/src/test/assets/subrip/typical_with_tags
index af196f8a04..85e304b498 100644
--- a/library/core/src/test/assets/subrip/typical_with_tags
+++ b/library/core/src/test/assets/subrip/typical_with_tags
@@ -13,7 +13,7 @@ This {\an2} is the third {\ tag} subtitle.
 
 4
 00:00:09,567 --> 00:00:12,901
-This { \an2} is the fourth subtitle.
+This { \an2} is not a valid tag due to the space after the opening bracket.
 
 5
 00:00:013,567 --> 00:00:14,901
@@ -53,4 +53,4 @@ This {\an8} is a line.
 
 14
 00:00:024,567 --> 00:00:24,901
-This {\an9} is a line.
\ No newline at end of file
+This {\an9} is a line.
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
index 554184da5d..1430c70e09 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
@@ -19,7 +19,6 @@ import static com.google.common.truth.Truth.assertThat;
 
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.text.Cue;
-
 import java.io.IOException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -158,89 +157,30 @@ public final class SubripDecoderTest {
   }
 
   @Test
-  public void testDecodeCueWithTag() throws IOException{
+  public void testDecodeCueWithTag() throws IOException {
     SubripDecoder decoder = new SubripDecoder();
     byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, TYPICAL_WITH_TAGS);
     SubripSubtitle subtitle = decoder.decode(bytes, bytes.length, false);
-    assertThat(subtitle.getCues(subtitle.getEventTime(0)).get(0).text.toString())
-        .isEqualTo("This is the first subtitle.");
-    assertThat(subtitle.getCues(subtitle.getEventTime(2)).get(0).text.toString())
-        .isEqualTo("This is the second subtitle.\nSecond subtitle with second line.");
-    assertThat(subtitle.getCues(subtitle.getEventTime(4)).get(0).text.toString())
-        .isEqualTo("This is the third subtitle.");
 
-    // Based on the SSA v4+ specs the curly bracket must be followed by a backslash, so this is
-    // not a valid tag (won't be parsed / replaced)
+    assertTypicalCue1(subtitle, 0);
+    assertTypicalCue2(subtitle, 2);
+    assertTypicalCue3(subtitle, 4);
+
     assertThat(subtitle.getCues(subtitle.getEventTime(6)).get(0).text.toString())
-        .isEqualTo("This { \\an2} is the fourth subtitle.");
+        .isEqualTo("This { \\an2} is not a valid tag due to the space after the opening bracket.");
 
     assertThat(subtitle.getCues(subtitle.getEventTime(8)).get(0).text.toString())
         .isEqualTo("This is the fifth subtitle with multiple valid tags.");
 
-    // Verify positions
-
-    // {/an1}
-    assertThat(subtitle.getCues(subtitle.getEventTime(10)).get(0).positionAnchor)
-        .isEqualTo(Cue.ANCHOR_TYPE_START);
-
-    assertThat(subtitle.getCues(subtitle.getEventTime(10)).get(0).lineAnchor)
-        .isEqualTo(Cue.ANCHOR_TYPE_END);
-
-    // {/an2}
-    assertThat(subtitle.getCues(subtitle.getEventTime(12)).get(0).positionAnchor)
-        .isEqualTo(Cue.ANCHOR_TYPE_MIDDLE);
-
-    assertThat(subtitle.getCues(subtitle.getEventTime(12)).get(0).lineAnchor)
-        .isEqualTo(Cue.ANCHOR_TYPE_END);
-
-    // {/an3}
-    assertThat(subtitle.getCues(subtitle.getEventTime(14)).get(0).positionAnchor)
-        .isEqualTo(Cue.ANCHOR_TYPE_END);
-
-    assertThat(subtitle.getCues(subtitle.getEventTime(14)).get(0).lineAnchor)
-        .isEqualTo(Cue.ANCHOR_TYPE_END);
-
-    // {/an4}
-    assertThat(subtitle.getCues(subtitle.getEventTime(16)).get(0).positionAnchor)
-        .isEqualTo(Cue.ANCHOR_TYPE_START);
-
-    assertThat(subtitle.getCues(subtitle.getEventTime(16)).get(0).lineAnchor)
-        .isEqualTo(Cue.ANCHOR_TYPE_MIDDLE);
-
-    // {/an5}
-    assertThat(subtitle.getCues(subtitle.getEventTime(18)).get(0).positionAnchor)
-        .isEqualTo(Cue.ANCHOR_TYPE_MIDDLE);
-
-    assertThat(subtitle.getCues(subtitle.getEventTime(18)).get(0).lineAnchor)
-        .isEqualTo(Cue.ANCHOR_TYPE_MIDDLE);
-
-    // {/an6}
-    assertThat(subtitle.getCues(subtitle.getEventTime(20)).get(0).positionAnchor)
-        .isEqualTo(Cue.ANCHOR_TYPE_END);
-
-    assertThat(subtitle.getCues(subtitle.getEventTime(20)).get(0).lineAnchor)
-        .isEqualTo(Cue.ANCHOR_TYPE_MIDDLE);
-
-    // {/an7}
-    assertThat(subtitle.getCues(subtitle.getEventTime(22)).get(0).positionAnchor)
-        .isEqualTo(Cue.ANCHOR_TYPE_START);
-
-    assertThat(subtitle.getCues(subtitle.getEventTime(22)).get(0).lineAnchor)
-        .isEqualTo(Cue.ANCHOR_TYPE_START);
-
-    // {/an8}
-    assertThat(subtitle.getCues(subtitle.getEventTime(24)).get(0).positionAnchor)
-        .isEqualTo(Cue.ANCHOR_TYPE_MIDDLE);
-
-    assertThat(subtitle.getCues(subtitle.getEventTime(24)).get(0).lineAnchor)
-        .isEqualTo(Cue.ANCHOR_TYPE_START);
-
-    // {/an9}
-    assertThat(subtitle.getCues(subtitle.getEventTime(26)).get(0).positionAnchor)
-        .isEqualTo(Cue.ANCHOR_TYPE_END);
-
-    assertThat(subtitle.getCues(subtitle.getEventTime(26)).get(0).lineAnchor)
-        .isEqualTo(Cue.ANCHOR_TYPE_START);
+    assertAlignmentCue(subtitle, 10, Cue.ANCHOR_TYPE_END, Cue.ANCHOR_TYPE_START); // {/an1}
+    assertAlignmentCue(subtitle, 12, Cue.ANCHOR_TYPE_END, Cue.ANCHOR_TYPE_MIDDLE); // {/an2}
+    assertAlignmentCue(subtitle, 14, Cue.ANCHOR_TYPE_END, Cue.ANCHOR_TYPE_END); // {/an3}
+    assertAlignmentCue(subtitle, 16, Cue.ANCHOR_TYPE_MIDDLE, Cue.ANCHOR_TYPE_START); // {/an4}
+    assertAlignmentCue(subtitle, 18, Cue.ANCHOR_TYPE_MIDDLE, Cue.ANCHOR_TYPE_MIDDLE); // {/an5}
+    assertAlignmentCue(subtitle, 20, Cue.ANCHOR_TYPE_MIDDLE, Cue.ANCHOR_TYPE_END); // {/an6}
+    assertAlignmentCue(subtitle, 22, Cue.ANCHOR_TYPE_START, Cue.ANCHOR_TYPE_START); // {/an7}
+    assertAlignmentCue(subtitle, 24, Cue.ANCHOR_TYPE_START, Cue.ANCHOR_TYPE_MIDDLE); // {/an8}
+    assertAlignmentCue(subtitle, 26, Cue.ANCHOR_TYPE_START, Cue.ANCHOR_TYPE_END); // {/an9}
   }
 
   private static void assertTypicalCue1(SubripSubtitle subtitle, int eventIndex) {
@@ -263,4 +203,19 @@ public final class SubripDecoderTest {
         .isEqualTo("This is the third subtitle.");
     assertThat(subtitle.getEventTime(eventIndex + 1)).isEqualTo(8901000);
   }
+
+  private static void assertAlignmentCue(
+      SubripSubtitle subtitle,
+      int eventIndex,
+      @Cue.AnchorType int lineAnchor,
+      @Cue.AnchorType int positionAnchor) {
+    long eventTimeUs = subtitle.getEventTime(eventIndex);
+    Cue cue = subtitle.getCues(eventTimeUs).get(0);
+    assertThat(cue.lineType).isEqualTo(Cue.LINE_TYPE_FRACTION);
+    assertThat(cue.lineAnchor).isEqualTo(lineAnchor);
+    assertThat(cue.line).isEqualTo(SubripDecoder.getFractionalPositionForAnchorType(lineAnchor));
+    assertThat(cue.positionAnchor).isEqualTo(positionAnchor);
+    assertThat(cue.position)
+        .isEqualTo(SubripDecoder.getFractionalPositionForAnchorType(positionAnchor));
+  }
 }

From 35cc479f76ec8d96a27409398acc0275f672a713 Mon Sep 17 00:00:00 2001
From: Brandon Davis <brandon_davis5@comcast.com>
Date: Thu, 4 Oct 2018 11:44:59 -0600
Subject: [PATCH 056/832] Create unique id for hls audio and text tracks

Combine groupId and name for uniqueness
---
 .../hls/playlist/HlsPlaylistParser.java       |  7 ++--
 .../playlist/HlsMasterPlaylistParserTest.java | 37 ++++++++++++++++++-
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
index 49826902cd..bd2bea0197 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
@@ -341,6 +341,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
       String name = parseStringAttr(line, REGEX_NAME, variableDefinitions);
       String language = parseOptionalStringAttr(line, REGEX_LANGUAGE, variableDefinitions);
       String groupId = parseOptionalStringAttr(line, REGEX_GROUP_ID, variableDefinitions);
+      String id = String.format("%s:%s", groupId, name);
       Format format;
       switch (parseStringAttr(line, REGEX_TYPE, variableDefinitions)) {
         case TYPE_AUDIO:
@@ -348,7 +349,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
           String sampleMimeType = codecs != null ? MimeTypes.getMediaMimeType(codecs) : null;
           format =
               Format.createAudioContainerFormat(
-                  /* id= */ name,
+                  /* id= */ id,
                   /* label= */ name,
                   /* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
                   sampleMimeType,
@@ -368,7 +369,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
         case TYPE_SUBTITLES:
           format =
               Format.createTextContainerFormat(
-                  /* id= */ name,
+                  /* id= */ id,
                   /* label= */ name,
                   /* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
                   /* sampleMimeType= */ MimeTypes.TEXT_VTT,
@@ -394,7 +395,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
           }
           muxedCaptionFormats.add(
               Format.createTextContainerFormat(
-                  /* id= */ name,
+                  /* id= */ id,
                   /* label= */ name,
                   /* containerMimeType= */ null,
                   /* sampleMimeType= */ mimeType,
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
index d818111eec..d03049efb3 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
@@ -75,7 +75,7 @@ public class HlsMasterPlaylistParserTest {
 
   private static final String PLAYLIST_WITH_CC =
       " #EXTM3U \n"
-          + "#EXT-X-MEDIA:TYPE=CLOSED-CAPTIONS,"
+          + "#EXT-X-MEDIA:TYPE=CLOSED-CAPTIONS,GROUP-ID=\"cc1\","
           + "LANGUAGE=\"es\",NAME=\"Eng\",INSTREAM-ID=\"SERVICE4\"\n"
           + "#EXT-X-STREAM-INF:BANDWIDTH=1280000,"
           + "CODECS=\"mp4a.40.2,avc1.66.30\",RESOLUTION=304x128\n"
@@ -90,6 +90,14 @@ public class HlsMasterPlaylistParserTest {
           + "CLOSED-CAPTIONS=NONE\n"
           + "http://example.com/low.m3u8\n";
 
+  private static final String PLAYLIST_WITH_SUBTITLES =
+      " #EXTM3U \n"
+          + "#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID=\"sub1\","
+          + "LANGUAGE=\"es\",NAME=\"Eng\"\n"
+          + "#EXT-X-STREAM-INF:BANDWIDTH=1280000,"
+          + "CODECS=\"mp4a.40.2,avc1.66.30\",RESOLUTION=304x128\n"
+          + "http://example.com/low.m3u8\n";
+
   private static final String PLAYLIST_WITH_AUDIO_MEDIA_TAG =
       "#EXTM3U\n"
           + "#EXT-X-STREAM-INF:BANDWIDTH=2227464,CODECS=\"avc1.640020,mp4a.40.2\",AUDIO=\"aud1\"\n"
@@ -216,6 +224,33 @@ public class HlsMasterPlaylistParserTest {
     assertThat(secondAudioFormat.sampleMimeType).isEqualTo(MimeTypes.AUDIO_AC3);
   }
 
+  @Test
+  public void testAudioIdPropagation() throws IOException {
+    HlsMasterPlaylist playlist = parseMasterPlaylist(PLAYLIST_URI, PLAYLIST_WITH_AUDIO_MEDIA_TAG);
+
+    Format firstAudioFormat = playlist.audios.get(0).format;
+    assertThat(firstAudioFormat.id).isEqualTo("aud1:English");
+
+    Format secondAudioFormat = playlist.audios.get(1).format;
+    assertThat(secondAudioFormat.id).isEqualTo("aud2:English");
+  }
+
+  @Test
+  public void testCCIdPropagation() throws IOException {
+    HlsMasterPlaylist playlist = parseMasterPlaylist(PLAYLIST_URI, PLAYLIST_WITH_CC);
+
+    Format firstTextFormat = playlist.muxedCaptionFormats.get(0);
+    assertThat(firstTextFormat.id).isEqualTo("cc1:Eng");
+  }
+
+  @Test
+  public void testSubtitleIdPropagation() throws IOException {
+    HlsMasterPlaylist playlist = parseMasterPlaylist(PLAYLIST_URI, PLAYLIST_WITH_SUBTITLES);
+
+    Format firstTextFormat = playlist.subtitles.get(0).format;
+    assertThat(firstTextFormat.id).isEqualTo("sub1:Eng");
+  }
+
   @Test
   public void testIndependentSegments() throws IOException {
     HlsMasterPlaylist playlistWithIndependentSegments =

From 57d90f30a88f58b09b6c6f0e8706833d30cdc844 Mon Sep 17 00:00:00 2001
From: Brandon Davis <brandon_davis5@comcast.com>
Date: Fri, 5 Oct 2018 08:37:30 -0600
Subject: [PATCH 057/832] add test for setForceHighestSupportedBitrate

---
 .../DefaultTrackSelectorTest.java             | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
index ee3d2cf9b0..8bb638d267 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
@@ -1078,6 +1078,33 @@ public final class DefaultTrackSelectorTest {
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(lowerBitrateFormat);
   }
 
+  /**
+   * Tests that track selector will select audio tracks with higher bitrate when {@link Parameters}
+   * indicate highest bitrate preference, even when tracks are within capabilities.
+   */
+  @Test
+  public void testSelectTracksWithinCapabilitiesAndForceHighestBitrateSelectHigherBitrate()
+          throws Exception {
+    trackSelector.setParameters(new ParametersBuilder().setForceHighestSupportedBitrate(true).build());
+
+    Format lowerBitrateFormat =
+            Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, 15000,
+                    Format.NO_VALUE, 2, 44100, null, null, 0, null);
+    Format higherBitrateFormat =
+            Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, 30000,
+                    Format.NO_VALUE, 2, 44100, null, null, 0, null);
+
+    TrackSelectorResult result =
+            trackSelector.selectTracks(
+                    new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
+                    singleTrackGroup(lowerBitrateFormat, higherBitrateFormat),
+                    periodId,
+                    TIMELINE);
+
+    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(higherBitrateFormat);
+  }
+
+
   @Test
   public void testSelectTracksWithMultipleAudioTracksReturnsAdaptiveTrackSelection()
       throws Exception {

From e42786d6f2e0a6ece1c2e26f9e62e2e8638d1ecc Mon Sep 17 00:00:00 2001
From: "Lieblich, Jonathan" <Jonathan_Lieblich@comcast.com>
Date: Wed, 10 Oct 2018 15:34:29 -0600
Subject: [PATCH 058/832] added parsing for program information

---
 .../source/dash/manifest/DashManifest.java    | 10 ++-
 .../dash/manifest/DashManifestParser.java     | 46 ++++++++++++-
 .../dash/manifest/ProgramInformation.java     | 67 +++++++++++++++++++
 library/dash/src/test/assets/sample_mpd_1     |  3 +
 .../dash/manifest/DashManifestParserTest.java | 12 ++++
 .../dash/manifest/DashManifestTest.java       |  2 +-
 6 files changed, 134 insertions(+), 6 deletions(-)
 create mode 100644 library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java

diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java
index 1fdb137be9..6446909808 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java
@@ -86,12 +86,17 @@ public class DashManifest implements FilterableManifest<DashManifest> {
    */
   public final Uri location;
 
+  /**
+   * The ProgramInformation of this manifest.
+   */
+  public final ProgramInformation programInformation;
+
   private final List<Period> periods;
 
   public DashManifest(long availabilityStartTimeMs, long durationMs, long minBufferTimeMs,
       boolean dynamic, long minUpdatePeriodMs, long timeShiftBufferDepthMs,
       long suggestedPresentationDelayMs, long publishTimeMs, UtcTimingElement utcTiming,
-      Uri location, List<Period> periods) {
+      Uri location, ProgramInformation programInformation, List<Period> periods) {
     this.availabilityStartTimeMs = availabilityStartTimeMs;
     this.durationMs = durationMs;
     this.minBufferTimeMs = minBufferTimeMs;
@@ -102,6 +107,7 @@ public class DashManifest implements FilterableManifest<DashManifest> {
     this.publishTimeMs = publishTimeMs;
     this.utcTiming = utcTiming;
     this.location = location;
+    this.programInformation = programInformation;
     this.periods = periods == null ? Collections.emptyList() : periods;
   }
 
@@ -150,7 +156,7 @@ public class DashManifest implements FilterableManifest<DashManifest> {
     long newDuration = durationMs != C.TIME_UNSET ? durationMs - shiftMs : C.TIME_UNSET;
     return new DashManifest(availabilityStartTimeMs, newDuration, minBufferTimeMs, dynamic,
         minUpdatePeriodMs, timeShiftBufferDepthMs, suggestedPresentationDelayMs, publishTimeMs,
-        utcTiming, location, copyPeriods);
+        utcTiming, location, programInformation, copyPeriods);
   }
 
   private static ArrayList<AdaptationSet> copyAdaptationSets(
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
index 153856af8c..ce629f6509 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
@@ -122,6 +122,7 @@ public class DashManifestParser extends DefaultHandler
     long publishTimeMs = parseDateTime(xpp, "publishTime", C.TIME_UNSET);
     UtcTimingElement utcTiming = null;
     Uri location = null;
+    ProgramInformation programInformation = null;
 
     List<Period> periods = new ArrayList<>();
     long nextPeriodStartMs = dynamic ? C.TIME_UNSET : 0;
@@ -138,6 +139,8 @@ public class DashManifestParser extends DefaultHandler
         utcTiming = parseUtcTiming(xpp);
       } else if (XmlPullParserUtil.isStartTag(xpp, "Location")) {
         location = Uri.parse(xpp.nextText());
+      } else if (XmlPullParserUtil.isStartTag(xpp, "ProgramInformation")) {
+        programInformation = parseProgramInformation(xpp);
       } else if (XmlPullParserUtil.isStartTag(xpp, "Period") && !seenEarlyAccessPeriod) {
         Pair<Period, Long> periodWithDurationMs = parsePeriod(xpp, baseUrl, nextPeriodStartMs);
         Period period = periodWithDurationMs.first;
@@ -173,16 +176,16 @@ public class DashManifestParser extends DefaultHandler
 
     return buildMediaPresentationDescription(availabilityStartTime, durationMs, minBufferTimeMs,
         dynamic, minUpdateTimeMs, timeShiftBufferDepthMs, suggestedPresentationDelayMs,
-        publishTimeMs, utcTiming, location, periods);
+        publishTimeMs, utcTiming, location, programInformation, periods);
   }
 
   protected DashManifest buildMediaPresentationDescription(long availabilityStartTime,
       long durationMs, long minBufferTimeMs, boolean dynamic, long minUpdateTimeMs,
       long timeShiftBufferDepthMs, long suggestedPresentationDelayMs, long publishTimeMs,
-      UtcTimingElement utcTiming, Uri location, List<Period> periods) {
+      UtcTimingElement utcTiming, Uri location, ProgramInformation programInformation, List<Period> periods) {
     return new DashManifest(availabilityStartTime, durationMs, minBufferTimeMs,
         dynamic, minUpdateTimeMs, timeShiftBufferDepthMs, suggestedPresentationDelayMs,
-        publishTimeMs, utcTiming, location, periods);
+        publishTimeMs, utcTiming, location, programInformation, periods);
   }
 
   protected UtcTimingElement parseUtcTiming(XmlPullParser xpp) {
@@ -978,6 +981,43 @@ public class DashManifestParser extends DefaultHandler
     return new RangedUri(urlText, rangeStart, rangeLength);
   }
 
+  protected ProgramInformation parseProgramInformation(XmlPullParser xpp) throws IOException, XmlPullParserException {
+    String title = "";
+    String source = "";
+    String copyright = "";
+    List<byte[]> customEvents = new ArrayList<>();
+    do {
+      xpp.next();
+      if (XmlPullParserUtil.isStartTag(xpp, "Title")) {
+        title = xpp.getText();
+      } else if (XmlPullParserUtil.isStartTag(xpp, "Source")) {
+        source = xpp.getText();
+      } else if (XmlPullParserUtil.isStartTag(xpp, "Copyright")) {
+        copyright = xpp.getText();
+      } else {
+        byte[] customElement = parseCustomElement(xpp, new ByteArrayOutputStream(512));
+        if (customElement.length > 0) {
+          customEvents.add(customElement);
+        }
+      }
+    } while (!XmlPullParserUtil.isEndTag(xpp, "ProgramInformation"));
+    return new ProgramInformation(title, source, copyright, customEvents);
+  }
+
+  private byte[] parseCustomElement(XmlPullParser xpp, ByteArrayOutputStream outputStream) throws IOException, XmlPullParserException {
+    XmlSerializer serializer = Xml.newSerializer();
+    serializer.setOutput(outputStream, C.UTF8_NAME);
+    if (xpp.getEventType() == XmlPullParser.START_TAG) {
+      serializer.startTag(xpp.getNamespace(), xpp.getName());
+      for (int i = 0; i < xpp.getAttributeCount(); i++) {
+        serializer.attribute(xpp.getAttributeNamespace(i), xpp.getAttributeName(i), xpp.getAttributeValue(i));
+      }
+      serializer.endTag(xpp.getNamespace(), xpp.getName());
+    }
+    serializer.flush();
+    return outputStream.toByteArray();
+  }
+
   // AudioChannelConfiguration parsing.
 
   protected int parseAudioChannelConfiguration(XmlPullParser xpp)
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java
new file mode 100644
index 0000000000..7d162336bc
--- /dev/null
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java
@@ -0,0 +1,67 @@
+package com.google.android.exoplayer2.source.dash.manifest;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class ProgramInformation {
+  /**
+   * The title for the media presentation.
+   */
+  public final String title;
+
+  /**
+   * Information about the original source of the media presentation.
+   */
+  public final String source;
+
+  /**
+   * A copyright statement for the media presentation.
+   */
+  public final String copyright;
+
+  /**
+   * A list of custom elements.
+   */
+  public final List<byte[]> customEvents;
+
+  public ProgramInformation(String title, String source, String copyright, List<byte[]> customEvents) {
+    this.title = title;
+    this.source = source;
+    this.copyright = copyright;
+    this.customEvents = customEvents;
+  }
+
+  @Override
+  public int hashCode() {
+    int result = 17;
+    result = 31 * result + (title != null ? title.hashCode() : 0);
+    result = 31 * result + (source != null ? source.hashCode() : 0);
+    result = 31 * result + (copyright != null ? copyright.hashCode() : 0);
+    for (int i = 0; i < customEvents.size(); i++) {
+      result = 31 * result + Arrays.hashCode(customEvents.get(i));
+    }
+    return result;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof ProgramInformation
+            && ((ProgramInformation)obj).title.equals(this.title)
+            && ((ProgramInformation)obj).source.equals(this.source)
+            && ((ProgramInformation)obj).copyright.equals(this.copyright)
+            && validateEvents(((ProgramInformation)obj).customEvents);
+  }
+
+  private boolean validateEvents(List<byte[]> customEvents) {
+    for (int i = 0; i < customEvents.size() && i < this.customEvents.size(); i++) {
+      byte[] comparator = customEvents.get(i);
+      byte[] current = this.customEvents.get(i);
+      for (int j = 0; j < comparator.length && j < current.length; j++) {
+        if (current[j] != comparator[j]) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+}
\ No newline at end of file
diff --git a/library/dash/src/test/assets/sample_mpd_1 b/library/dash/src/test/assets/sample_mpd_1
index 07bcdd4f50..e75c1234c0 100644
--- a/library/dash/src/test/assets/sample_mpd_1
+++ b/library/dash/src/test/assets/sample_mpd_1
@@ -9,6 +9,9 @@
     xmlns="urn:mpeg:DASH:schema:MPD:2011"
     xsi:schemaLocation="urn:mpeg:DASH:schema:MPD:2011 DASH-MPD.xsd"
     yt:earliestMediaSequence="1266404" >
+    <ProgramInformation>
+        <scte214:ContentIdentifier type="URN" value="5939026565177792163" />
+    </ProgramInformation>
     <Period start="PT6462826.784S" >
         <SegmentList
             presentationTimeOffset="34740095"
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java
index 23dc7f96ca..5551f05aae 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java
@@ -25,6 +25,7 @@ import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import org.junit.Test;
@@ -152,6 +153,17 @@ public class DashManifestParserTest {
                 1000000000));
   }
 
+  @Test
+  public void testParseMediaPresentationDescriptionCanParseProgramInformation() throws IOException {
+    DashManifestParser parser = new DashManifestParser();
+    DashManifest mpd = parser.parse(Uri.parse("Https://example.com/test.mpd"),
+            TestUtil.getInputStream(RuntimeEnvironment.application, SAMPLE_MPD_1));
+    List<byte[]> list = new ArrayList<>();
+    list.add("<scte214:ContentIdentifier type=\"URN\" value=\"5939026565177792163\" />".getBytes());
+    ProgramInformation programInformation = new ProgramInformation("", "", "", list);
+    assertThat(programInformation).isEqualTo(mpd.programInformation);
+  }
+
   @Test
   public void testParseCea608AccessibilityChannel() {
     assertThat(
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java
index 94f7a28a73..17a96fded3 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java
@@ -219,7 +219,7 @@ public class DashManifestTest {
 
   private static DashManifest newDashManifest(int duration, Period... periods) {
     return new DashManifest(
-        0, duration, 1, false, 2, 3, 4, 12345, DUMMY_UTC_TIMING, Uri.EMPTY, Arrays.asList(periods));
+        0, duration, 1, false, 2, 3, 4, 12345, DUMMY_UTC_TIMING, Uri.EMPTY, null, Arrays.asList(periods));
   }
 
   private static Period newPeriod(String id, int startMs, AdaptationSet... adaptationSets) {

From 8a671c1cfecfad30a7f5f41e49b302b68b5dc905 Mon Sep 17 00:00:00 2001
From: Brandon Davis <brandon_davis5@comcast.com>
Date: Thu, 11 Oct 2018 12:57:23 -0600
Subject: [PATCH 059/832] add check to ensure single track selection

---
 .../exoplayer2/trackselection/DefaultTrackSelectorTest.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
index 8bb638d267..f9f750aec8 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
@@ -1075,6 +1075,7 @@ public final class DefaultTrackSelectorTest {
             periodId,
             TIMELINE);
 
+    assertThat(result.selections.get(0).length()).isEqualTo(1);
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(lowerBitrateFormat);
   }
 
@@ -1101,6 +1102,7 @@ public final class DefaultTrackSelectorTest {
                     periodId,
                     TIMELINE);
 
+    assertThat(result.selections.get(0).length()).isEqualTo(1);
     assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(higherBitrateFormat);
   }
 

From a5b72762299adaf78b3609b454e8d28ce404aab6 Mon Sep 17 00:00:00 2001
From: Brandon Davis <brandon_davis5@comcast.com>
Date: Thu, 11 Oct 2018 13:01:33 -0600
Subject: [PATCH 060/832] Correct javadoc for forced bitrate tests

---
 .../trackselection/DefaultTrackSelectorTest.java          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
index f9f750aec8..5d0b48bd7f 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
@@ -1053,8 +1053,8 @@ public final class DefaultTrackSelectorTest {
   }
 
   /**
-   * Tests that track selector will select audio tracks with lower bitrate when {@link Parameters}
-   * indicate lowest bitrate preference, even when tracks are within capabilities.
+   * Tests that track selector will select the lowest supported audio track when
+   * {@link Parameters#forceLowestBitrate} is set.
    */
   @Test
   public void testSelectTracksWithinCapabilitiesAndForceLowestBitrateSelectLowerBitrate()
@@ -1080,8 +1080,8 @@ public final class DefaultTrackSelectorTest {
   }
 
   /**
-   * Tests that track selector will select audio tracks with higher bitrate when {@link Parameters}
-   * indicate highest bitrate preference, even when tracks are within capabilities.
+   * Tests that track selector will select the highest supported audio track when
+   * {@link Parameters#forceHighestSupportedBitrate} is set.
    */
   @Test
   public void testSelectTracksWithinCapabilitiesAndForceHighestBitrateSelectHigherBitrate()

From 211a2dfd7a9dc044f6c215a806e37e6c0d4ec074 Mon Sep 17 00:00:00 2001
From: Brandon Davis <brandon_davis5@comcast.com>
Date: Thu, 11 Oct 2018 13:04:17 -0600
Subject: [PATCH 061/832] Ensure formats have unique ids

---
 .../trackselection/DefaultTrackSelectorTest.java          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
index 5d0b48bd7f..3e6e0cbd24 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
@@ -1062,10 +1062,10 @@ public final class DefaultTrackSelectorTest {
     trackSelector.setParameters(new ParametersBuilder().setForceLowestBitrate(true).build());
 
     Format lowerBitrateFormat =
-        Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, 15000,
+        Format.createAudioSampleFormat("lowerBitrateFormat", MimeTypes.AUDIO_AAC, null, 15000,
             Format.NO_VALUE, 2, 44100, null, null, 0, null);
     Format higherBitrateFormat =
-        Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, 30000,
+        Format.createAudioSampleFormat("higherBitrateFormat", MimeTypes.AUDIO_AAC, null, 30000,
             Format.NO_VALUE, 2, 44100, null, null, 0, null);
 
     TrackSelectorResult result =
@@ -1089,10 +1089,10 @@ public final class DefaultTrackSelectorTest {
     trackSelector.setParameters(new ParametersBuilder().setForceHighestSupportedBitrate(true).build());
 
     Format lowerBitrateFormat =
-            Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, 15000,
+            Format.createAudioSampleFormat("lowerBitrateFormat", MimeTypes.AUDIO_AAC, null, 15000,
                     Format.NO_VALUE, 2, 44100, null, null, 0, null);
     Format higherBitrateFormat =
-            Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, 30000,
+            Format.createAudioSampleFormat("higherBitrateFormat", MimeTypes.AUDIO_AAC, null, 30000,
                     Format.NO_VALUE, 2, 44100, null, null, 0, null);
 
     TrackSelectorResult result =

From 30c7954482d10ef305803dca7e04ff55d7e7f3b5 Mon Sep 17 00:00:00 2001
From: Brandon Davis <brandon_davis5@comcast.com>
Date: Thu, 11 Oct 2018 13:05:21 -0600
Subject: [PATCH 062/832] add bitrate that is unsupported by renderer

---
 .../DefaultTrackSelectorTest.java             | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
index 3e6e0cbd24..2eb01e051e 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
@@ -1061,6 +1061,9 @@ public final class DefaultTrackSelectorTest {
       throws Exception {
     trackSelector.setParameters(new ParametersBuilder().setForceLowestBitrate(true).build());
 
+    Format exceedsBitrateFormat =
+        Format.createAudioSampleFormat("exceedsBitrateFormat", MimeTypes.AUDIO_AAC, null, 5000,
+                    Format.NO_VALUE, 2, 44100, null, null, 0, null);
     Format lowerBitrateFormat =
         Format.createAudioSampleFormat("lowerBitrateFormat", MimeTypes.AUDIO_AAC, null, 15000,
             Format.NO_VALUE, 2, 44100, null, null, 0, null);
@@ -1068,10 +1071,17 @@ public final class DefaultTrackSelectorTest {
         Format.createAudioSampleFormat("higherBitrateFormat", MimeTypes.AUDIO_AAC, null, 30000,
             Format.NO_VALUE, 2, 44100, null, null, 0, null);
 
+    Map<String, Integer> mappedCapabilities = new HashMap<>();
+    mappedCapabilities.put(exceedsBitrateFormat.id, FORMAT_EXCEEDS_CAPABILITIES);
+    mappedCapabilities.put(lowerBitrateFormat.id, FORMAT_HANDLED);
+    mappedCapabilities.put(higherBitrateFormat.id, FORMAT_HANDLED);
+    RendererCapabilities mappedAudioRendererCapabilities =
+            new FakeMappedRendererCapabilities(C.TRACK_TYPE_AUDIO, mappedCapabilities);
+
     TrackSelectorResult result =
         trackSelector.selectTracks(
-            new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
-            singleTrackGroup(lowerBitrateFormat, higherBitrateFormat),
+            new RendererCapabilities[] {mappedAudioRendererCapabilities},
+            singleTrackGroup(exceedsBitrateFormat, lowerBitrateFormat, higherBitrateFormat),
             periodId,
             TIMELINE);
 
@@ -1094,11 +1104,21 @@ public final class DefaultTrackSelectorTest {
     Format higherBitrateFormat =
             Format.createAudioSampleFormat("higherBitrateFormat", MimeTypes.AUDIO_AAC, null, 30000,
                     Format.NO_VALUE, 2, 44100, null, null, 0, null);
+    Format exceedsBitrateFormat =
+            Format.createAudioSampleFormat("exceedsBitrateFormat", MimeTypes.AUDIO_AAC, null, 45000,
+                    Format.NO_VALUE, 2, 44100, null, null, 0, null);
+
+    Map<String, Integer> mappedCapabilities = new HashMap<>();
+    mappedCapabilities.put(lowerBitrateFormat.id, FORMAT_HANDLED);
+    mappedCapabilities.put(higherBitrateFormat.id, FORMAT_HANDLED);
+    mappedCapabilities.put(exceedsBitrateFormat.id, FORMAT_EXCEEDS_CAPABILITIES);
+    RendererCapabilities mappedAudioRendererCapabilities =
+            new FakeMappedRendererCapabilities(C.TRACK_TYPE_AUDIO, mappedCapabilities);
 
     TrackSelectorResult result =
             trackSelector.selectTracks(
-                    new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
-                    singleTrackGroup(lowerBitrateFormat, higherBitrateFormat),
+                    new RendererCapabilities[] {mappedAudioRendererCapabilities},
+                    singleTrackGroup(lowerBitrateFormat, higherBitrateFormat, exceedsBitrateFormat),
                     periodId,
                     TIMELINE);
 

From ce0b5e4c445b96ca4a62bab722f34a29c844d9e7 Mon Sep 17 00:00:00 2001
From: "Lieblich, Jonathan" <Jonathan_Lieblich@comcast.com>
Date: Thu, 11 Oct 2018 16:25:21 -0600
Subject: [PATCH 063/832] removed custom element parsing

---
 .../dash/manifest/DashManifestParser.java     | 28 ++-------
 .../dash/manifest/ProgramInformation.java     | 62 +++++--------------
 2 files changed, 21 insertions(+), 69 deletions(-)

diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
index ce629f6509..1bbcab690b 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
@@ -982,10 +982,9 @@ public class DashManifestParser extends DefaultHandler
   }
 
   protected ProgramInformation parseProgramInformation(XmlPullParser xpp) throws IOException, XmlPullParserException {
-    String title = "";
-    String source = "";
-    String copyright = "";
-    List<byte[]> customEvents = new ArrayList<>();
+    String title = null;
+    String source = null;
+    String copyright = null;
     do {
       xpp.next();
       if (XmlPullParserUtil.isStartTag(xpp, "Title")) {
@@ -994,28 +993,9 @@ public class DashManifestParser extends DefaultHandler
         source = xpp.getText();
       } else if (XmlPullParserUtil.isStartTag(xpp, "Copyright")) {
         copyright = xpp.getText();
-      } else {
-        byte[] customElement = parseCustomElement(xpp, new ByteArrayOutputStream(512));
-        if (customElement.length > 0) {
-          customEvents.add(customElement);
-        }
       }
     } while (!XmlPullParserUtil.isEndTag(xpp, "ProgramInformation"));
-    return new ProgramInformation(title, source, copyright, customEvents);
-  }
-
-  private byte[] parseCustomElement(XmlPullParser xpp, ByteArrayOutputStream outputStream) throws IOException, XmlPullParserException {
-    XmlSerializer serializer = Xml.newSerializer();
-    serializer.setOutput(outputStream, C.UTF8_NAME);
-    if (xpp.getEventType() == XmlPullParser.START_TAG) {
-      serializer.startTag(xpp.getNamespace(), xpp.getName());
-      for (int i = 0; i < xpp.getAttributeCount(); i++) {
-        serializer.attribute(xpp.getAttributeNamespace(i), xpp.getAttributeName(i), xpp.getAttributeValue(i));
-      }
-      serializer.endTag(xpp.getNamespace(), xpp.getName());
-    }
-    serializer.flush();
-    return outputStream.toByteArray();
+    return new ProgramInformation(title, source, copyright);
   }
 
   // AudioChannelConfiguration parsing.
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java
index 7d162336bc..faf938e3df 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java
@@ -1,8 +1,20 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.google.android.exoplayer2.source.dash.manifest;
 
-import java.util.Arrays;
-import java.util.List;
-
 public class ProgramInformation {
   /**
    * The title for the media presentation.
@@ -19,49 +31,9 @@ public class ProgramInformation {
    */
   public final String copyright;
 
-  /**
-   * A list of custom elements.
-   */
-  public final List<byte[]> customEvents;
-
-  public ProgramInformation(String title, String source, String copyright, List<byte[]> customEvents) {
+  public ProgramInformation(String title, String source, String copyright) {
     this.title = title;
     this.source = source;
     this.copyright = copyright;
-    this.customEvents = customEvents;
   }
-
-  @Override
-  public int hashCode() {
-    int result = 17;
-    result = 31 * result + (title != null ? title.hashCode() : 0);
-    result = 31 * result + (source != null ? source.hashCode() : 0);
-    result = 31 * result + (copyright != null ? copyright.hashCode() : 0);
-    for (int i = 0; i < customEvents.size(); i++) {
-      result = 31 * result + Arrays.hashCode(customEvents.get(i));
-    }
-    return result;
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    return obj instanceof ProgramInformation
-            && ((ProgramInformation)obj).title.equals(this.title)
-            && ((ProgramInformation)obj).source.equals(this.source)
-            && ((ProgramInformation)obj).copyright.equals(this.copyright)
-            && validateEvents(((ProgramInformation)obj).customEvents);
-  }
-
-  private boolean validateEvents(List<byte[]> customEvents) {
-    for (int i = 0; i < customEvents.size() && i < this.customEvents.size(); i++) {
-      byte[] comparator = customEvents.get(i);
-      byte[] current = this.customEvents.get(i);
-      for (int j = 0; j < comparator.length && j < current.length; j++) {
-        if (current[j] != comparator[j]) {
-          return false;
-        }
-      }
-    }
-    return true;
-  }
-}
\ No newline at end of file
+}

From 6cbac152c9da36cddec56d6722666abd1721ba73 Mon Sep 17 00:00:00 2001
From: "Lieblich, Jonathan" <Jonathan_Lieblich@comcast.com>
Date: Thu, 11 Oct 2018 17:09:00 -0600
Subject: [PATCH 064/832] added attribute parsin

---
 .../dash/manifest/DashManifestParser.java     | 10 +++--
 .../dash/manifest/ProgramInformation.java     | 40 ++++++++++++++++++-
 library/dash/src/test/assets/sample_mpd_1     |  7 +++-
 .../dash/manifest/DashManifestParserTest.java |  5 +--
 4 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
index 1bbcab690b..9938f8564c 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
@@ -985,17 +985,19 @@ public class DashManifestParser extends DefaultHandler
     String title = null;
     String source = null;
     String copyright = null;
+    String moreInformationURL = parseString(xpp, "moreInformationURL", null);
+    String lang = parseString(xpp, "lang", null);
     do {
       xpp.next();
       if (XmlPullParserUtil.isStartTag(xpp, "Title")) {
-        title = xpp.getText();
+        title = xpp.nextText();
       } else if (XmlPullParserUtil.isStartTag(xpp, "Source")) {
-        source = xpp.getText();
+        source = xpp.nextText();
       } else if (XmlPullParserUtil.isStartTag(xpp, "Copyright")) {
-        copyright = xpp.getText();
+        copyright = xpp.nextText();
       }
     } while (!XmlPullParserUtil.isEndTag(xpp, "ProgramInformation"));
-    return new ProgramInformation(title, source, copyright);
+    return new ProgramInformation(title, source, copyright, moreInformationURL, lang);
   }
 
   // AudioChannelConfiguration parsing.
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java
index faf938e3df..d3fc909ef8 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java
@@ -15,6 +15,8 @@
  */
 package com.google.android.exoplayer2.source.dash.manifest;
 
+import com.google.android.exoplayer2.util.Util;
+
 public class ProgramInformation {
   /**
    * The title for the media presentation.
@@ -31,9 +33,45 @@ public class ProgramInformation {
    */
   public final String copyright;
 
-  public ProgramInformation(String title, String source, String copyright) {
+  /**
+   * A URL that provides more information about the media presentation.
+   */
+  public final String moreInformationURL;
+
+  /**
+   * Declares the language code(s) for this ProgramInformation.
+   */
+  public final String lang;
+
+  public ProgramInformation(String title, String source, String copyright, String moreInformationURL, String lang) {
     this.title = title;
     this.source = source;
     this.copyright = copyright;
+    this.moreInformationURL = moreInformationURL;
+    this.lang = lang;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (!(obj instanceof ProgramInformation)) {
+      return false;
+    }
+    ProgramInformation other = (ProgramInformation) obj;
+    return Util.areEqual(this.title, other.title)
+            && Util.areEqual(this.source, other.source)
+            && Util.areEqual(this.copyright, other.copyright)
+            && Util.areEqual(this.moreInformationURL, other.moreInformationURL)
+            && Util.areEqual(this.lang, other.lang);
+  }
+
+  @Override
+  public int hashCode() {
+    int result = 17;
+    result = 31 * result + (title != null ? title.hashCode() : 0);
+    result = 31 * result + (source != null ? source.hashCode() : 0);
+    result = 31 * result + (copyright != null ? copyright.hashCode() : 0);
+    result = 31 * result + (moreInformationURL != null ? moreInformationURL.hashCode() : 0);
+    result = 31 * result + (lang != null ? lang.hashCode() : 0);
+    return result;
   }
 }
diff --git a/library/dash/src/test/assets/sample_mpd_1 b/library/dash/src/test/assets/sample_mpd_1
index e75c1234c0..ccd3ab4dd6 100644
--- a/library/dash/src/test/assets/sample_mpd_1
+++ b/library/dash/src/test/assets/sample_mpd_1
@@ -9,8 +9,11 @@
     xmlns="urn:mpeg:DASH:schema:MPD:2011"
     xsi:schemaLocation="urn:mpeg:DASH:schema:MPD:2011 DASH-MPD.xsd"
     yt:earliestMediaSequence="1266404" >
-    <ProgramInformation>
-        <scte214:ContentIdentifier type="URN" value="5939026565177792163" />
+    <ProgramInformation lang="enUs"
+        moreInformationURL="www.example.com">
+        <Title>MediaTitle</Title>
+        <Source>MediaSource</Source>
+        <Copyright>MediaCopyright</Copyright>
     </ProgramInformation>
     <Period start="PT6462826.784S" >
         <SegmentList
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java
index 5551f05aae..3183e3c672 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java
@@ -158,9 +158,8 @@ public class DashManifestParserTest {
     DashManifestParser parser = new DashManifestParser();
     DashManifest mpd = parser.parse(Uri.parse("Https://example.com/test.mpd"),
             TestUtil.getInputStream(RuntimeEnvironment.application, SAMPLE_MPD_1));
-    List<byte[]> list = new ArrayList<>();
-    list.add("<scte214:ContentIdentifier type=\"URN\" value=\"5939026565177792163\" />".getBytes());
-    ProgramInformation programInformation = new ProgramInformation("", "", "", list);
+    ProgramInformation programInformation = new ProgramInformation("MediaTitle", "MediaSource",
+            "MediaCopyright", "www.example.com", "enUs");
     assertThat(programInformation).isEqualTo(mpd.programInformation);
   }
 

From ced302fd83c24258ee43932c68fa3245ea6ac789 Mon Sep 17 00:00:00 2001
From: "Lieblich, Jonathan" <Jonathan_Lieblich@comcast.com>
Date: Fri, 12 Oct 2018 11:00:17 -0600
Subject: [PATCH 065/832] added javadoc for  ProgramInformation

---
 .../exoplayer2/source/dash/manifest/ProgramInformation.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java
index d3fc909ef8..71b4af3a21 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java
@@ -17,6 +17,9 @@ package com.google.android.exoplayer2.source.dash.manifest;
 
 import com.google.android.exoplayer2.util.Util;
 
+/**
+ * A parsed ProgramInformation element.
+ */
 public class ProgramInformation {
   /**
    * The title for the media presentation.

From 9ca6544311c30a12b7f77dbea034a3fd2c922fbf Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 4 Oct 2018 02:06:32 -0700
Subject: [PATCH 066/832] Simplify some buffered position related code.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215704344
---
 .../exoplayer2/ExoPlayerImplInternal.java     | 27 ++++++++++++-------
 .../android/exoplayer2/MediaPeriodHolder.java | 13 +++------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index 6810c86558..8b22999679 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -496,10 +496,8 @@ import java.util.Collections;
 
     // Update the buffered position and total buffered duration.
     MediaPeriodHolder loadingPeriod = queue.getLoadingPeriod();
-    playbackInfo.bufferedPositionUs =
-        loadingPeriod.getBufferedPositionUs(/* convertEosToDuration= */ true);
-    playbackInfo.totalBufferedDurationUs =
-        playbackInfo.bufferedPositionUs - loadingPeriod.toPeriodTime(rendererPositionUs);
+    playbackInfo.bufferedPositionUs = loadingPeriod.getBufferedPositionUs();
+    playbackInfo.totalBufferedDurationUs = getTotalBufferedDurationUs();
   }
 
   private void doSomeWork() throws ExoPlaybackException, IOException {
@@ -1097,12 +1095,10 @@ import java.util.Collections;
     }
     // Renderers are ready and we're loading. Ask the LoadControl whether to transition.
     MediaPeriodHolder loadingHolder = queue.getLoadingPeriod();
-    long bufferedPositionUs = loadingHolder.getBufferedPositionUs(!loadingHolder.info.isFinal);
-    return bufferedPositionUs == C.TIME_END_OF_SOURCE
+    boolean bufferedToEnd = loadingHolder.isFullyBuffered() && loadingHolder.info.isFinal;
+    return bufferedToEnd
         || loadControl.shouldStartPlayback(
-            bufferedPositionUs - loadingHolder.toPeriodTime(rendererPositionUs),
-            mediaClock.getPlaybackParameters().speed,
-            rebuffering);
+            getTotalBufferedDurationUs(), mediaClock.getPlaybackParameters().speed, rebuffering);
   }
 
   private boolean isTimelineReady() {
@@ -1574,7 +1570,7 @@ import java.util.Collections;
       return;
     }
     long bufferedDurationUs =
-        nextLoadPositionUs - loadingPeriodHolder.toPeriodTime(rendererPositionUs);
+        getTotalBufferedDurationUs(/* bufferedPositionInLoadingPeriodUs= */ nextLoadPositionUs);
     boolean continueLoading =
         loadControl.shouldContinueLoading(
             bufferedDurationUs, mediaClock.getPlaybackParameters().speed);
@@ -1680,6 +1676,17 @@ import java.util.Collections;
     }
   }
 
+  private long getTotalBufferedDurationUs() {
+    return getTotalBufferedDurationUs(playbackInfo.bufferedPositionUs);
+  }
+
+  private long getTotalBufferedDurationUs(long bufferedPositionInLoadingPeriodUs) {
+    MediaPeriodHolder loadingPeriodHolder = queue.getLoadingPeriod();
+    return loadingPeriodHolder == null
+        ? 0
+        : bufferedPositionInLoadingPeriodUs - loadingPeriodHolder.toPeriodTime(rendererPositionUs);
+  }
+
   private void updateLoadControlTrackSelection(
       TrackGroupArray trackGroups, TrackSelectorResult trackSelectorResult) {
     loadControl.onTracksSelected(renderers, trackGroups, trackSelectorResult.selections);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
index 3ba96d2b80..4fc21475d9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
@@ -133,23 +133,18 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   }
 
   /**
-   * Returns the buffered position in microseconds. If the period is buffered to the end then
-   * {@link C#TIME_END_OF_SOURCE} is returned unless {@code convertEosToDuration} is true, in which
-   * case the period duration is returned.
+   * Returns the buffered position in microseconds. If the period is buffered to the end, then the
+   * period duration is returned.
    *
-   * @param convertEosToDuration Whether to return the period duration rather than
-   *     {@link C#TIME_END_OF_SOURCE} if the period is fully buffered.
    * @return The buffered position in microseconds.
    */
-  public long getBufferedPositionUs(boolean convertEosToDuration) {
+  public long getBufferedPositionUs() {
     if (!prepared) {
       return info.startPositionUs;
     }
     long bufferedPositionUs =
         hasEnabledTracks ? mediaPeriod.getBufferedPositionUs() : C.TIME_END_OF_SOURCE;
-    return bufferedPositionUs == C.TIME_END_OF_SOURCE && convertEosToDuration
-        ? info.durationUs
-        : bufferedPositionUs;
+    return bufferedPositionUs == C.TIME_END_OF_SOURCE ? info.durationUs : bufferedPositionUs;
   }
 
   /**

From 711f9f8b6ada665a5d2f9cd29724f3b718304d9d Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 4 Oct 2018 02:07:17 -0700
Subject: [PATCH 067/832] Add test action to wait for an isLoading change.

This allows to wait until loading started or finished.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215704424
---
 .../android/exoplayer2/testutil/Action.java   | 50 +++++++++++++++++++
 .../exoplayer2/testutil/ActionSchedule.java   | 11 ++++
 2 files changed, 61 insertions(+)

diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/Action.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/Action.java
index 14d62e85c8..c988c0c172 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/Action.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/Action.java
@@ -686,6 +686,56 @@ public abstract class Action {
     }
   }
 
+  /**
+   * Waits for a specified loading state, returning either immediately or after a call to {@link
+   * Player.EventListener#onLoadingChanged(boolean)}.
+   */
+  public static final class WaitForIsLoading extends Action {
+
+    private final boolean targetIsLoading;
+
+    /**
+     * @param tag A tag to use for logging.
+     * @param targetIsLoading The loading state to wait for.
+     */
+    public WaitForIsLoading(String tag, boolean targetIsLoading) {
+      super(tag, "WaitForIsLoading");
+      this.targetIsLoading = targetIsLoading;
+    }
+
+    @Override
+    protected void doActionAndScheduleNextImpl(
+        final SimpleExoPlayer player,
+        final DefaultTrackSelector trackSelector,
+        final Surface surface,
+        final HandlerWrapper handler,
+        final ActionNode nextAction) {
+      if (nextAction == null) {
+        return;
+      }
+      if (targetIsLoading == player.isLoading()) {
+        nextAction.schedule(player, trackSelector, surface, handler);
+      } else {
+        player.addListener(
+            new Player.EventListener() {
+              @Override
+              public void onLoadingChanged(boolean isLoading) {
+                if (targetIsLoading == isLoading) {
+                  player.removeListener(this);
+                  nextAction.schedule(player, trackSelector, surface, handler);
+                }
+              }
+            });
+      }
+    }
+
+    @Override
+    protected void doActionImpl(
+        SimpleExoPlayer player, DefaultTrackSelector trackSelector, Surface surface) {
+      // Not triggered.
+    }
+  }
+
   /**
    * Waits for {@link Player.EventListener#onSeekProcessed()}.
    */
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ActionSchedule.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ActionSchedule.java
index 54d97fb905..71f5fdeae1 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ActionSchedule.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ActionSchedule.java
@@ -41,6 +41,7 @@ import com.google.android.exoplayer2.testutil.Action.SetShuffleModeEnabled;
 import com.google.android.exoplayer2.testutil.Action.SetVideoSurface;
 import com.google.android.exoplayer2.testutil.Action.Stop;
 import com.google.android.exoplayer2.testutil.Action.ThrowPlaybackException;
+import com.google.android.exoplayer2.testutil.Action.WaitForIsLoading;
 import com.google.android.exoplayer2.testutil.Action.WaitForPlaybackState;
 import com.google.android.exoplayer2.testutil.Action.WaitForPositionDiscontinuity;
 import com.google.android.exoplayer2.testutil.Action.WaitForSeekProcessed;
@@ -414,6 +415,16 @@ public final class ActionSchedule {
       return apply(new WaitForPlaybackState(tag, targetPlaybackState));
     }
 
+    /**
+     * Schedules a delay until {@code player.isLoading()} changes to the specified value.
+     *
+     * @param targetIsLoading The target value of {@code player.isLoading()}.
+     * @return The builder, for convenience.
+     */
+    public Builder waitForIsLoading(boolean targetIsLoading) {
+      return apply(new WaitForIsLoading(tag, targetIsLoading));
+    }
+
     /**
      * Schedules a {@link Runnable} to be executed.
      *

From d4b87cdc2338e79f6d020d076da82491566fdfff Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 4 Oct 2018 03:32:54 -0700
Subject: [PATCH 068/832] Fix updates of loading period and buffered positions
 in PlaybackInfo.

This makes the following changes to improve consistency among the PlaybackInfo
values:
 1. Update buffered position and total buffered duration after loading period
    is set as both values are affected by a loading period update.
 2. Add copyWithPosition to allow updating the position without resetting the
    loading period.
 3. Forward the total buffered duration to playing position updates
    as it may have changed with the new playing position.

Issue:#4899

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215712328
---
 RELEASENOTES.md                               |   3 +
 .../android/exoplayer2/ExoPlayerImpl.java     |   2 +-
 .../exoplayer2/ExoPlayerImplInternal.java     |  55 +++++++---
 .../android/exoplayer2/PlaybackInfo.java      | 102 +++++++++++++++++-
 .../android/exoplayer2/ExoPlayerTest.java     |  53 +++++++++
 5 files changed, 198 insertions(+), 17 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 0510055942..e2f33d9150 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -19,6 +19,9 @@
   ([#4788](https://github.com/google/ExoPlayer/issues/4788)).
 * SubRip: Add support for alignment tags, and remove tags from the displayed
   captions ([#4306](https://github.com/google/ExoPlayer/issues/4306)).
+* Fix issue where buffered position is not updated correctly when transitioning
+  between periods
+  ([#4899](https://github.com/google/ExoPlayer/issues/4899)).
 
 ### 2.9.0 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index 5fb6202d2f..e1f942147d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -619,7 +619,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
       if (playbackInfo.startPositionUs == C.TIME_UNSET) {
         // Replace internal unset start position with externally visible start position of zero.
         playbackInfo =
-            playbackInfo.fromNewPosition(
+            playbackInfo.resetToNewPosition(
                 playbackInfo.periodId, /* startPositionUs= */ 0, playbackInfo.contentPositionUs);
       }
       if ((!this.playbackInfo.timeline.isEmpty() || hasPendingPrepare)
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index 8b22999679..40716c14c0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -448,7 +448,11 @@ import java.util.Collections;
         seekToPeriodPosition(periodId, playbackInfo.positionUs, /* forceDisableRenderers= */ true);
     if (newPositionUs != playbackInfo.positionUs) {
       playbackInfo =
-          playbackInfo.fromNewPosition(periodId, newPositionUs, playbackInfo.contentPositionUs);
+          playbackInfo.copyWithNewPosition(
+              periodId,
+              newPositionUs,
+              playbackInfo.contentPositionUs,
+              getTotalBufferedDurationUs());
       if (sendDiscontinuity) {
         playbackInfoUpdate.setPositionDiscontinuity(Player.DISCONTINUITY_REASON_INTERNAL);
       }
@@ -483,8 +487,12 @@ import java.util.Collections;
       // A MediaPeriod may report a discontinuity at the current playback position to ensure the
       // renderers are flushed. Only report the discontinuity externally if the position changed.
       if (periodPositionUs != playbackInfo.positionUs) {
-        playbackInfo = playbackInfo.fromNewPosition(playbackInfo.periodId, periodPositionUs,
-            playbackInfo.contentPositionUs);
+        playbackInfo =
+            playbackInfo.copyWithNewPosition(
+                playbackInfo.periodId,
+                periodPositionUs,
+                playbackInfo.contentPositionUs,
+                getTotalBufferedDurationUs());
         playbackInfoUpdate.setPositionDiscontinuity(Player.DISCONTINUITY_REASON_INTERNAL);
       }
     } else {
@@ -645,7 +653,9 @@ import java.util.Collections;
         periodPositionUs = newPeriodPositionUs;
       }
     } finally {
-      playbackInfo = playbackInfo.fromNewPosition(periodId, periodPositionUs, contentPositionUs);
+      playbackInfo =
+          playbackInfo.copyWithNewPosition(
+              periodId, periodPositionUs, contentPositionUs, getTotalBufferedDurationUs());
       if (seekPositionAdjusted) {
         playbackInfoUpdate.setPositionDiscontinuity(Player.DISCONTINUITY_REASON_SEEK_ADJUSTMENT);
       }
@@ -1020,8 +1030,12 @@ import java.util.Collections;
               newTrackSelectorResult, playbackInfo.positionUs, recreateStreams, streamResetFlags);
       if (playbackInfo.playbackState != Player.STATE_ENDED
           && periodPositionUs != playbackInfo.positionUs) {
-        playbackInfo = playbackInfo.fromNewPosition(playbackInfo.periodId, periodPositionUs,
-            playbackInfo.contentPositionUs);
+        playbackInfo =
+            playbackInfo.copyWithNewPosition(
+                playbackInfo.periodId,
+                periodPositionUs,
+                playbackInfo.contentPositionUs,
+                getTotalBufferedDurationUs());
         playbackInfoUpdate.setPositionDiscontinuity(Player.DISCONTINUITY_REASON_INTERNAL);
         resetRendererPosition(periodPositionUs);
       }
@@ -1163,7 +1177,7 @@ import java.util.Collections;
               resolveSeekPosition(pendingInitialSeekPosition, /* trySubsequentPeriods= */ true);
         } catch (IllegalSeekPositionException e) {
           playbackInfo =
-              playbackInfo.fromNewPosition(getFirstMediaPeriodId(), C.TIME_UNSET, C.TIME_UNSET);
+              playbackInfo.resetToNewPosition(getFirstMediaPeriodId(), C.TIME_UNSET, C.TIME_UNSET);
           throw e;
         }
         pendingInitialSeekPosition = null;
@@ -1176,7 +1190,7 @@ import java.util.Collections;
           long positionUs = periodPosition.second;
           MediaPeriodId periodId = queue.resolveMediaPeriodIdForAds(periodUid, positionUs);
           playbackInfo =
-              playbackInfo.fromNewPosition(
+              playbackInfo.resetToNewPosition(
                   periodId, periodId.isAd() ? 0 : positionUs, /* contentPositionUs= */ positionUs);
         }
       } else if (playbackInfo.startPositionUs == C.TIME_UNSET) {
@@ -1190,7 +1204,7 @@ import java.util.Collections;
           long startPositionUs = defaultPosition.second;
           MediaPeriodId periodId = queue.resolveMediaPeriodIdForAds(periodUid, startPositionUs);
           playbackInfo =
-              playbackInfo.fromNewPosition(
+              playbackInfo.resetToNewPosition(
                   periodId,
                   periodId.isAd() ? 0 : startPositionUs,
                   /* contentPositionUs= */ startPositionUs);
@@ -1209,7 +1223,7 @@ import java.util.Collections;
         long startPositionUs = defaultPosition.second;
         MediaPeriodId periodId = queue.resolveMediaPeriodIdForAds(periodUid, startPositionUs);
         playbackInfo =
-            playbackInfo.fromNewPosition(
+            playbackInfo.resetToNewPosition(
                 periodId,
                 /* startPositionUs= */ periodId.isAd() ? 0 : startPositionUs,
                 /* contentPositionUs= */ startPositionUs);
@@ -1248,7 +1262,9 @@ import java.util.Collections;
       }
       // Actually do the seek.
       long seekPositionUs = seekToPeriodPosition(periodId, periodId.isAd() ? 0 : contentPositionUs);
-      playbackInfo = playbackInfo.fromNewPosition(periodId, seekPositionUs, contentPositionUs);
+      playbackInfo =
+          playbackInfo.copyWithNewPosition(
+              periodId, seekPositionUs, contentPositionUs, getTotalBufferedDurationUs());
       return;
     }
 
@@ -1260,7 +1276,9 @@ import java.util.Collections;
         // The previously playing ad should no longer be played, so skip it.
         long seekPositionUs =
             seekToPeriodPosition(periodId, periodId.isAd() ? 0 : contentPositionUs);
-        playbackInfo = playbackInfo.fromNewPosition(periodId, seekPositionUs, contentPositionUs);
+        playbackInfo =
+            playbackInfo.copyWithNewPosition(
+                periodId, seekPositionUs, contentPositionUs, getTotalBufferedDurationUs());
         return;
       }
     }
@@ -1416,8 +1434,12 @@ import java.util.Collections;
       MediaPeriodHolder oldPlayingPeriodHolder = playingPeriodHolder;
       playingPeriodHolder = queue.advancePlayingPeriod();
       updatePlayingPeriodRenderers(oldPlayingPeriodHolder);
-      playbackInfo = playbackInfo.fromNewPosition(playingPeriodHolder.info.id,
-          playingPeriodHolder.info.startPositionUs, playingPeriodHolder.info.contentPositionUs);
+      playbackInfo =
+          playbackInfo.copyWithNewPosition(
+              playingPeriodHolder.info.id,
+              playingPeriodHolder.info.startPositionUs,
+              playingPeriodHolder.info.contentPositionUs,
+              getTotalBufferedDurationUs());
       playbackInfoUpdate.setPositionDiscontinuity(discontinuityReason);
       updatePlaybackPositions();
       advancedPlayingPeriod = true;
@@ -1667,6 +1689,11 @@ import java.util.Collections;
     if (loadingMediaPeriodChanged) {
       playbackInfo = playbackInfo.copyWithLoadingMediaPeriodId(loadingMediaPeriodId);
     }
+    playbackInfo.bufferedPositionUs =
+        loadingMediaPeriodHolder == null
+            ? playbackInfo.positionUs
+            : loadingMediaPeriodHolder.getBufferedPositionUs();
+    playbackInfo.totalBufferedDurationUs = getTotalBufferedDurationUs();
     if ((loadingMediaPeriodChanged || loadingTrackSelectionChanged)
         && loadingMediaPeriodHolder != null
         && loadingMediaPeriodHolder.prepared) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java
index 02058c0484..8c73fde3be 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2;
 
+import android.support.annotation.CheckResult;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 import com.google.android.exoplayer2.source.TrackGroupArray;
@@ -40,7 +41,8 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
   public final MediaPeriodId periodId;
   /**
    * The start position at which playback started in {@link #periodId} relative to the start of the
-   * associated period in the {@link #timeline}, in microseconds.
+   * associated period in the {@link #timeline}, in microseconds. Note that this value changes for
+   * each position discontinuity.
    */
   public final long startPositionUs;
   /**
@@ -103,6 +105,23 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
         startPositionUs);
   }
 
+  /**
+   * Create playback info.
+   *
+   * @param timeline See {@link #timeline}.
+   * @param manifest See {@link #manifest}.
+   * @param periodId See {@link #periodId}.
+   * @param startPositionUs See {@link #startPositionUs}.
+   * @param contentPositionUs See {@link #contentPositionUs}.
+   * @param playbackState See {@link #playbackState}.
+   * @param isLoading See {@link #isLoading}.
+   * @param trackGroups See {@link #trackGroups}.
+   * @param trackSelectorResult See {@link #trackSelectorResult}.
+   * @param loadingMediaPeriodId See {@link #loadingMediaPeriodId}.
+   * @param bufferedPositionUs See {@link #bufferedPositionUs}.
+   * @param totalBufferedDurationUs See {@link #totalBufferedDurationUs}.
+   * @param positionUs See {@link #positionUs}.
+   */
   public PlaybackInfo(
       Timeline timeline,
       @Nullable Object manifest,
@@ -132,7 +151,17 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
     this.positionUs = positionUs;
   }
 
-  public PlaybackInfo fromNewPosition(
+  /**
+   * Copies playback info and resets playing and loading position.
+   *
+   * @param periodId New playing and loading {@link MediaPeriodId}.
+   * @param startPositionUs New start position. See {@link #startPositionUs}.
+   * @param contentPositionUs New content position. See {@link #contentPositionUs}. Value is ignored
+   *     if {@code periodId.isAd()} is true.
+   * @return Copied playback info with reset position.
+   */
+  @CheckResult
+  public PlaybackInfo resetToNewPosition(
       MediaPeriodId periodId, long startPositionUs, long contentPositionUs) {
     return new PlaybackInfo(
         timeline,
@@ -150,6 +179,46 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
         startPositionUs);
   }
 
+  /**
+   * Copied playback info with new playing position.
+   *
+   * @param periodId New playing media period. See {@link #periodId}.
+   * @param positionUs New position. See {@link #positionUs}.
+   * @param contentPositionUs New content position. See {@link #contentPositionUs}. Value is ignored
+   *     if {@code periodId.isAd()} is true.
+   * @param totalBufferedDurationUs New buffered duration. See {@link #totalBufferedDurationUs}.
+   * @return Copied playback info with new playing position.
+   */
+  @CheckResult
+  public PlaybackInfo copyWithNewPosition(
+      MediaPeriodId periodId,
+      long positionUs,
+      long contentPositionUs,
+      long totalBufferedDurationUs) {
+    return new PlaybackInfo(
+        timeline,
+        manifest,
+        periodId,
+        positionUs,
+        periodId.isAd() ? contentPositionUs : C.TIME_UNSET,
+        playbackState,
+        isLoading,
+        trackGroups,
+        trackSelectorResult,
+        loadingMediaPeriodId,
+        bufferedPositionUs,
+        totalBufferedDurationUs,
+        positionUs);
+  }
+
+  /**
+   * Copies playback info with new timeline and manifest.
+   *
+   * @param timeline New timeline. See {@link #timeline}.
+   * @param manifest New manifest. See {@link #manifest}.
+   * @return Copied playback info with new timeline and manifest.
+   */
+  @CheckResult
   public PlaybackInfo copyWithTimeline(Timeline timeline, Object manifest) {
     return new PlaybackInfo(
         timeline,
@@ -167,6 +236,13 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
         positionUs);
   }
 
+  /**
+   * Copies playback info with new playback state.
+   *
+   * @param playbackState New playback state. See {@link #playbackState}.
+   * @return Copied playback info with new playback state.
+   */
+  @CheckResult
   public PlaybackInfo copyWithPlaybackState(int playbackState) {
     return new PlaybackInfo(
         timeline,
@@ -184,6 +260,13 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
         positionUs);
   }
 
+  /**
+   * Copies playback info with new loading state.
+   *
+   * @param isLoading New loading state. See {@link #isLoading}.
+   * @return Copied playback info with new loading state.
+   */
+  @CheckResult
   public PlaybackInfo copyWithIsLoading(boolean isLoading) {
     return new PlaybackInfo(
         timeline,
@@ -201,6 +284,14 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
         positionUs);
   }
 
+  /**
+   * Copies playback info with new track information.
+   *
+   * @param trackGroups New track groups. See {@link #trackGroups}.
+   * @param trackSelectorResult New track selector result. See {@link #trackSelectorResult}.
+   * @return Copied playback info with new track information.
+   */
+  @CheckResult
   public PlaybackInfo copyWithTrackInfo(
       TrackGroupArray trackGroups, TrackSelectorResult trackSelectorResult) {
     return new PlaybackInfo(
@@ -219,6 +310,13 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
         positionUs);
   }
 
+  /**
+   * Copies playback info with new loading media period.
+   *
+   * @param loadingMediaPeriodId New loading media period id. See {@link #loadingMediaPeriodId}.
+   * @return Copied playback info with new loading media period.
+   */
+  @CheckResult
   public PlaybackInfo copyWithLoadingMediaPeriodId(MediaPeriodId loadingMediaPeriodId) {
     return new PlaybackInfo(
         timeline,
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
index 407e9a3827..d131ed0f51 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
@@ -2534,6 +2534,59 @@ public final class ExoPlayerTest {
     assertThat(positionWhenReady.get()).isEqualTo(periodDurationMs + 10);
   }
 
+  @Test
+  public void periodTransitionReportsCorrectBufferedPosition() throws Exception {
+    int periodCount = 3;
+    long periodDurationUs = 5 * C.MICROS_PER_SECOND;
+    long windowDurationUs = periodCount * periodDurationUs;
+    Timeline timeline =
+        new FakeTimeline(
+            new TimelineWindowDefinition(
+                periodCount,
+                /* id= */ new Object(),
+                /* isSeekable= */ true,
+                /* isDynamic= */ false,
+                windowDurationUs));
+    AtomicReference<Player> playerReference = new AtomicReference<>();
+    AtomicLong bufferedPositionAtFirstDiscontinuityMs = new AtomicLong(C.TIME_UNSET);
+    EventListener eventListener =
+        new EventListener() {
+          @Override
+          public void onPositionDiscontinuity(@DiscontinuityReason int reason) {
+            if (reason == Player.DISCONTINUITY_REASON_PERIOD_TRANSITION) {
+              if (bufferedPositionAtFirstDiscontinuityMs.get() == C.TIME_UNSET) {
+                bufferedPositionAtFirstDiscontinuityMs.set(
+                    playerReference.get().getBufferedPosition());
+              }
+            }
+          }
+        };
+    ActionSchedule actionSchedule =
+        new ActionSchedule.Builder("periodTransitionReportsCorrectBufferedPosition")
+            .executeRunnable(
+                new PlayerRunnable() {
+                  @Override
+                  public void run(SimpleExoPlayer player) {
+                    playerReference.set(player);
+                    player.addListener(eventListener);
+                  }
+                })
+            .pause()
+            // Wait until all periods are fully buffered.
+            .waitForIsLoading(/* targetIsLoading= */ true)
+            .waitForIsLoading(/* targetIsLoading= */ false)
+            .play()
+            .build();
+    new Builder()
+        .setTimeline(timeline)
+        .setActionSchedule(actionSchedule)
+        .build(context)
+        .start()
+        .blockUntilEnded(TIMEOUT_MS);
+
+    assertThat(bufferedPositionAtFirstDiscontinuityMs.get()).isEqualTo(C.usToMs(windowDurationUs));
+  }
+
   // Internal methods.
 
   private static ActionSchedule.Builder addSurfaceSwitch(ActionSchedule.Builder builder) {

From cc7684d09f0a66de0e501882da668cdd35504752 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 4 Oct 2018 06:56:29 -0700
Subject: [PATCH 069/832] Introduce Renderer.reset

- It's a no-op for now
- Renderers that want to support retaining resources will move
  some functionality from their disable() implementations into
  reset()
- ExoPlayerImplInternal will be updated to not always call reset()
  immediately after disable(), which is what will enable resources
  to actually be retained.

Issue: #2826

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215729783
---
 .../android/exoplayer2/BaseRenderer.java       | 15 +++++++++++++++
 .../exoplayer2/ExoPlayerImplInternal.java      |  1 +
 .../android/exoplayer2/NoSampleRenderer.java   | 15 +++++++++++++++
 .../google/android/exoplayer2/Renderer.java    | 18 +++++++++++++++---
 .../video/spherical/CameraMotionRenderer.java  |  6 +++---
 .../audio/SimpleDecoderAudioRendererTest.java  |  1 +
 6 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/BaseRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/BaseRenderer.java
index 51e724bee1..73602d85aa 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/BaseRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/BaseRenderer.java
@@ -153,6 +153,12 @@ public abstract class BaseRenderer implements Renderer, RendererCapabilities {
     onDisabled();
   }
 
+  @Override
+  public final void reset() {
+    Assertions.checkState(state == STATE_DISABLED);
+    onReset();
+  }
+
   // RendererCapabilities implementation.
 
   @Override
@@ -247,6 +253,15 @@ public abstract class BaseRenderer implements Renderer, RendererCapabilities {
     // Do nothing.
   }
 
+  /**
+   * Called when the renderer is reset.
+   *
+   * <p>The default implementation is a no-op.
+   */
+  protected void onReset() {
+    // Do nothing.
+  }
+
   // Methods to be called by subclasses.
 
   /** Returns the formats of the currently enabled stream. */
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index 40716c14c0..891ea48108 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -989,6 +989,7 @@ import java.util.Collections;
     mediaClock.onRendererDisabled(renderer);
     ensureStopped(renderer);
     renderer.disable();
+    renderer.reset();
   }
 
   private void reselectTracksInternal() throws ExoPlaybackException {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/NoSampleRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/NoSampleRenderer.java
index 45d6537b84..6645850d3b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/NoSampleRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/NoSampleRenderer.java
@@ -158,6 +158,12 @@ public abstract class NoSampleRenderer implements Renderer, RendererCapabilities
     onDisabled();
   }
 
+  @Override
+  public final void reset() {
+    Assertions.checkState(state == STATE_DISABLED);
+    onReset();
+  }
+
   @Override
   public boolean isReady() {
     return true;
@@ -260,6 +266,15 @@ public abstract class NoSampleRenderer implements Renderer, RendererCapabilities
     // Do nothing.
   }
 
+  /**
+   * Called when the renderer is reset.
+   *
+   * <p>The default implementation is a no-op.
+   */
+  protected void onReset() {
+    // Do nothing.
+  }
+
   // Methods to be called by subclasses.
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java b/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java
index c6456e5f7f..1d4d587aeb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java
@@ -44,12 +44,16 @@ public interface Renderer extends PlayerMessage.Target {
   @IntDef({STATE_DISABLED, STATE_ENABLED, STATE_STARTED})
   @interface State {}
   /**
-   * The renderer is disabled.
+   * The renderer is disabled. A renderer in this state may hold resources that it requires for
+   * rendering (e.g. media decoders), for use if it's subsequently enabled. {@link #reset()} can be
+   * called to force the renderer to release these resources.
    */
   int STATE_DISABLED = 0;
   /**
-   * The renderer is enabled but not started. A renderer in this state is not actively rendering
-   * media, but will typically hold resources that it requires for rendering (e.g. media decoders).
+   * The renderer is enabled but not started. A renderer in this state may render media at the
+   * current position (e.g. an initial video frame), but the position will not advance. A renderer
+   * in this state will typically hold resources that it requires for rendering (e.g. media
+   * decoders).
    */
   int STATE_ENABLED = 1;
   /**
@@ -279,4 +283,12 @@ public interface Renderer extends PlayerMessage.Target {
    */
   void disable();
 
+  /**
+   * Forces the renderer to give up any resources (e.g. media decoders) that it may be holding. If
+   * the renderer is not holding any resources, the call is a no-op.
+   *
+   * <p>This method may be called when the renderer is in the following states: {@link
+   * #STATE_DISABLED}.
+   */
+  void reset();
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionRenderer.java
index 4a8354d17f..663c9fe284 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionRenderer.java
@@ -72,12 +72,12 @@ public class CameraMotionRenderer extends BaseRenderer {
 
   @Override
   protected void onPositionReset(long positionUs, boolean joining) throws ExoPlaybackException {
-    reset();
+    resetListener();
   }
 
   @Override
   protected void onDisabled() {
-    reset();
+    resetListener();
   }
 
   @Override
@@ -124,7 +124,7 @@ public class CameraMotionRenderer extends BaseRenderer {
     return result;
   }
 
-  private void reset() {
+  private void resetListener() {
     lastTimestampUs = 0;
     if (listener != null) {
       listener.onCameraMotionReset();
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRendererTest.java b/library/core/src/test/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRendererTest.java
index 8dc60a15a4..48e71c619c 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRendererTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRendererTest.java
@@ -103,6 +103,7 @@ public class SimpleDecoderAudioRendererTest {
     }
     verify(mockAudioSink, times(1)).playToEndOfStream();
     audioRenderer.disable();
+    audioRenderer.reset();
     verify(mockAudioSink, times(1)).release();
   }
 

From 76a1569e79dbb3edb64ed225c075727252336927 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 4 Oct 2018 07:24:07 -0700
Subject: [PATCH 070/832] Update release notes to better describe Java 8
 change.

Apps need to set the target compatibility to VERSION_1_8 to enable the
automatic desugaring if they haven't done so already.

Issue:#4907

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215733070
---
 RELEASENOTES.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index e2f33d9150..6f04fcd8f1 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -25,9 +25,8 @@
 
 ### 2.9.0 ###
 
-* Turn on Java 8 compiler support for the ExoPlayer library. Apps that depend
-  on ExoPlayer via its source code rather than an AAR may need to add
-  `compileOptions { targetCompatibility JavaVersion.VERSION_1_8 }` to their
+* Turn on Java 8 compiler support for the ExoPlayer library. Apps may need to
+  add `compileOptions { targetCompatibility JavaVersion.VERSION_1_8 }` to their
   gradle settings to ensure bytecode compatibility.
 * Set `compileSdkVersion` and `targetSdkVersion` to 28.
 * Support for automatic audio focus handling via

From c5f9ad9f8b9594c9abb12b25b9bc088eb3dee76c Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 4 Oct 2018 10:40:29 -0700
Subject: [PATCH 071/832] Minor fixes for period clipping

- Always clip to period duration for the last chunk. We previously
  did this only when the last chunk explicitly exceeded the period
  end time. We now also do it when the chunk claims to end at the
  period boundary, but still contains samples that exceed it.
- If pendingResetPositionUs == chunk.startTimeUs == 0 but the
  chunk still contains samples with negative timestamps, we now
  clip them by setting the decode only flag. Previously we only
  clipped such samples if the first chunk explicitly preceeded the
  start of the period.

Issue: #4899

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215763467
---
 .../android/exoplayer2/source/chunk/ChunkSampleStream.java    | 4 ++--
 .../exoplayer2/source/dash/DefaultDashChunkSource.java        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java
index a993c79b4a..9fac69b281 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java
@@ -308,7 +308,7 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
       // chunk even if the sample timestamps are slightly offset from the chunk start times.
       seekInsideBuffer =
           primarySampleQueue.setReadPosition(seekToMediaChunk.getFirstSampleIndex(0));
-      decodeOnlyUntilPositionUs = Long.MIN_VALUE;
+      decodeOnlyUntilPositionUs = 0;
     } else {
       seekInsideBuffer =
           primarySampleQueue.advanceTo(
@@ -583,7 +583,7 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
       if (pendingReset) {
         boolean resetToMediaChunk = mediaChunk.startTimeUs == pendingResetPositionUs;
         // Only enable setting of the decode only flag if we're not resetting to a chunk boundary.
-        decodeOnlyUntilPositionUs = resetToMediaChunk ? Long.MIN_VALUE : pendingResetPositionUs;
+        decodeOnlyUntilPositionUs = resetToMediaChunk ? 0 : pendingResetPositionUs;
         pendingResetPositionUs = C.TIME_UNSET;
       }
       mediaChunk.init(mediaChunkOutput);
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
index 37c9e313ae..1ea25ecc36 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
@@ -544,7 +544,7 @@ public class DefaultDashChunkSource implements DashChunkSource {
       long endTimeUs = representationHolder.getSegmentEndTimeUs(firstSegmentNum + segmentCount - 1);
       long periodDurationUs = representationHolder.periodDurationUs;
       long clippedEndTimeUs =
-          periodDurationUs != C.TIME_UNSET && periodDurationUs < endTimeUs
+          periodDurationUs != C.TIME_UNSET && periodDurationUs <= endTimeUs
               ? periodDurationUs
               : C.TIME_UNSET;
       DataSpec dataSpec = new DataSpec(segmentUri.resolveUri(baseUrl),

From 8dedbd5748b87f4bda71e83bb57cb60f1808cd9d Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 5 Oct 2018 01:01:51 -0700
Subject: [PATCH 072/832] Fix release notes Markdown syntax

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215868785
---
 RELEASENOTES.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 6f04fcd8f1..6433788846 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -348,18 +348,18 @@
     begins, and poll the audio timestamp less frequently once it starts
     advancing ([#3841](https://github.com/google/ExoPlayer/issues/3841)).
   * Add an option to skip silent audio in `PlaybackParameters`
-    ((#2635)[https://github.com/google/ExoPlayer/issues/2635]).
+    ([#2635](https://github.com/google/ExoPlayer/issues/2635)).
   * Fix an issue where playback of TrueHD streams would get stuck after seeking
     due to not finding a syncframe
-    ((#3845)[https://github.com/google/ExoPlayer/issues/3845]).
+    ([#3845](https://github.com/google/ExoPlayer/issues/3845)).
   * Fix an issue with eac3-joc playback where a codec would fail to configure
-    ((#4165)[https://github.com/google/ExoPlayer/issues/4165]).
+    ([#4165](https://github.com/google/ExoPlayer/issues/4165)).
   * Handle non-empty end-of-stream buffers, to fix gapless playback of streams
     with encoder padding when the decoder returns a non-empty final buffer.
   * Allow trimming more than one sample when applying an elst audio edit via
     gapless playback info.
   * Allow overriding skipping/scaling with custom `AudioProcessor`s
-    ((#3142)[https://github.com/google/ExoPlayer/issues/3142]).
+    ([#3142](https://github.com/google/ExoPlayer/issues/3142)).
 * Caching:
   * Add release method to the `Cache` interface, and prevent multiple instances
     of `SimpleCache` using the same folder at the same time.

From 0a7745bc03c93709e178c578a4649eb534e8a9e0 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 5 Oct 2018 07:36:40 -0700
Subject: [PATCH 073/832] Fix some random Android Studio warnings.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215904019
---
 .../android/exoplayer2/demo/SampleChooserActivity.java      | 3 +--
 .../google/android/exoplayer2/DefaultRenderersFactory.java  | 2 +-
 .../google/android/exoplayer2/ExoPlayerImplInternal.java    | 2 +-
 .../google/android/exoplayer2/audio/DefaultAudioSink.java   | 3 +--
 .../java/com/google/android/exoplayer2/drm/DrmInitData.java | 4 ++--
 .../android/exoplayer2/extractor/BinarySearchSeeker.java    | 3 ++-
 .../android/exoplayer2/extractor/mp4/Mp4Extractor.java      | 2 +-
 .../android/exoplayer2/source/ConcatenatingMediaSource.java | 2 +-
 .../exoplayer2/upstream/cache/CachedRegionTracker.java      | 4 ++--
 .../java/com/google/android/exoplayer2/ui/PlayerView.java   | 6 ++++++
 10 files changed, 18 insertions(+), 13 deletions(-)

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 6395ea4c24..20e27d8d48 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
@@ -350,8 +350,7 @@ public class SampleChooserActivity extends Activity
               ? null
               : new DrmInfo(drmScheme, drmLicenseUrl, drmKeyRequestProperties, drmMultiSession);
       if (playlistSamples != null) {
-        UriSample[] playlistSamplesArray = playlistSamples.toArray(
-            new UriSample[playlistSamples.size()]);
+        UriSample[] playlistSamplesArray = playlistSamples.toArray(new UriSample[0]);
         return new PlaylistSample(sampleName, drmInfo, playlistSamplesArray);
       } else {
         return new UriSample(
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
index cc16c43b05..6ccda2b8e9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
@@ -187,7 +187,7 @@ public class DefaultRenderersFactory implements RenderersFactory {
         extensionRendererMode, renderersList);
     buildCameraMotionRenderers(context, extensionRendererMode, renderersList);
     buildMiscellaneousRenderers(context, eventHandler, extensionRendererMode, renderersList);
-    return renderersList.toArray(new Renderer[renderersList.size()]);
+    return renderersList.toArray(new Renderer[0]);
   }
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index 891ea48108..0c6c3ca202 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -1002,7 +1002,7 @@ import java.util.Collections;
     MediaPeriodHolder periodHolder = queue.getPlayingPeriod();
     MediaPeriodHolder readingPeriodHolder = queue.getReadingPeriod();
     boolean selectionsChangedForReadPeriod = true;
-    TrackSelectorResult newTrackSelectorResult = null;
+    TrackSelectorResult newTrackSelectorResult;
     while (true) {
       if (periodHolder == null || !periodHolder.prepared) {
         // The reselection did not change any prepared periods.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
index 4ce34ad41a..6ad56a78d9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
@@ -351,8 +351,7 @@ public final class DefaultAudioSink implements AudioSink {
         channelMappingAudioProcessor,
         trimmingAudioProcessor);
     Collections.addAll(toIntPcmAudioProcessors, audioProcessorChain.getAudioProcessors());
-    toIntPcmAvailableAudioProcessors =
-        toIntPcmAudioProcessors.toArray(new AudioProcessor[toIntPcmAudioProcessors.size()]);
+    toIntPcmAvailableAudioProcessors = toIntPcmAudioProcessors.toArray(new AudioProcessor[0]);
     toFloatPcmAvailableAudioProcessors = new AudioProcessor[] {new FloatResamplingAudioProcessor()};
     volume = 1.0f;
     startMediaTimeState = START_NOT_SET;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
index ef96c7ae75..ff01cbc2b5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
@@ -97,7 +97,7 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
    * @param schemeDatas Scheme initialization data for possibly multiple DRM schemes.
    */
   public DrmInitData(List<SchemeData> schemeDatas) {
-    this(null, false, schemeDatas.toArray(new SchemeData[schemeDatas.size()]));
+    this(null, false, schemeDatas.toArray(new SchemeData[0]));
   }
 
   /**
@@ -105,7 +105,7 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
    * @param schemeDatas Scheme initialization data for possibly multiple DRM schemes.
    */
   public DrmInitData(@Nullable String schemeType, List<SchemeData> schemeDatas) {
-    this(schemeType, false, schemeDatas.toArray(new SchemeData[schemeDatas.size()]));
+    this(schemeType, false, schemeDatas.toArray(new SchemeData[0]));
   }
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java
index 3b0b834427..022b5b4c75 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java
@@ -81,8 +81,9 @@ public abstract class BinarySearchSeeker {
    */
   public static final class OutputFrameHolder {
 
+    public final ByteBuffer byteBuffer;
+
     public long timeUs;
-    public ByteBuffer byteBuffer;
 
     /** Constructs an instance, wrapping the given byte buffer. */
     public OutputFrameHolder(ByteBuffer outputByteBuffer) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
index 17c82c2c5b..ec24bed964 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
@@ -423,7 +423,7 @@ public final class Mp4Extractor implements Extractor, SeekMap {
     }
     this.firstVideoTrackIndex = firstVideoTrackIndex;
     this.durationUs = durationUs;
-    this.tracks = tracks.toArray(new Mp4Track[tracks.size()]);
+    this.tracks = tracks.toArray(new Mp4Track[0]);
     accumulatedSampleSizes = calculateAccumulatedSampleSizes(this.tracks);
 
     extractorOutput.endTracks();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
index 7418e84449..fb99eef6e7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
@@ -801,6 +801,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
 
     public final MediaSource mediaSource;
     public final Object uid;
+    public final List<DeferredMediaPeriod> activeMediaPeriods;
 
     public DeferredTimeline timeline;
     public int childIndex;
@@ -809,7 +810,6 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
     public boolean hasStartedPreparing;
     public boolean isPrepared;
     public boolean isRemoved;
-    public List<DeferredMediaPeriod> activeMediaPeriods;
 
     public MediaSourceHolder(MediaSource mediaSource) {
       this.mediaSource = mediaSource;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTracker.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTracker.java
index 6d090d073e..e8315385e0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTracker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTracker.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.upstream.cache;
 import android.support.annotation.NonNull;
 import com.google.android.exoplayer2.extractor.ChunkIndex;
 import com.google.android.exoplayer2.util.Log;
+import com.google.android.exoplayer2.util.Util;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.NavigableSet;
@@ -195,8 +196,7 @@ public final class CachedRegionTracker implements Cache.Listener {
 
     @Override
     public int compareTo(@NonNull Region another) {
-      return startOffset < another.startOffset ? -1
-          : startOffset == another.startOffset ? 0 : 1;
+      return Util.compareLong(startOffset, another.startOffset);
     }
 
   }
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
index e429f5bfa0..7e693111ab 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
@@ -1032,6 +1032,12 @@ public class PlayerView extends FrameLayout {
     if (ev.getActionMasked() != MotionEvent.ACTION_DOWN) {
       return false;
     }
+    return performClick();
+  }
+
+  @Override
+  public boolean performClick() {
+    super.performClick();
     return toggleControllerVisibility();
   }
 

From 048c8bd68f437ab384a573c4b5b1ba481393ecda Mon Sep 17 00:00:00 2001
From: vsethia <vsethia@google.com>
Date: Wed, 10 Oct 2018 19:39:52 -0700
Subject: [PATCH 074/832] Snapshots are going to become the default soon and
 these tests are failing when reloading frmo snapshots. b/117347850. This is a
 no-op change as the current default == _fullboot. When we globally flip and
 make snapshots the default, these tests would fail and we are moving them
 over so that when we flip your tests still pass.

https://groups.google.com[]forum/#!topic/mobile-ninjas/Y69PTAT5GyY

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=216634430
---
 library/ui/src/main/res/values-mr/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/ui/src/main/res/values-mr/strings.xml b/library/ui/src/main/res/values-mr/strings.xml
index 753e6ba8d8..45bac7c61f 100644
--- a/library/ui/src/main/res/values-mr/strings.xml
+++ b/library/ui/src/main/res/values-mr/strings.xml
@@ -11,7 +11,7 @@
   <string name="exo_controls_repeat_one_description">एक रीपीट करा</string>
   <string name="exo_controls_repeat_all_description">सर्व रीपीट करा</string>
   <string name="exo_controls_shuffle_description">शफल करा</string>
-  <string name="exo_controls_fullscreen_description">पूर्ण स्क्रीन मोड</string>
+  <string name="exo_controls_fullscreen_description">फुल स्क्रीन मोड</string>
   <string name="exo_download_description">डाउनलोड करा</string>
   <string name="exo_download_notification_channel_name">डाउनलोड</string>
   <string name="exo_download_downloading">डाउनलोड होत आहे</string>

From 81a9293072faabdd95f241f84b29e32217982ac9 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 11 Oct 2018 04:27:22 -0700
Subject: [PATCH 075/832] Project start position for preroll ad to content
 transitions

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=216675981
---
 RELEASENOTES.md                               |  3 ++
 .../android/exoplayer2/MediaPeriodQueue.java  | 41 +++++++++++++------
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 6433788846..90ba31c623 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -22,6 +22,9 @@
 * Fix issue where buffered position is not updated correctly when transitioning
   between periods
   ([#4899](https://github.com/google/ExoPlayer/issues/4899)).
+* IMA extension:
+  * For preroll to live stream transitions, project forward the loading position
+    to avoid being behind the live window.
 
 ### 2.9.0 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
index 6370299334..40bc658953 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
@@ -533,6 +533,11 @@ import com.google.android.exoplayer2.util.Assertions;
     // until the timeline is updated. Store whether the next timeline period is ready when the
     // timeline is updated, to avoid repeatedly checking the same timeline.
     MediaPeriodInfo mediaPeriodInfo = mediaPeriodHolder.info;
+    // The expected delay until playback transitions to the new period is equal the duration of
+    // media that's currently buffered (assuming no interruptions). This is used to project forward
+    // the start position for transitions to new windows.
+    long bufferedDurationUs =
+        mediaPeriodHolder.getRendererOffset() + mediaPeriodInfo.durationUs - rendererPositionUs;
     if (mediaPeriodInfo.isLastInTimelinePeriod) {
       int currentPeriodIndex = timeline.getIndexOfPeriod(mediaPeriodInfo.id.periodUid);
       int nextPeriodIndex =
@@ -550,19 +555,15 @@ import com.google.android.exoplayer2.util.Assertions;
       long windowSequenceNumber = mediaPeriodInfo.id.windowSequenceNumber;
       if (timeline.getWindow(nextWindowIndex, window).firstPeriodIndex == nextPeriodIndex) {
         // We're starting to buffer a new window. When playback transitions to this window we'll
-        // want it to be from its default start position. The expected delay until playback
-        // transitions is equal the duration of media that's currently buffered (assuming no
-        // interruptions). Hence we project the default start position forward by the duration of
-        // the buffer, and start buffering from this point.
-        long defaultPositionProjectionUs =
-            mediaPeriodHolder.getRendererOffset() + mediaPeriodInfo.durationUs - rendererPositionUs;
+        // want it to be from its default start position, so project the default start position
+        // forward by the duration of the buffer, and start buffering from this point.
         Pair<Object, Long> defaultPosition =
             timeline.getPeriodPosition(
                 window,
                 period,
                 nextWindowIndex,
-                C.TIME_UNSET,
-                Math.max(0, defaultPositionProjectionUs));
+                /* windowPositionUs= */ C.TIME_UNSET,
+                /* defaultPositionProjectionUs= */ Math.max(0, bufferedDurationUs));
         if (defaultPosition == null) {
           return null;
         }
@@ -603,11 +604,27 @@ import com.google.android.exoplayer2.util.Assertions;
                 mediaPeriodInfo.contentPositionUs,
                 currentPeriodId.windowSequenceNumber);
       } else {
-        // Play content from the ad group position.
+        // Play content from the ad group position. As a special case, if we're transitioning from a
+        // preroll ad group to content and there are no other ad groups, project the start position
+        // forward as if this were a transition to a new window. No attempt is made to handle
+        // midrolls in live streams, as it's unclear what content position should play after an ad
+        // (server-side dynamic ad insertion is more appropriate for this use case).
+        long startPositionUs = mediaPeriodInfo.contentPositionUs;
+        if (period.getAdGroupCount() == 1 && period.getAdGroupTimeUs(0) == 0) {
+          Pair<Object, Long> defaultPosition =
+              timeline.getPeriodPosition(
+                  window,
+                  period,
+                  period.windowIndex,
+                  /* windowPositionUs= */ C.TIME_UNSET,
+                  /* defaultPositionProjectionUs= */ Math.max(0, bufferedDurationUs));
+          if (defaultPosition == null) {
+            return null;
+          }
+          startPositionUs = defaultPosition.second;
+        }
         return getMediaPeriodInfoForContent(
-            currentPeriodId.periodUid,
-            mediaPeriodInfo.contentPositionUs,
-            currentPeriodId.windowSequenceNumber);
+            currentPeriodId.periodUid, startPositionUs, currentPeriodId.windowSequenceNumber);
       }
     } else if (mediaPeriodInfo.id.endPositionUs != C.TIME_END_OF_SOURCE) {
       // Play the next ad group if it's available.

From 42c3ff393413966bcd3743421511a1c05b016ef1 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 11 Oct 2018 09:00:00 -0700
Subject: [PATCH 076/832] Handle rotation signaled in MKV track name from HTC
 devices

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=216704331
---
 .../extractor/mkv/MatroskaExtractor.java      | 38 +++++++++++++++++--
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
index 63fee48771..86b750e821 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
@@ -157,6 +157,7 @@ public final class MatroskaExtractor implements Extractor {
   private static final int ID_FLAG_DEFAULT = 0x88;
   private static final int ID_FLAG_FORCED = 0x55AA;
   private static final int ID_DEFAULT_DURATION = 0x23E383;
+  private static final int ID_NAME = 0x536E;
   private static final int ID_CODEC_ID = 0x86;
   private static final int ID_CODEC_PRIVATE = 0x63A2;
   private static final int ID_CODEC_DELAY = 0x56AA;
@@ -815,6 +816,9 @@ public final class MatroskaExtractor implements Extractor {
           throw new ParserException("DocType " + value + " not supported");
         }
         break;
+      case ID_NAME:
+        currentTrack.name = value;
+        break;
       case ID_CODEC_ID:
         currentTrack.codecId = value;
         break;
@@ -1463,6 +1467,7 @@ public final class MatroskaExtractor implements Extractor {
         case ID_MAX_FALL:
           return TYPE_UNSIGNED_INT;
         case ID_DOC_TYPE:
+        case ID_NAME:
         case ID_CODEC_ID:
         case ID_LANGUAGE:
           return TYPE_STRING;
@@ -1609,6 +1614,7 @@ public final class MatroskaExtractor implements Extractor {
     private static final int DEFAULT_MAX_FALL = 200;  // nits.
 
     // Common elements.
+    public String name;
     public String codecId;
     public int number;
     public int type;
@@ -1833,10 +1839,34 @@ public final class MatroskaExtractor implements Extractor {
           byte[] hdrStaticInfo = getHdrStaticInfo();
           colorInfo = new ColorInfo(colorSpace, colorRange, colorTransfer, hdrStaticInfo);
         }
-        format = Format.createVideoSampleFormat(Integer.toString(trackId), mimeType, null,
-            Format.NO_VALUE, maxInputSize, width, height, Format.NO_VALUE, initializationData,
-            Format.NO_VALUE, pixelWidthHeightRatio, projectionData, stereoMode, colorInfo,
-            drmInitData);
+        int rotationDegrees = Format.NO_VALUE;
+        // Some HTC devices signal rotation in track names.
+        if ("htc_video_rotA-000".equals(name)) {
+          rotationDegrees = 0;
+        } else if ("htc_video_rotA-090".equals(name)) {
+          rotationDegrees = 90;
+        } else if ("htc_video_rotA-180".equals(name)) {
+          rotationDegrees = 180;
+        } else if ("htc_video_rotA-270".equals(name)) {
+          rotationDegrees = 270;
+        }
+        format =
+            Format.createVideoSampleFormat(
+                Integer.toString(trackId),
+                mimeType,
+                /* codecs= */ null,
+                /* bitrate= */ Format.NO_VALUE,
+                maxInputSize,
+                width,
+                height,
+                /* frameRate= */ Format.NO_VALUE,
+                initializationData,
+                rotationDegrees,
+                pixelWidthHeightRatio,
+                projectionData,
+                stereoMode,
+                colorInfo,
+                drmInitData);
       } else if (MimeTypes.APPLICATION_SUBRIP.equals(mimeType)) {
         type = C.TRACK_TYPE_TEXT;
         format = Format.createTextSampleFormat(Integer.toString(trackId), mimeType, selectionFlags,

From 842f622d29eb1fa3929a0b2e91f5fc425c78313b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 12 Oct 2018 02:57:28 -0700
Subject: [PATCH 077/832] Allow codec flushing without re-initialization

For decoder reuse, we want disable() to flush the decoder. However,
if the flush needs to release the decoder for some reason, it seems
non-ideal to immediately re-initialize it. Re-initialization can
also throw ExoPlaybackException, which we don't want for disabling.

This change allows a variant of flush that wont re-initialize the
decoder if it has to be released, which will be used from disable().

Issue: #2826

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=216834862
---
 .../mediacodec/MediaCodecRenderer.java        | 41 +++++++++++++++----
 .../video/MediaCodecVideoRenderer.java        | 11 +++--
 .../testutil/DebugRenderersFactory.java       |  9 ++--
 3 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index 87d56fdf3d..8554d84420 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -546,9 +546,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   protected void onPositionReset(long positionUs, boolean joining) throws ExoPlaybackException {
     inputStreamEnded = false;
     outputStreamEnded = false;
-    if (codec != null) {
-      flushCodec();
-    }
+    flushOrReinitCodec();
     formatQueue.clear();
   }
 
@@ -687,10 +685,36 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     decoderCounters.ensureUpdated();
   }
 
-  protected void flushCodec() throws ExoPlaybackException {
+  /**
+   * Flushes the codec. If flushing is not possible, the codec will be released and re-instantiated.
+   * This method is a no-op if the codec is {@code null}.
+   *
+   * <p>The implementation of this method calls {@link #flushOrReleaseCodec()}, and {@link
+   * #maybeInitCodec()} if the codec needs to be re-instantiated.
+   *
+   * @throws ExoPlaybackException If an error occurs re-instantiating the codec.
+   */
+  protected final void flushOrReinitCodec() throws ExoPlaybackException {
+    if (flushOrReleaseCodec()) {
+      maybeInitCodec();
+    }
+  }
+
+  /**
+   * Flushes the codec. If flushing is not possible, the codec will be released. This method is a
+   * no-op if the codec is {@code null}.
+   *
+   * @return Whether the codec was released.
+   */
+  protected boolean flushOrReleaseCodec() {
+    if (codec == null) {
+      // Nothing to do.
+      return false;
+    }
     codecHotswapDeadlineMs = C.TIME_UNSET;
     resetInputBuffer();
     resetOutputBuffer();
+    codecReceivedBuffers = false;
     waitingForFirstSyncFrame = true;
     waitingForKeys = false;
     shouldSkipOutputBuffer = false;
@@ -699,28 +723,27 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     shouldSkipAdaptationWorkaroundOutputBuffer = false;
     if (codecNeedsFlushWorkaround || (codecNeedsEosFlushWorkaround && codecReceivedEos)) {
       releaseCodec();
-      maybeInitCodec();
+      return true;
     } else if (codecReinitializationState != REINITIALIZATION_STATE_NONE) {
       // We're already waiting to re-initialize the codec. Since we're now flushing, there's no need
       // to wait any longer.
       if (codecReinitializationIsRelease) {
         releaseCodec();
-        maybeInitCodec();
+        return true;
       } else {
         codec.flush();
-        codecReceivedBuffers = false;
         codecReinitializationState = REINITIALIZATION_STATE_NONE;
       }
     } else {
       // We can flush and re-use the existing decoder.
       codec.flush();
-      codecReceivedBuffers = false;
     }
     if (codecReconfigured && format != null) {
       // Any reconfiguration data that we send shortly before the flush may be discarded. We
       // avoid this issue by sending reconfiguration data following every flush.
       codecReconfigurationState = RECONFIGURATION_STATE_WRITE_PENDING;
     }
+    return false;
   }
 
   private boolean initCodecWithFallback(MediaCrypto crypto, boolean drmSessionRequiresSecureDecoder)
@@ -1496,7 +1519,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
         releaseCodec();
         maybeInitCodec();
       } else {
-        flushCodec();
+        flushOrReinitCodec();
       }
     } else {
       outputStreamEnded = true;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index d217b47785..2b2e628017 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -520,9 +520,12 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
 
   @CallSuper
   @Override
-  protected void flushCodec() throws ExoPlaybackException {
-    super.flushCodec();
-    buffersInCodecCount = 0;
+  protected boolean flushOrReleaseCodec() {
+    try {
+      return super.flushOrReleaseCodec();
+    } finally {
+      buffersInCodecCount = 0;
+    }
   }
 
   @Override
@@ -859,7 +862,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
     // We dropped some buffers to catch up, so update the decoder counters and flush the codec,
     // which releases all pending buffers buffers including the current output buffer.
     updateDroppedBufferCounters(buffersInCodecCount + droppedSourceBufferCount);
-    flushCodec();
+    flushOrReinitCodec();
     return true;
   }
 
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/DebugRenderersFactory.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/DebugRenderersFactory.java
index 627b5b72f3..39194d48fe 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/DebugRenderersFactory.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/DebugRenderersFactory.java
@@ -105,9 +105,12 @@ public class DebugRenderersFactory extends DefaultRenderersFactory {
     }
 
     @Override
-    protected void flushCodec() throws ExoPlaybackException {
-      super.flushCodec();
-      clearTimestamps();
+    protected boolean flushOrReleaseCodec() {
+      try {
+        return super.flushOrReleaseCodec();
+      } finally {
+        clearTimestamps();
+      }
     }
 
     @Override

From ba6a1189981cddb4950bb0bcff64ead93555664d Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 12 Oct 2018 06:21:39 -0700
Subject: [PATCH 078/832] Retain decoder instance after the renderer is
 disabled

Issue: #2826

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=216852679
---
 .../exoplayer2/mediacodec/MediaCodecRenderer.java      | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index 8554d84420..27b0d89a3f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -558,6 +558,16 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
 
   @Override
   protected void onDisabled() {
+    if (drmSession != null || pendingDrmSession != null) {
+      // TODO: Do something better with this case.
+      onReset();
+    } else {
+      flushOrReleaseCodec();
+    }
+  }
+
+  @Override
+  protected void onReset() {
     format = null;
     availableCodecInfos = null;
     try {

From d511370338415733a1b9a40a23c3e9837dd5ed7d Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 15 Oct 2018 01:03:23 -0700
Subject: [PATCH 079/832] Fix DashManifestParser to properly skip unknown tags

Robustness fix to make sure we ignore tags with known names, but
which are nested inside of unknown tags. For example we don't want
to parse the third period in:

<Period>...</Period>
<Period>...</Period>
<CustomTag>
  <Period>...</Period>
</CustomTag>

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217101630
---
 .../dash/manifest/DashManifestParser.java     | 75 +++++++++++++++----
 1 file changed, 59 insertions(+), 16 deletions(-)

diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
index 153856af8c..31ff7d283e 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
@@ -155,6 +155,8 @@ public class DashManifestParser extends DefaultHandler
               : (period.startMs + periodDurationMs);
           periods.add(period);
         }
+      } else {
+        maybeSkipTag(xpp);
       }
     } while (!XmlPullParserUtil.isEndTag(xpp, "MPD"));
 
@@ -221,6 +223,8 @@ public class DashManifestParser extends DefaultHandler
         segmentBase = parseSegmentList(xpp, null);
       } else if (XmlPullParserUtil.isStartTag(xpp, "SegmentTemplate")) {
         segmentBase = parseSegmentTemplate(xpp, null);
+      } else {
+        maybeSkipTag(xpp);
       }
     } while (!XmlPullParserUtil.isEndTag(xpp, "Period"));
 
@@ -409,22 +413,26 @@ public class DashManifestParser extends DefaultHandler
       } else if (XmlPullParserUtil.isStartTag(xpp, "widevine:license")) {
         String robustnessLevel = xpp.getAttributeValue(null, "robustness_level");
         requiresSecureDecoder = robustnessLevel != null && robustnessLevel.startsWith("HW");
-      } else if (data == null) {
-        if (XmlPullParserUtil.isStartTagIgnorePrefix(xpp, "pssh")
-            && xpp.next() == XmlPullParser.TEXT) {
-          // The cenc:pssh element is defined in 23001-7:2015.
-          data = Base64.decode(xpp.getText(), Base64.DEFAULT);
-          uuid = PsshAtomUtil.parseUuid(data);
-          if (uuid == null) {
-            Log.w(TAG, "Skipping malformed cenc:pssh data");
-            data = null;
-          }
-        } else if (C.PLAYREADY_UUID.equals(uuid) && XmlPullParserUtil.isStartTag(xpp, "mspr:pro")
-            && xpp.next() == XmlPullParser.TEXT) {
-          // The mspr:pro element is defined in DASH Content Protection using Microsoft PlayReady.
-          data = PsshAtomUtil.buildPsshAtom(C.PLAYREADY_UUID,
-              Base64.decode(xpp.getText(), Base64.DEFAULT));
+      } else if (data == null
+          && XmlPullParserUtil.isStartTagIgnorePrefix(xpp, "pssh")
+          && xpp.next() == XmlPullParser.TEXT) {
+        // The cenc:pssh element is defined in 23001-7:2015.
+        data = Base64.decode(xpp.getText(), Base64.DEFAULT);
+        uuid = PsshAtomUtil.parseUuid(data);
+        if (uuid == null) {
+          Log.w(TAG, "Skipping malformed cenc:pssh data");
+          data = null;
         }
+      } else if (data == null
+          && C.PLAYREADY_UUID.equals(uuid)
+          && XmlPullParserUtil.isStartTag(xpp, "mspr:pro")
+          && xpp.next() == XmlPullParser.TEXT) {
+        // The mspr:pro element is defined in DASH Content Protection using Microsoft PlayReady.
+        data =
+            PsshAtomUtil.buildPsshAtom(
+                C.PLAYREADY_UUID, Base64.decode(xpp.getText(), Base64.DEFAULT));
+      } else {
+        maybeSkipTag(xpp);
       }
     } while (!XmlPullParserUtil.isEndTag(xpp, "ContentProtection"));
     SchemeData schemeData =
@@ -462,7 +470,7 @@ public class DashManifestParser extends DefaultHandler
    */
   protected void parseAdaptationSetChild(XmlPullParser xpp)
       throws XmlPullParserException, IOException {
-    // pass
+    maybeSkipTag(xpp);
   }
 
   // Representation parsing.
@@ -526,6 +534,8 @@ public class DashManifestParser extends DefaultHandler
         inbandEventStreams.add(parseDescriptor(xpp, "InbandEventStream"));
       } else if (XmlPullParserUtil.isStartTag(xpp, "SupplementalProperty")) {
         supplementalProperties.add(parseDescriptor(xpp, "SupplementalProperty"));
+      } else {
+        maybeSkipTag(xpp);
       }
     } while (!XmlPullParserUtil.isEndTag(xpp, "Representation"));
 
@@ -664,6 +674,8 @@ public class DashManifestParser extends DefaultHandler
       xpp.next();
       if (XmlPullParserUtil.isStartTag(xpp, "Initialization")) {
         initialization = parseInitialization(xpp);
+      } else {
+        maybeSkipTag(xpp);
       }
     } while (!XmlPullParserUtil.isEndTag(xpp, "SegmentBase"));
 
@@ -701,6 +713,8 @@ public class DashManifestParser extends DefaultHandler
           segments = new ArrayList<>();
         }
         segments.add(parseSegmentUrl(xpp));
+      } else {
+        maybeSkipTag(xpp);
       }
     } while (!XmlPullParserUtil.isEndTag(xpp, "SegmentList"));
 
@@ -747,6 +761,8 @@ public class DashManifestParser extends DefaultHandler
         initialization = parseInitialization(xpp);
       } else if (XmlPullParserUtil.isStartTag(xpp, "SegmentTimeline")) {
         timeline = parseSegmentTimeline(xpp);
+      } else {
+        maybeSkipTag(xpp);
       }
     } while (!XmlPullParserUtil.isEndTag(xpp, "SegmentTemplate"));
 
@@ -794,6 +810,8 @@ public class DashManifestParser extends DefaultHandler
         EventMessage event = parseEvent(xpp, schemeIdUri, value, timescale,
             scratchOutputStream);
         eventMessages.add(event);
+      } else {
+        maybeSkipTag(xpp);
       }
     } while (!XmlPullParserUtil.isEndTag(xpp, "EventStream"));
 
@@ -932,6 +950,8 @@ public class DashManifestParser extends DefaultHandler
           segmentTimeline.add(buildSegmentTimelineElement(elapsedTime, duration));
           elapsedTime += duration;
         }
+      } else {
+        maybeSkipTag(xpp);
       }
     } while (!XmlPullParserUtil.isEndTag(xpp, "SegmentTimeline"));
     return segmentTimeline;
@@ -995,6 +1015,29 @@ public class DashManifestParser extends DefaultHandler
 
   // Utility methods.
 
+  /**
+   * If the provided {@link XmlPullParser} is currently positioned at the start of a tag, skips
+   * forward to the end of that tag.
+   *
+   * @param xpp The {@link XmlPullParser}.
+   * @throws XmlPullParserException If an error occurs parsing the stream.
+   * @throws IOException If an error occurs reading the stream.
+   */
+  public static void maybeSkipTag(XmlPullParser xpp) throws IOException, XmlPullParserException {
+    if (!XmlPullParserUtil.isStartTag(xpp)) {
+      return;
+    }
+    int depth = 1;
+    while (depth != 0) {
+      xpp.next();
+      if (XmlPullParserUtil.isStartTag(xpp)) {
+        depth++;
+      } else if (XmlPullParserUtil.isEndTag(xpp)) {
+        depth--;
+      }
+    }
+  }
+
   /**
    * Removes unnecessary {@link SchemeData}s with null {@link SchemeData#data}.
    */

From 6fb8f66ba6e86850d52777bf591941d9ef479c34 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 15 Oct 2018 02:49:05 -0700
Subject: [PATCH 080/832] Remove assertion causing failure on some Samsung
 devices

The assertion was so weak it probably wouldn't detect genuine
misuse of the DefaultAllocator API, so it seems fine just to
remove it.

We don't really know what happens when the player is allowed to
continue on the affected devices, but hopefully it either "just
works" or fails in a more graceful way.

Issue: #4532

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217113060
---
 .../exoplayer2/upstream/DefaultAllocator.java       | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultAllocator.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultAllocator.java
index 06ca83dd93..71e2d8d19f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultAllocator.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultAllocator.java
@@ -117,19 +117,6 @@ public final class DefaultAllocator implements Allocator {
           Math.max(availableAllocations.length * 2, availableCount + allocations.length));
     }
     for (Allocation allocation : allocations) {
-      // Weak sanity check that the allocation probably originated from this pool.
-      if (allocation.data != initialAllocationBlock
-          && allocation.data.length != individualAllocationSize) {
-        throw new IllegalArgumentException(
-            "Unexpected allocation: "
-                + System.identityHashCode(allocation.data)
-                + ", "
-                + System.identityHashCode(initialAllocationBlock)
-                + ", "
-                + allocation.data.length
-                + ", "
-                + individualAllocationSize);
-      }
       availableAllocations[availableCount++] = allocation;
     }
     allocatedCount -= allocations.length;

From 0af9ccc99090f87a509965805d343a426f439b16 Mon Sep 17 00:00:00 2001
From: "Lieblich, Jonathan" <Jonathan_Lieblich@comcast.com>
Date: Mon, 15 Oct 2018 15:37:42 -0600
Subject: [PATCH 081/832]  added handling of unexpected tags

---
 .../exoplayer2/source/dash/manifest/DashManifestParser.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
index aacafc5a40..d048e22b33 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
@@ -1015,6 +1015,8 @@ public class DashManifestParser extends DefaultHandler
         source = xpp.nextText();
       } else if (XmlPullParserUtil.isStartTag(xpp, "Copyright")) {
         copyright = xpp.nextText();
+      } else {
+        maybeSkipTag(xpp);
       }
     } while (!XmlPullParserUtil.isEndTag(xpp, "ProgramInformation"));
     return new ProgramInformation(title, source, copyright, moreInformationURL, lang);

From 6e7b41512f7f7fd2910134a2dbe2621f68a36c84 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 15 Oct 2018 07:28:20 -0700
Subject: [PATCH 082/832] No-op cleanup of DefaultDrmSessionManager

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217139869
---
 .../exoplayer2/drm/DefaultDrmSession.java     | 30 +++++++++++--------
 .../drm/DefaultDrmSessionManager.java         | 12 ++++++--
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
index 25546acb95..514d9da073 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
@@ -209,23 +209,16 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
 
   @SuppressWarnings("deprecation")
   public void onMediaDrmEvent(int what) {
-    if (!isOpen()) {
-      return;
-    }
     switch (what) {
+      case ExoMediaDrm.EVENT_PROVISION_REQUIRED:
+        onProvisionRequired();
+        break;
       case ExoMediaDrm.EVENT_KEY_REQUIRED:
-        doLicense(false);
+        onKeysRequired();
         break;
       case ExoMediaDrm.EVENT_KEY_EXPIRED:
-        // When an already expired key is loaded MediaDrm sends this event immediately. Ignore
-        // this event if the state isn't STATE_OPENED_WITH_KEYS yet which means we're still
-        // waiting for key response.
         onKeysExpired();
         break;
-      case ExoMediaDrm.EVENT_PROVISION_REQUIRED:
-        state = STATE_OPENED;
-        provisioningManager.provisionRequired(this);
-        break;
       default:
         break;
     }
@@ -441,8 +434,21 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
     }
   }
 
+  private void onProvisionRequired() {
+    if (mode == DefaultDrmSessionManager.MODE_PLAYBACK && isOpen()) {
+      state = STATE_OPENED;
+      provisioningManager.provisionRequired(this);
+    }
+  }
+
+  private void onKeysRequired() {
+    if (mode == DefaultDrmSessionManager.MODE_PLAYBACK && isOpen()) {
+      doLicense(/* allowRetry= */ false);
+    }
+  }
+
   private void onKeysExpired() {
-    if (state == STATE_OPENED_WITH_KEYS) {
+    if (mode == DefaultDrmSessionManager.MODE_PLAYBACK && state == STATE_OPENED_WITH_KEYS) {
       state = STATE_OPENED;
       onError(new KeysExpiredException());
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
index d71c6fc64c..5f166c6114 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
@@ -589,6 +589,10 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
 
   @Override
   public void provisionRequired(DefaultDrmSession<T> session) {
+    if (provisioningSessions.contains(session)) {
+      // The session has already requested provisioning.
+      return;
+    }
     provisioningSessions.add(session);
     if (provisioningSessions.size() == 1) {
       // This is the first session requesting provisioning, so have it perform the operation.
@@ -649,6 +653,10 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
     @Override
     public void handleMessage(Message msg) {
       byte[] sessionId = (byte[]) msg.obj;
+      if (sessionId == null) {
+        // The event is not associated with any particular session.
+        return;
+      }
       for (DefaultDrmSession<T> session : sessions) {
         if (session.hasSessionId(sessionId)) {
           session.onMediaDrmEvent(msg.what);
@@ -668,9 +676,7 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
         int event,
         int extra,
         @Nullable byte[] data) {
-      if (mode == DefaultDrmSessionManager.MODE_PLAYBACK) {
-        Assertions.checkNotNull(mediaDrmHandler).obtainMessage(event, sessionId).sendToTarget();
-      }
+      Assertions.checkNotNull(mediaDrmHandler).obtainMessage(event, sessionId).sendToTarget();
     }
 
   }

From dbf5b073a60b2e6224e3d2275981ee915c731abc Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 15 Oct 2018 08:30:28 -0700
Subject: [PATCH 083/832] Network type cleanup

1. Remove option to pass null context to Util.getNetworkType. IMO it's
   clearer for the caller to just not call the method in this case.
2. Stop using deprecated DefaultBandwidthMeter.Builder constructor in
   all but one place.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217147091
---
 .../core/src/androidTest/AndroidManifest.xml  |  2 ++
 .../upstream/DefaultBandwidthMeter.java       |  4 ++-
 .../google/android/exoplayer2/util/Util.java  | 25 +++++++------------
 .../testutil/ExoPlayerTestRunner.java         |  2 +-
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/library/core/src/androidTest/AndroidManifest.xml b/library/core/src/androidTest/AndroidManifest.xml
index d9104b1077..c3c0852b29 100644
--- a/library/core/src/androidTest/AndroidManifest.xml
+++ b/library/core/src/androidTest/AndroidManifest.xml
@@ -18,6 +18,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer2.core.test">
 
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+
   <application android:debuggable="true"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
index e9f70ec92a..21e2ed4f65 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
@@ -187,7 +187,9 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
      * @return A bandwidth meter with the configured properties.
      */
     public DefaultBandwidthMeter build() {
-      Long initialBitrateEstimate = initialBitrateEstimates.get(Util.getNetworkType(context));
+      Long initialBitrateEstimate =
+          initialBitrateEstimates.get(
+              context == null ? C.NETWORK_TYPE_UNKNOWN : Util.getNetworkType(context));
       if (initialBitrateEstimate == null) {
         initialBitrateEstimate = initialBitrateEstimates.get(C.NETWORK_TYPE_UNKNOWN);
       }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
index 2d3a0aeb78..116ad860e0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
@@ -1620,31 +1620,24 @@ public final class Util {
   }
 
   /**
-   * Returns the {@link C.NetworkType} of the current network connection. {@link
-   * C#NETWORK_TYPE_UNKNOWN} will be returned if the {@code ACCESS_NETWORK_STATE} permission is not
-   * granted or the network connection type couldn't be determined.
+   * Returns the {@link C.NetworkType} of the current network connection.
    *
    * @param context A context to access the connectivity manager.
-   * @return The {@link C.NetworkType} of the current network connection, or {@link
-   *     C#NETWORK_TYPE_UNKNOWN} if the {@code ACCESS_NETWORK_STATE} permission is not granted or
-   *     {@code context} is null.
+   * @return The {@link C.NetworkType} of the current network connection.
    */
-  public static @C.NetworkType int getNetworkType(@Nullable Context context) {
+  @C.NetworkType
+  public static int getNetworkType(Context context) {
     if (context == null) {
+      // Note: This is for backward compatibility only (context used to be @Nullable).
       return C.NETWORK_TYPE_UNKNOWN;
     }
     NetworkInfo networkInfo;
-    try {
-      ConnectivityManager connectivityManager =
-          (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-      if (connectivityManager == null) {
-        return C.NETWORK_TYPE_UNKNOWN;
-      }
-      networkInfo = connectivityManager.getActiveNetworkInfo();
-    } catch (SecurityException e) {
-      // Permission ACCESS_NETWORK_STATE not granted.
+    ConnectivityManager connectivityManager =
+        (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+    if (connectivityManager == null) {
       return C.NETWORK_TYPE_UNKNOWN;
     }
+    networkInfo = connectivityManager.getActiveNetworkInfo();
     if (networkInfo == null || !networkInfo.isConnected()) {
       return C.NETWORK_TYPE_OFFLINE;
     }
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java
index b613f7f364..401a2fae1b 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java
@@ -287,7 +287,7 @@ public final class ExoPlayerTestRunner implements Player.EventListener, ActionSc
         trackSelector = new DefaultTrackSelector();
       }
       if (bandwidthMeter == null) {
-        bandwidthMeter = new DefaultBandwidthMeter.Builder().build();
+        bandwidthMeter = new DefaultBandwidthMeter.Builder(context).build();
       }
       if (renderersFactory == null) {
         if (renderers == null) {

From bfd67992f41a7c5698700322e712544432b23bc2 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 15 Oct 2018 12:37:44 -0700
Subject: [PATCH 084/832] Add ExoPlayer.setForegroundMode

Issue: #2826

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217189082
---
 RELEASENOTES.md                               |   2 +
 .../google/android/exoplayer2/ExoPlayer.java  |  30 ++++
 .../android/exoplayer2/ExoPlayerImpl.java     |   9 ++
 .../exoplayer2/ExoPlayerImplInternal.java     | 132 +++++++++++++++---
 .../android/exoplayer2/SimpleExoPlayer.java   |   5 +
 .../exoplayer2/testutil/StubExoPlayer.java    |   5 +
 6 files changed, 165 insertions(+), 18 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 90ba31c623..01103a7a22 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,6 +2,8 @@
 
 ### dev-v2 (not yet released) ###
 
+* Improve decoder re-use between playbacks. TODO: Write and link a blog post
+  here ([#2826](https://github.com/google/ExoPlayer/issues/2826)).
 * Improve initial bandwidth meter estimates using the current country and
   network type.
 * Do not retry failed loads whose error is `FileNotFoundException`.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
index 96ddb2eb9c..5ba2394c3f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
@@ -209,4 +209,34 @@ public interface ExoPlayer extends Player {
 
   /** Returns the currently active {@link SeekParameters} of the player. */
   SeekParameters getSeekParameters();
+
+  /**
+   * Sets whether the player is allowed to keep holding limited resources such as video decoders,
+   * even when in the idle state. By doing so, the player may be able to reduce latency when
+   * starting to play another piece of content for which the same resources are required.
+   *
+   * <p>This mode should be used with caution, since holding limited resources may prevent other
+   * players of media components from acquiring them. It should only be enabled when <em>both</em>
+   * of the following conditions are true:
+   *
+   * <ul>
+   *   <li>The application that owns the player is in the foreground.
+   *   <li>The player is used in a way that may benefit from foreground mode. For this to be true,
+   *       the same player instance must be used to play multiple pieces of content, and there must
+   *       be gaps between the playbacks (i.e. {@link #stop} is called to halt one playback, and
+   *       {@link #prepare} is called some time later to start a new one).
+   * </ul>
+   *
+   * <p>Note that foreground mode is <em>not</em> useful for switching between content without gaps
+   * between the playbacks. For this use case {@link #stop} does not need to be called, and simply
+   * calling {@link #prepare} for the new media will cause limited resources to be retained even if
+   * foreground mode is not enabled.
+   *
+   * <p>If foreground mode is enabled, it's the application's responsibility to disable it when the
+   * conditions described above no longer hold.
+   *
+   * @param foregroundMode Whether the player is allowed to keep limited resources even when in the
+   *     idle state.
+   */
+  void setForegroundMode(boolean foregroundMode);
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index e1f942147d..130bf48921 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -71,6 +71,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
   private int pendingOperationAcks;
   private boolean hasPendingPrepare;
   private boolean hasPendingSeek;
+  private boolean foregroundMode;
   private PlaybackParameters playbackParameters;
   private SeekParameters seekParameters;
   private @Nullable ExoPlaybackException playbackError;
@@ -359,6 +360,14 @@ import java.util.concurrent.CopyOnWriteArraySet;
     return seekParameters;
   }
 
+  @Override
+  public void setForegroundMode(boolean foregroundMode) {
+    if (this.foregroundMode != foregroundMode) {
+      this.foregroundMode = foregroundMode;
+      internalPlayer.setForegroundMode(foregroundMode);
+    }
+  }
+
   @Override
   public void stop(boolean reset) {
     if (reset) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index 0c6c3ca202..3034ead032 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -44,6 +44,7 @@ import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /** Implements the internal behavior of {@link ExoPlayerImpl}. */
 /* package */ final class ExoPlayerImplInternal
@@ -76,9 +77,10 @@ import java.util.Collections;
   private static final int MSG_TRACK_SELECTION_INVALIDATED = 11;
   private static final int MSG_SET_REPEAT_MODE = 12;
   private static final int MSG_SET_SHUFFLE_ENABLED = 13;
-  private static final int MSG_SEND_MESSAGE = 14;
-  private static final int MSG_SEND_MESSAGE_TO_TARGET_THREAD = 15;
-  private static final int MSG_PLAYBACK_PARAMETERS_CHANGED_INTERNAL = 16;
+  private static final int MSG_SET_FOREGROUND_MODE = 14;
+  private static final int MSG_SEND_MESSAGE = 15;
+  private static final int MSG_SEND_MESSAGE_TO_TARGET_THREAD = 16;
+  private static final int MSG_PLAYBACK_PARAMETERS_CHANGED_INTERNAL = 17;
 
   private static final int PREPARING_SOURCE_INTERVAL_MS = 10;
   private static final int RENDERING_INTERVAL_MS = 10;
@@ -115,6 +117,7 @@ import java.util.Collections;
   private boolean rebuffering;
   @Player.RepeatMode private int repeatMode;
   private boolean shuffleModeEnabled;
+  private boolean foregroundMode;
 
   private int pendingPrepareCount;
   private SeekPosition pendingInitialSeekPosition;
@@ -218,6 +221,29 @@ import java.util.Collections;
     handler.obtainMessage(MSG_SEND_MESSAGE, message).sendToTarget();
   }
 
+  public synchronized void setForegroundMode(boolean foregroundMode) {
+    if (foregroundMode) {
+      handler.obtainMessage(MSG_SET_FOREGROUND_MODE, /* foregroundMode */ 1, 0).sendToTarget();
+    } else {
+      AtomicBoolean processedFlag = new AtomicBoolean();
+      handler
+          .obtainMessage(MSG_SET_FOREGROUND_MODE, /* foregroundMode */ 0, 0, processedFlag)
+          .sendToTarget();
+      boolean wasInterrupted = false;
+      while (!processedFlag.get() && !released) {
+        try {
+          wait();
+        } catch (InterruptedException e) {
+          wasInterrupted = true;
+        }
+      }
+      if (wasInterrupted) {
+        // Restore the interrupted status.
+        Thread.currentThread().interrupt();
+      }
+    }
+  }
+
   public synchronized void release() {
     if (released) {
       return;
@@ -311,8 +337,15 @@ import java.util.Collections;
         case MSG_SET_SEEK_PARAMETERS:
           setSeekParametersInternal((SeekParameters) msg.obj);
           break;
+        case MSG_SET_FOREGROUND_MODE:
+          setForegroundModeInternal(
+              /* foregroundMode= */ msg.arg1 != 0, /* processedFlag= */ (AtomicBoolean) msg.obj);
+          break;
         case MSG_STOP:
-          stopInternal(/* reset= */ msg.arg1 != 0, /* acknowledgeStop= */ true);
+          stopInternal(
+              /* forceResetRenderers= */ false,
+              /* resetPositionAndState= */ msg.arg1 != 0,
+              /* acknowledgeStop= */ true);
           break;
         case MSG_PERIOD_PREPARED:
           handlePeriodPrepared((MediaPeriod) msg.obj);
@@ -345,17 +378,26 @@ import java.util.Collections;
       maybeNotifyPlaybackInfoChanged();
     } catch (ExoPlaybackException e) {
       Log.e(TAG, "Playback error.", e);
-      stopInternal(/* reset= */ false, /* acknowledgeStop= */ false);
+      stopInternal(
+          /* forceResetRenderers= */ true,
+          /* resetPositionAndState= */ false,
+          /* acknowledgeStop= */ false);
       eventHandler.obtainMessage(MSG_ERROR, e).sendToTarget();
       maybeNotifyPlaybackInfoChanged();
     } catch (IOException e) {
       Log.e(TAG, "Source error.", e);
-      stopInternal(/* reset= */ false, /* acknowledgeStop= */ false);
+      stopInternal(
+          /* forceResetRenderers= */ false,
+          /* resetPositionAndState= */ false,
+          /* acknowledgeStop= */ false);
       eventHandler.obtainMessage(MSG_ERROR, ExoPlaybackException.createForSource(e)).sendToTarget();
       maybeNotifyPlaybackInfoChanged();
     } catch (RuntimeException e) {
       Log.e(TAG, "Internal runtime error.", e);
-      stopInternal(/* reset= */ false, /* acknowledgeStop= */ false);
+      stopInternal(
+          /* forceResetRenderers= */ true,
+          /* resetPositionAndState= */ false,
+          /* acknowledgeStop= */ false);
       eventHandler.obtainMessage(MSG_ERROR, ExoPlaybackException.createForUnexpected(e))
           .sendToTarget();
       maybeNotifyPlaybackInfoChanged();
@@ -394,7 +436,8 @@ import java.util.Collections;
 
   private void prepareInternal(MediaSource mediaSource, boolean resetPosition, boolean resetState) {
     pendingPrepareCount++;
-    resetInternal(/* releaseMediaSource= */ true, resetPosition, resetState);
+    resetInternal(
+        /* resetRenderers= */ false, /* releaseMediaSource= */ true, resetPosition, resetState);
     loadControl.onPrepared();
     this.mediaSource = mediaSource;
     setState(Player.STATE_BUFFERING);
@@ -631,7 +674,10 @@ import java.util.Collections;
         // End playback, as we didn't manage to find a valid seek position.
         setState(Player.STATE_ENDED);
         resetInternal(
-            /* releaseMediaSource= */ false, /* resetPosition= */ true, /* resetState= */ false);
+            /* resetRenderers= */ false,
+            /* releaseMediaSource= */ false,
+            /* resetPosition= */ true,
+            /* resetState= */ false);
       } else {
         // Execute the seek in the current media periods.
         long newPeriodPositionUs = periodPositionUs;
@@ -738,9 +784,33 @@ import java.util.Collections;
     this.seekParameters = seekParameters;
   }
 
-  private void stopInternal(boolean reset, boolean acknowledgeStop) {
+  private void setForegroundModeInternal(
+      boolean foregroundMode, @Nullable AtomicBoolean processedFlag) {
+    if (this.foregroundMode != foregroundMode) {
+      this.foregroundMode = foregroundMode;
+      if (!foregroundMode) {
+        for (Renderer renderer : renderers) {
+          if (renderer.getState() == Renderer.STATE_DISABLED) {
+            renderer.reset();
+          }
+        }
+      }
+    }
+    if (processedFlag != null) {
+      synchronized (this) {
+        processedFlag.set(true);
+        notifyAll();
+      }
+    }
+  }
+
+  private void stopInternal(
+      boolean forceResetRenderers, boolean resetPositionAndState, boolean acknowledgeStop) {
     resetInternal(
-        /* releaseMediaSource= */ true, /* resetPosition= */ reset, /* resetState= */ reset);
+        /* resetRenderers= */ forceResetRenderers || !foregroundMode,
+        /* releaseMediaSource= */ true,
+        /* resetPosition= */ resetPositionAndState,
+        /* resetState= */ resetPositionAndState);
     playbackInfoUpdate.incrementPendingOperationAcks(
         pendingPrepareCount + (acknowledgeStop ? 1 : 0));
     pendingPrepareCount = 0;
@@ -750,7 +820,10 @@ import java.util.Collections;
 
   private void releaseInternal() {
     resetInternal(
-        /* releaseMediaSource= */ true, /* resetPosition= */ true, /* resetState= */ true);
+        /* resetRenderers= */ true,
+        /* releaseMediaSource= */ true,
+        /* resetPosition= */ true,
+        /* resetState= */ true);
     loadControl.onReleased();
     setState(Player.STATE_IDLE);
     internalPlaybackThread.quit();
@@ -772,7 +845,10 @@ import java.util.Collections;
   }
 
   private void resetInternal(
-      boolean releaseMediaSource, boolean resetPosition, boolean resetState) {
+      boolean resetRenderers,
+      boolean releaseMediaSource,
+      boolean resetPosition,
+      boolean resetState) {
     handler.removeMessages(MSG_DO_SOME_WORK);
     rebuffering = false;
     mediaClock.stop();
@@ -782,7 +858,17 @@ import java.util.Collections;
         disableRenderer(renderer);
       } catch (ExoPlaybackException | RuntimeException e) {
         // There's nothing we can do.
-        Log.e(TAG, "Stop failed.", e);
+        Log.e(TAG, "Disable failed.", e);
+      }
+    }
+    if (resetRenderers) {
+      for (Renderer renderer : renderers) {
+        try {
+          renderer.reset();
+        } catch (RuntimeException e) {
+          // There's nothing we can do.
+          Log.e(TAG, "Reset failed.", e);
+        }
       }
     }
     enabledRenderers = new Renderer[0];
@@ -989,7 +1075,6 @@ import java.util.Collections;
     mediaClock.onRendererDisabled(renderer);
     ensureStopped(renderer);
     renderer.disable();
-    renderer.reset();
   }
 
   private void reselectTracksInternal() throws ExoPlaybackException {
@@ -1294,7 +1379,10 @@ import java.util.Collections;
     setState(Player.STATE_ENDED);
     // Reset, but retain the source so that it can still be used should a seek occur.
     resetInternal(
-        /* releaseMediaSource= */ false, /* resetPosition= */ true, /* resetState= */ false);
+        /* resetRenderers= */ false,
+        /* releaseMediaSource= */ false,
+        /* resetPosition= */ true,
+        /* resetState= */ false);
   }
 
   /**
@@ -1639,9 +1727,17 @@ import java.util.Collections;
       throws ExoPlaybackException {
     enabledRenderers = new Renderer[totalEnabledRendererCount];
     int enabledRendererCount = 0;
-    MediaPeriodHolder playingPeriodHolder = queue.getPlayingPeriod();
+    TrackSelectorResult trackSelectorResult = queue.getPlayingPeriod().getTrackSelectorResult();
+    // Reset all disabled renderers before enabling any new ones. This makes sure resources released
+    // by the disabled renderers will be available to renderers that are being enabled.
     for (int i = 0; i < renderers.length; i++) {
-      if (playingPeriodHolder.getTrackSelectorResult().isRendererEnabled(i)) {
+      if (!trackSelectorResult.isRendererEnabled(i)) {
+        renderers[i].reset();
+      }
+    }
+    // Enable the renderers.
+    for (int i = 0; i < renderers.length; i++) {
+      if (trackSelectorResult.isRendererEnabled(i)) {
         enableRenderer(i, rendererWasEnabledFlags[i], enabledRendererCount++);
       }
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index 8517556887..4ca6b51ce2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -958,6 +958,11 @@ public class SimpleExoPlayer extends BasePlayer
     return player.getSeekParameters();
   }
 
+  @Override
+  public void setForegroundMode(boolean foregroundMode) {
+    player.setForegroundMode(foregroundMode);
+  }
+
   @Override
   public void stop(boolean reset) {
     verifyApplicationThread();
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
index 156b573df8..1ac19591c0 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
@@ -267,4 +267,9 @@ public abstract class StubExoPlayer extends BasePlayer implements ExoPlayer {
   public long getContentBufferedPosition() {
     throw new UnsupportedOperationException();
   }
+
+  @Override
+  public void setForegroundMode(boolean foregroundMode) {
+    throw new UnsupportedOperationException();
+  }
 }

From ee02c6789a6a404a935fb4f23fdffa7d6bd62d9e Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 15 Oct 2018 19:44:39 -0700
Subject: [PATCH 085/832] Support seeking based on MLLT metadata

Issue: #3241

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217252254
---
 RELEASENOTES.md                               |   3 +
 .../extractor/GaplessInfoHolder.java          |  10 --
 .../exoplayer2/extractor/mp3/MlltSeeker.java  | 121 ++++++++++++++++++
 .../extractor/mp3/Mp3Extractor.java           |  41 +++++-
 .../exoplayer2/metadata/id3/Id3Decoder.java   |  33 +++++
 .../exoplayer2/metadata/id3/MlltFrame.java    | 112 ++++++++++++++++
 .../metadata/id3/MlltFrameTest.java           |  49 +++++++
 7 files changed, 354 insertions(+), 15 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/MlltSeeker.java
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 01103a7a22..060b5f4daf 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -21,6 +21,9 @@
   ([#4788](https://github.com/google/ExoPlayer/issues/4788)).
 * SubRip: Add support for alignment tags, and remove tags from the displayed
   captions ([#4306](https://github.com/google/ExoPlayer/issues/4306)).
+* Audio:
+  * Support seeking based on MLLT metadata
+    ([#3241](https://github.com/google/ExoPlayer/issues/3241)).
 * Fix issue where buffered position is not updated correctly when transitioning
   between periods
   ([#4899](https://github.com/google/ExoPlayer/issues/4899)).
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java
index 0742d96a06..a0effc0df8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java
@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.extractor;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.id3.CommentFrame;
-import com.google.android.exoplayer2.metadata.id3.Id3Decoder.FramePredicate;
 import com.google.android.exoplayer2.metadata.id3.InternalFrame;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -28,15 +27,6 @@ import java.util.regex.Pattern;
  */
 public final class GaplessInfoHolder {
 
-  /**
-   * A {@link FramePredicate} suitable for use when decoding {@link Metadata} that will be passed to
-   * {@link #setFromMetadata(Metadata)}. Only frames that might contain gapless playback information
-   * are decoded.
-   */
-  public static final FramePredicate GAPLESS_INFO_ID3_FRAME_PREDICATE =
-      (majorVersion, id0, id1, id2, id3) ->
-          id0 == 'C' && id1 == 'O' && id2 == 'M' && (id3 == 'M' || majorVersion == 2);
-
   private static final String GAPLESS_DOMAIN = "com.apple.iTunes";
   private static final String GAPLESS_DESCRIPTION = "iTunSMPB";
   private static final Pattern GAPLESS_COMMENT_PATTERN =
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/MlltSeeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/MlltSeeker.java
new file mode 100644
index 0000000000..ff607b9482
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/MlltSeeker.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.extractor.mp3;
+
+import android.util.Pair;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.extractor.SeekPoint;
+import com.google.android.exoplayer2.metadata.id3.MlltFrame;
+import com.google.android.exoplayer2.util.Util;
+
+/** MP3 seeker that uses metadata from an {@link MlltFrame}. */
+/* package */ final class MlltSeeker implements Mp3Extractor.Seeker {
+
+  /**
+   * Returns an {@link MlltSeeker} for seeking in the stream.
+   *
+   * @param firstFramePosition The position of the start of the first frame in the stream.
+   * @param mlltFrame The MLLT frame with seeking metadata.
+   * @return An {@link MlltSeeker} for seeking in the stream.
+   */
+  public static MlltSeeker create(long firstFramePosition, MlltFrame mlltFrame) {
+    int referenceCount = mlltFrame.bytesDeviations.length;
+    long[] referencePositions = new long[1 + referenceCount];
+    long[] referenceTimesMs = new long[1 + referenceCount];
+    referencePositions[0] = firstFramePosition;
+    referenceTimesMs[0] = 0;
+    long position = firstFramePosition;
+    long timeMs = 0;
+    for (int i = 1; i <= referenceCount; i++) {
+      position += mlltFrame.bytesBetweenReference + mlltFrame.bytesDeviations[i - 1];
+      timeMs += mlltFrame.millisecondsBetweenReference + mlltFrame.millisecondsDeviations[i - 1];
+      referencePositions[i] = position;
+      referenceTimesMs[i] = timeMs;
+    }
+    return new MlltSeeker(referencePositions, referenceTimesMs);
+  }
+
+  private final long[] referencePositions;
+  private final long[] referenceTimesMs;
+  private final long durationUs;
+
+  private MlltSeeker(long[] referencePositions, long[] referenceTimesMs) {
+    this.referencePositions = referencePositions;
+    this.referenceTimesMs = referenceTimesMs;
+    // Use the last reference point as the duration, as extrapolating variable bitrate at the end of
+    // the stream may give a large error.
+    durationUs = C.msToUs(referenceTimesMs[referenceTimesMs.length - 1]);
+  }
+
+  @Override
+  public boolean isSeekable() {
+    return true;
+  }
+
+  @Override
+  public SeekPoints getSeekPoints(long timeUs) {
+    timeUs = Util.constrainValue(timeUs, 0, durationUs);
+    Pair<Long, Long> timeMsAndPosition =
+        linearlyInterpolate(C.usToMs(timeUs), referenceTimesMs, referencePositions);
+    timeUs = C.msToUs(timeMsAndPosition.first);
+    long position = timeMsAndPosition.second;
+    return new SeekPoints(new SeekPoint(timeUs, position));
+  }
+
+  @Override
+  public long getTimeUs(long position) {
+    Pair<Long, Long> positionAndTimeMs =
+        linearlyInterpolate(position, referencePositions, referenceTimesMs);
+    return C.msToUs(positionAndTimeMs.second);
+  }
+
+  @Override
+  public long getDurationUs() {
+    return durationUs;
+  }
+
+  /**
+   * Given a set of reference points as coordinates in {@code xReferences} and {@code yReferences}
+   * and an x-axis value, linearly interpolates between corresponding reference points to give a
+   * y-axis value.
+   *
+   * @param x The x-axis value for which a y-axis value is needed.
+   * @param xReferences x coordinates of reference points.
+   * @param yReferences y coordinates of reference points.
+   * @return The linearly interpolated y-axis value.
+   */
+  private static Pair<Long, Long> linearlyInterpolate(
+      long x, long[] xReferences, long[] yReferences) {
+    int previousReferenceIndex =
+        Util.binarySearchFloor(xReferences, x, /* inclusive= */ true, /* stayInBounds= */ true);
+    long xPreviousReference = xReferences[previousReferenceIndex];
+    long yPreviousReference = yReferences[previousReferenceIndex];
+    int nextReferenceIndex = previousReferenceIndex + 1;
+    if (nextReferenceIndex == xReferences.length) {
+      return Pair.create(xPreviousReference, yPreviousReference);
+    } else {
+      long xNextReference = xReferences[nextReferenceIndex];
+      long yNextReference = yReferences[nextReferenceIndex];
+      double proportion =
+          xNextReference == xPreviousReference
+              ? 0.0
+              : ((double) x - xPreviousReference) / (xNextReference - xPreviousReference);
+      long y = (long) (proportion * (yNextReference - yPreviousReference)) + yPreviousReference;
+      return Pair.create(x, y);
+    }
+  }
+
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java
index 92cf590a49..84f620734b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2.extractor.mp3;
 
 import android.support.annotation.IntDef;
+import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ParserException;
@@ -31,6 +32,8 @@ import com.google.android.exoplayer2.extractor.SeekMap;
 import com.google.android.exoplayer2.extractor.TrackOutput;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.id3.Id3Decoder;
+import com.google.android.exoplayer2.metadata.id3.Id3Decoder.FramePredicate;
+import com.google.android.exoplayer2.metadata.id3.MlltFrame;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.Util;
 import java.io.EOFException;
@@ -68,6 +71,12 @@ public final class Mp3Extractor implements Extractor {
    */
   public static final int FLAG_DISABLE_ID3_METADATA = 2;
 
+  /** Predicate that matches ID3 frames containing only required gapless/seeking metadata. */
+  private static final FramePredicate REQUIRED_ID3_FRAME_PREDICATE =
+      (majorVersion, id0, id1, id2, id3) ->
+          ((id0 == 'C' && id1 == 'O' && id2 == 'M' && (id3 == 'M' || majorVersion == 2))
+              || (id0 == 'M' && id1 == 'L' && id2 == 'L' && (id3 == 'T' || majorVersion == 2)));
+
   /**
    * The maximum number of bytes to search when synchronizing, before giving up.
    */
@@ -174,7 +183,15 @@ public final class Mp3Extractor implements Extractor {
       }
     }
     if (seeker == null) {
-      seeker = maybeReadSeekFrame(input);
+      // Read past any seek frame and set the seeker based on metadata or a seek frame. Metadata
+      // takes priority as it can provide greater precision.
+      Seeker seekFrameSeeker = maybeReadSeekFrame(input);
+      Seeker metadataSeeker = maybeHandleSeekMetadata(metadata, input.getPosition());
+      if (metadataSeeker != null) {
+        seeker = metadataSeeker;
+      } else if (seekFrameSeeker != null) {
+        seeker = seekFrameSeeker;
+      }
       if (seeker == null
           || (!seeker.isSeekable() && (flags & FLAG_ENABLE_CONSTANT_BITRATE_SEEKING) != 0)) {
         seeker = getConstantBitrateSeeker(input);
@@ -253,11 +270,11 @@ public final class Mp3Extractor implements Extractor {
     int searchLimitBytes = sniffing ? MAX_SNIFF_BYTES : MAX_SYNC_BYTES;
     input.resetPeekPosition();
     if (input.getPosition() == 0) {
-      // We need to parse enough ID3 metadata to retrieve any gapless playback information even
-      // if ID3 metadata parsing is disabled.
-      boolean onlyDecodeGaplessInfoFrames = (flags & FLAG_DISABLE_ID3_METADATA) != 0;
+      // We need to parse enough ID3 metadata to retrieve any gapless/seeking playback information
+      // even if ID3 metadata parsing is disabled.
+      boolean parseAllId3Frames = (flags & FLAG_DISABLE_ID3_METADATA) == 0;
       Id3Decoder.FramePredicate id3FramePredicate =
-          onlyDecodeGaplessInfoFrames ? GaplessInfoHolder.GAPLESS_INFO_ID3_FRAME_PREDICATE : null;
+          parseAllId3Frames ? null : REQUIRED_ID3_FRAME_PREDICATE;
       metadata = id3Peeker.peekId3Data(input, id3FramePredicate);
       if (metadata != null) {
         gaplessInfoHolder.setFromMetadata(metadata);
@@ -401,6 +418,20 @@ public final class Mp3Extractor implements Extractor {
     return SEEK_HEADER_UNSET;
   }
 
+  @Nullable
+  private static MlltSeeker maybeHandleSeekMetadata(Metadata metadata, long firstFramePosition) {
+    if (metadata != null) {
+      int length = metadata.length();
+      for (int i = 0; i < length; i++) {
+        Metadata.Entry entry = metadata.get(i);
+        if (entry instanceof MlltFrame) {
+          return MlltSeeker.create(firstFramePosition, (MlltFrame) entry);
+        }
+      }
+    }
+    return null;
+  }
+
   /**
    * {@link SeekMap} that also allows mapping from position (byte offset) back to time, which can be
    * used to work out the new sample basis timestamp after seeking and resynchronization.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java
index 0bf9d3b249..63bf30dd11 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java
@@ -21,6 +21,7 @@ import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.MetadataDecoder;
 import com.google.android.exoplayer2.metadata.MetadataInputBuffer;
 import com.google.android.exoplayer2.util.Log;
+import com.google.android.exoplayer2.util.ParsableBitArray;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.Util;
 import java.io.UnsupportedEncodingException;
@@ -382,6 +383,8 @@ public final class Id3Decoder implements MetadataDecoder {
       } else if (frameId0 == 'C' && frameId1 == 'T' && frameId2 == 'O' && frameId3 == 'C') {
         frame = decodeChapterTOCFrame(id3Data, frameSize, majorVersion, unsignedIntFrameSizeHack,
             frameHeaderSize, framePredicate);
+      } else if (frameId0 == 'M' && frameId1 == 'L' && frameId2 == 'L' && frameId3 == 'T') {
+        frame = decodeMlltFrame(id3Data, frameSize);
       } else {
         String id = getFrameId(majorVersion, frameId0, frameId1, frameId2, frameId3);
         frame = decodeBinaryFrame(id3Data, frameSize, id);
@@ -662,6 +665,36 @@ public final class Id3Decoder implements MetadataDecoder {
     return new ChapterTocFrame(elementId, isRoot, isOrdered, children, subFrameArray);
   }
 
+  private static MlltFrame decodeMlltFrame(ParsableByteArray id3Data, int frameSize) {
+    // See ID3v2.4.0 native frames subsection 4.6.
+    int mpegFramesBetweenReference = id3Data.readUnsignedShort();
+    int bytesBetweenReference = id3Data.readUnsignedInt24();
+    int millisecondsBetweenReference = id3Data.readUnsignedInt24();
+    int bitsForBytesDeviation = id3Data.readUnsignedByte();
+    int bitsForMillisecondsDeviation = id3Data.readUnsignedByte();
+
+    ParsableBitArray references = new ParsableBitArray();
+    references.reset(id3Data);
+    int referencesBits = 8 * (frameSize - 10);
+    int bitsPerReference = bitsForBytesDeviation + bitsForMillisecondsDeviation;
+    int referencesCount = referencesBits / bitsPerReference;
+    int[] bytesDeviations = new int[referencesCount];
+    int[] millisecondsDeviations = new int[referencesCount];
+    for (int i = 0; i < referencesCount; i++) {
+      int bytesDeviation = references.readBits(bitsForBytesDeviation);
+      int millisecondsDeviation = references.readBits(bitsForMillisecondsDeviation);
+      bytesDeviations[i] = bytesDeviation;
+      millisecondsDeviations[i] = millisecondsDeviation;
+    }
+
+    return new MlltFrame(
+        mpegFramesBetweenReference,
+        bytesBetweenReference,
+        millisecondsBetweenReference,
+        bytesDeviations,
+        millisecondsDeviations);
+  }
+
   private static BinaryFrame decodeBinaryFrame(ParsableByteArray id3Data, int frameSize,
       String id) {
     byte[] frame = new byte[frameSize];
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java
new file mode 100644
index 0000000000..06a4dd9d2d
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.metadata.id3;
+
+import android.os.Parcel;
+import android.support.annotation.Nullable;
+import java.util.Arrays;
+
+/** MPEG location lookup table frame. */
+public final class MlltFrame extends Id3Frame {
+
+  public static final String ID = "MLLT";
+
+  public final int mpegFramesBetweenReference;
+  public final int bytesBetweenReference;
+  public final int millisecondsBetweenReference;
+  public final int[] bytesDeviations;
+  public final int[] millisecondsDeviations;
+
+  public MlltFrame(
+      int mpegFramesBetweenReference,
+      int bytesBetweenReference,
+      int millisecondsBetweenReference,
+      int[] bytesDeviations,
+      int[] millisecondsDeviations) {
+    super(ID);
+    this.mpegFramesBetweenReference = mpegFramesBetweenReference;
+    this.bytesBetweenReference = bytesBetweenReference;
+    this.millisecondsBetweenReference = millisecondsBetweenReference;
+    this.bytesDeviations = bytesDeviations;
+    this.millisecondsDeviations = millisecondsDeviations;
+  }
+
+  /* package */ MlltFrame(Parcel in) {
+    super(ID);
+    this.mpegFramesBetweenReference = in.readInt();
+    this.bytesBetweenReference = in.readInt();
+    this.millisecondsBetweenReference = in.readInt();
+    this.bytesDeviations = in.createIntArray();
+    this.millisecondsDeviations = in.createIntArray();
+  }
+
+  @Override
+  public boolean equals(@Nullable Object obj) {
+    if (this == obj) {
+      return true;
+    }
+    if (obj == null || getClass() != obj.getClass()) {
+      return false;
+    }
+    MlltFrame other = (MlltFrame) obj;
+    return mpegFramesBetweenReference == other.mpegFramesBetweenReference
+        && bytesBetweenReference == other.bytesBetweenReference
+        && millisecondsBetweenReference == other.millisecondsBetweenReference
+        && Arrays.equals(bytesDeviations, other.bytesDeviations)
+        && Arrays.equals(millisecondsDeviations, other.millisecondsDeviations);
+  }
+
+  @Override
+  public int hashCode() {
+    int result = 17;
+    result = 31 * result + mpegFramesBetweenReference;
+    result = 31 * result + bytesBetweenReference;
+    result = 31 * result + millisecondsBetweenReference;
+    result = 31 * result + Arrays.hashCode(bytesDeviations);
+    result = 31 * result + Arrays.hashCode(millisecondsDeviations);
+    return result;
+  }
+
+  // Parcelable implementation.
+
+  @Override
+  public void writeToParcel(Parcel dest, int flags) {
+    dest.writeInt(mpegFramesBetweenReference);
+    dest.writeInt(bytesBetweenReference);
+    dest.writeInt(millisecondsBetweenReference);
+    dest.writeIntArray(bytesDeviations);
+    dest.writeIntArray(millisecondsDeviations);
+  }
+
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  public static final Creator<MlltFrame> CREATOR =
+      new Creator<MlltFrame>() {
+
+        @Override
+        public MlltFrame createFromParcel(Parcel in) {
+          return new MlltFrame(in);
+        }
+
+        @Override
+        public MlltFrame[] newArray(int size) {
+          return new MlltFrame[size];
+        }
+      };
+}
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java b/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java
new file mode 100644
index 0000000000..3e6520beca
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.metadata.id3;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.os.Parcel;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Test for {@link MlltFrame}. */
+@RunWith(RobolectricTestRunner.class)
+public final class MlltFrameTest {
+
+  @Test
+  public void testParcelable() {
+    MlltFrame mlltFrameToParcel =
+        new MlltFrame(
+            /* mpegFramesBetweenReference= */ 1,
+            /* bytesBetweenReference= */ 1,
+            /* millisecondsBetweenReference= */ 1,
+            /* bytesDeviations= */ new int[] {1, 2},
+            /* millisecondsDeviations= */ new int[] {1, 2});
+
+    Parcel parcel = Parcel.obtain();
+    mlltFrameToParcel.writeToParcel(parcel, 0);
+    parcel.setDataPosition(0);
+
+    MlltFrame mlltFrameFromParcel = MlltFrame.CREATOR.createFromParcel(parcel);
+    assertThat(mlltFrameFromParcel).isEqualTo(mlltFrameToParcel);
+
+    parcel.recycle();
+  }
+
+}

From cc914494d7d8ef51ba305dc7e0baa04fa130b9d4 Mon Sep 17 00:00:00 2001
From: cpaulino <cpaulino@google.com>
Date: Tue, 16 Oct 2018 11:01:37 -0700
Subject: [PATCH 086/832] Rename libvpxJNI.so to libvpxV2JNI.so

Renamed to stop collision between the ExoV1 and ExoV2 implementation.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217348150
---
 .../com/google/android/exoplayer2/ext/vp9/VpxLibrary.java     | 2 +-
 extensions/vp9/src/main/jni/Android.mk                        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxLibrary.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxLibrary.java
index 854576b4b2..5a65fc56ff 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxLibrary.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxLibrary.java
@@ -27,7 +27,7 @@ public final class VpxLibrary {
     ExoPlayerLibraryInfo.registerModule("goog.exo.vpx");
   }
 
-  private static final LibraryLoader LOADER = new LibraryLoader("vpx", "vpxJNI");
+  private static final LibraryLoader LOADER = new LibraryLoader("vpx", "vpxV2JNI");
 
   private VpxLibrary() {}
 
diff --git a/extensions/vp9/src/main/jni/Android.mk b/extensions/vp9/src/main/jni/Android.mk
index 868b869d56..fdcdc57b41 100644
--- a/extensions/vp9/src/main/jni/Android.mk
+++ b/extensions/vp9/src/main/jni/Android.mk
@@ -28,10 +28,10 @@ include $(LIBYUV_ROOT)/Android.mk
 LOCAL_PATH := $(WORKING_DIR)
 include libvpx.mk
 
-# build libvpxJNI.so
+# build libvpxV2JNI.so
 include $(CLEAR_VARS)
 LOCAL_PATH := $(WORKING_DIR)
-LOCAL_MODULE := libvpxJNI
+LOCAL_MODULE := libvpxV2JNI
 LOCAL_ARM_MODE := arm
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := vpx_jni.cc

From 423a954e1b0940ddaa3a1458ee80500ecdf09e5f Mon Sep 17 00:00:00 2001
From: falhassen <falhassen@google.com>
Date: Tue, 16 Oct 2018 11:44:56 -0700
Subject: [PATCH 087/832] Automated g4 rollback of changelist 217189082.

*** Reason for rollback ***

Broke photos (b/117818304)

*** Original change description ***

Add ExoPlayer.setForegroundMode

Issue: #2826

***

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217356705
---
 RELEASENOTES.md                               |   2 -
 .../google/android/exoplayer2/ExoPlayer.java  |  30 ----
 .../android/exoplayer2/ExoPlayerImpl.java     |   9 --
 .../exoplayer2/ExoPlayerImplInternal.java     | 132 +++---------------
 .../android/exoplayer2/SimpleExoPlayer.java   |   5 -
 .../exoplayer2/testutil/StubExoPlayer.java    |   5 -
 6 files changed, 18 insertions(+), 165 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 060b5f4daf..4be871821b 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,8 +2,6 @@
 
 ### dev-v2 (not yet released) ###
 
-* Improve decoder re-use between playbacks. TODO: Write and link a blog post
-  here ([#2826](https://github.com/google/ExoPlayer/issues/2826)).
 * Improve initial bandwidth meter estimates using the current country and
   network type.
 * Do not retry failed loads whose error is `FileNotFoundException`.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
index 5ba2394c3f..96ddb2eb9c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
@@ -209,34 +209,4 @@ public interface ExoPlayer extends Player {
 
   /** Returns the currently active {@link SeekParameters} of the player. */
   SeekParameters getSeekParameters();
-
-  /**
-   * Sets whether the player is allowed to keep holding limited resources such as video decoders,
-   * even when in the idle state. By doing so, the player may be able to reduce latency when
-   * starting to play another piece of content for which the same resources are required.
-   *
-   * <p>This mode should be used with caution, since holding limited resources may prevent other
-   * players of media components from acquiring them. It should only be enabled when <em>both</em>
-   * of the following conditions are true:
-   *
-   * <ul>
-   *   <li>The application that owns the player is in the foreground.
-   *   <li>The player is used in a way that may benefit from foreground mode. For this to be true,
-   *       the same player instance must be used to play multiple pieces of content, and there must
-   *       be gaps between the playbacks (i.e. {@link #stop} is called to halt one playback, and
-   *       {@link #prepare} is called some time later to start a new one).
-   * </ul>
-   *
-   * <p>Note that foreground mode is <em>not</em> useful for switching between content without gaps
-   * between the playbacks. For this use case {@link #stop} does not need to be called, and simply
-   * calling {@link #prepare} for the new media will cause limited resources to be retained even if
-   * foreground mode is not enabled.
-   *
-   * <p>If foreground mode is enabled, it's the application's responsibility to disable it when the
-   * conditions described above no longer hold.
-   *
-   * @param foregroundMode Whether the player is allowed to keep limited resources even when in the
-   *     idle state.
-   */
-  void setForegroundMode(boolean foregroundMode);
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index 130bf48921..e1f942147d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -71,7 +71,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
   private int pendingOperationAcks;
   private boolean hasPendingPrepare;
   private boolean hasPendingSeek;
-  private boolean foregroundMode;
   private PlaybackParameters playbackParameters;
   private SeekParameters seekParameters;
   private @Nullable ExoPlaybackException playbackError;
@@ -360,14 +359,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
     return seekParameters;
   }
 
-  @Override
-  public void setForegroundMode(boolean foregroundMode) {
-    if (this.foregroundMode != foregroundMode) {
-      this.foregroundMode = foregroundMode;
-      internalPlayer.setForegroundMode(foregroundMode);
-    }
-  }
-
   @Override
   public void stop(boolean reset) {
     if (reset) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index 3034ead032..0c6c3ca202 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -44,7 +44,6 @@ import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 /** Implements the internal behavior of {@link ExoPlayerImpl}. */
 /* package */ final class ExoPlayerImplInternal
@@ -77,10 +76,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
   private static final int MSG_TRACK_SELECTION_INVALIDATED = 11;
   private static final int MSG_SET_REPEAT_MODE = 12;
   private static final int MSG_SET_SHUFFLE_ENABLED = 13;
-  private static final int MSG_SET_FOREGROUND_MODE = 14;
-  private static final int MSG_SEND_MESSAGE = 15;
-  private static final int MSG_SEND_MESSAGE_TO_TARGET_THREAD = 16;
-  private static final int MSG_PLAYBACK_PARAMETERS_CHANGED_INTERNAL = 17;
+  private static final int MSG_SEND_MESSAGE = 14;
+  private static final int MSG_SEND_MESSAGE_TO_TARGET_THREAD = 15;
+  private static final int MSG_PLAYBACK_PARAMETERS_CHANGED_INTERNAL = 16;
 
   private static final int PREPARING_SOURCE_INTERVAL_MS = 10;
   private static final int RENDERING_INTERVAL_MS = 10;
@@ -117,7 +115,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
   private boolean rebuffering;
   @Player.RepeatMode private int repeatMode;
   private boolean shuffleModeEnabled;
-  private boolean foregroundMode;
 
   private int pendingPrepareCount;
   private SeekPosition pendingInitialSeekPosition;
@@ -221,29 +218,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
     handler.obtainMessage(MSG_SEND_MESSAGE, message).sendToTarget();
   }
 
-  public synchronized void setForegroundMode(boolean foregroundMode) {
-    if (foregroundMode) {
-      handler.obtainMessage(MSG_SET_FOREGROUND_MODE, /* foregroundMode */ 1, 0).sendToTarget();
-    } else {
-      AtomicBoolean processedFlag = new AtomicBoolean();
-      handler
-          .obtainMessage(MSG_SET_FOREGROUND_MODE, /* foregroundMode */ 0, 0, processedFlag)
-          .sendToTarget();
-      boolean wasInterrupted = false;
-      while (!processedFlag.get() && !released) {
-        try {
-          wait();
-        } catch (InterruptedException e) {
-          wasInterrupted = true;
-        }
-      }
-      if (wasInterrupted) {
-        // Restore the interrupted status.
-        Thread.currentThread().interrupt();
-      }
-    }
-  }
-
   public synchronized void release() {
     if (released) {
       return;
@@ -337,15 +311,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
         case MSG_SET_SEEK_PARAMETERS:
           setSeekParametersInternal((SeekParameters) msg.obj);
           break;
-        case MSG_SET_FOREGROUND_MODE:
-          setForegroundModeInternal(
-              /* foregroundMode= */ msg.arg1 != 0, /* processedFlag= */ (AtomicBoolean) msg.obj);
-          break;
         case MSG_STOP:
-          stopInternal(
-              /* forceResetRenderers= */ false,
-              /* resetPositionAndState= */ msg.arg1 != 0,
-              /* acknowledgeStop= */ true);
+          stopInternal(/* reset= */ msg.arg1 != 0, /* acknowledgeStop= */ true);
           break;
         case MSG_PERIOD_PREPARED:
           handlePeriodPrepared((MediaPeriod) msg.obj);
@@ -378,26 +345,17 @@ import java.util.concurrent.atomic.AtomicBoolean;
       maybeNotifyPlaybackInfoChanged();
     } catch (ExoPlaybackException e) {
       Log.e(TAG, "Playback error.", e);
-      stopInternal(
-          /* forceResetRenderers= */ true,
-          /* resetPositionAndState= */ false,
-          /* acknowledgeStop= */ false);
+      stopInternal(/* reset= */ false, /* acknowledgeStop= */ false);
       eventHandler.obtainMessage(MSG_ERROR, e).sendToTarget();
       maybeNotifyPlaybackInfoChanged();
     } catch (IOException e) {
       Log.e(TAG, "Source error.", e);
-      stopInternal(
-          /* forceResetRenderers= */ false,
-          /* resetPositionAndState= */ false,
-          /* acknowledgeStop= */ false);
+      stopInternal(/* reset= */ false, /* acknowledgeStop= */ false);
       eventHandler.obtainMessage(MSG_ERROR, ExoPlaybackException.createForSource(e)).sendToTarget();
       maybeNotifyPlaybackInfoChanged();
     } catch (RuntimeException e) {
       Log.e(TAG, "Internal runtime error.", e);
-      stopInternal(
-          /* forceResetRenderers= */ true,
-          /* resetPositionAndState= */ false,
-          /* acknowledgeStop= */ false);
+      stopInternal(/* reset= */ false, /* acknowledgeStop= */ false);
       eventHandler.obtainMessage(MSG_ERROR, ExoPlaybackException.createForUnexpected(e))
           .sendToTarget();
       maybeNotifyPlaybackInfoChanged();
@@ -436,8 +394,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
   private void prepareInternal(MediaSource mediaSource, boolean resetPosition, boolean resetState) {
     pendingPrepareCount++;
-    resetInternal(
-        /* resetRenderers= */ false, /* releaseMediaSource= */ true, resetPosition, resetState);
+    resetInternal(/* releaseMediaSource= */ true, resetPosition, resetState);
     loadControl.onPrepared();
     this.mediaSource = mediaSource;
     setState(Player.STATE_BUFFERING);
@@ -674,10 +631,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
         // End playback, as we didn't manage to find a valid seek position.
         setState(Player.STATE_ENDED);
         resetInternal(
-            /* resetRenderers= */ false,
-            /* releaseMediaSource= */ false,
-            /* resetPosition= */ true,
-            /* resetState= */ false);
+            /* releaseMediaSource= */ false, /* resetPosition= */ true, /* resetState= */ false);
       } else {
         // Execute the seek in the current media periods.
         long newPeriodPositionUs = periodPositionUs;
@@ -784,33 +738,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
     this.seekParameters = seekParameters;
   }
 
-  private void setForegroundModeInternal(
-      boolean foregroundMode, @Nullable AtomicBoolean processedFlag) {
-    if (this.foregroundMode != foregroundMode) {
-      this.foregroundMode = foregroundMode;
-      if (!foregroundMode) {
-        for (Renderer renderer : renderers) {
-          if (renderer.getState() == Renderer.STATE_DISABLED) {
-            renderer.reset();
-          }
-        }
-      }
-    }
-    if (processedFlag != null) {
-      synchronized (this) {
-        processedFlag.set(true);
-        notifyAll();
-      }
-    }
-  }
-
-  private void stopInternal(
-      boolean forceResetRenderers, boolean resetPositionAndState, boolean acknowledgeStop) {
+  private void stopInternal(boolean reset, boolean acknowledgeStop) {
     resetInternal(
-        /* resetRenderers= */ forceResetRenderers || !foregroundMode,
-        /* releaseMediaSource= */ true,
-        /* resetPosition= */ resetPositionAndState,
-        /* resetState= */ resetPositionAndState);
+        /* releaseMediaSource= */ true, /* resetPosition= */ reset, /* resetState= */ reset);
     playbackInfoUpdate.incrementPendingOperationAcks(
         pendingPrepareCount + (acknowledgeStop ? 1 : 0));
     pendingPrepareCount = 0;
@@ -820,10 +750,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
   private void releaseInternal() {
     resetInternal(
-        /* resetRenderers= */ true,
-        /* releaseMediaSource= */ true,
-        /* resetPosition= */ true,
-        /* resetState= */ true);
+        /* releaseMediaSource= */ true, /* resetPosition= */ true, /* resetState= */ true);
     loadControl.onReleased();
     setState(Player.STATE_IDLE);
     internalPlaybackThread.quit();
@@ -845,10 +772,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
   }
 
   private void resetInternal(
-      boolean resetRenderers,
-      boolean releaseMediaSource,
-      boolean resetPosition,
-      boolean resetState) {
+      boolean releaseMediaSource, boolean resetPosition, boolean resetState) {
     handler.removeMessages(MSG_DO_SOME_WORK);
     rebuffering = false;
     mediaClock.stop();
@@ -858,17 +782,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
         disableRenderer(renderer);
       } catch (ExoPlaybackException | RuntimeException e) {
         // There's nothing we can do.
-        Log.e(TAG, "Disable failed.", e);
-      }
-    }
-    if (resetRenderers) {
-      for (Renderer renderer : renderers) {
-        try {
-          renderer.reset();
-        } catch (RuntimeException e) {
-          // There's nothing we can do.
-          Log.e(TAG, "Reset failed.", e);
-        }
+        Log.e(TAG, "Stop failed.", e);
       }
     }
     enabledRenderers = new Renderer[0];
@@ -1075,6 +989,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
     mediaClock.onRendererDisabled(renderer);
     ensureStopped(renderer);
     renderer.disable();
+    renderer.reset();
   }
 
   private void reselectTracksInternal() throws ExoPlaybackException {
@@ -1379,10 +1294,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
     setState(Player.STATE_ENDED);
     // Reset, but retain the source so that it can still be used should a seek occur.
     resetInternal(
-        /* resetRenderers= */ false,
-        /* releaseMediaSource= */ false,
-        /* resetPosition= */ true,
-        /* resetState= */ false);
+        /* releaseMediaSource= */ false, /* resetPosition= */ true, /* resetState= */ false);
   }
 
   /**
@@ -1727,17 +1639,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
       throws ExoPlaybackException {
     enabledRenderers = new Renderer[totalEnabledRendererCount];
     int enabledRendererCount = 0;
-    TrackSelectorResult trackSelectorResult = queue.getPlayingPeriod().getTrackSelectorResult();
-    // Reset all disabled renderers before enabling any new ones. This makes sure resources released
-    // by the disabled renderers will be available to renderers that are being enabled.
+    MediaPeriodHolder playingPeriodHolder = queue.getPlayingPeriod();
     for (int i = 0; i < renderers.length; i++) {
-      if (!trackSelectorResult.isRendererEnabled(i)) {
-        renderers[i].reset();
-      }
-    }
-    // Enable the renderers.
-    for (int i = 0; i < renderers.length; i++) {
-      if (trackSelectorResult.isRendererEnabled(i)) {
+      if (playingPeriodHolder.getTrackSelectorResult().isRendererEnabled(i)) {
         enableRenderer(i, rendererWasEnabledFlags[i], enabledRendererCount++);
       }
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index 4ca6b51ce2..8517556887 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -958,11 +958,6 @@ public class SimpleExoPlayer extends BasePlayer
     return player.getSeekParameters();
   }
 
-  @Override
-  public void setForegroundMode(boolean foregroundMode) {
-    player.setForegroundMode(foregroundMode);
-  }
-
   @Override
   public void stop(boolean reset) {
     verifyApplicationThread();
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
index 1ac19591c0..156b573df8 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
@@ -267,9 +267,4 @@ public abstract class StubExoPlayer extends BasePlayer implements ExoPlayer {
   public long getContentBufferedPosition() {
     throw new UnsupportedOperationException();
   }
-
-  @Override
-  public void setForegroundMode(boolean foregroundMode) {
-    throw new UnsupportedOperationException();
-  }
 }

From 86fdcb08d84de1e04a0f0ffaa0aa9baa55b6c00a Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 17 Oct 2018 05:57:40 -0700
Subject: [PATCH 088/832] Fix documentation confusion in MediaChunkIterator
 subclasses

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217505571
---
 .../exoplayer2/source/chunk/BaseMediaChunkIterator.java   | 2 +-
 .../exoplayer2/source/dash/DefaultDashChunkSource.java    | 8 +++++---
 .../android/exoplayer2/source/hls/HlsChunkSource.java     | 2 +-
 .../source/smoothstreaming/DefaultSsChunkSource.java      | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkIterator.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkIterator.java
index 68dd322449..4c1462babf 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkIterator.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkIterator.java
@@ -31,7 +31,7 @@ public abstract class BaseMediaChunkIterator implements MediaChunkIterator {
   /**
    * Creates base iterator.
    *
-   * @param fromIndex The index at which the iterator will start.
+   * @param fromIndex The first available index.
    * @param toIndex The last available index.
    */
   public BaseMediaChunkIterator(long fromIndex, long toIndex) {
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
index 1ea25ecc36..d989cdf2f7 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
@@ -578,12 +578,14 @@ public class DefaultDashChunkSource implements DashChunkSource {
      * Creates iterator.
      *
      * @param representation The {@link RepresentationHolder} to wrap.
-     * @param segmentNum The number of the segment this iterator will be pointing to initially.
+     * @param firstAvailableSegmentNum The number of the first available segment.
      * @param lastAvailableSegmentNum The number of the last available segment.
      */
     public RepresentationSegmentIterator(
-        RepresentationHolder representation, long segmentNum, long lastAvailableSegmentNum) {
-      super(/* fromIndex= */ segmentNum, /* toIndex= */ lastAvailableSegmentNum);
+        RepresentationHolder representation,
+        long firstAvailableSegmentNum,
+        long lastAvailableSegmentNum) {
+      super(/* fromIndex= */ firstAvailableSegmentNum, /* toIndex= */ lastAvailableSegmentNum);
       this.representationHolder = representation;
     }
 
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
index a8cf1a1437..f000187827 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
@@ -631,7 +631,7 @@ import java.util.List;
      * @param playlist The {@link HlsMediaPlaylist} to wrap.
      * @param startOfPlaylistInPeriodUs The start time of the playlist in the period, in
      *     microseconds.
-     * @param chunkIndex The chunk index in the playlist at which the iterator will start.
+     * @param chunkIndex The index of the first available chunk in the playlist.
      */
     public HlsMediaPlaylistSegmentIterator(
         HlsMediaPlaylist playlist, long startOfPlaylistInPeriodUs, int chunkIndex) {
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java
index 9ac376efad..d50375d4c9 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java
@@ -318,7 +318,7 @@ public class DefaultSsChunkSource implements SsChunkSource {
      *
      * @param streamElement The {@link StreamElement} to wrap.
      * @param trackIndex The track index in the stream element.
-     * @param chunkIndex The chunk index at which the iterator will start.
+     * @param chunkIndex The index of the first available chunk.
      */
     public StreamElementIterator(StreamElement streamElement, int trackIndex, int chunkIndex) {
       super(/* fromIndex= */ chunkIndex, /* toIndex= */ streamElement.chunkCount - 1);

From 05a98a7b79e255b188ab7c0c40c02c2dfeb4f383 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 18 Oct 2018 04:01:53 -0700
Subject: [PATCH 089/832] Code shrinking doesn't like
 Class.super.defaultMethodName

Just not doing it seems simplier and more obviously correct
than suppressing the warnings in our proguard file.

Issue: #4890

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217675527
---
 .../android/exoplayer2/upstream/DefaultDataSource.java       | 5 ++---
 .../android/exoplayer2/upstream/cache/CacheDataSource.java   | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java
index acb2c59e0c..6504562c58 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java
@@ -23,6 +23,7 @@ import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -261,9 +262,7 @@ public final class DefaultDataSource implements DataSource {
 
   @Override
   public Map<String, List<String>> getResponseHeaders() {
-    return dataSource == null
-        ? DataSource.super.getResponseHeaders()
-        : dataSource.getResponseHeaders();
+    return dataSource == null ? Collections.emptyMap() : dataSource.getResponseHeaders();
   }
 
   @Override
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
index 37bc0aca37..eaf72cf7fb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
@@ -34,6 +34,7 @@ import java.io.InterruptedIOException;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -367,7 +368,7 @@ public final class CacheDataSource implements DataSource {
     // TODO: Implement.
     return isReadingFromUpstream()
         ? upstreamDataSource.getResponseHeaders()
-        : DataSource.super.getResponseHeaders();
+        : Collections.emptyMap();
   }
 
   @Override

From 1c6abc8b03c6015d226a1ded8f634e4c5693549d Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 18 Oct 2018 04:11:48 -0700
Subject: [PATCH 090/832] Set output on surface in all states

setSurface only sets the output surface on the codec if the
renderer is enabled or started. This was fine in the past
because the codec was always null in other states, however
the recent codec reuse work means this is no longer the case.

The output surface should always be set if the codec is
non-null. If setting the surface requires releasing the codec
instance, we should only instantiate the new instance if
enabled or started. This is in line with what onDisabled does
if flushing requires releasing the codec

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217676434
---
 .../exoplayer2/video/MediaCodecVideoRenderer.java     | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index 2b2e628017..423a7e32ed 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -415,14 +415,15 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
     if (this.surface != surface) {
       this.surface = surface;
       @State int state = getState();
-      if (state == STATE_ENABLED || state == STATE_STARTED) {
-        MediaCodec codec = getCodec();
-        if (Util.SDK_INT >= 23 && codec != null && surface != null
-            && !codecNeedsSetOutputSurfaceWorkaround) {
+      MediaCodec codec = getCodec();
+      if (codec != null) {
+        if (Util.SDK_INT >= 23 && surface != null && !codecNeedsSetOutputSurfaceWorkaround) {
           setOutputSurfaceV23(codec, surface);
         } else {
           releaseCodec();
-          maybeInitCodec();
+          if (state == STATE_ENABLED || state == STATE_STARTED) {
+            maybeInitCodec();
+          }
         }
       }
       if (surface != null && surface != dummySurface) {

From 50dd089794ac70e3aa34873d513cc832b4c009cf Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 18 Oct 2018 08:54:19 -0700
Subject: [PATCH 091/832] Update the cast framework gradle dependency in the
 Cast extension

Issue:#4960

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217707957
---
 extensions/cast/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/cast/build.gradle b/extensions/cast/build.gradle
index ab14b4034a..f6821d5cd2 100644
--- a/extensions/cast/build.gradle
+++ b/extensions/cast/build.gradle
@@ -31,7 +31,7 @@ android {
 }
 
 dependencies {
-    api 'com.google.android.gms:play-services-cast-framework:16.0.1'
+    api 'com.google.android.gms:play-services-cast-framework:16.0.3'
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion
     implementation project(modulePrefix + 'library-core')

From 80e9c84a9ef9d13fdc3990f4b87b4424e2e0b877 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 18 Oct 2018 08:56:36 -0700
Subject: [PATCH 092/832] Remove RemotePlayer

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217708323
---
 .../DefaultReceiverPlayerManager.java         |  4 +-
 .../exoplayer2/ext/cast/CastPlayer.java       | 10 ++---
 .../exoplayer2/ext/cast/RemotePlayer.java     | 45 -------------------
 .../ext/cast/SessionAvailabilityListener.java | 26 +++++++++++
 4 files changed, 33 insertions(+), 52 deletions(-)
 delete mode 100644 extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/RemotePlayer.java
 create mode 100644 extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/SessionAvailabilityListener.java

diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java
index f30d3e602f..daaac9486e 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java
@@ -33,7 +33,7 @@ import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.Timeline.Period;
 import com.google.android.exoplayer2.ext.cast.CastPlayer;
 import com.google.android.exoplayer2.ext.cast.MediaItem;
-import com.google.android.exoplayer2.ext.cast.RemotePlayer;
+import com.google.android.exoplayer2.ext.cast.SessionAvailabilityListener;
 import com.google.android.exoplayer2.source.ConcatenatingMediaSource;
 import com.google.android.exoplayer2.source.ExtractorMediaSource;
 import com.google.android.exoplayer2.source.MediaSource;
@@ -52,7 +52,7 @@ import java.util.ArrayList;
 
 /** Manages players and an internal media queue for the ExoPlayer/Cast demo app. */
 /* package */ class DefaultReceiverPlayerManager
-    implements EventListener, RemotePlayer.SessionAvailabilityListener, PlayerManager {
+    implements EventListener, SessionAvailabilityListener, PlayerManager {
 
   private static final String USER_AGENT = "ExoCastDemoPlayer";
   private static final DefaultHttpDataSourceFactory DATA_SOURCE_FACTORY =
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
index e5832f3b31..584ac68305 100644
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
@@ -53,8 +53,8 @@ import java.util.concurrent.CopyOnWriteArraySet;
  *
  * <p>The behavior of this class depends on the underlying Cast session, which is obtained from the
  * Cast context passed to {@link #CastPlayer}. To keep track of the session, {@link
- * #isCastSessionAvailable()} can be queried and {@link RemotePlayer.SessionAvailabilityListener}
- * can be implemented and attached to the player.
+ * #isCastSessionAvailable()} can be queried and {@link SessionAvailabilityListener} can be
+ * implemented and attached to the player.
  *
  * <p>If no session is available, the player state will remain unchanged and calls to methods that
  * alter it will be ignored. Querying the player state is possible even when no session is
@@ -88,7 +88,7 @@ public final class CastPlayer extends BasePlayer {
 
   // Listeners.
   private final CopyOnWriteArraySet<EventListener> listeners;
-  private RemotePlayer.SessionAvailabilityListener sessionAvailabilityListener;
+  private SessionAvailabilityListener sessionAvailabilityListener;
 
   // Internal state.
   private CastTimeline currentTimeline;
@@ -257,9 +257,9 @@ public final class CastPlayer extends BasePlayer {
   /**
    * Sets a listener for updates on the cast session availability.
    *
-   * @param listener The {@link RemotePlayer.SessionAvailabilityListener}.
+   * @param listener The {@link SessionAvailabilityListener}.
    */
-  public void setSessionAvailabilityListener(RemotePlayer.SessionAvailabilityListener listener) {
+  public void setSessionAvailabilityListener(SessionAvailabilityListener listener) {
     sessionAvailabilityListener = listener;
   }
 
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/RemotePlayer.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/RemotePlayer.java
deleted file mode 100644
index 98d5895db8..0000000000
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/RemotePlayer.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.ext.cast;
-
-import com.google.android.exoplayer2.Player;
-
-/** A {@link Player} for playing media remotely using the Google Cast framework. */
-public interface RemotePlayer extends Player {
-
-  /** Listener of changes in the cast session availability. */
-  interface SessionAvailabilityListener {
-
-    /** Called when a cast session becomes available to the player. */
-    void onCastSessionAvailable();
-
-    /** Called when the cast session becomes unavailable. */
-    void onCastSessionUnavailable();
-  }
-
-  /** Returns whether a cast session is available. */
-  boolean isCastSessionAvailable();
-
-  /**
-   * Sets a listener for updates on the cast session availability.
-   *
-   * @param listener The {@link SessionAvailabilityListener}.
-   */
-  void setSessionAvailabilityListener(SessionAvailabilityListener listener);
-
-  /** Returns the {@link MediaItemQueue} associated to this player. */
-  MediaItemQueue getMediaItemQueue();
-}
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/SessionAvailabilityListener.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/SessionAvailabilityListener.java
new file mode 100644
index 0000000000..c686c496c6
--- /dev/null
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/SessionAvailabilityListener.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.ext.cast;
+
+/** Listener of changes in the cast session availability. */
+public interface SessionAvailabilityListener {
+
+  /** Called when a cast session becomes available to the player. */
+  void onCastSessionAvailable();
+
+  /** Called when the cast session becomes unavailable. */
+  void onCastSessionUnavailable();
+}

From 3805717026b1fb2b81b73b20e3496be40d21bbe9 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 18 Oct 2018 09:17:28 -0700
Subject: [PATCH 093/832] Decouple dummySurface lifespan from codec lifespans

I don't think there's any particular reason for releasing
dummySurface when we release the codec. It seems to make
more sense to decouple the two, and treat a dummySurface as
a resource that should be released on reset.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217711788
---
 .../video/MediaCodecVideoRenderer.java        | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index 423a7e32ed..18aeada04b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -381,6 +381,21 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
     }
   }
 
+  @Override
+  protected void onReset() {
+    try {
+      super.onReset();
+    } finally {
+      if (dummySurface != null) {
+        if (surface == dummySurface) {
+          surface = null;
+        }
+        dummySurface.release();
+        dummySurface = null;
+      }
+    }
+  }
+
   @Override
   public void handleMessage(int messageType, @Nullable Object message) throws ExoPlaybackException {
     if (messageType == C.MSG_SET_SURFACE) {
@@ -509,13 +524,6 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
       super.releaseCodec();
     } finally {
       buffersInCodecCount = 0;
-      if (dummySurface != null) {
-        if (surface == dummySurface) {
-          surface = null;
-        }
-        dummySurface.release();
-        dummySurface = null;
-      }
     }
   }
 

From 1ef3efaa909df3b9ef49133a872d5e3ee39fdf73 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 18 Oct 2018 14:49:51 -0700
Subject: [PATCH 094/832] Automated g4 rollback of changelist 217356705.

*** Reason for rollback ***

Photos regression is resolved by []

*** Original change description ***

Automated g4 rollback of changelist 217189082.

*** Reason for rollback ***

Broke photos (b/117818304)

*** Original change description ***

Add ExoPlayer.setForegroundMode

Issue: #2826

***

***

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217773278
---
 RELEASENOTES.md                               |   2 +
 .../google/android/exoplayer2/ExoPlayer.java  |  30 ++++
 .../android/exoplayer2/ExoPlayerImpl.java     |   9 ++
 .../exoplayer2/ExoPlayerImplInternal.java     | 132 +++++++++++++++---
 .../android/exoplayer2/SimpleExoPlayer.java   |   5 +
 .../exoplayer2/testutil/StubExoPlayer.java    |   5 +
 6 files changed, 165 insertions(+), 18 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 4be871821b..060b5f4daf 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,6 +2,8 @@
 
 ### dev-v2 (not yet released) ###
 
+* Improve decoder re-use between playbacks. TODO: Write and link a blog post
+  here ([#2826](https://github.com/google/ExoPlayer/issues/2826)).
 * Improve initial bandwidth meter estimates using the current country and
   network type.
 * Do not retry failed loads whose error is `FileNotFoundException`.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
index 96ddb2eb9c..5ba2394c3f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
@@ -209,4 +209,34 @@ public interface ExoPlayer extends Player {
 
   /** Returns the currently active {@link SeekParameters} of the player. */
   SeekParameters getSeekParameters();
+
+  /**
+   * Sets whether the player is allowed to keep holding limited resources such as video decoders,
+   * even when in the idle state. By doing so, the player may be able to reduce latency when
+   * starting to play another piece of content for which the same resources are required.
+   *
+   * <p>This mode should be used with caution, since holding limited resources may prevent other
+   * players of media components from acquiring them. It should only be enabled when <em>both</em>
+   * of the following conditions are true:
+   *
+   * <ul>
+   *   <li>The application that owns the player is in the foreground.
+   *   <li>The player is used in a way that may benefit from foreground mode. For this to be true,
+   *       the same player instance must be used to play multiple pieces of content, and there must
+   *       be gaps between the playbacks (i.e. {@link #stop} is called to halt one playback, and
+   *       {@link #prepare} is called some time later to start a new one).
+   * </ul>
+   *
+   * <p>Note that foreground mode is <em>not</em> useful for switching between content without gaps
+   * between the playbacks. For this use case {@link #stop} does not need to be called, and simply
+   * calling {@link #prepare} for the new media will cause limited resources to be retained even if
+   * foreground mode is not enabled.
+   *
+   * <p>If foreground mode is enabled, it's the application's responsibility to disable it when the
+   * conditions described above no longer hold.
+   *
+   * @param foregroundMode Whether the player is allowed to keep limited resources even when in the
+   *     idle state.
+   */
+  void setForegroundMode(boolean foregroundMode);
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index e1f942147d..130bf48921 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -71,6 +71,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
   private int pendingOperationAcks;
   private boolean hasPendingPrepare;
   private boolean hasPendingSeek;
+  private boolean foregroundMode;
   private PlaybackParameters playbackParameters;
   private SeekParameters seekParameters;
   private @Nullable ExoPlaybackException playbackError;
@@ -359,6 +360,14 @@ import java.util.concurrent.CopyOnWriteArraySet;
     return seekParameters;
   }
 
+  @Override
+  public void setForegroundMode(boolean foregroundMode) {
+    if (this.foregroundMode != foregroundMode) {
+      this.foregroundMode = foregroundMode;
+      internalPlayer.setForegroundMode(foregroundMode);
+    }
+  }
+
   @Override
   public void stop(boolean reset) {
     if (reset) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index 0c6c3ca202..3034ead032 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -44,6 +44,7 @@ import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /** Implements the internal behavior of {@link ExoPlayerImpl}. */
 /* package */ final class ExoPlayerImplInternal
@@ -76,9 +77,10 @@ import java.util.Collections;
   private static final int MSG_TRACK_SELECTION_INVALIDATED = 11;
   private static final int MSG_SET_REPEAT_MODE = 12;
   private static final int MSG_SET_SHUFFLE_ENABLED = 13;
-  private static final int MSG_SEND_MESSAGE = 14;
-  private static final int MSG_SEND_MESSAGE_TO_TARGET_THREAD = 15;
-  private static final int MSG_PLAYBACK_PARAMETERS_CHANGED_INTERNAL = 16;
+  private static final int MSG_SET_FOREGROUND_MODE = 14;
+  private static final int MSG_SEND_MESSAGE = 15;
+  private static final int MSG_SEND_MESSAGE_TO_TARGET_THREAD = 16;
+  private static final int MSG_PLAYBACK_PARAMETERS_CHANGED_INTERNAL = 17;
 
   private static final int PREPARING_SOURCE_INTERVAL_MS = 10;
   private static final int RENDERING_INTERVAL_MS = 10;
@@ -115,6 +117,7 @@ import java.util.Collections;
   private boolean rebuffering;
   @Player.RepeatMode private int repeatMode;
   private boolean shuffleModeEnabled;
+  private boolean foregroundMode;
 
   private int pendingPrepareCount;
   private SeekPosition pendingInitialSeekPosition;
@@ -218,6 +221,29 @@ import java.util.Collections;
     handler.obtainMessage(MSG_SEND_MESSAGE, message).sendToTarget();
   }
 
+  public synchronized void setForegroundMode(boolean foregroundMode) {
+    if (foregroundMode) {
+      handler.obtainMessage(MSG_SET_FOREGROUND_MODE, /* foregroundMode */ 1, 0).sendToTarget();
+    } else {
+      AtomicBoolean processedFlag = new AtomicBoolean();
+      handler
+          .obtainMessage(MSG_SET_FOREGROUND_MODE, /* foregroundMode */ 0, 0, processedFlag)
+          .sendToTarget();
+      boolean wasInterrupted = false;
+      while (!processedFlag.get() && !released) {
+        try {
+          wait();
+        } catch (InterruptedException e) {
+          wasInterrupted = true;
+        }
+      }
+      if (wasInterrupted) {
+        // Restore the interrupted status.
+        Thread.currentThread().interrupt();
+      }
+    }
+  }
+
   public synchronized void release() {
     if (released) {
       return;
@@ -311,8 +337,15 @@ import java.util.Collections;
         case MSG_SET_SEEK_PARAMETERS:
           setSeekParametersInternal((SeekParameters) msg.obj);
           break;
+        case MSG_SET_FOREGROUND_MODE:
+          setForegroundModeInternal(
+              /* foregroundMode= */ msg.arg1 != 0, /* processedFlag= */ (AtomicBoolean) msg.obj);
+          break;
         case MSG_STOP:
-          stopInternal(/* reset= */ msg.arg1 != 0, /* acknowledgeStop= */ true);
+          stopInternal(
+              /* forceResetRenderers= */ false,
+              /* resetPositionAndState= */ msg.arg1 != 0,
+              /* acknowledgeStop= */ true);
           break;
         case MSG_PERIOD_PREPARED:
           handlePeriodPrepared((MediaPeriod) msg.obj);
@@ -345,17 +378,26 @@ import java.util.Collections;
       maybeNotifyPlaybackInfoChanged();
     } catch (ExoPlaybackException e) {
       Log.e(TAG, "Playback error.", e);
-      stopInternal(/* reset= */ false, /* acknowledgeStop= */ false);
+      stopInternal(
+          /* forceResetRenderers= */ true,
+          /* resetPositionAndState= */ false,
+          /* acknowledgeStop= */ false);
       eventHandler.obtainMessage(MSG_ERROR, e).sendToTarget();
       maybeNotifyPlaybackInfoChanged();
     } catch (IOException e) {
       Log.e(TAG, "Source error.", e);
-      stopInternal(/* reset= */ false, /* acknowledgeStop= */ false);
+      stopInternal(
+          /* forceResetRenderers= */ false,
+          /* resetPositionAndState= */ false,
+          /* acknowledgeStop= */ false);
       eventHandler.obtainMessage(MSG_ERROR, ExoPlaybackException.createForSource(e)).sendToTarget();
       maybeNotifyPlaybackInfoChanged();
     } catch (RuntimeException e) {
       Log.e(TAG, "Internal runtime error.", e);
-      stopInternal(/* reset= */ false, /* acknowledgeStop= */ false);
+      stopInternal(
+          /* forceResetRenderers= */ true,
+          /* resetPositionAndState= */ false,
+          /* acknowledgeStop= */ false);
       eventHandler.obtainMessage(MSG_ERROR, ExoPlaybackException.createForUnexpected(e))
           .sendToTarget();
       maybeNotifyPlaybackInfoChanged();
@@ -394,7 +436,8 @@ import java.util.Collections;
 
   private void prepareInternal(MediaSource mediaSource, boolean resetPosition, boolean resetState) {
     pendingPrepareCount++;
-    resetInternal(/* releaseMediaSource= */ true, resetPosition, resetState);
+    resetInternal(
+        /* resetRenderers= */ false, /* releaseMediaSource= */ true, resetPosition, resetState);
     loadControl.onPrepared();
     this.mediaSource = mediaSource;
     setState(Player.STATE_BUFFERING);
@@ -631,7 +674,10 @@ import java.util.Collections;
         // End playback, as we didn't manage to find a valid seek position.
         setState(Player.STATE_ENDED);
         resetInternal(
-            /* releaseMediaSource= */ false, /* resetPosition= */ true, /* resetState= */ false);
+            /* resetRenderers= */ false,
+            /* releaseMediaSource= */ false,
+            /* resetPosition= */ true,
+            /* resetState= */ false);
       } else {
         // Execute the seek in the current media periods.
         long newPeriodPositionUs = periodPositionUs;
@@ -738,9 +784,33 @@ import java.util.Collections;
     this.seekParameters = seekParameters;
   }
 
-  private void stopInternal(boolean reset, boolean acknowledgeStop) {
+  private void setForegroundModeInternal(
+      boolean foregroundMode, @Nullable AtomicBoolean processedFlag) {
+    if (this.foregroundMode != foregroundMode) {
+      this.foregroundMode = foregroundMode;
+      if (!foregroundMode) {
+        for (Renderer renderer : renderers) {
+          if (renderer.getState() == Renderer.STATE_DISABLED) {
+            renderer.reset();
+          }
+        }
+      }
+    }
+    if (processedFlag != null) {
+      synchronized (this) {
+        processedFlag.set(true);
+        notifyAll();
+      }
+    }
+  }
+
+  private void stopInternal(
+      boolean forceResetRenderers, boolean resetPositionAndState, boolean acknowledgeStop) {
     resetInternal(
-        /* releaseMediaSource= */ true, /* resetPosition= */ reset, /* resetState= */ reset);
+        /* resetRenderers= */ forceResetRenderers || !foregroundMode,
+        /* releaseMediaSource= */ true,
+        /* resetPosition= */ resetPositionAndState,
+        /* resetState= */ resetPositionAndState);
     playbackInfoUpdate.incrementPendingOperationAcks(
         pendingPrepareCount + (acknowledgeStop ? 1 : 0));
     pendingPrepareCount = 0;
@@ -750,7 +820,10 @@ import java.util.Collections;
 
   private void releaseInternal() {
     resetInternal(
-        /* releaseMediaSource= */ true, /* resetPosition= */ true, /* resetState= */ true);
+        /* resetRenderers= */ true,
+        /* releaseMediaSource= */ true,
+        /* resetPosition= */ true,
+        /* resetState= */ true);
     loadControl.onReleased();
     setState(Player.STATE_IDLE);
     internalPlaybackThread.quit();
@@ -772,7 +845,10 @@ import java.util.Collections;
   }
 
   private void resetInternal(
-      boolean releaseMediaSource, boolean resetPosition, boolean resetState) {
+      boolean resetRenderers,
+      boolean releaseMediaSource,
+      boolean resetPosition,
+      boolean resetState) {
     handler.removeMessages(MSG_DO_SOME_WORK);
     rebuffering = false;
     mediaClock.stop();
@@ -782,7 +858,17 @@ import java.util.Collections;
         disableRenderer(renderer);
       } catch (ExoPlaybackException | RuntimeException e) {
         // There's nothing we can do.
-        Log.e(TAG, "Stop failed.", e);
+        Log.e(TAG, "Disable failed.", e);
+      }
+    }
+    if (resetRenderers) {
+      for (Renderer renderer : renderers) {
+        try {
+          renderer.reset();
+        } catch (RuntimeException e) {
+          // There's nothing we can do.
+          Log.e(TAG, "Reset failed.", e);
+        }
       }
     }
     enabledRenderers = new Renderer[0];
@@ -989,7 +1075,6 @@ import java.util.Collections;
     mediaClock.onRendererDisabled(renderer);
     ensureStopped(renderer);
     renderer.disable();
-    renderer.reset();
   }
 
   private void reselectTracksInternal() throws ExoPlaybackException {
@@ -1294,7 +1379,10 @@ import java.util.Collections;
     setState(Player.STATE_ENDED);
     // Reset, but retain the source so that it can still be used should a seek occur.
     resetInternal(
-        /* releaseMediaSource= */ false, /* resetPosition= */ true, /* resetState= */ false);
+        /* resetRenderers= */ false,
+        /* releaseMediaSource= */ false,
+        /* resetPosition= */ true,
+        /* resetState= */ false);
   }
 
   /**
@@ -1639,9 +1727,17 @@ import java.util.Collections;
       throws ExoPlaybackException {
     enabledRenderers = new Renderer[totalEnabledRendererCount];
     int enabledRendererCount = 0;
-    MediaPeriodHolder playingPeriodHolder = queue.getPlayingPeriod();
+    TrackSelectorResult trackSelectorResult = queue.getPlayingPeriod().getTrackSelectorResult();
+    // Reset all disabled renderers before enabling any new ones. This makes sure resources released
+    // by the disabled renderers will be available to renderers that are being enabled.
     for (int i = 0; i < renderers.length; i++) {
-      if (playingPeriodHolder.getTrackSelectorResult().isRendererEnabled(i)) {
+      if (!trackSelectorResult.isRendererEnabled(i)) {
+        renderers[i].reset();
+      }
+    }
+    // Enable the renderers.
+    for (int i = 0; i < renderers.length; i++) {
+      if (trackSelectorResult.isRendererEnabled(i)) {
         enableRenderer(i, rendererWasEnabledFlags[i], enabledRendererCount++);
       }
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index 8517556887..4ca6b51ce2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -958,6 +958,11 @@ public class SimpleExoPlayer extends BasePlayer
     return player.getSeekParameters();
   }
 
+  @Override
+  public void setForegroundMode(boolean foregroundMode) {
+    player.setForegroundMode(foregroundMode);
+  }
+
   @Override
   public void stop(boolean reset) {
     verifyApplicationThread();
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
index 156b573df8..1ac19591c0 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
@@ -267,4 +267,9 @@ public abstract class StubExoPlayer extends BasePlayer implements ExoPlayer {
   public long getContentBufferedPosition() {
     throw new UnsupportedOperationException();
   }
+
+  @Override
+  public void setForegroundMode(boolean foregroundMode) {
+    throw new UnsupportedOperationException();
+  }
 }

From 861b81694de78b4eaba324121fec4bd997e99f73 Mon Sep 17 00:00:00 2001
From: ogaclejapan <ogaclejapan@gmail.com>
Date: Sun, 21 Oct 2018 13:23:53 +0900
Subject: [PATCH 095/832] Allow setting the ad media bitrate in ImaAdsLoader

---
 .../exoplayer2/ext/ima/ImaAdsLoader.java      | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
index 95a3a588b4..581964ae47 100644
--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
+++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
@@ -93,6 +93,7 @@ public final class ImaAdsLoader
     private @Nullable AdEventListener adEventListener;
     private int vastLoadTimeoutMs;
     private int mediaLoadTimeoutMs;
+    private int mediaBitrateKbps;
     private ImaFactory imaFactory;
 
     /**
@@ -104,6 +105,7 @@ public final class ImaAdsLoader
       this.context = Assertions.checkNotNull(context);
       vastLoadTimeoutMs = TIMEOUT_UNSET;
       mediaLoadTimeoutMs = TIMEOUT_UNSET;
+      mediaBitrateKbps = BITRATE_UNSET;
       imaFactory = new DefaultImaFactory();
     }
 
@@ -159,6 +161,19 @@ public final class ImaAdsLoader
       return this;
     }
 
+    /**
+     * Sets the ad media maximum recommended bitrate, in Kbps.
+     *
+     * @param mediaBitrateKbps The ad media maximum recommended bitrate, in Kbps.
+     * @return This builder, for convenience.
+     * @see AdsRenderingSettings#setBitrateKbps(int)
+     */
+    public Builder setMediaBitrateKbps(int mediaBitrateKbps) {
+      Assertions.checkArgument(mediaBitrateKbps > 0);
+      this.mediaBitrateKbps = mediaBitrateKbps;
+      return this;
+    }
+
     // @VisibleForTesting
     /* package */ Builder setImaFactory(ImaFactory imaFactory) {
       this.imaFactory = Assertions.checkNotNull(imaFactory);
@@ -181,6 +196,7 @@ public final class ImaAdsLoader
           null,
           vastLoadTimeoutMs,
           mediaLoadTimeoutMs,
+          mediaBitrateKbps,
           adEventListener,
           imaFactory);
     }
@@ -200,6 +216,7 @@ public final class ImaAdsLoader
           adsResponse,
           vastLoadTimeoutMs,
           mediaLoadTimeoutMs,
+          mediaBitrateKbps,
           adEventListener,
           imaFactory);
     }
@@ -229,6 +246,7 @@ public final class ImaAdsLoader
   private static final long MAXIMUM_PRELOAD_DURATION_MS = 8000;
 
   private static final int TIMEOUT_UNSET = -1;
+  private static final int BITRATE_UNSET = -1;
 
   /** The state of ad playback. */
   @Documented
@@ -252,6 +270,7 @@ public final class ImaAdsLoader
   private final @Nullable String adsResponse;
   private final int vastLoadTimeoutMs;
   private final int mediaLoadTimeoutMs;
+  private final int mediaBitrateKbps;
   private final @Nullable AdEventListener adEventListener;
   private final ImaFactory imaFactory;
   private final Timeline.Period period;
@@ -338,6 +357,7 @@ public final class ImaAdsLoader
         /* adsResponse= */ null,
         /* vastLoadTimeoutMs= */ TIMEOUT_UNSET,
         /* mediaLoadTimeoutMs= */ TIMEOUT_UNSET,
+        /* mediaBitrateKpbs= */ BITRATE_UNSET,
         /* adEventListener= */ null,
         /* imaFactory= */ new DefaultImaFactory());
   }
@@ -362,6 +382,7 @@ public final class ImaAdsLoader
         /* adsResponse= */ null,
         /* vastLoadTimeoutMs= */ TIMEOUT_UNSET,
         /* mediaLoadTimeoutMs= */ TIMEOUT_UNSET,
+        /* mediaBitrateKbps= */ BITRATE_UNSET,
         /* adEventListener= */ null,
         /* imaFactory= */ new DefaultImaFactory());
   }
@@ -373,6 +394,7 @@ public final class ImaAdsLoader
       @Nullable String adsResponse,
       int vastLoadTimeoutMs,
       int mediaLoadTimeoutMs,
+      int mediaBitrateKbps,
       @Nullable AdEventListener adEventListener,
       ImaFactory imaFactory) {
     Assertions.checkArgument(adTagUri != null || adsResponse != null);
@@ -380,6 +402,7 @@ public final class ImaAdsLoader
     this.adsResponse = adsResponse;
     this.vastLoadTimeoutMs = vastLoadTimeoutMs;
     this.mediaLoadTimeoutMs = mediaLoadTimeoutMs;
+    this.mediaBitrateKbps = mediaBitrateKbps;
     this.adEventListener = adEventListener;
     this.imaFactory = imaFactory;
     if (imaSdkSettings == null) {
@@ -926,6 +949,9 @@ public final class ImaAdsLoader
     if (mediaLoadTimeoutMs != TIMEOUT_UNSET) {
       adsRenderingSettings.setLoadVideoTimeout(mediaLoadTimeoutMs);
     }
+    if (mediaBitrateKbps != BITRATE_UNSET) {
+      adsRenderingSettings.setBitrateKbps(mediaBitrateKbps);
+    }
 
     // Set up the ad playback state, skipping ads based on the start position as required.
     long[] adGroupTimesUs = getAdGroupTimesUs(adsManager.getAdCuePoints());

From cfcbd2114ba43a7a906577981e383a264d437929 Mon Sep 17 00:00:00 2001
From: ogaclejapan <ogaclejapan@gmail.com>
Date: Sun, 21 Oct 2018 13:54:07 +0900
Subject: [PATCH 096/832] Allow setting the ad UI elements to be rendered in
 ImaAdsLoader

---
 .../exoplayer2/ext/ima/ImaAdsLoader.java      | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
index 581964ae47..e42f2853b2 100644
--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
+++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
@@ -40,6 +40,7 @@ import com.google.ads.interactivemedia.v3.api.AdsRequest;
 import com.google.ads.interactivemedia.v3.api.CompanionAdSlot;
 import com.google.ads.interactivemedia.v3.api.ImaSdkFactory;
 import com.google.ads.interactivemedia.v3.api.ImaSdkSettings;
+import com.google.ads.interactivemedia.v3.api.UiElement;
 import com.google.ads.interactivemedia.v3.api.player.ContentProgressProvider;
 import com.google.ads.interactivemedia.v3.api.player.VideoAdPlayer;
 import com.google.ads.interactivemedia.v3.api.player.VideoProgressUpdate;
@@ -69,6 +70,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /** Loads ads using the IMA SDK. All methods are called on the main thread. */
 public final class ImaAdsLoader
@@ -91,6 +93,7 @@ public final class ImaAdsLoader
 
     private @Nullable ImaSdkSettings imaSdkSettings;
     private @Nullable AdEventListener adEventListener;
+    private @Nullable Set<UiElement> adUiElements;
     private int vastLoadTimeoutMs;
     private int mediaLoadTimeoutMs;
     private int mediaBitrateKbps;
@@ -135,6 +138,18 @@ public final class ImaAdsLoader
       return this;
     }
 
+    /**
+     * Sets the ad UI elements to be rendered by the IMA SDK.
+     *
+     * @param adUiElements The ad UI elements to be rendered by the IMA SDK.
+     * @return This builder, for convenience.
+     * @see AdsRenderingSettings#setUiElements(Set)
+     */
+    public Builder setAdUiElements(Set<UiElement> adUiElements) {
+      this.adUiElements = Assertions.checkNotNull(adUiElements);
+      return this;
+    }
+
     /**
      * Sets the VAST load timeout, in milliseconds.
      *
@@ -197,6 +212,7 @@ public final class ImaAdsLoader
           vastLoadTimeoutMs,
           mediaLoadTimeoutMs,
           mediaBitrateKbps,
+          adUiElements,
           adEventListener,
           imaFactory);
     }
@@ -217,6 +233,7 @@ public final class ImaAdsLoader
           vastLoadTimeoutMs,
           mediaLoadTimeoutMs,
           mediaBitrateKbps,
+          adUiElements,
           adEventListener,
           imaFactory);
     }
@@ -271,6 +288,7 @@ public final class ImaAdsLoader
   private final int vastLoadTimeoutMs;
   private final int mediaLoadTimeoutMs;
   private final int mediaBitrateKbps;
+  private final @Nullable Set<UiElement> adUiElements;
   private final @Nullable AdEventListener adEventListener;
   private final ImaFactory imaFactory;
   private final Timeline.Period period;
@@ -358,6 +376,7 @@ public final class ImaAdsLoader
         /* vastLoadTimeoutMs= */ TIMEOUT_UNSET,
         /* mediaLoadTimeoutMs= */ TIMEOUT_UNSET,
         /* mediaBitrateKpbs= */ BITRATE_UNSET,
+        /* adUiElements= */ null,
         /* adEventListener= */ null,
         /* imaFactory= */ new DefaultImaFactory());
   }
@@ -383,6 +402,7 @@ public final class ImaAdsLoader
         /* vastLoadTimeoutMs= */ TIMEOUT_UNSET,
         /* mediaLoadTimeoutMs= */ TIMEOUT_UNSET,
         /* mediaBitrateKbps= */ BITRATE_UNSET,
+        /* adUiElements= */ null,
         /* adEventListener= */ null,
         /* imaFactory= */ new DefaultImaFactory());
   }
@@ -395,6 +415,7 @@ public final class ImaAdsLoader
       int vastLoadTimeoutMs,
       int mediaLoadTimeoutMs,
       int mediaBitrateKbps,
+      @Nullable Set<UiElement> adUiElements,
       @Nullable AdEventListener adEventListener,
       ImaFactory imaFactory) {
     Assertions.checkArgument(adTagUri != null || adsResponse != null);
@@ -403,6 +424,7 @@ public final class ImaAdsLoader
     this.vastLoadTimeoutMs = vastLoadTimeoutMs;
     this.mediaLoadTimeoutMs = mediaLoadTimeoutMs;
     this.mediaBitrateKbps = mediaBitrateKbps;
+    this.adUiElements = adUiElements;
     this.adEventListener = adEventListener;
     this.imaFactory = imaFactory;
     if (imaSdkSettings == null) {
@@ -952,6 +974,9 @@ public final class ImaAdsLoader
     if (mediaBitrateKbps != BITRATE_UNSET) {
       adsRenderingSettings.setBitrateKbps(mediaBitrateKbps);
     }
+    if (adUiElements != null) {
+      adsRenderingSettings.setUiElements(adUiElements);
+    }
 
     // Set up the ad playback state, skipping ads based on the start position as required.
     long[] adGroupTimesUs = getAdGroupTimesUs(adsManager.getAdCuePoints());

From 95eff3b747dabb7e8eaeee238b40d4812d91d29a Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <sascha@peilicke.de>
Date: Mon, 22 Oct 2018 23:02:01 +0200
Subject: [PATCH 097/832] Add Shoutcast Metadata Protocol (ICY) extension

Based on the OkHttp extension.

Resolves #3735
---
 core_settings.gradle                          |   2 +
 extensions/icy/README.md                      |  67 +++
 extensions/icy/build.gradle                   |  52 +++
 extensions/icy/proguard-rules.txt             |   2 +
 extensions/icy/src/main/AndroidManifest.xml   |  17 +
 .../exoplayer2/ext/icy/IcyHttpDataSource.java | 387 ++++++++++++++++++
 .../ext/icy/IcyHttpDataSourceFactory.java     |  85 ++++
 .../ext/icy/IcyHttpDataSourceFactoryTest.java |  41 ++
 .../ext/icy/IcyHttpDataSourceTest.java        |  29 ++
 .../exoplayer2/ext/icy/test/Constants.java    |   6 +
 10 files changed, 688 insertions(+)
 create mode 100644 extensions/icy/README.md
 create mode 100644 extensions/icy/build.gradle
 create mode 100644 extensions/icy/proguard-rules.txt
 create mode 100644 extensions/icy/src/main/AndroidManifest.xml
 create mode 100644 extensions/icy/src/main/java/com/google/android/exoplayer2/ext/icy/IcyHttpDataSource.java
 create mode 100644 extensions/icy/src/main/java/com/google/android/exoplayer2/ext/icy/IcyHttpDataSourceFactory.java
 create mode 100644 extensions/icy/src/test/java/com/google/android/exoplayer2/ext/icy/IcyHttpDataSourceFactoryTest.java
 create mode 100644 extensions/icy/src/test/java/com/google/android/exoplayer2/ext/icy/IcyHttpDataSourceTest.java
 create mode 100644 extensions/icy/src/test/java/com/google/android/exoplayer2/ext/icy/test/Constants.java

diff --git a/core_settings.gradle b/core_settings.gradle
index 4d90fa962a..df15edba29 100644
--- a/core_settings.gradle
+++ b/core_settings.gradle
@@ -28,6 +28,7 @@ include modulePrefix + 'testutils-robolectric'
 include modulePrefix + 'extension-ffmpeg'
 include modulePrefix + 'extension-flac'
 include modulePrefix + 'extension-gvr'
+include modulePrefix + 'extension-icy'
 include modulePrefix + 'extension-ima'
 include modulePrefix + 'extension-cast'
 include modulePrefix + 'extension-cronet'
@@ -50,6 +51,7 @@ project(modulePrefix + 'testutils-robolectric').projectDir = new File(rootDir, '
 project(modulePrefix + 'extension-ffmpeg').projectDir = new File(rootDir, 'extensions/ffmpeg')
 project(modulePrefix + 'extension-flac').projectDir = new File(rootDir, 'extensions/flac')
 project(modulePrefix + 'extension-gvr').projectDir = new File(rootDir, 'extensions/gvr')
+project(modulePrefix + 'extension-icy').projectDir = new File(rootDir, 'extensions/icy')
 project(modulePrefix + 'extension-ima').projectDir = new File(rootDir, 'extensions/ima')
 project(modulePrefix + 'extension-cast').projectDir = new File(rootDir, 'extensions/cast')
 project(modulePrefix + 'extension-cronet').projectDir = new File(rootDir, 'extensions/cronet')
diff --git a/extensions/icy/README.md b/extensions/icy/README.md
new file mode 100644
index 0000000000..34ffe762e3
--- /dev/null
+++ b/extensions/icy/README.md
@@ -0,0 +1,67 @@
+# ExoPlayer Shoutcast Metadata Protocol (ICY) extension #
+The Shoutcast Metadata Protocol extension provides **IcyHttpDataSource** and
+**IcyHttpDataSourceFactory** which can parse ICY metadata information such as
+stream name and genre as well as current song information from a music stream.
+
+You can find the protocol description here:
+
+- https://cast.readme.io/v1.0/docs/icy
+- http://www.smackfu.com/stuff/programming/shoutcast.html
+
+## Getting the extension ##
+
+The easiest way to use the extension is to add it as a gradle dependency:
+
+```gradle
+implementation 'com.google.android.exoplayer:extension-icy:2.X.X'
+```
+
+where `2.X.X` is the version, which must match the version of the ExoPlayer
+library being used.
+
+Alternatively, you can clone the ExoPlayer repository and depend on the module
+locally. Instructions for doing this can be found in ExoPlayer's
+[top level README][].
+
+[top level README]: https://github.com/google/ExoPlayer/blob/release-v2/README.md
+
+## Using the extension ##
+
+To receive information about the current music stream (such as name and genre,
+see **IcyHeaders** class) as well as current song information (see
+**IcyMetadata** class), pass an instance of **IcyHttpDataSourceFactory** instead
+of an **DefaultHttpDataSourceFactory** like this (in Kotlin):
+
+```kotlin
+// ... exoPlayer instance already created
+
+// Custom HTTP data source factory which requests Icy metadata and parses it if
+// the stream server supports it
+val client = OkHttpClient.Builder().build()
+val icyHttpDataSourceFactory = IcyHttpDataSourceFactory.Builder(client)
+    .setUserAgent(userAgent)
+    .setIcyHeadersListener { icyHeaders ->
+        Log.d("XXX", "onIcyHeaders: %s".format(icyHeaders.toString()))
+    }
+    .setIcyMetadataChangeListener { icyMetadata ->
+        Log.d("XXX", "onIcyMetaData: %s".format(icyMetadata.toString()))
+    }
+    .build()
+
+// Produces DataSource instances through which media data is loaded
+val dataSourceFactory = DefaultDataSourceFactory(applicationContext, null, icyHttpDataSourceFactory)
+
+// The MediaSource represents the media to be played
+val mediaSource = ExtractorMediaSource.Factory(dataSourceFactory)
+    .setExtractorsFactory(DefaultExtractorsFactory())
+    .createMediaSource(sourceUri)
+
+// exoPlayer?.prepare(mediaSource) ...
+```
+
+## Links ##
+
+* [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.icy.*`
+  belong to this module.
+
+[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
diff --git a/extensions/icy/build.gradle b/extensions/icy/build.gradle
new file mode 100644
index 0000000000..0bff281865
--- /dev/null
+++ b/extensions/icy/build.gradle
@@ -0,0 +1,52 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+apply from: '../../constants.gradle'
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    defaultConfig {
+        minSdkVersion project.ext.minSdkVersion
+        targetSdkVersion project.ext.targetSdkVersion
+        consumerProguardFiles 'proguard-rules.txt'
+    }
+}
+
+dependencies {
+    implementation project(modulePrefix + 'extension-okhttp')
+    implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+    compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
+    api 'com.google.android.exoplayer:extension-okhttp:' + releaseVersion
+    testImplementation 'junit:junit:' + junitVersion
+    testImplementation project(modulePrefix + 'testutils-robolectric')
+}
+
+ext {
+    javadocTitle = 'Shoutcast Metadata Protocol (ICY) extension'
+}
+apply from: '../../javadoc_library.gradle'
+
+ext {
+    releaseArtifact = 'extension-icy'
+    releaseDescription = 'Shoutcast Metadata Protocol (ICY) extension for ExoPlayer.'
+}
+apply from: '../../publish.gradle'
diff --git a/extensions/icy/proguard-rules.txt b/extensions/icy/proguard-rules.txt
new file mode 100644
index 0000000000..950555d877
--- /dev/null
+++ b/extensions/icy/proguard-rules.txt
@@ -0,0 +1,2 @@
+# Proguard rules specific to the Icy extension.
+
diff --git a/extensions/icy/src/main/AndroidManifest.xml b/extensions/icy/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..4f19052a68
--- /dev/null
+++ b/extensions/icy/src/main/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest package="com.google.android.exoplayer2.ext.icy"/>
diff --git a/extensions/icy/src/main/java/com/google/android/exoplayer2/ext/icy/IcyHttpDataSource.java b/extensions/icy/src/main/java/com/google/android/exoplayer2/ext/icy/IcyHttpDataSource.java
new file mode 100644
index 0000000000..c6728219c9
--- /dev/null
+++ b/extensions/icy/src/main/java/com/google/android/exoplayer2/ext/icy/IcyHttpDataSource.java
@@ -0,0 +1,387 @@
+package com.google.android.exoplayer2.ext.icy;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.util.Log;
+
+import com.google.android.exoplayer2.ext.okhttp.OkHttpDataSource;
+import com.google.android.exoplayer2.upstream.DataSpec;
+import com.google.android.exoplayer2.util.Predicate;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import okhttp3.CacheControl;
+import okhttp3.Call;
+
+/**
+ * https://cast.readme.io/v1.0/docs/icy http://www.smackfu.com/stuff/programming/shoutcast.html
+ */
+public final class IcyHttpDataSource extends OkHttpDataSource {
+
+  private static final String TAG = IcyHttpDataSource.class.getSimpleName();
+
+  private static final String REQUEST_HEADER_ICY_METAINT_KEY = "Icy-MetaData";
+  private static final String REQUEST_HEADER_ICY_METAINT_VALUE = "1";
+
+  private static final String RESPONSE_HEADER_ICY_BR_KEY = "icy-br";
+  private static final String RESPONSE_HEADER_ICY_GENRE_KEY = "icy-genre";
+  private static final String RESPONSE_HEADER_ICY_NAME_KEY = "icy-name";
+  private static final String RESPONSE_HEADER_ICY_URL_KEY = "icy-url";
+  private static final String RESPONSE_HEADER_ICY_PUB_KEY = "icy-pub";
+  private static final String RESPONSE_HEADER_ICY_METAINT_KEY = "icy-metaint";
+
+  private static final String ICY_METADATA_STREAM_TITLE_KEY = "StreamTitle";
+  private static final String ICY_METADATA_STREAM_URL_KEY = "StreamUrl";
+
+  private IcyHeadersListener icyHeadersListener;
+  private IcyMetadataListener icyMetadataListener;
+  private int metaDataIntervalInBytes = -1;
+  private int remainingStreamDataUntilMetaDataBlock = -1;
+  private DataSpec dataSpec;
+
+  public interface IcyHeadersListener {
+
+    void onIcyHeaders(IcyHeaders icyHeaders);
+  }
+
+  public interface IcyMetadataListener {
+
+    void onIcyMetaData(IcyMetadata icyMetadata);
+  }
+
+  private IcyHttpDataSource(
+      @NonNull Call.Factory callFactory,
+      @Nullable final String userAgent,
+      @Nullable final Predicate<String> contentTypePredicate,
+      @Nullable CacheControl cacheControl,
+      @NonNull RequestProperties defaultRequestProperties) {
+    super(callFactory, userAgent, contentTypePredicate, cacheControl, defaultRequestProperties);
+    defaultRequestProperties.set(REQUEST_HEADER_ICY_METAINT_KEY, REQUEST_HEADER_ICY_METAINT_VALUE);
+
+    // See class Builder
+  }
+
+  @Override
+  public long open(DataSpec dataSpec) throws HttpDataSourceException {
+    this.dataSpec = dataSpec;
+    long bytesToRead = super.open(dataSpec);
+
+    Map<String, List<String>> responseHeaders = getResponseHeaders();
+    if (responseHeaders != null) {
+      IcyHeaders icyHeaders = new IcyHeaders();
+
+      Log.d(TAG, "open: responseHeaders=" + responseHeaders.toString());
+      List<String> headers = responseHeaders.get(RESPONSE_HEADER_ICY_BR_KEY);
+      if (headers != null && headers.size() == 1) {
+        icyHeaders.bitRate = Integer.parseInt(headers.get(0));
+      }
+      headers = responseHeaders.get(RESPONSE_HEADER_ICY_GENRE_KEY);
+      if (headers != null && headers.size() == 1) {
+        icyHeaders.genre = headers.get(0);
+      }
+      headers = responseHeaders.get(RESPONSE_HEADER_ICY_NAME_KEY);
+      if (headers != null && headers.size() == 1) {
+        icyHeaders.name = headers.get(0);
+      }
+      headers = responseHeaders.get(RESPONSE_HEADER_ICY_URL_KEY);
+      if (headers != null && headers.size() == 1) {
+        icyHeaders.url = headers.get(0);
+      }
+      headers = responseHeaders.get(RESPONSE_HEADER_ICY_PUB_KEY);
+      if (headers != null && headers.size() == 1) {
+        icyHeaders.isPublic = headers.get(0).equals("1");
+      }
+      headers = responseHeaders.get(RESPONSE_HEADER_ICY_METAINT_KEY);
+      if (headers != null && headers.size() == 1) {
+        metaDataIntervalInBytes = Integer.parseInt(headers.get(0));
+        remainingStreamDataUntilMetaDataBlock = metaDataIntervalInBytes;
+      }
+
+      if (icyHeadersListener != null) {
+        icyHeadersListener.onIcyHeaders(icyHeaders);
+      }
+    }
+    return bytesToRead;
+  }
+
+  @Override
+  public int read(byte[] buffer, int offset, int readLength) throws HttpDataSourceException {
+    int bytesRead;
+
+    // Only read metadata if the server declared to send it...
+    if (metaDataIntervalInBytes < 0) {
+      bytesRead = super.read(buffer, offset, readLength);
+    } else {
+      bytesRead = super.read(buffer, offset,
+          remainingStreamDataUntilMetaDataBlock < readLength ? remainingStreamDataUntilMetaDataBlock
+              : readLength);
+      if (remainingStreamDataUntilMetaDataBlock == bytesRead) {
+        parseIcyMetadata();
+      } else {
+        remainingStreamDataUntilMetaDataBlock -= bytesRead;
+      }
+    }
+    return bytesRead;
+  }
+
+  private void parseIcyMetadata() throws HttpDataSourceException {
+    // We hit the metadata block, reset stream data counter
+    remainingStreamDataUntilMetaDataBlock = metaDataIntervalInBytes;
+
+    byte[] metaDataBuffer = new byte[1];
+    int bytesRead = super.read(metaDataBuffer, 0, 1);
+    if (bytesRead != 1) {
+      throw new HttpDataSourceException("parseIcyMetadata: Unable to read metadata length!",
+          dataSpec, HttpDataSourceException.TYPE_READ);
+    }
+    int metaDataBlockSize = metaDataBuffer[0];
+    if (metaDataBlockSize < 1) { // Either no metadata or end of file
+      return;
+    }
+    metaDataBlockSize <<= 4; // Multiply by 16 to get actual size
+
+    if (metaDataBuffer.length < metaDataBlockSize) {
+      metaDataBuffer = new byte[metaDataBlockSize]; // Make room for the full metadata block
+    }
+
+    // Read entire metadata block into buffer
+    int offset = 0;
+    int readLength = metaDataBlockSize;
+    while (readLength > 0 && (bytesRead = super.read(metaDataBuffer, offset, readLength)) != -1) {
+      offset += bytesRead;
+      readLength -= bytesRead;
+    }
+    metaDataBlockSize = offset;
+
+    // We read the metadata from the stream. Only parse it when we have a listener registered
+    // to return the contents.
+    if (icyMetadataListener != null) {
+      // Find null-terminator
+      for (int i = 0; i < metaDataBlockSize; i++) {
+        if (metaDataBuffer[i] == 0) {
+          metaDataBlockSize = i;
+          break;
+        }
+      }
+
+      try {
+        final String metaDataString = new String(metaDataBuffer, 0, metaDataBlockSize, "utf-8");
+        icyMetadataListener.onIcyMetaData(parseMetadata(metaDataString));
+      } catch (Exception e) {
+        Log.e(TAG, "parseIcyMetadata: Cannot convert bytes to String");
+      }
+    }
+  }
+
+  private IcyMetadata parseMetadata(final String metaDataString) {
+    String[] keyAndValuePairs = metaDataString.split(";");
+    IcyMetadata icyMetadata = new IcyMetadata();
+
+    for (String keyValuePair : keyAndValuePairs) {
+      int equalSignPosition = keyValuePair.indexOf('=');
+      if (equalSignPosition < 1) {
+        continue;
+      }
+
+      boolean isString = equalSignPosition + 1 < keyValuePair.length()
+          && keyValuePair.charAt(keyValuePair.length() - 1) == '\''
+          && keyValuePair.charAt(equalSignPosition + 1) == '\'';
+
+      String key = keyValuePair.substring(0, equalSignPosition);
+      String value = isString ?
+          keyValuePair.substring(equalSignPosition + 2, keyValuePair.length() - 1) :
+          equalSignPosition + 1 < keyValuePair.length() ?
+              keyValuePair.substring(equalSignPosition + 1) : "";
+
+      switch (key) {
+        case ICY_METADATA_STREAM_TITLE_KEY:
+          icyMetadata.streamTitle = value;
+        case ICY_METADATA_STREAM_URL_KEY:
+          icyMetadata.streamUrl = value;
+      }
+
+      icyMetadata.metadata.put(key, value);
+    }
+
+    return icyMetadata;
+  }
+
+  public final static class Builder {
+
+    private Call.Factory callFactory;
+    private String userAgent;
+    private Predicate<String> contentTypePredicate;
+    private CacheControl cacheControl;
+    private RequestProperties defaultRequestProperties = new RequestProperties();
+    private IcyHeadersListener icyHeadersListener;
+    private IcyMetadataListener icyMetadataListener;
+
+    public Builder(@NonNull Call.Factory callFactory) {
+      this.callFactory = callFactory;
+    }
+
+    public Builder setUserAgent(@NonNull final String userAgent) {
+      this.userAgent = userAgent;
+      return this;
+    }
+
+    public Builder setContentTypePredicate(@NonNull final Predicate<String> contentTypePredicate) {
+      this.contentTypePredicate = contentTypePredicate;
+      return this;
+    }
+
+    public Builder setCacheControl(@NonNull final CacheControl cacheControl) {
+      this.cacheControl = cacheControl;
+      return this;
+    }
+
+    public Builder setDefaultRequestProperties(
+        @NonNull final RequestProperties defaultRequestProperties) {
+      this.defaultRequestProperties = defaultRequestProperties;
+      return this;
+    }
+
+    public Builder setIcyHeadersListener(
+        @NonNull final IcyHttpDataSource.IcyHeadersListener icyHeadersListener) {
+      this.icyHeadersListener = icyHeadersListener;
+      return this;
+    }
+
+    public Builder setIcyMetadataListener(@NonNull final IcyMetadataListener icyMetadataListener) {
+      this.icyMetadataListener = icyMetadataListener;
+      return this;
+    }
+
+    IcyHttpDataSource build() {
+      final IcyHttpDataSource dataSource =
+          new IcyHttpDataSource(callFactory,
+              userAgent,
+              contentTypePredicate,
+              cacheControl,
+              defaultRequestProperties);
+      dataSource.icyHeadersListener = icyHeadersListener;
+      dataSource.icyMetadataListener = icyMetadataListener;
+      return dataSource;
+    }
+  }
+
+  /**
+   * Container for Icy headers such as stream genre or name.
+   */
+  public final class IcyHeaders {
+
+    /**
+     * icy-br Bit rate in KB/s
+     */
+    int bitRate;
+    /**
+     * icy-genre
+     */
+    String genre;
+    /**
+     * icy-name
+     */
+    String name;
+    /**
+     * icy-url
+     */
+    String url;
+    /**
+     * icy-pub
+     */
+    boolean isPublic;
+
+    /**
+     * @return The bit rate in kilobits per second (KB/s)
+     */
+    public int getBitRate() {
+      return bitRate;
+    }
+
+    /**
+     * @return The musical genre of the stream
+     */
+    public String getGenre() {
+      return genre;
+    }
+
+    /**
+     * @return The stream name
+     */
+    public String getName() {
+      return name;
+    }
+
+    /**
+     * @return The URL of the music stream (can be a website or artwork)
+     */
+    public String getUrl() {
+      return url;
+    }
+
+    /**
+     * @return Determines if this stream is public or listed in a catalog
+     */
+    public boolean isPublic() {
+      return isPublic;
+    }
+
+    @Override
+    public String toString() {
+      return "IcyHeaders{" +
+          "bitRate='" + bitRate + '\'' +
+          ", genre='" + genre + '\'' +
+          ", name='" + name + '\'' +
+          ", url='" + url + '\'' +
+          ", isPublic=" + isPublic +
+          '}';
+    }
+  }
+
+  /**
+   * Container for stream title and URL.
+   * <p>
+   * The exact contents isn't specified and implementation specific. It's therefore up to the user
+   * to figure what format a given stream returns.
+   */
+  public final class IcyMetadata {
+
+    String streamTitle;
+    String streamUrl;
+    HashMap<String, String> metadata = new HashMap<>();
+
+    /**
+     * @return The song title.
+     */
+    public String getStreamTitle() {
+      return streamTitle;
+    }
+
+    /**
+     * @return Url to album artwork or more information about the current song.
+     */
+    public String getStreamUrl() {
+      return streamUrl;
+    }
+
+    /**
+     * Provides a map of all stream metadata.
+     *
+     * @return Complete metadata
+     */
+    public HashMap<String, String> getMetadata() {
+      return metadata;
+    }
+
+    @Override
+    public String toString() {
+      return "IcyMetadata{" +
+          "streamTitle='" + streamTitle + '\'' +
+          ", streamUrl='" + streamUrl + '\'' +
+          ", metadata='" + metadata + '\'' +
+          '}';
+    }
+  }
+}
diff --git a/extensions/icy/src/main/java/com/google/android/exoplayer2/ext/icy/IcyHttpDataSourceFactory.java b/extensions/icy/src/main/java/com/google/android/exoplayer2/ext/icy/IcyHttpDataSourceFactory.java
new file mode 100644
index 0000000000..e396405f44
--- /dev/null
+++ b/extensions/icy/src/main/java/com/google/android/exoplayer2/ext/icy/IcyHttpDataSourceFactory.java
@@ -0,0 +1,85 @@
+package com.google.android.exoplayer2.ext.icy;
+
+import android.support.annotation.NonNull;
+
+import com.google.android.exoplayer2.ext.okhttp.OkHttpDataSource;
+import com.google.android.exoplayer2.upstream.HttpDataSource;
+import com.google.android.exoplayer2.util.Predicate;
+
+import okhttp3.CacheControl;
+import okhttp3.Call;
+
+/**
+ * A {@link HttpDataSource.Factory} that produces {@link IcyHttpDataSource} instances.
+ */
+public final class IcyHttpDataSourceFactory extends OkHttpDataSource.BaseFactory {
+
+  private Call.Factory callFactory;
+  private String userAgent;
+  private Predicate<String> contentTypePredicate;
+  private CacheControl cacheControl;
+  private IcyHttpDataSource.IcyHeadersListener icyHeadersListener;
+  private IcyHttpDataSource.IcyMetadataListener icyMetadataListener;
+
+  private IcyHttpDataSourceFactory() {
+    // See class Builder
+  }
+
+  /**
+   * Constructs a IcyHttpDataSourceFactory.
+   */
+  public final static class Builder {
+
+    private final IcyHttpDataSourceFactory factory;
+
+    public Builder(@NonNull Call.Factory callFactory) {
+      // Apply defaults
+      factory = new IcyHttpDataSourceFactory();
+      factory.callFactory = callFactory;
+    }
+
+    public Builder setUserAgent(@NonNull final String userAgent) {
+      factory.userAgent = userAgent;
+      return this;
+    }
+
+    public Builder setContentTypePredicate(@NonNull final Predicate<String> contentTypePredicate) {
+      factory.contentTypePredicate = contentTypePredicate;
+      return this;
+    }
+
+    public Builder setCacheControl(@NonNull final CacheControl cacheControl) {
+      factory.cacheControl = cacheControl;
+      return this;
+    }
+
+    public Builder setIcyHeadersListener(
+        @NonNull final IcyHttpDataSource.IcyHeadersListener icyHeadersListener) {
+      factory.icyHeadersListener = icyHeadersListener;
+      return this;
+    }
+
+    public Builder setIcyMetadataChangeListener(
+        @NonNull final IcyHttpDataSource.IcyMetadataListener icyMetadataListener) {
+      factory.icyMetadataListener = icyMetadataListener;
+      return this;
+    }
+
+    public IcyHttpDataSourceFactory build() {
+      return factory;
+    }
+  }
+
+  @Override
+  protected IcyHttpDataSource createDataSourceInternal(
+      @NonNull HttpDataSource.RequestProperties defaultRequestProperties) {
+    return new IcyHttpDataSource.Builder(callFactory)
+        .setUserAgent(userAgent)
+        .setContentTypePredicate(contentTypePredicate)
+        .setCacheControl(cacheControl)
+        .setDefaultRequestProperties(defaultRequestProperties)
+        .setIcyHeadersListener(icyHeadersListener)
+        .setIcyMetadataListener(icyMetadataListener)
+        .build();
+  }
+}
diff --git a/extensions/icy/src/test/java/com/google/android/exoplayer2/ext/icy/IcyHttpDataSourceFactoryTest.java b/extensions/icy/src/test/java/com/google/android/exoplayer2/ext/icy/IcyHttpDataSourceFactoryTest.java
new file mode 100644
index 0000000000..11f5e074d4
--- /dev/null
+++ b/extensions/icy/src/test/java/com/google/android/exoplayer2/ext/icy/IcyHttpDataSourceFactoryTest.java
@@ -0,0 +1,41 @@
+package com.google.android.exoplayer2.ext.icy;
+
+import com.google.android.exoplayer2.upstream.HttpDataSource;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import okhttp3.OkHttpClient;
+import com.google.android.exoplayer2.ext.icy.test.Constants;
+
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+public final class IcyHttpDataSourceFactoryTest {
+
+  private final IcyHttpDataSource.IcyHeadersListener TEST_ICY_HEADERS_LISTENER = icyHeaders -> {
+  };
+  private final IcyHttpDataSource.IcyMetadataListener TEST_ICY_METADATA_LISTENER = icyMetadata -> {
+  };
+
+  @Test
+  public void createDataSourceViaFactoryFromFactoryBuilder() {
+    // Arrange
+    OkHttpClient client = new OkHttpClient.Builder().build();
+    IcyHttpDataSourceFactory factory = new IcyHttpDataSourceFactory.Builder(client)
+        .setUserAgent(Constants.TEST_USER_AGENT)
+        .setIcyHeadersListener(TEST_ICY_HEADERS_LISTENER)
+        .setIcyMetadataChangeListener(TEST_ICY_METADATA_LISTENER)
+        .build();
+    HttpDataSource.RequestProperties requestProperties = new HttpDataSource.RequestProperties();
+
+    // Act
+    IcyHttpDataSource source = factory.createDataSourceInternal(requestProperties);
+
+    // Assert
+    assertNotNull(source);
+  }
+}
diff --git a/extensions/icy/src/test/java/com/google/android/exoplayer2/ext/icy/IcyHttpDataSourceTest.java b/extensions/icy/src/test/java/com/google/android/exoplayer2/ext/icy/IcyHttpDataSourceTest.java
new file mode 100644
index 0000000000..b06bd78e65
--- /dev/null
+++ b/extensions/icy/src/test/java/com/google/android/exoplayer2/ext/icy/IcyHttpDataSourceTest.java
@@ -0,0 +1,29 @@
+package com.google.android.exoplayer2.ext.icy;
+
+import com.google.android.exoplayer2.ext.icy.IcyHttpDataSource;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import okhttp3.OkHttpClient;
+import com.google.android.exoplayer2.ext.icy.test.Constants;
+
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+public final class IcyHttpDataSourceTest {
+
+  @Test
+  public void createDataSourceFromBuilder() {
+    // Arrange, act
+    OkHttpClient client = new OkHttpClient.Builder().build();
+    IcyHttpDataSource source = new IcyHttpDataSource.Builder(client)
+        .setUserAgent(Constants.TEST_USER_AGENT)
+        .build();
+
+    // Assert
+    assertNotNull(source);
+  }
+}
diff --git a/extensions/icy/src/test/java/com/google/android/exoplayer2/ext/icy/test/Constants.java b/extensions/icy/src/test/java/com/google/android/exoplayer2/ext/icy/test/Constants.java
new file mode 100644
index 0000000000..6dec462829
--- /dev/null
+++ b/extensions/icy/src/test/java/com/google/android/exoplayer2/ext/icy/test/Constants.java
@@ -0,0 +1,6 @@
+package com.google.android.exoplayer2.ext.icy.test;
+
+public final class Constants {
+
+  public static final String TEST_USER_AGENT = "test-agent";
+}

From 535b40539ad1c94ab98bfca73eb0d8b83aea83ad Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <sascha@peilicke.de>
Date: Mon, 22 Oct 2018 23:40:25 +0200
Subject: [PATCH 098/832] Add ICY demo application

---
 build.gradle                                  |   1 +
 demos/icy/README.md                           |   4 +
 demos/icy/build.gradle                        |  62 +++++++
 demos/icy/src/main/AndroidManifest.xml        |  42 +++++
 .../exoplayer2/icydemo/MainActivity.kt        | 160 +++++++++++++++++
 .../drawable-v24/ic_launcher_foreground.xml   |  34 ++++
 .../res/drawable/ic_launcher_background.xml   | 170 ++++++++++++++++++
 .../res/drawable/ic_play_arrow_black_24dp.xml |   9 +
 .../main/res/drawable/ic_stop_black_24dp.xml  |   9 +
 .../icy/src/main/res/layout/activity_main.xml |  47 +++++
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   5 +
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |   5 +
 .../src/main/res/mipmap-hdpi/ic_launcher.png  | Bin 0 -> 2963 bytes
 .../res/mipmap-hdpi/ic_launcher_round.png     | Bin 0 -> 4905 bytes
 .../src/main/res/mipmap-mdpi/ic_launcher.png  | Bin 0 -> 2060 bytes
 .../res/mipmap-mdpi/ic_launcher_round.png     | Bin 0 -> 2783 bytes
 .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 4490 bytes
 .../res/mipmap-xhdpi/ic_launcher_round.png    | Bin 0 -> 6895 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin 0 -> 6387 bytes
 .../res/mipmap-xxhdpi/ic_launcher_round.png   | Bin 0 -> 10413 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin 0 -> 9128 bytes
 .../res/mipmap-xxxhdpi/ic_launcher_round.png  | Bin 0 -> 15132 bytes
 demos/icy/src/main/res/values/colors.xml      |   8 +
 demos/icy/src/main/res/values/strings.xml     |   6 +
 demos/icy/src/main/res/values/styles.xml      |  11 ++
 settings.gradle                               |   2 +
 26 files changed, 575 insertions(+)
 create mode 100644 demos/icy/README.md
 create mode 100644 demos/icy/build.gradle
 create mode 100644 demos/icy/src/main/AndroidManifest.xml
 create mode 100644 demos/icy/src/main/java/com/google/android/exoplayer2/icydemo/MainActivity.kt
 create mode 100644 demos/icy/src/main/res/drawable-v24/ic_launcher_foreground.xml
 create mode 100644 demos/icy/src/main/res/drawable/ic_launcher_background.xml
 create mode 100644 demos/icy/src/main/res/drawable/ic_play_arrow_black_24dp.xml
 create mode 100644 demos/icy/src/main/res/drawable/ic_stop_black_24dp.xml
 create mode 100644 demos/icy/src/main/res/layout/activity_main.xml
 create mode 100644 demos/icy/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
 create mode 100644 demos/icy/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
 create mode 100644 demos/icy/src/main/res/mipmap-hdpi/ic_launcher.png
 create mode 100644 demos/icy/src/main/res/mipmap-hdpi/ic_launcher_round.png
 create mode 100644 demos/icy/src/main/res/mipmap-mdpi/ic_launcher.png
 create mode 100644 demos/icy/src/main/res/mipmap-mdpi/ic_launcher_round.png
 create mode 100644 demos/icy/src/main/res/mipmap-xhdpi/ic_launcher.png
 create mode 100644 demos/icy/src/main/res/mipmap-xhdpi/ic_launcher_round.png
 create mode 100644 demos/icy/src/main/res/mipmap-xxhdpi/ic_launcher.png
 create mode 100644 demos/icy/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
 create mode 100644 demos/icy/src/main/res/mipmap-xxxhdpi/ic_launcher.png
 create mode 100644 demos/icy/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
 create mode 100644 demos/icy/src/main/res/values/colors.xml
 create mode 100644 demos/icy/src/main/res/values/strings.xml
 create mode 100644 demos/icy/src/main/res/values/styles.xml

diff --git a/build.gradle b/build.gradle
index a013f4fb84..f4eb7704a2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,6 +20,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:3.1.4'
         classpath 'com.novoda:bintray-release:0.8.1'
         classpath 'com.google.android.gms:strict-version-matcher-plugin:1.0.3'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.71'
     }
     // Workaround for the following test coverage issue. Remove when fixed:
     // https://code.google.com/p/android/issues/detail?id=226070
diff --git a/demos/icy/README.md b/demos/icy/README.md
new file mode 100644
index 0000000000..77a54098e2
--- /dev/null
+++ b/demos/icy/README.md
@@ -0,0 +1,4 @@
+# ICY demo application #
+
+This folder contains a demo application that showcases the ExoPlayer Shoutcast
+Metadata (ICY) extension.
diff --git a/demos/icy/build.gradle b/demos/icy/build.gradle
new file mode 100644
index 0000000000..9ae88c445e
--- /dev/null
+++ b/demos/icy/build.gradle
@@ -0,0 +1,62 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+apply from: '../../constants.gradle'
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+
+android {
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
+
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
+
+    defaultConfig {
+        versionName project.ext.releaseVersion
+        versionCode project.ext.releaseVersionCode
+        minSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
+    }
+
+    buildTypes {
+        release {
+            shrinkResources true
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt')
+        }
+        debug {
+            jniDebuggable = true
+        }
+    }
+
+    lintOptions {
+        // The demo app does not have translations.
+        disable 'MissingTranslation'
+    }
+}
+
+dependencies {
+    implementation project(modulePrefix + 'extension-icy')
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'com.android.support:design:28.0.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71"
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.26.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:0.26.1'
+}
+
+apply plugin: 'com.google.android.gms.strict-version-matcher-plugin'
\ No newline at end of file
diff --git a/demos/icy/src/main/AndroidManifest.xml b/demos/icy/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..69d64dbf96
--- /dev/null
+++ b/demos/icy/src/main/AndroidManifest.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  package="com.google.android.exoplayer2.icydemo">
+
+  <uses-permission android:name="android.permission.INTERNET"/>
+
+  <application
+    android:allowBackup="true"
+    android:icon="@mipmap/ic_launcher"
+    android:label="@string/app_name"
+    android:roundIcon="@mipmap/ic_launcher_round"
+    android:supportsRtl="true"
+    android:theme="@style/AppTheme"
+    android:usesCleartextTraffic="true"
+    tools:ignore="AllowBackup,GoogleAppIndexingWarning">
+
+    <activity android:name=".MainActivity">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+
+        <category android:name="android.intent.category.LAUNCHER"/>
+      </intent-filter>
+    </activity>
+
+  </application>
+
+</manifest>
\ No newline at end of file
diff --git a/demos/icy/src/main/java/com/google/android/exoplayer2/icydemo/MainActivity.kt b/demos/icy/src/main/java/com/google/android/exoplayer2/icydemo/MainActivity.kt
new file mode 100644
index 0000000000..643ee84ed7
--- /dev/null
+++ b/demos/icy/src/main/java/com/google/android/exoplayer2/icydemo/MainActivity.kt
@@ -0,0 +1,160 @@
+package com.google.android.exoplayer2.icydemo
+
+import android.net.Uri
+import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
+import android.util.Log
+import com.google.android.exoplayer2.*
+import com.google.android.exoplayer2.audio.AudioAttributes
+import com.google.android.exoplayer2.ext.icy.IcyHttpDataSourceFactory
+import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory
+import com.google.android.exoplayer2.source.ExtractorMediaSource
+import com.google.android.exoplayer2.source.TrackGroupArray
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector
+import com.google.android.exoplayer2.trackselection.TrackSelectionArray
+import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory
+import com.google.android.exoplayer2.util.Util
+import kotlinx.android.synthetic.main.activity_main.*
+import kotlinx.coroutines.experimental.CoroutineStart
+import kotlinx.coroutines.experimental.Dispatchers
+import kotlinx.coroutines.experimental.GlobalScope
+import kotlinx.coroutines.experimental.async
+import okhttp3.OkHttpClient
+
+/**
+ * Test application, doesn't necessarily show the best way to do things.
+ */
+class MainActivity : AppCompatActivity() {
+    private var exoPlayer: SimpleExoPlayer? = null
+    private val exoPlayerEventListener = ExoPlayerEventListener()
+    private lateinit var userAgent: String
+    private var isPlaying = false
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        stream.setText(DEFAULT_STREAM)
+
+        userAgent = Util.getUserAgent(applicationContext, applicationContext.getString(R.string.app_name))
+
+        play_pause.setOnClickListener {
+            if (isPlaying) {
+                stop()
+                play_pause.setImageDrawable(resources.getDrawable(R.drawable.ic_play_arrow_black_24dp, null))
+            } else {
+                play()
+                play_pause.setImageDrawable(resources.getDrawable(R.drawable.ic_stop_black_24dp, null))
+            }
+        }
+    }
+
+    private fun play() {
+        GlobalScope.async(Dispatchers.Default, CoroutineStart.DEFAULT, null, {
+            if (exoPlayer == null) {
+                exoPlayer = ExoPlayerFactory.newSimpleInstance(applicationContext,
+                        DefaultRenderersFactory(applicationContext),
+                        DefaultTrackSelector(),
+                        DefaultLoadControl()
+                )
+                exoPlayer?.addListener(exoPlayerEventListener)
+            }
+
+            val audioAttributes = AudioAttributes.Builder()
+                    .setContentType(C.CONTENT_TYPE_MUSIC)
+                    .setUsage(C.USAGE_MEDIA)
+                    .build()
+            exoPlayer?.audioAttributes = audioAttributes
+
+            // Custom HTTP data source factory which requests Icy metadata and parses it if
+            // the stream server supports it
+            val client = OkHttpClient.Builder().build()
+            val icyHttpDataSourceFactory = IcyHttpDataSourceFactory.Builder(client)
+                    .setUserAgent(userAgent)
+                    .setIcyHeadersListener { icyHeaders ->
+                        Log.d(TAG, "onIcyMetaData: icyHeaders=$icyHeaders")
+                    }
+                    .setIcyMetadataChangeListener { icyMetadata ->
+                        Log.d(TAG, "onIcyMetaData: icyMetadata=$icyMetadata")
+                    }
+                    .build()
+
+            // Produces DataSource instances through which media data is loaded
+            val dataSourceFactory = DefaultDataSourceFactory(
+                    applicationContext, null, icyHttpDataSourceFactory
+            )
+            // Produces Extractor instances for parsing the media data
+            val extractorsFactory = DefaultExtractorsFactory()
+
+            // The MediaSource represents the media to be played
+            val mediaSource = ExtractorMediaSource.Factory(dataSourceFactory)
+                    .setExtractorsFactory(extractorsFactory)
+                    .createMediaSource(Uri.parse(stream.text.toString()))
+
+            // Prepares media to play (happens on background thread) and triggers
+            // {@code onPlayerStateChanged} callback when the stream is ready to play
+            exoPlayer?.prepare(mediaSource)
+        })
+    }
+
+    private fun stop() {
+        releaseResources(true)
+        isPlaying = false
+    }
+
+    private fun releaseResources(releasePlayer: Boolean) {
+        Log.d(TAG, "releaseResources: releasePlayer=$releasePlayer")
+
+        // Stops and releases player (if requested and available).
+        if (releasePlayer && exoPlayer != null) {
+            exoPlayer?.release()
+            exoPlayer?.removeListener(exoPlayerEventListener)
+            exoPlayer = null
+        }
+    }
+
+    private inner class ExoPlayerEventListener : Player.EventListener {
+        override fun onTimelineChanged(timeline: Timeline, manifest: Any?, reason: Int) {
+        }
+
+        override fun onTracksChanged(trackGroups: TrackGroupArray, trackSelections: TrackSelectionArray) {
+        }
+
+        override fun onLoadingChanged(isLoading: Boolean) {
+        }
+
+        override fun onPlayerStateChanged(playWhenReady: Boolean, playbackState: Int) {
+            Log.i(TAG, "onPlayerStateChanged: playWhenReady=$playWhenReady, playbackState=$playbackState")
+            when (playbackState) {
+                Player.STATE_IDLE, Player.STATE_BUFFERING, Player.STATE_READY ->
+                    isPlaying = true
+                Player.STATE_ENDED ->
+                    stop()
+            }
+        }
+
+        override fun onPlayerError(error: ExoPlaybackException) {
+            Log.e(TAG, "onPlayerStateChanged: error=$error")
+        }
+
+        override fun onPositionDiscontinuity(reason: Int) {
+        }
+
+        override fun onPlaybackParametersChanged(playbackParameters: PlaybackParameters) {
+        }
+
+        override fun onSeekProcessed() {
+        }
+
+        override fun onRepeatModeChanged(repeatMode: Int) {
+        }
+
+        override fun onShuffleModeEnabledChanged(shuffleModeEnabled: Boolean) {
+        }
+    }
+
+    companion object {
+        private const val TAG = "MainActivity"
+        private const val DEFAULT_STREAM = "http://ice1.somafm.com/indiepop-128-mp3"
+    }
+}
diff --git a/demos/icy/src/main/res/drawable-v24/ic_launcher_foreground.xml b/demos/icy/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 0000000000..1f6bb29060
--- /dev/null
+++ b/demos/icy/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
diff --git a/demos/icy/src/main/res/drawable/ic_launcher_background.xml b/demos/icy/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 0000000000..0d025f9bf6
--- /dev/null
+++ b/demos/icy/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#008577"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
diff --git a/demos/icy/src/main/res/drawable/ic_play_arrow_black_24dp.xml b/demos/icy/src/main/res/drawable/ic_play_arrow_black_24dp.xml
new file mode 100644
index 0000000000..bf9b895aca
--- /dev/null
+++ b/demos/icy/src/main/res/drawable/ic_play_arrow_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M8,5v14l11,-7z"/>
+</vector>
diff --git a/demos/icy/src/main/res/drawable/ic_stop_black_24dp.xml b/demos/icy/src/main/res/drawable/ic_stop_black_24dp.xml
new file mode 100644
index 0000000000..c428d728dd
--- /dev/null
+++ b/demos/icy/src/main/res/drawable/ic_stop_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6,6h12v12H6z"/>
+</vector>
diff --git a/demos/icy/src/main/res/layout/activity_main.xml b/demos/icy/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000000..14f3598479
--- /dev/null
+++ b/demos/icy/src/main/res/layout/activity_main.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
+
+  <android.support.constraint.ConstraintLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity">
+
+    <android.support.design.widget.TextInputLayout
+      android:id="@+id/stream_layout"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="16dp"
+      android:layout_marginTop="16dp"
+      android:layout_marginEnd="16dp"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent">
+
+      <android.support.design.widget.TextInputEditText
+        android:id="@+id/stream"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/audio_stream"
+        android:singleLine="true"/>
+
+    </android.support.design.widget.TextInputLayout>
+
+  </android.support.constraint.ConstraintLayout>
+
+  <android.support.design.widget.FloatingActionButton
+    android:id="@+id/play_pause"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="bottom|center"
+    android:layout_marginEnd="16dp"
+    android:layout_marginBottom="16dp"
+    android:clickable="true"
+    android:focusable="true"
+    app:fabSize="normal"
+    app:srcCompat="@drawable/ic_play_arrow_black_24dp"/>
+
+</android.support.design.widget.CoordinatorLayout>
diff --git a/demos/icy/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/demos/icy/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000000..eca70cfe52
--- /dev/null
+++ b/demos/icy/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/demos/icy/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/demos/icy/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 0000000000..eca70cfe52
--- /dev/null
+++ b/demos/icy/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/demos/icy/src/main/res/mipmap-hdpi/ic_launcher.png b/demos/icy/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..898f3ed59ac9f3248734a00e5902736c9367d455
GIT binary patch
literal 2963
zcmV;E3vBd>P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000YGNkl<Zc-rlp
z32YSS6~~v;2U0^g);4x*ZZ`qK*^oekNg|Z0s+3kr6p2DrK{4SpzA;{}cfIS|yY~9R
zUK`BaHaJn}MMF6XNd$=?DWMTPP?H84lpY}@-~bDHegAKF$Ft-40IzL)Xh-^Ed)~}^
z@BQZczW3(BU<fUtCA5T=(9+KrG7K_UEJFvB5L34-7R%rPd*Ztso9Y0OWv1^(mgU(-
zl$o3nWu}S|rFjmctH3d#w#0$o^%U*0I})np_83=@BeuFoYKINm$m}>a+K}1d8+^p?
z!e{m!F(8(%L-Or7x3OYORF&;mRAm8a^;km%J=s!AdNyc=+ezQqUM;oHYO18U%`T}O
zHf$ra<Jf3JW`}R^QQvMmHnpN+OmL7?<C72eM}s|^47MzfR%4x3Phwq}N6!XDR~C3C
z*OW-@u`atOzNScOhYj1v>^L^sklEoIeAKmbOvX~v2@Y|vHs<^3JwwH?D$4l*XnPNs
zMOqozmbkT?^lZ?$DjQ9%E0x+GsV=1PwZ&39Y}iI-$Fb3d%nsk+qrN@cV=OmQMEdF%
z)iHMl(4Yu=cIkixWXtwMIV=>BvDSrHg8?)+vLJKozy*}$iE>&gGGonlG0cJhG&DRv
ztzkg-AO<u%ZB+|m4GK_XetP3T2Nao_yd!8pW9->(q)B7~G^EwE#tK@nqmJ}!(Bqtf
z=eN{I?X#P!Xx=uL)D9cAk=b!<v>~&@H~6S)=a?R4fDdP{-5E5X_!5&FwFJ^7&W2WS
z;CnxBCOsSU^v-%(vad;MPukr;&+ciI+F`>sGCPiqHe`1A1|N0p^<|#<+iECwOG@y7
zBF$;;0YAhxtqK7O0SW;M0SW;ckbsQ#9QTYyC*g`2j%bA%1Zh^g9=9l*Cy!I<J4fl6
z-HoKTFN8X0{`MNF9X4zuvp=`jO_irkQ1RPGMZKf7!#DV-w{Hx`G`+z=qqEls4=Aq4
z<i<T0+*ZKZ(h7yzlD$nG);k!^?K^kKbNe>^{_p2$PP2>j_D2AybM$NwY}iJ(ZH9O3
zlM8g4+dw;}V{dlY2EM^Z-Q(AmcmO|Ub1&3EFTS>iuHC#rcNo$wkB3@5c#lSunxsQ)
zaA7tLFV3Oxk}X2`9qVL6?4fcq?f>Yk0E0IEcm0~^P5ovLLV$&D9ibbZTOt4ivg_<=
zu^#q8tYJktl(egXwj4c3u6N&}S3mj_9pv5y{gQvL;&nM}TeNE{4K3O%_QAdpCAswa
z`Ev>!oQREY9uPqL)g(QPVc1U`Q3An`+x_7g8edZ^0zdcpXNv7^!ZsgV{ugB){w+<Y
zEulC5@@K_%lY8f8KGqNh*e|nKd`%HGo;fK35s*08wp%yF&wGK<110wL{oQu!7CBEH
zziXE37ik_@1jDPdK<*{?nNys(9R0fvignp3{SUvU%U@mXc0d=eUZG8gekI!IH9%2C
zxo*@nc(Q=5tQGFnAQkJ`FxRAT09V@Dx*d*RU$kAPjfW11w)A{}Z}3sihL~n@?;g8(
zL-2rN7!aOK;qePnu2!fcaL-1&egZ4&$nWT@8{hO89KX;;`r+S*Hno1hH~6UMJ7SvC
zR7J+F019@9eVf<)^}qk_aX5aR|Ig>5&3-Wlp}yI7?tN)6*ST)-XSL4g8_rtDVlw+a
zE+K|#(tV!<wCuny7=nHv?_K<ao@#K?^8LH%(<@)xHyljzFYIZeB`x)I@}D0|z~7{0
zukY>KfQE22d-}7B(mLkHukIp4?na@q<A?7X&{n=675kY|=tujuNej%=mp-K-mh`?0
zXyJ}}`ufHVUFT8Ym2+hsmY+u7D#+rV@Q?cjbm(vAX>?%@4Kb%u!@F-ww?o?tn_Ohb
zPi3Do`yL?Y$rDPYtEV;|250yzpS^rZT*TflAZ&YqC;by2Ul7NTZHKm<?;IlogEa7o
zNUSgGSwNjh^ONdI>C)9NA6Vv+>C%^1XhNlp5*!7zxTTKfHTPhe?@XbH=VzWEuCcmX
z@L_&qCB;=(Xi;-D&DvT)kGOiMQ0&YQTezdH&j4D;U@#9&WiZClJThS7w)OHH^fIT|
z+jn{&5bhMbynmM$P<0U*%ksp0WUy)=J!n9<aQvFf{%f2`6me0A!Z2W+O4qx=eobRX
zCfjuI4FN>~WJ&YNn$e3{jMFOW6n~uqMHg+M3FY|#>(q)ZF;RS(xqTh>S1Ez_jfFig
z#ivbPnZ26mv{5wdB5SFYrUNM5D?g-OsiZZK?hPof9gqf&7m!5-C=d>yOsw<)(t*<s
z$lMM`0Adwn^y2*>G@h5zIY2saaEx|99pU%^#gv<M;h@(DK;`B@I96XTvSxN2P_U1E
zCUc!J(P5=0>dI(Qqf<Z%ltt(%PQl;hYqN=*lCiy3PrIvV0q;N2S)h_lfPs>>)zFjf
zN}5z<W7*rq*$aAZXFWXuyQ_#MRjXBub)I=#!o+kX%?JD7P&}C9v-5aOv4Di0q^LMo
z(d?QMng=`2MS7aYy>m9~oT`PmH~EF012{9eT8?4piYolF(86uiGy`^r#V4yu7SA-c
zjm})#d$(Kx2|Yn~i19Fr<)Gs+1XaUIJs~G>kg>3<hLw6kM$Z8h^{`S;$W!?Q87s`H
zVWk!iF+P4|N^d`#$Fujmln!tNAnpkXen1*HUO-lg6M#Cx@dC291Jb~O5^Dh{zat#X
zlh&+00thcJz#)HjQ%%GQARRd9H3<$4AWgPX0O`O%uh9hrUkWnY0ri=;J5T~3@Vf#E
z%vJ&r2O+C-1fYt1T{vDqC4qqaaQuKAmOl3Siw2SxkVRVO;EG%TlGHiKR9-;ox~V(>
zkQ$CqUj*cb1ORzHKmZ`Ab2<VFtaH48ERs4$1xO3W)=hwV>^0!}Qkq&-DC(S~W*1GV
zw9}L-zX}y4ZLblxEO1qhqE9Q-IY{NmR+w+RDpB<O9ycxEIxdk<k|Iv+LUpB{`Mhsz
zS6+YV(HF`2?9F6{QRj>;$@R(PRjCP|D$yJ+BvI$!mIbb<+GQ3MGKxUdIY{N`DOv%}
zWA){tEw8M2f!r&ugC6C5AMVXM=w7ej#c_{G;Obab=fD={ut@71RLCd*b?Y1+R_HMR
zqYNuWxFqU^Yq9YB)SmxVgNKR;UMH207l5qNItP~xUO*YTsayf1g`)yAJoRV6f2$Fh
z|A1cNgyW)@1ZJ!8eBC7gN$MOgAgg|zqX4pYgkw{E4wcr09u#3tt$JW@xgr2dT0piE
zfSguooznr3CR>T88cu6RII0io!Z)mN2S3C%toVr+P`0PTJ>8yo4OoHX161h;q+jRY
zs$2o2lgirxY2o-j$>c;3w)BT<1fb;PVV(V`cL*zHj5+On;kX@;0)<bC@YRfVy<d3M
z7H^Zv?Cl@*s@8LTV#v>6rF-I?1)gyZtM6}?#ji{u+_Jz`IW9a=87nIA3aK2~3iFMS
zzYP&fCXLEibCzR_6R~#sKN@)HB>);Za`ud*QCaKG8jEwqgoknK7rwW`Cq?RYYE5r+
zh-YUqJ082>*;EG`_lhV^<FokqNaInQ*73Jj`HJRpn#U~*TvI7>v<r0(QhDI9Io)$f
zF)Hnq4<DMA_$*>HEM7d+5Y#e$d^rC*jx{U%h3B^nU%7N|*y`o4g{@w;KP-89>&W#h
zTBB2vTk*S|My+4jYTPKdk6yR3b?nAfcd`FeC@gttYuGBEl9wuf8`rOD9VP6`bhNxR
znvXql-3ssVUSXfvcf^2L5R-^4E-s=g|M$Wm!?<yg{4<(0g*A;ey`O8EFP11nRMZF&
zW0#k?hGE>BMl!51d{AS*7Ggjwh^YsbK?6jgCA5T=(9$oK{{z$fCe9x5IJ^J=002ov
JPDHLkV1g@XpTGbB

literal 0
HcmV?d00001

diff --git a/demos/icy/src/main/res/mipmap-hdpi/ic_launcher_round.png b/demos/icy/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..dffca3601eba7bf5f409bdd520820e2eb5122c75
GIT binary patch
literal 4905
zcmV+^6V~jBP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000v3Nkl<Zc-rM$
z33wD$w!Xb2KoVA2lMs>sCJ+Khgs=qzz9*aFfTF@MBLc!81jy1$_D*`qMnYCeSOOSS
zh~l6kD7e75FgOnvP=_arGNJ+k0uBt2?%a3It*Y+o?&`L?*#fV=?@xECZq+^KuXD~l
z_tdQ><aTb9$_OPgqSMJGfyWU4Z#Go6ak>JOSF%q}x5h@>Id>gloHZ!fr_@%N)Qad*
zI}<}@Poh`#X29>b50CkB%{yWf?z(t0rQf48W{j1a($$IrZ9{N{@#9Wqx}%DM^fL-m
z`X#_s9{BwX>^};}KMtudHpmMyRCq34!+|XCtnqeli6}6}7JiE;H+GAtDViHuQ~X9`
zP0^{y>Ov~ufreT-w7!yx_c;QOV>|0UxJK{lqSx`7cx`b!OLV*;Ez4q9Y_XdB$PKk4
z+Aq(kmz%Wb<VG#!pg~yVMzt9cyQ<6_R$;Jk`!vlCu*eM>OV3IpYsa0#_Vd?)>*2Lc
zn)<dS*(2=Suf<uE_|ECIi87OR*YNc<G^jY65`!9HCI%HiZQ=iCh^Z^3p%q3d-scEB
zj_pMIEc~_1!anQ=`rD-}&?ZXCbejV(XEpk?2x8Q{LioEod|fpNo{35{yHegqg2ZS>
zvVw}USbx|rlL2LMl<$^rb@TnK-;J83fd3GKh6#=C5WlXv83lKz{0$(8x1g-%;q}$b
z1=&8M<_eQZO4eJk#nshu9TsZZ11Z~hVkpt8oA4831ZP3Fj3C~EG*%gSnciYD-cpkI
zj{J=o1Bg-kJrjfz${Js8D?vh>vJwR{=4)c@ZtTqt#tHRR<NXUWu87F76SxHsWM|QU
zE3NdZ2{$)*^On=5DE;xojde7jD3dBp8ne=*rH=3~NT;JWJWo3;&!JMs1q@nMMtfD6
z+_u5v*v?%W><9b9ew~kVG6oc8(lNE=Pu>)F6HIf=`kIH3oJBkSO2;+SnG--LDU5kx
zC0($63w`LN)znoR#GhW@M5n&8!EGBnj_usF!G5qm>{qhQ`sdB#K<?+>+CoQF7f-se
z?#7!W#vF7jw48A-)Ulxz@0b)?7iKWQI+f<SY=aoQdIgQBE^ylhk7GM`ZLlBg5Bqi1
z22&2WskBW&`V~LbvcWgT-Gm%Mr)vj(%mOl+Yyxl2u3|!qi9sTuyl6>E6Ud#Le4H#?
z*wIeM>mtaY-X;WO^yfR4Adp*W)N+A4Yv~TqOy)a5g8AjAEfJ4acRWELKhbNNKrc!(
z&!ze1YQkhsw=A3()t7B^pu2=1)CJq>k}s1bv-{fV>=i+J^=8Lh=Pn_L(@77X+QqLi
zSM!u0YfVL$I)-o^+D$g^8iKevTQlfM$<k-Wd+us{(2^O{JGmMTtHTJj9M%!$8#ttj
z_Y1hER7WFg3h7wLJKB|GOSTaZ3khIYrO|C0JdW+$wP_FiJow@&+PkKRC5=*TP+pW9
z<+ttUbdzNyz3*AT#xf~vBi2+7!+H+h6`YmhrvS`YF)2%U;dv_Fj~E5#ynFOp`oo1^
z={rXbK?1kNsf`#j{`wMqq;Z|wHh3J{xob0N(^~q$cSq=n3+L%;|2!bs2IWP$QGQ_`
z(+y-ER=0x28Z={2_vt(bZbz=Rg_&!x2!+WNny(mmhcI)+<jnEd125E4i^alV2E6*s
zmvC1Lo!SW)R$ob@Ru;QFj=<yC&eidLwae*_!~eAQ+hjJgeU9x=UX&Z<w?76t7G=>k
z8A}@MLX0cd>SIdp0%mtcJaTy&g94$WW9QB?a!}a+T)Rd$eDM!(fgHCnNCsx!svv{S
z@9-M<iT~q%cQL3-SsvZ;%>jC~sfoKOK+dN>{)_sV(mjhof{qxwvX-7Df1DQTI(g)o
z>s6XRhgIhE&g6I!q!Sxz>EW}#SnudH5WeBSekYPp`9~Vp)1-G^r@B46=-SWs(Z;X8
z02evPKG%G<kLK>)Nf*Dpl|H<Aog_J14}HZfM(FDwK+XUcWV#^;^CAn$OQrH9a~8P{
z*4!{Bi>NSeWdw0`U#|(mpohWGktDRF;Bo`A2K9T}=|{(p(X*E>(aYDag2maC6ay^+
zk7K(%-yfyPJKv<yD@$m2RROacF*#qI`kBV9siZP*MlmZmU1jQp+kpd#qQCI8a_-zt
z5mg00^TVZ279_NJ=FLWW^0$jt1<>6-`qy{#2oNV$%o|*T^A7!TivIn?ahqEKj{ka&
z1#*R?@}3aHxtTmO=~U-w(|Xu(B2EmI8B50EvnOk9*GGbcJZK_}E{D#X@`(&j@%hg`
zvgc+#<w0WLBPGa*LXs9v=G-h%=@ftDIms%HAhr2M5Y!(=lbuKY_ofnrBUlu;-Srcs
zGRyTU8k(M*!{<awM+=fGbZHGYilD@XI+hDv^U<9=1-jaHAPM`sE`lHq$zfU*mYcTO
zJ`S-ZDC|+OqDN`ohiI<&Bol+F6b7v>V--FuV!3MbUy#-AgE(<BiLndjfW1F_&-!&G
z6UvKnqx>$~;1gULUs<ph>w`94gkTgN-nwH+_TiyxD=9t>#{5GHSR=+VC|3HUj>p$m
zF=5TOh#WCVpZxG0Mfs)VLU~bclwVS}a)Tud>)$I3M@i?-ZEb;CNQ$OT?W!<oPVqt7
z;;W05?%i!2VQw|9G+m=5pM2n>i>WPgI2K-%bDAV3iV{YFpxIA_D~#F;z7mA_2ToA0
zz;J#$$gz?H{f~tykIYwsN^&ofDHEcc3HtMs_ksmo_H~%=S!trXzdzzq@XJ@P(yd>A
zNh?17fF3z>nk9kWDu3|gPt>$~7yTPdOfi9U)o%B9hiOkpO1&hgnGv)+?=lcH(3zlF
z)1$73Anp4*+{T@4Fog)rOQR%n2^~~bNRNp!ZBKCK-@noL+ER9Y8^~8Se*UT3c%<F+
zCMDRPF9bb2evmUkk4=tLnA8`2aWR}{?f>b7TLtsqf14?X2rJH|pTWGz8-n&h;14Ov
z#z`fWWiO*ed){^1em`8ly%A*0PxH#fdX?n<MkXfow-F?aV&fBfDD-Ndg7k!!*V1#B
zFS!-??=a1{zovv)(VW*_a_b^e_!X}I?AA@Ry<S5HR2I@Ne&>dqyYz250dgaflgvo+
zJV<AsCc_7Z+eR^gpw6VNJYRj75oGY3ApC#j|9s+cQg`^5(>{-K7`Kl9diHm3hJcly
zengd6QU#LyA&GQLke(wb%#d-6v?HDD3F1f!>{yWg5#|xN?9J0WD7v<U{&?~HZ5_E>
z;l~T-X%q||!6msgyeyyoVe>kdc~D4&(TwHYfu@{&z(qUzHQHR6u}wE)#*5x&(o-7O
zw@7jXJiKu=?N?bq2i6qRnT;Fhz}ixmnKagt?l)w<id+!8(knMH^OvVC$nthBHfd9R
zizaB&##Q*JnfgN<8o9chDsg1XS4mG+p-qoPb4_fjAu(B1D&{^lnGe#`Q-bEdwWUQ9
zH2;lPtOSi(UBMBgOR*<O&&nNC4(+<kc<c$}!oJ+W`I?;E*RNMZx#1^o3TDO+-*3?b
z8Tahs2~yEfYeWQzNz(HLGwpLHTSZ6T%eZiQ<$+_YeXpXdH#velE4eNN3)=kUemgWC
z*iUzT`wiW4@N=hQVr)P36@BBI1NQq5*aMI6IP|q>-)BzP^3@k~*Wp97@gTqNpbZPR
zy$S@S*a*rO5riY0Ud8DORwP?Adna(v!QOi8<4{14v_(t!#gLwrT(JX4+=L_$A%|pc
zXmt?{(xut$cSLlVo(30Y+4jMCjtGY2uwS_m`dG?inGHD{f(#luthNkXB!$a+a>Yn-
zK~O4(yi`tCXd{2}Q7v*n=1Z+W<4npgXvmO$@_f~4uO9n2kmNBzD-1S*B*<|l$eA1@
z#7Yn<E<p|>NRI?n@&u)dVc}PLoFRSt;=(FF*KZU}pY9KTJIT}LH;AkK9+f+gq?~2G
z5#)j#B*jLMG&xp+>KqBOk%JavBS>X$J^3kS)@II(S5WsDjsv%=Is#fvo%C=}VJ79C
zu4XlR`eZez2+jdtZkwl~W8jW<Go>?<?2u=}kg6iur!*hFt7uTZH2SX4)41nL*mdmy
zqzLE+az3!OinfEB7X;xU$f&i!#Gw<&_TYw<v;*pea^bSP0&O$u8JGhECXRfZx!3P4
zVCXY(BEF;5eaLddd+Zr@eYM%sXY*Y9N;d1B_3}DK5?YcC#ddfMlDG-$YUofPz#hx3
zm<UQuhq>O+mCNa{m8IZH0?Igm<vdVdMQ3l>NQbXlLF4NHs~k~IN5KqX9?a!NuC1W)
zYsz_4m;p2<C-p<nxd*SiM=Q(PlF1XMLo5>B(rNZ|bq7KTK$6gs(A^{fuF@Y|C$u<+
zeYYY<jAR-L(}eyoUBDcLLy8SL4rn<@4i4e?=!PLrj5OLBEG+?u^v8z^5Od`Dsm*e*
zM0t7=CF4f^iRnB)&cl_jiQ%o`Z!lRp_jQ&;`Lcit7aZWZQt^k6G5yL7EXIgqj^k(*
z3<UP8FxkZ%EBJVWZiSYE#0W9RZYT%%gDj(gASK31j6FJ46Ul|oIZth8x^g;uxJ_rV
zs4W>3Gn!;AyU4%y;QbOj@OvR}OAX~1e60jYkYi7fGch)Tw9J(lK@#LJf(#;pbZHir
zB&II7NTQ;~GF=lBy<Df5n23yaC$pyMSSS4a%<C0q;uOGPl(G`!f*d555mae%Ne)_!
zm7u&-NpjF)tOVt&u|8xb86eNpNd-*D5hL38vd&dTqS)h)NV0g&JB)F?#<yj_0!hD1
zkn>QEr3##lyCO%LAbWBIf<~=H3(^R#^&aTfo7d6DH>o+Z>qt5T4kD_BN0|i~wM{;)
zQDk{ivKxY=^BgNdF34d7nZyJ+lfx0Dp`+JSH331CES`Ogv=4}5y2Zs^=PL<uaRKnR
z8yP%!GD%-_QOU1Z_h}KQn51kmL9UZPX@cyNK#rhtHd;xMgT;HWAoFNQDHN%H`HjRz
zJ<4?Abh`mte4lpkH`MQ;v2)twrdq~rT*a2I`Sh*^z72#mVo+>gRUr*8)xq~v8}M$U
zLOie%h{Y~;4ui@DJqJtzG0(xF97ij3CmS@3983s@mls%CJveFs=+cwd>4yDCfvm&e
z!5#1cb>BZeo;3I6^_Foju7YH-rfKy08n55>!E;8!9e--mI{HXM9UTG5-bio}4&^qi
zE~isoTuo;*ZeZWBo`Vxk8!8zvL!O6k1VIoUEds_IbStzRBxm^3Gm}w=_OY=YZzMUw
zCMRKGc;U#1X^+ec$Xs%Pdmk&k3F4CX?~8#O4uI@BY`Kmq!J0Uv+5@a9tSpblLOV<X
zt;iQc#ikD<fiScf9L5>))hr-m%u%E*xX4>hBnb`e#B{kyo18?4;4dFUw7M^53Rybu
z824~aV-c4}JY7hR>xV*sAg3fy6mLS7LnaNbD2_RfLpjc^aO!{=GM5BGo|C6yB@D9o
z>0^ok{idSKZKI>_xtZixNop4pgLk193Gf?Ao}Iaq1y@!>f+5tPYW8ZSJw77VrMS#<
zkU%RzE|Nf;cya`#HnR*FQxeQ`<~;c>Y2!DH$r^KWEyp=Wij2g!i9-Mb<kKb_iRv%s
zSzQI^V+L(ge7zU1h2!YvqS$36$OSoQF*qxaUtQjWb1Qb8l=<i7kB%<{*<zWDoUFI}
zS7T%(I5>cG4!}i^_bU5@kB8)I8_7rlg4C4#@<K_b*;QrI>0J#r1#qtCFoLQJrO9E%
zt`s&x4TB&q*Dj{y&(q&hhKJ${y!SHMP)2fle^N(DLRef11H>ps$3G)mFl*0{%0f#}
zK?dh~_$b?`;>l7qyL_2N&lj^qc}_^Fh@jk*X2^mq@ZAj7%2fh^%)qQ<OMmUMJ&IBH
z&qW!SESyX&=EqJrYw8-<jg1t94D9;g$XRXX&TJ&9^G~uMjLLIlaq~JL3?J6v$}W<x
z=7Kx|zat4bDHvoe!KFHLbWO1tT*=G^1mUR!&h3`XJ4t3e*4R4!J}g%ZWPPIyEx>AA
zZ3@z-Q#;=6kf<1C_wHkrQ^se@o}KxQJaxedR`bDn4a5ufwojD_f5pWfSc3vWaa8IF
z!+Z?HAa-6lxNq{aCuDPGysez_-`RL=-eMvHI(P2D`bHV<fKAakDynT@*RI`I)=CJj
z*otl4rAtDmaS8LfKm9~WkED59;tZL42NYy|+cRJLQ<yRHY_G!X3kdv<`$DslzwMuy
zvUi|5X-n5xPn6)fcn#iK@S0()59sSoA;vjx>O)$w1e0^WP&R`mBpOFQKR>_w07I2s
zIwmM1dOoD+-D@HOzvDhQc0abkw){E0*){N5cul<aEgZUUK3OrupOqIdo9))ED+vtj
zj<sN(xG<Kla0uh~^<ZtVEuMqt;x+CfQrri2R5TGrnmFP|`t)gqOOYAyJMK$lqmcY|
b2HgJxw7%AYvJx@g00000NkvXXu0mjfkw#Z`

literal 0
HcmV?d00001

diff --git a/demos/icy/src/main/res/mipmap-mdpi/ic_launcher.png b/demos/icy/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..64ba76f75e9ce021aa3d95c213491f73bcacb597
GIT binary patch
literal 2060
zcmV+n2=n)eP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000NmNkl<Zc-rk*
zX>3$g6n-PcZs4>q4bV;KlnN~%kbn}!V8maBKN?~PDN77Zj6xT>KxccMrJYVYoo)<E
zD@z15pd^^^lOHN7J8Be#*ji{ofi5#70;QcC&$(~z@LoGprqI&H@RBd@-E;4K_dEBV
zbMCqC3Bt2$JYR=bPY^^gVoX6ChJA_Ra}49<8WtaU!}9G@1$#-VVAZ7%rZ}xB{Q03w
zH%Jy8LLR*TU|F<N0vnq+1miX&c~OkfxXRpuwd5bcQq;wvaf)5?G9j+o)D>adu8>W%
zmv*U9KCo@D{=sCEstjFGl{%?R9Bd_S;`C@G{FNG~X;+5Z0h*dJ1r|5g4wB8=?S#Zy
zt3sAsXM@aL)nWAyCYz08&uXYp$}38nkeVvA0^C`|ts22ve2Y2>mf~J~_Til&y|FUz
z%#l)O^+i>bDr7NsoiC}@GN^5^{=sAkPSF?VF#7ysBZm@DnF?;l<mJpza2+uF5$wKY
z!)(D^*yC4#UIHAmcQ`;^CZyEcAj)2<ki}H$AgRtesBN(R!DI<Ic3hQFDl-nKfLP#}
zv~g{wf@@F(Hm%FRj@{!@f%R*$!c$<pu0Zzt^B$?d<c~IGpcD6ybCG@0030h1Hi5iM
zc;moM=E!o{{M|M1`hNGIw!!)blfAOH0iC;!J#!A}E}JLigY0?#{}p(qz%vD&*ooI=
zVCNokOxmP~AO|@tf2N)KR7V>e_~|Un-B}Itc2u|IlX``0V1M3jKlcCTY73+_+5_^1
zO|_7<%PEyPhbqxCEnFv#uom}FdO$lY%`OKi#h<5Co8ZPBFZA{I!|wAx!c?aisEfxs
z?T$*AUTc9D8_Hpt%L37MoudCVml+QIa-Q{X>F$I{4t=051yd2KXJy7g2ho;dPy9%m
z&|3%hK)bgG?)N=_y3^l5BAU(HpEX16sc+%jjdr-wd5e*w`^js6LDPj(u<}q7%axih
zoQB@MKIp*y%l0*noe!-3>L8Nvz`X|#;P=}%;m-Yg;Pd%Hg6jXkc0~S4=WWP7_Qlvb
zG1>9)E0=~O9SWcSdXd@th$;|?3QV+Z@1bR;tdb%M2ko%(GTA+u#e@F7$5Mb+;mB`4
z!xVgv{Jp95<uC*Nhm{!zJ;Yi|!t()&LTZdcl+RO2OyQ7&(gXfX3hujj2KvznABQ{#
z^=~?VioK7&d%+$Ti)^gSIXH$9g~BnR<rora1_MM8|MvDWhaQSB)l<9v0kYTj?|6DX
zK;iA|^=k@Z7q7R&%qkJGk9-<(RY<<>%Y!hpT7-)jrQ~&IJFY@h`L?H{0L^~?0CJaZ
z{tZjr)sT1m=#VQw^-Fg;S$l<Yh~>@ofMbuY0uykS+-JWJI=h~`ci}FY$50ATJ+%wA
zO77DqVS>075^y6_kJfo$5r(}BH#(lkaYNw(n&Hbh&XQd<uxPhybj|}LZ|&|H6$M&x
z*VbUjOhBkBFhMjIjl2nIFlL|l^D>-lYhgIk-UdHhZ4HzOR6cX9O(7$kLq}D}u9EB;
z-dh<?v|RQpV2~6*a}vsmMqwuw3qa6qVMwy;A=3D;Oo%pZg&7rksjSZpK<mVJ8t~bW
z2ZB+8785<em=A)9qd=*ExRpMwfXX=1sf1sNkP4t&PM(Nson{4jBCd5=73Ar?2@X;~
zhqLcjpsWZ~hWwE~)TiU_xy<c^IW-nY!##i_(}i*jmD=huHtP&EW?0eOfOm@omxYmk
zb8jQ0W9rU;?;|Wl2VR8dfpknMv~@OLdVK}H%Q8BL`eY;*X&SHsVj(2*6)@xm%!Y{b
zndfFh#QDriz%c4Cg4)hkpwPbpd82rwq-U-Gl9m)OD9AH=udyh|2NaNzC(;R3T!BJK
z0rN0S=&{elG`Qd1qjBKGN<&x<OC}>HFDZZ<8Lc2GP(}(AKLrJ-Oau&a1s?6Nk^&FO
z6KSRZhEqx_SQs6S0+E<b<N36QK5^4mV#-T6=!==WOrQe^onZqqT>ca!Fb^G1gONmI
zC+HbyhfVOuc?OI&<gjG()Q^Z0<}^A$+facig-B)kT21f5bUI80Fe~h)@ALGDo02LH
z`rIck6X@#!9l&{+a+v8j@JqEeP}{a4wu8D{!a{cy-b-1Gm!M<OhU{H}p3OXwPo@48
zPAd&QwZlaHJySM?^Kmz4&73FxE`(%~Fl>h7uoNn}=`c_>iW5NO1q-GUX8K1^!Zxzl
z4XfveR)GIBSo>}=cI+IH9~|U>#(X~teA-&84{aZTo0BMk;yjBqEL^gX=_9kDnP=}a
z`+sm4^17nldnZj&U`51GznG$gf}Fz|OlbvM2~cNtN6bbO;LjW>4doDpXIHr_#-WEK
zTp3oTSyarnG|L?64R(Lh#u7IM@+CF;0?j-dAKR%u-gp$bMThf`Y=V%QniZFqb4;b%
z+^sU^c~$y+58W}2ds$fqbXadxS)oD}YcBF8+Kmro`dqK7bh9_jZo>N(2|7ZqH?6u%
zs@LZQps|*E)s_+u&N{X0R(-hsYauy#KI0bVpUP;&tcc8vw<4D;UKP1mLj0?AU!cHb
ztdAKWi}A~qZL?OzGg+1b@q^keUNsrViJ`HuE@E!RO5*b9*&nDxR@U?Q6pMIaj1kMY
qJl2nQa+aK&iDQb84*TpHAJ>1BQ$$nT?9A!_0000<MNUMnLSTaDRpP7w

literal 0
HcmV?d00001

diff --git a/demos/icy/src/main/res/mipmap-mdpi/ic_launcher_round.png b/demos/icy/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..dae5e082342fcdeee5db8a6e0b27028e2d2808f5
GIT binary patch
literal 2783
zcmV<53Ly1~P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000W6Nkl<Zc-qBU
zdr(x@8NW~z#1%veBnAx$Vt6=KYaVUNME^*g8q{%&8(%TC!Plq=;khg<yX>+Hy9+Dw
zQlg?UKB$_cZ8RBMYcyI%jkQf{#wz1Xr!PxQ>w~B~cKP~!=iIw{_rdOp7<T42_ug~Q
zJ?Hm3=lj0%-E&tE9`y%8h;UH(9ies22zCtglh>tZhwZ1+g(AXy-HL10DFmbXNx@L~
z3<I6(u*`QmVXUp;BtE82J9(_N;%CuT?Y5XY-N}?@Ye%$2+ZkP}y~V)KJ5pOLC#eqA
zrDwi<AvE=}QJ%E5c11)@*)c>H0wQYEps<v~l-4?S?ulvJH_NWsGshy#Wh<ucv5xlD
z$I$%%LY($Zc3Y)dr?6_SKHX>np{iIyzhEeKgc((i$;}oAoqHl}Yb`&gx~}ISy|wl#
zwdwQ;nvEgzkAnwYj%g}=Nide26RJwsNTUEE)Q2P-5}7cQ3Z84R%7r<Rv8_&i?R?f*
zPHj^k;!i2>dvN4sQKhOlPcRnSrOp+WGP}nNJgfkDx!pMkypKGe90p51ezT#4MxAxQ
zN3CC+fuRy0nP8u@+)%h}@FHZ<Af?5!4{aA>>vWFTTCD?*bPf|6Oz4#LAYDsH*sO<_
z+8Vve2|wE19JrkK!TNc*tzkb>2=OxIfDS8-yiLEA$m0k(kQf0ZJlj+Q&+pg*@-o6x
zTdEi#&vL>m?`;jX+>v0bbWnM`S<~tiA>-z6^m&Xo6y=iH&}dMDp40vqOvn?CbR0P3
z0YX_`z8klIalWefMaf}lN@-MvK>)C@OTMQsv<oGhUiQCE$X7u_(K*RsCA%ID0jykd
zY)#$;WESeh)!TFm*NPE`EjYt2fGv6@4ndEmq*}kxw<(E=#<%Js73Q+5M2_M-9Vyz7
z!}79nz&r*TFPs76>EFV1j6zbmglN3)tDNw{&IYft@#yp|U;GYg&z^)Rt7d@u#0Bpe
zimnOEmq&Tef~aWH7SjqERa#-iBMX%jZKUfNcy71bp|`IOKD_d0nA~D<-XkQV*jewl
zx|K<Ib?<h!>$GjP@M*^t)>e04FWS7-Uwy|!6q{ICob5gfvYaErq&g;Btk^VqnotOu
zSN-|V;a*P<^rDbv9KD!YExR|ex)jop)as*$VeKa$K<SB3L4{az^aJ?Gft?Ighw4(B
zd%nB~eb~m`?gyYd`5XVHC2>-3I_~rZ#$8<Hq6|eT5hit)Gfx>n0D;V;;rwan!I2{&
zEnl34toAlI^wpPe<z^?`$1=Oa0S*y#-qqa=9sj)v2fz9w6GG%4^!CF2-X3N`WGVr3
zCnNf%_MNVA8&+qyR%kISjWHBwQ%dZaDGubs-?df3-aq{wXQ9tY^kG2*p!w_=Jdd^>
zlye)Ao4ycY%W~JdLaI0e(MHvF%G1SkH=uyAXf{=!ABS!n#lZ@o8CZ4XFmw8#1n{&R
zVs(YP+3GCIkwRjs%TCiYQa(?iP=b^m$jib}=-N*{ggXx&44S-zukU>W+LOO#ZOZ!~
zOnukpUM6x&FsRNVXIChVTfbhB(rD_SHz|4<p*Svq5;Mwe<YlJQCz$O&DtQUimj2Xn
zw>}839cXjAmbiVtspfigR#uEFjIMj@si>Ore+Oei$<1cCarcfF2@0*j682U1A9rp;
zlE=d6(}XYz#@Cd03QHCwxdi0=G&$N_{=Yy1XfbK~!v(L-Fa7gxu<_$VaOSVq1CpmY
z8$Ujb&-~r%UfZSfpfHyQ7GTlb5>~#R>JqSaSxPVhD7~ea?b-3_j}BnQxCvh0zmvuF
zfymQ6C7Oj$o(rpg(e8EsF8b6fI~#$e4S@tKotNPf@Ro97lv&dmNB}MOzKDHx{Td^7
z^e>kK&H&X>w(nxk__|+v<^;uhpfq|w0oCgN2n*&Uy98ur#zdLa9sUH2!{g=78$;%}
z1L1P#zaX{-%}ARM>G(3`OF*1abzPV`HC~?1g-^B_&(OXN<=~`T0!1J)ouwb`hnx4h
z9=m{>-*my^gYQ9FLp5Z*znzJYxJcY)*bL{8bEG_x3mc;?*yV2q=Kg#a+<I{Tu?x6$
z|31v!w}Y7xi4b%J%$(d7vf`Y*$aw_k&QpmHMd7-QOaM<M`aK0?A34M_#>Xvy`pEue
zJ2#<55|A&7Ku(lOR2IUxb#E82l~|riL@t>>J=|1!XP{(Gfq7D*RSSuh3Wmux1H9O5
zbzVzIvg#nSb+dS_bpfB9xub!%!Jvc0T8>$5O?a$?#5xXzQ6&nfaS6~B@Yl=oyt`5J
zUi|^Lo>^h?bXpN!k$b{#I*o}Gg+L0KqjiNap+>{b<p|T{!6YQZ>dB$Wh1B{gdNt&z
zkU*wl;*p0Tp96`fH`Pew34JvBLf)EFl)AaU3W$CXzIJ5}*_hmnyplOlgkJ%5dN1-^
zfYFOQ7f|g*o(nK@@|F3Nh4!=hOBWWfJjm^}QhYrdl{|g|c5+Shdb>Od$s<#GvjwI%
znqg*ZJ*3tdIBXmlNOJbhCP>{}#ZfQ82y=FCgS0Is7aB~A{A+vOWk<4kG8-CsBA>N)
z2Ro)Vo9)zRim|LCBI$`F-!JxDQG~E+nVNaMk<Y?F>GbGoHB3M|cbfqm?Jyjr6ln%D
z61dqAY5B-YX2WN|HS&_#uo<W<z|k+_qrYT<mT~mCKjc#MB)<J$3~F0ti_z&5lDRkq
zc#tRJT!1@y_h{oHkHm4N$%G2I?QdFj3ArWmZR>&dO1ZLdVcx6-*l>@yGiUd^twKIQ
z1myy3dN1;B0z4enBib<Xgw!UBo#jQPIX%LUGnI_nnm`{wxQMaB$~TOpJl0m(Py3X9
z_l0C4!nBfrK}H*qJdV60y~Wzk+E}{4%s2(yT9iVQQlKdsFRWX!FBV_m6Y32P&lTEh
zV~a!}Q7*tR$Y|ptk0bA3^|P0>GcLp_=&v^1A84wc`CetouQG9=$!N7f##SDg2(;-$
z`!;UT3E!5cpgGLm)#4Fpf{Qj}^JF&E4%N%lmmNV4&oVB`hy6ytSLkp=a!l^3{cMD2
zTZ1ifMFW4}K)*?$c>mDR24g)rEZIEGUiM-d`ALieTX6^VNp)73C?Y9z`9d?=c(?d1
zs~_K-`cOc>&%IHK9z-;#Xp`TMv(d*wB}E%mPIu_y`4;N)(a6iqDI;Sfv%{G`Tq?Y?
z`XY5qua{3ZRrAk6vM-O$&0Shch^Vh<qs7>+#oUI{16*NgkrFgmFX!!x!YeN<XMJS|
zBOl&u{C%}iDoF(G1f+#7nXezM&bc<xrkB1hisn_~{+SgW5s5p5ihOoVYplj2Iw*}a
zIXyWnr5;u4YoTw<HDKH6tPkqzvHT5z$6zw4Cxpnz>2Yr^QVW|_o)XG(ZcBN)a|R?)
zB#;P8w$4loZCthCwy<I4snCUU)FZGh)@D#~ekf*xcQOi*fOsx^+O({wHy3Hp+1ukw
z^Uh7T={w@8R5#*HrC$@`3?(<>D)Kv~>DA|AHfFa+EnB3aXYkonv5irz&0+e_1c`|f
ziIC%^3DMCrgrvlo!j#n640IkHIfLEfbrQs9Mtu8!_VBgvQKZl*M~Z$T%?|zlVT_2;
lV%Z2*hu);<nIW+A{{w(@HP+rHXcqtg002ovPDHLkV1knrU~2#X

literal 0
HcmV?d00001

diff --git a/demos/icy/src/main/res/mipmap-xhdpi/ic_launcher.png b/demos/icy/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5ed46597ea8447d91ab1786a34e30f1c26b18bd
GIT binary patch
literal 4490
zcmV;55q0i~P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000qDNkl<Zc-rk<
z3v^V~xjyNTFnI~m1R;rpU;u%T&<GX+wN$K?w$xjDX>6rydA(}wUDXPCF_W1vnaRBK
zeoR6LNsxyaZGA2++G?*?dRwg0Dq5+E#aFEgnub(`IsN<pd!FayJOUYF9%rxhtvNI2
zKmR%V`}Wy;|9kIqhU2uPB`s-5OIp&Bmb9d$ag;2UFK~Sub<*h5$?rQ?+rG23Js;<n
z*+*QAS_++1OQX-rT8m{$_{;WN<2iSE7U$eLkF%BLMB}0sTh27EDM$Rf7<!v2C%eUq
z+v>LD^CGWJ)s74L)DOcaT_gD&woh@MDDT7paS^E*rkp>8F->o<OiyrCRwuZO&rNk1
z-^b5>#K*x;hPkb-{<L~)fAnusNcNcf7qr**C%H_jwpq>g{@G1-RXg&<e4=kP+w=x&
ze|C#Y)lToKWIj{80-r3;K@OfHPB`Qyz*V2_yp;T}?CDrMug(2RPMaHYT3xdE`raL|
zd}p(w4dK#uFKoD{7v}pss<v0$)edWR`Bd!|pfB>d5PhrJUf$gT>-Kc2+T~(?$>*Yu
zT4h`0W>J$pZ%Azsi;{nVW%G=At*)awy8+_t6`#e`RGh(2zZ43)n*13}cE8;I5R%*`
z|5tXk`=>gMs<sQ;YyG)CkE)&CWn?~++?A@f7dJcn%XT!X+QmBz%x9{{ENv6u;<GsW
zR!Fv0{AJedx2H#Q7ZU*z90nVe{5X60X|AUHUkH%Hmv%HlMq>>q*$@(4m8?`JI1Q?{
zRHAd+JgRmHP9yV))rP7q3IO??4XSoJ$5!Su*=<s?`xj>~JDub(K$fM<8yf*a-K*Qz
zPelO^(`|+V_|-0Wk_vz*qdO0>?1mS)wM$Y29FC;)bEP-uAW0uG0ct9EO#m6#%K0RZ
z39?+K6Wk5gE*|+^5I8uFyX{ALNYa2Nz%T`Hn@(}pU9*C57Xtylz}>iUsV2Z#2;ejg
zaNoZ2a>iW@1kiDtzFVLPa8^~&DQ^ARm5e)008Ic*fO8jsh19y~Ki*W3-Qpae2p0nv
zo(NXL_4n_CukY&uHM^BPt?*wD_pyjn&Gy=Rcfp3fUR68tMLx;5n(a64-U;9T#U52V
zit5Q{QE!`~T|s99zY=X$w0cfmaNYW#0DU9B1CnnlE=a4Z9-s@!Y^>p_bSr_8-_-<a
zcJo@@j93&`)fOXBSl#PWwVR8+$R|eas<xD$b$dHi?dVP+pL7Q*+BVquc|H#;uCF<j
zxZx_T3ewsDO#n>*O#n>*O#n>*O#n>*O#n@Ra~B|fQ*l9(%QQf9xcJEvaY~>ll!7d&
zeMy*!>i>NLUU=_aXnXb`eD~hF-~w+IsQDzK^0wEj+D$`WSMKSA3v0K*aIW*wzx){v
z|Lq;P{lJ5=b}1e+^O;s(t?biT$<IKW98cA$`1M!CZYW~rk8dhi;PVd9#PsSOA5W!0
z2^6+d<S4c8e;&IZK09*;c%Fwden0&F?c+=YHJ?AYe;*Y8Vy~**+TGjPIfyVNJM#61
zci&>yLHOtC&t(07^{x))^Qyf&6nz%;wDIf6##eu8#&sKFHx$9)9f0Z%(CUS$4kJ%h
zh7xEzhK3iU_R;u@KbYx|2=~79C&+BFEBd6;PpcBt&P}D2M4-D$&W5VeCtg1)xQ^3!
z9dwsT*;DBzpVRTKQar!Iz)wS)Y_}P!pfNfWp?4YK(O3Tre#~%m=I?&-Fr?${tJVhS
z>=lrTBvW+|8iS#2`i=IfwE<-R;44R%@X>{!`|u$=e(U6DgfD8a!sD+U6_7w8>_2iC
zX4F|kjj91=H`?IFhx(x5cTdB<7oUfx-gpfTz4Im<`TO4(Xq$f9`@-{Je(C_+`S?TZ
z4vcpQ8~0gw-iMFABs?!xhr3^RjtMxadO=JCss=<Qk*XtVNK-H)-`w8~dyt$rJ~|<=
zQv=z)e&R#e^~Yyfy-mcWp|Fp>`ts28z5FLd@+WjRbPjd{sS);z$b0hGtE^P}he^1i
z7>H-yd;^|7eoS~C1QmcUcehUNIDmRU&%AkT#6+Jh?!%J56dPSF5W|cS2~^FD7Wvd}
zT-<EeB4HBXTl;%pFE*^FgR#MAfZ~wO=Y9uEv1>c21)vi6B=%lT`_GJe6+|LDhTUPB
z>Kqr7@|jIF1GGeZq0h@xpIiwP1yjb9Y*zKO!2wZMbhJU|{xvrEbS+BPy11i`MdHh_
zU@6%x@Ok(Gv{}~ZjMb!kP=K2@70hm|8K6>-+veseAW{OYUZ4qdx&3t8|MsoFVo&7r
zBR|p`^0RB9Ym&QOBA13Klxzr>w7U5`YS<f4fDP+oITR7wDyZ~VkBn-auLimnx~56d
z1}yHVg^&I@IA+KXfv#yWmh=fNK%%>n4T7nW@sCeFfg|s|3n!5j{|JLH@<G1-@#!b3
z_D{U_3M4v>6H|aVdj<UTmk+3t@W#mxVQI4yxXL>q+q(_^fRXaK3P8tZdo9e@(iRu<
zt#-^$ANe`N*~%uK05m~D0gxI2h64{X!b14LJ-fp52WMNa-_Ungz>n!?42H)aRu9tf
zZn@BbcY(EZVhL~!%>xXh%jx{h69NHlePI7Nbyew@+aBx-lTRSu!x_l?#;y+Fs_qPn
zFzyAQVd36CK07Sp-tGSwzO%a%W;so;wyOnR9>!fGhokSm2Wxk>z$}*;zO!cs^F5s7
zdN4|kx0C?4Z8H;L+zUX*9sl^`u!*Ba_}GaL;N;-QdrRble38%L9&`MolaSM3!@FQJ
z6G4Z0_?!g@Oi9v1(0V6LNg6>3G$lEgO-Tm6-~7mZF&SDOz2J<8TOPaz5~@oX5^WXm
zRgCN}thFfSJHcV(r^j|mGB%U)4;_7J+>jr_V@F?x)tyaH)Y%AYx|-ou6lC4*?Vr!2
zJS|H}beRSgvSlfiJk7T%A+RjP#kOg-=>Ybx$D05Lj~|1Xc<p*yIV9KM9njqhGh8OD
z0Sxkar)4R1)i5`9%Th+(22l6&|KIxSxD()YY&UW!57Y)!mq5{uCKO^Te&2$1ecAYF
zglXFGl@I<t?gV)M)Br4Lbq56~6$)UH5n(I}uw;83e1Mr5ZvqT_`Y9B4)H1@u0?@J*
zOHcsnriw)vivrNppXcdcL*4&9IRuRdpMrgd4?)8-PfG5O#?C{(g|0&fRqYy{A)n8p
z@83Wj`BlJn^w<0R?<2n*jGz|3XH!>HQh<^OqD2_9kucVwoaqihgiFwGD}j~1T8KAq
z9<oo2+*&Kl3y$kV4=;$3fP}5;s0Tfg#+mUq^PNIeMUaX9@~D~#_V<O@5=KCP=AZy2
zLR3eIFs4UCB}6!90c6N$0w5_70p!Ui(!&BMkS`R#FqHi2C=tf|e1J%Va}q#-d@Av>
z0*J_$7eGipRXI8<3eY7Ipjr$(pS5fpOv=;6o~r=0)r#cH3Lrr~6QEWsz)<of1&|`2
zU@7Hk`F+d<pa-?n>#GN7h+$5Xou}0dN}v_c^boY%{;YZ{WV+0(M1QNN9kM;!AOnLO
zA<P1-Mp9R`*FmP+jHnXA6G09JLK}8>!aO<$`pxu4!x90Kzr3RkuIy=J+gW&=9H=qA
z_U>+&-|S@9p4AWyTLkr1J{JXz;e*<dRS|QVodfiOyZp`uK0mmkOb+z;KRto2WV6)g
zg~Ap$T)(dy3NT|!8tpQ0FkI8)gR8sSAg{?01t;V+3-P5k5B%_+U2qxt&uei-fW(MF
z<p0OMov;*-5yBe*`dQXq3!8qv7cR%1&{EtEAzy^N_F8@g7QE$+uGqe+;Jhu&!d``H
z6%?#ua_ekEs~~eU0@V$xg0?q+-dZME?L^o2RPu>%scI*>vDKlk)jL}tnO0kitDO+6
z?2}J&RYIn-a{R1}qm0E@ZB`_oFkdWy1o<HWiUa~klTV=PMIe9#`Ah(tSO5v~nE++u
zPXP9io~?XnoFHms1p>&B&jg?@V^{!r@`-SP05aqg;X(mq$fxs-TLGNGl11do^z)ej
zbyh|4sl+n@Iva%o$n^8W0w|C#6u>A?ev|-N<5GZdoFLuJoL?^%Ksv}8B7j1W6%fFy
zNPbv=Zjk_D@+X7<OoY;52p}Kf3ItGza3cc9lP@WN6!`)0?7gAmT7b}<U>5dvA_6E6
zFN6iKm8nL!k^)EsSvqW^!UD*VZ;KXSB0MP{62Yt>fJB5F5ujW(!es*ZyvoB1VF6kp
z*=dv~|NIJ2T%dOv2k0&0@pc1G%QTb_ih|Yb=$T%62%3bDw82d2XhH;WDF$Wp8)|TS
zO9Yk>O2SA)vS<#MrV(i-iw4q$z#0HWxD;ejKcAgz2+A3z)@+3<dfVUvw+VFQR}6a)
zSU6KL8lU4FW0Uf7pr_gC3G}rJlijO#wz9zLKQUtd9!9OST@*$mEA7#^0(&dBJg}e5
z;nEns5X}K}1wg|K6yZ`2M}Y2Vv@-H<d*r^rq<l|n5N)ugSBRqSR-Q%+*7)jTJSl%u
zaY2gPG(b<Pr@GBNt&dRxy<L#j%d6SZ1J?8yDJ|ttw8dLLpN0>bosdkE<O~%;)C4dc
zZNG-(&;&Y7Au`ybVF-i9c4&Bk`u7nSg+PB)@`?PJ7&#|9D+6$eLDy;G)9S4-k0#|O
z+DrT9<GC+ki=~u@7ZR{Kq0$~`1C%3N8d#$-9mU}Vs;*F2D)mIXpw17YJOFF?`56rz
zGq0;@aSDl-=;sd+Kq1JY(aeYd@)52;06Fp}g#Z+_5-AE1u0Q~l2sa`?sbYj15TK1!
zHL~Q}L@)1-sQ@=_TsEd&*hJ*W1X*DLkTkUjmjuWc3n0<YX9Dz!1rU)ho)iA|x>d0g
z;D&1#CpZiz#?%|L1R`t^3D6uAKsmytNfdzqGC|f*0VK$e7Qk*e$z8qXvXKiA`1=hV
zmpdyx!B&1`%>9K46G0ec(a5T#01`o#KmdgZm-_e-0c6Mz|AmPOGO9|Ba#>%@WZZ2W
z>Ho;wdKvvm*|hl5+kCX*InGgW8c#HK{=|ok`9yj<On@$t05TD7SOBHr1%Uu2dGc+@
ziM{+Z1%fkwa$_%X7UYhLg#amB-ooV<+YE2U(TVAwlx!7e=$50FUyOq7_5AF5tK`0D
zBswbjqMlYh0i$a*+XZcI{*o4#^nObj&sA+<NT@F7S9Uh?dMj3yRV6&PO^nhoGV7}O
zJfD}R$#mu;8r2c#Y!!S_cMG5FFyZ&|07B=sF`QwXplJF#Z+Sa$Q7$#WsocgT30w?P
z9Jhr1BT#1g)oY6rOMdcpBA$rGJgB~t0=>eW-XboyKLmQg9WCdk*L<nj(i7<P5VWif
zy$}!sscBeBzea2M-DdV(01T?4K@;dShs%x?!yN$)FRWuP?X$9%4l+ca8^04L`k&qW
zj(+uu8;C1z;lfnLU5wHcE+ZoiKXa28Ex2mtEt~db818s2(^m0uW{q($)4uf-`wU`v
zqhoN9$1)iGn-u0cDhG>NJcD!Wm8!M{^|rzMI;*ms)i5}x+Az2Z&!25I4rWwWL}BX?
zEOKufEUd2?%)sM9ARn2w5R42L+weM@-Ge!fsOt>oIm=qnPh6z`_Ydz*&dt4=I7*o{
zE1hu`!$e9>O-f74pc5eSr(Br2T9<$6_jJqiuh$jk6-OgwWnppRih^SC?_wkr78Flg
zxdOM<ZOLcKib7R89rIa;zVlRV=^DxJ@O-W)P7vpb@{SxJ7i)+U#!Y~usj)2mp+r3*
zJvTG?B5s;K2e;=V79kc-ax7w85GTY9aTMU{yd+YU8s%gzHT8>Jdh#qTEon9)Lx{AD
zp})x??JVrlV(c?%q&{ae4u}ilB*0A^Hwr0^^>G9BT>K=*lpq(QLcEr=q$MqBNlRMN
c(!@yr22-Ey)4s~&`~Uy|07*qoM6N<$g6%nSQUCw|

literal 0
HcmV?d00001

diff --git a/demos/icy/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/demos/icy/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..14ed0af35023e4f1901cf03487b6c524257b8483
GIT binary patch
literal 6895
zcmV<L8W81)P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000`cNkl<Zc-rk<
z2Ygdi`@T&lbQe0TP!NhO6a=X(LE7TS6qO-MLHHw}K%sObZPS%DNt2eAZfJo**$Ak(
z75{?YaNu5u3l%3KLq9i3dcOBP_uk}Y-=-;)k>BruHaWfboaZ^`J@5OTb59uN+UwfO
z>5DKPj6xxy*f-15A^38Hcw8gS)fY>m7X^~)>WdY`i-Y7Ev5tB;lGU`#+aci!MOUUM
zD}qsF_F|N>IHn{!fdYTV_wX|;<46$x9(d2I{>ArDOEMG+AD^=P{ywF-GrY99`C;pd
zTVmI*ebJ{Z?*lK5{2OnL{2bsnz#klb<KFuk@PU7M!He-5Dq8%?^YZZ;crCo94YSt1
z5q7!0l8-37X6@T&*6_Hxvgp1I<#PayvFpp<0m6TU|4D2^85!1GOQ!7ELT==KcZPvY
z>&V^vTF8LL3idsEt+KcA+ISDVmw89n=b3!uh}YH8<Apu0Ocv;)$(!j@mb=?qD?jC<
zl@lKgk6a%5m^zIvY5N9U7j2#nf9GJZ0RO%&tWu#Hzk8D|Xl<cha2?~d>Am2dcyFwO
zP>3sYL|70%XiHU}0Zo+(MxFf$fG{c^GK8Lk0nm!?MOUlH=$7@wQ=P+?afrb30+O<`
ziTG*r2zL#G;JREn?w(KwKTW>kAG@~nvD;BDbNA6Sw3X7nOleNtO`EFE_iw7?Nk@V%
z2nn}DI|Z-=FUSS{e!iMKGH%z#^FftGb+nGAxybACovek#YjQ#vb&d*p+t1kJZ`xQz
z;u|ZlH|p$>-hl#GilOt>$n{u0Xl)T;>j-tlI@@Z?Wzp-=)#G34?74swCQ~ERfdKmc
zFhPnTvx5a7><EyPaXXvzFlXqD<_YVp%9&?u2ezrxj|M(crNql4nNrza0r9+<p(CKP
z3BZnkLLx9vgw~z50or16n>%ShCv+=IbEiP%zhTLzjnoMn+{p#7s56cR+1Ip9!b!Tb
z`Sm7~BP+1z^;S0iG7&)FAn@&x7D5ZD8A|Rn^8#NH904lXb|d*p^Im_M3cx}s7!4)T
z9gHH`t8+}w++;htxjC@gx{~KPlVjj*{S_ks3$9(+#6u-Jl&IAP3pu!CJwK#M5t6c_
z>9wdD74a&~(E(Zk#1U@ZTtm|Z&dTxVSzAiRZr?zO5>r03qKN!s*CrAGLWn8vUzShH
zLj>)tEVfOD(e%jX+M_)bim*#E5_p?Gy16VcdB?_AS3UnYnfh>x4oMP&MNjS{^B><!
z#Fn4Fe>++6>|-QpN0X@X6L&Y0v_nr&QpJ?Nedk76e$t+1QRS1iuh%{F%%f!H-mR|<
zQLG8Eng=h6w*&uot15mDdp?pMw_z>mzOGmllD0RJTU#1Lm&egEdG8hyS)~+JzIUCL
zOasw+)T%|5zrIFI%imD16;(cBT?v`6d!z2=P1Pi<EbkDrj59+P3C51`^NneR>}_cC
zaY){_eM2i&Osq}6Oy>Y2JfPjfx74>{k`N|n!sM^n$$Li~8z=DouS%NFPq=6oaadk$
z0*u&FPkPm9z)j6IfM-M)d8(pgV+4M-S4t-d{CpIET*U$q-ZNqpnS{w$epknMM*J)<
zPm6>bel7I#uL*$fN%fSIg0yd#CHM7kuV;h_C^iY@0i^Gty<ZSyT@!#0*0Nzf08^Bc
zdH}eR2zYZ-?=P0l5#)ASuL)ow0CIx-C^EnlExF%4qkx}Kva^HX;-7K(5WTQ6*8~uL
z#+jnLv=hv{dEMJTDYJj<!4zkeu)W`${A&VetUp)F^uQNkGMAN8?pzjt|3gK3A0Yo6
zH}M*-3E)Hk<On-!e%g6v#e)7Uhsj>9+J2aLrPcO&e_I4V!m|%QLzX;!0D_phPA9;f
z54Vuq!_U%`L{EsIT^4|j0x3HRvX(Vc4%<2x@Oh2+Dn;)>o2t)Xj~&>w&Vc`00uyVP
z+rjjLt<Mqo*|)#^OmuoZ`CF$WN54Hub3yjXTVmYKjbs6o9|EDjnDQgH){_UGIzWas
z*NG}WZT~j%?y2v{1*qQzy^b6^eTsGxd*ug1J?=fYhfLVL+2-dwR|BfmXM3kEi$^XK
z+Y%dao2ESC8p;ZA_d<MQg#ml4EnuDo$;8}_y)xLd3<iS{dT8h?Uw=t%+qS{(-v}`l
z1f2KSZju0X5mP>~xt1(^VjmUESy@cLz5nC)L@%fx;yxhQ-ro#ptR%A^-9<Zw-D@{h
z8sh7<q))M|6uF!wI#0ysGFHqA0JC$<mgmz}6NH~5>B0u$XgK)sha_CY+|f}c==vHJ
zIsE14R^<PA;R5N?pmp5@89gHSKWD|q%*0V);`2nD?e|e;PP66ryCMLVX?*il^2de0
ztwea_qxWgPUz7k`?mn`rgv8X9l78#UDez}}4?pt|DFAL+eD3q(RvqJ)KmR0oho7S)
zw^IN%E+|YVOzMJr#mxn#=uP6IlI?W1wAhwOxLc)yY<~MFwX?zo<DBr=@efF_4G#o+
zJd&CMLw)TlFOh~fUMA0ccAWeN%-5UWe?va}@dpb08Q**Q(~n5q>;ECC&mE-m5-zZK
z+8{Cl>U!wJC$s|y>+%=$e8oRsp!aOoBrJ@MF;SPkbU$$FNuOD87#(v%q_;vE<)g{{
z)}HI>svC+uv;Os$twg|H_&AuO>#CKsTo>rM<9BT$m9M@;K7t9+k|;62$@KkG-xKZ2
zhe^_oMi>opdhOmo+KXR&YGro*f{q}Ep3j$aj{uxYnw$E)-`r`v*$LKBT)@uM9ye4J
z-Q#1bNUOU9;6>Q;!8^3)TN3u@@%O2>^UtqNkTbvkW<`=Kz-yfT?N{=`iBIXo`W%cP
zOF@78`!8CjaFJ~gEr7rbg{*#HA!~+a`8W%{Bz>w?4Y=;<toOSbh@r>y{O2FrCCt!4
zuy^g+qyHvTAKvPoK+M_<8JLnR5|X`g3r*75jg0vjI+5}2Tc>@aBLzSo8U5@X@4sm^
z5-ujt+fn`dMM}KeB4Jx*2>uVv&wPi8j_zvT3~}C%Z`$&>zV&72aX)=W3XlNt!|X?Q
zQm^Au32^rJ-)S6xb54f}0OiA!vY*2j%^E_@&@x*=87F{e-s<W2WC|5P)o}vgE{Bsp
zpSxt_^Eh$t3|;W=FacDY0Ht!$ZRG<C?7O3!{r4)&$VDF+pE?n<b-b+tpr0;%@oDIN
zzg=?jd0?8P0^Ho-ju8MSVnZ0Xw&7V1scg>!CjZ|nOe1f`XR>1IG<pnxoB@L<+_!@%
z2{C1tJavG2C7p$Q9_Rk}o#0*{tfRAb;5L>iFlvUuJSK*t=o+=Yf5Tc5TadL2IQF()
zEi;A4K7Fc758(rGN!uFr7=1be_I@-cIE<Z@#bE09zyI!Z<nzF~VI7^dW6ZYov?F21
z6T{KytsC?cAg;Nky!a*HxT|$qg8jvVNk|CrQDwi2Pa}5G%JmqDIs>M1amN~NnsQVQ
zGnAj7{i)NE&jag-b#>GhG`pj=Hqeb+VmN|mT#uW%u2aZ9WP0=nqg<PLLj20tU3W!#
ztFpgf=YSl&7<(vY4!|4^M!I?zBHD`$J}P&V_-o@FKofJ_fS>D1a!xX1#>7~!l<@*A
zoYvP%oqLK3P?~FShX9z1Sqj6ovlDNLrBCj+nMZO-0B}XA0IJ;6%pJ)C?Fk@Zmdxqz
zt<F8~P5}}(*O1T7o)*>UAO8CbdHVQ=<lwP)$(P_Bx{FM_*1==%(QD&9#Qe=?XHJtu
za4g&@K(t!^Gjr#-q1K)dFTnjXZ}Kk9{ja+O@P=4o--qvt^FqKaow2)_conQ69{Fh`
zX>%<(ai;xq23`ZNh1c{dOsDraC(;Gp_x{_&8?%}28UgCOUzsT>BkT#_$;_WV*qs7k
zaPyN$mvj4DM~Poi24V76Q+NQ14?o+kc?17edH8v_RvLR<5W!E8Nw&XzRMg*N-BY$S
zuzP*nCBWq5k(6tj0?eD4;4Tw{lUUiyM?|NRtpotF6fZvOQYu;~fC>eGYcU+!A^_gI
z>|g&+Jh5H^5!z*f#wXumUx4XTZuC;;xMdO!D9;DmFW!WFarO)uTvuikAf~*Cy!Q2%
z?KVMgd~=fYTB|S$Fu1;)-b?J?fAZ6hBmmb%3fCA#XxAj1GG?%S0g^}b05|kYcetUL
z-fe4Y`Q-Vtqy|P!>5)U^_~}z_aa-{kcrCnU&C4&rJ<hc`g*_F5C@KIhFTx1Ibc#!E
zs6uv<89E@Aa&5L(hz-OfOpl;2?-JR&?G*rnvzB+?xa?d{duRcZ<y$Oe1ps&yXMq59
z;ssEH0F??7Rhao96Yd{Hxi$;LxOHGakbjBv1<dP&RVwtjdgToGKpZ}kg^vaC?+pdl
z^V2h@uNVQaEkid{f+@<O2vp~iB#4CZJR&h11+LB4$JD4v4|zJKBEl%w3PzBMz{TQZ
zIwS)6l`FR5VMh~oZKelUI0HTihr7w}87uxh{QZwkobzcbaJ@L|xyQksts_azh<dW@
z;9fEd+q}aGM>`sE|B!wvbkd<kxqE@*K+3h%p@QrpL03QN%0g5&Xl-GupEeIc904B%
zMG^3UIR3r4kM6!=$mfy%>_OtElu>j6jNVj3Vxd?2fw$+FBYCS|S$=CYSc<5Xi_2*;
z&gOy)`=+1ggA3<z>j5q=$gF`8aHR>b`OQ}eQ<P5O0p8HC#&slST?zaSo>6h8^930&
zTfz6uT#6in{r9oABIe_L$ArY#I_=r^EJ;?q_OB~WfagCwZZ1HRKmdgU5x6DEkfO}<
zfwzyo4LP<w0@#TdKM3zrrF^430v!10y(>-t+{?-ekO2Z@S_?o$$g;aAA0l1(9&md-
z<=AWj7QQA=_Jw~#d#mJ4?b#K9JJqf<0gnCn1538001ANs_@tzj2-yZ49YM<%;c8eY
z$FZH)D*9o-^{baHqyo6OF>A<%3Ni|8q&>{r+d^jT-r}%~5L31_lEnvhk<m?6=AYs3
zHjn~d%0mYq25+U7jM`WwK($Sb1<z*r6Z^@ymi6p=o2)UkvC=|-DiA<vPCgH#2;9aj
zh`_tdxhoa9Wfmp-IoOv@gM%&sBW@nxqm+Iv971i1gz;%X9Ijki!4e5oYI0*`iQUgF
z5mlN;Ml@6q&-^sg`-1$AB?3xhBxz#}@k1gC;Jt!1)+jUqgDiA0191_iFx_bDO~^2V
zwE&qG0su;~Oj{E(mwo5mzdxp-yKwHlgI8=Uj)Dm9?9@HxXXUuC9$-g=b_?Kud?Y+T
zDHOml`AE2#08YrK0u&1cut9z?_j8F<M}K}`?m^%*lH=Cd(-{fqB87M_oO3@t2cbRN
z)0JHK?lu9|I3?ey02bt%3y|xSeC+Xd1t=CGqm_<=+*O3R<MtKEsbl+ZZic!t!NGl@
z@yE;_HgIK4*oHZBS%88yPRTb4u*rr1Hpn*$&}=DyZSsu*z?>3OrL;pn_Wlg^IkA<C
zK4Ag^`cqDmMLw(-otTJQCn9`O7i)Y=<(OPE09rB0W(nL&kLT^+UKv}T8&M)9K7|<+
zLu$1op;~SH-5Fxa3dxwpD$+%fMSP1gt)Van?m`>4rJe+-a^UwY7R5qH&49$;zI8q6
zuFa?QWFa#_X%0VCHo0|kEkwel#20?HhOE_Boonzd$ROVHrqv>s49lswR{|TU1x4L9
zYWUdAHK)eyY$D^fHyXs|f^6qRnrJT@3q;P}(?aHg7lc1M1q}7Ow>ObxkL;#qWh{6p
zNoJ@q2lV_2;LW5yv5(xor2$M!4PBBnq0SsoCnSIMQwPW-xK9!YXN?9Ewl<Jtz=Lr8
zS^Kt;B)FF)Qnof2Qot&VTw8KF{N_Ppk;_<7=EwA+dxUT>1gu%s7*t+Bg35~wxOdVL
z_!J6maK$|`wmvrlW(J|R4Qp6SZiZ11h`rAlpa;f+xk}ztOG1=6^mika+17v_cwJcm
znb@*{glqHQ_Z$<{mdK^Ro{!{5S13qeX|4t2CTLg$Yx3A^XhS&(#Cr%31fK<I^9@+P
zt_x>xLk>AE+jwroWIAJqGD8O53ik6ycRr{+uucnefYQ1B=j?lwCZCL0Z!rfHSi)rM
z13-u*5X=u3)NR;&OIH(34)$~;+?LI^bTx53U>L*(G1V#y+YdHhk;R@Ll=i?+OkCd-
z%3*SEKUbcW_h90><I(Otn5Fkt(u?E625t~w5JZvjH5yUm^8$?AP-zmt0r^G&HVXx?
zPrh9N?2u0dD6u5~B_IBm8W=g$f7aCXlslF~7f($|pe|_`6B;m(k*)aHR$SonQ3Vh!
z+YQz%JRCCtoRCiiPzeQaOg@s06Rnv54#-Ectp&(pQIe^rBCNRoGw>pZQtm|g{tib$
zTp&#%&A4L)t+45A(Dt7dVJl9s;bIyEC|u)|eC+Xd1+WujnF-*8d}{%+%uSDM1z{$R
z&7_>g#s<0G`%Nz|CMXD((fWe2kI<W`O<#o2?!!8if{59Uk8ctn-6{Dd0qV>Ja1h~|
z1dux=-=+ZA>r1lqv|jhme3Ej-a^{v(vpkqY`fO7a6BRX#kuLv&l7`Q~y7ROYB*UHn
z+5!+@oj?G`=>;nRoTL}fw?`M#BtWKv2$vOLIJmo103=_5DF<qLzG5OGMp3R3!UNpV
z`}voIiHX54G>Bm)B`<<WM#p<aZWBOhM}z`P0i5S{aN*o2fQa0Vxd4vIX9bW71u#%k
zn(?5H89n?#$`Q+z+fPsQW+EdaFkL6PZ)Q1dID2lW!L8>7DKe~FO@{*5NG})#;LV$p
z^ny_Ujoc~u*wc9ddR8e}^0QYE$@Iz9$PLF)hny$v0ZvsH#-G7`E%D3)bN6Cny)?Oo
z+qSv+;8rB2z(RmV8v@wL?N9-lEd{Wj+o1w%wGhA#`MdzbHr2Go)TqJbTt%3<(;lIm
zAUDzU378K1rVR-b78b-Utqt;cXu%;L^r5#m;S(UOxMfca@Vp&7^2Kf$-2R72FCZ2X
z4Uz3AJnS1&!MHIBQ6xl$8R)*9=6bq&fnG<!=J3r>Yy#$XFui~gt_LO97NkaamPlJi
zG}q~I`=rPHvkwCoH&ISlZaVxMHavs*`M}$I$W4lzSC%}s2RCQw@i<@HvgZtV*b$z$
z<G5TMP5Ise5isU<7Vh6chJz<`3&an%(EsfKMhdQQ;l3T*I)b|waQV=LDs#YS#Kaor
zc5oD+cVh`OH$1TCBl-93Z6UW7%8mjDiO5B82ibkwrU>1usHku}*8?kXySDgM-1OS3
zUTf%8r$G=$z>}u%up?*XVrolC&vhjv5k$Ci$41h-vY7O&P;e-=MkR~*S`E2p?^e2R
z2iI-Qp)^O8l4dnAv4*)FoLKDvZ9bYE?D@AANMDDx52qZkTzGY)>9HjOKPle;xH&j=
z@eBOKOmjv`Hyzps*NFnc=^TJ|TSRUrK%GPVdOzN?a*|%a6f$NpF_~t|=CiIQ=k0*a
z_gF9s&CV^f?WRfhqJP7Z2i@Zm5rN+@gx^9pm|1YoJ~}B;5wdmmL}=@&iPu5z8@0Jc
zAb{iaf=vM&M7XvE5Rxy|@!k$I=PsOZhtM{&ZTGnp<eP~Qzz#ti34<iF@2Ft1mS3P@
zxtjY*LS_4pt;7>nJdqF)xt#!<goOe)NiSFnAn5fN;o|S<%PvT!O+;675Vn<T^CczU
z+#Cf4c4PefP=o}}<dI95)J0#=-fCksxPESEHcOC`^n#fHB62(C0tk9Nb|Q>N9$N6F
zgblJ1XdAJum&oim79o@gW<o;nWT^gL;o)PzBpqb3R}$I~+@OSO%StyK+=|3Gh;WSp
zsIo=nc6b4BF$I3t)08rbAbp51^X`5E+JdWE{b}1mn2^p!zEA{o!~DS??g{_*L;qMZ
zJ}HA)vFKx(Y-7KV%Yf%<#y3{9w(H<lGZ8Xu2+$x9z;Sv3*Klze5m&NkXURz=%!Bhk
zk&GLi#rgRCxHkE7ZS2%vX(*vPfFt}PnP6Z1X3_!PL0v{lW>2kW(w3Y;Pl=9zrpi`&
z!mJaI$>Fh;R0Qh?H=tA~fP;NIicACUUhq}tw&EHtE`c(si%&^rOkR(5#=6rsU|X<F
z7a_=UuSvp(5kf;_xY01kt9Q?dlDX5i#wl`sxDoeNqG!Q=8;6eF`XX($C5FRuL(yhi
zxSEay$Y=%N#HyqFc5uf;{u(k|Q}~1bebZY!d-a&iO|<>Ex(9YvlOxt7`7r?j;Y@Ha
zPS9~Uq=Rp`VM6r6xi!r4g~#X|fyA-jV9L%Fxb&&yzc@|W8V$kHtq`T!J->k$fwT9f
zIY8D*dwEf&fqFE>)T?2)4Pu@N7f&9Xf6RBr<l3;ly(e+zCXUt>>&*6g&&!c~>&O}H
zr#}qk$lyMl5QDrSl9VKmNn_^Ee2iK3e<!K!MVro#3=S{?45M2%=siob_1s9&a}zoz
z6#Pt=1Jj{rr|SbWa(xombbNY+T`J6Cdp~+K=*zEM^c8dOjK}caP=^s*kB_5u^QY#<
z|6)hB7i(_7q3rJu0gPW1^_I{yB>)M7{i32${3oSk1TC7gGkDd~w?cAO{}c+|2tHX7
zU#BJGcQlcR%3^u|EI#sS6Kjh|H*En;OH2Zj6;&!Hp+#ASkepSggI6tnD`?^Do&Mky
z_(gS3!Fy7-66*lojXxVy`EzxYFjw%47oscmr^CW}fN#x@ih)QBU|84q*gJzJCZ~13
zcV=bGip38P%u7EKDP8$aq&)5O$o!1&t}Dv=F{)U027y0E7G!>hpM_^Fe<y0y(jx=b
zEZ-Y3e`aOSgp}2IExaa2`apUwyeHn9_367_4aD1<Bj_^;)aK%(hkH_SVFUB)ELk@J
zaYF!!XfC`$LdJT<#Ekchz2Q#J0kL;ez|Z)eS7_*MScWS*gtO@bxogGJYvVmw`yRmE
z+w)2@HLeID;cTuiH3PvA(%}Qm=zC-E!;X-?oXLvg2#u$~kqPnKXZ>hd{2TmRyarwi
zugRJiU+!L#tDSf;g80yf8j!fq&|tdLATY2y^~;e|A@Du?49j3d&XV1QyT&!b+bIYy
pii9&6o*bz{@b60mWOsVP{|BB8eXZ|AYE1wD002ovPDHLkV1li`I!yoo

literal 0
HcmV?d00001

diff --git a/demos/icy/src/main/res/mipmap-xxhdpi/ic_launcher.png b/demos/icy/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0907cac3bfd8fbfdc46e1108247f0a1055387ec
GIT binary patch
literal 6387
zcma($WmFVQySpr~^b#u_OG=0|(kva)DP1B+cP_AmARxJ*NC=Wrg0zUl5(`L)gp{N-
z(%_OG?|Z*r_s2c=$2@ap&UtF)$(eXP9W_!SdLjS-K&qjxY;ZTH{xb;h@8E{&N(%r$
z+p3|gU=%dFmq%!1q&9_NsUvvk-GvvZ<wcVzG@v|e|4Jy?LX<FGUmoL}ZkA3}ghcj_
z`#riOiz=uiNLcwO^g&<i6_yL-S(oodl@z~|6+dIO+1GBfu<fz=`|BT5UAKa2sf~z&
z<%RHX*Iz3vjL#>jaIJ%uU(o!Ypc=Wv%E8e<<)SFdRM{tz(T@!nKT{;0jT2A&dgKu3
zk|GDUX<&73+f+CnZza0G4g29@hmNkl+2wP#$0yi6=u-4CD#*a8LxJLG9KlkveQ7v}
z>E#)-tL=xh89y&5li1I!>Zzc!_i6V~nKP^5-+!69FtnX*f=*tr+cf&UpZtLBY|wv<
zJ6r*Z5<h}|-&d9@4B^3BbJ<qA=QJsOM-QK-cw*5kwc=;EviGyFMayb7i<-5~i>374
zi$7+B3A@szy#|*$Tb~kkzc_N~h3;oe8q95K$w@e#5FRGcF}wXTR}t#^!OnNc>Z52w
zu23YrlIQY7UrLLcFSW5ctMBzwrTz=X-m{1Y!*LWUbO~;u&&q8Lu;wlGFqO2h4olL;
z{rpPfr}7f=Z)eZhFw1_ITpft-VzPF1CHv-W>u;OCBJBEOEn$HmTpFjX=xN6-H5#V{
zn6Si;q3V*@lFMd>H8;M}vOp8McQcJ<pRUux#A0XW2B9<QzT$0OwsFg86_hGxRD;t7
zmm0rcB<z+MQ5#+!u1Vy&g@VEq9Zx7;4Ss*v<RWX%yS}C1tQsU$Tn*gMaLx<#5v?U~
zO$nakLr#uV#feu(^BDIg>}^bBfV`1xb0g0`9ZZa9(wb+L_RGO6wD&I8ouM<}YVDFU
ztMSz*yMDz3AkS0YO)3_lYDarEUyj?A#9s@-l<mqD6wKozIF$z;Ffjo4CzS;oYjqf}
zft$R8D~~&V=G~R5!LFi-)9=k(qPXz(KJggY%X7=e&jzX|*)^85Z)ehC{cj1WuBs5*
z=vj=Cy5(o+oUvO|st1`~4v;|Iwt7Fa4*ySr6_)6fvz)|Ix)et6E=sEKHBLh^Xkr~O
zuDl(Jy2j^JWnynXp;WY*<P$ORXGZ5r<_$#Vsv-r|R{@P;NRtJEeto6XkW({Oj^g{L
z<&U$4eD{vua4He>n${-1Op^nD7zREi=%4Hy%V?=YS7G`L@>`3kHM4eAD%)t@F};|C
zfj?B^Kox-WuPMuDp2=LPZU3Obgnl7{dD>|>*A`fn-0|^8uAHJz;<)tkTXA8lI<v&Y
z>&dHt&xG(4Il=e~QNN6o9YD7H{TR?17eM>#Z8#Y@_=7fZ?HkZX8i|mEGs5mR`uBi^
zzFh5AG^3EMyvpx(a*)!eOI1?nPTn?v0Ly$)KlQ16Xfrzh+}+Ua_I!5XU@ciwrAZ>O
z<7!MU$n6`x${EB6YH$hWOMuSEw+72Lb~rgO*Yp26LGdNp*;^;HAD@(SAr(Dk;j7w!
zQ>!M4rxUFYn7E?v7)2q)2rJ2%PY>A>-1O7bY~nt&n)jYnG$(iR#hvlih1p}c)I+|I
zy^C;<W4pxrQdxdoC_9<3`(|%ZXD^@a5ujf7^A-(?!Sk8-$M%igEog!MN5IQRc5Q^K
z0B@wk|ETv8)B{}ke=MuX3sOlX^-c#ay{^7^!VdpZ_y8X@K1W(tERg2N-O%Jp_|g;o
zl2&-%!haMQ@-T-*xCN#XN5k^wNtdy3t+?&I^<!Jj*j#st2G59Al1Co%1>=uIJImfY
zL~pm6t6Zw8FiOIY<1>EBS(<5`Cv8DBcZEpTCQ{@@-|2$Bhi;6H?Pofq1Z%b2@)&at
zUA{9iaqi62D1|=T{xTe3Czr|z52P;M7EB|V-ss{qspYc0Cj~hUUURef8?i5H?e;kA
z<~qW5`JIc(rCLz_oJ~>x8O2IVR%>+7%}`TBSQt%i+m+4tV?z0(?5cf&1v8cNlz7Lg
z%ZS>-e!({r)+sH_1+QJvE5BqOgmfK_$X*P0*x6be<T#@bau++ibWSYwem*#+-J}M@
z@D!W+pQe*DNr$CBoSMi6(pzVcvD|L7amdhwU#kS@4Fe6xl^uqBtjbV+o$>oRN|0FV
zBu+T9^1E5}1I>g&wC|Bn^{(R$!_A@+E4<}3n|QMU=H|GuQZRAZ+zSZ}SS{MNj&mi0
zRY+fp&8IQn-}zGeIVj+qntrIP-IpXF?2xAoyT|i)X+@HL$+|t{#ZAvBrd?L!=9aLy
z%@CY;X7U41O6VpHq<1UBk2vi<Psd!b&p_}S+Zgt7kh5v#0M|mk)6;Y^NyPT!O@-Eh
zrY7c|vyYAC4d90T%F(6fooR)#=^xB_6M^xB%{BJ}oFkSN^SkeYqA33HnDXqNNGjm$
z=0$z_;^~jcO229)h#c8kYoxN9PA!)Yl<Mov=>~afo_h1Xrb{vQ%cE|Fvi8EjFCP^~
zabJnB#=NPyBD*BaNSQW*V<yD>I+TbEmlu2&HD<4U_UQNUR<ygolvXm7NkRkxdo??~
zIraDkkK0sT;<8$m4!-vur`L)#hu3tF-ExdoNnJ>_`K~u~XWideSoLc(k)vEtG^CT*
zG`Zdarw^M&6C=~oi^6W<E_?`PQZOslNR@c>#WL!BMe{E&Gg9Arbg2gg;cO^sJ#+L$
zWBP!R+lcV(p-B#aK<&Ly>?*3fngF)TwSRSmGJ!zET{Brabip#AUPyChm}S9IFG!l{
z%+I_?Cl?zVm9nbGSU`<Su#CMqUz~-?Jj=U1b$a=+@;9In3O`59Zd?h-H){k9wVuq?
z2>Ksi%z1{vEPpxnv}!StZLIR4yl9y>GM~KIIbNdVs|xsuCpX=<EVQ#bD*xTl<4FxL
zIovgwrDPa(+*tEa?7@8fy=Tx3(TDph;|Q3gZH4YflQ;p_?sNBLElC~CIwDjdIlg#~
zwpXmBUmy}wB_e;T?n?D~M=<Q0>J#rE`8<@v*FO%Lb)=#c`~s7W#9EDhRI!G*VBK(y
z5D`)jJo4o1={q}Kg%YGhdH~@PGate(xi{(OiQn~MMSZM;!kHNh*1-e<+YS5-j3b?2
zq7SYPWMn1a!^Gqxr4d1gZ5G`QQ(&4Ag*OcnWO}~9rz5xeE3Ycol5cj$@jggn@8x2*
z)UpG-U2|Av7a)Hi=b^@SNp#`PEDfswF$nyx&rD*+4SF}`_U48`=1VnBn}aEm{Funk
zSWQuC>r8yUkd_D(dKEqo`7<i*fhS{OsE`tU`sDx-?b87Jz%BuQ1WGLvCpub`e&7F|
zqA|47Vc2I|t6qvDru%)3Tn8tB348H)^8=CREXz!@+HNJew^vQ!{<m9<#nRha14=fs
zR1&1%wb7RIasNCAU(gUy<wDqFKmx~bGN;V5q#<n+@kxb|%a3lP1jSrblz03z0SS@;
zdY_c``3K4IxR;&x_<`zHf&FC66JK}gpb<_a@z*gerV1~c<6eT+a0}!lw{y0Gf8RMW
zV#VZ1*AKquVpluV!}AeAHxEv9%pCAibgwk~uNNQPi`Y;rR+|Fn3sOY>i}}{#+a?O4
zDIg~&^q#d5-Ji>``G%gDDzV<~+=*qePTy_lbVjK?!d`>ygnhxwtyL65_G4A=A}{Dh
zq;iS@h|Y-wJdeGj1b{KBTkst|klERM7*Hwy#ZO<~Q$5~GzC~WjZHz>=z3~>oAVbbv
zzmgOw2JQ#Kv)GT9dwrXGJKz5(Jw%&rYPjfi;TI|dyVJrvaZ*ivGRT;i>R6}8B>7*j
zbJi0%9UfLcYKp+TU9qXLSp`rm`)3(g6YOdHa4cv2Y)-JCPZ&g1Z*%F~T@dw@_HA~-
zxeq6NeOi{(yh(ziMZ)4yIfDP6nhTg;)$=9N_-{KO!ZB@c@e$(SVH`%0b3YF`lgX)?
zmPOF$H%(2yD*LrQ;d*vDgW=s=2h+1RYg?DCXa2gXNT~<m!o{H`ZDcegLB$n4f(?R6
za_l3#2o5ldNYi!buoH{7*Mo*V6a*$HLV;7C9n*DDXEiA(lW$p%Xxd?ZlIqsdEXwj{
zSZDlFJAc<23xB7ffAD8!UqXU9<b0@k=`H!Q-N77DK|>W+Hu+pBZ$bO8IlS+nqXw^|
zBM2iS@v_S^5P@J5V0gw2hamKs7Wro(xWlv)U$%_D)AA{;Mb;l$7?FOK*2{U?f_M(W
z4#aOFFlOC*Grkxzi#w)?qgNP48e=dJ*`EYNKfLm6BlZ-j@VMi+{0T>$Y6e%gC|6;v
z4=~J;U-H`Rv(<}l7sEXpm?7;<B_ukVgD{N&G?AbC)6nAEQu($)S%O>(jXl{O>aLca
zP;<5GjkKb?74YTOqJAtFKzq|v(-+j{(@?GPIKVS9<F51=Uzl9;{cL!8zw;-kp$or2
z&{ad+>5tsog!>*S60XwAsnYHqG)dW<#@2UIte}({hi5+*r;^rQeDpKps%Ql|LRink
z=CR6^g!&1h1Ks5JplDey{0{E~MNPgvQNeH21%lrCFFh~_7#;b73>@zaFo0B}hXo(J
z#OVP*a2!ZeK|x0L<O>fazsE0=vAP5xpQ58{e}Xtzn5B`l%b)PM2PI{UmZ`}XbW%<w
zkRQx|>4eE<Q-Duh>=4-VAbQ|zojxNh6BnLDzTlx-stKQP0|=pi5R7qw0g}ivih_z$
zN`Pc6h9K3P5vFz^s^};EaGwq5yEdpH4Um!3Lju85e*w5hg)|yEkihSklp#pqhWjij
zaK_T%_)PG>g`7N9$25qwhR3WB{&pp8G2;J-#qe6%xdFHO2AeceqW`Q#`J1X4*a>V4
z;Y4EVTMA!^vxOA;$ZDCt!CPots~0yn*Erio(G!n)@W*|^D_=Wy;f*k=tF~9Zmr)dn
zCzfODoJ@UXXs>1NP-A4#YmmhGXavn<+z_gJ`<km%!n*`RuL>>cZaGo@Iz2J)=M7{{
zJ;n45y6T86%gls;?`*1bFl=sXf1H<+2AiBU`}H6YM=+eFPoz%Sg=s>Dva{ls1mJO?
zTWP*i(U7Ec^3%Z$g`f%l##*mSt_wOa-d<yud2yeR>&(0A0@(ms#pY$P8SX-ZAVg)>
zpsk00`SNH__*AQ#=>~|-wScS`e><aHbz0t(7&S;t+TzUd?0(&LR|4CUhO+FLkKpq7
zkko8D`trz9PfKE1b$7OEXV>RBCs6NsQ18sz`Q({qI(fOQUY10Mt%YO^v{>w>TEBSR
zi>oS_n(}3A8W+^iWG~}cr3Bv#s3W>CFUJm0ejS>=V^<Rt>X>!UmDV@|xH@hWB5yhc
zuXagN9&cY%tMFc@?PqIxYmy+OSGU`O5gvK2Yaic7tFAiaz`*T*dLafG4tz~<{L=*n
z1iRA9k6#TYhCWcSFW6P4&4yOea4q&Fy6Mbkfl&!{&@KmDXMWs7;2Q2bRU~gBtDs>o
zNeUgzt#lWV4oq=C=5{Id0)=a+u5HaCtDZwXnX5u!bO%{LbXF-L40}KeG<SfcY6X!)
zLy>4lG*uU{E_AOMMd4ch=Q9&rc=;3fB`I@EFBuF!XcuT783*FH`4z<TlJV8PC=T=+
zK4eNl2k0X#Yllb9E;9vC5kWhE$Rj2d(oSrPP(Vc@J!@f+yM0dKZU;O)^9Ld_+JH>O
zxZ=AOG#fzwnh^u6!|A7Fqf5u{$IesB&EF?V9g5dyhcmbVh)|M3^!U*}qJEYbGFaK2
z#0I`dWniJzl~+;sJs^jty%7`^Yv#{r+=Q<#CleH22pEWpQ)lwX9b5uv064&fPlS+b
zqZM<&o~(2`QgUJ$O29zuo%|4(uP+zAeibd;jfc(zz|+6+9EUrZ?#^|ymX-knV0Dsz
zFn=Bg(*p-JjWR}+{_C#CZ~dR&on|-C9&{&ij%~0x9gtgIMPCkr_rc{WE_}pL*bCnZ
z3d?M3AYq3)iUS7jPOFD3m9DVG)E&SJ1*`YXzZQib9R(``({n~0aGXEhgZnJU3vy*N
zlEAeqef_?@nqICTH{?wuZFw#7F{`&i?NLpf<7G2noyziDxMHBmK=Z&P8jf>~^fSVF
zFmD1h)DVg7D8erkb}OkfElv2i`s#7j5-;7~&l>SlgLRqNM90B`oFJ!3Z!I+~g7^$B
zkD<7Y^U2QID5DVT!a*uS%0aL5KAD#Lk5^|WCC!!OQcFyxCl$386q*ohKGP#?pNL0_
zG0d|NfxU%N?);5-{u0rA@S7+4>7&sDwppXmJaj`?8D#?9@k90l(a-Vg>E`q1zXh9B
zEsyo)21!OKE@yf_^P?a!d>O%I$~z&B<zAUWN^ediS|{i$|F8xE+oi4I`H5Jf`^;ZW
zj--fw4*!Wu;rxe740z*FZG2{6QR#Z*asgO5n16bKXw4M0PpG4OMrkihyMDZcc->g|
z{KuO5lVh07O|keMJh@ks$3EfHm`nFk6qNS&_PxPbKN1c~Ds8?;y>OzV;B0$XV<Ce1
zRb*{x*P4K&P>Q=LQx12PJ2~x!&?qm%Tl)eivoas}<)&`&84*`tT{?o<W`*`&H<A=e
zko<O+1oDk(@YJbgo+1BQ<apA<5D}X{{okr`(;5mR;@Nir_F2YnNK<=Y@0s9r%gdhb
z9@a?Bx}@ZIr^f@epqE0N-ORA23=+P7%}h)lzV2NZgstEH*8=ZSMy@1hH-VlcY3j_<
zb5ek;$R#9-%V6IGV5Z37;896Y;P#L7?C_G4=Y(enW-7RtJwP%VLkXi)mKWXvP6I`Q
z>u45c+RPjX;imIsuwmXJs;5Klbii3#Q0kSLKcW+Y@xKcRce+GJ-RTlpMp(c)D`xrv
zd|#_rj!Bm<&cad=Pq($+uKOY#CGCK-8EXOLAo{LJ2l({+_%87YR(e2EErULI*gm@X
z*m6LuczdHTQHH`3=)x;unt9KH-4duW3nu}xk&Cu4-DS4wjNG}S$tO5H_$l1*S3Go6
z0HH1rN4WcDUK${}+a@ICZ(ZC#*`6h6EK7)q2OePook_w)c5%-9AxwoT6E*>!XDxpM
zy_C$yP!`aN2TiCVLn_z`_E((J%LUYuw%2%(GBL3Cve+5zmepidD|^#$=@2Wfp!?NR
zUpV2SwaMg68}9+`X#n-Ust|TK-Qk@H<O0?Rn8&eQ*MB>Xu7dM*@>KO~@YA_S!geT;
zxLp>TbIo9^WI=ZuT?ErRN;LqRSZX$7)+{MdSSiDnSdSwQ+6Yqb#nF393O_Ow-rRZD
z1MtC55vP=~4kwe+$#2C8b3Q6*<^!T_D^X($HS$<Vzs_{5c};BxtpIa5eYtvSY+AdB
z9mL~o${;$|y;ronYV5#PCC&blZn7j+h;!zs$uy2Z9qvA^2`Y~y@fG(JB^jI=8#UtP
zc`-xy?<0oSdl15eDL;ce(_D)JUu&S#%s-d5chsm5ql2(JBL+^dmT-=FtWWrz<k_76
z0euiilJh5oN0nEfl(;*+c^H_MU(`DCt_dB1CEf__d!gV-Nn;n2vY_mgZD~f5c<%mB
z0k&?NfIcJYJtIDMD-pS<b64+VOnnO%6I25w2D(Rn(IBNxEl)RjokeM<Y$tWs4z_6G
z%N21xY&<kiAoy>*Ns2(pd5~m<_QgfsetRt77rwh}yjg#yx`@p|%;<R89SRx;t9u}I
zH%7V#Mr}Jr^6sDH-9GhLI--$hWc++(pm$Z_sx<MPREg4br^L@D)?8jz-fG{OK`n&)
zzM1@6_3~?nr;Aj=qFUk#72IKZXx{6C81CznT%+s1#S&q9h~lr5j69kwRaQl}h924B
zB-r?TcQNIAdwQ#eE2kp;hbdz{sjCT1@;d%TAnZHW=pyT{(7%JkEci0Ak5c{;U=UH-
za>RnzvAN8~6i5D;E<e-4@F*c#hP}N#+2l=#_05f;j9Lm})_1-iFL}cIss(SMFU4lb
zO`2yxVOL*s&wG*S-s~lA(RB-6`)U+TQ2L_TZ-?2A4_{whUnWCJ&*YMu7-U!IPVf!~
zf=);;`qwJMxfUA({r4Qqh=a2$<YiLZ*Yu+LyOO98h`!WO2Q5MG#@aEOiTj%jClnWh
zn<6$Sh-?fs?`!e}g$Wb^Xs2rp9+wu)%<6YUxA!DZ^>Qg*azSU-+F9W;M>-%sM=r4J
zY%}@{t+!28<QbBUm|QvdsTf1$&7=j6i!>83WSGMgw_85U#I}O75Rr0Q_D5;Du8|l@
zHWBq-r2&(pezi>6+daPx-qwVIQ3A6$h}GxIH72G*;HeRgyXKy?Uf!HvVg$M3Vs?lo
j7HB*8-{6~e<}KKy%g|C8?m&3=nE}vH(NX@WXdCq(XawjJ

literal 0
HcmV?d00001

diff --git a/demos/icy/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/demos/icy/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8ae03154975f397f8ed1b84f2d4bf9783ecfa26
GIT binary patch
literal 10413
zcmV;eC{ovnP)<h;3K|Lk000e1NJLTq0058x0058(1^@s6=SJeV001a-Nkl<Zc-rlq
z33yY*7RM)PXbas71uR=jWi6DYAe#bpK~YPgP-T-vphDTYr3=t~ryI}$ZRx^lSw)b=
zr?TinQJ%~5p`t#wr-&kM2ny1q^XAN*q)B>{+^kJY@_qlWNt)byXXcl4&di)UgOL4U
zf7l=Phy7uH*dML-fsqKMr;DlfM>yz|;&bpF`{OQzgo8jbktkySeg~64fbWuHz_H+%
zO2F)JwJEE@HLSkR79_Z#oHbogc3dx%o7^AeCk{b5(&1F_9NvTf!DryJ`XFJT+JS0q
z&?sCD-y=8K2W2PRhjJ3<`jzFS2UeBViE<NPL)nS{Mmb5}koSKjx<%ALBqzd5a`xUW
z?la`G^gD^Kc^9YG1#K%$cP~zxOOFlb&;}I94wJ1xgQ**#QhktLzF%2xfB((-^ZYg!
zZ1pS4Kkrwbf0YP>9@x1RKUQCZdv7kl1SX?3WZMS(_}*GPxT+MhW0P|fyhZ+Qq30&o
zK&_A(Oze8$+U<`PdXPq;v4_f|Urm8qVAY042UnGp45})9cTiQyEh4N`WieG?WwHFJ
zL%SQEJASBPNL8tfyeEVAm>Ttneh$6^dT@7TL)6K`4dZuI$Q8$@YC7*NxE8o3xHh;(
z)oY%paC7#DbzBq#z7eX{hBSaAFX=&XZgM%%7vkI`tW*yCO_Yg=`yqnAa-v2eeE;?>
zc<O;2*fB2|!)s&ZU!I3&9NdL_Y|6px*m8C*c21S+p@M5nE|=u22|=nq0OH;v>{iKw
z56$?22D^!CP)@={l~{!+p^?NV4J00s5s~K!m``K3Z^mK!w_^!uRBfLTqF!aWIQ-yF
z+-+mFw$C)OYiVHDrh2UxX&Im_YA#t%&~JYj4^H@@?c?sN*|d{1z)fXCWK#h&a-j`x
zMSwIVr!Zx+>*mUE)45>nPAFTm4uSn)0ywG_n3eP}spMCtk;WQXTc!X<VQCC*_!b06
zRWb!kq->a#?G<8~9?@D4_J^SH8;MHSdkm@M;{c4Zl4~|K=yFf32q2}KbIxDWFpb1y
zO+OA&=Iq3=s<EDZ2ta?&stKIDBtMj$v{NO%A(gzg0RmqFkV%bhg8*Ry5Dn@_R&U~B
zC8c{NbpUn2S4Z{-kJW+a*@+3H@~*1{n=-XZZp#2Ql})A+BVDI;qOd@AYornDD0^1K
zWalKls}dZmxvIMiAVm+ZK?S7u)ZE%#9~)Ihwo^XONy=1lSG+x{yAU9io*SJ?Vf91m
zimwjux;ZP_yNdTGmGZiV)iI`$+cH23sam7gY2ERSk+t<H2<7w4#HUC_{H|hk8qHA2
zZ5bfu)|A%hca$N0nzwG-X1t>^1(B1GFU0ED0TN)1GUEzJjf&cITr}~_843H9IFf?D
zpy-;D=W+{Ha$5$7>!~TGM>3^{(aM!hTwS-Zu6}T3B@Ohtm!x|WXwD0DS$2Sg4MHki
zT4wy)C@!)S)O94Q^ENX$IJLgcuiK`aOAMYnR<7i>43I*17(|~2Z^{a28-tFl06j}G
z1E(L_b%g+AG(2{IghMo@X493&wrmJ$)etG%R?khj1IO;za&76!!+2C}`5mZmW7T)d
zdc5TLAso7|4x4fu(6j?P@#13#aX@*#Nyh;YpF8maDO(w~k+R(hKe!7&`(pji{+WqG
zRNJD}1<c`ls(Z~iwCj6-r|A6IJ4=oqq`y{UHS>i%xZuq*IN{U@la2#gbNVFCfAchs
zIJDcO;{ZH`Z=Jz5RkkxH?-ZOri>KGuU75U|b7#s<Ol#??_smQ3>b@!GV{ltwd6tl0
z`-tj|)YKcR-o#ogdg%auyuQ|?<AA2@+m4?l$Lh5y*QDcs<*~`K9o>Hi%I3R1^-|ZB
z3w@dmquBHyVR{7VswXIVTX$?MPH4+9kb2qjlDK$t-RcV{VoZD69&BtHN{89>gQ~qP
zJ3uX1wj2^zXGt+iUU`JHjaZ|tY;IN^;K@-L=fQS>Y@uwVEi&RUN?2Y*+sNids}(cC
z+40kwrYD*P3GD#2c-goFwX_(F;ug=ctyz2p&FRs8<RX7jO#rh4WK(7164chM{uM2s
z*Vi`Y&D7(b*R@TI+5xhavXQpQB=JzvinmCcIkbE{#Eo)_$VFvn#yxg`Y_x39MrpAa
z#YC>BZP#KW)rz1wGkz3b++zpGX3NIKL+e&!v|_<T4x)*YmU3NUaxrh~%jvNLWNT$(
zt}Jo+d!!B9S>Kf@T~~axF4tuT$cD=XZI()UWvicEV_jFqjbw^Y;_9AkJsqs?mSQ_V
zHd!_~?Uk)r`5Rg=yAOj%Y^~TwjIt7{g{Gt00kYMyk+w^ZgMfMuZBvVP>lJ}>TFiaQ
z6}$vw71{x^*|Ko~^_rD(w0N!+0&330f%Q3TNHV+~AX_dQo92j#JW0ofEat`()+cpU
zNK-<*Wh>c%oF}ld7(cPM7T>>P3+`N++2#S7TwjYH+FeDL-}5iew@%rhE!V8XXvx!0
zTFweF>(f3j`6XB-!?_??289+P$hL!oDad&d`knUqYw_}zU&NQL{fPhk`)_>p#vk~F
zOaH-9ClAxr#e^P5n<nh6peu{H7OXSrIL4HXPo71oIPSG$`28!F@o#_qiErG#jo-Qa
zKm6prI?I<0+A=2zJI615)go4iEh#5@a>v&DV0je~`L#5{FGh$URTHx9AYn@Acj8H9
z-fn2Xa=Bbhm#_bhv)?!+_&C~>bovC&J9ipS=gMNVj42zRq^}*vKi$01ti15vyd!%p
zUA9JO)5+CkcwA~i2(<M?b9U<)K;q!)4OOsy4Ur7oh)_YEFQjThww;jA-$%~z{D0nW
zR+$Q2x^|UTsv*~)Dab~Qd-WI|T~}_>aSSaRpH~0l2>#}`U$mAt<;*`UUpCUF!4<_g
zFf*C<$Rf;^y{H)XiCNlB=(vxmae|1Pqx`~~S}Rm0li_pUevNx<%Eh8q90Q566Y<b(
z8}KJT{iwC9pan<wTcd2;xKP5f-%-Srduf|Tn4w$GOqm#^#>DZZYFMh0VeMrAMOVe1
z|Lz;ye`{f@1!x?J<v#oQC!J;d{nlSNU~_@x%a%ohX&Fk1#wc=bI&JevQ*(y6C1*hr
za)Ni6^|1;-?Q)ax_J98i-@0>0yCotz`^}fMr`Fm4f<X7fAFt?zM|$eG^~wgu0n%S%
zBL73$+?lq$Ny`qi*axj$eSgzxsD`giXlx~SF3G@qKl(stC4-d$OXN|QYIG%o%Y<u#
zMhzoDCAf^}S6;&DufIwK&*8l(<n!>Et{bxGcZ@CDfQlmg-(RljEY}^<fk-|33hj+r
z@yEdpEGDnOXhFnd(Do(;)4`kxa}Z}pi;Q(&rkZ&GW83?0;|4wM?DW_FC8j=K(AZK?
zRVhwC`zn6%(nb2cA8uUNd2Bvi`Qvx|%9o$v%J<IW(zo9rU~Q!fkLx@C$l6W#qo01z
zdF<Q7>PEkElrDm9b@vQz3{qdC=2bx32OI6ixaob7Peg<(shE$A37*Y0*ydf7hWB3l
zfOPA%yE6dn<bN;G{VO!T@49{+9$Zy|SCQV%@y|cOUy~k>F4t(NpuypoFMj$Fe(uB}
zYGE`j2L$`WNWctZJGzc_^Y7cZ=&iGKe5Qp4N#!&iijDjXjTz(3xiMo>J=mmazv7G#
zF};w)79FkiA@1zpCm-spe1PcGSD#bY2j6kZTSF>x2d*b>5aJ1Q0i#dXZr;STA6&qX
z?AfNYN-*H~;g8?zcE?0p{`DpSKBZ+x+2NX#R$#Yh=T4y^j8P-g+?ON+%kpw5Ksi!b
zOAq(oLt>AA{_iWD?hG2?wJ$%XV>2K8a2fw~=WnZlqj?=Lg8tUGU(+#}_pV&l`FXI2
z2R{Cgj<UD-G!29*sWI4n<>GSMfif5%=Dvs=1Gg5Q<1A2u%ogU0AeaR=a7WglGq9Gm
z05rN_()Itp2xw&&&f%Gd_t?ff9{`jo#qQFme-Q@S8}7!~yjOSWsy>00CD&oc8B<n<
zH}`~N=)UdvkREr|S_H6Xke*)0;&fY@D5kwJk9E;Ey3LLlO5K=2gNm&8)gvcmChU1d
z0Fv8U$^*niFMfIv|J~5gYT*GF2Xj^(U~<})QdPJ?MY(5&6#K_K7fB~rBO)9Pjepwp
zD#|F~05aZvSqdQN)l7Q6ngpyjS}j1|{{9;tUcHf)#pZIINSk}+uE7CGtG3a^d%<xK
z___#s)0tDR4cVt`5g=Gn<-y%m_^V%kY4tAb(`#4p_?=s6x8Jq^lFGbDZ?JD#{F^im
z0wx5-L5i%y(21S=HsyW`+c&~4e6|7*EC^M6{&o86Z3{6F2xj6T&k4$AL&<V-uc9>E
zFMG|E_M?KjbKQ9%c|x42azM)$4)-h1zrz4(v;}}*K(PA#cWCU;R^U<SkK4C!%?Iz`
z(Y56^0+6)Piv;!q)~7c(&kCJDnTQN-Cp3VTpoFLyunRG9VU0qD=q(KpSRcsPlgVXm
z4j$Ek&|DH!n=%S*Hh@SV?NyxCIItuOcbFfsh%zB0kY;lqjy>~Jl3;7>rw{Cu!{8QN
zl(B*ZEn!VUSbEKv??13(3(hAM`|DqSwpn--f-*wJC6w9N`i?w)2q&I8VbU?i)Rp5$
zpRbmO?ySVUW0vO8F+m{!u@5;7*qFB&61$hYbWjGt9T07-U^P?#05ata{Vwd{2a}a;
z(QWDK-j|R#Z<>+y4)Emu^ECb8n$m7_4%f@(9^8ck*T(DwCIkV5Cej$Fy(m5INbk)B
z81_|%Sz$1T#tN3wg#Zy2eKhpDFrV~OEAFZrs~>OtfgjpaWmJ8G<pFrW6`Im+KBbwm
zAr&RqJ$eZw+jn4W=mQ8z=!Y}n-hr9zffYsamWqLTk@LUtzc24Pcoce_l)V>Ec7e5$
z<-7`0<%3Bl$~A83zX=m=j13)K`E<GnqXc<-yQ9qbODzcyBy81Rd|z)KP+Jz19qK@2
zVEvmDprEP}>?&RU1#)%u;U-p*j;=g6-ytEUsw>Kreg^;rRu)?wAO})#2n1X6G=;eY
zbpY#7JLDu;AE2T%dC;~}?3TFl3JMDHXKYCH0n`pX@o;Z)fS+3mpgvpH<B#>+sc<*x
z<Eua5J_aP#n;oF!RllMUBL-161OViSW`*`A2e`oivg$YxSf7e_&zoH7*KhrWKOq%=
z?Z%B3N$rr)#IhUo8m^lmnQhBE=deSTwE;?L1c2PvM&Cpsqk@G4G$(8@%1*r15&%6+
zdR@>1F}9*_-oA}DzIg@@Ei1s?3sQ04(rg@i;xN56+FJ0yx!{~|Zn%b_<pt!L&eCf$
zx>xqcb^P%5t(dMXW@Ug}*T&pN4~-o|+0Y3PH&pF}W=|bT0Q%e706_}svCls?Dd?;u
zzf`BxSd7-LQcApTHC}%70KMPb((ph|^QvQq=sA_wK%P6L#o@{e=S=Dp9Q*VlcFK&`
z3z4}2a!ZM6K#x2yj<OLE=%^o{nNx<f1VC_SgGuQTzx|2_ZpcxCN1=A9G5ErF-&h==
zcQ1cSV2M?ON1=fmbLlmja{LL^Wf-MK!^U#f187~$9bo`*=E(_7pAv*}68^F#KrraF
z<HL7Ns@zK?@OI6R@&W{^|M$BV2k79%4|w4Lxn?HNYc%EfJKn#5ouQ1dzM&R~%n#7&
zTWA7xVNNJm*MzD9ps>jU$pQYbW-n|+%|^QNhAEZ%^{+o;|Dp_Dctk{ReEnaG1N7!M
zUvln?NB+f`^cqb${^jex;SpPlIV(gVl3I2ghz8NCZ=kUwM+yh%k@0;{mh_r60fM<7
zQyUMG(-U4kq8@)Rcpf7Gs5P<|e<tU6d}k#VX}}{+iN*>4I7+Y4)N_=QfSdz}A0i8M
z<9|WJh7HjV5X(eFBM0>$=J8u=0pwnoia*!0$bca|pm_&(<4!rrxI=n8_RLDeAtY}2
z=*KHo>(0ZuLTbvfXLb_qK-^8I+%<UKp*?2n34VU<Dt3o~MFl__5SbmIgs3a1pMO8f
z1~;9d2OxwxqKx=YtTmMZxy|Oh@el44egFG!@qvr)<8#ENK(ba#B#6Pe50ID$uI08F
z?}UZAnzXZ`2_8^d6GUd8%7|O~1!3YIE{H}t@6He-Ke{S|H%gB^Zw-K8;1KRikln>|
zUdG%Cl=sFd>;Oyj@<24U&RhVc(aBVo=p`QzCVUthI@4N3$j=Wx<b_hAU!)m{mBlhk
z0t9OVp8NJII~WEEtQ*`lp#~5rJr<9xEi(^5#p$xaTMMzvviYx4qr$PF2cY2K4&<+=
zM_T-rA=@_KhjvxT{LAw!wl#Lhu1d2mba1x_>TE)7Iqpe%ok|sRnzE-FFFLy4v@Ojy
z<zN#3$i|cSvCFcBu<V^DV?*bi8KUlE=;o{*{j-zTz$#(Ojvtc4il3I+8oTKHSvwF$
zYCUmdVY|0+BG4!#J^3QeI{h-9alnM_!w>Ah^N;M6&#AA&{i2o>0u#PM074u<?k-Ua
zXAQ0@g$0!wdk`8ewKevJx8JbCV03r>4E9~0hJ6dw^~A0!+7s<rl8L)*$TF_o$oB?T
z7B`M5E5Ke6Q<eb}f-Df4e6JJDJ`0;PmITqaEO}cGEcSHt(~s;h7^$O|E|NexmJ6O$
zG`g}BKS>~xzzXy*t&$}*`nH~ad24Swg^YQW%SiNd)(;TZ&v!xo_w?$uA?IrfP_|`m
zEQFQk^)0w$mv+7L-8Z=N`c!^^cB=rCZUjVG+>M2OQ>B-YZ>N5giD0_7nBKcn9Z(nY
zVT8K$EKGZqvp|-)wRvDgk=|8G?b5E#u3g0gVLJp(fT}bAG6o{JwYgv&4v1g=CLIIv
zMIDs;tm=7)QDC4e`P->SW@4!&?~R8=%fD+ww<ud%P<JB<Eb0KoY6nOtL|JTch3q8k
zw|rqOu)vrQ3j-+F7ijbDx_a?E4j{|KK;w68#aHjbTXxKuxHg{r2vy<X1t?urarz<R
zmUn6NNR7qaXHQ#2$ACB{1OX&M_tHSx!}H<s!vZUceqjqt$;}NA-1BA4wF}#tpza=l
zDGe2PngNs^%OkxI(Y@e25~6<hx^MUczycdY6bS<ef+cU#Z9}NrfDPHNQ-HF}4-o7`
zV;@8`Wiat?{N$c$HF(qj%8ciSM<HzxWsy!3fzK^!J}hz9ld>Q%fNlz;`*m_7f4lZg
zPs+CxK;6mf8GGySjQUzZnze5S&OQAymYz5)_&eH^bn*y2)>B%~UnfXQkL<$*XJ5rj
zUfj!-MX2_vYu16CIG-E`Qa)zv+b&q$i!-$Vw2cR#ICW+4KtvPw2|#OCVb?j+tDrN5
z?)7#T8bCM2K|x)hC)UY#!K_emE(FoWtx~UdHXaJ8k-wu&kn8+J-4;A-Q@)_j>(YJY
zg?Mu97A%3iAvFK5B_WJYJ=Uk;DLX5%Z$S!1DXUc!tzD^_ios5qQXIOg3I}f~YCb`#
zRk6GpUA2J+pg4XtgGkD)Rv#BBbDlJQ4i`ZC2o9iC;vkyV;Ys8tPL2MM0+eN;g~p)}
z0w6LgK%2DyWB@z>N{>Q5fDD62D?moT1F($VrU{S^crr8~0`~=JA&cjHO4_~;Wq@Nr
zWEemQNj!S?^ny4@yn0cIMFA2Bk;MTr5FUPj42OpoAS2;v4v+wNsNimoCijJ&no<L8
z@7}$;H@zbj8NOOQiG%t<9Ml<wPMS;({<p<9ThZgrEDDej@H7X=ICz=?WCA=*096x!
zqyphls*$#FOynIjZsgO@_TKm2YjFJ26bC^DnwwikaARoA%JarrA%kvh)?tY(29S~P
z2nI+GJZb=KEiwrnB|v+$0F<FiQaOTq>Ykkmt8oOdws$f#{!w*f?U)Jch8E3A=KN%$
z+~TWqXo1Kw0L2&$j}jo#@V*79M#G~7Xtyqagu%lBw2>bmUGSvS8y4j#ei=rgkL1%f
z@7Ap&y`32$qxTGRKt41A?~MHXhN9HfKQK2YxA^)%Jnqcg06k8QB}t7j8Xmm>352H!
zplw<J5)Kc5!V8d2%M%ZxV?Su=Ge4p3-AB<j??i`kOxpI6b7Nh*!rCys99J!=an4IN
zXv=Stw#FviNheZx00-nwDkN-21s+8jU-6!?y1$|XhY{D~k|CwH9qUxO7Lm%ow<HTs
zCynJ-oIzg4YgcAGg+!Y?a+7iR^EG%(WvTK#=PXcyc4ccSk!pNxIS#L{!!9|=%J-ly
z`ISWePn4S^b6OjX9cND62W^eIbm?r0`%>$Td3)1=B;S71raVS|C4XCE+i!)Y)YsxC
zwr{1D2jEFPc?7RGyqCV#udVzd$BRCC0H?lu6o-;y!s{o=UxTz0REZZH+>J9|JAt3s
zzmvYE+Eq#889~}zMJ*4&lX>bSjy`sXzE)_;9zIn!*Yltns(4batkeI%Q%T*?_v-l-
zwzrm3eQo2^eRVjbFzZgQkn!Qr)?Qv-9>(^*n!7QC+Pie_+=cw@9hkfB2xJx-vh}yA
zTVn@TmEvJ#1=R8YJWubbp>9m4%JS)VG&LMlUV!KB-HunhxDSsc$As6z%h&U3vo;k{
zO$HcWI*2C`VCj2X3Q12&RYlshwMk%k0G`<dMDD#}epP6yq?zWw@H~z_aTt#x!SsmA
z5+0S}5mlUm;q|r+vSAzZa6r_vkUZa;wRL+_-IrQ0jk>!-Fx?$J^uSaSsW%wXr8mn$
z;~AVgF)0R8iD^b{(GvruXp?%J)1xrGDF!ki=FyCE)MFsSVjfM6Au&)Wu}Bi=^k|QH
z6l$achszhr(CFcFXd8EPGdXzH1jvCdyxFM(++21qTCwm28srMxgw9+m)jJWN4erJ$
zfHVLZMJ&MM<XF4_34})tp!KOn!=nyRu}SbyfU0!?qyi7^dBw|6@=A=J4ttrlE!W11
z<T0}VqzI-Rkvp|QJ<+&flhL|We+soi=G-d-d^fluQ{d4FkOA;001Df!36Np%fFNMj
z3XlQt03_N0is!dJQS<&nL4nh0+j3(+j;03B+N_WZ>e#UxB{gzxExlj?R><7D^?>gd
zIsvP#Th0rRf$)HO7NyhMYMKBt93Bp!1R5YW1IR#lv;!2+Z+#M@Fq;1OKH8?<-rZ>%
zn<;qKH8R~3_2@bhB`p7*PXFr}owme&VS;Ayb&TsY1IP$?02p<EjDrV2;RVPDc=!Q|
z=K)A6hyRI|%>EJib{@y9PbYJ9-F0^9DWM#x0cd9E8d{Nhwu7<=K>8+N^$ZNE0c0dR
zf&mgRx77?FBjITdP&~i&$sz#7EWzl}kQ~~U7Pda>u@Fr0w?{q5-~J?^euK+yOKh+@
zK-wS@FtV&4AYl`uO#r1C4No(GOn|2epc(>Df)>{$ZJ_HW%?-am+He4COHWJ0KH7U^
zJ}zBh%m57^@+5I(e{q>?{I1NR0BKHp2%Oha0+beGG(36%GGJC+2~b6`N$@BEs@DQg
zX1pBgOSE*}Efmy$I&DJ>^}KXhp?36ES5Hqr^0%LO&a^z*cv>b}Ee=pNt0)6z*0lp<
zSV{&gYQPJSfhidrK-D||#TlBCfycn$tyX}D>xy2C#ZNx60osnWp*w3+F|xu#VTHJL
zgq)pW3H*WRxp}YA%HipiSp^_NAR?fQ+R6uz;rTqg02z_b!w-<*@IW1C1t<%~d{$u5
ztf~K`ZN{~oH)~6)SfAzrbq8wx0#N79V@ObTnO>*{L{<Yx;m&kHl%fqF<C4Le0c2z{
z7)*w$17sXLS^)xh$Tf(bop}ZM_>8A*)}e#1H3DaS0kwz1l{q{-VIh)6$u;94s{*9U
z5~XMZ$oNb`HGoXWBy0kx#3Xo{0hGz&9?~NdEngrPj~y9BU6+T4KW#fJ1kU<gS$n#s
zqPzROU>3zQ!wON-a=10NQ87wwb%6LRQHnNzVok~<R033(W>O}hUVsF`(;T3<MgmVG
zTD^$GJr9>r*TuC}N0kXv5o)1FlPiM+Bqt}hut8}4Q~S}Hl}cCEA^@pEl%fTo9TnOE
z5;!qR0U`~r9Ux&7qZFX$wE$!QJWT-AasYwrihB-=rayj^whh-tom<j%X>(<6q$B9d
zZUq^P7R@|EduBNavK9kK0a0o+4?xA*0Wx4#9hQ{S4v_F!bx8Vx+?{3s83>O8AUKu;
z7R5-2!lIdB=SZ6jp>5M1b)#+7g073t3W?bexF?D1dr=>Y&`=aP=RG=KRF>NSOQy95
zK)et|<53k_05UKoLpwl*rDX5|WCT1=*3s1jpuM#X5*RF;GwnaH88>Ycu5CP3rYl6q
zMjop1khimkM{gLVb|XErK`9BJ!`9JjPoHd<vbWBp?ZYSRtiVa9PSD+-4f<{!5rGb%
z0m}n_7arV=V_rIh$5xhd?-PwCjn_<-+Ehw4g~UIwCLt^<r+5!;E#}t-ddGyiHc~+v
zDr6EuG8p9Zz+j+Ok+NtLz!Q1&K*OrTd-0&ys4v}oeC~&~U~S@U3vrLWcnC%`J30CI
zfUh0Usb9a4sm1wUrN43vFM8=<gDKlk!(yMXrgYq^$Bg<u#05_fn8ES@JZa>bLU(bm
z;eEj(uqd?P&>oz1`XpVG5SEpLMGg41O+(c*@m(RvVTLqR$Rvb$EPmC{;Fw=5eU(@q
zfM-E*{{K4m?)@;dfs>DWA9{;2*ESMcghxGlkqgj#6g@N7fPjz(bJITSk)MJkc}X&3
zx1n||Scj*RSZZ`#x$)as6IUTgi=&nY;DLm932`IpiqozPb@`WM;c2AddJtCz%c<}x
zlTT7LK>|GFFhd$DOoH+&LAOZEBO#raL9xrfVDKn<Tt2K#+SxKZno}Lz?Lh97{()}3
zoyT=rvG6?@2}RtBXN^{ifp}t~QN%sb7zknz6EX>#VxV-BG6@wi5acWy8uM^nb<*3C
zF2kbP(>^3_>j4H&AJ*e?wdPcXIU#bR%Y(SN^(B7;+qG*q9L<Y3jS`lzaiT=UprdsG
zB7%4U+>ts!hUfDDKvSRB0+0c->J*@QZ2-mV0!U8Bd1526=;<kMkUAa#b?wxN)_E7!
z2JLJuXcpQtb7TeR>cl}bkQ8tzni+Ng#wO^Uu3(L_tPc<b)^N*^gzh(Cd?uk*fDBB@
zfP1v~0nz~vSRF`7UG*#$g-<?A>UJ2^F{|sY8r}6)1CKU{y0Ag40i>Wq#8V$DMynRd
zXk`mr#M7(*DR#7h*J;LQ680?4Yz~kS`8@mp>4Aq_pJ?eknRs%@Ca6=I+r!mym(~ss
zA4IM+m~%${$kj2BJP&es;J(Eua`v~}s5PX5=yquq0SGoEfnRZ&amirK05UQetT{mO
z+VYs?G@CFn3XA4Hby++zco~HU>eLzaW&yLSEe#Z!GbVCj-N~NF)fFHbEb;NWAI%Ow
z1wNeH15|rvqs0JH3^oD)2Bu^v0V+y2DU+}Xpi&+1NE_($Rg19bsnD~MPM#C!sK1x%
zAX=wf-MX~Km`A83YRASRU?Q&vfoLGi&p=!xesa=!(en8>x#^F@M!Hf~mK6a~LS$G<
zhHij_&#Ef{sw!;`4kW-spbWV@OXl1ZKNeC#V@a6X;(mxdSe<rgi}3IbHo|BqtbXQ8
ze0E>t;y4)0u*1N9VQ6mnIhyQEZyBO%Gb%x{I6!oXH>p9h>Ks5dJOCM%k^un0ed<bp
z(%Fg`aO({m53J72u(urg_YS8ni_{sdJ4ELny;z+}+LGH6lF{hS0zN<TO9C?tAPo~g
zHZe^UIp;gt-B<L~vJ)De^Q-`n!V)#x#Dsrt3wFe54v^vbJg`az02EAPAh_X=fCJlm
zOP6BN!kOQT9~qa)dRc>6UHP%Pb8m@^LR*1I5nOkq_hdUc^+S%FHIjIFJs_SQx=R!_
z{|}V3f?1%o4b%2-m&4)?76nK(Cekx8+8iL`lEGk!m8tc$a$<oRXi%TH9E+ZN<_~e$
zqkANto)f6mA$3F4pVk#uXNq9?u7ZazE^5zaiMwi8qoEE10;Zyf(4(Ri3vWB6L~|CX
zwoImsk+LiVkkXy$o>f-|$Uu0~<CHNDtj_~WtPCy9!J=jJZ;NI;am=A_z%(AK)0Nd#
z`?enM7;252*w{rU&Ke;S8@U8QcONRzA$ag?$C*=4JXnzV=aAwo&O$)2t(X?cvH(ET
z60udjv<wn90hA#eo^-aLWhNa6l*4PMq?I@%H|@`W#m}5{7&2%s11E^q0n`O&bvm&+
za=Kfsj!<jl!TftqYO-BiV32GGRO&q=hllrGIA<4$kuKBGZ0K^+MIP8Vl0cXY+8R4k
zs&$Z%0#ski4^T5`VjGFYk#oT@Ip(@(SP>PAo}G2sF?{mwdqxbK&cGQ$%gni}UaT%W
z>{iFH*vN(TF1pf6baWg*dmhXpN!;AVi65PqEqZ491+;wOpOAS+8#RZ)#91aeU3opr
zM1U0TES(RaEFAz5U^3zeEO9c{qvEDbq@;7OZ2q63IpG(?4?U1W%5uNL;yAjv45nq}
z!0F2Bz~yd^b&Rz}5@xDhSt1nNKIG>}ewB_*u5Bn$utQM)S>h>^Dn$#P{*b_Qi}v2A
zWlB&7DvMeu3e}jpavVlt4oQvyTVrcNloqGbjn8N#ujME$ULBYWcGoQFO`)jyw?y-1
zd?*fmxYA*8|JiWuY&?g$Do4)Z__4Bjv$8v>bkFVZm;oftBGK_9@@pl%lXjej!A!LC
zh#}9ohCi{{ZQ-mp-B&KY>P}({57N+{xyjh8FctPfr+T!$Mn30oz09XHQwIB^dljb1
z$^SVOsXW(wZ+)uVGjE;TvtW(PvtX@k@RmZ^+(Uch12(V6o&_nG{11DO9u@4h<xYB1
zZp#;5b)En8xeikw-|RdzXg;~dk?dNBAUd8y%D}}q3X7uv$Jq{!`9X4KmFvawTp+OQ
zO-%kkYLy%v6;=rvXt+y{9+SFE3R%^C&Wx&FOBb98kgoWmPfFbN{yA&$<jReB=AIfH
zRK6Y)2=L&_VjNUe0(+(F7WvGeiXuFyEFTA!X5(?>`w=yp@yLR7+-F_P_1>{dzv%Vc
z{4?EWO|R<m$i&s;8XjeqW*D_L<Qmzv4y4!4m7y~$lilK22_#20Z12u`Cik$ppa9x1
z&_GR=NeL9uXve;OQ`=7%z0x;)N<qNlxjS6uMjY?3Xy$pBrSm^_iCXxz>#D_<U85s^
za*ciN7q_@&zq!RP`^`0W=`ZxX)r&8?tXS|Be760<+2@^Sg&+5s6~4o7Mp(Z4gt03f
z1N^2+B$6@gT*KJ86_!Q;O#r*rd)T#mu(CMX!Lcq#4y;F_uu2{(Fu~lAKlv^9L#~d4
zXyds!D&i(hsD?8OF%lYI;^`S8x#yn89J+OT!l9>cC>41Q@6rEpfZPY}Qsw(iu+VtM
zk?VfLxt-`8D*o)6RH0G0sdlU^c5qq%Bu%TN3R6ec{q<$PcmS#o?ctDy1vk>p({m{8
zE>kOk6c$U>a;ZxBKlm)ODnpQ`%TPxJEO2ZmdS9GBJEt$ZhK?H0Xj&UPI5rAX2R88L
z$%0cK7N~Y(7NHkw?B3M1K;whO01!A0WE#NW=*IvFVBhg)$LPV1*_EBco1N2*U4tE(
zRtl2?YqWMOIBn0yR9sp7qyVcUb1gnBpzXq7P*oT9KOgqljw+zIvtzojb2zbcN;KS)
z9hz1SlqysTupC)~JF~`b&#VTY6#sW--*Hp{MHLo1Fn0-5nsA9VKvNapXEcv<*FF9Z
XdJ+W}DiIkV00000NkvXXu0mjfKBlg6

literal 0
HcmV?d00001

diff --git a/demos/icy/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/demos/icy/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c18de9e66108411737e910f5c1972476f03ddbf
GIT binary patch
literal 9128
zcmb`NcT^K!5btji2)!5SAPPuNq)Ls56s4*38hVo^(nUfO6%ZAH(6N9hNR=iCp@USV
zNUs_|I-wKc#ou}5-}laWIcKxU$(_yIot@8o_s%{sGSH@@=As4w(CO-E-X`sF|29fE
z>HYT9T?zm$_~>e0H4dIw&!!4C9vSZxNlr9*d^_s#H!1R~WS_6MVY<X9KRt@NZt=}!
zJmw-<%vu<9{2*46DzYqEKtRB}W?;0m`tPvir)n_|ws`U9&cRKD9E*zHuR$C4n1#E;
za+c2YE_XNhr=4w1`ERIhUJ+(t6EiL}daV&l{r~#GniUa(6@#hjzj$F=5S2gk$9PWl
zWp`VZF*ZXCuk-YS!7^kQ8v14=bEdJ<xKM{JEPw1Hx{SNYPnUkh{wY0gi>z@X@%G!e
zXHz-tb|VivQj`iFZDUWNj>i`*9rwT8VC9f`)ww2)D0tG&WBFX^J|oMigqUy#_eV)Q
z<3?;pz6pkr(;Z)thNWZ3Tu^XIU(m2~K2{iFEAS`~Gy5VW_tC>i*Cl0kv`b9xtW+!e
zPD_a1*)E4YGCWy+8(ZVrP7}Y9URLg*>8E8fyY^0u;VQCkoBQJ<_5zdXl(d!zb~b;b
z)6|dkG<QZi+WaF%@Udof3WFE!ox1A^l~w%sK3pfKy8oIly<B>)>oK`*erN6Q98nTc
z*T4b)onLqyA@?UYxy_MYQjd+D&|e(Pm(0oT&BjWQ4@?kFIoB**?M#(;rSUW9SnG<-
zSt-|WaL6iG_P3uZd9eIpr{TtNWC*$Hh2Qz?uBS}bIbRfO#e{zRE!IEy&YexD%F}@N
zL-y@k#YdI*GK@^S9Mw$gu9^2z1mSnEkrdxz+MPN|ZNhhS)_oYvhM)cLTYGn3J-&{3
z*gO%dE$+F=!pgEJp;TQOxUvmXY0MZXd)l&aIQ@q%&TOO4FwrA~ak$>;=zXV4zzr%`
z=0~OcyNxrVAu`L~2ctf1)jOUXrl5QhI{u_3cR4;2>t<wU@pMagBKNuwtKgG}A=ehS
z7p$kgZ$Qt&T)CR+i}f$#aao&&*xYW3ZEI7k6bouugE^}-_AB;YSZ14i*x}t}Z@S~Q
zCK<G`wV)M>?n_c`o(TMz?xA14+Wh$Va%BY<W2mbT=DT^|yby<@pz#}rnYMjS$BGO~
zbG_V{M8v_MH+{+#DPtYI%|kkb=d1yJipYtDre1<f-5ZWEHnxU@&f@Ev!J2V6UcZ5M
zf675C?`dT9%=-573+5~I()RMe<2sKuG_MbWJHLhYJHDum!)@h#kf&^zs@bn$_fJZ|
z66C>0&2$WKO9mM2sYf3h-OCY*=ZOJ$Ngw)1D_iorRZXHQZi4&2K7qT927nQC0Lrg3
z(#lL522bDvLQQ|!4#s}u&v;Yf6v=QytSm1*VR`JzNHPFHGlJ!`WMgHC3lNnE^`=*0
zy?^9tJWsJlLSn+d=%5(DNQYCcv%)omexK}h<gNWFsPA%6^w&%!<h`iN-}gM21=@du
zpeQ>yZmUHWQF=7JRFKXB_b-*?UD4{x!=d<XPfD$2zp>VwazRjll3YN!e1GQ6{ViI{
zhkd)N+MWKT`q_V0)j;tA_oAca{;nI(Y$Pb7t7Zgb7)DUREOEf@igE4Q;TqcgkX-wd
zJ;8G+7!?>DALr#bk)GNchOvQs{BBN~iU1F0&RMR&ou$CHl>C|ZrZ@PkAenI@K>Al%
zQ7|N8uxRTq4vM*lnm?oa%}HLn-3G$yJC_b75?=65k%LM)%(H@{N`65=i4pdO>Mz+=
zLeav25<ur3!O+tj|13g5ftpHmnAeZ8XB$vV91Qaw3L_23;{?l2FkEXkSk@$+eUdXM
z@L3hO_yQ%#5V5(`;X)7D;m<n`GzG{ve%IZs-PMX!!)f^@QbZ*1(lxHz*yO--RPiB(
zx44q7B&X-)=3y0?a2a>B?f086=X6O6;%!2@%ZP1|;Nvbnj_2aSc+8ZOx$k{x3Drh^
zc*UWh!@lFm$>1}Uo>u2rUqXSar;=W-2Mqo41Pl(rQD;>HWC;@e#W@Z29HUt(caNqC
zC&6BqG(7E8;B^rX*m6|Ejm>-6L>RWQs{?%J*!{N&Cn3FMX$DmBS8~(Emio*Dj(^J_
zk~mE@d*561epZk|Er>78iC#q_4Sp0Y3GD6B@JKKrmyoJG4WGBh)HqTZZw>kH>(OJH
zlp#iE)N?g*Z@4^*MV+s+H!!1<ug8?(BT`4A7%E&ah1dhHo?l3QQE66of_LCZD^_OT
zJ8ov&!NH;L%keL!;02WEZnps|bESIGUK*b|j_#3}7!wjn&lQ0zI^4P;B<R8)NXtK!
z<H<Qt0v>LJlIN*`JxC#o-v0{2|BS}}kDUMqX8%d%;Zo1pF*{G_rVrzNd`M2y<S4{E
zZ~?S6-J`cXoKw9Nyc!T319^R*JfQ;CQ+w%_vzSd2SA1Cl*~}5w4Th=Lu(-yB*lQ|@
zw+22g$NGGQm=zT@JCysH{2Xn`Jf|L6NF%L*D^anZd_sk<&BmUS^e{P4u2`5)XQ2pr
z6FxwTMEVRQEOwl&)%);vlI`^ws_!&-ek~dpP&K9}B(25TN;E!RZ*vT`(=BjbD|t}s
zzW9-Ab|ra=0R$O7HH=tvF02}sSNt9rzWq07iqcC`RPA>a!T0DJTesuRVwL9u7n&PS
ze_~l@1G?`(riUCq#<3T)^gi`sw~pk^JSP})C#_iBKTD*{^N7d0$A0wJ3#IRYe;0q4
zA*$YJb_LE1lo-`!M^fB~U00SLiLywh>%-_CXgSb{j<vY99&V=OvL;cr6v)Z*d1f(_
zmttDS1_bxRDJN&U^J7zW>u=7v+FzB+78O;y>TeZvRv&RoWxTLP?d+9Zi&Ypua2+{3
z?&P=TOQKt{%~L~p0$j8^;iia9j_>fKovkcwq%sUQ@nh>Z!)%cfJ0$;z4CPrz6I0OU
z@+^ZT$qbq`@V*LyaM7l>CZ1ZQo!IplAN5a81(Tt~ztAbY<i$mt9=sHzoH<;ZC3+j&
zfeoH_mod8oV=NQrKMgqIHo>c(d{@u2@?f2YdnGcoX!#60Ixw-Nvi<wZu~uCAx&ly4
zo*oEU`pRLNt<<tfYu^`o+<I^Yy&3+OpZ+3sM8|<a_+ikgx`j_8w8@oMw?QOnaxma#
ztvBdMW5dPGTHkg)r8zqmnR>x#$k1X*NJg)beT<!BI6I|$nDc()yoI)D@}gyRaOQsB
zfLbI&;}MtI-;K*eW0U+p^%s4#O>LqL8^6*<{2f@@ns|Q}RjZ!$JIHK8NbS8xrmu#@
z6ulfiVr7xxNb~dV#acSrSX_pQm;bUeyjdV!{OZy#M4(A`<QC!mJh4g5c)EF5T=q}<
zW@D_(8IdA)@LZ+^?@Re^`LN;LFa-XJ%jqe+&k%erD@TpV9_a{?l|I;EqV3fWd@!mm
znc+jjwSD4gmN~q8qb2O9b0&hq#dISkvqnp)dh^_5#awo2qtW#2hbA8~6gL-boX8(>
zwu81?V`O!?oZ`D{REMi+x!1hB*6Cy(I?k8T%kET=uKQWo39E<N!G@XLj^mB!`H3yJ
z!Qj!7#@(T$KMAIH7Uc`l?xcM4A`;H!Hh)WwbC<nD7gsWuv}r>}=ca$my=uHTEyP8y
z54Nz1YH*)(w%#ztIo^C*PQO<Sq}rhOxcNMb8@#ITb!uTvQ!QoC#4~;pzZIQh<`o5a
zsK0adCDkZzpSM2v?Dnq&Op#4|i{m+alHOF!rV!zABsraQWow3tn+iY$9*OuBUkT9M
zi!L7(cz}}k8jufu5FrW~Ooib3(c5RI3=e|#JTj3@HiyIuXNINCubwhP^CY1d5lV_I
zPR^pCAA7A;o{WSY&MoJ@^H3B3wlqudLt$03a92|ml`_fBD5^e1rQ0zZqI!!*)mUaX
zS<|#vzUIE4nH$}&9h{~-x}y>jte`Hel~gpFN_jZaXoFZnUzuu<)94E6T<5ZU?s4>c
zpU3Uo@d?+!hgYmVil!6X(ly;KNm*OwbI8{z3v|%I_4HT>Nt&7^q0@@SPXaA`iAvAR
zS<h!Nlet>r*v1muELwpeL3wqu$P7L5q4m)-N%|J6fE`4!V+xyr<AsF=N3Nw_)k%q=
z@sLeUChJ87|BuT3)Zfb(d_7rqA;;q<0RDq*yVB#%g~>Okr+X2!LT$k#tFYksHJH=n
z3F!I2Qe4B5pnFmAer;+($yQcgD*uHlDurPx@2dd)<Aw<hN8bwlTitDQCh*D4lJ&t@
zbPcg<?vGEB!6osFz!C<6J?T3elgq1CBGk`ViMLy*FsZblKacU=z9OgP`zQlmav8|r
zJqXVFXZ&oqcpL3VmE6|0LfYJxazx~g`We&de*5*>1-RjhQe(5`*~SLS`q|S9v+`3~
zQ>IMi+hcTX^%}_YWT=}koWlGSwSH~mOvRNJ&Sfrc>H__ux(6*kTUubhdoQN>V2}J<
zR)ymBx4g=I%zlp1J+QjI7joltSLskIt}qG%d@lfB@0(d>+A&l+Glwv&La86NxDmfT
zNv>`p7eT?@iBSF8R6M^wCx1D;HRt!F#6s8>2mF;&B-MF;2m~@G4CaiZ!p=4aG-$V0
zYR+PtSNvY$YwW0OPY<JADCVjnBFGw<R<nA2e$FKXH?9jddT!dyLUX$W(ij<mHx%^4
z#Kfw$Kapr+aI3ij<W<<!53T`L;(&MsUOV8aErX8@QL`(^=6IWe<B80#a`AX(GBOM|
zz);Yd#W2Z7Ls!=V<0lI#Q6KUeAF<oNH|r-BdT$SG_m>xL-i+8&!G0&s(?(IcQ&Iv2
z0Nx*-7_~pZT6#2L-so8nF7QMgH5}#22w+dCGMyllm->HAO8q%eYuJ_BHB7343cyG+
zgo9$W05T7<fr-GKzd>{CPl`Zw^P=q+<TZ&c<;8(qxZT}Mh0AA>#rx_<NkOp>`T2%M
zMCeCJLfZT%fI{csusPnQ7Xv@XSzVNmPU{iX2w134>~=<wxr-oc;}JE{7q$d%-;{bl
zFyTl|p*($(`P%HBVuIwixycDuqnx9y@GX3{y_Fp>VfgQ82*rq^p^97wA647vgT`a#
z85e!NpbSl#8uA*dnopv4RMby4F4MY{UFn^r{Li3l%Ume;QtBh5?8wCixw0*zSQ${*
z6)@M`djm|Nz;H2K_j1ACvx90`pqKN#`9b8Cd=@J|$6R{ZYc5yw){(D1GtABWH=Zy`
z-HxQuV(8LOB`UjI4iAOJ34LY@KVEmPb@XIC)FfA6m5B&*8T*hQyR{mweAL1#*kA9n
z;O}eZUE%DcD;yjrQM!F!8~hPzPrCH2Fvr-ItjJE$$pV*gv9>ye(q2lsB=uQP$h%X%
zlekK6q~fP4niGy&O9mR~_I;)G@;?e;L8#rja{}{3_rR(d$+fAsX?PiFx`2ashkOGP
zw9A><#);kE3G}H}!W&WxH1$sg*P@*n!{=#L{PK)<Hmz*c2ksnqz0=Q?Pv6<G2+l)H
ze|)2q=-l^eWMDHck0nk36M||B=_FV8jf%B632f$l@mg+rN>y~GHI;RsgpA$#8cpY~
zct*9kjG$l!k{*0T43n={dVV!idt6Zw;lPW%!2K;#E>?J>D|V%r^A`&*)MdYZJT>jL
z*;x5TTDFevc8OARtqyN`Wyt;0MTTO-DDG|<F-ksrpkirCX{-2<+9zqjKbqqU&G0*b
zj=R|>wtNxUqM1$~ye0&&wUtZ&eqI0=0|Y{WT*|Ia1An)J!bjzf9y3P874R^|FamuD
zD47YqkS6Zsd3^fEq_zq1i3zN7fM#ldxb7Z@0Y;<&n|qFI`e8q;TO3t$s`geh?U*oK
zp&F$0C<k*I-$^>KJFD-a%BYO^4KA!5J4T1f9rK@Izkpt4qui#^S_s8AE_pvL7$dKQ
z*TXfMJYx+MC<N%EC($kbK<8T>q$g?pCj@15ZQdjbAm~v`@A?MCg`$$;e!iKvcv423
z^QOF{_mgOGh3-cDZ={G<PvoTYnY2do@!iBn&T;!V$NX5|&QzV%MkUePwpLjq%5rda
zo=Z!u=Qi{bT{f@F4VyX#bda6508cLh%9p7$B-g9nUfss@=-CL0oE;`Ib{UM?^a4w@
z_wV{|otJPyPQ@?c^G~&fV{hrI^;#RgO2aJ^jS-HQZ;WMVg__#V-?pT&?R{|Awr>yr
z_&&UYqVw>f(5K`SHp~Mm5XB0N9$~=XOXd$uQNj=bO9<e_Ye%1Gib3+GiBG|@tU85&
zB{eX^oBbQ6B>5ChnZX9K@n&#T?vXPDfqt07xJZVvBuujM>H*4hP6HvbJ~#$K=z-<U
z5?=xi*(Moqexg^Jgqpmdd)91>vNQnRCryVz5<Fq3>?3YqR02@1#K{#%aX?h4VQ45b
zcmM<+1V?|eCnx}P7(IWh<1mpP1d4*Z4r1WAfB;C4dhrfKPC^**Pz;nD$YOJ0I9i3T
zdQ`v*Ujt<nWWcZ!lm#f~#fgkS>nCM$WL`J8L<$;~1_X+Oyzj(IKG(tLOn!YS8Vny{
z@>lc1XCA-~hhrD7h1@0<F6iC-DLMb3PLJt}xHM;uT1A@cqm`%4Qu#CH1Z3-2fYpL9
zw$)?wyn8v_jDld(m=U%zj630*ZuP@luIrcFdGDiz5B1ySIjmmwySjHA@H~BW`*{O)
zevpX8sl`V=<+NUR&^Qb;CGQcpym6ks%JD=k|1;ooEUWHZOx*0O{Sg{6uQw~vk15vd
z=~~d+qV^j~K!h3iZkpVLK4O1olH^KZe?&Nu^rug0Ee=<Xbvt?jd%oX6ZXQa+Y;edN
z+>O)T))gw+GcvsVwxcnaCv{EQzu|qcwKGyiwb`TTP(}njGXHh$KxOryTWq$<JW(m$
zCVycdJ0@?D!XB<%eK@mgLtacLov-1XVj<@lgw)IphsbBE!DYtf2hf{+I5P{jo1Q`0
zE+(%~hvO`aeboW%uzloy{hR%}$s>B1F6I8!hh2O<$rL^FOXZoKME=~3M&0eN93bd-
zfpL<(mU)+asMc@#Mvb?Ws^Rw;E;iny$Mb$bu)1ovt0lOm4f(~cAmY<65o0ePN*$EX
zrmHUhGI1J_t=@d`{#mmFd?eV^Q&jw>g^;Pf)7JHdLzQB*87{77<m=g1^_teVTci6*
z_IUOTewHz0BGYUp&Q|WpRcpI3qD91?OLrY6m7X*!+MDG>?Kto0xMvGjC=&M5EOW+c
zXpXOY6|Uf)0a<V8o?cS>m19ZLde+hX5J6c11*#mSinvk^A4NWc#m<TD8sWQ9vt^cd
zeJyE&D*|h8mJ2@<4@jhnoh=i_>5P)?v~|Bppv*0~T;-^rI9{w3{`~5)bC}`nF?zGx
z#@S`#(Q@kl-1Fmze)A@u^#@9=c>MA>$*eslP^G`Zvb5N|sKK{mQ*V?4eX_x+nT?*N
zalRRl;P=w1HG57g+d^AJQCZh4&g{?mbJZuj*>jJpGL#!`*C>{MRd4-HML#+<pYrl6
zi%Pa!Tmyn|(=qO+-$`YTig}hA=XUCRtovM@w<tt_76_kxdV$E~yr}?~@f$o}b2?v<
zquw5^!nROXGswV1-zET=F>BNUG#EHx5`rs8QUMda13u9eMG(lKCYTHCS2gO0L&PIU
zkkI-^jv5$aR|blKRsJ6xJ^?au7%A7>eD6+l!ALkEL&*RPl442Nll#UeUv)cn5=YV~
zP)$eQ=SZYMG+hSAy@o*c95}KXP7(~*M%`ovFuZo<iKZMJhdpA047xuI0lS&Gz|8;*
z)8^gT*8E8YqW_^H+n&$^MdOG+0EbKy3%E*#8iMALMSeR^M+X?ur;orpk}LK)l`JIo
zY|`RFTk$>s#RM5t0XkRn?DdjD!7zh+HMGoz6C^Gk*}xdzg{VaE0-<l9P_~H|)0n=^
zju(OEje|mlNG%J<SO?HycX%icn!kZ%9hY*b(Oq(s7qmV;(u*F5v4TPLL+G3q6decj
zMOndmw*+Z^y}w!_@BRSGGEFeR<9U$+qeWPhefmIA7UCNX2C1)N#lf!gy>2L4An_I#
z_)DVjA|u=a+{fkuUkWg+!HA~@f87&ENbQ{u_}}LPin9T}<o}Eles3v31Oy^&<N()8
zi;Mrz><ZivQ;9GTE0T{Svo8UN9NY}RbOmTIkMV-F-bKgYgp64#5SDL`Ba&h2A%h%I
z2s5A}elc<yf_lLWCVp@rt!R?XogjlRItpnqfdm$?L5bmoc8gN4LY^l}w2`p9e+iPO
z8fV4?vad7*0vAO{-T*NGTqLPqa?IafH&8f8p%Fl7LzSg8BpEP`WPuid_F~!1f8~Mn
zUAT|(CVLu_3ybikWAE$O562GZQDy^*g|0bE8k<FV9FNQBtvb=2bgO5yQUMm$SlqKp
z#YLrt8I@~A4+GO0C8YGwojkUB=w>}BZ5K1W#~XT5z0gcc+cy7@$?+tH6Ta*1qVBL@
zBwd%m=LAwRv8~~Cx3MfLmwax@N%=M`ciGYizcDPi#Qug{`#^)V(iZGpR*3ayNFiWv
zCT;%Yg?Tn;SO3Pvyu6Dolgt$Pq@8;O(nD{uHM<__6!t9UUP@K#N73GQB){T~9Hpci
z<4P6T>Kb;ktBMTne4`e~@)E&sIdENQj5G9OYu`7~bvsRTeRl1z?i^aI{)?VNlekCC
zXJKVy+B;Z0|Abe1cpfcW)93y`*4%NW#+1!-OVtut{#3Q5fvBQ-b<*<x<H2_yO6@T1
z1Dh=D{%X<GjwOmAT}D|e#oaQAoNi(=GmC36^R)EhNv18b`^t@R5&ou;6*pF6>gu<b
z47SMvv%b&YN)x+h8ggyEm{u_iCS0~Spor186>4x4f6pmz-<O0>x)Q<VQZ7D9yI)_t
z@0~W{nE3f{*|sM+F0eIkOn>8wc+4G^!kGq??b_{28Zdu9+dS0=wgR`1Va^@f*j96v
zE?<?v?v9Wk;(|hp^(fgFX`lGUkg&V{2gBz|x|QQN|GZw%%fUTc_0bixG&pb25)$V7
zhq-vXd?l(iEx*dvwwx}ukFWUXJ8^y7Z_7cSM}!o>=;Q{AtjKXi>F3-EkrPfL<`s@S
z(Cl$t|NBt^_k;7j{U(%~9iLt{7g5yFfhq?^mE$`_Z>W$9l{seeXUdzmz8$X$3_fz0
zNc_d*naeGkU7&S83}C%)Owd-QTjWCq)4F3puS?Y*tOH3*JX`9t7=HyB%;}BFw)~fX
zP3M8Ef?E#|5Tf;EuVktd)#&vh7trJcyxkI{{O|eok{tE^hzi3_4LW$*rN)J?Qmy@$
z@GmJ)5nOLC0(h_C(Ayd(aO3hP5pxuMsRZfvoFgBCNNrsu!(1gLl_W1XDWi)1KiM4&
z4TFIN4Z44<qXS(eM*U+KlzB`Jl6TMeJqcIoq+cX~>?71-@F^T<l2hrTOJM@J433O1
za2o)<8AuL>Gn<^DjNF#jfDTD;qdJ36mB3{oK$>kk1T9x32)H^4{v<&J$?GFZQeeKn
zog^e?9JHCkaVAg{99*Xytpn)yWZ-y+!;hT(I=Fwaat_Fckc87LJ*r7!)y;@7k^fUK
zxl{eySNWG_U%a8X+L`q+Pwk<%iyJN!iw;Q%=1>$p(4~A8CwtPS13^pt$BA_79TEm3
z!hx@gB4KmstaCTszUdc8*ch3y0f@{;*awP0cxYg(J0u?XLQsFzBA;#(`vHd`I*lBM
z;(99!j{626=)R8+$DgEz-MfuzaGI&_b*%9#-BUQaw^>IHgp<=gob@UA0r`@#>-qw0
zpfFP4HZ?#}t^J2jFG?J|6<^ALo3?t>Oz5`IuInteCESw+$NTFo3L77A?}>NbqA$vz
z-v81kRTwtLT8^1Hkf#X&iRsn`fKmr-Mu&N{*qwp;$qBXyT}BAQ@L;wB^UWEXX)3_b
zh&*ke8czIhFd!IxCi_N!jnrKGIQpfPR2xJo1%*JNF^Pv<Z+U_B<9<#M?w&vigez1E
z$S?&{o^aFyw}8!ezROLaE6TlAe``A*b{qp!ph9Y%7#8dcN1Sb}?d?nXyGrp@%fXd|
zyjrr$7y*~S<5y7hR~4Y-AIyYF4+LaFW%XpFTCQLInmvpAv)LAP?Vj0?>DwB;>G~7@
zQVZ23Q}9_P0C|)?QPY(DS0!&Y!!<B4*qd$g#oQ`S6bBT=M#g;bPvAfQM>b^`S|XCy
zKNy*Ki<wmBUDfRrO06kR2|0zDhJHS;I|n_z$uM8}F+ow@mjjjulfUjef2sf5a-~yc
zRFa&*dOgYJTbXKHHdl$F7pbF2M!=RIJBhfR7H4@o19b0sa;w<(wkH6A5AQAh;()GC
zORq6#o{QJrro~WL=;;L>l!;HIXgI}+mn{ko*V0S7_|JPJm`{p{nOe9Vi^>B;a*toh
zNY>_;v-<w8E!7l#o1BNs?z_wf#wYtVen}QzT>=$AgIA44ebwp@a!75wJN7K9j;+SW
z8uoQjVUb03=55d=@#Y_9`Fs=Ut|9xs?0ce>@0mn&q+oSJdb^!tTO8;mb$%l));(4-
zKPebA<Qs+-=No32z+@IB#h;m4<`kll+u<fplT9C)z{U<F)EYXY;*Abm)fWX>@3lPn
z@G1otTd9DCo-AAllf-ruy4anJn=H{RXLG>6j;g|@m(&__Lzek=U-sRZzRO1lOrtOJ
zm+5k9slTfFKsku7%a$T6ENphjA3uy9eG=kh6ii90n}D&mc!E$-XY)ycsx6qljq9PY
zpDzzbG!`4}xmvrE+7f*Jx351b!!}L5XmvDjt;&0$*g9U$nbVZwscA2!5>S?vG~K*d
zPzXIIrnkt|yfEO5^dk>cVc0*&Hh$%zYA8nPL(Hwwk?vVuZpJ+&#LxCsujZ^dalGUq
zk8X*2y(traI^+1KZEu-(_j%t<)w?tI>hVd#CUfisw!-|mSM{#>X=67C83>oRW^)Nc
z_@hYvV5!q}p#c+`qTV9*kqk5GkA6Z;&)MXHw7m;gzS)ito45k#Ejt_oX>5cfT<WWC
z2KQPilzc#zGBNtM6S+21XguLQ^dDB(z7%x$|9-GPGjusax-^CEce?|_6p!`LQeA*t
zPSMyw*{1IgF(Ju&%pGerqJ=JKbDhMW8MAdWH7W5Ps%BEf`_@XE%%LsfzQ^&li+p2k
z4foU))Cu$ljG^6sL~Dxwa@&z_QQ5dYY+?^vZ!Cx`c*gs}DQ3>LfXUX@_N^+#UicK@
zbUwcCAj!Nyi??H{sraN8Ni<n^weAk;y~J0UjKj{n{e-Mf;FOdSzH<=QAwgI~ZoYW2
zUpvi%)TT`4kALFV_jZJM_O<6bY?*wQEEJ~NlBv4Pxl13~^(Vhy-lxuaeReAyvv)Zl
z83s-MpuSp7Yp*OfRqsg=gRbR;Gk4?3H|XwA2=7vd7W5Mp##Mg*?k8z)v^N<f(0Z%i
z$mgMWkCQ{6;E>TB?aleSuG-iy_c^*{zg2xn*m1e+7r<Ch@N`8VIpTKl0Hu9*17Vn_
zP|UaDMbN9!!YkA(gT(V&zb_o<5of%DCQ${->BnP~o!PuP9z$Gcf(C!4f_G&|`v9JI
zHr460gE4qwW4yYiYMyx4c#(d_<1JDCcBZLe=D9DE4fC#q8)2D2Dpnaszf0h1)i*7)
zxyKd8y*&dyiKySsH2Uj5(~gfdkoWmaI$)6ycN3CquawfZ+R8$$x+k;L>%Fd*;XYy0
zkq~3{maC~f(~h3ZUsXWo-EodvK!+KO{DW8g|IOnpPq%l@9Ky`Dd0%sz0@6$Ox`Aei
I20H400LcNok^lez

literal 0
HcmV?d00001

diff --git a/demos/icy/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/demos/icy/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..beed3cdd2c32af5114a7dc70b9ef5b698eb8797e
GIT binary patch
literal 15132
zcmZvDWmr_-8||54h>`B@4yC)hOQZ#cM!EzfhmdZRPLWXQlpaz*O1gvrk&^D_^84TW
z@jlOq4`=WFp4extwb#3MjE<Hv_A`oS003aCswljCIwStuG0>ilFPELs0YL1Js)Fn*
zzr}qsbfZ_wbNOa4S@vf>;bE~>+%RD!>v%IFV#WTd^7(B=#T|Xno7mV6xS4f=u6692
zQq~7{i;;}Y46D{(Y+R?~SpnS3W=+e#JKDJX-SSUi>9(#}mwE5Tv-r0dn5ZY||9_k1
zWM~Q&Gt=O&6oAqZ3T;9&9$g)JWBOFs0NWF6vYJZJ24_?zn}`jXIHjr$^?F69z!2p<
zy%t?XyTRP;!zMXPY^&6kR$$J?UW%?3bCC4XDqr@?ukqAzCEf6lUi%~QE1bZLYf8h#
zNIFjy{z&gk+iBasaZQZklPN%Bhl~H-pewWJX`t_4w;I)?=gcrEWq1%u$-pwhg=Fn&
zj3nJfbY`j%G4F^8@$CZRg?Lweh*w;b>{2YdOIAi*x9?W^yUNov<sQ+UmPU)VO4uj0
zDDQH3K8p7Ks;G!<)!}->n|q?NJ#6TPeU_fVowC-#v9#b~gYH6zAw5m28>MUeJ4Tj*
znI<k2jowvXwz1FqzRTH_Ok0mJ`IJ?muj9Nf&_cE}p?PZ*PG-IdxC|+>Vgljj#XhW$
zhiz?z_2X4xbgPrk6@%1I-IDPigjXj6D_rk=N!MHKhrgxgN|sX9wAG{r8mKBc5uYx!
zD6;oWKPFPVaeKY+;_tfGk8dnA3*mxhD6c6ylsqfXvWFU-T3PF_*(Y_!aR4ycp@UiK
zL{0B(1-*H{F=ezF{RJj(g)4PzJx50@A1Bg2>XU|TM&*KjHze0G!vbN}?9#L0`)Mh&
zSDg1vm!sTu701b=n&--{Q{n2DpuDb{%No!D^gwg<Uj2vl;fNLaN0dNie5%og@3JQi
z-)(XlzBg~YseL5qbu?htPN<|S{XjUXg>^bAW&J!~L20v4&-T0QrdY*80B?ozklkW%
z0rk7=VB9&#oB_RdT&R<N*F#8FK%9DHfWAi+Ir^%BXMO=Bt5+J4q7j3`jI;UH>hUD^
z<%mehua9i+?=)hn7$V<hnfX&)FhVkec6pe?I}a(Xe`A0O?^nb<Yc(D(*Rq`sWY1R~
zN-nW3amL}k2!6HXjbDG5yylPS+|X(?lc;5Z8p@LXyU%D?fI2Fse>mdJdx(xObB8b;
z<S{?XzJ`)H&Az7qG+mJ6Jw4@sqrEgPWkw_5uKi0t8NxxY!YFGoj!_tcb*IDi`f?_V
z6&F=Au;_D<nuvZj{;uU-=jNl?AX{_0na2RSY}rp9dcY2<Gc<^Df3nHT1X!@>d)9+r
z`yz+r{dSM<Y3FULFlEVk6Q<?95a3tLwb)XN9>5hDz=4ys1#(+WoWqC+KtBRNG8x2R
zkNK+s#C-E*)s>kZCpyIRfB`}hQ6FwUXyKlgYs)!v{kjY>{yEe5^Qr5JEe^d*zcU@;
zK#oE%1w&_PZ%A@P#G}S>`1qbU0tkHPO<2-5_Uhe0Y6$FovD9c;Ov~qVD?l$$zpcmn
z8BGk}4~3UeEkzOUc<9FqtY1TqoY%<J>qGS&?kSM=O3g}NY85}H(VQS~6J6eJsX=%$
zf%etV-q-i9X(#Qm$6xDNs6>@0-*1b4*6TC?1v|R@FkpbQLy%N<#0-I&1swvEMn?Y(
zQKWmqz2#a=uq>R|^cdhnkaB3z*DB@@Q=Jpj%9EBXLuo{WDl~W0E}qH^aARnpD#`Dn
zAO=+iepMRRSE1j%9nTDc{=3ACQK(De^37Zvsl54F9`aO8G+M-hmV$3r9l|3HavVov
z=cO%-IO<MiBG5betc0Exb?ZA??sg@Yt^jxuzzfV}RgZ+#5?^zuGU#>Vsvo}L%}Jm>
zX9gR60KV3P&h$KA;XH%c12K@uFzJy5i9S6?U7BKXLk4&WhD>E$HbfP_Ojp5OF9rfm
zT$`)n#dWaGB<22Cl)AZ@Gv7i0;!*>IUJv7##H1X4+Wx!Jki<;jka&jGH6W2$nzJ4>
z6yD|%yOMzcBZj~}DSWA5Qj5Q$P>edSrrCzs=X;k&irN=Q9KBA<jVLfalIBx9QGwJv
z1M{R)VE;9*;S$~5GJi*2oV7iH&#qx&<{V2kez<x->fO4RZ>klxjm*H%`2m5c(y7Pw
zcP@DyYA!WftG!MB6T>V!I>_ym+&LEFyikRHI`-j@U5hGl(;JWZbO|orN^1|6{D4+0
z>5k@1pQ`!&UM0WB;(#4ds`}Zu6)B_YebI)X)jZRhJn}_frc0jF4SFi~JHS=t;knPP
z&yEu(+8%qK><?Utqp=kc>YIlcGahTfF6Ze^7edgT$J`6#2qm|n26OTFDY|d8s~3hl
zpLtuXp@mq2GW8<6|E)D{#yU2)#iuPY!=|5Hmo-<*yo(QYr$3HQqx#%vtHjS|I7N<c
zY$cj1UY%X6wN$tJeGNO~&kwjmhTCJ-m4eYk9uHOHE(YzWrLVYBBtv=!agp4e?@-Xw
z#@@d%cg74l#(ELF^|t-^FR7({=JtNC<VL$kUcR-|b+hOJ{pRqy#fQajq$873%ktez
z)obm-7DbOFZTECm$8#?%C&!6(4ae3HCmok8F5G0J$;d@QIWP+ri_?e3*&omC|0ES&
z%U)<mw&J1}h$k+Q+QOPgDHVk$Mkl1=bNhagblj7)sQQtl;JPOoyc@D>iRxC6lDQq<
zTXIalFx_Ncd(TZ(!iRaFymyh~tc4h-VJo_vaMKP(y_b-@V9j{@6aA&=*?g2r3#HBa
z-Q(IP$--;P*a%%PO{^%D$`G{5nl&>sUgEN|<ob+8jM$#{SCP$0+qsi#@yG5w+QWXn
z7wjB9Eu8Pj4v*yXkaVgLKQI*WUL_Rr&!8iU1R@Y1LAdQW{AO?vo7QmrUkb(%gb<zz
zhtcyA6wiMwgDN>s^PG}Jh>ISvD%;O|psp}p`-pKAK?pbIHTV?a9?u}(q*GCDRrVm>
z0lC9`wd;C96R!Yg%?DnK2`W*_@jf%9IPnwdr@BgGxWS)z)J>cDasy)mt3Y7)p=txP
zM)#~H^+!85n&7b%<Hq6l%gb%8C)dnR*L4=OlNIhlx07*oW#FdgjvgIT_wm7LDLIQ@
z-T31afEb`rrG^))IJ%^bJ<{>$l{U`iUrdD?1+BT#+yClM)OQek##8!6GFE0paMGl~
znJT5wR_VzqeBv^?U47rJ0!hXwG=8QSN^}EyUNDp2J?(D#FGFgCo^@;lRCMe2zczB^
zM%9XHn3ccHp;wqZ^Uy8mD<>D6R1W$5gqQ>%@AfWuiX0~?SIt2=9&6BS)f-v(V+-C6
zBfbm+ypV$sk2v=A1#JUeO~Sbved*o%-1Huvn%MCF?%m%fP5;xCPP|-(b1@laO;e4-
zd6?k_0KN;j`6NXEVgi#X0MXBw38O@O`lZ=y4(f@Vx@QT9*Vpgk{{$@lzYwyh%?NrN
zGtU^<Xp?^sLam{TiaAnSu<!UI1|2>kn)F6?fKBPA{djTaw^L#(7F&HK0b>+C#os)3
zXBq#MC^QE6lzK^4733pD>UE36G;-{`GpU&0a|`(V-vTwp@G~>2EL6F$*&3YMPp-<3
z$pGu8`_-xR9b-}m{9;+irLXejrTbK_!ep%zGnh;U{^iGo^_=F2)RW>Gnr99OXB*dm
zfO+ugGg0L-0>cKR_lG&~a#|_x2{kD1`&ncdCyi6M^Lm931EU`O+-XCCFYRAnjs5f6
zUa^V+z|fk5UB$rN`lRE$u7^I~$Cjw-;Cp6f)HA(2LU;};f)pd4T8-D?I2up<CIE-_
z0BM~3fYu&CvC@lKT)~T`_^r?t_rr_OF~QC}uE3jm?W1tzq?(ssDw<-4)$UN~!5^N7
zuIp1H{Szdjgu<U*<ONwr)R<|#q8qLAbP;vKy@zed#$$gM`u78~!!AwP@sMCx*XkoW
z>+3G(m$&;vg0~+JOD};L`gqqk*eJg+xpbq{T}SE4${0xj>in~=ldQi1rE&?>CiYw2
z#vg0Xtv2hPZfP@t{cR}nkn`imMzN%Ni-Y?Fuhn*~A(k1`mx6vQI)vLRy&;WKU0n}B
z@ZJ|)Fn=>TPu!<>B>2~#eYSLuW5D_)A)V<f*OsqS8u}JIOQ4c#d-MbLo<0s46EY{A
zDm;!R*<T#xOV%2cy%%o9dW}tEfA*H7gL~tKR9uG79r==tbU*8@(G<ES&F_cHF3361
zBE(ese9+URMmmq{w2r)*{#F`lifGeQQz2;z?>?!{Y4XguE!i#eiyl1d{uE|RTBFea
zM(g%RB^85qT#!n<!>$qYwxcyR1CEXmt{nlJiLD0Zs8{OI%+d`MxVXSwT?e&2t6`t3
za4o!LrCv}!1now|E(qC6Hf>E@-0qF^3NbW7_qjxU<9CDT$8j)VXDt{8H;2Pzmw@Nb
zJ}1NB7;d^GlLw5^EU`sTe0n9Pg~GmQIXwnxEAeh@zS%X#f?&FG!fvUXW1I^%m4Huq
zFb9-|D>sEz%pg}Dy}4S#5$%jBg@1FfhQKlNSk?MlP{oDv8s=i*#<tu1V3Ix_fW<(J
zJfe^b3;ryhuK-4@%J*%Rbv+W?wIkbHPNyoO0Z4$3Hk<bluEW50Ee(aixv^zPjV#o%
zTd=x6zN(G{3}E1foJa*5>C%7KTfKRpT((!vAA*0?h5%4doY~|3y<zwG&L#TgF$bYi
zNIhPm7*i{_xSzk6%sHD=KN}hpwotTDjyX^&nHfM0Je#8FI!{3+qTU|;pw&3QlZOIy
z5rT0_Xk2_TvcOf_uPEPjT5PgwOPQDs|NIwhCgdP8ELV(hZ2mb6Axa)6Jv)^ovay7R
z+Mhwte-AdR;PM6`Fg#Q~@Tk}qJ5~O0<vL%)0hNUiU=YYh-SIXcH*JcGy!C0nWRbe<
ze}1<s-27$lW;1EE{2=nZ7|)e(;01`DA#m&cxOD%L>q_DA32&6T2RHbNq-AItD)b&W
z5)Ng>T|a!hlRxqb6(lwy3n#TR>Q{5$zoTQ(7Yp23btrx0L6lb;lMIld_ZsBm;X65W
zhL~-DK~O*?iR1lG`e>ZDti=^0@Hu{22<C9G{5GMA?`hN_MpkF91>rk-ri$|Mhlfjx
zz}x1wtNp{S65T4sf<QQm7FFT+Q1VCP=nD<5Rm~Wdvt{>tJev1F_{R<Kn;g^+4*MKN
z<XUB4CO?VyLZefp!_fqjOBBqkG4S-?j6#3_NA+h?>MAe{B#a1+VB3lE#HN&bH7Rc8
z9d*c27p;2<s6OEf8b2kT)hXp1dpW(E^6DV&D!;;o1j82mqXn;0@F^i&q?fW+7Of+u
zeff1?hHSjG<rE8hQ-Oq_!K-WQ181GfyH|k^KTR9tv9q88Lq!7+2Syy{A5l`lNr|6%
z#0*U^&a$x#IxOE_aPrB2Xum}>oA4ZYZSk)abazBuwEu8=L?5J?TG~{R3V8o868I?F
z#Lt>o_|ohZd7psYl9Vtz6-np(@R<I2C;)T8oILvZc&}!k9l=rnh(SMx>&^Q6yKF@#
zKK_Phwv=G^eE6%t(B0N4(**az{<hbQ4M>Z$|8Nab8SLz)m@0bPk@Wo;!3I&BJu}Fl
z{}e^!Iy||DQ~DlD9=@%{OB>I8fpV4ZTC})4v8^-k&+wR4`hMI|wtCe3@xtk*M_gV&
zT7}a{1ERd3c8RiWPPBv<xo_~|`%6M>InQ4k+GP<n7v_pttFwk+8IrZHab-uhkGCsy
zKju>xSExF}CJt9v>(EoD>AsA|3ioYaprn4PVQ}7|zFbK2=iyU{SL8K#I2+N-*;IUC
zGNwTD;XDPHkYcjzxc(jT?|J#?A9c3l*&Jc_`dkI4Rs7QC{PM6ty6TzkxCMvgm=@WZ
zf59SoAflkydVV7?TYoT5`U(N`-HxGa2z_V)YRIz`HRRE3`12J1-lEtmojvMCPtH+1
z)V=IiqG9TR@`K%FOk2#6!1{1OD;*%xRAYo%)EDc|<)I;%EXi}?^()_B6K<n~w!o^m
z{^B@A7{e})%_k}+m7;q)#Pl|qj(aul-6|g>`pYE*`4Sg)tmZ&*^v8jAGJgK-rh(nO
znii&AGyPojK+Ee9+EI?hH-rm&m>=`lAO7{E>D1JKm7n{&r&z%Cwi})WQZ*k0bJ<u7
zd6Z`^+Vh~3QS&C=uzWkNq0?l}$C|uZiR#V2h?`ss(Gg)$R3rey<bV=Up%131fcyo~
zuYRuRQ*|jB%|Y+Me5=-!GIK)sAe|gwJDy9lY^UhXagIWU^)o*15x0zan~F-$T0Iol
zkE`eS#}A^@eg1Etk=5kFfnOy#C!jRfwXI?m68&w@EICw?K@OP*#v$reszm1rv59NX
z5fitq2x{yk1enIxl2)trdFA+m*MFk~B8z=JkTK!s*+5W}YtO!w!K%W+3)iQL`0(TW
zeI4Xyp+w_<ov2{%@-j$`YC_2j2Hg)uaO=aKo=QInC(3k>6u=B0Pn1}ek~+ch_lXwn
zuc_uu<oWjKV#rOl>@YRZb$iGWq5BG|g|^Wd_oh(t2hEHAQ>~0CE_L3eNN1(NZ={TZ
z*Q&K4gY{whUfZO+x8Pi73^^HTU(N+4u|z~}-7IGjQufEje1K4zazaTk96zyU#Oomt
z{bZ_BZ#I(ren>G~3QNkj-ElHS()&+TCR+bjq4vO-*_o`jyU7mwVd?J!edfIxKubK~
znqmum7Gd^m1|fh?4|kW$?Yo6*!cTvq_fNlm%+Ol<W$IOHKNwa5xAbLOaV}&W!ABGs
zYB|nN1T7s|frHs%iEJW2y|f}8c-ef{Z2l497Iq)}C^Z&vO8o0azOTn<5%U8+m!g@d
z;os(O7`{f-SXo6lO87v+d0kY6*iyn;4ke-4N{C@--M=PHZxaYPQ>mz3Wf^<BjsW!H
zEPF8@r8cFn?CP`|1v<#GSYQK?cZN^~m6l$pqgd70gKk=$yqjMhkj+$LZ5xA>I(4mQ
zO~z#3)9fPojD(VbPK-c6xq)}DM$borMa#X!P?x0&SBqzQG-BST1On6bd~bfeDWpmL
zg;dMkgsT6muQ^9L>bR6T?+9!G07EA3XvMR&Q}8^<F(#gvvQ7#Q$TgpjcoAy&I^5oI
z_d+EO4=&OpCEm=|(frwZ;Y75W5UY)cvuAK%0<Rq0(kdjUn&LLc3hp!Spi>MSfgNeA
zEzFXFy<gB7nMrL~Z){BGS}hdnu*m}fXLrf7Y@)jcL3F@IolN(<h2V#abPcMfVI#d#
z)<;61X0e40^QXbsBksx0u41h-0J3pjo~F_C>ts}my(yK#E3|dx>wH+PW-82HFn_p_
z{;sH%Izw2f?je+3ZGMKbJJ%-MUk6I$Q3lW<rax1QgTLZJqB}itr1=V&KG`VQC8yd`
z9j}wKJg#IzYu*y3N4@Bb%cqox9)eOF(B%TwKPK_mvIQ411a8_I34xP9BsPy-OxP=f
z^$=Rgo=aLuf$|15vr>`X#vZ{OC+X9zuDb|vQX4W2a2z2W*Oj)w$<7+lPbGYqEE4!Y
z5j4*J(;o`UAc^wryi7M1qZAX{UySopT5y$cT@|8wdo0j-F+*z55(QN4-0X9E2(%0w
z->Pj3_BQrPW?JjaUyorsqkqgQ;wow+pkug_qLB3byas`FE+^x`c+_Iv!A2o)GczmY
zAV6d5;m~?7FDJ}pHp;5ORZwuDRq(s2BNghbg+aq0nsM$z_3LiUp~h}O&p9WQTkF%8
zM=j%0_<0RSBT*koU?wS=bWkoexJwQclztyKASoPa^=_gN4ebgz`-%PQ4pC%-=4Vq0
zfe#O}LUsDlrtPI4qXRa|3{g~nzfS$+u@EI(83`y$`zM*F4ZrP)V>J3FyYXx}ZGKDg
zcnAHvt{Rs*n3G9nWAYgvN_?47{`Qg%8)$<Aq7w7Y;i=U#C>u7L&yUCg=`X~0xo?Nm
zOT?BaawiXVZT^N9@PB8m9mlRme!pMhW#CUp&O)q1Ff49V5&%z22#hJ2F`M#8APaP0
z$_Rp4aJOUiQWa7(@mp|%WL)nG$d&Zv_rF<$bdOHX?n0#JYw}R-L?73ZR{Dh~d)_hC
zut16KfP{BGRQ-I6p%4Q2bsb~&j&!tu<3}y`>iw3ht$>i661@OYn_Xr&XV#5d@S|oP
zA@W{))lxW_UJQXd+s5{jYwPj)u*;o$QivH&LtwNF#bMPtindqcy_Sg_0jNOW`<v7!
znJEO8*|0yQ<j#3cQNLl6We)bUW6e|yCa-^2a$l;DheS8^{5s<Nt1Ne}%Cap2BVH(i
zuT&AoSPH9k16RQ62%{Iuvz(S9^H3a+LU~=#Sc&r8O|`!{<aWlnQ0y|KV8S6u=x8Z5
z<;6)4`!|oUKjwj;r5>lS26z`VMFkJaH+Sv!=ug__rdCdmKpW)`?T6Ob{o>w!vsy+D
z-B>}mgAw_|pUbN&6M&;nPF~<=LStpG+Z5n5r71uf?m?gQ-F4dx9x_V$5%CbECK$Gw
zzJ2<^i95T446#0C`xOGneN913e!;7o!R%C)^uMCe0=Tn<*P?H{k7Z&~3QPz=NJW=T
zj3CEU61-h1U6W|>zbw|;d_CCnt>k5|J0cEO>N_La+8&pSKU3E{M-On-Vw%ehQ{LlX
zxIB8%LF!fTxKT!H6<|d62Qh9ehYjV*#xl%&Z~JpAI7ZChyU6I`b9k!^*geM*&r!)0
z`P_*C_$(P{7dfN3zXX2lZVtYo4StL|JW2|=e>3xO1G$K#=;n=dYTEcI0n01mkFdT*
zZlxjCcP7Y<Xe4eK!`8~!(%b0Y7eRosBKBC^`mfl$I^R{l?pp_;1@WD32ai5kdcd3M
z^m+UN=V;a5x_*9(vTzYtR(Heec{Ls)LdV&W7y{V+ZuqPMyu+XY%$fCdKj_hAA412X
z9#03Ex55W|536?9y#sOUVDTF@5$8YaHi%%9&MDkZ)|3Gp8mgcZJl50?7fGwkHO60p
zZhyFar{50Jgv_g8$k>5aQ>oPVpawo8YKRl#hc>oIaxO{*fKmVk?3H*sQ8bIy$$PNS
zm^QUJj;!T<|8X&Tmhjigq?%e(ppMY%uLMndna;mU<hf+(U9BDY8Q!?K2c9o|Cp?z;
z^Pj4|R$@COdz6|--+R3VyzF@q@V^d8Qf<+uE=L)2F(2$~G*r*u$<=O*7m}ns(1{9D
z;Y^{|9oF*p@@9q1kiw^&M)}vDtuk~W`5T^_=WBU3ZEl@0_8<1Y)SggaGLZ!A2#f`s
zbKrEiPfENE9s6MTM4C}Q+(s);GKp&lc$TM^mKI>(!hA{kXVc%0H6AUg<LVxARbB+I
zubB-?iJ!V3Qn!4fXz%tQ2mNOfI{4Q&9U?eom<x@YKL(w>IMB;Y2q3as&sY398#kE0
zW83CIlm!|%<nHchawVWv5AyxXiITYg<9_nbqbH51Hvx={H@rm_lFaDa>OO&SzQ41d
zS$iN9BrRi!79<Ui{~hrneIXRry?g+D;*8pl@}~bWkR^0vcz>O=xyI?ngbQV~+RpO`
zgt2WYwEdm=V<3qZ)gKkzTAP9<tsQxrWc$7BL*3@Y4)#dX=FLeu$Q)WKBe%`??5j6_
zGpXJtq$_g|SJdxLBtN+S%b;aWHg5TSbFIABDVieIv5TfvgPR0+myltdME7weY1tJv
zIi+{V*DR%5%@ab+A>Zf$LsE<)l0?cLpV{+UkiYYIQGnS~Bad;H{xUx0IA93P!Z$Ub
zRs}&&XlPF1+UESgi+B-d`JNY2Bfq~xE9@Kpnx?;#;mg;m75vQ*?*d4Tztw|nTLS^Y
zH-`iqEf>b-r);F3Q~_D`cZH$BGWu)siXg~pRDs3<QlxV3MAV*`OkO*y-}U=6g73RA
z&!q!2FhL9$AfbPBK&?WWip;9TujkAMy8K<br`rsf898zEPQX{lwvyq*G7(Ck|Bds{
z>)1|az7kgqJm2#$NR_{p2Y23-4BY)UL<O0}%Tx&U<y8w{_|@^Jr_<};cMy*m3XeO!
zh9J>yBE<v`ft>a^$KdzDc9uq0^ACB~H-gaD=Y4z@9VVD}V$kHmZY*Zd<tOLK{JHGE
z$tWALwM*HX4GU!Qfar7fAMFkm`pwhW<a=>--RR|Y0w6WlPWsSq`9?!a)pOu312EGz
zk4m+W%p>D^0mr(5WfHSjGm4$@-XbLhSU&;M=<@H`iuaG1?)qq49eVAA5|f{k5V){}
z8uBYG8s*=a?&=i4q?=aPx<^%phdi8kO`X$JJFg~83BLUMcYF-+MJbGo^^<XZ_r1UG
zp!%(v7DBC*GL8_rOxn!kK0_#ed0o~>{rW9<qih$wOO}bQlRZWAg5ImkYkyNRqEwcW
z9Q5*Sgsi-1G0VoPi^P<0E(`<D+5<cy(nK4TFK*euY~BLDZ1+OhYWGBq%9FNyX`0Qo
zey95SWRvrZs>Z@->vG69q4q3;`%j1PYG2lz1;eHL<hBnTu5y~9xtP4yyTU!ozLKep
zdOf9u_~P3$JQyv#Og7IECOzmM(Cee$_5@wJ_lJAS5i^fXgXO~gUWq)fW?g=_vR^MO
zO8V;)F@|ni8GTfoDk>UAMDldZP&8yIZ=zAT!_W^5Gh_b#n<M+3C{!PZ+i&eloZ_|D
zhm3x6UzNX$-HH|Kp())EXHc2epEfRFQXafiIMh=U26yIovzjEqiu!xSNW8?j>%EiU
zZ%Fin+oCFPL;K`A8?8xGtUp%fnKU^o)jCC>R2*P%Cfi#_LmHjMEJxhmc}|a?*)R;#
zbyHfgLFFpb00`ZaHUnRQmT#aiiK}x0gu+pd23%n_RUjE4QhiC3{(j_k)DA`~jo|p#
z#u5J(u73}=8;tpFvdM1RcA}^T|4=?G_T`x+6LdEhU<tF325F#lX@R4G;8tcnT|y8;
zM7RYZbpD7{f^}i}jWC9ixK0IM8zO%8@oO+3hds|;k{}`C@I2t<ubv__!$|%x$Xhi4
zA5onHl!jYyf)v1Ac3`q6kYg%b(<Y*cPg&j8gzJ)g!`ArqxEl=bz$AR>m=K9erRBQI
z%4?gf+wXzRB%6mX!*t}t3Kv1nsQ~!hZbTr0bFyUkaDfV!snDh2##9g(Hhul2EW747
zgi;TxQ%{3b>Mc4N=<s3V+t6sd`1<n_g$zkH2L&lWp2A0?KbSyNVu^_FI3OY%a3BWE
z75dux<p+XFv-h_3W#-m@wY{wQWzL5RBNIn+nhQl|y~--UW#PxD8U?5t{)(xH|I`{D
z`CTKF?#0zLB-2|51B8XrB@4j=2WJ)$Fn(l9IeYy2o-BcyM7wsO!dSiOb5bQ)ahIdW
zbpQJlSsI$4iB`daU+xZ`)Pyp0&|PfMIx1cvoxC&%3lbs-!oj46uOX{hWK<Jf!5FC0
z@eeUJXXsnLvdFo?j(#9kGx{-y>|y#vIG(4HW=>NnpTpmFun$Rj02m`#o`ex0ONfET
z4F{r7@emkC;R~!#dbkG?-M#lhIS+y-buu?tP{T}iowTIQI|Q3D*0|PFM=K&Z8(ngl
zIFhy237n_38l?NRLR4+dQiB2V$&rEkfgtk?a6l=H7ExIM41_<)P%KaggZNGFqMZAL
zMY&tS8=|yPYSZZFA&!dSI@Tu^@(_*Fml5a%4cZC)7jK+63+eEuZ3PCX_~(AjQOo`=
zNPnlQ)GVKn42^BzfT?X|&6O%hoWj^?UbjQVlhMl_0`x{xa=q49T>Mx-$^2R5#O^pn
z>2!Sz?&CdJ65j%GFWASd4pIV3tzxpdURHySx^q=6dV<a9LJ7&|zmM+^-ETMAxR98+
z;3)9nE~i9=C(<H*$MQJ^XE5|xIdYK)4;Zjn8Nk}I(zsDb*jXs2rh@`%|0eBzB9qff
zj4xhW@Ey7nox=HOfR-;2fs#b4GbZAJM`^8d$p4fi{Epn8JL;)duC3j77s``Beu+}6
zee6tiH1#|K#=d)klygO6%l5c+uk(VJs+KO?eoPGx7M!gc=e|8B__ZUxW3Pt;-=DA+
zKVOm^Fvt@PtGDQkmmjD3_7KnieRZ)(y^Fev7YHGFBaLE?{gVLXY_i}AYAS2`_{{{U
z-B!1EKX95m`s(!~Ydmpp#!b2VLVxM3`1Zrmb@>RBZ3a7`JP?PSBjkcQPh@?pe)x&(
zA66UTKY_1wx3-Ur8<y0+O-29COF73sbq*HuuK3fHK-6(by~qTYD7S}=qHBCSt>yZU
zi(!nn?u&oDM9#cLFP7RGZ@liCG@JKro%!fz2GqHc@fk04klM@5*ths6nRZJ%lI|p)
ztyuO1VIcggf?H~xX6i7k&p4~V9`G>zjntUEflyoQ^SD~$lBIr*#v)di`!hHHzZ~Wd
zJ-QNEBRBq)fz4l2#_xXm8YV8KB%v!-2Is(P`1=|D+zIhS-F?ZUgd{4ZvFP};cKr74
zvi0T|HHv$hL!f3guj8b`g!f?>1v<?j45gfkRATgu9tJo<3CbZ93QWlzMw3yj))Xg9
z$!T~{CY_6;N_!AzXl$KEx@6(;47Lrf1(+Qv<!xLi6gTTYXMt8jP|lem^Nhj8+cX|6
zPM;$h^0LAt+C>>B0gS~UEbJ?|HOB?fc^jFhtGDY1pfHBHP3X70`g0Pl;1%{(WPrw)
zLA={hi)#y_&B|CHDe{&@tUa4*`Gx7EV=fZARJ1+2VgS0L3UZC@{Wc`R>bF^Y|J_=)
z6@<ereL`p)6Mc~}dJ$3ptLE%4Bs2y8jxP>zu_xnjZE0yN`sSuL5S5%*$tR?_Sn;IN
zk+q_-5?}{FkQtG0br0boxa+}qf_r@ocNJU^!H6bY#l--XDfxMU;d>>l#G-kxw=U|n
z4oX{wIsAKre7G+PF-<zQIXe6@QBy19fj)^RTNi7+B1;2!j%Z>;OsE5di0T5MG_-(T
zhUl%sTLJ_I(vT32H{#nS1y<Olxi3z)Hb#CHp8wVLJWf{GORQ_rFw%0a!xY7rB9h{E
z?{$OEOmFsm)~q7j=lzb~?2!C->2{d~Bk*>z;1fMDT#15#7$-u6_Yo!o9QuS!|5#-{
z<Ai??f%M(eexmRE$+o#n(O~&4UBt-oteTjh1j}0{f11=tYKtr=GnpyFIp`@dh<?C<
zI7zVl6!rv13P6_+I2t7w_^t(J%9MdC&_kl9wc*h)F3e2#6f10=AMp=&6J`Av2+`g<
z<3bdQ4gN?CUFly$P!!LICyU_sd!u{;m-!1d5NC@Cl#bvEwD$z=G*?eg-k0*kfedfe
zX#weXT6OP3eRVI#^w?%!DTkP<hgnE64Y#XT=oVjWlnH0^GiQWFx@N|Fty2R}bYOum
z2{ANmC;p?XYB{(Z9sE0TP7O#wRObOVO2O+_EQF?wKrxiDNiSZ|aXQp0u{*zKvbc-I
zq7dJ40?9tCq1<NPM<1N@PSsQ6Js$fjRtR3IqNB_U?dRZVtYCex%`Ph(KgZY+Uq<1`
ziACn~!!K#}ui*X&*uvgW!KX-{P9kgU@^yz-q>C0)T!;?6@2clqJa$)sMARqIYV;r+
zk0)L=B>56L<Qz$eI0_7od~&h~5rcWJpDc_-0^&O~Lio>%h)=EE^|VE0=oK*K#|t8-
zuPFs$^fLQzLGuZ2ZmXe@id)*N@}ZDUnL1)Z8A52hime?+&Bx7u|5)K3ImXEMUQge<
zM`(Zo{DDFnt^k6F1jF&@<b^@0(R(0pg?aSf2kS%~jfJHE-FRb>18xC^>12aHE)&2k
zs@Nwb?4XI^>w*cbU-d#dTM%R#VlaWL2MW8>deH&l@xZNi1uJB>M`h5<RPlhBdSkg&
z3fL{^GSKeXOR1<N*apZdjJXcDy-9RxuE|DI;^IiL^(CdfrD9*-z!%yp%$^yef;5;y
zdBB-X3A(Hxg?R+d&d=n2<Nu_}DjgUxh|4`|E^%rhFySlOpBksG?4vD~acWIm9I~&W
z%OWuIOmxXNY)0(e#58#DHw>y{I|JcKhaAgcz;0;FD<ODa{KJ1i@V;j$D%p|cK~%n`
zNYxRa)-Jo*u$vv*)=bCt8-%xF1W+8{@lO%I_S0_gzTkXiTIP^0XP^iqLMVH&7Kci5
zfOTisf2v14W12-K!T~v_4rj_ggW?X<?GVz>w2<~EhliI5igwCTS&^FLFZSoB$eD>H
zD10LcRu|WoR}}rm2%pHJGsgh+eOu9q0~qG^b(v)v%8_%bfYg<>q0IYcTAhF-kNC49
zGRJPK;g!YDNi0#B-0xu-ox&gG{wQ(DTXtXWgzKH6KjnvR?85x$A$ZN+G0#8>XkFb9
z9zWb_5-`)TxAZ%jIz@ik!2)usZWY?tyjjOd<;04s^5^fjU8zy`7I$70NYN82zW6h|
z$X=NbEUMsfM*!<{`)e40n^{H-)`KJX!(mZdv-cC!9L+JvSVnSO(VKcNP;t?UGtk!b
zSPgVYsnD9ejE;FGyPg{6YW6R5Q$rGiy%J(H)2LXP4eT;Slga?wulT3;iy&;Ia=@Rj
z!U(jtPyK}8ZWprMhYw6rMgQS66{Y=o_anEEOn1Vj*{8icX-1vaY{+vNoJDFj0{pO(
zMG_NH%h3QMU|oF!Z9ocohL5ayn*Z36RiYk>2PU&<Rp16`0MZ3Oy(0#K%cs&f!WKkm
z!8pHNY1#d=o1$1MQia~A!QJ)_6tIgs-{?*mojwvw+F$iq%cFzt$w|`z?-9!Ygg%~c
zXVihI-HUA|cnoq2V<JNvpg1-Tvkgs?ZgSbY5uiNT@b3Dy7-rbP056T#ouze0W1k*v
z(z{KmE0MJroUI!0*{S_ljI-Y-3n|nTVug`|%I9bECEOiCj`HQ4<uUBNO(QUl2E0_1
zHz}QUXq$a0^JOuRKpr-x=x&p4&ijADo@1_k9#~AkzW#^zf1xAxf+R(&1dYZ_g5^sn
zCF+I#D9*4gsVGz~OOlc)=Rsi7O_?Si8^ShL@d2Nm3pd+yX`nZV3kDVyeY>{vAU1j?
zkRdJ8tizF;3llfJ+zh|bK4_O(7pI-9<s2)hi0<-%N(U4|E}xH*{=Q4x8<=>w<Ny2p
z@de@1QVZ&>^Y4gTB0F9sU?J)5ad=AE{p>o;579Jw#@~5OWbag~+3Mnyph?f@wbwu8
z=fB{(_w#nycZtQsdzOuJ=!+1W3GvhPtLJ9m8OpCA&1MCEcLm9=MUSexJUgvMnqDuz
zd3!`HT>912mxR#8IDT6FH+LT`QmrCDq@~pdJ?clm$SLSgUD~0uNXRqN&U+KZqw7Df
zzDBzgap!mUAGRk7ciu7Jh?&{>=jdQn1ag0rfaz2*?e8k)dfhWi<lN=lQenN!bXuah
zH>h%4+tNn18&<Eg`QcOFlDB*4Ht$b4D?3qs;0*nwuhWeFfNh-PkKI}J!>)E9RC<4z
zeXoG((fW36d;|?kq_y=zW+bjMr=HBC9G6~Oz67sXY9iWf{^(T=lY^M^#K>_LyRTd#
zP2auGUqc^`u^ubR5w4Vs@kxf)dChil)2=KRi>a|4o@pNTPdUTmaKG~`#_vwS6!#k6
z{+4VvCc;c#xd<Hd&gM!+{y5|=I$W4>y8hCDR;Cl~`TpA&O_}1i*3^LT54QK|MZcr>
z_WFbw0$>}L+Ody2Uo6A7WL7!Jjsi|{&4b%5B5BgX4~e|uY}|YIqYsLi98Q<{`IYRM
zg6GJnsy+;=)vhXW#}ZcT6Xz)uFQxpe`U{DB-KsDH#Ubr*#odC)p9`{S*v9t${JC%W
zNwRP4qvDI=x+u!)g-*90R-vYQbpgwWYEHiCSSi3znGDt6hfK_&?&t8e#l%}MMpBFl
zxE>$Q97^qR@(KeM*(xar8JyGv7=1lKpu)}4U@!(Ggn@EP+h#cPr~OUH-`QqXhlhNd
zjl-d^u9-i0$Gp!aVs!#8LeIRnr-PZYrSHxBwm7LpU-rGj%`%3{jJ$YGlC;!ih7QtL
z?Zt!uX4Po`%PTiH$H>#58o08=3zvG`f%ntyD#+pAjuhI>e65GIil<XG$-yg$1LPbL
z&08B`5qG9S{?N*tQ#yfwU45d~%$?j<Qx-#xKH$$k)?)s)ec^xNnI~*Nd}gU*_CGQU
z29pV#7*00#RAeUEKBXBQ|LsadB;F+^O1?w-TJs+D!7Zj(D5RiYgTUhA;<N%m>-1!j
zY|&2)#*BgVwZTom3H=~rSH4u71~5Evh9-a_APuJ-&g8=GsZ%XZ`qc>;Jya=i6~{(4
zze`0_$3fz?k)M$&6Q&2k9O@)|ms0J}WX+PQI!AD_7a~rK?MmT=*{6>HgTC8@7F?wW
zQvP*i_&d*0XyEkG>uvdgHGS``HxH~dcZ(_r(SdxGqHQ%PTNR$W9pbwF`p%+Ykchrg
zd;ZKP$e_{BKpcRu)<0Yc9BtI9zz>QDE10>pjI*RY^gW>ul4rjnPF^nE9*z_fjWPsx
z;rz(NO!21+*w8E;HQ$iEs5?KQdY&WrS6@)|)f2@QGGUNb`pZ9QAe|~5VNk^MzNK=|
z;9m<V(z6F_O59723H#57{`JNPnsyyl()}m76%JXpBG<DF^T_p2japPb5N<VUavqZw
z$Pvhj7X#aei!s7Wvk-%$TpSR*76*M7a399EC6pk5IEQrXN?FRM&&S~K(&n~;aVhHg
zyi^c_T%OhQbU~|Axk9whq@J(NkSZ|#!g0BUWw<t7LOPg(xm0e|S*Pqjy%Lf4dIrKa
zs{~A492pQ61~&VEnQHz%E3%?w0?W~aAU~T5p#*S;c3L8|Z-?Xd+w9tj&7pT_pEX5l
zRCRSwQacl49EMzV{P7z~%uw1MPS~w4htpAiEC2Fd!-_6!Faf)J4nD=e0$t#PZ77xh
zC$PT02cYd7qem6R>AK2uc9Z4dpSjUqcHr9b7A0l!Z0R|#ihlchp@I~KLoS?6Doh)_
zu=K%3UGOn9lpxZdn;Jp5l_rCG^PfI$I}&ztJSpaMC0Dy0lkx;${plYda`3~ne*P2}
z9ns|~NVrt6b{V?dJkGZr?$|N@3Us`o=$|_;^#S3=1iixlG*FRl!;~WTtHWQYrv4vi
zfe1%Iyo&Usa1;vcWijV9f7lG3%s-7n>1JhqP#>q+%Q)cm8&5xe%t7J#7D4;Pq!ZrW
z*g^ioamw?yQzmW9rs}H{8t5HMq^f8a;yr5&UFlvWAEjU8sr=MHK{6`(@8X=pB5QW2
z)rThuRkfKID&7*$00)V;uz|kjA&u<%qJ(-ftQI~Y0{FUqmAQ!dX>BIlbU4uR1a+&@
zkmj#sFi6@RVdl;od8!Nb$k?GwV+%UZN9AD$I^SFxGhyZiYBo6^FlHMmi!Ic%74vOR
zTbAhK$tdDL$9G>b!@nzjgEd46*Yv8FuSvFht22=+*r<om43#E!xlUF4@<^D9?WWml
z7KrliHrw9zeB7s0Jv5ae@F;ru;4Bk}qNv@M3@4D4@|G!g-rNwjrT5}kWa>v|+4$3b
zZ!3S9Pw}ln%eG1#?EZ^BG{yxDUxw|9&~c^5s(?Zdx-((jv<d4!5hbpJL*0f74rtA>
z13BIiNg7v<)1Ffv6D%?fSr_TBhX^49!*M=iw(6`RQc?jsR0}$}pNjkz<Y_5ag}wty
zT=szx99lFnvS`K7<cjwYs0oJqD*$u`DhN)Rxzu=7_Kc*C2><6%^oMiYn`-l$ug_5e
zS1DRhObQInw-Hk}ce)nOJZ9INf!2B`WzZ4KR@X3E!~FpiZ)K(=-8Jv@E0_O7vHoC^
z*mjWnD^9@x&n<51a}BtoDA5<;<}xSCC+OaWNZ$ME3m&cIdTfwC4Zm$M?e4xF(O$|$
zrSzuPFiN2WDjj&+{!K)`jnAnWe@$`zFB!7C_VUHc>G-^C$sIK&2Yo??dG8%0cY(-P
z1rmXM{)O0gYP&rAn2vYb`0|l9nE3ECc_<5>4C^-IkP5A?DipVEh9TOz&DpiYx%6@C
z#Dno^dc`iX8XU-yP(<05{clKW%B~$F$=^>896~*gwp&*&IxfA9fhpjF$7_{qs|GRM
zLX+R<MN|4&n$SgODsrEQHA?`~#a6OZLvyv8(8kbx`illkNWOa$$Pgmgx4-ZfM!|u;
zqpg&Hb6T&^?OQTGv>8N{JxU6-9q%_r?JeOsI^WN_t7?pj&xEkHMow{;zu80jt}tvI
zFD>(I?F<}NeZm5#`PrYw0M)P3Kz3*VPJFh2r$Th$n@AOsr`1d<ctu$NWw#qFLAr;v
z4!*VWioE3mJeVeZl=V`;WtsTeOMc3EvGMp%!Uf*UanX3hm*pP`R|gVE@%r&s^ooAF
zNn9^k!NQDwHU6_X@!pbet{Mg`(R8ln0~$~D;{91<@p;yAtya#siRn)tbtBNNQIE;@
zEc*qXr-v;|1yxQ;F;)=-i`fovmObTaa(zqNhnYF^16j4|OE7s(Bo#fe444$Z8I3<J
z81hQoH@tCPs%X$o)aQ8liIX@Y{+XN>hA9WkD|k=MnY0PQDYtoFoJo3AVzoQ(6}uJ5
zwBXm2)hE`7bwu6b&XTa}cPj9p2ZnQpcF_<Pk^dW%y=#@k-jVGTyTXWv=+KADPnGuO
z;L_GrjCw!zT*Pg4PV;&%WaRzndDzV+i)$-$Lv(oRc^rOnUJm&|(tfh8O7-?H70vgu
z^5JFy3+QIOS6uA*LQ2`xtIjq_!yUcUUSnb|o%a?JikLR%W8(-(Vdg&vZ;rqJ8z5U2
zWjU)({FWZL;A%Oc?oz7F;V9*e^z_^x_q^<e=Py&jSE|J9%Ls3=7VE}8XF=|M6kupM
zFSkP5;JrhPt_Ir!sog)SJpM=pW<eOspD?YL689`?HL&MYwbD*Ya-&mZ+dqdmPRfn6
zas8m?EaKL>$!1-P{a=mYqW?0lIKJ;w@^$6in|X0*YF`$DQZHSS134zF#>yPW_`4AM
znjWs@7CMvwH&w=voOp3Nmp*fLCy%HIhrP5`8tIG_zpnAcnl=|XlAwc5huL$3P(55h
z>c_yBe?U^0$VIy65!`OulJGuDnbnWNi(Y(X%(q+=wc|?Q2Wu_JnDJ&$*`0Aw!ZUIi
zLNC5ADY4@dQNnc>jc?!5JbOc?nNQyEX>`M5$mfqT$&v=S?+6QQU0tZYtev?)e4p?-
zY{z1l6g8L;7w5*j(|auG#MUb~C2FLD6F18@<AGAjR4usKZ&vu^J%8tiaqKIyhgrMU
zRa?r(T4k33DbqbZe+4yl&%{Xc{4{4uamikkHr&Hj|K7%v4NX$PiDq5O{ilwywXB8+
z0Y}4%Z4KP5&)qmzMkYevVu`1@`IZ%ay2*l9^3p5yIwFr%yR*14Cm))|aO7P~1!-NT
zn$8t+E@<>z+LutDU_~ID;*L^^u`B!#;k#f{-zo9?Ko4_oPY}^K;S}Z+?xf&NYM^|v
z*pkvo9N^|^q7*<0z0x+Hj+W+}ccPQ$H(-$H-?fpVpC<>uExt9k+(1qEU9M}<R@%oV
zI#^MphSytBL_LMpptz_oA=J0^?Q(HaL{hlt6ttS&v6;RnSsuP(?$VI)No=x0N0Res
z2sx-0F;JnkiSaA@BLR(bMLP;7uUIW?Zv<S=$?v2Sb|&{)4TRmhc&^KP;B^pyg=m`+
z%4`y=ck#6vp9z(0Mh|#i`3~;ZV_uILfV*3mp%k!#r-6n#ZjZ$19>vo%HvX0RkxaW5
z=KK>pm4^BzfJRm1U%B1g>RZ@jDfLn$`jQ>x1y$v|mymsRDCL?c!YkXHKGa-HgE^c<
z&YfRD-oQYl9&jEJOV>1l30cc7hM{sP6OEbF4?M=-nqywL<<z<eS}wVc<p0c)^p#)1
zsD>U9Y?sIr@s$(G5wcSm@dzPD$+RR=zaQD*X%5`4WL^3uN+b)z#*3hP*#P%bC@!UE
zZ>`)nYW}1sbTh`W{0WJAY;H1vzX&xGt4PFK9HgI<Bhf5O{|B@{{P2?=(I-n1yNogg
SFP~Pu0;-By3RQBju>S)leN-3#

literal 0
HcmV?d00001

diff --git a/demos/icy/src/main/res/values/colors.xml b/demos/icy/src/main/res/values/colors.xml
new file mode 100644
index 0000000000..e7185c4951
--- /dev/null
+++ b/demos/icy/src/main/res/values/colors.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="colorPrimary">#008577</color>
+    <color name="colorPrimaryDark">#00574B</color>
+    <color name="colorAccent">#D81B60</color>
+
+</resources>
diff --git a/demos/icy/src/main/res/values/strings.xml b/demos/icy/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..6f87ce75c7
--- /dev/null
+++ b/demos/icy/src/main/res/values/strings.xml
@@ -0,0 +1,6 @@
+<resources>
+
+    <string name="app_name">Icy-Ext Example</string>
+    <string name="audio_stream">Audio stream</string>
+
+</resources>
diff --git a/demos/icy/src/main/res/values/styles.xml b/demos/icy/src/main/res/values/styles.xml
new file mode 100644
index 0000000000..5885930df6
--- /dev/null
+++ b/demos/icy/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>
diff --git a/settings.gradle b/settings.gradle
index d4530d67b7..2e0842fde2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -20,10 +20,12 @@ if (gradle.ext.has('exoplayerModulePrefix')) {
 
 include modulePrefix + 'demo'
 include modulePrefix + 'demo-cast'
+include modulePrefix + 'demo-icy'
 include modulePrefix + 'demo-ima'
 include modulePrefix + 'playbacktests'
 project(modulePrefix + 'demo').projectDir = new File(rootDir, 'demos/main')
 project(modulePrefix + 'demo-cast').projectDir = new File(rootDir, 'demos/cast')
+project(modulePrefix + 'demo-icy').projectDir = new File(rootDir, 'demos/icy')
 project(modulePrefix + 'demo-ima').projectDir = new File(rootDir, 'demos/ima')
 project(modulePrefix + 'playbacktests').projectDir = new File(rootDir, 'playbacktests')
 

From 090a9923326e348aef5074108c1ded38d9225e28 Mon Sep 17 00:00:00 2001
From: ogaclejapan <ogaclejapan@gmail.com>
Date: Tue, 23 Oct 2018 11:24:41 +0900
Subject: [PATCH 099/832] Fix setMediaBitrateKbps naming from consistency point
 of view

---
 .../exoplayer2/ext/ima/ImaAdsLoader.java      | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
index e42f2853b2..4b35c7545d 100644
--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
+++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
@@ -96,7 +96,7 @@ public final class ImaAdsLoader
     private @Nullable Set<UiElement> adUiElements;
     private int vastLoadTimeoutMs;
     private int mediaLoadTimeoutMs;
-    private int mediaBitrateKbps;
+    private int mediaBitrate;
     private ImaFactory imaFactory;
 
     /**
@@ -108,7 +108,7 @@ public final class ImaAdsLoader
       this.context = Assertions.checkNotNull(context);
       vastLoadTimeoutMs = TIMEOUT_UNSET;
       mediaLoadTimeoutMs = TIMEOUT_UNSET;
-      mediaBitrateKbps = BITRATE_UNSET;
+      mediaBitrate = BITRATE_UNSET;
       imaFactory = new DefaultImaFactory();
     }
 
@@ -177,15 +177,15 @@ public final class ImaAdsLoader
     }
 
     /**
-     * Sets the ad media maximum recommended bitrate, in Kbps.
+     * Sets the ad media maximum recommended bitrate, in bps.
      *
-     * @param mediaBitrateKbps The ad media maximum recommended bitrate, in Kbps.
+     * @param bitrate The ad media maximum recommended bitrate, in bps.
      * @return This builder, for convenience.
      * @see AdsRenderingSettings#setBitrateKbps(int)
      */
-    public Builder setMediaBitrateKbps(int mediaBitrateKbps) {
-      Assertions.checkArgument(mediaBitrateKbps > 0);
-      this.mediaBitrateKbps = mediaBitrateKbps;
+    public Builder setMaxMediaBitrate(int bitrate) {
+      Assertions.checkArgument(bitrate > 0);
+      this.mediaBitrate = bitrate;
       return this;
     }
 
@@ -211,7 +211,7 @@ public final class ImaAdsLoader
           null,
           vastLoadTimeoutMs,
           mediaLoadTimeoutMs,
-          mediaBitrateKbps,
+          mediaBitrate,
           adUiElements,
           adEventListener,
           imaFactory);
@@ -232,7 +232,7 @@ public final class ImaAdsLoader
           adsResponse,
           vastLoadTimeoutMs,
           mediaLoadTimeoutMs,
-          mediaBitrateKbps,
+          mediaBitrate,
           adUiElements,
           adEventListener,
           imaFactory);
@@ -287,7 +287,7 @@ public final class ImaAdsLoader
   private final @Nullable String adsResponse;
   private final int vastLoadTimeoutMs;
   private final int mediaLoadTimeoutMs;
-  private final int mediaBitrateKbps;
+  private final int mediaBitrate;
   private final @Nullable Set<UiElement> adUiElements;
   private final @Nullable AdEventListener adEventListener;
   private final ImaFactory imaFactory;
@@ -375,7 +375,7 @@ public final class ImaAdsLoader
         /* adsResponse= */ null,
         /* vastLoadTimeoutMs= */ TIMEOUT_UNSET,
         /* mediaLoadTimeoutMs= */ TIMEOUT_UNSET,
-        /* mediaBitrateKpbs= */ BITRATE_UNSET,
+        /* mediaBitrate= */ BITRATE_UNSET,
         /* adUiElements= */ null,
         /* adEventListener= */ null,
         /* imaFactory= */ new DefaultImaFactory());
@@ -401,7 +401,7 @@ public final class ImaAdsLoader
         /* adsResponse= */ null,
         /* vastLoadTimeoutMs= */ TIMEOUT_UNSET,
         /* mediaLoadTimeoutMs= */ TIMEOUT_UNSET,
-        /* mediaBitrateKbps= */ BITRATE_UNSET,
+        /* mediaBitrate= */ BITRATE_UNSET,
         /* adUiElements= */ null,
         /* adEventListener= */ null,
         /* imaFactory= */ new DefaultImaFactory());
@@ -414,7 +414,7 @@ public final class ImaAdsLoader
       @Nullable String adsResponse,
       int vastLoadTimeoutMs,
       int mediaLoadTimeoutMs,
-      int mediaBitrateKbps,
+      int mediaBitrate,
       @Nullable Set<UiElement> adUiElements,
       @Nullable AdEventListener adEventListener,
       ImaFactory imaFactory) {
@@ -423,7 +423,7 @@ public final class ImaAdsLoader
     this.adsResponse = adsResponse;
     this.vastLoadTimeoutMs = vastLoadTimeoutMs;
     this.mediaLoadTimeoutMs = mediaLoadTimeoutMs;
-    this.mediaBitrateKbps = mediaBitrateKbps;
+    this.mediaBitrate = mediaBitrate;
     this.adUiElements = adUiElements;
     this.adEventListener = adEventListener;
     this.imaFactory = imaFactory;
@@ -971,8 +971,8 @@ public final class ImaAdsLoader
     if (mediaLoadTimeoutMs != TIMEOUT_UNSET) {
       adsRenderingSettings.setLoadVideoTimeout(mediaLoadTimeoutMs);
     }
-    if (mediaBitrateKbps != BITRATE_UNSET) {
-      adsRenderingSettings.setBitrateKbps(mediaBitrateKbps);
+    if (mediaBitrate != BITRATE_UNSET) {
+      adsRenderingSettings.setBitrateKbps(mediaBitrate / 1000);
     }
     if (adUiElements != null) {
       adsRenderingSettings.setUiElements(adUiElements);

From 23666e3ac89ae28ae78679dc5e3300e91822562f Mon Sep 17 00:00:00 2001
From: ogaclejapan <ogaclejapan@gmail.com>
Date: Tue, 23 Oct 2018 11:44:53 +0900
Subject: [PATCH 100/832] Fix adUiElements variables even more robust

---
 .../com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
index 4b35c7545d..060a3a02a5 100644
--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
+++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
@@ -68,6 +68,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -146,7 +147,7 @@ public final class ImaAdsLoader
      * @see AdsRenderingSettings#setUiElements(Set)
      */
     public Builder setAdUiElements(Set<UiElement> adUiElements) {
-      this.adUiElements = Assertions.checkNotNull(adUiElements);
+      this.adUiElements = new HashSet<>(Assertions.checkNotNull(adUiElements));
       return this;
     }
 

From 9d114b1ccb784fe5d4b5392eb41d30d67eb19e64 Mon Sep 17 00:00:00 2001
From: Yuki312 <define1394@gmail.com>
Date: Tue, 23 Oct 2018 17:13:26 +0900
Subject: [PATCH 101/832] fix checkIdleRequirement

---
 .../com/google/android/exoplayer2/scheduler/Requirements.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
index 4d6dbd83be..5acd31ee0d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
@@ -187,7 +187,7 @@ public final class Requirements {
     }
     PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
     return Util.SDK_INT >= 23
-        ? !powerManager.isDeviceIdleMode()
+        ? powerManager.isDeviceIdleMode()
         : Util.SDK_INT >= 20 ? !powerManager.isInteractive() : !powerManager.isScreenOn();
   }
 

From 8c5703e9313db0dde1b37563a1c8c56e0fae2a40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrik=20=C3=85kerfeldt?= <patrik.akerfeldt@gmail.com>
Date: Tue, 23 Oct 2018 16:25:40 +0200
Subject: [PATCH 102/832] Provide http status message to
 InvalidResponseCodeException

When response code alone is not enough to distinguish error responses, the http status message is helpful.
---
 .../exoplayer2/ext/cronet/CronetDataSource.java        |  5 +++--
 .../exoplayer2/ext/okhttp/OkHttpDataSource.java        |  2 +-
 .../exoplayer2/upstream/DefaultHttpDataSource.java     |  4 +++-
 .../android/exoplayer2/upstream/HttpDataSource.java    | 10 +++++++++-
 .../upstream/DefaultLoadErrorHandlingPolicyTest.java   |  6 +++---
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java b/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java
index 9525983491..d67d8bb107 100644
--- a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java
+++ b/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java
@@ -327,7 +327,7 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
     int responseCode = responseInfo.getHttpStatusCode();
     if (responseCode < 200 || responseCode > 299) {
       InvalidResponseCodeException exception = new InvalidResponseCodeException(responseCode,
-          responseInfo.getAllHeaders(), currentDataSpec);
+          responseInfo.getHttpStatusText(), responseInfo.getAllHeaders(), currentDataSpec);
       if (responseCode == 416) {
         exception.initCause(new DataSourceException(DataSourceException.POSITION_OUT_OF_RANGE));
       }
@@ -611,7 +611,8 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
         // The industry standard is to disregard POST redirects when the status code is 307 or 308.
         if (responseCode == 307 || responseCode == 308) {
           exception =
-              new InvalidResponseCodeException(responseCode, info.getAllHeaders(), currentDataSpec);
+              new InvalidResponseCodeException(responseCode, info.getHttpStatusText(),
+                      info.getAllHeaders(), currentDataSpec);
           operation.open();
           return;
         }
diff --git a/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java b/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java
index 2707f539bc..8091c7c94b 100644
--- a/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java
+++ b/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java
@@ -173,7 +173,7 @@ public class OkHttpDataSource extends BaseDataSource implements HttpDataSource {
       Map<String, List<String>> headers = response.headers().toMultimap();
       closeConnectionQuietly();
       InvalidResponseCodeException exception = new InvalidResponseCodeException(
-          responseCode, headers, dataSpec);
+          responseCode, response.message(), headers, dataSpec);
       if (responseCode == 416) {
         exception.initCause(new DataSourceException(DataSourceException.POSITION_OUT_OF_RANGE));
       }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
index 3673af5540..c6749e6c8f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
@@ -283,8 +283,10 @@ public class DefaultHttpDataSource extends BaseDataSource implements HttpDataSou
     }
 
     int responseCode;
+    String responseMessage;
     try {
       responseCode = connection.getResponseCode();
+      responseMessage = connection.getResponseMessage();
     } catch (IOException e) {
       closeConnectionQuietly();
       throw new HttpDataSourceException("Unable to connect to " + dataSpec.uri.toString(), e,
@@ -296,7 +298,7 @@ public class DefaultHttpDataSource extends BaseDataSource implements HttpDataSou
       Map<String, List<String>> headers = connection.getHeaderFields();
       closeConnectionQuietly();
       InvalidResponseCodeException exception =
-          new InvalidResponseCodeException(responseCode, headers, dataSpec);
+          new InvalidResponseCodeException(responseCode, responseMessage, headers, dataSpec);
       if (responseCode == 416) {
         exception.initCause(new DataSourceException(DataSourceException.POSITION_OUT_OF_RANGE));
       }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
index 0be7b857df..0ee28b260f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2.upstream;
 
 import android.support.annotation.IntDef;
+import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import com.google.android.exoplayer2.util.Predicate;
 import com.google.android.exoplayer2.util.Util;
@@ -294,15 +295,22 @@ public interface HttpDataSource extends DataSource {
      */
     public final int responseCode;
 
+    /**
+     * The HTTP status message.
+     */
+    public final @Nullable String responseMessage;
+
     /**
      * An unmodifiable map of the response header fields and values.
      */
     public final Map<String, List<String>> headerFields;
 
-    public InvalidResponseCodeException(int responseCode, Map<String, List<String>> headerFields,
+    public InvalidResponseCodeException(int responseCode, @Nullable String responseMessage,
+                                        Map<String, List<String>> headerFields,
         DataSpec dataSpec) {
       super("Response code: " + responseCode, dataSpec, TYPE_OPEN);
       this.responseCode = responseCode;
+      this.responseMessage = responseMessage;
       this.headerFields = headerFields;
     }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicyTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicyTest.java
index 0c2b938a64..d656e0dfcc 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicyTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicyTest.java
@@ -34,7 +34,7 @@ public final class DefaultLoadErrorHandlingPolicyTest {
   @Test
   public void getBlacklistDurationMsFor_blacklist404() {
     InvalidResponseCodeException exception =
-        new InvalidResponseCodeException(404, Collections.emptyMap(), new DataSpec(Uri.EMPTY));
+        new InvalidResponseCodeException(404, "Not Found", Collections.emptyMap(), new DataSpec(Uri.EMPTY));
     assertThat(getDefaultPolicyBlacklistOutputFor(exception))
         .isEqualTo(DefaultLoadErrorHandlingPolicy.DEFAULT_TRACK_BLACKLIST_MS);
   }
@@ -42,7 +42,7 @@ public final class DefaultLoadErrorHandlingPolicyTest {
   @Test
   public void getBlacklistDurationMsFor_blacklist410() {
     InvalidResponseCodeException exception =
-        new InvalidResponseCodeException(410, Collections.emptyMap(), new DataSpec(Uri.EMPTY));
+        new InvalidResponseCodeException(410, "Gone", Collections.emptyMap(), new DataSpec(Uri.EMPTY));
     assertThat(getDefaultPolicyBlacklistOutputFor(exception))
         .isEqualTo(DefaultLoadErrorHandlingPolicy.DEFAULT_TRACK_BLACKLIST_MS);
   }
@@ -50,7 +50,7 @@ public final class DefaultLoadErrorHandlingPolicyTest {
   @Test
   public void getBlacklistDurationMsFor_dontBlacklistUnexpectedHttpCodes() {
     InvalidResponseCodeException exception =
-        new InvalidResponseCodeException(500, Collections.emptyMap(), new DataSpec(Uri.EMPTY));
+        new InvalidResponseCodeException(500, "Internal Server Error", Collections.emptyMap(), new DataSpec(Uri.EMPTY));
     assertThat(getDefaultPolicyBlacklistOutputFor(exception)).isEqualTo(C.TIME_UNSET);
   }
 

From 70ccbc6eb8f82488d7163af606e81ef358acd640 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@users.noreply.github.com>
Date: Tue, 23 Oct 2018 18:46:52 +0200
Subject: [PATCH 103/832] Fix review comments

See https://github.com/google/ExoPlayer/pull/5004
---
 .../exoplayer2/ext/cronet/CronetDataSource.java   | 15 +++++++++++----
 .../exoplayer2/ext/okhttp/OkHttpDataSource.java   |  4 ++--
 .../exoplayer2/upstream/HttpDataSource.java       |  8 +++++---
 .../DefaultLoadErrorHandlingPolicyTest.java       |  3 ++-
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java b/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java
index d67d8bb107..9f381d0053 100644
--- a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java
+++ b/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java
@@ -326,8 +326,12 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
     // Check for a valid response code.
     int responseCode = responseInfo.getHttpStatusCode();
     if (responseCode < 200 || responseCode > 299) {
-      InvalidResponseCodeException exception = new InvalidResponseCodeException(responseCode,
-          responseInfo.getHttpStatusText(), responseInfo.getAllHeaders(), currentDataSpec);
+      InvalidResponseCodeException exception =
+          new InvalidResponseCodeException(
+              responseCode,
+              responseInfo.getHttpStatusText(),
+              responseInfo.getAllHeaders(),
+              currentDataSpec);
       if (responseCode == 416) {
         exception.initCause(new DataSourceException(DataSourceException.POSITION_OUT_OF_RANGE));
       }
@@ -611,8 +615,11 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
         // The industry standard is to disregard POST redirects when the status code is 307 or 308.
         if (responseCode == 307 || responseCode == 308) {
           exception =
-              new InvalidResponseCodeException(responseCode, info.getHttpStatusText(),
-                      info.getAllHeaders(), currentDataSpec);
+              new InvalidResponseCodeException(
+                  responseCode,
+                  info.getHttpStatusText(),
+                  info.getAllHeaders(),
+                  currentDataSpec);
           operation.open();
           return;
         }
diff --git a/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java b/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java
index 8091c7c94b..778277fdbc 100644
--- a/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java
+++ b/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java
@@ -172,8 +172,8 @@ public class OkHttpDataSource extends BaseDataSource implements HttpDataSource {
     if (!response.isSuccessful()) {
       Map<String, List<String>> headers = response.headers().toMultimap();
       closeConnectionQuietly();
-      InvalidResponseCodeException exception = new InvalidResponseCodeException(
-          responseCode, response.message(), headers, dataSpec);
+      InvalidResponseCodeException exception =
+          new InvalidResponseCodeException(responseCode, response.message(), headers, dataSpec);
       if (responseCode == 416) {
         exception.initCause(new DataSourceException(DataSourceException.POSITION_OUT_OF_RANGE));
       }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
index 0ee28b260f..e73901eccb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
@@ -298,15 +298,17 @@ public interface HttpDataSource extends DataSource {
     /**
      * The HTTP status message.
      */
-    public final @Nullable String responseMessage;
+    @Nullable public final String responseMessage;
 
     /**
      * An unmodifiable map of the response header fields and values.
      */
     public final Map<String, List<String>> headerFields;
 
-    public InvalidResponseCodeException(int responseCode, @Nullable String responseMessage,
-                                        Map<String, List<String>> headerFields,
+    public InvalidResponseCodeException(
+        int responseCode,
+        @Nullable String responseMessage,
+        Map<String, List<String>> headerFields,
         DataSpec dataSpec) {
       super("Response code: " + responseCode, dataSpec, TYPE_OPEN);
       this.responseCode = responseCode;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicyTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicyTest.java
index d656e0dfcc..f0f737828c 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicyTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicyTest.java
@@ -50,7 +50,8 @@ public final class DefaultLoadErrorHandlingPolicyTest {
   @Test
   public void getBlacklistDurationMsFor_dontBlacklistUnexpectedHttpCodes() {
     InvalidResponseCodeException exception =
-        new InvalidResponseCodeException(500, "Internal Server Error", Collections.emptyMap(), new DataSpec(Uri.EMPTY));
+        new InvalidResponseCodeException(
+            500, "Internal Server Error", Collections.emptyMap(), new DataSpec(Uri.EMPTY));
     assertThat(getDefaultPolicyBlacklistOutputFor(exception)).isEqualTo(C.TIME_UNSET);
   }
 

From 8f3c3e284155ff26a23c29a089305bdb0a6ab7e4 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Fri, 19 Oct 2018 03:14:26 -0700
Subject: [PATCH 104/832] Add GlUtil createBuffer overload which doesn't copy
 values

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217846755
---
 .../android/exoplayer2/util/GlUtil.java       | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/GlUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/util/GlUtil.java
index 72a782c2ac..df22e6dc2e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/GlUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/GlUtil.java
@@ -95,14 +95,23 @@ public final class GlUtil {
     return program;
   }
 
-  /** Allocates a FloatBuffer with the given data. */
+  /**
+   * Allocates a FloatBuffer with the given data.
+   *
+   * @param data Used to initialize the new buffer.
+   */
   public static FloatBuffer createBuffer(float[] data) {
-    ByteBuffer byteBuffer = ByteBuffer.allocateDirect(data.length * C.BYTES_PER_FLOAT);
-    byteBuffer.order(ByteOrder.nativeOrder());
-    FloatBuffer buffer = byteBuffer.asFloatBuffer();
-    buffer.put(data);
-    buffer.flip();
-    return buffer;
+    return (FloatBuffer) createBuffer(data.length).put(data).flip();
+  }
+
+  /**
+   * Allocates a FloatBuffer.
+   *
+   * @param capacity The new buffer's capacity, in floats.
+   */
+  public static FloatBuffer createBuffer(int capacity) {
+    ByteBuffer byteBuffer = ByteBuffer.allocateDirect(capacity * C.BYTES_PER_FLOAT);
+    return byteBuffer.order(ByteOrder.nativeOrder()).asFloatBuffer();
   }
 
   /**

From bf57d4402343f214985a330255bc2f044c6707a9 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 19 Oct 2018 08:37:01 -0700
Subject: [PATCH 105/832] Update VR video player sample app

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217874381
---
 .../source/ClippingMediaSource.java           | 30 -------------------
 1 file changed, 30 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
index 5f80725805..8ac9460586 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
@@ -116,36 +116,6 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> {
         /* relativeToDefaultPosition= */ false);
   }
 
-  /**
-   * Creates a new clipping source that wraps the specified source and provides samples between the
-   * specified start and end position.
-   *
-   * @param mediaSource The single-period source to wrap.
-   * @param startPositionUs The start position within {@code mediaSource}'s window at which to start
-   *     providing samples, in microseconds.
-   * @param endPositionUs The end position within {@code mediaSource}'s window at which to stop
-   *     providing samples, in microseconds. Specify {@link C#TIME_END_OF_SOURCE} to provide samples
-   *     from the specified start point up to the end of the source. Specifying a position that
-   *     exceeds the {@code mediaSource}'s duration will also result in the end of the source not
-   *     being clipped.
-   * @param enableInitialDiscontinuity Whether the initial discontinuity should be enabled.
-   */
-  // TODO: remove this when the new API is public.
-  @Deprecated
-  public ClippingMediaSource(
-      MediaSource mediaSource,
-      long startPositionUs,
-      long endPositionUs,
-      boolean enableInitialDiscontinuity) {
-    this(
-        mediaSource,
-        startPositionUs,
-        endPositionUs,
-        enableInitialDiscontinuity,
-        /* allowDynamicClippingUpdates= */ false,
-        /* relativeToDefaultPosition= */ false);
-  }
-
   /**
    * Creates a new clipping source that wraps the specified source and provides samples from the
    * default position for the specified duration.

From 4c6507e7a0e101468268cce03c062275c5c13b65 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 19 Oct 2018 09:32:07 -0700
Subject: [PATCH 106/832] Remove deprecated MediaSource.prepareSource.

This method only ensured backward compatibility while the new version was not
public yet. Now ExoPlayer 2.9.0. is public, this workaround can be removed.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217881691
---
 .../google/android/exoplayer2/source/BaseMediaSource.java   | 6 ------
 .../com/google/android/exoplayer2/source/MediaSource.java   | 5 -----
 2 files changed, 11 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/BaseMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/BaseMediaSource.java
index 2feac2978e..3d6e204c9c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/BaseMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/BaseMediaSource.java
@@ -133,12 +133,6 @@ public abstract class BaseMediaSource implements MediaSource {
     eventDispatcher.removeEventListener(eventListener);
   }
 
-  @Override
-  public final void prepareSource(
-      ExoPlayer player, boolean isTopLevelSource, SourceInfoRefreshListener listener) {
-    prepareSource(player, isTopLevelSource, listener, /* mediaTransferListener= */ null);
-  }
-
   @Override
   public final void prepareSource(
       ExoPlayer player,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
index 6b0f5c8eeb..2a94e884a6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
@@ -220,11 +220,6 @@ public interface MediaSource {
    */
   void removeEventListener(MediaSourceEventListener eventListener);
 
-  /** @deprecated Will be removed in the next release. */
-  @Deprecated
-  void prepareSource(
-      ExoPlayer player, boolean isTopLevelSource, SourceInfoRefreshListener listener);
-
   /**
    * Starts source preparation if not yet started, and adds a listener for timeline and/or manifest
    * updates.

From ca4b5d0a0def1928323b4ec86dd4564b89d4bba4 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 19 Oct 2018 10:05:44 -0700
Subject: [PATCH 107/832] Make context non-optional for DefaultBandwidthMeter

- Added ability to override the DefaultBandwidthMeter network type.
- These methods currently only work properly if called before the
  meter is used, but the plan is for them to be handled in the same
  way as internally detected network changes.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217887019
---
 .../flac/src/androidTest/AndroidManifest.xml  |   2 +
 .../exoplayer2/ext/flac/FlacPlaybackTest.java |   2 +-
 .../opus/src/androidTest/AndroidManifest.xml  |   2 +
 .../exoplayer2/ext/opus/OpusPlaybackTest.java |   2 +-
 .../vp9/src/androidTest/AndroidManifest.xml   |   2 +
 .../exoplayer2/ext/vp9/VpxPlaybackTest.java   |   2 +-
 .../android/exoplayer2/ExoPlayerFactory.java  | 124 ++++++++----------
 .../upstream/DefaultBandwidthMeter.java       |  78 +++++++----
 8 files changed, 115 insertions(+), 99 deletions(-)

diff --git a/extensions/flac/src/androidTest/AndroidManifest.xml b/extensions/flac/src/androidTest/AndroidManifest.xml
index cfc90117ac..68ab6fe0c3 100644
--- a/extensions/flac/src/androidTest/AndroidManifest.xml
+++ b/extensions/flac/src/androidTest/AndroidManifest.xml
@@ -18,6 +18,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer2.ext.flac.test">
 
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+
   <application android:debuggable="true"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java
index 99ddba55c4..2efdde4e58 100644
--- a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java
+++ b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java
@@ -83,7 +83,7 @@ public class FlacPlaybackTest {
       Looper.prepare();
       LibflacAudioRenderer audioRenderer = new LibflacAudioRenderer();
       DefaultTrackSelector trackSelector = new DefaultTrackSelector();
-      player = ExoPlayerFactory.newInstance(new Renderer[] {audioRenderer}, trackSelector);
+      player = ExoPlayerFactory.newInstance(context, new Renderer[] {audioRenderer}, trackSelector);
       player.addListener(this);
       MediaSource mediaSource =
           new ExtractorMediaSource.Factory(
diff --git a/extensions/opus/src/androidTest/AndroidManifest.xml b/extensions/opus/src/androidTest/AndroidManifest.xml
index 5ba0f3c0f4..9c1241a512 100644
--- a/extensions/opus/src/androidTest/AndroidManifest.xml
+++ b/extensions/opus/src/androidTest/AndroidManifest.xml
@@ -18,6 +18,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer2.ext.opus.test">
 
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+
   <application android:debuggable="true"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
diff --git a/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java b/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java
index c457514c87..5ad864c597 100644
--- a/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java
+++ b/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java
@@ -83,7 +83,7 @@ public class OpusPlaybackTest {
       Looper.prepare();
       LibopusAudioRenderer audioRenderer = new LibopusAudioRenderer();
       DefaultTrackSelector trackSelector = new DefaultTrackSelector();
-      player = ExoPlayerFactory.newInstance(new Renderer[] {audioRenderer}, trackSelector);
+      player = ExoPlayerFactory.newInstance(context, new Renderer[] {audioRenderer}, trackSelector);
       player.addListener(this);
       MediaSource mediaSource =
           new ExtractorMediaSource.Factory(
diff --git a/extensions/vp9/src/androidTest/AndroidManifest.xml b/extensions/vp9/src/androidTest/AndroidManifest.xml
index 214427c4f0..aef376237e 100644
--- a/extensions/vp9/src/androidTest/AndroidManifest.xml
+++ b/extensions/vp9/src/androidTest/AndroidManifest.xml
@@ -18,6 +18,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer2.ext.vp9.test">
 
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+
   <application android:debuggable="true"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
diff --git a/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java b/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
index 2eb5c87e04..c6d1e667e0 100644
--- a/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
+++ b/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
@@ -116,7 +116,7 @@ public class VpxPlaybackTest {
       Looper.prepare();
       LibvpxVideoRenderer videoRenderer = new LibvpxVideoRenderer(true, 0);
       DefaultTrackSelector trackSelector = new DefaultTrackSelector();
-      player = ExoPlayerFactory.newInstance(new Renderer[] {videoRenderer}, trackSelector);
+      player = ExoPlayerFactory.newInstance(context, new Renderer[] {videoRenderer}, trackSelector);
       player.addListener(this);
       MediaSource mediaSource =
           new ExtractorMediaSource.Factory(
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java
index 81f4285a08..c63dbc04d0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java
@@ -19,7 +19,6 @@ import android.content.Context;
 import android.os.Looper;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.analytics.AnalyticsCollector;
-import com.google.android.exoplayer2.audio.AudioAttributes;
 import com.google.android.exoplayer2.drm.DrmSessionManager;
 import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
@@ -38,44 +37,6 @@ public final class ExoPlayerFactory {
 
   private ExoPlayerFactory() {}
 
-  /**
-   * Creates a {@link SimpleExoPlayer} instance.
-   *
-   * @param context A {@link Context}.
-   * @param trackSelector The {@link TrackSelector} that will be used by the instance.
-   * @param loadControl The {@link LoadControl} that will be used by the instance.
-   * @deprecated Use {@link #newSimpleInstance(Context, RenderersFactory, TrackSelector,
-   *     LoadControl)}.
-   */
-  @Deprecated
-  public static SimpleExoPlayer newSimpleInstance(
-      Context context, TrackSelector trackSelector, LoadControl loadControl) {
-    RenderersFactory renderersFactory = new DefaultRenderersFactory(context);
-    return newSimpleInstance(context, renderersFactory, trackSelector, loadControl);
-  }
-
-  /**
-   * Creates a {@link SimpleExoPlayer} instance. Available extension renderers are not used.
-   *
-   * @param context A {@link Context}.
-   * @param trackSelector The {@link TrackSelector} that will be used by the instance.
-   * @param loadControl The {@link LoadControl} that will be used by the instance.
-   * @param drmSessionManager An optional {@link DrmSessionManager}. May be null if the instance
-   *     will not be used for DRM protected playbacks.
-   * @deprecated Use {@link #newSimpleInstance(Context, RenderersFactory, TrackSelector,
-   *     LoadControl)}.
-   */
-  @Deprecated
-  public static SimpleExoPlayer newSimpleInstance(
-      Context context,
-      TrackSelector trackSelector,
-      LoadControl loadControl,
-      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager) {
-    RenderersFactory renderersFactory = new DefaultRenderersFactory(context);
-    return newSimpleInstance(
-        context, renderersFactory, trackSelector, loadControl, drmSessionManager);
-  }
-
   /**
    * Creates a {@link SimpleExoPlayer} instance.
    *
@@ -88,7 +49,7 @@ public final class ExoPlayerFactory {
    *     extension renderers are used. Note that extensions must be included in the application
    *     build for them to be considered available.
    * @deprecated Use {@link #newSimpleInstance(Context, RenderersFactory, TrackSelector,
-   *     LoadControl)}.
+   *     LoadControl, DrmSessionManager)}.
    */
   @Deprecated
   public static SimpleExoPlayer newSimpleInstance(
@@ -116,7 +77,7 @@ public final class ExoPlayerFactory {
    * @param allowedVideoJoiningTimeMs The maximum duration for which a video renderer can attempt to
    *     seamlessly join an ongoing playback.
    * @deprecated Use {@link #newSimpleInstance(Context, RenderersFactory, TrackSelector,
-   *     LoadControl)}.
+   *     LoadControl, DrmSessionManager)}.
    */
   @Deprecated
   public static SimpleExoPlayer newSimpleInstance(
@@ -151,23 +112,6 @@ public final class ExoPlayerFactory {
     return newSimpleInstance(context, new DefaultRenderersFactory(context), trackSelector);
   }
 
-  /**
-   * Creates a {@link SimpleExoPlayer} instance.
-   *
-   * @param renderersFactory A factory for creating {@link Renderer}s to be used by the instance.
-   * @param trackSelector The {@link TrackSelector} that will be used by the instance.
-   * @deprecated Use {@link #newSimpleInstance(Context, RenderersFactory, TrackSelector)}. The use
-   *     of {@link SimpleExoPlayer#setAudioAttributes(AudioAttributes, boolean)} to manage audio
-   *     focus will be unavailable for the {@link SimpleExoPlayer} returned by this method.
-   */
-  @Deprecated
-  @SuppressWarnings("nullness:argument.type.incompatible")
-  public static SimpleExoPlayer newSimpleInstance(
-      RenderersFactory renderersFactory, TrackSelector trackSelector) {
-    return newSimpleInstance(
-        /* context= */ null, renderersFactory, trackSelector, new DefaultLoadControl());
-  }
-
   /**
    * Creates a {@link SimpleExoPlayer} instance.
    *
@@ -180,6 +124,38 @@ public final class ExoPlayerFactory {
     return newSimpleInstance(context, renderersFactory, trackSelector, new DefaultLoadControl());
   }
 
+  /**
+   * Creates a {@link SimpleExoPlayer} instance.
+   *
+   * @param context A {@link Context}.
+   * @param trackSelector The {@link TrackSelector} that will be used by the instance.
+   * @param loadControl The {@link LoadControl} that will be used by the instance.
+   */
+  public static SimpleExoPlayer newSimpleInstance(
+      Context context, TrackSelector trackSelector, LoadControl loadControl) {
+    RenderersFactory renderersFactory = new DefaultRenderersFactory(context);
+    return newSimpleInstance(context, renderersFactory, trackSelector, loadControl);
+  }
+
+  /**
+   * Creates a {@link SimpleExoPlayer} instance. Available extension renderers are not used.
+   *
+   * @param context A {@link Context}.
+   * @param trackSelector The {@link TrackSelector} that will be used by the instance.
+   * @param loadControl The {@link LoadControl} that will be used by the instance.
+   * @param drmSessionManager An optional {@link DrmSessionManager}. May be null if the instance
+   *     will not be used for DRM protected playbacks.
+   */
+  public static SimpleExoPlayer newSimpleInstance(
+      Context context,
+      TrackSelector trackSelector,
+      LoadControl loadControl,
+      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager) {
+    RenderersFactory renderersFactory = new DefaultRenderersFactory(context);
+    return newSimpleInstance(
+        context, renderersFactory, trackSelector, loadControl, drmSessionManager);
+  }
+
   /**
    * Creates a {@link SimpleExoPlayer} instance.
    *
@@ -355,7 +331,7 @@ public final class ExoPlayerFactory {
         trackSelector,
         loadControl,
         drmSessionManager,
-        getDefaultBandwidthMeter(),
+        getDefaultBandwidthMeter(context),
         analyticsCollectorFactory,
         looper);
   }
@@ -397,28 +373,32 @@ public final class ExoPlayerFactory {
   /**
    * Creates an {@link ExoPlayer} instance.
    *
+   * @param context A {@link Context}.
    * @param renderers The {@link Renderer}s that will be used by the instance.
    * @param trackSelector The {@link TrackSelector} that will be used by the instance.
    */
-  public static ExoPlayer newInstance(Renderer[] renderers, TrackSelector trackSelector) {
-    return newInstance(renderers, trackSelector, new DefaultLoadControl());
+  public static ExoPlayer newInstance(
+      Context context, Renderer[] renderers, TrackSelector trackSelector) {
+    return newInstance(context, renderers, trackSelector, new DefaultLoadControl());
   }
 
   /**
    * Creates an {@link ExoPlayer} instance.
    *
+   * @param context A {@link Context}.
    * @param renderers The {@link Renderer}s that will be used by the instance.
    * @param trackSelector The {@link TrackSelector} that will be used by the instance.
    * @param loadControl The {@link LoadControl} that will be used by the instance.
    */
-  public static ExoPlayer newInstance(Renderer[] renderers, TrackSelector trackSelector,
-      LoadControl loadControl) {
-    return newInstance(renderers, trackSelector, loadControl, Util.getLooper());
+  public static ExoPlayer newInstance(
+      Context context, Renderer[] renderers, TrackSelector trackSelector, LoadControl loadControl) {
+    return newInstance(context, renderers, trackSelector, loadControl, Util.getLooper());
   }
 
   /**
    * Creates an {@link ExoPlayer} instance.
    *
+   * @param context A {@link Context}.
    * @param renderers The {@link Renderer}s that will be used by the instance.
    * @param trackSelector The {@link TrackSelector} that will be used by the instance.
    * @param loadControl The {@link LoadControl} that will be used by the instance.
@@ -426,13 +406,19 @@ public final class ExoPlayerFactory {
    *     used to call listeners on.
    */
   public static ExoPlayer newInstance(
-      Renderer[] renderers, TrackSelector trackSelector, LoadControl loadControl, Looper looper) {
-    return newInstance(renderers, trackSelector, loadControl, getDefaultBandwidthMeter(), looper);
+      Context context,
+      Renderer[] renderers,
+      TrackSelector trackSelector,
+      LoadControl loadControl,
+      Looper looper) {
+    return newInstance(
+        context, renderers, trackSelector, loadControl, getDefaultBandwidthMeter(context), looper);
   }
 
   /**
    * Creates an {@link ExoPlayer} instance.
    *
+   * @param context A {@link Context}.
    * @param renderers The {@link Renderer}s that will be used by the instance.
    * @param trackSelector The {@link TrackSelector} that will be used by the instance.
    * @param loadControl The {@link LoadControl} that will be used by the instance.
@@ -440,7 +426,9 @@ public final class ExoPlayerFactory {
    * @param looper The {@link Looper} which must be used for all calls to the player and which is
    *     used to call listeners on.
    */
+  @SuppressWarnings("unused")
   public static ExoPlayer newInstance(
+      Context context,
       Renderer[] renderers,
       TrackSelector trackSelector,
       LoadControl loadControl,
@@ -450,9 +438,9 @@ public final class ExoPlayerFactory {
         renderers, trackSelector, loadControl, bandwidthMeter, Clock.DEFAULT, looper);
   }
 
-  private static synchronized BandwidthMeter getDefaultBandwidthMeter() {
+  private static synchronized BandwidthMeter getDefaultBandwidthMeter(Context context) {
     if (singletonBandwidthMeter == null) {
-      singletonBandwidthMeter = new DefaultBandwidthMeter.Builder().build();
+      singletonBandwidthMeter = new DefaultBandwidthMeter.Builder(context).build();
     }
     return singletonBandwidthMeter;
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
index 21e2ed4f65..561ecfb024 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
@@ -82,18 +82,13 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
     private int slidingWindowMaxWeight;
     private Clock clock;
 
-    /** @deprecated Use {@link #Builder(Context)} instead. */
-    @Deprecated
-    public Builder() {
-      this(/* context= */ null);
-    }
-
     /**
      * Creates a builder with default parameters and without listener.
      *
      * @param context A context.
      */
-    public Builder(@Nullable Context context) {
+    public Builder(Context context) {
+      // Handling of null is for backward compatibility only.
       this.context = context == null ? null : context.getApplicationContext();
       initialBitrateEstimates = getInitialBitrateEstimatesForCountry(Util.getCountryCode(context));
       slidingWindowMaxWeight = DEFAULT_SLIDING_WINDOW_MAX_WEIGHT;
@@ -187,14 +182,9 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
      * @return A bandwidth meter with the configured properties.
      */
     public DefaultBandwidthMeter build() {
-      Long initialBitrateEstimate =
-          initialBitrateEstimates.get(
-              context == null ? C.NETWORK_TYPE_UNKNOWN : Util.getNetworkType(context));
-      if (initialBitrateEstimate == null) {
-        initialBitrateEstimate = initialBitrateEstimates.get(C.NETWORK_TYPE_UNKNOWN);
-      }
       DefaultBandwidthMeter bandwidthMeter =
-          new DefaultBandwidthMeter(initialBitrateEstimate, slidingWindowMaxWeight, clock);
+          new DefaultBandwidthMeter(
+              context, initialBitrateEstimates, slidingWindowMaxWeight, clock);
       if (eventHandler != null && eventListener != null) {
         bandwidthMeter.addEventListener(eventHandler, eventListener);
       }
@@ -225,6 +215,7 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
   private static final int ELAPSED_MILLIS_FOR_ESTIMATE = 2000;
   private static final int BYTES_TRANSFERRED_FOR_ESTIMATE = 512 * 1024;
 
+  private final SparseArray<Long> initialBitrateEstimates;
   private final EventDispatcher<EventListener> eventDispatcher;
   private final SlidingPercentile slidingPercentile;
   private final Clock clock;
@@ -237,34 +228,54 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
   private long totalBytesTransferred;
   private long bitrateEstimate;
 
-  /** Creates a bandwidth meter with default parameters. */
+  /** @deprecated Use {@link Builder} instead. */
+  @Deprecated
   public DefaultBandwidthMeter() {
-    this(DEFAULT_INITIAL_BITRATE_ESTIMATE, DEFAULT_SLIDING_WINDOW_MAX_WEIGHT, Clock.DEFAULT);
+    this(
+        /* context= */ null,
+        /* initialBitrateEstimates= */ new SparseArray<>(),
+        DEFAULT_SLIDING_WINDOW_MAX_WEIGHT,
+        Clock.DEFAULT);
   }
 
   /** @deprecated Use {@link Builder} instead. */
   @Deprecated
   public DefaultBandwidthMeter(Handler eventHandler, EventListener eventListener) {
-    this(DEFAULT_INITIAL_BITRATE_ESTIMATE, DEFAULT_SLIDING_WINDOW_MAX_WEIGHT, Clock.DEFAULT);
+    this(
+        /* context= */ null,
+        /* initialBitrateEstimates= */ new SparseArray<>(),
+        DEFAULT_SLIDING_WINDOW_MAX_WEIGHT,
+        Clock.DEFAULT);
     if (eventHandler != null && eventListener != null) {
       addEventListener(eventHandler, eventListener);
     }
   }
 
-  /** @deprecated Use {@link Builder} instead. */
-  @Deprecated
-  public DefaultBandwidthMeter(Handler eventHandler, EventListener eventListener, int maxWeight) {
-    this(DEFAULT_INITIAL_BITRATE_ESTIMATE, maxWeight, Clock.DEFAULT);
-    if (eventHandler != null && eventListener != null) {
-      addEventListener(eventHandler, eventListener);
-    }
-  }
-
-  private DefaultBandwidthMeter(long initialBitrateEstimate, int maxWeight, Clock clock) {
+  private DefaultBandwidthMeter(
+      @Nullable Context context,
+      SparseArray<Long> initialBitrateEstimates,
+      int maxWeight,
+      Clock clock) {
+    this.initialBitrateEstimates = initialBitrateEstimates;
     this.eventDispatcher = new EventDispatcher<>();
     this.slidingPercentile = new SlidingPercentile(maxWeight);
     this.clock = clock;
-    bitrateEstimate = initialBitrateEstimate;
+    bitrateEstimate =
+        getInitialBitrateEstimateForNetworkType(
+            context == null ? C.NETWORK_TYPE_UNKNOWN : Util.getNetworkType(context));
+  }
+
+  /**
+   * Overrides the network type. Handled in the same way as if the meter had detected a change from
+   * the current network type to the specified network type.
+   *
+   * <p>Applications should not normally call this method. It is intended for testing purposes.
+   *
+   * @param networkType The overriding network type.
+   */
+  public synchronized void setNetworkTypeOverride(@C.NetworkType int networkType) {
+    // TODO: Handle properly as a network change (in same way as non-external network changes).
+    bitrateEstimate = getInitialBitrateEstimateForNetworkType(networkType);
   }
 
   @Override
@@ -343,6 +354,17 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
     eventDispatcher.dispatch(listener -> listener.onBandwidthSample(elapsedMs, bytes, bitrate));
   }
 
+  private long getInitialBitrateEstimateForNetworkType(@C.NetworkType int networkType) {
+    Long initialBitrateEstimate = initialBitrateEstimates.get(networkType);
+    if (initialBitrateEstimate == null) {
+      initialBitrateEstimate = initialBitrateEstimates.get(C.NETWORK_TYPE_UNKNOWN);
+    }
+    if (initialBitrateEstimate == null) {
+      initialBitrateEstimate = DEFAULT_INITIAL_BITRATE_ESTIMATE;
+    }
+    return initialBitrateEstimate;
+  }
+
   private static Map<String, int[]> createInitialBitrateCountryGroupAssignment() {
     HashMap<String, int[]> countryGroupAssignment = new HashMap<>();
     countryGroupAssignment.put("AD", new int[] {1, 0, 0, 0});

From 6977fdbc1d4515f2cc5f16efd2bbee2d17624cd8 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 19 Oct 2018 10:36:35 -0700
Subject: [PATCH 108/832] Properly reset period id and start position in
 ExoPlayerImpl.

This is a no-op change as the respective values are not used so far but
the change makes the current state cleaner and is less error-prone.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217892421
---
 .../android/exoplayer2/ExoPlayerImpl.java     | 18 ++++++++-----
 .../exoplayer2/ExoPlayerImplInternal.java     | 25 ++++++++-----------
 .../android/exoplayer2/PlaybackInfo.java      | 20 ++++++++++++++-
 3 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index 130bf48921..6124a6c18b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -667,20 +667,26 @@ import java.util.concurrent.CopyOnWriteArraySet;
       maskingPeriodIndex = getCurrentPeriodIndex();
       maskingWindowPositionMs = getCurrentPosition();
     }
+    MediaPeriodId mediaPeriodId =
+        resetPosition
+            ? playbackInfo.getDummyFirstMediaPeriodId(shuffleModeEnabled, window)
+            : playbackInfo.periodId;
+    long startPositionUs = resetPosition ? 0 : playbackInfo.positionUs;
+    long contentPositionUs = resetPosition ? C.TIME_UNSET : playbackInfo.contentPositionUs;
     return new PlaybackInfo(
         resetState ? Timeline.EMPTY : playbackInfo.timeline,
         resetState ? null : playbackInfo.manifest,
-        playbackInfo.periodId,
-        playbackInfo.startPositionUs,
-        playbackInfo.contentPositionUs,
+        mediaPeriodId,
+        startPositionUs,
+        contentPositionUs,
         playbackState,
         /* isLoading= */ false,
         resetState ? TrackGroupArray.EMPTY : playbackInfo.trackGroups,
         resetState ? emptyTrackSelectorResult : playbackInfo.trackSelectorResult,
-        playbackInfo.periodId,
-        playbackInfo.startPositionUs,
+        mediaPeriodId,
+        startPositionUs,
         /* totalBufferedDurationUs= */ 0,
-        playbackInfo.startPositionUs);
+        startPositionUs);
   }
 
   private void updatePlaybackInfo(
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index 3034ead032..08e1cbfe2b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -648,7 +648,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
     if (resolvedSeekPosition == null) {
       // The seek position was valid for the timeline that it was performed into, but the
       // timeline has changed or is not ready and a suitable seek position could not be resolved.
-      periodId = getFirstMediaPeriodId();
+      periodId = playbackInfo.getDummyFirstMediaPeriodId(shuffleModeEnabled, window);
       periodPositionUs = C.TIME_UNSET;
       contentPositionUs = C.TIME_UNSET;
       seekPositionAdjusted = true;
@@ -833,17 +833,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
     }
   }
 
-  private MediaPeriodId getFirstMediaPeriodId() {
-    Timeline timeline = playbackInfo.timeline;
-    if (timeline.isEmpty()) {
-      return PlaybackInfo.DUMMY_MEDIA_PERIOD_ID;
-    }
-    int firstPeriodIndex =
-        timeline.getWindow(timeline.getFirstWindowIndex(shuffleModeEnabled), window)
-            .firstPeriodIndex;
-    return new MediaPeriodId(timeline.getUidOfPeriod(firstPeriodIndex));
-  }
-
   private void resetInternal(
       boolean resetRenderers,
       boolean releaseMediaSource,
@@ -885,8 +874,11 @@ import java.util.concurrent.atomic.AtomicBoolean;
       pendingMessages.clear();
       nextPendingMessageIndex = 0;
     }
+    MediaPeriodId mediaPeriodId =
+        resetPosition
+            ? playbackInfo.getDummyFirstMediaPeriodId(shuffleModeEnabled, window)
+            : playbackInfo.periodId;
     // Set the start position to TIME_UNSET so that a subsequent seek to 0 isn't ignored.
-    MediaPeriodId mediaPeriodId = resetPosition ? getFirstMediaPeriodId() : playbackInfo.periodId;
     long startPositionUs = resetPosition ? C.TIME_UNSET : playbackInfo.positionUs;
     long contentPositionUs = resetPosition ? C.TIME_UNSET : playbackInfo.contentPositionUs;
     playbackInfo =
@@ -1262,8 +1254,13 @@ import java.util.concurrent.atomic.AtomicBoolean;
           periodPosition =
               resolveSeekPosition(pendingInitialSeekPosition, /* trySubsequentPeriods= */ true);
         } catch (IllegalSeekPositionException e) {
+          MediaPeriodId firstMediaPeriodId =
+              playbackInfo.getDummyFirstMediaPeriodId(shuffleModeEnabled, window);
           playbackInfo =
-              playbackInfo.resetToNewPosition(getFirstMediaPeriodId(), C.TIME_UNSET, C.TIME_UNSET);
+              playbackInfo.resetToNewPosition(
+                  firstMediaPeriodId,
+                  /* startPositionUs= */ C.TIME_UNSET,
+                  /* contentPositionUs= */ C.TIME_UNSET);
           throw e;
         }
         pendingInitialSeekPosition = null;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java
index 8c73fde3be..4333f51bf7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java
@@ -30,7 +30,7 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
    * Dummy media period id used while the timeline is empty and no period id is specified. This id
    * is used when playback infos are created with {@link #createDummy(long, TrackSelectorResult)}.
    */
-  public static final MediaPeriodId DUMMY_MEDIA_PERIOD_ID =
+  private static final MediaPeriodId DUMMY_MEDIA_PERIOD_ID =
       new MediaPeriodId(/* periodUid= */ new Object());
 
   /** The current {@link Timeline}. */
@@ -151,6 +151,24 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
     this.positionUs = positionUs;
   }
 
+  /**
+   * Returns dummy media period id for the first-to-be-played period of the current timeline.
+   *
+   * @param shuffleModeEnabled Whether shuffle mode is enabled.
+   * @param window A writable {@link Timeline.Window}.
+   * @return A dummy media period id for the first-to-be-played period of the current timeline.
+   */
+  public MediaPeriodId getDummyFirstMediaPeriodId(
+      boolean shuffleModeEnabled, Timeline.Window window) {
+    if (timeline.isEmpty()) {
+      return DUMMY_MEDIA_PERIOD_ID;
+    }
+    int firstPeriodIndex =
+        timeline.getWindow(timeline.getFirstWindowIndex(shuffleModeEnabled), window)
+            .firstPeriodIndex;
+    return new MediaPeriodId(timeline.getUidOfPeriod(firstPeriodIndex));
+  }
+
   /**
    * Copies playback info and resets playing and loading position.
    *

From 0834d128431a8724f4c5c7828c7ab5e9d035c5e9 Mon Sep 17 00:00:00 2001
From: cpaulino <cpaulino@google.com>
Date: Fri, 19 Oct 2018 10:41:10 -0700
Subject: [PATCH 109/832] Make VpxOutputBuffer public

Mimics the ExoV1 behavior.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217893212
---
 .../google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java
index fa0df1cfa9..725d94819b 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java
@@ -19,10 +19,8 @@ import com.google.android.exoplayer2.decoder.OutputBuffer;
 import com.google.android.exoplayer2.video.ColorInfo;
 import java.nio.ByteBuffer;
 
-/**
- * Output buffer containing video frame data, populated by {@link VpxDecoder}.
- */
-/* package */ final class VpxOutputBuffer extends OutputBuffer {
+/** Output buffer containing video frame data, populated by {@link VpxDecoder}. */
+public final class VpxOutputBuffer extends OutputBuffer {
 
   public static final int COLORSPACE_UNKNOWN = 0;
   public static final int COLORSPACE_BT601 = 1;

From 42c9b244eee6e5775c91967f6f529b6fb8589d64 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 19 Oct 2018 11:05:50 -0700
Subject: [PATCH 110/832] Make context non-optional in AudioFocusManager

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217897796
---
 .../exoplayer2/audio/AudioFocusManager.java   | 30 ++++---------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java
index ca4e0c299e..39422c2873 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java
@@ -99,7 +99,7 @@ public final class AudioFocusManager {
   private static final float VOLUME_MULTIPLIER_DUCK = 0.2f;
   private static final float VOLUME_MULTIPLIER_DEFAULT = 1.0f;
 
-  private final @Nullable AudioManager audioManager;
+  private final AudioManager audioManager;
   private final AudioFocusListener focusListener;
   private final PlayerControl playerControl;
   private @Nullable AudioAttributes audioAttributes;
@@ -117,12 +117,9 @@ public final class AudioFocusManager {
    * @param context The current context.
    * @param playerControl A {@link PlayerControl} to handle commands from this instance.
    */
-  public AudioFocusManager(@Nullable Context context, PlayerControl playerControl) {
+  public AudioFocusManager(Context context, PlayerControl playerControl) {
     this.audioManager =
-        context == null
-            ? null
-            : (AudioManager)
-                context.getApplicationContext().getSystemService(Context.AUDIO_SERVICE);
+        (AudioManager) context.getApplicationContext().getSystemService(Context.AUDIO_SERVICE);
     this.playerControl = playerControl;
     this.focusListener = new AudioFocusListener();
     this.audioFocusState = AUDIO_FOCUS_STATE_NO_FOCUS;
@@ -148,8 +145,6 @@ public final class AudioFocusManager {
       return PLAYER_COMMAND_PLAY_WHEN_READY;
     }
 
-    Assertions.checkNotNull(
-        audioManager, "SimpleExoPlayer must be created with a context to handle audio focus.");
     if (!Util.areEqual(this.audioAttributes, audioAttributes)) {
       this.audioAttributes = audioAttributes;
       focusGain = convertAudioAttributesToFocusGain(audioAttributes);
@@ -177,10 +172,6 @@ public final class AudioFocusManager {
    * @return A {@link PlayerCommand} to execute on the player.
    */
   public @PlayerCommand int handlePrepare(boolean playWhenReady) {
-    if (audioManager == null) {
-      return PLAYER_COMMAND_PLAY_WHEN_READY;
-    }
-
     return playWhenReady ? requestAudioFocus() : PLAYER_COMMAND_DO_NOT_PLAY;
   }
 
@@ -192,10 +183,6 @@ public final class AudioFocusManager {
    * @return A {@link PlayerCommand} to execute on the player.
    */
   public @PlayerCommand int handleSetPlayWhenReady(boolean playWhenReady, int playerState) {
-    if (audioManager == null) {
-      return PLAYER_COMMAND_PLAY_WHEN_READY;
-    }
-
     if (!playWhenReady) {
       abandonAudioFocus();
       return PLAYER_COMMAND_DO_NOT_PLAY;
@@ -209,10 +196,6 @@ public final class AudioFocusManager {
 
   /** Called by the player as part of {@link ExoPlayer#stop(boolean)}. */
   public void handleStop() {
-    if (audioManager == null) {
-      return;
-    }
-
     abandonAudioFocus(/* forceAbandon= */ true);
   }
 
@@ -271,7 +254,6 @@ public final class AudioFocusManager {
   }
 
   private int requestAudioFocusDefault() {
-    AudioManager audioManager = Assertions.checkNotNull(this.audioManager);
     return audioManager.requestAudioFocus(
         focusListener,
         Util.getStreamTypeForAudioUsage(Assertions.checkNotNull(audioAttributes).usage),
@@ -296,17 +278,17 @@ public final class AudioFocusManager {
 
       rebuildAudioFocusRequest = false;
     }
-    return Assertions.checkNotNull(audioManager).requestAudioFocus(audioFocusRequest);
+    return audioManager.requestAudioFocus(audioFocusRequest);
   }
 
   private void abandonAudioFocusDefault() {
-    Assertions.checkNotNull(audioManager).abandonAudioFocus(focusListener);
+    audioManager.abandonAudioFocus(focusListener);
   }
 
   @RequiresApi(26)
   private void abandonAudioFocusV26() {
     if (audioFocusRequest != null) {
-      Assertions.checkNotNull(audioManager).abandonAudioFocusRequest(audioFocusRequest);
+      audioManager.abandonAudioFocusRequest(audioFocusRequest);
     }
   }
 

From bb5a9ef8add0217e4d67e4ad000440bfd9c69069 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 19 Oct 2018 11:57:29 -0700
Subject: [PATCH 111/832] Remove extra blank line

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217907544
---
 .../com/google/android/exoplayer2/source/hls/HlsMediaChunk.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
index 0cfe31f3b9..a0dd66785d 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
@@ -41,7 +41,6 @@ import java.util.concurrent.atomic.AtomicInteger;
  */
 /* package */ final class HlsMediaChunk extends MediaChunk {
 
-
   private static final String PRIV_TIMESTAMP_FRAME_OWNER =
       "com.apple.streaming.transportStreamTimestamp";
 

From f3b4575436d86024e537eb6afa582b752a38e916 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 19 Oct 2018 13:47:45 -0700
Subject: [PATCH 112/832] Temporarily disable codec reuse

There are multiple subtle issues with the current implementation:

1. setOperatingRate can cause a codec initialization even if the
   renderer is disabled. This is not supposed to happen.
2. If the codec is released whilst the renderer is disabled, the
   renderer can instantiate a new codec using the old format when
   it's enabled again, only to immediately have to reconfigure or
   release it if the actual format to be played is different.
3. Codec reuse does not take into account renderer configuration.
   The specific case where this is problematic is if the video
   renderer is re-enabled with a different tunneling session id.
   The reused codec is then not configured correctly.

Also moved availableCodecInfos reset into releaseCodec for sanity.

Issue: #2826

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217924592
---
 .../exoplayer2/mediacodec/MediaCodecRenderer.java   | 13 +------------
 .../exoplayer2/video/MediaCodecVideoRenderer.java   |  4 +---
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index 27b0d89a3f..a35240668e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -558,18 +558,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
 
   @Override
   protected void onDisabled() {
-    if (drmSession != null || pendingDrmSession != null) {
-      // TODO: Do something better with this case.
-      onReset();
-    } else {
-      flushOrReleaseCodec();
-    }
-  }
-
-  @Override
-  protected void onReset() {
     format = null;
-    availableCodecInfos = null;
     try {
       releaseCodec();
     } finally {
@@ -591,6 +580,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   }
 
   protected void releaseCodec() {
+    availableCodecInfos = null;
     codecHotswapDeadlineMs = C.TIME_UNSET;
     resetInputBuffer();
     resetOutputBuffer();
@@ -1307,7 +1297,6 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
    * @throws ExoPlaybackException If an error occurs releasing or initializing a codec.
    */
   private void reinitializeCodec(boolean release) throws ExoPlaybackException {
-    availableCodecInfos = null;
     if (codecReceivedBuffers) {
       // Signal end of stream and wait for any final output buffers before re-initialization.
       codecReinitializationState = REINITIALIZATION_STATE_SIGNAL_END_OF_STREAM;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index 18aeada04b..a0e794764a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -436,9 +436,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
           setOutputSurfaceV23(codec, surface);
         } else {
           releaseCodec();
-          if (state == STATE_ENABLED || state == STATE_STARTED) {
-            maybeInitCodec();
-          }
+          maybeInitCodec();
         }
       }
       if (surface != null && surface != dummySurface) {

From 62759e8dd622177a9959d903d6e91b5e484a2710 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Sat, 20 Oct 2018 06:41:04 -0700
Subject: [PATCH 113/832] Cleanup VR video player sample app

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=218003875
---
 .../android/exoplayer2/util/GlUtil.java       | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/GlUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/util/GlUtil.java
index df22e6dc2e..9387392ec4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/GlUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/GlUtil.java
@@ -40,18 +40,14 @@ public final class GlUtil {
    * ExoPlayerLibraryInfo#GL_ASSERTIONS_ENABLED} is true throws a {@link RuntimeException}.
    */
   public static void checkGlError() {
-    int error = GLES20.glGetError();
-    int lastError;
-    if (error != GLES20.GL_NO_ERROR) {
-      do {
-        lastError = error;
-        Log.e(TAG, "glError " + gluErrorString(lastError));
-        error = GLES20.glGetError();
-      } while (error != GLES20.GL_NO_ERROR);
-
-      if (ExoPlayerLibraryInfo.GL_ASSERTIONS_ENABLED) {
-        throw new RuntimeException("glError " + gluErrorString(lastError));
-      }
+    int lastError = GLES20.GL_NO_ERROR;
+    int error;
+    while ((error = GLES20.glGetError()) != GLES20.GL_NO_ERROR) {
+      Log.e(TAG, "glError " + gluErrorString(lastError));
+      lastError = error;
+    }
+    if (ExoPlayerLibraryInfo.GL_ASSERTIONS_ENABLED && lastError != GLES20.GL_NO_ERROR) {
+      throw new RuntimeException("glError " + gluErrorString(lastError));
     }
   }
 

From 4170c79a4b1e7fe2a1b14d90d605c600e9cd1e9f Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Sun, 21 Oct 2018 02:53:00 -0700
Subject: [PATCH 114/832] Add ACCESS_NETWORK_STATE permission for MH tests

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=218058185
---
 playbacktests/src/androidTest/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/playbacktests/src/androidTest/AndroidManifest.xml b/playbacktests/src/androidTest/AndroidManifest.xml
index d458df55bb..4165a42568 100644
--- a/playbacktests/src/androidTest/AndroidManifest.xml
+++ b/playbacktests/src/androidTest/AndroidManifest.xml
@@ -18,6 +18,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer2.playbacktests">
 
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.WAKE_LOCK"/>
 

From ea49d39a4d34feb7f6da5d643235eafdb0feed0d Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Mon, 22 Oct 2018 02:50:26 -0700
Subject: [PATCH 115/832] Add VR string and icon

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=218137830
---
 .../ui/src/main/res/drawable-hdpi/exo_icon_vr.png | Bin 0 -> 291 bytes
 .../ui/src/main/res/drawable-ldpi/exo_icon_vr.png | Bin 0 -> 170 bytes
 .../ui/src/main/res/drawable-mdpi/exo_icon_vr.png | Bin 0 -> 207 bytes
 .../src/main/res/drawable-xhdpi/exo_icon_vr.png   | Bin 0 -> 375 bytes
 .../src/main/res/drawable-xxhdpi/exo_icon_vr.png  | Bin 0 -> 602 bytes
 library/ui/src/main/res/values-af/strings.xml     |   1 +
 library/ui/src/main/res/values-am/strings.xml     |   1 +
 library/ui/src/main/res/values-ar/strings.xml     |   1 +
 library/ui/src/main/res/values-az/strings.xml     |   1 +
 .../ui/src/main/res/values-b+sr+Latn/strings.xml  |   1 +
 library/ui/src/main/res/values-be/strings.xml     |   1 +
 library/ui/src/main/res/values-bg/strings.xml     |   1 +
 library/ui/src/main/res/values-bn/strings.xml     |   1 +
 library/ui/src/main/res/values-bs/strings.xml     |   1 +
 library/ui/src/main/res/values-ca/strings.xml     |   1 +
 library/ui/src/main/res/values-cs/strings.xml     |   1 +
 library/ui/src/main/res/values-da/strings.xml     |   1 +
 library/ui/src/main/res/values-de/strings.xml     |   1 +
 library/ui/src/main/res/values-el/strings.xml     |   1 +
 library/ui/src/main/res/values-en-rAU/strings.xml |   1 +
 library/ui/src/main/res/values-en-rGB/strings.xml |   1 +
 library/ui/src/main/res/values-en-rIN/strings.xml |   1 +
 library/ui/src/main/res/values-es-rUS/strings.xml |   1 +
 library/ui/src/main/res/values-es/strings.xml     |   1 +
 library/ui/src/main/res/values-et/strings.xml     |   1 +
 library/ui/src/main/res/values-eu/strings.xml     |   1 +
 library/ui/src/main/res/values-fa/strings.xml     |   1 +
 library/ui/src/main/res/values-fi/strings.xml     |   1 +
 library/ui/src/main/res/values-fr-rCA/strings.xml |   1 +
 library/ui/src/main/res/values-fr/strings.xml     |   1 +
 library/ui/src/main/res/values-gl/strings.xml     |   1 +
 library/ui/src/main/res/values-gu/strings.xml     |   1 +
 library/ui/src/main/res/values-hi/strings.xml     |   1 +
 library/ui/src/main/res/values-hr/strings.xml     |   1 +
 library/ui/src/main/res/values-hu/strings.xml     |   1 +
 library/ui/src/main/res/values-hy/strings.xml     |   1 +
 library/ui/src/main/res/values-in/strings.xml     |   1 +
 library/ui/src/main/res/values-is/strings.xml     |   1 +
 library/ui/src/main/res/values-it/strings.xml     |   1 +
 library/ui/src/main/res/values-iw/strings.xml     |   1 +
 library/ui/src/main/res/values-ja/strings.xml     |   1 +
 library/ui/src/main/res/values-ka/strings.xml     |   1 +
 library/ui/src/main/res/values-kk/strings.xml     |   1 +
 library/ui/src/main/res/values-km/strings.xml     |   1 +
 library/ui/src/main/res/values-kn/strings.xml     |   1 +
 library/ui/src/main/res/values-ko/strings.xml     |   1 +
 library/ui/src/main/res/values-ky/strings.xml     |   1 +
 library/ui/src/main/res/values-lo/strings.xml     |   1 +
 library/ui/src/main/res/values-lt/strings.xml     |   1 +
 library/ui/src/main/res/values-lv/strings.xml     |   1 +
 library/ui/src/main/res/values-mk/strings.xml     |   1 +
 library/ui/src/main/res/values-ml/strings.xml     |   1 +
 library/ui/src/main/res/values-mn/strings.xml     |   1 +
 library/ui/src/main/res/values-mr/strings.xml     |   1 +
 library/ui/src/main/res/values-ms/strings.xml     |   1 +
 library/ui/src/main/res/values-my/strings.xml     |   1 +
 library/ui/src/main/res/values-nb/strings.xml     |   1 +
 library/ui/src/main/res/values-ne/strings.xml     |   1 +
 library/ui/src/main/res/values-nl/strings.xml     |   1 +
 library/ui/src/main/res/values-pa/strings.xml     |   1 +
 library/ui/src/main/res/values-pl/strings.xml     |   1 +
 library/ui/src/main/res/values-pt-rPT/strings.xml |   1 +
 library/ui/src/main/res/values-pt/strings.xml     |   1 +
 library/ui/src/main/res/values-ro/strings.xml     |   1 +
 library/ui/src/main/res/values-ru/strings.xml     |   1 +
 library/ui/src/main/res/values-si/strings.xml     |   1 +
 library/ui/src/main/res/values-sk/strings.xml     |   1 +
 library/ui/src/main/res/values-sl/strings.xml     |   1 +
 library/ui/src/main/res/values-sq/strings.xml     |   1 +
 library/ui/src/main/res/values-sr/strings.xml     |   1 +
 library/ui/src/main/res/values-sv/strings.xml     |   1 +
 library/ui/src/main/res/values-sw/strings.xml     |   1 +
 library/ui/src/main/res/values-ta/strings.xml     |   1 +
 library/ui/src/main/res/values-te/strings.xml     |   1 +
 library/ui/src/main/res/values-th/strings.xml     |   1 +
 library/ui/src/main/res/values-tl/strings.xml     |   1 +
 library/ui/src/main/res/values-tr/strings.xml     |   1 +
 library/ui/src/main/res/values-uk/strings.xml     |   1 +
 library/ui/src/main/res/values-ur/strings.xml     |   1 +
 library/ui/src/main/res/values-uz/strings.xml     |   1 +
 library/ui/src/main/res/values-vi/strings.xml     |   1 +
 library/ui/src/main/res/values-zh-rCN/strings.xml |   1 +
 library/ui/src/main/res/values-zh-rHK/strings.xml |   1 +
 library/ui/src/main/res/values-zh-rTW/strings.xml |   1 +
 library/ui/src/main/res/values-zu/strings.xml     |   1 +
 library/ui/src/main/res/values/strings.xml        |   2 ++
 86 files changed, 82 insertions(+)
 create mode 100644 library/ui/src/main/res/drawable-hdpi/exo_icon_vr.png
 create mode 100644 library/ui/src/main/res/drawable-ldpi/exo_icon_vr.png
 create mode 100644 library/ui/src/main/res/drawable-mdpi/exo_icon_vr.png
 create mode 100644 library/ui/src/main/res/drawable-xhdpi/exo_icon_vr.png
 create mode 100644 library/ui/src/main/res/drawable-xxhdpi/exo_icon_vr.png

diff --git a/library/ui/src/main/res/drawable-hdpi/exo_icon_vr.png b/library/ui/src/main/res/drawable-hdpi/exo_icon_vr.png
new file mode 100644
index 0000000000000000000000000000000000000000..90948eb44f23878a6cf8fcca64da973317231928
GIT binary patch
literal 291
zcmV+;0o?wHP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0002$Nkl<ZcmeH|
zfd+$66ox0(wlM$!7ytu%fZij35CFYGkI^%v2S{_7P}MtqBV5MC?I^<e4(LDXqi*M%
z6h%>#Jt5@A-Lr0l>mDBPro`~|EJMkgz+dpBVqRGlPk%weuv##X_zN;-L1hOOjC6F2
z_S%`t1uZEN5h<<B9Jy35l5$>>GbtmpJC_SOBAZ2Y%<lY%0{JVFf8>wN9Qjtqbi!bm
zHaVuwGQ`A~z5e8hf-6@FCV{|X*fqSC?u*8M*!hp^o}6&$hUE0}aqV6>H5m`ve~?kj
p7mjOXUjA<<;38a^ilQirfFI#cK#(TP+w1@U002ovPDHLkV1gM{eZ2qx

literal 0
HcmV?d00001

diff --git a/library/ui/src/main/res/drawable-ldpi/exo_icon_vr.png b/library/ui/src/main/res/drawable-ldpi/exo_icon_vr.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e21960ed6eac2fc430a0cdc3b0108cd36b562f4
GIT binary patch
literal 170
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iLQfaRkP61P6B}6%7>Kw;TR9zH
zt@J|Sq{2y+nF^k6RlN>VwO26gWdC0H=YRf8DIGIDy@LmrG52|ih0Nh&5t_Atd7jHb
zGp?6U|CS#pOZV*mFF!&1X<MA9T&$&ZsQlV{QjyYu`$9$1Z~Weq98ws}T*6#@{*tD_
T)6A<t%Naaf{an^LB{Ts5t=&8I

literal 0
HcmV?d00001

diff --git a/library/ui/src/main/res/drawable-mdpi/exo_icon_vr.png b/library/ui/src/main/res/drawable-mdpi/exo_icon_vr.png
new file mode 100644
index 0000000000000000000000000000000000000000..02063a79a9ac4e2af44b9237939f2a9a03d9ff57
GIT binary patch
literal 207
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4U(>z@qLn;{G1~alTC<@pV?tQq<
z{to}I_=e`+#~kB3n*Nz=Kct)F&0^wQwrJ(uvhA&{ng{rF3-V>Rf9PPcT~o8$J?{ed
z`UbZgDVG;=%`RtruGO-c`$<G;t}AJGY|=axFh$$;dPA_m9H!S3mG&KJR4RI_pEPNI
zV3rEIYl)LG=USN$4>YRTT^pl!*3Y=IfBAvKTQ(Rl%Rl|oT@_XB`4Z?t22WQ%mvv4F
FO#lNFPiFuC

literal 0
HcmV?d00001

diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_icon_vr.png b/library/ui/src/main/res/drawable-xhdpi/exo_icon_vr.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff243ef56a603c767f8677e4b59c7db94d00fddc
GIT binary patch
literal 375
zcmV--0f_#IP)<h;3K|Lk000e1NJLTq002M$002M;1ONa40ARUQ0003#Nkl<ZcmeH~
z0fxgs7=@Em(?tT1Bc!W6Lyxcl6ku;rKu~~QqjG=}rCJFHlHTdt!5Tss{*E^IzXy0f
zc``GTmq1YzMNt$*nLWfLq(UXc!7C7vQ&Q6iRa24^$phq^8F(Vsz?oeB@=N>pS0a?c
zg&?8k=|MG#EI>-*B|t-}0sI6Q=xB{P?ACPnUIX-0{E!(HRP<QK;d=@&P_ZTq41}zy
ztmE)~1?VUUtrJqvS<m773DA;_yo}a*4u5_D=D!5)P55m$ncMez42y|l=Jx$xM5D*{
z)Bby|;s?J*k57FIdX9V<9qB(4;LbKMu;nffATJ~X2jc(cbYPGc5_u)Nu(6XHF0x7{
zFQqs3EbQEZJvTuq71r`ACw44HlS_7-xC&~y;Kw9kMKlq1H8B|nilQirqA1GT`2&LH
Vv}{x|h?D>T002ovPDHLkV1faAonrt1

literal 0
HcmV?d00001

diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_icon_vr.png b/library/ui/src/main/res/drawable-xxhdpi/exo_icon_vr.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c0338842d0bd3efa47d0ad816ed71c0a6e5acd6
GIT binary patch
literal 602
zcmV-g0;T<lP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0006ZNkl<ZcmeFe
z0Sy2E0Ky>qr?$rj3;+NC0D!!+X9k=N17R4JjI1>)GLV#EU<`~|{>JnVbO5?C04rm#
z{eprSU>F-Dm?p?bsqHTR>Dgh9tt*FKuOVK5=d{nYZNI)B9vymwmeQkxXY<Ji#9T5Z
zWk$Z{%t)CsBqp#VLBJ^!GAabMg$OD#CY%!3x&N361(MogBn1;<3$FnkhGa-;%aLRZ
z>8xL%$CQd1`>B}HTfaa^ir9#NASJXRFr(g3W_ASfjS1up5@-cl0m+<_LZxJmTqX>7
zX9AK1DOV))RT9ReELKab=3NOacw|6C7hk1I#DGT@Xu_O#As|T^5aMaZBV<6T@6?=k
zA~0u6g!gCUix@N4j5+T>pd_KY#C1t1HDk^@5Gd&5FL6G73e6but$^#dQ2QZn;@4>V
zL#9WAvB4-|z;EX;Cy`q^%o#*b@}g2An)rV}Qt`mK$^#X$c>;oG5(1TkXGHS^Dn>+j
zDiI?ps{$5k6+y-c!B3}pLWZzdt5_(ua<19aXZN@!w^nRfs1`qY;tXG(^*Q5-Pq)>g
zdATbo7;*6H^Z_FZq<OjPu3i_E+;W8fXJ|g+mJ(qge?yGtV!<K#;)7T2IA(Y0^e)HT
z@ydsyq=N;AUNH?<u9)6=<DLr++4=YU4u@QDuc&t?D<-2Q-@bnMRada@Y{~cC9vl(?
o00008`v2M+1^@s6004lC0HQ*gE0QV?5&!@I07*qoM6N<$f=!YA;s5{u

literal 0
HcmV?d00001

diff --git a/library/ui/src/main/res/values-af/strings.xml b/library/ui/src/main/res/values-af/strings.xml
index 4d525836a0..d0190d9202 100644
--- a/library/ui/src/main/res/values-af/strings.xml
+++ b/library/ui/src/main/res/values-af/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Herhaal alles</string>
   <string name="exo_controls_shuffle_description">Skommel</string>
   <string name="exo_controls_fullscreen_description">Volskermmodus</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Aflaai</string>
   <string name="exo_download_notification_channel_name">Aflaaie</string>
   <string name="exo_download_downloading">Laai tans af</string>
diff --git a/library/ui/src/main/res/values-am/strings.xml b/library/ui/src/main/res/values-am/strings.xml
index 08c7a3180a..cdc6b5fd7b 100644
--- a/library/ui/src/main/res/values-am/strings.xml
+++ b/library/ui/src/main/res/values-am/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">ሁሉንም ድገም</string>
   <string name="exo_controls_shuffle_description">በውዝ</string>
   <string name="exo_controls_fullscreen_description">የሙሉ ማያ ሁነታ</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">አውርድ</string>
   <string name="exo_download_notification_channel_name">የወረዱ</string>
   <string name="exo_download_downloading">በማውረድ ላይ</string>
diff --git a/library/ui/src/main/res/values-ar/strings.xml b/library/ui/src/main/res/values-ar/strings.xml
index f79a1cf5db..e64797f7b3 100644
--- a/library/ui/src/main/res/values-ar/strings.xml
+++ b/library/ui/src/main/res/values-ar/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">تكرار الكل</string>
   <string name="exo_controls_shuffle_description">ترتيب عشوائي</string>
   <string name="exo_controls_fullscreen_description">وضع ملء الشاشة</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">تنزيل</string>
   <string name="exo_download_notification_channel_name">التنزيلات</string>
   <string name="exo_download_downloading">جارٍ التنزيل.</string>
diff --git a/library/ui/src/main/res/values-az/strings.xml b/library/ui/src/main/res/values-az/strings.xml
index 4191095b4d..31fde9987f 100644
--- a/library/ui/src/main/res/values-az/strings.xml
+++ b/library/ui/src/main/res/values-az/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Hamısı təkrarlansın</string>
   <string name="exo_controls_shuffle_description">Qarışdırın</string>
   <string name="exo_controls_fullscreen_description">Tam ekran rejimi</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Endirin</string>
   <string name="exo_download_notification_channel_name">Endirmələr</string>
   <string name="exo_download_downloading">Endirilir</string>
diff --git a/library/ui/src/main/res/values-b+sr+Latn/strings.xml b/library/ui/src/main/res/values-b+sr+Latn/strings.xml
index 6acedb205f..890a19b310 100644
--- a/library/ui/src/main/res/values-b+sr+Latn/strings.xml
+++ b/library/ui/src/main/res/values-b+sr+Latn/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ponovi sve</string>
   <string name="exo_controls_shuffle_description">Pusti nasumično</string>
   <string name="exo_controls_fullscreen_description">Režim celog ekrana</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Preuzmi</string>
   <string name="exo_download_notification_channel_name">Preuzimanja</string>
   <string name="exo_download_downloading">Preuzima se</string>
diff --git a/library/ui/src/main/res/values-be/strings.xml b/library/ui/src/main/res/values-be/strings.xml
index 63704e66ca..b6c50e4c27 100644
--- a/library/ui/src/main/res/values-be/strings.xml
+++ b/library/ui/src/main/res/values-be/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Паўтарыць усе</string>
   <string name="exo_controls_shuffle_description">Перамяшаць</string>
   <string name="exo_controls_fullscreen_description">Поўнаэкранны рэжым</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Спампаваць</string>
   <string name="exo_download_notification_channel_name">Спампоўкі</string>
   <string name="exo_download_downloading">Спампоўваецца</string>
diff --git a/library/ui/src/main/res/values-bg/strings.xml b/library/ui/src/main/res/values-bg/strings.xml
index 74bc85313d..da02946695 100644
--- a/library/ui/src/main/res/values-bg/strings.xml
+++ b/library/ui/src/main/res/values-bg/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Повтаряне на всички</string>
   <string name="exo_controls_shuffle_description">Разбъркване</string>
   <string name="exo_controls_fullscreen_description">Режим на цял екран</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Изтегляне</string>
   <string name="exo_download_notification_channel_name">Изтегляния</string>
   <string name="exo_download_downloading">Изтегля се</string>
diff --git a/library/ui/src/main/res/values-bn/strings.xml b/library/ui/src/main/res/values-bn/strings.xml
index 4e3b00113f..e90d448a85 100644
--- a/library/ui/src/main/res/values-bn/strings.xml
+++ b/library/ui/src/main/res/values-bn/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">সবগুলি আইটেম আবার চালান</string>
   <string name="exo_controls_shuffle_description">শাফেল করুন</string>
   <string name="exo_controls_fullscreen_description">পূর্ণ স্ক্রিন মোড</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">ডাউনলোড করুন</string>
   <string name="exo_download_notification_channel_name">ডাউনলোড</string>
   <string name="exo_download_downloading">ডাউনলোড হচ্ছে</string>
diff --git a/library/ui/src/main/res/values-bs/strings.xml b/library/ui/src/main/res/values-bs/strings.xml
index be2f6459f5..3bb68d006a 100644
--- a/library/ui/src/main/res/values-bs/strings.xml
+++ b/library/ui/src/main/res/values-bs/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ponovi sve</string>
   <string name="exo_controls_shuffle_description">Izmiješaj</string>
   <string name="exo_controls_fullscreen_description">Način rada preko cijelog ekrana</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Preuzmi</string>
   <string name="exo_download_notification_channel_name">Preuzimanja</string>
   <string name="exo_download_downloading">Preuzimanje</string>
diff --git a/library/ui/src/main/res/values-ca/strings.xml b/library/ui/src/main/res/values-ca/strings.xml
index 10bf259418..530423f212 100644
--- a/library/ui/src/main/res/values-ca/strings.xml
+++ b/library/ui/src/main/res/values-ca/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repeteix tot</string>
   <string name="exo_controls_shuffle_description">Reprodueix aleatòriament</string>
   <string name="exo_controls_fullscreen_description">Mode de pantalla completa</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Baixa</string>
   <string name="exo_download_notification_channel_name">Baixades</string>
   <string name="exo_download_downloading">S\'està baixant</string>
diff --git a/library/ui/src/main/res/values-cs/strings.xml b/library/ui/src/main/res/values-cs/strings.xml
index c910fd3483..e1670d6fc4 100644
--- a/library/ui/src/main/res/values-cs/strings.xml
+++ b/library/ui/src/main/res/values-cs/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Opakovat vše</string>
   <string name="exo_controls_shuffle_description">Náhodně</string>
   <string name="exo_controls_fullscreen_description">Režim celé obrazovky</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Stáhnout</string>
   <string name="exo_download_notification_channel_name">Stahování</string>
   <string name="exo_download_downloading">Stahování</string>
diff --git a/library/ui/src/main/res/values-da/strings.xml b/library/ui/src/main/res/values-da/strings.xml
index 6a25bbf395..93da6a649a 100644
--- a/library/ui/src/main/res/values-da/strings.xml
+++ b/library/ui/src/main/res/values-da/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Gentag alle</string>
   <string name="exo_controls_shuffle_description">Bland</string>
   <string name="exo_controls_fullscreen_description">Fuld skærm</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Download</string>
   <string name="exo_download_notification_channel_name">Downloads</string>
   <string name="exo_download_downloading">Downloader</string>
diff --git a/library/ui/src/main/res/values-de/strings.xml b/library/ui/src/main/res/values-de/strings.xml
index 6ac92acf9d..410b261b02 100644
--- a/library/ui/src/main/res/values-de/strings.xml
+++ b/library/ui/src/main/res/values-de/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Alle wiederholen</string>
   <string name="exo_controls_shuffle_description">Zufallsmix</string>
   <string name="exo_controls_fullscreen_description">Vollbildmodus</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Herunterladen</string>
   <string name="exo_download_notification_channel_name">Downloads</string>
   <string name="exo_download_downloading">Wird heruntergeladen</string>
diff --git a/library/ui/src/main/res/values-el/strings.xml b/library/ui/src/main/res/values-el/strings.xml
index 699650d31e..9c1373a77e 100644
--- a/library/ui/src/main/res/values-el/strings.xml
+++ b/library/ui/src/main/res/values-el/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Επανάληψη όλων</string>
   <string name="exo_controls_shuffle_description">Τυχαία αναπαραγωγή</string>
   <string name="exo_controls_fullscreen_description">Λειτουργία πλήρους οθόνης</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Λήψη</string>
   <string name="exo_download_notification_channel_name">Λήψεις</string>
   <string name="exo_download_downloading">Λήψη</string>
diff --git a/library/ui/src/main/res/values-en-rAU/strings.xml b/library/ui/src/main/res/values-en-rAU/strings.xml
index 2356f0cd94..74b51249e7 100644
--- a/library/ui/src/main/res/values-en-rAU/strings.xml
+++ b/library/ui/src/main/res/values-en-rAU/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repeat all</string>
   <string name="exo_controls_shuffle_description">Shuffle</string>
   <string name="exo_controls_fullscreen_description">Full-screen mode</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Download</string>
   <string name="exo_download_notification_channel_name">Downloads</string>
   <string name="exo_download_downloading">Downloading</string>
diff --git a/library/ui/src/main/res/values-en-rGB/strings.xml b/library/ui/src/main/res/values-en-rGB/strings.xml
index 2356f0cd94..74b51249e7 100644
--- a/library/ui/src/main/res/values-en-rGB/strings.xml
+++ b/library/ui/src/main/res/values-en-rGB/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repeat all</string>
   <string name="exo_controls_shuffle_description">Shuffle</string>
   <string name="exo_controls_fullscreen_description">Full-screen mode</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Download</string>
   <string name="exo_download_notification_channel_name">Downloads</string>
   <string name="exo_download_downloading">Downloading</string>
diff --git a/library/ui/src/main/res/values-en-rIN/strings.xml b/library/ui/src/main/res/values-en-rIN/strings.xml
index 2356f0cd94..74b51249e7 100644
--- a/library/ui/src/main/res/values-en-rIN/strings.xml
+++ b/library/ui/src/main/res/values-en-rIN/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repeat all</string>
   <string name="exo_controls_shuffle_description">Shuffle</string>
   <string name="exo_controls_fullscreen_description">Full-screen mode</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Download</string>
   <string name="exo_download_notification_channel_name">Downloads</string>
   <string name="exo_download_downloading">Downloading</string>
diff --git a/library/ui/src/main/res/values-es-rUS/strings.xml b/library/ui/src/main/res/values-es-rUS/strings.xml
index b7d8facf17..677fddad66 100644
--- a/library/ui/src/main/res/values-es-rUS/strings.xml
+++ b/library/ui/src/main/res/values-es-rUS/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repetir todo</string>
   <string name="exo_controls_shuffle_description">Reproducir aleatoriamente</string>
   <string name="exo_controls_fullscreen_description">Modo de pantalla completa</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Descargar</string>
   <string name="exo_download_notification_channel_name">Descargas</string>
   <string name="exo_download_downloading">Descargando</string>
diff --git a/library/ui/src/main/res/values-es/strings.xml b/library/ui/src/main/res/values-es/strings.xml
index 7a48245abb..7e36bf86af 100644
--- a/library/ui/src/main/res/values-es/strings.xml
+++ b/library/ui/src/main/res/values-es/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repetir todo</string>
   <string name="exo_controls_shuffle_description">Reproducir aleatoriamente</string>
   <string name="exo_controls_fullscreen_description">Modo de pantalla completa</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Descargar</string>
   <string name="exo_download_notification_channel_name">Descargas</string>
   <string name="exo_download_downloading">Descargando</string>
diff --git a/library/ui/src/main/res/values-et/strings.xml b/library/ui/src/main/res/values-et/strings.xml
index 0ed5389da7..189c5032db 100644
--- a/library/ui/src/main/res/values-et/strings.xml
+++ b/library/ui/src/main/res/values-et/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Korda kõiki</string>
   <string name="exo_controls_shuffle_description">Esita juhuslikus järjekorras</string>
   <string name="exo_controls_fullscreen_description">Täisekraani režiim</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Allalaadimine</string>
   <string name="exo_download_notification_channel_name">Allalaadimised</string>
   <string name="exo_download_downloading">Allalaadimine</string>
diff --git a/library/ui/src/main/res/values-eu/strings.xml b/library/ui/src/main/res/values-eu/strings.xml
index 31ec286cfb..2db2ac2131 100644
--- a/library/ui/src/main/res/values-eu/strings.xml
+++ b/library/ui/src/main/res/values-eu/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Errepikatu guztiak</string>
   <string name="exo_controls_shuffle_description">Erreproduzitu ausaz</string>
   <string name="exo_controls_fullscreen_description">Pantaila osoko modua</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Deskargak</string>
   <string name="exo_download_notification_channel_name">Deskargak</string>
   <string name="exo_download_downloading">Deskargatzen</string>
diff --git a/library/ui/src/main/res/values-fa/strings.xml b/library/ui/src/main/res/values-fa/strings.xml
index 9b0853cee5..e923dae795 100644
--- a/library/ui/src/main/res/values-fa/strings.xml
+++ b/library/ui/src/main/res/values-fa/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">تکرار همه</string>
   <string name="exo_controls_shuffle_description">درهم</string>
   <string name="exo_controls_fullscreen_description">حالت تمام‌صفحه</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">بارگیری</string>
   <string name="exo_download_notification_channel_name">بارگیری‌ها</string>
   <string name="exo_download_downloading">درحال بارگیری</string>
diff --git a/library/ui/src/main/res/values-fi/strings.xml b/library/ui/src/main/res/values-fi/strings.xml
index d9b33f0977..89b2ed60bc 100644
--- a/library/ui/src/main/res/values-fi/strings.xml
+++ b/library/ui/src/main/res/values-fi/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Toista kaikki uudelleen</string>
   <string name="exo_controls_shuffle_description">Satunnaistoisto</string>
   <string name="exo_controls_fullscreen_description">Koko näytön tila</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Lataa</string>
   <string name="exo_download_notification_channel_name">Lataukset</string>
   <string name="exo_download_downloading">Ladataan</string>
diff --git a/library/ui/src/main/res/values-fr-rCA/strings.xml b/library/ui/src/main/res/values-fr-rCA/strings.xml
index b68fab04ed..a694f48c10 100644
--- a/library/ui/src/main/res/values-fr-rCA/strings.xml
+++ b/library/ui/src/main/res/values-fr-rCA/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Tout lire en boucle</string>
   <string name="exo_controls_shuffle_description">Lecture aléatoire</string>
   <string name="exo_controls_fullscreen_description">Mode Plein écran</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Télécharger</string>
   <string name="exo_download_notification_channel_name">Téléchargements</string>
   <string name="exo_download_downloading">Téléchargement en cours…</string>
diff --git a/library/ui/src/main/res/values-fr/strings.xml b/library/ui/src/main/res/values-fr/strings.xml
index 48c19e30d9..b7c4168bef 100644
--- a/library/ui/src/main/res/values-fr/strings.xml
+++ b/library/ui/src/main/res/values-fr/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Tout lire en boucle</string>
   <string name="exo_controls_shuffle_description">Aléatoire</string>
   <string name="exo_controls_fullscreen_description">Mode plein écran</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Télécharger</string>
   <string name="exo_download_notification_channel_name">Téléchargements</string>
   <string name="exo_download_downloading">Téléchargement…</string>
diff --git a/library/ui/src/main/res/values-gl/strings.xml b/library/ui/src/main/res/values-gl/strings.xml
index e41b1d1445..ead458f87c 100644
--- a/library/ui/src/main/res/values-gl/strings.xml
+++ b/library/ui/src/main/res/values-gl/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repetir todas as pistas</string>
   <string name="exo_controls_shuffle_description">Reprodución aleatoria</string>
   <string name="exo_controls_fullscreen_description">Modo de pantalla completa</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Descargar</string>
   <string name="exo_download_notification_channel_name">Descargas</string>
   <string name="exo_download_downloading">Descargando</string>
diff --git a/library/ui/src/main/res/values-gu/strings.xml b/library/ui/src/main/res/values-gu/strings.xml
index 5d8dd31cc5..e00f7cc7fb 100644
--- a/library/ui/src/main/res/values-gu/strings.xml
+++ b/library/ui/src/main/res/values-gu/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">બધાને રિપીટ કરો</string>
   <string name="exo_controls_shuffle_description">શફલ કરો</string>
   <string name="exo_controls_fullscreen_description">પૂર્ણસ્ક્રીન મોડ</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">ડાઉનલોડ કરો</string>
   <string name="exo_download_notification_channel_name">ડાઉનલોડ</string>
   <string name="exo_download_downloading">ડાઉનલોડ કરી રહ્યાં છીએ</string>
diff --git a/library/ui/src/main/res/values-hi/strings.xml b/library/ui/src/main/res/values-hi/strings.xml
index 9df542ef52..4ba488e95d 100644
--- a/library/ui/src/main/res/values-hi/strings.xml
+++ b/library/ui/src/main/res/values-hi/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">सभी को दोहराएं</string>
   <string name="exo_controls_shuffle_description">शफ़ल करें</string>
   <string name="exo_controls_fullscreen_description">फ़ुलस्क्रीन मोड</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">डाउनलोड करें</string>
   <string name="exo_download_notification_channel_name">डाउनलोड की गई मीडिया फ़ाइलें</string>
   <string name="exo_download_downloading">डाउनलोड हो रहा है</string>
diff --git a/library/ui/src/main/res/values-hr/strings.xml b/library/ui/src/main/res/values-hr/strings.xml
index 7d5de9b189..1cba6e162b 100644
--- a/library/ui/src/main/res/values-hr/strings.xml
+++ b/library/ui/src/main/res/values-hr/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ponovi sve</string>
   <string name="exo_controls_shuffle_description">Reproduciraj nasumično</string>
   <string name="exo_controls_fullscreen_description">Prikaz na cijelom zaslonu</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Preuzmi</string>
   <string name="exo_download_notification_channel_name">Preuzimanja</string>
   <string name="exo_download_downloading">Preuzimanje</string>
diff --git a/library/ui/src/main/res/values-hu/strings.xml b/library/ui/src/main/res/values-hu/strings.xml
index bb7d5950e6..d271d741ab 100644
--- a/library/ui/src/main/res/values-hu/strings.xml
+++ b/library/ui/src/main/res/values-hu/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Összes szám ismétlése</string>
   <string name="exo_controls_shuffle_description">Keverés</string>
   <string name="exo_controls_fullscreen_description">Teljes képernyős mód</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Letöltés</string>
   <string name="exo_download_notification_channel_name">Letöltések</string>
   <string name="exo_download_downloading">Letöltés folyamatban</string>
diff --git a/library/ui/src/main/res/values-hy/strings.xml b/library/ui/src/main/res/values-hy/strings.xml
index 38468b892d..c017a2fc27 100644
--- a/library/ui/src/main/res/values-hy/strings.xml
+++ b/library/ui/src/main/res/values-hy/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Կրկնել բոլորը</string>
   <string name="exo_controls_shuffle_description">Խառնել</string>
   <string name="exo_controls_fullscreen_description">Լիաէկրան ռեժիմ</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Ներբեռնել</string>
   <string name="exo_download_notification_channel_name">Ներբեռնումներ</string>
   <string name="exo_download_downloading">Ներբեռնում</string>
diff --git a/library/ui/src/main/res/values-in/strings.xml b/library/ui/src/main/res/values-in/strings.xml
index 6cbd6a703a..92c6e055b6 100644
--- a/library/ui/src/main/res/values-in/strings.xml
+++ b/library/ui/src/main/res/values-in/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ulangi semua</string>
   <string name="exo_controls_shuffle_description">Acak</string>
   <string name="exo_controls_fullscreen_description">Mode layar penuh</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Download</string>
   <string name="exo_download_notification_channel_name">Download</string>
   <string name="exo_download_downloading">Mendownload</string>
diff --git a/library/ui/src/main/res/values-is/strings.xml b/library/ui/src/main/res/values-is/strings.xml
index cb5f40ef51..77f03e4889 100644
--- a/library/ui/src/main/res/values-is/strings.xml
+++ b/library/ui/src/main/res/values-is/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Endurtaka allt</string>
   <string name="exo_controls_shuffle_description">Stokka</string>
   <string name="exo_controls_fullscreen_description">Allur skjárinn</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Sækja</string>
   <string name="exo_download_notification_channel_name">Niðurhal</string>
   <string name="exo_download_downloading">Sækir</string>
diff --git a/library/ui/src/main/res/values-it/strings.xml b/library/ui/src/main/res/values-it/strings.xml
index 7e058b4a49..72ea9ee01d 100644
--- a/library/ui/src/main/res/values-it/strings.xml
+++ b/library/ui/src/main/res/values-it/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ripeti tutto</string>
   <string name="exo_controls_shuffle_description">Riproduzione casuale</string>
   <string name="exo_controls_fullscreen_description">Modalità a schermo intero</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Scarica</string>
   <string name="exo_download_notification_channel_name">Download</string>
   <string name="exo_download_downloading">Download…</string>
diff --git a/library/ui/src/main/res/values-iw/strings.xml b/library/ui/src/main/res/values-iw/strings.xml
index 9aec8e5834..003597fdee 100644
--- a/library/ui/src/main/res/values-iw/strings.xml
+++ b/library/ui/src/main/res/values-iw/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">חזור על הכול</string>
   <string name="exo_controls_shuffle_description">ערבוב</string>
   <string name="exo_controls_fullscreen_description">מצב מסך מלא</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">הורדה</string>
   <string name="exo_download_notification_channel_name">הורדות</string>
   <string name="exo_download_downloading">ההורדה מתבצעת</string>
diff --git a/library/ui/src/main/res/values-ja/strings.xml b/library/ui/src/main/res/values-ja/strings.xml
index 86f204e572..5ea4a3ec07 100644
--- a/library/ui/src/main/res/values-ja/strings.xml
+++ b/library/ui/src/main/res/values-ja/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">全曲をリピート</string>
   <string name="exo_controls_shuffle_description">シャッフル</string>
   <string name="exo_controls_fullscreen_description">全画面モード</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">ダウンロード</string>
   <string name="exo_download_notification_channel_name">ダウンロード</string>
   <string name="exo_download_downloading">ダウンロードしています</string>
diff --git a/library/ui/src/main/res/values-ka/strings.xml b/library/ui/src/main/res/values-ka/strings.xml
index 5b8c08065e..06b798baf2 100644
--- a/library/ui/src/main/res/values-ka/strings.xml
+++ b/library/ui/src/main/res/values-ka/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">ყველას გამეორება</string>
   <string name="exo_controls_shuffle_description">არეულად დაკვრა</string>
   <string name="exo_controls_fullscreen_description">სრულეკრანიანი რეჟიმი</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">ჩამოტვირთვა</string>
   <string name="exo_download_notification_channel_name">ჩამოტვირთვები</string>
   <string name="exo_download_downloading">მიმდინარეობს ჩამოტვირთვა</string>
diff --git a/library/ui/src/main/res/values-kk/strings.xml b/library/ui/src/main/res/values-kk/strings.xml
index 3842263348..1988908ae3 100644
--- a/library/ui/src/main/res/values-kk/strings.xml
+++ b/library/ui/src/main/res/values-kk/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Барлығын қайталау</string>
   <string name="exo_controls_shuffle_description">Араластыру</string>
   <string name="exo_controls_fullscreen_description">Толық экран режимі</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Жүктеп алу</string>
   <string name="exo_download_notification_channel_name">Жүктеп алынғандар</string>
   <string name="exo_download_downloading">Жүктеп алынуда</string>
diff --git a/library/ui/src/main/res/values-km/strings.xml b/library/ui/src/main/res/values-km/strings.xml
index 89d73605a5..e78efe17d7 100644
--- a/library/ui/src/main/res/values-km/strings.xml
+++ b/library/ui/src/main/res/values-km/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">លេង​ឡើងវិញ​ទាំងអស់</string>
   <string name="exo_controls_shuffle_description">ច្របល់</string>
   <string name="exo_controls_fullscreen_description">មុខងារពេញ​អេក្រង់</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">ទាញយក</string>
   <string name="exo_download_notification_channel_name">ទាញយក</string>
   <string name="exo_download_downloading">កំពុង​ទាញ​យក</string>
diff --git a/library/ui/src/main/res/values-kn/strings.xml b/library/ui/src/main/res/values-kn/strings.xml
index 65d65b1d23..1efac2b25f 100644
--- a/library/ui/src/main/res/values-kn/strings.xml
+++ b/library/ui/src/main/res/values-kn/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">ಎಲ್ಲವನ್ನು ಪುನರಾವರ್ತಿಸಿ</string>
   <string name="exo_controls_shuffle_description">ಶಫಲ್‌</string>
   <string name="exo_controls_fullscreen_description">ಪೂರ್ಣ ಪರದೆ ಮೋಡ್</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">ಡೌನ್‌ಲೋಡ್‌</string>
   <string name="exo_download_notification_channel_name">ಡೌನ್‌ಲೋಡ್‌ಗಳು</string>
   <string name="exo_download_downloading">ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ</string>
diff --git a/library/ui/src/main/res/values-ko/strings.xml b/library/ui/src/main/res/values-ko/strings.xml
index 7714203e5e..92d840374a 100644
--- a/library/ui/src/main/res/values-ko/strings.xml
+++ b/library/ui/src/main/res/values-ko/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">모두 반복</string>
   <string name="exo_controls_shuffle_description">셔플</string>
   <string name="exo_controls_fullscreen_description">전체화면 모드</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">다운로드</string>
   <string name="exo_download_notification_channel_name">다운로드</string>
   <string name="exo_download_downloading">다운로드 중</string>
diff --git a/library/ui/src/main/res/values-ky/strings.xml b/library/ui/src/main/res/values-ky/strings.xml
index 20a4739a2b..614e5846c4 100644
--- a/library/ui/src/main/res/values-ky/strings.xml
+++ b/library/ui/src/main/res/values-ky/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Баарын кайталоо</string>
   <string name="exo_controls_shuffle_description">Аралаштыруу</string>
   <string name="exo_controls_fullscreen_description">Толук экран режими</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Жүктөп алуу</string>
   <string name="exo_download_notification_channel_name">Жүктөлүп алынгандар</string>
   <string name="exo_download_downloading">Жүктөлүп алынууда</string>
diff --git a/library/ui/src/main/res/values-lo/strings.xml b/library/ui/src/main/res/values-lo/strings.xml
index 3de5962a42..291dd5f187 100644
--- a/library/ui/src/main/res/values-lo/strings.xml
+++ b/library/ui/src/main/res/values-lo/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">ຫຼິ້ນຊ້ຳທັງໝົດ</string>
   <string name="exo_controls_shuffle_description">ຫຼີ້ນແບບສຸ່ມ</string>
   <string name="exo_controls_fullscreen_description">ໂໝດເຕັມຈໍ</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">ດາວໂຫລດ</string>
   <string name="exo_download_notification_channel_name">ດາວໂຫລດ</string>
   <string name="exo_download_downloading">ກຳລັງດາວໂຫລດ</string>
diff --git a/library/ui/src/main/res/values-lt/strings.xml b/library/ui/src/main/res/values-lt/strings.xml
index eaf26aafb6..c3e39edc3c 100644
--- a/library/ui/src/main/res/values-lt/strings.xml
+++ b/library/ui/src/main/res/values-lt/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Kartoti viską</string>
   <string name="exo_controls_shuffle_description">Maišyti</string>
   <string name="exo_controls_fullscreen_description">Viso ekrano režimas</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Atsisiųsti</string>
   <string name="exo_download_notification_channel_name">Atsisiuntimai</string>
   <string name="exo_download_downloading">Atsisiunčiama</string>
diff --git a/library/ui/src/main/res/values-lv/strings.xml b/library/ui/src/main/res/values-lv/strings.xml
index 708a2143c7..cf3c20e53d 100644
--- a/library/ui/src/main/res/values-lv/strings.xml
+++ b/library/ui/src/main/res/values-lv/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Atkārtot visu</string>
   <string name="exo_controls_shuffle_description">Atskaņot jauktā secībā</string>
   <string name="exo_controls_fullscreen_description">Pilnekrāna režīms</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Lejupielādēt</string>
   <string name="exo_download_notification_channel_name">Lejupielādes</string>
   <string name="exo_download_downloading">Notiek lejupielāde</string>
diff --git a/library/ui/src/main/res/values-mk/strings.xml b/library/ui/src/main/res/values-mk/strings.xml
index 3e6ae777cc..8b44cd317e 100644
--- a/library/ui/src/main/res/values-mk/strings.xml
+++ b/library/ui/src/main/res/values-mk/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Повтори ги сите</string>
   <string name="exo_controls_shuffle_description">Измешај</string>
   <string name="exo_controls_fullscreen_description">Режим на цел екран</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Преземи</string>
   <string name="exo_download_notification_channel_name">Преземања</string>
   <string name="exo_download_downloading">Се презема</string>
diff --git a/library/ui/src/main/res/values-ml/strings.xml b/library/ui/src/main/res/values-ml/strings.xml
index acd3828fe2..d5c474bd17 100644
--- a/library/ui/src/main/res/values-ml/strings.xml
+++ b/library/ui/src/main/res/values-ml/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">എല്ലാം ആവർത്തിക്കുക</string>
   <string name="exo_controls_shuffle_description">ഇടകലര്‍ത്തുക</string>
   <string name="exo_controls_fullscreen_description">പൂർണ്ണ സ്‌ക്രീൻ മോഡ്</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">ഡൗൺലോഡ്</string>
   <string name="exo_download_notification_channel_name">ഡൗൺലോഡുകൾ</string>
   <string name="exo_download_downloading">ഡൗൺലോഡ് ചെയ്യുന്നു</string>
diff --git a/library/ui/src/main/res/values-mn/strings.xml b/library/ui/src/main/res/values-mn/strings.xml
index 328827f87f..77d493b42f 100644
--- a/library/ui/src/main/res/values-mn/strings.xml
+++ b/library/ui/src/main/res/values-mn/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Бүгдийг нь дахин тоглуулах</string>
   <string name="exo_controls_shuffle_description">Холих</string>
   <string name="exo_controls_fullscreen_description">Бүтэн дэлгэцийн горим</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Татах</string>
   <string name="exo_download_notification_channel_name">Татaлт</string>
   <string name="exo_download_downloading">Татаж байна</string>
diff --git a/library/ui/src/main/res/values-mr/strings.xml b/library/ui/src/main/res/values-mr/strings.xml
index 45bac7c61f..c88466ca9c 100644
--- a/library/ui/src/main/res/values-mr/strings.xml
+++ b/library/ui/src/main/res/values-mr/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">सर्व रीपीट करा</string>
   <string name="exo_controls_shuffle_description">शफल करा</string>
   <string name="exo_controls_fullscreen_description">फुल स्क्रीन मोड</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">डाउनलोड करा</string>
   <string name="exo_download_notification_channel_name">डाउनलोड</string>
   <string name="exo_download_downloading">डाउनलोड होत आहे</string>
diff --git a/library/ui/src/main/res/values-ms/strings.xml b/library/ui/src/main/res/values-ms/strings.xml
index c4a437da3b..df74b68abc 100644
--- a/library/ui/src/main/res/values-ms/strings.xml
+++ b/library/ui/src/main/res/values-ms/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ulang semua</string>
   <string name="exo_controls_shuffle_description">Rombak</string>
   <string name="exo_controls_fullscreen_description">Mod skrin penuh</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Muat turun</string>
   <string name="exo_download_notification_channel_name">Muat turun</string>
   <string name="exo_download_downloading">Memuat turun</string>
diff --git a/library/ui/src/main/res/values-my/strings.xml b/library/ui/src/main/res/values-my/strings.xml
index 497ff50416..d7aa70c610 100644
--- a/library/ui/src/main/res/values-my/strings.xml
+++ b/library/ui/src/main/res/values-my/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">အားလုံး ပြန်ကျော့ရန်</string>
   <string name="exo_controls_shuffle_description">ရောသမမွှေ</string>
   <string name="exo_controls_fullscreen_description">မျက်နှာပြင်အပြည့် မုဒ်</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">ဒေါင်းလုဒ် လုပ်ရန်</string>
   <string name="exo_download_notification_channel_name">ဒေါင်းလုဒ်များ</string>
   <string name="exo_download_downloading">ဒေါင်းလုဒ်လုပ်နေသည်</string>
diff --git a/library/ui/src/main/res/values-nb/strings.xml b/library/ui/src/main/res/values-nb/strings.xml
index 7e48146084..c73deb4a18 100644
--- a/library/ui/src/main/res/values-nb/strings.xml
+++ b/library/ui/src/main/res/values-nb/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Gjenta alle</string>
   <string name="exo_controls_shuffle_description">Tilfeldig rekkefølge</string>
   <string name="exo_controls_fullscreen_description">Fullskjermmodus</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Last ned</string>
   <string name="exo_download_notification_channel_name">Nedlastinger</string>
   <string name="exo_download_downloading">Laster ned</string>
diff --git a/library/ui/src/main/res/values-ne/strings.xml b/library/ui/src/main/res/values-ne/strings.xml
index 5011998b87..7daff17e1f 100644
--- a/library/ui/src/main/res/values-ne/strings.xml
+++ b/library/ui/src/main/res/values-ne/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">सबै दोहोर्‍याउनुहोस्</string>
   <string name="exo_controls_shuffle_description">मिसाउनुहोस्</string>
   <string name="exo_controls_fullscreen_description">पूर्ण स्क्रिन मोड</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">डाउनलोड गर्नुहोस्</string>
   <string name="exo_download_notification_channel_name">डाउनलोडहरू</string>
   <string name="exo_download_downloading">डाउनलोड गरिँदै छ</string>
diff --git a/library/ui/src/main/res/values-nl/strings.xml b/library/ui/src/main/res/values-nl/strings.xml
index 1a2880ae1f..4749f6bbbb 100644
--- a/library/ui/src/main/res/values-nl/strings.xml
+++ b/library/ui/src/main/res/values-nl/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Alles herhalen</string>
   <string name="exo_controls_shuffle_description">Shuffle</string>
   <string name="exo_controls_fullscreen_description">Modus \'Volledig scherm\'</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Downloaden</string>
   <string name="exo_download_notification_channel_name">Downloads</string>
   <string name="exo_download_downloading">Downloaden</string>
diff --git a/library/ui/src/main/res/values-pa/strings.xml b/library/ui/src/main/res/values-pa/strings.xml
index effc9250ed..ea5f8f034f 100644
--- a/library/ui/src/main/res/values-pa/strings.xml
+++ b/library/ui/src/main/res/values-pa/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">ਸਾਰਿਆਂ ਨੂੰ ਦੁਹਰਾਓ</string>
   <string name="exo_controls_shuffle_description">ਬੇਤਰਤੀਬ ਕਰੋ</string>
   <string name="exo_controls_fullscreen_description">ਪੂਰੀ-ਸਕ੍ਰੀਨ ਮੋਡ</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">ਡਾਊਨਲੋਡ ਕਰੋ</string>
   <string name="exo_download_notification_channel_name">ਡਾਊਨਲੋਡ</string>
   <string name="exo_download_downloading">ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ</string>
diff --git a/library/ui/src/main/res/values-pl/strings.xml b/library/ui/src/main/res/values-pl/strings.xml
index 312481fa2b..6e08237bfd 100644
--- a/library/ui/src/main/res/values-pl/strings.xml
+++ b/library/ui/src/main/res/values-pl/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Powtórz wszystkie</string>
   <string name="exo_controls_shuffle_description">Odtwarzanie losowe</string>
   <string name="exo_controls_fullscreen_description">Tryb pełnoekranowy</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Pobierz</string>
   <string name="exo_download_notification_channel_name">Pobieranie</string>
   <string name="exo_download_downloading">Pobieram</string>
diff --git a/library/ui/src/main/res/values-pt-rPT/strings.xml b/library/ui/src/main/res/values-pt-rPT/strings.xml
index 52eb01e219..6bbfb49c6b 100644
--- a/library/ui/src/main/res/values-pt-rPT/strings.xml
+++ b/library/ui/src/main/res/values-pt-rPT/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repetir tudo</string>
   <string name="exo_controls_shuffle_description">Reproduzir aleatoriamente</string>
   <string name="exo_controls_fullscreen_description">Modo de ecrã inteiro</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Transferir</string>
   <string name="exo_download_notification_channel_name">Transferências</string>
   <string name="exo_download_downloading">A transferir…</string>
diff --git a/library/ui/src/main/res/values-pt/strings.xml b/library/ui/src/main/res/values-pt/strings.xml
index 6ea00fed8d..96c27f3d4a 100644
--- a/library/ui/src/main/res/values-pt/strings.xml
+++ b/library/ui/src/main/res/values-pt/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repetir tudo</string>
   <string name="exo_controls_shuffle_description">Aleatório</string>
   <string name="exo_controls_fullscreen_description">Modo de tela cheia</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Fazer o download</string>
   <string name="exo_download_notification_channel_name">Downloads</string>
   <string name="exo_download_downloading">Fazendo o download</string>
diff --git a/library/ui/src/main/res/values-ro/strings.xml b/library/ui/src/main/res/values-ro/strings.xml
index 4ea18d4a58..cb50bb6b76 100644
--- a/library/ui/src/main/res/values-ro/strings.xml
+++ b/library/ui/src/main/res/values-ro/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repetați-le pe toate</string>
   <string name="exo_controls_shuffle_description">Redați aleatoriu</string>
   <string name="exo_controls_fullscreen_description">Modul Ecran complet</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Descărcați</string>
   <string name="exo_download_notification_channel_name">Descărcări</string>
   <string name="exo_download_downloading">Se descarcă</string>
diff --git a/library/ui/src/main/res/values-ru/strings.xml b/library/ui/src/main/res/values-ru/strings.xml
index 14c8badf99..24659ef1c1 100644
--- a/library/ui/src/main/res/values-ru/strings.xml
+++ b/library/ui/src/main/res/values-ru/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Повторять все</string>
   <string name="exo_controls_shuffle_description">Перемешать</string>
   <string name="exo_controls_fullscreen_description">Полноэкранный режим</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Скачать</string>
   <string name="exo_download_notification_channel_name">Скачивания</string>
   <string name="exo_download_downloading">Скачивание…</string>
diff --git a/library/ui/src/main/res/values-si/strings.xml b/library/ui/src/main/res/values-si/strings.xml
index 92ae038c4b..80412f5aa5 100644
--- a/library/ui/src/main/res/values-si/strings.xml
+++ b/library/ui/src/main/res/values-si/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">සියල්ල පුනරාවර්තනය කරන්න</string>
   <string name="exo_controls_shuffle_description">කලවම් කරන්න</string>
   <string name="exo_controls_fullscreen_description">සම්පූර්ණ තිර ප්‍රකාරය</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">බාගන්න</string>
   <string name="exo_download_notification_channel_name">බාගැනීම්</string>
   <string name="exo_download_downloading">බාගනිමින්</string>
diff --git a/library/ui/src/main/res/values-sk/strings.xml b/library/ui/src/main/res/values-sk/strings.xml
index f4f997b207..99ec680405 100644
--- a/library/ui/src/main/res/values-sk/strings.xml
+++ b/library/ui/src/main/res/values-sk/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Opakovať všetko</string>
   <string name="exo_controls_shuffle_description">Náhodne prehrávať</string>
   <string name="exo_controls_fullscreen_description">Režim celej obrazovky</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Stiahnuť</string>
   <string name="exo_download_notification_channel_name">Stiahnuté</string>
   <string name="exo_download_downloading">Sťahuje sa</string>
diff --git a/library/ui/src/main/res/values-sl/strings.xml b/library/ui/src/main/res/values-sl/strings.xml
index 83d332103e..ec75cd1d4b 100644
--- a/library/ui/src/main/res/values-sl/strings.xml
+++ b/library/ui/src/main/res/values-sl/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ponavljanje vseh</string>
   <string name="exo_controls_shuffle_description">Naključno predvajanje</string>
   <string name="exo_controls_fullscreen_description">Celozaslonski način</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Prenos</string>
   <string name="exo_download_notification_channel_name">Prenosi</string>
   <string name="exo_download_downloading">Prenašanje</string>
diff --git a/library/ui/src/main/res/values-sq/strings.xml b/library/ui/src/main/res/values-sq/strings.xml
index c46524762d..2c139f20cb 100644
--- a/library/ui/src/main/res/values-sq/strings.xml
+++ b/library/ui/src/main/res/values-sq/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Përsërit të gjitha</string>
   <string name="exo_controls_shuffle_description">Përziej</string>
   <string name="exo_controls_fullscreen_description">Modaliteti me ekran të plotë</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Shkarko</string>
   <string name="exo_download_notification_channel_name">Shkarkimet</string>
   <string name="exo_download_downloading">Po shkarkohet</string>
diff --git a/library/ui/src/main/res/values-sr/strings.xml b/library/ui/src/main/res/values-sr/strings.xml
index 394ab8d36e..82af21ba17 100644
--- a/library/ui/src/main/res/values-sr/strings.xml
+++ b/library/ui/src/main/res/values-sr/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Понови све</string>
   <string name="exo_controls_shuffle_description">Пусти насумично</string>
   <string name="exo_controls_fullscreen_description">Режим целог екрана</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Преузми</string>
   <string name="exo_download_notification_channel_name">Преузимања</string>
   <string name="exo_download_downloading">Преузима се</string>
diff --git a/library/ui/src/main/res/values-sv/strings.xml b/library/ui/src/main/res/values-sv/strings.xml
index 38daddb507..a99f8409bd 100644
--- a/library/ui/src/main/res/values-sv/strings.xml
+++ b/library/ui/src/main/res/values-sv/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Upprepa alla</string>
   <string name="exo_controls_shuffle_description">Blanda spår</string>
   <string name="exo_controls_fullscreen_description">Helskärmsläge</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Ladda ned</string>
   <string name="exo_download_notification_channel_name">Nedladdningar</string>
   <string name="exo_download_downloading">Laddar ned</string>
diff --git a/library/ui/src/main/res/values-sw/strings.xml b/library/ui/src/main/res/values-sw/strings.xml
index 2c7268626f..aeefbc2a9f 100644
--- a/library/ui/src/main/res/values-sw/strings.xml
+++ b/library/ui/src/main/res/values-sw/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Rudia zote</string>
   <string name="exo_controls_shuffle_description">Changanya</string>
   <string name="exo_controls_fullscreen_description">Hali ya skrini nzima</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Pakua</string>
   <string name="exo_download_notification_channel_name">Vipakuliwa</string>
   <string name="exo_download_downloading">Inapakua</string>
diff --git a/library/ui/src/main/res/values-ta/strings.xml b/library/ui/src/main/res/values-ta/strings.xml
index 14a0203e06..655da2f718 100644
--- a/library/ui/src/main/res/values-ta/strings.xml
+++ b/library/ui/src/main/res/values-ta/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">அனைத்தையும் மீண்டும் இயக்கு</string>
   <string name="exo_controls_shuffle_description">கலைத்துப் போடு</string>
   <string name="exo_controls_fullscreen_description">முழுத்திரைப் பயன்முறை</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">பதிவிறக்கும் பட்டன்</string>
   <string name="exo_download_notification_channel_name">பதிவிறக்கங்கள்</string>
   <string name="exo_download_downloading">பதிவிறக்குகிறது</string>
diff --git a/library/ui/src/main/res/values-te/strings.xml b/library/ui/src/main/res/values-te/strings.xml
index 7e3f32a039..ed056ef26e 100644
--- a/library/ui/src/main/res/values-te/strings.xml
+++ b/library/ui/src/main/res/values-te/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">అన్నింటినీ పునరావృతం చేయండి</string>
   <string name="exo_controls_shuffle_description">షఫుల్ చేయండి</string>
   <string name="exo_controls_fullscreen_description">పూర్తి స్క్రీన్ మోడ్</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">డౌన్‌లోడ్ చేయి</string>
   <string name="exo_download_notification_channel_name">డౌన్‌లోడ్‌లు</string>
   <string name="exo_download_downloading">డౌన్‌లోడ్ చేస్తోంది</string>
diff --git a/library/ui/src/main/res/values-th/strings.xml b/library/ui/src/main/res/values-th/strings.xml
index 85c4f8cf92..5193aa3b86 100644
--- a/library/ui/src/main/res/values-th/strings.xml
+++ b/library/ui/src/main/res/values-th/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">เล่นซ้ำทั้งหมด</string>
   <string name="exo_controls_shuffle_description">สุ่ม</string>
   <string name="exo_controls_fullscreen_description">โหมดเต็มหน้าจอ</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">ดาวน์โหลด</string>
   <string name="exo_download_notification_channel_name">ดาวน์โหลด</string>
   <string name="exo_download_downloading">กำลังดาวน์โหลด</string>
diff --git a/library/ui/src/main/res/values-tl/strings.xml b/library/ui/src/main/res/values-tl/strings.xml
index dfad2c1b08..54b4e9ca6c 100644
--- a/library/ui/src/main/res/values-tl/strings.xml
+++ b/library/ui/src/main/res/values-tl/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ulitin lahat</string>
   <string name="exo_controls_shuffle_description">I-shuffle</string>
   <string name="exo_controls_fullscreen_description">Fullscreen mode</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">I-download</string>
   <string name="exo_download_notification_channel_name">Mga Download</string>
   <string name="exo_download_downloading">Nagda-download</string>
diff --git a/library/ui/src/main/res/values-tr/strings.xml b/library/ui/src/main/res/values-tr/strings.xml
index cacb60c5a5..6c93d81270 100644
--- a/library/ui/src/main/res/values-tr/strings.xml
+++ b/library/ui/src/main/res/values-tr/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Tümünü tekrarla</string>
   <string name="exo_controls_shuffle_description">Karıştır</string>
   <string name="exo_controls_fullscreen_description">Tam ekran modu</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">İndir</string>
   <string name="exo_download_notification_channel_name">İndirilenler</string>
   <string name="exo_download_downloading">İndiriliyor</string>
diff --git a/library/ui/src/main/res/values-uk/strings.xml b/library/ui/src/main/res/values-uk/strings.xml
index ecf6c8745e..ac1d4c0ce5 100644
--- a/library/ui/src/main/res/values-uk/strings.xml
+++ b/library/ui/src/main/res/values-uk/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Повторити всі</string>
   <string name="exo_controls_shuffle_description">Перемішати</string>
   <string name="exo_controls_fullscreen_description">Повноекранний режим</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Завантажити</string>
   <string name="exo_download_notification_channel_name">Завантаження</string>
   <string name="exo_download_downloading">Завантажується</string>
diff --git a/library/ui/src/main/res/values-ur/strings.xml b/library/ui/src/main/res/values-ur/strings.xml
index fbc18fa347..bf4e6eddaf 100644
--- a/library/ui/src/main/res/values-ur/strings.xml
+++ b/library/ui/src/main/res/values-ur/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">سبھی کو دہرائیں</string>
   <string name="exo_controls_shuffle_description">شفل کریں</string>
   <string name="exo_controls_fullscreen_description">پوری اسکرین والی وضع</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">ڈاؤن لوڈ کریں</string>
   <string name="exo_download_notification_channel_name">ڈاؤن لوڈز</string>
   <string name="exo_download_downloading">ڈاؤن لوڈ ہو رہا ہے</string>
diff --git a/library/ui/src/main/res/values-uz/strings.xml b/library/ui/src/main/res/values-uz/strings.xml
index 5c9a05d259..5275d7bd06 100644
--- a/library/ui/src/main/res/values-uz/strings.xml
+++ b/library/ui/src/main/res/values-uz/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Hammasini takrorlash</string>
   <string name="exo_controls_shuffle_description">Aralash</string>
   <string name="exo_controls_fullscreen_description">Butun ekran rejimi</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Yuklab olish</string>
   <string name="exo_download_notification_channel_name">Yuklanmalar</string>
   <string name="exo_download_downloading">Yuklab olinmoqda</string>
diff --git a/library/ui/src/main/res/values-vi/strings.xml b/library/ui/src/main/res/values-vi/strings.xml
index 65c9cb52a3..bb9b290bd4 100644
--- a/library/ui/src/main/res/values-vi/strings.xml
+++ b/library/ui/src/main/res/values-vi/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Lặp lại tất cả</string>
   <string name="exo_controls_shuffle_description">Phát ngẫu nhiên</string>
   <string name="exo_controls_fullscreen_description">Chế độ toàn màn hình</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Tải xuống</string>
   <string name="exo_download_notification_channel_name">Tài nguyên đã tải xuống</string>
   <string name="exo_download_downloading">Đang tải xuống</string>
diff --git a/library/ui/src/main/res/values-zh-rCN/strings.xml b/library/ui/src/main/res/values-zh-rCN/strings.xml
index e75697621c..ece063ff0f 100644
--- a/library/ui/src/main/res/values-zh-rCN/strings.xml
+++ b/library/ui/src/main/res/values-zh-rCN/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">全部重复播放</string>
   <string name="exo_controls_shuffle_description">随机播放</string>
   <string name="exo_controls_fullscreen_description">全屏模式</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">下载</string>
   <string name="exo_download_notification_channel_name">下载内容</string>
   <string name="exo_download_downloading">正在下载</string>
diff --git a/library/ui/src/main/res/values-zh-rHK/strings.xml b/library/ui/src/main/res/values-zh-rHK/strings.xml
index e65831ad9f..6ccdd01a2a 100644
--- a/library/ui/src/main/res/values-zh-rHK/strings.xml
+++ b/library/ui/src/main/res/values-zh-rHK/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">全部重複播放</string>
   <string name="exo_controls_shuffle_description">隨機播放</string>
   <string name="exo_controls_fullscreen_description">全螢幕模式</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">下載</string>
   <string name="exo_download_notification_channel_name">下載內容</string>
   <string name="exo_download_downloading">正在下載</string>
diff --git a/library/ui/src/main/res/values-zh-rTW/strings.xml b/library/ui/src/main/res/values-zh-rTW/strings.xml
index b817f189fb..04134d92a6 100644
--- a/library/ui/src/main/res/values-zh-rTW/strings.xml
+++ b/library/ui/src/main/res/values-zh-rTW/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">重複播放所有項目</string>
   <string name="exo_controls_shuffle_description">隨機播放</string>
   <string name="exo_controls_fullscreen_description">全螢幕模式</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">下載</string>
   <string name="exo_download_notification_channel_name">下載</string>
   <string name="exo_download_downloading">下載中</string>
diff --git a/library/ui/src/main/res/values-zu/strings.xml b/library/ui/src/main/res/values-zu/strings.xml
index 0b78b7d1fa..40a1a6ce29 100644
--- a/library/ui/src/main/res/values-zu/strings.xml
+++ b/library/ui/src/main/res/values-zu/strings.xml
@@ -12,6 +12,7 @@
   <string name="exo_controls_repeat_all_description">Phinda konke</string>
   <string name="exo_controls_shuffle_description">Shova</string>
   <string name="exo_controls_fullscreen_description">Imodi yesikrini esigcwele</string>
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <string name="exo_download_description">Landa</string>
   <string name="exo_download_notification_channel_name">Ukulandwa</string>
   <string name="exo_download_downloading">Iyalanda</string>
diff --git a/library/ui/src/main/res/values/strings.xml b/library/ui/src/main/res/values/strings.xml
index d3befa2f43..2acbaadeeb 100644
--- a/library/ui/src/main/res/values/strings.xml
+++ b/library/ui/src/main/res/values/strings.xml
@@ -38,6 +38,8 @@
   <string name="exo_controls_shuffle_description">Shuffle</string>
   <!-- Description for a media control button that toggles whether a video playback is fullscreen. [CHAR LIMIT=30] -->
   <string name="exo_controls_fullscreen_description">Fullscreen mode</string>
+  <!-- Description for a media control button that exits VR mode. [CHAR LIMIT=30] -->
+  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
   <!-- Description for a button that downloads a piece of media content onto the device. [CHAR LIMIT=20] -->
   <string name="exo_download_description">Download</string>
   <!-- Default name for a notification channel corresponding to media downloads. [CHAR LIMIT=40] -->

From 5ce2f1763d061d63f9d2f95e94da0a5441328c20 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 22 Oct 2018 03:31:38 -0700
Subject: [PATCH 116/832] Check if source has been prepared before releasing
 it.

In ConcatenatingMediaSource, the source may be removed before it started
preparing (this may happen if lazyPreparation=true). In this case, we
shouldn't call releaseSource as the preparation didn't start.

Issue:#4986

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=218141658
---
 RELEASENOTES.md                                |  3 +++
 .../source/ConcatenatingMediaSource.java       | 18 ++++++++++++------
 .../source/ConcatenatingMediaSourceTest.java   | 16 ++++++++++++++++
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 060b5f4daf..17e445dd98 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -30,6 +30,9 @@
 * IMA extension:
   * For preroll to live stream transitions, project forward the loading position
     to avoid being behind the live window.
+* Fix issue where a `NullPointerException` is thrown when removing an unprepared
+  media source from a `ConcatenatingMediaSource` with the `useLazyPreparation`
+  option enabled ([#4986](https://github.com/google/ExoPlayer/issues/4986)).
 
 ### 2.9.0 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
index fb99eef6e7..830ab52e19 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
@@ -502,9 +502,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
         Assertions.checkNotNull(mediaSourceByMediaPeriod.remove(mediaPeriod));
     ((DeferredMediaPeriod) mediaPeriod).releasePeriod();
     holder.activeMediaPeriods.remove(mediaPeriod);
-    if (holder.activeMediaPeriods.isEmpty() && holder.isRemoved) {
-      releaseChildSource(holder);
-    }
+    maybeReleaseChildSource(holder);
   }
 
   @Override
@@ -747,9 +745,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
         -oldTimeline.getWindowCount(),
         -oldTimeline.getPeriodCount());
     holder.isRemoved = true;
-    if (holder.activeMediaPeriods.isEmpty()) {
-      releaseChildSource(holder);
-    }
+    maybeReleaseChildSource(holder);
   }
 
   private void moveMediaSourceInternal(int currentIndex, int newIndex) {
@@ -778,6 +774,16 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
     }
   }
 
+  private void maybeReleaseChildSource(MediaSourceHolder mediaSourceHolder) {
+    // Release if the source has been removed from the playlist, but only if it has been previously
+    // prepared and only if we are not waiting for an existing media period to be released.
+    if (mediaSourceHolder.isRemoved
+        && mediaSourceHolder.hasStartedPreparing
+        && mediaSourceHolder.activeMediaPeriods.isEmpty()) {
+      releaseChildSource(mediaSourceHolder);
+    }
+  }
+
   /** Return uid of media source holder from period uid of concatenated source. */
   private static Object getMediaSourceHolderUid(Object periodUid) {
     return ConcatenatedTimeline.getChildTimelineUidFromConcatenatedUid(periodUid);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
index d3d3b39ea4..dd1221f160 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
@@ -925,6 +925,22 @@ public final class ConcatenatingMediaSourceTest {
     testRunner.createPeriod(mediaPeriodId);
   }
 
+  @Test
+  public void testRemoveUnpreparedChildSourceWithLazyPreparation() throws IOException {
+    FakeMediaSource[] childSources = createMediaSources(/* count= */ 2);
+    mediaSource =
+        new ConcatenatingMediaSource(
+            /* isAtomic= */ false,
+            /* useLazyPreparation= */ true,
+            new DefaultShuffleOrder(0),
+            childSources);
+    testRunner = new MediaSourceTestRunner(mediaSource, /* allocator= */ null);
+    testRunner.prepareSource();
+
+    // Check that removal doesn't throw even though the child sources are unprepared.
+    mediaSource.removeMediaSource(0);
+  }
+
   @Test
   public void testSetShuffleOrderBeforePreparation() throws Exception {
     mediaSource.setShuffleOrder(new ShuffleOrder.UnshuffledShuffleOrder(/* length= */ 0));

From 4343dc6084cb53bcdb67278a480a475a624437ef Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Mon, 22 Oct 2018 12:59:24 -0700
Subject: [PATCH 117/832] Remove the Uri suffix from
 MediaItem.DrmScheme.licenseServerUri

Makes it consistent with MediaItem.media.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=218217648
---
 .../google/android/exoplayer2/ext/cast/MediaItem.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java
index f9188e08be..02a8d1b5d4 100644
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java
@@ -201,20 +201,20 @@ public final class MediaItem {
     public final UUID uuid;
 
     /**
-     * A optional {@link UriBundle} for the license server. If no license server is provided, the
+     * Optional {@link UriBundle} for the license server. If no license server is provided, the
      * server must be provided by the media.
      */
-    @Nullable public final UriBundle licenseServerUri;
+    @Nullable public final UriBundle licenseServer;
 
     /**
      * Creates an instance.
      *
      * @param uuid See {@link #uuid}.
-     * @param licenseServerUri See {@link #licenseServerUri}.
+     * @param licenseServer See {@link #licenseServer}.
      */
-    public DrmScheme(UUID uuid, @Nullable UriBundle licenseServerUri) {
+    public DrmScheme(UUID uuid, @Nullable UriBundle licenseServer) {
       this.uuid = uuid;
-      this.licenseServerUri = licenseServerUri;
+      this.licenseServer = licenseServer;
     }
   }
 

From e1ba9b0086b8510614160d0ab7df08aa509c3181 Mon Sep 17 00:00:00 2001
From: vigneshv <vigneshv@google.com>
Date: Mon, 22 Oct 2018 14:58:21 -0700
Subject: [PATCH 118/832] vp9_extension: Enable fast loop filtering

Turn on flag to enable fast loop filtering. This improves
multi-threaded decode performance by starting loop filtering early
if there are free threads available to do so.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=218239442
---
 extensions/vp9/src/main/jni/vpx_jni.cc | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/extensions/vp9/src/main/jni/vpx_jni.cc b/extensions/vp9/src/main/jni/vpx_jni.cc
index f36c433b22..875e46d40f 100644
--- a/extensions/vp9/src/main/jni/vpx_jni.cc
+++ b/extensions/vp9/src/main/jni/vpx_jni.cc
@@ -460,6 +460,14 @@ DECODER_FUNC(jlong, vpxInit, jboolean disableLoopFilter,
     if (err) {
       LOGE("ERROR: Failed to shut off libvpx loop filter, error = %d.", err);
     }
+#ifdef VPX_CTRL_VP9_SET_LOOP_FILTER_OPT
+  } else {
+    err = vpx_codec_control(context->decoder, VP9D_SET_LOOP_FILTER_OPT, true);
+    if (err) {
+      LOGE("ERROR: Failed to enable loop filter optimization, error = %d.",
+           err);
+    }
+#endif
   }
   if (enableBufferManager) {
     err = vpx_codec_set_frame_buffer_functions(

From 2d63be096229571508939e8277c0537ac81c0728 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 23 Oct 2018 05:41:48 -0700
Subject: [PATCH 119/832] Swap google() and jcenter() in docs and gradle
 config.

This seems to be more stable in case Bintray has issues updating the ExoPlayer
sources.

Issue:#4997

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=218327350
---
 README.md       | 2 +-
 RELEASENOTES.md | 2 ++
 build.gradle    | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 13dfaddab3..b69be03ae4 100644
--- a/README.md
+++ b/README.md
@@ -33,8 +33,8 @@ included in the `build.gradle` file in the root of your project:
 
 ```gradle
 repositories {
-    jcenter()
     google()
+    jcenter()
 }
 ```
 
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 17e445dd98..84864a35c4 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -33,6 +33,8 @@
 * Fix issue where a `NullPointerException` is thrown when removing an unprepared
   media source from a `ConcatenatingMediaSource` with the `useLazyPreparation`
   option enabled ([#4986](https://github.com/google/ExoPlayer/issues/4986)).
+* Swap recommended order for google() and jcenter() in gradle config
+  ([#4997](https://github.com/google/ExoPlayer/issues/4997)).
 
 ### 2.9.0 ###
 
diff --git a/build.gradle b/build.gradle
index a013f4fb84..96eade1aa3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,8 +13,8 @@
 // limitations under the License.
 buildscript {
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.4'
@@ -32,8 +32,8 @@ buildscript {
 }
 allprojects {
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
     project.ext {
         exoplayerPublishEnabled = true

From 2fc122745a1bde8aafe45f87e38be36006660460 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 23 Oct 2018 06:23:50 -0700
Subject: [PATCH 120/832] Give EventDispatcher more predictable behavior

If EventDispatcher.removeListener is called to remove a listener,
and if the call is made from the same thread that said listener
handles events on, then it should be guaranteed that the listener
will not be subsequently invoked on that thread.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=218331427
---
 .../exoplayer2/util/EventDispatcher.java      | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/EventDispatcher.java b/library/core/src/main/java/com/google/android/exoplayer2/util/EventDispatcher.java
index 26c02d8ae9..07f278c808 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/EventDispatcher.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/EventDispatcher.java
@@ -39,22 +39,23 @@ public final class EventDispatcher<T> {
   /** The list of listeners and handlers. */
   private final CopyOnWriteArrayList<HandlerAndListener<T>> listeners;
 
-  /** Creates event dispatcher. */
+  /** Creates an event dispatcher. */
   public EventDispatcher() {
     listeners = new CopyOnWriteArrayList<>();
   }
 
-  /** Adds listener to event dispatcher. */
+  /** Adds a listener to the event dispatcher. */
   public void addListener(Handler handler, T eventListener) {
     Assertions.checkArgument(handler != null && eventListener != null);
     removeListener(eventListener);
     listeners.add(new HandlerAndListener<>(handler, eventListener));
   }
 
-  /** Removes listener from event dispatcher. */
+  /** Removes a listener from the event dispatcher. */
   public void removeListener(T eventListener) {
     for (HandlerAndListener<T> handlerAndListener : listeners) {
       if (handlerAndListener.listener == eventListener) {
+        handlerAndListener.release();
         listeners.remove(handlerAndListener);
       }
     }
@@ -67,19 +68,33 @@ public final class EventDispatcher<T> {
    */
   public void dispatch(Event<T> event) {
     for (HandlerAndListener<T> handlerAndListener : listeners) {
-      T eventListener = handlerAndListener.listener;
-      handlerAndListener.handler.post(() -> event.sendTo(eventListener));
+      handlerAndListener.dispatch(event);
     }
   }
 
   private static final class HandlerAndListener<T> {
 
-    public final Handler handler;
-    public final T listener;
+    private final Handler handler;
+    private final T listener;
+
+    private boolean released;
 
     public HandlerAndListener(Handler handler, T eventListener) {
       this.handler = handler;
       this.listener = eventListener;
     }
+
+    public void release() {
+      released = true;
+    }
+
+    public void dispatch(Event<T> event) {
+      handler.post(
+          () -> {
+            if (!released) {
+              event.sendTo(listener);
+            }
+          });
+    }
   }
 }

From 66c508651ad1de2e011a25ce2e935a1b9fea4f2c Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 23 Oct 2018 06:30:52 -0700
Subject: [PATCH 121/832] Cleanup codec init, flush and release

Issue: #2826

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=218332277
---
 .../mediacodec/MediaCodecRenderer.java        | 158 ++++++++----------
 1 file changed, 72 insertions(+), 86 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index a35240668e..76244dc600 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -475,32 +475,10 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     }
 
     try {
-      if (!initCodecWithFallback(wrappedMediaCrypto, drmSessionRequiresSecureDecoder)) {
-        // We can't initialize a codec yet.
-        return;
-      }
+      maybeInitCodecWithFallback(wrappedMediaCrypto, drmSessionRequiresSecureDecoder);
     } catch (DecoderInitializationException e) {
       throw ExoPlaybackException.createForRenderer(e, getIndex());
     }
-
-    String codecName = codecInfo.name;
-    codecAdaptationWorkaroundMode = codecAdaptationWorkaroundMode(codecName);
-    codecNeedsReconfigureWorkaround = codecNeedsReconfigureWorkaround(codecName);
-    codecNeedsDiscardToSpsWorkaround = codecNeedsDiscardToSpsWorkaround(codecName, format);
-    codecNeedsFlushWorkaround = codecNeedsFlushWorkaround(codecName);
-    codecNeedsEosFlushWorkaround = codecNeedsEosFlushWorkaround(codecName);
-    codecNeedsEosOutputExceptionWorkaround = codecNeedsEosOutputExceptionWorkaround(codecName);
-    codecNeedsMonoChannelCountWorkaround = codecNeedsMonoChannelCountWorkaround(codecName, format);
-    codecNeedsEosPropagation =
-        codecNeedsEosPropagationWorkaround(codecInfo) || getCodecNeedsEosPropagation();
-    codecHotswapDeadlineMs =
-        getState() == STATE_STARTED
-            ? (SystemClock.elapsedRealtime() + MAX_CODEC_HOTSWAP_TIME_MS)
-            : C.TIME_UNSET;
-    resetInputBuffer();
-    resetOutputBuffer();
-    waitingForFirstSyncFrame = true;
-    decoderCounters.decoderInitCount++;
   }
 
   protected boolean shouldInitCodec(MediaCodecInfo codecInfo) {
@@ -581,31 +559,17 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
 
   protected void releaseCodec() {
     availableCodecInfos = null;
-    codecHotswapDeadlineMs = C.TIME_UNSET;
-    resetInputBuffer();
-    resetOutputBuffer();
-    waitingForKeys = false;
-    shouldSkipOutputBuffer = false;
-    decodeOnlyPresentationTimestamps.clear();
-    resetCodecBuffers();
-    codecInfo = null;
-    codecReconfigured = false;
-    codecReceivedBuffers = false;
-    codecNeedsDiscardToSpsWorkaround = false;
-    codecNeedsFlushWorkaround = false;
-    codecAdaptationWorkaroundMode = ADAPTATION_WORKAROUND_MODE_NEVER;
-    codecNeedsReconfigureWorkaround = false;
-    codecNeedsEosFlushWorkaround = false;
-    codecNeedsMonoChannelCountWorkaround = false;
-    codecNeedsAdaptationWorkaroundBuffer = false;
-    shouldSkipAdaptationWorkaroundOutputBuffer = false;
-    codecNeedsEosPropagation = false;
-    codecReceivedEos = false;
-    codecReconfigurationState = RECONFIGURATION_STATE_NONE;
-    codecReinitializationState = REINITIALIZATION_STATE_NONE;
-    codecReinitializationIsRelease = false;
-    codecConfiguredWithOperatingRate = false;
     if (codec != null) {
+      resetInputBuffer();
+      resetOutputBuffer();
+      resetCodecBuffers();
+      codecHotswapDeadlineMs = C.TIME_UNSET;
+      waitingForKeys = false;
+      decodeOnlyPresentationTimestamps.clear();
+      codecInfo = null;
+      codecReconfigured = false;
+      codecReconfigurationState = RECONFIGURATION_STATE_NONE;
+      codecReinitializationState = REINITIALIZATION_STATE_NONE;
       decoderCounters.decoderReleaseCount++;
       try {
         codec.stop();
@@ -708,45 +672,40 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
    */
   protected boolean flushOrReleaseCodec() {
     if (codec == null) {
-      // Nothing to do.
       return false;
     }
-    codecHotswapDeadlineMs = C.TIME_UNSET;
-    resetInputBuffer();
-    resetOutputBuffer();
-    codecReceivedBuffers = false;
-    waitingForFirstSyncFrame = true;
-    waitingForKeys = false;
-    shouldSkipOutputBuffer = false;
-    decodeOnlyPresentationTimestamps.clear();
-    codecNeedsAdaptationWorkaroundBuffer = false;
-    shouldSkipAdaptationWorkaroundOutputBuffer = false;
-    if (codecNeedsFlushWorkaround || (codecNeedsEosFlushWorkaround && codecReceivedEos)) {
+    if (codecNeedsFlushWorkaround
+        || (codecNeedsEosFlushWorkaround && codecReceivedEos)
+        || (codecReinitializationState != REINITIALIZATION_STATE_NONE
+            && codecReinitializationIsRelease)) {
       releaseCodec();
       return true;
-    } else if (codecReinitializationState != REINITIALIZATION_STATE_NONE) {
-      // We're already waiting to re-initialize the codec. Since we're now flushing, there's no need
-      // to wait any longer.
-      if (codecReinitializationIsRelease) {
-        releaseCodec();
-        return true;
-      } else {
-        codec.flush();
-        codecReinitializationState = REINITIALIZATION_STATE_NONE;
-      }
-    } else {
-      // We can flush and re-use the existing decoder.
-      codec.flush();
-    }
-    if (codecReconfigured && format != null) {
-      // Any reconfiguration data that we send shortly before the flush may be discarded. We
-      // avoid this issue by sending reconfiguration data following every flush.
-      codecReconfigurationState = RECONFIGURATION_STATE_WRITE_PENDING;
     }
+    codec.flush();
+
+    resetInputBuffer();
+    resetOutputBuffer();
+    codecHotswapDeadlineMs = C.TIME_UNSET;
+    codecReceivedEos = false;
+    codecReceivedBuffers = false;
+    waitingForFirstSyncFrame = true;
+    codecNeedsAdaptationWorkaroundBuffer = false;
+    shouldSkipAdaptationWorkaroundOutputBuffer = false;
+    shouldSkipOutputBuffer = false;
+
+    waitingForKeys = false;
+    decodeOnlyPresentationTimestamps.clear();
+    codecReinitializationState = REINITIALIZATION_STATE_NONE;
+    // Reconfiguration data sent shortly before the flush may not have been processed by the
+    // decoder. If the codec has been reconfigured we always send reconfiguration data again to
+    // guarantee that it's processed.
+    codecReconfigurationState =
+        codecReconfigured ? RECONFIGURATION_STATE_WRITE_PENDING : RECONFIGURATION_STATE_NONE;
     return false;
   }
 
-  private boolean initCodecWithFallback(MediaCrypto crypto, boolean drmSessionRequiresSecureDecoder)
+  private void maybeInitCodecWithFallback(
+      MediaCrypto crypto, boolean drmSessionRequiresSecureDecoder)
       throws DecoderInitializationException {
     if (availableCodecInfos == null) {
       try {
@@ -770,14 +729,13 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
           DecoderInitializationException.NO_SUITABLE_DECODER_ERROR);
     }
 
-    while (true) {
+    while (codec == null) {
       MediaCodecInfo codecInfo = availableCodecInfos.peekFirst();
       if (!shouldInitCodec(codecInfo)) {
-        return false;
+        return;
       }
       try {
         initCodec(codecInfo, crypto);
-        return true;
       } catch (Exception e) {
         Log.w(TAG, "Failed to initialize decoder: " + codecInfo, e);
         // This codec failed to initialize, so fall back to the next codec in the list (if any). We
@@ -798,6 +756,8 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
         }
       }
     }
+
+    availableCodecInfos = null;
   }
 
   private List<MediaCodecInfo> getAvailableCodecInfos(boolean drmSessionRequiresSecureDecoder)
@@ -827,13 +787,14 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     long codecInitializingTimestamp;
     long codecInitializedTimestamp;
     MediaCodec codec = null;
-    String name = codecInfo.name;
+    String codecName = codecInfo.name;
+
     updateCodecOperatingRate();
     boolean configureWithOperatingRate = codecOperatingRate > assumedMinimumCodecOperatingRate;
     try {
       codecInitializingTimestamp = SystemClock.elapsedRealtime();
-      TraceUtil.beginSection("createCodec:" + name);
-      codec = MediaCodec.createByCodecName(name);
+      TraceUtil.beginSection("createCodec:" + codecName);
+      codec = MediaCodec.createByCodecName(codecName);
       TraceUtil.endSection();
       TraceUtil.beginSection("configureCodec");
       configureCodec(
@@ -842,7 +803,6 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
           format,
           crypto,
           configureWithOperatingRate ? codecOperatingRate : CODEC_OPERATING_RATE_UNSET);
-      codecConfiguredWithOperatingRate = configureWithOperatingRate;
       TraceUtil.endSection();
       TraceUtil.beginSection("startCodec");
       codec.start();
@@ -856,10 +816,36 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
       }
       throw e;
     }
+
     this.codec = codec;
     this.codecInfo = codecInfo;
+    codecConfiguredWithOperatingRate = configureWithOperatingRate;
+    codecAdaptationWorkaroundMode = codecAdaptationWorkaroundMode(codecName);
+    codecNeedsReconfigureWorkaround = codecNeedsReconfigureWorkaround(codecName);
+    codecNeedsDiscardToSpsWorkaround = codecNeedsDiscardToSpsWorkaround(codecName, format);
+    codecNeedsFlushWorkaround = codecNeedsFlushWorkaround(codecName);
+    codecNeedsEosFlushWorkaround = codecNeedsEosFlushWorkaround(codecName);
+    codecNeedsEosOutputExceptionWorkaround = codecNeedsEosOutputExceptionWorkaround(codecName);
+    codecNeedsMonoChannelCountWorkaround = codecNeedsMonoChannelCountWorkaround(codecName, format);
+    codecNeedsEosPropagation =
+        codecNeedsEosPropagationWorkaround(codecInfo) || getCodecNeedsEosPropagation();
+
+    resetInputBuffer();
+    resetOutputBuffer();
+    codecHotswapDeadlineMs =
+        getState() == STATE_STARTED
+            ? (SystemClock.elapsedRealtime() + MAX_CODEC_HOTSWAP_TIME_MS)
+            : C.TIME_UNSET;
+    codecReceivedEos = false;
+    codecReceivedBuffers = false;
+    waitingForFirstSyncFrame = true;
+    codecNeedsAdaptationWorkaroundBuffer = false;
+    shouldSkipAdaptationWorkaroundOutputBuffer = false;
+    shouldSkipOutputBuffer = false;
+
+    decoderCounters.decoderInitCount++;
     long elapsed = codecInitializedTimestamp - codecInitializingTimestamp;
-    onCodecInitialized(name, codecInitializedTimestamp, elapsed);
+    onCodecInitialized(codecName, codecInitializedTimestamp, elapsed);
   }
 
   private void getCodecBuffers(MediaCodec codec) {

From d56b7ad8117e48ea1dcc4b404be995a41cab55bf Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 23 Oct 2018 08:34:32 -0700
Subject: [PATCH 122/832] Clean up codec reinitialization

Issue: #2826

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=218346327
---
 .../mediacodec/MediaCodecRenderer.java        | 159 +++++++++---------
 1 file changed, 77 insertions(+), 82 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index 76244dc600..3d7287d720 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -228,28 +228,25 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
 
   @Documented
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({
-    REINITIALIZATION_STATE_NONE,
-    REINITIALIZATION_STATE_SIGNAL_END_OF_STREAM,
-    REINITIALIZATION_STATE_WAIT_END_OF_STREAM
-  })
-  private @interface ReinitializationState {}
-  /**
-   * The codec does not need to be re-initialized.
-   */
-  private static final int REINITIALIZATION_STATE_NONE = 0;
-  /**
-   * The input format has changed in a way that requires the codec to be re-initialized, but we
-   * haven't yet signaled an end of stream to the existing codec. We need to do so in order to
-   * ensure that it outputs any remaining buffers before we release it.
-   */
-  private static final int REINITIALIZATION_STATE_SIGNAL_END_OF_STREAM = 1;
-  /**
-   * The input format has changed in a way that requires the codec to be re-initialized, and we've
-   * signaled an end of stream to the existing codec. We're waiting for the codec to output an end
-   * of stream signal to indicate that it has output any remaining buffers before we release it.
-   */
-  private static final int REINITIALIZATION_STATE_WAIT_END_OF_STREAM = 2;
+  @IntDef({DRAIN_STATE_NONE, DRAIN_STATE_SIGNAL_END_OF_STREAM, DRAIN_STATE_WAIT_END_OF_STREAM})
+  private @interface DrainState {}
+  /** The codec is not being drained. */
+  private static final int DRAIN_STATE_NONE = 0;
+  /** The codec needs to be drained, but we haven't signaled an end of stream to it yet. */
+  private static final int DRAIN_STATE_SIGNAL_END_OF_STREAM = 1;
+  /** The codec needs to be drained, and we're waiting for it to output an end of stream. */
+  private static final int DRAIN_STATE_WAIT_END_OF_STREAM = 2;
+
+  @Documented
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({DRAIN_ACTION_NONE, DRAIN_ACTION_FLUSH, DRAIN_ACTION_REINITIALIZE})
+  private @interface DrainAction {}
+  /** No special action should be taken. */
+  private static final int DRAIN_ACTION_NONE = 0;
+  /** The codec should be flushed. */
+  private static final int DRAIN_ACTION_FLUSH = 1;
+  /** The codec should be re-initialized. */
+  private static final int DRAIN_ACTION_REINITIALIZE = 2;
 
   @Documented
   @Retention(RetentionPolicy.SOURCE)
@@ -283,8 +280,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   private static final int ADAPTATION_WORKAROUND_SLICE_WIDTH_HEIGHT = 32;
 
   private final MediaCodecSelector mediaCodecSelector;
-  @Nullable
-  private final DrmSessionManager<FrameworkMediaCrypto> drmSessionManager;
+  @Nullable private final DrmSessionManager<FrameworkMediaCrypto> drmSessionManager;
   private final boolean playClearSamplesWithoutKeys;
   private final float assumedMinimumCodecOperatingRate;
   private final DecoderInputBuffer buffer;
@@ -303,10 +299,10 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   private float rendererOperatingRate;
   private float codecOperatingRate;
   private boolean codecConfiguredWithOperatingRate;
-  private @Nullable ArrayDeque<MediaCodecInfo> availableCodecInfos;
-  private @Nullable DecoderInitializationException preferredDecoderInitializationException;
-  private @Nullable MediaCodecInfo codecInfo;
-  private @AdaptationWorkaroundMode int codecAdaptationWorkaroundMode;
+  @Nullable private ArrayDeque<MediaCodecInfo> availableCodecInfos;
+  @Nullable private DecoderInitializationException preferredDecoderInitializationException;
+  @Nullable private MediaCodecInfo codecInfo;
+  @AdaptationWorkaroundMode private int codecAdaptationWorkaroundMode;
   private boolean codecNeedsReconfigureWorkaround;
   private boolean codecNeedsDiscardToSpsWorkaround;
   private boolean codecNeedsFlushWorkaround;
@@ -324,9 +320,9 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   private ByteBuffer outputBuffer;
   private boolean shouldSkipOutputBuffer;
   private boolean codecReconfigured;
-  private @ReconfigurationState int codecReconfigurationState;
-  private @ReinitializationState int codecReinitializationState;
-  private boolean codecReinitializationIsRelease;
+  @ReconfigurationState private int codecReconfigurationState;
+  @DrainState private int codecDrainState;
+  @DrainAction private int codecDrainAction;
   private boolean codecReceivedBuffers;
   private boolean codecReceivedEos;
 
@@ -371,7 +367,8 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     decodeOnlyPresentationTimestamps = new ArrayList<>();
     outputBufferInfo = new MediaCodec.BufferInfo();
     codecReconfigurationState = RECONFIGURATION_STATE_NONE;
-    codecReinitializationState = REINITIALIZATION_STATE_NONE;
+    codecDrainState = DRAIN_STATE_NONE;
+    codecDrainAction = DRAIN_ACTION_NONE;
     codecOperatingRate = CODEC_OPERATING_RATE_UNSET;
     rendererOperatingRate = 1f;
   }
@@ -567,9 +564,6 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
       waitingForKeys = false;
       decodeOnlyPresentationTimestamps.clear();
       codecInfo = null;
-      codecReconfigured = false;
-      codecReconfigurationState = RECONFIGURATION_STATE_NONE;
-      codecReinitializationState = REINITIALIZATION_STATE_NONE;
       decoderCounters.decoderReleaseCount++;
       try {
         codec.stop();
@@ -674,15 +668,14 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     if (codec == null) {
       return false;
     }
-    if (codecNeedsFlushWorkaround
-        || (codecNeedsEosFlushWorkaround && codecReceivedEos)
-        || (codecReinitializationState != REINITIALIZATION_STATE_NONE
-            && codecReinitializationIsRelease)) {
+    if (codecDrainAction == DRAIN_ACTION_REINITIALIZE
+        || codecNeedsFlushWorkaround
+        || (codecNeedsEosFlushWorkaround && codecReceivedEos)) {
       releaseCodec();
       return true;
     }
-    codec.flush();
 
+    codec.flush();
     resetInputBuffer();
     resetOutputBuffer();
     codecHotswapDeadlineMs = C.TIME_UNSET;
@@ -695,7 +688,8 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
 
     waitingForKeys = false;
     decodeOnlyPresentationTimestamps.clear();
-    codecReinitializationState = REINITIALIZATION_STATE_NONE;
+    codecDrainState = DRAIN_STATE_NONE;
+    codecDrainAction = DRAIN_ACTION_NONE;
     // Reconfiguration data sent shortly before the flush may not have been processed by the
     // decoder. If the codec has been reconfigured we always send reconfiguration data again to
     // guarantee that it's processed.
@@ -836,12 +830,16 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
         getState() == STATE_STARTED
             ? (SystemClock.elapsedRealtime() + MAX_CODEC_HOTSWAP_TIME_MS)
             : C.TIME_UNSET;
+    codecReconfigured = false;
+    codecReconfigurationState = RECONFIGURATION_STATE_NONE;
     codecReceivedEos = false;
     codecReceivedBuffers = false;
-    waitingForFirstSyncFrame = true;
+    codecDrainState = DRAIN_STATE_NONE;
+    codecDrainAction = DRAIN_ACTION_NONE;
     codecNeedsAdaptationWorkaroundBuffer = false;
     shouldSkipAdaptationWorkaroundOutputBuffer = false;
     shouldSkipOutputBuffer = false;
+    waitingForFirstSyncFrame = true;
 
     decoderCounters.decoderInitCount++;
     long elapsed = codecInitializedTimestamp - codecInitializingTimestamp;
@@ -897,9 +895,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
    * @throws ExoPlaybackException If an error occurs feeding the input buffer.
    */
   private boolean feedInputBuffer() throws ExoPlaybackException {
-    if (codec == null || codecReinitializationState == REINITIALIZATION_STATE_WAIT_END_OF_STREAM
-        || inputStreamEnded) {
-      // We need to re-initialize the codec or the input stream has ended.
+    if (codec == null || codecDrainState == DRAIN_STATE_WAIT_END_OF_STREAM || inputStreamEnded) {
       return false;
     }
 
@@ -912,7 +908,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
       buffer.clear();
     }
 
-    if (codecReinitializationState == REINITIALIZATION_STATE_SIGNAL_END_OF_STREAM) {
+    if (codecDrainState == DRAIN_STATE_SIGNAL_END_OF_STREAM) {
       // We need to re-initialize the codec. Send an end of stream signal to the existing codec so
       // that it outputs any remaining buffers before we release it.
       if (codecNeedsEosPropagation) {
@@ -922,7 +918,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
         codec.queueInputBuffer(inputIndex, 0, 0, 0, MediaCodec.BUFFER_FLAG_END_OF_STREAM);
         resetInputBuffer();
       }
-      codecReinitializationState = REINITIALIZATION_STATE_WAIT_END_OF_STREAM;
+      codecDrainState = DRAIN_STATE_WAIT_END_OF_STREAM;
       return false;
     }
 
@@ -1109,19 +1105,19 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     // We have an existing codec that we may need to reconfigure or re-initialize. If the existing
     // codec instance is being kept then its operating rate may need to be updated.
     if (pendingDrmSession != drmSession) {
-      reinitializeCodec(/* release= */ true);
+      drainAndReinitializeCodec();
     } else {
       switch (canKeepCodec(codec, codecInfo, oldFormat, format)) {
         case KEEP_CODEC_RESULT_NO:
-          reinitializeCodec(/* release= */ true);
+          drainAndReinitializeCodec();
           break;
         case KEEP_CODEC_RESULT_YES_WITH_FLUSH:
-          reinitializeCodec(/* release= */ false);
+          drainAndFlushCodec();
           updateCodecOperatingRate();
           break;
         case KEEP_CODEC_RESULT_YES_WITH_RECONFIGURATION:
           if (codecNeedsReconfigureWorkaround) {
-            reinitializeCodec(/* release= */ true);
+            drainAndReinitializeCodec();
           } else {
             codecReconfigured = true;
             codecReconfigurationState = RECONFIGURATION_STATE_WRITE_PENDING;
@@ -1253,15 +1249,13 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     }
 
     this.codecOperatingRate = codecOperatingRate;
-    if (codec == null
-        || (codecReinitializationState != REINITIALIZATION_STATE_NONE
-            && codecReinitializationIsRelease)) {
+    if (codec == null || codecDrainAction == DRAIN_ACTION_REINITIALIZE) {
       // Either no codec, or it's about to be released due to re-initialization anyway.
     } else if (codecOperatingRate == CODEC_OPERATING_RATE_UNSET
         && codecConfiguredWithOperatingRate) {
       // We need to clear the operating rate. The only way to do so is to instantiate a new codec
       // instance. See [Internal ref: b/71987865].
-      reinitializeCodec(/* release= */ true);
+      drainAndReinitializeCodec();
     } else if (codecOperatingRate != CODEC_OPERATING_RATE_UNSET
         && (codecConfiguredWithOperatingRate
             || codecOperatingRate > assumedMinimumCodecOperatingRate)) {
@@ -1274,26 +1268,26 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     }
   }
 
-  /**
-   * Starts the process of re-initializing the codec. This may occur immediately, or be deferred
-   * until any final output buffers have been dequeued.
-   *
-   * @param release Whether re-initialization requires fully releasing the codec and instantiating a
-   *     new instance, as opposed to flushing and reusing the current instance.
-   * @throws ExoPlaybackException If an error occurs releasing or initializing a codec.
-   */
-  private void reinitializeCodec(boolean release) throws ExoPlaybackException {
+  /** Starts draining the codec for flush. */
+  private void drainAndFlushCodec() {
     if (codecReceivedBuffers) {
-      // Signal end of stream and wait for any final output buffers before re-initialization.
-      codecReinitializationState = REINITIALIZATION_STATE_SIGNAL_END_OF_STREAM;
-      codecReinitializationIsRelease = release;
-      return;
+      codecDrainState = DRAIN_STATE_SIGNAL_END_OF_STREAM;
+      codecDrainAction = DRAIN_ACTION_FLUSH;
     }
+  }
 
-    // Nothing has been queued to the decoder. If we need to fully release the codec and instantiate
-    // a new instance, do so immediately. If only a flush is required then we can do nothing, since
-    // flushing will be a no-op.
-    if (release) {
+  /**
+   * Starts draining the codec for re-initialization. Re-initialization may occur immediately if no
+   * buffers have been queued to the codec.
+   *
+   * @throws ExoPlaybackException If an error occurs re-initializing a codec.
+   */
+  private void drainAndReinitializeCodec() throws ExoPlaybackException {
+    if (codecReceivedBuffers) {
+      codecDrainState = DRAIN_STATE_SIGNAL_END_OF_STREAM;
+      codecDrainAction = DRAIN_ACTION_REINITIALIZE;
+    } else {
+      // Nothing has been queued to the decoder, so we can re-initialize immediately.
       releaseCodec();
       maybeInitCodec();
     }
@@ -1334,8 +1328,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
         }
         /* MediaCodec.INFO_TRY_AGAIN_LATER (-1) or unknown negative return value */
         if (codecNeedsEosPropagation
-            && (inputStreamEnded
-                || codecReinitializationState == REINITIALIZATION_STATE_WAIT_END_OF_STREAM)) {
+            && (inputStreamEnded || codecDrainState == DRAIN_STATE_WAIT_END_OF_STREAM)) {
           processEndOfStream();
         }
         return false;
@@ -1498,17 +1491,19 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
    * @throws ExoPlaybackException If an error occurs processing the signal.
    */
   private void processEndOfStream() throws ExoPlaybackException {
-    if (codecReinitializationState == REINITIALIZATION_STATE_WAIT_END_OF_STREAM) {
-      // We're waiting to re-initialize the codec, and have now processed all final buffers.
-      if (codecReinitializationIsRelease) {
+    switch (codecDrainAction) {
+      case DRAIN_ACTION_REINITIALIZE:
         releaseCodec();
         maybeInitCodec();
-      } else {
+        break;
+      case DRAIN_ACTION_FLUSH:
         flushOrReinitCodec();
-      }
-    } else {
-      outputStreamEnded = true;
-      renderToEndOfStream();
+        break;
+      case DRAIN_ACTION_NONE:
+      default:
+        outputStreamEnded = true;
+        renderToEndOfStream();
+        break;
     }
   }
 

From 66a6921c26acab24b4d31635d450b1c02170c748 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 23 Oct 2018 08:44:40 -0700
Subject: [PATCH 123/832] Remove non-addEventListener ways of adding an event
 listener

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=218347641
---
 .../upstream/DefaultBandwidthMeter.java       | 33 -------------------
 1 file changed, 33 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
index 561ecfb024..0654d2b475 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
@@ -76,8 +76,6 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
 
     @Nullable private final Context context;
 
-    @Nullable private Handler eventHandler;
-    @Nullable private EventListener eventListener;
     private SparseArray<Long> initialBitrateEstimates;
     private int slidingWindowMaxWeight;
     private Clock clock;
@@ -95,21 +93,6 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
       clock = Clock.DEFAULT;
     }
 
-    /**
-     * Sets an event listener for new bandwidth estimates.
-     *
-     * @param eventHandler A handler for events.
-     * @param eventListener A listener of events.
-     * @return This builder.
-     * @throws IllegalArgumentException If the event handler or listener are null.
-     */
-    public Builder setEventListener(Handler eventHandler, EventListener eventListener) {
-      Assertions.checkArgument(eventHandler != null && eventListener != null);
-      this.eventHandler = eventHandler;
-      this.eventListener = eventListener;
-      return this;
-    }
-
     /**
      * Sets the maximum weight for the sliding window.
      *
@@ -185,9 +168,6 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
       DefaultBandwidthMeter bandwidthMeter =
           new DefaultBandwidthMeter(
               context, initialBitrateEstimates, slidingWindowMaxWeight, clock);
-      if (eventHandler != null && eventListener != null) {
-        bandwidthMeter.addEventListener(eventHandler, eventListener);
-      }
       return bandwidthMeter;
     }
 
@@ -238,19 +218,6 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
         Clock.DEFAULT);
   }
 
-  /** @deprecated Use {@link Builder} instead. */
-  @Deprecated
-  public DefaultBandwidthMeter(Handler eventHandler, EventListener eventListener) {
-    this(
-        /* context= */ null,
-        /* initialBitrateEstimates= */ new SparseArray<>(),
-        DEFAULT_SLIDING_WINDOW_MAX_WEIGHT,
-        Clock.DEFAULT);
-    if (eventHandler != null && eventListener != null) {
-      addEventListener(eventHandler, eventListener);
-    }
-  }
-
   private DefaultBandwidthMeter(
       @Nullable Context context,
       SparseArray<Long> initialBitrateEstimates,

From 706ce49bd37938dd5b9ae65957ada0717de5c74c Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 23 Oct 2018 09:49:45 -0700
Subject: [PATCH 124/832] Fix handling of MP3s with appended data

Issue: #4954

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=218357113
---
 RELEASENOTES.md                               |  2 ++
 .../extractor/mp3/ConstantBitrateSeeker.java  |  5 +++
 .../exoplayer2/extractor/mp3/MlltSeeker.java  |  4 +++
 .../extractor/mp3/Mp3Extractor.java           | 32 +++++++++++++++----
 .../exoplayer2/extractor/mp3/VbriSeeker.java  | 10 ++++--
 .../exoplayer2/extractor/mp3/XingSeeker.java  | 25 +++++++++++----
 6 files changed, 63 insertions(+), 15 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 84864a35c4..df1423e688 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -24,6 +24,8 @@
 * Audio:
   * Support seeking based on MLLT metadata
     ([#3241](https://github.com/google/ExoPlayer/issues/3241)).
+  * Fix handling of MP3s with appended data
+    ([#4954](https://github.com/google/ExoPlayer/issues/4954)).
 * Fix issue where buffered position is not updated correctly when transitioning
   between periods
   ([#4899](https://github.com/google/ExoPlayer/issues/4899)).
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeeker.java
index bffc43a540..f400720772 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeeker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeeker.java
@@ -39,4 +39,9 @@ import com.google.android.exoplayer2.extractor.MpegAudioHeader;
   public long getTimeUs(long position) {
     return getTimeUsAtPosition(position);
   }
+
+  @Override
+  public long getDataEndPosition() {
+    return C.POSITION_UNSET;
+  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/MlltSeeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/MlltSeeker.java
index ff607b9482..868c1d9fbf 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/MlltSeeker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/MlltSeeker.java
@@ -118,4 +118,8 @@ import com.google.android.exoplayer2.util.Util;
     }
   }
 
+  @Override
+  public long getDataEndPosition() {
+    return C.POSITION_UNSET;
+  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java
index 84f620734b..e8848bf983 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java
@@ -223,7 +223,7 @@ public final class Mp3Extractor implements Extractor {
   private int readSample(ExtractorInput extractorInput) throws IOException, InterruptedException {
     if (sampleBytesRemaining == 0) {
       extractorInput.resetPeekPosition();
-      if (!extractorInput.peekFully(scratch.data, 0, 4, true)) {
+      if (peekEndOfStreamOrHeader(extractorInput)) {
         return RESULT_END_OF_INPUT;
       }
       scratch.setPosition(0);
@@ -285,9 +285,12 @@ public final class Mp3Extractor implements Extractor {
       }
     }
     while (true) {
-      if (!input.peekFully(scratch.data, 0, 4, validFrameCount > 0)) {
-        // We reached the end of the stream but found at least one valid frame.
-        break;
+      if (peekEndOfStreamOrHeader(input)) {
+        if (validFrameCount > 0) {
+          // We reached the end of the stream but found at least one valid frame.
+          break;
+        }
+        throw new EOFException();
       }
       scratch.setPosition(0);
       int headerData = scratch.readInt();
@@ -332,6 +335,17 @@ public final class Mp3Extractor implements Extractor {
     return true;
   }
 
+  /**
+   * Returns whether the extractor input is peeking the end of the stream. If {@code false},
+   * populates the scratch buffer with the next four bytes.
+   */
+  private boolean peekEndOfStreamOrHeader(ExtractorInput extractorInput)
+      throws IOException, InterruptedException {
+    return (seeker != null && extractorInput.getPeekPosition() == seeker.getDataEndPosition())
+        || !extractorInput.peekFully(
+            scratch.data, /* offset= */ 0, /* length= */ 4, /* allowEndOfInput= */ true);
+  }
+
   /**
    * Consumes the next frame from the {@code input} if it contains VBRI or Xing seeking metadata,
    * returning a {@link Seeker} if the metadata was present and valid, or {@code null} otherwise.
@@ -433,8 +447,9 @@ public final class Mp3Extractor implements Extractor {
   }
 
   /**
-   * {@link SeekMap} that also allows mapping from position (byte offset) back to time, which can be
-   * used to work out the new sample basis timestamp after seeking and resynchronization.
+   * {@link SeekMap} that provides the end position of audio data and also allows mapping from
+   * position (byte offset) back to time, which can be used to work out the new sample basis
+   * timestamp after seeking and resynchronization.
    */
   /* package */ interface Seeker extends SeekMap {
 
@@ -446,6 +461,11 @@ public final class Mp3Extractor implements Extractor {
      */
     long getTimeUs(long position);
 
+    /**
+     * Returns the position (byte offset) in the stream that is immediately after audio data, or
+     * {@link C#POSITION_UNSET} if not known.
+     */
+    long getDataEndPosition();
   }
 
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/VbriSeeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/VbriSeeker.java
index 774505f622..15e778115d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/VbriSeeker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/VbriSeeker.java
@@ -89,17 +89,19 @@ import com.google.android.exoplayer2.util.Util;
     if (inputLength != C.LENGTH_UNSET && inputLength != position) {
       Log.w(TAG, "VBRI data size mismatch: " + inputLength + ", " + position);
     }
-    return new VbriSeeker(timesUs, positions, durationUs);
+    return new VbriSeeker(timesUs, positions, durationUs, /* dataEndPosition= */ position);
   }
 
   private final long[] timesUs;
   private final long[] positions;
   private final long durationUs;
+  private final long dataEndPosition;
 
-  private VbriSeeker(long[] timesUs, long[] positions, long durationUs) {
+  private VbriSeeker(long[] timesUs, long[] positions, long durationUs, long dataEndPosition) {
     this.timesUs = timesUs;
     this.positions = positions;
     this.durationUs = durationUs;
+    this.dataEndPosition = dataEndPosition;
   }
 
   @Override
@@ -129,4 +131,8 @@ import com.google.android.exoplayer2.util.Util;
     return durationUs;
   }
 
+  @Override
+  public long getDataEndPosition() {
+    return dataEndPosition;
+  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/XingSeeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/XingSeeker.java
index c2971e47ce..42752e55fb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/XingSeeker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/XingSeeker.java
@@ -75,17 +75,17 @@ import com.google.android.exoplayer2.util.Util;
     if (inputLength != C.LENGTH_UNSET && inputLength != position + dataSize) {
       Log.w(TAG, "XING data size mismatch: " + inputLength + ", " + (position + dataSize));
     }
-    return new XingSeeker(position, mpegAudioHeader.frameSize, durationUs, dataSize,
-        tableOfContents);
+    return new XingSeeker(
+        position, mpegAudioHeader.frameSize, durationUs, dataSize, tableOfContents);
   }
 
   private final long dataStartPosition;
   private final int xingFrameSize;
   private final long durationUs;
-  /**
-   * Data size, including the XING frame.
-   */
+  /** Data size, including the XING frame. */
   private final long dataSize;
+
+  private final long dataEndPosition;
   /**
    * Entries are in the range [0, 255], but are stored as long integers for convenience. Null if the
    * table of contents was missing from the header, in which case seeking is not be supported.
@@ -93,7 +93,12 @@ import com.google.android.exoplayer2.util.Util;
   private final @Nullable long[] tableOfContents;
 
   private XingSeeker(long dataStartPosition, int xingFrameSize, long durationUs) {
-    this(dataStartPosition, xingFrameSize, durationUs, C.LENGTH_UNSET, null);
+    this(
+        dataStartPosition,
+        xingFrameSize,
+        durationUs,
+        /* dataSize= */ C.LENGTH_UNSET,
+        /* tableOfContents= */ null);
   }
 
   private XingSeeker(
@@ -105,8 +110,9 @@ import com.google.android.exoplayer2.util.Util;
     this.dataStartPosition = dataStartPosition;
     this.xingFrameSize = xingFrameSize;
     this.durationUs = durationUs;
-    this.dataSize = dataSize;
     this.tableOfContents = tableOfContents;
+    this.dataSize = dataSize;
+    dataEndPosition = dataSize == C.LENGTH_UNSET ? C.POSITION_UNSET : dataStartPosition + dataSize;
   }
 
   @Override
@@ -166,6 +172,11 @@ import com.google.android.exoplayer2.util.Util;
     return durationUs;
   }
 
+  @Override
+  public long getDataEndPosition() {
+    return dataEndPosition;
+  }
+
   /**
    * Returns the time in microseconds for a given table index.
    *

From 1b6801c0914f51a9e8018dd0814819f5663a990f Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 24 Oct 2018 11:01:58 -0700
Subject: [PATCH 125/832] Simplify setting of codec operating rate

Issue: #2826

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=218540967
---
 .../audio/MediaCodecAudioRenderer.java        |  2 +-
 .../mediacodec/MediaCodecRenderer.java        | 50 ++++++++-----------
 .../video/MediaCodecVideoRenderer.java        |  2 +-
 3 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
index 59a077dff8..c90b815347 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
@@ -388,7 +388,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
   }
 
   @Override
-  protected float getCodecOperatingRate(
+  protected float getCodecOperatingRateV23(
       float operatingRate, Format format, Format[] streamFormats) {
     // Use the highest known stream sample-rate up front, to avoid having to reconfigure the codec
     // should an adaptive switch to that stream occur.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index 3d7287d720..71ed640f57 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -298,7 +298,6 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   private MediaCodec codec;
   private float rendererOperatingRate;
   private float codecOperatingRate;
-  private boolean codecConfiguredWithOperatingRate;
   @Nullable private ArrayDeque<MediaCodecInfo> availableCodecInfos;
   @Nullable private DecoderInitializationException preferredDecoderInitializationException;
   @Nullable private MediaCodecInfo codecInfo;
@@ -783,20 +782,20 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     MediaCodec codec = null;
     String codecName = codecInfo.name;
 
-    updateCodecOperatingRate();
-    boolean configureWithOperatingRate = codecOperatingRate > assumedMinimumCodecOperatingRate;
+    float codecOperatingRate =
+        Util.SDK_INT < 23
+            ? CODEC_OPERATING_RATE_UNSET
+            : getCodecOperatingRateV23(rendererOperatingRate, format, getStreamFormats());
+    if (codecOperatingRate <= assumedMinimumCodecOperatingRate) {
+      codecOperatingRate = CODEC_OPERATING_RATE_UNSET;
+    }
     try {
       codecInitializingTimestamp = SystemClock.elapsedRealtime();
       TraceUtil.beginSection("createCodec:" + codecName);
       codec = MediaCodec.createByCodecName(codecName);
       TraceUtil.endSection();
       TraceUtil.beginSection("configureCodec");
-      configureCodec(
-          codecInfo,
-          codec,
-          format,
-          crypto,
-          configureWithOperatingRate ? codecOperatingRate : CODEC_OPERATING_RATE_UNSET);
+      configureCodec(codecInfo, codec, format, crypto, codecOperatingRate);
       TraceUtil.endSection();
       TraceUtil.beginSection("startCodec");
       codec.start();
@@ -813,7 +812,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
 
     this.codec = codec;
     this.codecInfo = codecInfo;
-    codecConfiguredWithOperatingRate = configureWithOperatingRate;
+    this.codecOperatingRate = codecOperatingRate;
     codecAdaptationWorkaroundMode = codecAdaptationWorkaroundMode(codecName);
     codecNeedsReconfigureWorkaround = codecNeedsReconfigureWorkaround(codecName);
     codecNeedsDiscardToSpsWorkaround = codecNeedsDiscardToSpsWorkaround(codecName, format);
@@ -1227,7 +1226,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
    * @return The codec operating rate, or {@link #CODEC_OPERATING_RATE_UNSET} if no codec operating
    *     rate should be set.
    */
-  protected float getCodecOperatingRate(
+  protected float getCodecOperatingRateV23(
       float operatingRate, Format format, Format[] streamFormats) {
     return CODEC_OPERATING_RATE_UNSET;
   }
@@ -1238,33 +1237,26 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
    * @throws ExoPlaybackException If an error occurs releasing or initializing a codec.
    */
   private void updateCodecOperatingRate() throws ExoPlaybackException {
-    if (format == null || Util.SDK_INT < 23) {
+    if (Util.SDK_INT < 23 || codec == null || codecDrainAction == DRAIN_ACTION_REINITIALIZE) {
       return;
     }
 
-    float codecOperatingRate =
-        getCodecOperatingRate(rendererOperatingRate, format, getStreamFormats());
-    if (this.codecOperatingRate == codecOperatingRate) {
-      return;
-    }
-
-    this.codecOperatingRate = codecOperatingRate;
-    if (codec == null || codecDrainAction == DRAIN_ACTION_REINITIALIZE) {
-      // Either no codec, or it's about to be released due to re-initialization anyway.
-    } else if (codecOperatingRate == CODEC_OPERATING_RATE_UNSET
-        && codecConfiguredWithOperatingRate) {
-      // We need to clear the operating rate. The only way to do so is to instantiate a new codec
-      // instance. See [Internal ref: b/71987865].
+    float newCodecOperatingRate =
+        getCodecOperatingRateV23(rendererOperatingRate, format, getStreamFormats());
+    if (codecOperatingRate == newCodecOperatingRate) {
+      // No change.
+    } else if (newCodecOperatingRate == CODEC_OPERATING_RATE_UNSET) {
+      // The only way to clear the operating rate is to instantiate a new codec instance. See
+      // [Internal ref: b/71987865].
       drainAndReinitializeCodec();
     } else if (codecOperatingRate != CODEC_OPERATING_RATE_UNSET
-        && (codecConfiguredWithOperatingRate
-            || codecOperatingRate > assumedMinimumCodecOperatingRate)) {
+        || newCodecOperatingRate > assumedMinimumCodecOperatingRate) {
       // We need to set the operating rate, either because we've set it previously or because it's
       // above the assumed minimum rate.
       Bundle codecParameters = new Bundle();
-      codecParameters.putFloat(MediaFormat.KEY_OPERATING_RATE, codecOperatingRate);
+      codecParameters.putFloat(MediaFormat.KEY_OPERATING_RATE, newCodecOperatingRate);
       codec.setParameters(codecParameters);
-      codecConfiguredWithOperatingRate = true;
+      codecOperatingRate = newCodecOperatingRate;
     }
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index a0e794764a..a896bc2322 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -536,7 +536,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
   }
 
   @Override
-  protected float getCodecOperatingRate(
+  protected float getCodecOperatingRateV23(
       float operatingRate, Format format, Format[] streamFormats) {
     // Use the highest known stream frame-rate up front, to avoid having to reconfigure the codec
     // should an adaptive switch to that stream occur.

From 4fe14c76935ab1625c3e2370a6d8fa7934be71de Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 24 Oct 2018 11:56:58 -0700
Subject: [PATCH 126/832] Minor cleanup to BandwidthMeter/DefaultBandwidthMeter

- Improve variable naming
- In the edge case that bytes are transferred in a sample that
  has 0 elapsed time, carry the bytes forward into the next
  sample. If we don't do this then the estimate will be calculated
  as though those bytes were never transferred. In practice I
  suspect this very rarely occurs.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=218551208
---
 .../exoplayer2/upstream/BandwidthMeter.java   | 19 +++++++++++--------
 .../upstream/DefaultBandwidthMeter.java       | 14 +++++++-------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/BandwidthMeter.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/BandwidthMeter.java
index 470937f02f..85bcda4e32 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/BandwidthMeter.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/BandwidthMeter.java
@@ -29,30 +29,33 @@ public interface BandwidthMeter {
   interface EventListener {
 
     /**
-     * Called periodically to indicate that bytes have been transferred.
+     * Called periodically to indicate that bytes have been transferred or the estimated bitrate has
+     * changed.
      *
      * <p>Note: The estimated bitrate is typically derived from more information than just {@code
      * bytes} and {@code elapsedMs}.
      *
-     * @param elapsedMs The time taken to transfer the bytes, in milliseconds.
-     * @param bytes The number of bytes transferred.
-     * @param bitrate The estimated bitrate in bits/sec.
+     * @param elapsedMs The time taken to transfer {@code bytesTransferred}, in milliseconds. This
+     *     is at most the elapsed time since the last callback, but may be less if there were
+     *     periods during which data was not being transferred.
+     * @param bytesTransferred The number of bytes transferred since the last callback.
+     * @param bitrateEstimate The estimated bitrate in bits/sec.
      */
-    void onBandwidthSample(int elapsedMs, long bytes, long bitrate);
+    void onBandwidthSample(int elapsedMs, long bytesTransferred, long bitrateEstimate);
   }
 
-  /** Returns the estimated bandwidth in bits/sec. */
+  /** Returns the estimated bitrate. */
   long getBitrateEstimate();
 
   /**
    * Returns the {@link TransferListener} that this instance uses to gather bandwidth information
-   * from data transfers. May be null, if no transfer listener is used.
+   * from data transfers. May be null if the implementation does not listen to data transfers.
    */
   @Nullable
   TransferListener getTransferListener();
 
   /**
-   * Adds an {@link EventListener} to be informed of bandwidth samples.
+   * Adds an {@link EventListener}.
    *
    * @param eventHandler A handler for events.
    * @param eventListener A listener of events.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
index 0654d2b475..6be13603ee 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
@@ -309,16 +309,16 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
           || totalBytesTransferred >= BYTES_TRANSFERRED_FOR_ESTIMATE) {
         bitrateEstimate = (long) slidingPercentile.getPercentile(0.5f);
       }
-    }
-    notifyBandwidthSample(sampleElapsedTimeMs, sampleBytesTransferred, bitrateEstimate);
-    if (--streamCount > 0) {
+      notifyBandwidthSample(sampleElapsedTimeMs, sampleBytesTransferred, bitrateEstimate);
       sampleStartTimeMs = nowMs;
-    }
-    sampleBytesTransferred = 0;
+      sampleBytesTransferred = 0;
+    } // Else any sample bytes transferred will be carried forward into the next sample.
+    streamCount--;
   }
 
-  private void notifyBandwidthSample(int elapsedMs, long bytes, long bitrate) {
-    eventDispatcher.dispatch(listener -> listener.onBandwidthSample(elapsedMs, bytes, bitrate));
+  private void notifyBandwidthSample(int elapsedMs, long bytesTransferred, long bitrateEstimate) {
+    eventDispatcher.dispatch(
+        listener -> listener.onBandwidthSample(elapsedMs, bytesTransferred, bitrateEstimate));
   }
 
   private long getInitialBitrateEstimateForNetworkType(@C.NetworkType int networkType) {

From ede62e97b2d6679fddbb80a056130944300ff505 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 25 Oct 2018 03:41:44 -0700
Subject: [PATCH 127/832] Fix track selection when forceLowestBitrate is
 enabled:

- Only use bitrate when comparing two tracks if their bitrates are
  actually different.
- For audio, prefer to use bitrate over selection flags.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=218660886
---
 .../trackselection/DefaultTrackSelector.java  | 43 +++++++++++--------
 library/ui/src/main/res/values-ar/strings.xml |  2 +-
 library/ui/src/main/res/values-az/strings.xml |  2 +-
 library/ui/src/main/res/values-bs/strings.xml |  2 +-
 library/ui/src/main/res/values-fa/strings.xml |  2 +-
 library/ui/src/main/res/values-hr/strings.xml |  2 +-
 library/ui/src/main/res/values-in/strings.xml |  2 +-
 library/ui/src/main/res/values-ka/strings.xml |  2 +-
 library/ui/src/main/res/values-my/strings.xml |  2 +-
 library/ui/src/main/res/values-sk/strings.xml |  2 +-
 library/ui/src/main/res/values-sq/strings.xml |  2 +-
 library/ui/src/main/res/values-uz/strings.xml |  2 +-
 library/ui/src/main/res/values-zu/strings.xml |  2 +-
 13 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
index 4a75b6f722..0f5adab4f5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -1651,9 +1651,10 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           }
           boolean selectTrack = trackScore > selectedTrackScore;
           if (trackScore == selectedTrackScore) {
-            if (params.forceLowestBitrate) {
+            int bitrateComparison = compareFormatValues(format.bitrate, selectedBitrate);
+            if (params.forceLowestBitrate && bitrateComparison != 0) {
               // Use bitrate as a tie breaker, preferring the lower bitrate.
-              selectTrack = compareFormatValues(format.bitrate, selectedBitrate) < 0;
+              selectTrack = bitrateComparison < 0;
             } else {
               // Use the pixel count as a tie breaker (or bitrate if pixel counts are tied). If
               // we're within constraints prefer a higher pixel count (or bitrate), else prefer a
@@ -2173,23 +2174,29 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       if (this.withinRendererCapabilitiesScore != other.withinRendererCapabilitiesScore) {
         return compareInts(this.withinRendererCapabilitiesScore,
             other.withinRendererCapabilitiesScore);
-      } else if (this.matchLanguageScore != other.matchLanguageScore) {
-        return compareInts(this.matchLanguageScore, other.matchLanguageScore);
-      } else if (this.defaultSelectionFlagScore != other.defaultSelectionFlagScore) {
-        return compareInts(this.defaultSelectionFlagScore, other.defaultSelectionFlagScore);
-      } else if (parameters.forceLowestBitrate) {
-        return compareInts(other.bitrate, this.bitrate);
-      } else {
-        // If the format are within renderer capabilities, prefer higher values of channel count,
-        // sample rate and bit rate in that order. Otherwise, prefer lower values.
-        int resultSign = withinRendererCapabilitiesScore == 1 ? 1 : -1;
-        if (this.channelCount != other.channelCount) {
-          return resultSign * compareInts(this.channelCount, other.channelCount);
-        } else if (this.sampleRate != other.sampleRate) {
-          return resultSign * compareInts(this.sampleRate, other.sampleRate);
-        }
-        return resultSign * compareInts(this.bitrate, other.bitrate);
       }
+      if (this.matchLanguageScore != other.matchLanguageScore) {
+        return compareInts(this.matchLanguageScore, other.matchLanguageScore);
+      }
+      if (parameters.forceLowestBitrate) {
+        int bitrateComparison = compareFormatValues(bitrate, other.bitrate);
+        if (bitrateComparison != 0) {
+          return bitrateComparison > 0 ? -1 : 1;
+        }
+      }
+      if (this.defaultSelectionFlagScore != other.defaultSelectionFlagScore) {
+        return compareInts(this.defaultSelectionFlagScore, other.defaultSelectionFlagScore);
+      }
+      // If the formats are within renderer capabilities then prefer higher values of channel count,
+      // sample rate and bit rate in that order. Otherwise, prefer lower values.
+      int resultSign = withinRendererCapabilitiesScore == 1 ? 1 : -1;
+      if (this.channelCount != other.channelCount) {
+        return resultSign * compareInts(this.channelCount, other.channelCount);
+      }
+      if (this.sampleRate != other.sampleRate) {
+        return resultSign * compareInts(this.sampleRate, other.sampleRate);
+      }
+      return resultSign * compareInts(this.bitrate, other.bitrate);
     }
   }
 
diff --git a/library/ui/src/main/res/values-ar/strings.xml b/library/ui/src/main/res/values-ar/strings.xml
index e64797f7b3..9980191621 100644
--- a/library/ui/src/main/res/values-ar/strings.xml
+++ b/library/ui/src/main/res/values-ar/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">تكرار الكل</string>
   <string name="exo_controls_shuffle_description">ترتيب عشوائي</string>
   <string name="exo_controls_fullscreen_description">وضع ملء الشاشة</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">الخروج من وضع VR</string>
   <string name="exo_download_description">تنزيل</string>
   <string name="exo_download_notification_channel_name">التنزيلات</string>
   <string name="exo_download_downloading">جارٍ التنزيل.</string>
diff --git a/library/ui/src/main/res/values-az/strings.xml b/library/ui/src/main/res/values-az/strings.xml
index 31fde9987f..d119531c70 100644
--- a/library/ui/src/main/res/values-az/strings.xml
+++ b/library/ui/src/main/res/values-az/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Hamısı təkrarlansın</string>
   <string name="exo_controls_shuffle_description">Qarışdırın</string>
   <string name="exo_controls_fullscreen_description">Tam ekran rejimi</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">VR rejimdən çıxın</string>
   <string name="exo_download_description">Endirin</string>
   <string name="exo_download_notification_channel_name">Endirmələr</string>
   <string name="exo_download_downloading">Endirilir</string>
diff --git a/library/ui/src/main/res/values-bs/strings.xml b/library/ui/src/main/res/values-bs/strings.xml
index 3bb68d006a..34f445bcca 100644
--- a/library/ui/src/main/res/values-bs/strings.xml
+++ b/library/ui/src/main/res/values-bs/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ponovi sve</string>
   <string name="exo_controls_shuffle_description">Izmiješaj</string>
   <string name="exo_controls_fullscreen_description">Način rada preko cijelog ekrana</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Izlazak iz VR načina</string>
   <string name="exo_download_description">Preuzmi</string>
   <string name="exo_download_notification_channel_name">Preuzimanja</string>
   <string name="exo_download_downloading">Preuzimanje</string>
diff --git a/library/ui/src/main/res/values-fa/strings.xml b/library/ui/src/main/res/values-fa/strings.xml
index e923dae795..2f36b5fc3b 100644
--- a/library/ui/src/main/res/values-fa/strings.xml
+++ b/library/ui/src/main/res/values-fa/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">تکرار همه</string>
   <string name="exo_controls_shuffle_description">درهم</string>
   <string name="exo_controls_fullscreen_description">حالت تمام‌صفحه</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">خروج از حالت واقعیت مجازی</string>
   <string name="exo_download_description">بارگیری</string>
   <string name="exo_download_notification_channel_name">بارگیری‌ها</string>
   <string name="exo_download_downloading">درحال بارگیری</string>
diff --git a/library/ui/src/main/res/values-hr/strings.xml b/library/ui/src/main/res/values-hr/strings.xml
index 1cba6e162b..d76fef9367 100644
--- a/library/ui/src/main/res/values-hr/strings.xml
+++ b/library/ui/src/main/res/values-hr/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ponovi sve</string>
   <string name="exo_controls_shuffle_description">Reproduciraj nasumično</string>
   <string name="exo_controls_fullscreen_description">Prikaz na cijelom zaslonu</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Izlazak iz VR načina</string>
   <string name="exo_download_description">Preuzmi</string>
   <string name="exo_download_notification_channel_name">Preuzimanja</string>
   <string name="exo_download_downloading">Preuzimanje</string>
diff --git a/library/ui/src/main/res/values-in/strings.xml b/library/ui/src/main/res/values-in/strings.xml
index 92c6e055b6..39fcfea559 100644
--- a/library/ui/src/main/res/values-in/strings.xml
+++ b/library/ui/src/main/res/values-in/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ulangi semua</string>
   <string name="exo_controls_shuffle_description">Acak</string>
   <string name="exo_controls_fullscreen_description">Mode layar penuh</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Keluar dari mode VR</string>
   <string name="exo_download_description">Download</string>
   <string name="exo_download_notification_channel_name">Download</string>
   <string name="exo_download_downloading">Mendownload</string>
diff --git a/library/ui/src/main/res/values-ka/strings.xml b/library/ui/src/main/res/values-ka/strings.xml
index 06b798baf2..2ec70e9c51 100644
--- a/library/ui/src/main/res/values-ka/strings.xml
+++ b/library/ui/src/main/res/values-ka/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">ყველას გამეორება</string>
   <string name="exo_controls_shuffle_description">არეულად დაკვრა</string>
   <string name="exo_controls_fullscreen_description">სრულეკრანიანი რეჟიმი</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">VR რეჟიმიდან გასვლა</string>
   <string name="exo_download_description">ჩამოტვირთვა</string>
   <string name="exo_download_notification_channel_name">ჩამოტვირთვები</string>
   <string name="exo_download_downloading">მიმდინარეობს ჩამოტვირთვა</string>
diff --git a/library/ui/src/main/res/values-my/strings.xml b/library/ui/src/main/res/values-my/strings.xml
index d7aa70c610..124b2826c0 100644
--- a/library/ui/src/main/res/values-my/strings.xml
+++ b/library/ui/src/main/res/values-my/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">အားလုံး ပြန်ကျော့ရန်</string>
   <string name="exo_controls_shuffle_description">ရောသမမွှေ</string>
   <string name="exo_controls_fullscreen_description">မျက်နှာပြင်အပြည့် မုဒ်</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">VR မုဒ်မှထွက်ပါ</string>
   <string name="exo_download_description">ဒေါင်းလုဒ် လုပ်ရန်</string>
   <string name="exo_download_notification_channel_name">ဒေါင်းလုဒ်များ</string>
   <string name="exo_download_downloading">ဒေါင်းလုဒ်လုပ်နေသည်</string>
diff --git a/library/ui/src/main/res/values-sk/strings.xml b/library/ui/src/main/res/values-sk/strings.xml
index 99ec680405..39b99e215d 100644
--- a/library/ui/src/main/res/values-sk/strings.xml
+++ b/library/ui/src/main/res/values-sk/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Opakovať všetko</string>
   <string name="exo_controls_shuffle_description">Náhodne prehrávať</string>
   <string name="exo_controls_fullscreen_description">Režim celej obrazovky</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Ukončiť režim VR</string>
   <string name="exo_download_description">Stiahnuť</string>
   <string name="exo_download_notification_channel_name">Stiahnuté</string>
   <string name="exo_download_downloading">Sťahuje sa</string>
diff --git a/library/ui/src/main/res/values-sq/strings.xml b/library/ui/src/main/res/values-sq/strings.xml
index 2c139f20cb..434ef77f58 100644
--- a/library/ui/src/main/res/values-sq/strings.xml
+++ b/library/ui/src/main/res/values-sq/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Përsërit të gjitha</string>
   <string name="exo_controls_shuffle_description">Përziej</string>
   <string name="exo_controls_fullscreen_description">Modaliteti me ekran të plotë</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Dil nga modaliteti VR</string>
   <string name="exo_download_description">Shkarko</string>
   <string name="exo_download_notification_channel_name">Shkarkimet</string>
   <string name="exo_download_downloading">Po shkarkohet</string>
diff --git a/library/ui/src/main/res/values-uz/strings.xml b/library/ui/src/main/res/values-uz/strings.xml
index 5275d7bd06..a62bc1a2e8 100644
--- a/library/ui/src/main/res/values-uz/strings.xml
+++ b/library/ui/src/main/res/values-uz/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Hammasini takrorlash</string>
   <string name="exo_controls_shuffle_description">Aralash</string>
   <string name="exo_controls_fullscreen_description">Butun ekran rejimi</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">VR rejimidan chiqish</string>
   <string name="exo_download_description">Yuklab olish</string>
   <string name="exo_download_notification_channel_name">Yuklanmalar</string>
   <string name="exo_download_downloading">Yuklab olinmoqda</string>
diff --git a/library/ui/src/main/res/values-zu/strings.xml b/library/ui/src/main/res/values-zu/strings.xml
index 40a1a6ce29..6be1c61f5e 100644
--- a/library/ui/src/main/res/values-zu/strings.xml
+++ b/library/ui/src/main/res/values-zu/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Phinda konke</string>
   <string name="exo_controls_shuffle_description">Shova</string>
   <string name="exo_controls_fullscreen_description">Imodi yesikrini esigcwele</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Phuma kumodi ye-VR</string>
   <string name="exo_download_description">Landa</string>
   <string name="exo_download_notification_channel_name">Ukulandwa</string>
   <string name="exo_download_downloading">Iyalanda</string>

From 9ea678c5e6974436f407c7c39dd11b95302fcf16 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 26 Oct 2018 06:45:08 -0700
Subject: [PATCH 128/832] Add ExoCastMessage

ExoCastMessage contains all player management messages that the sender app can
send to the receiver app. ExoCastMessages can be serialized as JSON strings.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=218846977
---
 library/ui/src/main/res/values-af/strings.xml | 2 +-
 library/ui/src/main/res/values-am/strings.xml | 2 +-
 library/ui/src/main/res/values-cs/strings.xml | 2 +-
 library/ui/src/main/res/values-el/strings.xml | 2 +-
 library/ui/src/main/res/values-es/strings.xml | 2 +-
 library/ui/src/main/res/values-eu/strings.xml | 2 +-
 library/ui/src/main/res/values-it/strings.xml | 2 +-
 library/ui/src/main/res/values-ja/strings.xml | 2 +-
 library/ui/src/main/res/values-km/strings.xml | 2 +-
 library/ui/src/main/res/values-kn/strings.xml | 2 +-
 library/ui/src/main/res/values-ko/strings.xml | 2 +-
 library/ui/src/main/res/values-lo/strings.xml | 2 +-
 library/ui/src/main/res/values-mr/strings.xml | 2 +-
 library/ui/src/main/res/values-pa/strings.xml | 2 +-
 library/ui/src/main/res/values-pl/strings.xml | 2 +-
 library/ui/src/main/res/values-pt/strings.xml | 2 +-
 library/ui/src/main/res/values-sl/strings.xml | 2 +-
 library/ui/src/main/res/values-sw/strings.xml | 2 +-
 library/ui/src/main/res/values-ta/strings.xml | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/library/ui/src/main/res/values-af/strings.xml b/library/ui/src/main/res/values-af/strings.xml
index d0190d9202..e20ade1cde 100644
--- a/library/ui/src/main/res/values-af/strings.xml
+++ b/library/ui/src/main/res/values-af/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Herhaal alles</string>
   <string name="exo_controls_shuffle_description">Skommel</string>
   <string name="exo_controls_fullscreen_description">Volskermmodus</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Verlaat VR-modus</string>
   <string name="exo_download_description">Aflaai</string>
   <string name="exo_download_notification_channel_name">Aflaaie</string>
   <string name="exo_download_downloading">Laai tans af</string>
diff --git a/library/ui/src/main/res/values-am/strings.xml b/library/ui/src/main/res/values-am/strings.xml
index cdc6b5fd7b..d24d681019 100644
--- a/library/ui/src/main/res/values-am/strings.xml
+++ b/library/ui/src/main/res/values-am/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">ሁሉንም ድገም</string>
   <string name="exo_controls_shuffle_description">በውዝ</string>
   <string name="exo_controls_fullscreen_description">የሙሉ ማያ ሁነታ</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">ከቪአር ሁነታ ውጣ</string>
   <string name="exo_download_description">አውርድ</string>
   <string name="exo_download_notification_channel_name">የወረዱ</string>
   <string name="exo_download_downloading">በማውረድ ላይ</string>
diff --git a/library/ui/src/main/res/values-cs/strings.xml b/library/ui/src/main/res/values-cs/strings.xml
index e1670d6fc4..97e3c35fb1 100644
--- a/library/ui/src/main/res/values-cs/strings.xml
+++ b/library/ui/src/main/res/values-cs/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Opakovat vše</string>
   <string name="exo_controls_shuffle_description">Náhodně</string>
   <string name="exo_controls_fullscreen_description">Režim celé obrazovky</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Ukončit režim VR</string>
   <string name="exo_download_description">Stáhnout</string>
   <string name="exo_download_notification_channel_name">Stahování</string>
   <string name="exo_download_downloading">Stahování</string>
diff --git a/library/ui/src/main/res/values-el/strings.xml b/library/ui/src/main/res/values-el/strings.xml
index 9c1373a77e..eff333354b 100644
--- a/library/ui/src/main/res/values-el/strings.xml
+++ b/library/ui/src/main/res/values-el/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Επανάληψη όλων</string>
   <string name="exo_controls_shuffle_description">Τυχαία αναπαραγωγή</string>
   <string name="exo_controls_fullscreen_description">Λειτουργία πλήρους οθόνης</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Έξοδος από λειτουργία VR mode</string>
   <string name="exo_download_description">Λήψη</string>
   <string name="exo_download_notification_channel_name">Λήψεις</string>
   <string name="exo_download_downloading">Λήψη</string>
diff --git a/library/ui/src/main/res/values-es/strings.xml b/library/ui/src/main/res/values-es/strings.xml
index 7e36bf86af..845210ecfa 100644
--- a/library/ui/src/main/res/values-es/strings.xml
+++ b/library/ui/src/main/res/values-es/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repetir todo</string>
   <string name="exo_controls_shuffle_description">Reproducir aleatoriamente</string>
   <string name="exo_controls_fullscreen_description">Modo de pantalla completa</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Salir del modo RV</string>
   <string name="exo_download_description">Descargar</string>
   <string name="exo_download_notification_channel_name">Descargas</string>
   <string name="exo_download_downloading">Descargando</string>
diff --git a/library/ui/src/main/res/values-eu/strings.xml b/library/ui/src/main/res/values-eu/strings.xml
index 2db2ac2131..381726a2ea 100644
--- a/library/ui/src/main/res/values-eu/strings.xml
+++ b/library/ui/src/main/res/values-eu/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Errepikatu guztiak</string>
   <string name="exo_controls_shuffle_description">Erreproduzitu ausaz</string>
   <string name="exo_controls_fullscreen_description">Pantaila osoko modua</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Irten EB modutik</string>
   <string name="exo_download_description">Deskargak</string>
   <string name="exo_download_notification_channel_name">Deskargak</string>
   <string name="exo_download_downloading">Deskargatzen</string>
diff --git a/library/ui/src/main/res/values-it/strings.xml b/library/ui/src/main/res/values-it/strings.xml
index 72ea9ee01d..6611da7595 100644
--- a/library/ui/src/main/res/values-it/strings.xml
+++ b/library/ui/src/main/res/values-it/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ripeti tutto</string>
   <string name="exo_controls_shuffle_description">Riproduzione casuale</string>
   <string name="exo_controls_fullscreen_description">Modalità a schermo intero</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Esci dalla modalità VR</string>
   <string name="exo_download_description">Scarica</string>
   <string name="exo_download_notification_channel_name">Download</string>
   <string name="exo_download_downloading">Download…</string>
diff --git a/library/ui/src/main/res/values-ja/strings.xml b/library/ui/src/main/res/values-ja/strings.xml
index 5ea4a3ec07..9f39d59103 100644
--- a/library/ui/src/main/res/values-ja/strings.xml
+++ b/library/ui/src/main/res/values-ja/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">全曲をリピート</string>
   <string name="exo_controls_shuffle_description">シャッフル</string>
   <string name="exo_controls_fullscreen_description">全画面モード</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">VR モードを終了します</string>
   <string name="exo_download_description">ダウンロード</string>
   <string name="exo_download_notification_channel_name">ダウンロード</string>
   <string name="exo_download_downloading">ダウンロードしています</string>
diff --git a/library/ui/src/main/res/values-km/strings.xml b/library/ui/src/main/res/values-km/strings.xml
index e78efe17d7..80234d89c9 100644
--- a/library/ui/src/main/res/values-km/strings.xml
+++ b/library/ui/src/main/res/values-km/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">លេង​ឡើងវិញ​ទាំងអស់</string>
   <string name="exo_controls_shuffle_description">ច្របល់</string>
   <string name="exo_controls_fullscreen_description">មុខងារពេញ​អេក្រង់</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">ចាកចេញពីមុខងារ​ VR</string>
   <string name="exo_download_description">ទាញយក</string>
   <string name="exo_download_notification_channel_name">ទាញយក</string>
   <string name="exo_download_downloading">កំពុង​ទាញ​យក</string>
diff --git a/library/ui/src/main/res/values-kn/strings.xml b/library/ui/src/main/res/values-kn/strings.xml
index 1efac2b25f..0a24dcb001 100644
--- a/library/ui/src/main/res/values-kn/strings.xml
+++ b/library/ui/src/main/res/values-kn/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">ಎಲ್ಲವನ್ನು ಪುನರಾವರ್ತಿಸಿ</string>
   <string name="exo_controls_shuffle_description">ಶಫಲ್‌</string>
   <string name="exo_controls_fullscreen_description">ಪೂರ್ಣ ಪರದೆ ಮೋಡ್</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">VR ಮೋಡ್‌ನಿಂದ ನಿರ್ಗಮಿಸಿ</string>
   <string name="exo_download_description">ಡೌನ್‌ಲೋಡ್‌</string>
   <string name="exo_download_notification_channel_name">ಡೌನ್‌ಲೋಡ್‌ಗಳು</string>
   <string name="exo_download_downloading">ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ</string>
diff --git a/library/ui/src/main/res/values-ko/strings.xml b/library/ui/src/main/res/values-ko/strings.xml
index 92d840374a..e87a6c1645 100644
--- a/library/ui/src/main/res/values-ko/strings.xml
+++ b/library/ui/src/main/res/values-ko/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">모두 반복</string>
   <string name="exo_controls_shuffle_description">셔플</string>
   <string name="exo_controls_fullscreen_description">전체화면 모드</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">VR 모드 종료</string>
   <string name="exo_download_description">다운로드</string>
   <string name="exo_download_notification_channel_name">다운로드</string>
   <string name="exo_download_downloading">다운로드 중</string>
diff --git a/library/ui/src/main/res/values-lo/strings.xml b/library/ui/src/main/res/values-lo/strings.xml
index 291dd5f187..025a66ad95 100644
--- a/library/ui/src/main/res/values-lo/strings.xml
+++ b/library/ui/src/main/res/values-lo/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">ຫຼິ້ນຊ້ຳທັງໝົດ</string>
   <string name="exo_controls_shuffle_description">ຫຼີ້ນແບບສຸ່ມ</string>
   <string name="exo_controls_fullscreen_description">ໂໝດເຕັມຈໍ</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">ອອກຈາກໂໝດ VR</string>
   <string name="exo_download_description">ດາວໂຫລດ</string>
   <string name="exo_download_notification_channel_name">ດາວໂຫລດ</string>
   <string name="exo_download_downloading">ກຳລັງດາວໂຫລດ</string>
diff --git a/library/ui/src/main/res/values-mr/strings.xml b/library/ui/src/main/res/values-mr/strings.xml
index c88466ca9c..f53b2dc75e 100644
--- a/library/ui/src/main/res/values-mr/strings.xml
+++ b/library/ui/src/main/res/values-mr/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">सर्व रीपीट करा</string>
   <string name="exo_controls_shuffle_description">शफल करा</string>
   <string name="exo_controls_fullscreen_description">फुल स्क्रीन मोड</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">VR मोडमधून बाहेर पडा</string>
   <string name="exo_download_description">डाउनलोड करा</string>
   <string name="exo_download_notification_channel_name">डाउनलोड</string>
   <string name="exo_download_downloading">डाउनलोड होत आहे</string>
diff --git a/library/ui/src/main/res/values-pa/strings.xml b/library/ui/src/main/res/values-pa/strings.xml
index ea5f8f034f..1293f58cd6 100644
--- a/library/ui/src/main/res/values-pa/strings.xml
+++ b/library/ui/src/main/res/values-pa/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">ਸਾਰਿਆਂ ਨੂੰ ਦੁਹਰਾਓ</string>
   <string name="exo_controls_shuffle_description">ਬੇਤਰਤੀਬ ਕਰੋ</string>
   <string name="exo_controls_fullscreen_description">ਪੂਰੀ-ਸਕ੍ਰੀਨ ਮੋਡ</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">VR ਮੋਡ ਤੋਂ ਬਾਹਰ ਜਾਓ</string>
   <string name="exo_download_description">ਡਾਊਨਲੋਡ ਕਰੋ</string>
   <string name="exo_download_notification_channel_name">ਡਾਊਨਲੋਡ</string>
   <string name="exo_download_downloading">ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ</string>
diff --git a/library/ui/src/main/res/values-pl/strings.xml b/library/ui/src/main/res/values-pl/strings.xml
index 6e08237bfd..c6ef64e724 100644
--- a/library/ui/src/main/res/values-pl/strings.xml
+++ b/library/ui/src/main/res/values-pl/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Powtórz wszystkie</string>
   <string name="exo_controls_shuffle_description">Odtwarzanie losowe</string>
   <string name="exo_controls_fullscreen_description">Tryb pełnoekranowy</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Wyłącz tryb VR</string>
   <string name="exo_download_description">Pobierz</string>
   <string name="exo_download_notification_channel_name">Pobieranie</string>
   <string name="exo_download_downloading">Pobieram</string>
diff --git a/library/ui/src/main/res/values-pt/strings.xml b/library/ui/src/main/res/values-pt/strings.xml
index 96c27f3d4a..7a0592e837 100644
--- a/library/ui/src/main/res/values-pt/strings.xml
+++ b/library/ui/src/main/res/values-pt/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repetir tudo</string>
   <string name="exo_controls_shuffle_description">Aleatório</string>
   <string name="exo_controls_fullscreen_description">Modo de tela cheia</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Sair do modo RV</string>
   <string name="exo_download_description">Fazer o download</string>
   <string name="exo_download_notification_channel_name">Downloads</string>
   <string name="exo_download_downloading">Fazendo o download</string>
diff --git a/library/ui/src/main/res/values-sl/strings.xml b/library/ui/src/main/res/values-sl/strings.xml
index ec75cd1d4b..7b32ddcefe 100644
--- a/library/ui/src/main/res/values-sl/strings.xml
+++ b/library/ui/src/main/res/values-sl/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ponavljanje vseh</string>
   <string name="exo_controls_shuffle_description">Naključno predvajanje</string>
   <string name="exo_controls_fullscreen_description">Celozaslonski način</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Izhod iz načina VR</string>
   <string name="exo_download_description">Prenos</string>
   <string name="exo_download_notification_channel_name">Prenosi</string>
   <string name="exo_download_downloading">Prenašanje</string>
diff --git a/library/ui/src/main/res/values-sw/strings.xml b/library/ui/src/main/res/values-sw/strings.xml
index aeefbc2a9f..97db67a16e 100644
--- a/library/ui/src/main/res/values-sw/strings.xml
+++ b/library/ui/src/main/res/values-sw/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Rudia zote</string>
   <string name="exo_controls_shuffle_description">Changanya</string>
   <string name="exo_controls_fullscreen_description">Hali ya skrini nzima</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Ondoka kwenye hali ya VR</string>
   <string name="exo_download_description">Pakua</string>
   <string name="exo_download_notification_channel_name">Vipakuliwa</string>
   <string name="exo_download_downloading">Inapakua</string>
diff --git a/library/ui/src/main/res/values-ta/strings.xml b/library/ui/src/main/res/values-ta/strings.xml
index 655da2f718..0f3c22275c 100644
--- a/library/ui/src/main/res/values-ta/strings.xml
+++ b/library/ui/src/main/res/values-ta/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">அனைத்தையும் மீண்டும் இயக்கு</string>
   <string name="exo_controls_shuffle_description">கலைத்துப் போடு</string>
   <string name="exo_controls_fullscreen_description">முழுத்திரைப் பயன்முறை</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">VRரிலிருந்து வெளியேறும்</string>
   <string name="exo_download_description">பதிவிறக்கும் பட்டன்</string>
   <string name="exo_download_notification_channel_name">பதிவிறக்கங்கள்</string>
   <string name="exo_download_downloading">பதிவிறக்குகிறது</string>

From ed32e2a7f7857e7bbcea79b05dd16a80882ba5eb Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Fri, 26 Oct 2018 10:44:14 -0700
Subject: [PATCH 129/832] Add TrackSelectionUtil.getAverageBitrate method

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=218877191
---
 .../trackselection/TrackSelectionUtil.java    |  57 +++++++
 .../TrackSelectionUtilTest.java               | 150 ++++++++++++++++++
 2 files changed, 207 insertions(+)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
new file mode 100644
index 0000000000..6f6cd8d80c
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.trackselection;
+
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
+
+/** Track selection related utility methods. */
+public final class TrackSelectionUtil {
+
+  private TrackSelectionUtil() {}
+
+  /**
+   * Returns average bitrate for chunks in bits per second. Chunks are included in average until
+   * {@code maxDurationMs} or the first unknown length chunk.
+   *
+   * @param iterator Iterator for media chunk sequences.
+   * @param maxDurationUs Maximum duration of chunks to be included in average bitrate, in
+   *     microseconds.
+   * @return Average bitrate for chunks in bits per second, or {@link C#LENGTH_UNSET} if there are
+   *     no chunks or the first chunk length is unknown.
+   */
+  public static int getAverageBitrate(MediaChunkIterator iterator, long maxDurationUs) {
+    long totalDurationUs = 0;
+    long totalLength = 0;
+    while (iterator.next()) {
+      long chunkLength = iterator.getDataSpec().length;
+      if (chunkLength == C.LENGTH_UNSET) {
+        break;
+      }
+      long chunkDurationUs = iterator.getChunkEndTimeUs() - iterator.getChunkStartTimeUs();
+      if (totalDurationUs + chunkDurationUs >= maxDurationUs) {
+        totalLength += chunkLength * (maxDurationUs - totalDurationUs) / chunkDurationUs;
+        totalDurationUs = maxDurationUs;
+        break;
+      }
+      totalDurationUs += chunkDurationUs;
+      totalLength += chunkLength;
+    }
+    return totalDurationUs == 0
+        ? C.LENGTH_UNSET
+        : (int) (totalLength * C.BITS_PER_BYTE * C.MICROS_PER_SECOND / totalDurationUs);
+  }
+}
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java
new file mode 100644
index 0000000000..df1780c984
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.trackselection;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.net.Uri;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.source.chunk.BaseMediaChunkIterator;
+import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
+import com.google.android.exoplayer2.upstream.DataSpec;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** {@link TrackSelectionUtil} tests. */
+@RunWith(RobolectricTestRunner.class)
+public class TrackSelectionUtilTest {
+
+  public static final long MAX_DURATION_US = 30 * C.MICROS_PER_SECOND;
+
+  @Test
+  public void getAverageBitrate_emptyIterator_returnsUnsetLength() {
+    assertThat(TrackSelectionUtil.getAverageBitrate(MediaChunkIterator.EMPTY, MAX_DURATION_US))
+        .isEqualTo(C.LENGTH_UNSET);
+  }
+
+  @Test
+  public void getAverageBitrate_oneChunk_returnsChunkBitrate() {
+    long[] chunkTimeBoundariesSec = {0, 5};
+    long[] chunkLengths = {10};
+    FakeIterator iterator = new FakeIterator(chunkTimeBoundariesSec, chunkLengths);
+    int expectedAverageBitrate =
+        (int) (chunkLengths[0] * C.BITS_PER_BYTE / chunkTimeBoundariesSec[1]);
+    assertThat(TrackSelectionUtil.getAverageBitrate(iterator, MAX_DURATION_US))
+        .isEqualTo(expectedAverageBitrate);
+  }
+
+  @Test
+  public void getAverageBitrate_multipleSameDurationChunks_returnsAverageChunkBitrate() {
+    long[] chunkTimeBoundariesSec = {0, 5, 10};
+    long[] chunkLengths = {10, 20};
+    FakeIterator iterator = new FakeIterator(chunkTimeBoundariesSec, chunkLengths);
+    long totalLength = chunkLengths[0] + chunkLengths[1];
+    int expectedAverageBitrate = (int) (totalLength * C.BITS_PER_BYTE / chunkTimeBoundariesSec[2]);
+    assertThat(TrackSelectionUtil.getAverageBitrate(iterator, MAX_DURATION_US))
+        .isEqualTo(expectedAverageBitrate);
+  }
+
+  @Test
+  public void getAverageBitrate_multipleDifferentDurationChunks_returnsAverageChunkBitrate() {
+    long[] chunkTimeBoundariesSec = {0, 5, 15, 30};
+    long[] chunkLengths = {10, 20, 30};
+    FakeIterator iterator = new FakeIterator(chunkTimeBoundariesSec, chunkLengths);
+    long totalLength = chunkLengths[0] + chunkLengths[1] + chunkLengths[2];
+    int expectedAverageBitrate = (int) (totalLength * C.BITS_PER_BYTE / chunkTimeBoundariesSec[3]);
+    assertThat(TrackSelectionUtil.getAverageBitrate(iterator, MAX_DURATION_US))
+        .isEqualTo(expectedAverageBitrate);
+  }
+
+  @Test
+  public void getAverageBitrate_firstChunkLengthUnset_returnsUnsetLength() {
+    long[] chunkTimeBoundariesSec = {0, 5, 15, 30};
+    long[] chunkLengths = {C.LENGTH_UNSET, 20, 30};
+    FakeIterator iterator = new FakeIterator(chunkTimeBoundariesSec, chunkLengths);
+    assertThat(TrackSelectionUtil.getAverageBitrate(iterator, MAX_DURATION_US))
+        .isEqualTo(C.LENGTH_UNSET);
+  }
+
+  @Test
+  public void getAverageBitrate_secondChunkLengthUnset_returnsFirstChunkBitrate() {
+    long[] chunkTimeBoundariesSec = {0, 5, 15, 30};
+    long[] chunkLengths = {10, C.LENGTH_UNSET, 30};
+    FakeIterator iterator = new FakeIterator(chunkTimeBoundariesSec, chunkLengths);
+    int expectedAverageBitrate =
+        (int) (chunkLengths[0] * C.BITS_PER_BYTE / chunkTimeBoundariesSec[1]);
+    assertThat(TrackSelectionUtil.getAverageBitrate(iterator, MAX_DURATION_US))
+        .isEqualTo(expectedAverageBitrate);
+  }
+
+  @Test
+  public void
+      getAverageBitrate_chunksExceedingMaxDuration_returnsAverageChunkBitrateUpToMaxDuration() {
+    long[] chunkTimeBoundariesSec = {0, 5, 15, 45, 50};
+    long[] chunkLengths = {10, 20, 30, 100};
+    FakeIterator iterator = new FakeIterator(chunkTimeBoundariesSec, chunkLengths);
+    // Just half of the third chunk is in the max duration
+    long totalLength = chunkLengths[0] + chunkLengths[1] + chunkLengths[2] / 2;
+    int expectedAverageBitrate =
+        (int) (totalLength * C.BITS_PER_BYTE * C.MICROS_PER_SECOND / MAX_DURATION_US);
+    assertThat(TrackSelectionUtil.getAverageBitrate(iterator, MAX_DURATION_US))
+        .isEqualTo(expectedAverageBitrate);
+  }
+
+  @Test
+  public void getAverageBitrate_zeroMaxDuration_returnsUnsetLength() {
+    long[] chunkTimeBoundariesSec = {0, 5, 10};
+    long[] chunkLengths = {10, 20};
+    FakeIterator iterator = new FakeIterator(chunkTimeBoundariesSec, chunkLengths);
+    assertThat(TrackSelectionUtil.getAverageBitrate(iterator, /* maxDurationUs= */ 0))
+        .isEqualTo(C.LENGTH_UNSET);
+  }
+
+  private static final class FakeIterator extends BaseMediaChunkIterator {
+
+    private final long[] chunkTimeBoundariesSec;
+    private final long[] chunkLengths;
+
+    public FakeIterator(long[] chunkTimeBoundariesSec, long[] chunkLengths) {
+      super(/* fromIndex= */ 0, /* toIndex= */ chunkTimeBoundariesSec.length - 2);
+      this.chunkTimeBoundariesSec = chunkTimeBoundariesSec;
+      this.chunkLengths = chunkLengths;
+    }
+
+    @Override
+    public DataSpec getDataSpec() {
+      checkInBounds();
+      return new DataSpec(
+          Uri.EMPTY,
+          /* absoluteStreamPosition= */ 0,
+          chunkLengths[(int) getCurrentIndex()],
+          /* key= */ null);
+    }
+
+    @Override
+    public long getChunkStartTimeUs() {
+      checkInBounds();
+      return chunkTimeBoundariesSec[(int) getCurrentIndex()] * C.MICROS_PER_SECOND;
+    }
+
+    @Override
+    public long getChunkEndTimeUs() {
+      checkInBounds();
+      return chunkTimeBoundariesSec[(int) getCurrentIndex() + 1] * C.MICROS_PER_SECOND;
+    }
+  }
+}

From 194d0f3331aa90d42275ab9a7f55fa6226438616 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 29 Oct 2018 04:43:48 -0700
Subject: [PATCH 130/832] Add a bit of structure DefaultTrackSelector, for
 sanity

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219109829
---
 .../trackselection/DefaultTrackSelector.java  | 568 ++++++++++--------
 .../DefaultTrackSelectorTest.java             |  35 +-
 .../src/main/res/values-b+sr+Latn/strings.xml |   2 +-
 library/ui/src/main/res/values-be/strings.xml |   2 +-
 library/ui/src/main/res/values-bg/strings.xml |   2 +-
 library/ui/src/main/res/values-bs/strings.xml |   2 +-
 library/ui/src/main/res/values-ca/strings.xml |   2 +-
 library/ui/src/main/res/values-da/strings.xml |   2 +-
 library/ui/src/main/res/values-de/strings.xml |   2 +-
 .../ui/src/main/res/values-es-rUS/strings.xml |   2 +-
 library/ui/src/main/res/values-et/strings.xml |   2 +-
 library/ui/src/main/res/values-fi/strings.xml |   2 +-
 .../ui/src/main/res/values-fr-rCA/strings.xml |   2 +-
 library/ui/src/main/res/values-fr/strings.xml |   2 +-
 library/ui/src/main/res/values-gl/strings.xml |   2 +-
 library/ui/src/main/res/values-hi/strings.xml |   2 +-
 library/ui/src/main/res/values-hu/strings.xml |   2 +-
 library/ui/src/main/res/values-hy/strings.xml |   2 +-
 library/ui/src/main/res/values-is/strings.xml |   2 +-
 library/ui/src/main/res/values-iw/strings.xml |   2 +-
 library/ui/src/main/res/values-kk/strings.xml |   2 +-
 library/ui/src/main/res/values-ky/strings.xml |   2 +-
 library/ui/src/main/res/values-lt/strings.xml |   2 +-
 library/ui/src/main/res/values-lv/strings.xml |   2 +-
 library/ui/src/main/res/values-mk/strings.xml |   2 +-
 library/ui/src/main/res/values-mn/strings.xml |   2 +-
 library/ui/src/main/res/values-ms/strings.xml |   2 +-
 library/ui/src/main/res/values-nb/strings.xml |   2 +-
 library/ui/src/main/res/values-ne/strings.xml |   2 +-
 library/ui/src/main/res/values-nl/strings.xml |   2 +-
 .../ui/src/main/res/values-pt-rPT/strings.xml |   2 +-
 library/ui/src/main/res/values-ro/strings.xml |   2 +-
 library/ui/src/main/res/values-ru/strings.xml |   2 +-
 library/ui/src/main/res/values-sr/strings.xml |   2 +-
 library/ui/src/main/res/values-sv/strings.xml |   2 +-
 library/ui/src/main/res/values-sw/strings.xml |   2 +-
 library/ui/src/main/res/values-th/strings.xml |   2 +-
 library/ui/src/main/res/values-tl/strings.xml |   2 +-
 library/ui/src/main/res/values-tr/strings.xml |   2 +-
 library/ui/src/main/res/values-uk/strings.xml |   2 +-
 library/ui/src/main/res/values-ur/strings.xml |   2 +-
 library/ui/src/main/res/values-vi/strings.xml |   2 +-
 .../ui/src/main/res/values-zh-rCN/strings.xml |   2 +-
 .../ui/src/main/res/values-zh-rHK/strings.xml |   2 +-
 .../ui/src/main/res/values-zh-rTW/strings.xml |   2 +-
 45 files changed, 376 insertions(+), 313 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
index 0f5adab4f5..435b5f1301 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -164,23 +164,27 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     private final SparseArray<Map<TrackGroupArray, SelectionOverride>> selectionOverrides;
     private final SparseBooleanArray rendererDisabledFlags;
 
-    private @Nullable String preferredAudioLanguage;
-    private @Nullable String preferredTextLanguage;
-    private boolean selectUndeterminedTextLanguage;
-    private int disabledTextTrackSelectionFlags;
-    private boolean forceLowestBitrate;
-    private boolean forceHighestSupportedBitrate;
-    private boolean allowMixedMimeAdaptiveness;
-    private boolean allowNonSeamlessAdaptiveness;
+    // Video
     private int maxVideoWidth;
     private int maxVideoHeight;
     private int maxVideoFrameRate;
     private int maxVideoBitrate;
     private boolean exceedVideoConstraintsIfNecessary;
-    private boolean exceedRendererCapabilitiesIfNecessary;
     private int viewportWidth;
     private int viewportHeight;
     private boolean viewportOrientationMayChange;
+    // Audio
+    @Nullable private String preferredAudioLanguage;
+    // Text
+    @Nullable private String preferredTextLanguage;
+    private boolean selectUndeterminedTextLanguage;
+    private int disabledTextTrackSelectionFlags;
+    // General
+    private boolean forceLowestBitrate;
+    private boolean forceHighestSupportedBitrate;
+    private boolean allowMixedMimeAdaptiveness;
+    private boolean allowNonSeamlessAdaptiveness;
+    private boolean exceedRendererCapabilitiesIfNecessary;
     private int tunnelingAudioSessionId;
 
     /** Creates a builder with default initial values. */
@@ -193,109 +197,34 @@ public class DefaultTrackSelector extends MappingTrackSelector {
      *     obtained.
      */
     private ParametersBuilder(Parameters initialValues) {
-      selectionOverrides = cloneSelectionOverrides(initialValues.selectionOverrides);
-      rendererDisabledFlags = initialValues.rendererDisabledFlags.clone();
-      preferredAudioLanguage = initialValues.preferredAudioLanguage;
-      preferredTextLanguage = initialValues.preferredTextLanguage;
-      selectUndeterminedTextLanguage = initialValues.selectUndeterminedTextLanguage;
-      disabledTextTrackSelectionFlags = initialValues.disabledTextTrackSelectionFlags;
-      forceLowestBitrate = initialValues.forceLowestBitrate;
-      forceHighestSupportedBitrate = initialValues.forceHighestSupportedBitrate;
-      allowMixedMimeAdaptiveness = initialValues.allowMixedMimeAdaptiveness;
-      allowNonSeamlessAdaptiveness = initialValues.allowNonSeamlessAdaptiveness;
+      // Video
       maxVideoWidth = initialValues.maxVideoWidth;
       maxVideoHeight = initialValues.maxVideoHeight;
       maxVideoFrameRate = initialValues.maxVideoFrameRate;
       maxVideoBitrate = initialValues.maxVideoBitrate;
       exceedVideoConstraintsIfNecessary = initialValues.exceedVideoConstraintsIfNecessary;
-      exceedRendererCapabilitiesIfNecessary = initialValues.exceedRendererCapabilitiesIfNecessary;
       viewportWidth = initialValues.viewportWidth;
       viewportHeight = initialValues.viewportHeight;
       viewportOrientationMayChange = initialValues.viewportOrientationMayChange;
+      // Audio
+      preferredAudioLanguage = initialValues.preferredAudioLanguage;
+      // Text
+      preferredTextLanguage = initialValues.preferredTextLanguage;
+      selectUndeterminedTextLanguage = initialValues.selectUndeterminedTextLanguage;
+      disabledTextTrackSelectionFlags = initialValues.disabledTextTrackSelectionFlags;
+      // General
+      forceLowestBitrate = initialValues.forceLowestBitrate;
+      forceHighestSupportedBitrate = initialValues.forceHighestSupportedBitrate;
+      allowMixedMimeAdaptiveness = initialValues.allowMixedMimeAdaptiveness;
+      allowNonSeamlessAdaptiveness = initialValues.allowNonSeamlessAdaptiveness;
+      exceedRendererCapabilitiesIfNecessary = initialValues.exceedRendererCapabilitiesIfNecessary;
       tunnelingAudioSessionId = initialValues.tunnelingAudioSessionId;
+      // Overrides
+      selectionOverrides = cloneSelectionOverrides(initialValues.selectionOverrides);
+      rendererDisabledFlags = initialValues.rendererDisabledFlags.clone();
     }
 
-    /**
-     * See {@link Parameters#preferredAudioLanguage}.
-     *
-     * @return This builder.
-     */
-    public ParametersBuilder setPreferredAudioLanguage(String preferredAudioLanguage) {
-      this.preferredAudioLanguage = preferredAudioLanguage;
-      return this;
-    }
-
-    /**
-     * See {@link Parameters#preferredTextLanguage}.
-     *
-     * @return This builder.
-     */
-    public ParametersBuilder setPreferredTextLanguage(String preferredTextLanguage) {
-      this.preferredTextLanguage = preferredTextLanguage;
-      return this;
-    }
-
-    /**
-     * See {@link Parameters#selectUndeterminedTextLanguage}.
-     *
-     * @return This builder.
-     */
-    public ParametersBuilder setSelectUndeterminedTextLanguage(
-        boolean selectUndeterminedTextLanguage) {
-      this.selectUndeterminedTextLanguage = selectUndeterminedTextLanguage;
-      return this;
-    }
-
-    /**
-     * See {@link Parameters#disabledTextTrackSelectionFlags}.
-     *
-     * @return This builder.
-     */
-    public ParametersBuilder setDisabledTextTrackSelectionFlags(
-        int disabledTextTrackSelectionFlags) {
-      this.disabledTextTrackSelectionFlags = disabledTextTrackSelectionFlags;
-      return this;
-    }
-
-    /**
-     * See {@link Parameters#forceLowestBitrate}.
-     *
-     * @return This builder.
-     */
-    public ParametersBuilder setForceLowestBitrate(boolean forceLowestBitrate) {
-      this.forceLowestBitrate = forceLowestBitrate;
-      return this;
-    }
-
-    /**
-     * See {@link Parameters#forceHighestSupportedBitrate}.
-     *
-     * @return This builder.
-     */
-    public ParametersBuilder setForceHighestSupportedBitrate(boolean forceHighestSupportedBitrate) {
-      this.forceHighestSupportedBitrate = forceHighestSupportedBitrate;
-      return this;
-    }
-
-    /**
-     * See {@link Parameters#allowMixedMimeAdaptiveness}.
-     *
-     * @return This builder.
-     */
-    public ParametersBuilder setAllowMixedMimeAdaptiveness(boolean allowMixedMimeAdaptiveness) {
-      this.allowMixedMimeAdaptiveness = allowMixedMimeAdaptiveness;
-      return this;
-    }
-
-    /**
-     * See {@link Parameters#allowNonSeamlessAdaptiveness}.
-     *
-     * @return This builder.
-     */
-    public ParametersBuilder setAllowNonSeamlessAdaptiveness(boolean allowNonSeamlessAdaptiveness) {
-      this.allowNonSeamlessAdaptiveness = allowNonSeamlessAdaptiveness;
-      return this;
-    }
+    // Video
 
     /**
      * Equivalent to {@link #setMaxVideoSize setMaxVideoSize(1279, 719)}.
@@ -357,17 +286,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       return this;
     }
 
-    /**
-     * See {@link Parameters#exceedRendererCapabilitiesIfNecessary}.
-     *
-     * @return This builder.
-     */
-    public ParametersBuilder setExceedRendererCapabilitiesIfNecessary(
-        boolean exceedRendererCapabilitiesIfNecessary) {
-      this.exceedRendererCapabilitiesIfNecessary = exceedRendererCapabilitiesIfNecessary;
-      return this;
-    }
-
     /**
      * Equivalent to calling {@link #setViewportSize(int, int, boolean)} with the viewport size
      * obtained from {@link Util#getPhysicalDisplaySize(Context)}.
@@ -384,8 +302,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     }
 
     /**
-     * Equivalent to
-     * {@link #setViewportSize setViewportSize(Integer.MAX_VALUE, Integer.MAX_VALUE, true)}.
+     * Equivalent to {@link #setViewportSize setViewportSize(Integer.MAX_VALUE, Integer.MAX_VALUE,
+     * true)}.
      *
      * @return This builder.
      */
@@ -410,6 +328,127 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       return this;
     }
 
+    // Audio
+
+    /**
+     * See {@link Parameters#preferredAudioLanguage}.
+     *
+     * @return This builder.
+     */
+    public ParametersBuilder setPreferredAudioLanguage(String preferredAudioLanguage) {
+      this.preferredAudioLanguage = preferredAudioLanguage;
+      return this;
+    }
+
+    // Text
+
+    /**
+     * See {@link Parameters#preferredTextLanguage}.
+     *
+     * @return This builder.
+     */
+    public ParametersBuilder setPreferredTextLanguage(String preferredTextLanguage) {
+      this.preferredTextLanguage = preferredTextLanguage;
+      return this;
+    }
+
+    /**
+     * See {@link Parameters#selectUndeterminedTextLanguage}.
+     *
+     * @return This builder.
+     */
+    public ParametersBuilder setSelectUndeterminedTextLanguage(
+        boolean selectUndeterminedTextLanguage) {
+      this.selectUndeterminedTextLanguage = selectUndeterminedTextLanguage;
+      return this;
+    }
+
+    /**
+     * See {@link Parameters#disabledTextTrackSelectionFlags}.
+     *
+     * @return This builder.
+     */
+    public ParametersBuilder setDisabledTextTrackSelectionFlags(
+        int disabledTextTrackSelectionFlags) {
+      this.disabledTextTrackSelectionFlags = disabledTextTrackSelectionFlags;
+      return this;
+    }
+
+    // General
+
+    /**
+     * See {@link Parameters#forceLowestBitrate}.
+     *
+     * @return This builder.
+     */
+    public ParametersBuilder setForceLowestBitrate(boolean forceLowestBitrate) {
+      this.forceLowestBitrate = forceLowestBitrate;
+      return this;
+    }
+
+    /**
+     * See {@link Parameters#forceHighestSupportedBitrate}.
+     *
+     * @return This builder.
+     */
+    public ParametersBuilder setForceHighestSupportedBitrate(boolean forceHighestSupportedBitrate) {
+      this.forceHighestSupportedBitrate = forceHighestSupportedBitrate;
+      return this;
+    }
+
+    /**
+     * See {@link Parameters#allowMixedMimeAdaptiveness}.
+     *
+     * @return This builder.
+     */
+    public ParametersBuilder setAllowMixedMimeAdaptiveness(boolean allowMixedMimeAdaptiveness) {
+      this.allowMixedMimeAdaptiveness = allowMixedMimeAdaptiveness;
+      return this;
+    }
+
+    /**
+     * See {@link Parameters#allowNonSeamlessAdaptiveness}.
+     *
+     * @return This builder.
+     */
+    public ParametersBuilder setAllowNonSeamlessAdaptiveness(boolean allowNonSeamlessAdaptiveness) {
+      this.allowNonSeamlessAdaptiveness = allowNonSeamlessAdaptiveness;
+      return this;
+    }
+
+    /**
+     * See {@link Parameters#exceedRendererCapabilitiesIfNecessary}.
+     *
+     * @return This builder.
+     */
+    public ParametersBuilder setExceedRendererCapabilitiesIfNecessary(
+        boolean exceedRendererCapabilitiesIfNecessary) {
+      this.exceedRendererCapabilitiesIfNecessary = exceedRendererCapabilitiesIfNecessary;
+      return this;
+    }
+
+    /**
+     * See {@link Parameters#tunnelingAudioSessionId}.
+     *
+     * <p>Enables or disables tunneling. To enable tunneling, pass an audio session id to use when
+     * in tunneling mode. Session ids can be generated using {@link
+     * C#generateAudioSessionIdV21(Context)}. To disable tunneling pass {@link
+     * C#AUDIO_SESSION_ID_UNSET}. Tunneling will only be activated if it's both enabled and
+     * supported by the audio and video renderers for the selected tracks.
+     *
+     * @param tunnelingAudioSessionId The audio session id to use when tunneling, or {@link
+     *     C#AUDIO_SESSION_ID_UNSET} to disable tunneling.
+     */
+    public ParametersBuilder setTunnelingAudioSessionId(int tunnelingAudioSessionId) {
+      if (this.tunnelingAudioSessionId != tunnelingAudioSessionId) {
+        this.tunnelingAudioSessionId = tunnelingAudioSessionId;
+        return this;
+      }
+      return this;
+    }
+
+    // Overrides
+
     /**
      * Sets whether the renderer at the specified index is disabled. Disabling a renderer prevents
      * the selector from selecting any tracks for it.
@@ -513,51 +552,36 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       return this;
     }
 
-    /**
-     * See {@link Parameters#tunnelingAudioSessionId}.
-     *
-     * <p>Enables or disables tunneling. To enable tunneling, pass an audio session id to use when
-     * in tunneling mode. Session ids can be generated using {@link
-     * C#generateAudioSessionIdV21(Context)}. To disable tunneling pass {@link
-     * C#AUDIO_SESSION_ID_UNSET}. Tunneling will only be activated if it's both enabled and
-     * supported by the audio and video renderers for the selected tracks.
-     *
-     * @param tunnelingAudioSessionId The audio session id to use when tunneling, or {@link
-     *     C#AUDIO_SESSION_ID_UNSET} to disable tunneling.
-     */
-    public ParametersBuilder setTunnelingAudioSessionId(int tunnelingAudioSessionId) {
-      if (this.tunnelingAudioSessionId != tunnelingAudioSessionId) {
-        this.tunnelingAudioSessionId = tunnelingAudioSessionId;
-        return this;
-      }
-      return this;
-    }
-
     /**
      * Builds a {@link Parameters} instance with the selected values.
      */
     public Parameters build() {
       return new Parameters(
-          selectionOverrides,
-          rendererDisabledFlags,
-          preferredAudioLanguage,
-          preferredTextLanguage,
-          selectUndeterminedTextLanguage,
-          disabledTextTrackSelectionFlags,
-          forceLowestBitrate,
-          forceHighestSupportedBitrate,
-          allowMixedMimeAdaptiveness,
-          allowNonSeamlessAdaptiveness,
+          // Video
           maxVideoWidth,
           maxVideoHeight,
           maxVideoFrameRate,
           maxVideoBitrate,
           exceedVideoConstraintsIfNecessary,
-          exceedRendererCapabilitiesIfNecessary,
           viewportWidth,
           viewportHeight,
           viewportOrientationMayChange,
-          tunnelingAudioSessionId);
+          // Audio
+          preferredAudioLanguage,
+          // Text
+          preferredTextLanguage,
+          selectUndeterminedTextLanguage,
+          disabledTextTrackSelectionFlags,
+          // General
+          forceLowestBitrate,
+          forceHighestSupportedBitrate,
+          allowMixedMimeAdaptiveness,
+          allowNonSeamlessAdaptiveness,
+          exceedRendererCapabilitiesIfNecessary,
+          tunnelingAudioSessionId,
+          // Overrides
+          selectionOverrides,
+          rendererDisabledFlags);
     }
 
     private static SparseArray<Map<TrackGroupArray, SelectionOverride>> cloneSelectionOverrides(
@@ -576,37 +600,10 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     /** An instance with default values. */
     public static final Parameters DEFAULT = new Parameters();
 
-    // Per renderer overrides.
-
+    // Overrides
     private final SparseArray<Map<TrackGroupArray, SelectionOverride>> selectionOverrides;
     private final SparseBooleanArray rendererDisabledFlags;
 
-    // Audio
-    /**
-     * The preferred language for audio and forced text tracks, as an ISO 639-2/T tag. {@code null}
-     * selects the default track, or the first track if there's no default. The default value is
-     * {@code null}.
-     */
-    public final @Nullable String preferredAudioLanguage;
-
-    // Text
-    /**
-     * The preferred language for text tracks as an ISO 639-2/T tag. {@code null} selects the
-     * default track if there is one, or no track otherwise. The default value is {@code null}.
-     */
-    public final @Nullable String preferredTextLanguage;
-    /**
-     * Whether a text track with undetermined language should be selected if no track with {@link
-     * #preferredTextLanguage} is available, or if {@link #preferredTextLanguage} is unset. The
-     * default value is {@code false}.
-     */
-    public final boolean selectUndeterminedTextLanguage;
-    /**
-     * Bitmask of selection flags that are disabled for text track selections. See {@link
-     * C.SelectionFlags}. The default value is {@code 0} (i.e. no flags).
-     */
-    public final int disabledTextTrackSelectionFlags;
-
     // Video
     /**
      * Maximum allowed video width. The default value is {@link Integer#MAX_VALUE} (i.e. no
@@ -660,6 +657,32 @@ public class DefaultTrackSelector extends MappingTrackSelector {
      */
     public final boolean viewportOrientationMayChange;
 
+    // Audio
+    /**
+     * The preferred language for audio and forced text tracks, as an ISO 639-2/T tag. {@code null}
+     * selects the default track, or the first track if there's no default. The default value is
+     * {@code null}.
+     */
+    @Nullable public final String preferredAudioLanguage;
+
+    // Text
+    /**
+     * The preferred language for text tracks as an ISO 639-2/T tag. {@code null} selects the
+     * default track if there is one, or no track otherwise. The default value is {@code null}.
+     */
+    @Nullable public final String preferredTextLanguage;
+    /**
+     * Whether a text track with undetermined language should be selected if no track with {@link
+     * #preferredTextLanguage} is available, or if {@link #preferredTextLanguage} is unset. The
+     * default value is {@code false}.
+     */
+    public final boolean selectUndeterminedTextLanguage;
+    /**
+     * Bitmask of selection flags that are disabled for text track selections. See {@link
+     * C.SelectionFlags}. The default value is {@code 0} (i.e. no flags).
+     */
+    public final int disabledTextTrackSelectionFlags;
+
     // General
     /**
      * Whether to force selection of the single lowest bitrate audio and video tracks that comply
@@ -700,92 +723,112 @@ public class DefaultTrackSelector extends MappingTrackSelector {
 
     private Parameters() {
       this(
-          /* selectionOverrides= */ new SparseArray<>(),
-          /* rendererDisabledFlags= */ new SparseBooleanArray(),
-          /* preferredAudioLanguage= */ null,
-          /* preferredTextLanguage= */ null,
-          /* selectUndeterminedTextLanguage= */ false,
-          /* disabledTextTrackSelectionFlags= */ 0,
-          /* forceLowestBitrate= */ false,
-          /* forceHighestSupportedBitrate= */ false,
-          /* allowMixedMimeAdaptiveness= */ false,
-          /* allowNonSeamlessAdaptiveness= */ true,
+          // Video
           /* maxVideoWidth= */ Integer.MAX_VALUE,
           /* maxVideoHeight= */ Integer.MAX_VALUE,
           /* maxVideoFrameRate= */ Integer.MAX_VALUE,
           /* maxVideoBitrate= */ Integer.MAX_VALUE,
           /* exceedVideoConstraintsIfNecessary= */ true,
-          /* exceedRendererCapabilitiesIfNecessary= */ true,
           /* viewportWidth= */ Integer.MAX_VALUE,
           /* viewportHeight= */ Integer.MAX_VALUE,
           /* viewportOrientationMayChange= */ true,
-          /* tunnelingAudioSessionId= */ C.AUDIO_SESSION_ID_UNSET);
+          // Audio
+          /* preferredAudioLanguage= */ null,
+          // Text
+          /* preferredTextLanguage= */ null,
+          /* selectUndeterminedTextLanguage= */ false,
+          /* disabledTextTrackSelectionFlags= */ 0,
+          // General
+          /* forceLowestBitrate= */ false,
+          /* forceHighestSupportedBitrate= */ false,
+          /* allowMixedMimeAdaptiveness= */ false,
+          /* allowNonSeamlessAdaptiveness= */ true,
+          /* exceedRendererCapabilitiesIfNecessary= */ true,
+          /* tunnelingAudioSessionId= */ C.AUDIO_SESSION_ID_UNSET,
+          // Overrides
+          /* selectionOverrides= */ new SparseArray<>(),
+          /* rendererDisabledFlags= */ new SparseBooleanArray());
     }
 
     /* package */ Parameters(
-        SparseArray<Map<TrackGroupArray, SelectionOverride>> selectionOverrides,
-        SparseBooleanArray rendererDisabledFlags,
-        @Nullable String preferredAudioLanguage,
-        @Nullable String preferredTextLanguage,
-        boolean selectUndeterminedTextLanguage,
-        int disabledTextTrackSelectionFlags,
-        boolean forceLowestBitrate,
-        boolean forceHighestSupportedBitrate,
-        boolean allowMixedMimeAdaptiveness,
-        boolean allowNonSeamlessAdaptiveness,
+        // Video
         int maxVideoWidth,
         int maxVideoHeight,
         int maxVideoFrameRate,
         int maxVideoBitrate,
         boolean exceedVideoConstraintsIfNecessary,
-        boolean exceedRendererCapabilitiesIfNecessary,
         int viewportWidth,
         int viewportHeight,
         boolean viewportOrientationMayChange,
-        int tunnelingAudioSessionId) {
-      this.selectionOverrides = selectionOverrides;
-      this.rendererDisabledFlags = rendererDisabledFlags;
-      this.preferredAudioLanguage = Util.normalizeLanguageCode(preferredAudioLanguage);
-      this.preferredTextLanguage = Util.normalizeLanguageCode(preferredTextLanguage);
-      this.selectUndeterminedTextLanguage = selectUndeterminedTextLanguage;
-      this.disabledTextTrackSelectionFlags = disabledTextTrackSelectionFlags;
-      this.forceLowestBitrate = forceLowestBitrate;
-      this.forceHighestSupportedBitrate = forceHighestSupportedBitrate;
-      this.allowMixedMimeAdaptiveness = allowMixedMimeAdaptiveness;
-      this.allowNonSeamlessAdaptiveness = allowNonSeamlessAdaptiveness;
+        // Audio
+        @Nullable String preferredAudioLanguage,
+        // Text
+        @Nullable String preferredTextLanguage,
+        boolean selectUndeterminedTextLanguage,
+        int disabledTextTrackSelectionFlags,
+        // General
+        boolean forceLowestBitrate,
+        boolean forceHighestSupportedBitrate,
+        boolean allowMixedMimeAdaptiveness,
+        boolean allowNonSeamlessAdaptiveness,
+        boolean exceedRendererCapabilitiesIfNecessary,
+        int tunnelingAudioSessionId,
+        // Overrides
+        SparseArray<Map<TrackGroupArray, SelectionOverride>> selectionOverrides,
+        SparseBooleanArray rendererDisabledFlags) {
+      // Video
       this.maxVideoWidth = maxVideoWidth;
       this.maxVideoHeight = maxVideoHeight;
       this.maxVideoFrameRate = maxVideoFrameRate;
       this.maxVideoBitrate = maxVideoBitrate;
       this.exceedVideoConstraintsIfNecessary = exceedVideoConstraintsIfNecessary;
-      this.exceedRendererCapabilitiesIfNecessary = exceedRendererCapabilitiesIfNecessary;
       this.viewportWidth = viewportWidth;
       this.viewportHeight = viewportHeight;
       this.viewportOrientationMayChange = viewportOrientationMayChange;
+      // Audio
+      this.preferredAudioLanguage = Util.normalizeLanguageCode(preferredAudioLanguage);
+      // Text
+      this.preferredTextLanguage = Util.normalizeLanguageCode(preferredTextLanguage);
+      this.selectUndeterminedTextLanguage = selectUndeterminedTextLanguage;
+      this.disabledTextTrackSelectionFlags = disabledTextTrackSelectionFlags;
+      // General
+      this.forceLowestBitrate = forceLowestBitrate;
+      this.forceHighestSupportedBitrate = forceHighestSupportedBitrate;
+      this.allowMixedMimeAdaptiveness = allowMixedMimeAdaptiveness;
+      this.allowNonSeamlessAdaptiveness = allowNonSeamlessAdaptiveness;
+      this.exceedRendererCapabilitiesIfNecessary = exceedRendererCapabilitiesIfNecessary;
       this.tunnelingAudioSessionId = tunnelingAudioSessionId;
+      // Overrides
+      this.selectionOverrides = selectionOverrides;
+      this.rendererDisabledFlags = rendererDisabledFlags;
     }
 
     /* package */ Parameters(Parcel in) {
-      this.selectionOverrides = readSelectionOverrides(in);
-      this.rendererDisabledFlags = in.readSparseBooleanArray();
-      this.preferredAudioLanguage = in.readString();
-      this.preferredTextLanguage = in.readString();
-      this.selectUndeterminedTextLanguage = Util.readBoolean(in);
-      this.disabledTextTrackSelectionFlags = in.readInt();
-      this.forceLowestBitrate = Util.readBoolean(in);
-      this.forceHighestSupportedBitrate = Util.readBoolean(in);
-      this.allowMixedMimeAdaptiveness = Util.readBoolean(in);
-      this.allowNonSeamlessAdaptiveness = Util.readBoolean(in);
+      // Video
       this.maxVideoWidth = in.readInt();
       this.maxVideoHeight = in.readInt();
       this.maxVideoFrameRate = in.readInt();
       this.maxVideoBitrate = in.readInt();
       this.exceedVideoConstraintsIfNecessary = Util.readBoolean(in);
-      this.exceedRendererCapabilitiesIfNecessary = Util.readBoolean(in);
       this.viewportWidth = in.readInt();
       this.viewportHeight = in.readInt();
       this.viewportOrientationMayChange = Util.readBoolean(in);
+      // Audio
+      this.preferredAudioLanguage = in.readString();
+      // Text
+      this.preferredTextLanguage = in.readString();
+      this.selectUndeterminedTextLanguage = Util.readBoolean(in);
+      this.disabledTextTrackSelectionFlags = in.readInt();
+      // General
+      this.forceLowestBitrate = Util.readBoolean(in);
+      this.forceHighestSupportedBitrate = Util.readBoolean(in);
+      this.allowMixedMimeAdaptiveness = Util.readBoolean(in);
+      this.allowNonSeamlessAdaptiveness = Util.readBoolean(in);
+      this.exceedRendererCapabilitiesIfNecessary = Util.readBoolean(in);
       this.tunnelingAudioSessionId = in.readInt();
+      // Overrides
+      this.selectionOverrides = readSelectionOverrides(in);
+      this.rendererDisabledFlags = in.readSparseBooleanArray();
     }
 
     /**
@@ -839,49 +882,59 @@ public class DefaultTrackSelector extends MappingTrackSelector {
         return false;
       }
       Parameters other = (Parameters) obj;
-      return selectUndeterminedTextLanguage == other.selectUndeterminedTextLanguage
+      return maxVideoWidth == other.maxVideoWidth
+          && maxVideoHeight == other.maxVideoHeight
+          && maxVideoFrameRate == other.maxVideoFrameRate
+          && maxVideoBitrate == other.maxVideoBitrate
+          && exceedVideoConstraintsIfNecessary == other.exceedVideoConstraintsIfNecessary
+          && viewportOrientationMayChange == other.viewportOrientationMayChange
+          && viewportWidth == other.viewportWidth
+          && viewportHeight == other.viewportHeight
+          // Audio
+          && TextUtils.equals(preferredAudioLanguage, other.preferredAudioLanguage)
+          // Text
+          && TextUtils.equals(preferredTextLanguage, other.preferredTextLanguage)
+          && selectUndeterminedTextLanguage == other.selectUndeterminedTextLanguage
           && disabledTextTrackSelectionFlags == other.disabledTextTrackSelectionFlags
+          // General
           && forceLowestBitrate == other.forceLowestBitrate
           && forceHighestSupportedBitrate == other.forceHighestSupportedBitrate
           && allowMixedMimeAdaptiveness == other.allowMixedMimeAdaptiveness
           && allowNonSeamlessAdaptiveness == other.allowNonSeamlessAdaptiveness
-          && maxVideoWidth == other.maxVideoWidth
-          && maxVideoHeight == other.maxVideoHeight
-          && maxVideoFrameRate == other.maxVideoFrameRate
-          && exceedVideoConstraintsIfNecessary == other.exceedVideoConstraintsIfNecessary
           && exceedRendererCapabilitiesIfNecessary == other.exceedRendererCapabilitiesIfNecessary
-          && viewportOrientationMayChange == other.viewportOrientationMayChange
-          && viewportWidth == other.viewportWidth
-          && viewportHeight == other.viewportHeight
-          && maxVideoBitrate == other.maxVideoBitrate
           && tunnelingAudioSessionId == other.tunnelingAudioSessionId
-          && TextUtils.equals(preferredAudioLanguage, other.preferredAudioLanguage)
-          && TextUtils.equals(preferredTextLanguage, other.preferredTextLanguage)
+          // Overrides
           && areRendererDisabledFlagsEqual(rendererDisabledFlags, other.rendererDisabledFlags)
           && areSelectionOverridesEqual(selectionOverrides, other.selectionOverrides);
     }
 
     @Override
     public int hashCode() {
-      int result = selectUndeterminedTextLanguage ? 1 : 0;
+      int result = 1;
+      // Video
+      result = 31 * result + maxVideoWidth;
+      result = 31 * result + maxVideoHeight;
+      result = 31 * result + maxVideoFrameRate;
+      result = 31 * result + maxVideoBitrate;
+      result = 31 * result + (exceedVideoConstraintsIfNecessary ? 1 : 0);
+      result = 31 * result + (viewportOrientationMayChange ? 1 : 0);
+      result = 31 * result + viewportWidth;
+      result = 31 * result + viewportHeight;
+      // Audio
+      result =
+          31 * result + (preferredAudioLanguage == null ? 0 : preferredAudioLanguage.hashCode());
+      // Text
+      result = 31 * result + (preferredTextLanguage == null ? 0 : preferredTextLanguage.hashCode());
+      result = 31 * result + (selectUndeterminedTextLanguage ? 1 : 0);
       result = 31 * result + disabledTextTrackSelectionFlags;
+      // General
       result = 31 * result + (forceLowestBitrate ? 1 : 0);
       result = 31 * result + (forceHighestSupportedBitrate ? 1 : 0);
       result = 31 * result + (allowMixedMimeAdaptiveness ? 1 : 0);
       result = 31 * result + (allowNonSeamlessAdaptiveness ? 1 : 0);
-      result = 31 * result + maxVideoWidth;
-      result = 31 * result + maxVideoHeight;
-      result = 31 * result + maxVideoFrameRate;
-      result = 31 * result + (exceedVideoConstraintsIfNecessary ? 1 : 0);
       result = 31 * result + (exceedRendererCapabilitiesIfNecessary ? 1 : 0);
-      result = 31 * result + (viewportOrientationMayChange ? 1 : 0);
-      result = 31 * result + viewportWidth;
-      result = 31 * result + viewportHeight;
-      result = 31 * result + maxVideoBitrate;
       result = 31 * result + tunnelingAudioSessionId;
-      result =
-          31 * result + (preferredAudioLanguage == null ? 0 : preferredAudioLanguage.hashCode());
-      result = 31 * result + (preferredTextLanguage == null ? 0 : preferredTextLanguage.hashCode());
+      // Overrides (omitted from hashCode).
       return result;
     }
 
@@ -894,26 +947,31 @@ public class DefaultTrackSelector extends MappingTrackSelector {
 
     @Override
     public void writeToParcel(Parcel dest, int flags) {
-      writeSelectionOverridesToParcel(dest, selectionOverrides);
-      dest.writeSparseBooleanArray(rendererDisabledFlags);
-      dest.writeString(preferredAudioLanguage);
-      dest.writeString(preferredTextLanguage);
-      Util.writeBoolean(dest, selectUndeterminedTextLanguage);
-      dest.writeInt(disabledTextTrackSelectionFlags);
-      Util.writeBoolean(dest, forceLowestBitrate);
-      Util.writeBoolean(dest, forceHighestSupportedBitrate);
-      Util.writeBoolean(dest, allowMixedMimeAdaptiveness);
-      Util.writeBoolean(dest, allowNonSeamlessAdaptiveness);
+      // Video
       dest.writeInt(maxVideoWidth);
       dest.writeInt(maxVideoHeight);
       dest.writeInt(maxVideoFrameRate);
       dest.writeInt(maxVideoBitrate);
       Util.writeBoolean(dest, exceedVideoConstraintsIfNecessary);
-      Util.writeBoolean(dest, exceedRendererCapabilitiesIfNecessary);
       dest.writeInt(viewportWidth);
       dest.writeInt(viewportHeight);
       Util.writeBoolean(dest, viewportOrientationMayChange);
+      // Audio
+      dest.writeString(preferredAudioLanguage);
+      // Text
+      dest.writeString(preferredTextLanguage);
+      Util.writeBoolean(dest, selectUndeterminedTextLanguage);
+      dest.writeInt(disabledTextTrackSelectionFlags);
+      // General
+      Util.writeBoolean(dest, forceLowestBitrate);
+      Util.writeBoolean(dest, forceHighestSupportedBitrate);
+      Util.writeBoolean(dest, allowMixedMimeAdaptiveness);
+      Util.writeBoolean(dest, allowNonSeamlessAdaptiveness);
+      Util.writeBoolean(dest, exceedRendererCapabilitiesIfNecessary);
       dest.writeInt(tunnelingAudioSessionId);
+      // Overrides
+      writeSelectionOverridesToParcel(dest, selectionOverrides);
+      dest.writeSparseBooleanArray(rendererDisabledFlags);
     }
 
     public static final Parcelable.Creator<Parameters> CREATOR =
@@ -2216,7 +2274,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
 
     public final int channelCount;
     public final int sampleRate;
-    public final @Nullable String mimeType;
+    @Nullable public final String mimeType;
 
     public AudioConfigurationTuple(int channelCount, int sampleRate, @Nullable String mimeType) {
       this.channelCount = channelCount;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
index ee3d2cf9b0..82fff694de 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
@@ -129,26 +129,31 @@ public final class DefaultTrackSelectorTest {
 
     Parameters parametersToParcel =
         new Parameters(
-            selectionOverrides,
-            rendererDisabledFlags,
+            // Video
+            /* maxVideoWidth= */ 0,
+            /* maxVideoHeight= */ 1,
+            /* maxVideoFrameRate= */ 2,
+            /* maxVideoBitrate= */ 3,
+            /* exceedVideoConstraintsIfNecessary= */ false,
+            /* viewportWidth= */ 4,
+            /* viewportHeight= */ 5,
+            /* viewportOrientationMayChange= */ true,
+            // Audio
             /* preferredAudioLanguage= */ "en",
+            // Text
             /* preferredTextLanguage= */ "de",
             /* selectUndeterminedTextLanguage= */ false,
-            /* disabledTextTrackSelectionFlags= */ 0,
+            /* disabledTextTrackSelectionFlags= */ 6,
+            // General
             /* forceLowestBitrate= */ true,
-            /* forceHighestSupportedBitrate= */ true,
-            /* allowMixedMimeAdaptiveness= */ false,
-            /* allowNonSeamlessAdaptiveness= */ true,
-            /* maxVideoWidth= */ 1,
-            /* maxVideoHeight= */ 2,
-            /* maxVideoFrameRate= */ 3,
-            /* maxVideoBitrate= */ 4,
-            /* exceedVideoConstraintsIfNecessary= */ false,
+            /* forceHighestSupportedBitrate= */ false,
+            /* allowMixedMimeAdaptiveness= */ true,
+            /* allowNonSeamlessAdaptiveness= */ false,
             /* exceedRendererCapabilitiesIfNecessary= */ true,
-            /* viewportWidth= */ 5,
-            /* viewportHeight= */ 6,
-            /* viewportOrientationMayChange= */ false,
-            /* tunnelingAudioSessionId= */ C.AUDIO_SESSION_ID_UNSET);
+            /* tunnelingAudioSessionId= */ C.AUDIO_SESSION_ID_UNSET,
+            // Overrides
+            selectionOverrides,
+            rendererDisabledFlags);
 
     Parcel parcel = Parcel.obtain();
     parametersToParcel.writeToParcel(parcel, 0);
diff --git a/library/ui/src/main/res/values-b+sr+Latn/strings.xml b/library/ui/src/main/res/values-b+sr+Latn/strings.xml
index 890a19b310..f03e6a6a94 100644
--- a/library/ui/src/main/res/values-b+sr+Latn/strings.xml
+++ b/library/ui/src/main/res/values-b+sr+Latn/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ponovi sve</string>
   <string name="exo_controls_shuffle_description">Pusti nasumično</string>
   <string name="exo_controls_fullscreen_description">Režim celog ekrana</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Izađi iz VR režima</string>
   <string name="exo_download_description">Preuzmi</string>
   <string name="exo_download_notification_channel_name">Preuzimanja</string>
   <string name="exo_download_downloading">Preuzima se</string>
diff --git a/library/ui/src/main/res/values-be/strings.xml b/library/ui/src/main/res/values-be/strings.xml
index b6c50e4c27..e669739691 100644
--- a/library/ui/src/main/res/values-be/strings.xml
+++ b/library/ui/src/main/res/values-be/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Паўтарыць усе</string>
   <string name="exo_controls_shuffle_description">Перамяшаць</string>
   <string name="exo_controls_fullscreen_description">Поўнаэкранны рэжым</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Выйсці з VR-рэжыму</string>
   <string name="exo_download_description">Спампаваць</string>
   <string name="exo_download_notification_channel_name">Спампоўкі</string>
   <string name="exo_download_downloading">Спампоўваецца</string>
diff --git a/library/ui/src/main/res/values-bg/strings.xml b/library/ui/src/main/res/values-bg/strings.xml
index da02946695..4146ccf0d8 100644
--- a/library/ui/src/main/res/values-bg/strings.xml
+++ b/library/ui/src/main/res/values-bg/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Повтаряне на всички</string>
   <string name="exo_controls_shuffle_description">Разбъркване</string>
   <string name="exo_controls_fullscreen_description">Режим на цял екран</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Изход от режима за VR</string>
   <string name="exo_download_description">Изтегляне</string>
   <string name="exo_download_notification_channel_name">Изтегляния</string>
   <string name="exo_download_downloading">Изтегля се</string>
diff --git a/library/ui/src/main/res/values-bs/strings.xml b/library/ui/src/main/res/values-bs/strings.xml
index 34f445bcca..d609f4b7cc 100644
--- a/library/ui/src/main/res/values-bs/strings.xml
+++ b/library/ui/src/main/res/values-bs/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ponovi sve</string>
   <string name="exo_controls_shuffle_description">Izmiješaj</string>
   <string name="exo_controls_fullscreen_description">Način rada preko cijelog ekrana</string>
-  <string name="exo_controls_exit_vr_description">Izlazak iz VR načina</string>
+  <string name="exo_controls_exit_vr_description">Izađi iz VR načina rada</string>
   <string name="exo_download_description">Preuzmi</string>
   <string name="exo_download_notification_channel_name">Preuzimanja</string>
   <string name="exo_download_downloading">Preuzimanje</string>
diff --git a/library/ui/src/main/res/values-ca/strings.xml b/library/ui/src/main/res/values-ca/strings.xml
index 530423f212..0023710ce4 100644
--- a/library/ui/src/main/res/values-ca/strings.xml
+++ b/library/ui/src/main/res/values-ca/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repeteix tot</string>
   <string name="exo_controls_shuffle_description">Reprodueix aleatòriament</string>
   <string name="exo_controls_fullscreen_description">Mode de pantalla completa</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Surt del mode RV</string>
   <string name="exo_download_description">Baixa</string>
   <string name="exo_download_notification_channel_name">Baixades</string>
   <string name="exo_download_downloading">S\'està baixant</string>
diff --git a/library/ui/src/main/res/values-da/strings.xml b/library/ui/src/main/res/values-da/strings.xml
index 93da6a649a..79f8bca488 100644
--- a/library/ui/src/main/res/values-da/strings.xml
+++ b/library/ui/src/main/res/values-da/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Gentag alle</string>
   <string name="exo_controls_shuffle_description">Bland</string>
   <string name="exo_controls_fullscreen_description">Fuld skærm</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Luk VR-tilstand</string>
   <string name="exo_download_description">Download</string>
   <string name="exo_download_notification_channel_name">Downloads</string>
   <string name="exo_download_downloading">Downloader</string>
diff --git a/library/ui/src/main/res/values-de/strings.xml b/library/ui/src/main/res/values-de/strings.xml
index 410b261b02..c49c23b1de 100644
--- a/library/ui/src/main/res/values-de/strings.xml
+++ b/library/ui/src/main/res/values-de/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Alle wiederholen</string>
   <string name="exo_controls_shuffle_description">Zufallsmix</string>
   <string name="exo_controls_fullscreen_description">Vollbildmodus</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">VR-Modus beenden</string>
   <string name="exo_download_description">Herunterladen</string>
   <string name="exo_download_notification_channel_name">Downloads</string>
   <string name="exo_download_downloading">Wird heruntergeladen</string>
diff --git a/library/ui/src/main/res/values-es-rUS/strings.xml b/library/ui/src/main/res/values-es-rUS/strings.xml
index 677fddad66..4980f3c20a 100644
--- a/library/ui/src/main/res/values-es-rUS/strings.xml
+++ b/library/ui/src/main/res/values-es-rUS/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repetir todo</string>
   <string name="exo_controls_shuffle_description">Reproducir aleatoriamente</string>
   <string name="exo_controls_fullscreen_description">Modo de pantalla completa</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Salir del modo RV</string>
   <string name="exo_download_description">Descargar</string>
   <string name="exo_download_notification_channel_name">Descargas</string>
   <string name="exo_download_downloading">Descargando</string>
diff --git a/library/ui/src/main/res/values-et/strings.xml b/library/ui/src/main/res/values-et/strings.xml
index 189c5032db..bd1bd19926 100644
--- a/library/ui/src/main/res/values-et/strings.xml
+++ b/library/ui/src/main/res/values-et/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Korda kõiki</string>
   <string name="exo_controls_shuffle_description">Esita juhuslikus järjekorras</string>
   <string name="exo_controls_fullscreen_description">Täisekraani režiim</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Välju VR-režiimist</string>
   <string name="exo_download_description">Allalaadimine</string>
   <string name="exo_download_notification_channel_name">Allalaadimised</string>
   <string name="exo_download_downloading">Allalaadimine</string>
diff --git a/library/ui/src/main/res/values-fi/strings.xml b/library/ui/src/main/res/values-fi/strings.xml
index 89b2ed60bc..65e9f0a7a8 100644
--- a/library/ui/src/main/res/values-fi/strings.xml
+++ b/library/ui/src/main/res/values-fi/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Toista kaikki uudelleen</string>
   <string name="exo_controls_shuffle_description">Satunnaistoisto</string>
   <string name="exo_controls_fullscreen_description">Koko näytön tila</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Poistu VR-tilasta</string>
   <string name="exo_download_description">Lataa</string>
   <string name="exo_download_notification_channel_name">Lataukset</string>
   <string name="exo_download_downloading">Ladataan</string>
diff --git a/library/ui/src/main/res/values-fr-rCA/strings.xml b/library/ui/src/main/res/values-fr-rCA/strings.xml
index a694f48c10..2454657faf 100644
--- a/library/ui/src/main/res/values-fr-rCA/strings.xml
+++ b/library/ui/src/main/res/values-fr-rCA/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Tout lire en boucle</string>
   <string name="exo_controls_shuffle_description">Lecture aléatoire</string>
   <string name="exo_controls_fullscreen_description">Mode Plein écran</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Quitter le mode RV</string>
   <string name="exo_download_description">Télécharger</string>
   <string name="exo_download_notification_channel_name">Téléchargements</string>
   <string name="exo_download_downloading">Téléchargement en cours…</string>
diff --git a/library/ui/src/main/res/values-fr/strings.xml b/library/ui/src/main/res/values-fr/strings.xml
index b7c4168bef..c3e32e7946 100644
--- a/library/ui/src/main/res/values-fr/strings.xml
+++ b/library/ui/src/main/res/values-fr/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Tout lire en boucle</string>
   <string name="exo_controls_shuffle_description">Aléatoire</string>
   <string name="exo_controls_fullscreen_description">Mode plein écran</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Quitter le mode RV</string>
   <string name="exo_download_description">Télécharger</string>
   <string name="exo_download_notification_channel_name">Téléchargements</string>
   <string name="exo_download_downloading">Téléchargement…</string>
diff --git a/library/ui/src/main/res/values-gl/strings.xml b/library/ui/src/main/res/values-gl/strings.xml
index ead458f87c..bd7524e5d3 100644
--- a/library/ui/src/main/res/values-gl/strings.xml
+++ b/library/ui/src/main/res/values-gl/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repetir todas as pistas</string>
   <string name="exo_controls_shuffle_description">Reprodución aleatoria</string>
   <string name="exo_controls_fullscreen_description">Modo de pantalla completa</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Sae do modo de RV</string>
   <string name="exo_download_description">Descargar</string>
   <string name="exo_download_notification_channel_name">Descargas</string>
   <string name="exo_download_downloading">Descargando</string>
diff --git a/library/ui/src/main/res/values-hi/strings.xml b/library/ui/src/main/res/values-hi/strings.xml
index 4ba488e95d..77264fe109 100644
--- a/library/ui/src/main/res/values-hi/strings.xml
+++ b/library/ui/src/main/res/values-hi/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">सभी को दोहराएं</string>
   <string name="exo_controls_shuffle_description">शफ़ल करें</string>
   <string name="exo_controls_fullscreen_description">फ़ुलस्क्रीन मोड</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">VR मोड से बाहर निकलें</string>
   <string name="exo_download_description">डाउनलोड करें</string>
   <string name="exo_download_notification_channel_name">डाउनलोड की गई मीडिया फ़ाइलें</string>
   <string name="exo_download_downloading">डाउनलोड हो रहा है</string>
diff --git a/library/ui/src/main/res/values-hu/strings.xml b/library/ui/src/main/res/values-hu/strings.xml
index d271d741ab..75e5b9e211 100644
--- a/library/ui/src/main/res/values-hu/strings.xml
+++ b/library/ui/src/main/res/values-hu/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Összes szám ismétlése</string>
   <string name="exo_controls_shuffle_description">Keverés</string>
   <string name="exo_controls_fullscreen_description">Teljes képernyős mód</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Kilépés a VR-módból</string>
   <string name="exo_download_description">Letöltés</string>
   <string name="exo_download_notification_channel_name">Letöltések</string>
   <string name="exo_download_downloading">Letöltés folyamatban</string>
diff --git a/library/ui/src/main/res/values-hy/strings.xml b/library/ui/src/main/res/values-hy/strings.xml
index c017a2fc27..a0a3d92aa5 100644
--- a/library/ui/src/main/res/values-hy/strings.xml
+++ b/library/ui/src/main/res/values-hy/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Կրկնել բոլորը</string>
   <string name="exo_controls_shuffle_description">Խառնել</string>
   <string name="exo_controls_fullscreen_description">Լիաէկրան ռեժիմ</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Դուրս գալ VR ռեժիմից</string>
   <string name="exo_download_description">Ներբեռնել</string>
   <string name="exo_download_notification_channel_name">Ներբեռնումներ</string>
   <string name="exo_download_downloading">Ներբեռնում</string>
diff --git a/library/ui/src/main/res/values-is/strings.xml b/library/ui/src/main/res/values-is/strings.xml
index 77f03e4889..c9e9212cbe 100644
--- a/library/ui/src/main/res/values-is/strings.xml
+++ b/library/ui/src/main/res/values-is/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Endurtaka allt</string>
   <string name="exo_controls_shuffle_description">Stokka</string>
   <string name="exo_controls_fullscreen_description">Allur skjárinn</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Loka sýndarveruleikastillingu</string>
   <string name="exo_download_description">Sækja</string>
   <string name="exo_download_notification_channel_name">Niðurhal</string>
   <string name="exo_download_downloading">Sækir</string>
diff --git a/library/ui/src/main/res/values-iw/strings.xml b/library/ui/src/main/res/values-iw/strings.xml
index 003597fdee..b69fa41101 100644
--- a/library/ui/src/main/res/values-iw/strings.xml
+++ b/library/ui/src/main/res/values-iw/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">חזור על הכול</string>
   <string name="exo_controls_shuffle_description">ערבוב</string>
   <string name="exo_controls_fullscreen_description">מצב מסך מלא</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">יציאה ממצב VR</string>
   <string name="exo_download_description">הורדה</string>
   <string name="exo_download_notification_channel_name">הורדות</string>
   <string name="exo_download_downloading">ההורדה מתבצעת</string>
diff --git a/library/ui/src/main/res/values-kk/strings.xml b/library/ui/src/main/res/values-kk/strings.xml
index 1988908ae3..8e5677e7f6 100644
--- a/library/ui/src/main/res/values-kk/strings.xml
+++ b/library/ui/src/main/res/values-kk/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Барлығын қайталау</string>
   <string name="exo_controls_shuffle_description">Араластыру</string>
   <string name="exo_controls_fullscreen_description">Толық экран режимі</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">VR режимінен шығу</string>
   <string name="exo_download_description">Жүктеп алу</string>
   <string name="exo_download_notification_channel_name">Жүктеп алынғандар</string>
   <string name="exo_download_downloading">Жүктеп алынуда</string>
diff --git a/library/ui/src/main/res/values-ky/strings.xml b/library/ui/src/main/res/values-ky/strings.xml
index 614e5846c4..efe78b4d23 100644
--- a/library/ui/src/main/res/values-ky/strings.xml
+++ b/library/ui/src/main/res/values-ky/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Баарын кайталоо</string>
   <string name="exo_controls_shuffle_description">Аралаштыруу</string>
   <string name="exo_controls_fullscreen_description">Толук экран режими</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">VR режиминен чыгуу</string>
   <string name="exo_download_description">Жүктөп алуу</string>
   <string name="exo_download_notification_channel_name">Жүктөлүп алынгандар</string>
   <string name="exo_download_downloading">Жүктөлүп алынууда</string>
diff --git a/library/ui/src/main/res/values-lt/strings.xml b/library/ui/src/main/res/values-lt/strings.xml
index c3e39edc3c..4e4da8b79b 100644
--- a/library/ui/src/main/res/values-lt/strings.xml
+++ b/library/ui/src/main/res/values-lt/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Kartoti viską</string>
   <string name="exo_controls_shuffle_description">Maišyti</string>
   <string name="exo_controls_fullscreen_description">Viso ekrano režimas</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Išeiti iš VR režimo</string>
   <string name="exo_download_description">Atsisiųsti</string>
   <string name="exo_download_notification_channel_name">Atsisiuntimai</string>
   <string name="exo_download_downloading">Atsisiunčiama</string>
diff --git a/library/ui/src/main/res/values-lv/strings.xml b/library/ui/src/main/res/values-lv/strings.xml
index cf3c20e53d..6a7937788e 100644
--- a/library/ui/src/main/res/values-lv/strings.xml
+++ b/library/ui/src/main/res/values-lv/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Atkārtot visu</string>
   <string name="exo_controls_shuffle_description">Atskaņot jauktā secībā</string>
   <string name="exo_controls_fullscreen_description">Pilnekrāna režīms</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Iziet no VR režīma</string>
   <string name="exo_download_description">Lejupielādēt</string>
   <string name="exo_download_notification_channel_name">Lejupielādes</string>
   <string name="exo_download_downloading">Notiek lejupielāde</string>
diff --git a/library/ui/src/main/res/values-mk/strings.xml b/library/ui/src/main/res/values-mk/strings.xml
index 8b44cd317e..fe5a32409a 100644
--- a/library/ui/src/main/res/values-mk/strings.xml
+++ b/library/ui/src/main/res/values-mk/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Повтори ги сите</string>
   <string name="exo_controls_shuffle_description">Измешај</string>
   <string name="exo_controls_fullscreen_description">Режим на цел екран</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Излези од режимот на VR</string>
   <string name="exo_download_description">Преземи</string>
   <string name="exo_download_notification_channel_name">Преземања</string>
   <string name="exo_download_downloading">Се презема</string>
diff --git a/library/ui/src/main/res/values-mn/strings.xml b/library/ui/src/main/res/values-mn/strings.xml
index 77d493b42f..4aecfcfc70 100644
--- a/library/ui/src/main/res/values-mn/strings.xml
+++ b/library/ui/src/main/res/values-mn/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Бүгдийг нь дахин тоглуулах</string>
   <string name="exo_controls_shuffle_description">Холих</string>
   <string name="exo_controls_fullscreen_description">Бүтэн дэлгэцийн горим</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">VR горимоос гарах</string>
   <string name="exo_download_description">Татах</string>
   <string name="exo_download_notification_channel_name">Татaлт</string>
   <string name="exo_download_downloading">Татаж байна</string>
diff --git a/library/ui/src/main/res/values-ms/strings.xml b/library/ui/src/main/res/values-ms/strings.xml
index df74b68abc..a94d7be6df 100644
--- a/library/ui/src/main/res/values-ms/strings.xml
+++ b/library/ui/src/main/res/values-ms/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ulang semua</string>
   <string name="exo_controls_shuffle_description">Rombak</string>
   <string name="exo_controls_fullscreen_description">Mod skrin penuh</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Keluar daripada mod VR</string>
   <string name="exo_download_description">Muat turun</string>
   <string name="exo_download_notification_channel_name">Muat turun</string>
   <string name="exo_download_downloading">Memuat turun</string>
diff --git a/library/ui/src/main/res/values-nb/strings.xml b/library/ui/src/main/res/values-nb/strings.xml
index c73deb4a18..cbcfff5902 100644
--- a/library/ui/src/main/res/values-nb/strings.xml
+++ b/library/ui/src/main/res/values-nb/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Gjenta alle</string>
   <string name="exo_controls_shuffle_description">Tilfeldig rekkefølge</string>
   <string name="exo_controls_fullscreen_description">Fullskjermmodus</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Avslutt VR-modus</string>
   <string name="exo_download_description">Last ned</string>
   <string name="exo_download_notification_channel_name">Nedlastinger</string>
   <string name="exo_download_downloading">Laster ned</string>
diff --git a/library/ui/src/main/res/values-ne/strings.xml b/library/ui/src/main/res/values-ne/strings.xml
index 7daff17e1f..bc8510393c 100644
--- a/library/ui/src/main/res/values-ne/strings.xml
+++ b/library/ui/src/main/res/values-ne/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">सबै दोहोर्‍याउनुहोस्</string>
   <string name="exo_controls_shuffle_description">मिसाउनुहोस्</string>
   <string name="exo_controls_fullscreen_description">पूर्ण स्क्रिन मोड</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">VR मोडबाट बाहिरिनुहोस्</string>
   <string name="exo_download_description">डाउनलोड गर्नुहोस्</string>
   <string name="exo_download_notification_channel_name">डाउनलोडहरू</string>
   <string name="exo_download_downloading">डाउनलोड गरिँदै छ</string>
diff --git a/library/ui/src/main/res/values-nl/strings.xml b/library/ui/src/main/res/values-nl/strings.xml
index 4749f6bbbb..b8215a3bad 100644
--- a/library/ui/src/main/res/values-nl/strings.xml
+++ b/library/ui/src/main/res/values-nl/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Alles herhalen</string>
   <string name="exo_controls_shuffle_description">Shuffle</string>
   <string name="exo_controls_fullscreen_description">Modus \'Volledig scherm\'</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">VR-modus sluiten</string>
   <string name="exo_download_description">Downloaden</string>
   <string name="exo_download_notification_channel_name">Downloads</string>
   <string name="exo_download_downloading">Downloaden</string>
diff --git a/library/ui/src/main/res/values-pt-rPT/strings.xml b/library/ui/src/main/res/values-pt-rPT/strings.xml
index 6bbfb49c6b..c45b94b144 100644
--- a/library/ui/src/main/res/values-pt-rPT/strings.xml
+++ b/library/ui/src/main/res/values-pt-rPT/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repetir tudo</string>
   <string name="exo_controls_shuffle_description">Reproduzir aleatoriamente</string>
   <string name="exo_controls_fullscreen_description">Modo de ecrã inteiro</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Sair do Modo de RV</string>
   <string name="exo_download_description">Transferir</string>
   <string name="exo_download_notification_channel_name">Transferências</string>
   <string name="exo_download_downloading">A transferir…</string>
diff --git a/library/ui/src/main/res/values-ro/strings.xml b/library/ui/src/main/res/values-ro/strings.xml
index cb50bb6b76..ddbfac1406 100644
--- a/library/ui/src/main/res/values-ro/strings.xml
+++ b/library/ui/src/main/res/values-ro/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repetați-le pe toate</string>
   <string name="exo_controls_shuffle_description">Redați aleatoriu</string>
   <string name="exo_controls_fullscreen_description">Modul Ecran complet</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Ieșiți din modul RV</string>
   <string name="exo_download_description">Descărcați</string>
   <string name="exo_download_notification_channel_name">Descărcări</string>
   <string name="exo_download_downloading">Se descarcă</string>
diff --git a/library/ui/src/main/res/values-ru/strings.xml b/library/ui/src/main/res/values-ru/strings.xml
index 24659ef1c1..dd08f5f7f9 100644
--- a/library/ui/src/main/res/values-ru/strings.xml
+++ b/library/ui/src/main/res/values-ru/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Повторять все</string>
   <string name="exo_controls_shuffle_description">Перемешать</string>
   <string name="exo_controls_fullscreen_description">Полноэкранный режим</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Выйти из VR-режима</string>
   <string name="exo_download_description">Скачать</string>
   <string name="exo_download_notification_channel_name">Скачивания</string>
   <string name="exo_download_downloading">Скачивание…</string>
diff --git a/library/ui/src/main/res/values-sr/strings.xml b/library/ui/src/main/res/values-sr/strings.xml
index 82af21ba17..4cc717220c 100644
--- a/library/ui/src/main/res/values-sr/strings.xml
+++ b/library/ui/src/main/res/values-sr/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Понови све</string>
   <string name="exo_controls_shuffle_description">Пусти насумично</string>
   <string name="exo_controls_fullscreen_description">Режим целог екрана</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Изађи из ВР режима</string>
   <string name="exo_download_description">Преузми</string>
   <string name="exo_download_notification_channel_name">Преузимања</string>
   <string name="exo_download_downloading">Преузима се</string>
diff --git a/library/ui/src/main/res/values-sv/strings.xml b/library/ui/src/main/res/values-sv/strings.xml
index a99f8409bd..56bc4a6731 100644
--- a/library/ui/src/main/res/values-sv/strings.xml
+++ b/library/ui/src/main/res/values-sv/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Upprepa alla</string>
   <string name="exo_controls_shuffle_description">Blanda spår</string>
   <string name="exo_controls_fullscreen_description">Helskärmsläge</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Avsluta VR-läget</string>
   <string name="exo_download_description">Ladda ned</string>
   <string name="exo_download_notification_channel_name">Nedladdningar</string>
   <string name="exo_download_downloading">Laddar ned</string>
diff --git a/library/ui/src/main/res/values-sw/strings.xml b/library/ui/src/main/res/values-sw/strings.xml
index 97db67a16e..98da2b1d99 100644
--- a/library/ui/src/main/res/values-sw/strings.xml
+++ b/library/ui/src/main/res/values-sw/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Rudia zote</string>
   <string name="exo_controls_shuffle_description">Changanya</string>
   <string name="exo_controls_fullscreen_description">Hali ya skrini nzima</string>
-  <string name="exo_controls_exit_vr_description">Ondoka kwenye hali ya VR</string>
+  <string name="exo_controls_exit_vr_description">Funga hali ya VR</string>
   <string name="exo_download_description">Pakua</string>
   <string name="exo_download_notification_channel_name">Vipakuliwa</string>
   <string name="exo_download_downloading">Inapakua</string>
diff --git a/library/ui/src/main/res/values-th/strings.xml b/library/ui/src/main/res/values-th/strings.xml
index 5193aa3b86..ef772e37a2 100644
--- a/library/ui/src/main/res/values-th/strings.xml
+++ b/library/ui/src/main/res/values-th/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">เล่นซ้ำทั้งหมด</string>
   <string name="exo_controls_shuffle_description">สุ่ม</string>
   <string name="exo_controls_fullscreen_description">โหมดเต็มหน้าจอ</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">ออกจากโหมด VR</string>
   <string name="exo_download_description">ดาวน์โหลด</string>
   <string name="exo_download_notification_channel_name">ดาวน์โหลด</string>
   <string name="exo_download_downloading">กำลังดาวน์โหลด</string>
diff --git a/library/ui/src/main/res/values-tl/strings.xml b/library/ui/src/main/res/values-tl/strings.xml
index 54b4e9ca6c..95d0e70918 100644
--- a/library/ui/src/main/res/values-tl/strings.xml
+++ b/library/ui/src/main/res/values-tl/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ulitin lahat</string>
   <string name="exo_controls_shuffle_description">I-shuffle</string>
   <string name="exo_controls_fullscreen_description">Fullscreen mode</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Lumabas sa VR mode</string>
   <string name="exo_download_description">I-download</string>
   <string name="exo_download_notification_channel_name">Mga Download</string>
   <string name="exo_download_downloading">Nagda-download</string>
diff --git a/library/ui/src/main/res/values-tr/strings.xml b/library/ui/src/main/res/values-tr/strings.xml
index 6c93d81270..1ac912d99c 100644
--- a/library/ui/src/main/res/values-tr/strings.xml
+++ b/library/ui/src/main/res/values-tr/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Tümünü tekrarla</string>
   <string name="exo_controls_shuffle_description">Karıştır</string>
   <string name="exo_controls_fullscreen_description">Tam ekran modu</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">VR modundan çıkar</string>
   <string name="exo_download_description">İndir</string>
   <string name="exo_download_notification_channel_name">İndirilenler</string>
   <string name="exo_download_downloading">İndiriliyor</string>
diff --git a/library/ui/src/main/res/values-uk/strings.xml b/library/ui/src/main/res/values-uk/strings.xml
index ac1d4c0ce5..a3ab4f2ad7 100644
--- a/library/ui/src/main/res/values-uk/strings.xml
+++ b/library/ui/src/main/res/values-uk/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Повторити всі</string>
   <string name="exo_controls_shuffle_description">Перемішати</string>
   <string name="exo_controls_fullscreen_description">Повноекранний режим</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Вийти з режиму VR</string>
   <string name="exo_download_description">Завантажити</string>
   <string name="exo_download_notification_channel_name">Завантаження</string>
   <string name="exo_download_downloading">Завантажується</string>
diff --git a/library/ui/src/main/res/values-ur/strings.xml b/library/ui/src/main/res/values-ur/strings.xml
index bf4e6eddaf..4f9a84a41b 100644
--- a/library/ui/src/main/res/values-ur/strings.xml
+++ b/library/ui/src/main/res/values-ur/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">سبھی کو دہرائیں</string>
   <string name="exo_controls_shuffle_description">شفل کریں</string>
   <string name="exo_controls_fullscreen_description">پوری اسکرین والی وضع</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">VR موڈ سے باہر نکلیں</string>
   <string name="exo_download_description">ڈاؤن لوڈ کریں</string>
   <string name="exo_download_notification_channel_name">ڈاؤن لوڈز</string>
   <string name="exo_download_downloading">ڈاؤن لوڈ ہو رہا ہے</string>
diff --git a/library/ui/src/main/res/values-vi/strings.xml b/library/ui/src/main/res/values-vi/strings.xml
index bb9b290bd4..46adac2451 100644
--- a/library/ui/src/main/res/values-vi/strings.xml
+++ b/library/ui/src/main/res/values-vi/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Lặp lại tất cả</string>
   <string name="exo_controls_shuffle_description">Phát ngẫu nhiên</string>
   <string name="exo_controls_fullscreen_description">Chế độ toàn màn hình</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">Thoát chế độ thực tế ảo (VR)</string>
   <string name="exo_download_description">Tải xuống</string>
   <string name="exo_download_notification_channel_name">Tài nguyên đã tải xuống</string>
   <string name="exo_download_downloading">Đang tải xuống</string>
diff --git a/library/ui/src/main/res/values-zh-rCN/strings.xml b/library/ui/src/main/res/values-zh-rCN/strings.xml
index ece063ff0f..68f3548bf7 100644
--- a/library/ui/src/main/res/values-zh-rCN/strings.xml
+++ b/library/ui/src/main/res/values-zh-rCN/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">全部重复播放</string>
   <string name="exo_controls_shuffle_description">随机播放</string>
   <string name="exo_controls_fullscreen_description">全屏模式</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">退出 VR 模式</string>
   <string name="exo_download_description">下载</string>
   <string name="exo_download_notification_channel_name">下载内容</string>
   <string name="exo_download_downloading">正在下载</string>
diff --git a/library/ui/src/main/res/values-zh-rHK/strings.xml b/library/ui/src/main/res/values-zh-rHK/strings.xml
index 6ccdd01a2a..dc3a44eaad 100644
--- a/library/ui/src/main/res/values-zh-rHK/strings.xml
+++ b/library/ui/src/main/res/values-zh-rHK/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">全部重複播放</string>
   <string name="exo_controls_shuffle_description">隨機播放</string>
   <string name="exo_controls_fullscreen_description">全螢幕模式</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">結束虛擬現實模式</string>
   <string name="exo_download_description">下載</string>
   <string name="exo_download_notification_channel_name">下載內容</string>
   <string name="exo_download_downloading">正在下載</string>
diff --git a/library/ui/src/main/res/values-zh-rTW/strings.xml b/library/ui/src/main/res/values-zh-rTW/strings.xml
index 04134d92a6..f879f5c857 100644
--- a/library/ui/src/main/res/values-zh-rTW/strings.xml
+++ b/library/ui/src/main/res/values-zh-rTW/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">重複播放所有項目</string>
   <string name="exo_controls_shuffle_description">隨機播放</string>
   <string name="exo_controls_fullscreen_description">全螢幕模式</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_exit_vr_description">結束虛擬實境模式</string>
   <string name="exo_download_description">下載</string>
   <string name="exo_download_notification_channel_name">下載</string>
   <string name="exo_download_downloading">下載中</string>

From 5de17b9adc0971b79a6e07bf1d5f980c40427ca6 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Mon, 29 Oct 2018 06:43:56 -0700
Subject: [PATCH 131/832] Add support for playing spherical videos on Daydream

RELNOTES=true

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219119888
---
 RELEASENOTES.md                               |   1 +
 extensions/gvr/build.gradle                   |   4 +
 .../ui/spherical/BaseGvrPlayerActivity.java   | 354 ++++++++++++++++++
 extensions/gvr/src/main/res/layout/vr_ui.xml  |  27 ++
 extensions/gvr/src/main/res/values/styles.xml |  19 +
 .../exoplayer2/ui/PlayerControlView.java      |  46 ++-
 .../ui/spherical/CanvasRenderer.java          | 297 +++++++++++++++
 .../exoplayer2/ui/spherical/GlViewGroup.java  | 115 ++++++
 .../ui/spherical/PointerRenderer.java         | 146 ++++++++
 .../ui/spherical/SceneRenderer.java           |   8 +-
 .../res/layout/exo_playback_control_view.xml  |   3 +
 library/ui/src/main/res/values-af/strings.xml |   2 +-
 library/ui/src/main/res/values-am/strings.xml |   2 +-
 library/ui/src/main/res/values-ar/strings.xml |   2 +-
 library/ui/src/main/res/values-az/strings.xml |   2 +-
 .../src/main/res/values-b+sr+Latn/strings.xml |   2 +-
 library/ui/src/main/res/values-be/strings.xml |   2 +-
 library/ui/src/main/res/values-bg/strings.xml |   2 +-
 library/ui/src/main/res/values-bn/strings.xml |   2 +-
 library/ui/src/main/res/values-bs/strings.xml |   2 +-
 library/ui/src/main/res/values-ca/strings.xml |   2 +-
 library/ui/src/main/res/values-cs/strings.xml |   2 +-
 library/ui/src/main/res/values-da/strings.xml |   2 +-
 library/ui/src/main/res/values-de/strings.xml |   2 +-
 library/ui/src/main/res/values-el/strings.xml |   2 +-
 .../ui/src/main/res/values-en-rAU/strings.xml |   2 +-
 .../ui/src/main/res/values-en-rGB/strings.xml |   2 +-
 .../ui/src/main/res/values-en-rIN/strings.xml |   2 +-
 .../ui/src/main/res/values-es-rUS/strings.xml |   2 +-
 library/ui/src/main/res/values-es/strings.xml |   2 +-
 library/ui/src/main/res/values-et/strings.xml |   2 +-
 library/ui/src/main/res/values-eu/strings.xml |   2 +-
 library/ui/src/main/res/values-fa/strings.xml |   2 +-
 library/ui/src/main/res/values-fi/strings.xml |   2 +-
 .../ui/src/main/res/values-fr-rCA/strings.xml |   2 +-
 library/ui/src/main/res/values-fr/strings.xml |   2 +-
 library/ui/src/main/res/values-gl/strings.xml |   2 +-
 library/ui/src/main/res/values-gu/strings.xml |   2 +-
 library/ui/src/main/res/values-hi/strings.xml |   2 +-
 library/ui/src/main/res/values-hr/strings.xml |   2 +-
 library/ui/src/main/res/values-hu/strings.xml |   2 +-
 library/ui/src/main/res/values-hy/strings.xml |   2 +-
 library/ui/src/main/res/values-in/strings.xml |   2 +-
 library/ui/src/main/res/values-is/strings.xml |   2 +-
 library/ui/src/main/res/values-it/strings.xml |   2 +-
 library/ui/src/main/res/values-iw/strings.xml |   2 +-
 library/ui/src/main/res/values-ja/strings.xml |   2 +-
 library/ui/src/main/res/values-ka/strings.xml |   2 +-
 library/ui/src/main/res/values-kk/strings.xml |   2 +-
 library/ui/src/main/res/values-km/strings.xml |   2 +-
 library/ui/src/main/res/values-kn/strings.xml |   2 +-
 library/ui/src/main/res/values-ko/strings.xml |   2 +-
 library/ui/src/main/res/values-ky/strings.xml |   2 +-
 library/ui/src/main/res/values-lo/strings.xml |   2 +-
 library/ui/src/main/res/values-lt/strings.xml |   2 +-
 library/ui/src/main/res/values-lv/strings.xml |   2 +-
 library/ui/src/main/res/values-mk/strings.xml |   2 +-
 library/ui/src/main/res/values-ml/strings.xml |   2 +-
 library/ui/src/main/res/values-mn/strings.xml |   2 +-
 library/ui/src/main/res/values-mr/strings.xml |   2 +-
 library/ui/src/main/res/values-ms/strings.xml |   2 +-
 library/ui/src/main/res/values-my/strings.xml |   2 +-
 library/ui/src/main/res/values-nb/strings.xml |   2 +-
 library/ui/src/main/res/values-ne/strings.xml |   2 +-
 library/ui/src/main/res/values-nl/strings.xml |   2 +-
 library/ui/src/main/res/values-pa/strings.xml |   2 +-
 library/ui/src/main/res/values-pl/strings.xml |   2 +-
 .../ui/src/main/res/values-pt-rPT/strings.xml |   2 +-
 library/ui/src/main/res/values-pt/strings.xml |   2 +-
 library/ui/src/main/res/values-ro/strings.xml |   2 +-
 library/ui/src/main/res/values-ru/strings.xml |   2 +-
 library/ui/src/main/res/values-si/strings.xml |   2 +-
 library/ui/src/main/res/values-sk/strings.xml |   2 +-
 library/ui/src/main/res/values-sl/strings.xml |   2 +-
 library/ui/src/main/res/values-sq/strings.xml |   2 +-
 library/ui/src/main/res/values-sr/strings.xml |   2 +-
 library/ui/src/main/res/values-sv/strings.xml |   2 +-
 library/ui/src/main/res/values-sw/strings.xml |   2 +-
 library/ui/src/main/res/values-ta/strings.xml |   2 +-
 library/ui/src/main/res/values-te/strings.xml |   2 +-
 library/ui/src/main/res/values-th/strings.xml |   2 +-
 library/ui/src/main/res/values-tl/strings.xml |   2 +-
 library/ui/src/main/res/values-tr/strings.xml |   2 +-
 library/ui/src/main/res/values-uk/strings.xml |   2 +-
 library/ui/src/main/res/values-ur/strings.xml |   2 +-
 library/ui/src/main/res/values-uz/strings.xml |   2 +-
 library/ui/src/main/res/values-vi/strings.xml |   2 +-
 .../ui/src/main/res/values-zh-rCN/strings.xml |   2 +-
 .../ui/src/main/res/values-zh-rHK/strings.xml |   2 +-
 .../ui/src/main/res/values-zh-rTW/strings.xml |   2 +-
 library/ui/src/main/res/values-zu/strings.xml |   2 +-
 library/ui/src/main/res/values/ids.xml        |   1 +
 library/ui/src/main/res/values/strings.xml    |   4 +-
 library/ui/src/main/res/values/styles.xml     |   5 +
 94 files changed, 1101 insertions(+), 89 deletions(-)
 create mode 100644 extensions/gvr/src/main/java/com/google/android/exoplayer2/ui/spherical/BaseGvrPlayerActivity.java
 create mode 100644 extensions/gvr/src/main/res/layout/vr_ui.xml
 create mode 100644 extensions/gvr/src/main/res/values/styles.xml
 create mode 100644 library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java
 create mode 100644 library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/GlViewGroup.java
 create mode 100644 library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/PointerRenderer.java

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index df1423e688..12e9dbb28d 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -32,6 +32,7 @@
 * IMA extension:
   * For preroll to live stream transitions, project forward the loading position
     to avoid being behind the live window.
+* Support for playing spherical videos on Daydream.
 * Fix issue where a `NullPointerException` is thrown when removing an unprepared
   media source from a `ConcatenatingMediaSource` with the `useLazyPreparation`
   option enabled ([#4986](https://github.com/google/ExoPlayer/issues/4986)).
diff --git a/extensions/gvr/build.gradle b/extensions/gvr/build.gradle
index af973e1345..c845cb3423 100644
--- a/extensions/gvr/build.gradle
+++ b/extensions/gvr/build.gradle
@@ -31,8 +31,12 @@ android {
 
 dependencies {
     implementation project(modulePrefix + 'library-core')
+    implementation project(modulePrefix + 'library-ui')
     implementation 'com.android.support:support-annotations:' + supportLibraryVersion
     implementation 'com.google.vr:sdk-audio:1.80.0'
+    implementation 'com.google.vr:sdk-controller:1.80.0'
+    api 'com.google.vr:sdk-base:1.80.0'
+    compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
 }
 
 ext {
diff --git a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ui/spherical/BaseGvrPlayerActivity.java b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ui/spherical/BaseGvrPlayerActivity.java
new file mode 100644
index 0000000000..48acc4a9c8
--- /dev/null
+++ b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ui/spherical/BaseGvrPlayerActivity.java
@@ -0,0 +1,354 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.exoplayer2.ui.spherical;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.SurfaceTexture;
+import android.opengl.Matrix;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.support.annotation.BinderThread;
+import android.support.annotation.CallSuper;
+import android.support.annotation.Nullable;
+import android.support.annotation.UiThread;
+import android.view.ContextThemeWrapper;
+import android.view.MotionEvent;
+import android.view.Surface;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Player;
+import com.google.android.exoplayer2.ext.gvr.R;
+import com.google.android.exoplayer2.ui.PlayerControlView;
+import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.Util;
+import com.google.vr.ndk.base.DaydreamApi;
+import com.google.vr.sdk.base.AndroidCompat;
+import com.google.vr.sdk.base.Eye;
+import com.google.vr.sdk.base.GvrActivity;
+import com.google.vr.sdk.base.GvrView;
+import com.google.vr.sdk.base.HeadTransform;
+import com.google.vr.sdk.base.Viewport;
+import com.google.vr.sdk.controller.Controller;
+import com.google.vr.sdk.controller.ControllerManager;
+import javax.microedition.khronos.egl.EGLConfig;
+import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
+
+/** VR 360 video player base activity class. */
+public abstract class BaseGvrPlayerActivity extends GvrActivity {
+  private static final String TAG = "GvrPlayerActivity";
+
+  private static final int EXIT_FROM_VR_REQUEST_CODE = 42;
+
+  private final Handler mainHandler;
+
+  @Nullable private Player player;
+  @MonotonicNonNull private GlViewGroup glView;
+  @MonotonicNonNull private ControllerManager controllerManager;
+  @MonotonicNonNull private SurfaceTexture surfaceTexture;
+  @MonotonicNonNull private Surface surface;
+  @MonotonicNonNull private SceneRenderer scene;
+  @MonotonicNonNull private PlayerControlView playerControl;
+
+  public BaseGvrPlayerActivity() {
+    mainHandler = new Handler(Looper.getMainLooper());
+  }
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setScreenAlwaysOn(true);
+
+    GvrView gvrView = new GvrView(this);
+    // Since videos typically have fewer pixels per degree than the phones, reducing the render
+    // target scaling factor reduces the work required to render the scene.
+    gvrView.setRenderTargetScale(.5f);
+
+    // If a custom theme isn't specified, the Context's theme is used. For VR Activities, this is
+    // the old Android default theme rather than a modern theme. Override this with a custom theme.
+    Context theme = new ContextThemeWrapper(this, R.style.VrTheme);
+    glView = new GlViewGroup(theme, R.layout.vr_ui);
+
+    playerControl = Assertions.checkNotNull(glView.findViewById(R.id.controller));
+    playerControl.setShowVrButton(true);
+    playerControl.setVrButtonListener(v -> exit());
+
+    PointerRenderer pointerRenderer = new PointerRenderer();
+    scene = new SceneRenderer();
+    Renderer renderer = new Renderer(scene, glView, pointerRenderer);
+
+    // Attach glView to gvrView in order to properly handle UI events.
+    gvrView.addView(glView, 0);
+
+    // Standard GvrView configuration
+    gvrView.setEGLConfigChooser(
+        8, 8, 8, 8, // RGBA bits.
+        16, // Depth bits.
+        0); // Stencil bits.
+    gvrView.setRenderer(renderer);
+    setContentView(gvrView);
+
+    // Most Daydream phones can render a 4k video at 60fps in sustained performance mode. These
+    // options can be tweaked along with the render target scale.
+    if (gvrView.setAsyncReprojectionEnabled(true)) {
+      AndroidCompat.setSustainedPerformanceMode(this, true);
+    }
+
+    // Handle the user clicking on the 'X' in the top left corner. Since this is done when the user
+    // has taken the headset out of VR, it should launch the app's exit flow directly rather than
+    // using the transition flow.
+    gvrView.setOnCloseButtonListener(this::finish);
+
+    ControllerManager.EventListener listener =
+        new ControllerManager.EventListener() {
+          @Override
+          public void onApiStatusChanged(int status) {
+            // Do nothing.
+          }
+
+          @Override
+          public void onRecentered() {
+            // TODO if in cardboard mode call gvrView.recenterHeadTracker();
+            glView.post(() -> Util.castNonNull(playerControl).show());
+          }
+        };
+    controllerManager = new ControllerManager(this, listener);
+
+    Controller controller = controllerManager.getController();
+    ControllerEventListener controllerEventListener =
+        new ControllerEventListener(controller, pointerRenderer, glView);
+    controller.setEventListener(controllerEventListener);
+  }
+
+  /**
+   * Sets the {@link Player} to use.
+   *
+   * @param newPlayer The {@link Player} to use, or {@code null} to detach the current player.
+   */
+  protected void setPlayer(@Nullable Player newPlayer) {
+    Assertions.checkNotNull(scene);
+    if (player == newPlayer) {
+      return;
+    }
+    if (player != null) {
+      Player.VideoComponent videoComponent = player.getVideoComponent();
+      if (videoComponent != null) {
+        if (surface != null) {
+          videoComponent.clearVideoSurface(surface);
+        }
+        videoComponent.clearVideoFrameMetadataListener(scene);
+        videoComponent.clearCameraMotionListener(scene);
+      }
+    }
+    player = newPlayer;
+    if (player != null) {
+      Player.VideoComponent videoComponent = player.getVideoComponent();
+      if (videoComponent != null) {
+        videoComponent.setVideoFrameMetadataListener(scene);
+        videoComponent.setCameraMotionListener(scene);
+        videoComponent.setVideoSurface(surface);
+      }
+    }
+    Assertions.checkNotNull(playerControl).setPlayer(player);
+  }
+
+  /**
+   * Sets the default stereo mode. If the played video doesn't contain a stereo mode the default one
+   * is used.
+   *
+   * @param stereoMode A {@link C.StereoMode} value.
+   */
+  protected void setDefaultStereoMode(@C.StereoMode int stereoMode) {
+    Assertions.checkNotNull(scene).setDefaultStereoMode(stereoMode);
+  }
+
+  @CallSuper
+  @Override
+  protected void onActivityResult(int requestCode, int resultCode, Intent unused) {
+    if (requestCode == EXIT_FROM_VR_REQUEST_CODE && resultCode == RESULT_OK) {
+      finish();
+    }
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+    Util.castNonNull(controllerManager).start();
+  }
+
+  @Override
+  protected void onPause() {
+    Util.castNonNull(controllerManager).stop();
+    super.onPause();
+  }
+
+  @Override
+  protected void onDestroy() {
+    setPlayer(null);
+    releaseSurface(surfaceTexture, surface);
+    super.onDestroy();
+  }
+
+  /** Tries to exit gracefully from VR using a VR transition dialog. */
+  @SuppressWarnings("nullness:argument.type.incompatible")
+  protected void exit() {
+    // This needs to use GVR's exit transition to avoid disorienting the user.
+    DaydreamApi api = DaydreamApi.create(this);
+    if (api != null) {
+      api.exitFromVr(this, EXIT_FROM_VR_REQUEST_CODE, null);
+      // Eventually, the Activity's onActivityResult will be called.
+      api.close();
+    } else {
+      finish();
+    }
+  }
+
+  /** Toggles PlayerControl visibility. */
+  @UiThread
+  protected void togglePlayerControlVisibility() {
+    if (Assertions.checkNotNull(playerControl).isVisible()) {
+      playerControl.hide();
+    } else {
+      playerControl.show();
+    }
+  }
+
+  // Called on GL thread.
+  private void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture) {
+    mainHandler.post(
+        () -> {
+          SurfaceTexture oldSurfaceTexture = this.surfaceTexture;
+          Surface oldSurface = this.surface;
+          this.surfaceTexture = surfaceTexture;
+          this.surface = new Surface(surfaceTexture);
+          if (player != null) {
+            Player.VideoComponent videoComponent = player.getVideoComponent();
+            if (videoComponent != null) {
+              videoComponent.setVideoSurface(surface);
+            }
+          }
+          releaseSurface(oldSurfaceTexture, oldSurface);
+        });
+  }
+
+  private static void releaseSurface(
+      @Nullable SurfaceTexture oldSurfaceTexture, @Nullable Surface oldSurface) {
+    if (oldSurfaceTexture != null) {
+      oldSurfaceTexture.release();
+    }
+    if (oldSurface != null) {
+      oldSurface.release();
+    }
+  }
+
+  private class Renderer implements GvrView.StereoRenderer {
+    private static final float Z_NEAR = .1f;
+    private static final float Z_FAR = 100;
+
+    private final float[] viewProjectionMatrix = new float[16];
+    private final SceneRenderer scene;
+    private final GlViewGroup glView;
+    private final PointerRenderer pointerRenderer;
+
+    public Renderer(SceneRenderer scene, GlViewGroup glView, PointerRenderer pointerRenderer) {
+      this.scene = scene;
+      this.glView = glView;
+      this.pointerRenderer = pointerRenderer;
+    }
+
+    @Override
+    public void onNewFrame(HeadTransform headTransform) {}
+
+    @Override
+    public void onDrawEye(Eye eye) {
+      Matrix.multiplyMM(
+          viewProjectionMatrix, 0, eye.getPerspective(Z_NEAR, Z_FAR), 0, eye.getEyeView(), 0);
+      scene.drawFrame(viewProjectionMatrix, eye.getType() == Eye.Type.RIGHT);
+      if (glView.isVisible()) {
+        glView.getRenderer().draw(viewProjectionMatrix);
+        pointerRenderer.draw(viewProjectionMatrix);
+      }
+    }
+
+    @Override
+    public void onFinishFrame(Viewport viewport) {}
+
+    @Override
+    public void onSurfaceCreated(EGLConfig config) {
+      onSurfaceTextureAvailable(scene.init());
+      glView.getRenderer().init();
+      pointerRenderer.init();
+    }
+
+    @Override
+    public void onSurfaceChanged(int width, int height) {}
+
+    @Override
+    public void onRendererShutdown() {
+      glView.getRenderer().shutdown();
+      pointerRenderer.shutdown();
+      scene.shutdown();
+    }
+  }
+
+  private class ControllerEventListener extends Controller.EventListener {
+
+    private final Controller controller;
+    private final PointerRenderer pointerRenderer;
+    private final GlViewGroup glView;
+    private final float[] controllerOrientationMatrix;
+    private boolean clickButtonDown;
+    private boolean appButtonDown;
+
+    public ControllerEventListener(
+        Controller controller, PointerRenderer pointerRenderer, GlViewGroup glView) {
+      this.controller = controller;
+      this.pointerRenderer = pointerRenderer;
+      this.glView = glView;
+      controllerOrientationMatrix = new float[16];
+    }
+
+    @Override
+    @BinderThread
+    public void onUpdate() {
+      controller.update();
+      controller.orientation.toRotationMatrix(controllerOrientationMatrix);
+      pointerRenderer.setControllerOrientation(controllerOrientationMatrix);
+
+      if (clickButtonDown || controller.clickButtonState) {
+        int action;
+        if (clickButtonDown != controller.clickButtonState) {
+          clickButtonDown = controller.clickButtonState;
+          action = clickButtonDown ? MotionEvent.ACTION_DOWN : MotionEvent.ACTION_UP;
+        } else {
+          action = MotionEvent.ACTION_MOVE;
+        }
+        glView.post(
+            () -> {
+              float[] angles = controller.orientation.toYawPitchRollRadians(new float[3]);
+              boolean clickedOnView = glView.simulateClick(action, angles[0], angles[1]);
+              if (action == MotionEvent.ACTION_DOWN && !clickedOnView) {
+                togglePlayerControlVisibility();
+              }
+            });
+      } else if (!appButtonDown && controller.appButtonState) {
+        glView.post(BaseGvrPlayerActivity.this::togglePlayerControlVisibility);
+      }
+      appButtonDown = controller.appButtonState;
+    }
+  }
+}
diff --git a/extensions/gvr/src/main/res/layout/vr_ui.xml b/extensions/gvr/src/main/res/layout/vr_ui.xml
new file mode 100644
index 0000000000..84e7ac7c6f
--- /dev/null
+++ b/extensions/gvr/src/main/res/layout/vr_ui.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<merge
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/video_ui_view"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:background="#000"
+  android:orientation="horizontal">
+  <com.google.android.exoplayer2.ui.PlayerControlView
+    android:id="@+id/controller"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"/>
+</merge>
diff --git a/extensions/gvr/src/main/res/values/styles.xml b/extensions/gvr/src/main/res/values/styles.xml
new file mode 100644
index 0000000000..c79e1dfa60
--- /dev/null
+++ b/extensions/gvr/src/main/res/values/styles.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<!-- Android Views rendered in VR should use a theme that matches the rest of the VR UI.-->
+<resources>
+  <style name="VrTheme" parent="android:Theme.Material"/>
+</resources>
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
index 5f4864d783..164a49a019 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
@@ -136,6 +136,10 @@ import java.util.Locale;
  *       <ul>
  *         <li>Type: {@link View}
  *       </ul>
+ *   <li><b>{@code exo_vr}</b> - The VR mode button.
+ *       <ul>
+ *         <li>Type: {@link View}
+ *       </ul>
  *   <li><b>{@code exo_position}</b> - Text view displaying the current playback position.
  *       <ul>
  *         <li>Type: {@link TextView}
@@ -202,6 +206,7 @@ public class PlayerControlView extends FrameLayout {
   private final View rewindButton;
   private final ImageView repeatToggleButton;
   private final View shuffleButton;
+  private final View vrButton;
   private final TextView durationView;
   private final TextView positionView;
   private final TimeBar timeBar;
@@ -334,6 +339,8 @@ public class PlayerControlView extends FrameLayout {
     if (shuffleButton != null) {
       shuffleButton.setOnClickListener(componentListener);
     }
+    vrButton = findViewById(R.id.exo_vr);
+    setShowVrButton(false);
     Resources resources = context.getResources();
     repeatOffButtonDrawable = resources.getDrawable(R.drawable.exo_controls_repeat_off);
     repeatOneButtonDrawable = resources.getDrawable(R.drawable.exo_controls_repeat_one);
@@ -546,6 +553,33 @@ public class PlayerControlView extends FrameLayout {
     updateShuffleButton();
   }
 
+  /** Returns whether the VR button is shown. */
+  public boolean getShowVrButton() {
+    return vrButton != null && vrButton.getVisibility() == VISIBLE;
+  }
+
+  /**
+   * Sets whether the VR button is shown.
+   *
+   * @param showVrButton Whether the VR button is shown.
+   */
+  public void setShowVrButton(boolean showVrButton) {
+    if (vrButton != null) {
+      vrButton.setVisibility(showVrButton ? VISIBLE : GONE);
+    }
+  }
+
+  /**
+   * Sets listener for the VR button.
+   *
+   * @param onClickListener Listener for the VR button, or null to clear the listener.
+   */
+  public void setVrButtonListener(@Nullable OnClickListener onClickListener) {
+    if (vrButton != null) {
+      vrButton.setOnClickListener(onClickListener);
+    }
+  }
+
   /**
    * Shows the playback controls. If {@link #getShowTimeoutMs()} is positive then the controls will
    * be automatically hidden after this duration of time has elapsed without user input.
@@ -609,11 +643,11 @@ public class PlayerControlView extends FrameLayout {
     boolean playing = isPlaying();
     if (playButton != null) {
       requestPlayPauseFocus |= playing && playButton.isFocused();
-      playButton.setVisibility(playing ? View.GONE : View.VISIBLE);
+      playButton.setVisibility(playing ? GONE : VISIBLE);
     }
     if (pauseButton != null) {
       requestPlayPauseFocus |= !playing && pauseButton.isFocused();
-      pauseButton.setVisibility(!playing ? View.GONE : View.VISIBLE);
+      pauseButton.setVisibility(!playing ? GONE : VISIBLE);
     }
     if (requestPlayPauseFocus) {
       requestPlayPauseFocus();
@@ -651,7 +685,7 @@ public class PlayerControlView extends FrameLayout {
       return;
     }
     if (repeatToggleModes == RepeatModeUtil.REPEAT_TOGGLE_MODE_NONE) {
-      repeatToggleButton.setVisibility(View.GONE);
+      repeatToggleButton.setVisibility(GONE);
       return;
     }
     if (player == null) {
@@ -675,7 +709,7 @@ public class PlayerControlView extends FrameLayout {
       default:
         // Never happens.
     }
-    repeatToggleButton.setVisibility(View.VISIBLE);
+    repeatToggleButton.setVisibility(VISIBLE);
   }
 
   private void updateShuffleButton() {
@@ -683,13 +717,13 @@ public class PlayerControlView extends FrameLayout {
       return;
     }
     if (!showShuffleButton) {
-      shuffleButton.setVisibility(View.GONE);
+      shuffleButton.setVisibility(GONE);
     } else if (player == null) {
       setButtonEnabled(false, shuffleButton);
     } else {
       shuffleButton.setAlpha(player.getShuffleModeEnabled() ? 1f : 0.3f);
       shuffleButton.setEnabled(true);
-      shuffleButton.setVisibility(View.VISIBLE);
+      shuffleButton.setVisibility(VISIBLE);
     }
   }
 
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java
new file mode 100644
index 0000000000..9e51c2ba45
--- /dev/null
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java
@@ -0,0 +1,297 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.exoplayer2.ui.spherical;
+
+import static com.google.android.exoplayer2.util.GlUtil.checkGlError;
+
+import android.annotation.TargetApi;
+import android.graphics.Canvas;
+import android.graphics.PointF;
+import android.graphics.Rect;
+import android.graphics.SurfaceTexture;
+import android.opengl.GLES11Ext;
+import android.opengl.GLES20;
+import android.support.annotation.Nullable;
+import android.view.Surface;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.util.GlUtil;
+import java.nio.FloatBuffer;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
+
+/**
+ * Renders a canvas on a quad.
+ *
+ * <p>A CanvasRenderer can be created on any thread, but {@link #init()} needs to be called on the
+ * GL thread before it can be rendered.
+ */
+@TargetApi(15)
+/* package */ final class CanvasRenderer {
+
+  private static final float WIDTH_UNIT = 0.8f;
+  private static final float DISTANCE_UNIT = 1f;
+  private static final float X_UNIT = -WIDTH_UNIT / 2;
+  private static final float Y_UNIT = -0.3f;
+
+  // Standard vertex shader that passes through the texture data.
+  private static final String[] VERTEX_SHADER_CODE = {
+    "uniform mat4 uMvpMatrix;",
+    // 3D position data.
+    "attribute vec3 aPosition;",
+    // 2D UV vertices.
+    "attribute vec2 aTexCoords;",
+    "varying vec2 vTexCoords;",
+
+    // Standard transformation.
+    "void main() {",
+    "  gl_Position = uMvpMatrix * vec4(aPosition, 1);",
+    "  vTexCoords = aTexCoords;",
+    "}"
+  };
+
+  private static final String[] FRAGMENT_SHADER_CODE = {
+    // This is required since the texture data is GL_TEXTURE_EXTERNAL_OES.
+    "#extension GL_OES_EGL_image_external : require",
+    "precision mediump float;",
+    "uniform samplerExternalOES uTexture;",
+    "varying vec2 vTexCoords;",
+    "void main() {",
+    "  gl_FragColor = texture2D(uTexture, vTexCoords);",
+    "}"
+  };
+
+  // The quad has 2 triangles built from 4 total vertices. Each vertex has 3 position & 2 texture
+  // coordinates.
+  private static final int POSITION_COORDS_PER_VERTEX = 3;
+  private static final int TEXTURE_COORDS_PER_VERTEX = 2;
+  private static final int COORDS_PER_VERTEX =
+      POSITION_COORDS_PER_VERTEX + TEXTURE_COORDS_PER_VERTEX;
+  private static final int VERTEX_STRIDE_BYTES = COORDS_PER_VERTEX * C.BYTES_PER_FLOAT;
+  private static final int VERTEX_COUNT = 4;
+  private static final float HALF_PI = (float) (Math.PI / 2);
+
+  private final FloatBuffer vertexBuffer;
+  private final AtomicBoolean surfaceDirty;
+
+  private int width;
+  private int height;
+  private float heightUnit;
+
+  // Program-related GL items. These are only valid if program != 0.
+  private int program = 0;
+  private int mvpMatrixHandle;
+  private int positionHandle;
+  private int textureCoordsHandle;
+  private int textureHandle;
+  private int textureId;
+
+  // Components used to manage the Canvas that the View is rendered to. These are only valid after
+  // GL initialization. The client of this class acquires a Canvas from the Surface, writes to it
+  // and posts it. This marks the Surface as dirty. The GL code then updates the SurfaceTexture
+  // when rendering only if it is dirty.
+  @MonotonicNonNull private SurfaceTexture displaySurfaceTexture;
+  @MonotonicNonNull private Surface displaySurface;
+
+  public CanvasRenderer() {
+    vertexBuffer = GlUtil.createBuffer(COORDS_PER_VERTEX * VERTEX_COUNT);
+    surfaceDirty = new AtomicBoolean();
+  }
+
+  public void setSize(int width, int height) {
+    this.width = width;
+    this.height = height;
+    heightUnit = WIDTH_UNIT * height / width;
+
+    float[] vertexData = new float[COORDS_PER_VERTEX * VERTEX_COUNT];
+    int vertexDataIndex = 0;
+    for (int y = 0; y < 2; y++) {
+      for (int x = 0; x < 2; x++) {
+        vertexData[vertexDataIndex++] = X_UNIT + (WIDTH_UNIT * x);
+        vertexData[vertexDataIndex++] = Y_UNIT + (heightUnit * y);
+        vertexData[vertexDataIndex++] = -DISTANCE_UNIT;
+        vertexData[vertexDataIndex++] = x;
+        vertexData[vertexDataIndex++] = 1 - y;
+      }
+    }
+    vertexBuffer.position(0);
+    vertexBuffer.put(vertexData);
+  }
+
+  /**
+   * Calls {@link Surface#lockCanvas(Rect)}.
+   *
+   * @return {@link Canvas} for the View to render to or {@code null} if {@link #init()} has not yet
+   *     been called.
+   */
+  @Nullable
+  public Canvas lockCanvas() {
+    return displaySurface == null ? null : displaySurface.lockCanvas(/* inOutDirty= */ null);
+  }
+
+  /**
+   * Calls {@link Surface#unlockCanvasAndPost(Canvas)} and marks the SurfaceTexture as dirty.
+   *
+   * @param canvas the canvas returned from {@link #lockCanvas()}
+   */
+  public void unlockCanvasAndPost(@Nullable Canvas canvas) {
+    if (canvas == null || displaySurface == null) {
+      // glInit() hasn't run yet.
+      return;
+    }
+    displaySurface.unlockCanvasAndPost(canvas);
+  }
+
+  /** Finishes constructing this object on the GL Thread. */
+  /* package */ void init() {
+    if (program != 0) {
+      return;
+    }
+
+    // Create the program.
+    program = GlUtil.compileProgram(VERTEX_SHADER_CODE, FRAGMENT_SHADER_CODE);
+    mvpMatrixHandle = GLES20.glGetUniformLocation(program, "uMvpMatrix");
+    positionHandle = GLES20.glGetAttribLocation(program, "aPosition");
+    textureCoordsHandle = GLES20.glGetAttribLocation(program, "aTexCoords");
+    textureHandle = GLES20.glGetUniformLocation(program, "uTexture");
+    textureId = GlUtil.createExternalTexture();
+    checkGlError();
+
+    // Create the underlying SurfaceTexture with the appropriate size.
+    displaySurfaceTexture = new SurfaceTexture(textureId);
+    displaySurfaceTexture.setOnFrameAvailableListener(surfaceTexture -> surfaceDirty.set(true));
+    displaySurfaceTexture.setDefaultBufferSize(width, height);
+    displaySurface = new Surface(displaySurfaceTexture);
+  }
+
+  /**
+   * Renders the quad.
+   *
+   * @param viewProjectionMatrix Array of floats containing the quad's 4x4 perspective matrix in the
+   *     {@link android.opengl.Matrix} format.
+   */
+  /* package */ void draw(float[] viewProjectionMatrix) {
+    if (displaySurfaceTexture == null) {
+      return;
+    }
+
+    GLES20.glUseProgram(program);
+    checkGlError();
+
+    GLES20.glEnableVertexAttribArray(positionHandle);
+    GLES20.glEnableVertexAttribArray(textureCoordsHandle);
+    checkGlError();
+
+    GLES20.glUniformMatrix4fv(mvpMatrixHandle, 1, false, viewProjectionMatrix, 0);
+    GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
+    GLES20.glBindTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES, textureId);
+    GLES20.glUniform1i(textureHandle, 0);
+    checkGlError();
+
+    // Load position data.
+    vertexBuffer.position(0);
+    GLES20.glVertexAttribPointer(
+        positionHandle,
+        POSITION_COORDS_PER_VERTEX,
+        GLES20.GL_FLOAT,
+        false,
+        VERTEX_STRIDE_BYTES,
+        vertexBuffer);
+    checkGlError();
+
+    // Load texture data.
+    vertexBuffer.position(POSITION_COORDS_PER_VERTEX);
+    GLES20.glVertexAttribPointer(
+        textureCoordsHandle,
+        TEXTURE_COORDS_PER_VERTEX,
+        GLES20.GL_FLOAT,
+        false,
+        VERTEX_STRIDE_BYTES,
+        vertexBuffer);
+    checkGlError();
+
+    if (surfaceDirty.compareAndSet(true, false)) {
+      // If the Surface has been written to, get the new data onto the SurfaceTexture.
+      displaySurfaceTexture.updateTexImage();
+    }
+
+    // Render.
+    GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, 0, VERTEX_COUNT);
+    checkGlError();
+
+    GLES20.glDisableVertexAttribArray(positionHandle);
+    GLES20.glDisableVertexAttribArray(textureCoordsHandle);
+  }
+
+  /** Frees GL resources. */
+  /* package */ void shutdown() {
+    if (program != 0) {
+      GLES20.glDeleteProgram(program);
+      GLES20.glDeleteTextures(1, new int[] {textureId}, 0);
+    }
+
+    if (displaySurfaceTexture != null) {
+      displaySurfaceTexture.release();
+    }
+    if (displaySurface != null) {
+      displaySurface.release();
+    }
+  }
+
+  /**
+   * Translates an orientation into pixel coordinates on the canvas.
+   *
+   * <p>This is a minimal hit detection system that works for this quad because it has no model
+   * matrix. All the math is based on the fact that its size & distance are hard-coded into this
+   * class. For a more complex 3D mesh, a general bounding box & ray collision system would be
+   * required.
+   *
+   * @param yaw Yaw of the orientation in radians.
+   * @param pitch Pitch of the orientation in radians.
+   * @return A {@link PointF} which contains the translated coordinate, or null if the point is
+   *     outside of the quad's bounds.
+   */
+  @Nullable
+  public PointF translateClick(float yaw, float pitch) {
+    return internalTranslateClick(
+        yaw, pitch, X_UNIT, Y_UNIT, WIDTH_UNIT, heightUnit, width, height);
+  }
+
+  @Nullable
+  /*package*/ static PointF internalTranslateClick(
+      float yaw,
+      float pitch,
+      float xUnit,
+      float yUnit,
+      float widthUnit,
+      float heightUnit,
+      int widthPixel,
+      int heightPixel) {
+    if (yaw >= HALF_PI || yaw <= -HALF_PI || pitch >= HALF_PI || pitch <= -HALF_PI) {
+      return null;
+    }
+    double clickXUnit = Math.tan(yaw) * DISTANCE_UNIT - xUnit;
+    double clickYUnit = Math.tan(pitch) * DISTANCE_UNIT - yUnit;
+    if (clickXUnit < 0 || clickXUnit > widthUnit || clickYUnit < 0 || clickYUnit > heightUnit) {
+      return null;
+    }
+    // Convert from the polar coordinates of the controller to the rectangular coordinates of the
+    // View. Note the negative yaw & pitch used to generate Android-compliant x & y coordinates.
+    float clickXPixel = (float) (widthPixel - clickXUnit * widthPixel / widthUnit);
+    float clickYPixel = (float) (heightPixel - clickYUnit * heightPixel / heightUnit);
+    return new PointF(clickXPixel, clickYPixel);
+  }
+}
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/GlViewGroup.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/GlViewGroup.java
new file mode 100644
index 0000000000..09e2f22207
--- /dev/null
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/GlViewGroup.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.exoplayer2.ui.spherical;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.PointF;
+import android.graphics.PorterDuff;
+import android.os.SystemClock;
+import android.support.annotation.AnyThread;
+import android.support.annotation.UiThread;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import com.google.android.exoplayer2.util.Assertions;
+
+/** This View uses standard Android APIs to render its child Views to a texture. */
+/* package */ final class GlViewGroup extends FrameLayout {
+
+  private final CanvasRenderer canvasRenderer;
+
+  /**
+   * @param context The Context the view is running in, through which it can access the current
+   *     theme, resources, etc.
+   * @param layoutId ID for an XML layout resource to load (e.g., * <code>R.layout.main_page</code>)
+   */
+  public GlViewGroup(Context context, int layoutId) {
+    super(context);
+    this.canvasRenderer = new CanvasRenderer();
+
+    LayoutInflater.from(context).inflate(layoutId, this);
+
+    measure(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+    int width = getMeasuredWidth();
+    int height = getMeasuredHeight();
+    Assertions.checkState(width > 0 && height > 0);
+    canvasRenderer.setSize(width, height);
+    setLayoutParams(new FrameLayout.LayoutParams(width, height));
+  }
+
+  /** Returns whether the view is currently visible. */
+  @UiThread
+  public boolean isVisible() {
+    int childCount = getChildCount();
+    for (int i = 0; i < childCount; i++) {
+      if (getChildAt(i).getVisibility() == VISIBLE) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  @Override
+  public void dispatchDraw(Canvas notUsed) {
+    Canvas glCanvas = canvasRenderer.lockCanvas();
+    if (glCanvas == null) {
+      // This happens if Android tries to draw this View before GL initialization completes. We need
+      // to retry until the draw call happens after GL invalidation.
+      postInvalidate();
+      return;
+    }
+
+    // Clear the canvas first.
+    glCanvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR);
+    // Have Android render the child views.
+    super.dispatchDraw(glCanvas);
+    // Commit the changes.
+    canvasRenderer.unlockCanvasAndPost(glCanvas);
+  }
+
+  /**
+   * Simulates a click on the view.
+   *
+   * @param action Click action.
+   * @param yaw Yaw of the click's orientation in radians.
+   * @param pitch Pitch of the click's orientation in radians.
+   * @return Whether the click was simulated. If false then the view is not visible or the click was
+   *     outside of its bounds.
+   */
+  @UiThread
+  public boolean simulateClick(int action, float yaw, float pitch) {
+    if (!isVisible()) {
+      return false;
+    }
+    PointF point = canvasRenderer.translateClick(yaw, pitch);
+    if (point == null) {
+      return false;
+    }
+    long now = SystemClock.uptimeMillis();
+    MotionEvent event = MotionEvent.obtain(now, now, action, point.x, point.y, /* metaState= */ 1);
+    dispatchTouchEvent(event);
+    return true;
+  }
+
+  @AnyThread
+  public CanvasRenderer getRenderer() {
+    return canvasRenderer;
+  }
+}
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/PointerRenderer.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/PointerRenderer.java
new file mode 100644
index 0000000000..d0a4d4c882
--- /dev/null
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/PointerRenderer.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.exoplayer2.ui.spherical;
+
+import static com.google.android.exoplayer2.util.GlUtil.checkGlError;
+
+import android.opengl.GLES20;
+import android.opengl.Matrix;
+import com.google.android.exoplayer2.util.GlUtil;
+import java.nio.FloatBuffer;
+
+/** Renders a pointer. */
+/* package */ final class PointerRenderer {
+  // The pointer quad is 2 * SIZE units.
+  private static final float SIZE = .01f;
+  private static final float DISTANCE = 1;
+
+  // Standard vertex shader.
+  private static final String[] VERTEX_SHADER_CODE =
+      new String[] {
+        "uniform mat4 uMvpMatrix;",
+        "attribute vec3 aPosition;",
+        "varying vec2 vCoords;",
+
+        // Pass through normalized vertex coordinates.
+        "void main() {",
+        "  gl_Position = uMvpMatrix * vec4(aPosition, 1);",
+        "  vCoords = aPosition.xy / vec2(" + SIZE + ", " + SIZE + ");",
+        "}"
+      };
+
+  // Procedurally render a ring on the quad between the specified radii.
+  private static final String[] FRAGMENT_SHADER_CODE =
+      new String[] {
+        "precision mediump float;",
+        "varying vec2 vCoords;",
+
+        // Simple ring shader that is white between the radii and transparent elsewhere.
+        "void main() {",
+        "  float r = length(vCoords);",
+        // Blend the edges of the ring at .55 +/- .05 and .85 +/- .05.
+        "  float alpha = smoothstep(0.5, 0.6, r) * (1.0 - smoothstep(0.8, 0.9, r));",
+        "  if (alpha == 0.0) {",
+        "    discard;",
+        "  } else {",
+        "    gl_FragColor = vec4(alpha);",
+        "  }",
+        "}"
+      };
+
+  // Simple quad mesh.
+  private static final int COORDS_PER_VERTEX = 3;
+  private static final float[] VERTEX_DATA = {
+    -SIZE, -SIZE, -DISTANCE, SIZE, -SIZE, -DISTANCE, -SIZE, SIZE, -DISTANCE, SIZE, SIZE, -DISTANCE,
+  };
+  private final FloatBuffer vertexBuffer;
+
+  // The pointer doesn't have a real modelMatrix. Its distance is baked into the mesh and it
+  // uses a rotation matrix when rendered.
+  private final float[] modelViewProjectionMatrix;
+  // This is accessed on the binder & GL Threads.
+  private final float[] controllerOrientationMatrix;
+
+  // Program-related GL items. These are only valid if program != 0.
+  private int program = 0;
+  private int mvpMatrixHandle;
+  private int positionHandle;
+
+  public PointerRenderer() {
+    vertexBuffer = GlUtil.createBuffer(VERTEX_DATA);
+    modelViewProjectionMatrix = new float[16];
+    controllerOrientationMatrix = new float[16];
+    Matrix.setIdentityM(controllerOrientationMatrix, 0);
+  }
+
+  /** Finishes initialization of this object on the GL thread. */
+  public void init() {
+    if (program != 0) {
+      return;
+    }
+
+    program = GlUtil.compileProgram(VERTEX_SHADER_CODE, FRAGMENT_SHADER_CODE);
+    mvpMatrixHandle = GLES20.glGetUniformLocation(program, "uMvpMatrix");
+    positionHandle = GLES20.glGetAttribLocation(program, "aPosition");
+    checkGlError();
+  }
+
+  /**
+   * Renders the pointer.
+   *
+   * @param viewProjectionMatrix Scene's view projection matrix.
+   */
+  public void draw(float[] viewProjectionMatrix) {
+    // Configure shader.
+    GLES20.glUseProgram(program);
+    checkGlError();
+
+    synchronized (controllerOrientationMatrix) {
+      Matrix.multiplyMM(
+          modelViewProjectionMatrix, 0, viewProjectionMatrix, 0, controllerOrientationMatrix, 0);
+    }
+    GLES20.glUniformMatrix4fv(mvpMatrixHandle, 1, false, modelViewProjectionMatrix, 0);
+    checkGlError();
+
+    // Render quad.
+    GLES20.glEnableVertexAttribArray(positionHandle);
+    checkGlError();
+
+    GLES20.glVertexAttribPointer(
+        positionHandle, COORDS_PER_VERTEX, GLES20.GL_FLOAT, false, /* stride= */ 0, vertexBuffer);
+    checkGlError();
+
+    GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, 0, VERTEX_DATA.length / COORDS_PER_VERTEX);
+    checkGlError();
+
+    GLES20.glDisableVertexAttribArray(positionHandle);
+  }
+
+  /** Frees GL resources. */
+  public void shutdown() {
+    if (program != 0) {
+      GLES20.glDeleteProgram(program);
+    }
+  }
+
+  /** Updates the pointer's position with the latest Controller pose. */
+  public void setControllerOrientation(float[] rotationMatrix) {
+    synchronized (controllerOrientationMatrix) {
+      System.arraycopy(rotationMatrix, 0, controllerOrientationMatrix, 0, rotationMatrix.length);
+    }
+  }
+}
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java
index 5099b2187d..b3b1acb7e4 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java
@@ -36,7 +36,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 /** Renders a GL Scene. */
-/* package */ class SceneRenderer implements VideoFrameMetadataListener, CameraMotionListener {
+/* package */ final class SceneRenderer
+    implements VideoFrameMetadataListener, CameraMotionListener {
 
   private final AtomicBoolean frameAvailable;
   private final AtomicBoolean resetRotationAtNextFrame;
@@ -131,6 +132,11 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
     projectionRenderer.draw(textureId, tempMatrix, rightEye);
   }
 
+  /** Cleans up the GL resources. */
+  public void shutdown() {
+    projectionRenderer.shutdown();
+  }
+
   // Methods called on playback thread.
 
   // VideoFrameMetadataListener implementation.
diff --git a/library/ui/src/main/res/layout/exo_playback_control_view.xml b/library/ui/src/main/res/layout/exo_playback_control_view.xml
index 534655f2f4..ed2fb8e2b2 100644
--- a/library/ui/src/main/res/layout/exo_playback_control_view.xml
+++ b/library/ui/src/main/res/layout/exo_playback_control_view.xml
@@ -54,6 +54,9 @@
     <ImageButton android:id="@id/exo_next"
       style="@style/ExoMediaButton.Next"/>
 
+    <ImageButton android:id="@id/exo_vr"
+      style="@style/ExoMediaButton.VR"/>
+
   </LinearLayout>
 
   <LinearLayout
diff --git a/library/ui/src/main/res/values-af/strings.xml b/library/ui/src/main/res/values-af/strings.xml
index e20ade1cde..5b24387028 100644
--- a/library/ui/src/main/res/values-af/strings.xml
+++ b/library/ui/src/main/res/values-af/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Herhaal alles</string>
   <string name="exo_controls_shuffle_description">Skommel</string>
   <string name="exo_controls_fullscreen_description">Volskermmodus</string>
-  <string name="exo_controls_exit_vr_description">Verlaat VR-modus</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Aflaai</string>
   <string name="exo_download_notification_channel_name">Aflaaie</string>
   <string name="exo_download_downloading">Laai tans af</string>
diff --git a/library/ui/src/main/res/values-am/strings.xml b/library/ui/src/main/res/values-am/strings.xml
index d24d681019..933019ac9f 100644
--- a/library/ui/src/main/res/values-am/strings.xml
+++ b/library/ui/src/main/res/values-am/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">ሁሉንም ድገም</string>
   <string name="exo_controls_shuffle_description">በውዝ</string>
   <string name="exo_controls_fullscreen_description">የሙሉ ማያ ሁነታ</string>
-  <string name="exo_controls_exit_vr_description">ከቪአር ሁነታ ውጣ</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">አውርድ</string>
   <string name="exo_download_notification_channel_name">የወረዱ</string>
   <string name="exo_download_downloading">በማውረድ ላይ</string>
diff --git a/library/ui/src/main/res/values-ar/strings.xml b/library/ui/src/main/res/values-ar/strings.xml
index 9980191621..ec79ce48e9 100644
--- a/library/ui/src/main/res/values-ar/strings.xml
+++ b/library/ui/src/main/res/values-ar/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">تكرار الكل</string>
   <string name="exo_controls_shuffle_description">ترتيب عشوائي</string>
   <string name="exo_controls_fullscreen_description">وضع ملء الشاشة</string>
-  <string name="exo_controls_exit_vr_description">الخروج من وضع VR</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">تنزيل</string>
   <string name="exo_download_notification_channel_name">التنزيلات</string>
   <string name="exo_download_downloading">جارٍ التنزيل.</string>
diff --git a/library/ui/src/main/res/values-az/strings.xml b/library/ui/src/main/res/values-az/strings.xml
index d119531c70..3a80bab572 100644
--- a/library/ui/src/main/res/values-az/strings.xml
+++ b/library/ui/src/main/res/values-az/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Hamısı təkrarlansın</string>
   <string name="exo_controls_shuffle_description">Qarışdırın</string>
   <string name="exo_controls_fullscreen_description">Tam ekran rejimi</string>
-  <string name="exo_controls_exit_vr_description">VR rejimdən çıxın</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Endirin</string>
   <string name="exo_download_notification_channel_name">Endirmələr</string>
   <string name="exo_download_downloading">Endirilir</string>
diff --git a/library/ui/src/main/res/values-b+sr+Latn/strings.xml b/library/ui/src/main/res/values-b+sr+Latn/strings.xml
index f03e6a6a94..23e1463725 100644
--- a/library/ui/src/main/res/values-b+sr+Latn/strings.xml
+++ b/library/ui/src/main/res/values-b+sr+Latn/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ponovi sve</string>
   <string name="exo_controls_shuffle_description">Pusti nasumično</string>
   <string name="exo_controls_fullscreen_description">Režim celog ekrana</string>
-  <string name="exo_controls_exit_vr_description">Izađi iz VR režima</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Preuzmi</string>
   <string name="exo_download_notification_channel_name">Preuzimanja</string>
   <string name="exo_download_downloading">Preuzima se</string>
diff --git a/library/ui/src/main/res/values-be/strings.xml b/library/ui/src/main/res/values-be/strings.xml
index e669739691..33ae18711a 100644
--- a/library/ui/src/main/res/values-be/strings.xml
+++ b/library/ui/src/main/res/values-be/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Паўтарыць усе</string>
   <string name="exo_controls_shuffle_description">Перамяшаць</string>
   <string name="exo_controls_fullscreen_description">Поўнаэкранны рэжым</string>
-  <string name="exo_controls_exit_vr_description">Выйсці з VR-рэжыму</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Спампаваць</string>
   <string name="exo_download_notification_channel_name">Спампоўкі</string>
   <string name="exo_download_downloading">Спампоўваецца</string>
diff --git a/library/ui/src/main/res/values-bg/strings.xml b/library/ui/src/main/res/values-bg/strings.xml
index 4146ccf0d8..50ffac7b0a 100644
--- a/library/ui/src/main/res/values-bg/strings.xml
+++ b/library/ui/src/main/res/values-bg/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Повтаряне на всички</string>
   <string name="exo_controls_shuffle_description">Разбъркване</string>
   <string name="exo_controls_fullscreen_description">Режим на цял екран</string>
-  <string name="exo_controls_exit_vr_description">Изход от режима за VR</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Изтегляне</string>
   <string name="exo_download_notification_channel_name">Изтегляния</string>
   <string name="exo_download_downloading">Изтегля се</string>
diff --git a/library/ui/src/main/res/values-bn/strings.xml b/library/ui/src/main/res/values-bn/strings.xml
index e90d448a85..0e5efb1b77 100644
--- a/library/ui/src/main/res/values-bn/strings.xml
+++ b/library/ui/src/main/res/values-bn/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">সবগুলি আইটেম আবার চালান</string>
   <string name="exo_controls_shuffle_description">শাফেল করুন</string>
   <string name="exo_controls_fullscreen_description">পূর্ণ স্ক্রিন মোড</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">ডাউনলোড করুন</string>
   <string name="exo_download_notification_channel_name">ডাউনলোড</string>
   <string name="exo_download_downloading">ডাউনলোড হচ্ছে</string>
diff --git a/library/ui/src/main/res/values-bs/strings.xml b/library/ui/src/main/res/values-bs/strings.xml
index d609f4b7cc..942921f28e 100644
--- a/library/ui/src/main/res/values-bs/strings.xml
+++ b/library/ui/src/main/res/values-bs/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ponovi sve</string>
   <string name="exo_controls_shuffle_description">Izmiješaj</string>
   <string name="exo_controls_fullscreen_description">Način rada preko cijelog ekrana</string>
-  <string name="exo_controls_exit_vr_description">Izađi iz VR načina rada</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Preuzmi</string>
   <string name="exo_download_notification_channel_name">Preuzimanja</string>
   <string name="exo_download_downloading">Preuzimanje</string>
diff --git a/library/ui/src/main/res/values-ca/strings.xml b/library/ui/src/main/res/values-ca/strings.xml
index 0023710ce4..c787ff0194 100644
--- a/library/ui/src/main/res/values-ca/strings.xml
+++ b/library/ui/src/main/res/values-ca/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repeteix tot</string>
   <string name="exo_controls_shuffle_description">Reprodueix aleatòriament</string>
   <string name="exo_controls_fullscreen_description">Mode de pantalla completa</string>
-  <string name="exo_controls_exit_vr_description">Surt del mode RV</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Baixa</string>
   <string name="exo_download_notification_channel_name">Baixades</string>
   <string name="exo_download_downloading">S\'està baixant</string>
diff --git a/library/ui/src/main/res/values-cs/strings.xml b/library/ui/src/main/res/values-cs/strings.xml
index 97e3c35fb1..31451856fc 100644
--- a/library/ui/src/main/res/values-cs/strings.xml
+++ b/library/ui/src/main/res/values-cs/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Opakovat vše</string>
   <string name="exo_controls_shuffle_description">Náhodně</string>
   <string name="exo_controls_fullscreen_description">Režim celé obrazovky</string>
-  <string name="exo_controls_exit_vr_description">Ukončit režim VR</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Stáhnout</string>
   <string name="exo_download_notification_channel_name">Stahování</string>
   <string name="exo_download_downloading">Stahování</string>
diff --git a/library/ui/src/main/res/values-da/strings.xml b/library/ui/src/main/res/values-da/strings.xml
index 79f8bca488..6a446b0963 100644
--- a/library/ui/src/main/res/values-da/strings.xml
+++ b/library/ui/src/main/res/values-da/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Gentag alle</string>
   <string name="exo_controls_shuffle_description">Bland</string>
   <string name="exo_controls_fullscreen_description">Fuld skærm</string>
-  <string name="exo_controls_exit_vr_description">Luk VR-tilstand</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Download</string>
   <string name="exo_download_notification_channel_name">Downloads</string>
   <string name="exo_download_downloading">Downloader</string>
diff --git a/library/ui/src/main/res/values-de/strings.xml b/library/ui/src/main/res/values-de/strings.xml
index c49c23b1de..d2b162ba72 100644
--- a/library/ui/src/main/res/values-de/strings.xml
+++ b/library/ui/src/main/res/values-de/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Alle wiederholen</string>
   <string name="exo_controls_shuffle_description">Zufallsmix</string>
   <string name="exo_controls_fullscreen_description">Vollbildmodus</string>
-  <string name="exo_controls_exit_vr_description">VR-Modus beenden</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Herunterladen</string>
   <string name="exo_download_notification_channel_name">Downloads</string>
   <string name="exo_download_downloading">Wird heruntergeladen</string>
diff --git a/library/ui/src/main/res/values-el/strings.xml b/library/ui/src/main/res/values-el/strings.xml
index eff333354b..6eb9fbc6de 100644
--- a/library/ui/src/main/res/values-el/strings.xml
+++ b/library/ui/src/main/res/values-el/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Επανάληψη όλων</string>
   <string name="exo_controls_shuffle_description">Τυχαία αναπαραγωγή</string>
   <string name="exo_controls_fullscreen_description">Λειτουργία πλήρους οθόνης</string>
-  <string name="exo_controls_exit_vr_description">Έξοδος από λειτουργία VR mode</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Λήψη</string>
   <string name="exo_download_notification_channel_name">Λήψεις</string>
   <string name="exo_download_downloading">Λήψη</string>
diff --git a/library/ui/src/main/res/values-en-rAU/strings.xml b/library/ui/src/main/res/values-en-rAU/strings.xml
index 74b51249e7..e2ae4ec65a 100644
--- a/library/ui/src/main/res/values-en-rAU/strings.xml
+++ b/library/ui/src/main/res/values-en-rAU/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repeat all</string>
   <string name="exo_controls_shuffle_description">Shuffle</string>
   <string name="exo_controls_fullscreen_description">Full-screen mode</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Download</string>
   <string name="exo_download_notification_channel_name">Downloads</string>
   <string name="exo_download_downloading">Downloading</string>
diff --git a/library/ui/src/main/res/values-en-rGB/strings.xml b/library/ui/src/main/res/values-en-rGB/strings.xml
index 74b51249e7..e2ae4ec65a 100644
--- a/library/ui/src/main/res/values-en-rGB/strings.xml
+++ b/library/ui/src/main/res/values-en-rGB/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repeat all</string>
   <string name="exo_controls_shuffle_description">Shuffle</string>
   <string name="exo_controls_fullscreen_description">Full-screen mode</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Download</string>
   <string name="exo_download_notification_channel_name">Downloads</string>
   <string name="exo_download_downloading">Downloading</string>
diff --git a/library/ui/src/main/res/values-en-rIN/strings.xml b/library/ui/src/main/res/values-en-rIN/strings.xml
index 74b51249e7..e2ae4ec65a 100644
--- a/library/ui/src/main/res/values-en-rIN/strings.xml
+++ b/library/ui/src/main/res/values-en-rIN/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repeat all</string>
   <string name="exo_controls_shuffle_description">Shuffle</string>
   <string name="exo_controls_fullscreen_description">Full-screen mode</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Download</string>
   <string name="exo_download_notification_channel_name">Downloads</string>
   <string name="exo_download_downloading">Downloading</string>
diff --git a/library/ui/src/main/res/values-es-rUS/strings.xml b/library/ui/src/main/res/values-es-rUS/strings.xml
index 4980f3c20a..92604c5e34 100644
--- a/library/ui/src/main/res/values-es-rUS/strings.xml
+++ b/library/ui/src/main/res/values-es-rUS/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repetir todo</string>
   <string name="exo_controls_shuffle_description">Reproducir aleatoriamente</string>
   <string name="exo_controls_fullscreen_description">Modo de pantalla completa</string>
-  <string name="exo_controls_exit_vr_description">Salir del modo RV</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Descargar</string>
   <string name="exo_download_notification_channel_name">Descargas</string>
   <string name="exo_download_downloading">Descargando</string>
diff --git a/library/ui/src/main/res/values-es/strings.xml b/library/ui/src/main/res/values-es/strings.xml
index 845210ecfa..4c6fcf7aa7 100644
--- a/library/ui/src/main/res/values-es/strings.xml
+++ b/library/ui/src/main/res/values-es/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repetir todo</string>
   <string name="exo_controls_shuffle_description">Reproducir aleatoriamente</string>
   <string name="exo_controls_fullscreen_description">Modo de pantalla completa</string>
-  <string name="exo_controls_exit_vr_description">Salir del modo RV</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Descargar</string>
   <string name="exo_download_notification_channel_name">Descargas</string>
   <string name="exo_download_downloading">Descargando</string>
diff --git a/library/ui/src/main/res/values-et/strings.xml b/library/ui/src/main/res/values-et/strings.xml
index bd1bd19926..d631499a78 100644
--- a/library/ui/src/main/res/values-et/strings.xml
+++ b/library/ui/src/main/res/values-et/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Korda kõiki</string>
   <string name="exo_controls_shuffle_description">Esita juhuslikus järjekorras</string>
   <string name="exo_controls_fullscreen_description">Täisekraani režiim</string>
-  <string name="exo_controls_exit_vr_description">Välju VR-režiimist</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Allalaadimine</string>
   <string name="exo_download_notification_channel_name">Allalaadimised</string>
   <string name="exo_download_downloading">Allalaadimine</string>
diff --git a/library/ui/src/main/res/values-eu/strings.xml b/library/ui/src/main/res/values-eu/strings.xml
index 381726a2ea..efdee2239d 100644
--- a/library/ui/src/main/res/values-eu/strings.xml
+++ b/library/ui/src/main/res/values-eu/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Errepikatu guztiak</string>
   <string name="exo_controls_shuffle_description">Erreproduzitu ausaz</string>
   <string name="exo_controls_fullscreen_description">Pantaila osoko modua</string>
-  <string name="exo_controls_exit_vr_description">Irten EB modutik</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Deskargak</string>
   <string name="exo_download_notification_channel_name">Deskargak</string>
   <string name="exo_download_downloading">Deskargatzen</string>
diff --git a/library/ui/src/main/res/values-fa/strings.xml b/library/ui/src/main/res/values-fa/strings.xml
index 2f36b5fc3b..50e52edd84 100644
--- a/library/ui/src/main/res/values-fa/strings.xml
+++ b/library/ui/src/main/res/values-fa/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">تکرار همه</string>
   <string name="exo_controls_shuffle_description">درهم</string>
   <string name="exo_controls_fullscreen_description">حالت تمام‌صفحه</string>
-  <string name="exo_controls_exit_vr_description">خروج از حالت واقعیت مجازی</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">بارگیری</string>
   <string name="exo_download_notification_channel_name">بارگیری‌ها</string>
   <string name="exo_download_downloading">درحال بارگیری</string>
diff --git a/library/ui/src/main/res/values-fi/strings.xml b/library/ui/src/main/res/values-fi/strings.xml
index 65e9f0a7a8..72819a376e 100644
--- a/library/ui/src/main/res/values-fi/strings.xml
+++ b/library/ui/src/main/res/values-fi/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Toista kaikki uudelleen</string>
   <string name="exo_controls_shuffle_description">Satunnaistoisto</string>
   <string name="exo_controls_fullscreen_description">Koko näytön tila</string>
-  <string name="exo_controls_exit_vr_description">Poistu VR-tilasta</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Lataa</string>
   <string name="exo_download_notification_channel_name">Lataukset</string>
   <string name="exo_download_downloading">Ladataan</string>
diff --git a/library/ui/src/main/res/values-fr-rCA/strings.xml b/library/ui/src/main/res/values-fr-rCA/strings.xml
index 2454657faf..6b8d459117 100644
--- a/library/ui/src/main/res/values-fr-rCA/strings.xml
+++ b/library/ui/src/main/res/values-fr-rCA/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Tout lire en boucle</string>
   <string name="exo_controls_shuffle_description">Lecture aléatoire</string>
   <string name="exo_controls_fullscreen_description">Mode Plein écran</string>
-  <string name="exo_controls_exit_vr_description">Quitter le mode RV</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Télécharger</string>
   <string name="exo_download_notification_channel_name">Téléchargements</string>
   <string name="exo_download_downloading">Téléchargement en cours…</string>
diff --git a/library/ui/src/main/res/values-fr/strings.xml b/library/ui/src/main/res/values-fr/strings.xml
index c3e32e7946..487007f573 100644
--- a/library/ui/src/main/res/values-fr/strings.xml
+++ b/library/ui/src/main/res/values-fr/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Tout lire en boucle</string>
   <string name="exo_controls_shuffle_description">Aléatoire</string>
   <string name="exo_controls_fullscreen_description">Mode plein écran</string>
-  <string name="exo_controls_exit_vr_description">Quitter le mode RV</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Télécharger</string>
   <string name="exo_download_notification_channel_name">Téléchargements</string>
   <string name="exo_download_downloading">Téléchargement…</string>
diff --git a/library/ui/src/main/res/values-gl/strings.xml b/library/ui/src/main/res/values-gl/strings.xml
index bd7524e5d3..a5420df692 100644
--- a/library/ui/src/main/res/values-gl/strings.xml
+++ b/library/ui/src/main/res/values-gl/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repetir todas as pistas</string>
   <string name="exo_controls_shuffle_description">Reprodución aleatoria</string>
   <string name="exo_controls_fullscreen_description">Modo de pantalla completa</string>
-  <string name="exo_controls_exit_vr_description">Sae do modo de RV</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Descargar</string>
   <string name="exo_download_notification_channel_name">Descargas</string>
   <string name="exo_download_downloading">Descargando</string>
diff --git a/library/ui/src/main/res/values-gu/strings.xml b/library/ui/src/main/res/values-gu/strings.xml
index e00f7cc7fb..847c5b6d33 100644
--- a/library/ui/src/main/res/values-gu/strings.xml
+++ b/library/ui/src/main/res/values-gu/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">બધાને રિપીટ કરો</string>
   <string name="exo_controls_shuffle_description">શફલ કરો</string>
   <string name="exo_controls_fullscreen_description">પૂર્ણસ્ક્રીન મોડ</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">ડાઉનલોડ કરો</string>
   <string name="exo_download_notification_channel_name">ડાઉનલોડ</string>
   <string name="exo_download_downloading">ડાઉનલોડ કરી રહ્યાં છીએ</string>
diff --git a/library/ui/src/main/res/values-hi/strings.xml b/library/ui/src/main/res/values-hi/strings.xml
index 77264fe109..a94462b4d9 100644
--- a/library/ui/src/main/res/values-hi/strings.xml
+++ b/library/ui/src/main/res/values-hi/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">सभी को दोहराएं</string>
   <string name="exo_controls_shuffle_description">शफ़ल करें</string>
   <string name="exo_controls_fullscreen_description">फ़ुलस्क्रीन मोड</string>
-  <string name="exo_controls_exit_vr_description">VR मोड से बाहर निकलें</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">डाउनलोड करें</string>
   <string name="exo_download_notification_channel_name">डाउनलोड की गई मीडिया फ़ाइलें</string>
   <string name="exo_download_downloading">डाउनलोड हो रहा है</string>
diff --git a/library/ui/src/main/res/values-hr/strings.xml b/library/ui/src/main/res/values-hr/strings.xml
index d76fef9367..624d7f04fe 100644
--- a/library/ui/src/main/res/values-hr/strings.xml
+++ b/library/ui/src/main/res/values-hr/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ponovi sve</string>
   <string name="exo_controls_shuffle_description">Reproduciraj nasumično</string>
   <string name="exo_controls_fullscreen_description">Prikaz na cijelom zaslonu</string>
-  <string name="exo_controls_exit_vr_description">Izlazak iz VR načina</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Preuzmi</string>
   <string name="exo_download_notification_channel_name">Preuzimanja</string>
   <string name="exo_download_downloading">Preuzimanje</string>
diff --git a/library/ui/src/main/res/values-hu/strings.xml b/library/ui/src/main/res/values-hu/strings.xml
index 75e5b9e211..e1f4d77e96 100644
--- a/library/ui/src/main/res/values-hu/strings.xml
+++ b/library/ui/src/main/res/values-hu/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Összes szám ismétlése</string>
   <string name="exo_controls_shuffle_description">Keverés</string>
   <string name="exo_controls_fullscreen_description">Teljes képernyős mód</string>
-  <string name="exo_controls_exit_vr_description">Kilépés a VR-módból</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Letöltés</string>
   <string name="exo_download_notification_channel_name">Letöltések</string>
   <string name="exo_download_downloading">Letöltés folyamatban</string>
diff --git a/library/ui/src/main/res/values-hy/strings.xml b/library/ui/src/main/res/values-hy/strings.xml
index a0a3d92aa5..390d848aff 100644
--- a/library/ui/src/main/res/values-hy/strings.xml
+++ b/library/ui/src/main/res/values-hy/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Կրկնել բոլորը</string>
   <string name="exo_controls_shuffle_description">Խառնել</string>
   <string name="exo_controls_fullscreen_description">Լիաէկրան ռեժիմ</string>
-  <string name="exo_controls_exit_vr_description">Դուրս գալ VR ռեժիմից</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Ներբեռնել</string>
   <string name="exo_download_notification_channel_name">Ներբեռնումներ</string>
   <string name="exo_download_downloading">Ներբեռնում</string>
diff --git a/library/ui/src/main/res/values-in/strings.xml b/library/ui/src/main/res/values-in/strings.xml
index 39fcfea559..5ac1696c8b 100644
--- a/library/ui/src/main/res/values-in/strings.xml
+++ b/library/ui/src/main/res/values-in/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ulangi semua</string>
   <string name="exo_controls_shuffle_description">Acak</string>
   <string name="exo_controls_fullscreen_description">Mode layar penuh</string>
-  <string name="exo_controls_exit_vr_description">Keluar dari mode VR</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Download</string>
   <string name="exo_download_notification_channel_name">Download</string>
   <string name="exo_download_downloading">Mendownload</string>
diff --git a/library/ui/src/main/res/values-is/strings.xml b/library/ui/src/main/res/values-is/strings.xml
index c9e9212cbe..4f0fbf0975 100644
--- a/library/ui/src/main/res/values-is/strings.xml
+++ b/library/ui/src/main/res/values-is/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Endurtaka allt</string>
   <string name="exo_controls_shuffle_description">Stokka</string>
   <string name="exo_controls_fullscreen_description">Allur skjárinn</string>
-  <string name="exo_controls_exit_vr_description">Loka sýndarveruleikastillingu</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Sækja</string>
   <string name="exo_download_notification_channel_name">Niðurhal</string>
   <string name="exo_download_downloading">Sækir</string>
diff --git a/library/ui/src/main/res/values-it/strings.xml b/library/ui/src/main/res/values-it/strings.xml
index 6611da7595..6d070c6aa9 100644
--- a/library/ui/src/main/res/values-it/strings.xml
+++ b/library/ui/src/main/res/values-it/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ripeti tutto</string>
   <string name="exo_controls_shuffle_description">Riproduzione casuale</string>
   <string name="exo_controls_fullscreen_description">Modalità a schermo intero</string>
-  <string name="exo_controls_exit_vr_description">Esci dalla modalità VR</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Scarica</string>
   <string name="exo_download_notification_channel_name">Download</string>
   <string name="exo_download_downloading">Download…</string>
diff --git a/library/ui/src/main/res/values-iw/strings.xml b/library/ui/src/main/res/values-iw/strings.xml
index b69fa41101..0a471f33e2 100644
--- a/library/ui/src/main/res/values-iw/strings.xml
+++ b/library/ui/src/main/res/values-iw/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">חזור על הכול</string>
   <string name="exo_controls_shuffle_description">ערבוב</string>
   <string name="exo_controls_fullscreen_description">מצב מסך מלא</string>
-  <string name="exo_controls_exit_vr_description">יציאה ממצב VR</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">הורדה</string>
   <string name="exo_download_notification_channel_name">הורדות</string>
   <string name="exo_download_downloading">ההורדה מתבצעת</string>
diff --git a/library/ui/src/main/res/values-ja/strings.xml b/library/ui/src/main/res/values-ja/strings.xml
index 9f39d59103..eea78b2fb5 100644
--- a/library/ui/src/main/res/values-ja/strings.xml
+++ b/library/ui/src/main/res/values-ja/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">全曲をリピート</string>
   <string name="exo_controls_shuffle_description">シャッフル</string>
   <string name="exo_controls_fullscreen_description">全画面モード</string>
-  <string name="exo_controls_exit_vr_description">VR モードを終了します</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">ダウンロード</string>
   <string name="exo_download_notification_channel_name">ダウンロード</string>
   <string name="exo_download_downloading">ダウンロードしています</string>
diff --git a/library/ui/src/main/res/values-ka/strings.xml b/library/ui/src/main/res/values-ka/strings.xml
index 2ec70e9c51..16f3bea5bf 100644
--- a/library/ui/src/main/res/values-ka/strings.xml
+++ b/library/ui/src/main/res/values-ka/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">ყველას გამეორება</string>
   <string name="exo_controls_shuffle_description">არეულად დაკვრა</string>
   <string name="exo_controls_fullscreen_description">სრულეკრანიანი რეჟიმი</string>
-  <string name="exo_controls_exit_vr_description">VR რეჟიმიდან გასვლა</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">ჩამოტვირთვა</string>
   <string name="exo_download_notification_channel_name">ჩამოტვირთვები</string>
   <string name="exo_download_downloading">მიმდინარეობს ჩამოტვირთვა</string>
diff --git a/library/ui/src/main/res/values-kk/strings.xml b/library/ui/src/main/res/values-kk/strings.xml
index 8e5677e7f6..26fe5d6019 100644
--- a/library/ui/src/main/res/values-kk/strings.xml
+++ b/library/ui/src/main/res/values-kk/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Барлығын қайталау</string>
   <string name="exo_controls_shuffle_description">Араластыру</string>
   <string name="exo_controls_fullscreen_description">Толық экран режимі</string>
-  <string name="exo_controls_exit_vr_description">VR режимінен шығу</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Жүктеп алу</string>
   <string name="exo_download_notification_channel_name">Жүктеп алынғандар</string>
   <string name="exo_download_downloading">Жүктеп алынуда</string>
diff --git a/library/ui/src/main/res/values-km/strings.xml b/library/ui/src/main/res/values-km/strings.xml
index 80234d89c9..ce88214f35 100644
--- a/library/ui/src/main/res/values-km/strings.xml
+++ b/library/ui/src/main/res/values-km/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">លេង​ឡើងវិញ​ទាំងអស់</string>
   <string name="exo_controls_shuffle_description">ច្របល់</string>
   <string name="exo_controls_fullscreen_description">មុខងារពេញ​អេក្រង់</string>
-  <string name="exo_controls_exit_vr_description">ចាកចេញពីមុខងារ​ VR</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">ទាញយក</string>
   <string name="exo_download_notification_channel_name">ទាញយក</string>
   <string name="exo_download_downloading">កំពុង​ទាញ​យក</string>
diff --git a/library/ui/src/main/res/values-kn/strings.xml b/library/ui/src/main/res/values-kn/strings.xml
index 0a24dcb001..9952d859d3 100644
--- a/library/ui/src/main/res/values-kn/strings.xml
+++ b/library/ui/src/main/res/values-kn/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">ಎಲ್ಲವನ್ನು ಪುನರಾವರ್ತಿಸಿ</string>
   <string name="exo_controls_shuffle_description">ಶಫಲ್‌</string>
   <string name="exo_controls_fullscreen_description">ಪೂರ್ಣ ಪರದೆ ಮೋಡ್</string>
-  <string name="exo_controls_exit_vr_description">VR ಮೋಡ್‌ನಿಂದ ನಿರ್ಗಮಿಸಿ</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">ಡೌನ್‌ಲೋಡ್‌</string>
   <string name="exo_download_notification_channel_name">ಡೌನ್‌ಲೋಡ್‌ಗಳು</string>
   <string name="exo_download_downloading">ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ</string>
diff --git a/library/ui/src/main/res/values-ko/strings.xml b/library/ui/src/main/res/values-ko/strings.xml
index e87a6c1645..d61346ff90 100644
--- a/library/ui/src/main/res/values-ko/strings.xml
+++ b/library/ui/src/main/res/values-ko/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">모두 반복</string>
   <string name="exo_controls_shuffle_description">셔플</string>
   <string name="exo_controls_fullscreen_description">전체화면 모드</string>
-  <string name="exo_controls_exit_vr_description">VR 모드 종료</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">다운로드</string>
   <string name="exo_download_notification_channel_name">다운로드</string>
   <string name="exo_download_downloading">다운로드 중</string>
diff --git a/library/ui/src/main/res/values-ky/strings.xml b/library/ui/src/main/res/values-ky/strings.xml
index efe78b4d23..ee7a90ede7 100644
--- a/library/ui/src/main/res/values-ky/strings.xml
+++ b/library/ui/src/main/res/values-ky/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Баарын кайталоо</string>
   <string name="exo_controls_shuffle_description">Аралаштыруу</string>
   <string name="exo_controls_fullscreen_description">Толук экран режими</string>
-  <string name="exo_controls_exit_vr_description">VR режиминен чыгуу</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Жүктөп алуу</string>
   <string name="exo_download_notification_channel_name">Жүктөлүп алынгандар</string>
   <string name="exo_download_downloading">Жүктөлүп алынууда</string>
diff --git a/library/ui/src/main/res/values-lo/strings.xml b/library/ui/src/main/res/values-lo/strings.xml
index 025a66ad95..e2fd29e5d4 100644
--- a/library/ui/src/main/res/values-lo/strings.xml
+++ b/library/ui/src/main/res/values-lo/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">ຫຼິ້ນຊ້ຳທັງໝົດ</string>
   <string name="exo_controls_shuffle_description">ຫຼີ້ນແບບສຸ່ມ</string>
   <string name="exo_controls_fullscreen_description">ໂໝດເຕັມຈໍ</string>
-  <string name="exo_controls_exit_vr_description">ອອກຈາກໂໝດ VR</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">ດາວໂຫລດ</string>
   <string name="exo_download_notification_channel_name">ດາວໂຫລດ</string>
   <string name="exo_download_downloading">ກຳລັງດາວໂຫລດ</string>
diff --git a/library/ui/src/main/res/values-lt/strings.xml b/library/ui/src/main/res/values-lt/strings.xml
index 4e4da8b79b..b3d296b4d8 100644
--- a/library/ui/src/main/res/values-lt/strings.xml
+++ b/library/ui/src/main/res/values-lt/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Kartoti viską</string>
   <string name="exo_controls_shuffle_description">Maišyti</string>
   <string name="exo_controls_fullscreen_description">Viso ekrano režimas</string>
-  <string name="exo_controls_exit_vr_description">Išeiti iš VR režimo</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Atsisiųsti</string>
   <string name="exo_download_notification_channel_name">Atsisiuntimai</string>
   <string name="exo_download_downloading">Atsisiunčiama</string>
diff --git a/library/ui/src/main/res/values-lv/strings.xml b/library/ui/src/main/res/values-lv/strings.xml
index 6a7937788e..ed61a7a27f 100644
--- a/library/ui/src/main/res/values-lv/strings.xml
+++ b/library/ui/src/main/res/values-lv/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Atkārtot visu</string>
   <string name="exo_controls_shuffle_description">Atskaņot jauktā secībā</string>
   <string name="exo_controls_fullscreen_description">Pilnekrāna režīms</string>
-  <string name="exo_controls_exit_vr_description">Iziet no VR režīma</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Lejupielādēt</string>
   <string name="exo_download_notification_channel_name">Lejupielādes</string>
   <string name="exo_download_downloading">Notiek lejupielāde</string>
diff --git a/library/ui/src/main/res/values-mk/strings.xml b/library/ui/src/main/res/values-mk/strings.xml
index fe5a32409a..4ed15c3913 100644
--- a/library/ui/src/main/res/values-mk/strings.xml
+++ b/library/ui/src/main/res/values-mk/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Повтори ги сите</string>
   <string name="exo_controls_shuffle_description">Измешај</string>
   <string name="exo_controls_fullscreen_description">Режим на цел екран</string>
-  <string name="exo_controls_exit_vr_description">Излези од режимот на VR</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Преземи</string>
   <string name="exo_download_notification_channel_name">Преземања</string>
   <string name="exo_download_downloading">Се презема</string>
diff --git a/library/ui/src/main/res/values-ml/strings.xml b/library/ui/src/main/res/values-ml/strings.xml
index d5c474bd17..76b9b3b4c6 100644
--- a/library/ui/src/main/res/values-ml/strings.xml
+++ b/library/ui/src/main/res/values-ml/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">എല്ലാം ആവർത്തിക്കുക</string>
   <string name="exo_controls_shuffle_description">ഇടകലര്‍ത്തുക</string>
   <string name="exo_controls_fullscreen_description">പൂർണ്ണ സ്‌ക്രീൻ മോഡ്</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">ഡൗൺലോഡ്</string>
   <string name="exo_download_notification_channel_name">ഡൗൺലോഡുകൾ</string>
   <string name="exo_download_downloading">ഡൗൺലോഡ് ചെയ്യുന്നു</string>
diff --git a/library/ui/src/main/res/values-mn/strings.xml b/library/ui/src/main/res/values-mn/strings.xml
index 4aecfcfc70..81c90f34c5 100644
--- a/library/ui/src/main/res/values-mn/strings.xml
+++ b/library/ui/src/main/res/values-mn/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Бүгдийг нь дахин тоглуулах</string>
   <string name="exo_controls_shuffle_description">Холих</string>
   <string name="exo_controls_fullscreen_description">Бүтэн дэлгэцийн горим</string>
-  <string name="exo_controls_exit_vr_description">VR горимоос гарах</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Татах</string>
   <string name="exo_download_notification_channel_name">Татaлт</string>
   <string name="exo_download_downloading">Татаж байна</string>
diff --git a/library/ui/src/main/res/values-mr/strings.xml b/library/ui/src/main/res/values-mr/strings.xml
index f53b2dc75e..7b698e5bcf 100644
--- a/library/ui/src/main/res/values-mr/strings.xml
+++ b/library/ui/src/main/res/values-mr/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">सर्व रीपीट करा</string>
   <string name="exo_controls_shuffle_description">शफल करा</string>
   <string name="exo_controls_fullscreen_description">फुल स्क्रीन मोड</string>
-  <string name="exo_controls_exit_vr_description">VR मोडमधून बाहेर पडा</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">डाउनलोड करा</string>
   <string name="exo_download_notification_channel_name">डाउनलोड</string>
   <string name="exo_download_downloading">डाउनलोड होत आहे</string>
diff --git a/library/ui/src/main/res/values-ms/strings.xml b/library/ui/src/main/res/values-ms/strings.xml
index a94d7be6df..cfe822f2b8 100644
--- a/library/ui/src/main/res/values-ms/strings.xml
+++ b/library/ui/src/main/res/values-ms/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ulang semua</string>
   <string name="exo_controls_shuffle_description">Rombak</string>
   <string name="exo_controls_fullscreen_description">Mod skrin penuh</string>
-  <string name="exo_controls_exit_vr_description">Keluar daripada mod VR</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Muat turun</string>
   <string name="exo_download_notification_channel_name">Muat turun</string>
   <string name="exo_download_downloading">Memuat turun</string>
diff --git a/library/ui/src/main/res/values-my/strings.xml b/library/ui/src/main/res/values-my/strings.xml
index 124b2826c0..34e69c2977 100644
--- a/library/ui/src/main/res/values-my/strings.xml
+++ b/library/ui/src/main/res/values-my/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">အားလုံး ပြန်ကျော့ရန်</string>
   <string name="exo_controls_shuffle_description">ရောသမမွှေ</string>
   <string name="exo_controls_fullscreen_description">မျက်နှာပြင်အပြည့် မုဒ်</string>
-  <string name="exo_controls_exit_vr_description">VR မုဒ်မှထွက်ပါ</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">ဒေါင်းလုဒ် လုပ်ရန်</string>
   <string name="exo_download_notification_channel_name">ဒေါင်းလုဒ်များ</string>
   <string name="exo_download_downloading">ဒေါင်းလုဒ်လုပ်နေသည်</string>
diff --git a/library/ui/src/main/res/values-nb/strings.xml b/library/ui/src/main/res/values-nb/strings.xml
index cbcfff5902..5f8e862f5d 100644
--- a/library/ui/src/main/res/values-nb/strings.xml
+++ b/library/ui/src/main/res/values-nb/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Gjenta alle</string>
   <string name="exo_controls_shuffle_description">Tilfeldig rekkefølge</string>
   <string name="exo_controls_fullscreen_description">Fullskjermmodus</string>
-  <string name="exo_controls_exit_vr_description">Avslutt VR-modus</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Last ned</string>
   <string name="exo_download_notification_channel_name">Nedlastinger</string>
   <string name="exo_download_downloading">Laster ned</string>
diff --git a/library/ui/src/main/res/values-ne/strings.xml b/library/ui/src/main/res/values-ne/strings.xml
index bc8510393c..4b6ec50903 100644
--- a/library/ui/src/main/res/values-ne/strings.xml
+++ b/library/ui/src/main/res/values-ne/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">सबै दोहोर्‍याउनुहोस्</string>
   <string name="exo_controls_shuffle_description">मिसाउनुहोस्</string>
   <string name="exo_controls_fullscreen_description">पूर्ण स्क्रिन मोड</string>
-  <string name="exo_controls_exit_vr_description">VR मोडबाट बाहिरिनुहोस्</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">डाउनलोड गर्नुहोस्</string>
   <string name="exo_download_notification_channel_name">डाउनलोडहरू</string>
   <string name="exo_download_downloading">डाउनलोड गरिँदै छ</string>
diff --git a/library/ui/src/main/res/values-nl/strings.xml b/library/ui/src/main/res/values-nl/strings.xml
index b8215a3bad..a3401a0114 100644
--- a/library/ui/src/main/res/values-nl/strings.xml
+++ b/library/ui/src/main/res/values-nl/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Alles herhalen</string>
   <string name="exo_controls_shuffle_description">Shuffle</string>
   <string name="exo_controls_fullscreen_description">Modus \'Volledig scherm\'</string>
-  <string name="exo_controls_exit_vr_description">VR-modus sluiten</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Downloaden</string>
   <string name="exo_download_notification_channel_name">Downloads</string>
   <string name="exo_download_downloading">Downloaden</string>
diff --git a/library/ui/src/main/res/values-pa/strings.xml b/library/ui/src/main/res/values-pa/strings.xml
index 1293f58cd6..1493a62e52 100644
--- a/library/ui/src/main/res/values-pa/strings.xml
+++ b/library/ui/src/main/res/values-pa/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">ਸਾਰਿਆਂ ਨੂੰ ਦੁਹਰਾਓ</string>
   <string name="exo_controls_shuffle_description">ਬੇਤਰਤੀਬ ਕਰੋ</string>
   <string name="exo_controls_fullscreen_description">ਪੂਰੀ-ਸਕ੍ਰੀਨ ਮੋਡ</string>
-  <string name="exo_controls_exit_vr_description">VR ਮੋਡ ਤੋਂ ਬਾਹਰ ਜਾਓ</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">ਡਾਊਨਲੋਡ ਕਰੋ</string>
   <string name="exo_download_notification_channel_name">ਡਾਊਨਲੋਡ</string>
   <string name="exo_download_downloading">ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ</string>
diff --git a/library/ui/src/main/res/values-pl/strings.xml b/library/ui/src/main/res/values-pl/strings.xml
index c6ef64e724..adb81b5779 100644
--- a/library/ui/src/main/res/values-pl/strings.xml
+++ b/library/ui/src/main/res/values-pl/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Powtórz wszystkie</string>
   <string name="exo_controls_shuffle_description">Odtwarzanie losowe</string>
   <string name="exo_controls_fullscreen_description">Tryb pełnoekranowy</string>
-  <string name="exo_controls_exit_vr_description">Wyłącz tryb VR</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Pobierz</string>
   <string name="exo_download_notification_channel_name">Pobieranie</string>
   <string name="exo_download_downloading">Pobieram</string>
diff --git a/library/ui/src/main/res/values-pt-rPT/strings.xml b/library/ui/src/main/res/values-pt-rPT/strings.xml
index c45b94b144..f5d8092723 100644
--- a/library/ui/src/main/res/values-pt-rPT/strings.xml
+++ b/library/ui/src/main/res/values-pt-rPT/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repetir tudo</string>
   <string name="exo_controls_shuffle_description">Reproduzir aleatoriamente</string>
   <string name="exo_controls_fullscreen_description">Modo de ecrã inteiro</string>
-  <string name="exo_controls_exit_vr_description">Sair do Modo de RV</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Transferir</string>
   <string name="exo_download_notification_channel_name">Transferências</string>
   <string name="exo_download_downloading">A transferir…</string>
diff --git a/library/ui/src/main/res/values-pt/strings.xml b/library/ui/src/main/res/values-pt/strings.xml
index 7a0592e837..2e86dd7acd 100644
--- a/library/ui/src/main/res/values-pt/strings.xml
+++ b/library/ui/src/main/res/values-pt/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repetir tudo</string>
   <string name="exo_controls_shuffle_description">Aleatório</string>
   <string name="exo_controls_fullscreen_description">Modo de tela cheia</string>
-  <string name="exo_controls_exit_vr_description">Sair do modo RV</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Fazer o download</string>
   <string name="exo_download_notification_channel_name">Downloads</string>
   <string name="exo_download_downloading">Fazendo o download</string>
diff --git a/library/ui/src/main/res/values-ro/strings.xml b/library/ui/src/main/res/values-ro/strings.xml
index ddbfac1406..a0bd5a0a16 100644
--- a/library/ui/src/main/res/values-ro/strings.xml
+++ b/library/ui/src/main/res/values-ro/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repetați-le pe toate</string>
   <string name="exo_controls_shuffle_description">Redați aleatoriu</string>
   <string name="exo_controls_fullscreen_description">Modul Ecran complet</string>
-  <string name="exo_controls_exit_vr_description">Ieșiți din modul RV</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Descărcați</string>
   <string name="exo_download_notification_channel_name">Descărcări</string>
   <string name="exo_download_downloading">Se descarcă</string>
diff --git a/library/ui/src/main/res/values-ru/strings.xml b/library/ui/src/main/res/values-ru/strings.xml
index dd08f5f7f9..a45022ffb4 100644
--- a/library/ui/src/main/res/values-ru/strings.xml
+++ b/library/ui/src/main/res/values-ru/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Повторять все</string>
   <string name="exo_controls_shuffle_description">Перемешать</string>
   <string name="exo_controls_fullscreen_description">Полноэкранный режим</string>
-  <string name="exo_controls_exit_vr_description">Выйти из VR-режима</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Скачать</string>
   <string name="exo_download_notification_channel_name">Скачивания</string>
   <string name="exo_download_downloading">Скачивание…</string>
diff --git a/library/ui/src/main/res/values-si/strings.xml b/library/ui/src/main/res/values-si/strings.xml
index 80412f5aa5..241d8336a0 100644
--- a/library/ui/src/main/res/values-si/strings.xml
+++ b/library/ui/src/main/res/values-si/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">සියල්ල පුනරාවර්තනය කරන්න</string>
   <string name="exo_controls_shuffle_description">කලවම් කරන්න</string>
   <string name="exo_controls_fullscreen_description">සම්පූර්ණ තිර ප්‍රකාරය</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">බාගන්න</string>
   <string name="exo_download_notification_channel_name">බාගැනීම්</string>
   <string name="exo_download_downloading">බාගනිමින්</string>
diff --git a/library/ui/src/main/res/values-sk/strings.xml b/library/ui/src/main/res/values-sk/strings.xml
index 39b99e215d..2d3997ed89 100644
--- a/library/ui/src/main/res/values-sk/strings.xml
+++ b/library/ui/src/main/res/values-sk/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Opakovať všetko</string>
   <string name="exo_controls_shuffle_description">Náhodne prehrávať</string>
   <string name="exo_controls_fullscreen_description">Režim celej obrazovky</string>
-  <string name="exo_controls_exit_vr_description">Ukončiť režim VR</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Stiahnuť</string>
   <string name="exo_download_notification_channel_name">Stiahnuté</string>
   <string name="exo_download_downloading">Sťahuje sa</string>
diff --git a/library/ui/src/main/res/values-sl/strings.xml b/library/ui/src/main/res/values-sl/strings.xml
index 7b32ddcefe..01fa00320a 100644
--- a/library/ui/src/main/res/values-sl/strings.xml
+++ b/library/ui/src/main/res/values-sl/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ponavljanje vseh</string>
   <string name="exo_controls_shuffle_description">Naključno predvajanje</string>
   <string name="exo_controls_fullscreen_description">Celozaslonski način</string>
-  <string name="exo_controls_exit_vr_description">Izhod iz načina VR</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Prenos</string>
   <string name="exo_download_notification_channel_name">Prenosi</string>
   <string name="exo_download_downloading">Prenašanje</string>
diff --git a/library/ui/src/main/res/values-sq/strings.xml b/library/ui/src/main/res/values-sq/strings.xml
index 434ef77f58..29007fa20e 100644
--- a/library/ui/src/main/res/values-sq/strings.xml
+++ b/library/ui/src/main/res/values-sq/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Përsërit të gjitha</string>
   <string name="exo_controls_shuffle_description">Përziej</string>
   <string name="exo_controls_fullscreen_description">Modaliteti me ekran të plotë</string>
-  <string name="exo_controls_exit_vr_description">Dil nga modaliteti VR</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Shkarko</string>
   <string name="exo_download_notification_channel_name">Shkarkimet</string>
   <string name="exo_download_downloading">Po shkarkohet</string>
diff --git a/library/ui/src/main/res/values-sr/strings.xml b/library/ui/src/main/res/values-sr/strings.xml
index 4cc717220c..659fb113bc 100644
--- a/library/ui/src/main/res/values-sr/strings.xml
+++ b/library/ui/src/main/res/values-sr/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Понови све</string>
   <string name="exo_controls_shuffle_description">Пусти насумично</string>
   <string name="exo_controls_fullscreen_description">Режим целог екрана</string>
-  <string name="exo_controls_exit_vr_description">Изађи из ВР режима</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Преузми</string>
   <string name="exo_download_notification_channel_name">Преузимања</string>
   <string name="exo_download_downloading">Преузима се</string>
diff --git a/library/ui/src/main/res/values-sv/strings.xml b/library/ui/src/main/res/values-sv/strings.xml
index 56bc4a6731..d9c48aaebe 100644
--- a/library/ui/src/main/res/values-sv/strings.xml
+++ b/library/ui/src/main/res/values-sv/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Upprepa alla</string>
   <string name="exo_controls_shuffle_description">Blanda spår</string>
   <string name="exo_controls_fullscreen_description">Helskärmsläge</string>
-  <string name="exo_controls_exit_vr_description">Avsluta VR-läget</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Ladda ned</string>
   <string name="exo_download_notification_channel_name">Nedladdningar</string>
   <string name="exo_download_downloading">Laddar ned</string>
diff --git a/library/ui/src/main/res/values-sw/strings.xml b/library/ui/src/main/res/values-sw/strings.xml
index 98da2b1d99..83e6b7bc47 100644
--- a/library/ui/src/main/res/values-sw/strings.xml
+++ b/library/ui/src/main/res/values-sw/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Rudia zote</string>
   <string name="exo_controls_shuffle_description">Changanya</string>
   <string name="exo_controls_fullscreen_description">Hali ya skrini nzima</string>
-  <string name="exo_controls_exit_vr_description">Funga hali ya VR</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Pakua</string>
   <string name="exo_download_notification_channel_name">Vipakuliwa</string>
   <string name="exo_download_downloading">Inapakua</string>
diff --git a/library/ui/src/main/res/values-ta/strings.xml b/library/ui/src/main/res/values-ta/strings.xml
index 0f3c22275c..828170c101 100644
--- a/library/ui/src/main/res/values-ta/strings.xml
+++ b/library/ui/src/main/res/values-ta/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">அனைத்தையும் மீண்டும் இயக்கு</string>
   <string name="exo_controls_shuffle_description">கலைத்துப் போடு</string>
   <string name="exo_controls_fullscreen_description">முழுத்திரைப் பயன்முறை</string>
-  <string name="exo_controls_exit_vr_description">VRரிலிருந்து வெளியேறும்</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">பதிவிறக்கும் பட்டன்</string>
   <string name="exo_download_notification_channel_name">பதிவிறக்கங்கள்</string>
   <string name="exo_download_downloading">பதிவிறக்குகிறது</string>
diff --git a/library/ui/src/main/res/values-te/strings.xml b/library/ui/src/main/res/values-te/strings.xml
index ed056ef26e..7f77e32b41 100644
--- a/library/ui/src/main/res/values-te/strings.xml
+++ b/library/ui/src/main/res/values-te/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">అన్నింటినీ పునరావృతం చేయండి</string>
   <string name="exo_controls_shuffle_description">షఫుల్ చేయండి</string>
   <string name="exo_controls_fullscreen_description">పూర్తి స్క్రీన్ మోడ్</string>
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">డౌన్‌లోడ్ చేయి</string>
   <string name="exo_download_notification_channel_name">డౌన్‌లోడ్‌లు</string>
   <string name="exo_download_downloading">డౌన్‌లోడ్ చేస్తోంది</string>
diff --git a/library/ui/src/main/res/values-th/strings.xml b/library/ui/src/main/res/values-th/strings.xml
index ef772e37a2..454a0f361d 100644
--- a/library/ui/src/main/res/values-th/strings.xml
+++ b/library/ui/src/main/res/values-th/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">เล่นซ้ำทั้งหมด</string>
   <string name="exo_controls_shuffle_description">สุ่ม</string>
   <string name="exo_controls_fullscreen_description">โหมดเต็มหน้าจอ</string>
-  <string name="exo_controls_exit_vr_description">ออกจากโหมด VR</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">ดาวน์โหลด</string>
   <string name="exo_download_notification_channel_name">ดาวน์โหลด</string>
   <string name="exo_download_downloading">กำลังดาวน์โหลด</string>
diff --git a/library/ui/src/main/res/values-tl/strings.xml b/library/ui/src/main/res/values-tl/strings.xml
index 95d0e70918..8ca6e90c07 100644
--- a/library/ui/src/main/res/values-tl/strings.xml
+++ b/library/ui/src/main/res/values-tl/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ulitin lahat</string>
   <string name="exo_controls_shuffle_description">I-shuffle</string>
   <string name="exo_controls_fullscreen_description">Fullscreen mode</string>
-  <string name="exo_controls_exit_vr_description">Lumabas sa VR mode</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">I-download</string>
   <string name="exo_download_notification_channel_name">Mga Download</string>
   <string name="exo_download_downloading">Nagda-download</string>
diff --git a/library/ui/src/main/res/values-tr/strings.xml b/library/ui/src/main/res/values-tr/strings.xml
index 1ac912d99c..43bf4f885f 100644
--- a/library/ui/src/main/res/values-tr/strings.xml
+++ b/library/ui/src/main/res/values-tr/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Tümünü tekrarla</string>
   <string name="exo_controls_shuffle_description">Karıştır</string>
   <string name="exo_controls_fullscreen_description">Tam ekran modu</string>
-  <string name="exo_controls_exit_vr_description">VR modundan çıkar</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">İndir</string>
   <string name="exo_download_notification_channel_name">İndirilenler</string>
   <string name="exo_download_downloading">İndiriliyor</string>
diff --git a/library/ui/src/main/res/values-uk/strings.xml b/library/ui/src/main/res/values-uk/strings.xml
index a3ab4f2ad7..0b00dbbe82 100644
--- a/library/ui/src/main/res/values-uk/strings.xml
+++ b/library/ui/src/main/res/values-uk/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Повторити всі</string>
   <string name="exo_controls_shuffle_description">Перемішати</string>
   <string name="exo_controls_fullscreen_description">Повноекранний режим</string>
-  <string name="exo_controls_exit_vr_description">Вийти з режиму VR</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Завантажити</string>
   <string name="exo_download_notification_channel_name">Завантаження</string>
   <string name="exo_download_downloading">Завантажується</string>
diff --git a/library/ui/src/main/res/values-ur/strings.xml b/library/ui/src/main/res/values-ur/strings.xml
index 4f9a84a41b..fab6127fc8 100644
--- a/library/ui/src/main/res/values-ur/strings.xml
+++ b/library/ui/src/main/res/values-ur/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">سبھی کو دہرائیں</string>
   <string name="exo_controls_shuffle_description">شفل کریں</string>
   <string name="exo_controls_fullscreen_description">پوری اسکرین والی وضع</string>
-  <string name="exo_controls_exit_vr_description">VR موڈ سے باہر نکلیں</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">ڈاؤن لوڈ کریں</string>
   <string name="exo_download_notification_channel_name">ڈاؤن لوڈز</string>
   <string name="exo_download_downloading">ڈاؤن لوڈ ہو رہا ہے</string>
diff --git a/library/ui/src/main/res/values-uz/strings.xml b/library/ui/src/main/res/values-uz/strings.xml
index a62bc1a2e8..b5cea1f59e 100644
--- a/library/ui/src/main/res/values-uz/strings.xml
+++ b/library/ui/src/main/res/values-uz/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Hammasini takrorlash</string>
   <string name="exo_controls_shuffle_description">Aralash</string>
   <string name="exo_controls_fullscreen_description">Butun ekran rejimi</string>
-  <string name="exo_controls_exit_vr_description">VR rejimidan chiqish</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Yuklab olish</string>
   <string name="exo_download_notification_channel_name">Yuklanmalar</string>
   <string name="exo_download_downloading">Yuklab olinmoqda</string>
diff --git a/library/ui/src/main/res/values-vi/strings.xml b/library/ui/src/main/res/values-vi/strings.xml
index 46adac2451..d5299d3e6d 100644
--- a/library/ui/src/main/res/values-vi/strings.xml
+++ b/library/ui/src/main/res/values-vi/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Lặp lại tất cả</string>
   <string name="exo_controls_shuffle_description">Phát ngẫu nhiên</string>
   <string name="exo_controls_fullscreen_description">Chế độ toàn màn hình</string>
-  <string name="exo_controls_exit_vr_description">Thoát chế độ thực tế ảo (VR)</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Tải xuống</string>
   <string name="exo_download_notification_channel_name">Tài nguyên đã tải xuống</string>
   <string name="exo_download_downloading">Đang tải xuống</string>
diff --git a/library/ui/src/main/res/values-zh-rCN/strings.xml b/library/ui/src/main/res/values-zh-rCN/strings.xml
index 68f3548bf7..ad3e4fe68d 100644
--- a/library/ui/src/main/res/values-zh-rCN/strings.xml
+++ b/library/ui/src/main/res/values-zh-rCN/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">全部重复播放</string>
   <string name="exo_controls_shuffle_description">随机播放</string>
   <string name="exo_controls_fullscreen_description">全屏模式</string>
-  <string name="exo_controls_exit_vr_description">退出 VR 模式</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">下载</string>
   <string name="exo_download_notification_channel_name">下载内容</string>
   <string name="exo_download_downloading">正在下载</string>
diff --git a/library/ui/src/main/res/values-zh-rHK/strings.xml b/library/ui/src/main/res/values-zh-rHK/strings.xml
index dc3a44eaad..f538231146 100644
--- a/library/ui/src/main/res/values-zh-rHK/strings.xml
+++ b/library/ui/src/main/res/values-zh-rHK/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">全部重複播放</string>
   <string name="exo_controls_shuffle_description">隨機播放</string>
   <string name="exo_controls_fullscreen_description">全螢幕模式</string>
-  <string name="exo_controls_exit_vr_description">結束虛擬現實模式</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">下載</string>
   <string name="exo_download_notification_channel_name">下載內容</string>
   <string name="exo_download_downloading">正在下載</string>
diff --git a/library/ui/src/main/res/values-zh-rTW/strings.xml b/library/ui/src/main/res/values-zh-rTW/strings.xml
index f879f5c857..da4b01cc93 100644
--- a/library/ui/src/main/res/values-zh-rTW/strings.xml
+++ b/library/ui/src/main/res/values-zh-rTW/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">重複播放所有項目</string>
   <string name="exo_controls_shuffle_description">隨機播放</string>
   <string name="exo_controls_fullscreen_description">全螢幕模式</string>
-  <string name="exo_controls_exit_vr_description">結束虛擬實境模式</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">下載</string>
   <string name="exo_download_notification_channel_name">下載</string>
   <string name="exo_download_downloading">下載中</string>
diff --git a/library/ui/src/main/res/values-zu/strings.xml b/library/ui/src/main/res/values-zu/strings.xml
index 6be1c61f5e..4b80136a85 100644
--- a/library/ui/src/main/res/values-zu/strings.xml
+++ b/library/ui/src/main/res/values-zu/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Phinda konke</string>
   <string name="exo_controls_shuffle_description">Shova</string>
   <string name="exo_controls_fullscreen_description">Imodi yesikrini esigcwele</string>
-  <string name="exo_controls_exit_vr_description">Phuma kumodi ye-VR</string>
+  <string name="exo_controls_vr_description">VR mode</string>
   <string name="exo_download_description">Landa</string>
   <string name="exo_download_notification_channel_name">Ukulandwa</string>
   <string name="exo_download_downloading">Iyalanda</string>
diff --git a/library/ui/src/main/res/values/ids.xml b/library/ui/src/main/res/values/ids.xml
index 184e51ac58..575a2b9c77 100644
--- a/library/ui/src/main/res/values/ids.xml
+++ b/library/ui/src/main/res/values/ids.xml
@@ -35,5 +35,6 @@
   <item name="exo_progress" type="id"/>
   <item name="exo_buffering" type="id"/>
   <item name="exo_error_message" type="id"/>
+  <item name="exo_vr" type="id"/>
 
 </resources>
diff --git a/library/ui/src/main/res/values/strings.xml b/library/ui/src/main/res/values/strings.xml
index 2acbaadeeb..036a0e0495 100644
--- a/library/ui/src/main/res/values/strings.xml
+++ b/library/ui/src/main/res/values/strings.xml
@@ -38,8 +38,8 @@
   <string name="exo_controls_shuffle_description">Shuffle</string>
   <!-- Description for a media control button that toggles whether a video playback is fullscreen. [CHAR LIMIT=30] -->
   <string name="exo_controls_fullscreen_description">Fullscreen mode</string>
-  <!-- Description for a media control button that exits VR mode. [CHAR LIMIT=30] -->
-  <string name="exo_controls_exit_vr_description">Exit VR mode</string>
+  <!-- Description for a media control button that toggles whether a video playback is in VR mode. [CHAR LIMIT=30] -->
+  <string name="exo_controls_vr_description">VR mode</string>
   <!-- Description for a button that downloads a piece of media content onto the device. [CHAR LIMIT=20] -->
   <string name="exo_download_description">Download</string>
   <!-- Default name for a notification channel corresponding to media downloads. [CHAR LIMIT=40] -->
diff --git a/library/ui/src/main/res/values/styles.xml b/library/ui/src/main/res/values/styles.xml
index b57cbeaddf..89d7a2fc8e 100644
--- a/library/ui/src/main/res/values/styles.xml
+++ b/library/ui/src/main/res/values/styles.xml
@@ -56,4 +56,9 @@
     <item name="android:contentDescription">@string/exo_controls_shuffle_description</item>
   </style>
 
+  <style name="ExoMediaButton.VR">
+    <item name="android:src">@drawable/exo_icon_vr</item>
+    <item name="android:contentDescription">@string/exo_controls_vr_description</item>
+  </style>
+
 </resources>

From 4824f352de137f84638289f612f631f08ee7fa39 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 29 Oct 2018 07:37:23 -0700
Subject: [PATCH 132/832] Decouple input format and codec format

This paves the way to cleanly fix the first two issues
listed in [] onDisabled will null inputFormat,
but nulling of codecFormat will remain tied to the codec
being released.

Issue: #2826

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219125458
---
 .../mediacodec/MediaCodecRenderer.java        | 93 +++++++++++--------
 1 file changed, 52 insertions(+), 41 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index 71ed640f57..74c575c1ef 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -290,13 +290,13 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   private final List<Long> decodeOnlyPresentationTimestamps;
   private final MediaCodec.BufferInfo outputBufferInfo;
 
-  private Format format;
-  private Format pendingFormat;
+  @Nullable private Format inputFormat;
   private Format outputFormat;
   private DrmSession<FrameworkMediaCrypto> drmSession;
   private DrmSession<FrameworkMediaCrypto> pendingDrmSession;
-  private MediaCodec codec;
   private float rendererOperatingRate;
+  @Nullable private MediaCodec codec;
+  @Nullable private Format codecFormat;
   private float codecOperatingRate;
   @Nullable private ArrayDeque<MediaCodecInfo> availableCodecInfos;
   @Nullable private DecoderInitializationException preferredDecoderInitializationException;
@@ -328,7 +328,8 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   private boolean inputStreamEnded;
   private boolean outputStreamEnded;
   private boolean waitingForKeys;
-  private boolean waitingForFirstSyncFrame;
+  private boolean waitingForFirstSyncSample;
+  private boolean waitingForFirstSampleInFormat;
 
   protected DecoderCounters decoderCounters;
 
@@ -435,13 +436,13 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
       throws DecoderQueryException;
 
   protected final void maybeInitCodec() throws ExoPlaybackException {
-    if (codec != null || format == null) {
+    if (codec != null || inputFormat == null) {
       // We have a codec already, or we don't have a format with which to instantiate one.
       return;
     }
 
     drmSession = pendingDrmSession;
-    String mimeType = format.sampleMimeType;
+    String mimeType = inputFormat.sampleMimeType;
     MediaCrypto wrappedMediaCrypto = null;
     boolean drmSessionRequiresSecureDecoder = false;
     if (drmSession != null) {
@@ -527,12 +528,14 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   @Override
   public final void setOperatingRate(float operatingRate) throws ExoPlaybackException {
     rendererOperatingRate = operatingRate;
-    updateCodecOperatingRate();
+    if (codec != null && codecDrainAction != DRAIN_ACTION_REINITIALIZE) {
+      updateCodecOperatingRate();
+    }
   }
 
   @Override
   protected void onDisabled() {
-    format = null;
+    inputFormat = null;
     try {
       releaseCodec();
     } finally {
@@ -563,6 +566,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
       waitingForKeys = false;
       decodeOnlyPresentationTimestamps.clear();
       codecInfo = null;
+      codecFormat = null;
       decoderCounters.decoderReleaseCount++;
       try {
         codec.stop();
@@ -599,7 +603,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
       renderToEndOfStream();
       return;
     }
-    if (format == null) {
+    if (inputFormat == null) {
       // We don't have a format yet, so try and read one.
       flagsOnlyBuffer.clear();
       int result = readSource(formatHolder, flagsOnlyBuffer, true);
@@ -680,7 +684,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     codecHotswapDeadlineMs = C.TIME_UNSET;
     codecReceivedEos = false;
     codecReceivedBuffers = false;
-    waitingForFirstSyncFrame = true;
+    waitingForFirstSyncSample = true;
     codecNeedsAdaptationWorkaroundBuffer = false;
     shouldSkipAdaptationWorkaroundOutputBuffer = false;
     shouldSkipOutputBuffer = false;
@@ -707,7 +711,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
         preferredDecoderInitializationException = null;
       } catch (DecoderQueryException e) {
         throw new DecoderInitializationException(
-            format,
+            inputFormat,
             e,
             drmSessionRequiresSecureDecoder,
             DecoderInitializationException.DECODER_QUERY_ERROR);
@@ -716,7 +720,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
 
     if (availableCodecInfos.isEmpty()) {
       throw new DecoderInitializationException(
-          format,
+          inputFormat,
           /* cause= */ null,
           drmSessionRequiresSecureDecoder,
           DecoderInitializationException.NO_SUITABLE_DECODER_ERROR);
@@ -737,7 +741,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
         availableCodecInfos.removeFirst();
         DecoderInitializationException exception =
             new DecoderInitializationException(
-                format, e, drmSessionRequiresSecureDecoder, codecInfo.name);
+                inputFormat, e, drmSessionRequiresSecureDecoder, codecInfo.name);
         if (preferredDecoderInitializationException == null) {
           preferredDecoderInitializationException = exception;
         } else {
@@ -756,18 +760,19 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   private List<MediaCodecInfo> getAvailableCodecInfos(boolean drmSessionRequiresSecureDecoder)
       throws DecoderQueryException {
     List<MediaCodecInfo> codecInfos =
-        getDecoderInfos(mediaCodecSelector, format, drmSessionRequiresSecureDecoder);
+        getDecoderInfos(mediaCodecSelector, inputFormat, drmSessionRequiresSecureDecoder);
     if (codecInfos.isEmpty() && drmSessionRequiresSecureDecoder) {
       // The drm session indicates that a secure decoder is required, but the device does not
       // have one. Assuming that supportsFormat indicated support for the media being played, we
       // know that it does not require a secure output path. Most CDM implementations allow
       // playback to proceed with a non-secure decoder in this case, so we try our luck.
-      codecInfos = getDecoderInfos(mediaCodecSelector, format, /* requiresSecureDecoder= */ false);
+      codecInfos =
+          getDecoderInfos(mediaCodecSelector, inputFormat, /* requiresSecureDecoder= */ false);
       if (!codecInfos.isEmpty()) {
         Log.w(
             TAG,
             "Drm session requires secure decoder for "
-                + format.sampleMimeType
+                + inputFormat.sampleMimeType
                 + ", but no secure decoder available. Trying to proceed with "
                 + codecInfos
                 + ".");
@@ -785,7 +790,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     float codecOperatingRate =
         Util.SDK_INT < 23
             ? CODEC_OPERATING_RATE_UNSET
-            : getCodecOperatingRateV23(rendererOperatingRate, format, getStreamFormats());
+            : getCodecOperatingRateV23(rendererOperatingRate, inputFormat, getStreamFormats());
     if (codecOperatingRate <= assumedMinimumCodecOperatingRate) {
       codecOperatingRate = CODEC_OPERATING_RATE_UNSET;
     }
@@ -795,7 +800,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
       codec = MediaCodec.createByCodecName(codecName);
       TraceUtil.endSection();
       TraceUtil.beginSection("configureCodec");
-      configureCodec(codecInfo, codec, format, crypto, codecOperatingRate);
+      configureCodec(codecInfo, codec, inputFormat, crypto, codecOperatingRate);
       TraceUtil.endSection();
       TraceUtil.beginSection("startCodec");
       codec.start();
@@ -813,13 +818,15 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     this.codec = codec;
     this.codecInfo = codecInfo;
     this.codecOperatingRate = codecOperatingRate;
+    codecFormat = inputFormat;
     codecAdaptationWorkaroundMode = codecAdaptationWorkaroundMode(codecName);
     codecNeedsReconfigureWorkaround = codecNeedsReconfigureWorkaround(codecName);
-    codecNeedsDiscardToSpsWorkaround = codecNeedsDiscardToSpsWorkaround(codecName, format);
+    codecNeedsDiscardToSpsWorkaround = codecNeedsDiscardToSpsWorkaround(codecName, codecFormat);
     codecNeedsFlushWorkaround = codecNeedsFlushWorkaround(codecName);
     codecNeedsEosFlushWorkaround = codecNeedsEosFlushWorkaround(codecName);
     codecNeedsEosOutputExceptionWorkaround = codecNeedsEosOutputExceptionWorkaround(codecName);
-    codecNeedsMonoChannelCountWorkaround = codecNeedsMonoChannelCountWorkaround(codecName, format);
+    codecNeedsMonoChannelCountWorkaround =
+        codecNeedsMonoChannelCountWorkaround(codecName, codecFormat);
     codecNeedsEosPropagation =
         codecNeedsEosPropagationWorkaround(codecInfo) || getCodecNeedsEosPropagation();
 
@@ -838,7 +845,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     codecNeedsAdaptationWorkaroundBuffer = false;
     shouldSkipAdaptationWorkaroundOutputBuffer = false;
     shouldSkipOutputBuffer = false;
-    waitingForFirstSyncFrame = true;
+    waitingForFirstSyncSample = true;
 
     decoderCounters.decoderInitCount++;
     long elapsed = codecInitializedTimestamp - codecInitializingTimestamp;
@@ -939,8 +946,8 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
       // For adaptive reconfiguration OMX decoders expect all reconfiguration data to be supplied
       // at the start of the buffer that also contains the first frame in the new format.
       if (codecReconfigurationState == RECONFIGURATION_STATE_WRITE_PENDING) {
-        for (int i = 0; i < format.initializationData.size(); i++) {
-          byte[] data = format.initializationData.get(i);
+        for (int i = 0; i < codecFormat.initializationData.size(); i++) {
+          byte[] data = codecFormat.initializationData.get(i);
           buffer.data.put(data);
         }
         codecReconfigurationState = RECONFIGURATION_STATE_QUEUE_PENDING;
@@ -990,7 +997,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
       }
       return false;
     }
-    if (waitingForFirstSyncFrame && !buffer.isKeyFrame()) {
+    if (waitingForFirstSyncSample && !buffer.isKeyFrame()) {
       buffer.clear();
       if (codecReconfigurationState == RECONFIGURATION_STATE_QUEUE_PENDING) {
         // The buffer we just cleared contained reconfiguration data. We need to re-write this
@@ -999,7 +1006,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
       }
       return true;
     }
-    waitingForFirstSyncFrame = false;
+    waitingForFirstSyncSample = false;
     boolean bufferEncrypted = buffer.isEncrypted();
     waitingForKeys = shouldWaitForKeys(bufferEncrypted);
     if (waitingForKeys) {
@@ -1017,9 +1024,9 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
       if (buffer.isDecodeOnly()) {
         decodeOnlyPresentationTimestamps.add(presentationTimeUs);
       }
-      if (pendingFormat != null) {
-        formatQueue.add(presentationTimeUs, pendingFormat);
-        pendingFormat = null;
+      if (waitingForFirstSampleInFormat) {
+        formatQueue.add(presentationTimeUs, inputFormat);
+        waitingForFirstSampleInFormat = false;
       }
 
       buffer.flip();
@@ -1075,19 +1082,20 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
    * @throws ExoPlaybackException If an error occurs re-initializing the {@link MediaCodec}.
    */
   protected void onInputFormatChanged(Format newFormat) throws ExoPlaybackException {
-    Format oldFormat = format;
-    format = newFormat;
-    pendingFormat = newFormat;
+    Format oldFormat = inputFormat;
+    inputFormat = newFormat;
+    waitingForFirstSampleInFormat = true;
 
     boolean drmInitDataChanged =
-        !Util.areEqual(format.drmInitData, oldFormat == null ? null : oldFormat.drmInitData);
+        !Util.areEqual(newFormat.drmInitData, oldFormat == null ? null : oldFormat.drmInitData);
     if (drmInitDataChanged) {
-      if (format.drmInitData != null) {
+      if (newFormat.drmInitData != null) {
         if (drmSessionManager == null) {
           throw ExoPlaybackException.createForRenderer(
               new IllegalStateException("Media requires a DrmSessionManager"), getIndex());
         }
-        pendingDrmSession = drmSessionManager.acquireSession(Looper.myLooper(), format.drmInitData);
+        pendingDrmSession =
+            drmSessionManager.acquireSession(Looper.myLooper(), newFormat.drmInitData);
         if (pendingDrmSession == drmSession) {
           drmSessionManager.releaseSession(pendingDrmSession);
         }
@@ -1106,12 +1114,13 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     if (pendingDrmSession != drmSession) {
       drainAndReinitializeCodec();
     } else {
-      switch (canKeepCodec(codec, codecInfo, oldFormat, format)) {
+      switch (canKeepCodec(codec, codecInfo, codecFormat, newFormat)) {
         case KEEP_CODEC_RESULT_NO:
           drainAndReinitializeCodec();
           break;
         case KEEP_CODEC_RESULT_YES_WITH_FLUSH:
           drainAndFlushCodec();
+          codecFormat = newFormat;
           updateCodecOperatingRate();
           break;
         case KEEP_CODEC_RESULT_YES_WITH_RECONFIGURATION:
@@ -1123,12 +1132,14 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
             codecNeedsAdaptationWorkaroundBuffer =
                 codecAdaptationWorkaroundMode == ADAPTATION_WORKAROUND_MODE_ALWAYS
                     || (codecAdaptationWorkaroundMode == ADAPTATION_WORKAROUND_MODE_SAME_RESOLUTION
-                        && format.width == oldFormat.width
-                        && format.height == oldFormat.height);
+                        && newFormat.width == codecFormat.width
+                        && newFormat.height == codecFormat.height);
+            codecFormat = newFormat;
             updateCodecOperatingRate();
           }
           break;
         case KEEP_CODEC_RESULT_YES_WITHOUT_RECONFIGURATION:
+          codecFormat = newFormat;
           updateCodecOperatingRate();
           break;
         default:
@@ -1197,7 +1208,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
 
   @Override
   public boolean isReady() {
-    return format != null
+    return inputFormat != null
         && !waitingForKeys
         && (isSourceReady()
             || hasOutputBuffer()
@@ -1232,17 +1243,17 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   }
 
   /**
-   * Updates the codec operating rate, and the codec itself if necessary.
+   * Updates the codec operating rate.
    *
    * @throws ExoPlaybackException If an error occurs releasing or initializing a codec.
    */
   private void updateCodecOperatingRate() throws ExoPlaybackException {
-    if (Util.SDK_INT < 23 || codec == null || codecDrainAction == DRAIN_ACTION_REINITIALIZE) {
+    if (Util.SDK_INT < 23) {
       return;
     }
 
     float newCodecOperatingRate =
-        getCodecOperatingRateV23(rendererOperatingRate, format, getStreamFormats());
+        getCodecOperatingRateV23(rendererOperatingRate, codecFormat, getStreamFormats());
     if (codecOperatingRate == newCodecOperatingRate) {
       // No change.
     } else if (newCodecOperatingRate == CODEC_OPERATING_RATE_UNSET) {

From 038238430b0a70eb1dcf669d337a6a8d6530423c Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 29 Oct 2018 08:19:54 -0700
Subject: [PATCH 133/832] Re-enable codec re-use

Issue: #2826

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219130576
---
 .../mediacodec/MediaCodecRenderer.java           | 16 +++++++++++++---
 .../video/MediaCodecVideoRenderer.java           |  4 ++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index 74c575c1ef..efe8959908 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -536,6 +536,16 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   @Override
   protected void onDisabled() {
     inputFormat = null;
+    if (drmSession != null || pendingDrmSession != null) {
+      // TODO: Do something better with this case.
+      onReset();
+    } else {
+      flushOrReleaseCodec();
+    }
+  }
+
+  @Override
+  protected void onReset() {
     try {
       releaseCodec();
     } finally {
@@ -559,14 +569,14 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   protected void releaseCodec() {
     availableCodecInfos = null;
     if (codec != null) {
+      codecInfo = null;
+      codecFormat = null;
       resetInputBuffer();
       resetOutputBuffer();
       resetCodecBuffers();
-      codecHotswapDeadlineMs = C.TIME_UNSET;
       waitingForKeys = false;
+      codecHotswapDeadlineMs = C.TIME_UNSET;
       decodeOnlyPresentationTimestamps.clear();
-      codecInfo = null;
-      codecFormat = null;
       decoderCounters.decoderReleaseCount++;
       try {
         codec.stop();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index a896bc2322..0b17cd6338 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -283,8 +283,12 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
   @Override
   protected void onEnabled(boolean joining) throws ExoPlaybackException {
     super.onEnabled(joining);
+    int oldTunnelingAudioSessionId = tunnelingAudioSessionId;
     tunnelingAudioSessionId = getConfiguration().tunnelingAudioSessionId;
     tunneling = tunnelingAudioSessionId != C.AUDIO_SESSION_ID_UNSET;
+    if (tunnelingAudioSessionId != oldTunnelingAudioSessionId) {
+      releaseCodec();
+    }
     eventDispatcher.enabled(decoderCounters);
     frameReleaseTimeHelper.enable();
   }

From 069e3cbf7df6c582a88b41c4a2275412491f5530 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 29 Oct 2018 09:22:55 -0700
Subject: [PATCH 134/832] Clean up DefaultTrackSelectorTest

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219139356
---
 .../DefaultTrackSelectorTest.java             | 734 +++++++++---------
 1 file changed, 376 insertions(+), 358 deletions(-)

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
index 82fff694de..06fdaf9218 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
@@ -20,9 +20,6 @@ import static com.google.android.exoplayer2.RendererCapabilities.FORMAT_HANDLED;
 import static com.google.android.exoplayer2.RendererCapabilities.FORMAT_UNSUPPORTED_SUBTYPE;
 import static com.google.android.exoplayer2.RendererConfiguration.DEFAULT;
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyVararg;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -87,13 +84,13 @@ public final class DefaultTrackSelectorTest {
   private static final TrackGroup AUDIO_TRACK_GROUP = new TrackGroup(AUDIO_FORMAT);
   private static final TrackGroupArray TRACK_GROUPS =
       new TrackGroupArray(VIDEO_TRACK_GROUP, AUDIO_TRACK_GROUP);
-
   private static final TrackSelection[] TRACK_SELECTIONS =
       new TrackSelection[] {
         new FixedTrackSelection(VIDEO_TRACK_GROUP, 0), new FixedTrackSelection(AUDIO_TRACK_GROUP, 0)
       };
   private static final TrackSelection[] TRACK_SELECTIONS_WITH_NO_SAMPLE_RENDERER =
       new TrackSelection[] {new FixedTrackSelection(VIDEO_TRACK_GROUP, 0), null};
+
   private static final Timeline TIMELINE = new FakeTimeline(/* windowCount= */ 1);
 
   private static MediaPeriodId periodId;
@@ -186,15 +183,13 @@ public final class DefaultTrackSelectorTest {
   /** Tests that a null override clears a track selection. */
   @Test
   public void testSelectTracksWithNullOverride() throws ExoPlaybackException {
-    DefaultTrackSelector trackSelector = new DefaultTrackSelector();
-    trackSelector.init(invalidationListener, bandwidthMeter);
     trackSelector.setParameters(
         trackSelector
             .buildUponParameters()
             .setSelectionOverride(0, new TrackGroupArray(VIDEO_TRACK_GROUP), null));
     TrackSelectorResult result =
         trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS, periodId, TIMELINE);
-    assertTrackSelections(result, new TrackSelection[] {null, TRACK_SELECTIONS[1]});
+    assertSelections(result, new TrackSelection[] {null, TRACK_SELECTIONS[1]});
     assertThat(result.rendererConfigurations)
         .isEqualTo(new RendererConfiguration[] {null, DEFAULT});
   }
@@ -202,8 +197,6 @@ public final class DefaultTrackSelectorTest {
   /** Tests that a null override can be cleared. */
   @Test
   public void testSelectTracksWithClearedNullOverride() throws ExoPlaybackException {
-    DefaultTrackSelector trackSelector = new DefaultTrackSelector();
-    trackSelector.init(invalidationListener, bandwidthMeter);
     trackSelector.setParameters(
         trackSelector
             .buildUponParameters()
@@ -211,7 +204,7 @@ public final class DefaultTrackSelectorTest {
             .clearSelectionOverride(0, new TrackGroupArray(VIDEO_TRACK_GROUP)));
     TrackSelectorResult result =
         trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS, periodId, TIMELINE);
-    assertTrackSelections(result, TRACK_SELECTIONS);
+    assertSelections(result, TRACK_SELECTIONS);
     assertThat(result.rendererConfigurations)
         .isEqualTo(new RendererConfiguration[] {DEFAULT, DEFAULT});
   }
@@ -219,8 +212,6 @@ public final class DefaultTrackSelectorTest {
   /** Tests that an override is not applied for a different set of available track groups. */
   @Test
   public void testSelectTracksWithNullOverrideForDifferentTracks() throws ExoPlaybackException {
-    DefaultTrackSelector trackSelector = new DefaultTrackSelector();
-    trackSelector.init(invalidationListener, bandwidthMeter);
     trackSelector.setParameters(
         trackSelector
             .buildUponParameters()
@@ -231,7 +222,7 @@ public final class DefaultTrackSelectorTest {
             new TrackGroupArray(VIDEO_TRACK_GROUP, AUDIO_TRACK_GROUP, VIDEO_TRACK_GROUP),
             periodId,
             TIMELINE);
-    assertTrackSelections(result, TRACK_SELECTIONS);
+    assertSelections(result, TRACK_SELECTIONS);
     assertThat(result.rendererConfigurations)
         .isEqualTo(new RendererConfiguration[] {DEFAULT, DEFAULT});
   }
@@ -239,12 +230,10 @@ public final class DefaultTrackSelectorTest {
   /** Tests disabling a renderer. */
   @Test
   public void testSelectTracksWithDisabledRenderer() throws ExoPlaybackException {
-    DefaultTrackSelector trackSelector = new DefaultTrackSelector();
-    trackSelector.init(invalidationListener, bandwidthMeter);
-    trackSelector.setParameters(trackSelector.buildUponParameters().setRendererDisabled(1, true));
+    trackSelector.setParameters(Parameters.DEFAULT.buildUpon().setRendererDisabled(1, true));
     TrackSelectorResult result =
         trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS, periodId, TIMELINE);
-    assertTrackSelections(result, new TrackSelection[] {TRACK_SELECTIONS[0], null});
+    assertSelections(result, new TrackSelection[] {TRACK_SELECTIONS[0], null});
     assertThat(new RendererConfiguration[] {DEFAULT, null})
         .isEqualTo(result.rendererConfigurations);
   }
@@ -252,8 +241,6 @@ public final class DefaultTrackSelectorTest {
   /** Tests that a disabled renderer can be enabled again. */
   @Test
   public void testSelectTracksWithClearedDisabledRenderer() throws ExoPlaybackException {
-    DefaultTrackSelector trackSelector = new DefaultTrackSelector();
-    trackSelector.init(invalidationListener, bandwidthMeter);
     trackSelector.setParameters(
         trackSelector
             .buildUponParameters()
@@ -261,7 +248,7 @@ public final class DefaultTrackSelectorTest {
             .setRendererDisabled(1, false));
     TrackSelectorResult result =
         trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS, periodId, TIMELINE);
-    assertTrackSelections(result, TRACK_SELECTIONS);
+    assertSelections(result, TRACK_SELECTIONS);
     assertThat(new RendererConfiguration[] {DEFAULT, DEFAULT})
         .isEqualTo(result.rendererConfigurations);
   }
@@ -269,12 +256,10 @@ public final class DefaultTrackSelectorTest {
   /** Tests a no-sample renderer is enabled without a track selection by default. */
   @Test
   public void testSelectTracksWithNoSampleRenderer() throws ExoPlaybackException {
-    DefaultTrackSelector trackSelector = new DefaultTrackSelector();
-    trackSelector.init(invalidationListener, bandwidthMeter);
     TrackSelectorResult result =
         trackSelector.selectTracks(
             RENDERER_CAPABILITIES_WITH_NO_SAMPLE_RENDERER, TRACK_GROUPS, periodId, TIMELINE);
-    assertTrackSelections(result, TRACK_SELECTIONS_WITH_NO_SAMPLE_RENDERER);
+    assertSelections(result, TRACK_SELECTIONS_WITH_NO_SAMPLE_RENDERER);
     assertThat(new RendererConfiguration[] {DEFAULT, DEFAULT})
         .isEqualTo(result.rendererConfigurations);
   }
@@ -282,13 +267,11 @@ public final class DefaultTrackSelectorTest {
   /** Tests disabling a no-sample renderer. */
   @Test
   public void testSelectTracksWithDisabledNoSampleRenderer() throws ExoPlaybackException {
-    DefaultTrackSelector trackSelector = new DefaultTrackSelector();
-    trackSelector.init(invalidationListener, bandwidthMeter);
-    trackSelector.setParameters(trackSelector.buildUponParameters().setRendererDisabled(1, true));
+    trackSelector.setParameters(Parameters.DEFAULT.buildUpon().setRendererDisabled(1, true));
     TrackSelectorResult result =
         trackSelector.selectTracks(
             RENDERER_CAPABILITIES_WITH_NO_SAMPLE_RENDERER, TRACK_GROUPS, periodId, TIMELINE);
-    assertTrackSelections(result, TRACK_SELECTIONS_WITH_NO_SAMPLE_RENDERER);
+    assertSelections(result, TRACK_SELECTIONS_WITH_NO_SAMPLE_RENDERER);
     assertThat(new RendererConfiguration[] {DEFAULT, null})
         .isEqualTo(result.rendererConfigurations);
   }
@@ -301,8 +284,7 @@ public final class DefaultTrackSelectorTest {
   @Test
   public void testSetParameterWithDefaultParametersDoesNotNotifyInvalidationListener()
       throws Exception {
-    trackSelector.init(invalidationListener, /* bandwidthMeter= */ null);
-
+    trackSelector.setParameters(Parameters.DEFAULT);
     verify(invalidationListener, never()).onTrackSelectionsInvalidated();
   }
 
@@ -313,10 +295,8 @@ public final class DefaultTrackSelectorTest {
   @Test
   public void testSetParameterWithNonDefaultParameterNotifyInvalidationListener()
       throws Exception {
-    Parameters parameters = new ParametersBuilder().setPreferredAudioLanguage("eng").build();
-    trackSelector.init(invalidationListener, /* bandwidthMeter= */ null);
+    Parameters parameters = Parameters.DEFAULT.buildUpon().setPreferredAudioLanguage("eng").build();
     trackSelector.setParameters(parameters);
-
     verify(invalidationListener).onTrackSelectionsInvalidated();
   }
 
@@ -328,11 +308,9 @@ public final class DefaultTrackSelectorTest {
   @Test
   public void testSetParameterWithSameParametersDoesNotNotifyInvalidationListenerAgain()
       throws Exception {
-    ParametersBuilder builder = new ParametersBuilder().setPreferredAudioLanguage("eng");
-    trackSelector.init(invalidationListener, /* bandwidthMeter= */ null);
+    ParametersBuilder builder = Parameters.DEFAULT.buildUpon().setPreferredAudioLanguage("eng");
     trackSelector.setParameters(builder.build());
     trackSelector.setParameters(builder.build());
-
     verify(invalidationListener, times(1)).onTrackSelectionsInvalidated();
   }
 
@@ -342,17 +320,21 @@ public final class DefaultTrackSelectorTest {
    */
   @Test
   public void testSelectTracksSelectTrackWithSelectionFlag() throws Exception {
-    Format audioFormat = buildAudioFormat("audio", /* language= */ null, /* selectionFlags= */ 0);
+    Format audioFormat =
+        buildAudioFormatWithLanguageAndFlags(
+            "audio", /* language= */ null, /* selectionFlags= */ 0);
     Format formatWithSelectionFlag =
-        buildAudioFormat("audio", /* language= */ null, C.SELECTION_FLAG_DEFAULT);
+        buildAudioFormatWithLanguageAndFlags(
+            "audio", /* language= */ null, C.SELECTION_FLAG_DEFAULT);
+    TrackGroupArray trackGroups = wrapFormats(audioFormat, formatWithSelectionFlag);
 
     TrackSelectorResult result =
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
-            singleTrackGroup(formatWithSelectionFlag, audioFormat),
+            trackGroups,
             periodId,
             TIMELINE);
-    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(formatWithSelectionFlag);
+    assertFixedSelection(result.selections.get(0), trackGroups, formatWithSelectionFlag);
   }
 
   /**
@@ -362,23 +344,23 @@ public final class DefaultTrackSelectorTest {
   @Test
   public void testSelectTracksSelectPreferredAudioLanguage()
       throws Exception {
-    trackSelector.setParameters(new ParametersBuilder().setPreferredAudioLanguage("eng").build());
-
     Format frAudioFormat =
         Format.createAudioSampleFormat("audio", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
             Format.NO_VALUE, 2, 44100, null, null, 0, "fra");
     Format enAudioFormat =
         Format.createAudioSampleFormat("audio", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
             Format.NO_VALUE, 2, 44100, null, null, 0, "eng");
+    TrackGroupArray trackGroups = wrapFormats(frAudioFormat, enAudioFormat);
 
+    trackSelector.setParameters(
+        Parameters.DEFAULT.buildUpon().setPreferredAudioLanguage("eng").build());
     TrackSelectorResult result =
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
             wrapFormats(frAudioFormat, enAudioFormat),
             periodId,
             TIMELINE);
-
-    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(enAudioFormat);
+    assertFixedSelection(result.selections.get(0), trackGroups, enAudioFormat);
   }
 
   /**
@@ -388,23 +370,23 @@ public final class DefaultTrackSelectorTest {
   @Test
   public void testSelectTracksSelectPreferredAudioLanguageOverSelectionFlag()
       throws Exception {
-    trackSelector.setParameters(new ParametersBuilder().setPreferredAudioLanguage("eng").build());
-
     Format frAudioFormat =
         Format.createAudioSampleFormat("audio", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
             Format.NO_VALUE, 2, 44100, null, null, C.SELECTION_FLAG_DEFAULT, "fra");
     Format enAudioFormat =
         Format.createAudioSampleFormat("audio", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
             Format.NO_VALUE, 2, 44100, null, null, 0, "eng");
+    TrackGroupArray trackGroups = wrapFormats(frAudioFormat, enAudioFormat);
 
+    trackSelector.setParameters(
+        Parameters.DEFAULT.buildUpon().setPreferredAudioLanguage("eng").build());
     TrackSelectorResult result =
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
-            wrapFormats(frAudioFormat, enAudioFormat),
+            trackGroups,
             periodId,
             TIMELINE);
-
-    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(enAudioFormat);
+    assertFixedSelection(result.selections.get(0), trackGroups, enAudioFormat);
   }
 
   /**
@@ -415,6 +397,7 @@ public final class DefaultTrackSelectorTest {
   public void testSelectTracksPreferTrackWithinCapabilities() throws Exception {
     Format supportedFormat = buildAudioFormat("supportedFormat");
     Format exceededFormat = buildAudioFormat("exceededFormat");
+    TrackGroupArray trackGroups = wrapFormats(exceededFormat, supportedFormat);
 
     Map<String, Integer> mappedCapabilities = new HashMap<>();
     mappedCapabilities.put(supportedFormat.id, FORMAT_HANDLED);
@@ -425,11 +408,10 @@ public final class DefaultTrackSelectorTest {
     TrackSelectorResult result =
         trackSelector.selectTracks(
             new RendererCapabilities[] {mappedAudioRendererCapabilities},
-            singleTrackGroup(exceededFormat, supportedFormat),
+            trackGroups,
             periodId,
             TIMELINE);
-
-    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(supportedFormat);
+    assertFixedSelection(result.selections.get(0), trackGroups, supportedFormat);
   }
 
   /**
@@ -442,14 +424,15 @@ public final class DefaultTrackSelectorTest {
     Format audioFormat =
         Format.createAudioSampleFormat("audio", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
             Format.NO_VALUE, 2, 44100, null, null, 0, null);
+    TrackGroupArray trackGroups = singleTrackGroup(audioFormat);
+
     TrackSelectorResult result =
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
-            singleTrackGroup(audioFormat),
+            trackGroups,
             periodId,
             TIMELINE);
-
-    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(audioFormat);
+    assertFixedSelection(result.selections.get(0), trackGroups, audioFormat);
   }
 
   /**
@@ -460,20 +443,20 @@ public final class DefaultTrackSelectorTest {
   @Test
   public void testSelectTracksWithNoTrackWithinCapabilitiesAndSetByParamsReturnNoSelection()
       throws Exception {
-    trackSelector.setParameters(
-        new ParametersBuilder().setExceedRendererCapabilitiesIfNecessary(false).build());
-
     Format audioFormat =
         Format.createAudioSampleFormat("audio", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
             Format.NO_VALUE, 2, 44100, null, null, 0, null);
+    TrackGroupArray trackGroups = singleTrackGroup(audioFormat);
+
+    trackSelector.setParameters(
+        Parameters.DEFAULT.buildUpon().setExceedRendererCapabilitiesIfNecessary(false).build());
     TrackSelectorResult result =
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
-            singleTrackGroup(audioFormat),
+            trackGroups,
             periodId,
             TIMELINE);
-
-    assertThat(result.selections.get(0)).isNull();
+    assertNoSelection(result.selections.get(0));
   }
 
   /**
@@ -483,12 +466,23 @@ public final class DefaultTrackSelectorTest {
   @Test
   public void testSelectTracksPreferTrackWithinCapabilitiesOverSelectionFlag()
       throws Exception {
+    Format exceededWithSelectionFlagFormat =
+        Format.createAudioSampleFormat(
+            "exceededFormat",
+            MimeTypes.AUDIO_AAC,
+            null,
+            Format.NO_VALUE,
+            Format.NO_VALUE,
+            2,
+            44100,
+            null,
+            null,
+            C.SELECTION_FLAG_DEFAULT,
+            null);
     Format supportedFormat =
         Format.createAudioSampleFormat("supportedFormat", MimeTypes.AUDIO_AAC, null,
             Format.NO_VALUE, Format.NO_VALUE, 2, 44100, null, null, 0, null);
-    Format exceededWithSelectionFlagFormat =
-        Format.createAudioSampleFormat("exceededFormat", MimeTypes.AUDIO_AAC, null,
-            Format.NO_VALUE, Format.NO_VALUE, 2, 44100, null, null, C.SELECTION_FLAG_DEFAULT, null);
+    TrackGroupArray trackGroups = wrapFormats(exceededWithSelectionFlagFormat, supportedFormat);
 
     Map<String, Integer> mappedCapabilities = new HashMap<>();
     mappedCapabilities.put(supportedFormat.id, FORMAT_HANDLED);
@@ -499,11 +493,10 @@ public final class DefaultTrackSelectorTest {
     TrackSelectorResult result =
         trackSelector.selectTracks(
             new RendererCapabilities[] {mappedAudioRendererCapabilities},
-            singleTrackGroup(exceededWithSelectionFlagFormat, supportedFormat),
+            trackGroups,
             periodId,
             TIMELINE);
-
-    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(supportedFormat);
+    assertFixedSelection(result.selections.get(0), trackGroups, supportedFormat);
   }
 
   /**
@@ -514,14 +507,23 @@ public final class DefaultTrackSelectorTest {
   @Test
   public void testSelectTracksPreferTrackWithinCapabilitiesOverPreferredLanguage()
       throws Exception {
-    trackSelector.setParameters(new ParametersBuilder().setPreferredAudioLanguage("eng").build());
-
+    Format exceededEnFormat =
+        Format.createAudioSampleFormat(
+            "exceededFormat",
+            MimeTypes.AUDIO_AAC,
+            null,
+            Format.NO_VALUE,
+            Format.NO_VALUE,
+            2,
+            44100,
+            null,
+            null,
+            0,
+            "eng");
     Format supportedFrFormat =
         Format.createAudioSampleFormat("supportedFormat", MimeTypes.AUDIO_AAC, null,
             Format.NO_VALUE, Format.NO_VALUE, 2, 44100, null, null, 0, "fra");
-    Format exceededEnFormat =
-        Format.createAudioSampleFormat("exceededFormat", MimeTypes.AUDIO_AAC, null,
-            Format.NO_VALUE, Format.NO_VALUE, 2, 44100, null, null, 0, "eng");
+    TrackGroupArray trackGroups = wrapFormats(exceededEnFormat, supportedFrFormat);
 
     Map<String, Integer> mappedCapabilities = new HashMap<>();
     mappedCapabilities.put(exceededEnFormat.id, FORMAT_EXCEEDS_CAPABILITIES);
@@ -529,14 +531,15 @@ public final class DefaultTrackSelectorTest {
     RendererCapabilities mappedAudioRendererCapabilities =
         new FakeMappedRendererCapabilities(C.TRACK_TYPE_AUDIO, mappedCapabilities);
 
+    trackSelector.setParameters(
+        Parameters.DEFAULT.buildUpon().setPreferredAudioLanguage("eng").build());
     TrackSelectorResult result =
         trackSelector.selectTracks(
             new RendererCapabilities[] {mappedAudioRendererCapabilities},
-            singleTrackGroup(exceededEnFormat, supportedFrFormat),
+            trackGroups,
             periodId,
             TIMELINE);
-
-    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(supportedFrFormat);
+    assertFixedSelection(result.selections.get(0), trackGroups, supportedFrFormat);
   }
 
   /**
@@ -547,14 +550,23 @@ public final class DefaultTrackSelectorTest {
   @Test
   public void testSelectTracksPreferTrackWithinCapabilitiesOverSelectionFlagAndPreferredLanguage()
       throws Exception {
-    trackSelector.setParameters(new ParametersBuilder().setPreferredAudioLanguage("eng").build());
-
+    Format exceededDefaultSelectionEnFormat =
+        Format.createAudioSampleFormat(
+            "exceededFormat",
+            MimeTypes.AUDIO_AAC,
+            null,
+            Format.NO_VALUE,
+            Format.NO_VALUE,
+            2,
+            44100,
+            null,
+            null,
+            C.SELECTION_FLAG_DEFAULT,
+            "eng");
     Format supportedFrFormat =
         Format.createAudioSampleFormat("supportedFormat", MimeTypes.AUDIO_AAC, null,
             Format.NO_VALUE, Format.NO_VALUE, 2, 44100, null, null, 0, "fra");
-    Format exceededDefaultSelectionEnFormat =
-        Format.createAudioSampleFormat("exceededFormat", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
-            Format.NO_VALUE, 2, 44100, null, null, C.SELECTION_FLAG_DEFAULT, "eng");
+    TrackGroupArray trackGroups = wrapFormats(exceededDefaultSelectionEnFormat, supportedFrFormat);
 
     Map<String, Integer> mappedCapabilities = new HashMap<>();
     mappedCapabilities.put(exceededDefaultSelectionEnFormat.id, FORMAT_EXCEEDS_CAPABILITIES);
@@ -562,14 +574,15 @@ public final class DefaultTrackSelectorTest {
     RendererCapabilities mappedAudioRendererCapabilities =
         new FakeMappedRendererCapabilities(C.TRACK_TYPE_AUDIO, mappedCapabilities);
 
+    trackSelector.setParameters(
+        Parameters.DEFAULT.buildUpon().setPreferredAudioLanguage("eng").build());
     TrackSelectorResult result =
         trackSelector.selectTracks(
             new RendererCapabilities[] {mappedAudioRendererCapabilities},
-            singleTrackGroup(exceededDefaultSelectionEnFormat, supportedFrFormat),
+            trackGroups,
             periodId,
             TIMELINE);
-
-    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(supportedFrFormat);
+    assertFixedSelection(result.selections.get(0), trackGroups, supportedFrFormat);
   }
 
   /**
@@ -579,21 +592,31 @@ public final class DefaultTrackSelectorTest {
   @Test
   public void testSelectTracksWithinCapabilitiesSelectHigherNumChannel()
       throws Exception {
+    Format higherChannelFormat =
+        Format.createAudioSampleFormat(
+            "audioFormat",
+            MimeTypes.AUDIO_AAC,
+            null,
+            Format.NO_VALUE,
+            Format.NO_VALUE,
+            6,
+            44100,
+            null,
+            null,
+            0,
+            null);
     Format lowerChannelFormat =
         Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
             Format.NO_VALUE, 2, 44100, null, null, 0, null);
-    Format higherChannelFormat =
-        Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
-            Format.NO_VALUE, 6, 44100, null, null, 0, null);
+    TrackGroupArray trackGroups = wrapFormats(higherChannelFormat, lowerChannelFormat);
 
     TrackSelectorResult result =
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
-            singleTrackGroup(higherChannelFormat, lowerChannelFormat),
+            trackGroups,
             periodId,
             TIMELINE);
-
-    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(higherChannelFormat);
+    assertFixedSelection(result.selections.get(0), trackGroups, higherChannelFormat);
   }
 
   /**
@@ -609,39 +632,58 @@ public final class DefaultTrackSelectorTest {
     Format lowerSampleRateFormat =
         Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
             Format.NO_VALUE, 2, 22050, null, null, 0, null);
+    TrackGroupArray trackGroups = wrapFormats(higherSampleRateFormat, lowerSampleRateFormat);
 
     TrackSelectorResult result =
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
-            singleTrackGroup(higherSampleRateFormat, lowerSampleRateFormat),
+            trackGroups,
             periodId,
             TIMELINE);
-
-    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(higherSampleRateFormat);
+    assertFixedSelection(result.selections.get(0), trackGroups, higherSampleRateFormat);
   }
 
   /**
-   * Tests that track selector will select audio tracks with higher bit-rate when other factors
-   * are the same, and tracks are within renderer's capabilities.
+   * Tests that track selector will select audio tracks with higher bit-rate when other factors are
+   * the same, and tracks are within renderer's capabilities.
    */
   @Test
-  public void testSelectTracksWithinCapabilitiesSelectHigherBitrate()
-      throws Exception {
+  public void testSelectTracksWithinCapabilitiesSelectHigherBitrate() throws Exception {
     Format lowerBitrateFormat =
-        Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, 15000,
-            Format.NO_VALUE, 2, 44100, null, null, 0, null);
+        Format.createAudioSampleFormat(
+            "audioFormat",
+            MimeTypes.AUDIO_AAC,
+            null,
+            15000,
+            Format.NO_VALUE,
+            2,
+            44100,
+            null,
+            null,
+            0,
+            null);
     Format higherBitrateFormat =
-        Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, 30000,
-            Format.NO_VALUE, 2, 44100, null, null, 0, null);
+        Format.createAudioSampleFormat(
+            "audioFormat",
+            MimeTypes.AUDIO_AAC,
+            null,
+            30000,
+            Format.NO_VALUE,
+            2,
+            44100,
+            null,
+            null,
+            0,
+            null);
+    TrackGroupArray trackGroups = wrapFormats(lowerBitrateFormat, higherBitrateFormat);
 
     TrackSelectorResult result =
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
-            singleTrackGroup(lowerBitrateFormat, higherBitrateFormat),
+            trackGroups,
             periodId,
             TIMELINE);
-
-    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(higherBitrateFormat);
+    assertFixedSelection(result.selections.get(0), trackGroups, higherBitrateFormat);
   }
 
   /**
@@ -652,23 +694,32 @@ public final class DefaultTrackSelectorTest {
   @Test
   public void testSelectTracksPreferHigherNumChannelBeforeSampleRate()
       throws Exception {
+    Format higherChannelLowerSampleRateFormat =
+        Format.createAudioSampleFormat(
+            "audioFormat",
+            MimeTypes.AUDIO_AAC,
+            null,
+            Format.NO_VALUE,
+            Format.NO_VALUE,
+            6,
+            22050,
+            null,
+            null,
+            0,
+            null);
     Format lowerChannelHigherSampleRateFormat =
         Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
             Format.NO_VALUE, 2, 44100, null, null, 0, null);
-    Format higherChannelLowerSampleRateFormat =
-        Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
-            Format.NO_VALUE, 6, 22050, null, null, 0, null);
+    TrackGroupArray trackGroups =
+        wrapFormats(higherChannelLowerSampleRateFormat, lowerChannelHigherSampleRateFormat);
 
     TrackSelectorResult result =
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
-            singleTrackGroup(
-                higherChannelLowerSampleRateFormat, lowerChannelHigherSampleRateFormat),
+            trackGroups,
             periodId,
             TIMELINE);
-
-    assertThat(result.selections.get(0).getSelectedFormat())
-        .isEqualTo(higherChannelLowerSampleRateFormat);
+    assertFixedSelection(result.selections.get(0), trackGroups, higherChannelLowerSampleRateFormat);
   }
 
   /**
@@ -685,17 +736,16 @@ public final class DefaultTrackSelectorTest {
     Format lowerSampleRateHigherBitrateFormat =
         Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, 30000,
             Format.NO_VALUE, 2, 22050, null, null, 0, null);
+    TrackGroupArray trackGroups =
+        wrapFormats(higherSampleRateLowerBitrateFormat, lowerSampleRateHigherBitrateFormat);
 
     TrackSelectorResult result =
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
-            singleTrackGroup(
-                higherSampleRateLowerBitrateFormat, lowerSampleRateHigherBitrateFormat),
+            trackGroups,
             periodId,
             TIMELINE);
-
-    assertThat(result.selections.get(0).getSelectedFormat())
-        .isEqualTo(higherSampleRateLowerBitrateFormat);
+    assertFixedSelection(result.selections.get(0), trackGroups, higherSampleRateLowerBitrateFormat);
   }
 
   /**
@@ -705,21 +755,31 @@ public final class DefaultTrackSelectorTest {
   @Test
   public void testSelectTracksExceedingCapabilitiesSelectLowerNumChannel()
       throws Exception {
+    Format higherChannelFormat =
+        Format.createAudioSampleFormat(
+            "audioFormat",
+            MimeTypes.AUDIO_AAC,
+            null,
+            Format.NO_VALUE,
+            Format.NO_VALUE,
+            6,
+            44100,
+            null,
+            null,
+            0,
+            null);
     Format lowerChannelFormat =
         Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
             Format.NO_VALUE, 2, 44100, null, null, 0, null);
-    Format higherChannelFormat =
-        Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
-            Format.NO_VALUE, 6, 44100, null, null, 0, null);
+    TrackGroupArray trackGroups = wrapFormats(higherChannelFormat, lowerChannelFormat);
 
     TrackSelectorResult result =
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
-            singleTrackGroup(higherChannelFormat, lowerChannelFormat),
+            trackGroups,
             periodId,
             TIMELINE);
-
-    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(lowerChannelFormat);
+    assertFixedSelection(result.selections.get(0), trackGroups, lowerChannelFormat);
   }
 
   /**
@@ -735,15 +795,15 @@ public final class DefaultTrackSelectorTest {
     Format higherSampleRateFormat =
         Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
             Format.NO_VALUE, 2, 44100, null, null, 0, null);
+    TrackGroupArray trackGroups = wrapFormats(higherSampleRateFormat, lowerSampleRateFormat);
 
     TrackSelectorResult result =
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
-            singleTrackGroup(higherSampleRateFormat, lowerSampleRateFormat),
+            trackGroups,
             periodId,
             TIMELINE);
-
-    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(lowerSampleRateFormat);
+    assertFixedSelection(result.selections.get(0), trackGroups, lowerSampleRateFormat);
   }
 
   /**
@@ -759,15 +819,15 @@ public final class DefaultTrackSelectorTest {
     Format higherBitrateFormat =
         Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, 30000,
             Format.NO_VALUE, 2, 44100, null, null, 0, null);
+    TrackGroupArray trackGroups = wrapFormats(lowerBitrateFormat, higherBitrateFormat);
 
     TrackSelectorResult result =
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
-            singleTrackGroup(lowerBitrateFormat, higherBitrateFormat),
+            trackGroups,
             periodId,
             TIMELINE);
-
-    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(lowerBitrateFormat);
+    assertFixedSelection(result.selections.get(0), trackGroups, lowerBitrateFormat);
   }
 
   /**
@@ -784,17 +844,16 @@ public final class DefaultTrackSelectorTest {
     Format higherChannelLowerSampleRateFormat =
         Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
             Format.NO_VALUE, 6, 22050, null, null, 0, null);
+    TrackGroupArray trackGroups =
+        wrapFormats(higherChannelLowerSampleRateFormat, lowerChannelHigherSampleRateFormat);
 
     TrackSelectorResult result =
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
-            singleTrackGroup(
-                higherChannelLowerSampleRateFormat, lowerChannelHigherSampleRateFormat),
+            trackGroups,
             periodId,
             TIMELINE);
-
-    assertThat(result.selections.get(0).getSelectedFormat())
-        .isEqualTo(lowerChannelHigherSampleRateFormat);
+    assertFixedSelection(result.selections.get(0), trackGroups, lowerChannelHigherSampleRateFormat);
   }
 
   /**
@@ -811,17 +870,16 @@ public final class DefaultTrackSelectorTest {
     Format lowerSampleRateHigherBitrateFormat =
         Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, 30000,
             Format.NO_VALUE, 2, 22050, null, null, 0, null);
+    TrackGroupArray trackGroups =
+        wrapFormats(higherSampleRateLowerBitrateFormat, lowerSampleRateHigherBitrateFormat);
 
     TrackSelectorResult result =
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
-            singleTrackGroup(
-                higherSampleRateLowerBitrateFormat, lowerSampleRateHigherBitrateFormat),
+            trackGroups,
             periodId,
             TIMELINE);
-
-    assertThat(result.selections.get(0).getSelectedFormat())
-        .isEqualTo(lowerSampleRateHigherBitrateFormat);
+    assertFixedSelection(result.selections.get(0), trackGroups, lowerSampleRateHigherBitrateFormat);
   }
 
   /** Tests text track selection flags. */
@@ -838,105 +896,71 @@ public final class DefaultTrackSelectorTest {
         new RendererCapabilities[] {ALL_TEXT_FORMAT_SUPPORTED_RENDERER_CAPABILITIES};
 
     // There is no text language preference, the first track flagged as default should be selected.
+    TrackGroupArray trackGroups = wrapFormats(forcedOnly, forcedDefault, defaultOnly, noFlag);
     TrackSelectorResult result =
-        trackSelector.selectTracks(
-            textRendererCapabilities,
-            wrapFormats(forcedOnly, forcedDefault, defaultOnly, noFlag),
-            periodId,
-            TIMELINE);
-    assertThat(result.selections.get(0).getFormat(0)).isSameAs(forcedDefault);
+        trackSelector.selectTracks(textRendererCapabilities, trackGroups, periodId, TIMELINE);
+    assertFixedSelection(result.selections.get(0), trackGroups, forcedDefault);
 
     // Ditto.
-    result =
-        trackSelector.selectTracks(
-            textRendererCapabilities,
-            wrapFormats(forcedOnly, noFlag, defaultOnly),
-            periodId,
-            TIMELINE);
-    assertThat(result.selections.get(0).getFormat(0)).isSameAs(defaultOnly);
+    trackGroups = wrapFormats(forcedOnly, noFlag, defaultOnly);
+    result = trackSelector.selectTracks(textRendererCapabilities, trackGroups, periodId, TIMELINE);
+    assertFixedSelection(result.selections.get(0), trackGroups, defaultOnly);
 
     // With no language preference and no text track flagged as default, the first forced should be
     // selected.
-    result =
-        trackSelector.selectTracks(
-            textRendererCapabilities, wrapFormats(forcedOnly, noFlag), periodId, TIMELINE);
-    assertThat(result.selections.get(0).getFormat(0)).isSameAs(forcedOnly);
+    trackGroups = wrapFormats(forcedOnly, noFlag);
+    result = trackSelector.selectTracks(textRendererCapabilities, trackGroups, periodId, TIMELINE);
+    assertFixedSelection(result.selections.get(0), trackGroups, forcedOnly);
 
+    // Default flags are disabled, so the first track flagged as forced should be selected.
+    trackGroups = wrapFormats(defaultOnly, noFlag, forcedOnly, forcedDefault);
     trackSelector.setParameters(
         Parameters.DEFAULT
             .buildUpon()
             .setDisabledTextTrackSelectionFlags(C.SELECTION_FLAG_DEFAULT)
             .build());
-
-    // Default flags are disabled, so the first track flagged as forced should be selected.
-    result =
-        trackSelector.selectTracks(
-            textRendererCapabilities,
-            wrapFormats(defaultOnly, noFlag, forcedOnly, forcedDefault),
-            periodId,
-            TIMELINE);
-    assertThat(result.selections.get(0).getFormat(0)).isSameAs(forcedOnly);
-
-    trackSelector.setParameters(
-        trackSelector.getParameters().buildUpon().setPreferredAudioLanguage("spa").build());
+    result = trackSelector.selectTracks(textRendererCapabilities, trackGroups, periodId, TIMELINE);
+    assertFixedSelection(result.selections.get(0), trackGroups, forcedOnly);
 
     // Default flags are disabled, but there is a text track flagged as forced whose language
     // matches the preferred audio language.
-    result =
-        trackSelector.selectTracks(
-            textRendererCapabilities,
-            wrapFormats(forcedDefault, forcedOnly, defaultOnly, noFlag, forcedOnlySpanish),
-            periodId,
-            TIMELINE);
-    assertThat(result.selections.get(0).getFormat(0)).isSameAs(forcedOnlySpanish);
+    trackGroups = wrapFormats(forcedDefault, forcedOnly, defaultOnly, noFlag, forcedOnlySpanish);
+    trackSelector.setParameters(
+        trackSelector.getParameters().buildUpon().setPreferredAudioLanguage("spa").build());
+    result = trackSelector.selectTracks(textRendererCapabilities, trackGroups, periodId, TIMELINE);
+    assertFixedSelection(result.selections.get(0), trackGroups, forcedOnlySpanish);
 
+    // All selection flags are disabled and there is no language preference, so nothing should be
+    // selected.
+    trackGroups = wrapFormats(forcedOnly, forcedDefault, defaultOnly, noFlag);
     trackSelector.setParameters(
         trackSelector
             .getParameters()
             .buildUpon()
             .setDisabledTextTrackSelectionFlags(C.SELECTION_FLAG_DEFAULT | C.SELECTION_FLAG_FORCED)
             .build());
-
-    // All selection flags are disabled and there is no language preference, so nothing should be
-    // selected.
-    result =
-        trackSelector.selectTracks(
-            textRendererCapabilities,
-            wrapFormats(forcedOnly, forcedDefault, defaultOnly, noFlag),
-            periodId,
-            TIMELINE);
-    assertThat(result.selections.get(0)).isNull();
-
-    trackSelector.setParameters(
-        Parameters.DEFAULT.buildUpon().setPreferredTextLanguage("eng").build());
+    result = trackSelector.selectTracks(textRendererCapabilities, trackGroups, periodId, TIMELINE);
+    assertNoSelection(result.selections.get(0));
 
     // There is a preferred language, so the first language-matching track flagged as default should
     // be selected.
-    result =
-        trackSelector.selectTracks(
-            textRendererCapabilities,
-            wrapFormats(forcedOnly, forcedDefault, defaultOnly, noFlag),
-            periodId,
-            TIMELINE);
-    assertThat(result.selections.get(0).getFormat(0)).isSameAs(forcedDefault);
+    trackSelector.setParameters(
+        Parameters.DEFAULT.buildUpon().setPreferredTextLanguage("eng").build());
+    result = trackSelector.selectTracks(textRendererCapabilities, trackGroups, periodId, TIMELINE);
+    assertFixedSelection(result.selections.get(0), trackGroups, forcedDefault);
 
+    // Same as above, but the default flag is disabled. If multiple tracks match the preferred
+    // language, those not flagged as forced are preferred, as they likely include the contents of
+    // forced subtitles.
+    trackGroups = wrapFormats(noFlag, forcedOnly, forcedDefault, defaultOnly);
     trackSelector.setParameters(
         trackSelector
             .getParameters()
             .buildUpon()
             .setDisabledTextTrackSelectionFlags(C.SELECTION_FLAG_DEFAULT)
             .build());
-
-    // Same as above, but the default flag is disabled. If multiple tracks match the preferred
-    // language, those not flagged as forced are preferred, as they likely include the contents of
-    // forced subtitles.
-    result =
-        trackSelector.selectTracks(
-            textRendererCapabilities,
-            wrapFormats(noFlag, forcedOnly, forcedDefault, defaultOnly),
-            periodId,
-            TIMELINE);
-    assertThat(result.selections.get(0).getFormat(0)).isSameAs(noFlag);
+    result = trackSelector.selectTracks(textRendererCapabilities, trackGroups, periodId, TIMELINE);
+    assertFixedSelection(result.selections.get(0), trackGroups, noFlag);
   }
 
   /**
@@ -954,60 +978,37 @@ public final class DefaultTrackSelectorTest {
     RendererCapabilities[] textRendererCapabilites =
         new RendererCapabilities[] {ALL_TEXT_FORMAT_SUPPORTED_RENDERER_CAPABILITIES};
 
+    TrackGroupArray trackGroups = wrapFormats(spanish, german, undeterminedUnd, undeterminedNull);
     TrackSelectorResult result =
-        trackSelector.selectTracks(
-            textRendererCapabilites,
-            wrapFormats(spanish, german, undeterminedUnd, undeterminedNull),
-            periodId,
-            TIMELINE);
-    assertThat(result.selections.get(0)).isNull();
+        trackSelector.selectTracks(textRendererCapabilites, trackGroups, periodId, TIMELINE);
+    assertNoSelection(result.selections.get(0));
 
     trackSelector.setParameters(
-        new ParametersBuilder().setSelectUndeterminedTextLanguage(true).build());
-    result =
-        trackSelector.selectTracks(
-            textRendererCapabilites,
-            wrapFormats(spanish, german, undeterminedUnd, undeterminedNull),
-            periodId,
-            TIMELINE);
-    assertThat(result.selections.get(0).getFormat(0)).isSameAs(undeterminedUnd);
+        Parameters.DEFAULT.buildUpon().setSelectUndeterminedTextLanguage(true).build());
+    result = trackSelector.selectTracks(textRendererCapabilites, trackGroups, periodId, TIMELINE);
+    assertFixedSelection(result.selections.get(0), trackGroups, undeterminedUnd);
 
-    ParametersBuilder builder = new ParametersBuilder().setPreferredTextLanguage("spa");
+    ParametersBuilder builder = Parameters.DEFAULT.buildUpon().setPreferredTextLanguage("spa");
     trackSelector.setParameters(builder.build());
-    result =
-        trackSelector.selectTracks(
-            textRendererCapabilites,
-            wrapFormats(spanish, german, undeterminedUnd, undeterminedNull),
-            periodId,
-            TIMELINE);
-    assertThat(result.selections.get(0).getFormat(0)).isSameAs(spanish);
+    result = trackSelector.selectTracks(textRendererCapabilites, trackGroups, periodId, TIMELINE);
+    assertFixedSelection(result.selections.get(0), trackGroups, spanish);
 
-    result =
-        trackSelector.selectTracks(
-            textRendererCapabilites,
-            wrapFormats(german, undeterminedUnd, undeterminedNull),
-            periodId,
-            TIMELINE);
-    assertThat(result.selections.get(0)).isNull();
+    trackGroups = wrapFormats(german, undeterminedUnd, undeterminedNull);
+
+    result = trackSelector.selectTracks(textRendererCapabilites, trackGroups, periodId, TIMELINE);
+    assertNoSelection(result.selections.get(0));
 
     trackSelector.setParameters(builder.setSelectUndeterminedTextLanguage(true).build());
-    result =
-        trackSelector.selectTracks(
-            textRendererCapabilites,
-            wrapFormats(german, undeterminedUnd, undeterminedNull),
-            periodId,
-            TIMELINE);
-    assertThat(result.selections.get(0).getFormat(0)).isSameAs(undeterminedUnd);
+    result = trackSelector.selectTracks(textRendererCapabilites, trackGroups, periodId, TIMELINE);
+    assertFixedSelection(result.selections.get(0), trackGroups, undeterminedUnd);
 
-    result =
-        trackSelector.selectTracks(
-            textRendererCapabilites, wrapFormats(german, undeterminedNull), periodId, TIMELINE);
-    assertThat(result.selections.get(0).getFormat(0)).isSameAs(undeterminedNull);
+    trackGroups = wrapFormats(german, undeterminedNull);
+    result = trackSelector.selectTracks(textRendererCapabilites, trackGroups, periodId, TIMELINE);
+    assertFixedSelection(result.selections.get(0), trackGroups, undeterminedNull);
 
-    result =
-        trackSelector.selectTracks(
-            textRendererCapabilites, wrapFormats(german), periodId, TIMELINE);
-    assertThat(result.selections.get(0)).isNull();
+    trackGroups = wrapFormats(german);
+    result = trackSelector.selectTracks(textRendererCapabilites, trackGroups, periodId, TIMELINE);
+    assertNoSelection(result.selections.get(0));
   }
 
   /** Tests audio track selection when there are multiple audio renderers. */
@@ -1032,29 +1033,25 @@ public final class DefaultTrackSelectorTest {
 
     RendererCapabilities[] rendererCapabilities =
         new RendererCapabilities[] {firstRendererCapabilities, secondRendererCapabilities};
+    TrackGroupArray trackGroups = wrapFormats(english, german);
 
     // Without an explicit language preference, nothing should be selected.
     TrackSelectorResult result =
-        trackSelector.selectTracks(
-            rendererCapabilities, wrapFormats(english, german), periodId, TIMELINE);
-    assertThat(result.selections.get(0)).isNull();
-    assertThat(result.selections.get(1)).isNull();
+        trackSelector.selectTracks(rendererCapabilities, trackGroups, periodId, TIMELINE);
+    assertNoSelection(result.selections.get(0));
+    assertNoSelection(result.selections.get(1));
 
     // Explicit language preference for english. First renderer should be used.
-    trackSelector.setParameters(trackSelector.buildUponParameters().setPreferredTextLanguage("en"));
-    result =
-        trackSelector.selectTracks(
-            rendererCapabilities, wrapFormats(english, german), periodId, TIMELINE);
-    assertThat(result.selections.get(0).getFormat(0)).isSameAs(english);
-    assertThat(result.selections.get(1)).isNull();
+    trackSelector.setParameters(Parameters.DEFAULT.buildUpon().setPreferredTextLanguage("en"));
+    result = trackSelector.selectTracks(rendererCapabilities, trackGroups, periodId, TIMELINE);
+    assertFixedSelection(result.selections.get(0), trackGroups, english);
+    assertNoSelection(result.selections.get(1));
 
     // Explicit language preference for German. Second renderer should be used.
-    trackSelector.setParameters(trackSelector.buildUponParameters().setPreferredTextLanguage("de"));
-    result =
-        trackSelector.selectTracks(
-            rendererCapabilities, wrapFormats(english, german), periodId, TIMELINE);
-    assertThat(result.selections.get(0)).isNull();
-    assertThat(result.selections.get(1).getFormat(0)).isSameAs(german);
+    trackSelector.setParameters(Parameters.DEFAULT.buildUpon().setPreferredTextLanguage("de"));
+    result = trackSelector.selectTracks(rendererCapabilities, trackGroups, periodId, TIMELINE);
+    assertNoSelection(result.selections.get(0));
+    assertFixedSelection(result.selections.get(1), trackGroups, german);
   }
 
   /**
@@ -1064,81 +1061,60 @@ public final class DefaultTrackSelectorTest {
   @Test
   public void testSelectTracksWithinCapabilitiesAndForceLowestBitrateSelectLowerBitrate()
       throws Exception {
-    trackSelector.setParameters(new ParametersBuilder().setForceLowestBitrate(true).build());
-
     Format lowerBitrateFormat =
         Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, 15000,
             Format.NO_VALUE, 2, 44100, null, null, 0, null);
     Format higherBitrateFormat =
         Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, 30000,
             Format.NO_VALUE, 2, 44100, null, null, 0, null);
+    TrackGroupArray trackGroups = wrapFormats(lowerBitrateFormat, higherBitrateFormat);
 
+    trackSelector.setParameters(Parameters.DEFAULT.buildUpon().setForceLowestBitrate(true).build());
     TrackSelectorResult result =
         trackSelector.selectTracks(
             new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
-            singleTrackGroup(lowerBitrateFormat, higherBitrateFormat),
+            trackGroups,
             periodId,
             TIMELINE);
-
-    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(lowerBitrateFormat);
+    assertFixedSelection(result.selections.get(0), trackGroups, lowerBitrateFormat);
   }
 
   @Test
-  public void testSelectTracksWithMultipleAudioTracksReturnsAdaptiveTrackSelection()
-      throws Exception {
-    TrackSelection adaptiveTrackSelection = mock(TrackSelection.class);
-    TrackSelection.Factory adaptiveTrackSelectionFactory = mock(TrackSelection.Factory.class);
-    when(adaptiveTrackSelectionFactory.createTrackSelection(any(), any(), anyVararg()))
-        .thenReturn(adaptiveTrackSelection);
-
-    trackSelector = new DefaultTrackSelector(adaptiveTrackSelectionFactory);
-    trackSelector.init(invalidationListener, bandwidthMeter);
-
-    TrackGroupArray trackGroupArray = singleTrackGroup(AUDIO_FORMAT, AUDIO_FORMAT);
+  public void testSelectTracksWithMultipleAudioTracks() throws Exception {
+    TrackGroupArray trackGroups = singleTrackGroup(buildAudioFormat("0"), buildAudioFormat("1"));
     TrackSelectorResult result =
         trackSelector.selectTracks(
-            new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroupArray, periodId, TIMELINE);
+            new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroups, periodId, TIMELINE);
 
     assertThat(result.length).isEqualTo(1);
-    assertThat(result.selections.get(0)).isEqualTo(adaptiveTrackSelection);
-    verify(adaptiveTrackSelectionFactory)
-        .createTrackSelection(trackGroupArray.get(0), bandwidthMeter, 0, 1);
+    assertAdaptiveSelection(result.selections.get(0), trackGroups.get(0), 0, 1);
   }
 
   @Test
   public void testSelectTracksWithMultipleAudioTracksOverrideReturnsAdaptiveTrackSelection()
       throws Exception {
-    TrackSelection adaptiveTrackSelection = mock(TrackSelection.class);
-    TrackSelection.Factory adaptiveTrackSelectionFactory = mock(TrackSelection.Factory.class);
-    when(adaptiveTrackSelectionFactory.createTrackSelection(any(), any(), anyVararg()))
-        .thenReturn(adaptiveTrackSelection);
-
-    trackSelector = new DefaultTrackSelector(adaptiveTrackSelectionFactory);
-    trackSelector.init(invalidationListener, bandwidthMeter);
-
-    TrackGroupArray trackGroupArray = singleTrackGroup(AUDIO_FORMAT, AUDIO_FORMAT, AUDIO_FORMAT);
+    TrackGroupArray trackGroups =
+        singleTrackGroup(buildAudioFormat("0"), buildAudioFormat("1"), buildAudioFormat("2"));
     trackSelector.setParameters(
         trackSelector
             .buildUponParameters()
             .setSelectionOverride(
                 /* rendererIndex= */ 0,
-                trackGroupArray,
+                trackGroups,
                 new SelectionOverride(/* groupIndex= */ 0, /* tracks= */ 1, 2)));
     TrackSelectorResult result =
         trackSelector.selectTracks(
-            new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroupArray, periodId, TIMELINE);
+            new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroups, periodId, TIMELINE);
 
     assertThat(result.length).isEqualTo(1);
-    assertThat(result.selections.get(0)).isEqualTo(adaptiveTrackSelection);
-    verify(adaptiveTrackSelectionFactory)
-        .createTrackSelection(trackGroupArray.get(0), bandwidthMeter, 1, 2);
+    assertAdaptiveSelection(result.selections.get(0), trackGroups.get(0), 1, 2);
   }
 
   /** Tests audio track selection when there are multiple audio renderers. */
   @Test
   public void testSelectPreferredAudioTrackMultipleRenderers() throws Exception {
-    Format english = buildAudioFormat("en", "en");
-    Format german = buildAudioFormat("de", "de");
+    Format english = buildAudioFormatWithLanguage("en", "en");
+    Format german = buildAudioFormatWithLanguage("de", "de");
 
     // First renderer handles english.
     Map<String, Integer> firstRendererMappedCapabilities = new HashMap<>();
@@ -1158,89 +1134,104 @@ public final class DefaultTrackSelectorTest {
         new RendererCapabilities[] {firstRendererCapabilities, secondRendererCapabilities};
 
     // Without an explicit language preference, prefer the first renderer.
+    TrackGroupArray trackGroups = wrapFormats(english, german);
     TrackSelectorResult result =
-        trackSelector.selectTracks(
-            rendererCapabilities, wrapFormats(english, german), periodId, TIMELINE);
-    assertThat(result.selections.get(0).getFormat(0)).isSameAs(english);
-    assertThat(result.selections.get(1)).isNull();
+        trackSelector.selectTracks(rendererCapabilities, trackGroups, periodId, TIMELINE);
+    assertFixedSelection(result.selections.get(0), trackGroups, english);
+    assertNoSelection(result.selections.get(1));
 
     // Explicit language preference for english. First renderer should be used.
-    trackSelector.setParameters(
-        trackSelector.buildUponParameters().setPreferredAudioLanguage("en"));
-    result =
-        trackSelector.selectTracks(
-            rendererCapabilities, wrapFormats(english, german), periodId, TIMELINE);
-    assertThat(result.selections.get(0).getFormat(0)).isSameAs(english);
-    assertThat(result.selections.get(1)).isNull();
+    trackSelector.setParameters(Parameters.DEFAULT.buildUpon().setPreferredAudioLanguage("en"));
+    result = trackSelector.selectTracks(rendererCapabilities, trackGroups, periodId, TIMELINE);
+    assertFixedSelection(result.selections.get(0), trackGroups, english);
+    assertNoSelection(result.selections.get(1));
 
     // Explicit language preference for German. Second renderer should be used.
-    trackSelector.setParameters(
-        trackSelector.buildUponParameters().setPreferredAudioLanguage("de"));
-    result =
-        trackSelector.selectTracks(
-            rendererCapabilities, wrapFormats(english, german), periodId, TIMELINE);
-    assertThat(result.selections.get(0)).isNull();
-    assertThat(result.selections.get(1).getFormat(0)).isSameAs(german);
+    trackSelector.setParameters(Parameters.DEFAULT.buildUpon().setPreferredAudioLanguage("de"));
+    result = trackSelector.selectTracks(rendererCapabilities, trackGroups, periodId, TIMELINE);
+    assertNoSelection(result.selections.get(0));
+    assertFixedSelection(result.selections.get(1), trackGroups, german);
   }
 
   @Test
-  public void testSelectTracksWithMultipleVideoTracksReturnsAdaptiveTrackSelection()
-      throws Exception {
-    TrackSelection adaptiveTrackSelection = mock(TrackSelection.class);
-    TrackSelection.Factory adaptiveTrackSelectionFactory = mock(TrackSelection.Factory.class);
-    when(adaptiveTrackSelectionFactory.createTrackSelection(any(), any(), anyVararg()))
-        .thenReturn(adaptiveTrackSelection);
-
-    trackSelector = new DefaultTrackSelector(adaptiveTrackSelectionFactory);
-    trackSelector.init(invalidationListener, bandwidthMeter);
-
-    TrackGroupArray trackGroupArray = singleTrackGroup(VIDEO_FORMAT, VIDEO_FORMAT);
+  public void testSelectTracksWithMultipleVideoTracks() throws Exception {
+    TrackGroupArray trackGroups = singleTrackGroup(buildVideoFormat("0"), buildVideoFormat("1"));
     TrackSelectorResult result =
         trackSelector.selectTracks(
-            new RendererCapabilities[] {VIDEO_CAPABILITIES}, trackGroupArray, periodId, TIMELINE);
+            new RendererCapabilities[] {VIDEO_CAPABILITIES}, trackGroups, periodId, TIMELINE);
 
     assertThat(result.length).isEqualTo(1);
-    assertThat(result.selections.get(0)).isEqualTo(adaptiveTrackSelection);
-    verify(adaptiveTrackSelectionFactory)
-        .createTrackSelection(trackGroupArray.get(0), bandwidthMeter, 0, 1);
+    assertAdaptiveSelection(result.selections.get(0), trackGroups.get(0), 0, 1);
   }
 
   @Test
   public void testSelectTracksWithMultipleVideoTracksOverrideReturnsAdaptiveTrackSelection()
       throws Exception {
-    TrackSelection adaptiveTrackSelection = mock(TrackSelection.class);
-    TrackSelection.Factory adaptiveTrackSelectionFactory = mock(TrackSelection.Factory.class);
-    when(adaptiveTrackSelectionFactory.createTrackSelection(any(), any(), anyVararg()))
-        .thenReturn(adaptiveTrackSelection);
-
-    trackSelector = new DefaultTrackSelector(adaptiveTrackSelectionFactory);
-    trackSelector.init(invalidationListener, bandwidthMeter);
-
-    TrackGroupArray trackGroupArray = singleTrackGroup(VIDEO_FORMAT, VIDEO_FORMAT, VIDEO_FORMAT);
+    TrackGroupArray trackGroups =
+        singleTrackGroup(buildVideoFormat("0"), buildVideoFormat("1"), buildVideoFormat("2"));
     trackSelector.setParameters(
         trackSelector
             .buildUponParameters()
             .setSelectionOverride(
                 /* rendererIndex= */ 0,
-                trackGroupArray,
+                trackGroups,
                 new SelectionOverride(/* groupIndex= */ 0, /* tracks= */ 1, 2)));
     TrackSelectorResult result =
         trackSelector.selectTracks(
-            new RendererCapabilities[] {VIDEO_CAPABILITIES}, trackGroupArray, periodId, TIMELINE);
+            new RendererCapabilities[] {VIDEO_CAPABILITIES}, trackGroups, periodId, TIMELINE);
 
     assertThat(result.length).isEqualTo(1);
-    assertThat(result.selections.get(0)).isEqualTo(adaptiveTrackSelection);
-    verify(adaptiveTrackSelectionFactory)
-        .createTrackSelection(trackGroupArray.get(0), bandwidthMeter, 1, 2);
+    assertAdaptiveSelection(result.selections.get(0), trackGroups.get(0), 1, 2);
   }
 
-  private static void assertTrackSelections(TrackSelectorResult result, TrackSelection[] expected) {
+  private static void assertSelections(TrackSelectorResult result, TrackSelection[] expected) {
     assertThat(result.length).isEqualTo(expected.length);
     for (int i = 0; i < expected.length; i++) {
       assertThat(result.selections.get(i)).isEqualTo(expected[i]);
     }
   }
 
+  private static void assertFixedSelection(
+      TrackSelection selection, TrackGroupArray trackGroups, Format expectedFormat) {
+    int trackGroupIndex = -1;
+    for (int i = 0; i < trackGroups.length; i++) {
+      int expectedTrack = trackGroups.get(i).indexOf(expectedFormat);
+      if (expectedTrack != -1) {
+        assertThat(trackGroupIndex).isEqualTo(-1);
+        assertFixedSelection(selection, trackGroups.get(i), expectedTrack);
+        trackGroupIndex = i;
+      }
+    }
+    // Assert that we found the expected format in a track group
+    assertThat(trackGroupIndex).isNotEqualTo(-1);
+  }
+
+  private static void assertFixedSelection(
+      TrackSelection selection, TrackGroup expectedTrackGroup, int expectedTrack) {
+    assertThat(selection).isInstanceOf(FixedTrackSelection.class);
+    assertThat(selection.getTrackGroup()).isEqualTo(expectedTrackGroup);
+    assertThat(selection.length()).isEqualTo(1);
+    assertThat(selection.getIndexInTrackGroup(0)).isEqualTo(expectedTrack);
+    assertThat(selection.getFormat(0))
+        .isSameAs(expectedTrackGroup.getFormat(selection.getIndexInTrackGroup(0)));
+  }
+
+  private static void assertNoSelection(TrackSelection selection) {
+    assertThat(selection).isNull();
+  }
+
+  private static void assertAdaptiveSelection(
+      TrackSelection selection, TrackGroup expectedTrackGroup, int... expectedTracks) {
+    assertThat(selection).isInstanceOf(AdaptiveTrackSelection.class);
+    assertThat(selection.getTrackGroup()).isEqualTo(expectedTrackGroup);
+    assertThat(selection.length()).isEqualTo(expectedTracks.length);
+    for (int i = 0; i < expectedTracks.length; i++) {
+      assertThat(selection.getIndexInTrackGroup(i)).isEqualTo(expectedTracks[i]);
+      assertThat(selection.getFormat(i))
+          .isSameAs(expectedTrackGroup.getFormat(selection.getIndexInTrackGroup(i)));
+    }
+  }
+
   private static TrackGroupArray singleTrackGroup(Format... formats) {
     return new TrackGroupArray(new TrackGroup(formats));
   }
@@ -1253,10 +1244,10 @@ public final class DefaultTrackSelectorTest {
     return new TrackGroupArray(trackGroups);
   }
 
-  private static Format buildVideoFormat(String id) {
+  private static Format buildVideoFormatWithMimeType(String id, String mimeType) {
     return Format.createVideoSampleFormat(
         id,
-        MimeTypes.VIDEO_H264,
+        mimeType,
         null,
         Format.NO_VALUE,
         Format.NO_VALUE,
@@ -1267,23 +1258,50 @@ public final class DefaultTrackSelectorTest {
         null);
   }
 
-  private static Format buildAudioFormat(String id) {
-    return buildAudioFormat(id, /* language= */ null);
+  private static Format buildVideoFormat(String id) {
+    return buildVideoFormatWithMimeType(id, MimeTypes.VIDEO_H264);
   }
 
-  private static Format buildAudioFormat(String id, String language) {
-    return buildAudioFormat(id, language, /* selectionFlags= */ 0);
+  private static Format buildAudioFormatWithLanguage(String id, String language) {
+    return buildAudioFormatWithLanguageAndFlags(id, language, /* selectionFlags= */ 0);
   }
 
-  private static Format buildAudioFormat(String id, String language, int selectionFlags) {
-    return Format.createAudioSampleFormat(
+  private static Format buildAudioFormatWithLanguageAndFlags(
+      String id, String language, int selectionFlags) {
+    return buildAudioFormat(
         id,
         MimeTypes.AUDIO_AAC,
+        language,
+        selectionFlags,
+        /* channelCount= */ 2,
+        /* sampleRate= */ 44100);
+  }
+
+  private static Format buildAudioFormat(String id) {
+    return buildAudioFormat(
+        id,
+        MimeTypes.AUDIO_AAC,
+        /* language= */ null,
+        /* selectionFlags= */ 0,
+        /* channelCount= */ 2,
+        /* sampleRate= */ 44100);
+  }
+
+  private static Format buildAudioFormat(
+      String id,
+      String mimeType,
+      String language,
+      int selectionFlags,
+      int channelCount,
+      int sampleRate) {
+    return Format.createAudioSampleFormat(
+        id,
+        mimeType,
         /* codecs= */ null,
         /* bitrate= */ Format.NO_VALUE,
         /* maxInputSize= */ Format.NO_VALUE,
-        /* channelCount= */ 2,
-        /* sampleRate= */ 44100,
+        channelCount,
+        sampleRate,
         /* initializationData= */ null,
         /* drmInitData= */ null,
         selectionFlags,

From 7eeeb40d24d179a074e4a69f802ff6a6bff58b09 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 29 Oct 2018 11:08:22 -0700
Subject: [PATCH 135/832] Add options for controlling audio track selection

Issue: #3314

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219158729
---
 RELEASENOTES.md                               |   2 +
 .../trackselection/DefaultTrackSelector.java  | 349 ++++++++++++++----
 .../DefaultTrackSelectorTest.java             | 245 +++++++++++-
 3 files changed, 519 insertions(+), 77 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 12e9dbb28d..4ea4610b84 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -6,6 +6,8 @@
   here ([#2826](https://github.com/google/ExoPlayer/issues/2826)).
 * Improve initial bandwidth meter estimates using the current country and
   network type.
+* Add options for controlling audio track selections to `DefaultTrackSelector`
+  ([#3314](https://github.com/google/ExoPlayer/issues/3314)).
 * Do not retry failed loads whose error is `FileNotFoundException`.
 * Add convenience methods `Player.next`, `Player.previous`, `Player.hasNext`
   and `Player.hasPrevious`
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
index 435b5f1301..d40afa3acc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -170,11 +170,18 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     private int maxVideoFrameRate;
     private int maxVideoBitrate;
     private boolean exceedVideoConstraintsIfNecessary;
+    private boolean allowVideoMixedMimeTypeAdaptiveness;
+    private boolean allowVideoNonSeamlessAdaptiveness;
     private int viewportWidth;
     private int viewportHeight;
     private boolean viewportOrientationMayChange;
     // Audio
     @Nullable private String preferredAudioLanguage;
+    private int maxAudioChannelCount;
+    private int maxAudioBitrate;
+    private boolean exceedAudioConstraintsIfNecessary;
+    private boolean allowAudioMixedMimeTypeAdaptiveness;
+    private boolean allowAudioMixedSampleRateAdaptiveness;
     // Text
     @Nullable private String preferredTextLanguage;
     private boolean selectUndeterminedTextLanguage;
@@ -182,8 +189,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     // General
     private boolean forceLowestBitrate;
     private boolean forceHighestSupportedBitrate;
-    private boolean allowMixedMimeAdaptiveness;
-    private boolean allowNonSeamlessAdaptiveness;
     private boolean exceedRendererCapabilitiesIfNecessary;
     private int tunnelingAudioSessionId;
 
@@ -203,11 +208,18 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       maxVideoFrameRate = initialValues.maxVideoFrameRate;
       maxVideoBitrate = initialValues.maxVideoBitrate;
       exceedVideoConstraintsIfNecessary = initialValues.exceedVideoConstraintsIfNecessary;
+      allowVideoMixedMimeTypeAdaptiveness = initialValues.allowVideoMixedMimeTypeAdaptiveness;
+      allowVideoNonSeamlessAdaptiveness = initialValues.allowVideoNonSeamlessAdaptiveness;
       viewportWidth = initialValues.viewportWidth;
       viewportHeight = initialValues.viewportHeight;
       viewportOrientationMayChange = initialValues.viewportOrientationMayChange;
       // Audio
       preferredAudioLanguage = initialValues.preferredAudioLanguage;
+      maxAudioChannelCount = initialValues.maxAudioChannelCount;
+      maxAudioBitrate = initialValues.maxAudioBitrate;
+      exceedAudioConstraintsIfNecessary = initialValues.exceedAudioConstraintsIfNecessary;
+      allowAudioMixedMimeTypeAdaptiveness = initialValues.allowAudioMixedMimeTypeAdaptiveness;
+      allowAudioMixedSampleRateAdaptiveness = initialValues.allowAudioMixedSampleRateAdaptiveness;
       // Text
       preferredTextLanguage = initialValues.preferredTextLanguage;
       selectUndeterminedTextLanguage = initialValues.selectUndeterminedTextLanguage;
@@ -215,8 +227,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       // General
       forceLowestBitrate = initialValues.forceLowestBitrate;
       forceHighestSupportedBitrate = initialValues.forceHighestSupportedBitrate;
-      allowMixedMimeAdaptiveness = initialValues.allowMixedMimeAdaptiveness;
-      allowNonSeamlessAdaptiveness = initialValues.allowNonSeamlessAdaptiveness;
       exceedRendererCapabilitiesIfNecessary = initialValues.exceedRendererCapabilitiesIfNecessary;
       tunnelingAudioSessionId = initialValues.tunnelingAudioSessionId;
       // Overrides
@@ -286,6 +296,28 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       return this;
     }
 
+    /**
+     * See {@link Parameters#allowVideoMixedMimeTypeAdaptiveness}.
+     *
+     * @return This builder.
+     */
+    public ParametersBuilder setAllowVideoMixedMimeTypeAdaptiveness(
+        boolean allowVideoMixedMimeTypeAdaptiveness) {
+      this.allowVideoMixedMimeTypeAdaptiveness = allowVideoMixedMimeTypeAdaptiveness;
+      return this;
+    }
+
+    /**
+     * See {@link Parameters#allowVideoNonSeamlessAdaptiveness}.
+     *
+     * @return This builder.
+     */
+    public ParametersBuilder setAllowVideoNonSeamlessAdaptiveness(
+        boolean allowVideoNonSeamlessAdaptiveness) {
+      this.allowVideoNonSeamlessAdaptiveness = allowVideoNonSeamlessAdaptiveness;
+      return this;
+    }
+
     /**
      * Equivalent to calling {@link #setViewportSize(int, int, boolean)} with the viewport size
      * obtained from {@link Util#getPhysicalDisplaySize(Context)}.
@@ -340,6 +372,59 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       return this;
     }
 
+    /**
+     * See {@link Parameters#maxAudioChannelCount}.
+     *
+     * @return This builder.
+     */
+    public ParametersBuilder setMaxAudioChannelCount(int maxAudioChannelCount) {
+      this.maxAudioChannelCount = maxAudioChannelCount;
+      return this;
+    }
+
+    /**
+     * See {@link Parameters#maxAudioBitrate}.
+     *
+     * @return This builder.
+     */
+    public ParametersBuilder setMaxAudioBitrate(int maxAudioBitrate) {
+      this.maxAudioBitrate = maxAudioBitrate;
+      return this;
+    }
+
+    /**
+     * See {@link Parameters#exceedAudioConstraintsIfNecessary}.
+     *
+     * @return This builder.
+     */
+    public ParametersBuilder setExceedAudioConstraintsIfNecessary(
+        boolean exceedAudioConstraintsIfNecessary) {
+      this.exceedAudioConstraintsIfNecessary = exceedAudioConstraintsIfNecessary;
+      return this;
+    }
+
+    /**
+     * See {@link Parameters#allowAudioMixedMimeTypeAdaptiveness}.
+     *
+     * @return This builder.
+     */
+    public ParametersBuilder setAllowAudioMixedMimeTypeAdaptiveness(
+        boolean allowAudioMixedMimeTypeAdaptiveness) {
+      this.allowAudioMixedMimeTypeAdaptiveness = allowAudioMixedMimeTypeAdaptiveness;
+      return this;
+    }
+
+    /**
+     * See {@link Parameters#allowAudioMixedSampleRateAdaptiveness}.
+     *
+     * @return This builder.
+     */
+    public ParametersBuilder setAllowAudioMixedSampleRateAdaptiveness(
+        boolean allowAudioMixedSampleRateAdaptiveness) {
+      this.allowAudioMixedSampleRateAdaptiveness = allowAudioMixedSampleRateAdaptiveness;
+      return this;
+    }
+
     // Text
 
     /**
@@ -397,23 +482,20 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     }
 
     /**
-     * See {@link Parameters#allowMixedMimeAdaptiveness}.
-     *
-     * @return This builder.
+     * @deprecated Use {@link #setAllowVideoMixedMimeTypeAdaptiveness(boolean)} and {@link
+     *     #setAllowAudioMixedMimeTypeAdaptiveness(boolean)}.
      */
+    @Deprecated
     public ParametersBuilder setAllowMixedMimeAdaptiveness(boolean allowMixedMimeAdaptiveness) {
-      this.allowMixedMimeAdaptiveness = allowMixedMimeAdaptiveness;
+      setAllowAudioMixedMimeTypeAdaptiveness(allowMixedMimeAdaptiveness);
+      setAllowVideoMixedMimeTypeAdaptiveness(allowMixedMimeAdaptiveness);
       return this;
     }
 
-    /**
-     * See {@link Parameters#allowNonSeamlessAdaptiveness}.
-     *
-     * @return This builder.
-     */
+    /** @deprecated Use {@link #setAllowVideoNonSeamlessAdaptiveness(boolean)} */
+    @Deprecated
     public ParametersBuilder setAllowNonSeamlessAdaptiveness(boolean allowNonSeamlessAdaptiveness) {
-      this.allowNonSeamlessAdaptiveness = allowNonSeamlessAdaptiveness;
-      return this;
+      return setAllowVideoNonSeamlessAdaptiveness(allowNonSeamlessAdaptiveness);
     }
 
     /**
@@ -563,11 +645,18 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           maxVideoFrameRate,
           maxVideoBitrate,
           exceedVideoConstraintsIfNecessary,
+          allowVideoMixedMimeTypeAdaptiveness,
+          allowVideoNonSeamlessAdaptiveness,
           viewportWidth,
           viewportHeight,
           viewportOrientationMayChange,
           // Audio
           preferredAudioLanguage,
+          maxAudioChannelCount,
+          maxAudioBitrate,
+          exceedAudioConstraintsIfNecessary,
+          allowAudioMixedMimeTypeAdaptiveness,
+          allowAudioMixedSampleRateAdaptiveness,
           // Text
           preferredTextLanguage,
           selectUndeterminedTextLanguage,
@@ -575,8 +664,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           // General
           forceLowestBitrate,
           forceHighestSupportedBitrate,
-          allowMixedMimeAdaptiveness,
-          allowNonSeamlessAdaptiveness,
           exceedRendererCapabilitiesIfNecessary,
           tunnelingAudioSessionId,
           // Overrides
@@ -638,6 +725,18 @@ public class DefaultTrackSelector extends MappingTrackSelector {
      * {@code true}.
      */
     public final boolean exceedVideoConstraintsIfNecessary;
+    /**
+     * Whether to allow adaptive video selections containing mixed mime types. Adaptations between
+     * different mime types may not be completely seamless, in which case {@link
+     * #allowVideoNonSeamlessAdaptiveness} also needs to be {@code true} for mixed mime type
+     * selections to be made. The default value is {@code false}.
+     */
+    public final boolean allowVideoMixedMimeTypeAdaptiveness;
+    /**
+     * Whether to allow adaptive video selections where adaptation may not be completely seamless.
+     * The default value is {@code true}.
+     */
+    public final boolean allowVideoNonSeamlessAdaptiveness;
     /**
      * Viewport width in pixels. Constrains video track selections for adaptive content so that only
      * tracks suitable for the viewport are selected. The default value is {@link Integer#MAX_VALUE}
@@ -664,6 +763,30 @@ public class DefaultTrackSelector extends MappingTrackSelector {
      * {@code null}.
      */
     @Nullable public final String preferredAudioLanguage;
+    /**
+     * Maximum allowed audio channel count. The default value is {@link Integer#MAX_VALUE} (i.e. no
+     * constraint).
+     */
+    public final int maxAudioChannelCount;
+    /**
+     * Maximum audio bitrate. The default value is {@link Integer#MAX_VALUE} (i.e. no constraint).
+     */
+    public final int maxAudioBitrate;
+    /**
+     * Whether to exceed the {@link #maxAudioChannelCount} and {@link #maxAudioBitrate} constraints
+     * when no selection can be made otherwise. The default value is {@code true}.
+     */
+    public final boolean exceedAudioConstraintsIfNecessary;
+    /**
+     * Whether to allow adaptive audio selections containing mixed mime types. Adaptations between
+     * different mime types may not be completely seamless. The default value is {@code false}.
+     */
+    public final boolean allowAudioMixedMimeTypeAdaptiveness;
+    /**
+     * Whether to allow adaptive audio selections containing mixed sample rates. Adaptations between
+     * different sample rates may not be completely seamless. The default value is {@code false}.
+     */
+    public final boolean allowAudioMixedSampleRateAdaptiveness;
 
     // Text
     /**
@@ -695,15 +818,12 @@ public class DefaultTrackSelector extends MappingTrackSelector {
      */
     public final boolean forceHighestSupportedBitrate;
     /**
-     * Whether to allow adaptive selections containing mixed mime types. The default value is {@code
-     * false}.
+     * @deprecated Use {@link #allowVideoMixedMimeTypeAdaptiveness} and {@link
+     *     #allowAudioMixedMimeTypeAdaptiveness}.
      */
-    public final boolean allowMixedMimeAdaptiveness;
-    /**
-     * Whether to allow adaptive selections where adaptation may not be completely seamless. The
-     * default value is {@code true}.
-     */
-    public final boolean allowNonSeamlessAdaptiveness;
+    @Deprecated public final boolean allowMixedMimeAdaptiveness;
+    /** @deprecated Use {@link #allowVideoNonSeamlessAdaptiveness}. */
+    @Deprecated public final boolean allowNonSeamlessAdaptiveness;
     /**
      * Whether to exceed renderer capabilities when no selection can be made otherwise.
      *
@@ -729,11 +849,18 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           /* maxVideoFrameRate= */ Integer.MAX_VALUE,
           /* maxVideoBitrate= */ Integer.MAX_VALUE,
           /* exceedVideoConstraintsIfNecessary= */ true,
+          /* allowVideoMixedMimeTypeAdaptiveness= */ false,
+          /* allowVideoNonSeamlessAdaptiveness= */ true,
           /* viewportWidth= */ Integer.MAX_VALUE,
           /* viewportHeight= */ Integer.MAX_VALUE,
           /* viewportOrientationMayChange= */ true,
           // Audio
           /* preferredAudioLanguage= */ null,
+          /* maxAudioChannelCount= */ Integer.MAX_VALUE,
+          /* maxAudioBitrate= */ Integer.MAX_VALUE,
+          /* exceedAudioConstraintsIfNecessary= */ true,
+          /* allowAudioMixedMimeTypeAdaptiveness= */ false,
+          /* allowAudioMixedSampleRateAdaptiveness= */ false,
           // Text
           /* preferredTextLanguage= */ null,
           /* selectUndeterminedTextLanguage= */ false,
@@ -741,8 +868,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           // General
           /* forceLowestBitrate= */ false,
           /* forceHighestSupportedBitrate= */ false,
-          /* allowMixedMimeAdaptiveness= */ false,
-          /* allowNonSeamlessAdaptiveness= */ true,
           /* exceedRendererCapabilitiesIfNecessary= */ true,
           /* tunnelingAudioSessionId= */ C.AUDIO_SESSION_ID_UNSET,
           // Overrides
@@ -757,11 +882,18 @@ public class DefaultTrackSelector extends MappingTrackSelector {
         int maxVideoFrameRate,
         int maxVideoBitrate,
         boolean exceedVideoConstraintsIfNecessary,
+        boolean allowVideoMixedMimeTypeAdaptiveness,
+        boolean allowVideoNonSeamlessAdaptiveness,
         int viewportWidth,
         int viewportHeight,
         boolean viewportOrientationMayChange,
         // Audio
         @Nullable String preferredAudioLanguage,
+        int maxAudioChannelCount,
+        int maxAudioBitrate,
+        boolean exceedAudioConstraintsIfNecessary,
+        boolean allowAudioMixedMimeTypeAdaptiveness,
+        boolean allowAudioMixedSampleRateAdaptiveness,
         // Text
         @Nullable String preferredTextLanguage,
         boolean selectUndeterminedTextLanguage,
@@ -769,8 +901,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
         // General
         boolean forceLowestBitrate,
         boolean forceHighestSupportedBitrate,
-        boolean allowMixedMimeAdaptiveness,
-        boolean allowNonSeamlessAdaptiveness,
         boolean exceedRendererCapabilitiesIfNecessary,
         int tunnelingAudioSessionId,
         // Overrides
@@ -782,11 +912,18 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       this.maxVideoFrameRate = maxVideoFrameRate;
       this.maxVideoBitrate = maxVideoBitrate;
       this.exceedVideoConstraintsIfNecessary = exceedVideoConstraintsIfNecessary;
+      this.allowVideoMixedMimeTypeAdaptiveness = allowVideoMixedMimeTypeAdaptiveness;
+      this.allowVideoNonSeamlessAdaptiveness = allowVideoNonSeamlessAdaptiveness;
       this.viewportWidth = viewportWidth;
       this.viewportHeight = viewportHeight;
       this.viewportOrientationMayChange = viewportOrientationMayChange;
       // Audio
       this.preferredAudioLanguage = Util.normalizeLanguageCode(preferredAudioLanguage);
+      this.maxAudioChannelCount = maxAudioChannelCount;
+      this.maxAudioBitrate = maxAudioBitrate;
+      this.exceedAudioConstraintsIfNecessary = exceedAudioConstraintsIfNecessary;
+      this.allowAudioMixedMimeTypeAdaptiveness = allowAudioMixedMimeTypeAdaptiveness;
+      this.allowAudioMixedSampleRateAdaptiveness = allowAudioMixedSampleRateAdaptiveness;
       // Text
       this.preferredTextLanguage = Util.normalizeLanguageCode(preferredTextLanguage);
       this.selectUndeterminedTextLanguage = selectUndeterminedTextLanguage;
@@ -794,13 +931,14 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       // General
       this.forceLowestBitrate = forceLowestBitrate;
       this.forceHighestSupportedBitrate = forceHighestSupportedBitrate;
-      this.allowMixedMimeAdaptiveness = allowMixedMimeAdaptiveness;
-      this.allowNonSeamlessAdaptiveness = allowNonSeamlessAdaptiveness;
       this.exceedRendererCapabilitiesIfNecessary = exceedRendererCapabilitiesIfNecessary;
       this.tunnelingAudioSessionId = tunnelingAudioSessionId;
       // Overrides
       this.selectionOverrides = selectionOverrides;
       this.rendererDisabledFlags = rendererDisabledFlags;
+      // Deprecated fields.
+      this.allowMixedMimeAdaptiveness = allowVideoMixedMimeTypeAdaptiveness;
+      this.allowNonSeamlessAdaptiveness = allowVideoNonSeamlessAdaptiveness;
     }
 
     /* package */ Parameters(Parcel in) {
@@ -810,11 +948,18 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       this.maxVideoFrameRate = in.readInt();
       this.maxVideoBitrate = in.readInt();
       this.exceedVideoConstraintsIfNecessary = Util.readBoolean(in);
+      this.allowVideoMixedMimeTypeAdaptiveness = Util.readBoolean(in);
+      this.allowVideoNonSeamlessAdaptiveness = Util.readBoolean(in);
       this.viewportWidth = in.readInt();
       this.viewportHeight = in.readInt();
       this.viewportOrientationMayChange = Util.readBoolean(in);
       // Audio
       this.preferredAudioLanguage = in.readString();
+      this.maxAudioChannelCount = in.readInt();
+      this.maxAudioBitrate = in.readInt();
+      this.exceedAudioConstraintsIfNecessary = Util.readBoolean(in);
+      this.allowAudioMixedMimeTypeAdaptiveness = Util.readBoolean(in);
+      this.allowAudioMixedSampleRateAdaptiveness = Util.readBoolean(in);
       // Text
       this.preferredTextLanguage = in.readString();
       this.selectUndeterminedTextLanguage = Util.readBoolean(in);
@@ -822,13 +967,14 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       // General
       this.forceLowestBitrate = Util.readBoolean(in);
       this.forceHighestSupportedBitrate = Util.readBoolean(in);
-      this.allowMixedMimeAdaptiveness = Util.readBoolean(in);
-      this.allowNonSeamlessAdaptiveness = Util.readBoolean(in);
       this.exceedRendererCapabilitiesIfNecessary = Util.readBoolean(in);
       this.tunnelingAudioSessionId = in.readInt();
       // Overrides
       this.selectionOverrides = readSelectionOverrides(in);
       this.rendererDisabledFlags = in.readSparseBooleanArray();
+      // Deprecated fields.
+      this.allowMixedMimeAdaptiveness = allowVideoMixedMimeTypeAdaptiveness;
+      this.allowNonSeamlessAdaptiveness = allowVideoNonSeamlessAdaptiveness;
     }
 
     /**
@@ -887,11 +1033,18 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           && maxVideoFrameRate == other.maxVideoFrameRate
           && maxVideoBitrate == other.maxVideoBitrate
           && exceedVideoConstraintsIfNecessary == other.exceedVideoConstraintsIfNecessary
+          && allowVideoMixedMimeTypeAdaptiveness == other.allowVideoMixedMimeTypeAdaptiveness
+          && allowVideoNonSeamlessAdaptiveness == other.allowVideoNonSeamlessAdaptiveness
           && viewportOrientationMayChange == other.viewportOrientationMayChange
           && viewportWidth == other.viewportWidth
           && viewportHeight == other.viewportHeight
           // Audio
           && TextUtils.equals(preferredAudioLanguage, other.preferredAudioLanguage)
+          && maxAudioChannelCount == other.maxAudioChannelCount
+          && maxAudioBitrate == other.maxAudioBitrate
+          && exceedAudioConstraintsIfNecessary == other.exceedAudioConstraintsIfNecessary
+          && allowAudioMixedMimeTypeAdaptiveness == other.allowAudioMixedMimeTypeAdaptiveness
+          && allowAudioMixedSampleRateAdaptiveness == other.allowAudioMixedSampleRateAdaptiveness
           // Text
           && TextUtils.equals(preferredTextLanguage, other.preferredTextLanguage)
           && selectUndeterminedTextLanguage == other.selectUndeterminedTextLanguage
@@ -899,8 +1052,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           // General
           && forceLowestBitrate == other.forceLowestBitrate
           && forceHighestSupportedBitrate == other.forceHighestSupportedBitrate
-          && allowMixedMimeAdaptiveness == other.allowMixedMimeAdaptiveness
-          && allowNonSeamlessAdaptiveness == other.allowNonSeamlessAdaptiveness
           && exceedRendererCapabilitiesIfNecessary == other.exceedRendererCapabilitiesIfNecessary
           && tunnelingAudioSessionId == other.tunnelingAudioSessionId
           // Overrides
@@ -917,12 +1068,19 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       result = 31 * result + maxVideoFrameRate;
       result = 31 * result + maxVideoBitrate;
       result = 31 * result + (exceedVideoConstraintsIfNecessary ? 1 : 0);
+      result = 31 * result + (allowVideoMixedMimeTypeAdaptiveness ? 1 : 0);
+      result = 31 * result + (allowVideoNonSeamlessAdaptiveness ? 1 : 0);
       result = 31 * result + (viewportOrientationMayChange ? 1 : 0);
       result = 31 * result + viewportWidth;
       result = 31 * result + viewportHeight;
       // Audio
       result =
           31 * result + (preferredAudioLanguage == null ? 0 : preferredAudioLanguage.hashCode());
+      result = 31 * result + maxAudioChannelCount;
+      result = 31 * result + maxAudioBitrate;
+      result = 31 * result + (exceedAudioConstraintsIfNecessary ? 1 : 0);
+      result = 31 * result + (allowAudioMixedMimeTypeAdaptiveness ? 1 : 0);
+      result = 31 * result + (allowAudioMixedSampleRateAdaptiveness ? 1 : 0);
       // Text
       result = 31 * result + (preferredTextLanguage == null ? 0 : preferredTextLanguage.hashCode());
       result = 31 * result + (selectUndeterminedTextLanguage ? 1 : 0);
@@ -930,8 +1088,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       // General
       result = 31 * result + (forceLowestBitrate ? 1 : 0);
       result = 31 * result + (forceHighestSupportedBitrate ? 1 : 0);
-      result = 31 * result + (allowMixedMimeAdaptiveness ? 1 : 0);
-      result = 31 * result + (allowNonSeamlessAdaptiveness ? 1 : 0);
       result = 31 * result + (exceedRendererCapabilitiesIfNecessary ? 1 : 0);
       result = 31 * result + tunnelingAudioSessionId;
       // Overrides (omitted from hashCode).
@@ -953,11 +1109,18 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       dest.writeInt(maxVideoFrameRate);
       dest.writeInt(maxVideoBitrate);
       Util.writeBoolean(dest, exceedVideoConstraintsIfNecessary);
+      Util.writeBoolean(dest, allowVideoMixedMimeTypeAdaptiveness);
+      Util.writeBoolean(dest, allowVideoNonSeamlessAdaptiveness);
       dest.writeInt(viewportWidth);
       dest.writeInt(viewportHeight);
       Util.writeBoolean(dest, viewportOrientationMayChange);
       // Audio
       dest.writeString(preferredAudioLanguage);
+      dest.writeInt(maxAudioChannelCount);
+      dest.writeInt(maxAudioBitrate);
+      Util.writeBoolean(dest, exceedAudioConstraintsIfNecessary);
+      Util.writeBoolean(dest, allowAudioMixedMimeTypeAdaptiveness);
+      Util.writeBoolean(dest, allowAudioMixedSampleRateAdaptiveness);
       // Text
       dest.writeString(preferredTextLanguage);
       Util.writeBoolean(dest, selectUndeterminedTextLanguage);
@@ -965,8 +1128,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       // General
       Util.writeBoolean(dest, forceLowestBitrate);
       Util.writeBoolean(dest, forceHighestSupportedBitrate);
-      Util.writeBoolean(dest, allowMixedMimeAdaptiveness);
-      Util.writeBoolean(dest, allowNonSeamlessAdaptiveness);
       Util.writeBoolean(dest, exceedRendererCapabilitiesIfNecessary);
       dest.writeInt(tunnelingAudioSessionId);
       // Overrides
@@ -1322,11 +1483,10 @@ public class DefaultTrackSelector extends MappingTrackSelector {
                     rendererTrackGroups.get(override.groupIndex), override.tracks[0]);
           } else {
             rendererTrackSelections[i] =
-                Assertions.checkNotNull(adaptiveTrackSelectionFactory)
-                    .createTrackSelection(
-                        rendererTrackGroups.get(override.groupIndex),
-                        getBandwidthMeter(),
-                        override.tracks);
+                adaptiveTrackSelectionFactory.createTrackSelection(
+                    rendererTrackGroups.get(override.groupIndex),
+                    getBandwidthMeter(),
+                    override.tracks);
           }
         }
       }
@@ -1508,11 +1668,12 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       TrackSelection.Factory adaptiveTrackSelectionFactory,
       BandwidthMeter bandwidthMeter)
       throws ExoPlaybackException {
-    int requiredAdaptiveSupport = params.allowNonSeamlessAdaptiveness
-        ? (RendererCapabilities.ADAPTIVE_NOT_SEAMLESS | RendererCapabilities.ADAPTIVE_SEAMLESS)
-        : RendererCapabilities.ADAPTIVE_SEAMLESS;
+    int requiredAdaptiveSupport =
+        params.allowVideoNonSeamlessAdaptiveness
+            ? (RendererCapabilities.ADAPTIVE_NOT_SEAMLESS | RendererCapabilities.ADAPTIVE_SEAMLESS)
+            : RendererCapabilities.ADAPTIVE_SEAMLESS;
     boolean allowMixedMimeTypes =
-        params.allowMixedMimeAdaptiveness
+        params.allowVideoMixedMimeTypeAdaptiveness
             && (mixedMimeTypeAdaptationSupports & requiredAdaptiveSupport) != 0;
     for (int i = 0; i < groups.length; i++) {
       TrackGroup group = groups.get(i);
@@ -1530,8 +1691,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
               params.viewportHeight,
               params.viewportOrientationMayChange);
       if (adaptiveTracks.length > 0) {
-        return Assertions.checkNotNull(adaptiveTrackSelectionFactory)
-            .createTrackSelection(group, bandwidthMeter, adaptiveTracks);
+        return adaptiveTrackSelectionFactory.createTrackSelection(
+            group, bandwidthMeter, adaptiveTracks);
       }
     }
     return null;
@@ -1758,6 +1919,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
    *     selection was made.
    * @throws ExoPlaybackException If an error occurs while selecting the tracks.
    */
+  @SuppressWarnings("unused")
   protected @Nullable Pair<TrackSelection, AudioTrackScore> selectAudioTrack(
       TrackGroupArray groups,
       int[][] formatSupports,
@@ -1777,6 +1939,10 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           Format format = trackGroup.getFormat(trackIndex);
           AudioTrackScore trackScore =
               new AudioTrackScore(format, params, trackFormatSupport[trackIndex]);
+          if (!trackScore.isWithinConstraints && !params.exceedAudioConstraintsIfNecessary) {
+            // Track should not be selected.
+            continue;
+          }
           if (selectedTrackScore == null || trackScore.compareTo(selectedTrackScore) > 0) {
             selectedGroupIndex = groupIndex;
             selectedTrackIndex = trackIndex;
@@ -1799,7 +1965,10 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       // If the group of the track with the highest score allows it, try to enable adaptation.
       int[] adaptiveTracks =
           getAdaptiveAudioTracks(
-              selectedGroup, formatSupports[selectedGroupIndex], params.allowMixedMimeAdaptiveness);
+              selectedGroup,
+              formatSupports[selectedGroupIndex],
+              params.allowAudioMixedMimeTypeAdaptiveness,
+              params.allowAudioMixedSampleRateAdaptiveness);
       if (adaptiveTracks.length > 0) {
         selection =
             adaptiveTrackSelectionFactory.createTrackSelection(
@@ -1814,18 +1983,27 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     return Pair.create(selection, Assertions.checkNotNull(selectedTrackScore));
   }
 
-  private static int[] getAdaptiveAudioTracks(TrackGroup group, int[] formatSupport,
-      boolean allowMixedMimeTypes) {
+  private static int[] getAdaptiveAudioTracks(
+      TrackGroup group,
+      int[] formatSupport,
+      boolean allowMixedMimeTypeAdaptiveness,
+      boolean allowMixedSampleRateAdaptiveness) {
     int selectedConfigurationTrackCount = 0;
     AudioConfigurationTuple selectedConfiguration = null;
     HashSet<AudioConfigurationTuple> seenConfigurationTuples = new HashSet<>();
     for (int i = 0; i < group.length; i++) {
       Format format = group.getFormat(i);
-      AudioConfigurationTuple configuration = new AudioConfigurationTuple(
-          format.channelCount, format.sampleRate,
-          allowMixedMimeTypes ? null : format.sampleMimeType);
+      AudioConfigurationTuple configuration =
+          new AudioConfigurationTuple(
+              format.channelCount, format.sampleRate, format.sampleMimeType);
       if (seenConfigurationTuples.add(configuration)) {
-        int configurationCount = getAdaptiveAudioTrackCount(group, formatSupport, configuration);
+        int configurationCount =
+            getAdaptiveAudioTrackCount(
+                group,
+                formatSupport,
+                configuration,
+                allowMixedMimeTypeAdaptiveness,
+                allowMixedSampleRateAdaptiveness);
         if (configurationCount > selectedConfigurationTrackCount) {
           selectedConfiguration = configuration;
           selectedConfigurationTrackCount = configurationCount;
@@ -1838,7 +2016,11 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       int index = 0;
       for (int i = 0; i < group.length; i++) {
         if (isSupportedAdaptiveAudioTrack(
-            group.getFormat(i), formatSupport[i], Assertions.checkNotNull(selectedConfiguration))) {
+            group.getFormat(i),
+            formatSupport[i],
+            Assertions.checkNotNull(selectedConfiguration),
+            allowMixedMimeTypeAdaptiveness,
+            allowMixedSampleRateAdaptiveness)) {
           adaptiveIndices[index++] = i;
         }
       }
@@ -1847,23 +2029,41 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     return NO_TRACKS;
   }
 
-  private static int getAdaptiveAudioTrackCount(TrackGroup group, int[] formatSupport,
-      AudioConfigurationTuple configuration) {
+  private static int getAdaptiveAudioTrackCount(
+      TrackGroup group,
+      int[] formatSupport,
+      AudioConfigurationTuple configuration,
+      boolean allowMixedMimeTypeAdaptiveness,
+      boolean allowMixedSampleRateAdaptiveness) {
     int count = 0;
     for (int i = 0; i < group.length; i++) {
-      if (isSupportedAdaptiveAudioTrack(group.getFormat(i), formatSupport[i], configuration)) {
+      if (isSupportedAdaptiveAudioTrack(
+          group.getFormat(i),
+          formatSupport[i],
+          configuration,
+          allowMixedMimeTypeAdaptiveness,
+          allowMixedSampleRateAdaptiveness)) {
         count++;
       }
     }
     return count;
   }
 
-  private static boolean isSupportedAdaptiveAudioTrack(Format format, int formatSupport,
-      AudioConfigurationTuple configuration) {
-    return isSupported(formatSupport, false) && format.channelCount == configuration.channelCount
-        && format.sampleRate == configuration.sampleRate
-        && (configuration.mimeType == null
-        || TextUtils.equals(configuration.mimeType, format.sampleMimeType));
+  private static boolean isSupportedAdaptiveAudioTrack(
+      Format format,
+      int formatSupport,
+      AudioConfigurationTuple configuration,
+      boolean allowMixedMimeTypeAdaptiveness,
+      boolean allowMixedSampleRateAdaptiveness) {
+    return isSupported(formatSupport, false)
+        && (format.channelCount != Format.NO_VALUE
+            && format.channelCount == configuration.channelCount)
+        && (allowMixedMimeTypeAdaptiveness
+            || (format.sampleMimeType != null
+                && TextUtils.equals(format.sampleMimeType, configuration.mimeType)))
+        && (allowMixedSampleRateAdaptiveness
+            || (format.sampleRate != Format.NO_VALUE
+                && format.sampleRate == configuration.sampleRate));
   }
 
   // Text track selection implementation.
@@ -2202,6 +2402,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
   /** Represents how well an audio track matches the selection {@link Parameters}. */
   protected static final class AudioTrackScore implements Comparable<AudioTrackScore> {
 
+    public final boolean isWithinConstraints;
+
     private final Parameters parameters;
     private final int withinRendererCapabilitiesScore;
     private final int matchLanguageScore;
@@ -2218,6 +2420,10 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       channelCount = format.channelCount;
       sampleRate = format.sampleRate;
       bitrate = format.bitrate;
+      isWithinConstraints =
+          (format.bitrate == Format.NO_VALUE || format.bitrate <= parameters.maxAudioBitrate)
+              && (format.channelCount == Format.NO_VALUE
+                  || format.channelCount <= parameters.maxAudioChannelCount);
     }
 
     /**
@@ -2236,6 +2442,9 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       if (this.matchLanguageScore != other.matchLanguageScore) {
         return compareInts(this.matchLanguageScore, other.matchLanguageScore);
       }
+      if (this.isWithinConstraints != other.isWithinConstraints) {
+        return this.isWithinConstraints ? 1 : -1;
+      }
       if (parameters.forceLowestBitrate) {
         int bitrateComparison = compareFormatValues(bitrate, other.bitrate);
         if (bitrateComparison != 0) {
@@ -2245,9 +2454,9 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       if (this.defaultSelectionFlagScore != other.defaultSelectionFlagScore) {
         return compareInts(this.defaultSelectionFlagScore, other.defaultSelectionFlagScore);
       }
-      // If the formats are within renderer capabilities then prefer higher values of channel count,
-      // sample rate and bit rate in that order. Otherwise, prefer lower values.
-      int resultSign = withinRendererCapabilitiesScore == 1 ? 1 : -1;
+      // If the formats are within constraints and renderer capabilities then prefer higher values
+      // of channel count, sample rate and bit rate in that order. Otherwise, prefer lower values.
+      int resultSign = isWithinConstraints && withinRendererCapabilitiesScore == 1 ? 1 : -1;
       if (this.channelCount != other.channelCount) {
         return resultSign * compareInts(this.channelCount, other.channelCount);
       }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
index 06fdaf9218..92dca1d4dd 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.trackselection;
 
+import static com.google.android.exoplayer2.RendererCapabilities.ADAPTIVE_NOT_SEAMLESS;
 import static com.google.android.exoplayer2.RendererCapabilities.FORMAT_EXCEEDS_CAPABILITIES;
 import static com.google.android.exoplayer2.RendererCapabilities.FORMAT_HANDLED;
 import static com.google.android.exoplayer2.RendererCapabilities.FORMAT_UNSUPPORTED_SUBTYPE;
@@ -132,21 +133,26 @@ public final class DefaultTrackSelectorTest {
             /* maxVideoFrameRate= */ 2,
             /* maxVideoBitrate= */ 3,
             /* exceedVideoConstraintsIfNecessary= */ false,
+            /* allowVideoMixedMimeTypeAdaptiveness= */ true,
+            /* allowVideoNonSeamlessAdaptiveness= */ false,
             /* viewportWidth= */ 4,
             /* viewportHeight= */ 5,
             /* viewportOrientationMayChange= */ true,
             // Audio
             /* preferredAudioLanguage= */ "en",
+            /* maxAudioChannelCount= */ 6,
+            /* maxAudioBitrate= */ 7,
+            /* exceedAudioConstraintsIfNecessary= */ false,
+            /* allowAudioMixedMimeTypeAdaptiveness= */ true,
+            /* allowAudioMixedSampleRateAdaptiveness= */ false,
             // Text
             /* preferredTextLanguage= */ "de",
-            /* selectUndeterminedTextLanguage= */ false,
-            /* disabledTextTrackSelectionFlags= */ 6,
+            /* selectUndeterminedTextLanguage= */ true,
+            /* disabledTextTrackSelectionFlags= */ 8,
             // General
-            /* forceLowestBitrate= */ true,
-            /* forceHighestSupportedBitrate= */ false,
-            /* allowMixedMimeAdaptiveness= */ true,
-            /* allowNonSeamlessAdaptiveness= */ false,
-            /* exceedRendererCapabilitiesIfNecessary= */ true,
+            /* forceLowestBitrate= */ false,
+            /* forceHighestSupportedBitrate= */ true,
+            /* exceedRendererCapabilitiesIfNecessary= */ false,
             /* tunnelingAudioSessionId= */ C.AUDIO_SESSION_ID_UNSET,
             // Overrides
             selectionOverrides,
@@ -1090,6 +1096,137 @@ public final class DefaultTrackSelectorTest {
     assertAdaptiveSelection(result.selections.get(0), trackGroups.get(0), 0, 1);
   }
 
+  @Test
+  public void testSelectTracksWithMultipleAudioTracksWithMixedSampleRates() throws Exception {
+    Format highSampleRateAudioFormat =
+        buildAudioFormatWithSampleRate("44100", /* sampleRate= */ 44100);
+    Format lowSampleRateAudioFormat =
+        buildAudioFormatWithSampleRate("22050", /* sampleRate= */ 22050);
+
+    // Should not adapt between mixed sample rates by default, so we expect a fixed selection
+    // containing the higher sample rate stream.
+    TrackGroupArray trackGroups =
+        singleTrackGroup(highSampleRateAudioFormat, lowSampleRateAudioFormat);
+    TrackSelectorResult result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroups, periodId, TIMELINE);
+    assertThat(result.length).isEqualTo(1);
+    assertFixedSelection(result.selections.get(0), trackGroups, highSampleRateAudioFormat);
+
+    // The same applies if the tracks are provided in the opposite order.
+    trackGroups = singleTrackGroup(lowSampleRateAudioFormat, highSampleRateAudioFormat);
+    result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroups, periodId, TIMELINE);
+    assertThat(result.length).isEqualTo(1);
+    assertFixedSelection(result.selections.get(0), trackGroups, highSampleRateAudioFormat);
+
+    // If we explicitly enable mixed sample rate adaptiveness, expect an adaptive selection.
+    trackSelector.setParameters(
+        Parameters.DEFAULT.buildUpon().setAllowAudioMixedSampleRateAdaptiveness(true));
+    result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroups, periodId, TIMELINE);
+    assertThat(result.length).isEqualTo(1);
+    assertAdaptiveSelection(result.selections.get(0), trackGroups.get(0), 0, 1);
+  }
+
+  @Test
+  public void testSelectTracksWithMultipleAudioTracksWithMixedMimeTypes() throws Exception {
+    Format aacAudioFormat = buildAudioFormatWithMimeType("aac", MimeTypes.AUDIO_AAC);
+    Format opusAudioFormat = buildAudioFormatWithMimeType("opus", MimeTypes.AUDIO_OPUS);
+
+    // Should not adapt between mixed mime types by default, so we expect a fixed selection
+    // containing the first stream.
+    TrackGroupArray trackGroups = singleTrackGroup(aacAudioFormat, opusAudioFormat);
+    TrackSelectorResult result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroups, periodId, TIMELINE);
+    assertThat(result.length).isEqualTo(1);
+    assertFixedSelection(result.selections.get(0), trackGroups, aacAudioFormat);
+
+    // The same applies if the tracks are provided in the opposite order.
+    trackGroups = singleTrackGroup(opusAudioFormat, aacAudioFormat);
+    result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroups, periodId, TIMELINE);
+    assertThat(result.length).isEqualTo(1);
+    assertFixedSelection(result.selections.get(0), trackGroups, opusAudioFormat);
+
+    // If we explicitly enable mixed mime type adaptiveness, expect an adaptive selection.
+    trackSelector.setParameters(
+        Parameters.DEFAULT.buildUpon().setAllowAudioMixedMimeTypeAdaptiveness(true));
+    result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroups, periodId, TIMELINE);
+    assertThat(result.length).isEqualTo(1);
+    assertAdaptiveSelection(result.selections.get(0), trackGroups.get(0), 0, 1);
+  }
+
+  @Test
+  public void testSelectTracksWithMultipleAudioTracksWithMixedChannelCounts() throws Exception {
+    Format stereoAudioFormat =
+        buildAudioFormatWithChannelCount("2-channels", /* channelCount= */ 2);
+    Format surroundAudioFormat =
+        buildAudioFormatWithChannelCount("5-channels", /* channelCount= */ 5);
+
+    // Should not adapt between different channel counts, so we expect a fixed selection containing
+    // the track with more channels.
+    TrackGroupArray trackGroups = singleTrackGroup(stereoAudioFormat, surroundAudioFormat);
+    TrackSelectorResult result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroups, periodId, TIMELINE);
+    assertThat(result.length).isEqualTo(1);
+    assertFixedSelection(result.selections.get(0), trackGroups, surroundAudioFormat);
+
+    // The same applies if the tracks are provided in the opposite order.
+    trackGroups = singleTrackGroup(surroundAudioFormat, stereoAudioFormat);
+    result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroups, periodId, TIMELINE);
+    assertThat(result.length).isEqualTo(1);
+    assertFixedSelection(result.selections.get(0), trackGroups, surroundAudioFormat);
+
+    // If we constrain the channel count to 4 we expect a fixed selection containing the track with
+    // fewer channels.
+    trackSelector.setParameters(Parameters.DEFAULT.buildUpon().setMaxAudioChannelCount(4));
+    result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroups, periodId, TIMELINE);
+    assertThat(result.length).isEqualTo(1);
+    assertFixedSelection(result.selections.get(0), trackGroups, stereoAudioFormat);
+
+    // If we constrain the channel count to 2 we expect a fixed selection containing the track with
+    // fewer channels.
+    trackSelector.setParameters(Parameters.DEFAULT.buildUpon().setMaxAudioChannelCount(2));
+    result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroups, periodId, TIMELINE);
+    assertThat(result.length).isEqualTo(1);
+    assertFixedSelection(result.selections.get(0), trackGroups, stereoAudioFormat);
+
+    // If we constrain the channel count to 1 we expect a fixed selection containing the track with
+    // fewer channels.
+    trackSelector.setParameters(Parameters.DEFAULT.buildUpon().setMaxAudioChannelCount(1));
+    result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroups, periodId, TIMELINE);
+    assertThat(result.length).isEqualTo(1);
+    assertFixedSelection(result.selections.get(0), trackGroups, stereoAudioFormat);
+
+    // If we disable exceeding of constraints we expect no selection.
+    trackSelector.setParameters(
+        Parameters.DEFAULT
+            .buildUpon()
+            .setMaxAudioChannelCount(1)
+            .setExceedAudioConstraintsIfNecessary(false));
+    result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroups, periodId, TIMELINE);
+    assertThat(result.length).isEqualTo(1);
+    assertNoSelection(result.selections.get(0));
+  }
+
   @Test
   public void testSelectTracksWithMultipleAudioTracksOverrideReturnsAdaptiveTrackSelection()
       throws Exception {
@@ -1164,6 +1301,70 @@ public final class DefaultTrackSelectorTest {
     assertAdaptiveSelection(result.selections.get(0), trackGroups.get(0), 0, 1);
   }
 
+  @Test
+  public void testSelectTracksWithMultipleVideoTracksWithNonSeamlessAdaptiveness()
+      throws Exception {
+    FakeRendererCapabilities nonSeamlessVideoCapabilities =
+        new FakeRendererCapabilities(C.TRACK_TYPE_VIDEO, FORMAT_HANDLED | ADAPTIVE_NOT_SEAMLESS);
+
+    // Should do non-seamless adaptiveness by default, so expect an adaptive selection.
+    TrackGroupArray trackGroups = singleTrackGroup(buildVideoFormat("0"), buildVideoFormat("1"));
+    trackSelector.setParameters(
+        Parameters.DEFAULT.buildUpon().setAllowVideoNonSeamlessAdaptiveness(true));
+    TrackSelectorResult result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {nonSeamlessVideoCapabilities},
+            trackGroups,
+            periodId,
+            TIMELINE);
+    assertThat(result.length).isEqualTo(1);
+    assertAdaptiveSelection(result.selections.get(0), trackGroups.get(0), 0, 1);
+
+    // If we explicitly disable non-seamless adaptiveness, expect a fixed selection.
+    trackSelector.setParameters(
+        Parameters.DEFAULT.buildUpon().setAllowVideoNonSeamlessAdaptiveness(false));
+    result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {nonSeamlessVideoCapabilities},
+            trackGroups,
+            periodId,
+            TIMELINE);
+    assertThat(result.length).isEqualTo(1);
+    assertFixedSelection(result.selections.get(0), trackGroups.get(0), 0);
+  }
+
+  @Test
+  public void testSelectTracksWithMultipleVideoTracksWithMixedMimeTypes() throws Exception {
+    Format h264VideoFormat = buildVideoFormatWithMimeType("h264", MimeTypes.VIDEO_H264);
+    Format h265VideoFormat = buildVideoFormatWithMimeType("h265", MimeTypes.VIDEO_H265);
+
+    // Should not adapt between mixed mime types by default, so we expect a fixed selection
+    // containing the first stream.
+    TrackGroupArray trackGroups = singleTrackGroup(h264VideoFormat, h265VideoFormat);
+    TrackSelectorResult result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {VIDEO_CAPABILITIES}, trackGroups, periodId, TIMELINE);
+    assertThat(result.length).isEqualTo(1);
+    assertFixedSelection(result.selections.get(0), trackGroups, h264VideoFormat);
+
+    // The same applies if the tracks are provided in the opposite order.
+    trackGroups = singleTrackGroup(h265VideoFormat, h264VideoFormat);
+    result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {VIDEO_CAPABILITIES}, trackGroups, periodId, TIMELINE);
+    assertThat(result.length).isEqualTo(1);
+    assertFixedSelection(result.selections.get(0), trackGroups, h265VideoFormat);
+
+    // If we explicitly enable mixed mime type adaptiveness, expect an adaptive selection.
+    trackSelector.setParameters(
+        Parameters.DEFAULT.buildUpon().setAllowVideoMixedMimeTypeAdaptiveness(true));
+    result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {VIDEO_CAPABILITIES}, trackGroups, periodId, TIMELINE);
+    assertThat(result.length).isEqualTo(1);
+    assertAdaptiveSelection(result.selections.get(0), trackGroups.get(0), 0, 1);
+  }
+
   @Test
   public void testSelectTracksWithMultipleVideoTracksOverrideReturnsAdaptiveTrackSelection()
       throws Exception {
@@ -1277,6 +1478,36 @@ public final class DefaultTrackSelectorTest {
         /* sampleRate= */ 44100);
   }
 
+  private static Format buildAudioFormatWithSampleRate(String id, int sampleRate) {
+    return buildAudioFormat(
+        id,
+        MimeTypes.AUDIO_AAC,
+        /* language= */ null,
+        /* selectionFlags= */ 0,
+        /* channelCount= */ 2,
+        sampleRate);
+  }
+
+  private static Format buildAudioFormatWithChannelCount(String id, int channelCount) {
+    return buildAudioFormat(
+        id,
+        MimeTypes.AUDIO_AAC,
+        /* language= */ null,
+        /* selectionFlags= */ 0,
+        channelCount,
+        /* sampleRate= */ 44100);
+  }
+
+  private static Format buildAudioFormatWithMimeType(String id, String mimeType) {
+    return buildAudioFormat(
+        id,
+        mimeType,
+        /* language= */ null,
+        /* selectionFlags= */ 0,
+        /* channelCount= */ 2,
+        /* sampleRate= */ 44100);
+  }
+
   private static Format buildAudioFormat(String id) {
     return buildAudioFormat(
         id,

From 053a7bc0b9af79e183ec5b5fed7f0501dbd79348 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 29 Oct 2018 12:25:39 -0700
Subject: [PATCH 136/832] Simplify DefaultDrmSession event handling

- Handling EVENT_PROVISION_REQUIRED is unnecessary because we handle
  it via NotProvisionedException, which was thrown on all API levels.
- Handling EVENT_KEY_EXPIRED during playback is unnecessary. All it
  does is cause an error to be thrown, but an error will be thrown
  anyway out of the MediaCodec when it tries to use the expired keys.
  It's currently a race condition where the error gets thrown from,
  where-as having it always be thrown from one place is preferable.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219172021
---
 .../exoplayer2/drm/DefaultDrmSession.java     | 24 ++-----------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
index 514d9da073..faf4b68f10 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
@@ -207,18 +207,11 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
     return Arrays.equals(this.sessionId, sessionId);
   }
 
-  @SuppressWarnings("deprecation")
   public void onMediaDrmEvent(int what) {
     switch (what) {
-      case ExoMediaDrm.EVENT_PROVISION_REQUIRED:
-        onProvisionRequired();
-        break;
       case ExoMediaDrm.EVENT_KEY_REQUIRED:
         onKeysRequired();
         break;
-      case ExoMediaDrm.EVENT_KEY_EXPIRED:
-        onKeysExpired();
-        break;
       default:
         break;
     }
@@ -434,23 +427,10 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
     }
   }
 
-  private void onProvisionRequired() {
-    if (mode == DefaultDrmSessionManager.MODE_PLAYBACK && isOpen()) {
-      state = STATE_OPENED;
-      provisioningManager.provisionRequired(this);
-    }
-  }
-
   private void onKeysRequired() {
-    if (mode == DefaultDrmSessionManager.MODE_PLAYBACK && isOpen()) {
-      doLicense(/* allowRetry= */ false);
-    }
-  }
-
-  private void onKeysExpired() {
     if (mode == DefaultDrmSessionManager.MODE_PLAYBACK && state == STATE_OPENED_WITH_KEYS) {
-      state = STATE_OPENED;
-      onError(new KeysExpiredException());
+      Util.castNonNull(sessionId);
+      doLicense(/* allowRetry= */ false);
     }
   }
 

From 4b9530c214d9d5ac0e3db7421b10224daf0efd34 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 30 Oct 2018 02:19:08 -0700
Subject: [PATCH 137/832] Let apps specify whether to focus skip button on ATV

Issue: #5019

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219267048
---
 RELEASENOTES.md                               |  2 ++
 .../exoplayer2/ext/ima/ImaAdsLoader.java      | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 4ea4610b84..a52a076014 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -34,6 +34,8 @@
 * IMA extension:
   * For preroll to live stream transitions, project forward the loading position
     to avoid being behind the live window.
+  * Let apps specify whether to focus the skip button on ATV
+    ([#5019](https://github.com/google/ExoPlayer/issues/5019)).
 * Support for playing spherical videos on Daydream.
 * Fix issue where a `NullPointerException` is thrown when removing an unprepared
   media source from a `ConcatenatingMediaSource` with the `useLazyPreparation`
diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
index 95a3a588b4..cc621c6218 100644
--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
+++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
@@ -93,6 +93,7 @@ public final class ImaAdsLoader
     private @Nullable AdEventListener adEventListener;
     private int vastLoadTimeoutMs;
     private int mediaLoadTimeoutMs;
+    private boolean focusSkipButtonWhenAvailable;
     private ImaFactory imaFactory;
 
     /**
@@ -104,6 +105,7 @@ public final class ImaAdsLoader
       this.context = Assertions.checkNotNull(context);
       vastLoadTimeoutMs = TIMEOUT_UNSET;
       mediaLoadTimeoutMs = TIMEOUT_UNSET;
+      focusSkipButtonWhenAvailable = true;
       imaFactory = new DefaultImaFactory();
     }
 
@@ -159,6 +161,20 @@ public final class ImaAdsLoader
       return this;
     }
 
+    /**
+     * Sets whether to focus the skip button (when available) on Android TV devices. The default
+     * setting is {@code true}.
+     *
+     * @param focusSkipButtonWhenAvailable Whether to focus the skip button (when available) on
+     *     Android TV devices.
+     * @return This builder, for convenience.
+     * @see AdsRenderingSettings#setFocusSkipButtonWhenAvailable(boolean)
+     */
+    public Builder setFocusSkipButtonWhenAvailable(boolean focusSkipButtonWhenAvailable) {
+      this.focusSkipButtonWhenAvailable = focusSkipButtonWhenAvailable;
+      return this;
+    }
+
     // @VisibleForTesting
     /* package */ Builder setImaFactory(ImaFactory imaFactory) {
       this.imaFactory = Assertions.checkNotNull(imaFactory);
@@ -181,6 +197,7 @@ public final class ImaAdsLoader
           null,
           vastLoadTimeoutMs,
           mediaLoadTimeoutMs,
+          focusSkipButtonWhenAvailable,
           adEventListener,
           imaFactory);
     }
@@ -200,6 +217,7 @@ public final class ImaAdsLoader
           adsResponse,
           vastLoadTimeoutMs,
           mediaLoadTimeoutMs,
+          focusSkipButtonWhenAvailable,
           adEventListener,
           imaFactory);
     }
@@ -252,6 +270,7 @@ public final class ImaAdsLoader
   private final @Nullable String adsResponse;
   private final int vastLoadTimeoutMs;
   private final int mediaLoadTimeoutMs;
+  private final boolean focusSkipButtonWhenAvailable;
   private final @Nullable AdEventListener adEventListener;
   private final ImaFactory imaFactory;
   private final Timeline.Period period;
@@ -338,6 +357,7 @@ public final class ImaAdsLoader
         /* adsResponse= */ null,
         /* vastLoadTimeoutMs= */ TIMEOUT_UNSET,
         /* mediaLoadTimeoutMs= */ TIMEOUT_UNSET,
+        /* focusSkipButtonWhenAvailable= */ true,
         /* adEventListener= */ null,
         /* imaFactory= */ new DefaultImaFactory());
   }
@@ -362,6 +382,7 @@ public final class ImaAdsLoader
         /* adsResponse= */ null,
         /* vastLoadTimeoutMs= */ TIMEOUT_UNSET,
         /* mediaLoadTimeoutMs= */ TIMEOUT_UNSET,
+        /* focusSkipButtonWhenAvailable= */ true,
         /* adEventListener= */ null,
         /* imaFactory= */ new DefaultImaFactory());
   }
@@ -373,6 +394,7 @@ public final class ImaAdsLoader
       @Nullable String adsResponse,
       int vastLoadTimeoutMs,
       int mediaLoadTimeoutMs,
+      boolean focusSkipButtonWhenAvailable,
       @Nullable AdEventListener adEventListener,
       ImaFactory imaFactory) {
     Assertions.checkArgument(adTagUri != null || adsResponse != null);
@@ -380,6 +402,7 @@ public final class ImaAdsLoader
     this.adsResponse = adsResponse;
     this.vastLoadTimeoutMs = vastLoadTimeoutMs;
     this.mediaLoadTimeoutMs = mediaLoadTimeoutMs;
+    this.focusSkipButtonWhenAvailable = focusSkipButtonWhenAvailable;
     this.adEventListener = adEventListener;
     this.imaFactory = imaFactory;
     if (imaSdkSettings == null) {
@@ -926,6 +949,7 @@ public final class ImaAdsLoader
     if (mediaLoadTimeoutMs != TIMEOUT_UNSET) {
       adsRenderingSettings.setLoadVideoTimeout(mediaLoadTimeoutMs);
     }
+    adsRenderingSettings.setFocusSkipButtonWhenAvailable(focusSkipButtonWhenAvailable);
 
     // Set up the ad playback state, skipping ads based on the start position as required.
     long[] adGroupTimesUs = getAdGroupTimesUs(adsManager.getAdCuePoints());

From 1094da2b61a05cacef7036ce1bb81c698bab90f8 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Wed, 31 Oct 2018 02:42:14 -0700
Subject: [PATCH 138/832] Fix player state transitions for postroll ads

Before this change, the player state would be STATE_ENDED then
STATE_BUFFERING (when the postroll ad was marked as played) then
STATE_ENDED again.

Queueing a final content media period with start point equal to
the content duration after a postroll ensures that the player
state doesn't change to STATE_ENDED transiently.

Switch from using C.TIME_END_OF_SOURCE to C.TIME_UNSET for media
periods that should not have an end point and are not followed
by an ad.

Content media periods before postrolls have end position
C.TIME_END_OF_SOURCE. If the postroll ad loads, its content
position is set to the content duration, which should be known
at the point of loading the postroll, then a final 'empty'
content media period with start position equal to its duration
is queued. If the postroll fails to load, this empty content
media period is queued up directly after the preceding content
media period.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219443683
---
 .../exoplayer2/ext/ima/ImaAdsLoader.java      |   3 +-
 .../android/exoplayer2/MediaPeriodHolder.java |  53 ++--
 .../android/exoplayer2/MediaPeriodInfo.java   |  35 ++-
 .../android/exoplayer2/MediaPeriodQueue.java  |  96 ++-----
 .../google/android/exoplayer2/Timeline.java   |   2 +-
 .../exoplayer2/source/MediaSource.java        |  13 +-
 .../source/ads/AdPlaybackState.java           |  20 +-
 .../exoplayer2/MediaPeriodQueueTest.java      | 257 ++++++++++++++++++
 library/ui/src/main/res/values-af/strings.xml |   2 +-
 library/ui/src/main/res/values-am/strings.xml |   2 +-
 library/ui/src/main/res/values-ar/strings.xml |   2 +-
 library/ui/src/main/res/values-az/strings.xml |   2 +-
 .../src/main/res/values-b+sr+Latn/strings.xml |   2 +-
 library/ui/src/main/res/values-be/strings.xml |   2 +-
 library/ui/src/main/res/values-bg/strings.xml |   2 +-
 library/ui/src/main/res/values-bs/strings.xml |   2 +-
 library/ui/src/main/res/values-ca/strings.xml |   2 +-
 library/ui/src/main/res/values-cs/strings.xml |   2 +-
 library/ui/src/main/res/values-da/strings.xml |   2 +-
 library/ui/src/main/res/values-de/strings.xml |   2 +-
 library/ui/src/main/res/values-el/strings.xml |   2 +-
 .../ui/src/main/res/values-es-rUS/strings.xml |   2 +-
 library/ui/src/main/res/values-es/strings.xml |   2 +-
 library/ui/src/main/res/values-et/strings.xml |   2 +-
 library/ui/src/main/res/values-eu/strings.xml |   2 +-
 library/ui/src/main/res/values-fa/strings.xml |   2 +-
 library/ui/src/main/res/values-fi/strings.xml |   2 +-
 .../ui/src/main/res/values-fr-rCA/strings.xml |   2 +-
 library/ui/src/main/res/values-fr/strings.xml |   2 +-
 library/ui/src/main/res/values-gl/strings.xml |   2 +-
 library/ui/src/main/res/values-hi/strings.xml |   2 +-
 library/ui/src/main/res/values-hr/strings.xml |   2 +-
 library/ui/src/main/res/values-hu/strings.xml |   2 +-
 library/ui/src/main/res/values-hy/strings.xml |   2 +-
 library/ui/src/main/res/values-in/strings.xml |   2 +-
 library/ui/src/main/res/values-is/strings.xml |   2 +-
 library/ui/src/main/res/values-it/strings.xml |   2 +-
 library/ui/src/main/res/values-ja/strings.xml |   2 +-
 library/ui/src/main/res/values-ka/strings.xml |   2 +-
 library/ui/src/main/res/values-kk/strings.xml |   2 +-
 library/ui/src/main/res/values-km/strings.xml |   2 +-
 library/ui/src/main/res/values-ko/strings.xml |   2 +-
 library/ui/src/main/res/values-ky/strings.xml |   2 +-
 library/ui/src/main/res/values-lt/strings.xml |   2 +-
 library/ui/src/main/res/values-lv/strings.xml |   2 +-
 library/ui/src/main/res/values-mk/strings.xml |   2 +-
 library/ui/src/main/res/values-mn/strings.xml |   2 +-
 library/ui/src/main/res/values-mr/strings.xml |   2 +-
 library/ui/src/main/res/values-ms/strings.xml |   2 +-
 library/ui/src/main/res/values-my/strings.xml |   2 +-
 library/ui/src/main/res/values-nb/strings.xml |   2 +-
 library/ui/src/main/res/values-nl/strings.xml |   2 +-
 library/ui/src/main/res/values-pl/strings.xml |   2 +-
 .../ui/src/main/res/values-pt-rPT/strings.xml |   2 +-
 library/ui/src/main/res/values-pt/strings.xml |   2 +-
 library/ui/src/main/res/values-ro/strings.xml |   2 +-
 library/ui/src/main/res/values-ru/strings.xml |   2 +-
 library/ui/src/main/res/values-sk/strings.xml |   2 +-
 library/ui/src/main/res/values-sl/strings.xml |   2 +-
 library/ui/src/main/res/values-sq/strings.xml |   2 +-
 library/ui/src/main/res/values-sr/strings.xml |   2 +-
 library/ui/src/main/res/values-sv/strings.xml |   2 +-
 library/ui/src/main/res/values-sw/strings.xml |   2 +-
 library/ui/src/main/res/values-th/strings.xml |   2 +-
 library/ui/src/main/res/values-tr/strings.xml |   2 +-
 library/ui/src/main/res/values-uk/strings.xml |   2 +-
 library/ui/src/main/res/values-uz/strings.xml |   2 +-
 library/ui/src/main/res/values-vi/strings.xml |   2 +-
 .../ui/src/main/res/values-zh-rCN/strings.xml |   2 +-
 .../ui/src/main/res/values-zh-rHK/strings.xml |   2 +-
 .../ui/src/main/res/values-zh-rTW/strings.xml |   2 +-
 library/ui/src/main/res/values-zu/strings.xml |   2 +-
 72 files changed, 443 insertions(+), 164 deletions(-)
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java

diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
index cc621c6218..71bc048902 100644
--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
+++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
@@ -666,7 +666,8 @@ public final class ImaAdsLoader
       // until MAXIMUM_PRELOAD_DURATION_MS before the ad so that an ad group load error delivered
       // just after an ad group isn't incorrectly attributed to the next ad group.
       int nextAdGroupIndex =
-          adPlaybackState.getAdGroupIndexAfterPositionUs(C.msToUs(contentPositionMs));
+          adPlaybackState.getAdGroupIndexAfterPositionUs(
+              C.msToUs(contentPositionMs), C.msToUs(contentDurationMs));
       if (nextAdGroupIndex != expectedAdGroupIndex && nextAdGroupIndex != C.INDEX_UNSET) {
         long nextAdGroupTimeMs = C.usToMs(adPlaybackState.adGroupTimesUs[nextAdGroupIndex]);
         if (nextAdGroupTimeMs == C.TIME_END_OF_SOURCE) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
index 4fc21475d9..7becac7b55 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
@@ -20,6 +20,7 @@ import com.google.android.exoplayer2.source.ClippingMediaPeriod;
 import com.google.android.exoplayer2.source.EmptySampleStream;
 import com.google.android.exoplayer2.source.MediaPeriod;
 import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 import com.google.android.exoplayer2.source.SampleStream;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
@@ -88,16 +89,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     this.info = info;
     sampleStreams = new SampleStream[rendererCapabilities.length];
     mayRetainStreamFlags = new boolean[rendererCapabilities.length];
-    MediaPeriod mediaPeriod = mediaSource.createPeriod(info.id, allocator);
-    if (info.id.endPositionUs != C.TIME_END_OF_SOURCE) {
-      mediaPeriod =
-          new ClippingMediaPeriod(
-              mediaPeriod,
-              /* enableInitialDiscontinuity= */ true,
-              /* startUs= */ 0,
-              info.id.endPositionUs);
-    }
-    this.mediaPeriod = mediaPeriod;
+    mediaPeriod = createMediaPeriod(info.id, mediaSource, allocator);
   }
 
   /**
@@ -302,16 +294,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   public void release() {
     disableTrackSelectionsInResult();
     trackSelectorResult = null;
-    try {
-      if (info.id.endPositionUs != C.TIME_END_OF_SOURCE) {
-        mediaSource.releasePeriod(((ClippingMediaPeriod) mediaPeriod).mediaPeriod);
-      } else {
-        mediaSource.releasePeriod(mediaPeriod);
-      }
-    } catch (RuntimeException e) {
-      // There's nothing we can do.
-      Log.e(TAG, "Period release failed.", e);
-    }
+    releaseMediaPeriod(info.id, mediaSource, mediaPeriod);
   }
 
   /**
@@ -413,4 +396,34 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   private boolean isLoadingMediaPeriod() {
     return next == null;
   }
+
+  /** Returns a media period corresponding to the given {@code id}. */
+  private static MediaPeriod createMediaPeriod(
+      MediaPeriodId id, MediaSource mediaSource, Allocator allocator) {
+    MediaPeriod mediaPeriod = mediaSource.createPeriod(id, allocator);
+    if (id.endPositionUs != C.TIME_UNSET && id.endPositionUs != C.TIME_END_OF_SOURCE) {
+      mediaPeriod =
+          new ClippingMediaPeriod(
+              mediaPeriod,
+              /* enableInitialDiscontinuity= */ true,
+              /* startUs= */ 0,
+              id.endPositionUs);
+    }
+    return mediaPeriod;
+  }
+
+  /** Releases the given {@code mediaPeriod}, logging and suppressing any errors. */
+  private static void releaseMediaPeriod(
+      MediaPeriodId id, MediaSource mediaSource, MediaPeriod mediaPeriod) {
+    try {
+      if (id.endPositionUs != C.TIME_UNSET && id.endPositionUs != C.TIME_END_OF_SOURCE) {
+        mediaSource.releasePeriod(((ClippingMediaPeriod) mediaPeriod).mediaPeriod);
+      } else {
+        mediaSource.releasePeriod(mediaPeriod);
+      }
+    } catch (RuntimeException e) {
+      // There's nothing we can do.
+      Log.e(TAG, "Period release failed.", e);
+    }
+  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfo.java
index ba19b54c3f..e57100931e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfo.java
@@ -15,8 +15,10 @@
  */
 package com.google.android.exoplayer2;
 
+import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.source.MediaPeriod;
 import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
+import com.google.android.exoplayer2.util.Util;
 
 /** Stores the information required to load and play a {@link MediaPeriod}. */
 /* package */ final class MediaPeriodInfo {
@@ -32,8 +34,8 @@ import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
   public final long contentPositionUs;
   /**
    * The duration of the media period, like {@link MediaPeriodId#endPositionUs} but with {@link
-   * C#TIME_END_OF_SOURCE} resolved to the timeline period duration. May be {@link C#TIME_UNSET} if
-   * the end position is not known.
+   * C#TIME_END_OF_SOURCE} and {@link C#TIME_UNSET} resolved to the timeline period duration if
+   * known.
    */
   public final long durationUs;
   /**
@@ -72,4 +74,33 @@ import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
         isLastInTimelinePeriod,
         isFinal);
   }
+
+  @Override
+  public boolean equals(@Nullable Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    MediaPeriodInfo that = (MediaPeriodInfo) o;
+    return startPositionUs == that.startPositionUs
+        && contentPositionUs == that.contentPositionUs
+        && durationUs == that.durationUs
+        && isLastInTimelinePeriod == that.isLastInTimelinePeriod
+        && isFinal == that.isFinal
+        && Util.areEqual(id, that.id);
+  }
+
+  @Override
+  public int hashCode() {
+    int result = 17;
+    result = 31 * result + id.hashCode();
+    result = 31 * result + (int) startPositionUs;
+    result = 31 * result + (int) contentPositionUs;
+    result = 31 * result + (int) durationUs;
+    result = 31 * result + (isLastInTimelinePeriod ? 1 : 0);
+    result = 31 * result + (isFinal ? 1 : 0);
+    return result;
+  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
index 40bc658953..de09fc13a1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
@@ -351,17 +351,18 @@ import com.google.android.exoplayer2.util.Assertions;
    * @return The updated media period info for the current timeline.
    */
   public MediaPeriodInfo getUpdatedMediaPeriodInfo(MediaPeriodInfo info) {
-    boolean isLastInPeriod = isLastInPeriod(info.id);
-    boolean isLastInTimeline = isLastInTimeline(info.id, isLastInPeriod);
+    MediaPeriodId id = info.id;
+    boolean isLastInPeriod = isLastInPeriod(id);
+    boolean isLastInTimeline = isLastInTimeline(id, isLastInPeriod);
     timeline.getPeriodByUid(info.id.periodUid, period);
     long durationUs =
-        info.id.isAd()
-            ? period.getAdDurationUs(info.id.adGroupIndex, info.id.adIndexInAdGroup)
-            : (info.id.endPositionUs == C.TIME_END_OF_SOURCE
+        id.isAd()
+            ? period.getAdDurationUs(id.adGroupIndex, id.adIndexInAdGroup)
+            : (id.endPositionUs == C.TIME_UNSET || id.endPositionUs == C.TIME_END_OF_SOURCE
                 ? period.getDurationUs()
-                : info.id.endPositionUs);
+                : id.endPositionUs);
     return new MediaPeriodInfo(
-        info.id,
+        id,
         info.startPositionUs,
         info.contentPositionUs,
         durationUs,
@@ -404,7 +405,7 @@ import com.google.android.exoplayer2.util.Assertions;
       int nextAdGroupIndex = period.getAdGroupIndexAfterPositionUs(positionUs);
       long endPositionUs =
           nextAdGroupIndex == C.INDEX_UNSET
-              ? C.TIME_END_OF_SOURCE
+              ? C.TIME_UNSET
               : period.getAdGroupTimeUs(nextAdGroupIndex);
       return new MediaPeriodId(periodUid, windowSequenceNumber, endPositionUs);
     } else {
@@ -580,7 +581,8 @@ import com.google.android.exoplayer2.util.Assertions;
       }
       MediaPeriodId periodId =
           resolveMediaPeriodIdForAds(nextPeriodUid, startPositionUs, windowSequenceNumber);
-      return getMediaPeriodInfo(periodId, startPositionUs, startPositionUs);
+      return getMediaPeriodInfo(
+          periodId, /* contentPositionUs= */ startPositionUs, startPositionUs);
     }
 
     MediaPeriodId currentPeriodId = mediaPeriodInfo.id;
@@ -626,14 +628,14 @@ import com.google.android.exoplayer2.util.Assertions;
         return getMediaPeriodInfoForContent(
             currentPeriodId.periodUid, startPositionUs, currentPeriodId.windowSequenceNumber);
       }
-    } else if (mediaPeriodInfo.id.endPositionUs != C.TIME_END_OF_SOURCE) {
+    } else {
       // Play the next ad group if it's available.
       int nextAdGroupIndex = period.getAdGroupIndexForPositionUs(mediaPeriodInfo.id.endPositionUs);
       if (nextAdGroupIndex == C.INDEX_UNSET) {
-        // The next ad group can't be played. Play content from the ad group position instead.
+        // The next ad group can't be played. Play content from the previous end position instead.
         return getMediaPeriodInfoForContent(
             currentPeriodId.periodUid,
-            mediaPeriodInfo.id.endPositionUs,
+            /* startPositionUs= */ mediaPeriodInfo.durationUs,
             currentPeriodId.windowSequenceNumber);
       }
       int adIndexInAdGroup = period.getFirstAdIndexToPlay(nextAdGroupIndex);
@@ -643,30 +645,8 @@ import com.google.android.exoplayer2.util.Assertions;
               currentPeriodId.periodUid,
               nextAdGroupIndex,
               adIndexInAdGroup,
-              mediaPeriodInfo.id.endPositionUs,
+              /* contentPositionUs= */ mediaPeriodInfo.durationUs,
               currentPeriodId.windowSequenceNumber);
-    } else {
-      // Check if the postroll ad should be played.
-      int adGroupCount = period.getAdGroupCount();
-      if (adGroupCount == 0) {
-        return null;
-      }
-      int adGroupIndex = adGroupCount - 1;
-      if (period.getAdGroupTimeUs(adGroupIndex) != C.TIME_END_OF_SOURCE
-          || period.hasPlayedAdGroup(adGroupIndex)) {
-        return null;
-      }
-      int adIndexInAdGroup = period.getFirstAdIndexToPlay(adGroupIndex);
-      if (!period.isAdAvailable(adGroupIndex, adIndexInAdGroup)) {
-        return null;
-      }
-      long contentDurationUs = period.getDurationUs();
-      return getMediaPeriodInfoForAd(
-          currentPeriodId.periodUid,
-          adGroupIndex,
-          adIndexInAdGroup,
-          contentDurationUs,
-          currentPeriodId.windowSequenceNumber);
     }
   }
 
@@ -696,8 +676,6 @@ import com.google.android.exoplayer2.util.Assertions;
       long windowSequenceNumber) {
     MediaPeriodId id =
         new MediaPeriodId(periodUid, adGroupIndex, adIndexInAdGroup, windowSequenceNumber);
-    boolean isLastInPeriod = isLastInPeriod(id);
-    boolean isLastInTimeline = isLastInTimeline(id, isLastInPeriod);
     long durationUs =
         timeline
             .getPeriodByUid(id.periodUid, period)
@@ -711,49 +689,35 @@ import com.google.android.exoplayer2.util.Assertions;
         startPositionUs,
         contentPositionUs,
         durationUs,
-        isLastInPeriod,
-        isLastInTimeline);
+        /* isLastInTimelinePeriod= */ false,
+        /* isFinal= */ false);
   }
 
   private MediaPeriodInfo getMediaPeriodInfoForContent(
       Object periodUid, long startPositionUs, long windowSequenceNumber) {
     int nextAdGroupIndex = period.getAdGroupIndexAfterPositionUs(startPositionUs);
     long endPositionUs =
-        nextAdGroupIndex == C.INDEX_UNSET
-            ? C.TIME_END_OF_SOURCE
-            : period.getAdGroupTimeUs(nextAdGroupIndex);
+        nextAdGroupIndex != C.INDEX_UNSET
+            ? period.getAdGroupTimeUs(nextAdGroupIndex)
+            : C.TIME_UNSET;
     MediaPeriodId id = new MediaPeriodId(periodUid, windowSequenceNumber, endPositionUs);
-    timeline.getPeriodByUid(id.periodUid, period);
     boolean isLastInPeriod = isLastInPeriod(id);
     boolean isLastInTimeline = isLastInTimeline(id, isLastInPeriod);
     long durationUs =
-        endPositionUs == C.TIME_END_OF_SOURCE ? period.getDurationUs() : endPositionUs;
+        endPositionUs == C.TIME_UNSET || endPositionUs == C.TIME_END_OF_SOURCE
+            ? period.durationUs
+            : endPositionUs;
     return new MediaPeriodInfo(
-        id, startPositionUs, C.TIME_UNSET, durationUs, isLastInPeriod, isLastInTimeline);
+        id,
+        startPositionUs,
+        /* contentPositionUs= */ C.TIME_UNSET,
+        durationUs,
+        isLastInPeriod,
+        isLastInTimeline);
   }
 
   private boolean isLastInPeriod(MediaPeriodId id) {
-    int adGroupCount = timeline.getPeriodByUid(id.periodUid, period).getAdGroupCount();
-    if (adGroupCount == 0) {
-      return true;
-    }
-
-    int lastAdGroupIndex = adGroupCount - 1;
-    boolean isAd = id.isAd();
-    if (period.getAdGroupTimeUs(lastAdGroupIndex) != C.TIME_END_OF_SOURCE) {
-      // There's no postroll ad.
-      return !isAd && id.endPositionUs == C.TIME_END_OF_SOURCE;
-    }
-
-    int postrollAdCount = period.getAdCountInAdGroup(lastAdGroupIndex);
-    if (postrollAdCount == C.LENGTH_UNSET) {
-      // We won't know if this is the last ad until we know how many postroll ads there are.
-      return false;
-    }
-
-    boolean isLastAd =
-        isAd && id.adGroupIndex == lastAdGroupIndex && id.adIndexInAdGroup == postrollAdCount - 1;
-    return isLastAd || (!isAd && period.getFirstAdIndexToPlay(lastAdGroupIndex) == postrollAdCount);
+    return !id.isAd() && id.endPositionUs == C.TIME_UNSET;
   }
 
   private boolean isLastInTimeline(MediaPeriodId id, boolean isLastMediaPeriodInPeriod) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java b/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java
index 1639920aaa..61a31f7db5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java
@@ -441,7 +441,7 @@ public abstract class Timeline {
      * @return The index of the ad group, or {@link C#INDEX_UNSET}.
      */
     public int getAdGroupIndexAfterPositionUs(long positionUs) {
-      return adPlaybackState.getAdGroupIndexAfterPositionUs(positionUs);
+      return adPlaybackState.getAdGroupIndexAfterPositionUs(positionUs, durationUs);
     }
 
     /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
index 2a94e884a6..d8335131f9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
@@ -89,11 +89,10 @@ public interface MediaSource {
     public final long windowSequenceNumber;
 
     /**
-     * The end position of the media to play within the media period, in microseconds, or {@link
-     * C#TIME_END_OF_SOURCE} if the end position is the end of the media period.
-     *
-     * <p>Note that this only applies if the media period is for content (i.e., not for an ad) and
-     * is clipped to the position of the next ad group.
+     * The end position to which the media period's content is clipped in order to play a following
+     * ad group, in microseconds, or {@link C#TIME_UNSET} if there is no following ad group or if
+     * this media period is an ad. The value {@link C#TIME_END_OF_SOURCE} indicates that a postroll
+     * ad follows at the end of this content media period.
      */
     public final long endPositionUs;
 
@@ -115,7 +114,7 @@ public interface MediaSource {
      *     windows this media period is part of.
      */
     public MediaPeriodId(Object periodUid, long windowSequenceNumber) {
-      this(periodUid, C.INDEX_UNSET, C.INDEX_UNSET, windowSequenceNumber, C.TIME_END_OF_SOURCE);
+      this(periodUid, C.INDEX_UNSET, C.INDEX_UNSET, windowSequenceNumber, C.TIME_UNSET);
     }
 
     /**
@@ -143,7 +142,7 @@ public interface MediaSource {
      */
     public MediaPeriodId(
         Object periodUid, int adGroupIndex, int adIndexInAdGroup, long windowSequenceNumber) {
-      this(periodUid, adGroupIndex, adIndexInAdGroup, windowSequenceNumber, C.TIME_END_OF_SOURCE);
+      this(periodUid, adGroupIndex, adIndexInAdGroup, windowSequenceNumber, C.TIME_UNSET);
     }
 
     private MediaPeriodId(
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdPlaybackState.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdPlaybackState.java
index 41adb78906..fc1355df6a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdPlaybackState.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdPlaybackState.java
@@ -310,7 +310,9 @@ public final class AdPlaybackState {
    * unplayed. Returns {@link C#INDEX_UNSET} if the ad group at or before {@code positionUs} has no
    * ads remaining to be played, or if there is no such ad group.
    *
-   * @param positionUs The position at or before which to find an ad group, in microseconds.
+   * @param positionUs The position at or before which to find an ad group, in microseconds, or
+   *     {@link C#TIME_END_OF_SOURCE} for the end of the stream (in which case the index of any
+   *     unplayed postroll ad group will be returned).
    * @return The index of the ad group, or {@link C#INDEX_UNSET}.
    */
   public int getAdGroupIndexForPositionUs(long positionUs) {
@@ -327,10 +329,18 @@ public final class AdPlaybackState {
    * Returns the index of the next ad group after {@code positionUs} that has ads remaining to be
    * played. Returns {@link C#INDEX_UNSET} if there is no such ad group.
    *
-   * @param positionUs The position after which to find an ad group, in microseconds.
+   * @param positionUs The position after which to find an ad group, in microseconds, or {@link
+   *     C#TIME_END_OF_SOURCE} for the end of the stream (in which case there can be no ad group
+   *     after the position).
+   * @param periodDurationUs The duration of the containing period in microseconds, or {@link
+   *     C#TIME_UNSET} if not known.
    * @return The index of the ad group, or {@link C#INDEX_UNSET}.
    */
-  public int getAdGroupIndexAfterPositionUs(long positionUs) {
+  public int getAdGroupIndexAfterPositionUs(long positionUs, long periodDurationUs) {
+    if (positionUs == C.TIME_END_OF_SOURCE
+        || (periodDurationUs != C.TIME_UNSET && positionUs >= periodDurationUs)) {
+      return C.INDEX_UNSET;
+    }
     // Use a linear search as the array elements may not be increasing due to TIME_END_OF_SOURCE.
     // In practice we expect there to be few ad groups so the search shouldn't be expensive.
     int index = 0;
@@ -457,6 +467,10 @@ public final class AdPlaybackState {
   }
 
   private boolean isPositionBeforeAdGroup(long positionUs, int adGroupIndex) {
+    if (positionUs == C.TIME_END_OF_SOURCE) {
+      // The end of the content is at (but not before) any postroll ad, and after any other ads.
+      return false;
+    }
     long adGroupPositionUs = adGroupTimesUs[adGroupIndex];
     if (adGroupPositionUs == C.TIME_END_OF_SOURCE) {
       return contentDurationUs == C.TIME_UNSET || positionUs < contentDurationUs;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java b/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java
new file mode 100644
index 0000000000..e8f43e3fe6
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java
@@ -0,0 +1,257 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertNull;
+import static org.mockito.Mockito.mock;
+
+import android.net.Uri;
+import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
+import com.google.android.exoplayer2.source.SinglePeriodTimeline;
+import com.google.android.exoplayer2.source.ads.AdPlaybackState;
+import com.google.android.exoplayer2.source.ads.SinglePeriodAdTimeline;
+import com.google.android.exoplayer2.trackselection.TrackSelector;
+import com.google.android.exoplayer2.upstream.Allocator;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Unit tests for {@link MediaPeriodQueue}. */
+@RunWith(RobolectricTestRunner.class)
+public final class MediaPeriodQueueTest {
+
+  private static final long CONTENT_DURATION_US = 30 * C.MICROS_PER_SECOND;
+  private static final long FIRST_AD_START_TIME_US = 10 * C.MICROS_PER_SECOND;
+  private static final long SECOND_AD_START_TIME_US = 20 * C.MICROS_PER_SECOND;
+
+  private static final Timeline CONTENT_TIMELINE =
+      new SinglePeriodTimeline(CONTENT_DURATION_US, /* isSeekable= */ true, /* isDynamic= */ false);
+  private static final Uri AD_URI = Uri.EMPTY;
+
+  private MediaPeriodQueue mediaPeriodQueue;
+  private AdPlaybackState adPlaybackState;
+  private Timeline timeline;
+  private Object periodUid;
+
+  private PlaybackInfo playbackInfo;
+  private RendererCapabilities[] rendererCapabilities;
+  private TrackSelector trackSelector;
+  private Allocator allocator;
+  private MediaSource mediaSource;
+
+  @Before
+  public void setUp() {
+    mediaPeriodQueue = new MediaPeriodQueue();
+    mediaSource = mock(MediaSource.class);
+    rendererCapabilities = new RendererCapabilities[0];
+    trackSelector = mock(TrackSelector.class);
+    allocator = mock(Allocator.class);
+  }
+
+  @Test
+  public void testGetNextMediaPeriodInfo_withoutAds_returnsLastMediaPeriodInfo() {
+    setupInitialTimeline(/* initialPositionUs= */ 0);
+    assertGetNextMediaPeriodInfoReturnsContentMediaPeriod(
+        /* startPositionUs= */ 0,
+        /* endPositionUs= */ C.TIME_UNSET,
+        /* durationUs= */ CONTENT_DURATION_US,
+        /* isLast= */ true);
+  }
+
+  @Test
+  public void testGetNextMediaPeriodInfo_withPrerollAd_returnsCorrectMediaPeriodInfos() {
+    setupInitialTimeline(/* initialPositionUs= */ 0, /* adGroupTimesUs= */ 0);
+    setAdGroupLoaded(/* adGroupIndex= */ 0);
+    assertNextMediaPeriodInfoIsAd(/* adGroupIndex= */ 0, /* contentPositionUs= */ 0);
+    advance();
+    assertGetNextMediaPeriodInfoReturnsContentMediaPeriod(
+        /* startPositionUs= */ 0,
+        /* endPositionUs= */ C.TIME_UNSET,
+        /* durationUs= */ CONTENT_DURATION_US,
+        /* isLast= */ true);
+  }
+
+  @Test
+  public void testGetNextMediaPeriodInfo_withMidrollAds_returnsCorrectMediaPeriodInfos() {
+    setupInitialTimeline(
+        /* initialPositionUs= */ 0,
+        /* adGroupTimesUs= */ FIRST_AD_START_TIME_US,
+        SECOND_AD_START_TIME_US);
+    assertGetNextMediaPeriodInfoReturnsContentMediaPeriod(
+        /* startPositionUs= */ 0,
+        /* endPositionUs= */ FIRST_AD_START_TIME_US,
+        /* durationUs= */ FIRST_AD_START_TIME_US,
+        /* isLast= */ false);
+    // The next media period info should be null as we haven't loaded the ad yet.
+    advance();
+    assertNull(getNextMediaPeriodInfo());
+    setAdGroupLoaded(/* adGroupIndex= */ 0);
+    assertNextMediaPeriodInfoIsAd(
+        /* adGroupIndex= */ 0, /* contentPositionUs= */ FIRST_AD_START_TIME_US);
+    advance();
+    assertGetNextMediaPeriodInfoReturnsContentMediaPeriod(
+        /* startPositionUs= */ FIRST_AD_START_TIME_US,
+        /* endPositionUs= */ SECOND_AD_START_TIME_US,
+        /* durationUs= */ SECOND_AD_START_TIME_US,
+        /* isLast= */ false);
+    advance();
+    setAdGroupLoaded(/* adGroupIndex= */ 1);
+    assertNextMediaPeriodInfoIsAd(
+        /* adGroupIndex= */ 1, /* contentPositionUs= */ SECOND_AD_START_TIME_US);
+    advance();
+    assertGetNextMediaPeriodInfoReturnsContentMediaPeriod(
+        /* startPositionUs= */ SECOND_AD_START_TIME_US,
+        /* endPositionUs= */ C.TIME_UNSET,
+        /* durationUs= */ CONTENT_DURATION_US,
+        /* isLast= */ true);
+  }
+
+  @Test
+  public void testGetNextMediaPeriodInfo_withMidrollAndPostroll_returnsCorrectMediaPeriodInfos() {
+    setupInitialTimeline(
+        /* initialPositionUs= */ 0,
+        /* adGroupTimesUs= */ FIRST_AD_START_TIME_US,
+        C.TIME_END_OF_SOURCE);
+    assertGetNextMediaPeriodInfoReturnsContentMediaPeriod(
+        /* startPositionUs= */ 0,
+        /* endPositionUs= */ FIRST_AD_START_TIME_US,
+        /* durationUs= */ FIRST_AD_START_TIME_US,
+        /* isLast= */ false);
+    advance();
+    setAdGroupLoaded(/* adGroupIndex= */ 0);
+    assertNextMediaPeriodInfoIsAd(
+        /* adGroupIndex= */ 0, /* contentPositionUs= */ FIRST_AD_START_TIME_US);
+    advance();
+    assertGetNextMediaPeriodInfoReturnsContentMediaPeriod(
+        /* startPositionUs= */ FIRST_AD_START_TIME_US,
+        /* endPositionUs= */ C.TIME_END_OF_SOURCE,
+        /* durationUs= */ CONTENT_DURATION_US,
+        /* isLast= */ false);
+    advance();
+    setAdGroupLoaded(/* adGroupIndex= */ 1);
+    assertNextMediaPeriodInfoIsAd(
+        /* adGroupIndex= */ 1, /* contentPositionUs= */ CONTENT_DURATION_US);
+    advance();
+    assertGetNextMediaPeriodInfoReturnsContentMediaPeriod(
+        /* startPositionUs= */ CONTENT_DURATION_US,
+        /* endPositionUs= */ C.TIME_UNSET,
+        /* durationUs= */ CONTENT_DURATION_US,
+        /* isLast= */ true);
+  }
+
+  @Test
+  public void testGetNextMediaPeriodInfo_withPostrollLoadError_returnsEmptyFinalMediaPeriodInfo() {
+    setupInitialTimeline(/* initialPositionUs= */ 0, /* adGroupTimesUs= */ C.TIME_END_OF_SOURCE);
+    assertGetNextMediaPeriodInfoReturnsContentMediaPeriod(
+        /* startPositionUs= */ 0,
+        /* endPositionUs= */ C.TIME_END_OF_SOURCE,
+        /* durationUs= */ CONTENT_DURATION_US,
+        /* isLast= */ false);
+    advance();
+    setAdGroupFailedToLoad(/* adGroupIndex= */ 0);
+    assertGetNextMediaPeriodInfoReturnsContentMediaPeriod(
+        /* startPositionUs= */ CONTENT_DURATION_US,
+        /* endPositionUs= */ C.TIME_UNSET,
+        /* durationUs= */ CONTENT_DURATION_US,
+        /* isLast= */ true);
+  }
+
+  private void setupInitialTimeline(long initialPositionUs, long... adGroupTimesUs) {
+    adPlaybackState =
+        new AdPlaybackState(adGroupTimesUs).withContentDurationUs(CONTENT_DURATION_US);
+    timeline = new SinglePeriodAdTimeline(CONTENT_TIMELINE, adPlaybackState);
+    periodUid = timeline.getUidOfPeriod(/* periodIndex= */ 0);
+    mediaPeriodQueue.setTimeline(timeline);
+    playbackInfo =
+        new PlaybackInfo(
+            timeline,
+            /* manifest= */ null,
+            mediaPeriodQueue.resolveMediaPeriodIdForAds(periodUid, initialPositionUs),
+            /* startPositionUs= */ 0,
+            /* contentPositionUs= */ 0,
+            Player.STATE_READY,
+            /* isLoading= */ false,
+            /* trackGroups= */ null,
+            /* trackSelectorResult= */ null,
+            /* loadingMediaPeriodId= */ null,
+            /* bufferedPositionUs= */ 0,
+            /* totalBufferedDurationUs= */ 0,
+            /* positionUs= */ 0);
+  }
+
+  private void advance() {
+    mediaPeriodQueue.enqueueNextMediaPeriod(
+        rendererCapabilities, trackSelector, allocator, mediaSource, getNextMediaPeriodInfo());
+    mediaPeriodQueue.advancePlayingPeriod();
+  }
+
+  private MediaPeriodInfo getNextMediaPeriodInfo() {
+    return mediaPeriodQueue.getNextMediaPeriodInfo(/* rendererPositionUs= */ 0, playbackInfo);
+  }
+
+  private void setAdGroupLoaded(int adGroupIndex) {
+    adPlaybackState =
+        adPlaybackState
+            .withAdCount(adGroupIndex, /* adCount= */ 1)
+            .withAdUri(adGroupIndex, /* adIndexInAdGroup= */ 0, AD_URI);
+    updateTimeline();
+  }
+
+  private void setAdGroupFailedToLoad(int adGroupIndex) {
+    adPlaybackState =
+        adPlaybackState
+            .withAdCount(adGroupIndex, /* adCount= */ 1)
+            .withAdLoadError(adGroupIndex, /* adIndexInAdGroup= */ 0);
+    updateTimeline();
+  }
+
+  private void updateTimeline() {
+    timeline = new SinglePeriodAdTimeline(CONTENT_TIMELINE, adPlaybackState);
+    mediaPeriodQueue.setTimeline(timeline);
+  }
+
+  private void assertGetNextMediaPeriodInfoReturnsContentMediaPeriod(
+      long startPositionUs, long endPositionUs, long durationUs, boolean isLast) {
+    assertThat(getNextMediaPeriodInfo())
+        .isEqualTo(
+            new MediaPeriodInfo(
+                new MediaPeriodId(periodUid, /* windowSequenceNumber= */ 0, endPositionUs),
+                startPositionUs,
+                /* contentPositionUs= */ C.TIME_UNSET,
+                durationUs,
+                /* isLastInTimelinePeriod= */ isLast,
+                /* isFinal= */ isLast));
+  }
+
+  private void assertNextMediaPeriodInfoIsAd(int adGroupIndex, long contentPositionUs) {
+    assertThat(getNextMediaPeriodInfo())
+        .isEqualTo(
+            new MediaPeriodInfo(
+                new MediaPeriodId(
+                    periodUid,
+                    adGroupIndex,
+                    /* adIndexInAdGroup= */ 0,
+                    /* windowSequenceNumber= */ 0),
+                /* startPositionUs= */ 0,
+                contentPositionUs,
+                /* durationUs= */ C.TIME_UNSET,
+                /* isLastInTimelinePeriod= */ false,
+                /* isFinal= */ false));
+  }
+}
diff --git a/library/ui/src/main/res/values-af/strings.xml b/library/ui/src/main/res/values-af/strings.xml
index 5b24387028..729d3b9609 100644
--- a/library/ui/src/main/res/values-af/strings.xml
+++ b/library/ui/src/main/res/values-af/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Herhaal alles</string>
   <string name="exo_controls_shuffle_description">Skommel</string>
   <string name="exo_controls_fullscreen_description">Volskermmodus</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR-modus</string>
   <string name="exo_download_description">Aflaai</string>
   <string name="exo_download_notification_channel_name">Aflaaie</string>
   <string name="exo_download_downloading">Laai tans af</string>
diff --git a/library/ui/src/main/res/values-am/strings.xml b/library/ui/src/main/res/values-am/strings.xml
index 933019ac9f..bae3776e35 100644
--- a/library/ui/src/main/res/values-am/strings.xml
+++ b/library/ui/src/main/res/values-am/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">ሁሉንም ድገም</string>
   <string name="exo_controls_shuffle_description">በውዝ</string>
   <string name="exo_controls_fullscreen_description">የሙሉ ማያ ሁነታ</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">የቪአር ሁነታ</string>
   <string name="exo_download_description">አውርድ</string>
   <string name="exo_download_notification_channel_name">የወረዱ</string>
   <string name="exo_download_downloading">በማውረድ ላይ</string>
diff --git a/library/ui/src/main/res/values-ar/strings.xml b/library/ui/src/main/res/values-ar/strings.xml
index ec79ce48e9..c78aac1e65 100644
--- a/library/ui/src/main/res/values-ar/strings.xml
+++ b/library/ui/src/main/res/values-ar/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">تكرار الكل</string>
   <string name="exo_controls_shuffle_description">ترتيب عشوائي</string>
   <string name="exo_controls_fullscreen_description">وضع ملء الشاشة</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">وضع VR</string>
   <string name="exo_download_description">تنزيل</string>
   <string name="exo_download_notification_channel_name">التنزيلات</string>
   <string name="exo_download_downloading">جارٍ التنزيل.</string>
diff --git a/library/ui/src/main/res/values-az/strings.xml b/library/ui/src/main/res/values-az/strings.xml
index 3a80bab572..c2f208e54e 100644
--- a/library/ui/src/main/res/values-az/strings.xml
+++ b/library/ui/src/main/res/values-az/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Hamısı təkrarlansın</string>
   <string name="exo_controls_shuffle_description">Qarışdırın</string>
   <string name="exo_controls_fullscreen_description">Tam ekran rejimi</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR rejimi</string>
   <string name="exo_download_description">Endirin</string>
   <string name="exo_download_notification_channel_name">Endirmələr</string>
   <string name="exo_download_downloading">Endirilir</string>
diff --git a/library/ui/src/main/res/values-b+sr+Latn/strings.xml b/library/ui/src/main/res/values-b+sr+Latn/strings.xml
index 23e1463725..6e90860a9c 100644
--- a/library/ui/src/main/res/values-b+sr+Latn/strings.xml
+++ b/library/ui/src/main/res/values-b+sr+Latn/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ponovi sve</string>
   <string name="exo_controls_shuffle_description">Pusti nasumično</string>
   <string name="exo_controls_fullscreen_description">Režim celog ekrana</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR režim</string>
   <string name="exo_download_description">Preuzmi</string>
   <string name="exo_download_notification_channel_name">Preuzimanja</string>
   <string name="exo_download_downloading">Preuzima se</string>
diff --git a/library/ui/src/main/res/values-be/strings.xml b/library/ui/src/main/res/values-be/strings.xml
index 33ae18711a..f0b28d9b2e 100644
--- a/library/ui/src/main/res/values-be/strings.xml
+++ b/library/ui/src/main/res/values-be/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Паўтарыць усе</string>
   <string name="exo_controls_shuffle_description">Перамяшаць</string>
   <string name="exo_controls_fullscreen_description">Поўнаэкранны рэжым</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR-рэжым</string>
   <string name="exo_download_description">Спампаваць</string>
   <string name="exo_download_notification_channel_name">Спампоўкі</string>
   <string name="exo_download_downloading">Спампоўваецца</string>
diff --git a/library/ui/src/main/res/values-bg/strings.xml b/library/ui/src/main/res/values-bg/strings.xml
index 50ffac7b0a..fd2b21efce 100644
--- a/library/ui/src/main/res/values-bg/strings.xml
+++ b/library/ui/src/main/res/values-bg/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Повтаряне на всички</string>
   <string name="exo_controls_shuffle_description">Разбъркване</string>
   <string name="exo_controls_fullscreen_description">Режим на цял екран</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">режим за VR</string>
   <string name="exo_download_description">Изтегляне</string>
   <string name="exo_download_notification_channel_name">Изтегляния</string>
   <string name="exo_download_downloading">Изтегля се</string>
diff --git a/library/ui/src/main/res/values-bs/strings.xml b/library/ui/src/main/res/values-bs/strings.xml
index 942921f28e..fce36435fd 100644
--- a/library/ui/src/main/res/values-bs/strings.xml
+++ b/library/ui/src/main/res/values-bs/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ponovi sve</string>
   <string name="exo_controls_shuffle_description">Izmiješaj</string>
   <string name="exo_controls_fullscreen_description">Način rada preko cijelog ekrana</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR način rada</string>
   <string name="exo_download_description">Preuzmi</string>
   <string name="exo_download_notification_channel_name">Preuzimanja</string>
   <string name="exo_download_downloading">Preuzimanje</string>
diff --git a/library/ui/src/main/res/values-ca/strings.xml b/library/ui/src/main/res/values-ca/strings.xml
index c787ff0194..2875ccfe83 100644
--- a/library/ui/src/main/res/values-ca/strings.xml
+++ b/library/ui/src/main/res/values-ca/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repeteix tot</string>
   <string name="exo_controls_shuffle_description">Reprodueix aleatòriament</string>
   <string name="exo_controls_fullscreen_description">Mode de pantalla completa</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">Mode RV</string>
   <string name="exo_download_description">Baixa</string>
   <string name="exo_download_notification_channel_name">Baixades</string>
   <string name="exo_download_downloading">S\'està baixant</string>
diff --git a/library/ui/src/main/res/values-cs/strings.xml b/library/ui/src/main/res/values-cs/strings.xml
index 31451856fc..7964068543 100644
--- a/library/ui/src/main/res/values-cs/strings.xml
+++ b/library/ui/src/main/res/values-cs/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Opakovat vše</string>
   <string name="exo_controls_shuffle_description">Náhodně</string>
   <string name="exo_controls_fullscreen_description">Režim celé obrazovky</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">Režim VR</string>
   <string name="exo_download_description">Stáhnout</string>
   <string name="exo_download_notification_channel_name">Stahování</string>
   <string name="exo_download_downloading">Stahování</string>
diff --git a/library/ui/src/main/res/values-da/strings.xml b/library/ui/src/main/res/values-da/strings.xml
index 6a446b0963..03409e1cdd 100644
--- a/library/ui/src/main/res/values-da/strings.xml
+++ b/library/ui/src/main/res/values-da/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Gentag alle</string>
   <string name="exo_controls_shuffle_description">Bland</string>
   <string name="exo_controls_fullscreen_description">Fuld skærm</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR-tilstand</string>
   <string name="exo_download_description">Download</string>
   <string name="exo_download_notification_channel_name">Downloads</string>
   <string name="exo_download_downloading">Downloader</string>
diff --git a/library/ui/src/main/res/values-de/strings.xml b/library/ui/src/main/res/values-de/strings.xml
index d2b162ba72..a096211b00 100644
--- a/library/ui/src/main/res/values-de/strings.xml
+++ b/library/ui/src/main/res/values-de/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Alle wiederholen</string>
   <string name="exo_controls_shuffle_description">Zufallsmix</string>
   <string name="exo_controls_fullscreen_description">Vollbildmodus</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR-Modus</string>
   <string name="exo_download_description">Herunterladen</string>
   <string name="exo_download_notification_channel_name">Downloads</string>
   <string name="exo_download_downloading">Wird heruntergeladen</string>
diff --git a/library/ui/src/main/res/values-el/strings.xml b/library/ui/src/main/res/values-el/strings.xml
index 6eb9fbc6de..598d1c45dc 100644
--- a/library/ui/src/main/res/values-el/strings.xml
+++ b/library/ui/src/main/res/values-el/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Επανάληψη όλων</string>
   <string name="exo_controls_shuffle_description">Τυχαία αναπαραγωγή</string>
   <string name="exo_controls_fullscreen_description">Λειτουργία πλήρους οθόνης</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">Λειτουργία VR mode</string>
   <string name="exo_download_description">Λήψη</string>
   <string name="exo_download_notification_channel_name">Λήψεις</string>
   <string name="exo_download_downloading">Λήψη</string>
diff --git a/library/ui/src/main/res/values-es-rUS/strings.xml b/library/ui/src/main/res/values-es-rUS/strings.xml
index 92604c5e34..1bfc2513ba 100644
--- a/library/ui/src/main/res/values-es-rUS/strings.xml
+++ b/library/ui/src/main/res/values-es-rUS/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repetir todo</string>
   <string name="exo_controls_shuffle_description">Reproducir aleatoriamente</string>
   <string name="exo_controls_fullscreen_description">Modo de pantalla completa</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">Modo RV</string>
   <string name="exo_download_description">Descargar</string>
   <string name="exo_download_notification_channel_name">Descargas</string>
   <string name="exo_download_downloading">Descargando</string>
diff --git a/library/ui/src/main/res/values-es/strings.xml b/library/ui/src/main/res/values-es/strings.xml
index 4c6fcf7aa7..d424331765 100644
--- a/library/ui/src/main/res/values-es/strings.xml
+++ b/library/ui/src/main/res/values-es/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repetir todo</string>
   <string name="exo_controls_shuffle_description">Reproducir aleatoriamente</string>
   <string name="exo_controls_fullscreen_description">Modo de pantalla completa</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">Modo RV</string>
   <string name="exo_download_description">Descargar</string>
   <string name="exo_download_notification_channel_name">Descargas</string>
   <string name="exo_download_downloading">Descargando</string>
diff --git a/library/ui/src/main/res/values-et/strings.xml b/library/ui/src/main/res/values-et/strings.xml
index d631499a78..38ee173bec 100644
--- a/library/ui/src/main/res/values-et/strings.xml
+++ b/library/ui/src/main/res/values-et/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Korda kõiki</string>
   <string name="exo_controls_shuffle_description">Esita juhuslikus järjekorras</string>
   <string name="exo_controls_fullscreen_description">Täisekraani režiim</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR-režiim</string>
   <string name="exo_download_description">Allalaadimine</string>
   <string name="exo_download_notification_channel_name">Allalaadimised</string>
   <string name="exo_download_downloading">Allalaadimine</string>
diff --git a/library/ui/src/main/res/values-eu/strings.xml b/library/ui/src/main/res/values-eu/strings.xml
index efdee2239d..8bc5f0670c 100644
--- a/library/ui/src/main/res/values-eu/strings.xml
+++ b/library/ui/src/main/res/values-eu/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Errepikatu guztiak</string>
   <string name="exo_controls_shuffle_description">Erreproduzitu ausaz</string>
   <string name="exo_controls_fullscreen_description">Pantaila osoko modua</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">EB modua</string>
   <string name="exo_download_description">Deskargak</string>
   <string name="exo_download_notification_channel_name">Deskargak</string>
   <string name="exo_download_downloading">Deskargatzen</string>
diff --git a/library/ui/src/main/res/values-fa/strings.xml b/library/ui/src/main/res/values-fa/strings.xml
index 50e52edd84..bef2aebcfe 100644
--- a/library/ui/src/main/res/values-fa/strings.xml
+++ b/library/ui/src/main/res/values-fa/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">تکرار همه</string>
   <string name="exo_controls_shuffle_description">درهم</string>
   <string name="exo_controls_fullscreen_description">حالت تمام‌صفحه</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">حالت واقعیت مجازی</string>
   <string name="exo_download_description">بارگیری</string>
   <string name="exo_download_notification_channel_name">بارگیری‌ها</string>
   <string name="exo_download_downloading">درحال بارگیری</string>
diff --git a/library/ui/src/main/res/values-fi/strings.xml b/library/ui/src/main/res/values-fi/strings.xml
index 72819a376e..3280dff99b 100644
--- a/library/ui/src/main/res/values-fi/strings.xml
+++ b/library/ui/src/main/res/values-fi/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Toista kaikki uudelleen</string>
   <string name="exo_controls_shuffle_description">Satunnaistoisto</string>
   <string name="exo_controls_fullscreen_description">Koko näytön tila</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR-tila</string>
   <string name="exo_download_description">Lataa</string>
   <string name="exo_download_notification_channel_name">Lataukset</string>
   <string name="exo_download_downloading">Ladataan</string>
diff --git a/library/ui/src/main/res/values-fr-rCA/strings.xml b/library/ui/src/main/res/values-fr-rCA/strings.xml
index 6b8d459117..ce125f7d06 100644
--- a/library/ui/src/main/res/values-fr-rCA/strings.xml
+++ b/library/ui/src/main/res/values-fr-rCA/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Tout lire en boucle</string>
   <string name="exo_controls_shuffle_description">Lecture aléatoire</string>
   <string name="exo_controls_fullscreen_description">Mode Plein écran</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">Mode RV</string>
   <string name="exo_download_description">Télécharger</string>
   <string name="exo_download_notification_channel_name">Téléchargements</string>
   <string name="exo_download_downloading">Téléchargement en cours…</string>
diff --git a/library/ui/src/main/res/values-fr/strings.xml b/library/ui/src/main/res/values-fr/strings.xml
index 487007f573..b143832ca1 100644
--- a/library/ui/src/main/res/values-fr/strings.xml
+++ b/library/ui/src/main/res/values-fr/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Tout lire en boucle</string>
   <string name="exo_controls_shuffle_description">Aléatoire</string>
   <string name="exo_controls_fullscreen_description">Mode plein écran</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">Mode RV</string>
   <string name="exo_download_description">Télécharger</string>
   <string name="exo_download_notification_channel_name">Téléchargements</string>
   <string name="exo_download_downloading">Téléchargement…</string>
diff --git a/library/ui/src/main/res/values-gl/strings.xml b/library/ui/src/main/res/values-gl/strings.xml
index a5420df692..c321d28bec 100644
--- a/library/ui/src/main/res/values-gl/strings.xml
+++ b/library/ui/src/main/res/values-gl/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repetir todas as pistas</string>
   <string name="exo_controls_shuffle_description">Reprodución aleatoria</string>
   <string name="exo_controls_fullscreen_description">Modo de pantalla completa</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">Modo RV</string>
   <string name="exo_download_description">Descargar</string>
   <string name="exo_download_notification_channel_name">Descargas</string>
   <string name="exo_download_downloading">Descargando</string>
diff --git a/library/ui/src/main/res/values-hi/strings.xml b/library/ui/src/main/res/values-hi/strings.xml
index a94462b4d9..373c0f4303 100644
--- a/library/ui/src/main/res/values-hi/strings.xml
+++ b/library/ui/src/main/res/values-hi/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">सभी को दोहराएं</string>
   <string name="exo_controls_shuffle_description">शफ़ल करें</string>
   <string name="exo_controls_fullscreen_description">फ़ुलस्क्रीन मोड</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR मोड</string>
   <string name="exo_download_description">डाउनलोड करें</string>
   <string name="exo_download_notification_channel_name">डाउनलोड की गई मीडिया फ़ाइलें</string>
   <string name="exo_download_downloading">डाउनलोड हो रहा है</string>
diff --git a/library/ui/src/main/res/values-hr/strings.xml b/library/ui/src/main/res/values-hr/strings.xml
index 624d7f04fe..9958f9b4dc 100644
--- a/library/ui/src/main/res/values-hr/strings.xml
+++ b/library/ui/src/main/res/values-hr/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ponovi sve</string>
   <string name="exo_controls_shuffle_description">Reproduciraj nasumično</string>
   <string name="exo_controls_fullscreen_description">Prikaz na cijelom zaslonu</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR način</string>
   <string name="exo_download_description">Preuzmi</string>
   <string name="exo_download_notification_channel_name">Preuzimanja</string>
   <string name="exo_download_downloading">Preuzimanje</string>
diff --git a/library/ui/src/main/res/values-hu/strings.xml b/library/ui/src/main/res/values-hu/strings.xml
index e1f4d77e96..f517ef6212 100644
--- a/library/ui/src/main/res/values-hu/strings.xml
+++ b/library/ui/src/main/res/values-hu/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Összes szám ismétlése</string>
   <string name="exo_controls_shuffle_description">Keverés</string>
   <string name="exo_controls_fullscreen_description">Teljes képernyős mód</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR-mód</string>
   <string name="exo_download_description">Letöltés</string>
   <string name="exo_download_notification_channel_name">Letöltések</string>
   <string name="exo_download_downloading">Letöltés folyamatban</string>
diff --git a/library/ui/src/main/res/values-hy/strings.xml b/library/ui/src/main/res/values-hy/strings.xml
index 390d848aff..d3060b06c4 100644
--- a/library/ui/src/main/res/values-hy/strings.xml
+++ b/library/ui/src/main/res/values-hy/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Կրկնել բոլորը</string>
   <string name="exo_controls_shuffle_description">Խառնել</string>
   <string name="exo_controls_fullscreen_description">Լիաէկրան ռեժիմ</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR ռեժիմ</string>
   <string name="exo_download_description">Ներբեռնել</string>
   <string name="exo_download_notification_channel_name">Ներբեռնումներ</string>
   <string name="exo_download_downloading">Ներբեռնում</string>
diff --git a/library/ui/src/main/res/values-in/strings.xml b/library/ui/src/main/res/values-in/strings.xml
index 5ac1696c8b..06c55fc020 100644
--- a/library/ui/src/main/res/values-in/strings.xml
+++ b/library/ui/src/main/res/values-in/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ulangi semua</string>
   <string name="exo_controls_shuffle_description">Acak</string>
   <string name="exo_controls_fullscreen_description">Mode layar penuh</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">Mode VR</string>
   <string name="exo_download_description">Download</string>
   <string name="exo_download_notification_channel_name">Download</string>
   <string name="exo_download_downloading">Mendownload</string>
diff --git a/library/ui/src/main/res/values-is/strings.xml b/library/ui/src/main/res/values-is/strings.xml
index 4f0fbf0975..4a0b84db2f 100644
--- a/library/ui/src/main/res/values-is/strings.xml
+++ b/library/ui/src/main/res/values-is/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Endurtaka allt</string>
   <string name="exo_controls_shuffle_description">Stokka</string>
   <string name="exo_controls_fullscreen_description">Allur skjárinn</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">sýndarveruleikastilling</string>
   <string name="exo_download_description">Sækja</string>
   <string name="exo_download_notification_channel_name">Niðurhal</string>
   <string name="exo_download_downloading">Sækir</string>
diff --git a/library/ui/src/main/res/values-it/strings.xml b/library/ui/src/main/res/values-it/strings.xml
index 6d070c6aa9..84da9905b2 100644
--- a/library/ui/src/main/res/values-it/strings.xml
+++ b/library/ui/src/main/res/values-it/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ripeti tutto</string>
   <string name="exo_controls_shuffle_description">Riproduzione casuale</string>
   <string name="exo_controls_fullscreen_description">Modalità a schermo intero</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">Modalità VR</string>
   <string name="exo_download_description">Scarica</string>
   <string name="exo_download_notification_channel_name">Download</string>
   <string name="exo_download_downloading">Download…</string>
diff --git a/library/ui/src/main/res/values-ja/strings.xml b/library/ui/src/main/res/values-ja/strings.xml
index eea78b2fb5..e159292348 100644
--- a/library/ui/src/main/res/values-ja/strings.xml
+++ b/library/ui/src/main/res/values-ja/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">全曲をリピート</string>
   <string name="exo_controls_shuffle_description">シャッフル</string>
   <string name="exo_controls_fullscreen_description">全画面モード</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR モード</string>
   <string name="exo_download_description">ダウンロード</string>
   <string name="exo_download_notification_channel_name">ダウンロード</string>
   <string name="exo_download_downloading">ダウンロードしています</string>
diff --git a/library/ui/src/main/res/values-ka/strings.xml b/library/ui/src/main/res/values-ka/strings.xml
index 16f3bea5bf..ff879c5dd8 100644
--- a/library/ui/src/main/res/values-ka/strings.xml
+++ b/library/ui/src/main/res/values-ka/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">ყველას გამეორება</string>
   <string name="exo_controls_shuffle_description">არეულად დაკვრა</string>
   <string name="exo_controls_fullscreen_description">სრულეკრანიანი რეჟიმი</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR რეჟიმი</string>
   <string name="exo_download_description">ჩამოტვირთვა</string>
   <string name="exo_download_notification_channel_name">ჩამოტვირთვები</string>
   <string name="exo_download_downloading">მიმდინარეობს ჩამოტვირთვა</string>
diff --git a/library/ui/src/main/res/values-kk/strings.xml b/library/ui/src/main/res/values-kk/strings.xml
index 26fe5d6019..f634579932 100644
--- a/library/ui/src/main/res/values-kk/strings.xml
+++ b/library/ui/src/main/res/values-kk/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Барлығын қайталау</string>
   <string name="exo_controls_shuffle_description">Араластыру</string>
   <string name="exo_controls_fullscreen_description">Толық экран режимі</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR режимі</string>
   <string name="exo_download_description">Жүктеп алу</string>
   <string name="exo_download_notification_channel_name">Жүктеп алынғандар</string>
   <string name="exo_download_downloading">Жүктеп алынуда</string>
diff --git a/library/ui/src/main/res/values-km/strings.xml b/library/ui/src/main/res/values-km/strings.xml
index ce88214f35..17476b16d1 100644
--- a/library/ui/src/main/res/values-km/strings.xml
+++ b/library/ui/src/main/res/values-km/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">លេង​ឡើងវិញ​ទាំងអស់</string>
   <string name="exo_controls_shuffle_description">ច្របល់</string>
   <string name="exo_controls_fullscreen_description">មុខងារពេញ​អេក្រង់</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">មុខងារ VR</string>
   <string name="exo_download_description">ទាញយក</string>
   <string name="exo_download_notification_channel_name">ទាញយក</string>
   <string name="exo_download_downloading">កំពុង​ទាញ​យក</string>
diff --git a/library/ui/src/main/res/values-ko/strings.xml b/library/ui/src/main/res/values-ko/strings.xml
index d61346ff90..a4096711f2 100644
--- a/library/ui/src/main/res/values-ko/strings.xml
+++ b/library/ui/src/main/res/values-ko/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">모두 반복</string>
   <string name="exo_controls_shuffle_description">셔플</string>
   <string name="exo_controls_fullscreen_description">전체화면 모드</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">가상 현실 모드</string>
   <string name="exo_download_description">다운로드</string>
   <string name="exo_download_notification_channel_name">다운로드</string>
   <string name="exo_download_downloading">다운로드 중</string>
diff --git a/library/ui/src/main/res/values-ky/strings.xml b/library/ui/src/main/res/values-ky/strings.xml
index ee7a90ede7..c85b70f108 100644
--- a/library/ui/src/main/res/values-ky/strings.xml
+++ b/library/ui/src/main/res/values-ky/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Баарын кайталоо</string>
   <string name="exo_controls_shuffle_description">Аралаштыруу</string>
   <string name="exo_controls_fullscreen_description">Толук экран режими</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR режими</string>
   <string name="exo_download_description">Жүктөп алуу</string>
   <string name="exo_download_notification_channel_name">Жүктөлүп алынгандар</string>
   <string name="exo_download_downloading">Жүктөлүп алынууда</string>
diff --git a/library/ui/src/main/res/values-lt/strings.xml b/library/ui/src/main/res/values-lt/strings.xml
index b3d296b4d8..12710e41fd 100644
--- a/library/ui/src/main/res/values-lt/strings.xml
+++ b/library/ui/src/main/res/values-lt/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Kartoti viską</string>
   <string name="exo_controls_shuffle_description">Maišyti</string>
   <string name="exo_controls_fullscreen_description">Viso ekrano režimas</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR režimas</string>
   <string name="exo_download_description">Atsisiųsti</string>
   <string name="exo_download_notification_channel_name">Atsisiuntimai</string>
   <string name="exo_download_downloading">Atsisiunčiama</string>
diff --git a/library/ui/src/main/res/values-lv/strings.xml b/library/ui/src/main/res/values-lv/strings.xml
index ed61a7a27f..a55570112f 100644
--- a/library/ui/src/main/res/values-lv/strings.xml
+++ b/library/ui/src/main/res/values-lv/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Atkārtot visu</string>
   <string name="exo_controls_shuffle_description">Atskaņot jauktā secībā</string>
   <string name="exo_controls_fullscreen_description">Pilnekrāna režīms</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR režīms</string>
   <string name="exo_download_description">Lejupielādēt</string>
   <string name="exo_download_notification_channel_name">Lejupielādes</string>
   <string name="exo_download_downloading">Notiek lejupielāde</string>
diff --git a/library/ui/src/main/res/values-mk/strings.xml b/library/ui/src/main/res/values-mk/strings.xml
index 4ed15c3913..f4382aaeae 100644
--- a/library/ui/src/main/res/values-mk/strings.xml
+++ b/library/ui/src/main/res/values-mk/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Повтори ги сите</string>
   <string name="exo_controls_shuffle_description">Измешај</string>
   <string name="exo_controls_fullscreen_description">Режим на цел екран</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">Режим на VR</string>
   <string name="exo_download_description">Преземи</string>
   <string name="exo_download_notification_channel_name">Преземања</string>
   <string name="exo_download_downloading">Се презема</string>
diff --git a/library/ui/src/main/res/values-mn/strings.xml b/library/ui/src/main/res/values-mn/strings.xml
index 81c90f34c5..9d8fb29408 100644
--- a/library/ui/src/main/res/values-mn/strings.xml
+++ b/library/ui/src/main/res/values-mn/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Бүгдийг нь дахин тоглуулах</string>
   <string name="exo_controls_shuffle_description">Холих</string>
   <string name="exo_controls_fullscreen_description">Бүтэн дэлгэцийн горим</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR горим</string>
   <string name="exo_download_description">Татах</string>
   <string name="exo_download_notification_channel_name">Татaлт</string>
   <string name="exo_download_downloading">Татаж байна</string>
diff --git a/library/ui/src/main/res/values-mr/strings.xml b/library/ui/src/main/res/values-mr/strings.xml
index 7b698e5bcf..d1ee83be30 100644
--- a/library/ui/src/main/res/values-mr/strings.xml
+++ b/library/ui/src/main/res/values-mr/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">सर्व रीपीट करा</string>
   <string name="exo_controls_shuffle_description">शफल करा</string>
   <string name="exo_controls_fullscreen_description">फुल स्क्रीन मोड</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR मोड</string>
   <string name="exo_download_description">डाउनलोड करा</string>
   <string name="exo_download_notification_channel_name">डाउनलोड</string>
   <string name="exo_download_downloading">डाउनलोड होत आहे</string>
diff --git a/library/ui/src/main/res/values-ms/strings.xml b/library/ui/src/main/res/values-ms/strings.xml
index cfe822f2b8..3b3fc3109f 100644
--- a/library/ui/src/main/res/values-ms/strings.xml
+++ b/library/ui/src/main/res/values-ms/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ulang semua</string>
   <string name="exo_controls_shuffle_description">Rombak</string>
   <string name="exo_controls_fullscreen_description">Mod skrin penuh</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">Mod VR</string>
   <string name="exo_download_description">Muat turun</string>
   <string name="exo_download_notification_channel_name">Muat turun</string>
   <string name="exo_download_downloading">Memuat turun</string>
diff --git a/library/ui/src/main/res/values-my/strings.xml b/library/ui/src/main/res/values-my/strings.xml
index 34e69c2977..68c1f27056 100644
--- a/library/ui/src/main/res/values-my/strings.xml
+++ b/library/ui/src/main/res/values-my/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">အားလုံး ပြန်ကျော့ရန်</string>
   <string name="exo_controls_shuffle_description">ရောသမမွှေ</string>
   <string name="exo_controls_fullscreen_description">မျက်နှာပြင်အပြည့် မုဒ်</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR မုဒ်</string>
   <string name="exo_download_description">ဒေါင်းလုဒ် လုပ်ရန်</string>
   <string name="exo_download_notification_channel_name">ဒေါင်းလုဒ်များ</string>
   <string name="exo_download_downloading">ဒေါင်းလုဒ်လုပ်နေသည်</string>
diff --git a/library/ui/src/main/res/values-nb/strings.xml b/library/ui/src/main/res/values-nb/strings.xml
index 5f8e862f5d..e24dcbf959 100644
--- a/library/ui/src/main/res/values-nb/strings.xml
+++ b/library/ui/src/main/res/values-nb/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Gjenta alle</string>
   <string name="exo_controls_shuffle_description">Tilfeldig rekkefølge</string>
   <string name="exo_controls_fullscreen_description">Fullskjermmodus</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR-modus</string>
   <string name="exo_download_description">Last ned</string>
   <string name="exo_download_notification_channel_name">Nedlastinger</string>
   <string name="exo_download_downloading">Laster ned</string>
diff --git a/library/ui/src/main/res/values-nl/strings.xml b/library/ui/src/main/res/values-nl/strings.xml
index a3401a0114..18dd96ed9e 100644
--- a/library/ui/src/main/res/values-nl/strings.xml
+++ b/library/ui/src/main/res/values-nl/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Alles herhalen</string>
   <string name="exo_controls_shuffle_description">Shuffle</string>
   <string name="exo_controls_fullscreen_description">Modus \'Volledig scherm\'</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR-modus</string>
   <string name="exo_download_description">Downloaden</string>
   <string name="exo_download_notification_channel_name">Downloads</string>
   <string name="exo_download_downloading">Downloaden</string>
diff --git a/library/ui/src/main/res/values-pl/strings.xml b/library/ui/src/main/res/values-pl/strings.xml
index adb81b5779..66eb7d81c7 100644
--- a/library/ui/src/main/res/values-pl/strings.xml
+++ b/library/ui/src/main/res/values-pl/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Powtórz wszystkie</string>
   <string name="exo_controls_shuffle_description">Odtwarzanie losowe</string>
   <string name="exo_controls_fullscreen_description">Tryb pełnoekranowy</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">Tryb VR</string>
   <string name="exo_download_description">Pobierz</string>
   <string name="exo_download_notification_channel_name">Pobieranie</string>
   <string name="exo_download_downloading">Pobieram</string>
diff --git a/library/ui/src/main/res/values-pt-rPT/strings.xml b/library/ui/src/main/res/values-pt-rPT/strings.xml
index f5d8092723..5d199683d9 100644
--- a/library/ui/src/main/res/values-pt-rPT/strings.xml
+++ b/library/ui/src/main/res/values-pt-rPT/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repetir tudo</string>
   <string name="exo_controls_shuffle_description">Reproduzir aleatoriamente</string>
   <string name="exo_controls_fullscreen_description">Modo de ecrã inteiro</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">Modo de RV</string>
   <string name="exo_download_description">Transferir</string>
   <string name="exo_download_notification_channel_name">Transferências</string>
   <string name="exo_download_downloading">A transferir…</string>
diff --git a/library/ui/src/main/res/values-pt/strings.xml b/library/ui/src/main/res/values-pt/strings.xml
index 2e86dd7acd..151d235554 100644
--- a/library/ui/src/main/res/values-pt/strings.xml
+++ b/library/ui/src/main/res/values-pt/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repetir tudo</string>
   <string name="exo_controls_shuffle_description">Aleatório</string>
   <string name="exo_controls_fullscreen_description">Modo de tela cheia</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">Modo RV</string>
   <string name="exo_download_description">Fazer o download</string>
   <string name="exo_download_notification_channel_name">Downloads</string>
   <string name="exo_download_downloading">Fazendo o download</string>
diff --git a/library/ui/src/main/res/values-ro/strings.xml b/library/ui/src/main/res/values-ro/strings.xml
index a0bd5a0a16..93f5129d13 100644
--- a/library/ui/src/main/res/values-ro/strings.xml
+++ b/library/ui/src/main/res/values-ro/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Repetați-le pe toate</string>
   <string name="exo_controls_shuffle_description">Redați aleatoriu</string>
   <string name="exo_controls_fullscreen_description">Modul Ecran complet</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">Mod RV</string>
   <string name="exo_download_description">Descărcați</string>
   <string name="exo_download_notification_channel_name">Descărcări</string>
   <string name="exo_download_downloading">Se descarcă</string>
diff --git a/library/ui/src/main/res/values-ru/strings.xml b/library/ui/src/main/res/values-ru/strings.xml
index a45022ffb4..77d96f0bc0 100644
--- a/library/ui/src/main/res/values-ru/strings.xml
+++ b/library/ui/src/main/res/values-ru/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Повторять все</string>
   <string name="exo_controls_shuffle_description">Перемешать</string>
   <string name="exo_controls_fullscreen_description">Полноэкранный режим</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR-режим</string>
   <string name="exo_download_description">Скачать</string>
   <string name="exo_download_notification_channel_name">Скачивания</string>
   <string name="exo_download_downloading">Скачивание…</string>
diff --git a/library/ui/src/main/res/values-sk/strings.xml b/library/ui/src/main/res/values-sk/strings.xml
index 2d3997ed89..ae6c0fbb12 100644
--- a/library/ui/src/main/res/values-sk/strings.xml
+++ b/library/ui/src/main/res/values-sk/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Opakovať všetko</string>
   <string name="exo_controls_shuffle_description">Náhodne prehrávať</string>
   <string name="exo_controls_fullscreen_description">Režim celej obrazovky</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">režim VR</string>
   <string name="exo_download_description">Stiahnuť</string>
   <string name="exo_download_notification_channel_name">Stiahnuté</string>
   <string name="exo_download_downloading">Sťahuje sa</string>
diff --git a/library/ui/src/main/res/values-sl/strings.xml b/library/ui/src/main/res/values-sl/strings.xml
index 01fa00320a..16d9a6af03 100644
--- a/library/ui/src/main/res/values-sl/strings.xml
+++ b/library/ui/src/main/res/values-sl/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Ponavljanje vseh</string>
   <string name="exo_controls_shuffle_description">Naključno predvajanje</string>
   <string name="exo_controls_fullscreen_description">Celozaslonski način</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">Način VR</string>
   <string name="exo_download_description">Prenos</string>
   <string name="exo_download_notification_channel_name">Prenosi</string>
   <string name="exo_download_downloading">Prenašanje</string>
diff --git a/library/ui/src/main/res/values-sq/strings.xml b/library/ui/src/main/res/values-sq/strings.xml
index 29007fa20e..fcef9643e8 100644
--- a/library/ui/src/main/res/values-sq/strings.xml
+++ b/library/ui/src/main/res/values-sq/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Përsërit të gjitha</string>
   <string name="exo_controls_shuffle_description">Përziej</string>
   <string name="exo_controls_fullscreen_description">Modaliteti me ekran të plotë</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">Modaliteti RV</string>
   <string name="exo_download_description">Shkarko</string>
   <string name="exo_download_notification_channel_name">Shkarkimet</string>
   <string name="exo_download_downloading">Po shkarkohet</string>
diff --git a/library/ui/src/main/res/values-sr/strings.xml b/library/ui/src/main/res/values-sr/strings.xml
index 659fb113bc..19018f0bac 100644
--- a/library/ui/src/main/res/values-sr/strings.xml
+++ b/library/ui/src/main/res/values-sr/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Понови све</string>
   <string name="exo_controls_shuffle_description">Пусти насумично</string>
   <string name="exo_controls_fullscreen_description">Режим целог екрана</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">ВР режим</string>
   <string name="exo_download_description">Преузми</string>
   <string name="exo_download_notification_channel_name">Преузимања</string>
   <string name="exo_download_downloading">Преузима се</string>
diff --git a/library/ui/src/main/res/values-sv/strings.xml b/library/ui/src/main/res/values-sv/strings.xml
index d9c48aaebe..1f3e7db320 100644
--- a/library/ui/src/main/res/values-sv/strings.xml
+++ b/library/ui/src/main/res/values-sv/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Upprepa alla</string>
   <string name="exo_controls_shuffle_description">Blanda spår</string>
   <string name="exo_controls_fullscreen_description">Helskärmsläge</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR-läge</string>
   <string name="exo_download_description">Ladda ned</string>
   <string name="exo_download_notification_channel_name">Nedladdningar</string>
   <string name="exo_download_downloading">Laddar ned</string>
diff --git a/library/ui/src/main/res/values-sw/strings.xml b/library/ui/src/main/res/values-sw/strings.xml
index 83e6b7bc47..b699116dd7 100644
--- a/library/ui/src/main/res/values-sw/strings.xml
+++ b/library/ui/src/main/res/values-sw/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Rudia zote</string>
   <string name="exo_controls_shuffle_description">Changanya</string>
   <string name="exo_controls_fullscreen_description">Hali ya skrini nzima</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">Hali ya Uhalisia Pepe</string>
   <string name="exo_download_description">Pakua</string>
   <string name="exo_download_notification_channel_name">Vipakuliwa</string>
   <string name="exo_download_downloading">Inapakua</string>
diff --git a/library/ui/src/main/res/values-th/strings.xml b/library/ui/src/main/res/values-th/strings.xml
index 454a0f361d..7827c99d93 100644
--- a/library/ui/src/main/res/values-th/strings.xml
+++ b/library/ui/src/main/res/values-th/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">เล่นซ้ำทั้งหมด</string>
   <string name="exo_controls_shuffle_description">สุ่ม</string>
   <string name="exo_controls_fullscreen_description">โหมดเต็มหน้าจอ</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">โหมด VR</string>
   <string name="exo_download_description">ดาวน์โหลด</string>
   <string name="exo_download_notification_channel_name">ดาวน์โหลด</string>
   <string name="exo_download_downloading">กำลังดาวน์โหลด</string>
diff --git a/library/ui/src/main/res/values-tr/strings.xml b/library/ui/src/main/res/values-tr/strings.xml
index 43bf4f885f..d47ca1e2aa 100644
--- a/library/ui/src/main/res/values-tr/strings.xml
+++ b/library/ui/src/main/res/values-tr/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Tümünü tekrarla</string>
   <string name="exo_controls_shuffle_description">Karıştır</string>
   <string name="exo_controls_fullscreen_description">Tam ekran modu</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR modu</string>
   <string name="exo_download_description">İndir</string>
   <string name="exo_download_notification_channel_name">İndirilenler</string>
   <string name="exo_download_downloading">İndiriliyor</string>
diff --git a/library/ui/src/main/res/values-uk/strings.xml b/library/ui/src/main/res/values-uk/strings.xml
index 0b00dbbe82..5f3097a256 100644
--- a/library/ui/src/main/res/values-uk/strings.xml
+++ b/library/ui/src/main/res/values-uk/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Повторити всі</string>
   <string name="exo_controls_shuffle_description">Перемішати</string>
   <string name="exo_controls_fullscreen_description">Повноекранний режим</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">Режим віртуальної реальності</string>
   <string name="exo_download_description">Завантажити</string>
   <string name="exo_download_notification_channel_name">Завантаження</string>
   <string name="exo_download_downloading">Завантажується</string>
diff --git a/library/ui/src/main/res/values-uz/strings.xml b/library/ui/src/main/res/values-uz/strings.xml
index b5cea1f59e..9427fc4149 100644
--- a/library/ui/src/main/res/values-uz/strings.xml
+++ b/library/ui/src/main/res/values-uz/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Hammasini takrorlash</string>
   <string name="exo_controls_shuffle_description">Aralash</string>
   <string name="exo_controls_fullscreen_description">Butun ekran rejimi</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR rejimi</string>
   <string name="exo_download_description">Yuklab olish</string>
   <string name="exo_download_notification_channel_name">Yuklanmalar</string>
   <string name="exo_download_downloading">Yuklab olinmoqda</string>
diff --git a/library/ui/src/main/res/values-vi/strings.xml b/library/ui/src/main/res/values-vi/strings.xml
index d5299d3e6d..ae6abb90f5 100644
--- a/library/ui/src/main/res/values-vi/strings.xml
+++ b/library/ui/src/main/res/values-vi/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Lặp lại tất cả</string>
   <string name="exo_controls_shuffle_description">Phát ngẫu nhiên</string>
   <string name="exo_controls_fullscreen_description">Chế độ toàn màn hình</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">Chế độ thực tế ảo</string>
   <string name="exo_download_description">Tải xuống</string>
   <string name="exo_download_notification_channel_name">Tài nguyên đã tải xuống</string>
   <string name="exo_download_downloading">Đang tải xuống</string>
diff --git a/library/ui/src/main/res/values-zh-rCN/strings.xml b/library/ui/src/main/res/values-zh-rCN/strings.xml
index ad3e4fe68d..cfb9a6fb11 100644
--- a/library/ui/src/main/res/values-zh-rCN/strings.xml
+++ b/library/ui/src/main/res/values-zh-rCN/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">全部重复播放</string>
   <string name="exo_controls_shuffle_description">随机播放</string>
   <string name="exo_controls_fullscreen_description">全屏模式</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR 模式</string>
   <string name="exo_download_description">下载</string>
   <string name="exo_download_notification_channel_name">下载内容</string>
   <string name="exo_download_downloading">正在下载</string>
diff --git a/library/ui/src/main/res/values-zh-rHK/strings.xml b/library/ui/src/main/res/values-zh-rHK/strings.xml
index f538231146..be96b852f5 100644
--- a/library/ui/src/main/res/values-zh-rHK/strings.xml
+++ b/library/ui/src/main/res/values-zh-rHK/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">全部重複播放</string>
   <string name="exo_controls_shuffle_description">隨機播放</string>
   <string name="exo_controls_fullscreen_description">全螢幕模式</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">虛擬現實模式</string>
   <string name="exo_download_description">下載</string>
   <string name="exo_download_notification_channel_name">下載內容</string>
   <string name="exo_download_downloading">正在下載</string>
diff --git a/library/ui/src/main/res/values-zh-rTW/strings.xml b/library/ui/src/main/res/values-zh-rTW/strings.xml
index da4b01cc93..c17c9e44ed 100644
--- a/library/ui/src/main/res/values-zh-rTW/strings.xml
+++ b/library/ui/src/main/res/values-zh-rTW/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">重複播放所有項目</string>
   <string name="exo_controls_shuffle_description">隨機播放</string>
   <string name="exo_controls_fullscreen_description">全螢幕模式</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">虛擬實境模式</string>
   <string name="exo_download_description">下載</string>
   <string name="exo_download_notification_channel_name">下載</string>
   <string name="exo_download_downloading">下載中</string>
diff --git a/library/ui/src/main/res/values-zu/strings.xml b/library/ui/src/main/res/values-zu/strings.xml
index 4b80136a85..70eccd3c36 100644
--- a/library/ui/src/main/res/values-zu/strings.xml
+++ b/library/ui/src/main/res/values-zu/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">Phinda konke</string>
   <string name="exo_controls_shuffle_description">Shova</string>
   <string name="exo_controls_fullscreen_description">Imodi yesikrini esigcwele</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">Inqubo ye-VR</string>
   <string name="exo_download_description">Landa</string>
   <string name="exo_download_notification_channel_name">Ukulandwa</string>
   <string name="exo_download_downloading">Iyalanda</string>

From 53e06e636df1c63ae8de35a3470861b019b9753e Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 31 Oct 2018 03:06:40 -0700
Subject: [PATCH 139/832] Clean up ExoHostedTest.

Some test specific things, like adding an extra listener or adding decoder
counters are currently handled by ExoHostedTest. They can be moved to the
classes actually using them to clean up ExoHostedTest.

This also adds more flexibility to further generic clean-up in onTestFinished.

Also, reorder player setup to what ExoPlayerTestRunner is doing.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219446276
---
 .../playbacktests/gts/DashTestRunner.java     |  6 +---
 .../exoplayer2/testutil/ExoHostedTest.java    | 35 ++++---------------
 2 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
index 1a43a70f25..6ec2a825c3 100644
--- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
+++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
@@ -323,7 +323,7 @@ public final class DashTestRunner {
     }
 
     @Override
-    protected void logMetrics(DecoderCounters audioCounters, DecoderCounters videoCounters) {
+    protected void onTestFinished(DecoderCounters audioCounters, DecoderCounters videoCounters) {
       metricsLogger.logMetric(MetricsLogger.KEY_TEST_NAME, streamName);
       metricsLogger.logMetric(MetricsLogger.KEY_IS_CDD_LIMITED_RETRY, isCddLimitedRetry);
       metricsLogger.logMetric(MetricsLogger.KEY_FRAMES_DROPPED_COUNT,
@@ -335,10 +335,7 @@ public final class DashTestRunner {
       metricsLogger.logMetric(MetricsLogger.KEY_FRAMES_RENDERED_COUNT,
           videoCounters.renderedOutputBufferCount);
       metricsLogger.close();
-    }
 
-    @Override
-    protected void assertPassed(DecoderCounters audioCounters, DecoderCounters videoCounters) {
       if (fullPlaybackNoSeeking) {
         // We shouldn't have skipped any output buffers.
         DecoderCountersUtil
@@ -372,7 +369,6 @@ public final class DashTestRunner {
         }
       }
     }
-
   }
 
   private static final class DashTestTrackSelector extends DefaultTrackSelector {
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java
index ad59ca7152..74c0d4bb43 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java
@@ -74,7 +74,6 @@ public abstract class ExoHostedTest implements AnalyticsListener, HostedTest {
   private SimpleExoPlayer player;
   private Surface surface;
   private ExoPlaybackException playerError;
-  private AnalyticsListener analyticsListener;
   private boolean playerWasPrepared;
 
   private boolean playing;
@@ -127,14 +126,6 @@ public abstract class ExoHostedTest implements AnalyticsListener, HostedTest {
     }
   }
 
-  /** Sets an {@link AnalyticsListener} to listen for events during the test. */
-  public final void setAnalyticsListener(AnalyticsListener analyticsListener) {
-    this.analyticsListener = analyticsListener;
-    if (player != null) {
-      player.addAnalyticsListener(analyticsListener);
-    }
-  }
-
   // HostedTest implementation
 
   @Override
@@ -145,19 +136,16 @@ public abstract class ExoHostedTest implements AnalyticsListener, HostedTest {
     String userAgent = "ExoPlayerPlaybackTests";
     DrmSessionManager<FrameworkMediaCrypto> drmSessionManager = buildDrmSessionManager(userAgent);
     player = buildExoPlayer(host, surface, trackSelector, drmSessionManager);
-    player.prepare(buildSource(host, Util.getUserAgent(host, userAgent)));
+    player.setPlayWhenReady(true);
     player.addAnalyticsListener(this);
     player.addAnalyticsListener(new EventLogger(trackSelector, tag));
-    if (analyticsListener != null) {
-      player.addAnalyticsListener(analyticsListener);
-    }
-    player.setPlayWhenReady(true);
-    actionHandler = Clock.DEFAULT.createHandler(Looper.myLooper(), /* callback= */ null);
     // Schedule any pending actions.
+    actionHandler = Clock.DEFAULT.createHandler(Looper.myLooper(), /* callback= */ null);
     if (pendingSchedule != null) {
       pendingSchedule.start(player, trackSelector, surface, actionHandler, /* callback= */ null);
       pendingSchedule = null;
     }
+    player.prepare(buildSource(host, Util.getUserAgent(host, userAgent)));
   }
 
   @Override
@@ -172,10 +160,10 @@ public abstract class ExoHostedTest implements AnalyticsListener, HostedTest {
 
   @Override
   public final void onFinished() {
+    onTestFinished(audioDecoderCounters, videoDecoderCounters);
     if (failOnPlayerError && playerError != null) {
       throw new Error(playerError);
     }
-    logMetrics(audioDecoderCounters, videoDecoderCounters);
     if (expectedPlayingTimeMs != EXPECTED_PLAYING_TIME_UNSET) {
       long playingTimeToAssertMs = expectedPlayingTimeMs == EXPECTED_PLAYING_TIME_MEDIA_DURATION_MS
           ? sourceDurationMs : expectedPlayingTimeMs;
@@ -189,8 +177,6 @@ public abstract class ExoHostedTest implements AnalyticsListener, HostedTest {
                   && totalPlayingTimeMs <= maxAllowedActualPlayingTimeMs)
           .isTrue();
     }
-    // Make any additional assertions.
-    assertPassed(audioDecoderCounters, videoDecoderCounters);
   }
 
   // AnalyticsListener
@@ -251,12 +237,10 @@ public abstract class ExoHostedTest implements AnalyticsListener, HostedTest {
     return null;
   }
 
-  @SuppressWarnings("unused")
   protected DefaultTrackSelector buildTrackSelector(HostActivity host) {
     return new DefaultTrackSelector(new AdaptiveTrackSelection.Factory());
   }
 
-  @SuppressWarnings("unused")
   protected SimpleExoPlayer buildExoPlayer(
       HostActivity host,
       Surface surface,
@@ -274,20 +258,13 @@ public abstract class ExoHostedTest implements AnalyticsListener, HostedTest {
     return player;
   }
 
-  @SuppressWarnings("unused")
   protected abstract MediaSource buildSource(HostActivity host, String userAgent);
 
-  @SuppressWarnings("unused")
   protected void onPlayerErrorInternal(ExoPlaybackException error) {
     // Do nothing. Interested subclasses may override.
   }
 
-  protected void logMetrics(DecoderCounters audioCounters, DecoderCounters videoCounters) {
-    // Do nothing. Subclasses may override to log metrics.
+  protected void onTestFinished(DecoderCounters audioCounters, DecoderCounters videoCounters) {
+    // Do nothing. Subclasses may override to add clean-up and assertions.
   }
-
-  protected void assertPassed(DecoderCounters audioCounters, DecoderCounters videoCounters) {
-    // Do nothing. Subclasses may override to add additional assertions.
-  }
-
 }

From 7d99794bb8f731484416053a0fa471eda2b24f37 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Wed, 31 Oct 2018 03:37:24 -0700
Subject: [PATCH 140/832] Allow MP4s with truncated stco to be played

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219448836
---
 .../exoplayer2/extractor/mp4/AtomParsers.java     | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
index 7104630a23..0cda3fafa8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
@@ -221,11 +221,22 @@ import java.util.List;
 
       for (int i = 0; i < sampleCount; i++) {
         // Advance to the next chunk if necessary.
-        while (remainingSamplesInChunk == 0) {
-          Assertions.checkState(chunkIterator.moveNext());
+        boolean chunkDataComplete = true;
+        while (remainingSamplesInChunk == 0 && (chunkDataComplete = chunkIterator.moveNext())) {
           offset = chunkIterator.offset;
           remainingSamplesInChunk = chunkIterator.numSamples;
         }
+        if (!chunkDataComplete) {
+          Log.w(TAG, "Unexpected end of chunk data");
+          sampleCount = i;
+          offsets = Arrays.copyOf(offsets, sampleCount);
+          sizes = Arrays.copyOf(sizes, sampleCount);
+          timestamps = Arrays.copyOf(timestamps, sampleCount);
+          flags = Arrays.copyOf(flags, sampleCount);
+          remainingSamplesAtTimestampOffset = 0;
+          remainingTimestampOffsetChanges = 0;
+          break;
+        }
 
         // Add on the timestamp offset if ctts is present.
         if (ctts != null) {

From 5f6c907c652c70f44869a7a7e7f70573fc88d89c Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 31 Oct 2018 04:58:25 -0700
Subject: [PATCH 141/832] Reset DefaultBandwidthMeter on network type change

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219454931
---
 .../upstream/DefaultBandwidthMeter.java       | 171 ++++++++++++++++--
 .../exoplayer2/util/SlidingPercentile.java    |   8 +
 .../google/android/exoplayer2/util/Util.java  |   2 +-
 .../upstream/DefaultBandwidthMeterTest.java   |  74 ++++++--
 4 files changed, 225 insertions(+), 30 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
index 6be13603ee..eef86a3aab 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
@@ -15,8 +15,13 @@
  */
 package com.google.android.exoplayer2.upstream;
 
+import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.ConnectivityManager;
 import android.os.Handler;
+import android.os.Looper;
 import android.support.annotation.Nullable;
 import android.util.SparseArray;
 import com.google.android.exoplayer2.C;
@@ -25,9 +30,12 @@ import com.google.android.exoplayer2.util.Clock;
 import com.google.android.exoplayer2.util.EventDispatcher;
 import com.google.android.exoplayer2.util.SlidingPercentile;
 import com.google.android.exoplayer2.util.Util;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 /**
  * Estimates bandwidth by listening to data transfers.
@@ -79,6 +87,7 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
     private SparseArray<Long> initialBitrateEstimates;
     private int slidingWindowMaxWeight;
     private Clock clock;
+    private boolean resetOnNetworkTypeChange;
 
     /**
      * Creates a builder with default parameters and without listener.
@@ -119,9 +128,8 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
     }
 
     /**
-     * Sets the initial bitrate estimate in bits per second for a network type that should be
-     * assumed when a bandwidth estimate is unavailable and the current network connection is of the
-     * specified type.
+     * Sets the initial bitrate estimate in bits per second that should be assumed when a bandwidth
+     * estimate is unavailable and the current network connection is of the specified type.
      *
      * @param networkType The {@link C.NetworkType} this initial estimate is for.
      * @param initialBitrateEstimate The initial bitrate estimate in bits per second.
@@ -159,16 +167,29 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
       return this;
     }
 
+    /**
+     * Sets whether to reset if the network type changes.
+     *
+     * @param resetOnNetworkTypeChange Whether to reset if the network type changes.
+     * @return This builder.
+     */
+    public Builder experimental_resetOnNetworkTypeChange(boolean resetOnNetworkTypeChange) {
+      this.resetOnNetworkTypeChange = resetOnNetworkTypeChange;
+      return this;
+    }
+
     /**
      * Builds the bandwidth meter.
      *
      * @return A bandwidth meter with the configured properties.
      */
     public DefaultBandwidthMeter build() {
-      DefaultBandwidthMeter bandwidthMeter =
-          new DefaultBandwidthMeter(
-              context, initialBitrateEstimates, slidingWindowMaxWeight, clock);
-      return bandwidthMeter;
+      return new DefaultBandwidthMeter(
+          context,
+          initialBitrateEstimates,
+          slidingWindowMaxWeight,
+          clock,
+          resetOnNetworkTypeChange);
     }
 
     private static SparseArray<Long> getInitialBitrateEstimatesForCountry(String countryCode) {
@@ -195,6 +216,7 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
   private static final int ELAPSED_MILLIS_FOR_ESTIMATE = 2000;
   private static final int BYTES_TRANSFERRED_FOR_ESTIMATE = 512 * 1024;
 
+  @Nullable private final Context context;
   private final SparseArray<Long> initialBitrateEstimates;
   private final EventDispatcher<EventListener> eventDispatcher;
   private final SlidingPercentile slidingPercentile;
@@ -204,9 +226,14 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
   private long sampleStartTimeMs;
   private long sampleBytesTransferred;
 
+  @C.NetworkType private int networkType;
   private long totalElapsedTimeMs;
   private long totalBytesTransferred;
   private long bitrateEstimate;
+  private long lastReportedBitrateEstimate;
+
+  private boolean networkTypeOverrideSet;
+  @C.NetworkType private int networkTypeOverride;
 
   /** @deprecated Use {@link Builder} instead. */
   @Deprecated
@@ -215,34 +242,44 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
         /* context= */ null,
         /* initialBitrateEstimates= */ new SparseArray<>(),
         DEFAULT_SLIDING_WINDOW_MAX_WEIGHT,
-        Clock.DEFAULT);
+        Clock.DEFAULT,
+        /* resetOnNetworkTypeChange= */ false);
   }
 
   private DefaultBandwidthMeter(
       @Nullable Context context,
       SparseArray<Long> initialBitrateEstimates,
       int maxWeight,
-      Clock clock) {
+      Clock clock,
+      boolean resetOnNetworkTypeChange) {
+    this.context = context == null ? null : context.getApplicationContext();
     this.initialBitrateEstimates = initialBitrateEstimates;
     this.eventDispatcher = new EventDispatcher<>();
     this.slidingPercentile = new SlidingPercentile(maxWeight);
     this.clock = clock;
-    bitrateEstimate =
-        getInitialBitrateEstimateForNetworkType(
-            context == null ? C.NETWORK_TYPE_UNKNOWN : Util.getNetworkType(context));
+    // Set the initial network type and bitrate estimate
+    networkType = context == null ? C.NETWORK_TYPE_UNKNOWN : Util.getNetworkType(context);
+    bitrateEstimate = getInitialBitrateEstimateForNetworkType(networkType);
+    // Register to receive connectivity actions if possible.
+    if (context != null && resetOnNetworkTypeChange) {
+      ConnectivityActionReceiver connectivityActionReceiver =
+          ConnectivityActionReceiver.getInstance(context);
+      connectivityActionReceiver.register(/* bandwidthMeter= */ this);
+    }
   }
 
   /**
    * Overrides the network type. Handled in the same way as if the meter had detected a change from
-   * the current network type to the specified network type.
+   * the current network type to the specified network type internally.
    *
    * <p>Applications should not normally call this method. It is intended for testing purposes.
    *
    * @param networkType The overriding network type.
    */
   public synchronized void setNetworkTypeOverride(@C.NetworkType int networkType) {
-    // TODO: Handle properly as a network change (in same way as non-external network changes).
-    bitrateEstimate = getInitialBitrateEstimateForNetworkType(networkType);
+    networkTypeOverride = networkType;
+    networkTypeOverrideSet = true;
+    onConnectivityAction();
   }
 
   @Override
@@ -309,14 +346,50 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
           || totalBytesTransferred >= BYTES_TRANSFERRED_FOR_ESTIMATE) {
         bitrateEstimate = (long) slidingPercentile.getPercentile(0.5f);
       }
-      notifyBandwidthSample(sampleElapsedTimeMs, sampleBytesTransferred, bitrateEstimate);
+      maybeNotifyBandwidthSample(sampleElapsedTimeMs, sampleBytesTransferred, bitrateEstimate);
       sampleStartTimeMs = nowMs;
       sampleBytesTransferred = 0;
     } // Else any sample bytes transferred will be carried forward into the next sample.
     streamCount--;
   }
 
-  private void notifyBandwidthSample(int elapsedMs, long bytesTransferred, long bitrateEstimate) {
+  private synchronized void onConnectivityAction() {
+    int networkType =
+        networkTypeOverrideSet
+            ? networkTypeOverride
+            : (context == null ? C.NETWORK_TYPE_UNKNOWN : Util.getNetworkType(context));
+    if (this.networkType == networkType) {
+      return;
+    }
+
+    this.networkType = networkType;
+    if (networkType == C.NETWORK_TYPE_OFFLINE
+        || networkType == C.NETWORK_TYPE_UNKNOWN
+        || networkType == C.NETWORK_TYPE_OTHER) {
+      // It's better not to reset the bandwidth meter for these network types.
+      return;
+    }
+
+    // Reset the bitrate estimate and report it, along with any bytes transferred.
+    this.bitrateEstimate = getInitialBitrateEstimateForNetworkType(networkType);
+    long nowMs = clock.elapsedRealtime();
+    int sampleElapsedTimeMs = streamCount > 0 ? (int) (nowMs - sampleStartTimeMs) : 0;
+    maybeNotifyBandwidthSample(sampleElapsedTimeMs, sampleBytesTransferred, bitrateEstimate);
+
+    // Reset the remainder of the state.
+    sampleStartTimeMs = nowMs;
+    sampleBytesTransferred = 0;
+    totalBytesTransferred = 0;
+    totalElapsedTimeMs = 0;
+    slidingPercentile.reset();
+  }
+
+  private void maybeNotifyBandwidthSample(
+      int elapsedMs, long bytesTransferred, long bitrateEstimate) {
+    if (elapsedMs == 0 && bytesTransferred == 0 && bitrateEstimate == lastReportedBitrateEstimate) {
+      return;
+    }
+    lastReportedBitrateEstimate = bitrateEstimate;
     eventDispatcher.dispatch(
         listener -> listener.onBandwidthSample(elapsedMs, bytesTransferred, bitrateEstimate));
   }
@@ -332,6 +405,70 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
     return initialBitrateEstimate;
   }
 
+  /*
+   * Note: This class only holds a weak reference to DefaultBandwidthMeter instances. It should not
+   * be made non-static, since doing so adds a strong reference (i.e. DefaultBandwidthMeter.this).
+   */
+  private static class ConnectivityActionReceiver extends BroadcastReceiver {
+
+    @MonotonicNonNull private static ConnectivityActionReceiver staticInstance;
+
+    private final Handler mainHandler;
+    private final ArrayList<WeakReference<DefaultBandwidthMeter>> bandwidthMeters;
+
+    public static synchronized ConnectivityActionReceiver getInstance(Context context) {
+      if (staticInstance == null) {
+        staticInstance = new ConnectivityActionReceiver();
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
+        context.registerReceiver(staticInstance, filter);
+      }
+      return staticInstance;
+    }
+
+    private ConnectivityActionReceiver() {
+      mainHandler = new Handler(Looper.getMainLooper());
+      bandwidthMeters = new ArrayList<>();
+    }
+
+    public synchronized void register(DefaultBandwidthMeter bandwidthMeter) {
+      removeClearedReferences();
+      bandwidthMeters.add(new WeakReference<>(bandwidthMeter));
+      // Simulate an initial update on the main thread (like the sticky broadcast we'd receive if
+      // we were to register a separate broadcast receiver for each bandwidth meter).
+      mainHandler.post(() -> updateBandwidthMeter(bandwidthMeter));
+    }
+
+    @Override
+    public synchronized void onReceive(Context context, Intent intent) {
+      if (isInitialStickyBroadcast()) {
+        return;
+      }
+      removeClearedReferences();
+      for (int i = 0; i < bandwidthMeters.size(); i++) {
+        WeakReference<DefaultBandwidthMeter> bandwidthMeterReference = bandwidthMeters.get(i);
+        DefaultBandwidthMeter bandwidthMeter = bandwidthMeterReference.get();
+        if (bandwidthMeter != null) {
+          updateBandwidthMeter(bandwidthMeter);
+        }
+      }
+    }
+
+    private void updateBandwidthMeter(DefaultBandwidthMeter bandwidthMeter) {
+      bandwidthMeter.onConnectivityAction();
+    }
+
+    private void removeClearedReferences() {
+      for (int i = bandwidthMeters.size() - 1; i >= 0; i--) {
+        WeakReference<DefaultBandwidthMeter> bandwidthMeterReference = bandwidthMeters.get(i);
+        DefaultBandwidthMeter bandwidthMeter = bandwidthMeterReference.get();
+        if (bandwidthMeter == null) {
+          bandwidthMeters.remove(i);
+        }
+      }
+    }
+  }
+
   private static Map<String, int[]> createInitialBitrateCountryGroupAssignment() {
     HashMap<String, int[]> countryGroupAssignment = new HashMap<>();
     countryGroupAssignment.put("AD", new int[] {1, 0, 0, 0});
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/SlidingPercentile.java b/library/core/src/main/java/com/google/android/exoplayer2/util/SlidingPercentile.java
index f9be1a53b2..c9c21023c3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/SlidingPercentile.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/SlidingPercentile.java
@@ -65,6 +65,14 @@ public class SlidingPercentile {
     currentSortOrder = SORT_ORDER_NONE;
   }
 
+  /** Resets the sliding percentile. */
+  public void reset() {
+    samples.clear();
+    currentSortOrder = SORT_ORDER_NONE;
+    nextSampleIndex = 0;
+    totalWeight = 0;
+  }
+
   /**
    * Adds a new weighted value.
    *
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
index 116ad860e0..410e1c174c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
@@ -1652,7 +1652,7 @@ public final class Util {
         return getMobileNetworkType(networkInfo);
       case ConnectivityManager.TYPE_ETHERNET:
         return C.NETWORK_TYPE_ETHERNET;
-      default: // Ethernet, VPN, Bluetooth, Dummy.
+      default: // VPN, Bluetooth, Dummy.
         return C.NETWORK_TYPE_OTHER;
     }
   }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeterTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeterTest.java
index ebdb45909b..ec5d82e712 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeterTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeterTest.java
@@ -15,15 +15,18 @@
  */
 package com.google.android.exoplayer2.upstream;
 
-import static android.Manifest.permission.ACCESS_NETWORK_STATE;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.NetworkInfo.DetailedState;
+import android.net.Uri;
 import android.telephony.TelephonyManager;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.testutil.FakeClock;
+import com.google.android.exoplayer2.testutil.FakeDataSource;
+import java.util.Random;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -36,6 +39,7 @@ import org.robolectric.shadows.ShadowNetworkInfo;
 @RunWith(RobolectricTestRunner.class)
 public final class DefaultBandwidthMeterTest {
 
+  private static final int SIMULATED_TRANSFER_COUNT = 100;
   private static final String FAST_COUNTRY_ISO = "EE";
   private static final String SLOW_COUNTRY_ISO = "PG";
 
@@ -496,6 +500,44 @@ public final class DefaultBandwidthMeterTest {
   }
 
   @Test
+  public void networkTypeOverride_updatesBitrateEstimate() {
+    setActiveNetworkInfo(networkInfoEthernet);
+    DefaultBandwidthMeter bandwidthMeter =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+    long initialEstimateEthernet = bandwidthMeter.getBitrateEstimate();
+
+    bandwidthMeter.setNetworkTypeOverride(C.NETWORK_TYPE_2G);
+    long initialEstimate2g = bandwidthMeter.getBitrateEstimate();
+
+    assertThat(initialEstimateEthernet).isGreaterThan(initialEstimate2g);
+  }
+
+  @Test
+  public void networkTypeOverride_doesFullReset() {
+    // Simulate transfers for an ethernet connection.
+    setActiveNetworkInfo(networkInfoEthernet);
+    FakeClock clock = new FakeClock(/* initialTimeMs= */ 0);
+    DefaultBandwidthMeter bandwidthMeter =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).setClock(clock).build();
+    long[] bitrateEstimatesWithNewInstance = simulateTransfers(bandwidthMeter, clock);
+
+    // Create a new instance and seed with some transfers.
+    setActiveNetworkInfo(networkInfo2g);
+    bandwidthMeter =
+        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).setClock(clock).build();
+    simulateTransfers(bandwidthMeter, clock);
+
+    // Override the network type to ethernet and simulate transfers again.
+    bandwidthMeter.setNetworkTypeOverride(C.NETWORK_TYPE_ETHERNET);
+    long[] bitrateEstimatesAfterReset = simulateTransfers(bandwidthMeter, clock);
+
+    // If overriding the network type fully reset the bandwidth meter, we expect the bitrate
+    // estimates generated during simulation to be the same.
+    assertThat(bitrateEstimatesAfterReset).isEqualTo(bitrateEstimatesWithNewInstance);
+  }
+
+  @Test
+  @SuppressWarnings("deprecation")
   public void defaultInitialBitrateEstimate_withoutContext_isReasonable() {
     DefaultBandwidthMeter bandwidthMeterWithBuilder =
         new DefaultBandwidthMeter.Builder(/* context= */ null).build();
@@ -510,17 +552,6 @@ public final class DefaultBandwidthMeterTest {
     assertThat(initialEstimateWithoutBuilder).isLessThan(50_000_000L);
   }
 
-  @Test
-  public void defaultInitialBitrateEstimate_withoutAccessNetworkStatePermission_isReasonable() {
-    Shadows.shadowOf(RuntimeEnvironment.application).denyPermissions(ACCESS_NETWORK_STATE);
-    DefaultBandwidthMeter bandwidthMeter =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
-    long initialEstimate = bandwidthMeter.getBitrateEstimate();
-
-    assertThat(initialEstimate).isGreaterThan(100_000L);
-    assertThat(initialEstimate).isLessThan(50_000_000L);
-  }
-
   private void setActiveNetworkInfo(NetworkInfo networkInfo) {
     Shadows.shadowOf(connectivityManager).setActiveNetworkInfo(networkInfo);
   }
@@ -528,4 +559,23 @@ public final class DefaultBandwidthMeterTest {
   private void setNetworkCountryIso(String countryIso) {
     Shadows.shadowOf(telephonyManager).setNetworkCountryIso(countryIso);
   }
+
+  private static long[] simulateTransfers(DefaultBandwidthMeter bandwidthMeter, FakeClock clock) {
+    long[] bitrateEstimates = new long[SIMULATED_TRANSFER_COUNT];
+    Random random = new Random(/* seed= */ 0);
+    DataSource dataSource = new FakeDataSource();
+    DataSpec dataSpec = new DataSpec(Uri.parse("https://dummy.com"));
+    for (int i = 0; i < SIMULATED_TRANSFER_COUNT; i++) {
+      bandwidthMeter.onTransferStart(dataSource, dataSpec, /* isNetwork= */ true);
+      clock.advanceTime(random.nextInt(/* bound= */ 5000));
+      bandwidthMeter.onBytesTransferred(
+          dataSource,
+          dataSpec,
+          /* isNetwork= */ true,
+          /* bytes= */ random.nextInt(5 * 1024 * 1024));
+      bandwidthMeter.onTransferEnd(dataSource, dataSpec, /* isNetwork= */ true);
+      bitrateEstimates[i] = bandwidthMeter.getBitrateEstimate();
+    }
+    return bitrateEstimates;
+  }
 }

From 58f50ca6555eb60e87e84e717a3c49e0cee17703 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 31 Oct 2018 04:59:04 -0700
Subject: [PATCH 142/832] Clarify Java 8 gradle requirement in developer guide.

Issue:#5026

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219454985
---
 README.md | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index b69be03ae4..2b6a508aaa 100644
--- a/README.md
+++ b/README.md
@@ -45,10 +45,15 @@ following will add a dependency to the full library:
 implementation 'com.google.android.exoplayer:exoplayer:2.X.X'
 ```
 
-where `2.X.X` is your preferred version. Alternatively, you can depend on only
-the library modules that you actually need. For example the following will add
-dependencies on the Core, DASH and UI library modules, as might be required for
-an app that plays DASH content:
+where `2.X.X` is your preferred version. If not enabled already, you also need
+to turn on Java 8 support in all `build.gradle` files depending on ExoPlayer, by
+adding `compileOptions { targetCompatibility JavaVersion.VERSION_1_8 }` to the
+`android` section.
+
+As an alternative to the full library, you can depend on only the library
+modules that you actually need. For example the following will add dependencies
+on the Core, DASH and UI library modules, as might be required for an app that
+plays DASH content:
 
 ```gradle
 implementation 'com.google.android.exoplayer:exoplayer-core:2.X.X'

From db832d691b0a9279c8c6103ad73d0ac9dadf3d28 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 31 Oct 2018 07:36:49 -0700
Subject: [PATCH 143/832] Add equals and hashCode to MediaItem

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219470655
---
 .../exoplayer2/ext/cast/MediaItem.java        | 75 +++++++++++++++++++
 .../exoplayer2/ext/cast/MediaItemTest.java    | 64 ++++++++++++++--
 2 files changed, 133 insertions(+), 6 deletions(-)

diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java
index 02a8d1b5d4..8ab10e165d 100644
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java
@@ -19,6 +19,7 @@ import android.net.Uri;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.Util;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -189,6 +190,26 @@ public final class MediaItem {
       this.uri = uri;
       this.requestHeaders = Collections.unmodifiableMap(new HashMap<>(requestHeaders));
     }
+
+    @Override
+    public boolean equals(@Nullable Object other) {
+      if (this == other) {
+        return true;
+      }
+      if (other == null || getClass() != other.getClass()) {
+        return false;
+      }
+
+      UriBundle uriBundle = (UriBundle) other;
+      return uri.equals(uriBundle.uri) && requestHeaders.equals(uriBundle.requestHeaders);
+    }
+
+    @Override
+    public int hashCode() {
+      int result = uri.hashCode();
+      result = 31 * result + requestHeaders.hashCode();
+      return result;
+    }
   }
 
   /**
@@ -216,6 +237,26 @@ public final class MediaItem {
       this.uuid = uuid;
       this.licenseServer = licenseServer;
     }
+
+    @Override
+    public boolean equals(@Nullable Object other) {
+      if (this == other) {
+        return true;
+      }
+      if (other == null || getClass() != other.getClass()) {
+        return false;
+      }
+
+      DrmScheme drmScheme = (DrmScheme) other;
+      return uuid.equals(drmScheme.uuid) && Util.areEqual(licenseServer, drmScheme.licenseServer);
+    }
+
+    @Override
+    public int hashCode() {
+      int result = uuid.hashCode();
+      result = 31 * result + (licenseServer != null ? licenseServer.hashCode() : 0);
+      return result;
+    }
   }
 
   /**
@@ -270,6 +311,40 @@ public final class MediaItem {
 
   // TODO: Add support for sideloaded tracks, artwork, icon, and subtitle.
 
+  @Override
+  public boolean equals(@Nullable Object other) {
+    if (this == other) {
+      return true;
+    }
+    if (other == null || getClass() != other.getClass()) {
+      return false;
+    }
+    MediaItem mediaItem = (MediaItem) other;
+    return startPositionUs == mediaItem.startPositionUs
+        && endPositionUs == mediaItem.endPositionUs
+        && uuid.equals(mediaItem.uuid)
+        && title.equals(mediaItem.title)
+        && description.equals(mediaItem.description)
+        && media.equals(mediaItem.media)
+        && Util.areEqual(attachment, mediaItem.attachment)
+        && drmSchemes.equals(mediaItem.drmSchemes)
+        && mimeType.equals(mediaItem.mimeType);
+  }
+
+  @Override
+  public int hashCode() {
+    int result = uuid.hashCode();
+    result = 31 * result + title.hashCode();
+    result = 31 * result + description.hashCode();
+    result = 31 * result + media.hashCode();
+    result = 31 * result + (attachment != null ? attachment.hashCode() : 0);
+    result = 31 * result + drmSchemes.hashCode();
+    result = 31 * result + (int) (startPositionUs ^ (startPositionUs >>> 32));
+    result = 31 * result + (int) (endPositionUs ^ (endPositionUs >>> 32));
+    result = 31 * result + mimeType.hashCode();
+    return result;
+  }
+
   private MediaItem(
       UUID uuid,
       String title,
diff --git a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/MediaItemTest.java b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/MediaItemTest.java
index 3c7ec6cab3..f176fe9c6f 100644
--- a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/MediaItemTest.java
+++ b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/MediaItemTest.java
@@ -20,6 +20,9 @@ import static com.google.common.truth.Truth.assertThat;
 import android.net.Uri;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.MimeTypes;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
 import java.util.UUID;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -47,18 +50,15 @@ public class MediaItemTest {
     MediaItem.Builder builder = new MediaItem.Builder();
     MediaItem item1 =
         builder
+            .setUuid(new UUID(0, 1))
             .setMedia("http://example.com")
             .setTitle("title")
             .setMimeType(MimeTypes.AUDIO_MP4)
             .setStartPositionUs(3)
             .setEndPositionUs(4)
             .build();
-    MediaItem item2 = builder.build();
-    assertThat(item1.title).isEqualTo(item2.title);
-    assertThat(item1.media.uri).isEqualTo(item2.media.uri);
-    assertThat(item1.mimeType).isEqualTo(item2.mimeType);
-    assertThat(item1.startPositionUs).isEqualTo(item2.startPositionUs);
-    assertThat(item1.endPositionUs).isEqualTo(item2.endPositionUs);
+    MediaItem item2 = builder.setUuid(new UUID(0, 1)).build();
+    assertThat(item1).isEqualTo(item2);
   }
 
   @Test
@@ -79,6 +79,42 @@ public class MediaItemTest {
     assertDefaultValues(builder.build());
   }
 
+  @Test
+  public void equals_withEqualDrmSchemes_returnsTrue() {
+    MediaItem.Builder builder = new MediaItem.Builder();
+    MediaItem mediaItem1 =
+        builder
+            .setUuid(new UUID(0, 1))
+            .setMedia("www.google.com")
+            .setDrmSchemes(createMockDrmSchemes(1))
+            .buildAndClear();
+    MediaItem mediaItem2 =
+        builder
+            .setUuid(new UUID(0, 1))
+            .setMedia("www.google.com")
+            .setDrmSchemes(createMockDrmSchemes(1))
+            .buildAndClear();
+    assertThat(mediaItem1).isEqualTo(mediaItem2);
+  }
+
+  @Test
+  public void equals_withDifferentDrmRequestHeaders_returnsFalse() {
+    MediaItem.Builder builder = new MediaItem.Builder();
+    MediaItem mediaItem1 =
+        builder
+            .setUuid(new UUID(0, 1))
+            .setMedia("www.google.com")
+            .setDrmSchemes(createMockDrmSchemes(1))
+            .buildAndClear();
+    MediaItem mediaItem2 =
+        builder
+            .setUuid(new UUID(0, 1))
+            .setMedia("www.google.com")
+            .setDrmSchemes(createMockDrmSchemes(2))
+            .buildAndClear();
+    assertThat(mediaItem1).isNotEqualTo(mediaItem2);
+  }
+
   private static void assertDefaultValues(MediaItem item) {
     assertThat(item.title).isEmpty();
     assertThat(item.description).isEmpty();
@@ -89,4 +125,20 @@ public class MediaItemTest {
     assertThat(item.endPositionUs).isEqualTo(C.TIME_UNSET);
     assertThat(item.mimeType).isEmpty();
   }
+
+  private static List<MediaItem.DrmScheme> createMockDrmSchemes(int seed) {
+    HashMap<String, String> requestHeaders1 = new HashMap<>();
+    requestHeaders1.put("key1", "value1");
+    requestHeaders1.put("key2", "value1");
+    MediaItem.UriBundle uriBundle1 =
+        new MediaItem.UriBundle(Uri.parse("www.uri1.com"), requestHeaders1);
+    MediaItem.DrmScheme drmScheme1 = new MediaItem.DrmScheme(C.WIDEVINE_UUID, uriBundle1);
+    HashMap<String, String> requestHeaders2 = new HashMap<>();
+    requestHeaders2.put("key3", "value3");
+    requestHeaders2.put("key4", "valueWithSeed" + seed);
+    MediaItem.UriBundle uriBundle2 =
+        new MediaItem.UriBundle(Uri.parse("www.uri2.com"), requestHeaders2);
+    MediaItem.DrmScheme drmScheme2 = new MediaItem.DrmScheme(C.PLAYREADY_UUID, uriBundle2);
+    return Arrays.asList(drmScheme1, drmScheme2);
+  }
 }

From 140d5fc9a96ee8be60138629c98f091fc0be80e0 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 31 Oct 2018 07:50:19 -0700
Subject: [PATCH 144/832] Fix naming in MediaItemTest

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219472219
---
 .../android/exoplayer2/ext/cast/MediaItemTest.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/MediaItemTest.java b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/MediaItemTest.java
index f176fe9c6f..98df0d5690 100644
--- a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/MediaItemTest.java
+++ b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/MediaItemTest.java
@@ -67,7 +67,7 @@ public class MediaItemTest {
   }
 
   @Test
-  public void buildMediaItem_testClear() {
+  public void buildAndClear_assertDefaultValues() {
     MediaItem.Builder builder = new MediaItem.Builder();
     builder
         .setMedia("http://example.com")
@@ -86,13 +86,13 @@ public class MediaItemTest {
         builder
             .setUuid(new UUID(0, 1))
             .setMedia("www.google.com")
-            .setDrmSchemes(createMockDrmSchemes(1))
+            .setDrmSchemes(createDummyDrmSchemes(1))
             .buildAndClear();
     MediaItem mediaItem2 =
         builder
             .setUuid(new UUID(0, 1))
             .setMedia("www.google.com")
-            .setDrmSchemes(createMockDrmSchemes(1))
+            .setDrmSchemes(createDummyDrmSchemes(1))
             .buildAndClear();
     assertThat(mediaItem1).isEqualTo(mediaItem2);
   }
@@ -104,13 +104,13 @@ public class MediaItemTest {
         builder
             .setUuid(new UUID(0, 1))
             .setMedia("www.google.com")
-            .setDrmSchemes(createMockDrmSchemes(1))
+            .setDrmSchemes(createDummyDrmSchemes(1))
             .buildAndClear();
     MediaItem mediaItem2 =
         builder
             .setUuid(new UUID(0, 1))
             .setMedia("www.google.com")
-            .setDrmSchemes(createMockDrmSchemes(2))
+            .setDrmSchemes(createDummyDrmSchemes(2))
             .buildAndClear();
     assertThat(mediaItem1).isNotEqualTo(mediaItem2);
   }
@@ -126,7 +126,7 @@ public class MediaItemTest {
     assertThat(item.mimeType).isEmpty();
   }
 
-  private static List<MediaItem.DrmScheme> createMockDrmSchemes(int seed) {
+  private static List<MediaItem.DrmScheme> createDummyDrmSchemes(int seed) {
     HashMap<String, String> requestHeaders1 = new HashMap<>();
     requestHeaders1.put("key1", "value1");
     requestHeaders1.put("key2", "value1");

From 9d947a56f837cd7698c59b229baca9860bb61172 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 31 Oct 2018 07:57:14 -0700
Subject: [PATCH 145/832] Add MediaChunkListIterator

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219472988
---
 .../source/chunk/BaseMediaChunkIterator.java  |  4 +-
 .../source/chunk/MediaChunkListIterator.java  | 61 +++++++++++++++
 .../chunk/MediaChunkListIteratorTest.java     | 76 +++++++++++++++++++
 .../AdaptiveTrackSelectionTest.java           | 38 +---------
 .../exoplayer2/testutil/FakeMediaChunk.java   | 58 ++++++++++++++
 5 files changed, 198 insertions(+), 39 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/source/chunk/MediaChunkListIterator.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/source/chunk/MediaChunkListIteratorTest.java
 create mode 100644 testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaChunk.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkIterator.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkIterator.java
index 4c1462babf..e506cac675 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkIterator.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkIterator.java
@@ -56,14 +56,14 @@ public abstract class BaseMediaChunkIterator implements MediaChunkIterator {
    *
    * @throws NoSuchElementException If the iterator does not point to a valid element.
    */
-  protected void checkInBounds() {
+  protected final void checkInBounds() {
     if (currentIndex < fromIndex || currentIndex > toIndex) {
       throw new NoSuchElementException();
     }
   }
 
   /** Returns the current index this iterator is pointing to. */
-  protected long getCurrentIndex() {
+  protected final long getCurrentIndex() {
     return currentIndex;
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/MediaChunkListIterator.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/MediaChunkListIterator.java
new file mode 100644
index 0000000000..ca64e1affd
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/MediaChunkListIterator.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.source.chunk;
+
+import com.google.android.exoplayer2.upstream.DataSpec;
+import java.util.List;
+
+/** A {@link MediaChunkIterator} which iterates over a {@link List} of {@link MediaChunk}s. */
+public final class MediaChunkListIterator extends BaseMediaChunkIterator {
+
+  private final List<? extends MediaChunk> chunks;
+  private final boolean reverseOrder;
+
+  /**
+   * Creates iterator.
+   *
+   * @param chunks The list of chunks to iterate over.
+   * @param reverseOrder Whether to iterate in reverse order.
+   */
+  public MediaChunkListIterator(List<? extends MediaChunk> chunks, boolean reverseOrder) {
+    super(0, chunks.size() - 1);
+    this.chunks = chunks;
+    this.reverseOrder = reverseOrder;
+  }
+
+  @Override
+  public DataSpec getDataSpec() {
+    return getCurrentChunk().dataSpec;
+  }
+
+  @Override
+  public long getChunkStartTimeUs() {
+    return getCurrentChunk().startTimeUs;
+  }
+
+  @Override
+  public long getChunkEndTimeUs() {
+    return getCurrentChunk().endTimeUs;
+  }
+
+  private MediaChunk getCurrentChunk() {
+    int index = (int) super.getCurrentIndex();
+    if (reverseOrder) {
+      index = chunks.size() - 1 - index;
+    }
+    return chunks.get(index);
+  }
+}
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/chunk/MediaChunkListIteratorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/chunk/MediaChunkListIteratorTest.java
new file mode 100644
index 0000000000..590c06f3d5
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/chunk/MediaChunkListIteratorTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.source.chunk;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.testutil.FakeMediaChunk;
+import java.util.Arrays;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link MediaChunkListIterator}. */
+@RunWith(RobolectricTestRunner.class)
+public class MediaChunkListIteratorTest {
+
+  private static final Format TEST_FORMAT = Format.createSampleFormat(null, null, 0);
+
+  private FakeMediaChunk testChunk1;
+  private FakeMediaChunk testChunk2;
+
+  @Before
+  public void setUp() {
+    testChunk1 = new FakeMediaChunk(TEST_FORMAT, 0, 10);
+    testChunk2 = new FakeMediaChunk(TEST_FORMAT, 10, 20);
+  }
+
+  @Test
+  public void iterator_reverseOrderFalse_returnsItemsInNormalOrder() {
+    MediaChunkListIterator iterator =
+        new MediaChunkListIterator(
+            Arrays.asList(testChunk1, testChunk2), /* reverseOrder= */ false);
+    assertThat(iterator.isEnded()).isFalse();
+    assertThat(iterator.next()).isTrue();
+    assertEqual(iterator, testChunk1);
+    assertThat(iterator.next()).isTrue();
+    assertEqual(iterator, testChunk2);
+    assertThat(iterator.next()).isFalse();
+    assertThat(iterator.isEnded()).isTrue();
+  }
+
+  @Test
+  public void iterator_reverseOrderTrue_returnsItemsInReverseOrder() {
+    MediaChunkListIterator iterator =
+        new MediaChunkListIterator(
+            Arrays.asList(testChunk1, testChunk2), /* reverseOrder= */ true);
+    assertThat(iterator.isEnded()).isFalse();
+    assertThat(iterator.next()).isTrue();
+    assertEqual(iterator, testChunk2);
+    assertThat(iterator.next()).isTrue();
+    assertEqual(iterator, testChunk1);
+    assertThat(iterator.next()).isFalse();
+    assertThat(iterator.isEnded()).isTrue();
+  }
+
+  private static void assertEqual(MediaChunkListIterator iterator, FakeMediaChunk chunk) {
+    assertThat(iterator.getChunkStartTimeUs()).isEqualTo(chunk.startTimeUs);
+    assertThat(iterator.getChunkEndTimeUs()).isEqualTo(chunk.endTimeUs);
+    assertThat(iterator.getDataSpec()).isEqualTo(chunk.dataSpec);
+  }
+}
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
index 3ddc809ca4..dcad02fef1 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
@@ -23,19 +23,14 @@ import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import android.net.Uri;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.TrackGroup;
-import com.google.android.exoplayer2.source.chunk.MediaChunk;
 import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
 import com.google.android.exoplayer2.testutil.FakeClock;
+import com.google.android.exoplayer2.testutil.FakeMediaChunk;
 import com.google.android.exoplayer2.upstream.BandwidthMeter;
-import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.upstream.DataSpec;
-import com.google.android.exoplayer2.upstream.DefaultHttpDataSource;
 import com.google.android.exoplayer2.util.MimeTypes;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -409,35 +404,4 @@ public final class AdaptiveTrackSelectionTest {
         /* drmInitData= */ null);
   }
 
-  private static final class FakeMediaChunk extends MediaChunk {
-
-    private static final DataSource DATA_SOURCE = new DefaultHttpDataSource("TEST_AGENT", null);
-
-    public FakeMediaChunk(Format trackFormat, long startTimeUs, long endTimeUs) {
-      super(
-          DATA_SOURCE,
-          new DataSpec(Uri.EMPTY),
-          trackFormat,
-          C.SELECTION_REASON_ADAPTIVE,
-          null,
-          startTimeUs,
-          endTimeUs,
-          0);
-    }
-
-    @Override
-    public void cancelLoad() {
-      // Do nothing.
-    }
-
-    @Override
-    public void load() throws IOException, InterruptedException {
-      // Do nothing.
-    }
-
-    @Override
-    public boolean isLoadCompleted() {
-      return true;
-    }
-  }
 }
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaChunk.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaChunk.java
new file mode 100644
index 0000000000..8740e3e57f
--- /dev/null
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaChunk.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.testutil;
+
+import android.net.Uri;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.source.chunk.MediaChunk;
+import com.google.android.exoplayer2.upstream.DataSource;
+import com.google.android.exoplayer2.upstream.DataSpec;
+import com.google.android.exoplayer2.upstream.DefaultHttpDataSource;
+import java.io.IOException;
+
+/** Fake {@link MediaChunk}. */
+public final class FakeMediaChunk extends MediaChunk {
+
+  private static final DataSource DATA_SOURCE = new DefaultHttpDataSource("TEST_AGENT", null);
+
+  public FakeMediaChunk(Format trackFormat, long startTimeUs, long endTimeUs) {
+    super(
+        DATA_SOURCE,
+        new DataSpec(Uri.EMPTY),
+        trackFormat,
+        C.SELECTION_REASON_ADAPTIVE,
+        /* trackSelectionData= */ null,
+        startTimeUs,
+        endTimeUs,
+        /* chunkIndex= */ 0);
+  }
+
+  @Override
+  public void cancelLoad() {
+    // Do nothing.
+  }
+
+  @Override
+  public void load() throws IOException, InterruptedException {
+    // Do nothing.
+  }
+
+  @Override
+  public boolean isLoadCompleted() {
+    return true;
+  }
+}

From 097c045befeeec76d8ed8dab7a97e022ec7d4ed9 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Wed, 31 Oct 2018 19:45:32 +0000
Subject: [PATCH 146/832] Resolve conflicts

---
 .../DefaultTrackSelectorTest.java             | 75 ++++++++++++++++---
 1 file changed, 64 insertions(+), 11 deletions(-)

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
index 92dca1d4dd..63b1c6d597 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
@@ -1061,30 +1061,66 @@ public final class DefaultTrackSelectorTest {
   }
 
   /**
-   * Tests that track selector will select audio tracks with lower bitrate when {@link Parameters}
-   * indicate lowest bitrate preference, even when tracks are within capabilities.
+   * Tests that track selector will select the lowest bitrate supported audio track when {@link
+   * Parameters#forceLowestBitrate} is set.
    */
   @Test
   public void testSelectTracksWithinCapabilitiesAndForceLowestBitrateSelectLowerBitrate()
       throws Exception {
-    Format lowerBitrateFormat =
-        Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, 15000,
-            Format.NO_VALUE, 2, 44100, null, null, 0, null);
-    Format higherBitrateFormat =
-        Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, 30000,
-            Format.NO_VALUE, 2, 44100, null, null, 0, null);
-    TrackGroupArray trackGroups = wrapFormats(lowerBitrateFormat, higherBitrateFormat);
+    Format unsupportedLowBitrateFormat = buildAudioFormatWithBitrate("unsupportedLowBitrate", 5000);
+    Format lowerBitrateFormat = buildAudioFormatWithBitrate("lowBitrate", 15000);
+    Format higherBitrateFormat = buildAudioFormatWithBitrate("highBitrate", 30000);
+    TrackGroupArray trackGroups =
+        wrapFormats(unsupportedLowBitrateFormat, lowerBitrateFormat, higherBitrateFormat);
+
+    Map<String, Integer> mappedCapabilities = new HashMap<>();
+    mappedCapabilities.put(unsupportedLowBitrateFormat.id, FORMAT_EXCEEDS_CAPABILITIES);
+    mappedCapabilities.put(lowerBitrateFormat.id, FORMAT_HANDLED);
+    mappedCapabilities.put(higherBitrateFormat.id, FORMAT_HANDLED);
+    RendererCapabilities mappedAudioRendererCapabilities =
+        new FakeMappedRendererCapabilities(C.TRACK_TYPE_AUDIO, mappedCapabilities);
 
     trackSelector.setParameters(Parameters.DEFAULT.buildUpon().setForceLowestBitrate(true).build());
     TrackSelectorResult result =
         trackSelector.selectTracks(
-            new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
+            new RendererCapabilities[] {mappedAudioRendererCapabilities},
             trackGroups,
             periodId,
             TIMELINE);
     assertFixedSelection(result.selections.get(0), trackGroups, lowerBitrateFormat);
   }
 
+  /**
+   * Tests that track selector will select the highest bitrate supported audio track when {@link
+   * Parameters#forceHighestSupportedBitrate} is set.
+   */
+  @Test
+  public void testSelectTracksWithinCapabilitiesAndForceHighestBitrateSelectHigherBitrate()
+      throws Exception {
+    Format lowerBitrateFormat = buildAudioFormatWithBitrate("lowerBitrateFormat", 5000);
+    Format higherBitrateFormat = buildAudioFormatWithBitrate("higherBitrateFormat", 15000);
+    Format exceedsBitrateFormat = buildAudioFormatWithBitrate("exceedsBitrateFormat", 30000);
+    TrackGroupArray trackGroups =
+        wrapFormats(lowerBitrateFormat, higherBitrateFormat, exceedsBitrateFormat);
+
+    Map<String, Integer> mappedCapabilities = new HashMap<>();
+    mappedCapabilities.put(lowerBitrateFormat.id, FORMAT_HANDLED);
+    mappedCapabilities.put(higherBitrateFormat.id, FORMAT_HANDLED);
+    mappedCapabilities.put(exceedsBitrateFormat.id, FORMAT_EXCEEDS_CAPABILITIES);
+    RendererCapabilities mappedAudioRendererCapabilities =
+        new FakeMappedRendererCapabilities(C.TRACK_TYPE_AUDIO, mappedCapabilities);
+
+    trackSelector.setParameters(
+        new ParametersBuilder().setForceHighestSupportedBitrate(true).build());
+    TrackSelectorResult result =
+        trackSelector.selectTracks(
+            new RendererCapabilities[] {mappedAudioRendererCapabilities},
+            singleTrackGroup(lowerBitrateFormat, higherBitrateFormat, exceedsBitrateFormat),
+            periodId,
+            TIMELINE);
+    assertFixedSelection(result.selections.get(0), trackGroups, higherBitrateFormat);
+  }
+
   @Test
   public void testSelectTracksWithMultipleAudioTracks() throws Exception {
     TrackGroupArray trackGroups = singleTrackGroup(buildAudioFormat("0"), buildAudioFormat("1"));
@@ -1472,16 +1508,29 @@ public final class DefaultTrackSelectorTest {
     return buildAudioFormat(
         id,
         MimeTypes.AUDIO_AAC,
+        /* bitrate= */ Format.NO_VALUE,
         language,
         selectionFlags,
         /* channelCount= */ 2,
         /* sampleRate= */ 44100);
   }
 
+  private static Format buildAudioFormatWithBitrate(String id, int bitrate) {
+    return buildAudioFormat(
+        id,
+        MimeTypes.AUDIO_AAC,
+        bitrate,
+        /* language= */ null,
+        /* selectionFlags= */ 0,
+        /* channelCount= */ 2,
+        /* sampleRate= */ 44100);
+  }
+
   private static Format buildAudioFormatWithSampleRate(String id, int sampleRate) {
     return buildAudioFormat(
         id,
         MimeTypes.AUDIO_AAC,
+        /* bitrate= */ Format.NO_VALUE,
         /* language= */ null,
         /* selectionFlags= */ 0,
         /* channelCount= */ 2,
@@ -1492,6 +1541,7 @@ public final class DefaultTrackSelectorTest {
     return buildAudioFormat(
         id,
         MimeTypes.AUDIO_AAC,
+        /* bitrate= */ Format.NO_VALUE,
         /* language= */ null,
         /* selectionFlags= */ 0,
         channelCount,
@@ -1502,6 +1552,7 @@ public final class DefaultTrackSelectorTest {
     return buildAudioFormat(
         id,
         mimeType,
+        /* bitrate= */ Format.NO_VALUE,
         /* language= */ null,
         /* selectionFlags= */ 0,
         /* channelCount= */ 2,
@@ -1512,6 +1563,7 @@ public final class DefaultTrackSelectorTest {
     return buildAudioFormat(
         id,
         MimeTypes.AUDIO_AAC,
+        /* bitrate= */ Format.NO_VALUE,
         /* language= */ null,
         /* selectionFlags= */ 0,
         /* channelCount= */ 2,
@@ -1521,6 +1573,7 @@ public final class DefaultTrackSelectorTest {
   private static Format buildAudioFormat(
       String id,
       String mimeType,
+      int bitrate,
       String language,
       int selectionFlags,
       int channelCount,
@@ -1529,7 +1582,7 @@ public final class DefaultTrackSelectorTest {
         id,
         mimeType,
         /* codecs= */ null,
-        /* bitrate= */ Format.NO_VALUE,
+        bitrate,
         /* maxInputSize= */ Format.NO_VALUE,
         channelCount,
         sampleRate,

From f1d31bdf4f5f6294f2a69f05725d3f175a81f221 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Wed, 31 Oct 2018 19:49:24 +0000
Subject: [PATCH 147/832] Fix test

---
 .../exoplayer2/trackselection/DefaultTrackSelectorTest.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
index 63b1c6d597..53bc9f4eea 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
@@ -1115,7 +1115,7 @@ public final class DefaultTrackSelectorTest {
     TrackSelectorResult result =
         trackSelector.selectTracks(
             new RendererCapabilities[] {mappedAudioRendererCapabilities},
-            singleTrackGroup(lowerBitrateFormat, higherBitrateFormat, exceedsBitrateFormat),
+            trackGroups,
             periodId,
             TIMELINE);
     assertFixedSelection(result.selections.get(0), trackGroups, higherBitrateFormat);

From 2dfe7a7ad6a784482b8de094c41b7815a09444b8 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Wed, 31 Oct 2018 20:37:59 +0000
Subject: [PATCH 148/832] Misc fixes / stylistic consistency changes for merged
 pull requests

---
 .../ext/cronet/CronetDataSource.java          |  5 +-
 .../exoplayer2/upstream/HttpDataSource.java   | 11 ++-
 .../DefaultLoadErrorHandlingPolicyTest.java   |  6 +-
 .../source/dash/manifest/DashManifest.java    | 74 ++++++++++++++++---
 .../dash/manifest/DashManifestParser.java     | 58 +++++++++++----
 .../dash/manifest/ProgramInformation.java     | 40 ++++------
 .../dash/manifest/DashManifestParserTest.java | 12 +--
 .../dash/manifest/DashManifestTest.java       | 13 +++-
 .../hls/playlist/HlsPlaylistParser.java       |  2 +-
 9 files changed, 155 insertions(+), 66 deletions(-)

diff --git a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java b/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java
index 9f381d0053..af85401100 100644
--- a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java
+++ b/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java
@@ -616,10 +616,7 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
         if (responseCode == 307 || responseCode == 308) {
           exception =
               new InvalidResponseCodeException(
-                  responseCode,
-                  info.getHttpStatusText(),
-                  info.getAllHeaders(),
-                  currentDataSpec);
+                  responseCode, info.getHttpStatusText(), info.getAllHeaders(), currentDataSpec);
           operation.open();
           return;
         }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
index e73901eccb..e3e93bd6fb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
@@ -295,9 +295,7 @@ public interface HttpDataSource extends DataSource {
      */
     public final int responseCode;
 
-    /**
-     * The HTTP status message.
-     */
+    /** The http status message. */
     @Nullable public final String responseMessage;
 
     /**
@@ -305,6 +303,13 @@ public interface HttpDataSource extends DataSource {
      */
     public final Map<String, List<String>> headerFields;
 
+    /** @deprecated Use {@link #InvalidResponseCodeException(int, String, Map, DataSpec)}. */
+    @Deprecated
+    public InvalidResponseCodeException(
+        int responseCode, Map<String, List<String>> headerFields, DataSpec dataSpec) {
+      this(responseCode, /* responseMessage= */ null, headerFields, dataSpec);
+    }
+
     public InvalidResponseCodeException(
         int responseCode,
         @Nullable String responseMessage,
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicyTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicyTest.java
index f0f737828c..cf30fce3a6 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicyTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicyTest.java
@@ -34,7 +34,8 @@ public final class DefaultLoadErrorHandlingPolicyTest {
   @Test
   public void getBlacklistDurationMsFor_blacklist404() {
     InvalidResponseCodeException exception =
-        new InvalidResponseCodeException(404, "Not Found", Collections.emptyMap(), new DataSpec(Uri.EMPTY));
+        new InvalidResponseCodeException(
+            404, "Not Found", Collections.emptyMap(), new DataSpec(Uri.EMPTY));
     assertThat(getDefaultPolicyBlacklistOutputFor(exception))
         .isEqualTo(DefaultLoadErrorHandlingPolicy.DEFAULT_TRACK_BLACKLIST_MS);
   }
@@ -42,7 +43,8 @@ public final class DefaultLoadErrorHandlingPolicyTest {
   @Test
   public void getBlacklistDurationMsFor_blacklist410() {
     InvalidResponseCodeException exception =
-        new InvalidResponseCodeException(410, "Gone", Collections.emptyMap(), new DataSpec(Uri.EMPTY));
+        new InvalidResponseCodeException(
+            410, "Gone", Collections.emptyMap(), new DataSpec(Uri.EMPTY));
     assertThat(getDefaultPolicyBlacklistOutputFor(exception))
         .isEqualTo(DefaultLoadErrorHandlingPolicy.DEFAULT_TRACK_BLACKLIST_MS);
   }
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java
index 6446909808..3637b80ecb 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2.source.dash.manifest;
 
 import android.net.Uri;
+import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.offline.FilterableManifest;
 import com.google.android.exoplayer2.offline.StreamKey;
@@ -86,17 +87,56 @@ public class DashManifest implements FilterableManifest<DashManifest> {
    */
   public final Uri location;
 
-  /**
-   * The ProgramInformation of this manifest.
-   */
-  public final ProgramInformation programInformation;
+  /** The {@link ProgramInformation}, or null if not present. */
+  @Nullable public final ProgramInformation programInformation;
 
   private final List<Period> periods;
 
-  public DashManifest(long availabilityStartTimeMs, long durationMs, long minBufferTimeMs,
-      boolean dynamic, long minUpdatePeriodMs, long timeShiftBufferDepthMs,
-      long suggestedPresentationDelayMs, long publishTimeMs, UtcTimingElement utcTiming,
-      Uri location, ProgramInformation programInformation, List<Period> periods) {
+  /**
+   * @deprecated Use {@link #DashManifest(long, long, long, boolean, long, long, long, long,
+   *     ProgramInformation, UtcTimingElement, Uri, List)}.
+   */
+  @Deprecated
+  public DashManifest(
+      long availabilityStartTimeMs,
+      long durationMs,
+      long minBufferTimeMs,
+      boolean dynamic,
+      long minUpdatePeriodMs,
+      long timeShiftBufferDepthMs,
+      long suggestedPresentationDelayMs,
+      long publishTimeMs,
+      UtcTimingElement utcTiming,
+      Uri location,
+      List<Period> periods) {
+    this(
+        availabilityStartTimeMs,
+        durationMs,
+        minBufferTimeMs,
+        dynamic,
+        minUpdatePeriodMs,
+        timeShiftBufferDepthMs,
+        suggestedPresentationDelayMs,
+        publishTimeMs,
+        /* programInformation= */ null,
+        utcTiming,
+        location,
+        periods);
+  }
+
+  public DashManifest(
+      long availabilityStartTimeMs,
+      long durationMs,
+      long minBufferTimeMs,
+      boolean dynamic,
+      long minUpdatePeriodMs,
+      long timeShiftBufferDepthMs,
+      long suggestedPresentationDelayMs,
+      long publishTimeMs,
+      @Nullable ProgramInformation programInformation,
+      UtcTimingElement utcTiming,
+      Uri location,
+      List<Period> periods) {
     this.availabilityStartTimeMs = availabilityStartTimeMs;
     this.durationMs = durationMs;
     this.minBufferTimeMs = minBufferTimeMs;
@@ -105,9 +145,9 @@ public class DashManifest implements FilterableManifest<DashManifest> {
     this.timeShiftBufferDepthMs = timeShiftBufferDepthMs;
     this.suggestedPresentationDelayMs = suggestedPresentationDelayMs;
     this.publishTimeMs = publishTimeMs;
+    this.programInformation = programInformation;
     this.utcTiming = utcTiming;
     this.location = location;
-    this.programInformation = programInformation;
     this.periods = periods == null ? Collections.emptyList() : periods;
   }
 
@@ -154,9 +194,19 @@ public class DashManifest implements FilterableManifest<DashManifest> {
       }
     }
     long newDuration = durationMs != C.TIME_UNSET ? durationMs - shiftMs : C.TIME_UNSET;
-    return new DashManifest(availabilityStartTimeMs, newDuration, minBufferTimeMs, dynamic,
-        minUpdatePeriodMs, timeShiftBufferDepthMs, suggestedPresentationDelayMs, publishTimeMs,
-        utcTiming, location, programInformation, copyPeriods);
+    return new DashManifest(
+        availabilityStartTimeMs,
+        newDuration,
+        minBufferTimeMs,
+        dynamic,
+        minUpdatePeriodMs,
+        timeShiftBufferDepthMs,
+        suggestedPresentationDelayMs,
+        publishTimeMs,
+        programInformation,
+        utcTiming,
+        location,
+        copyPeriods);
   }
 
   private static ArrayList<AdaptationSet> copyAdaptationSets(
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
index d048e22b33..f017ae64ad 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
@@ -120,9 +120,9 @@ public class DashManifestParser extends DefaultHandler
     long suggestedPresentationDelayMs = dynamic
         ? parseDuration(xpp, "suggestedPresentationDelay", C.TIME_UNSET) : C.TIME_UNSET;
     long publishTimeMs = parseDateTime(xpp, "publishTime", C.TIME_UNSET);
+    ProgramInformation programInformation = null;
     UtcTimingElement utcTiming = null;
     Uri location = null;
-    ProgramInformation programInformation = null;
 
     List<Period> periods = new ArrayList<>();
     long nextPeriodStartMs = dynamic ? C.TIME_UNSET : 0;
@@ -135,12 +135,12 @@ public class DashManifestParser extends DefaultHandler
           baseUrl = parseBaseUrl(xpp, baseUrl);
           seenFirstBaseUrl = true;
         }
+      } else if (XmlPullParserUtil.isStartTag(xpp, "ProgramInformation")) {
+        programInformation = parseProgramInformation(xpp);
       } else if (XmlPullParserUtil.isStartTag(xpp, "UTCTiming")) {
         utcTiming = parseUtcTiming(xpp);
       } else if (XmlPullParserUtil.isStartTag(xpp, "Location")) {
         location = Uri.parse(xpp.nextText());
-      } else if (XmlPullParserUtil.isStartTag(xpp, "ProgramInformation")) {
-        programInformation = parseProgramInformation(xpp);
       } else if (XmlPullParserUtil.isStartTag(xpp, "Period") && !seenEarlyAccessPeriod) {
         Pair<Period, Long> periodWithDurationMs = parsePeriod(xpp, baseUrl, nextPeriodStartMs);
         Period period = periodWithDurationMs.first;
@@ -176,18 +176,47 @@ public class DashManifestParser extends DefaultHandler
       throw new ParserException("No periods found.");
     }
 
-    return buildMediaPresentationDescription(availabilityStartTime, durationMs, minBufferTimeMs,
-        dynamic, minUpdateTimeMs, timeShiftBufferDepthMs, suggestedPresentationDelayMs,
-        publishTimeMs, utcTiming, location, programInformation, periods);
+    return buildMediaPresentationDescription(
+        availabilityStartTime,
+        durationMs,
+        minBufferTimeMs,
+        dynamic,
+        minUpdateTimeMs,
+        timeShiftBufferDepthMs,
+        suggestedPresentationDelayMs,
+        publishTimeMs,
+        programInformation,
+        utcTiming,
+        location,
+        periods);
   }
 
-  protected DashManifest buildMediaPresentationDescription(long availabilityStartTime,
-      long durationMs, long minBufferTimeMs, boolean dynamic, long minUpdateTimeMs,
-      long timeShiftBufferDepthMs, long suggestedPresentationDelayMs, long publishTimeMs,
-      UtcTimingElement utcTiming, Uri location, ProgramInformation programInformation, List<Period> periods) {
-    return new DashManifest(availabilityStartTime, durationMs, minBufferTimeMs,
-        dynamic, minUpdateTimeMs, timeShiftBufferDepthMs, suggestedPresentationDelayMs,
-        publishTimeMs, utcTiming, location, programInformation, periods);
+  protected DashManifest buildMediaPresentationDescription(
+      long availabilityStartTime,
+      long durationMs,
+      long minBufferTimeMs,
+      boolean dynamic,
+      long minUpdateTimeMs,
+      long timeShiftBufferDepthMs,
+      long suggestedPresentationDelayMs,
+      long publishTimeMs,
+      ProgramInformation programInformation,
+      UtcTimingElement utcTiming,
+      Uri location,
+      List<Period> periods) {
+    return new DashManifest(
+        availabilityStartTime,
+        durationMs,
+        minBufferTimeMs,
+        dynamic,
+        minUpdateTimeMs,
+        timeShiftBufferDepthMs,
+        suggestedPresentationDelayMs,
+        publishTimeMs,
+        programInformation,
+        utcTiming,
+        location,
+        periods);
   }
 
   protected UtcTimingElement parseUtcTiming(XmlPullParser xpp) {
@@ -1001,7 +1030,8 @@ public class DashManifestParser extends DefaultHandler
     return new RangedUri(urlText, rangeStart, rangeLength);
   }
 
-  protected ProgramInformation parseProgramInformation(XmlPullParser xpp) throws IOException, XmlPullParserException {
+  protected ProgramInformation parseProgramInformation(XmlPullParser xpp)
+      throws IOException, XmlPullParserException {
     String title = null;
     String source = null;
     String copyright = null;
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java
index 71b4af3a21..73e8ef986e 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java
@@ -17,36 +17,25 @@ package com.google.android.exoplayer2.source.dash.manifest;
 
 import com.google.android.exoplayer2.util.Util;
 
-/**
- * A parsed ProgramInformation element.
- */
+/** A parsed program information element. */
 public class ProgramInformation {
-  /**
-   * The title for the media presentation.
-   */
+  /** The title for the media presentation. */
   public final String title;
 
-  /**
-   * Information about the original source of the media presentation.
-   */
+  /** Information about the original source of the media presentation. */
   public final String source;
 
-  /**
-   * A copyright statement for the media presentation.
-   */
+  /** A copyright statement for the media presentation. */
   public final String copyright;
 
-  /**
-   * A URL that provides more information about the media presentation.
-   */
+  /** A URL that provides more information about the media presentation. */
   public final String moreInformationURL;
 
-  /**
-   * Declares the language code(s) for this ProgramInformation.
-   */
+  /** Declares the language code(s) for this ProgramInformation. */
   public final String lang;
 
-  public ProgramInformation(String title, String source, String copyright, String moreInformationURL, String lang) {
+  public ProgramInformation(
+      String title, String source, String copyright, String moreInformationURL, String lang) {
     this.title = title;
     this.source = source;
     this.copyright = copyright;
@@ -56,15 +45,18 @@ public class ProgramInformation {
 
   @Override
   public boolean equals(Object obj) {
-    if (!(obj instanceof ProgramInformation)) {
+    if (this == obj) {
+      return true;
+    }
+    if (obj == null || getClass() != obj.getClass()) {
       return false;
     }
     ProgramInformation other = (ProgramInformation) obj;
     return Util.areEqual(this.title, other.title)
-            && Util.areEqual(this.source, other.source)
-            && Util.areEqual(this.copyright, other.copyright)
-            && Util.areEqual(this.moreInformationURL, other.moreInformationURL)
-            && Util.areEqual(this.lang, other.lang);
+        && Util.areEqual(this.source, other.source)
+        && Util.areEqual(this.copyright, other.copyright)
+        && Util.areEqual(this.moreInformationURL, other.moreInformationURL)
+        && Util.areEqual(this.lang, other.lang);
   }
 
   @Override
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java
index 3183e3c672..a1693f6985 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java
@@ -25,7 +25,6 @@ import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
 import java.nio.charset.Charset;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import org.junit.Test;
@@ -156,11 +155,14 @@ public class DashManifestParserTest {
   @Test
   public void testParseMediaPresentationDescriptionCanParseProgramInformation() throws IOException {
     DashManifestParser parser = new DashManifestParser();
-    DashManifest mpd = parser.parse(Uri.parse("Https://example.com/test.mpd"),
+    DashManifest mpd =
+        parser.parse(
+            Uri.parse("Https://example.com/test.mpd"),
             TestUtil.getInputStream(RuntimeEnvironment.application, SAMPLE_MPD_1));
-    ProgramInformation programInformation = new ProgramInformation("MediaTitle", "MediaSource",
-            "MediaCopyright", "www.example.com", "enUs");
-    assertThat(programInformation).isEqualTo(mpd.programInformation);
+    ProgramInformation expectedProgramInformation =
+        new ProgramInformation(
+            "MediaTitle", "MediaSource", "MediaCopyright", "www.example.com", "enUs");
+    assertThat(mpd.programInformation).isEqualTo(expectedProgramInformation);
   }
 
   @Test
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java
index 17a96fded3..0d08df42e9 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java
@@ -219,7 +219,18 @@ public class DashManifestTest {
 
   private static DashManifest newDashManifest(int duration, Period... periods) {
     return new DashManifest(
-        0, duration, 1, false, 2, 3, 4, 12345, DUMMY_UTC_TIMING, Uri.EMPTY, null, Arrays.asList(periods));
+        /* availabilityStartTimeMs= */ 0,
+        duration,
+        /* minBufferTimeMs= */ 1,
+        /* dynamic= */ false,
+        /* minUpdatePeriodMs= */ 2,
+        /* timeShiftBufferDepthMs= */ 3,
+        /* suggestedPresentationDelayMs= */ 4,
+        /* publishTimeMs= */ 12345,
+        /* programInformation= */ null,
+        DUMMY_UTC_TIMING,
+        Uri.EMPTY,
+        Arrays.asList(periods));
   }
 
   private static Period newPeriod(String id, int startMs, AdaptationSet... adaptationSets) {
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
index bd2bea0197..65f4796187 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
@@ -341,7 +341,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
       String name = parseStringAttr(line, REGEX_NAME, variableDefinitions);
       String language = parseOptionalStringAttr(line, REGEX_LANGUAGE, variableDefinitions);
       String groupId = parseOptionalStringAttr(line, REGEX_GROUP_ID, variableDefinitions);
-      String id = String.format("%s:%s", groupId, name);
+      String id = groupId + ":" + name;
       Format format;
       switch (parseStringAttr(line, REGEX_TYPE, variableDefinitions)) {
         case TYPE_AUDIO:

From a442c72814bc798f0d1f18886cea824e3029fa62 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Wed, 31 Oct 2018 20:40:57 +0000
Subject: [PATCH 149/832] Fix nullability

---
 .../exoplayer2/source/dash/manifest/ProgramInformation.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java
index 73e8ef986e..e3072c86bd 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.source.dash.manifest;
 
+import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.util.Util;
 
 /** A parsed program information element. */
@@ -44,7 +45,7 @@ public class ProgramInformation {
   }
 
   @Override
-  public boolean equals(Object obj) {
+  public boolean equals(@Nullable Object obj) {
     if (this == obj) {
       return true;
     }

From 609f10b5eccd37dc991c7bd077ba2089c26a716f Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 31 Oct 2018 14:43:46 -0700
Subject: [PATCH 150/832] Update moe equivalence

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219540864
---
 RELEASENOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index a52a076014..4f2353f1df 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,6 +2,7 @@
 
 ### dev-v2 (not yet released) ###
 
+* DASH: Parse ProgramInformation element if present in the manifest.
 * Improve decoder re-use between playbacks. TODO: Write and link a blog post
   here ([#2826](https://github.com/google/ExoPlayer/issues/2826)).
 * Improve initial bandwidth meter estimates using the current country and

From f76b80c3cbd3ec1dec6faecc2d0e3a6016d1e795 Mon Sep 17 00:00:00 2001
From: ishani <ishani@google.com>
Date: Wed, 31 Oct 2018 21:47:57 -0700
Subject: [PATCH 151/832] Automated g4 rollback of changelist 219130576.

*** Original change description ***

Re-enable codec re-use

Issue: #2826

***

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219585084
---
 .../mediacodec/MediaCodecRenderer.java           | 16 +++-------------
 .../video/MediaCodecVideoRenderer.java           |  4 ----
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index efe8959908..74c575c1ef 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -536,16 +536,6 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   @Override
   protected void onDisabled() {
     inputFormat = null;
-    if (drmSession != null || pendingDrmSession != null) {
-      // TODO: Do something better with this case.
-      onReset();
-    } else {
-      flushOrReleaseCodec();
-    }
-  }
-
-  @Override
-  protected void onReset() {
     try {
       releaseCodec();
     } finally {
@@ -569,14 +559,14 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   protected void releaseCodec() {
     availableCodecInfos = null;
     if (codec != null) {
-      codecInfo = null;
-      codecFormat = null;
       resetInputBuffer();
       resetOutputBuffer();
       resetCodecBuffers();
-      waitingForKeys = false;
       codecHotswapDeadlineMs = C.TIME_UNSET;
+      waitingForKeys = false;
       decodeOnlyPresentationTimestamps.clear();
+      codecInfo = null;
+      codecFormat = null;
       decoderCounters.decoderReleaseCount++;
       try {
         codec.stop();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index 0b17cd6338..a896bc2322 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -283,12 +283,8 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
   @Override
   protected void onEnabled(boolean joining) throws ExoPlaybackException {
     super.onEnabled(joining);
-    int oldTunnelingAudioSessionId = tunnelingAudioSessionId;
     tunnelingAudioSessionId = getConfiguration().tunnelingAudioSessionId;
     tunneling = tunnelingAudioSessionId != C.AUDIO_SESSION_ID_UNSET;
-    if (tunnelingAudioSessionId != oldTunnelingAudioSessionId) {
-      releaseCodec();
-    }
     eventDispatcher.enabled(decoderCounters);
     frameReleaseTimeHelper.enable();
   }

From 36fef95f47de48bd540c0321691f9ac78e43eb23 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 1 Nov 2018 00:58:32 -0700
Subject: [PATCH 152/832] Fix extended service number calculation

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219597894
---
 .../google/android/exoplayer2/text/cea/Cea708Decoder.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Decoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Decoder.java
index a95f1de738..b3be88b851 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Decoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Decoder.java
@@ -272,7 +272,10 @@ public final class Cea708Decoder extends CeaDecoder {
     if (serviceNumber == 7) {
       // extended service numbers
       serviceBlockPacket.skipBits(2);
-      serviceNumber += serviceBlockPacket.readBits(6);
+      serviceNumber = serviceBlockPacket.readBits(6);
+      if (serviceNumber < 7) {
+        Log.w(TAG, "Invalid extended service number: " + serviceNumber);
+      }
     }
 
     // Ignore packets in which blockSize is 0

From e1c6229cc8e38ee70cc13b10d2d46f3c75e8d6f3 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 1 Nov 2018 03:08:01 -0700
Subject: [PATCH 153/832] Bump version to 2.9.1

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219609471
---
 RELEASENOTES.md                               | 53 +++++++++++--------
 constants.gradle                              |  4 +-
 .../exoplayer2/ExoPlayerLibraryInfo.java      |  6 +--
 library/ui/src/main/res/values-bn/strings.xml |  2 +-
 library/ui/src/main/res/values-gu/strings.xml |  2 +-
 library/ui/src/main/res/values-iw/strings.xml |  2 +-
 library/ui/src/main/res/values-kn/strings.xml |  2 +-
 library/ui/src/main/res/values-lo/strings.xml |  2 +-
 library/ui/src/main/res/values-ml/strings.xml |  2 +-
 library/ui/src/main/res/values-ne/strings.xml |  2 +-
 library/ui/src/main/res/values-pa/strings.xml |  2 +-
 library/ui/src/main/res/values-si/strings.xml |  2 +-
 library/ui/src/main/res/values-ta/strings.xml |  2 +-
 library/ui/src/main/res/values-te/strings.xml |  2 +-
 library/ui/src/main/res/values-ur/strings.xml |  2 +-
 15 files changed, 47 insertions(+), 40 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 4f2353f1df..c61b1fecb4 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,42 +2,49 @@
 
 ### dev-v2 (not yet released) ###
 
-* DASH: Parse ProgramInformation element if present in the manifest.
+* Support for playing spherical videos on Daydream.
 * Improve decoder re-use between playbacks. TODO: Write and link a blog post
   here ([#2826](https://github.com/google/ExoPlayer/issues/2826)).
-* Improve initial bandwidth meter estimates using the current country and
-  network type.
 * Add options for controlling audio track selections to `DefaultTrackSelector`
   ([#3314](https://github.com/google/ExoPlayer/issues/3314)).
 * Do not retry failed loads whose error is `FileNotFoundException`.
+
+### 2.9.1 ###
+
 * Add convenience methods `Player.next`, `Player.previous`, `Player.hasNext`
   and `Player.hasPrevious`
   ([#4863](https://github.com/google/ExoPlayer/issues/4863)).
-* HLS:
-  * Add constructor to `DefaultHlsExtractorFactory` for adding TS payload reader
-    factory flags ([#4861](https://github.com/google/ExoPlayer/issues/4861)).
-* Fix an issue with blind seeking to windows with non-zero offset in a
-  `ConcatenatingMediaSource`
-  ([#4873](https://github.com/google/ExoPlayer/issues/4873)).
-* Fix issue where subtitles have a wrong position if SubtitleView has a non-zero
-  offset to its parent
-  ([#4788](https://github.com/google/ExoPlayer/issues/4788)).
-* SubRip: Add support for alignment tags, and remove tags from the displayed
-  captions ([#4306](https://github.com/google/ExoPlayer/issues/4306)).
-* Audio:
-  * Support seeking based on MLLT metadata
-    ([#3241](https://github.com/google/ExoPlayer/issues/3241)).
-  * Fix handling of MP3s with appended data
-    ([#4954](https://github.com/google/ExoPlayer/issues/4954)).
-* Fix issue where buffered position is not updated correctly when transitioning
-  between periods
-  ([#4899](https://github.com/google/ExoPlayer/issues/4899)).
+* Improve initial bandwidth meter estimates using the current country and
+  network type.
 * IMA extension:
   * For preroll to live stream transitions, project forward the loading position
     to avoid being behind the live window.
   * Let apps specify whether to focus the skip button on ATV
     ([#5019](https://github.com/google/ExoPlayer/issues/5019)).
-* Support for playing spherical videos on Daydream.
+* MP3:
+  * Support seeking based on MLLT metadata
+    ([#3241](https://github.com/google/ExoPlayer/issues/3241)).
+  * Fix handling of streams with appended data
+    ([#4954](https://github.com/google/ExoPlayer/issues/4954)).
+* DASH: Parse ProgramInformation element if present in the manifest.
+* HLS: Add constructor to `DefaultHlsExtractorFactory` for adding TS payload
+  reader factory flags
+  ([#4861](https://github.com/google/ExoPlayer/issues/4861)).
+* SubRip: Add support for alignment tags, and remove tags from the displayed
+  captions ([#4306](https://github.com/google/ExoPlayer/issues/4306)).
+* Fix issue with blind seeking to windows with non-zero offset in a
+  `ConcatenatingMediaSource`
+  ([#4873](https://github.com/google/ExoPlayer/issues/4873)).
+* Fix issue where subtitles were positioned incorrectly if `SubtitleView` had a
+  non-zero position offset to its parent
+  ([#4788](https://github.com/google/ExoPlayer/issues/4788)).
+* Fix issue where the buffered position was not updated correctly when
+  transitioning between periods
+  ([#4899](https://github.com/google/ExoPlayer/issues/4899)).
+* Suppress a spurious assertion failure on some Samsung devices
+  ([#4532](https://github.com/google/ExoPlayer/issues/4532)).
+* Suppress spurious "references unknown class member" shrinking warning
+  ([#4890](https://github.com/google/ExoPlayer/issues/4890)).
 * Fix issue where a `NullPointerException` is thrown when removing an unprepared
   media source from a `ConcatenatingMediaSource` with the `useLazyPreparation`
   option enabled ([#4986](https://github.com/google/ExoPlayer/issues/4986)).
diff --git a/constants.gradle b/constants.gradle
index 6db6d6310b..dd277c722c 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -13,8 +13,8 @@
 // limitations under the License.
 project.ext {
     // ExoPlayer version and version code.
-    releaseVersion = '2.9.0'
-    releaseVersionCode = 2009000
+    releaseVersion = '2.9.1'
+    releaseVersionCode = 2009001
     // Important: ExoPlayer specifies a minSdkVersion of 14 because various
     // components provided by the library may be of use on older devices.
     // However, please note that the core media playback functionality provided
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
index f5ad677d77..c4dda9e957 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
@@ -29,11 +29,11 @@ public final class ExoPlayerLibraryInfo {
 
   /** The version of the library expressed as a string, for example "1.2.3". */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION_INT) or vice versa.
-  public static final String VERSION = "2.9.0";
+  public static final String VERSION = "2.9.1";
 
   /** The version of the library expressed as {@code "ExoPlayerLib/" + VERSION}. */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
-  public static final String VERSION_SLASHY = "ExoPlayerLib/2.9.0";
+  public static final String VERSION_SLASHY = "ExoPlayerLib/2.9.1";
 
   /**
    * The version of the library expressed as an integer, for example 1002003.
@@ -43,7 +43,7 @@ public final class ExoPlayerLibraryInfo {
    * integer version 123045006 (123-045-006).
    */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
-  public static final int VERSION_INT = 2009000;
+  public static final int VERSION_INT = 2009001;
 
   /**
    * Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions}
diff --git a/library/ui/src/main/res/values-bn/strings.xml b/library/ui/src/main/res/values-bn/strings.xml
index 0e5efb1b77..c58d70a063 100644
--- a/library/ui/src/main/res/values-bn/strings.xml
+++ b/library/ui/src/main/res/values-bn/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">সবগুলি আইটেম আবার চালান</string>
   <string name="exo_controls_shuffle_description">শাফেল করুন</string>
   <string name="exo_controls_fullscreen_description">পূর্ণ স্ক্রিন মোড</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">ভিআর মোড</string>
   <string name="exo_download_description">ডাউনলোড করুন</string>
   <string name="exo_download_notification_channel_name">ডাউনলোড</string>
   <string name="exo_download_downloading">ডাউনলোড হচ্ছে</string>
diff --git a/library/ui/src/main/res/values-gu/strings.xml b/library/ui/src/main/res/values-gu/strings.xml
index 847c5b6d33..a362329138 100644
--- a/library/ui/src/main/res/values-gu/strings.xml
+++ b/library/ui/src/main/res/values-gu/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">બધાને રિપીટ કરો</string>
   <string name="exo_controls_shuffle_description">શફલ કરો</string>
   <string name="exo_controls_fullscreen_description">પૂર્ણસ્ક્રીન મોડ</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR મોડ</string>
   <string name="exo_download_description">ડાઉનલોડ કરો</string>
   <string name="exo_download_notification_channel_name">ડાઉનલોડ</string>
   <string name="exo_download_downloading">ડાઉનલોડ કરી રહ્યાં છીએ</string>
diff --git a/library/ui/src/main/res/values-iw/strings.xml b/library/ui/src/main/res/values-iw/strings.xml
index 0a471f33e2..b2e1171017 100644
--- a/library/ui/src/main/res/values-iw/strings.xml
+++ b/library/ui/src/main/res/values-iw/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">חזור על הכול</string>
   <string name="exo_controls_shuffle_description">ערבוב</string>
   <string name="exo_controls_fullscreen_description">מצב מסך מלא</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">מצב VR</string>
   <string name="exo_download_description">הורדה</string>
   <string name="exo_download_notification_channel_name">הורדות</string>
   <string name="exo_download_downloading">ההורדה מתבצעת</string>
diff --git a/library/ui/src/main/res/values-kn/strings.xml b/library/ui/src/main/res/values-kn/strings.xml
index 9952d859d3..cb46a4f0d8 100644
--- a/library/ui/src/main/res/values-kn/strings.xml
+++ b/library/ui/src/main/res/values-kn/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">ಎಲ್ಲವನ್ನು ಪುನರಾವರ್ತಿಸಿ</string>
   <string name="exo_controls_shuffle_description">ಶಫಲ್‌</string>
   <string name="exo_controls_fullscreen_description">ಪೂರ್ಣ ಪರದೆ ಮೋಡ್</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR ಮೋಡ್</string>
   <string name="exo_download_description">ಡೌನ್‌ಲೋಡ್‌</string>
   <string name="exo_download_notification_channel_name">ಡೌನ್‌ಲೋಡ್‌ಗಳು</string>
   <string name="exo_download_downloading">ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ</string>
diff --git a/library/ui/src/main/res/values-lo/strings.xml b/library/ui/src/main/res/values-lo/strings.xml
index e2fd29e5d4..a32fabf213 100644
--- a/library/ui/src/main/res/values-lo/strings.xml
+++ b/library/ui/src/main/res/values-lo/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">ຫຼິ້ນຊ້ຳທັງໝົດ</string>
   <string name="exo_controls_shuffle_description">ຫຼີ້ນແບບສຸ່ມ</string>
   <string name="exo_controls_fullscreen_description">ໂໝດເຕັມຈໍ</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">ໂໝດ VR</string>
   <string name="exo_download_description">ດາວໂຫລດ</string>
   <string name="exo_download_notification_channel_name">ດາວໂຫລດ</string>
   <string name="exo_download_downloading">ກຳລັງດາວໂຫລດ</string>
diff --git a/library/ui/src/main/res/values-ml/strings.xml b/library/ui/src/main/res/values-ml/strings.xml
index 76b9b3b4c6..9f2c3a702d 100644
--- a/library/ui/src/main/res/values-ml/strings.xml
+++ b/library/ui/src/main/res/values-ml/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">എല്ലാം ആവർത്തിക്കുക</string>
   <string name="exo_controls_shuffle_description">ഇടകലര്‍ത്തുക</string>
   <string name="exo_controls_fullscreen_description">പൂർണ്ണ സ്‌ക്രീൻ മോഡ്</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR മോഡ്</string>
   <string name="exo_download_description">ഡൗൺലോഡ്</string>
   <string name="exo_download_notification_channel_name">ഡൗൺലോഡുകൾ</string>
   <string name="exo_download_downloading">ഡൗൺലോഡ് ചെയ്യുന്നു</string>
diff --git a/library/ui/src/main/res/values-ne/strings.xml b/library/ui/src/main/res/values-ne/strings.xml
index 4b6ec50903..6ae86f84d2 100644
--- a/library/ui/src/main/res/values-ne/strings.xml
+++ b/library/ui/src/main/res/values-ne/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">सबै दोहोर्‍याउनुहोस्</string>
   <string name="exo_controls_shuffle_description">मिसाउनुहोस्</string>
   <string name="exo_controls_fullscreen_description">पूर्ण स्क्रिन मोड</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR मोड</string>
   <string name="exo_download_description">डाउनलोड गर्नुहोस्</string>
   <string name="exo_download_notification_channel_name">डाउनलोडहरू</string>
   <string name="exo_download_downloading">डाउनलोड गरिँदै छ</string>
diff --git a/library/ui/src/main/res/values-pa/strings.xml b/library/ui/src/main/res/values-pa/strings.xml
index 1493a62e52..7a03e89faf 100644
--- a/library/ui/src/main/res/values-pa/strings.xml
+++ b/library/ui/src/main/res/values-pa/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">ਸਾਰਿਆਂ ਨੂੰ ਦੁਹਰਾਓ</string>
   <string name="exo_controls_shuffle_description">ਬੇਤਰਤੀਬ ਕਰੋ</string>
   <string name="exo_controls_fullscreen_description">ਪੂਰੀ-ਸਕ੍ਰੀਨ ਮੋਡ</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR ਮੋਡ</string>
   <string name="exo_download_description">ਡਾਊਨਲੋਡ ਕਰੋ</string>
   <string name="exo_download_notification_channel_name">ਡਾਊਨਲੋਡ</string>
   <string name="exo_download_downloading">ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ</string>
diff --git a/library/ui/src/main/res/values-si/strings.xml b/library/ui/src/main/res/values-si/strings.xml
index 241d8336a0..30b63789db 100644
--- a/library/ui/src/main/res/values-si/strings.xml
+++ b/library/ui/src/main/res/values-si/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">සියල්ල පුනරාවර්තනය කරන්න</string>
   <string name="exo_controls_shuffle_description">කලවම් කරන්න</string>
   <string name="exo_controls_fullscreen_description">සම්පූර්ණ තිර ප්‍රකාරය</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR ප්‍රකාරය</string>
   <string name="exo_download_description">බාගන්න</string>
   <string name="exo_download_notification_channel_name">බාගැනීම්</string>
   <string name="exo_download_downloading">බාගනිමින්</string>
diff --git a/library/ui/src/main/res/values-ta/strings.xml b/library/ui/src/main/res/values-ta/strings.xml
index 828170c101..4608e1beba 100644
--- a/library/ui/src/main/res/values-ta/strings.xml
+++ b/library/ui/src/main/res/values-ta/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">அனைத்தையும் மீண்டும் இயக்கு</string>
   <string name="exo_controls_shuffle_description">கலைத்துப் போடு</string>
   <string name="exo_controls_fullscreen_description">முழுத்திரைப் பயன்முறை</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR பயன்முறை</string>
   <string name="exo_download_description">பதிவிறக்கும் பட்டன்</string>
   <string name="exo_download_notification_channel_name">பதிவிறக்கங்கள்</string>
   <string name="exo_download_downloading">பதிவிறக்குகிறது</string>
diff --git a/library/ui/src/main/res/values-te/strings.xml b/library/ui/src/main/res/values-te/strings.xml
index 7f77e32b41..46271ddf33 100644
--- a/library/ui/src/main/res/values-te/strings.xml
+++ b/library/ui/src/main/res/values-te/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">అన్నింటినీ పునరావృతం చేయండి</string>
   <string name="exo_controls_shuffle_description">షఫుల్ చేయండి</string>
   <string name="exo_controls_fullscreen_description">పూర్తి స్క్రీన్ మోడ్</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">వర్చువల్ రియాలిటీ మోడ్</string>
   <string name="exo_download_description">డౌన్‌లోడ్ చేయి</string>
   <string name="exo_download_notification_channel_name">డౌన్‌లోడ్‌లు</string>
   <string name="exo_download_downloading">డౌన్‌లోడ్ చేస్తోంది</string>
diff --git a/library/ui/src/main/res/values-ur/strings.xml b/library/ui/src/main/res/values-ur/strings.xml
index fab6127fc8..ce77007e4d 100644
--- a/library/ui/src/main/res/values-ur/strings.xml
+++ b/library/ui/src/main/res/values-ur/strings.xml
@@ -12,7 +12,7 @@
   <string name="exo_controls_repeat_all_description">سبھی کو دہرائیں</string>
   <string name="exo_controls_shuffle_description">شفل کریں</string>
   <string name="exo_controls_fullscreen_description">پوری اسکرین والی وضع</string>
-  <string name="exo_controls_vr_description">VR mode</string>
+  <string name="exo_controls_vr_description">VR موڈ</string>
   <string name="exo_download_description">ڈاؤن لوڈ کریں</string>
   <string name="exo_download_notification_channel_name">ڈاؤن لوڈز</string>
   <string name="exo_download_downloading">ڈاؤن لوڈ ہو رہا ہے</string>

From 76688589d2f49c2681afb8a9a6b1a5c10a7c33df Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Thu, 1 Nov 2018 08:17:18 -0700
Subject: [PATCH 154/832] Add TrackSelectionUtil.getAverageBitrates method

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219636548
---
 .../source/chunk/BaseMediaChunkIterator.java  |   8 +-
 .../source/chunk/MediaChunkIterator.java      |   8 +
 .../trackselection/TrackSelectionUtil.java    |  78 +++++++++-
 .../TrackSelectionUtilTest.java               | 137 ++++++++++++++----
 4 files changed, 199 insertions(+), 32 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkIterator.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkIterator.java
index e506cac675..274be54889 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkIterator.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkIterator.java
@@ -34,10 +34,11 @@ public abstract class BaseMediaChunkIterator implements MediaChunkIterator {
    * @param fromIndex The first available index.
    * @param toIndex The last available index.
    */
+  @SuppressWarnings("method.invocation.invalid")
   public BaseMediaChunkIterator(long fromIndex, long toIndex) {
     this.fromIndex = fromIndex;
     this.toIndex = toIndex;
-    currentIndex = fromIndex - 1;
+    reset();
   }
 
   @Override
@@ -51,6 +52,11 @@ public abstract class BaseMediaChunkIterator implements MediaChunkIterator {
     return !isEnded();
   }
 
+  @Override
+  public void reset() {
+    currentIndex = fromIndex - 1;
+  }
+
   /**
    * Verifies that the iterator points to a valid element.
    *
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/MediaChunkIterator.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/MediaChunkIterator.java
index 71d8940e26..59ecc03d7a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/MediaChunkIterator.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/MediaChunkIterator.java
@@ -55,6 +55,11 @@ public interface MediaChunkIterator {
         public long getChunkEndTimeUs() {
           throw new NoSuchElementException();
         }
+
+        @Override
+        public void reset() {
+          // Do nothing.
+        }
       };
 
   /** Returns whether the iteration has reached the end of the available data. */
@@ -93,4 +98,7 @@ public interface MediaChunkIterator {
    *     {@link #next()} or when {@link #isEnded()} is true.
    */
   long getChunkEndTimeUs();
+
+  /** Resets the iterator to the initial position. */
+  void reset();
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
index 6f6cd8d80c..9c342b6065 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
@@ -16,7 +16,9 @@
 package com.google.android.exoplayer2.trackselection;
 
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
+import com.google.android.exoplayer2.util.Assertions;
 
 /** Track selection related utility methods. */
 public final class TrackSelectionUtil {
@@ -30,7 +32,7 @@ public final class TrackSelectionUtil {
    * @param iterator Iterator for media chunk sequences.
    * @param maxDurationUs Maximum duration of chunks to be included in average bitrate, in
    *     microseconds.
-   * @return Average bitrate for chunks in bits per second, or {@link C#LENGTH_UNSET} if there are
+   * @return Average bitrate for chunks in bits per second, or {@link Format#NO_VALUE} if there are
    *     no chunks or the first chunk length is unknown.
    */
   public static int getAverageBitrate(MediaChunkIterator iterator, long maxDurationUs) {
@@ -51,7 +53,79 @@ public final class TrackSelectionUtil {
       totalLength += chunkLength;
     }
     return totalDurationUs == 0
-        ? C.LENGTH_UNSET
+        ? Format.NO_VALUE
         : (int) (totalLength * C.BITS_PER_BYTE * C.MICROS_PER_SECOND / totalDurationUs);
   }
+
+  /**
+   * Returns average bitrate values for a set of tracks whose upcoming media chunk iterators and
+   * formats are given. If an average bitrate can't be calculated, an estimation is calculated using
+   * average bitrate of another track and the ratio of the bitrate values defined in the formats of
+   * the two tracks.
+   *
+   * @param iterators An array of {@link MediaChunkIterator}s providing information about the
+   *     sequence of upcoming media chunks for each track.
+   * @param formats The track formats.
+   * @param maxDurationUs Maximum duration of chunks to be included in average bitrate values, in
+   *     microseconds.
+   * @return Average bitrate values for the tracks. If for a track, an average bitrate or an
+   *     estimation can't be calculated, {@link Format#NO_VALUE} is set.
+   * @see #getAverageBitrate(MediaChunkIterator, long)
+   */
+  public static int[] getAverageBitrates(
+      MediaChunkIterator[] iterators, Format[] formats, long maxDurationUs) {
+    int trackCount = iterators.length;
+    Assertions.checkArgument(trackCount == formats.length);
+    if (trackCount == 0) {
+      return new int[0];
+    }
+
+    int[] bitrates = new int[trackCount];
+    int[] formatBitrates = new int[trackCount];
+    float[] bitrateRatios = new float[trackCount];
+    boolean needEstimateBitrate = false;
+    boolean canEstimateBitrate = false;
+    for (int i = 0; i < trackCount; i++) {
+      int bitrate = getAverageBitrate(iterators[i], maxDurationUs);
+      if (bitrate != Format.NO_VALUE) {
+        int formatBitrate = formats[i].bitrate;
+        formatBitrates[i] = formatBitrate;
+        if (formatBitrate != Format.NO_VALUE) {
+          bitrateRatios[i] = ((float) bitrate) / formatBitrate;
+          canEstimateBitrate = true;
+        }
+      } else {
+        needEstimateBitrate = true;
+        formatBitrates[i] = Format.NO_VALUE;
+      }
+      bitrates[i] = bitrate;
+    }
+
+    if (needEstimateBitrate && canEstimateBitrate) {
+      for (int i = 0; i < trackCount; i++) {
+        if (bitrates[i] == Format.NO_VALUE) {
+          int formatBitrate = formats[i].bitrate;
+          if (formatBitrate != Format.NO_VALUE) {
+            int closestFormat = findClosestBitrateFormat(formatBitrate, formatBitrates);
+            bitrates[i] = (int) (bitrateRatios[closestFormat] * formatBitrate);
+          }
+        }
+      }
+    }
+    return bitrates;
+  }
+
+  private static int findClosestBitrateFormat(int formatBitrate, int[] formatBitrates) {
+    int closestDistance = Integer.MAX_VALUE;
+    int closestFormat = C.INDEX_UNSET;
+    for (int j = 0; j < formatBitrates.length; j++) {
+      if (formatBitrates[j] != Format.NO_VALUE) {
+        int distance = Math.abs(formatBitrates[j] - formatBitrate);
+        if (distance < closestDistance) {
+          closestFormat = j;
+        }
+      }
+    }
+    return closestFormat;
+  }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java
index df1780c984..2d5f2a7c67 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java
@@ -18,7 +18,9 @@ package com.google.android.exoplayer2.trackselection;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
+import android.support.annotation.NonNull;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.chunk.BaseMediaChunkIterator;
 import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
 import com.google.android.exoplayer2.upstream.DataSpec;
@@ -33,62 +35,60 @@ public class TrackSelectionUtilTest {
   public static final long MAX_DURATION_US = 30 * C.MICROS_PER_SECOND;
 
   @Test
-  public void getAverageBitrate_emptyIterator_returnsUnsetLength() {
+  public void getAverageBitrate_emptyIterator_returnsNoValue() {
     assertThat(TrackSelectionUtil.getAverageBitrate(MediaChunkIterator.EMPTY, MAX_DURATION_US))
-        .isEqualTo(C.LENGTH_UNSET);
+        .isEqualTo(Format.NO_VALUE);
   }
 
   @Test
   public void getAverageBitrate_oneChunk_returnsChunkBitrate() {
-    long[] chunkTimeBoundariesSec = {0, 5};
+    long[] chunkTimeBoundariesSec = {12, 17};
     long[] chunkLengths = {10};
+
     FakeIterator iterator = new FakeIterator(chunkTimeBoundariesSec, chunkLengths);
-    int expectedAverageBitrate =
-        (int) (chunkLengths[0] * C.BITS_PER_BYTE / chunkTimeBoundariesSec[1]);
-    assertThat(TrackSelectionUtil.getAverageBitrate(iterator, MAX_DURATION_US))
-        .isEqualTo(expectedAverageBitrate);
+
+    assertThat(TrackSelectionUtil.getAverageBitrate(iterator, MAX_DURATION_US)).isEqualTo(16);
   }
 
   @Test
   public void getAverageBitrate_multipleSameDurationChunks_returnsAverageChunkBitrate() {
     long[] chunkTimeBoundariesSec = {0, 5, 10};
     long[] chunkLengths = {10, 20};
+
     FakeIterator iterator = new FakeIterator(chunkTimeBoundariesSec, chunkLengths);
-    long totalLength = chunkLengths[0] + chunkLengths[1];
-    int expectedAverageBitrate = (int) (totalLength * C.BITS_PER_BYTE / chunkTimeBoundariesSec[2]);
-    assertThat(TrackSelectionUtil.getAverageBitrate(iterator, MAX_DURATION_US))
-        .isEqualTo(expectedAverageBitrate);
+
+    assertThat(TrackSelectionUtil.getAverageBitrate(iterator, MAX_DURATION_US)).isEqualTo(24);
   }
 
   @Test
   public void getAverageBitrate_multipleDifferentDurationChunks_returnsAverageChunkBitrate() {
     long[] chunkTimeBoundariesSec = {0, 5, 15, 30};
     long[] chunkLengths = {10, 20, 30};
+
     FakeIterator iterator = new FakeIterator(chunkTimeBoundariesSec, chunkLengths);
-    long totalLength = chunkLengths[0] + chunkLengths[1] + chunkLengths[2];
-    int expectedAverageBitrate = (int) (totalLength * C.BITS_PER_BYTE / chunkTimeBoundariesSec[3]);
-    assertThat(TrackSelectionUtil.getAverageBitrate(iterator, MAX_DURATION_US))
-        .isEqualTo(expectedAverageBitrate);
+
+    assertThat(TrackSelectionUtil.getAverageBitrate(iterator, MAX_DURATION_US)).isEqualTo(16);
   }
 
   @Test
-  public void getAverageBitrate_firstChunkLengthUnset_returnsUnsetLength() {
+  public void getAverageBitrate_firstChunkLengthUnset_returnsNoValue() {
     long[] chunkTimeBoundariesSec = {0, 5, 15, 30};
     long[] chunkLengths = {C.LENGTH_UNSET, 20, 30};
+
     FakeIterator iterator = new FakeIterator(chunkTimeBoundariesSec, chunkLengths);
+
     assertThat(TrackSelectionUtil.getAverageBitrate(iterator, MAX_DURATION_US))
-        .isEqualTo(C.LENGTH_UNSET);
+        .isEqualTo(Format.NO_VALUE);
   }
 
   @Test
   public void getAverageBitrate_secondChunkLengthUnset_returnsFirstChunkBitrate() {
     long[] chunkTimeBoundariesSec = {0, 5, 15, 30};
     long[] chunkLengths = {10, C.LENGTH_UNSET, 30};
+
     FakeIterator iterator = new FakeIterator(chunkTimeBoundariesSec, chunkLengths);
-    int expectedAverageBitrate =
-        (int) (chunkLengths[0] * C.BITS_PER_BYTE / chunkTimeBoundariesSec[1]);
-    assertThat(TrackSelectionUtil.getAverageBitrate(iterator, MAX_DURATION_US))
-        .isEqualTo(expectedAverageBitrate);
+
+    assertThat(TrackSelectionUtil.getAverageBitrate(iterator, MAX_DURATION_US)).isEqualTo(16);
   }
 
   @Test
@@ -96,22 +96,101 @@ public class TrackSelectionUtilTest {
       getAverageBitrate_chunksExceedingMaxDuration_returnsAverageChunkBitrateUpToMaxDuration() {
     long[] chunkTimeBoundariesSec = {0, 5, 15, 45, 50};
     long[] chunkLengths = {10, 20, 30, 100};
+
     FakeIterator iterator = new FakeIterator(chunkTimeBoundariesSec, chunkLengths);
-    // Just half of the third chunk is in the max duration
-    long totalLength = chunkLengths[0] + chunkLengths[1] + chunkLengths[2] / 2;
-    int expectedAverageBitrate =
-        (int) (totalLength * C.BITS_PER_BYTE * C.MICROS_PER_SECOND / MAX_DURATION_US);
-    assertThat(TrackSelectionUtil.getAverageBitrate(iterator, MAX_DURATION_US))
-        .isEqualTo(expectedAverageBitrate);
+
+    assertThat(TrackSelectionUtil.getAverageBitrate(iterator, 30 * C.MICROS_PER_SECOND))
+        .isEqualTo(12);
   }
 
   @Test
-  public void getAverageBitrate_zeroMaxDuration_returnsUnsetLength() {
+  public void getAverageBitrate_zeroMaxDuration_returnsNoValue() {
     long[] chunkTimeBoundariesSec = {0, 5, 10};
     long[] chunkLengths = {10, 20};
+
     FakeIterator iterator = new FakeIterator(chunkTimeBoundariesSec, chunkLengths);
+
     assertThat(TrackSelectionUtil.getAverageBitrate(iterator, /* maxDurationUs= */ 0))
-        .isEqualTo(C.LENGTH_UNSET);
+        .isEqualTo(Format.NO_VALUE);
+  }
+
+  @Test
+  public void getAverageBitrates_noIterator_returnsEmptyArray() {
+    assertThat(
+            TrackSelectionUtil.getAverageBitrates(
+                new MediaChunkIterator[0], new Format[0], MAX_DURATION_US))
+        .hasLength(0);
+  }
+
+  @Test
+  public void getAverageBitrates_emptyIterator_returnsNoValue() {
+    int[] averageBitrates =
+        TrackSelectionUtil.getAverageBitrates(
+            new MediaChunkIterator[] {MediaChunkIterator.EMPTY},
+            new Format[] {createFormatWithBitrate(10)},
+            MAX_DURATION_US);
+
+    assertThat(averageBitrates).asList().containsExactly(Format.NO_VALUE);
+  }
+
+  @Test
+  public void getAverageBitrates_twoTracks_returnsAverageChunkBitrates() {
+    FakeIterator iterator1 =
+        new FakeIterator(
+            /* chunkTimeBoundariesSec= */ new long[] {0, 10}, /* chunkLengths= */ new long[] {10});
+    FakeIterator iterator2 =
+        new FakeIterator(
+            /* chunkTimeBoundariesSec= */ new long[] {0, 5, 15, 30},
+            /* chunkLengths= */ new long[] {10, 20, 30});
+
+    int[] averageBitrates =
+        TrackSelectionUtil.getAverageBitrates(
+            new MediaChunkIterator[] {iterator1, iterator2},
+            new Format[] {createFormatWithBitrate(10), createFormatWithBitrate(20)},
+            MAX_DURATION_US);
+
+    assertThat(averageBitrates).asList().containsExactly(8, 16).inOrder();
+  }
+
+  @Test
+  public void getAverageBitrates_oneEmptyIteratorOneWithChunks_returnsEstimationForEmpty() {
+    FakeIterator iterator1 =
+        new FakeIterator(
+            /* chunkTimeBoundariesSec= */ new long[] {0, 5}, /* chunkLengths= */ new long[] {10});
+    Format format1 = createFormatWithBitrate(10);
+    MediaChunkIterator iterator2 = MediaChunkIterator.EMPTY;
+    Format format2 = createFormatWithBitrate(20);
+
+    int[] averageBitrates =
+        TrackSelectionUtil.getAverageBitrates(
+            new MediaChunkIterator[] {iterator1, iterator2},
+            new Format[] {format1, format2},
+            MAX_DURATION_US);
+
+    assertThat(averageBitrates).asList().containsExactly(16, 32).inOrder();
+  }
+
+  @Test
+  public void getAverageBitrates_formatWithoutBitrate_returnsNoValueForEmpty() {
+    FakeIterator iterator1 =
+        new FakeIterator(
+            /* chunkTimeBoundariesSec= */ new long[] {0, 5}, /* chunkLengths= */ new long[] {10});
+    Format format1 = createFormatWithBitrate(10);
+    MediaChunkIterator iterator2 = MediaChunkIterator.EMPTY;
+    Format format2 = createFormatWithBitrate(Format.NO_VALUE);
+
+    int[] averageBitrates =
+        TrackSelectionUtil.getAverageBitrates(
+            new MediaChunkIterator[] {iterator1, iterator2},
+            new Format[] {format1, format2},
+            MAX_DURATION_US);
+
+    assertThat(averageBitrates).asList().containsExactly(16, Format.NO_VALUE).inOrder();
+  }
+
+  @NonNull
+  private static Format createFormatWithBitrate(int bitrate) {
+    return Format.createSampleFormat(null, null, null, bitrate, null);
   }
 
   private static final class FakeIterator extends BaseMediaChunkIterator {

From 3b1d0e270bf67567021388ef86625dc236cc5eb3 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 2 Nov 2018 01:36:41 -0700
Subject: [PATCH 155/832] Double the buffer duration for AC3

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219765107
---
 .../google/android/exoplayer2/audio/DefaultAudioSink.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
index 6ad56a78d9..d29659b102 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
@@ -172,6 +172,9 @@ public final class DefaultAudioSink implements AudioSink {
    */
   private static final int BUFFER_MULTIPLICATION_FACTOR = 4;
 
+  /** To avoid underruns on some devices (e.g., Broadcom 7271), scale up the AC3 buffer duration. */
+  private static final int AC3_BUFFER_MULTIPLICATION_FACTOR = 2;
+
   /**
    * @see AudioTrack#ERROR_BAD_VALUE
    */
@@ -483,6 +486,9 @@ public final class DefaultAudioSink implements AudioSink {
       return Util.constrainValue(multipliedBufferSize, minAppBufferSize, maxAppBufferSize);
     } else {
       int rate = getMaximumEncodedRateBytesPerSecond(outputEncoding);
+      if (outputEncoding == C.ENCODING_AC3) {
+        rate *= AC3_BUFFER_MULTIPLICATION_FACTOR;
+      }
       return (int) (PASSTHROUGH_BUFFER_DURATION_US * rate / C.MICROS_PER_SECOND);
     }
   }

From b0555315cb693ae2d191b2579713be63c18403fa Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 2 Nov 2018 04:25:31 -0700
Subject: [PATCH 156/832] Move all messaging constants to ExoCastConstants

Also make ExoCastMessage#mediaItemAsJsonObject protected.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219780620
---
 .../exoplayer2/ext/cast/ExoCastConstants.java | 83 +++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/ExoCastConstants.java

diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/ExoCastConstants.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/ExoCastConstants.java
new file mode 100644
index 0000000000..c5647dd949
--- /dev/null
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/ExoCastConstants.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.ext.cast;
+
+/** Defines constants used by the Cast extension. */
+public final class ExoCastConstants {
+
+  private ExoCastConstants() {}
+
+  public static final int PROTOCOL_VERSION = 0;
+
+  // String representations.
+
+  public static final String STR_STATE_IDLE = "IDLE";
+  public static final String STR_STATE_BUFFERING = "BUFFERING";
+  public static final String STR_STATE_READY = "READY";
+  public static final String STR_STATE_ENDED = "ENDED";
+
+  public static final String STR_REPEAT_MODE_OFF = "REPEAT_MODE_OFF";
+  public static final String STR_REPEAT_MODE_ONE = "REPEAT_MODE_ONE";
+  public static final String STR_REPEAT_MODE_ALL = "REPEAT_MODE_ALL";
+
+  // Methods.
+
+  public static final String METHOD_BASE = "player.";
+
+  public static final String METHOD_ADD_ITEMS = METHOD_BASE + "addItems";
+  public static final String METHOD_MOVE_ITEM = METHOD_BASE + "moveItem";
+  public static final String METHOD_REMOVE_ITEMS = METHOD_BASE + "removeItems";
+  public static final String METHOD_SET_PLAY_WHEN_READY = METHOD_BASE + "setPlayWhenReady";
+  public static final String METHOD_SET_REPEAT_MODE = METHOD_BASE + "setRepeatMode";
+  public static final String METHOD_SET_SHUFFLE_MODE_ENABLED =
+      METHOD_BASE + "setShuffleModeEnabled";
+  public static final String METHOD_SEEK_TO = METHOD_BASE + "seekTo";
+  public static final String METHOD_SET_PLAYBACK_PARAMETERS = METHOD_BASE + "setPlaybackParameters";
+
+  // JSON message keys.
+
+  public static final String KEY_PROTOCOL_VERSION = "protocolVersion";
+  public static final String KEY_METHOD = "method";
+  public static final String KEY_SEQUENCE_NUMBER = "sequenceNumber";
+  public static final String KEY_INDEX = "index";
+  public static final String KEY_ITEMS = "items";
+  public static final String KEY_ARGS = "args";
+  public static final String KEY_UUID = "uuid";
+  public static final String KEY_UUIDS = "uuids";
+  public static final String KEY_LICENSE_SERVER = "licenseServer";
+  public static final String KEY_TITLE = "title";
+  public static final String KEY_URI = "uri";
+  public static final String KEY_REQUEST_HEADERS = "requestHeaders";
+  public static final String KEY_DESCRIPTION = "description";
+  public static final String KEY_MEDIA = "media";
+  public static final String KEY_DRM_SCHEMES = "drmSchemes";
+  public static final String KEY_START_POSITION_US = "startPositionUs";
+  public static final String KEY_END_POSITION_US = "endPositionUs";
+  public static final String KEY_MIME_TYPE = "mimeType";
+  public static final String KEY_PLAY_WHEN_READY = "playWhenReady";
+  public static final String KEY_REPEAT_MODE = "repeatMode";
+  public static final String KEY_SHUFFLE_MODE_ENABLED = "shuffleModeEnabled";
+  public static final String KEY_POSITION_MS = "positionMs";
+  public static final String KEY_SPEED = "speed";
+  public static final String KEY_PITCH = "pitch";
+  public static final String KEY_SKIP_SILENCE = "skipSilence";
+  public static final String KEY_PLAYBACK_STATE = "playbackState";
+  public static final String KEY_MEDIA_QUEUE = "mediaQueue";
+  public static final String KEY_IS_LOADING = "isLoading";
+  public static final String KEY_PLAYBACK_ERROR = "error";
+  public static final String KEY_PLAYBACK_POSITION = "playbackPosition";
+  public static final String KEY_PLAYBACK_PARAMETERS = "playbackParameters";
+}

From 32927bb62ca8d59f8f6af22ae13520e8cb145f16 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 2 Nov 2018 05:28:24 -0700
Subject: [PATCH 157/832] Update the DefaultExtractorInput's peek buffer length
 on each write

This prevents leaving an inconsistent state after a EOF exception.

Issue:#5039

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219785275
---
 RELEASENOTES.md                                 |  7 +++++--
 .../extractor/DefaultExtractorInput.java        |  4 ++--
 .../extractor/DefaultExtractorInputTest.java    | 17 +++++++++++++++++
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index c61b1fecb4..569e2e555e 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -27,8 +27,11 @@
   * Fix handling of streams with appended data
     ([#4954](https://github.com/google/ExoPlayer/issues/4954)).
 * DASH: Parse ProgramInformation element if present in the manifest.
-* HLS: Add constructor to `DefaultHlsExtractorFactory` for adding TS payload
-  reader factory flags
+* HLS:
+  * Add constructor to `DefaultHlsExtractorFactory` for adding TS payload
+    reader factory flags
+  * Fix bug in segment sniffing
+    ([#5039](https://github.com/google/ExoPlayer/issues/5039)).
   ([#4861](https://github.com/google/ExoPlayer/issues/4861)).
 * SubRip: Add support for alignment tags, and remove tags from the displayed
   captions ([#4306](https://github.com/google/ExoPlayer/issues/4306)).
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java
index c3f6304091..450cca42b0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java
@@ -130,16 +130,16 @@ public final class DefaultExtractorInput implements ExtractorInput {
   public boolean advancePeekPosition(int length, boolean allowEndOfInput)
       throws IOException, InterruptedException {
     ensureSpaceForPeek(length);
-    int bytesPeeked = Math.min(peekBufferLength - peekBufferPosition, length);
+    int bytesPeeked = peekBufferLength - peekBufferPosition;
     while (bytesPeeked < length) {
       bytesPeeked = readFromDataSource(peekBuffer, peekBufferPosition, length, bytesPeeked,
           allowEndOfInput);
       if (bytesPeeked == C.RESULT_END_OF_INPUT) {
         return false;
       }
+      peekBufferLength = peekBufferPosition + bytesPeeked;
     }
     peekBufferPosition += length;
-    peekBufferLength = Math.max(peekBufferLength, peekBufferPosition);
     return true;
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java
index a96dfaf2f8..8b26361578 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java
@@ -338,6 +338,23 @@ public class DefaultExtractorInputTest {
     }
   }
 
+  @Test
+  public void testPeekFullyAfterEofExceptionPeeksAsExpected() throws Exception {
+    DefaultExtractorInput input = createDefaultExtractorInput();
+    byte[] target = new byte[TEST_DATA.length + 10];
+
+    try {
+      input.peekFully(target, /* offset= */ 0, target.length);
+      fail();
+    } catch (EOFException expected) {
+      // Do nothing. Expected.
+    }
+    input.peekFully(target, /* offset= */ 0, /* length= */ TEST_DATA.length);
+
+    assertThat(input.getPeekPosition()).isEqualTo(TEST_DATA.length);
+    assertThat(Arrays.equals(TEST_DATA, Arrays.copyOf(target, TEST_DATA.length))).isTrue();
+  }
+
   @Test
   public void testResetPeekPosition() throws Exception {
     DefaultExtractorInput input = createDefaultExtractorInput();

From 34797651c28ffac03082ceed96b8609063fe14ae Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 2 Nov 2018 07:26:30 -0700
Subject: [PATCH 158/832] Add support for .cmf* extension in
 DefaultHlsExtractorFactory

This makes extractor selection a bit more efficient for some CMAF files.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219795105
---
 .../exoplayer2/source/hls/DefaultHlsExtractorFactory.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
index 3d75923553..8a403c3759 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
@@ -48,6 +48,7 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
   public static final String MP4_FILE_EXTENSION = ".mp4";
   public static final String M4_FILE_EXTENSION_PREFIX = ".m4";
   public static final String MP4_FILE_EXTENSION_PREFIX = ".mp4";
+  public static final String CMF_FILE_EXTENSION_PREFIX = ".cmf";
   public static final String VTT_FILE_EXTENSION = ".vtt";
   public static final String WEBVTT_FILE_EXTENSION = ".webvtt";
 
@@ -191,7 +192,8 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
       return new Mp3Extractor(/* flags= */ 0, /* forcedFirstSampleTimestampUs= */ 0);
     } else if (lastPathSegment.endsWith(MP4_FILE_EXTENSION)
         || lastPathSegment.startsWith(M4_FILE_EXTENSION_PREFIX, lastPathSegment.length() - 4)
-        || lastPathSegment.startsWith(MP4_FILE_EXTENSION_PREFIX, lastPathSegment.length() - 5)) {
+        || lastPathSegment.startsWith(MP4_FILE_EXTENSION_PREFIX, lastPathSegment.length() - 5)
+        || lastPathSegment.startsWith(CMF_FILE_EXTENSION_PREFIX, lastPathSegment.length() - 5)) {
       return new FragmentedMp4Extractor(
           /* flags= */ 0,
           timestampAdjuster,

From 251c4207674aa2f721b7212f618a6d2907916db8 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 2 Nov 2018 10:26:55 -0700
Subject: [PATCH 159/832] Experimental parameter for setting a render time
 limit in MediaCodecRenderer

Currently, MediaCodecRenderer's render loop does not have any time limit. We
always try to drain and feed as much buffers as possible. This may lead to a
pattern of feeding phase takes too much time from previous loop, which makes
the next draining phase drops all buffers, making these buffers available for
feeding all at once, and the pattern keeps repeating.

This CL adds an experimental parameter for setting a time limit. If the time
limit is exceeded, the feeding process stops even if more input could be fed.
The default behavior is unchanged

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219820386
---
 .../mediacodec/MediaCodecRenderer.java        | 24 ++++++++++++++++++-
 .../upstream/DefaultBandwidthMeter.java       |  2 ++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index 74c575c1ef..6ba2557ede 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -294,6 +294,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   private Format outputFormat;
   private DrmSession<FrameworkMediaCrypto> drmSession;
   private DrmSession<FrameworkMediaCrypto> pendingDrmSession;
+  private long renderTimeLimitMs;
   private float rendererOperatingRate;
   @Nullable private MediaCodec codec;
   @Nullable private Format codecFormat;
@@ -371,6 +372,21 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     codecDrainAction = DRAIN_ACTION_NONE;
     codecOperatingRate = CODEC_OPERATING_RATE_UNSET;
     rendererOperatingRate = 1f;
+    renderTimeLimitMs = C.TIME_UNSET;
+  }
+
+  /**
+   * Set a limit on the time a single {@link #render(long, long)} call can spend draining and
+   * filling the decoder.
+   *
+   * <p>This method is experimental, and will be renamed or removed in a future release. It should
+   * only be called before the renderer is used.
+   *
+   * @param renderTimeLimitMs The render time limit in milliseconds, or {@link C#TIME_UNSET} for no
+   *     limit.
+   */
+  public void experimental_setRenderTimeLimitMs(long renderTimeLimitMs) {
+    this.renderTimeLimitMs = renderTimeLimitMs;
   }
 
   @Override
@@ -623,9 +639,10 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     // We have a format.
     maybeInitCodec();
     if (codec != null) {
+      long drainStartTimeMs = SystemClock.elapsedRealtime();
       TraceUtil.beginSection("drainAndFeed");
       while (drainOutputBuffer(positionUs, elapsedRealtimeUs)) {}
-      while (feedInputBuffer()) {}
+      while (feedInputBuffer() && shouldContinueFeeding(drainStartTimeMs)) {}
       TraceUtil.endSection();
     } else {
       decoderCounters.skippedInputBufferCount += skipSource(positionUs);
@@ -852,6 +869,11 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     onCodecInitialized(codecName, codecInitializedTimestamp, elapsed);
   }
 
+  private boolean shouldContinueFeeding(long drainStartTimeMs) {
+    return renderTimeLimitMs == C.TIME_UNSET
+        || SystemClock.elapsedRealtime() - drainStartTimeMs < renderTimeLimitMs;
+  }
+
   private void getCodecBuffers(MediaCodec codec) {
     if (Util.SDK_INT < 21) {
       inputBuffers = codec.getInputBuffers();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
index eef86a3aab..d1bda8010f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
@@ -170,6 +170,8 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
     /**
      * Sets whether to reset if the network type changes.
      *
+     * <p>This method is experimental, and will be renamed or removed in a future release.
+     *
      * @param resetOnNetworkTypeChange Whether to reset if the network type changes.
      * @return This builder.
      */

From c5db69d22cd4daa913e2493a5c76384ad9959530 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 2 Nov 2018 10:32:44 -0700
Subject: [PATCH 160/832] Fix further issues with decoder re-use

It's no longer guaranteed that onOutputFormatChanged will always be
called when the renderer is re-enabled, since the codec may be kept
and its output format may not change. Hence we need to avoid resetting
state in onDisabled that we need when the renderer is enabled again.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219821519
---
 .../android/exoplayer2/audio/AudioSink.java   | 72 +++++++++----------
 .../exoplayer2/audio/DefaultAudioSink.java    | 18 ++---
 .../audio/MediaCodecAudioRenderer.java        | 13 +++-
 .../audio/SimpleDecoderAudioRenderer.java     |  4 +-
 .../video/MediaCodecVideoRenderer.java        |  7 +-
 .../audio/SimpleDecoderAudioRendererTest.java |  2 +-
 6 files changed, 59 insertions(+), 57 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java
index bb7ef22ef4..bf1dc3ca8a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java
@@ -23,29 +23,30 @@ import java.nio.ByteBuffer;
 
 /**
  * A sink that consumes audio data.
- * <p>
- * Before starting playback, specify the input audio format by calling
- * {@link #configure(int, int, int, int, int[], int, int)}.
- * <p>
- * Call {@link #handleBuffer(ByteBuffer, long)} to write data, and {@link #handleDiscontinuity()}
+ *
+ * <p>Before starting playback, specify the input audio format by calling {@link #configure(int,
+ * int, int, int, int[], int, int)}.
+ *
+ * <p>Call {@link #handleBuffer(ByteBuffer, long)} to write data, and {@link #handleDiscontinuity()}
  * when the data being fed is discontinuous. Call {@link #play()} to start playing the written data.
- * <p>
- * Call {@link #configure(int, int, int, int, int[], int, int)} whenever the input format changes.
- * The sink will be reinitialized on the next call to {@link #handleBuffer(ByteBuffer, long)}.
- * <p>
- * Call {@link #reset()} to prepare the sink to receive audio data from a new playback position.
- * <p>
- * Call {@link #playToEndOfStream()} repeatedly to play out all data when no more input buffers will
- * be provided via {@link #handleBuffer(ByteBuffer, long)} until the next {@link #reset()}. Call
- * {@link #release()} when the instance is no longer required.
- * <p>
- * The implementation may be backed by a platform {@link AudioTrack}. In this case,
- * {@link #setAudioSessionId(int)}, {@link #setAudioAttributes(AudioAttributes)},
- * {@link #enableTunnelingV21(int)} and/or {@link #disableTunneling()} may be called before writing
- * data to the sink. These methods may also be called after writing data to the sink, in which case
- * it will be reinitialized as required. For implementations that are not based on platform
- * {@link AudioTrack}s, calling methods relating to audio sessions, audio attributes, and tunneling
- * may have no effect.
+ *
+ * <p>Call {@link #configure(int, int, int, int, int[], int, int)} whenever the input format
+ * changes. The sink will be reinitialized on the next call to {@link #handleBuffer(ByteBuffer,
+ * long)}.
+ *
+ * <p>Call {@link #flush()} to prepare the sink to receive audio data from a new playback position.
+ *
+ * <p>Call {@link #playToEndOfStream()} repeatedly to play out all data when no more input buffers
+ * will be provided via {@link #handleBuffer(ByteBuffer, long)} until the next {@link #flush()}.
+ * Call {@link #reset()} when the instance is no longer required.
+ *
+ * <p>The implementation may be backed by a platform {@link AudioTrack}. In this case, {@link
+ * #setAudioSessionId(int)}, {@link #setAudioAttributes(AudioAttributes)}, {@link
+ * #enableTunnelingV21(int)} and/or {@link #disableTunneling()} may be called before writing data to
+ * the sink. These methods may also be called after writing data to the sink, in which case it will
+ * be reinitialized as required. For implementations that are not based on platform {@link
+ * AudioTrack}s, calling methods relating to audio sessions, audio attributes, and tunneling may
+ * have no effect.
  */
 public interface AudioSink {
 
@@ -197,7 +198,7 @@ public interface AudioSink {
    * @param trimStartFrames The number of audio frames to trim from the start of data written to the
    *     sink after this call.
    * @param trimEndFrames The number of audio frames to trim from data written to the sink
-   *     immediately preceding the next call to {@link #reset()} or this method.
+   *     immediately preceding the next call to {@link #flush()} or this method.
    * @throws ConfigurationException If an error occurs configuring the sink.
    */
   void configure(
@@ -223,11 +224,11 @@ public interface AudioSink {
    * ending at its limit (exclusive). The position of the {@link ByteBuffer} is advanced by the
    * number of bytes that were handled. {@link Listener#onPositionDiscontinuity()} will be called if
    * {@code presentationTimeUs} is discontinuous with the last buffer handled since the last reset.
-   * <p>
-   * Returns whether the data was handled in full. If the data was not handled in full then the same
-   * {@link ByteBuffer} must be provided to subsequent calls until it has been fully consumed,
-   * except in the case of an intervening call to {@link #reset()} (or to
-   * {@link #configure(int, int, int, int, int[], int, int)} that causes the sink to be reset).
+   *
+   * <p>Returns whether the data was handled in full. If the data was not handled in full then the
+   * same {@link ByteBuffer} must be provided to subsequent calls until it has been fully consumed,
+   * except in the case of an intervening call to {@link #flush()} (or to {@link #configure(int,
+   * int, int, int, int[], int, int)} that causes the sink to be flushed).
    *
    * @param buffer The buffer containing audio data.
    * @param presentationTimeUs The presentation timestamp of the buffer in microseconds.
@@ -316,15 +317,12 @@ public interface AudioSink {
   void pause();
 
   /**
-   * Resets the sink, after which it is ready to receive buffers from a new playback position.
-   * <p>
-   * The audio session may remain active until {@link #release()} is called.
+   * Flushes the sink, after which it is ready to receive buffers from a new playback position.
+   *
+   * <p>The audio session may remain active until {@link #reset()} is called.
    */
+  void flush();
+
+  /** Resets the renderer, releasing any resources that it currently holds. */
   void reset();
-
-  /**
-   * Releases any resources associated with this instance.
-   */
-  void release();
-
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
index d29659b102..7ba060ad76 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
@@ -463,7 +463,7 @@ public final class DefaultAudioSink implements AudioSink {
       return;
     }
 
-    reset();
+    flush();
 
     this.processingEnabled = processingEnabled;
     outputSampleRate = sampleRate;
@@ -681,7 +681,7 @@ public final class DefaultAudioSink implements AudioSink {
 
     if (audioTrackPositionTracker.isStalled(getWrittenFrames())) {
       Log.w(TAG, "Resetting stalled audio track");
-      reset();
+      flush();
       return true;
     }
 
@@ -871,7 +871,7 @@ public final class DefaultAudioSink implements AudioSink {
       // The audio attributes are ignored in tunneling mode, so no need to reset.
       return;
     }
-    reset();
+    flush();
     audioSessionId = C.AUDIO_SESSION_ID_UNSET;
   }
 
@@ -879,7 +879,7 @@ public final class DefaultAudioSink implements AudioSink {
   public void setAudioSessionId(int audioSessionId) {
     if (this.audioSessionId != audioSessionId) {
       this.audioSessionId = audioSessionId;
-      reset();
+      flush();
     }
   }
 
@@ -907,7 +907,7 @@ public final class DefaultAudioSink implements AudioSink {
     if (!tunneling || audioSessionId != tunnelingAudioSessionId) {
       tunneling = true;
       audioSessionId = tunnelingAudioSessionId;
-      reset();
+      flush();
     }
   }
 
@@ -916,7 +916,7 @@ public final class DefaultAudioSink implements AudioSink {
     if (tunneling) {
       tunneling = false;
       audioSessionId = C.AUDIO_SESSION_ID_UNSET;
-      reset();
+      flush();
     }
   }
 
@@ -947,7 +947,7 @@ public final class DefaultAudioSink implements AudioSink {
   }
 
   @Override
-  public void reset() {
+  public void flush() {
     if (isInitialized()) {
       submittedPcmBytes = 0;
       submittedEncodedFrames = 0;
@@ -995,8 +995,8 @@ public final class DefaultAudioSink implements AudioSink {
   }
 
   @Override
-  public void release() {
-    reset();
+  public void reset() {
+    flush();
     releaseKeepSessionIdAudioTrack();
     for (AudioProcessor audioProcessor : toIntPcmAvailableAudioProcessors) {
       audioProcessor.reset();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
index c90b815347..dbc25c8d42 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
@@ -511,7 +511,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
   @Override
   protected void onPositionReset(long positionUs, boolean joining) throws ExoPlaybackException {
     super.onPositionReset(positionUs, joining);
-    audioSink.reset();
+    audioSink.flush();
     currentPositionUs = positionUs;
     allowFirstBufferPositionDiscontinuity = true;
     allowPositionDiscontinuity = true;
@@ -537,7 +537,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
     try {
       lastInputTimeUs = C.TIME_UNSET;
       pendingStreamChangeCount = 0;
-      audioSink.release();
+      audioSink.flush();
     } finally {
       try {
         super.onDisabled();
@@ -548,6 +548,15 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
     }
   }
 
+  @Override
+  protected void onReset() {
+    try {
+      super.onReset();
+    } finally {
+      audioSink.reset();
+    }
+  }
+
   @Override
   public boolean isEnded() {
     return super.isEnded() && audioSink.isEnded();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
index cecb17d96c..3df38e3557 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
@@ -538,7 +538,7 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
 
   @Override
   protected void onPositionReset(long positionUs, boolean joining) throws ExoPlaybackException {
-    audioSink.reset();
+    audioSink.flush();
     currentPositionUs = positionUs;
     allowFirstBufferPositionDiscontinuity = true;
     allowPositionDiscontinuity = true;
@@ -567,7 +567,7 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
     waitingForKeys = false;
     try {
       releaseDecoder();
-      audioSink.release();
+      audioSink.reset();
     } finally {
       try {
         if (drmSession != null) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index a896bc2322..29a75f06e5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -361,18 +361,13 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
 
   @Override
   protected void onDisabled() {
-    currentWidth = Format.NO_VALUE;
-    currentHeight = Format.NO_VALUE;
-    currentPixelWidthHeightRatio = Format.NO_VALUE;
-    pendingPixelWidthHeightRatio = Format.NO_VALUE;
-    outputStreamOffsetUs = C.TIME_UNSET;
     lastInputTimeUs = C.TIME_UNSET;
+    outputStreamOffsetUs = C.TIME_UNSET;
     pendingOutputStreamOffsetCount = 0;
     clearReportedVideoSize();
     clearRenderedFirstFrame();
     frameReleaseTimeHelper.disable();
     tunnelingOnFrameRenderedListener = null;
-    tunneling = false;
     try {
       super.onDisabled();
     } finally {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRendererTest.java b/library/core/src/test/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRendererTest.java
index 48e71c619c..3f28999820 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRendererTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRendererTest.java
@@ -104,7 +104,7 @@ public class SimpleDecoderAudioRendererTest {
     verify(mockAudioSink, times(1)).playToEndOfStream();
     audioRenderer.disable();
     audioRenderer.reset();
-    verify(mockAudioSink, times(1)).release();
+    verify(mockAudioSink, times(1)).reset();
   }
 
   private static final class FakeDecoder

From 37f4540156369891e95f515bd2edf739f067cb85 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Fri, 2 Nov 2018 11:13:53 -0700
Subject: [PATCH 161/832] Move BaseGvrPlayerActivity to
 com.google.android.exoplayer2.ext.gvr

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219829614
---
 .../{ui/spherical => ext/gvr}/BaseGvrPlayerActivity.java  | 6 ++++--
 .../android/exoplayer2/ui/spherical/CanvasRenderer.java   | 8 ++++----
 .../android/exoplayer2/ui/spherical/GlViewGroup.java      | 2 +-
 .../android/exoplayer2/ui/spherical/PointerRenderer.java  | 2 +-
 .../android/exoplayer2/ui/spherical/SceneRenderer.java    | 3 +--
 5 files changed, 11 insertions(+), 10 deletions(-)
 rename extensions/gvr/src/main/java/com/google/android/exoplayer2/{ui/spherical => ext/gvr}/BaseGvrPlayerActivity.java (98%)

diff --git a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ui/spherical/BaseGvrPlayerActivity.java b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/BaseGvrPlayerActivity.java
similarity index 98%
rename from extensions/gvr/src/main/java/com/google/android/exoplayer2/ui/spherical/BaseGvrPlayerActivity.java
rename to extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/BaseGvrPlayerActivity.java
index 48acc4a9c8..acddae49e9 100644
--- a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ui/spherical/BaseGvrPlayerActivity.java
+++ b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/BaseGvrPlayerActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.exoplayer2.ui.spherical;
+package com.google.android.exoplayer2.ext.gvr;
 
 import android.content.Context;
 import android.content.Intent;
@@ -32,8 +32,10 @@ import android.view.MotionEvent;
 import android.view.Surface;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Player;
-import com.google.android.exoplayer2.ext.gvr.R;
 import com.google.android.exoplayer2.ui.PlayerControlView;
+import com.google.android.exoplayer2.ui.spherical.GlViewGroup;
+import com.google.android.exoplayer2.ui.spherical.PointerRenderer;
+import com.google.android.exoplayer2.ui.spherical.SceneRenderer;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
 import com.google.vr.ndk.base.DaydreamApi;
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java
index 9e51c2ba45..247de5a3d0 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java
@@ -40,7 +40,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
  * GL thread before it can be rendered.
  */
 @TargetApi(15)
-/* package */ final class CanvasRenderer {
+public final class CanvasRenderer {
 
   private static final float WIDTH_UNIT = 0.8f;
   private static final float DISTANCE_UNIT = 1f;
@@ -156,7 +156,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
   }
 
   /** Finishes constructing this object on the GL Thread. */
-  /* package */ void init() {
+  public void init() {
     if (program != 0) {
       return;
     }
@@ -183,7 +183,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
    * @param viewProjectionMatrix Array of floats containing the quad's 4x4 perspective matrix in the
    *     {@link android.opengl.Matrix} format.
    */
-  /* package */ void draw(float[] viewProjectionMatrix) {
+  public void draw(float[] viewProjectionMatrix) {
     if (displaySurfaceTexture == null) {
       return;
     }
@@ -237,7 +237,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
   }
 
   /** Frees GL resources. */
-  /* package */ void shutdown() {
+  public void shutdown() {
     if (program != 0) {
       GLES20.glDeleteProgram(program);
       GLES20.glDeleteTextures(1, new int[] {textureId}, 0);
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/GlViewGroup.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/GlViewGroup.java
index 09e2f22207..b3c1a963b8 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/GlViewGroup.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/GlViewGroup.java
@@ -31,7 +31,7 @@ import android.widget.FrameLayout;
 import com.google.android.exoplayer2.util.Assertions;
 
 /** This View uses standard Android APIs to render its child Views to a texture. */
-/* package */ final class GlViewGroup extends FrameLayout {
+public final class GlViewGroup extends FrameLayout {
 
   private final CanvasRenderer canvasRenderer;
 
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/PointerRenderer.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/PointerRenderer.java
index d0a4d4c882..fa7118a0fb 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/PointerRenderer.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/PointerRenderer.java
@@ -24,7 +24,7 @@ import com.google.android.exoplayer2.util.GlUtil;
 import java.nio.FloatBuffer;
 
 /** Renders a pointer. */
-/* package */ final class PointerRenderer {
+public final class PointerRenderer {
   // The pointer quad is 2 * SIZE units.
   private static final float SIZE = .01f;
   private static final float DISTANCE = 1;
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java
index b3b1acb7e4..6793b0c584 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java
@@ -36,8 +36,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 /** Renders a GL Scene. */
-/* package */ final class SceneRenderer
-    implements VideoFrameMetadataListener, CameraMotionListener {
+public final class SceneRenderer implements VideoFrameMetadataListener, CameraMotionListener {
 
   private final AtomicBoolean frameAvailable;
   private final AtomicBoolean resetRotationAtNextFrame;

From 894bac617350df582dbf59a832d042fe64979649 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 5 Nov 2018 01:23:47 -0800
Subject: [PATCH 162/832] Tweak dev guide / readme

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=220059244
---
 README.md | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 2b6a508aaa..37967dd527 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ repository and depend on the modules locally.
 ### From JCenter ###
 
 The easiest way to get started using ExoPlayer is to add it as a gradle
-dependency. You need to make sure you have the JCenter and Google repositories
+dependency. You need to make sure you have the Google and JCenter repositories
 included in the `build.gradle` file in the root of your project:
 
 ```gradle
@@ -47,8 +47,13 @@ implementation 'com.google.android.exoplayer:exoplayer:2.X.X'
 
 where `2.X.X` is your preferred version. If not enabled already, you also need
 to turn on Java 8 support in all `build.gradle` files depending on ExoPlayer, by
-adding `compileOptions { targetCompatibility JavaVersion.VERSION_1_8 }` to the
-`android` section.
+adding the following to the `android` section:
+
+```gradle
+compileOptions {
+    targetCompatibility JavaVersion.VERSION_1_8
+}
+```
 
 As an alternative to the full library, you can depend on only the library
 modules that you actually need. For example the following will add dependencies

From 0afd9c17e64eda74f5c3d52b08c25a653201af38 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Mon, 5 Nov 2018 02:29:53 -0800
Subject: [PATCH 163/832] Add TrackSelectionUtil getBitratesUsingPastInfo

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=220066159
---
 .../trackselection/TrackSelectionUtil.java    |  91 +++++-
 .../TrackSelectionUtilTest.java               | 276 ++++++++++++++++--
 .../exoplayer2/testutil/FakeMediaChunk.java   |   6 +-
 3 files changed, 332 insertions(+), 41 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
index 9c342b6065..fdfd87910e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
@@ -17,8 +17,12 @@ package com.google.android.exoplayer2.trackselection;
 
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.source.chunk.MediaChunk;
 import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
+import com.google.android.exoplayer2.source.chunk.MediaChunkListIterator;
 import com.google.android.exoplayer2.util.Assertions;
+import java.util.Arrays;
+import java.util.List;
 
 /** Track selection related utility methods. */
 public final class TrackSelectionUtil {
@@ -58,10 +62,11 @@ public final class TrackSelectionUtil {
   }
 
   /**
-   * Returns average bitrate values for a set of tracks whose upcoming media chunk iterators and
-   * formats are given. If an average bitrate can't be calculated, an estimation is calculated using
-   * average bitrate of another track and the ratio of the bitrate values defined in the formats of
-   * the two tracks.
+   * Returns bitrate values for a set of tracks whose upcoming media chunk iterators and formats are
+   * given.
+   *
+   * <p>If an average bitrate can't be calculated, an estimation is calculated using average bitrate
+   * of another track and the ratio of the bitrate values defined in the formats of the two tracks.
    *
    * @param iterators An array of {@link MediaChunkIterator}s providing information about the
    *     sequence of upcoming media chunks for each track.
@@ -72,7 +77,7 @@ public final class TrackSelectionUtil {
    *     estimation can't be calculated, {@link Format#NO_VALUE} is set.
    * @see #getAverageBitrate(MediaChunkIterator, long)
    */
-  public static int[] getAverageBitrates(
+  public static int[] getBitratesUsingFutureInfo(
       MediaChunkIterator[] iterators, Format[] formats, long maxDurationUs) {
     int trackCount = iterators.length;
     Assertions.checkArgument(trackCount == formats.length);
@@ -102,26 +107,82 @@ public final class TrackSelectionUtil {
     }
 
     if (needEstimateBitrate && canEstimateBitrate) {
-      for (int i = 0; i < trackCount; i++) {
-        if (bitrates[i] == Format.NO_VALUE) {
-          int formatBitrate = formats[i].bitrate;
-          if (formatBitrate != Format.NO_VALUE) {
-            int closestFormat = findClosestBitrateFormat(formatBitrate, formatBitrates);
-            bitrates[i] = (int) (bitrateRatios[closestFormat] * formatBitrate);
-          }
-        }
-      }
+      estimateBitrates(bitrates, formats, formatBitrates, bitrateRatios);
     }
     return bitrates;
   }
 
-  private static int findClosestBitrateFormat(int formatBitrate, int[] formatBitrates) {
+  /**
+   * Returns bitrate values for a set of tracks whose formats are given, using the given queue of
+   * already buffered {@link MediaChunk} instances.
+   *
+   * @param queue The queue of already buffered {@link MediaChunk} instances. Must not be modified.
+   * @param formats The track formats.
+   * @param maxDurationUs Maximum duration of chunks to be included in average bitrate values, in
+   *     microseconds.
+   * @return Bitrate values for the tracks. If for a track, a bitrate value can't be calculated,
+   *     {@link Format#NO_VALUE} is set.
+   * @see #getBitratesUsingFutureInfo(MediaChunkIterator[], Format[], long)
+   */
+  public static int[] getBitratesUsingPastInfo(
+      List<? extends MediaChunk> queue, Format[] formats, long maxDurationUs) {
+    int[] bitrates = new int[formats.length];
+    Arrays.fill(bitrates, Format.NO_VALUE);
+    int queueAverageBitrate = getAverageQueueBitrate(queue, maxDurationUs);
+    if (queueAverageBitrate == Format.NO_VALUE) {
+      return bitrates;
+    }
+    int queueFormatBitrate = queue.get(queue.size() - 1).trackFormat.bitrate;
+    if (queueFormatBitrate != Format.NO_VALUE) {
+      float queueBitrateRatio = ((float) queueAverageBitrate) / queueFormatBitrate;
+      estimateBitrates(
+          bitrates, formats, new int[] {queueFormatBitrate}, new float[] {queueBitrateRatio});
+    }
+    return bitrates;
+  }
+
+  private static int getAverageQueueBitrate(List<? extends MediaChunk> queue, long maxDurationUs) {
+    if (queue.isEmpty()) {
+      return Format.NO_VALUE;
+    }
+    MediaChunkListIterator iterator =
+        new MediaChunkListIterator(getSingleFormatSubQueue(queue), /* reverseOrder= */ true);
+    return getAverageBitrate(iterator, maxDurationUs);
+  }
+
+  private static List<? extends MediaChunk> getSingleFormatSubQueue(
+      List<? extends MediaChunk> queue) {
+    Format queueFormat = queue.get(queue.size() - 1).trackFormat;
+    int queueSize = queue.size();
+    for (int i = queueSize - 2; i >= 0; i--) {
+      if (!queue.get(i).trackFormat.equals(queueFormat)) {
+        return queue.subList(i + 1, queueSize);
+      }
+    }
+    return queue;
+  }
+
+  private static void estimateBitrates(
+      int[] bitrates, Format[] formats, int[] formatBitrates, float[] bitrateRatios) {
+    for (int i = 0; i < bitrates.length; i++) {
+      if (bitrates[i] == Format.NO_VALUE) {
+        int formatBitrate = formats[i].bitrate;
+        if (formatBitrate != Format.NO_VALUE) {
+          int closestFormat = getClosestBitrateIndex(formatBitrate, formatBitrates);
+          bitrates[i] = (int) (bitrateRatios[closestFormat] * formatBitrate);
+        }
+      }
+    }
+  }
+
+  private static int getClosestBitrateIndex(int formatBitrate, int[] formatBitrates) {
     int closestDistance = Integer.MAX_VALUE;
     int closestFormat = C.INDEX_UNSET;
     for (int j = 0; j < formatBitrates.length; j++) {
       if (formatBitrates[j] != Format.NO_VALUE) {
         int distance = Math.abs(formatBitrates[j] - formatBitrate);
         if (distance < closestDistance) {
+          closestDistance = distance;
           closestFormat = j;
         }
       }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java
index 2d5f2a7c67..49da9b567a 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java
@@ -18,12 +18,14 @@ package com.google.android.exoplayer2.trackselection;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.chunk.BaseMediaChunkIterator;
 import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
+import com.google.android.exoplayer2.testutil.FakeMediaChunk;
 import com.google.android.exoplayer2.upstream.DataSpec;
+import java.util.Arrays;
+import java.util.Collections;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -96,11 +98,12 @@ public class TrackSelectionUtilTest {
       getAverageBitrate_chunksExceedingMaxDuration_returnsAverageChunkBitrateUpToMaxDuration() {
     long[] chunkTimeBoundariesSec = {0, 5, 15, 45, 50};
     long[] chunkLengths = {10, 20, 30, 100};
-
     FakeIterator iterator = new FakeIterator(chunkTimeBoundariesSec, chunkLengths);
 
-    assertThat(TrackSelectionUtil.getAverageBitrate(iterator, 30 * C.MICROS_PER_SECOND))
-        .isEqualTo(12);
+    long maxDurationUs = 30 * C.MICROS_PER_SECOND;
+    int averageBitrate = TrackSelectionUtil.getAverageBitrate(iterator, maxDurationUs);
+
+    assertThat(averageBitrate).isEqualTo(12);
   }
 
   @Test
@@ -115,26 +118,26 @@ public class TrackSelectionUtilTest {
   }
 
   @Test
-  public void getAverageBitrates_noIterator_returnsEmptyArray() {
+  public void getBitratesUsingFutureInfo_noIterator_returnsEmptyArray() {
     assertThat(
-            TrackSelectionUtil.getAverageBitrates(
+            TrackSelectionUtil.getBitratesUsingFutureInfo(
                 new MediaChunkIterator[0], new Format[0], MAX_DURATION_US))
         .hasLength(0);
   }
 
   @Test
-  public void getAverageBitrates_emptyIterator_returnsNoValue() {
-    int[] averageBitrates =
-        TrackSelectionUtil.getAverageBitrates(
+  public void getBitratesUsingFutureInfo_emptyIterator_returnsNoValue() {
+    int[] bitrates =
+        TrackSelectionUtil.getBitratesUsingFutureInfo(
             new MediaChunkIterator[] {MediaChunkIterator.EMPTY},
             new Format[] {createFormatWithBitrate(10)},
             MAX_DURATION_US);
 
-    assertThat(averageBitrates).asList().containsExactly(Format.NO_VALUE);
+    assertThat(bitrates).asList().containsExactly(Format.NO_VALUE);
   }
 
   @Test
-  public void getAverageBitrates_twoTracks_returnsAverageChunkBitrates() {
+  public void getBitratesUsingFutureInfo_twoTracksZeroMaxDuration_returnsNoValue() {
     FakeIterator iterator1 =
         new FakeIterator(
             /* chunkTimeBoundariesSec= */ new long[] {0, 10}, /* chunkLengths= */ new long[] {10});
@@ -143,35 +146,62 @@ public class TrackSelectionUtilTest {
             /* chunkTimeBoundariesSec= */ new long[] {0, 5, 15, 30},
             /* chunkLengths= */ new long[] {10, 20, 30});
 
-    int[] averageBitrates =
-        TrackSelectionUtil.getAverageBitrates(
+    int[] bitrates =
+        TrackSelectionUtil.getBitratesUsingFutureInfo(
+            new MediaChunkIterator[] {iterator1, iterator2},
+            new Format[] {createFormatWithBitrate(10), createFormatWithBitrate(20)},
+            /* maxDurationUs= */ 0);
+
+    assertThat(bitrates).asList().containsExactly(Format.NO_VALUE, Format.NO_VALUE);
+  }
+
+  @Test
+  public void getBitratesUsingFutureInfo_twoTracks_returnsBitrates() {
+    FakeIterator iterator1 =
+        new FakeIterator(
+            /* chunkTimeBoundariesSec= */ new long[] {0, 10}, /* chunkLengths= */ new long[] {10});
+    FakeIterator iterator2 =
+        new FakeIterator(
+            /* chunkTimeBoundariesSec= */ new long[] {0, 5, 15, 30},
+            /* chunkLengths= */ new long[] {10, 20, 30});
+
+    int[] bitrates =
+        TrackSelectionUtil.getBitratesUsingFutureInfo(
             new MediaChunkIterator[] {iterator1, iterator2},
             new Format[] {createFormatWithBitrate(10), createFormatWithBitrate(20)},
             MAX_DURATION_US);
 
-    assertThat(averageBitrates).asList().containsExactly(8, 16).inOrder();
+    assertThat(bitrates).asList().containsExactly(8, 16).inOrder();
   }
 
   @Test
-  public void getAverageBitrates_oneEmptyIteratorOneWithChunks_returnsEstimationForEmpty() {
+  public void getBitratesUsingFutureInfo_emptyIterator_returnsEstimationUsingClosest() {
     FakeIterator iterator1 =
         new FakeIterator(
             /* chunkTimeBoundariesSec= */ new long[] {0, 5}, /* chunkLengths= */ new long[] {10});
     Format format1 = createFormatWithBitrate(10);
     MediaChunkIterator iterator2 = MediaChunkIterator.EMPTY;
     Format format2 = createFormatWithBitrate(20);
+    FakeIterator iterator3 =
+        new FakeIterator(
+            /* chunkTimeBoundariesSec= */ new long[] {0, 5}, /* chunkLengths= */ new long[] {50});
+    Format format3 = createFormatWithBitrate(25);
+    FakeIterator iterator4 =
+        new FakeIterator(
+            /* chunkTimeBoundariesSec= */ new long[] {0, 5}, /* chunkLengths= */ new long[] {20});
+    Format format4 = createFormatWithBitrate(30);
 
-    int[] averageBitrates =
-        TrackSelectionUtil.getAverageBitrates(
-            new MediaChunkIterator[] {iterator1, iterator2},
-            new Format[] {format1, format2},
+    int[] bitrates =
+        TrackSelectionUtil.getBitratesUsingFutureInfo(
+            new MediaChunkIterator[] {iterator1, iterator2, iterator3, iterator4},
+            new Format[] {format1, format2, format3, format4},
             MAX_DURATION_US);
 
-    assertThat(averageBitrates).asList().containsExactly(16, 32).inOrder();
+    assertThat(bitrates).asList().containsExactly(16, 64, 80, 32).inOrder();
   }
 
   @Test
-  public void getAverageBitrates_formatWithoutBitrate_returnsNoValueForEmpty() {
+  public void getBitratesUsingFutureInfo_formatWithoutBitrate_returnsNoValueForEmpty() {
     FakeIterator iterator1 =
         new FakeIterator(
             /* chunkTimeBoundariesSec= */ new long[] {0, 5}, /* chunkLengths= */ new long[] {10});
@@ -179,16 +209,212 @@ public class TrackSelectionUtilTest {
     MediaChunkIterator iterator2 = MediaChunkIterator.EMPTY;
     Format format2 = createFormatWithBitrate(Format.NO_VALUE);
 
-    int[] averageBitrates =
-        TrackSelectionUtil.getAverageBitrates(
+    int[] bitrates =
+        TrackSelectionUtil.getBitratesUsingFutureInfo(
             new MediaChunkIterator[] {iterator1, iterator2},
             new Format[] {format1, format2},
             MAX_DURATION_US);
 
-    assertThat(averageBitrates).asList().containsExactly(16, Format.NO_VALUE).inOrder();
+    assertThat(bitrates).asList().containsExactly(16, Format.NO_VALUE).inOrder();
+  }
+
+  @Test
+  public void getBitratesUsingPastInfo_noFormat_returnsEmptyArray() {
+    FakeMediaChunk chunk =
+        createChunk(
+            createFormatWithBitrate(10),
+            /* length= */ 10,
+            /* startTimeSec= */ 0,
+            /* endTimeSec= */ 10);
+
+    int[] bitrates =
+        TrackSelectionUtil.getBitratesUsingPastInfo(
+            Collections.singletonList(chunk), new Format[0], MAX_DURATION_US);
+
+    assertThat(bitrates).hasLength(0);
+  }
+
+  @Test
+  public void getBitratesUsingPastInfo_emptyQueue_returnsNoValue() {
+    int[] bitrates =
+        TrackSelectionUtil.getBitratesUsingPastInfo(
+            Collections.emptyList(), new Format[] {createFormatWithBitrate(10)}, MAX_DURATION_US);
+
+    assertThat(bitrates).asList().containsExactly(Format.NO_VALUE);
+  }
+
+  @Test
+  public void getBitratesUsingPastInfo_oneChunkFormatNoBitrate_returnsNoValue() {
+    Format format = createFormatWithBitrate(Format.NO_VALUE);
+    FakeMediaChunk chunk =
+        createChunk(format, /* length= */ 10, /* startTimeSec= */ 0, /* endTimeSec= */ 10);
+
+    int[] bitrates =
+        TrackSelectionUtil.getBitratesUsingPastInfo(
+            Collections.singletonList(chunk), new Format[] {format}, MAX_DURATION_US);
+
+    assertThat(bitrates).asList().containsExactly(Format.NO_VALUE);
+  }
+
+  @Test
+  public void getBitratesUsingPastInfo_oneChunkNoLength_returnsNoValue() {
+    Format format = createFormatWithBitrate(10);
+    FakeMediaChunk chunk =
+        createChunk(
+            format, /* length= */ C.LENGTH_UNSET, /* startTimeSec= */ 0, /* endTimeSec= */ 10);
+
+    int[] bitrates =
+        TrackSelectionUtil.getBitratesUsingPastInfo(
+            Collections.singletonList(chunk), new Format[] {format}, MAX_DURATION_US);
+
+    assertThat(bitrates).asList().containsExactly(Format.NO_VALUE);
+  }
+
+  @Test
+  public void getBitratesUsingPastInfo_oneChunkWithSameFormat_returnsBitrates() {
+    Format format = createFormatWithBitrate(10);
+    FakeMediaChunk chunk =
+        createChunk(format, /* length= */ 10, /* startTimeSec= */ 0, /* endTimeSec= */ 10);
+
+    int[] bitrates =
+        TrackSelectionUtil.getBitratesUsingPastInfo(
+            Collections.singletonList(chunk), new Format[] {format}, MAX_DURATION_US);
+
+    assertThat(bitrates).asList().containsExactly(8).inOrder();
+  }
+
+  @Test
+  public void getBitratesUsingPastInfo_zeroMaxDuration_returnsNoValue() {
+    Format format = createFormatWithBitrate(10);
+    FakeMediaChunk chunk =
+        createChunk(format, /* length= */ 10, /* startTimeSec= */ 0, /* endTimeSec= */ 10);
+
+    int[] bitrates =
+        TrackSelectionUtil.getBitratesUsingPastInfo(
+            Collections.singletonList(chunk), new Format[] {format}, /* maxDurationUs= */ 0);
+
+    assertThat(bitrates).asList().containsExactly(Format.NO_VALUE).inOrder();
+  }
+
+  @Test
+  public void getBitratesUsingPastInfo_multipleChunkWithSameFormat_returnsAverageBitrate() {
+    Format format = createFormatWithBitrate(10);
+    FakeMediaChunk chunk =
+        createChunk(format, /* length= */ 10, /* startTimeSec= */ 0, /* endTimeSec= */ 10);
+    FakeMediaChunk chunk2 =
+        createChunk(format, /* length= */ 20, /* startTimeSec= */ 10, /* endTimeSec= */ 20);
+
+    int[] bitrates =
+        TrackSelectionUtil.getBitratesUsingPastInfo(
+            Arrays.asList(chunk, chunk2), new Format[] {format}, MAX_DURATION_US);
+
+    assertThat(bitrates).asList().containsExactly(12).inOrder();
+  }
+
+  @Test
+  public void getBitratesUsingPastInfo_oneChunkWithDifferentFormat_returnsEstimationBitrate() {
+    FakeMediaChunk chunk =
+        createChunk(
+            createFormatWithBitrate(10),
+            /* length= */ 10,
+            /* startTimeSec= */ 0,
+            /* endTimeSec= */ 10);
+
+    int[] bitrates =
+        TrackSelectionUtil.getBitratesUsingPastInfo(
+            Collections.singletonList(chunk),
+            new Format[] {createFormatWithBitrate(20)},
+            MAX_DURATION_US);
+
+    assertThat(bitrates).asList().containsExactly(16).inOrder();
+  }
+
+  @Test
+  public void getBitratesUsingPastInfo_trackFormatNoBitrate_returnsNoValue() {
+    FakeMediaChunk chunk =
+        createChunk(
+            createFormatWithBitrate(10),
+            /* length= */ 10,
+            /* startTimeSec= */ 0,
+            /* endTimeSec= */ 10);
+
+    int[] bitrates =
+        TrackSelectionUtil.getBitratesUsingPastInfo(
+            Collections.singletonList(chunk),
+            new Format[] {createFormatWithBitrate(Format.NO_VALUE)},
+            MAX_DURATION_US);
+
+    assertThat(bitrates).asList().containsExactly(Format.NO_VALUE);
+  }
+
+  @Test
+  public void getBitratesUsingPastInfo_multipleTracks_returnsBitrates() {
+    FakeMediaChunk chunk =
+        createChunk(
+            createFormatWithBitrate(10),
+            /* length= */ 10,
+            /* startTimeSec= */ 0,
+            /* endTimeSec= */ 10);
+
+    int[] bitrates =
+        TrackSelectionUtil.getBitratesUsingPastInfo(
+            Collections.singletonList(chunk),
+            new Format[] {createFormatWithBitrate(20), createFormatWithBitrate(30)},
+            MAX_DURATION_US);
+
+    assertThat(bitrates).asList().containsExactly(16, 24).inOrder();
+  }
+
+  @Test
+  public void
+      getBitratesUsingPastInfo_multipleChunkExceedingMaxDuration_returnsAverageUntilMaxDuration() {
+    Format format = createFormatWithBitrate(10);
+    FakeMediaChunk chunk =
+        createChunk(format, /* length= */ 10, /* startTimeSec= */ 0, /* endTimeSec= */ 20);
+    FakeMediaChunk chunk2 =
+        createChunk(format, /* length= */ 40, /* startTimeSec= */ 20, /* endTimeSec= */ 40);
+
+    int[] bitrates =
+        TrackSelectionUtil.getBitratesUsingPastInfo(
+            Arrays.asList(chunk, chunk2),
+            new Format[] {format},
+            /* maxDurationUs= */ 30 * C.MICROS_PER_SECOND);
+
+    assertThat(bitrates).asList().containsExactly(12).inOrder();
+  }
+
+  @Test
+  public void
+      getBitratesUsingPastInfo_chunksWithDifferentFormats_returnsChunkAverageBitrateForLastFormat() {
+    FakeMediaChunk chunk =
+        createChunk(
+            createFormatWithBitrate(10),
+            /* length= */ 10,
+            /* startTimeSec= */ 0,
+            /* endTimeSec= */ 10);
+    FakeMediaChunk chunk2 =
+        createChunk(
+            createFormatWithBitrate(20),
+            /* length= */ 40,
+            /* startTimeSec= */ 10,
+            /* endTimeSec= */ 20);
+
+    int[] bitrates =
+        TrackSelectionUtil.getBitratesUsingPastInfo(
+            Arrays.asList(chunk, chunk2),
+            new Format[] {createFormatWithBitrate(10)},
+            MAX_DURATION_US);
+
+    assertThat(bitrates).asList().containsExactly(16).inOrder();
+  }
+
+  private static FakeMediaChunk createChunk(
+      Format format, int length, int startTimeSec, int endTimeSec) {
+    DataSpec dataSpec = new DataSpec(Uri.EMPTY, 0, length, null, 0);
+    return new FakeMediaChunk(
+        dataSpec, format, startTimeSec * C.MICROS_PER_SECOND, endTimeSec * C.MICROS_PER_SECOND);
   }
 
-  @NonNull
   private static Format createFormatWithBitrate(int bitrate) {
     return Format.createSampleFormat(null, null, null, bitrate, null);
   }
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaChunk.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaChunk.java
index 8740e3e57f..6669504c07 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaChunk.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaChunk.java
@@ -30,9 +30,13 @@ public final class FakeMediaChunk extends MediaChunk {
   private static final DataSource DATA_SOURCE = new DefaultHttpDataSource("TEST_AGENT", null);
 
   public FakeMediaChunk(Format trackFormat, long startTimeUs, long endTimeUs) {
+    this(new DataSpec(Uri.EMPTY), trackFormat, startTimeUs, endTimeUs);
+  }
+
+  public FakeMediaChunk(DataSpec dataSpec, Format trackFormat, long startTimeUs, long endTimeUs) {
     super(
         DATA_SOURCE,
-        new DataSpec(Uri.EMPTY),
+        dataSpec,
         trackFormat,
         C.SELECTION_REASON_ADAPTIVE,
         /* trackSelectionData= */ null,

From 8844694dfd0a033472b98c00e8cbaf023f69d596 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 5 Nov 2018 10:11:27 -0800
Subject: [PATCH 164/832] Automated g4 rollback of changelist 219585084.

*** Reason for rollback ***

Rolling forward again as [] should fix issue that prompted the rollback

*** Original change description ***

Automated g4 rollback of changelist 219130576.

*** Original change description ***

Re-enable codec re-use

Issue: #2826

***

***

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=220124362
---
 .../mediacodec/MediaCodecRenderer.java           | 16 +++++++++++++---
 .../video/MediaCodecVideoRenderer.java           |  4 ++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index 6ba2557ede..2d936afc2a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -552,6 +552,16 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   @Override
   protected void onDisabled() {
     inputFormat = null;
+    if (drmSession != null || pendingDrmSession != null) {
+      // TODO: Do something better with this case.
+      onReset();
+    } else {
+      flushOrReleaseCodec();
+    }
+  }
+
+  @Override
+  protected void onReset() {
     try {
       releaseCodec();
     } finally {
@@ -575,14 +585,14 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   protected void releaseCodec() {
     availableCodecInfos = null;
     if (codec != null) {
+      codecInfo = null;
+      codecFormat = null;
       resetInputBuffer();
       resetOutputBuffer();
       resetCodecBuffers();
-      codecHotswapDeadlineMs = C.TIME_UNSET;
       waitingForKeys = false;
+      codecHotswapDeadlineMs = C.TIME_UNSET;
       decodeOnlyPresentationTimestamps.clear();
-      codecInfo = null;
-      codecFormat = null;
       decoderCounters.decoderReleaseCount++;
       try {
         codec.stop();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index 29a75f06e5..2851325c75 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -283,8 +283,12 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
   @Override
   protected void onEnabled(boolean joining) throws ExoPlaybackException {
     super.onEnabled(joining);
+    int oldTunnelingAudioSessionId = tunnelingAudioSessionId;
     tunnelingAudioSessionId = getConfiguration().tunnelingAudioSessionId;
     tunneling = tunnelingAudioSessionId != C.AUDIO_SESSION_ID_UNSET;
+    if (tunnelingAudioSessionId != oldTunnelingAudioSessionId) {
+      releaseCodec();
+    }
     eventDispatcher.enabled(decoderCounters);
     frameReleaseTimeHelper.enable();
   }

From a8d1f04f92e15b2832ba810bc4fb993312f23073 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 5 Nov 2018 10:54:24 -0800
Subject: [PATCH 165/832] Document error case for generateAudioSessionIdV21

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=220132865
---
 .../core/src/main/java/com/google/android/exoplayer2/C.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/C.java b/library/core/src/main/java/com/google/android/exoplayer2/C.java
index 6c72dd8d0a..fac9818d9e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/C.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/C.java
@@ -978,7 +978,10 @@ public final class C {
   }
 
   /**
-   * Returns a newly generated {@link android.media.AudioTrack} session identifier.
+   * Returns a newly generated audio session identifier, or {@link AudioManager#ERROR} if an error
+   * occurred in which case audio playback may fail.
+   *
+   * @see AudioManager#generateAudioSessionId()
    */
   @TargetApi(21)
   public static int generateAudioSessionIdV21(Context context) {

From 032883e1d280f1f4f659370007afdce858c065ae Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 6 Nov 2018 00:35:42 -0800
Subject: [PATCH 166/832] Work around non-empty EoS buffers with timestamp 0

Issue: #5045

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=220237752
---
 RELEASENOTES.md                               |  3 ++
 .../audio/MediaCodecAudioRenderer.java        | 30 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 569e2e555e..9f83a40e0f 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -7,6 +7,9 @@
   here ([#2826](https://github.com/google/ExoPlayer/issues/2826)).
 * Add options for controlling audio track selections to `DefaultTrackSelector`
   ([#3314](https://github.com/google/ExoPlayer/issues/3314)).
+* Work around an issue where a non-empty end-of-stream audio buffer would be
+  output with timestamp zero, causing the player position to jump backwards
+  ([#5045](https://github.com/google/ExoPlayer/issues/5045)).
 * Do not retry failed loads whose error is `FileNotFoundException`.
 
 ### 2.9.1 ###
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
index dbc25c8d42..d7206cd2c5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
@@ -23,6 +23,7 @@ import android.media.MediaCrypto;
 import android.media.MediaFormat;
 import android.media.audiofx.Virtualizer;
 import android.os.Handler;
+import android.support.annotation.CallSuper;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
@@ -85,6 +86,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
   private int codecMaxInputSize;
   private boolean passthroughEnabled;
   private boolean codecNeedsDiscardChannelsWorkaround;
+  private boolean codecNeedsEosBufferTimestampWorkaround;
   private android.media.MediaFormat passthroughMediaFormat;
   private @C.Encoding int pcmEncoding;
   private int channelCount;
@@ -344,6 +346,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
       float codecOperatingRate) {
     codecMaxInputSize = getCodecMaxInputSize(codecInfo, format, getStreamFormats());
     codecNeedsDiscardChannelsWorkaround = codecNeedsDiscardChannelsWorkaround(codecInfo.name);
+    codecNeedsEosBufferTimestampWorkaround = codecNeedsEosBufferTimestampWorkaround(codecInfo.name);
     passthroughEnabled = codecInfo.passthrough;
     String codecMimeType = passthroughEnabled ? MimeTypes.AUDIO_RAW : codecInfo.mimeType;
     MediaFormat mediaFormat =
@@ -599,9 +602,9 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
     lastInputTimeUs = Math.max(buffer.timeUs, lastInputTimeUs);
   }
 
+  @CallSuper
   @Override
   protected void onProcessedOutputBuffer(long presentationTimeUs) {
-    super.onProcessedOutputBuffer(presentationTimeUs);
     while (pendingStreamChangeCount != 0 && presentationTimeUs >= pendingStreamChangeTimesUs[0]) {
       audioSink.handleDiscontinuity();
       pendingStreamChangeCount--;
@@ -626,6 +629,13 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
       boolean shouldSkip,
       Format format)
       throws ExoPlaybackException {
+    if (codecNeedsEosBufferTimestampWorkaround
+        && bufferPresentationTimeUs == 0
+        && (bufferFlags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0
+        && lastInputTimeUs != C.TIME_UNSET) {
+      bufferPresentationTimeUs = lastInputTimeUs;
+    }
+
     if (passthroughEnabled && (bufferFlags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0) {
       // Discard output buffers from the passthrough (raw) decoder containing codec specific data.
       codec.releaseOutputBuffer(bufferIndex, false);
@@ -802,6 +812,24 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
         || Util.DEVICE.startsWith("heroqlte"));
   }
 
+  /**
+   * Returns whether the decoder may output a non-empty buffer with timestamp 0 as the end of stream
+   * buffer.
+   *
+   * <p>See <a href="https://github.com/google/ExoPlayer/issues/5045">GitHub issue #5045</a>.
+   */
+  private static boolean codecNeedsEosBufferTimestampWorkaround(String codecName) {
+    return Util.SDK_INT < 21
+        && "OMX.SEC.mp3.dec".equals(codecName)
+        && "samsung".equals(Util.MANUFACTURER)
+        && (Util.DEVICE.startsWith("baffin")
+            || Util.DEVICE.startsWith("grand")
+            || Util.DEVICE.startsWith("fortuna")
+            || Util.DEVICE.startsWith("gprimelte")
+            || Util.DEVICE.startsWith("j2y18lte")
+            || Util.DEVICE.startsWith("ms01"));
+  }
+
   private final class AudioSinkListener implements AudioSink.Listener {
 
     @Override

From 254a586e27fa800f2fd53e6b30bd4f84525bcfc1 Mon Sep 17 00:00:00 2001
From: Arnold Szabo <szaboaarnold@gmail.com>
Date: Tue, 6 Nov 2018 21:25:08 +0200
Subject: [PATCH 167/832] #1583 - Parsing base64 encoded image data from
 metadata

---
 demos/main/src/main/assets/media.exolist.json |  5 ++
 .../exoplayer2/text/ttml/TtmlDecoder.java     | 34 ++++++++--
 .../exoplayer2/text/ttml/TtmlNode.java        | 63 ++++++++++++++++---
 .../exoplayer2/text/ttml/TtmlSubtitle.java    |  7 ++-
 4 files changed, 95 insertions(+), 14 deletions(-)

diff --git a/demos/main/src/main/assets/media.exolist.json b/demos/main/src/main/assets/media.exolist.json
index c2acf3990b..74b57625d1 100644
--- a/demos/main/src/main/assets/media.exolist.json
+++ b/demos/main/src/main/assets/media.exolist.json
@@ -2,6 +2,11 @@
   {
     "name": "YouTube DASH",
     "samples": [
+      {
+        "name": "DVB Image sub",
+        "uri": "https://livesim.dashif.org/dash/vod/testpic_2s/img_subs.mpd",
+        "extension": "mpd"
+      },
       {
         "name": "Google Glass (MP4,H264)",
         "uri": "https://www.youtube.com/api/manifest/dash/id/bf5bb2419360daf1/source/youtube?as=fmp4_audio_clear,fmp4_sd_hd_clear&sparams=ip,ipbits,expire,source,id,as&ip=0.0.0.0&ipbits=0&expire=19000000000&signature=51AF5F39AB0CEC3E5497CD9C900EBFEAECCCB5C7.8506521BFC350652163895D4C26DEE124209AA9E&key=ik0",
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java
index 2e868077a5..8be5af5a3f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java
@@ -68,6 +68,8 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
   private static final String ATTR_END = "end";
   private static final String ATTR_STYLE = "style";
   private static final String ATTR_REGION = "region";
+  private static final String ATTR_IMAGE = "backgroundImage";
+
 
   private static final Pattern CLOCK_TIME =
       Pattern.compile("^([0-9][0-9]+):([0-9][0-9]):([0-9][0-9])"
@@ -105,6 +107,7 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
       XmlPullParser xmlParser = xmlParserFactory.newPullParser();
       Map<String, TtmlStyle> globalStyles = new HashMap<>();
       Map<String, TtmlRegion> regionMap = new HashMap<>();
+      Map<String, String> imageMap = new HashMap<>();
       regionMap.put(TtmlNode.ANONYMOUS_REGION_ID, new TtmlRegion(null));
       ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes, 0, length);
       xmlParser.setInput(inputStream, null);
@@ -127,7 +130,7 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
               Log.i(TAG, "Ignoring unsupported tag: " + xmlParser.getName());
               unsupportedNodeDepth++;
             } else if (TtmlNode.TAG_HEAD.equals(name)) {
-              parseHeader(xmlParser, globalStyles, regionMap, cellResolution);
+              parseHeader(xmlParser, globalStyles, regionMap, cellResolution, imageMap);
             } else {
               try {
                 TtmlNode node = parseNode(xmlParser, parent, regionMap, frameAndTickRate);
@@ -145,7 +148,7 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
             parent.addChild(TtmlNode.buildTextNode(xmlParser.getText()));
           } else if (eventType == XmlPullParser.END_TAG) {
             if (xmlParser.getName().equals(TtmlNode.TAG_TT)) {
-              ttmlSubtitle = new TtmlSubtitle(nodeStack.peek(), globalStyles, regionMap);
+              ttmlSubtitle = new TtmlSubtitle(nodeStack.peek(), globalStyles, regionMap, imageMap);
             }
             nodeStack.pop();
           }
@@ -230,7 +233,8 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
       XmlPullParser xmlParser,
       Map<String, TtmlStyle> globalStyles,
       Map<String, TtmlRegion> globalRegions,
-      CellResolution cellResolution)
+      CellResolution cellResolution,
+      Map<String, String> imageMap)
       throws IOException, XmlPullParserException {
     do {
       xmlParser.next();
@@ -250,11 +254,29 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
         if (ttmlRegion != null) {
           globalRegions.put(ttmlRegion.id, ttmlRegion);
         }
+      } else if(XmlPullParserUtil.isStartTag(xmlParser, TtmlNode.TAG_METADATA)){
+        parseMetaData(xmlParser, imageMap);
       }
+
     } while (!XmlPullParserUtil.isEndTag(xmlParser, TtmlNode.TAG_HEAD));
     return globalStyles;
   }
 
+  public void parseMetaData(XmlPullParser xmlParser, Map<String, String> imageMap) throws IOException, XmlPullParserException {
+    do {
+      xmlParser.next();
+      if (XmlPullParserUtil.isStartTag(xmlParser, TtmlNode.TAG_SMPTE_IMAGE)) {
+        for (int i = 0; i < xmlParser.getAttributeCount(); i++) {
+          String id = XmlPullParserUtil.getAttributeValue(xmlParser, "id");
+          if(id != null){
+            String base64 = xmlParser.nextText();
+            imageMap.put(id, base64);
+          }
+        }
+      }
+    } while (!XmlPullParserUtil.isEndTag(xmlParser, TtmlNode.TAG_METADATA));
+  }
+
   /**
    * Parses a region declaration.
    *
@@ -457,6 +479,7 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
     long startTime = C.TIME_UNSET;
     long endTime = C.TIME_UNSET;
     String regionId = TtmlNode.ANONYMOUS_REGION_ID;
+    String imageId = "";
     String[] styleIds = null;
     int attributeCount = parser.getAttributeCount();
     TtmlStyle style = parseStyleAttributes(parser, null);
@@ -487,6 +510,9 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
             regionId = value;
           }
           break;
+        case ATTR_IMAGE:
+          imageId = value.substring(1);
+          break;
         default:
           // Do nothing.
           break;
@@ -509,7 +535,7 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
         endTime = parent.endTimeUs;
       }
     }
-    return TtmlNode.buildNode(parser.getName(), startTime, endTime, style, styleIds, regionId);
+    return TtmlNode.buildNode(parser.getName(), startTime, endTime, style, styleIds, regionId, imageId);
   }
 
   private static boolean isSupportedTag(String tag) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
index c8b9a59de4..ccea61c498 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
@@ -15,10 +15,16 @@
  */
 package com.google.android.exoplayer2.text.ttml;
 
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.text.SpannableStringBuilder;
+import android.util.Base64;
+import android.util.Pair;
+
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.text.Cue;
 import com.google.android.exoplayer2.util.Assertions;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -44,9 +50,9 @@ import java.util.TreeSet;
   public static final String TAG_LAYOUT = "layout";
   public static final String TAG_REGION = "region";
   public static final String TAG_METADATA = "metadata";
-  public static final String TAG_SMPTE_IMAGE = "smpte:image";
-  public static final String TAG_SMPTE_DATA = "smpte:data";
-  public static final String TAG_SMPTE_INFORMATION = "smpte:information";
+  public static final String TAG_SMPTE_IMAGE = "image";
+  public static final String TAG_SMPTE_DATA = "data";
+  public static final String TAG_SMPTE_INFORMATION = "information";
 
   public static final String ANONYMOUS_REGION_ID = "";
   public static final String ATTR_ID = "id";
@@ -82,6 +88,7 @@ import java.util.TreeSet;
   public final long endTimeUs;
   public final TtmlStyle style;
   public final String regionId;
+  public final String imageId;
 
   private final String[] styleIds;
   private final HashMap<String, Integer> nodeStartsByRegion;
@@ -91,18 +98,19 @@ import java.util.TreeSet;
 
   public static TtmlNode buildTextNode(String text) {
     return new TtmlNode(null, TtmlRenderUtil.applyTextElementSpacePolicy(text), C.TIME_UNSET,
-        C.TIME_UNSET, null, null, ANONYMOUS_REGION_ID);
+        C.TIME_UNSET, null, null, ANONYMOUS_REGION_ID, null);
   }
 
   public static TtmlNode buildNode(String tag, long startTimeUs, long endTimeUs,
-      TtmlStyle style, String[] styleIds, String regionId) {
-    return new TtmlNode(tag, null, startTimeUs, endTimeUs, style, styleIds, regionId);
+                                   TtmlStyle style, String[] styleIds, String regionId, String imageId) {
+    return new TtmlNode(tag, null, startTimeUs, endTimeUs, style, styleIds, regionId, imageId);
   }
 
   private TtmlNode(String tag, String text, long startTimeUs, long endTimeUs,
-      TtmlStyle style, String[] styleIds, String regionId) {
+                   TtmlStyle style, String[] styleIds, String regionId, String imageId) {
     this.tag = tag;
     this.text = text;
+    this.imageId = imageId;
     this.style = style;
     this.styleIds = styleIds;
     this.isTextNode = text != null;
@@ -172,11 +180,37 @@ import java.util.TreeSet;
   }
 
   public List<Cue> getCues(long timeUs, Map<String, TtmlStyle> globalStyles,
-      Map<String, TtmlRegion> regionMap) {
+                           Map<String, TtmlRegion> regionMap, Map<String, String> imageMap) {
+
     TreeMap<String, SpannableStringBuilder> regionOutputs = new TreeMap<>();
+    List<Pair<String, String>> regionImageList = new ArrayList<>();
+
     traverseForText(timeUs, false, regionId, regionOutputs);
     traverseForStyle(timeUs, globalStyles, regionOutputs);
+    traverseForImage(timeUs, regionId, regionImageList);
+
     List<Cue> cues = new ArrayList<>();
+
+    // Create text based cues
+    for (Pair<String, String> regionImagePair : regionImageList) {
+      String base64 = imageMap.get(regionImagePair.second);
+      byte[] decodedString = Base64.decode(base64, Base64.DEFAULT);
+      Bitmap decodedByte = BitmapFactory.decodeByteArray(decodedString, 0, decodedString.length);
+      TtmlRegion region = regionMap.get(regionImagePair.first);
+
+      cues.add(
+          new Cue(decodedByte,
+              region.position,
+              Cue.TYPE_UNSET,
+              region.line,
+              region.lineAnchor,
+              region.width,
+              Cue.DIMEN_UNSET
+          )
+      );
+    }
+
+    // Create image based cues
     for (Entry<String, SpannableStringBuilder> entry : regionOutputs.entrySet()) {
       TtmlRegion region = regionMap.get(entry.getKey());
       cues.add(
@@ -195,6 +229,19 @@ import java.util.TreeSet;
     return cues;
   }
 
+  private void traverseForImage(long timeUs, String inheritedRegion, List<Pair<String, String>> regionImageList) {
+      // TODO isActive needed?
+
+    String resolvedRegionId = ANONYMOUS_REGION_ID.equals(regionId) ? inheritedRegion : regionId;
+    if (TAG_DIV.equals(tag) && imageId != null) {
+      regionImageList.add(new Pair<>(resolvedRegionId, imageId));
+    }
+
+    for (int i = 0; i < getChildCount(); ++i) {
+      getChild(i).traverseForImage(timeUs, resolvedRegionId, regionImageList);
+    }
+  }
+
   private void traverseForText(
       long timeUs,
       boolean descendsPNode,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java
index 50916aa841..c92fa876f2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java
@@ -32,11 +32,14 @@ import java.util.Map;
   private final long[] eventTimesUs;
   private final Map<String, TtmlStyle> globalStyles;
   private final Map<String, TtmlRegion> regionMap;
+  private final Map<String, String> imageMap;
+
 
   public TtmlSubtitle(TtmlNode root, Map<String, TtmlStyle> globalStyles,
-      Map<String, TtmlRegion> regionMap) {
+      Map<String, TtmlRegion> regionMap, Map<String, String> imageMap) {
     this.root = root;
     this.regionMap = regionMap;
+    this.imageMap = imageMap;
     this.globalStyles =
         globalStyles != null ? Collections.unmodifiableMap(globalStyles) : Collections.emptyMap();
     this.eventTimesUs = root.getEventTimesUs();
@@ -65,7 +68,7 @@ import java.util.Map;
 
   @Override
   public List<Cue> getCues(long timeUs) {
-    return root.getCues(timeUs, globalStyles, regionMap);
+    return root.getCues(timeUs, globalStyles, regionMap, imageMap);
   }
 
   /* @VisibleForTesting */

From eafca5402a9595d4ea160df732f72c02f7b34722 Mon Sep 17 00:00:00 2001
From: Arnold Szabo <szaboaarnold@gmail.com>
Date: Tue, 6 Nov 2018 21:54:34 +0200
Subject: [PATCH 168/832] #1583 - Correcting comment in TtmlNode#getCues()

---
 .../com/google/android/exoplayer2/text/ttml/TtmlNode.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
index ccea61c498..6b2a524e49 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
@@ -191,7 +191,7 @@ import java.util.TreeSet;
 
     List<Cue> cues = new ArrayList<>();
 
-    // Create text based cues
+    // Create image based cues
     for (Pair<String, String> regionImagePair : regionImageList) {
       String base64 = imageMap.get(regionImagePair.second);
       byte[] decodedString = Base64.decode(base64, Base64.DEFAULT);
@@ -210,7 +210,7 @@ import java.util.TreeSet;
       );
     }
 
-    // Create image based cues
+    // Create text based cues
     for (Entry<String, SpannableStringBuilder> entry : regionOutputs.entrySet()) {
       TtmlRegion region = regionMap.get(entry.getKey());
       cues.add(

From bc5e12013b793b9772b31cfdfbfa24e0d0e7d9fa Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 6 Nov 2018 06:03:59 -0800
Subject: [PATCH 169/832] Remove executable bit from some resources

Copybara propagates this bit on the files, so removing it avoids some
unnecessary changes in the first migrated commit.

Also losslessly optimize two PNG files.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=220268951
---
 .../main/res/drawable-xxhdpi/ic_download.png    | Bin 303 -> 261 bytes
 .../main/res/drawable-xxxhdpi/ic_download.png   | Bin 304 -> 263 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/demos/main/src/main/res/drawable-xxhdpi/ic_download.png b/demos/main/src/main/res/drawable-xxhdpi/ic_download.png
index f02715177ad64ccd13ae3b10298f099f692ae725..4e04a30198d72eedd3a749158ce4fc091a2b0f8b 100644
GIT binary patch
delta 233
zcmZ3_)XFqLrCun&C&ZP3f#E+YunSsi1r%i~3GxeOaA^3ia3H(HS_UXG$J50zq=GR?
z;#h)650j#*$^wrqW~s?42__1++_v^+NnbTvl^Zg9vXBUia<*}6=c)%6j-~Kql=t~E
zurNq)IH?J4YJ9hUHgm^y?VWZtFOm-I47ZRz9yitSi9oXwo1;&c1dE|&lE9HA9gYH%
zmDmD#x+Gi-HIf95F6eL+0jj_ds63Wdb#doS_w@hf#^!%2o==z_Tf7eFPzFy|KbLh*
G2~7ZayIVp4

delta 276
zcmZo=TF*2=rCv0^C&ZP3f#E*}@Hn5#0+e7c3GxeOaA;uouW%rGQBx#P=#Zz2V@L(#
z+bbJ$j|2!XUtE1qHe!*qg0%pPc!BAT|59@_0v05uN&JX-#xMMKU)tu@?;G!ao7uki
zlfm5WvWMGvrOn>N->BaGtvLOD{q3##33ji`5(0zWJ9ZxLaJ6+iW9z2#$}s7jVNzhf
zU~#`-cU8}f>Yj)z$w%%aA6X=){7g<+?5l)f@f-cRPIU3B5=Pf0Hmx{1W9QKst}@wY
zWU_T0MI_&|e#{#^<K-IbHr=DonA&)wJO45XPP94sPhFQc73d!ZPgg&ebxsLQ0R8QN
A!T<mO

diff --git a/demos/main/src/main/res/drawable-xxxhdpi/ic_download.png b/demos/main/src/main/res/drawable-xxxhdpi/ic_download.png
index 6602791545ff97a485042c4609a729757922b6c3..f9bfb5edba7fdff1e63a71c0dfaab6ae5dc2a9a9 100644
GIT binary patch
literal 263
zcmeAS@N?(olHy`uVBq!ia0vp^6F``W8A#63;L-+CoB=)|u0Z-f7!+45O$Kt9OM?7@
z8U8o4yxP?R<gW5`aSW+oe0z>DjWv+R;i913rU`GJA70J0Yf7HdZ(Wfyo{Xm^Fh6({
z_nPtA>pxZT^|vw>_nO_(IRD_a*ip%vc=Os1g?FzWTps**Qn22_*r1(DN<1H4T7bql
vcxeelge1npOP|+Xm)v7s<?yBdT9p0kwiwT6_X?f?UCrR>>gTe~DWM4f1o3xI

literal 304
zcmeAS@N?(olHy`uVBq!ia0vp^6F``W8A#63;L-+CJOMr-u0Z-f3|JhnUIFB@lmz(&
zGyG?0c(D0mIFNtd)5S5Qg7NL8g}Kd%Jgyff^!->F<iP&YPH`KLZP)Z4%QZARiYk__
zsQb~teeW&rw%fIH?%#b}xxM1v<Nb?WyTx=@JwErH`_$ueUz?Il=9_GN!5wm3C7??$
zpvQBOnP-Sv=OvXusxo;z7iCOx2~_D+(huC>`o2}}_}t%%${nijyLSKM`^zAAsKnfb
Sjb}E{YYd*QelF{r5}E)O=6ezV


From abb7d8a2d501deb6c8537ac64b78301b793de85a Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 6 Nov 2018 07:26:27 -0800
Subject: [PATCH 170/832] Include UI module tests in open source push

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=220277660
---
 library/ui/src/test/AndroidManifest.xml       |  18 +++
 .../ui/spherical/CanvasRendererTest.java      |  70 ++++++++
 .../ui/spherical/TouchTrackerTest.java        | 150 ++++++++++++++++++
 .../src/test/resources/robolectric.properties |   1 +
 4 files changed, 239 insertions(+)
 create mode 100644 library/ui/src/test/AndroidManifest.xml
 create mode 100644 library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/CanvasRendererTest.java
 create mode 100644 library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/TouchTrackerTest.java
 create mode 100644 library/ui/src/test/resources/robolectric.properties

diff --git a/library/ui/src/test/AndroidManifest.xml b/library/ui/src/test/AndroidManifest.xml
new file mode 100644
index 0000000000..1a749dc82c
--- /dev/null
+++ b/library/ui/src/test/AndroidManifest.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<manifest package="com.google.android.exoplayer2.source.ui.test" />
diff --git a/library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/CanvasRendererTest.java b/library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/CanvasRendererTest.java
new file mode 100644
index 0000000000..d0503d4a93
--- /dev/null
+++ b/library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/CanvasRendererTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.ui.spherical;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.graphics.PointF;
+import android.support.annotation.Nullable;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link CanvasRenderer}. */
+@RunWith(RobolectricTestRunner.class)
+public class CanvasRendererTest {
+
+  private static final float JUST_BELOW_45_DEGREES = (float) (Math.PI / 4 - 1.0E-08);
+  private static final float JUST_ABOVE_45_DEGREES = (float) (Math.PI / 4 + 1.0E-08);
+  private static final float TOLERANCE = .00001f;
+
+  @Test
+  public void testClicksOnCanvas() {
+    assertClick(translateClick(JUST_BELOW_45_DEGREES, JUST_BELOW_45_DEGREES), 0, 0);
+    assertClick(translateClick(JUST_BELOW_45_DEGREES, -JUST_BELOW_45_DEGREES), 0, 100);
+    assertClick(translateClick(0, 0), 50, 50);
+    assertClick(translateClick(-JUST_BELOW_45_DEGREES, JUST_BELOW_45_DEGREES), 100, 0);
+    assertClick(translateClick(-JUST_BELOW_45_DEGREES, -JUST_BELOW_45_DEGREES), 100, 100);
+  }
+
+  @Test
+  public void testClicksNotOnCanvas() {
+    assertThat(translateClick(JUST_ABOVE_45_DEGREES, JUST_ABOVE_45_DEGREES)).isNull();
+    assertThat(translateClick(JUST_ABOVE_45_DEGREES, -JUST_ABOVE_45_DEGREES)).isNull();
+    assertThat(translateClick(-JUST_ABOVE_45_DEGREES, JUST_ABOVE_45_DEGREES)).isNull();
+    assertThat(translateClick(-JUST_ABOVE_45_DEGREES, -JUST_ABOVE_45_DEGREES)).isNull();
+    assertThat(translateClick((float) (Math.PI / 2), 0)).isNull();
+    assertThat(translateClick(0, (float) Math.PI)).isNull();
+  }
+
+  private static PointF translateClick(float yaw, float pitch) {
+    return CanvasRenderer.internalTranslateClick(
+        yaw,
+        pitch,
+        /* xUnit= */ -1,
+        /* yUnit= */ -1,
+        /* widthUnit= */ 2,
+        /* heightUnit= */ 2,
+        /* widthPixel= */ 100,
+        /* heightPixel= */ 100);
+  }
+
+  private static void assertClick(@Nullable PointF actual, float expectedX, float expectedY) {
+    assertThat(actual).isNotNull();
+    assertThat(actual.x).isWithin(TOLERANCE).of(expectedX);
+    assertThat(actual.y).isWithin(TOLERANCE).of(expectedY);
+  }
+}
diff --git a/library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/TouchTrackerTest.java b/library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/TouchTrackerTest.java
new file mode 100644
index 0000000000..337fb4c593
--- /dev/null
+++ b/library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/TouchTrackerTest.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.ui.spherical;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.view.MotionEvent;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+/** Tests for {@link TouchTracker}. */
+@RunWith(RobolectricTestRunner.class)
+public class TouchTrackerTest {
+  private static final float EPSILON = 0.00001f;
+  private static final int SWIPE_PX = 100;
+  private static final float PX_PER_DEGREES = 25;
+
+  private TouchTracker tracker;
+  private float yaw;
+  private float pitch;
+  private float[] dummyMatrix;
+
+  private static void swipe(TouchTracker tracker, float x0, float y0, float x1, float y1) {
+    tracker.onTouch(null, MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, x0, y0, 0));
+    tracker.onTouch(null, MotionEvent.obtain(0, 0, MotionEvent.ACTION_MOVE, x1, y1, 0));
+    tracker.onTouch(null, MotionEvent.obtain(0, 0, MotionEvent.ACTION_UP, x1, y1, 0));
+  }
+
+  @Before
+  public void setUp() {
+    Context context = RuntimeEnvironment.application;
+    tracker =
+        new TouchTracker(
+            context,
+            scrollOffsetDegrees -> {
+              pitch = scrollOffsetDegrees.y;
+              yaw = scrollOffsetDegrees.x;
+            },
+            PX_PER_DEGREES);
+    dummyMatrix = new float[16];
+    tracker.onOrientationChange(dummyMatrix, 0);
+  }
+
+  @Test
+  public void testTap() {
+    // Tap is a noop.
+    swipe(tracker, 0, 0, 0, 0);
+    assertThat(yaw).isWithin(EPSILON).of(0);
+    assertThat(pitch).isWithin(EPSILON).of(0);
+  }
+
+  @Test
+  public void testBasicYaw() {
+    swipe(tracker, 0, 0, SWIPE_PX, 0);
+    assertThat(yaw).isWithin(EPSILON).of(-SWIPE_PX / PX_PER_DEGREES);
+    assertThat(pitch).isWithin(EPSILON).of(0);
+  }
+
+  @Test
+  public void testBigYaw() {
+    swipe(tracker, 0, 0, -10 * SWIPE_PX, 0);
+    assertThat(yaw).isEqualTo(10 * SWIPE_PX / PX_PER_DEGREES);
+    assertThat(pitch).isWithin(EPSILON).of(0);
+  }
+
+  @Test
+  public void testYawUnaffectedByPitch() {
+    swipe(tracker, 0, 0, 0, SWIPE_PX);
+    assertThat(yaw).isWithin(EPSILON).of(0);
+
+    swipe(tracker, 0, 0, SWIPE_PX, SWIPE_PX);
+    assertThat(yaw).isWithin(EPSILON).of(-SWIPE_PX / PX_PER_DEGREES);
+  }
+
+  @Test
+  public void testBasicPitch() {
+    swipe(tracker, 0, 0, 0, SWIPE_PX);
+    assertThat(yaw).isWithin(EPSILON).of(0);
+    assertThat(pitch).isWithin(EPSILON).of(SWIPE_PX / PX_PER_DEGREES);
+  }
+
+  @Test
+  public void testPitchClipped() {
+    // Big reverse pitch should be clipped.
+    swipe(tracker, 0, 0, 0, -20 * SWIPE_PX);
+    assertThat(yaw).isWithin(EPSILON).of(0);
+    assertThat(pitch).isEqualTo(-TouchTracker.MAX_PITCH_DEGREES);
+
+    // Big forward pitch should be clipped.
+    swipe(tracker, 0, 0, 0, 50 * SWIPE_PX);
+    assertThat(yaw).isWithin(EPSILON).of(0);
+    assertThat(pitch).isEqualTo(TouchTracker.MAX_PITCH_DEGREES);
+  }
+
+  @Test
+  public void testWithRoll90() {
+    tracker.onOrientationChange(dummyMatrix, (float) Math.toRadians(90));
+
+    // Y-axis should now control yaw.
+    swipe(tracker, 0, 0, 0, 2 * SWIPE_PX);
+    assertThat(yaw).isWithin(EPSILON).of(-2 * SWIPE_PX / PX_PER_DEGREES);
+
+    // X-axis should now control reverse pitch.
+    swipe(tracker, 0, 0, -3 * SWIPE_PX, 0);
+    assertThat(pitch).isWithin(EPSILON).of(3 * SWIPE_PX / PX_PER_DEGREES);
+  }
+
+  @Test
+  public void testWithRoll180() {
+    tracker.onOrientationChange(dummyMatrix, (float) Math.toRadians(180));
+
+    // X-axis should now control reverse yaw.
+    swipe(tracker, 0, 0, -2 * SWIPE_PX, 0);
+    assertThat(yaw).isWithin(EPSILON).of(-2 * SWIPE_PX / PX_PER_DEGREES);
+
+    // Y-axis should now control reverse pitch.
+    swipe(tracker, 0, 0, 0, -3 * SWIPE_PX);
+    assertThat(pitch).isWithin(EPSILON).of(3 * SWIPE_PX / PX_PER_DEGREES);
+  }
+
+  @Test
+  public void testWithRoll270() {
+    tracker.onOrientationChange(dummyMatrix, (float) Math.toRadians(270));
+
+    // Y-axis should now control reverse yaw.
+    swipe(tracker, 0, 0, 0, -2 * SWIPE_PX);
+    assertThat(yaw).isWithin(EPSILON).of(-2 * SWIPE_PX / PX_PER_DEGREES);
+
+    // X-axis should now control pitch.
+    swipe(tracker, 0, 0, 3 * SWIPE_PX, 0);
+    assertThat(pitch).isWithin(EPSILON).of(3 * SWIPE_PX / PX_PER_DEGREES);
+  }
+}
diff --git a/library/ui/src/test/resources/robolectric.properties b/library/ui/src/test/resources/robolectric.properties
new file mode 100644
index 0000000000..2f3210368e
--- /dev/null
+++ b/library/ui/src/test/resources/robolectric.properties
@@ -0,0 +1 @@
+manifest=src/test/AndroidManifest.xml

From 0c4d0ee1c11f0649ab55b8cbb5fda61d923b86f5 Mon Sep 17 00:00:00 2001
From: borrelli <borrelli@google.com>
Date: Tue, 6 Nov 2018 11:18:28 -0800
Subject: [PATCH 171/832] Fix for #5055 - Cannot disable audio focus after
 enabled.

This fixes an issue where disabling audio focus handling
while audio focus is held would not release audio focus.

A new test was added for this situation.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=220316866
---
 RELEASENOTES.md                               |  2 ++
 .../exoplayer2/audio/AudioFocusManager.java   |  4 ---
 .../audio/AudioFocusManagerTest.java          | 33 ++++++++++++++++++-
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 9f83a40e0f..02876af90c 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,6 +2,8 @@
 
 ### dev-v2 (not yet released) ###
 
+* Fix issue where audio focus handling could not be disabled after enabling
+  it ([#5055](https://github.com/google/ExoPlayer/issues/5055)).
 * Support for playing spherical videos on Daydream.
 * Improve decoder re-use between playbacks. TODO: Write and link a blog post
   here ([#2826](https://github.com/google/ExoPlayer/issues/2826)).
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java
index 39422c2873..09fd1f3f02 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java
@@ -141,10 +141,6 @@ public final class AudioFocusManager {
    */
   public @PlayerCommand int setAudioAttributes(
       @Nullable AudioAttributes audioAttributes, boolean playWhenReady, int playerState) {
-    if (audioAttributes == null) {
-      return PLAYER_COMMAND_PLAY_WHEN_READY;
-    }
-
     if (!Util.areEqual(this.audioAttributes, audioAttributes)) {
       this.audioAttributes = audioAttributes;
       focusGain = convertAudioAttributesToFocusGain(audioAttributes);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/audio/AudioFocusManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/audio/AudioFocusManagerTest.java
index 1cf812559c..b175828d44 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/audio/AudioFocusManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/audio/AudioFocusManagerTest.java
@@ -58,7 +58,38 @@ public class AudioFocusManagerTest {
     assertThat(
             audioFocusManager.setAudioAttributes(
                 /* audioAttributes= */ null, /* playWhenReady= */ false, Player.STATE_IDLE))
+        .isEqualTo(PLAYER_COMMAND_WAIT_FOR_CALLBACK);
+    assertThat(
+            audioFocusManager.setAudioAttributes(
+                /* audioAttributes= */ null, /* playWhenReady= */ true, Player.STATE_READY))
         .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
+    ShadowAudioManager.AudioFocusRequest request =
+        Shadows.shadowOf(audioManager).getLastAudioFocusRequest();
+    assertThat(request).isNull();
+  }
+
+  @Test
+  public void setAudioAttributes_withNullUsage_releasesAudioFocus() {
+    // Create attributes and request audio focus.
+    AudioAttributes media = new AudioAttributes.Builder().setUsage(C.USAGE_MEDIA).build();
+    Shadows.shadowOf(audioManager)
+        .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
+    assertThat(
+            audioFocusManager.setAudioAttributes(
+                media, /* playWhenReady= */ true, Player.STATE_READY))
+        .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
+    ShadowAudioManager.AudioFocusRequest request =
+        Shadows.shadowOf(audioManager).getLastAudioFocusRequest();
+    assertThat(request.durationHint).isEqualTo(AudioManager.AUDIOFOCUS_GAIN);
+
+    // Ensure that setting null audio attributes with audio focus releases audio focus.
+    assertThat(
+            audioFocusManager.setAudioAttributes(
+                /* audioAttributes= */ null, /* playWhenReady= */ true, Player.STATE_READY))
+        .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
+    AudioManager.OnAudioFocusChangeListener lastRequest =
+        Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusListener();
+    assertThat(lastRequest).isNotNull();
   }
 
   @Test
@@ -296,7 +327,7 @@ public class AudioFocusManagerTest {
     assertThat(
             audioFocusManager.setAudioAttributes(
                 /* audioAttributes= */ null, /* playWhenReady= */ false, Player.STATE_READY))
-        .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
+        .isEqualTo(PLAYER_COMMAND_DO_NOT_PLAY);
     assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusListener()).isNull();
     ShadowAudioManager.AudioFocusRequest request =
         Shadows.shadowOf(audioManager).getLastAudioFocusRequest();

From d7e23f826b62f167ba27c1c9f8f0b0e83d215621 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Tue, 6 Nov 2018 11:52:16 -0800
Subject: [PATCH 172/832] Fix package visibility comments

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=220323772
---
 .../com/google/android/exoplayer2/extractor/mp4/Atom.java   | 2 +-
 .../android/exoplayer2/upstream/cache/CachedContent.java    | 6 ++----
 .../exoplayer2/upstream/cache/CachedContentIndex.java       | 2 +-
 .../android/exoplayer2/upstream/cache/SimpleCache.java      | 2 +-
 .../android/exoplayer2/upstream/cache/SimpleCacheSpan.java  | 6 ++----
 .../android/exoplayer2/source/dash/PlayerEmsgHandler.java   | 2 +-
 .../android/exoplayer2/ui/spherical/CanvasRenderer.java     | 2 +-
 7 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
index 3b85c3d2e3..a20195139f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
@@ -23,7 +23,7 @@ import java.util.Arrays;
 import java.util.List;
 
 @SuppressWarnings("ConstantField")
-/* package*/ abstract class Atom {
+/* package */ abstract class Atom {
 
   /**
    * Size of an atom header, in bytes.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java
index 97a7828a22..4d15de5932 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java
@@ -23,10 +23,8 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.TreeSet;
 
-/**
- * Defines the cached content for a single stream.
- */
-/*package*/ final class CachedContent {
+/** Defines the cached content for a single stream. */
+/* package */ final class CachedContent {
 
   private static final int VERSION_METADATA_INTRODUCED = 2;
   private static final int VERSION_MAX = Integer.MAX_VALUE;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
index 3bcfac5053..4220f6c5b4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
@@ -43,7 +43,7 @@ import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
 /** Maintains the index of cached content. */
-/*package*/ class CachedContentIndex {
+/* package */ class CachedContentIndex {
 
   public static final String FILE_NAME = "cached_content_index.exi";
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index ca2983c891..1fd6dc63bc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -120,7 +120,7 @@ public final class SimpleCache implements Cache {
    * @param evictor The evictor to be used.
    * @param index The CachedContentIndex to be used.
    */
-  /*package*/ SimpleCache(File cacheDir, CacheEvictor evictor, CachedContentIndex index) {
+  /* package */ SimpleCache(File cacheDir, CacheEvictor evictor, CachedContentIndex index) {
     if (!lockFolder(cacheDir)) {
       throw new IllegalStateException("Another SimpleCache instance uses the folder: " + cacheDir);
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
index e12d876ce1..82e9f03f4f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
@@ -23,10 +23,8 @@ import java.io.File;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-/**
- * This class stores span metadata in filename.
- */
-/*package*/ final class SimpleCacheSpan extends CacheSpan {
+/** This class stores span metadata in filename. */
+/* package */ final class SimpleCacheSpan extends CacheSpan {
 
   private static final String SUFFIX = ".v3.exo";
   private static final Pattern CACHE_FILE_PATTERN_V1 = Pattern.compile(
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/PlayerEmsgHandler.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/PlayerEmsgHandler.java
index e657d126bf..46d70ca714 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/PlayerEmsgHandler.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/PlayerEmsgHandler.java
@@ -126,7 +126,7 @@ public final class PlayerEmsgHandler implements Handler.Callback {
     removePreviouslyExpiredManifestPublishTimeValues();
   }
 
-  /* package*/ boolean maybeRefreshManifestBeforeLoadingNextChunk(long presentationPositionUs) {
+  /* package */ boolean maybeRefreshManifestBeforeLoadingNextChunk(long presentationPositionUs) {
     if (!manifest.dynamic) {
       return false;
     }
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java
index 247de5a3d0..5538390d3b 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java
@@ -271,7 +271,7 @@ public final class CanvasRenderer {
   }
 
   @Nullable
-  /*package*/ static PointF internalTranslateClick(
+  /* package */ static PointF internalTranslateClick(
       float yaw,
       float pitch,
       float xUnit,

From 7a114cb3746f832c671112aebcba4b1faebce036 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 7 Nov 2018 02:29:53 -0800
Subject: [PATCH 173/832] Uncomment VisibleForTesting annotations

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=220432564
---
 .../exoplayer2/ext/ima/ImaAdsLoader.java      |  5 ++--
 .../extractor/ogg/DefaultOggSeeker.java       | 27 +++++++++----------
 .../exoplayer2/extractor/ogg/OggPacket.java   |  7 ++---
 .../extractor/ogg/VorbisReader.java           | 15 ++++++-----
 .../exoplayer2/text/ttml/TtmlSubtitle.java    |  5 ++--
 .../upstream/cache/CachedContentIndex.java    |  3 ++-
 .../ui/spherical/SphericalSurfaceView.java    |  3 ++-
 .../exoplayer2/ui/spherical/TouchTracker.java |  3 ++-
 8 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
index 3be28e1b84..40950bceef 100644
--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
+++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
@@ -21,6 +21,7 @@ import android.os.Looper;
 import android.os.SystemClock;
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
 import android.view.ViewGroup;
 import com.google.ads.interactivemedia.v3.api.Ad;
 import com.google.ads.interactivemedia.v3.api.AdDisplayContainer;
@@ -206,7 +207,7 @@ public final class ImaAdsLoader
       return this;
     }
 
-    // @VisibleForTesting
+    @VisibleForTesting
     /* package */ Builder setImaFactory(ImaFactory imaFactory) {
       this.imaFactory = Assertions.checkNotNull(imaFactory);
       return this;
@@ -1346,7 +1347,7 @@ public final class ImaAdsLoader
   }
 
   /** Factory for objects provided by the IMA SDK. */
-  // @VisibleForTesting
+  @VisibleForTesting
   /* package */ interface ImaFactory {
     /** @see ImaSdkSettings */
     ImaSdkSettings createImaSdkSettings();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java
index 93ed00a05b..d251dc1d5d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor.ogg;
 
+import android.support.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.extractor.SeekMap;
@@ -26,10 +27,8 @@ import java.io.IOException;
 /** Seeks in an Ogg stream. */
 /* package */ final class DefaultOggSeeker implements OggSeeker {
 
-  //@VisibleForTesting
-  public static final int MATCH_RANGE = 72000;
-  //@VisibleForTesting
-  public static final int MATCH_BYTE_RANGE = 100000;
+  @VisibleForTesting public static final int MATCH_RANGE = 72000;
+  @VisibleForTesting public static final int MATCH_BYTE_RANGE = 100000;
   private static final int DEFAULT_OFFSET = 30000;
 
   private static final int STATE_SEEK_TO_END = 0;
@@ -133,7 +132,7 @@ import java.io.IOException;
     return totalGranules != 0 ? new OggSeekMap() : null;
   }
 
-  //@VisibleForTesting
+  @VisibleForTesting
   public void resetSeeking() {
     start = startPosition;
     end = endPosition;
@@ -150,12 +149,12 @@ import java.io.IOException;
    *
    * @param targetGranule the target granule position to seek to.
    * @param input the {@link ExtractorInput} to read from.
-   * @return the position to seek the {@link ExtractorInput} to for a next call or
-   *     -(currentGranule + 2) if it's close enough to skip to the target page.
+   * @return the position to seek the {@link ExtractorInput} to for a next call or -(currentGranule
+   *     + 2) if it's close enough to skip to the target page.
    * @throws IOException thrown if reading from the input fails.
    * @throws InterruptedException thrown if interrupted while reading from the input.
    */
-  //@VisibleForTesting
+  @VisibleForTesting
   public long getNextSeekPosition(long targetGranule, ExtractorInput input)
       throws IOException, InterruptedException {
     if (start == end) {
@@ -250,7 +249,7 @@ import java.io.IOException;
    * @throws InterruptedException If the thread is interrupted.
    * @throws EOFException If the next page can't be found before the end of the input.
    */
-  // @VisibleForTesting
+  @VisibleForTesting
   void skipToNextPage(ExtractorInput input) throws IOException, InterruptedException {
     if (!skipToNextPage(input, endPosition)) {
       // Not found until eof.
@@ -267,7 +266,7 @@ import java.io.IOException;
    * @throws IOException thrown if peeking/reading from the input fails.
    * @throws InterruptedException thrown if interrupted while peeking/reading from the input.
    */
-  // @VisibleForTesting
+  @VisibleForTesting
   boolean skipToNextPage(ExtractorInput input, long limit)
       throws IOException, InterruptedException {
     limit = Math.min(limit + 3, endPosition);
@@ -307,7 +306,7 @@ import java.io.IOException;
    * @throws IOException If reading from the input fails.
    * @throws InterruptedException If the thread is interrupted.
    */
-  // @VisibleForTesting
+  @VisibleForTesting
   long readGranuleOfLastPage(ExtractorInput input) throws IOException, InterruptedException {
     skipToNextPage(input);
     pageHeader.reset();
@@ -319,8 +318,8 @@ import java.io.IOException;
   }
 
   /**
-   * Skips to the position of the start of the page containing the {@code targetGranule} and
-   * returns the granule of the page previous to the target page.
+   * Skips to the position of the start of the page containing the {@code targetGranule} and returns
+   * the granule of the page previous to the target page.
    *
    * @param input the {@link ExtractorInput} to read from.
    * @param targetGranule the target granule.
@@ -331,7 +330,7 @@ import java.io.IOException;
    * @throws IOException thrown if reading from the input fails.
    * @throws InterruptedException thrown if interrupted while reading from the input.
    */
-  //@VisibleForTesting
+  @VisibleForTesting
   long skipToPageOfGranule(ExtractorInput input, long targetGranule, long currentGranule)
       throws IOException, InterruptedException {
     pageHeader.populate(input, false);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java
index 482f0c5021..ca79c838de 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor.ogg;
 
+import android.support.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.util.Assertions;
@@ -103,14 +104,14 @@ import java.util.Arrays;
   /**
    * An OGG Packet may span multiple pages. Returns the {@link OggPageHeader} of the last page read,
    * or an empty header if the packet has yet to be populated.
-   * <p>
-   * Note that the returned {@link OggPageHeader} is mutable and may be updated during subsequent
+   *
+   * <p>Note that the returned {@link OggPageHeader} is mutable and may be updated during subsequent
    * calls to {@link #populate(ExtractorInput)}.
    *
    * @return the {@code PageHeader} of the last page read or an empty header if the packet has yet
    *     to be populated.
    */
-  //@VisibleForTesting
+  @VisibleForTesting
   public OggPageHeader getPageHeader() {
     return pageHeader;
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java
index 147ad5a20b..3c62f7a824 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor.ogg;
 
+import android.support.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.extractor.ogg.VorbisUtil.Mode;
@@ -107,7 +108,7 @@ import java.util.ArrayList;
     return true;
   }
 
-  //@VisibleForTesting
+  @VisibleForTesting
   /* package */ VorbisSetup readSetupHeaders(ParsableByteArray scratch) throws IOException {
 
     if (vorbisIdHeader == null) {
@@ -133,22 +134,22 @@ import java.util.ArrayList;
   }
 
   /**
-   * Reads an int of {@code length} bits from {@code src} starting at
-   * {@code leastSignificantBitIndex}.
+   * Reads an int of {@code length} bits from {@code src} starting at {@code
+   * leastSignificantBitIndex}.
    *
    * @param src the {@code byte} to read from.
    * @param length the length in bits of the int to read.
    * @param leastSignificantBitIndex the index of the least significant bit of the int to read.
    * @return the int value read.
    */
-  //@VisibleForTesting
+  @VisibleForTesting
   /* package */ static int readBits(byte src, int length, int leastSignificantBitIndex) {
     return (src >> leastSignificantBitIndex) & (255 >>> (8 - length));
   }
 
-  //@VisibleForTesting
-  /* package */ static void appendNumberOfSamples(ParsableByteArray buffer,
-      long packetSampleCount) {
+  @VisibleForTesting
+  /* package */ static void appendNumberOfSamples(
+      ParsableByteArray buffer, long packetSampleCount) {
 
     buffer.setLimit(buffer.limit() + 4);
     // The vorbis decoder expects the number of samples in the packet
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java
index 50916aa841..2ac1427e91 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.text.ttml;
 
+import android.support.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.text.Cue;
 import com.google.android.exoplayer2.text.Subtitle;
@@ -58,7 +59,7 @@ import java.util.Map;
     return eventTimesUs[index];
   }
 
-  /* @VisibleForTesting */
+  @VisibleForTesting
   /* package */ TtmlNode getRoot() {
     return root;
   }
@@ -68,7 +69,7 @@ import java.util.Map;
     return root.getCues(timeUs, globalStyles, regionMap);
   }
 
-  /* @VisibleForTesting */
+  @VisibleForTesting
   /* package */ Map<String, TtmlStyle> getGlobalStyles() {
     return globalStyles;
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
index 4220f6c5b4..19160c73d4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
+import android.support.annotation.VisibleForTesting;
 import android.util.SparseArray;
 import com.google.android.exoplayer2.upstream.cache.Cache.CacheException;
 import com.google.android.exoplayer2.util.Assertions;
@@ -336,7 +337,7 @@ import javax.crypto.spec.SecretKeySpec;
    * than {@link java.lang.Integer#MAX_VALUE} it just returns the next bigger integer. Otherwise it
    * returns the smallest unused non-negative integer.
    */
-  //@VisibleForTesting
+  @VisibleForTesting
   public static int getNewId(SparseArray<String> idToKey) {
     int size = idToKey.size();
     int id = size == 0 ? 0 : (idToKey.keyAt(size - 1) + 1);
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java
index bae29a6858..8665852de7 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java
@@ -30,6 +30,7 @@ import android.support.annotation.AnyThread;
 import android.support.annotation.BinderThread;
 import android.support.annotation.Nullable;
 import android.support.annotation.UiThread;
+import android.support.annotation.VisibleForTesting;
 import android.util.AttributeSet;
 import android.view.Display;
 import android.view.Surface;
@@ -230,7 +231,7 @@ public final class SphericalSurfaceView extends GLSurfaceView {
    * Standard GL Renderer implementation. The notable code is the matrix multiplication in
    * onDrawFrame and updatePitchMatrix.
    */
-  // @VisibleForTesting
+  @VisibleForTesting
   /* package */ class Renderer
       implements GLSurfaceView.Renderer, TouchTracker.Listener, OrientationListener.Listener {
     private final SceneRenderer scene;
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/TouchTracker.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/TouchTracker.java
index 2da913fc32..08c4779cf7 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/TouchTracker.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/TouchTracker.java
@@ -19,6 +19,7 @@ import android.content.Context;
 import android.graphics.PointF;
 import android.support.annotation.BinderThread;
 import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;
@@ -44,7 +45,7 @@ import android.view.View;
  * a nicer UI. An even more advanced UI would reproject the user's touch point into 3D and drag the
  * Mesh as the user moves their finger. However, that requires quaternion interpolation.
  */
-// @VisibleForTesting
+@VisibleForTesting
 /* package */ class TouchTracker extends GestureDetector.SimpleOnGestureListener
     implements View.OnTouchListener, OrientationListener.Listener {
 

From 5a18a98fbd8ce75786de804f97b3c80722d19fde Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 7 Nov 2018 05:28:34 -0800
Subject: [PATCH 174/832] Add TrackSelectionUtil
 getBitratesUsingPastAndFutureInfo

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=220447459
---
 .../trackselection/TrackSelectionUtil.java    |  97 +++++++++++++---
 .../TrackSelectionUtilTest.java               | 108 ++++++++++++++++++
 2 files changed, 190 insertions(+), 15 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
index fdfd87910e..052cf36309 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.trackselection;
 
+import android.support.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.chunk.MediaChunk;
@@ -77,7 +78,8 @@ public final class TrackSelectionUtil {
    *     estimation can't be calculated, {@link Format#NO_VALUE} is set.
    * @see #getAverageBitrate(MediaChunkIterator, long)
    */
-  public static int[] getBitratesUsingFutureInfo(
+  @VisibleForTesting
+  /* package */ static int[] getBitratesUsingFutureInfo(
       MediaChunkIterator[] iterators, Format[] formats, long maxDurationUs) {
     int trackCount = iterators.length;
     Assertions.checkArgument(trackCount == formats.length);
@@ -86,6 +88,11 @@ public final class TrackSelectionUtil {
     }
 
     int[] bitrates = new int[trackCount];
+    if (maxDurationUs == 0) {
+      Arrays.fill(bitrates, Format.NO_VALUE);
+      return bitrates;
+    }
+
     int[] formatBitrates = new int[trackCount];
     float[] bitrateRatios = new float[trackCount];
     boolean needEstimateBitrate = false;
@@ -124,10 +131,14 @@ public final class TrackSelectionUtil {
    *     {@link Format#NO_VALUE} is set.
    * @see #getBitratesUsingFutureInfo(MediaChunkIterator[], Format[], long)
    */
-  public static int[] getBitratesUsingPastInfo(
+  @VisibleForTesting
+  /* package */ static int[] getBitratesUsingPastInfo(
       List<? extends MediaChunk> queue, Format[] formats, long maxDurationUs) {
     int[] bitrates = new int[formats.length];
     Arrays.fill(bitrates, Format.NO_VALUE);
+    if (maxDurationUs == 0) {
+      return bitrates;
+    }
     int queueAverageBitrate = getAverageQueueBitrate(queue, maxDurationUs);
     if (queueAverageBitrate == Format.NO_VALUE) {
       return bitrates;
@@ -141,6 +152,75 @@ public final class TrackSelectionUtil {
     return bitrates;
   }
 
+  /**
+   * Returns bitrate values for a set of tracks whose formats are given, using the given upcoming
+   * media chunk iterators and the queue of already buffered {@link MediaChunk}s.
+   *
+   * @param iterators An array of {@link MediaChunkIterator}s providing information about the
+   *     sequence of upcoming media chunks for each track.
+   * @param queue The queue of already buffered {@link MediaChunk}s. Must not be modified.
+   * @param formats The track formats.
+   * @param maxFutureDurationUs Maximum duration of future chunks to be included in average bitrate
+   *     values, in microseconds.
+   * @param maxPastDurationUs Maximum duration of past chunks to be included in average bitrate
+   *     values, in microseconds.
+   * @param useFormatBitrateAsLowerBound Whether to return the estimated bitrate only if it's higher
+   *     than the bitrate of the track's format.
+   * @return Bitrate values for the tracks. If for a track, a bitrate value can't be calculated,
+   *     {@link Format#NO_VALUE} is set.
+   */
+  public static int[] getBitratesUsingPastAndFutureInfo(
+      MediaChunkIterator[] iterators,
+      List<? extends MediaChunk> queue,
+      Format[] formats,
+      long maxFutureDurationUs,
+      long maxPastDurationUs,
+      boolean useFormatBitrateAsLowerBound) {
+    int[] bitrates = getBitratesUsingFutureInfo(iterators, formats, maxFutureDurationUs);
+    int[] bitratesUsingPastInfo = getBitratesUsingPastInfo(queue, formats, maxPastDurationUs);
+    for (int i = 0; i < bitrates.length; i++) {
+      int bitrate = bitrates[i];
+      if (bitrate == Format.NO_VALUE) {
+        bitrate = bitratesUsingPastInfo[i];
+      }
+      if (bitrate == Format.NO_VALUE
+          || (useFormatBitrateAsLowerBound
+              && formats[i].bitrate != Format.NO_VALUE
+              && bitrate < formats[i].bitrate)) {
+        bitrate = formats[i].bitrate;
+      }
+      bitrates[i] = bitrate;
+    }
+    return bitrates;
+  }
+
+  /**
+   * Fills missing values in the given {@code bitrates} array by calculates an estimation using the
+   * closest reference bitrate value.
+   *
+   * @param bitrates An array of bitrates to be filled with estimations. Missing values are set to
+   *     {@link Format#NO_VALUE}.
+   * @param formats An array of formats, one for each bitrate.
+   * @param referenceBitrates An array of reference bitrates which are used to calculate
+   *     estimations.
+   * @param referenceBitrateRatios An array containing ratio of reference bitrates to their bitrate
+   *     estimates.
+   */
+  private static void estimateBitrates(
+      int[] bitrates, Format[] formats, int[] referenceBitrates, float[] referenceBitrateRatios) {
+    for (int i = 0; i < bitrates.length; i++) {
+      if (bitrates[i] == Format.NO_VALUE) {
+        int formatBitrate = formats[i].bitrate;
+        if (formatBitrate != Format.NO_VALUE) {
+          int closestReferenceBitrateIndex =
+              getClosestBitrateIndex(formatBitrate, referenceBitrates);
+          bitrates[i] =
+              (int) (referenceBitrateRatios[closestReferenceBitrateIndex] * formatBitrate);
+        }
+      }
+    }
+  }
+
   private static int getAverageQueueBitrate(List<? extends MediaChunk> queue, long maxDurationUs) {
     if (queue.isEmpty()) {
       return Format.NO_VALUE;
@@ -162,19 +242,6 @@ public final class TrackSelectionUtil {
     return queue;
   }
 
-  private static void estimateBitrates(
-      int[] bitrates, Format[] formats, int[] formatBitrates, float[] bitrateRatios) {
-    for (int i = 0; i < bitrates.length; i++) {
-      if (bitrates[i] == Format.NO_VALUE) {
-        int formatBitrate = formats[i].bitrate;
-        if (formatBitrate != Format.NO_VALUE) {
-          int closestFormat = getClosestBitrateIndex(formatBitrate, formatBitrates);
-          bitrates[i] = (int) (bitrateRatios[closestFormat] * formatBitrate);
-        }
-      }
-    }
-  }
-
   private static int getClosestBitrateIndex(int formatBitrate, int[] formatBitrates) {
     int closestDistance = Integer.MAX_VALUE;
     int closestFormat = C.INDEX_UNSET;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java
index 49da9b567a..4596ea5ded 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java
@@ -408,6 +408,114 @@ public class TrackSelectionUtilTest {
     assertThat(bitrates).asList().containsExactly(16).inOrder();
   }
 
+  @Test
+  public void getBitratesUsingPastAndFutureInfo_noPastInfo_returnsBitratesUsingOnlyFutureInfo() {
+    FakeIterator iterator1 =
+        new FakeIterator(
+            /* chunkTimeBoundariesSec= */ new long[] {0, 10}, /* chunkLengths= */ new long[] {10});
+    FakeIterator iterator2 =
+        new FakeIterator(
+            /* chunkTimeBoundariesSec= */ new long[] {0, 5, 15, 30},
+            /* chunkLengths= */ new long[] {10, 20, 30});
+
+    int[] bitrates =
+        TrackSelectionUtil.getBitratesUsingPastAndFutureInfo(
+            new MediaChunkIterator[] {iterator1, iterator2},
+            Collections.emptyList(),
+            new Format[] {createFormatWithBitrate(10), createFormatWithBitrate(20)},
+            MAX_DURATION_US,
+            MAX_DURATION_US,
+            /* useFormatBitrateAsLowerBound= */ false);
+
+    assertThat(bitrates).asList().containsExactly(8, 16).inOrder();
+  }
+
+  @Test
+  public void getBitratesUsingPastAndFutureInfo_noFutureInfo_returnsBitratesUsingOnlyPastInfo() {
+    FakeMediaChunk chunk =
+        createChunk(
+            createFormatWithBitrate(10),
+            /* length= */ 10,
+            /* startTimeSec= */ 0,
+            /* endTimeSec= */ 10);
+
+    int[] bitrates =
+        TrackSelectionUtil.getBitratesUsingPastAndFutureInfo(
+            new MediaChunkIterator[] {MediaChunkIterator.EMPTY, MediaChunkIterator.EMPTY},
+            Collections.singletonList(chunk),
+            new Format[] {createFormatWithBitrate(20), createFormatWithBitrate(30)},
+            MAX_DURATION_US,
+            MAX_DURATION_US,
+            /* useFormatBitrateAsLowerBound= */ false);
+
+    assertThat(bitrates).asList().containsExactly(16, 24).inOrder();
+  }
+
+  @Test
+  public void
+      getBitratesUsingPastAndFutureInfo_pastAndFutureInfo_returnsBitratesUsingOnlyFutureInfo() {
+    FakeMediaChunk chunk =
+        createChunk(
+            createFormatWithBitrate(5),
+            /* length= */ 10,
+            /* startTimeSec= */ 0,
+            /* endTimeSec= */ 10);
+    FakeIterator iterator1 =
+        new FakeIterator(
+            /* chunkTimeBoundariesSec= */ new long[] {0, 10}, /* chunkLengths= */ new long[] {10});
+    FakeIterator iterator2 =
+        new FakeIterator(
+            /* chunkTimeBoundariesSec= */ new long[] {0, 5, 15, 30},
+            /* chunkLengths= */ new long[] {10, 20, 30});
+
+    int[] bitrates =
+        TrackSelectionUtil.getBitratesUsingPastAndFutureInfo(
+            new MediaChunkIterator[] {iterator1, iterator2},
+            Collections.singletonList(chunk),
+            new Format[] {createFormatWithBitrate(10), createFormatWithBitrate(20)},
+            MAX_DURATION_US,
+            MAX_DURATION_US,
+            /* useFormatBitrateAsLowerBound= */ false);
+
+    assertThat(bitrates).asList().containsExactly(8, 16).inOrder();
+  }
+
+  @Test
+  public void getBitratesUsingPastAndFutureInfo_noPastAndFutureInfo_returnsBitratesOfFormats() {
+    int[] bitrates =
+        TrackSelectionUtil.getBitratesUsingPastAndFutureInfo(
+            new MediaChunkIterator[] {MediaChunkIterator.EMPTY, MediaChunkIterator.EMPTY},
+            Collections.emptyList(),
+            new Format[] {createFormatWithBitrate(10), createFormatWithBitrate(20)},
+            MAX_DURATION_US,
+            MAX_DURATION_US,
+            /* useFormatBitrateAsLowerBound= */ false);
+
+    assertThat(bitrates).asList().containsExactly(10, 20).inOrder();
+  }
+
+  @Test
+  public void
+      getBitratesUsingPastAndFutureInfo_estimatesLowerAndUseFormatBitrateAsLowerBoundTrue_returnsBitratesOfFormats() {
+    FakeMediaChunk chunk =
+        createChunk(
+            createFormatWithBitrate(10),
+            /* length= */ 10,
+            /* startTimeSec= */ 0,
+            /* endTimeSec= */ 10);
+
+    int[] bitrates =
+        TrackSelectionUtil.getBitratesUsingPastAndFutureInfo(
+            new MediaChunkIterator[] {MediaChunkIterator.EMPTY, MediaChunkIterator.EMPTY},
+            Collections.singletonList(chunk),
+            new Format[] {createFormatWithBitrate(20), createFormatWithBitrate(30)},
+            MAX_DURATION_US,
+            MAX_DURATION_US,
+            /* useFormatBitrateAsLowerBound= */ true);
+
+    assertThat(bitrates).asList().containsExactly(20, 30).inOrder();
+  }
+
   private static FakeMediaChunk createChunk(
       Format format, int length, int startTimeSec, int endTimeSec) {
     DataSpec dataSpec = new DataSpec(Uri.EMPTY, 0, length, null, 0);

From 0dfd478a2044b8a2b4bb52c74e783f55dd66e8e7 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 7 Nov 2018 07:47:51 -0800
Subject: [PATCH 175/832] Add missing update on repeat toggle mode change

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=220461315
---
 .../java/com/google/android/exoplayer2/ui/PlayerControlView.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
index 164a49a019..c297e62c07 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
@@ -536,6 +536,7 @@ public class PlayerControlView extends FrameLayout {
         controlDispatcher.dispatchSetRepeatMode(player, Player.REPEAT_MODE_ALL);
       }
     }
+    updateRepeatModeButton();
   }
 
   /** Returns whether the shuffle button is shown. */

From 2d606f26f7f0ea04ba04d58ccf4cb2bfad64db78 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 7 Nov 2018 08:09:16 -0800
Subject: [PATCH 176/832] Minor cleanup to mediasession extension

- Make units of time clear for seeking
- Remove option to specify supported repeat modes in default
  playback controller. It doesn't seem useful, given we can't
  control what the session is sent.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=220464529
---
 .../DefaultPlaybackController.java            | 44 +++++++------------
 .../mediasession/MediaSessionConnector.java   | 14 ++----
 .../RepeatModeActionProvider.java             |  7 ++-
 3 files changed, 26 insertions(+), 39 deletions(-)

diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/DefaultPlaybackController.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/DefaultPlaybackController.java
index 7d983e14e9..fbc4a39ff2 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/DefaultPlaybackController.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/DefaultPlaybackController.java
@@ -20,7 +20,6 @@ import android.os.ResultReceiver;
 import android.support.v4.media.session.PlaybackStateCompat;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Player;
-import com.google.android.exoplayer2.util.RepeatModeUtil;
 
 /**
  * A default implementation of {@link MediaSessionConnector.PlaybackController}.
@@ -45,32 +44,27 @@ public class DefaultPlaybackController implements MediaSessionConnector.Playback
 
   protected final long rewindIncrementMs;
   protected final long fastForwardIncrementMs;
-  protected final int repeatToggleModes;
 
   /**
    * Creates a new instance.
-   * <p>
-   * Equivalent to {@code DefaultPlaybackController(DefaultPlaybackController.DEFAULT_REWIND_MS,
-   *     DefaultPlaybackController.DEFAULT_FAST_FORWARD_MS,
-   *     MediaSessionConnector.DEFAULT_REPEAT_TOGGLE_MODES)}.
+   *
+   * <p>Equivalent to {@code DefaultPlaybackController(DefaultPlaybackController.DEFAULT_REWIND_MS,
+   * DefaultPlaybackController.DEFAULT_FAST_FORWARD_MS)}.
    */
   public DefaultPlaybackController() {
-    this(DEFAULT_REWIND_MS, DEFAULT_FAST_FORWARD_MS,
-        MediaSessionConnector.DEFAULT_REPEAT_TOGGLE_MODES);
+    this(DEFAULT_REWIND_MS, DEFAULT_FAST_FORWARD_MS);
   }
 
   /**
    * Creates a new instance with the given fast forward and rewind increments.
-   *  @param rewindIncrementMs The rewind increment in milliseconds. A zero or negative value will
+   *
+   * @param rewindIncrementMs The rewind increment in milliseconds. A zero or negative value will
    *     cause the rewind action to be disabled.
    * @param fastForwardIncrementMs The fast forward increment in milliseconds. A zero or negative
-   * @param repeatToggleModes The available repeatToggleModes.
    */
-  public DefaultPlaybackController(long rewindIncrementMs, long fastForwardIncrementMs,
-      @RepeatModeUtil.RepeatToggleModes int repeatToggleModes) {
+  public DefaultPlaybackController(long rewindIncrementMs, long fastForwardIncrementMs) {
     this.rewindIncrementMs = rewindIncrementMs;
     this.fastForwardIncrementMs = fastForwardIncrementMs;
-    this.repeatToggleModes = repeatToggleModes;
   }
 
   @Override
@@ -101,12 +95,12 @@ public class DefaultPlaybackController implements MediaSessionConnector.Playback
   }
 
   @Override
-  public void onSeekTo(Player player, long position) {
+  public void onSeekTo(Player player, long positionMs) {
     long duration = player.getDuration();
     if (duration != C.TIME_UNSET) {
-      position = Math.min(position, duration);
+      positionMs = Math.min(positionMs, duration);
     }
-    player.seekTo(Math.max(position, 0));
+    player.seekTo(Math.max(positionMs, 0));
   }
 
   @Override
@@ -137,25 +131,21 @@ public class DefaultPlaybackController implements MediaSessionConnector.Playback
   }
 
   @Override
-  public void onSetRepeatMode(Player player, int repeatMode) {
-    int selectedExoPlayerRepeatMode = player.getRepeatMode();
-    switch (repeatMode) {
+  public void onSetRepeatMode(Player player, int mediaSessionRepeatMode) {
+    int repeatMode;
+    switch (mediaSessionRepeatMode) {
       case PlaybackStateCompat.REPEAT_MODE_ALL:
       case PlaybackStateCompat.REPEAT_MODE_GROUP:
-        if ((repeatToggleModes & RepeatModeUtil.REPEAT_TOGGLE_MODE_ALL) != 0) {
-          selectedExoPlayerRepeatMode = Player.REPEAT_MODE_ALL;
-        }
+        repeatMode = Player.REPEAT_MODE_ALL;
         break;
       case PlaybackStateCompat.REPEAT_MODE_ONE:
-        if ((repeatToggleModes & RepeatModeUtil.REPEAT_TOGGLE_MODE_ONE) != 0) {
-          selectedExoPlayerRepeatMode = Player.REPEAT_MODE_ONE;
-        }
+        repeatMode = Player.REPEAT_MODE_ONE;
         break;
       default:
-        selectedExoPlayerRepeatMode = Player.REPEAT_MODE_OFF;
+        repeatMode = Player.REPEAT_MODE_OFF;
         break;
     }
-    player.setRepeatMode(selectedExoPlayerRepeatMode);
+    player.setRepeatMode(repeatMode);
   }
 
   // CommandReceiver implementation.
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
index c4110a10f7..b24c936f1a 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
@@ -39,7 +39,6 @@ import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.ErrorMessageProvider;
-import com.google.android.exoplayer2.util.RepeatModeUtil;
 import com.google.android.exoplayer2.util.Util;
 import java.util.Collections;
 import java.util.HashMap;
@@ -76,13 +75,6 @@ public final class MediaSessionConnector {
     ExoPlayerLibraryInfo.registerModule("goog.exo.mediasession");
   }
 
-  /**
-   * The default repeat toggle modes which is the bitmask of {@link
-   * RepeatModeUtil#REPEAT_TOGGLE_MODE_ONE} and {@link RepeatModeUtil#REPEAT_TOGGLE_MODE_ALL}.
-   */
-  public static final @RepeatModeUtil.RepeatToggleModes int DEFAULT_REPEAT_TOGGLE_MODES =
-      RepeatModeUtil.REPEAT_TOGGLE_MODE_ONE | RepeatModeUtil.REPEAT_TOGGLE_MODE_ALL;
-
   public static final String EXTRAS_PITCH = "EXO_PITCH";
   private static final int BASE_MEDIA_SESSION_FLAGS =
       MediaSessionCompat.FLAG_HANDLES_MEDIA_BUTTONS
@@ -167,7 +159,7 @@ public final class MediaSessionConnector {
     /** See {@link MediaSessionCompat.Callback#onPause()}. */
     void onPause(Player player);
     /** See {@link MediaSessionCompat.Callback#onSeekTo(long)}. */
-    void onSeekTo(Player player, long position);
+    void onSeekTo(Player player, long positionMs);
     /** See {@link MediaSessionCompat.Callback#onFastForward()}. */
     void onFastForward(Player player);
     /** See {@link MediaSessionCompat.Callback#onRewind()}. */
@@ -857,9 +849,9 @@ public final class MediaSessionConnector {
     }
 
     @Override
-    public void onSeekTo(long position) {
+    public void onSeekTo(long positionMs) {
       if (canDispatchToPlaybackController(PlaybackStateCompat.ACTION_SEEK_TO)) {
-        playbackController.onSeekTo(player, position);
+        playbackController.onSeekTo(player, positionMs);
       }
     }
 
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/RepeatModeActionProvider.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/RepeatModeActionProvider.java
index 057f59f62c..b45a690a9d 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/RepeatModeActionProvider.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/RepeatModeActionProvider.java
@@ -26,6 +26,11 @@ import com.google.android.exoplayer2.util.RepeatModeUtil;
  */
 public final class RepeatModeActionProvider implements MediaSessionConnector.CustomActionProvider {
 
+  /** The default repeat toggle modes. */
+  @RepeatModeUtil.RepeatToggleModes
+  public static final int DEFAULT_REPEAT_TOGGLE_MODES =
+      RepeatModeUtil.REPEAT_TOGGLE_MODE_ONE | RepeatModeUtil.REPEAT_TOGGLE_MODE_ALL;
+
   private static final String ACTION_REPEAT_MODE = "ACTION_EXO_REPEAT_MODE";
 
   private final Player player;
@@ -45,7 +50,7 @@ public final class RepeatModeActionProvider implements MediaSessionConnector.Cus
    * @param player The player on which to toggle the repeat mode.
    */
   public RepeatModeActionProvider(Context context, Player player) {
-    this(context, player, MediaSessionConnector.DEFAULT_REPEAT_TOGGLE_MODES);
+    this(context, player, DEFAULT_REPEAT_TOGGLE_MODES);
   }
 
   /**

From 15dda17905502b99d6fe830895811737ab78476e Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 7 Nov 2018 08:39:05 -0800
Subject: [PATCH 177/832] Make TimelineQueueNavigator shuffle aware

Issue: #5065

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=220468285
---
 RELEASENOTES.md                               |  2 +
 .../mediasession/TimelineQueueNavigator.java  | 51 +++++++++++--------
 .../source/ClippingMediaSource.java           |  2 +-
 .../exoplayer2/ui/PlayerControlView.java      | 11 ++--
 4 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 02876af90c..dae0c593aa 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,6 +2,8 @@
 
 ### dev-v2 (not yet released) ###
 
+* Fix logic for enabling next and previous actions in `TimelineQueueNavigator`
+  ([#5065](https://github.com/google/ExoPlayer/issues/5065)).
 * Fix issue where audio focus handling could not be disabled after enabling
   it ([#5055](https://github.com/google/ExoPlayer/issues/5055)).
 * Support for playing spherical videos on Daydream.
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
index 6671add7e5..d55f8e04f0 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
@@ -39,6 +39,7 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
   public static final int DEFAULT_MAX_QUEUE_SIZE = 10;
 
   private final MediaSessionCompat mediaSession;
+  private final Timeline.Window window;
   protected final int maxQueueSize;
 
   private long activeQueueItemId;
@@ -68,6 +69,7 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
     this.mediaSession = mediaSession;
     this.maxQueueSize = maxQueueSize;
     activeQueueItemId = MediaSessionCompat.QueueItem.UNKNOWN_ID;
+    window = new Timeline.Window();
   }
 
   /**
@@ -81,25 +83,24 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
 
   @Override
   public long getSupportedQueueNavigatorActions(Player player) {
-    if (player == null || player.getCurrentTimeline().getWindowCount() < 2) {
+    if (player == null) {
       return 0;
     }
-    if (player.getRepeatMode() != Player.REPEAT_MODE_OFF) {
-      return PlaybackStateCompat.ACTION_SKIP_TO_NEXT | PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS
-          | PlaybackStateCompat.ACTION_SKIP_TO_QUEUE_ITEM;
+    Timeline timeline = player.getCurrentTimeline();
+    if (timeline.isEmpty() || player.isPlayingAd()) {
+      return 0;
     }
-
-    int currentWindowIndex = player.getCurrentWindowIndex();
-    long actions;
-    if (currentWindowIndex == 0) {
-      actions = PlaybackStateCompat.ACTION_SKIP_TO_NEXT;
-    } else if (currentWindowIndex == player.getCurrentTimeline().getWindowCount() - 1) {
-      actions = PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS;
-    } else {
-      actions = PlaybackStateCompat.ACTION_SKIP_TO_NEXT
-          | PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS;
+    long actions = 0;
+    if (timeline.getWindowCount() > 1) {
+      actions |= PlaybackStateCompat.ACTION_SKIP_TO_QUEUE_ITEM;
     }
-    return actions | PlaybackStateCompat.ACTION_SKIP_TO_QUEUE_ITEM;
+    if (window.isSeekable || !window.isDynamic || player.hasPrevious()) {
+      actions |= PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS;
+    }
+    if (window.isDynamic || player.hasNext()) {
+      actions |= PlaybackStateCompat.ACTION_SKIP_TO_NEXT;
+    }
+    return actions;
   }
 
   @Override
@@ -125,22 +126,25 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
   @Override
   public void onSkipToPrevious(Player player) {
     Timeline timeline = player.getCurrentTimeline();
-    if (timeline.isEmpty()) {
+    if (timeline.isEmpty() || player.isPlayingAd()) {
       return;
     }
+    int windowIndex = player.getCurrentWindowIndex();
+    timeline.getWindow(windowIndex, window);
     int previousWindowIndex = player.getPreviousWindowIndex();
-    if (player.getCurrentPosition() > MAX_POSITION_FOR_SEEK_TO_PREVIOUS
-        || previousWindowIndex == C.INDEX_UNSET) {
-      player.seekTo(0);
-    } else {
+    if (previousWindowIndex != C.INDEX_UNSET
+        && (player.getCurrentPosition() <= MAX_POSITION_FOR_SEEK_TO_PREVIOUS
+            || (window.isDynamic && !window.isSeekable))) {
       player.seekTo(previousWindowIndex, C.TIME_UNSET);
+    } else {
+      player.seekTo(0);
     }
   }
 
   @Override
   public void onSkipToQueueItem(Player player, long id) {
     Timeline timeline = player.getCurrentTimeline();
-    if (timeline.isEmpty()) {
+    if (timeline.isEmpty() || player.isPlayingAd()) {
       return;
     }
     int windowIndex = (int) id;
@@ -152,12 +156,15 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
   @Override
   public void onSkipToNext(Player player) {
     Timeline timeline = player.getCurrentTimeline();
-    if (timeline.isEmpty()) {
+    if (timeline.isEmpty() || player.isPlayingAd()) {
       return;
     }
+    int windowIndex = player.getCurrentWindowIndex();
     int nextWindowIndex = player.getNextWindowIndex();
     if (nextWindowIndex != C.INDEX_UNSET) {
       player.seekTo(nextWindowIndex, C.TIME_UNSET);
+    } else if (timeline.getWindow(windowIndex, window).isDynamic) {
+      player.seekTo(windowIndex, C.TIME_UNSET);
     }
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
index 8ac9460586..3916d41b61 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
@@ -318,7 +318,7 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> {
       if (timeline.getPeriodCount() != 1) {
         throw new IllegalClippingException(IllegalClippingException.REASON_INVALID_PERIOD_COUNT);
       }
-      Window window = timeline.getWindow(0, new Window(), false);
+      Window window = timeline.getWindow(0, new Window());
       startUs = Math.max(0, startUs);
       long resolvedEndUs = endUs == C.TIME_END_OF_SOURCE ? window.durationUs : Math.max(0, endUs);
       if (window.durationUs != C.TIME_UNSET) {
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
index c297e62c07..a3d7825f08 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
@@ -668,9 +668,8 @@ public class PlayerControlView extends FrameLayout {
       int windowIndex = player.getCurrentWindowIndex();
       timeline.getWindow(windowIndex, window);
       isSeekable = window.isSeekable;
-      enablePrevious =
-          isSeekable || !window.isDynamic || player.getPreviousWindowIndex() != C.INDEX_UNSET;
-      enableNext = window.isDynamic || player.getNextWindowIndex() != C.INDEX_UNSET;
+      enablePrevious = isSeekable || !window.isDynamic || player.hasPrevious();
+      enableNext = window.isDynamic || player.hasNext();
     }
     setButtonEnabled(enablePrevious, previousButton);
     setButtonEnabled(enableNext, nextButton);
@@ -865,7 +864,7 @@ public class PlayerControlView extends FrameLayout {
 
   private void previous() {
     Timeline timeline = player.getCurrentTimeline();
-    if (timeline.isEmpty()) {
+    if (timeline.isEmpty() || player.isPlayingAd()) {
       return;
     }
     int windowIndex = player.getCurrentWindowIndex();
@@ -882,14 +881,14 @@ public class PlayerControlView extends FrameLayout {
 
   private void next() {
     Timeline timeline = player.getCurrentTimeline();
-    if (timeline.isEmpty()) {
+    if (timeline.isEmpty() || player.isPlayingAd()) {
       return;
     }
     int windowIndex = player.getCurrentWindowIndex();
     int nextWindowIndex = player.getNextWindowIndex();
     if (nextWindowIndex != C.INDEX_UNSET) {
       seekTo(nextWindowIndex, C.TIME_UNSET);
-    } else if (timeline.getWindow(windowIndex, window, false).isDynamic) {
+    } else if (timeline.getWindow(windowIndex, window).isDynamic) {
       seekTo(windowIndex, C.TIME_UNSET);
     }
   }

From e82d29f47a4b6ce6a7ec1778195ed3fa2c92f656 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 7 Nov 2018 08:49:10 -0800
Subject: [PATCH 178/832] Make BasePlayer.get[Next/Previous]WindowIndex more
 useful

When in REPEAT_MODE_ONE, it's unlikely apps want next/previous methods
on the player to keep them in the same window. Music apps in particular
tend to implement next/previous functionality as though repeat mode were
off when in this mode (i.e. current song loops forever during playback,
but next/previous navigation still navigates to next/previous items).

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=220469655
---
 .../java/com/google/android/exoplayer2/BasePlayer.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java
index 6ff0853d9b..f1b54153a1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java
@@ -79,7 +79,7 @@ public abstract class BasePlayer implements Player {
     return timeline.isEmpty()
         ? C.INDEX_UNSET
         : timeline.getNextWindowIndex(
-            getCurrentWindowIndex(), getRepeatMode(), getShuffleModeEnabled());
+            getCurrentWindowIndex(), getRepeatModeForNavigation(), getShuffleModeEnabled());
   }
 
   @Override
@@ -88,7 +88,7 @@ public abstract class BasePlayer implements Player {
     return timeline.isEmpty()
         ? C.INDEX_UNSET
         : timeline.getPreviousWindowIndex(
-            getCurrentWindowIndex(), getRepeatMode(), getShuffleModeEnabled());
+            getCurrentWindowIndex(), getRepeatModeForNavigation(), getShuffleModeEnabled());
   }
 
   @Override
@@ -129,4 +129,10 @@ public abstract class BasePlayer implements Player {
         ? C.TIME_UNSET
         : timeline.getWindow(getCurrentWindowIndex(), window).getDurationMs();
   }
+
+  @RepeatMode
+  private int getRepeatModeForNavigation() {
+    @RepeatMode int repeatMode = getRepeatMode();
+    return repeatMode == REPEAT_MODE_ONE ? REPEAT_MODE_OFF : repeatMode;
+  }
 }

From 8d833c319d6be36bf49ad03c99594263a75d1ea1 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 7 Nov 2018 08:53:09 -0800
Subject: [PATCH 179/832] Fix BasePlayer.next()

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=220470213
---
 .../src/main/java/com/google/android/exoplayer2/BasePlayer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java
index f1b54153a1..eb3bd4f91a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java
@@ -62,7 +62,7 @@ public abstract class BasePlayer implements Player {
 
   @Override
   public final void next() {
-    int nextWindowIndex = getPreviousWindowIndex();
+    int nextWindowIndex = getNextWindowIndex();
     if (nextWindowIndex != C.INDEX_UNSET) {
       seekToDefaultPosition(nextWindowIndex);
     }

From f895be6b1f7b0202802a3d1a196f36e9131b4db6 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 7 Nov 2018 11:35:23 -0800
Subject: [PATCH 180/832] AudioFocusManager - Treat idle state consistently

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=220500268
---
 .../exoplayer2/ext/cast/ExoCastConstants.java | 83 -------------------
 .../exoplayer2/audio/AudioFocusManager.java   | 32 +++----
 .../audio/AudioFocusManagerTest.java          |  4 +-
 3 files changed, 20 insertions(+), 99 deletions(-)
 delete mode 100644 extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/ExoCastConstants.java

diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/ExoCastConstants.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/ExoCastConstants.java
deleted file mode 100644
index c5647dd949..0000000000
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/ExoCastConstants.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.ext.cast;
-
-/** Defines constants used by the Cast extension. */
-public final class ExoCastConstants {
-
-  private ExoCastConstants() {}
-
-  public static final int PROTOCOL_VERSION = 0;
-
-  // String representations.
-
-  public static final String STR_STATE_IDLE = "IDLE";
-  public static final String STR_STATE_BUFFERING = "BUFFERING";
-  public static final String STR_STATE_READY = "READY";
-  public static final String STR_STATE_ENDED = "ENDED";
-
-  public static final String STR_REPEAT_MODE_OFF = "REPEAT_MODE_OFF";
-  public static final String STR_REPEAT_MODE_ONE = "REPEAT_MODE_ONE";
-  public static final String STR_REPEAT_MODE_ALL = "REPEAT_MODE_ALL";
-
-  // Methods.
-
-  public static final String METHOD_BASE = "player.";
-
-  public static final String METHOD_ADD_ITEMS = METHOD_BASE + "addItems";
-  public static final String METHOD_MOVE_ITEM = METHOD_BASE + "moveItem";
-  public static final String METHOD_REMOVE_ITEMS = METHOD_BASE + "removeItems";
-  public static final String METHOD_SET_PLAY_WHEN_READY = METHOD_BASE + "setPlayWhenReady";
-  public static final String METHOD_SET_REPEAT_MODE = METHOD_BASE + "setRepeatMode";
-  public static final String METHOD_SET_SHUFFLE_MODE_ENABLED =
-      METHOD_BASE + "setShuffleModeEnabled";
-  public static final String METHOD_SEEK_TO = METHOD_BASE + "seekTo";
-  public static final String METHOD_SET_PLAYBACK_PARAMETERS = METHOD_BASE + "setPlaybackParameters";
-
-  // JSON message keys.
-
-  public static final String KEY_PROTOCOL_VERSION = "protocolVersion";
-  public static final String KEY_METHOD = "method";
-  public static final String KEY_SEQUENCE_NUMBER = "sequenceNumber";
-  public static final String KEY_INDEX = "index";
-  public static final String KEY_ITEMS = "items";
-  public static final String KEY_ARGS = "args";
-  public static final String KEY_UUID = "uuid";
-  public static final String KEY_UUIDS = "uuids";
-  public static final String KEY_LICENSE_SERVER = "licenseServer";
-  public static final String KEY_TITLE = "title";
-  public static final String KEY_URI = "uri";
-  public static final String KEY_REQUEST_HEADERS = "requestHeaders";
-  public static final String KEY_DESCRIPTION = "description";
-  public static final String KEY_MEDIA = "media";
-  public static final String KEY_DRM_SCHEMES = "drmSchemes";
-  public static final String KEY_START_POSITION_US = "startPositionUs";
-  public static final String KEY_END_POSITION_US = "endPositionUs";
-  public static final String KEY_MIME_TYPE = "mimeType";
-  public static final String KEY_PLAY_WHEN_READY = "playWhenReady";
-  public static final String KEY_REPEAT_MODE = "repeatMode";
-  public static final String KEY_SHUFFLE_MODE_ENABLED = "shuffleModeEnabled";
-  public static final String KEY_POSITION_MS = "positionMs";
-  public static final String KEY_SPEED = "speed";
-  public static final String KEY_PITCH = "pitch";
-  public static final String KEY_SKIP_SILENCE = "skipSilence";
-  public static final String KEY_PLAYBACK_STATE = "playbackState";
-  public static final String KEY_MEDIA_QUEUE = "mediaQueue";
-  public static final String KEY_IS_LOADING = "isLoading";
-  public static final String KEY_PLAYBACK_ERROR = "error";
-  public static final String KEY_PLAYBACK_POSITION = "playbackPosition";
-  public static final String KEY_PLAYBACK_PARAMETERS = "playbackParameters";
-}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java
index 09fd1f3f02..c20ede439f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java
@@ -139,7 +139,8 @@ public final class AudioFocusManager {
    * @param playerState The current player state; {@link ExoPlayer#getPlaybackState()}.
    * @return A {@link PlayerCommand} to execute on the player.
    */
-  public @PlayerCommand int setAudioAttributes(
+  @PlayerCommand
+  public int setAudioAttributes(
       @Nullable AudioAttributes audioAttributes, boolean playWhenReady, int playerState) {
     if (!Util.areEqual(this.audioAttributes, audioAttributes)) {
       this.audioAttributes = audioAttributes;
@@ -154,11 +155,9 @@ public final class AudioFocusManager {
       }
     }
 
-    if (playerState == Player.STATE_IDLE) {
-      return PLAYER_COMMAND_WAIT_FOR_CALLBACK;
-    } else {
-      return handlePrepare(playWhenReady);
-    }
+    return playerState == Player.STATE_IDLE
+        ? handleIdle(playWhenReady)
+        : handlePrepare(playWhenReady);
   }
 
   /**
@@ -167,7 +166,8 @@ public final class AudioFocusManager {
    * @param playWhenReady The current state of {@link ExoPlayer#getPlayWhenReady()}.
    * @return A {@link PlayerCommand} to execute on the player.
    */
-  public @PlayerCommand int handlePrepare(boolean playWhenReady) {
+  @PlayerCommand
+  public int handlePrepare(boolean playWhenReady) {
     return playWhenReady ? requestAudioFocus() : PLAYER_COMMAND_DO_NOT_PLAY;
   }
 
@@ -178,16 +178,14 @@ public final class AudioFocusManager {
    * @param playerState The current state of the player.
    * @return A {@link PlayerCommand} to execute on the player.
    */
-  public @PlayerCommand int handleSetPlayWhenReady(boolean playWhenReady, int playerState) {
+  @PlayerCommand
+  public int handleSetPlayWhenReady(boolean playWhenReady, int playerState) {
     if (!playWhenReady) {
       abandonAudioFocus();
       return PLAYER_COMMAND_DO_NOT_PLAY;
-    } else if (playerState != Player.STATE_IDLE) {
-      return requestAudioFocus();
     }
-    return focusGain != C.AUDIOFOCUS_NONE
-        ? PLAYER_COMMAND_WAIT_FOR_CALLBACK
-        : PLAYER_COMMAND_PLAY_WHEN_READY;
+
+    return playerState == Player.STATE_IDLE ? handleIdle(playWhenReady) : requestAudioFocus();
   }
 
   /** Called by the player as part of {@link ExoPlayer#stop(boolean)}. */
@@ -197,7 +195,13 @@ public final class AudioFocusManager {
 
   // Internal methods.
 
-  private @PlayerCommand int requestAudioFocus() {
+  @PlayerCommand
+  private int handleIdle(boolean playWhenReady) {
+    return playWhenReady ? PLAYER_COMMAND_PLAY_WHEN_READY : PLAYER_COMMAND_DO_NOT_PLAY;
+  }
+
+  @PlayerCommand
+  private int requestAudioFocus() {
     int focusRequestResult;
 
     if (focusGain == C.AUDIOFOCUS_NONE) {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/audio/AudioFocusManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/audio/AudioFocusManagerTest.java
index b175828d44..086c4ebc7f 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/audio/AudioFocusManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/audio/AudioFocusManagerTest.java
@@ -58,7 +58,7 @@ public class AudioFocusManagerTest {
     assertThat(
             audioFocusManager.setAudioAttributes(
                 /* audioAttributes= */ null, /* playWhenReady= */ false, Player.STATE_IDLE))
-        .isEqualTo(PLAYER_COMMAND_WAIT_FOR_CALLBACK);
+        .isEqualTo(PLAYER_COMMAND_DO_NOT_PLAY);
     assertThat(
             audioFocusManager.setAudioAttributes(
                 /* audioAttributes= */ null, /* playWhenReady= */ true, Player.STATE_READY))
@@ -148,7 +148,7 @@ public class AudioFocusManagerTest {
     assertThat(
             audioFocusManager.setAudioAttributes(
                 media, /* playWhenReady= */ true, Player.STATE_IDLE))
-        .isEqualTo(PLAYER_COMMAND_WAIT_FOR_CALLBACK);
+        .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
     assertThat(Shadows.shadowOf(audioManager).getLastAudioFocusRequest()).isNull();
     assertThat(audioFocusManager.handlePrepare(/* playWhenReady= */ true))
         .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);

From c7f763a3692b1bd24f24e0e9492360bfe937a74f Mon Sep 17 00:00:00 2001
From: Arnold Szabo <szaboaarnold@gmail.com>
Date: Thu, 8 Nov 2018 22:22:23 +0200
Subject: [PATCH 181/832] #1583 - Modify in event time generation of TtmlNode

Look for "div" tags when generating the set of times.
---
 .../exoplayer2/text/ttml/TtmlDecoder.java     |  8 ++++++--
 .../exoplayer2/text/ttml/TtmlNode.java        | 20 ++++++++++++-------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java
index 8be5af5a3f..6da9502e1b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java
@@ -479,7 +479,7 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
     long startTime = C.TIME_UNSET;
     long endTime = C.TIME_UNSET;
     String regionId = TtmlNode.ANONYMOUS_REGION_ID;
-    String imageId = "";
+    String imageId = null;
     String[] styleIds = null;
     int attributeCount = parser.getAttributeCount();
     TtmlStyle style = parseStyleAttributes(parser, null);
@@ -511,7 +511,11 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
           }
           break;
         case ATTR_IMAGE:
-          imageId = value.substring(1);
+          // Parse URI reference only if refers to an element in the same document (it must start with '#')
+          // Resolving URIs from external sources is not supported
+          if (value.startsWith("#")) {
+            imageId = value.substring(1);
+          }
           break;
         default:
           // Do nothing.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
index 6b2a524e49..479d6a1771 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
@@ -159,7 +159,8 @@ import java.util.TreeSet;
 
   private void getEventTimes(TreeSet<Long> out, boolean descendsPNode) {
     boolean isPNode = TAG_P.equals(tag);
-    if (descendsPNode || isPNode) {
+    boolean isDivNode = TAG_DIV.equals(tag);
+    if (descendsPNode || isPNode || (isDivNode && imageId != null)) {
       if (startTimeUs != C.TIME_UNSET) {
         out.add(startTimeUs);
       }
@@ -180,7 +181,7 @@ import java.util.TreeSet;
   }
 
   public List<Cue> getCues(long timeUs, Map<String, TtmlStyle> globalStyles,
-                           Map<String, TtmlRegion> regionMap, Map<String, String> imageMap) {
+      Map<String, TtmlRegion> regionMap, Map<String, String> imageMap) {
 
     TreeMap<String, SpannableStringBuilder> regionOutputs = new TreeMap<>();
     List<Pair<String, String>> regionImageList = new ArrayList<>();
@@ -204,7 +205,7 @@ import java.util.TreeSet;
               Cue.TYPE_UNSET,
               region.line,
               region.lineAnchor,
-              region.width,
+              region.width == Cue.DIMEN_UNSET ? 0.5f : region.width,
               Cue.DIMEN_UNSET
           )
       );
@@ -229,12 +230,17 @@ import java.util.TreeSet;
     return cues;
   }
 
-  private void traverseForImage(long timeUs, String inheritedRegion, List<Pair<String, String>> regionImageList) {
-      // TODO isActive needed?
+  private void traverseForImage(
+      long timeUs,
+      String inheritedRegion,
+      List<Pair<String, String>> regionImageList) {
 
     String resolvedRegionId = ANONYMOUS_REGION_ID.equals(regionId) ? inheritedRegion : regionId;
-    if (TAG_DIV.equals(tag) && imageId != null) {
-      regionImageList.add(new Pair<>(resolvedRegionId, imageId));
+
+    if (isActive(timeUs)) {
+      if (TAG_DIV.equals(tag) && imageId != null) {
+        regionImageList.add(new Pair<>(resolvedRegionId, imageId));
+      }
     }
 
     for (int i = 0; i < getChildCount(); ++i) {

From d159050eebc7b93ab816bd4b97a38d8972cb4875 Mon Sep 17 00:00:00 2001
From: Arnold Szabo <szaboaarnold@gmail.com>
Date: Sat, 10 Nov 2018 17:07:07 +0200
Subject: [PATCH 182/832] #1583 - Set default region attrs in SubtitlePainter,
 extend TtmlDecoderTest

---
 demos/main/src/main/assets/media.exolist.json |  5 --
 .../exoplayer2/text/ttml/TtmlNode.java        |  4 +-
 .../src/test/assets/ttml/bitmap_region.xml    | 26 ++++++++
 .../assets/ttml/bitmap_unsupported_region.xml | 23 +++++++
 .../exoplayer2/text/ttml/TtmlDecoderTest.java | 65 +++++++++++++++++++
 .../exoplayer2/ui/SubtitlePainter.java        | 16 +++++
 6 files changed, 132 insertions(+), 7 deletions(-)
 create mode 100644 library/core/src/test/assets/ttml/bitmap_region.xml
 create mode 100644 library/core/src/test/assets/ttml/bitmap_unsupported_region.xml

diff --git a/demos/main/src/main/assets/media.exolist.json b/demos/main/src/main/assets/media.exolist.json
index 74b57625d1..c2acf3990b 100644
--- a/demos/main/src/main/assets/media.exolist.json
+++ b/demos/main/src/main/assets/media.exolist.json
@@ -2,11 +2,6 @@
   {
     "name": "YouTube DASH",
     "samples": [
-      {
-        "name": "DVB Image sub",
-        "uri": "https://livesim.dashif.org/dash/vod/testpic_2s/img_subs.mpd",
-        "extension": "mpd"
-      },
       {
         "name": "Google Glass (MP4,H264)",
         "uri": "https://www.youtube.com/api/manifest/dash/id/bf5bb2419360daf1/source/youtube?as=fmp4_audio_clear,fmp4_sd_hd_clear&sparams=ip,ipbits,expire,source,id,as&ip=0.0.0.0&ipbits=0&expire=19000000000&signature=51AF5F39AB0CEC3E5497CD9C900EBFEAECCCB5C7.8506521BFC350652163895D4C26DEE124209AA9E&key=ik0",
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
index 479d6a1771..a20b9df24f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
@@ -202,10 +202,10 @@ import java.util.TreeSet;
       cues.add(
           new Cue(decodedByte,
               region.position,
-              Cue.TYPE_UNSET,
+              Cue.ANCHOR_TYPE_MIDDLE,
               region.line,
               region.lineAnchor,
-              region.width == Cue.DIMEN_UNSET ? 0.5f : region.width,
+              region.width,
               Cue.DIMEN_UNSET
           )
       );
diff --git a/library/core/src/test/assets/ttml/bitmap_region.xml b/library/core/src/test/assets/ttml/bitmap_region.xml
new file mode 100644
index 0000000000..2be95a3932
--- /dev/null
+++ b/library/core/src/test/assets/ttml/bitmap_region.xml
@@ -0,0 +1,26 @@
+<tt xmlns="http://www.w3.org/ns/ttml" xmlns:ttm="http://www.w3.org/ns/ttml#metadata" xmlns:tts="http://www.w3.org/ns/ttml#styling" xmlns:smpte="http://www.smpte-ra.org/schemas/2052-1/2010/smpte-tt" xml:lang="eng">
+    <head>
+        <metadata>
+            <smpte:image imagetype="PNG" encoding="Base64" xml:id="img_0">
+                iVBORw0KGgoAAAANSUhEUgAAAXAAAABICAYAAADvR65LAAAACXBIWXMAAAsTAAALEwEAmpwYAAANIUlEQVR4nO2d/5GjSA+GNVVfALMh4EyucAIXxDiGCWFiwKngukwghA1h74/vxMia/t3qNtjvU7W1u8Ygtbp53agFvL2/v/8hAAAAh+N/j3YAAABAGRBwAAA4KBBwAAA4KC8j4MMwEBHRuq4P9qQ/vdv+yrFOBTECFhxawFNPgnEc6Xw+ExHRPM90u92a+7YXerZ9HEc6nU50Op2IiGhZFprnGSKleOXxCGwxE/BxHLd/uwYkb1+WpeqE1iLBLMuy/XEdX54wRyEW01RCbbeyMQwDnc/nzRYRBfvjWUmN517Ho9V4eDTP0o4YJgLOJ+/pdHLOKMZxpMvlQkRE0zQVn9B8HC3eknmeq2zsBSmI8zw3EUJLG1K85Y/psiyWLu+aHn3WkqP7zzxLO1IwEXB92ezbzsEsQYu3Fge2wX+etcNKaC2iwzDc9cs0TU896wFgL5gKuEug9cldIqxyhk/0c5bNNng7xOMbGYuWcZF9jPgD0IdqAY8JdGx2nkJsYWxdV1rXFcLhoXVcQiktAEA7igScqz+I6MeCotwmt7N4l5ZP+VIntZT4k7NP7Luu7fqKQsc4N3Ytbej+1p9pm67PYrYs4l3SDzlYx7PVeAwdI8f/Hn1Zsm9tP9SOtdz21WYosgVclkAR3QdIpjnkdv77crls4ltaPlU72/N1bKzkTadxUvaRsXItrLrKyfgzPQhLY9fShus4cmzIdms/2Cbvp+NTG2+XDT4Gp3lcNlLbHotDajx7jkcr/3v0Zcm+pf1gNdb02A+NI+mrhO2mjr9sAT+dTj8cldtCAqtn4yVwh5T+ALDvLj9Pp5NTaIdhoMvl4my3r/KGbZ3PZ1qWxbuw6ion89kpzTO3suEbC7IaRbbb98Ovv1cab2lDnsCaZVl+nOjaBlFe6qk0nj3Ho6X/PfqyZN/cdliNtZxxFKqmy52NZws4/0IwoXpWKdhStHMFiG2yLT75SsqE2B9XG/h4evYgO1jvJ39FLXLNXMWhxVHarU0hWdmQcdQlhPrfEletuEyxWcQ71M/yhJPb+XP+k9qfNfFsMR7ZXuo5UeN/bV/6fC3ZN7cd1mONjy3HEJdP8/5sU44/uV8u2QJ+u902Zz4+PojIPe2XjnJgS3N067rSPM/O3JYMXsol2TzPd6I/DAMty7IFWp+4crDI6he5Hw8YCwFf15Wu1+uWS+OT2LK23coGjwV5c1VKX8v+4v/LWbpFvGP9zPblmJEzo9PplJTTJaqLp+V4lNuXZaHr9Rr1vdb/0r6M+Vqyb247rMeaFmk50eRtevLgSjdxW1KoqkKJXR5KR2vFh4/vynHJf8cuH7Wv67pug1BfCukFBtkO/lGR/ozjiEoYig8+LZyMZbxj/ewSDbm9FzXjUZ78epLjmr23ILUvc3zt0c7WY0366JsMuK48mi9iMjIAOemTGm632zawXTnMlEueHF907kzvyyebLwcG3Pgu7y3jbVmp1JKa8ejL70vhaC3gqX2Z42uPdrYea/pHWPooNYy/V9pPxQIuBVrDq7rsrCWy5lteusv8plU6g48nbWtk+3LypsAN4h2G48OTFR0PGb9Hx6fG1x7tbDnWfIKshf3r62ubAJfc9p8s4PohUvJvmUti5Hadd7SaFXAOVua82GavdIbuZNAWxPubI1351fj6qHa2GGvrutI0TbQsy12OnOg7Z9+kjNAl0nKbD520b4Er5wTAM5OSmtxLGqnG1yO1MxVebNV5dpkaJkqraksWcLnSHMofhbbV5HpS/Ou9AEV0/8t8tIF0RBDv/1Nb2dWTGl8f2c6asea6Q1nDQk70fWOPq3IlRLKAy/IcLq/hMhgJp0x4u5x1t+4Ea/HW+Sq9kiwXcvn7oBzEO8yjJikl1Pjao509xlpokVQjq+ykDzHNzFrElHWY7Jg2oJ22EG25KOrLoctLD6vKF70SfT6f70rPdHrIZ9M1EGWbYvSoKOhVtRDCKt57oEU8ZXxC5XMWz0ap9b/GV8t2+tphOdZ4kVXa0Hokt43jGNTOHIpupWeHXY3i7ZYnmMwNuWzLhQAim7pzeSxd6cK29fPJXXWejBbr0JoC0f2g1O2z+mHsYSOXmng/mh7xlPGRN8oxfJ7M85x8I08r/2t8rdk3tR1WY01mHLRNmXom+r5ZjO3IK4GSeBcLuEugLZ79HUM3kn1ipmkyXSzlSxvuJA5+ik3dOVz3mfpL63p8AH+ee3I+0kYONfHeA63j6YsP0f154EoL9Pa/xtfadqa0w3Ks+c5v12STv+9Dp55DFAl4LD1ilcJg5G2orudZsL1QmWLIH+mv63syP6UvjXx3ovF+8upB2tPPEPH5patrSuIaa3utjVj8UvyQlMY7xb6ln759U+LZajzGzoMe/lv5WrNvajtqxpq0JdMxof154it1TB8np+/e3t/f/yR98z94lu0TcIv8W4p9TWzGzy85DT35LNQul+3UqwzffvLzmF+S3Pr21LbX2EiJX8yPmF8p8a7t55R25Prt8qfFeCSyufK18D/lmKXnT+q+OeM6d6yN40hfX19E9D1Lzz2HdMaCKF83swUcAABeHSngn5+fD7vj1eSdmAAAAPoDAQcAgIMCAQcAgIMCAQcAgIMCAQcAgAL2cCcwBBwAADKRVSePfOY6yggBAOCgvP39B/od4p9fvxAgAB7EX79/vz3ahz2DFAoAABwUCDgAABwUCDgAABwUCPhOaP0QsBb08Hnvcdm7f6141XbvDQh4Q1IHOb8Pj4iy3kj9SHr4vPe47N2/Vrxqu/cIBNyYcRzvngvMyGcY+14JR0S7fVGBi5DP/LhRoro62UfFJdX/I/abBa/a7r0BATeEX5cUeuMOvwj6mS89+X2f/D7DPb7+LMTR/QevAwTcCC3erlcpyT+h92cehR4+HzEurwD6ZR9AwA3gGZt8756cZfObN3xv39nLbbk59PD5iHF5BdAv+wECboDrXXhyhr2uK63rGhzsRzwRevh8xLi8AuiXfQABN8KXOkklVLHi25ZbyuX6fk05mO948gdNL+jm2ukRF72vhf8lPliW5vn6JnRs3ifFh979AtxAwI0JLWD6CJVl6W1sw/WW+9DLhF37SH9zy8FcPvNnWgAvl8tmL8dO67j47JX47xP8mA86/Vbit68d7K/2Sy+iy+9LH5Zlcba1d78APxBwY/iEzxXEUFkWb5Mi4bLrqm5JqYzx2S3xWQsB+yavUPYQl5g9fYyY/9qXFB+GYaDL5eK1WVNjLY+p/ZeL6LLiRsM/WqH29uoX4AYCbgDPKHjg8ozKugztdDptthhpU89q9OxOpndcteq1LMtC0zRtbWekvy2qF3Lj4qPG/5K+keKt9+PPa8eObIe8F0GjhViO4VIfrPoF+IGAG7CuK83z7Myd8iC2uGyc5/nuB2EYBlqWhS6Xy2ZTzpakEPC+t9tty/P6Zl6lrOtK1+t1y3XySdp6ppUblxb+1/YN25C2WTyv12t+UP5Djj3+v15gn6Zp+zcR3flQ8yNv1S/ADwTcCB6Irhyq/HfNZbG+fF/XdTtB9YyaRZr3k3a5KsZ6Bv4ocuKyBx9038gfCD0ZqJ2psoiG9tfb2Hei7/FbYn8P/fLsQMANud1u2+DUQk50P6MpEfGc9INv0bL0eHtmD+0o7RseL67jhW78yvErp3ImlLcusQ3aAgE3RtZ8y+oPubBzPp+7XDpKkUCucV9w3/CPuuuuXfn/VuNFVyhZCjhoDwS8Ibfbbcs5E92vzo/jiPwfIKI2C8opyAol1wInRHz/QMA7oPOaODEAk3LjV4tUhBbvaZrurtQ+Pj62xUawXyDgnZCLNwAwehGzF/rGHn01iPz1MYCAd6S3eMsfjNht1KAfe/gxl+sj4LhAwA3gG2aIyFuy5buhphVSJHw3kvQQkNoqikfTwn8up4uVCbZ8doguE9QzcFwpHgMIuAG6bNC1GKTv7GstaLKWl4ju8p1E9TdpxGwzuu1HqIjp4b9cE9F9Q/TdP/M8V93I40Pbkp/pNoP9AgE3Rp/sRPezmWmaur2GikWCxYAfytRjduV6tAB/3kKQrGntP894WbzlA7N0CWGL9Jd8/EPIPtg3EHAD+GTU9d46ZRK6nT6UUolt4+36e/I2adet/UTuhzelEvNLV96UpI1axCXVbor/NT7Iu3ddKbaaxy/E2sxjY1mWH1eP8imCJcdv2S/gnre///x5tA+75p9fv7IC5Mstxy69+SW6vsd3+rZJmyEb8iW97M/5fN5KxT4/P7Pr0lP9kljasIhLiBT/LXxw2alN1cT8cn1X2ib6FvDc2Fv2y1+/f79F3H9pIOARcgX8SIzjSF9fX0RUJuAAtAYCHgYplBcGuU4Ajg0E/ImRl8b6clU/EQ8AcDwg4E+MrECRz2Ym+vnSAIg4AMcDAv7E6OdK88KRrpDBm1EAOCYQ8CeGH6JF9PNFE0Q/X/QAADgWqEKJ8AxVKJzv1nXgR7grErw2qEIJAwGP8AwCDsBRgYCH+RdHEwkWLXE/8gAAAABJRU5ErkJggg==
+            </smpte:image>
+            <smpte:image imagetype="PNG" encoding="Base64" xml:id="img_1">
+                iVBORw0KGgoAAAANSUhEUgAAAaAAAAAkCAIAAABAAnl0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAIBklEQVR4nO1d65GrPAz1nfkKSAu4FWglqeXWQFohrZhW7o8zaBS/kB+QhE/nx86uA5YsnT1+CHb/3G43o1AoFFfEf592QKFQKI6CCpxCobgsVOAUCsVloQL3SxiGwRizruuht5TiBBM/hJ+Lxs85XAQVuJ/BOI7TNBljlmV5vV4H3XKCVxfGz0Xj5xwuRaXAjeOIb7ygoN05J58QqCuOoh7+PyAu8sZULjK3lOIEE5fBB6ORT1MK105fjcANwzBNk7XWU/1xHB+PhzFmnmehPOEWa63X7pxblsU5d8lZpSOQi2maEK4jZoUTTCjaoWmKokbgrLWQJOdc2I74VnRLd6Gfx+OBWUU1jlAXWMWZ0Bx9FeoFzhOyYRhI9Spmj2VZaJGM/jEdoU/VOMOCoNH4WmiOvg3FApcSstSyTg5ODpwmQOCmaVK6ABqH74fm6KsgFTjUkg0TMt5I7VC39sIzWGI3jOMY5Q05kLIVeiL0TXJZx4c2hO3hj5QOnpeObh9qopon8rTmTVTctbtT2R1U46hTDlekqdHDipHWpanuSkAkcFRLNix8tH+kdnx9PB6QucbC8+v1ggkgLNeSS8YY51xYkeAlcPOeeBQxUkShnqPdUo0l31WIYRhQhHHOPZ/PqJ/c1v1+hxUUbbzL8COndSbyIfUlbh9kojqAYbhCi8iXZyLqMPXj1cRS6aBoUAs8D6+JmpNQa3fI0XuL0pRC9/T1SlOR0RAigeOJ4Y3cM6+9y1Hrsiywa60dhoGvXHBCxy+GRS86dDt95X56zIYAhd1aa0mPotfYoKCcAepcfDh8LNQJL1XzKw2r6Idu0OIiE4dMBKLe9jXRHkCTTatzjv+2cxPmnR4IO/LrBSF8ciJa7o8u5aJPXUiolYKE7fI0pXBE+rqkqdSoB5HAQS+5017+SNRI17o84YEOU0rKfaDTuujGAb55Q4DQcNGkINJAaP0IPeLX8N7orrxY0KfoEz9623wSPs7RVHDmeeZzD7kU3iKJwAkmGgMosUhx82pWQB0n4TZ1S9wouj1Prd1OMmwvSlMKjemLClOmZ3maGjkjErjX6wWT9/vdBCtzSj8C3fcBHAicMYZPs+u6zvNsNsmARnhrXQ6UaBGLYRicc9gq8lDyiNPo6MAFhiisy7JgpGQabNudjbEm5Vnk8s2Fj9QtxdF1XZ/PJzlALlVH4AQT7QGUWAQ/6TeTFl9yNfHAucEjIDwPklArg122F6Upher04UqbLgY2pqmRM2VVVJtY91L+Tnu8kBvCJGbeBYKDO4yLvYUh7Qc97V7X1TvRN9u6Bu3rui7Lgq52F0TkTChq9Cn4RLZMp+eqdiNwgoleAdy16JGe2ruM0SPe7i0Sau2iiO11KEofpQnpozk7WgxsSVM7ZwoEjozt7k9PA7mUp++uY5TIzCj4NZ45osIu4XgWMU3xkIIomKDIVhcGn5CaoiBXB7DIYkfAQywZipIioZYQQrbXofp3BJqVmSxbRt3OmQKBIyHjjZigzGFsiy5kxnGkkfdKOfWQCZZl5WPyx1uO5U95vOnXMCHzevPar4H2AH4EfDnz9+9fzEbyN6Ik1MrgCLbXITUQnsru6WvkzI7ARYPr1XSonW+tu6w7UupGR358Mjkz65n5aheOHVHTnIFGbyb8yKL4HLQE8HzgFMxthT9+AN/4LNQuvoHtuzjHqzrO7AhcWJ82QU3aM790/bME3qTB8w3Oof1+v0NeT0BGdyR6RMsBCqPX4eUFrjGAHwEO8vl5EzJo09XDdnwD278E1ZzZETi31Xf5ZjhcKPLGXsdGtPk1QS3ZGDPPM2fVyccxjcXicKWG3kLhO61ocybaA/gpQObM9hTrdPCrhN/AdgmiO62+qObMjsBR+RkzCSq19Cm2pWgnDepFXL4k9NbA3ePID1lSTxLw+kAL+DEc9ex9E/3x19ErgN8AyA1NRZmnTyTUSuGrzmFTA+le8Y8are5hv8hAD56YYE3Bl299J2T+4Dg/0eMn9HxOa/y14ZWgaZqiT9bQNdHKdNErcjxt3uKXtxcNAc4fuixqNNExgB3hMYfvGzjGcYySfxcSaqVQx/aDmJAaSHQh0t1oNWekr2rZ2IMgaO8yMGvt/X53rPRLi3PeOX3PS7c29iZZKfiTNaEhLI/pGjoZoWsQByF9vRFx+Y4KXwb87YiD9rYdTfQKYBd4KabvQy5hunVbIaj0JEFCLYmHebafwIToQGghctCJSiNnCgRu6foH4EIT3rmpe3/QmTdibMS5Lrue1+tlt2Njr2fafWMWRaBD6/I9CM1L5l3saPdqSqK6bG/s0pl3d6XoZaJXALuAS9W0vZQavdJuTyqEH/HDmRQk1Ep5WMT2o5kQpo+cmee5b3UxY9SUcEYqcKl9qHChkULqdrf9yXLPolewt+w1t2jiU53TbMzbn8+ne38HGFdykaXDF+KQ21D0cAzmpdCHlG/54dAsZ4MHFYsikEJHE10CWDGosJHrDh+mCbQMVJzeX0dP+Ry1LqFWiAq2Z9KUQnv6woVIRc+ZW1o48+d2u2U+BrBYC+Wmy7kJP6QEJIsX/q9quKhH/wlOWORKjSj0J/XHW/g18tWW51vKAZOIan44UZ8rIhBFXxONASy1KPTEbe9LRrlk3nctpjBHRkatKIRsrzPRmL5M7jqmKRyakDMigVMoFIpfhP5fVIVCcVmowCkUistCBU6hUFwWKnAKheKyUIFTKBSXhQqcQqG4LFTgFArFZfEPuuTdBr3uWzgAAAAASUVORK5CYII=
+            </smpte:image>
+        </metadata>
+        <styling>
+            <style/>
+        </styling>
+        <layout>
+            <region xml:id="region_0" tts:extent="51% 12%" tts:origin="24% 78%"/>
+            <region xml:id="region_1" tts:extent="57% 6%" tts:origin="21% 85%"/>
+            <region xml:id="region_2" tts:extent="51% 12%" tts:origin="24% 28%"/>
+            <region xml:id="region_3" tts:extent="57% 6%" tts:origin="21% 35%"/>
+        </layout>
+    </head>
+    <body>
+        <div begin="00:00:00.200" end="00:00:03.000" region="region_2" smpte:backgroundImage="#img_0"/>
+        <div begin="00:00:03.200" end="00:00:06.937" region="region_3" smpte:backgroundImage="#img_1"/>
+        <div begin="00:00:07.200" end="00:59:03.000" region="region_2" smpte:backgroundImage="#img_0"/>
+    </body>
+</tt>
\ No newline at end of file
diff --git a/library/core/src/test/assets/ttml/bitmap_unsupported_region.xml b/library/core/src/test/assets/ttml/bitmap_unsupported_region.xml
new file mode 100644
index 0000000000..611d8c7dce
--- /dev/null
+++ b/library/core/src/test/assets/ttml/bitmap_unsupported_region.xml
@@ -0,0 +1,23 @@
+<tt xmlns="http://www.w3.org/ns/ttml" xmlns:ttm="http://www.w3.org/ns/ttml#metadata" xmlns:tts="http://www.w3.org/ns/ttml#styling" xmlns:smpte="http://www.smpte-ra.org/schemas/2052-1/2010/smpte-tt" xml:lang="eng" tts:extent="1280px 720px">
+    <head>
+        <metadata>
+            <smpte:image imagetype="PNG" encoding="Base64" xml:id="img_0">
+                iVBORw0KGgoAAAANSUhEUgAAAXAAAABICAYAAADvR65LAAAACXBIWXMAAAsTAAALEwEAmpwYAAANIUlEQVR4nO2d/5GjSA+GNVVfALMh4EyucAIXxDiGCWFiwKngukwghA1h74/vxMia/t3qNtjvU7W1u8Ygtbp53agFvL2/v/8hAAAAh+N/j3YAAABAGRBwAAA4KBBwAAA4KC8j4MMwEBHRuq4P9qQ/vdv+yrFOBTECFhxawFNPgnEc6Xw+ExHRPM90u92a+7YXerZ9HEc6nU50Op2IiGhZFprnGSKleOXxCGwxE/BxHLd/uwYkb1+WpeqE1iLBLMuy/XEdX54wRyEW01RCbbeyMQwDnc/nzRYRBfvjWUmN517Ho9V4eDTP0o4YJgLOJ+/pdHLOKMZxpMvlQkRE0zQVn9B8HC3eknmeq2zsBSmI8zw3EUJLG1K85Y/psiyWLu+aHn3WkqP7zzxLO1IwEXB92ezbzsEsQYu3Fge2wX+etcNKaC2iwzDc9cs0TU896wFgL5gKuEug9cldIqxyhk/0c5bNNng7xOMbGYuWcZF9jPgD0IdqAY8JdGx2nkJsYWxdV1rXFcLhoXVcQiktAEA7igScqz+I6MeCotwmt7N4l5ZP+VIntZT4k7NP7Luu7fqKQsc4N3Ytbej+1p9pm67PYrYs4l3SDzlYx7PVeAwdI8f/Hn1Zsm9tP9SOtdz21WYosgVclkAR3QdIpjnkdv77crls4ltaPlU72/N1bKzkTadxUvaRsXItrLrKyfgzPQhLY9fShus4cmzIdms/2Cbvp+NTG2+XDT4Gp3lcNlLbHotDajx7jkcr/3v0Zcm+pf1gNdb02A+NI+mrhO2mjr9sAT+dTj8cldtCAqtn4yVwh5T+ALDvLj9Pp5NTaIdhoMvl4my3r/KGbZ3PZ1qWxbuw6ion89kpzTO3suEbC7IaRbbb98Ovv1cab2lDnsCaZVl+nOjaBlFe6qk0nj3Ho6X/PfqyZN/cdliNtZxxFKqmy52NZws4/0IwoXpWKdhStHMFiG2yLT75SsqE2B9XG/h4evYgO1jvJ39FLXLNXMWhxVHarU0hWdmQcdQlhPrfEletuEyxWcQ71M/yhJPb+XP+k9qfNfFsMR7ZXuo5UeN/bV/6fC3ZN7cd1mONjy3HEJdP8/5sU44/uV8u2QJ+u902Zz4+PojIPe2XjnJgS3N067rSPM/O3JYMXsol2TzPd6I/DAMty7IFWp+4crDI6he5Hw8YCwFf15Wu1+uWS+OT2LK23coGjwV5c1VKX8v+4v/LWbpFvGP9zPblmJEzo9PplJTTJaqLp+V4lNuXZaHr9Rr1vdb/0r6M+Vqyb247rMeaFmk50eRtevLgSjdxW1KoqkKJXR5KR2vFh4/vynHJf8cuH7Wv67pug1BfCukFBtkO/lGR/ozjiEoYig8+LZyMZbxj/ewSDbm9FzXjUZ78epLjmr23ILUvc3zt0c7WY0366JsMuK48mi9iMjIAOemTGm632zawXTnMlEueHF907kzvyyebLwcG3Pgu7y3jbVmp1JKa8ejL70vhaC3gqX2Z42uPdrYea/pHWPooNYy/V9pPxQIuBVrDq7rsrCWy5lteusv8plU6g48nbWtk+3LypsAN4h2G48OTFR0PGb9Hx6fG1x7tbDnWfIKshf3r62ubAJfc9p8s4PohUvJvmUti5Hadd7SaFXAOVua82GavdIbuZNAWxPubI1351fj6qHa2GGvrutI0TbQsy12OnOg7Z9+kjNAl0nKbD520b4Er5wTAM5OSmtxLGqnG1yO1MxVebNV5dpkaJkqraksWcLnSHMofhbbV5HpS/Ou9AEV0/8t8tIF0RBDv/1Nb2dWTGl8f2c6asea6Q1nDQk70fWOPq3IlRLKAy/IcLq/hMhgJp0x4u5x1t+4Ea/HW+Sq9kiwXcvn7oBzEO8yjJikl1Pjao509xlpokVQjq+ykDzHNzFrElHWY7Jg2oJ22EG25KOrLoctLD6vKF70SfT6f70rPdHrIZ9M1EGWbYvSoKOhVtRDCKt57oEU8ZXxC5XMWz0ap9b/GV8t2+tphOdZ4kVXa0Hokt43jGNTOHIpupWeHXY3i7ZYnmMwNuWzLhQAim7pzeSxd6cK29fPJXXWejBbr0JoC0f2g1O2z+mHsYSOXmng/mh7xlPGRN8oxfJ7M85x8I08r/2t8rdk3tR1WY01mHLRNmXom+r5ZjO3IK4GSeBcLuEugLZ79HUM3kn1ipmkyXSzlSxvuJA5+ik3dOVz3mfpL63p8AH+ee3I+0kYONfHeA63j6YsP0f154EoL9Pa/xtfadqa0w3Ks+c5v12STv+9Dp55DFAl4LD1ilcJg5G2orudZsL1QmWLIH+mv63syP6UvjXx3ovF+8upB2tPPEPH5patrSuIaa3utjVj8UvyQlMY7xb6ln759U+LZajzGzoMe/lv5WrNvajtqxpq0JdMxof154it1TB8np+/e3t/f/yR98z94lu0TcIv8W4p9TWzGzy85DT35LNQul+3UqwzffvLzmF+S3Pr21LbX2EiJX8yPmF8p8a7t55R25Prt8qfFeCSyufK18D/lmKXnT+q+OeM6d6yN40hfX19E9D1Lzz2HdMaCKF83swUcAABeHSngn5+fD7vj1eSdmAAAAPoDAQcAgIMCAQcAgIMCAQcAgIMCAQcAgAL2cCcwBBwAADKRVSePfOY6yggBAOCgvP39B/od4p9fvxAgAB7EX79/vz3ahz2DFAoAABwUCDgAABwUCDgAABwUCPhOaP0QsBb08Hnvcdm7f6141XbvDQh4Q1IHOb8Pj4iy3kj9SHr4vPe47N2/Vrxqu/cIBNyYcRzvngvMyGcY+14JR0S7fVGBi5DP/LhRoro62UfFJdX/I/abBa/a7r0BATeEX5cUeuMOvwj6mS89+X2f/D7DPb7+LMTR/QevAwTcCC3erlcpyT+h92cehR4+HzEurwD6ZR9AwA3gGZt8756cZfObN3xv39nLbbk59PD5iHF5BdAv+wECboDrXXhyhr2uK63rGhzsRzwRevh8xLi8AuiXfQABN8KXOkklVLHi25ZbyuX6fk05mO948gdNL+jm2ukRF72vhf8lPliW5vn6JnRs3ifFh979AtxAwI0JLWD6CJVl6W1sw/WW+9DLhF37SH9zy8FcPvNnWgAvl8tmL8dO67j47JX47xP8mA86/Vbit68d7K/2Sy+iy+9LH5Zlcba1d78APxBwY/iEzxXEUFkWb5Mi4bLrqm5JqYzx2S3xWQsB+yavUPYQl5g9fYyY/9qXFB+GYaDL5eK1WVNjLY+p/ZeL6LLiRsM/WqH29uoX4AYCbgDPKHjg8ozKugztdDptthhpU89q9OxOpndcteq1LMtC0zRtbWekvy2qF3Lj4qPG/5K+keKt9+PPa8eObIe8F0GjhViO4VIfrPoF+IGAG7CuK83z7Myd8iC2uGyc5/nuB2EYBlqWhS6Xy2ZTzpakEPC+t9tty/P6Zl6lrOtK1+t1y3XySdp6ppUblxb+1/YN25C2WTyv12t+UP5Djj3+v15gn6Zp+zcR3flQ8yNv1S/ADwTcCB6Irhyq/HfNZbG+fF/XdTtB9YyaRZr3k3a5KsZ6Bv4ocuKyBx9038gfCD0ZqJ2psoiG9tfb2Hei7/FbYn8P/fLsQMANud1u2+DUQk50P6MpEfGc9INv0bL0eHtmD+0o7RseL67jhW78yvErp3ImlLcusQ3aAgE3RtZ8y+oPubBzPp+7XDpKkUCucV9w3/CPuuuuXfn/VuNFVyhZCjhoDwS8Ibfbbcs5E92vzo/jiPwfIKI2C8opyAol1wInRHz/QMA7oPOaODEAk3LjV4tUhBbvaZrurtQ+Pj62xUawXyDgnZCLNwAwehGzF/rGHn01iPz1MYCAd6S3eMsfjNht1KAfe/gxl+sj4LhAwA3gG2aIyFuy5buhphVSJHw3kvQQkNoqikfTwn8up4uVCbZ8doguE9QzcFwpHgMIuAG6bNC1GKTv7GstaLKWl4ju8p1E9TdpxGwzuu1HqIjp4b9cE9F9Q/TdP/M8V93I40Pbkp/pNoP9AgE3Rp/sRPezmWmaur2GikWCxYAfytRjduV6tAB/3kKQrGntP894WbzlA7N0CWGL9Jd8/EPIPtg3EHAD+GTU9d46ZRK6nT6UUolt4+36e/I2adet/UTuhzelEvNLV96UpI1axCXVbor/NT7Iu3ddKbaaxy/E2sxjY1mWH1eP8imCJcdv2S/gnre///x5tA+75p9fv7IC5Mstxy69+SW6vsd3+rZJmyEb8iW97M/5fN5KxT4/P7Pr0lP9kljasIhLiBT/LXxw2alN1cT8cn1X2ib6FvDc2Fv2y1+/f79F3H9pIOARcgX8SIzjSF9fX0RUJuAAtAYCHgYplBcGuU4Ajg0E/ImRl8b6clU/EQ8AcDwg4E+MrECRz2Ym+vnSAIg4AMcDAv7E6OdK88KRrpDBm1EAOCYQ8CeGH6JF9PNFE0Q/X/QAADgWqEKJ8AxVKJzv1nXgR7grErw2qEIJAwGP8AwCDsBRgYCH+RdHEwkWLXE/8gAAAABJRU5ErkJggg==
+            </smpte:image>
+            <smpte:image imagetype="PNG" encoding="Base64" xml:id="img_1">
+                iVBORw0KGgoAAAANSUhEUgAAAaAAAAAkCAIAAABAAnl0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAIBklEQVR4nO1d65GrPAz1nfkKSAu4FWglqeXWQFohrZhW7o8zaBS/kB+QhE/nx86uA5YsnT1+CHb/3G43o1AoFFfEf592QKFQKI6CCpxCobgsVOAUCsVloQL3SxiGwRizruuht5TiBBM/hJ+Lxs85XAQVuJ/BOI7TNBljlmV5vV4H3XKCVxfGz0Xj5xwuRaXAjeOIb7ygoN05J58QqCuOoh7+PyAu8sZULjK3lOIEE5fBB6ORT1MK105fjcANwzBNk7XWU/1xHB+PhzFmnmehPOEWa63X7pxblsU5d8lZpSOQi2maEK4jZoUTTCjaoWmKokbgrLWQJOdc2I74VnRLd6Gfx+OBWUU1jlAXWMWZ0Bx9FeoFzhOyYRhI9Spmj2VZaJGM/jEdoU/VOMOCoNH4WmiOvg3FApcSstSyTg5ODpwmQOCmaVK6ABqH74fm6KsgFTjUkg0TMt5I7VC39sIzWGI3jOMY5Q05kLIVeiL0TXJZx4c2hO3hj5QOnpeObh9qopon8rTmTVTctbtT2R1U46hTDlekqdHDipHWpanuSkAkcFRLNix8tH+kdnx9PB6QucbC8+v1ggkgLNeSS8YY51xYkeAlcPOeeBQxUkShnqPdUo0l31WIYRhQhHHOPZ/PqJ/c1v1+hxUUbbzL8COndSbyIfUlbh9kojqAYbhCi8iXZyLqMPXj1cRS6aBoUAs8D6+JmpNQa3fI0XuL0pRC9/T1SlOR0RAigeOJ4Y3cM6+9y1Hrsiywa60dhoGvXHBCxy+GRS86dDt95X56zIYAhd1aa0mPotfYoKCcAepcfDh8LNQJL1XzKw2r6Idu0OIiE4dMBKLe9jXRHkCTTatzjv+2cxPmnR4IO/LrBSF8ciJa7o8u5aJPXUiolYKE7fI0pXBE+rqkqdSoB5HAQS+5017+SNRI17o84YEOU0rKfaDTuujGAb55Q4DQcNGkINJAaP0IPeLX8N7orrxY0KfoEz9623wSPs7RVHDmeeZzD7kU3iKJwAkmGgMosUhx82pWQB0n4TZ1S9wouj1Prd1OMmwvSlMKjemLClOmZ3maGjkjErjX6wWT9/vdBCtzSj8C3fcBHAicMYZPs+u6zvNsNsmARnhrXQ6UaBGLYRicc9gq8lDyiNPo6MAFhiisy7JgpGQabNudjbEm5Vnk8s2Fj9QtxdF1XZ/PJzlALlVH4AQT7QGUWAQ/6TeTFl9yNfHAucEjIDwPklArg122F6Upher04UqbLgY2pqmRM2VVVJtY91L+Tnu8kBvCJGbeBYKDO4yLvYUh7Qc97V7X1TvRN9u6Bu3rui7Lgq52F0TkTChq9Cn4RLZMp+eqdiNwgoleAdy16JGe2ruM0SPe7i0Sau2iiO11KEofpQnpozk7WgxsSVM7ZwoEjozt7k9PA7mUp++uY5TIzCj4NZ45osIu4XgWMU3xkIIomKDIVhcGn5CaoiBXB7DIYkfAQywZipIioZYQQrbXofp3BJqVmSxbRt3OmQKBIyHjjZigzGFsiy5kxnGkkfdKOfWQCZZl5WPyx1uO5U95vOnXMCHzevPar4H2AH4EfDnz9+9fzEbyN6Ik1MrgCLbXITUQnsru6WvkzI7ARYPr1XSonW+tu6w7UupGR358Mjkz65n5aheOHVHTnIFGbyb8yKL4HLQE8HzgFMxthT9+AN/4LNQuvoHtuzjHqzrO7AhcWJ82QU3aM790/bME3qTB8w3Oof1+v0NeT0BGdyR6RMsBCqPX4eUFrjGAHwEO8vl5EzJo09XDdnwD278E1ZzZETi31Xf5ZjhcKPLGXsdGtPk1QS3ZGDPPM2fVyccxjcXicKWG3kLhO61ocybaA/gpQObM9hTrdPCrhN/AdgmiO62+qObMjsBR+RkzCSq19Cm2pWgnDepFXL4k9NbA3ePID1lSTxLw+kAL+DEc9ex9E/3x19ErgN8AyA1NRZmnTyTUSuGrzmFTA+le8Y8are5hv8hAD56YYE3Bl299J2T+4Dg/0eMn9HxOa/y14ZWgaZqiT9bQNdHKdNErcjxt3uKXtxcNAc4fuixqNNExgB3hMYfvGzjGcYySfxcSaqVQx/aDmJAaSHQh0t1oNWekr2rZ2IMgaO8yMGvt/X53rPRLi3PeOX3PS7c29iZZKfiTNaEhLI/pGjoZoWsQByF9vRFx+Y4KXwb87YiD9rYdTfQKYBd4KabvQy5hunVbIaj0JEFCLYmHebafwIToQGghctCJSiNnCgRu6foH4EIT3rmpe3/QmTdibMS5Lrue1+tlt2Njr2fafWMWRaBD6/I9CM1L5l3saPdqSqK6bG/s0pl3d6XoZaJXALuAS9W0vZQavdJuTyqEH/HDmRQk1Ep5WMT2o5kQpo+cmee5b3UxY9SUcEYqcKl9qHChkULqdrf9yXLPolewt+w1t2jiU53TbMzbn8+ne38HGFdykaXDF+KQ21D0cAzmpdCHlG/54dAsZ4MHFYsikEJHE10CWDGosJHrDh+mCbQMVJzeX0dP+Ry1LqFWiAq2Z9KUQnv6woVIRc+ZW1o48+d2u2U+BrBYC+Wmy7kJP6QEJIsX/q9quKhH/wlOWORKjSj0J/XHW/g18tWW51vKAZOIan44UZ8rIhBFXxONASy1KPTEbe9LRrlk3nctpjBHRkatKIRsrzPRmL5M7jqmKRyakDMigVMoFIpfhP5fVIVCcVmowCkUistCBU6hUFwWKnAKheKyUIFTKBSXhQqcQqG4LFTgFArFZfEPuuTdBr3uWzgAAAAASUVORK5CYII=
+            </smpte:image>
+        </metadata>
+        <styling>
+            <style/>
+        </styling>
+        <layout>
+            <region xml:id="region_0" tts:extent="653px 86px" tts:origin="307px 562px"/>
+            <region xml:id="region_1" tts:extent="730px 43px" tts:origin="269px 612px"/>
+        </layout>
+    </head>
+    <body>
+        <div begin="00:00:00.200" end="00:00:03.000" region="region_0" smpte:backgroundImage="#img_0"/>
+        <div begin="00:00:03.200" end="00:00:06.937" region="region_1" smpte:backgroundImage="#img_1"/>
+    </body>
+</tt>
\ No newline at end of file
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java
index fdf454e5df..3f0dc708ad 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java
@@ -63,6 +63,8 @@ public final class TtmlDecoderTest {
   private static final String FONT_SIZE_INVALID_TTML_FILE = "ttml/font_size_invalid.xml";
   private static final String FONT_SIZE_EMPTY_TTML_FILE = "ttml/font_size_empty.xml";
   private static final String FRAME_RATE_TTML_FILE = "ttml/frame_rate.xml";
+  private static final String BITMAP_REGION_FILE = "ttml/bitmap_region.xml";
+  private static final String BITMAP_UNSUPPORTED_REGION_FILE = "ttml/bitmap_unsupported_region.xml";
 
   @Test
   public void testInlineAttributes() throws IOException, SubtitleDecoderException {
@@ -499,6 +501,69 @@ public final class TtmlDecoderTest {
     assertThat((double) subtitle.getEventTime(3)).isWithin(2000).of(2_002_000_000);
   }
 
+  @Test
+  public void testBitmapWithRegion() throws IOException, SubtitleDecoderException{
+    TtmlSubtitle subtitle = getSubtitle(BITMAP_REGION_FILE);
+    List<Cue> output = subtitle.getCues(1000000);
+    assertThat(output).hasSize(1);
+    Cue ttmlCue = output.get(0);
+
+    assertThat(ttmlCue.text).isEqualTo(null);
+    assertThat(ttmlCue.bitmap).isNotNull();
+    assertThat(ttmlCue.position).isEqualTo(24f / 100f);
+    assertThat(ttmlCue.line).isEqualTo(28f / 100f);
+    assertThat(ttmlCue.size).isEqualTo(51f / 100f);
+    // bitmap should be displayed at its natural height for the specified width (= size)
+    assertThat(ttmlCue.bitmapHeight).isEqualTo(Cue.DIMEN_UNSET);
+
+    output = subtitle.getCues(4000000);
+    ttmlCue = output.get(0);
+
+    assertThat(ttmlCue.text).isEqualTo(null);
+    assertThat(ttmlCue.bitmap).isNotNull();
+    assertThat(ttmlCue.position).isEqualTo(21f / 100f);
+    assertThat(ttmlCue.line).isEqualTo(35f / 100f);
+    assertThat(ttmlCue.size).isEqualTo(57f / 100f);
+    // bitmap should be displayed at its natural height for the specified width (= size)
+    assertThat(ttmlCue.bitmapHeight).isEqualTo(Cue.DIMEN_UNSET);
+
+    output = subtitle.getCues(7500000);
+    ttmlCue = output.get(0);
+
+    assertThat(ttmlCue.text).isEqualTo(null);
+    assertThat(ttmlCue.bitmap).isNotNull();
+    assertThat(ttmlCue.position).isEqualTo(24f / 100f);
+    assertThat(ttmlCue.line).isEqualTo(28f / 100f);
+    assertThat(ttmlCue.size).isEqualTo(51f / 100f);
+    // bitmap should be displayed at its natural height for the specified width (= size)
+    assertThat(ttmlCue.bitmapHeight).isEqualTo(Cue.DIMEN_UNSET);
+  }
+
+  @Test
+  public void testBitmapWithUnsupportedRegion() throws IOException, SubtitleDecoderException{
+    TtmlSubtitle subtitle = getSubtitle(BITMAP_UNSUPPORTED_REGION_FILE);
+    List<Cue> output = subtitle.getCues(1000000);
+    assertThat(output).hasSize(1);
+    Cue ttmlCue = output.get(0);
+
+    assertThat(ttmlCue.text).isEqualTo(null);
+    assertThat(ttmlCue.bitmap).isNotNull();
+    assertThat(ttmlCue.position).isEqualTo(Cue.DIMEN_UNSET);
+    assertThat(ttmlCue.line).isEqualTo(Cue.DIMEN_UNSET);
+    assertThat(ttmlCue.size).isEqualTo(Cue.DIMEN_UNSET);
+    assertThat(ttmlCue.bitmapHeight).isEqualTo(Cue.DIMEN_UNSET);
+
+    output = subtitle.getCues(4000000);
+    ttmlCue = output.get(0);
+
+    assertThat(ttmlCue.text).isEqualTo(null);
+    assertThat(ttmlCue.bitmap).isNotNull();
+    assertThat(ttmlCue.position).isEqualTo(Cue.DIMEN_UNSET);
+    assertThat(ttmlCue.line).isEqualTo(Cue.DIMEN_UNSET);
+    assertThat(ttmlCue.size).isEqualTo(Cue.DIMEN_UNSET);
+    assertThat(ttmlCue.bitmapHeight).isEqualTo(Cue.DIMEN_UNSET);
+  }
+
   private void assertSpans(
       TtmlSubtitle subtitle,
       int second,
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java
index 4f22362de6..83b3ff3d1e 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java
@@ -355,6 +355,22 @@ import com.google.android.exoplayer2.util.Util;
   }
 
   private void setupBitmapLayout() {
+    // Default position
+    if (cuePosition == Cue.DIMEN_UNSET) {
+      cuePosition = 0.5f;
+    }
+
+    // Default line
+    if (cueLine == Cue.DIMEN_UNSET) {
+      cueLineAnchor = Cue.ANCHOR_TYPE_MIDDLE;
+      cueLine = 0.85f;
+    }
+
+    // Default width
+    if (cueSize == Cue.DIMEN_UNSET) {
+      cueSize = 0.5f;
+    }
+
     int parentWidth = parentRight - parentLeft;
     int parentHeight = parentBottom - parentTop;
     float anchorX = parentLeft + (parentWidth * cuePosition);

From 78ef90f61c8d2cd3f80ca4b34b4d5871cd0024b6 Mon Sep 17 00:00:00 2001
From: Arnold Szabo <szaboaarnold@gmail.com>
Date: Mon, 12 Nov 2018 23:11:44 +0200
Subject: [PATCH 183/832] Correcting default sizing of bitmaps, code review
 adjustments

---
 .../exoplayer2/text/ttml/TtmlDecoder.java     | 19 +++++++--------
 .../exoplayer2/text/ttml/TtmlNode.java        | 22 ++++++++++-------
 .../exoplayer2/ui/SubtitlePainter.java        | 24 +++++++++++++++----
 3 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java
index 6da9502e1b..378ec602c4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java
@@ -70,7 +70,6 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
   private static final String ATTR_REGION = "region";
   private static final String ATTR_IMAGE = "backgroundImage";
 
-
   private static final Pattern CLOCK_TIME =
       Pattern.compile("^([0-9][0-9]+):([0-9][0-9]):([0-9][0-9])"
           + "(?:(\\.[0-9]+)|:([0-9][0-9])(?:\\.([0-9]+))?)?$");
@@ -130,7 +129,7 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
               Log.i(TAG, "Ignoring unsupported tag: " + xmlParser.getName());
               unsupportedNodeDepth++;
             } else if (TtmlNode.TAG_HEAD.equals(name)) {
-              parseHeader(xmlParser, globalStyles, regionMap, cellResolution, imageMap);
+              parseHeader(xmlParser, globalStyles, cellResolution, regionMap, imageMap);
             } else {
               try {
                 TtmlNode node = parseNode(xmlParser, parent, regionMap, frameAndTickRate);
@@ -232,8 +231,8 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
   private Map<String, TtmlStyle> parseHeader(
       XmlPullParser xmlParser,
       Map<String, TtmlStyle> globalStyles,
-      Map<String, TtmlRegion> globalRegions,
       CellResolution cellResolution,
+      Map<String, TtmlRegion> globalRegions,
       Map<String, String> imageMap)
       throws IOException, XmlPullParserException {
     do {
@@ -255,23 +254,21 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
           globalRegions.put(ttmlRegion.id, ttmlRegion);
         }
       } else if(XmlPullParserUtil.isStartTag(xmlParser, TtmlNode.TAG_METADATA)){
-        parseMetaData(xmlParser, imageMap);
+        parseMetadata(xmlParser, imageMap);
       }
 
     } while (!XmlPullParserUtil.isEndTag(xmlParser, TtmlNode.TAG_HEAD));
     return globalStyles;
   }
 
-  public void parseMetaData(XmlPullParser xmlParser, Map<String, String> imageMap) throws IOException, XmlPullParserException {
+  private void parseMetadata(XmlPullParser xmlParser, Map<String, String> imageMap) throws IOException, XmlPullParserException {
     do {
       xmlParser.next();
       if (XmlPullParserUtil.isStartTag(xmlParser, TtmlNode.TAG_SMPTE_IMAGE)) {
-        for (int i = 0; i < xmlParser.getAttributeCount(); i++) {
-          String id = XmlPullParserUtil.getAttributeValue(xmlParser, "id");
-          if(id != null){
-            String base64 = xmlParser.nextText();
-            imageMap.put(id, base64);
-          }
+        String id = XmlPullParserUtil.getAttributeValue(xmlParser, "id");
+        if (id != null) {
+          String base64 = xmlParser.nextText();
+          imageMap.put(id, base64);
         }
       }
     } while (!XmlPullParserUtil.isEndTag(xmlParser, TtmlNode.TAG_METADATA));
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
index a20b9df24f..eb17e34729 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
@@ -183,18 +183,24 @@ import java.util.TreeSet;
   public List<Cue> getCues(long timeUs, Map<String, TtmlStyle> globalStyles,
       Map<String, TtmlRegion> regionMap, Map<String, String> imageMap) {
 
-    TreeMap<String, SpannableStringBuilder> regionOutputs = new TreeMap<>();
-    List<Pair<String, String>> regionImageList = new ArrayList<>();
+    TreeMap<String, SpannableStringBuilder> regionTextOutputs = new TreeMap<>();
+    List<Pair<String, String>> regionImageOutputs = new ArrayList<>();
 
-    traverseForText(timeUs, false, regionId, regionOutputs);
-    traverseForStyle(timeUs, globalStyles, regionOutputs);
-    traverseForImage(timeUs, regionId, regionImageList);
+    traverseForText(timeUs, false, regionId, regionTextOutputs);
+    traverseForStyle(timeUs, globalStyles, regionTextOutputs);
+    traverseForImage(timeUs, regionId, regionImageOutputs);
 
     List<Cue> cues = new ArrayList<>();
 
     // Create image based cues
-    for (Pair<String, String> regionImagePair : regionImageList) {
+    for (Pair<String, String> regionImagePair : regionImageOutputs) {
       String base64 = imageMap.get(regionImagePair.second);
+
+      if (base64 == null) {
+        // Image ref points to invalid image, do nothing
+        continue;
+      }
+
       byte[] decodedString = Base64.decode(base64, Base64.DEFAULT);
       Bitmap decodedByte = BitmapFactory.decodeByteArray(decodedString, 0, decodedString.length);
       TtmlRegion region = regionMap.get(regionImagePair.first);
@@ -206,13 +212,13 @@ import java.util.TreeSet;
               region.line,
               region.lineAnchor,
               region.width,
-              Cue.DIMEN_UNSET
+              /* height= */ Cue.DIMEN_UNSET
           )
       );
     }
 
     // Create text based cues
-    for (Entry<String, SpannableStringBuilder> entry : regionOutputs.entrySet()) {
+    for (Entry<String, SpannableStringBuilder> entry : regionTextOutputs.entrySet()) {
       TtmlRegion region = regionMap.get(entry.getKey());
       cues.add(
           new Cue(
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java
index 83b3ff3d1e..b881792576 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java
@@ -355,8 +355,12 @@ import com.google.android.exoplayer2.util.Util;
   }
 
   private void setupBitmapLayout() {
+    int parentWidth = parentRight - parentLeft;
+    int parentHeight = parentBottom - parentTop;
+
     // Default position
     if (cuePosition == Cue.DIMEN_UNSET) {
+      cuePositionAnchor = Cue.ANCHOR_TYPE_MIDDLE;
       cuePosition = 0.5f;
     }
 
@@ -366,13 +370,25 @@ import com.google.android.exoplayer2.util.Util;
       cueLine = 0.85f;
     }
 
-    // Default width
+    // Default width and height
     if (cueSize == Cue.DIMEN_UNSET) {
-      cueSize = 0.5f;
+      // Scale up by height to be 10% of the parent's height
+      cueBitmapHeight = 0.1f;
+
+      float heightInParent = parentHeight * cueBitmapHeight;
+      float widthInParent = heightInParent * ((float) cueBitmap.getWidth() / cueBitmap.getHeight());
+      cueSize = widthInParent / parentWidth;
+
+      // If by the previous scaling the width exceeds 50% of the parent's width
+      // then scale back to 50% by width and adjust its height to keep the aspect ratio
+      if (cueSize > 0.5f) {
+        cueSize = 0.5f;
+        widthInParent = parentWidth * cueSize;
+        heightInParent = widthInParent * ((float) cueBitmap.getHeight() / cueBitmap.getWidth());
+        cueBitmapHeight = heightInParent / parentHeight;
+      }
     }
 
-    int parentWidth = parentRight - parentLeft;
-    int parentHeight = parentBottom - parentTop;
     float anchorX = parentLeft + (parentWidth * cuePosition);
     float anchorY = parentTop + (parentHeight * cueLine);
     int width = Math.round(parentWidth * cueSize);

From 158bc1edacf6e316de7de9623e37d008e86f5651 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 7 Nov 2018 14:28:44 -0800
Subject: [PATCH 184/832] Add TrackBitrateEstimator and
 WindowedTrackBitrateEstimator

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=220529628
---
 .../trackselection/TrackBitrateEstimator.java |  53 ++++
 .../trackselection/TrackSelectionUtil.java    |  79 ++++--
 .../WindowedTrackBitrateEstimator.java        |  65 +++++
 .../TrackSelectionUtilTest.java               | 256 +++++++++++-------
 .../WindowedTrackBitrateEstimatorTest.java    | 175 ++++++++++++
 .../testutil/FakeMediaChunkIterator.java      |  66 +++++
 6 files changed, 569 insertions(+), 125 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackBitrateEstimator.java
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimator.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimatorTest.java
 create mode 100644 testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaChunkIterator.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackBitrateEstimator.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackBitrateEstimator.java
new file mode 100644
index 0000000000..94513b8250
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackBitrateEstimator.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.exoplayer2.trackselection;
+
+import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.source.chunk.MediaChunk;
+import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
+import java.util.List;
+
+/** Estimates track bitrate values. */
+public interface TrackBitrateEstimator {
+
+  /**
+   * A {@link TrackBitrateEstimator} that returns the bitrate values defined in the track formats.
+   */
+  TrackBitrateEstimator DEFAULT =
+      (formats, queue, iterators, bitrates) ->
+          TrackSelectionUtil.getFormatBitrates(formats, bitrates);
+
+  /**
+   * Returns bitrate values for a set of tracks whose formats are given.
+   *
+   * @param formats The track formats.
+   * @param queue The queue of already buffered {@link MediaChunk} instances. Must not be modified.
+   * @param iterators An array of {@link MediaChunkIterator}s providing information about the
+   *     sequence of upcoming media chunks for each track.
+   * @param bitrates An array into which the bitrate values will be written. If non-null, this array
+   *     is the one that will be returned.
+   * @return Bitrate values for the tracks. As long as the format of a track has set bitrate, a
+   *     bitrate value is set in the returned array. Otherwise it might be set to {@link
+   *     Format#NO_VALUE}.
+   */
+  int[] getBitrates(
+      Format[] formats,
+      List<? extends MediaChunk> queue,
+      MediaChunkIterator[] iterators,
+      @Nullable int[] bitrates);
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
index 052cf36309..947f64be2c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.trackselection;
 
+import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
@@ -74,20 +75,25 @@ public final class TrackSelectionUtil {
    * @param formats The track formats.
    * @param maxDurationUs Maximum duration of chunks to be included in average bitrate values, in
    *     microseconds.
+   * @param bitrates If not null, stores bitrate values in this array.
    * @return Average bitrate values for the tracks. If for a track, an average bitrate or an
    *     estimation can't be calculated, {@link Format#NO_VALUE} is set.
    * @see #getAverageBitrate(MediaChunkIterator, long)
    */
   @VisibleForTesting
   /* package */ static int[] getBitratesUsingFutureInfo(
-      MediaChunkIterator[] iterators, Format[] formats, long maxDurationUs) {
+      MediaChunkIterator[] iterators,
+      Format[] formats,
+      long maxDurationUs,
+      @Nullable int[] bitrates) {
     int trackCount = iterators.length;
     Assertions.checkArgument(trackCount == formats.length);
     if (trackCount == 0) {
       return new int[0];
     }
-
-    int[] bitrates = new int[trackCount];
+    if (bitrates == null) {
+      bitrates = new int[trackCount];
+    }
     if (maxDurationUs == 0) {
       Arrays.fill(bitrates, Format.NO_VALUE);
       return bitrates;
@@ -127,15 +133,22 @@ public final class TrackSelectionUtil {
    * @param formats The track formats.
    * @param maxDurationUs Maximum duration of chunks to be included in average bitrate values, in
    *     microseconds.
+   * @param bitrates If not null, calculates bitrate values only for indexes set to Format.NO_VALUE
+   *     and stores result in this array.
    * @return Bitrate values for the tracks. If for a track, a bitrate value can't be calculated,
    *     {@link Format#NO_VALUE} is set.
-   * @see #getBitratesUsingFutureInfo(MediaChunkIterator[], Format[], long)
+   * @see #getBitratesUsingFutureInfo(MediaChunkIterator[], Format[], long, int[])
    */
   @VisibleForTesting
   /* package */ static int[] getBitratesUsingPastInfo(
-      List<? extends MediaChunk> queue, Format[] formats, long maxDurationUs) {
-    int[] bitrates = new int[formats.length];
-    Arrays.fill(bitrates, Format.NO_VALUE);
+      List<? extends MediaChunk> queue,
+      Format[] formats,
+      long maxDurationUs,
+      @Nullable int[] bitrates) {
+    if (bitrates == null) {
+      bitrates = new int[formats.length];
+      Arrays.fill(bitrates, Format.NO_VALUE);
+    }
     if (maxDurationUs == 0) {
       return bitrates;
     }
@@ -156,40 +169,58 @@ public final class TrackSelectionUtil {
    * Returns bitrate values for a set of tracks whose formats are given, using the given upcoming
    * media chunk iterators and the queue of already buffered {@link MediaChunk}s.
    *
+   * @param formats The track formats.
+   * @param queue The queue of already buffered {@link MediaChunk}s. Must not be modified.
+   * @param maxPastDurationUs Maximum duration of past chunks to be included in average bitrate
+   *     values, in microseconds.
    * @param iterators An array of {@link MediaChunkIterator}s providing information about the
    *     sequence of upcoming media chunks for each track.
-   * @param queue The queue of already buffered {@link MediaChunk}s. Must not be modified.
-   * @param formats The track formats.
    * @param maxFutureDurationUs Maximum duration of future chunks to be included in average bitrate
    *     values, in microseconds.
-   * @param maxPastDurationUs Maximum duration of past chunks to be included in average bitrate
-   *     values, in microseconds.
    * @param useFormatBitrateAsLowerBound Whether to return the estimated bitrate only if it's higher
    *     than the bitrate of the track's format.
-   * @return Bitrate values for the tracks. If for a track, a bitrate value can't be calculated,
-   *     {@link Format#NO_VALUE} is set.
+   * @param bitrates An array into which the bitrate values will be written. If non-null, this array
+   *     is the one that will be returned.
+   * @return Bitrate values for the tracks. As long as the format of a track has set bitrate, a
+   *     bitrate value is set in the returned array. Otherwise it might be set to {@link
+   *     Format#NO_VALUE}.
    */
   public static int[] getBitratesUsingPastAndFutureInfo(
-      MediaChunkIterator[] iterators,
-      List<? extends MediaChunk> queue,
       Format[] formats,
-      long maxFutureDurationUs,
+      List<? extends MediaChunk> queue,
       long maxPastDurationUs,
-      boolean useFormatBitrateAsLowerBound) {
-    int[] bitrates = getBitratesUsingFutureInfo(iterators, formats, maxFutureDurationUs);
-    int[] bitratesUsingPastInfo = getBitratesUsingPastInfo(queue, formats, maxPastDurationUs);
+      MediaChunkIterator[] iterators,
+      long maxFutureDurationUs,
+      boolean useFormatBitrateAsLowerBound,
+      @Nullable int[] bitrates) {
+    bitrates = getBitratesUsingFutureInfo(iterators, formats, maxFutureDurationUs, bitrates);
+    getBitratesUsingPastInfo(queue, formats, maxPastDurationUs, bitrates);
     for (int i = 0; i < bitrates.length; i++) {
       int bitrate = bitrates[i];
-      if (bitrate == Format.NO_VALUE) {
-        bitrate = bitratesUsingPastInfo[i];
-      }
       if (bitrate == Format.NO_VALUE
           || (useFormatBitrateAsLowerBound
               && formats[i].bitrate != Format.NO_VALUE
               && bitrate < formats[i].bitrate)) {
-        bitrate = formats[i].bitrate;
+        bitrates[i] = formats[i].bitrate;
       }
-      bitrates[i] = bitrate;
+    }
+    return bitrates;
+  }
+
+  /**
+   * Returns an array containing {@link Format#bitrate} values for given each format in order.
+   *
+   * @param formats The format array to copy {@link Format#bitrate} values.
+   * @param bitrates If not null, stores bitrate values in this array.
+   * @return An array containing {@link Format#bitrate} values for given each format in order.
+   */
+  public static int[] getFormatBitrates(Format[] formats, @Nullable int[] bitrates) {
+    int trackCount = formats.length;
+    if (bitrates == null) {
+      bitrates = new int[trackCount];
+    }
+    for (int i = 0; i < trackCount; i++) {
+      bitrates[i] = formats[i].bitrate;
     }
     return bitrates;
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimator.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimator.java
new file mode 100644
index 0000000000..960b22e83b
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimator.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.exoplayer2.trackselection;
+
+import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.source.chunk.MediaChunk;
+import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
+import java.util.List;
+
+/** A {@link TrackBitrateEstimator} which derives estimates from a window of time. */
+public final class WindowedTrackBitrateEstimator implements TrackBitrateEstimator {
+
+  private final long maxFutureDurationUs;
+  private final long maxPastDurationUs;
+  private final boolean useFormatBitrateAsLowerBound;
+
+  /**
+   * @param maxFutureDurationUs Maximum duration of future chunks to be included in average bitrate
+   *     values, in microseconds.
+   * @param maxPastDurationUs Maximum duration of past chunks to be included in average bitrate
+   *     values, in microseconds.
+   * @param useFormatBitrateAsLowerBound Whether to return the estimated bitrate only if it's higher
+   *     than the bitrate of the track's format.
+   */
+  public WindowedTrackBitrateEstimator(
+      long maxFutureDurationUs, long maxPastDurationUs, boolean useFormatBitrateAsLowerBound) {
+    this.maxFutureDurationUs = maxFutureDurationUs;
+    this.maxPastDurationUs = maxPastDurationUs;
+    this.useFormatBitrateAsLowerBound = useFormatBitrateAsLowerBound;
+  }
+
+  @Override
+  public int[] getBitrates(
+      Format[] formats,
+      List<? extends MediaChunk> queue,
+      MediaChunkIterator[] iterators,
+      @Nullable int[] bitrates) {
+    if (maxFutureDurationUs > 0 || maxPastDurationUs > 0) {
+      return TrackSelectionUtil.getBitratesUsingPastAndFutureInfo(
+          formats,
+          queue,
+          maxPastDurationUs,
+          iterators,
+          maxFutureDurationUs,
+          useFormatBitrateAsLowerBound,
+          bitrates);
+    }
+    return TrackSelectionUtil.getFormatBitrates(formats, bitrates);
+  }
+}
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java
index 4596ea5ded..c513b86263 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java
@@ -20,9 +20,9 @@ import static com.google.common.truth.Truth.assertThat;
 import android.net.Uri;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
-import com.google.android.exoplayer2.source.chunk.BaseMediaChunkIterator;
 import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
 import com.google.android.exoplayer2.testutil.FakeMediaChunk;
+import com.google.android.exoplayer2.testutil.FakeMediaChunkIterator;
 import com.google.android.exoplayer2.upstream.DataSpec;
 import java.util.Arrays;
 import java.util.Collections;
@@ -47,7 +47,8 @@ public class TrackSelectionUtilTest {
     long[] chunkTimeBoundariesSec = {12, 17};
     long[] chunkLengths = {10};
 
-    FakeIterator iterator = new FakeIterator(chunkTimeBoundariesSec, chunkLengths);
+    FakeMediaChunkIterator iterator =
+        new FakeMediaChunkIterator(chunkTimeBoundariesSec, chunkLengths);
 
     assertThat(TrackSelectionUtil.getAverageBitrate(iterator, MAX_DURATION_US)).isEqualTo(16);
   }
@@ -57,7 +58,8 @@ public class TrackSelectionUtilTest {
     long[] chunkTimeBoundariesSec = {0, 5, 10};
     long[] chunkLengths = {10, 20};
 
-    FakeIterator iterator = new FakeIterator(chunkTimeBoundariesSec, chunkLengths);
+    FakeMediaChunkIterator iterator =
+        new FakeMediaChunkIterator(chunkTimeBoundariesSec, chunkLengths);
 
     assertThat(TrackSelectionUtil.getAverageBitrate(iterator, MAX_DURATION_US)).isEqualTo(24);
   }
@@ -67,7 +69,8 @@ public class TrackSelectionUtilTest {
     long[] chunkTimeBoundariesSec = {0, 5, 15, 30};
     long[] chunkLengths = {10, 20, 30};
 
-    FakeIterator iterator = new FakeIterator(chunkTimeBoundariesSec, chunkLengths);
+    FakeMediaChunkIterator iterator =
+        new FakeMediaChunkIterator(chunkTimeBoundariesSec, chunkLengths);
 
     assertThat(TrackSelectionUtil.getAverageBitrate(iterator, MAX_DURATION_US)).isEqualTo(16);
   }
@@ -77,7 +80,8 @@ public class TrackSelectionUtilTest {
     long[] chunkTimeBoundariesSec = {0, 5, 15, 30};
     long[] chunkLengths = {C.LENGTH_UNSET, 20, 30};
 
-    FakeIterator iterator = new FakeIterator(chunkTimeBoundariesSec, chunkLengths);
+    FakeMediaChunkIterator iterator =
+        new FakeMediaChunkIterator(chunkTimeBoundariesSec, chunkLengths);
 
     assertThat(TrackSelectionUtil.getAverageBitrate(iterator, MAX_DURATION_US))
         .isEqualTo(Format.NO_VALUE);
@@ -88,7 +92,8 @@ public class TrackSelectionUtilTest {
     long[] chunkTimeBoundariesSec = {0, 5, 15, 30};
     long[] chunkLengths = {10, C.LENGTH_UNSET, 30};
 
-    FakeIterator iterator = new FakeIterator(chunkTimeBoundariesSec, chunkLengths);
+    FakeMediaChunkIterator iterator =
+        new FakeMediaChunkIterator(chunkTimeBoundariesSec, chunkLengths);
 
     assertThat(TrackSelectionUtil.getAverageBitrate(iterator, MAX_DURATION_US)).isEqualTo(16);
   }
@@ -98,7 +103,8 @@ public class TrackSelectionUtilTest {
       getAverageBitrate_chunksExceedingMaxDuration_returnsAverageChunkBitrateUpToMaxDuration() {
     long[] chunkTimeBoundariesSec = {0, 5, 15, 45, 50};
     long[] chunkLengths = {10, 20, 30, 100};
-    FakeIterator iterator = new FakeIterator(chunkTimeBoundariesSec, chunkLengths);
+    FakeMediaChunkIterator iterator =
+        new FakeMediaChunkIterator(chunkTimeBoundariesSec, chunkLengths);
 
     long maxDurationUs = 30 * C.MICROS_PER_SECOND;
     int averageBitrate = TrackSelectionUtil.getAverageBitrate(iterator, maxDurationUs);
@@ -111,7 +117,8 @@ public class TrackSelectionUtilTest {
     long[] chunkTimeBoundariesSec = {0, 5, 10};
     long[] chunkLengths = {10, 20};
 
-    FakeIterator iterator = new FakeIterator(chunkTimeBoundariesSec, chunkLengths);
+    FakeMediaChunkIterator iterator =
+        new FakeMediaChunkIterator(chunkTimeBoundariesSec, chunkLengths);
 
     assertThat(TrackSelectionUtil.getAverageBitrate(iterator, /* maxDurationUs= */ 0))
         .isEqualTo(Format.NO_VALUE);
@@ -121,7 +128,7 @@ public class TrackSelectionUtilTest {
   public void getBitratesUsingFutureInfo_noIterator_returnsEmptyArray() {
     assertThat(
             TrackSelectionUtil.getBitratesUsingFutureInfo(
-                new MediaChunkIterator[0], new Format[0], MAX_DURATION_US))
+                new MediaChunkIterator[0], new Format[0], MAX_DURATION_US, /* bitrates= */ null))
         .hasLength(0);
   }
 
@@ -131,18 +138,19 @@ public class TrackSelectionUtilTest {
         TrackSelectionUtil.getBitratesUsingFutureInfo(
             new MediaChunkIterator[] {MediaChunkIterator.EMPTY},
             new Format[] {createFormatWithBitrate(10)},
-            MAX_DURATION_US);
+            MAX_DURATION_US,
+            /* bitrates= */ null);
 
     assertThat(bitrates).asList().containsExactly(Format.NO_VALUE);
   }
 
   @Test
   public void getBitratesUsingFutureInfo_twoTracksZeroMaxDuration_returnsNoValue() {
-    FakeIterator iterator1 =
-        new FakeIterator(
+    FakeMediaChunkIterator iterator1 =
+        new FakeMediaChunkIterator(
             /* chunkTimeBoundariesSec= */ new long[] {0, 10}, /* chunkLengths= */ new long[] {10});
-    FakeIterator iterator2 =
-        new FakeIterator(
+    FakeMediaChunkIterator iterator2 =
+        new FakeMediaChunkIterator(
             /* chunkTimeBoundariesSec= */ new long[] {0, 5, 15, 30},
             /* chunkLengths= */ new long[] {10, 20, 30});
 
@@ -150,18 +158,19 @@ public class TrackSelectionUtilTest {
         TrackSelectionUtil.getBitratesUsingFutureInfo(
             new MediaChunkIterator[] {iterator1, iterator2},
             new Format[] {createFormatWithBitrate(10), createFormatWithBitrate(20)},
-            /* maxDurationUs= */ 0);
+            /* maxDurationUs= */ 0,
+            /* bitrates= */ null);
 
     assertThat(bitrates).asList().containsExactly(Format.NO_VALUE, Format.NO_VALUE);
   }
 
   @Test
   public void getBitratesUsingFutureInfo_twoTracks_returnsBitrates() {
-    FakeIterator iterator1 =
-        new FakeIterator(
+    FakeMediaChunkIterator iterator1 =
+        new FakeMediaChunkIterator(
             /* chunkTimeBoundariesSec= */ new long[] {0, 10}, /* chunkLengths= */ new long[] {10});
-    FakeIterator iterator2 =
-        new FakeIterator(
+    FakeMediaChunkIterator iterator2 =
+        new FakeMediaChunkIterator(
             /* chunkTimeBoundariesSec= */ new long[] {0, 5, 15, 30},
             /* chunkLengths= */ new long[] {10, 20, 30});
 
@@ -169,25 +178,47 @@ public class TrackSelectionUtilTest {
         TrackSelectionUtil.getBitratesUsingFutureInfo(
             new MediaChunkIterator[] {iterator1, iterator2},
             new Format[] {createFormatWithBitrate(10), createFormatWithBitrate(20)},
-            MAX_DURATION_US);
+            MAX_DURATION_US,
+            /* bitrates= */ null);
 
     assertThat(bitrates).asList().containsExactly(8, 16).inOrder();
   }
 
+  @Test
+  public void getBitratesUsingFutureInfo_bitratesArrayGiven_returnsTheSameArray() {
+    FakeMediaChunkIterator iterator1 =
+        new FakeMediaChunkIterator(
+            /* chunkTimeBoundariesSec= */ new long[] {0, 10}, /* chunkLengths= */ new long[] {10});
+    FakeMediaChunkIterator iterator2 =
+        new FakeMediaChunkIterator(
+            /* chunkTimeBoundariesSec= */ new long[] {0, 5, 15, 30},
+            /* chunkLengths= */ new long[] {10, 20, 30});
+
+    int[] bitratesArrayToUse = new int[2];
+    int[] bitrates =
+        TrackSelectionUtil.getBitratesUsingFutureInfo(
+            new MediaChunkIterator[] {iterator1, iterator2},
+            new Format[] {createFormatWithBitrate(10), createFormatWithBitrate(20)},
+            MAX_DURATION_US,
+            bitratesArrayToUse);
+
+    assertThat(bitrates).isSameAs(bitratesArrayToUse);
+  }
+
   @Test
   public void getBitratesUsingFutureInfo_emptyIterator_returnsEstimationUsingClosest() {
-    FakeIterator iterator1 =
-        new FakeIterator(
+    FakeMediaChunkIterator iterator1 =
+        new FakeMediaChunkIterator(
             /* chunkTimeBoundariesSec= */ new long[] {0, 5}, /* chunkLengths= */ new long[] {10});
     Format format1 = createFormatWithBitrate(10);
     MediaChunkIterator iterator2 = MediaChunkIterator.EMPTY;
     Format format2 = createFormatWithBitrate(20);
-    FakeIterator iterator3 =
-        new FakeIterator(
+    FakeMediaChunkIterator iterator3 =
+        new FakeMediaChunkIterator(
             /* chunkTimeBoundariesSec= */ new long[] {0, 5}, /* chunkLengths= */ new long[] {50});
     Format format3 = createFormatWithBitrate(25);
-    FakeIterator iterator4 =
-        new FakeIterator(
+    FakeMediaChunkIterator iterator4 =
+        new FakeMediaChunkIterator(
             /* chunkTimeBoundariesSec= */ new long[] {0, 5}, /* chunkLengths= */ new long[] {20});
     Format format4 = createFormatWithBitrate(30);
 
@@ -195,15 +226,16 @@ public class TrackSelectionUtilTest {
         TrackSelectionUtil.getBitratesUsingFutureInfo(
             new MediaChunkIterator[] {iterator1, iterator2, iterator3, iterator4},
             new Format[] {format1, format2, format3, format4},
-            MAX_DURATION_US);
+            MAX_DURATION_US,
+            /* bitrates= */ null);
 
     assertThat(bitrates).asList().containsExactly(16, 64, 80, 32).inOrder();
   }
 
   @Test
   public void getBitratesUsingFutureInfo_formatWithoutBitrate_returnsNoValueForEmpty() {
-    FakeIterator iterator1 =
-        new FakeIterator(
+    FakeMediaChunkIterator iterator1 =
+        new FakeMediaChunkIterator(
             /* chunkTimeBoundariesSec= */ new long[] {0, 5}, /* chunkLengths= */ new long[] {10});
     Format format1 = createFormatWithBitrate(10);
     MediaChunkIterator iterator2 = MediaChunkIterator.EMPTY;
@@ -213,7 +245,8 @@ public class TrackSelectionUtilTest {
         TrackSelectionUtil.getBitratesUsingFutureInfo(
             new MediaChunkIterator[] {iterator1, iterator2},
             new Format[] {format1, format2},
-            MAX_DURATION_US);
+            MAX_DURATION_US,
+            /* bitrates= */ null);
 
     assertThat(bitrates).asList().containsExactly(16, Format.NO_VALUE).inOrder();
   }
@@ -229,7 +262,7 @@ public class TrackSelectionUtilTest {
 
     int[] bitrates =
         TrackSelectionUtil.getBitratesUsingPastInfo(
-            Collections.singletonList(chunk), new Format[0], MAX_DURATION_US);
+            Collections.singletonList(chunk), new Format[0], MAX_DURATION_US, /* bitrates= */ null);
 
     assertThat(bitrates).hasLength(0);
   }
@@ -238,7 +271,10 @@ public class TrackSelectionUtilTest {
   public void getBitratesUsingPastInfo_emptyQueue_returnsNoValue() {
     int[] bitrates =
         TrackSelectionUtil.getBitratesUsingPastInfo(
-            Collections.emptyList(), new Format[] {createFormatWithBitrate(10)}, MAX_DURATION_US);
+            Collections.emptyList(),
+            new Format[] {createFormatWithBitrate(10)},
+            MAX_DURATION_US,
+            /* bitrates= */ null);
 
     assertThat(bitrates).asList().containsExactly(Format.NO_VALUE);
   }
@@ -251,7 +287,10 @@ public class TrackSelectionUtilTest {
 
     int[] bitrates =
         TrackSelectionUtil.getBitratesUsingPastInfo(
-            Collections.singletonList(chunk), new Format[] {format}, MAX_DURATION_US);
+            Collections.singletonList(chunk),
+            new Format[] {format},
+            MAX_DURATION_US,
+            /* bitrates= */ null);
 
     assertThat(bitrates).asList().containsExactly(Format.NO_VALUE);
   }
@@ -265,7 +304,10 @@ public class TrackSelectionUtilTest {
 
     int[] bitrates =
         TrackSelectionUtil.getBitratesUsingPastInfo(
-            Collections.singletonList(chunk), new Format[] {format}, MAX_DURATION_US);
+            Collections.singletonList(chunk),
+            new Format[] {format},
+            MAX_DURATION_US,
+            /* bitrates= */ null);
 
     assertThat(bitrates).asList().containsExactly(Format.NO_VALUE);
   }
@@ -278,7 +320,10 @@ public class TrackSelectionUtilTest {
 
     int[] bitrates =
         TrackSelectionUtil.getBitratesUsingPastInfo(
-            Collections.singletonList(chunk), new Format[] {format}, MAX_DURATION_US);
+            Collections.singletonList(chunk),
+            new Format[] {format},
+            MAX_DURATION_US,
+            /* bitrates= */ null);
 
     assertThat(bitrates).asList().containsExactly(8).inOrder();
   }
@@ -291,7 +336,10 @@ public class TrackSelectionUtilTest {
 
     int[] bitrates =
         TrackSelectionUtil.getBitratesUsingPastInfo(
-            Collections.singletonList(chunk), new Format[] {format}, /* maxDurationUs= */ 0);
+            Collections.singletonList(chunk),
+            new Format[] {format},
+            /* maxDurationUs= */ 0,
+            /* bitrates= */ null);
 
     assertThat(bitrates).asList().containsExactly(Format.NO_VALUE).inOrder();
   }
@@ -306,7 +354,10 @@ public class TrackSelectionUtilTest {
 
     int[] bitrates =
         TrackSelectionUtil.getBitratesUsingPastInfo(
-            Arrays.asList(chunk, chunk2), new Format[] {format}, MAX_DURATION_US);
+            Arrays.asList(chunk, chunk2),
+            new Format[] {format},
+            MAX_DURATION_US,
+            /* bitrates= */ null);
 
     assertThat(bitrates).asList().containsExactly(12).inOrder();
   }
@@ -324,7 +375,8 @@ public class TrackSelectionUtilTest {
         TrackSelectionUtil.getBitratesUsingPastInfo(
             Collections.singletonList(chunk),
             new Format[] {createFormatWithBitrate(20)},
-            MAX_DURATION_US);
+            MAX_DURATION_US,
+            /* bitrates= */ null);
 
     assertThat(bitrates).asList().containsExactly(16).inOrder();
   }
@@ -342,7 +394,8 @@ public class TrackSelectionUtilTest {
         TrackSelectionUtil.getBitratesUsingPastInfo(
             Collections.singletonList(chunk),
             new Format[] {createFormatWithBitrate(Format.NO_VALUE)},
-            MAX_DURATION_US);
+            MAX_DURATION_US,
+            /* bitrates= */ null);
 
     assertThat(bitrates).asList().containsExactly(Format.NO_VALUE);
   }
@@ -360,11 +413,32 @@ public class TrackSelectionUtilTest {
         TrackSelectionUtil.getBitratesUsingPastInfo(
             Collections.singletonList(chunk),
             new Format[] {createFormatWithBitrate(20), createFormatWithBitrate(30)},
-            MAX_DURATION_US);
+            MAX_DURATION_US,
+            /* bitrates= */ null);
 
     assertThat(bitrates).asList().containsExactly(16, 24).inOrder();
   }
 
+  @Test
+  public void getBitratesUsingPastInfo_bitratesArrayGiven_returnsTheSameArray() {
+    FakeMediaChunk chunk =
+        createChunk(
+            createFormatWithBitrate(10),
+            /* length= */ 10,
+            /* startTimeSec= */ 0,
+            /* endTimeSec= */ 10);
+
+    int[] bitratesArrayToUse = new int[2];
+    int[] bitrates =
+        TrackSelectionUtil.getBitratesUsingPastInfo(
+            Collections.singletonList(chunk),
+            new Format[] {createFormatWithBitrate(20), createFormatWithBitrate(30)},
+            MAX_DURATION_US,
+            bitratesArrayToUse);
+
+    assertThat(bitrates).isSameAs(bitratesArrayToUse);
+  }
+
   @Test
   public void
       getBitratesUsingPastInfo_multipleChunkExceedingMaxDuration_returnsAverageUntilMaxDuration() {
@@ -378,7 +452,8 @@ public class TrackSelectionUtilTest {
         TrackSelectionUtil.getBitratesUsingPastInfo(
             Arrays.asList(chunk, chunk2),
             new Format[] {format},
-            /* maxDurationUs= */ 30 * C.MICROS_PER_SECOND);
+            /* maxDurationUs= */ 30 * C.MICROS_PER_SECOND,
+            /* bitrates= */ null);
 
     assertThat(bitrates).asList().containsExactly(12).inOrder();
   }
@@ -403,29 +478,31 @@ public class TrackSelectionUtilTest {
         TrackSelectionUtil.getBitratesUsingPastInfo(
             Arrays.asList(chunk, chunk2),
             new Format[] {createFormatWithBitrate(10)},
-            MAX_DURATION_US);
+            MAX_DURATION_US,
+            /* bitrates= */ null);
 
     assertThat(bitrates).asList().containsExactly(16).inOrder();
   }
 
   @Test
   public void getBitratesUsingPastAndFutureInfo_noPastInfo_returnsBitratesUsingOnlyFutureInfo() {
-    FakeIterator iterator1 =
-        new FakeIterator(
+    FakeMediaChunkIterator iterator1 =
+        new FakeMediaChunkIterator(
             /* chunkTimeBoundariesSec= */ new long[] {0, 10}, /* chunkLengths= */ new long[] {10});
-    FakeIterator iterator2 =
-        new FakeIterator(
+    FakeMediaChunkIterator iterator2 =
+        new FakeMediaChunkIterator(
             /* chunkTimeBoundariesSec= */ new long[] {0, 5, 15, 30},
             /* chunkLengths= */ new long[] {10, 20, 30});
 
     int[] bitrates =
         TrackSelectionUtil.getBitratesUsingPastAndFutureInfo(
-            new MediaChunkIterator[] {iterator1, iterator2},
-            Collections.emptyList(),
             new Format[] {createFormatWithBitrate(10), createFormatWithBitrate(20)},
+            Collections.emptyList(),
             MAX_DURATION_US,
+            new MediaChunkIterator[] {iterator1, iterator2},
             MAX_DURATION_US,
-            /* useFormatBitrateAsLowerBound= */ false);
+            /* useFormatBitrateAsLowerBound= */ false,
+            /* bitrates= */ null);
 
     assertThat(bitrates).asList().containsExactly(8, 16).inOrder();
   }
@@ -441,12 +518,13 @@ public class TrackSelectionUtilTest {
 
     int[] bitrates =
         TrackSelectionUtil.getBitratesUsingPastAndFutureInfo(
-            new MediaChunkIterator[] {MediaChunkIterator.EMPTY, MediaChunkIterator.EMPTY},
-            Collections.singletonList(chunk),
             new Format[] {createFormatWithBitrate(20), createFormatWithBitrate(30)},
+            Collections.singletonList(chunk),
             MAX_DURATION_US,
+            new MediaChunkIterator[] {MediaChunkIterator.EMPTY, MediaChunkIterator.EMPTY},
             MAX_DURATION_US,
-            /* useFormatBitrateAsLowerBound= */ false);
+            /* useFormatBitrateAsLowerBound= */ false,
+            /* bitrates= */ null);
 
     assertThat(bitrates).asList().containsExactly(16, 24).inOrder();
   }
@@ -460,22 +538,23 @@ public class TrackSelectionUtilTest {
             /* length= */ 10,
             /* startTimeSec= */ 0,
             /* endTimeSec= */ 10);
-    FakeIterator iterator1 =
-        new FakeIterator(
+    FakeMediaChunkIterator iterator1 =
+        new FakeMediaChunkIterator(
             /* chunkTimeBoundariesSec= */ new long[] {0, 10}, /* chunkLengths= */ new long[] {10});
-    FakeIterator iterator2 =
-        new FakeIterator(
+    FakeMediaChunkIterator iterator2 =
+        new FakeMediaChunkIterator(
             /* chunkTimeBoundariesSec= */ new long[] {0, 5, 15, 30},
             /* chunkLengths= */ new long[] {10, 20, 30});
 
     int[] bitrates =
         TrackSelectionUtil.getBitratesUsingPastAndFutureInfo(
-            new MediaChunkIterator[] {iterator1, iterator2},
-            Collections.singletonList(chunk),
             new Format[] {createFormatWithBitrate(10), createFormatWithBitrate(20)},
+            Collections.singletonList(chunk),
             MAX_DURATION_US,
+            new MediaChunkIterator[] {iterator1, iterator2},
             MAX_DURATION_US,
-            /* useFormatBitrateAsLowerBound= */ false);
+            /* useFormatBitrateAsLowerBound= */ false,
+            /* bitrates= */ null);
 
     assertThat(bitrates).asList().containsExactly(8, 16).inOrder();
   }
@@ -484,12 +563,13 @@ public class TrackSelectionUtilTest {
   public void getBitratesUsingPastAndFutureInfo_noPastAndFutureInfo_returnsBitratesOfFormats() {
     int[] bitrates =
         TrackSelectionUtil.getBitratesUsingPastAndFutureInfo(
-            new MediaChunkIterator[] {MediaChunkIterator.EMPTY, MediaChunkIterator.EMPTY},
-            Collections.emptyList(),
             new Format[] {createFormatWithBitrate(10), createFormatWithBitrate(20)},
+            Collections.emptyList(),
             MAX_DURATION_US,
+            new MediaChunkIterator[] {MediaChunkIterator.EMPTY, MediaChunkIterator.EMPTY},
             MAX_DURATION_US,
-            /* useFormatBitrateAsLowerBound= */ false);
+            /* useFormatBitrateAsLowerBound= */ false,
+            /* bitrates= */ null);
 
     assertThat(bitrates).asList().containsExactly(10, 20).inOrder();
   }
@@ -506,58 +586,32 @@ public class TrackSelectionUtilTest {
 
     int[] bitrates =
         TrackSelectionUtil.getBitratesUsingPastAndFutureInfo(
-            new MediaChunkIterator[] {MediaChunkIterator.EMPTY, MediaChunkIterator.EMPTY},
-            Collections.singletonList(chunk),
             new Format[] {createFormatWithBitrate(20), createFormatWithBitrate(30)},
+            Collections.singletonList(chunk),
             MAX_DURATION_US,
+            new MediaChunkIterator[] {MediaChunkIterator.EMPTY, MediaChunkIterator.EMPTY},
             MAX_DURATION_US,
-            /* useFormatBitrateAsLowerBound= */ true);
+            /* useFormatBitrateAsLowerBound= */ true,
+            /* bitrates= */ null);
 
     assertThat(bitrates).asList().containsExactly(20, 30).inOrder();
   }
 
   private static FakeMediaChunk createChunk(
       Format format, int length, int startTimeSec, int endTimeSec) {
-    DataSpec dataSpec = new DataSpec(Uri.EMPTY, 0, length, null, 0);
+    DataSpec dataSpec =
+        new DataSpec(
+            Uri.EMPTY, /* absoluteStreamPosition= */ 0, length, /* key= */ null, /* flags= */ 0);
     return new FakeMediaChunk(
         dataSpec, format, startTimeSec * C.MICROS_PER_SECOND, endTimeSec * C.MICROS_PER_SECOND);
   }
 
   private static Format createFormatWithBitrate(int bitrate) {
-    return Format.createSampleFormat(null, null, null, bitrate, null);
-  }
-
-  private static final class FakeIterator extends BaseMediaChunkIterator {
-
-    private final long[] chunkTimeBoundariesSec;
-    private final long[] chunkLengths;
-
-    public FakeIterator(long[] chunkTimeBoundariesSec, long[] chunkLengths) {
-      super(/* fromIndex= */ 0, /* toIndex= */ chunkTimeBoundariesSec.length - 2);
-      this.chunkTimeBoundariesSec = chunkTimeBoundariesSec;
-      this.chunkLengths = chunkLengths;
-    }
-
-    @Override
-    public DataSpec getDataSpec() {
-      checkInBounds();
-      return new DataSpec(
-          Uri.EMPTY,
-          /* absoluteStreamPosition= */ 0,
-          chunkLengths[(int) getCurrentIndex()],
-          /* key= */ null);
-    }
-
-    @Override
-    public long getChunkStartTimeUs() {
-      checkInBounds();
-      return chunkTimeBoundariesSec[(int) getCurrentIndex()] * C.MICROS_PER_SECOND;
-    }
-
-    @Override
-    public long getChunkEndTimeUs() {
-      checkInBounds();
-      return chunkTimeBoundariesSec[(int) getCurrentIndex() + 1] * C.MICROS_PER_SECOND;
-    }
+    return Format.createSampleFormat(
+        /* id= */ null,
+        /* sampleMimeType= */ null,
+        /* codecs= */ null,
+        bitrate,
+        /* drmInitData= */ null);
   }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimatorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimatorTest.java
new file mode 100644
index 0000000000..59c5092fc0
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimatorTest.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.exoplayer2.trackselection;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.net.Uri;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.source.chunk.MediaChunk;
+import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
+import com.google.android.exoplayer2.testutil.FakeMediaChunk;
+import com.google.android.exoplayer2.testutil.FakeMediaChunkIterator;
+import com.google.android.exoplayer2.upstream.DataSpec;
+import java.util.Collections;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** {@link WindowedTrackBitrateEstimator} tests. */
+@RunWith(RobolectricTestRunner.class)
+public class WindowedTrackBitrateEstimatorTest {
+
+  private static final long MAX_DURATION_US = 30 * C.MICROS_PER_SECOND;
+
+  @Test
+  public void getBitrates_zeroMaxDuration_returnsFormatBitrates() {
+    WindowedTrackBitrateEstimator estimator =
+        new WindowedTrackBitrateEstimator(
+            /* maxFutureDurationUs= */ 0,
+            /* maxPastDurationUs= */ 0,
+            /* useFormatBitrateAsLowerBound= */ false);
+    MediaChunk chunk = createMediaChunk(/* formatBitrate= */ 5, /* actualBitrate= */ 10);
+    MediaChunkIterator iterator1 = createMediaChunkIteratorWithBitrate(8);
+    MediaChunkIterator iterator2 = createMediaChunkIteratorWithBitrate(16);
+    Format format1 = createFormatWithBitrate(10);
+    Format format2 = createFormatWithBitrate(20);
+
+    int[] bitrates =
+        estimator.getBitrates(
+            new Format[] {format1, format2},
+            Collections.singletonList(chunk),
+            new MediaChunkIterator[] {iterator1, iterator2},
+            /* bitrates= */ null);
+
+    assertThat(bitrates).asList().containsExactly(10, 20).inOrder();
+  }
+
+  @Test
+  public void getBitrates_futureMaxDurationSet_returnsEstimateUsingFutureChunks() {
+    WindowedTrackBitrateEstimator estimator =
+        new WindowedTrackBitrateEstimator(
+            MAX_DURATION_US, /* maxPastDurationUs= */ 0, /* useFormatBitrateAsLowerBound= */ false);
+    MediaChunk chunk = createMediaChunk(/* formatBitrate= */ 5, /* actualBitrate= */ 10);
+    MediaChunkIterator iterator1 = createMediaChunkIteratorWithBitrate(8);
+    MediaChunkIterator iterator2 = createMediaChunkIteratorWithBitrate(16);
+    Format format1 = createFormatWithBitrate(10);
+    Format format2 = createFormatWithBitrate(20);
+
+    int[] bitrates =
+        estimator.getBitrates(
+            new Format[] {format1, format2},
+            Collections.singletonList(chunk),
+            new MediaChunkIterator[] {iterator1, iterator2},
+            /* bitrates= */ null);
+
+    assertThat(bitrates).asList().containsExactly(8, 16).inOrder();
+  }
+
+  @Test
+  public void getBitrates_pastMaxDurationSet_returnsEstimateUsingPastChunks() {
+    WindowedTrackBitrateEstimator estimator =
+        new WindowedTrackBitrateEstimator(
+            /* maxFutureDurationUs= */ 0,
+            MAX_DURATION_US,
+            /* useFormatBitrateAsLowerBound= */ false);
+    MediaChunk chunk = createMediaChunk(/* formatBitrate= */ 5, /* actualBitrate= */ 10);
+    MediaChunkIterator iterator1 = createMediaChunkIteratorWithBitrate(8);
+    MediaChunkIterator iterator2 = createMediaChunkIteratorWithBitrate(16);
+    Format format1 = createFormatWithBitrate(10);
+    Format format2 = createFormatWithBitrate(20);
+
+    int[] bitrates =
+        estimator.getBitrates(
+            new Format[] {format1, format2},
+            Collections.singletonList(chunk),
+            new MediaChunkIterator[] {iterator1, iterator2},
+            /* bitrates= */ null);
+
+    assertThat(bitrates).asList().containsExactly(16, 32).inOrder();
+  }
+
+  @Test
+  public void
+      getBitrates_useFormatBitrateAsLowerBoundSetTrue_returnsEstimateIfOnlyHigherThanFormat() {
+    WindowedTrackBitrateEstimator estimator =
+        new WindowedTrackBitrateEstimator(
+            MAX_DURATION_US, MAX_DURATION_US, /* useFormatBitrateAsLowerBound= */ true);
+    MediaChunk chunk = createMediaChunk(/* formatBitrate= */ 5, /* actualBitrate= */ 10);
+    MediaChunkIterator iterator1 = createMediaChunkIteratorWithBitrate(80);
+    MediaChunkIterator iterator2 = createMediaChunkIteratorWithBitrate(16);
+    Format format1 = createFormatWithBitrate(10);
+    Format format2 = createFormatWithBitrate(20);
+
+    int[] bitrates =
+        estimator.getBitrates(
+            new Format[] {format1, format2},
+            Collections.singletonList(chunk),
+            new MediaChunkIterator[] {iterator1, iterator2},
+            /* bitrates= */ null);
+
+    assertThat(bitrates).asList().containsExactly(80, 20).inOrder();
+  }
+
+  @Test
+  public void getBitrates_bitratesArrayGiven_returnsTheSameArray() {
+    WindowedTrackBitrateEstimator estimator =
+        new WindowedTrackBitrateEstimator(
+            MAX_DURATION_US, MAX_DURATION_US, /* useFormatBitrateAsLowerBound= */ true);
+    MediaChunk chunk = createMediaChunk(/* formatBitrate= */ 5, /* actualBitrate= */ 10);
+    MediaChunkIterator iterator1 = createMediaChunkIteratorWithBitrate(8);
+    MediaChunkIterator iterator2 = createMediaChunkIteratorWithBitrate(16);
+    Format format1 = createFormatWithBitrate(10);
+    Format format2 = createFormatWithBitrate(20);
+
+    int[] bitratesArrayToUse = new int[2];
+    int[] bitrates =
+        estimator.getBitrates(
+            new Format[] {format1, format2},
+            Collections.singletonList(chunk),
+            new MediaChunkIterator[] {iterator1, iterator2},
+            bitratesArrayToUse);
+
+    assertThat(bitrates).isSameAs(bitratesArrayToUse);
+  }
+
+  private static MediaChunk createMediaChunk(int formatBitrate, int actualBitrate) {
+    int length = actualBitrate / C.BITS_PER_BYTE;
+    DataSpec dataSpec =
+        new DataSpec(
+            Uri.EMPTY, /* absoluteStreamPosition= */ 0, length, /* key= */ null, /* flags= */ 0);
+    Format format = createFormatWithBitrate(formatBitrate);
+    return new FakeMediaChunk(
+        dataSpec, format, /* startTimeUs= */ 0L, /* endTimeUs= */ C.MICROS_PER_SECOND);
+  }
+
+  private static Format createFormatWithBitrate(int bitrate) {
+    return Format.createSampleFormat(
+        /* id= */ null,
+        /* sampleMimeType= */ null,
+        /* codecs= */ null,
+        bitrate,
+        /* drmInitData= */ null);
+  }
+
+  private static MediaChunkIterator createMediaChunkIteratorWithBitrate(int bitrate) {
+    return new FakeMediaChunkIterator(
+        /* chunkTimeBoundariesSec= */ new long[] {0, 1},
+        /* chunkLengths= */ new long[] {bitrate / C.BITS_PER_BYTE});
+  }
+}
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaChunkIterator.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaChunkIterator.java
new file mode 100644
index 0000000000..6dce2b5428
--- /dev/null
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaChunkIterator.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.exoplayer2.testutil;
+
+import android.net.Uri;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.source.chunk.BaseMediaChunkIterator;
+import com.google.android.exoplayer2.upstream.DataSpec;
+
+/** Fake {@link com.google.android.exoplayer2.source.chunk.MediaChunkIterator}. */
+public final class FakeMediaChunkIterator extends BaseMediaChunkIterator {
+
+  private final long[] chunkTimeBoundariesSec;
+  private final long[] chunkLengths;
+
+  /**
+   * Creates a fake {@link com.google.android.exoplayer2.source.chunk.MediaChunkIterator}.
+   *
+   * @param chunkTimeBoundariesSec An array containing the time boundaries where one chunk ends and
+   *     the next one starts. The first value is the start time of the first chunk and the last
+   *     value is the end time of the last chunk. The array should be of length (chunk-count + 1).
+   * @param chunkLengths An array which contains the length of each chunk, should be of length
+   *     (chunk-count).
+   */
+  public FakeMediaChunkIterator(long[] chunkTimeBoundariesSec, long[] chunkLengths) {
+    super(/* fromIndex= */ 0, /* toIndex= */ chunkTimeBoundariesSec.length - 2);
+    this.chunkTimeBoundariesSec = chunkTimeBoundariesSec;
+    this.chunkLengths = chunkLengths;
+  }
+
+  @Override
+  public DataSpec getDataSpec() {
+    checkInBounds();
+    return new DataSpec(
+        Uri.EMPTY,
+        /* absoluteStreamPosition= */ 0,
+        chunkLengths[(int) getCurrentIndex()],
+        /* key= */ null);
+  }
+
+  @Override
+  public long getChunkStartTimeUs() {
+    checkInBounds();
+    return chunkTimeBoundariesSec[(int) getCurrentIndex()] * C.MICROS_PER_SECOND;
+  }
+
+  @Override
+  public long getChunkEndTimeUs() {
+    checkInBounds();
+    return chunkTimeBoundariesSec[(int) getCurrentIndex() + 1] * C.MICROS_PER_SECOND;
+  }
+}

From b44f837d1b16f89c0f3b6996a530e17141b6962f Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 8 Nov 2018 00:19:51 -0800
Subject: [PATCH 185/832] Update release notes for 2.9.1

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=220592303
---
 RELEASENOTES.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index dae0c593aa..901d94a1cb 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,18 +2,11 @@
 
 ### dev-v2 (not yet released) ###
 
-* Fix logic for enabling next and previous actions in `TimelineQueueNavigator`
-  ([#5065](https://github.com/google/ExoPlayer/issues/5065)).
-* Fix issue where audio focus handling could not be disabled after enabling
-  it ([#5055](https://github.com/google/ExoPlayer/issues/5055)).
 * Support for playing spherical videos on Daydream.
 * Improve decoder re-use between playbacks. TODO: Write and link a blog post
   here ([#2826](https://github.com/google/ExoPlayer/issues/2826)).
 * Add options for controlling audio track selections to `DefaultTrackSelector`
   ([#3314](https://github.com/google/ExoPlayer/issues/3314)).
-* Work around an issue where a non-empty end-of-stream audio buffer would be
-  output with timestamp zero, causing the player position to jump backwards
-  ([#5045](https://github.com/google/ExoPlayer/issues/5045)).
 * Do not retry failed loads whose error is `FileNotFoundException`.
 
 ### 2.9.1 ###
@@ -45,19 +38,26 @@
 * Fix issue with blind seeking to windows with non-zero offset in a
   `ConcatenatingMediaSource`
   ([#4873](https://github.com/google/ExoPlayer/issues/4873)).
+* Fix logic for enabling next and previous actions in `TimelineQueueNavigator`
+  ([#5065](https://github.com/google/ExoPlayer/issues/5065)).
+* Fix issue where audio focus handling could not be disabled after enabling it
+  ([#5055](https://github.com/google/ExoPlayer/issues/5055)).
 * Fix issue where subtitles were positioned incorrectly if `SubtitleView` had a
   non-zero position offset to its parent
   ([#4788](https://github.com/google/ExoPlayer/issues/4788)).
 * Fix issue where the buffered position was not updated correctly when
   transitioning between periods
   ([#4899](https://github.com/google/ExoPlayer/issues/4899)).
+* Fix issue where a `NullPointerException` is thrown when removing an unprepared
+  media source from a `ConcatenatingMediaSource` with the `useLazyPreparation`
+  option enabled ([#4986](https://github.com/google/ExoPlayer/issues/4986)).
+* Work around an issue where a non-empty end-of-stream audio buffer would be
+  output with timestamp zero, causing the player position to jump backwards
+  ([#5045](https://github.com/google/ExoPlayer/issues/5045)).
 * Suppress a spurious assertion failure on some Samsung devices
   ([#4532](https://github.com/google/ExoPlayer/issues/4532)).
 * Suppress spurious "references unknown class member" shrinking warning
   ([#4890](https://github.com/google/ExoPlayer/issues/4890)).
-* Fix issue where a `NullPointerException` is thrown when removing an unprepared
-  media source from a `ConcatenatingMediaSource` with the `useLazyPreparation`
-  option enabled ([#4986](https://github.com/google/ExoPlayer/issues/4986)).
 * Swap recommended order for google() and jcenter() in gradle config
   ([#4997](https://github.com/google/ExoPlayer/issues/4997)).
 

From 91d9fbd95d5acfdf2e74685141b199f7d97c9e68 Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Thu, 8 Nov 2018 04:24:59 -0800
Subject: [PATCH 186/832] pass the notification listener to the constructor

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=220616166
---
 .../ui/PlayerNotificationManager.java         | 103 +++++++++++++++++-
 1 file changed, 102 insertions(+), 1 deletion(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
index 47025d9bba..a125f31932 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
@@ -328,6 +328,12 @@ public class PlayerNotificationManager {
    * Creates a notification manager and a low-priority notification channel with the specified
    * {@code channelId} and {@code channelName}.
    *
+   * <p>If the player notification manager is intended to be used within a foreground service,
+   * {@link #createWithNotificationChannel(Context, String, int, int, MediaDescriptionAdapter,
+   * NotificationListener)} should be used to which a {@link NotificationListener} can be passed.
+   * This way you'll receive the notification to put the service into the foreground by calling
+   * {@link android.app.Service#startForeground(int, Notification)}.
+   *
    * @param context The {@link Context}.
    * @param channelId The id of the notification channel.
    * @param channelName A string resource identifier for the user visible name of the channel. The
@@ -347,10 +353,40 @@ public class PlayerNotificationManager {
         context, channelId, notificationId, mediaDescriptionAdapter);
   }
 
+  /**
+   * Creates a notification manager and a low-priority notification channel with the specified
+   * {@code channelId} and {@code channelName}. The {@link NotificationListener} passed as the last
+   * parameter will be notified when the notification is created and cancelled.
+   *
+   * @param context The {@link Context}.
+   * @param channelId The id of the notification channel.
+   * @param channelName A string resource identifier for the user visible name of the channel. The
+   *     recommended maximum length is 40 characters; the value may be truncated if it is too long.
+   * @param notificationId The id of the notification.
+   * @param mediaDescriptionAdapter The {@link MediaDescriptionAdapter}.
+   * @param notificationListener The {@link NotificationListener}.
+   */
+  public static PlayerNotificationManager createWithNotificationChannel(
+      Context context,
+      String channelId,
+      @StringRes int channelName,
+      int notificationId,
+      MediaDescriptionAdapter mediaDescriptionAdapter,
+      @Nullable NotificationListener notificationListener) {
+    NotificationUtil.createNotificationChannel(
+        context, channelId, channelName, NotificationUtil.IMPORTANCE_LOW);
+    return new PlayerNotificationManager(
+        context, channelId, notificationId, mediaDescriptionAdapter, notificationListener);
+  }
+
   /**
    * Creates a notification manager using the specified notification {@code channelId}. The caller
    * is responsible for creating the notification channel.
    *
+   * <p>When used within a service, consider using {@link #PlayerNotificationManager(Context,
+   * String, int, MediaDescriptionAdapter, NotificationListener)} to which a {@link
+   * NotificationListener} can be passed.
+   *
    * @param context The {@link Context}.
    * @param channelId The id of the notification channel.
    * @param notificationId The id of the notification.
@@ -366,13 +402,43 @@ public class PlayerNotificationManager {
         channelId,
         notificationId,
         mediaDescriptionAdapter,
-        /* customActionReceiver= */ null);
+        /* notificationListener= */ null,
+        /* customActionReceiver */ null);
+  }
+
+  /**
+   * Creates a notification manager using the specified notification {@code channelId} and {@link
+   * NotificationListener}. The caller is responsible for creating the notification channel.
+   *
+   * @param context The {@link Context}.
+   * @param channelId The id of the notification channel.
+   * @param notificationId The id of the notification.
+   * @param mediaDescriptionAdapter The {@link MediaDescriptionAdapter}.
+   * @param notificationListener The {@link NotificationListener}.
+   */
+  public PlayerNotificationManager(
+      Context context,
+      String channelId,
+      int notificationId,
+      MediaDescriptionAdapter mediaDescriptionAdapter,
+      @Nullable NotificationListener notificationListener) {
+    this(
+        context,
+        channelId,
+        notificationId,
+        mediaDescriptionAdapter,
+        notificationListener,
+        /* customActionReceiver*/ null);
   }
 
   /**
    * Creates a notification manager using the specified notification {@code channelId} and {@link
    * CustomActionReceiver}. The caller is responsible for creating the notification channel.
    *
+   * <p>When used within a service, consider using {@link #PlayerNotificationManager(Context,
+   * String, int, MediaDescriptionAdapter, NotificationListener, CustomActionReceiver)} to which a
+   * {@link NotificationListener} can be passed.
+   *
    * @param context The {@link Context}.
    * @param channelId The id of the notification channel.
    * @param notificationId The id of the notification.
@@ -385,10 +451,39 @@ public class PlayerNotificationManager {
       int notificationId,
       MediaDescriptionAdapter mediaDescriptionAdapter,
       @Nullable CustomActionReceiver customActionReceiver) {
+    this(
+        context,
+        channelId,
+        notificationId,
+        mediaDescriptionAdapter,
+        /* notificationListener */ null,
+        customActionReceiver);
+  }
+
+  /**
+   * Creates a notification manager using the specified notification {@code channelId}, {@link
+   * NotificationListener} and {@link CustomActionReceiver}. The caller is responsible for creating
+   * the notification channel.
+   *
+   * @param context The {@link Context}.
+   * @param channelId The id of the notification channel.
+   * @param notificationId The id of the notification.
+   * @param mediaDescriptionAdapter The {@link MediaDescriptionAdapter}.
+   * @param notificationListener The {@link NotificationListener}.
+   * @param customActionReceiver The {@link CustomActionReceiver}.
+   */
+  public PlayerNotificationManager(
+      Context context,
+      String channelId,
+      int notificationId,
+      MediaDescriptionAdapter mediaDescriptionAdapter,
+      @Nullable NotificationListener notificationListener,
+      @Nullable CustomActionReceiver customActionReceiver) {
     this.context = context.getApplicationContext();
     this.channelId = channelId;
     this.notificationId = notificationId;
     this.mediaDescriptionAdapter = mediaDescriptionAdapter;
+    this.notificationListener = notificationListener;
     this.customActionReceiver = customActionReceiver;
     this.controlDispatcher = new DefaultControlDispatcher();
     instanceId = instanceIdCounter++;
@@ -479,8 +574,14 @@ public class PlayerNotificationManager {
   /**
    * Sets the {@link NotificationListener}.
    *
+   * <p>Please note that you should call this method before you call {@link #setPlayer(Player)} or
+   * you may not get the {@link NotificationListener#onNotificationStarted(int, Notification)}
+   * called on your listener.
+   *
    * @param notificationListener The {@link NotificationListener}.
+   * @deprecated Pass the notification listener to the constructor instead.
    */
+  @Deprecated
   public final void setNotificationListener(NotificationListener notificationListener) {
     this.notificationListener = notificationListener;
   }

From bce1fab03cd55d7ea95c32db79e8fe5dd389aac9 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 8 Nov 2018 08:18:44 -0800
Subject: [PATCH 187/832] Include channel count in capabilities check

Issue: #4690

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=220640737
---
 RELEASENOTES.md                                 |  2 ++
 .../ext/ffmpeg/FfmpegAudioRenderer.java         |  5 +++--
 .../ext/flac/LibflacAudioRenderer.java          |  2 +-
 .../ext/opus/LibopusAudioRenderer.java          |  2 +-
 .../exoplayer2/audio/AudioCapabilities.java     | 14 ++++++++------
 .../android/exoplayer2/audio/AudioSink.java     | 10 ++++++----
 .../exoplayer2/audio/DefaultAudioSink.java      | 12 ++++++++----
 .../audio/MediaCodecAudioRenderer.java          | 17 ++++++++++-------
 .../audio/SimpleDecoderAudioRenderer.java       |  9 ++++-----
 9 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 901d94a1cb..f16ac3ee81 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -7,6 +7,8 @@
   here ([#2826](https://github.com/google/ExoPlayer/issues/2826)).
 * Add options for controlling audio track selections to `DefaultTrackSelector`
   ([#3314](https://github.com/google/ExoPlayer/issues/3314)).
+* Include channel count in audio capabilities check
+  ([#4690](https://github.com/google/ExoPlayer/issues/4690)).
 * Do not retry failed loads whose error is `FileNotFoundException`.
 
 ### 2.9.1 ###
diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java
index 13e3964c71..f0b30baa8a 100644
--- a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java
+++ b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java
@@ -145,12 +145,13 @@ public final class FfmpegAudioRenderer extends SimpleDecoderAudioRenderer {
   }
 
   private boolean isOutputSupported(Format inputFormat) {
-    return shouldUseFloatOutput(inputFormat) || supportsOutputEncoding(C.ENCODING_PCM_16BIT);
+    return shouldUseFloatOutput(inputFormat)
+        || supportsOutput(inputFormat.channelCount, C.ENCODING_PCM_16BIT);
   }
 
   private boolean shouldUseFloatOutput(Format inputFormat) {
     Assertions.checkNotNull(inputFormat.sampleMimeType);
-    if (!enableFloatOutput || !supportsOutputEncoding(C.ENCODING_PCM_FLOAT)) {
+    if (!enableFloatOutput || !supportsOutput(inputFormat.channelCount, C.ENCODING_PCM_FLOAT)) {
       return false;
     }
     switch (inputFormat.sampleMimeType) {
diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java
index fa66abbdc6..424fcbb285 100644
--- a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java
+++ b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java
@@ -53,7 +53,7 @@ public class LibflacAudioRenderer extends SimpleDecoderAudioRenderer {
     if (!FlacLibrary.isAvailable()
         || !MimeTypes.AUDIO_FLAC.equalsIgnoreCase(format.sampleMimeType)) {
       return FORMAT_UNSUPPORTED_TYPE;
-    } else if (!supportsOutputEncoding(C.ENCODING_PCM_16BIT)) {
+    } else if (!supportsOutput(format.channelCount, C.ENCODING_PCM_16BIT)) {
       return FORMAT_UNSUPPORTED_SUBTYPE;
     } else if (!supportsFormatDrm(drmSessionManager, format.drmInitData)) {
       return FORMAT_UNSUPPORTED_DRM;
diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java
index 57937b4282..e288339058 100644
--- a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java
+++ b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java
@@ -78,7 +78,7 @@ public final class LibopusAudioRenderer extends SimpleDecoderAudioRenderer {
     if (!OpusLibrary.isAvailable()
         || !MimeTypes.AUDIO_OPUS.equalsIgnoreCase(format.sampleMimeType)) {
       return FORMAT_UNSUPPORTED_TYPE;
-    } else if (!supportsOutputEncoding(C.ENCODING_PCM_16BIT)) {
+    } else if (!supportsOutput(format.channelCount, C.ENCODING_PCM_16BIT)) {
       return FORMAT_UNSUPPORTED_SUBTYPE;
     } else if (!supportsFormatDrm(drmSessionManager, format.drmInitData)) {
       return FORMAT_UNSUPPORTED_DRM;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java
index 92d39dec65..6a5e58ef2a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java
@@ -29,11 +29,11 @@ import java.util.Arrays;
 @TargetApi(21)
 public final class AudioCapabilities {
 
-  /**
-   * The minimum audio capabilities supported by all devices.
-   */
+  private static final int DEFAULT_MAX_CHANNEL_COUNT = 8;
+
+  /** The minimum audio capabilities supported by all devices. */
   public static final AudioCapabilities DEFAULT_AUDIO_CAPABILITIES =
-      new AudioCapabilities(new int[] {AudioFormat.ENCODING_PCM_16BIT}, 2);
+      new AudioCapabilities(new int[] {AudioFormat.ENCODING_PCM_16BIT}, DEFAULT_MAX_CHANNEL_COUNT);
 
   /**
    * Returns the current audio capabilities for the device.
@@ -52,8 +52,10 @@ public final class AudioCapabilities {
     if (intent == null || intent.getIntExtra(AudioManager.EXTRA_AUDIO_PLUG_STATE, 0) == 0) {
       return DEFAULT_AUDIO_CAPABILITIES;
     }
-    return new AudioCapabilities(intent.getIntArrayExtra(AudioManager.EXTRA_ENCODINGS),
-        intent.getIntExtra(AudioManager.EXTRA_MAX_CHANNEL_COUNT, 0));
+    return new AudioCapabilities(
+        intent.getIntArrayExtra(AudioManager.EXTRA_ENCODINGS),
+        intent.getIntExtra(
+            AudioManager.EXTRA_MAX_CHANNEL_COUNT, /* defaultValue= */ DEFAULT_MAX_CHANNEL_COUNT));
   }
 
   private final int[] supportedEncodings;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java
index bf1dc3ca8a..5e8efdc788 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.audio;
 import android.media.AudioTrack;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.PlaybackParameters;
 import java.nio.ByteBuffer;
 
@@ -166,12 +167,13 @@ public interface AudioSink {
   void setListener(Listener listener);
 
   /**
-   * Returns whether it's possible to play audio in the specified encoding.
+   * Returns whether the sink supports the audio format.
    *
-   * @param encoding The audio encoding.
-   * @return Whether it's possible to play audio in the specified encoding.
+   * @param channelCount The number of channels, or {@link Format#NO_VALUE} if not known.
+   * @param encoding The audio encoding, or {@link Format#NO_VALUE} if not known.
+   * @return Whether the sink supports the audio format.
    */
-  boolean isEncodingSupported(@C.Encoding int encoding);
+  boolean supportsOutput(int channelCount, @C.Encoding int encoding);
 
   /**
    * Returns the playback position in the stream starting at zero, in microseconds, or
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
index 7ba060ad76..fc515dbdb3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
@@ -376,14 +376,18 @@ public final class DefaultAudioSink implements AudioSink {
   }
 
   @Override
-  public boolean isEncodingSupported(@C.Encoding int encoding) {
+  public boolean supportsOutput(int channelCount, @C.Encoding int encoding) {
     if (Util.isEncodingLinearPcm(encoding)) {
       // AudioTrack supports 16-bit integer PCM output in all platform API versions, and float
       // output from platform API version 21 only. Other integer PCM encodings are resampled by this
-      // sink to 16-bit PCM.
+      // sink to 16-bit PCM. We assume that the audio framework will downsample any number of
+      // channels to the output device's required number of channels.
       return encoding != C.ENCODING_PCM_FLOAT || Util.SDK_INT >= 21;
     } else {
-      return audioCapabilities != null && audioCapabilities.supportsEncoding(encoding);
+      return audioCapabilities != null
+          && audioCapabilities.supportsEncoding(encoding)
+          && (channelCount == Format.NO_VALUE
+              || channelCount <= audioCapabilities.getMaxChannelCount());
     }
   }
 
@@ -414,7 +418,7 @@ public final class DefaultAudioSink implements AudioSink {
     isInputPcm = Util.isEncodingLinearPcm(inputEncoding);
     shouldConvertHighResIntPcmToFloat =
         enableConvertHighResIntPcmToFloat
-            && isEncodingSupported(C.ENCODING_PCM_32BIT)
+            && supportsOutput(channelCount, C.ENCODING_PCM_32BIT)
             && Util.isEncodingHighResolutionIntegerPcm(inputEncoding);
     if (isInputPcm) {
       pcmFrameSize = Util.getPcmFrameSize(inputEncoding, channelCount);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
index d7206cd2c5..49c391c4cc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
@@ -271,12 +271,14 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
     }
     int tunnelingSupport = Util.SDK_INT >= 21 ? TUNNELING_SUPPORTED : TUNNELING_NOT_SUPPORTED;
     boolean supportsFormatDrm = supportsFormatDrm(drmSessionManager, format.drmInitData);
-    if (supportsFormatDrm && allowPassthrough(mimeType)
+    if (supportsFormatDrm
+        && allowPassthrough(format.channelCount, mimeType)
         && mediaCodecSelector.getPassthroughDecoderInfo() != null) {
       return ADAPTIVE_NOT_SEAMLESS | tunnelingSupport | FORMAT_HANDLED;
     }
-    if ((MimeTypes.AUDIO_RAW.equals(mimeType) && !audioSink.isEncodingSupported(format.pcmEncoding))
-        || !audioSink.isEncodingSupported(C.ENCODING_PCM_16BIT)) {
+    if ((MimeTypes.AUDIO_RAW.equals(mimeType)
+            && !audioSink.supportsOutput(format.channelCount, format.pcmEncoding))
+        || !audioSink.supportsOutput(format.channelCount, C.ENCODING_PCM_16BIT)) {
       // Assume the decoder outputs 16-bit PCM, unless the input is raw.
       return FORMAT_UNSUPPORTED_SUBTYPE;
     }
@@ -315,7 +317,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
   protected List<MediaCodecInfo> getDecoderInfos(
       MediaCodecSelector mediaCodecSelector, Format format, boolean requiresSecureDecoder)
       throws DecoderQueryException {
-    if (allowPassthrough(format.sampleMimeType)) {
+    if (allowPassthrough(format.channelCount, format.sampleMimeType)) {
       MediaCodecInfo passthroughDecoderInfo = mediaCodecSelector.getPassthroughDecoderInfo();
       if (passthroughDecoderInfo != null) {
         return Collections.singletonList(passthroughDecoderInfo);
@@ -329,12 +331,13 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
    * This implementation returns true if the {@link AudioSink} indicates that encoded audio output
    * is supported.
    *
+   * @param channelCount The number of channels in the input media, or {@link Format#NO_VALUE} if
+   *     not known.
    * @param mimeType The type of input media.
    * @return Whether passthrough playback is supported.
    */
-  protected boolean allowPassthrough(String mimeType) {
-    @C.Encoding int encoding = MimeTypes.getEncoding(mimeType);
-    return encoding != C.ENCODING_INVALID && audioSink.isEncodingSupported(encoding);
+  protected boolean allowPassthrough(int channelCount, String mimeType) {
+    return audioSink.supportsOutput(channelCount, MimeTypes.getEncoding(mimeType));
   }
 
   @Override
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
index 3df38e3557..287cae9d41 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
@@ -249,13 +249,12 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
       DrmSessionManager<ExoMediaCrypto> drmSessionManager, Format format);
 
   /**
-   * Returns whether the audio sink can accept audio in the specified encoding.
+   * Returns whether the sink supports the audio format.
    *
-   * @param encoding The audio encoding.
-   * @return Whether the audio sink can accept audio in the specified encoding.
+   * @see AudioSink#supportsOutput(int, int)
    */
-  protected final boolean supportsOutputEncoding(@C.Encoding int encoding) {
-    return audioSink.isEncodingSupported(encoding);
+  protected final boolean supportsOutput(int channelCount, @C.Encoding int encoding) {
+    return audioSink.supportsOutput(channelCount, encoding);
   }
 
   @Override

From 4754aa59bd0429e671eca5e5d7b35debc5c714ca Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Thu, 8 Nov 2018 08:44:22 -0800
Subject: [PATCH 188/832] Use estimated bitrates in AdaptiveTrackSelection

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=220643861
---
 .../AdaptiveTrackSelection.java               | 78 +++++++++++++++----
 .../AdaptiveTrackSelectionTest.java           | 64 ++++++++++++---
 2 files changed, 114 insertions(+), 28 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
index 696f2bdefe..2c74d2412d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
@@ -47,6 +47,8 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
     private final long minTimeBetweenBufferReevaluationMs;
     private final Clock clock;
 
+    private TrackBitrateEstimator trackBitrateEstimator;
+
     /** Creates an adaptive track selection factory with default parameters. */
     public Factory() {
       this(
@@ -199,6 +201,18 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
           bufferedFractionToLiveEdgeForQualityIncrease;
       this.minTimeBetweenBufferReevaluationMs = minTimeBetweenBufferReevaluationMs;
       this.clock = clock;
+      trackBitrateEstimator = TrackBitrateEstimator.DEFAULT;
+    }
+
+    /**
+     * Sets a TrackBitrateEstimator.
+     *
+     * <p>This method is experimental, and will be renamed or removed in a future release.
+     *
+     * @param trackBitrateEstimator A {@link TrackBitrateEstimator}.
+     */
+    public void experimental_setTrackBitrateEstimator(TrackBitrateEstimator trackBitrateEstimator) {
+      this.trackBitrateEstimator = trackBitrateEstimator;
     }
 
     @Override
@@ -207,17 +221,20 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
       if (this.bandwidthMeter != null) {
         bandwidthMeter = this.bandwidthMeter;
       }
-      return new AdaptiveTrackSelection(
-          group,
-          tracks,
-          bandwidthMeter,
-          minDurationForQualityIncreaseMs,
-          maxDurationForQualityDecreaseMs,
-          minDurationToRetainAfterDiscardMs,
-          bandwidthFraction,
-          bufferedFractionToLiveEdgeForQualityIncrease,
-          minTimeBetweenBufferReevaluationMs,
-          clock);
+      AdaptiveTrackSelection adaptiveTrackSelection =
+          new AdaptiveTrackSelection(
+              group,
+              tracks,
+              bandwidthMeter,
+              minDurationForQualityIncreaseMs,
+              maxDurationForQualityDecreaseMs,
+              minDurationToRetainAfterDiscardMs,
+              bandwidthFraction,
+              bufferedFractionToLiveEdgeForQualityIncrease,
+              minTimeBetweenBufferReevaluationMs,
+              clock);
+      adaptiveTrackSelection.experimental_setTrackBitrateEstimator(trackBitrateEstimator);
+      return adaptiveTrackSelection;
     }
   }
 
@@ -236,7 +253,11 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
   private final float bufferedFractionToLiveEdgeForQualityIncrease;
   private final long minTimeBetweenBufferReevaluationMs;
   private final Clock clock;
+  private final Format[] formats;
+  private final int[] formatBitrates;
+  private final int[] estimatedBitrates;
 
+  private TrackBitrateEstimator trackBitrateEstimator;
   private float playbackSpeed;
   private int selectedIndex;
   private int reason;
@@ -314,11 +335,32 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
     playbackSpeed = 1f;
     reason = C.SELECTION_REASON_INITIAL;
     lastBufferEvaluationMs = C.TIME_UNSET;
+    trackBitrateEstimator = TrackBitrateEstimator.DEFAULT;
+    formats = new Format[length];
+    formatBitrates = new int[length];
+    estimatedBitrates = new int[length];
+    for (int i = 0; i < length; i++) {
+      @SuppressWarnings("nullness:method.invocation.invalid")
+      Format format = getFormat(i);
+      formats[i] = format;
+      formatBitrates[i] = formats[i].bitrate;
+    }
     @SuppressWarnings("nullness:method.invocation.invalid")
-    int selectedIndex = determineIdealSelectedIndex(Long.MIN_VALUE);
+    int selectedIndex = determineIdealSelectedIndex(Long.MIN_VALUE, formatBitrates);
     this.selectedIndex = selectedIndex;
   }
 
+  /**
+   * Sets a TrackBitrateEstimator.
+   *
+   * <p>This method is experimental, and will be renamed or removed in a future release.
+   *
+   * @param trackBitrateEstimator A {@link TrackBitrateEstimator}.
+   */
+  public void experimental_setTrackBitrateEstimator(TrackBitrateEstimator trackBitrateEstimator) {
+    this.trackBitrateEstimator = trackBitrateEstimator;
+  }
+
   @Override
   public void enable() {
     lastBufferEvaluationMs = C.TIME_UNSET;
@@ -338,9 +380,11 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
       MediaChunkIterator[] mediaChunkIterators) {
     long nowMs = clock.elapsedRealtime();
 
+    trackBitrateEstimator.getBitrates(formats, queue, mediaChunkIterators, estimatedBitrates);
+
     // Stash the current selection, then make a new one.
     int currentSelectedIndex = selectedIndex;
-    selectedIndex = determineIdealSelectedIndex(nowMs);
+    selectedIndex = determineIdealSelectedIndex(nowMs, estimatedBitrates);
     if (selectedIndex == currentSelectedIndex) {
       return;
     }
@@ -402,7 +446,7 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
     if (playoutBufferedDurationBeforeLastChunkUs < minDurationToRetainAfterDiscardUs) {
       return queueSize;
     }
-    int idealSelectedIndex = determineIdealSelectedIndex(nowMs);
+    int idealSelectedIndex = determineIdealSelectedIndex(nowMs, formatBitrates);
     Format idealFormat = getFormat(idealSelectedIndex);
     // If the chunks contain video, discard from the first SD chunk beyond
     // minDurationToRetainAfterDiscardUs whose resolution and bitrate are both lower than the ideal
@@ -429,14 +473,14 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
    *
    * @param nowMs The current time in the timebase of {@link Clock#elapsedRealtime()}, or {@link
    *     Long#MIN_VALUE} to ignore blacklisting.
+   * @param bitrates Track bitrates.
    */
-  private int determineIdealSelectedIndex(long nowMs) {
+  private int determineIdealSelectedIndex(long nowMs, int[] bitrates) {
     long effectiveBitrate = (long) (bandwidthMeter.getBitrateEstimate() * bandwidthFraction);
     int lowestBitrateNonBlacklistedIndex = 0;
     for (int i = 0; i < length; i++) {
       if (nowMs == Long.MIN_VALUE || !isBlacklisted(i, nowMs)) {
-        Format format = getFormat(i);
-        if (Math.round(format.bitrate * playbackSpeed) <= effectiveBitrate) {
+        if (Math.round(bitrates[i] * playbackSpeed) <= effectiveBitrate) {
           return i;
         } else {
           lowestBitrateNonBlacklistedIndex = i;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
index dcad02fef1..29018a520c 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
@@ -16,6 +16,9 @@
 package com.google.android.exoplayer2.trackselection;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.argThat;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -32,11 +35,13 @@ import com.google.android.exoplayer2.testutil.FakeMediaChunk;
 import com.google.android.exoplayer2.upstream.BandwidthMeter;
 import com.google.android.exoplayer2.util.MimeTypes;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatcher;
 import org.mockito.Mock;
 import org.robolectric.RobolectricTestRunner;
 
@@ -220,6 +225,52 @@ public final class AdaptiveTrackSelectionTest {
     assertThat(adaptiveTrackSelection.getSelectionReason()).isEqualTo(C.SELECTION_REASON_ADAPTIVE);
   }
 
+  @Test
+  public void testUpdateSelectedTrackSwitchUpIfTrackBitrateEstimateIsLow() {
+    Format format1 = videoFormat(/* bitrate= */ 500, /* width= */ 320, /* height= */ 240);
+    Format format2 = videoFormat(/* bitrate= */ 1000, /* width= */ 640, /* height= */ 480);
+    Format format3 = videoFormat(/* bitrate= */ 2000, /* width= */ 960, /* height= */ 720);
+    TrackGroup trackGroup = new TrackGroup(format1, format2, format3);
+
+    // The second measurement onward returns 1500L, which isn't enough to switch up to format3 as
+    // the format bitrate is 2000.
+    when(mockBandwidthMeter.getBitrateEstimate()).thenReturn(1000L, 1500L);
+
+    // But TrackBitrateEstimator returns 1500 for 3rd track so it should switch up.
+    TrackBitrateEstimator estimator = mock(TrackBitrateEstimator.class);
+    when(estimator.getBitrates(any(), any(), any(), any())).thenReturn(new int[] {500, 1000, 1500});
+
+    adaptiveTrackSelection = adaptiveTrackSelection(trackGroup);
+    adaptiveTrackSelection.experimental_setTrackBitrateEstimator(estimator);
+
+    adaptiveTrackSelection.updateSelectedTrack(
+        /* playbackPositionUs= */ 0,
+        /* bufferedDurationUs= */ AdaptiveTrackSelection
+                .DEFAULT_MIN_DURATION_FOR_QUALITY_INCREASE_MS
+            * 1000,
+        /* availableDurationUs= */ C.TIME_UNSET,
+        /* queue= */ Collections.emptyList(),
+        /* mediaChunkIterators= */ THREE_EMPTY_MEDIA_CHUNK_ITERATORS);
+
+    ArgumentMatcher<Format[]> matcher =
+        new ArgumentMatcher<Format[]>() {
+          @Override
+          public boolean matches(Object argument) {
+            Format[] formats = (Format[]) argument;
+            return formats.length == 3
+                && Arrays.asList(formats).containsAll(Arrays.asList(format1, format2, format3));
+          }
+        };
+    verify(estimator)
+        .getBitrates(
+            argThat(matcher),
+            eq(Collections.emptyList()),
+            eq(THREE_EMPTY_MEDIA_CHUNK_ITERATORS),
+            any());
+    assertThat(adaptiveTrackSelection.getSelectedFormat()).isEqualTo(format3);
+    assertThat(adaptiveTrackSelection.getSelectionReason()).isEqualTo(C.SELECTION_REASON_ADAPTIVE);
+  }
+
   @Test
   public void testEvaluateQueueSizeReturnQueueSizeIfBandwidthIsNotImproved() {
     Format format1 = videoFormat(/* bitrate= */ 500, /* width= */ 320, /* height= */ 240);
@@ -322,17 +373,8 @@ public final class AdaptiveTrackSelectionTest {
   }
 
   private AdaptiveTrackSelection adaptiveTrackSelection(TrackGroup trackGroup) {
-    return new AdaptiveTrackSelection(
-        trackGroup,
-        selectedAllTracksInGroup(trackGroup),
-        mockBandwidthMeter,
-        AdaptiveTrackSelection.DEFAULT_MIN_DURATION_FOR_QUALITY_INCREASE_MS,
-        AdaptiveTrackSelection.DEFAULT_MAX_DURATION_FOR_QUALITY_DECREASE_MS,
-        AdaptiveTrackSelection.DEFAULT_MIN_DURATION_TO_RETAIN_AFTER_DISCARD_MS,
-        /* bandwidthFraction= */ 1.0f,
-        AdaptiveTrackSelection.DEFAULT_BUFFERED_FRACTION_TO_LIVE_EDGE_FOR_QUALITY_INCREASE,
-        AdaptiveTrackSelection.DEFAULT_MIN_TIME_BETWEEN_BUFFER_REEVALUTATION_MS,
-        fakeClock);
+    return adaptiveTrackSelectionWithMinDurationForQualityIncreaseMs(
+        trackGroup, AdaptiveTrackSelection.DEFAULT_MIN_DURATION_FOR_QUALITY_INCREASE_MS);
   }
 
   private AdaptiveTrackSelection adaptiveTrackSelectionWithMinDurationForQualityIncreaseMs(

From 8ec757ad2bca4280fbfe8d83a49a876a4eccb1cb Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 9 Nov 2018 05:33:57 -0800
Subject: [PATCH 189/832] Some MediaSessionConnector simplifications

- Simplify logic for dispatching to the rating callback
- Simplify CommandReceiver by removing getCommands. Simply calling
  receivers is simpler, and more flexible because it doesn't force
  implementations to define a static set of things that they handle
  up front.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=220788423
---
 .../DefaultPlaybackController.java            |  9 +---
 .../mediasession/MediaSessionConnector.java   | 49 +++++++------------
 .../ext/mediasession/TimelineQueueEditor.java | 12 ++---
 .../mediasession/TimelineQueueNavigator.java  |  9 ++--
 4 files changed, 29 insertions(+), 50 deletions(-)

diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/DefaultPlaybackController.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/DefaultPlaybackController.java
index fbc4a39ff2..655fc878ba 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/DefaultPlaybackController.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/DefaultPlaybackController.java
@@ -151,13 +151,8 @@ public class DefaultPlaybackController implements MediaSessionConnector.Playback
   // CommandReceiver implementation.
 
   @Override
-  public String[] getCommands() {
-    return null;
-  }
-
-  @Override
-  public void onCommand(Player player, String command, Bundle extras, ResultReceiver cb) {
-    // Do nothing.
+  public boolean onCommand(Player player, String command, Bundle extras, ResultReceiver cb) {
+    return false;
   }
 
 }
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
index b24c936f1a..16dc40d1e9 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
@@ -40,6 +40,7 @@ import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.ErrorMessageProvider;
 import com.google.android.exoplayer2.util.Util;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -85,11 +86,11 @@ public final class MediaSessionConnector {
   /** Receiver of media commands sent by a media controller. */
   public interface CommandReceiver {
     /**
-     * Returns the commands the receiver handles, or {@code null} if no commands need to be handled.
+     * See {@link MediaSessionCompat.Callback#onCommand(String, Bundle, ResultReceiver)}.
+     *
+     * @return Whether the command was handled by the receiver.
      */
-    String[] getCommands();
-    /** See {@link MediaSessionCompat.Callback#onCommand(String, Bundle, ResultReceiver)}. */
-    void onCommand(Player player, String command, Bundle extras, ResultReceiver cb);
+    boolean onCommand(Player player, String command, Bundle extras, ResultReceiver cb);
   }
 
   /** Interface to which playback preparation actions are delegated. */
@@ -247,8 +248,6 @@ public final class MediaSessionConnector {
   /** Callback receiving a user rating for the active media item. */
   public interface RatingCallback extends CommandReceiver {
 
-    long ACTIONS = PlaybackStateCompat.ACTION_SET_RATING;
-
     /** See {@link MediaSessionCompat.Callback#onSetRating(RatingCompat)}. */
     void onSetRating(Player player, RatingCompat rating);
 
@@ -297,7 +296,7 @@ public final class MediaSessionConnector {
   private final ExoPlayerEventListener exoPlayerEventListener;
   private final MediaSessionCallback mediaSessionCallback;
   private final PlaybackController playbackController;
-  private final Map<String, CommandReceiver> commandMap;
+  private final ArrayList<CommandReceiver> commandReceivers;
 
   private Player player;
   private CustomActionProvider[] customActionProviders;
@@ -385,7 +384,7 @@ public final class MediaSessionConnector {
     mediaSessionCallback = new MediaSessionCallback();
     exoPlayerEventListener = new ExoPlayerEventListener();
     customActionMap = Collections.emptyMap();
-    commandMap = new HashMap<>();
+    commandReceivers = new ArrayList<>();
     registerCommandReceiver(playbackController);
   }
 
@@ -593,19 +592,13 @@ public final class MediaSessionConnector {
   }
 
   private void registerCommandReceiver(CommandReceiver commandReceiver) {
-    if (commandReceiver != null && commandReceiver.getCommands() != null) {
-      for (String command : commandReceiver.getCommands()) {
-        commandMap.put(command, commandReceiver);
-      }
+    if (!commandReceivers.contains(commandReceiver)) {
+      commandReceivers.add(commandReceiver);
     }
   }
 
   private void unregisterCommandReceiver(CommandReceiver commandReceiver) {
-    if (commandReceiver != null && commandReceiver.getCommands() != null) {
-      for (String command : commandReceiver.getCommands()) {
-        commandMap.remove(command);
-      }
-    }
+    commandReceivers.remove(commandReceiver);
   }
 
   private long buildPlaybackActions() {
@@ -619,7 +612,7 @@ public final class MediaSessionConnector {
           (QueueNavigator.ACTIONS & queueNavigator.getSupportedQueueNavigatorActions(player));
     }
     if (ratingCallback != null) {
-      actions |= RatingCallback.ACTIONS;
+      actions |= PlaybackStateCompat.ACTION_SET_RATING;
     }
     return actions;
   }
@@ -642,10 +635,6 @@ public final class MediaSessionConnector {
         && (playbackPreparer.getSupportedPrepareActions() & PlaybackPreparer.ACTIONS & action) != 0;
   }
 
-  private boolean canDispatchToRatingCallback(long action) {
-    return ratingCallback != null && (RatingCallback.ACTIONS & action) != 0;
-  }
-
   private boolean canDispatchToPlaybackController(long action) {
     return (playbackController.getSupportedPlaybackActions(player)
             & PlaybackController.ACTIONS
@@ -913,18 +902,18 @@ public final class MediaSessionConnector {
 
     @Override
     public void onCustomAction(@NonNull String action, @Nullable Bundle extras) {
-      Map<String, CustomActionProvider> actionMap = customActionMap;
-      if (actionMap.containsKey(action)) {
-        actionMap.get(action).onCustomAction(action, extras);
+      if (customActionMap.containsKey(action)) {
+        customActionMap.get(action).onCustomAction(action, extras);
         invalidateMediaSessionPlaybackState();
       }
     }
 
     @Override
     public void onCommand(String command, Bundle extras, ResultReceiver cb) {
-      CommandReceiver commandReceiver = commandMap.get(command);
-      if (commandReceiver != null) {
-        commandReceiver.onCommand(player, command, extras, cb);
+      for (int i = 0; i < commandReceivers.size(); i++) {
+        if (commandReceivers.get(i).onCommand(player, command, extras, cb)) {
+          return;
+        }
       }
     }
 
@@ -993,14 +982,14 @@ public final class MediaSessionConnector {
 
     @Override
     public void onSetRating(RatingCompat rating) {
-      if (canDispatchToRatingCallback(PlaybackStateCompat.ACTION_SET_RATING)) {
+      if (ratingCallback != null) {
         ratingCallback.onSetRating(player, rating);
       }
     }
 
     @Override
     public void onSetRating(RatingCompat rating, Bundle extras) {
-      if (canDispatchToRatingCallback(PlaybackStateCompat.ACTION_SET_RATING)) {
+      if (ratingCallback != null) {
         ratingCallback.onSetRating(player, rating, extras);
       }
     }
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
index 4f9c553a15..ab296afad7 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
@@ -193,20 +193,18 @@ public final class TimelineQueueEditor
 
   // CommandReceiver implementation.
 
-  @NonNull
   @Override
-  public String[] getCommands() {
-    return new String[] {COMMAND_MOVE_QUEUE_ITEM};
-  }
-
-  @Override
-  public void onCommand(Player player, String command, Bundle extras, ResultReceiver cb) {
+  public boolean onCommand(Player player, String command, Bundle extras, ResultReceiver cb) {
+    if (!COMMAND_MOVE_QUEUE_ITEM.equals(command)) {
+      return false;
+    }
     int from = extras.getInt(EXTRA_FROM_INDEX, C.INDEX_UNSET);
     int to = extras.getInt(EXTRA_TO_INDEX, C.INDEX_UNSET);
     if (from != C.INDEX_UNSET && to != C.INDEX_UNSET) {
       queueDataAdapter.move(from, to);
       queueMediaSource.moveMediaSource(from, to);
     }
+    return true;
   }
 
 }
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
index d55f8e04f0..53f784e021 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
@@ -171,14 +171,11 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
   // CommandReceiver implementation.
 
   @Override
-  public String[] getCommands() {
-    return null;
+  public boolean onCommand(Player player, String command, Bundle extras, ResultReceiver cb) {
+    return false;
   }
 
-  @Override
-  public void onCommand(Player player, String command, Bundle extras, ResultReceiver cb) {
-    // Do nothing.
-  }
+  // Helper methods.
 
   private void publishFloatingQueueWindow(Player player) {
     if (player.getCurrentTimeline().isEmpty()) {

From 063f5704cd80a733bf770375d8fbf402a6c5d958 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 9 Nov 2018 10:14:58 -0800
Subject: [PATCH 190/832] Simplify MediaSessionConnector

- Make MediaSessionConnector use a ControlDispatcher and add setControlDispatcher,
  setFastForwardIncrementMs and setRewindIncrementMs methods. This brings it in line
  with our other UI components, including PlayerControlView and
  PlayerNotificationManager.
- Collapsed DefaultPlaybackController into MediaSessionConnector, since I'm not
  sure there's a legitimate alternative implementation (note ControlDispatcher does
  provide some equivalent functionality e.g. to modify calls being made on the
  player).
- Pass the Player and ControlDispatcher to command receivers and custom actions,
  so they don't need their own references.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=220822082
---
 .../DefaultPlaybackController.java            | 158 -------
 .../mediasession/MediaSessionConnector.java   | 394 +++++++++++-------
 .../RepeatModeActionProvider.java             |  25 +-
 .../ext/mediasession/TimelineQueueEditor.java |   8 +-
 .../mediasession/TimelineQueueNavigator.java  |  25 +-
 5 files changed, 283 insertions(+), 327 deletions(-)
 delete mode 100644 extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/DefaultPlaybackController.java

diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/DefaultPlaybackController.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/DefaultPlaybackController.java
deleted file mode 100644
index 655fc878ba..0000000000
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/DefaultPlaybackController.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.ext.mediasession;
-
-import android.os.Bundle;
-import android.os.ResultReceiver;
-import android.support.v4.media.session.PlaybackStateCompat;
-import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.Player;
-
-/**
- * A default implementation of {@link MediaSessionConnector.PlaybackController}.
- * <p>
- * Methods can be safely overridden by subclasses to intercept calls for given actions.
- */
-public class DefaultPlaybackController implements MediaSessionConnector.PlaybackController {
-
-  /**
-   * The default fast forward increment, in milliseconds.
-   */
-  public static final int DEFAULT_FAST_FORWARD_MS = 15000;
-  /**
-   * The default rewind increment, in milliseconds.
-   */
-  public static final int DEFAULT_REWIND_MS = 5000;
-
-  private static final long BASE_ACTIONS = PlaybackStateCompat.ACTION_PLAY_PAUSE
-      | PlaybackStateCompat.ACTION_PLAY | PlaybackStateCompat.ACTION_PAUSE
-      | PlaybackStateCompat.ACTION_STOP | PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE
-      | PlaybackStateCompat.ACTION_SET_REPEAT_MODE;
-
-  protected final long rewindIncrementMs;
-  protected final long fastForwardIncrementMs;
-
-  /**
-   * Creates a new instance.
-   *
-   * <p>Equivalent to {@code DefaultPlaybackController(DefaultPlaybackController.DEFAULT_REWIND_MS,
-   * DefaultPlaybackController.DEFAULT_FAST_FORWARD_MS)}.
-   */
-  public DefaultPlaybackController() {
-    this(DEFAULT_REWIND_MS, DEFAULT_FAST_FORWARD_MS);
-  }
-
-  /**
-   * Creates a new instance with the given fast forward and rewind increments.
-   *
-   * @param rewindIncrementMs The rewind increment in milliseconds. A zero or negative value will
-   *     cause the rewind action to be disabled.
-   * @param fastForwardIncrementMs The fast forward increment in milliseconds. A zero or negative
-   */
-  public DefaultPlaybackController(long rewindIncrementMs, long fastForwardIncrementMs) {
-    this.rewindIncrementMs = rewindIncrementMs;
-    this.fastForwardIncrementMs = fastForwardIncrementMs;
-  }
-
-  @Override
-  public long getSupportedPlaybackActions(Player player) {
-    if (player == null || player.getCurrentTimeline().isEmpty()) {
-      return 0;
-    } else if (!player.isCurrentWindowSeekable()) {
-      return BASE_ACTIONS;
-    }
-    long actions = BASE_ACTIONS | PlaybackStateCompat.ACTION_SEEK_TO;
-    if (fastForwardIncrementMs > 0) {
-      actions |= PlaybackStateCompat.ACTION_FAST_FORWARD;
-    }
-    if (rewindIncrementMs > 0) {
-      actions |= PlaybackStateCompat.ACTION_REWIND;
-    }
-    return actions;
-  }
-
-  @Override
-  public void onPlay(Player player) {
-    player.setPlayWhenReady(true);
-  }
-
-  @Override
-  public void onPause(Player player) {
-    player.setPlayWhenReady(false);
-  }
-
-  @Override
-  public void onSeekTo(Player player, long positionMs) {
-    long duration = player.getDuration();
-    if (duration != C.TIME_UNSET) {
-      positionMs = Math.min(positionMs, duration);
-    }
-    player.seekTo(Math.max(positionMs, 0));
-  }
-
-  @Override
-  public void onFastForward(Player player) {
-    if (fastForwardIncrementMs <= 0) {
-      return;
-    }
-    onSeekTo(player, player.getCurrentPosition() + fastForwardIncrementMs);
-  }
-
-  @Override
-  public void onRewind(Player player) {
-    if (rewindIncrementMs <= 0) {
-      return;
-    }
-    onSeekTo(player, player.getCurrentPosition() - rewindIncrementMs);
-  }
-
-  @Override
-  public void onStop(Player player) {
-    player.stop(true);
-  }
-
-  @Override
-  public void onSetShuffleMode(Player player, int shuffleMode) {
-    player.setShuffleModeEnabled(shuffleMode == PlaybackStateCompat.SHUFFLE_MODE_ALL
-        || shuffleMode == PlaybackStateCompat.SHUFFLE_MODE_GROUP);
-  }
-
-  @Override
-  public void onSetRepeatMode(Player player, int mediaSessionRepeatMode) {
-    int repeatMode;
-    switch (mediaSessionRepeatMode) {
-      case PlaybackStateCompat.REPEAT_MODE_ALL:
-      case PlaybackStateCompat.REPEAT_MODE_GROUP:
-        repeatMode = Player.REPEAT_MODE_ALL;
-        break;
-      case PlaybackStateCompat.REPEAT_MODE_ONE:
-        repeatMode = Player.REPEAT_MODE_ONE;
-        break;
-      default:
-        repeatMode = Player.REPEAT_MODE_OFF;
-        break;
-    }
-    player.setRepeatMode(repeatMode);
-  }
-
-  // CommandReceiver implementation.
-
-  @Override
-  public boolean onCommand(Player player, String command, Bundle extras, ResultReceiver cb) {
-    return false;
-  }
-
-}
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
index 16dc40d1e9..0b5fdbc624 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
@@ -22,6 +22,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.ResultReceiver;
 import android.os.SystemClock;
+import android.support.annotation.LongDef;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.media.MediaDescriptionCompat;
@@ -32,6 +33,8 @@ import android.support.v4.media.session.MediaSessionCompat;
 import android.support.v4.media.session.PlaybackStateCompat;
 import android.util.Pair;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ControlDispatcher;
+import com.google.android.exoplayer2.DefaultControlDispatcher;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.PlaybackParameters;
@@ -39,7 +42,10 @@ import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.ErrorMessageProvider;
+import com.google.android.exoplayer2.util.RepeatModeUtil;
 import com.google.android.exoplayer2.util.Util;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -76,7 +82,52 @@ public final class MediaSessionConnector {
     ExoPlayerLibraryInfo.registerModule("goog.exo.mediasession");
   }
 
+  /** Playback actions supported by the connector. */
+  @LongDef(
+      flag = true,
+      value = {
+        PlaybackStateCompat.ACTION_PLAY_PAUSE,
+        PlaybackStateCompat.ACTION_PLAY,
+        PlaybackStateCompat.ACTION_PAUSE,
+        PlaybackStateCompat.ACTION_SEEK_TO,
+        PlaybackStateCompat.ACTION_FAST_FORWARD,
+        PlaybackStateCompat.ACTION_REWIND,
+        PlaybackStateCompat.ACTION_STOP,
+        PlaybackStateCompat.ACTION_SET_REPEAT_MODE,
+        PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE
+      })
+  @Retention(RetentionPolicy.SOURCE)
+  public @interface PlaybackActions {}
+
+  @PlaybackActions
+  public static final long ALL_PLAYBACK_ACTIONS =
+      PlaybackStateCompat.ACTION_PLAY_PAUSE
+          | PlaybackStateCompat.ACTION_PLAY
+          | PlaybackStateCompat.ACTION_PAUSE
+          | PlaybackStateCompat.ACTION_SEEK_TO
+          | PlaybackStateCompat.ACTION_FAST_FORWARD
+          | PlaybackStateCompat.ACTION_REWIND
+          | PlaybackStateCompat.ACTION_STOP
+          | PlaybackStateCompat.ACTION_SET_REPEAT_MODE
+          | PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE;
+
+  /** The default playback actions. */
+  @PlaybackActions public static final long DEFAULT_PLAYBACK_ACTIONS = ALL_PLAYBACK_ACTIONS;
+
+  /** The default fast forward increment, in milliseconds. */
+  public static final int DEFAULT_FAST_FORWARD_MS = 15000;
+  /** The default rewind increment, in milliseconds. */
+  public static final int DEFAULT_REWIND_MS = 5000;
+
   public static final String EXTRAS_PITCH = "EXO_PITCH";
+
+  private static final long BASE_PLAYBACK_ACTIONS =
+      PlaybackStateCompat.ACTION_PLAY_PAUSE
+          | PlaybackStateCompat.ACTION_PLAY
+          | PlaybackStateCompat.ACTION_PAUSE
+          | PlaybackStateCompat.ACTION_STOP
+          | PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE
+          | PlaybackStateCompat.ACTION_SET_REPEAT_MODE;
   private static final int BASE_MEDIA_SESSION_FLAGS =
       MediaSessionCompat.FLAG_HANDLES_MEDIA_BUTTONS
           | MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS;
@@ -86,11 +137,24 @@ public final class MediaSessionConnector {
   /** Receiver of media commands sent by a media controller. */
   public interface CommandReceiver {
     /**
-     * See {@link MediaSessionCompat.Callback#onCommand(String, Bundle, ResultReceiver)}.
+     * See {@link MediaSessionCompat.Callback#onCommand(String, Bundle, ResultReceiver)}. The
+     * receiver may handle the command, but is not required to do so. Changes to the player should
+     * be made via the {@link ControlDispatcher}.
      *
-     * @return Whether the command was handled by the receiver.
+     * @param player The player connected to the media session.
+     * @param controlDispatcher A {@link ControlDispatcher} that should be used for dispatching
+     *     changes to the player.
+     * @param command The command name.
+     * @param extras Optional parameters for the command, may be null.
+     * @param cb A result receiver to which a result may be sent by the command, may be null.
+     * @return Whether the receiver handled the command.
      */
-    boolean onCommand(Player player, String command, Bundle extras, ResultReceiver cb);
+    boolean onCommand(
+        Player player,
+        ControlDispatcher controlDispatcher,
+        String command,
+        Bundle extras,
+        ResultReceiver cb);
   }
 
   /** Interface to which playback preparation actions are delegated. */
@@ -128,51 +192,6 @@ public final class MediaSessionConnector {
     void onPrepareFromUri(Uri uri, Bundle extras);
   }
 
-  /** Interface to which playback actions are delegated. */
-  public interface PlaybackController extends CommandReceiver {
-
-    long ACTIONS =
-        PlaybackStateCompat.ACTION_PLAY_PAUSE
-            | PlaybackStateCompat.ACTION_PLAY
-            | PlaybackStateCompat.ACTION_PAUSE
-            | PlaybackStateCompat.ACTION_SEEK_TO
-            | PlaybackStateCompat.ACTION_FAST_FORWARD
-            | PlaybackStateCompat.ACTION_REWIND
-            | PlaybackStateCompat.ACTION_STOP
-            | PlaybackStateCompat.ACTION_SET_REPEAT_MODE
-            | PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE;
-
-    /**
-     * Returns the actions which are supported by the controller. The supported actions must be a
-     * bitmask combined out of {@link PlaybackStateCompat#ACTION_PLAY_PAUSE}, {@link
-     * PlaybackStateCompat#ACTION_PLAY}, {@link PlaybackStateCompat#ACTION_PAUSE}, {@link
-     * PlaybackStateCompat#ACTION_SEEK_TO}, {@link PlaybackStateCompat#ACTION_FAST_FORWARD}, {@link
-     * PlaybackStateCompat#ACTION_REWIND}, {@link PlaybackStateCompat#ACTION_STOP}, {@link
-     * PlaybackStateCompat#ACTION_SET_REPEAT_MODE} and {@link
-     * PlaybackStateCompat#ACTION_SET_SHUFFLE_MODE}.
-     *
-     * @param player The player.
-     * @return The bitmask of the supported media actions.
-     */
-    long getSupportedPlaybackActions(@Nullable Player player);
-    /** See {@link MediaSessionCompat.Callback#onPlay()}. */
-    void onPlay(Player player);
-    /** See {@link MediaSessionCompat.Callback#onPause()}. */
-    void onPause(Player player);
-    /** See {@link MediaSessionCompat.Callback#onSeekTo(long)}. */
-    void onSeekTo(Player player, long positionMs);
-    /** See {@link MediaSessionCompat.Callback#onFastForward()}. */
-    void onFastForward(Player player);
-    /** See {@link MediaSessionCompat.Callback#onRewind()}. */
-    void onRewind(Player player);
-    /** See {@link MediaSessionCompat.Callback#onStop()}. */
-    void onStop(Player player);
-    /** See {@link MediaSessionCompat.Callback#onSetShuffleMode(int)}. */
-    void onSetShuffleMode(Player player, int shuffleMode);
-    /** See {@link MediaSessionCompat.Callback#onSetRepeatMode(int)}. */
-    void onSetRepeatMode(Player player, int repeatMode);
-  }
-
   /**
    * Handles queue navigation actions, and updates the media session queue by calling {@code
    * MediaSessionCompat.setQueue()}.
@@ -190,20 +209,20 @@ public final class MediaSessionConnector {
      * PlaybackStateCompat#ACTION_SKIP_TO_NEXT}, {@link
      * PlaybackStateCompat#ACTION_SKIP_TO_PREVIOUS}.
      *
-     * @param player The {@link Player}.
+     * @param player The player connected to the media session.
      * @return The bitmask of the supported media actions.
      */
     long getSupportedQueueNavigatorActions(@Nullable Player player);
     /**
      * Called when the timeline of the player has changed.
      *
-     * @param player The player of which the timeline has changed.
+     * @param player The player connected to the media session.
      */
     void onTimelineChanged(Player player);
     /**
      * Called when the current window index changed.
      *
-     * @param player The player of which the current window index of the timeline has changed.
+     * @param player The player connected to the media session.
      */
     void onCurrentWindowIndexChanged(Player player);
     /**
@@ -218,12 +237,30 @@ public final class MediaSessionConnector {
      * @return The id of the active queue item.
      */
     long getActiveQueueItemId(@Nullable Player player);
-    /** See {@link MediaSessionCompat.Callback#onSkipToPrevious()}. */
-    void onSkipToPrevious(Player player);
-    /** See {@link MediaSessionCompat.Callback#onSkipToQueueItem(long)}. */
-    void onSkipToQueueItem(Player player, long id);
-    /** See {@link MediaSessionCompat.Callback#onSkipToNext()}. */
-    void onSkipToNext(Player player);
+    /**
+     * See {@link MediaSessionCompat.Callback#onSkipToPrevious()}.
+     *
+     * @param player The player connected to the media session.
+     * @param controlDispatcher A {@link ControlDispatcher} that should be used for dispatching
+     *     changes to the player.
+     */
+    void onSkipToPrevious(Player player, ControlDispatcher controlDispatcher);
+    /**
+     * See {@link MediaSessionCompat.Callback#onSkipToQueueItem(long)}.
+     *
+     * @param player The player connected to the media session.
+     * @param controlDispatcher A {@link ControlDispatcher} that should be used for dispatching
+     *     changes to the player.
+     */
+    void onSkipToQueueItem(Player player, ControlDispatcher controlDispatcher, long id);
+    /**
+     * See {@link MediaSessionCompat.Callback#onSkipToNext()}.
+     *
+     * @param player The player connected to the media session.
+     * @param controlDispatcher A {@link ControlDispatcher} that should be used for dispatching
+     *     changes to the player.
+     */
+    void onSkipToNext(Player player, ControlDispatcher controlDispatcher);
   }
 
   /** Handles media session queue edits. */
@@ -263,19 +300,24 @@ public final class MediaSessionConnector {
     /**
      * Called when a custom action provided by this provider is sent to the media session.
      *
+     * @param player The player connected to the media session.
+     * @param controlDispatcher A {@link ControlDispatcher} that should be used for dispatching
+     *     changes to the player.
      * @param action The name of the action which was sent by a media controller.
      * @param extras Optional extras sent by a media controller.
      */
-    void onCustomAction(String action, Bundle extras);
+    void onCustomAction(
+        Player player, ControlDispatcher controlDispatcher, String action, Bundle extras);
 
     /**
      * Returns a {@link PlaybackStateCompat.CustomAction} which will be published to the media
      * session by the connector or {@code null} if this action should not be published at the given
      * player state.
      *
+     * @param player The player connected to the media session.
      * @return The custom action to be included in the session playback state or {@code null}.
      */
-    PlaybackStateCompat.CustomAction getCustomAction();
+    PlaybackStateCompat.CustomAction getCustomAction(Player player);
   }
 
   /** Provides a {@link MediaMetadataCompat} for a given player state. */
@@ -283,7 +325,7 @@ public final class MediaSessionConnector {
     /**
      * Gets the {@link MediaMetadataCompat} to be published to the session.
      *
-     * @param player The player for which to provide metadata.
+     * @param player The player connected to the media session.
      * @return The {@link MediaMetadataCompat} to be published to the session.
      */
     MediaMetadataCompat getMetadata(Player player);
@@ -292,47 +334,37 @@ public final class MediaSessionConnector {
   /** The wrapped {@link MediaSessionCompat}. */
   public final MediaSessionCompat mediaSession;
 
-  private @Nullable final MediaMetadataProvider mediaMetadataProvider;
+  @Nullable private final MediaMetadataProvider mediaMetadataProvider;
   private final ExoPlayerEventListener exoPlayerEventListener;
   private final MediaSessionCallback mediaSessionCallback;
-  private final PlaybackController playbackController;
   private final ArrayList<CommandReceiver> commandReceivers;
 
   private Player player;
+  private ControlDispatcher controlDispatcher;
   private CustomActionProvider[] customActionProviders;
   private Map<String, CustomActionProvider> customActionMap;
-  private @Nullable ErrorMessageProvider<? super ExoPlaybackException> errorMessageProvider;
-  private @Nullable Pair<Integer, CharSequence> customError;
+  @Nullable private ErrorMessageProvider<? super ExoPlaybackException> errorMessageProvider;
+  @Nullable private Pair<Integer, CharSequence> customError;
   private PlaybackPreparer playbackPreparer;
   private QueueNavigator queueNavigator;
   private QueueEditor queueEditor;
   private RatingCallback ratingCallback;
 
-  /**
-   * Creates an instance.
-   *
-   * <p>Equivalent to {@code MediaSessionConnector(mediaSession, new DefaultPlaybackController())}.
-   *
-   * @param mediaSession The {@link MediaSessionCompat} to connect to.
-   */
-  public MediaSessionConnector(MediaSessionCompat mediaSession) {
-    this(mediaSession, null);
-  }
+  private long enabledPlaybackActions;
+  private int rewindMs;
+  private int fastForwardMs;
 
   /**
    * Creates an instance.
    *
-   * <p>Equivalent to {@code MediaSessionConnector(mediaSession, playbackController, new
+   * <p>Equivalent to {@code MediaSessionConnector(mediaSession, new
    * DefaultMediaMetadataProvider(mediaSession.getController(), null))}.
    *
    * @param mediaSession The {@link MediaSessionCompat} to connect to.
-   * @param playbackController A {@link PlaybackController} for handling playback actions.
    */
-  public MediaSessionConnector(
-      MediaSessionCompat mediaSession, PlaybackController playbackController) {
+  public MediaSessionConnector(MediaSessionCompat mediaSession) {
     this(
         mediaSession,
-        playbackController,
         new DefaultMediaMetadataProvider(mediaSession.getController(), null));
   }
 
@@ -340,52 +372,24 @@ public final class MediaSessionConnector {
    * Creates an instance.
    *
    * @param mediaSession The {@link MediaSessionCompat} to connect to.
-   * @param playbackController A {@link PlaybackController} for handling playback actions, or {@code
-   *     null} if the connector should handle playback actions directly.
-   * @param doMaintainMetadata Whether the connector should maintain the metadata of the session.
-   * @param metadataExtrasPrefix A string to prefix extra keys which are propagated from the active
-   *     queue item to the session metadata.
-   * @deprecated Use {@link MediaSessionConnector#MediaSessionConnector(MediaSessionCompat,
-   *     PlaybackController, MediaMetadataProvider)}.
-   */
-  @Deprecated
-  public MediaSessionConnector(
-      MediaSessionCompat mediaSession,
-      @Nullable PlaybackController playbackController,
-      boolean doMaintainMetadata,
-      @Nullable String metadataExtrasPrefix) {
-    this(
-        mediaSession,
-        playbackController,
-        doMaintainMetadata
-            ? new DefaultMediaMetadataProvider(mediaSession.getController(), metadataExtrasPrefix)
-            : null);
-  }
-
-  /**
-   * Creates an instance.
-   *
-   * @param mediaSession The {@link MediaSessionCompat} to connect to.
-   * @param playbackController A {@link PlaybackController} for handling playback actions, or {@code
-   *     null} if the connector should handle playback actions directly.
    * @param mediaMetadataProvider A {@link MediaMetadataProvider} for providing a custom metadata
    *     object to be published to the media session, or {@code null} if metadata shouldn't be
    *     published.
    */
   public MediaSessionConnector(
       MediaSessionCompat mediaSession,
-      @Nullable PlaybackController playbackController,
       @Nullable MediaMetadataProvider mediaMetadataProvider) {
     this.mediaSession = mediaSession;
-    this.playbackController =
-        playbackController != null ? playbackController : new DefaultPlaybackController();
     this.mediaMetadataProvider = mediaMetadataProvider;
     mediaSession.setFlags(BASE_MEDIA_SESSION_FLAGS);
     mediaSessionCallback = new MediaSessionCallback();
     exoPlayerEventListener = new ExoPlayerEventListener();
+    controlDispatcher = new DefaultControlDispatcher();
     customActionMap = Collections.emptyMap();
     commandReceivers = new ArrayList<>();
-    registerCommandReceiver(playbackController);
+    enabledPlaybackActions = DEFAULT_PLAYBACK_ACTIONS;
+    rewindMs = DEFAULT_REWIND_MS;
+    fastForwardMs = DEFAULT_FAST_FORWARD_MS;
   }
 
   /**
@@ -410,8 +414,8 @@ public final class MediaSessionConnector {
       this.player.removeListener(exoPlayerEventListener);
       mediaSession.setCallback(null);
     }
-    unregisterCommandReceiver(this.playbackPreparer);
 
+    unregisterCommandReceiver(this.playbackPreparer);
     this.player = player;
     this.playbackPreparer = playbackPreparer;
     registerCommandReceiver(playbackPreparer);
@@ -429,6 +433,58 @@ public final class MediaSessionConnector {
     invalidateMediaSessionMetadata();
   }
 
+  /**
+   * Sets the {@link ControlDispatcher}.
+   *
+   * @param controlDispatcher The {@link ControlDispatcher}, or null to use {@link
+   *     DefaultControlDispatcher}.
+   */
+  public void setControlDispatcher(@Nullable ControlDispatcher controlDispatcher) {
+    if (this.controlDispatcher != controlDispatcher) {
+      this.controlDispatcher =
+          controlDispatcher == null ? new DefaultControlDispatcher() : controlDispatcher;
+    }
+  }
+
+  /**
+   * Sets the enabled playback actions.
+   *
+   * @param enabledPlaybackActions The enabled playback actions.
+   */
+  public void setEnabledPlaybackActions(@PlaybackActions long enabledPlaybackActions) {
+    enabledPlaybackActions &= ALL_PLAYBACK_ACTIONS;
+    if (this.enabledPlaybackActions != enabledPlaybackActions) {
+      this.enabledPlaybackActions = enabledPlaybackActions;
+      invalidateMediaSessionPlaybackState();
+    }
+  }
+
+  /**
+   * Sets the rewind increment in milliseconds.
+   *
+   * @param rewindMs The rewind increment in milliseconds. A non-positive value will cause the
+   *     rewind button to be disabled.
+   */
+  public void setRewindIncrementMs(int rewindMs) {
+    if (this.rewindMs != rewindMs) {
+      this.rewindMs = rewindMs;
+      invalidateMediaSessionPlaybackState();
+    }
+  }
+
+  /**
+   * Sets the fast forward increment in milliseconds.
+   *
+   * @param fastForwardMs The fast forward increment in milliseconds. A non-positive value will
+   *     cause the fast forward button to be disabled.
+   */
+  public void setFastForwardIncrementMs(int fastForwardMs) {
+    if (this.fastForwardMs != fastForwardMs) {
+      this.fastForwardMs = fastForwardMs;
+      invalidateMediaSessionPlaybackState();
+    }
+  }
+
   /**
    * Sets the optional {@link ErrorMessageProvider}.
    *
@@ -537,7 +593,7 @@ public final class MediaSessionConnector {
 
     Map<String, CustomActionProvider> currentActions = new HashMap<>();
     for (CustomActionProvider customActionProvider : customActionProviders) {
-      PlaybackStateCompat.CustomAction customAction = customActionProvider.getCustomAction();
+      PlaybackStateCompat.CustomAction customAction = customActionProvider.getCustomAction(player);
       if (customAction != null) {
         currentActions.put(customAction.getAction(), customActionProvider);
         builder.addCustomAction(customAction);
@@ -602,8 +658,20 @@ public final class MediaSessionConnector {
   }
 
   private long buildPlaybackActions() {
-    long actions =
-        (PlaybackController.ACTIONS & playbackController.getSupportedPlaybackActions(player));
+    long actions = 0;
+    if (player != null && !player.getCurrentTimeline().isEmpty()) {
+      long playbackActions = BASE_PLAYBACK_ACTIONS;
+      if (player.isCurrentWindowSeekable()) {
+        playbackActions |= PlaybackStateCompat.ACTION_SEEK_TO;
+        if (fastForwardMs > 0) {
+          playbackActions |= PlaybackStateCompat.ACTION_FAST_FORWARD;
+        }
+        if (rewindMs > 0) {
+          playbackActions |= PlaybackStateCompat.ACTION_REWIND;
+        }
+      }
+      actions |= (playbackActions & enabledPlaybackActions);
+    }
     if (playbackPreparer != null) {
       actions |= (PlaybackPreparer.ACTIONS & playbackPreparer.getSupportedPrepareActions());
     }
@@ -630,18 +698,15 @@ public final class MediaSessionConnector {
     }
   }
 
+  private boolean canDispatchPlaybackAction(long action) {
+    return (enabledPlaybackActions & action) != 0;
+  }
+
   private boolean canDispatchToPlaybackPreparer(long action) {
     return playbackPreparer != null
         && (playbackPreparer.getSupportedPrepareActions() & PlaybackPreparer.ACTIONS & action) != 0;
   }
 
-  private boolean canDispatchToPlaybackController(long action) {
-    return (playbackController.getSupportedPlaybackActions(player)
-            & PlaybackController.ACTIONS
-            & action)
-        != 0;
-  }
-
   private boolean canDispatchToQueueNavigator(long action) {
     return queueNavigator != null
         && (queueNavigator.getSupportedQueueNavigatorActions(player)
@@ -650,6 +715,31 @@ public final class MediaSessionConnector {
             != 0;
   }
 
+  private void rewind() {
+    if (rewindMs > 0) {
+      seekTo(player.getCurrentPosition() - rewindMs);
+    }
+  }
+
+  private void fastForward() {
+    if (fastForwardMs > 0) {
+      seekTo(player.getCurrentPosition() + fastForwardMs);
+    }
+  }
+
+  private void seekTo(long positionMs) {
+    seekTo(player.getCurrentWindowIndex(), positionMs);
+  }
+
+  private void seekTo(int windowIndex, long positionMs) {
+    long durationMs = player.getDuration();
+    if (durationMs != C.TIME_UNSET) {
+      positionMs = Math.min(positionMs, durationMs);
+    }
+    positionMs = Math.max(positionMs, 0);
+    controlDispatcher.dispatchSeekTo(player, windowIndex, positionMs);
+  }
+
   /**
    * Provides a default {@link MediaMetadataCompat} with properties and extras propagated from the
    * active queue item to the session metadata.
@@ -825,85 +915,101 @@ public final class MediaSessionConnector {
 
     @Override
     public void onPlay() {
-      if (canDispatchToPlaybackController(PlaybackStateCompat.ACTION_PLAY)) {
-        playbackController.onPlay(player);
+      if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_PLAY)) {
+        controlDispatcher.dispatchSetPlayWhenReady(player, /* playWhenReady= */ true);
       }
     }
 
     @Override
     public void onPause() {
-      if (canDispatchToPlaybackController(PlaybackStateCompat.ACTION_PAUSE)) {
-        playbackController.onPause(player);
+      if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_PAUSE)) {
+        controlDispatcher.dispatchSetPlayWhenReady(player, /* playWhenReady= */ false);
       }
     }
 
     @Override
     public void onSeekTo(long positionMs) {
-      if (canDispatchToPlaybackController(PlaybackStateCompat.ACTION_SEEK_TO)) {
-        playbackController.onSeekTo(player, positionMs);
+      if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_SEEK_TO)) {
+        seekTo(positionMs);
       }
     }
 
     @Override
     public void onFastForward() {
-      if (canDispatchToPlaybackController(PlaybackStateCompat.ACTION_FAST_FORWARD)) {
-        playbackController.onFastForward(player);
+      if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_FAST_FORWARD)) {
+        fastForward();
       }
     }
 
     @Override
     public void onRewind() {
-      if (canDispatchToPlaybackController(PlaybackStateCompat.ACTION_REWIND)) {
-        playbackController.onRewind(player);
+      if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_REWIND)) {
+        rewind();
       }
     }
 
     @Override
     public void onStop() {
-      if (canDispatchToPlaybackController(PlaybackStateCompat.ACTION_STOP)) {
-        playbackController.onStop(player);
+      if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_STOP)) {
+        controlDispatcher.dispatchStop(player, /* reset= */ true);
       }
     }
 
     @Override
     public void onSetShuffleMode(int shuffleMode) {
-      if (canDispatchToPlaybackController(PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE)) {
-        playbackController.onSetShuffleMode(player, shuffleMode);
+      if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE)) {
+        boolean shuffleModeEnabled =
+            shuffleMode == PlaybackStateCompat.SHUFFLE_MODE_ALL
+                || shuffleMode == PlaybackStateCompat.SHUFFLE_MODE_GROUP;
+        controlDispatcher.dispatchSetShuffleModeEnabled(player, shuffleModeEnabled);
       }
     }
 
     @Override
-    public void onSetRepeatMode(int repeatMode) {
-      if (canDispatchToPlaybackController(PlaybackStateCompat.ACTION_SET_REPEAT_MODE)) {
-        playbackController.onSetRepeatMode(player, repeatMode);
+    public void onSetRepeatMode(int mediaSessionRepeatMode) {
+      if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_SET_REPEAT_MODE)) {
+        @RepeatModeUtil.RepeatToggleModes int repeatMode;
+        switch (mediaSessionRepeatMode) {
+          case PlaybackStateCompat.REPEAT_MODE_ALL:
+          case PlaybackStateCompat.REPEAT_MODE_GROUP:
+            repeatMode = Player.REPEAT_MODE_ALL;
+            break;
+          case PlaybackStateCompat.REPEAT_MODE_ONE:
+            repeatMode = Player.REPEAT_MODE_ONE;
+            break;
+          default:
+            repeatMode = Player.REPEAT_MODE_OFF;
+            break;
+        }
+        controlDispatcher.dispatchSetRepeatMode(player, repeatMode);
       }
     }
 
     @Override
     public void onSkipToNext() {
       if (canDispatchToQueueNavigator(PlaybackStateCompat.ACTION_SKIP_TO_NEXT)) {
-        queueNavigator.onSkipToNext(player);
+        queueNavigator.onSkipToNext(player, controlDispatcher);
       }
     }
 
     @Override
     public void onSkipToPrevious() {
       if (canDispatchToQueueNavigator(PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS)) {
-        queueNavigator.onSkipToPrevious(player);
+        queueNavigator.onSkipToPrevious(player, controlDispatcher);
       }
     }
 
     @Override
     public void onSkipToQueueItem(long id) {
       if (canDispatchToQueueNavigator(PlaybackStateCompat.ACTION_SKIP_TO_QUEUE_ITEM)) {
-        queueNavigator.onSkipToQueueItem(player, id);
+        queueNavigator.onSkipToQueueItem(player, controlDispatcher, id);
       }
     }
 
     @Override
     public void onCustomAction(@NonNull String action, @Nullable Bundle extras) {
       if (customActionMap.containsKey(action)) {
-        customActionMap.get(action).onCustomAction(action, extras);
+        customActionMap.get(action).onCustomAction(player, controlDispatcher, action, extras);
         invalidateMediaSessionPlaybackState();
       }
     }
@@ -911,7 +1017,7 @@ public final class MediaSessionConnector {
     @Override
     public void onCommand(String command, Bundle extras, ResultReceiver cb) {
       for (int i = 0; i < commandReceivers.size(); i++) {
-        if (commandReceivers.get(i).onCommand(player, command, extras, cb)) {
+        if (commandReceivers.get(i).onCommand(player, controlDispatcher, command, extras, cb)) {
           return;
         }
       }
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/RepeatModeActionProvider.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/RepeatModeActionProvider.java
index b45a690a9d..b773396198 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/RepeatModeActionProvider.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/RepeatModeActionProvider.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.ext.mediasession;
 import android.content.Context;
 import android.os.Bundle;
 import android.support.v4.media.session.PlaybackStateCompat;
+import com.google.android.exoplayer2.ControlDispatcher;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.util.RepeatModeUtil;
 
@@ -33,7 +34,6 @@ public final class RepeatModeActionProvider implements MediaSessionConnector.Cus
 
   private static final String ACTION_REPEAT_MODE = "ACTION_EXO_REPEAT_MODE";
 
-  private final Player player;
   @RepeatModeUtil.RepeatToggleModes
   private final int repeatToggleModes;
   private final CharSequence repeatAllDescription;
@@ -42,27 +42,23 @@ public final class RepeatModeActionProvider implements MediaSessionConnector.Cus
 
   /**
    * Creates a new instance.
-   * <p>
-   * Equivalent to {@code RepeatModeActionProvider(context, player,
-   *     MediaSessionConnector.DEFAULT_REPEAT_TOGGLE_MODES)}.
+   *
+   * <p>Equivalent to {@code RepeatModeActionProvider(context, DEFAULT_REPEAT_TOGGLE_MODES)}.
    *
    * @param context The context.
-   * @param player The player on which to toggle the repeat mode.
    */
-  public RepeatModeActionProvider(Context context, Player player) {
-    this(context, player, DEFAULT_REPEAT_TOGGLE_MODES);
+  public RepeatModeActionProvider(Context context) {
+    this(context, DEFAULT_REPEAT_TOGGLE_MODES);
   }
 
   /**
    * Creates a new instance enabling the given repeat toggle modes.
    *
    * @param context The context.
-   * @param player The player on which to toggle the repeat mode.
    * @param repeatToggleModes The toggle modes to enable.
    */
-  public RepeatModeActionProvider(Context context, Player player,
-      @RepeatModeUtil.RepeatToggleModes int repeatToggleModes) {
-    this.player = player;
+  public RepeatModeActionProvider(
+      Context context, @RepeatModeUtil.RepeatToggleModes int repeatToggleModes) {
     this.repeatToggleModes = repeatToggleModes;
     repeatAllDescription = context.getString(R.string.exo_media_action_repeat_all_description);
     repeatOneDescription = context.getString(R.string.exo_media_action_repeat_one_description);
@@ -70,16 +66,17 @@ public final class RepeatModeActionProvider implements MediaSessionConnector.Cus
   }
 
   @Override
-  public void onCustomAction(String action, Bundle extras) {
+  public void onCustomAction(
+      Player player, ControlDispatcher controlDispatcher, String action, Bundle extras) {
     int mode = player.getRepeatMode();
     int proposedMode = RepeatModeUtil.getNextRepeatMode(mode, repeatToggleModes);
     if (mode != proposedMode) {
-      player.setRepeatMode(proposedMode);
+      controlDispatcher.dispatchSetRepeatMode(player, proposedMode);
     }
   }
 
   @Override
-  public PlaybackStateCompat.CustomAction getCustomAction() {
+  public PlaybackStateCompat.CustomAction getCustomAction(Player player) {
     CharSequence actionLabel;
     int iconResourceId;
     switch (player.getRepeatMode()) {
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
index ab296afad7..093913fd8c 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
@@ -23,6 +23,7 @@ import android.support.v4.media.MediaDescriptionCompat;
 import android.support.v4.media.session.MediaControllerCompat;
 import android.support.v4.media.session.MediaSessionCompat;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ControlDispatcher;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.source.ConcatenatingMediaSource;
 import com.google.android.exoplayer2.source.MediaSource;
@@ -194,7 +195,12 @@ public final class TimelineQueueEditor
   // CommandReceiver implementation.
 
   @Override
-  public boolean onCommand(Player player, String command, Bundle extras, ResultReceiver cb) {
+  public boolean onCommand(
+      Player player,
+      ControlDispatcher controlDispatcher,
+      String command,
+      Bundle extras,
+      ResultReceiver cb) {
     if (!COMMAND_MOVE_QUEUE_ITEM.equals(command)) {
       return false;
     }
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
index 53f784e021..6eb1b4d4ca 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
@@ -22,6 +22,7 @@ import android.support.v4.media.MediaDescriptionCompat;
 import android.support.v4.media.session.MediaSessionCompat;
 import android.support.v4.media.session.PlaybackStateCompat;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ControlDispatcher;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.util.Util;
@@ -124,7 +125,7 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
   }
 
   @Override
-  public void onSkipToPrevious(Player player) {
+  public void onSkipToPrevious(Player player, ControlDispatcher controlDispatcher) {
     Timeline timeline = player.getCurrentTimeline();
     if (timeline.isEmpty() || player.isPlayingAd()) {
       return;
@@ -135,26 +136,26 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
     if (previousWindowIndex != C.INDEX_UNSET
         && (player.getCurrentPosition() <= MAX_POSITION_FOR_SEEK_TO_PREVIOUS
             || (window.isDynamic && !window.isSeekable))) {
-      player.seekTo(previousWindowIndex, C.TIME_UNSET);
+      controlDispatcher.dispatchSeekTo(player, previousWindowIndex, C.TIME_UNSET);
     } else {
-      player.seekTo(0);
+      controlDispatcher.dispatchSeekTo(player, windowIndex, 0);
     }
   }
 
   @Override
-  public void onSkipToQueueItem(Player player, long id) {
+  public void onSkipToQueueItem(Player player, ControlDispatcher controlDispatcher, long id) {
     Timeline timeline = player.getCurrentTimeline();
     if (timeline.isEmpty() || player.isPlayingAd()) {
       return;
     }
     int windowIndex = (int) id;
     if (0 <= windowIndex && windowIndex < timeline.getWindowCount()) {
-      player.seekTo(windowIndex, C.TIME_UNSET);
+      controlDispatcher.dispatchSeekTo(player, windowIndex, C.TIME_UNSET);
     }
   }
 
   @Override
-  public void onSkipToNext(Player player) {
+  public void onSkipToNext(Player player, ControlDispatcher controlDispatcher) {
     Timeline timeline = player.getCurrentTimeline();
     if (timeline.isEmpty() || player.isPlayingAd()) {
       return;
@@ -162,16 +163,21 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
     int windowIndex = player.getCurrentWindowIndex();
     int nextWindowIndex = player.getNextWindowIndex();
     if (nextWindowIndex != C.INDEX_UNSET) {
-      player.seekTo(nextWindowIndex, C.TIME_UNSET);
+      controlDispatcher.dispatchSeekTo(player, nextWindowIndex, C.TIME_UNSET);
     } else if (timeline.getWindow(windowIndex, window).isDynamic) {
-      player.seekTo(windowIndex, C.TIME_UNSET);
+      controlDispatcher.dispatchSeekTo(player, windowIndex, C.TIME_UNSET);
     }
   }
 
   // CommandReceiver implementation.
 
   @Override
-  public boolean onCommand(Player player, String command, Bundle extras, ResultReceiver cb) {
+  public boolean onCommand(
+      Player player,
+      ControlDispatcher controlDispatcher,
+      String command,
+      Bundle extras,
+      ResultReceiver cb) {
     return false;
   }
 
@@ -197,4 +203,3 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
   }
 
 }
-

From 75082194160dbdc3b92ee077ba8131a31205b05e Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 12 Nov 2018 03:32:39 -0800
Subject: [PATCH 191/832] Simplify PlayerControlView fast forward and rewind
 implementation

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=221065798
---
 .../exoplayer2/ui/PlayerControlView.java      | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
index a3d7825f08..b0de163ad2 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
@@ -894,35 +894,28 @@ public class PlayerControlView extends FrameLayout {
   }
 
   private void rewind() {
-    if (rewindMs <= 0) {
-      return;
+    if (rewindMs > 0) {
+      seekTo(player.getCurrentPosition() - rewindMs);
     }
-    seekTo(Math.max(player.getCurrentPosition() - rewindMs, 0));
   }
 
   private void fastForward() {
-    if (fastForwardMs <= 0) {
-      return;
+    if (fastForwardMs > 0) {
+      seekTo(player.getCurrentPosition() + fastForwardMs);
     }
-    long durationMs = player.getDuration();
-    long seekPositionMs = player.getCurrentPosition() + fastForwardMs;
-    if (durationMs != C.TIME_UNSET) {
-      seekPositionMs = Math.min(seekPositionMs, durationMs);
-    }
-    seekTo(seekPositionMs);
   }
 
   private void seekTo(long positionMs) {
     seekTo(player.getCurrentWindowIndex(), positionMs);
   }
 
-  private void seekTo(int windowIndex, long positionMs) {
-    boolean dispatched = controlDispatcher.dispatchSeekTo(player, windowIndex, positionMs);
-    if (!dispatched) {
-      // The seek wasn't dispatched. If the progress bar was dragged by the user to perform the
-      // seek then it'll now be in the wrong position. Trigger a progress update to snap it back.
-      updateProgress();
+  private boolean seekTo(int windowIndex, long positionMs) {
+    long durationMs = player.getDuration();
+    if (durationMs != C.TIME_UNSET) {
+      positionMs = Math.min(positionMs, durationMs);
     }
+    positionMs = Math.max(positionMs, 0);
+    return controlDispatcher.dispatchSeekTo(player, windowIndex, positionMs);
   }
 
   private void seekToTimeBarPosition(long positionMs) {
@@ -946,7 +939,12 @@ public class PlayerControlView extends FrameLayout {
     } else {
       windowIndex = player.getCurrentWindowIndex();
     }
-    seekTo(windowIndex, positionMs);
+    boolean dispatched = seekTo(windowIndex, positionMs);
+    if (!dispatched) {
+      // The seek wasn't dispatched then the progress bar scrubber will be in the wrong position.
+      // Trigger a progress update to snap it back.
+      updateProgress();
+    }
   }
 
   @Override

From eb6859e436b5ef7735b83d3e38b94b6826c97c7e Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 12 Nov 2018 04:24:51 -0800
Subject: [PATCH 192/832] Align navigation implementation across UI components

This change also paves the way for splitting out functionality into a utility class.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=221070262
---
 .../mediasession/MediaSessionConnector.java   | 114 +++++++++------
 .../mediasession/TimelineQueueNavigator.java  |  20 +--
 .../exoplayer2/ui/PlayerControlView.java      | 134 ++++++++++--------
 .../ui/PlayerNotificationManager.java         | 133 +++++++++++------
 4 files changed, 242 insertions(+), 159 deletions(-)

diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
index 0b5fdbc624..0cb590b65e 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
@@ -212,7 +212,7 @@ public final class MediaSessionConnector {
      * @param player The player connected to the media session.
      * @return The bitmask of the supported media actions.
      */
-    long getSupportedQueueNavigatorActions(@Nullable Player player);
+    long getSupportedQueueNavigatorActions(Player player);
     /**
      * Called when the timeline of the player has changed.
      *
@@ -586,7 +586,7 @@ public final class MediaSessionConnector {
   public final void invalidateMediaSessionPlaybackState() {
     PlaybackStateCompat.Builder builder = new PlaybackStateCompat.Builder();
     if (player == null) {
-      builder.setActions(buildPlaybackActions()).setState(PlaybackStateCompat.STATE_NONE, 0, 0, 0);
+      builder.setActions(/* capabilities= */ 0).setState(PlaybackStateCompat.STATE_NONE, 0, 0, 0);
       mediaSession.setPlaybackState(builder.build());
       return;
     }
@@ -622,7 +622,7 @@ public final class MediaSessionConnector {
     Bundle extras = new Bundle();
     extras.putFloat(EXTRAS_PITCH, player.getPlaybackParameters().pitch);
     builder
-        .setActions(buildPlaybackActions())
+        .setActions(buildPlaybackActions(player))
         .setActiveQueueItemId(activeQueueItemId)
         .setBufferedPosition(player.getBufferedPosition())
         .setState(
@@ -657,21 +657,32 @@ public final class MediaSessionConnector {
     commandReceivers.remove(commandReceiver);
   }
 
-  private long buildPlaybackActions() {
-    long actions = 0;
-    if (player != null && !player.getCurrentTimeline().isEmpty()) {
-      long playbackActions = BASE_PLAYBACK_ACTIONS;
-      if (player.isCurrentWindowSeekable()) {
-        playbackActions |= PlaybackStateCompat.ACTION_SEEK_TO;
-        if (fastForwardMs > 0) {
-          playbackActions |= PlaybackStateCompat.ACTION_FAST_FORWARD;
-        }
-        if (rewindMs > 0) {
-          playbackActions |= PlaybackStateCompat.ACTION_REWIND;
-        }
-      }
-      actions |= (playbackActions & enabledPlaybackActions);
+  private long buildPlaybackActions(Player player) {
+    boolean enableSeeking = false;
+    boolean enableRewind = false;
+    boolean enableFastForward = false;
+    boolean enableSetRating = false;
+    Timeline timeline = player.getCurrentTimeline();
+    if (!timeline.isEmpty() && !player.isPlayingAd()) {
+      enableSeeking = player.isCurrentWindowSeekable();
+      enableRewind = enableSeeking && rewindMs > 0;
+      enableFastForward = enableSeeking && fastForwardMs > 0;
+      enableSetRating = true;
     }
+
+    long playbackActions = BASE_PLAYBACK_ACTIONS;
+    if (enableSeeking) {
+      playbackActions |= PlaybackStateCompat.ACTION_SEEK_TO;
+    }
+    if (enableFastForward) {
+      playbackActions |= PlaybackStateCompat.ACTION_FAST_FORWARD;
+    }
+    if (enableRewind) {
+      playbackActions |= PlaybackStateCompat.ACTION_REWIND;
+    }
+    playbackActions &= enabledPlaybackActions;
+
+    long actions = playbackActions;
     if (playbackPreparer != null) {
       actions |= (PlaybackPreparer.ACTIONS & playbackPreparer.getSupportedPrepareActions());
     }
@@ -679,7 +690,7 @@ public final class MediaSessionConnector {
       actions |=
           (QueueNavigator.ACTIONS & queueNavigator.getSupportedQueueNavigatorActions(player));
     }
-    if (ratingCallback != null) {
+    if (ratingCallback != null && enableSetRating) {
       actions |= PlaybackStateCompat.ACTION_SET_RATING;
     }
     return actions;
@@ -699,39 +710,46 @@ public final class MediaSessionConnector {
   }
 
   private boolean canDispatchPlaybackAction(long action) {
-    return (enabledPlaybackActions & action) != 0;
+    return player != null && (enabledPlaybackActions & action) != 0;
   }
 
   private boolean canDispatchToPlaybackPreparer(long action) {
-    return playbackPreparer != null
-        && (playbackPreparer.getSupportedPrepareActions() & PlaybackPreparer.ACTIONS & action) != 0;
+    return player != null
+        && playbackPreparer != null
+        && (playbackPreparer.getSupportedPrepareActions() & action) != 0;
   }
 
   private boolean canDispatchToQueueNavigator(long action) {
-    return queueNavigator != null
-        && (queueNavigator.getSupportedQueueNavigatorActions(player)
-                & QueueNavigator.ACTIONS
-                & action)
-            != 0;
+    return player != null
+        && queueNavigator != null
+        && (queueNavigator.getSupportedQueueNavigatorActions(player) & action) != 0;
   }
 
-  private void rewind() {
-    if (rewindMs > 0) {
-      seekTo(player.getCurrentPosition() - rewindMs);
+  private boolean canDispatchSetRating() {
+    return player != null && ratingCallback != null;
+  }
+
+  private boolean canDispatchQueueEdit() {
+    return player != null && queueEditor != null;
+  }
+
+  private void rewind(Player player) {
+    if (player.isCurrentWindowSeekable() && rewindMs > 0) {
+      seekTo(player, player.getCurrentPosition() - rewindMs);
     }
   }
 
-  private void fastForward() {
-    if (fastForwardMs > 0) {
-      seekTo(player.getCurrentPosition() + fastForwardMs);
+  private void fastForward(Player player) {
+    if (player.isCurrentWindowSeekable() && fastForwardMs > 0) {
+      seekTo(player, player.getCurrentPosition() + fastForwardMs);
     }
   }
 
-  private void seekTo(long positionMs) {
-    seekTo(player.getCurrentWindowIndex(), positionMs);
+  private void seekTo(Player player, long positionMs) {
+    seekTo(player, player.getCurrentWindowIndex(), positionMs);
   }
 
-  private void seekTo(int windowIndex, long positionMs) {
+  private void seekTo(Player player, int windowIndex, long positionMs) {
     long durationMs = player.getDuration();
     if (durationMs != C.TIME_UNSET) {
       positionMs = Math.min(positionMs, durationMs);
@@ -930,21 +948,21 @@ public final class MediaSessionConnector {
     @Override
     public void onSeekTo(long positionMs) {
       if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_SEEK_TO)) {
-        seekTo(positionMs);
+        seekTo(player, positionMs);
       }
     }
 
     @Override
     public void onFastForward() {
       if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_FAST_FORWARD)) {
-        fastForward();
+        fastForward(player);
       }
     }
 
     @Override
     public void onRewind() {
       if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_REWIND)) {
-        rewind();
+        rewind(player);
       }
     }
 
@@ -1008,7 +1026,7 @@ public final class MediaSessionConnector {
 
     @Override
     public void onCustomAction(@NonNull String action, @Nullable Bundle extras) {
-      if (customActionMap.containsKey(action)) {
+      if (player != null && customActionMap.containsKey(action)) {
         customActionMap.get(action).onCustomAction(player, controlDispatcher, action, extras);
         invalidateMediaSessionPlaybackState();
       }
@@ -1016,9 +1034,11 @@ public final class MediaSessionConnector {
 
     @Override
     public void onCommand(String command, Bundle extras, ResultReceiver cb) {
-      for (int i = 0; i < commandReceivers.size(); i++) {
-        if (commandReceivers.get(i).onCommand(player, controlDispatcher, command, extras, cb)) {
-          return;
+      if (player != null) {
+        for (int i = 0; i < commandReceivers.size(); i++) {
+          if (commandReceivers.get(i).onCommand(player, controlDispatcher, command, extras, cb)) {
+            return;
+          }
         }
       }
     }
@@ -1088,35 +1108,35 @@ public final class MediaSessionConnector {
 
     @Override
     public void onSetRating(RatingCompat rating) {
-      if (ratingCallback != null) {
+      if (canDispatchSetRating()) {
         ratingCallback.onSetRating(player, rating);
       }
     }
 
     @Override
     public void onSetRating(RatingCompat rating, Bundle extras) {
-      if (ratingCallback != null) {
+      if (canDispatchSetRating()) {
         ratingCallback.onSetRating(player, rating, extras);
       }
     }
 
     @Override
     public void onAddQueueItem(MediaDescriptionCompat description) {
-      if (queueEditor != null) {
+      if (canDispatchQueueEdit()) {
         queueEditor.onAddQueueItem(player, description);
       }
     }
 
     @Override
     public void onAddQueueItem(MediaDescriptionCompat description, int index) {
-      if (queueEditor != null) {
+      if (canDispatchQueueEdit()) {
         queueEditor.onAddQueueItem(player, description, index);
       }
     }
 
     @Override
     public void onRemoveQueueItem(MediaDescriptionCompat description) {
-      if (queueEditor != null) {
+      if (canDispatchQueueEdit()) {
         queueEditor.onRemoveQueueItem(player, description);
       }
     }
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
index 6eb1b4d4ca..5d2b37618f 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
@@ -84,21 +84,25 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
 
   @Override
   public long getSupportedQueueNavigatorActions(Player player) {
-    if (player == null) {
-      return 0;
-    }
+    boolean enableSkipTo = false;
+    boolean enablePrevious = false;
+    boolean enableNext = false;
     Timeline timeline = player.getCurrentTimeline();
-    if (timeline.isEmpty() || player.isPlayingAd()) {
-      return 0;
+    if (!timeline.isEmpty() && !player.isPlayingAd()) {
+      timeline.getWindow(player.getCurrentWindowIndex(), window);
+      enableSkipTo = timeline.getWindowCount() > 1;
+      enablePrevious = window.isSeekable || !window.isDynamic || player.hasPrevious();
+      enableNext = window.isDynamic || player.hasNext();
     }
+
     long actions = 0;
-    if (timeline.getWindowCount() > 1) {
+    if (enableSkipTo) {
       actions |= PlaybackStateCompat.ACTION_SKIP_TO_QUEUE_ITEM;
     }
-    if (window.isSeekable || !window.isDynamic || player.hasPrevious()) {
+    if (enablePrevious) {
       actions |= PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS;
     }
-    if (window.isDynamic || player.hasNext()) {
+    if (enableNext) {
       actions |= PlaybackStateCompat.ACTION_SKIP_TO_NEXT;
     }
     return actions;
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
index b0de163ad2..7ac813211a 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
@@ -224,10 +224,10 @@ public class PlayerControlView extends FrameLayout {
   private final String repeatOneButtonContentDescription;
   private final String repeatAllButtonContentDescription;
 
-  private Player player;
+  @Nullable private Player player;
   private com.google.android.exoplayer2.ControlDispatcher controlDispatcher;
   private VisibilityListener visibilityListener;
-  private @Nullable PlaybackPreparer playbackPreparer;
+  @Nullable private PlaybackPreparer playbackPreparer;
 
   private boolean isAttachedToWindow;
   private boolean showMultiWindowTimeBar;
@@ -363,6 +363,7 @@ public class PlayerControlView extends FrameLayout {
    * Returns the {@link Player} currently being controlled by this view, or null if no player is
    * set.
    */
+  @Nullable
   public Player getPlayer() {
     return player;
   }
@@ -411,8 +412,8 @@ public class PlayerControlView extends FrameLayout {
    *
    * @param extraAdGroupTimesMs The millisecond timestamps of the extra ad markers to show, or
    *     {@code null} to show no extra ad markers.
-   * @param extraPlayedAdGroups Whether each ad has been played, or {@code null} to show no extra ad
-   *     markers.
+   * @param extraPlayedAdGroups Whether each ad has been played. Must be the same length as {@code
+   *     extraAdGroupTimesMs}, or {@code null} if {@code extraAdGroupTimesMs} is {@code null}.
    */
   public void setExtraAdGroupMarkers(
       @Nullable long[] extraAdGroupTimesMs, @Nullable boolean[] extraPlayedAdGroups) {
@@ -420,6 +421,7 @@ public class PlayerControlView extends FrameLayout {
       this.extraAdGroupTimesMs = new long[0];
       this.extraPlayedAdGroups = new boolean[0];
     } else {
+      extraPlayedAdGroups = Assertions.checkNotNull(extraPlayedAdGroups);
       Assertions.checkArgument(extraAdGroupTimesMs.length == extraPlayedAdGroups.length);
       this.extraAdGroupTimesMs = extraAdGroupTimesMs;
       this.extraPlayedAdGroups = extraPlayedAdGroups;
@@ -659,24 +661,30 @@ public class PlayerControlView extends FrameLayout {
     if (!isVisible() || !isAttachedToWindow) {
       return;
     }
-    Timeline timeline = player != null ? player.getCurrentTimeline() : null;
-    boolean haveNonEmptyTimeline = timeline != null && !timeline.isEmpty();
-    boolean isSeekable = false;
+    boolean enableSeeking = false;
     boolean enablePrevious = false;
+    boolean enableRewind = false;
+    boolean enableFastForward = false;
     boolean enableNext = false;
-    if (haveNonEmptyTimeline && !player.isPlayingAd()) {
-      int windowIndex = player.getCurrentWindowIndex();
-      timeline.getWindow(windowIndex, window);
-      isSeekable = window.isSeekable;
-      enablePrevious = isSeekable || !window.isDynamic || player.hasPrevious();
-      enableNext = window.isDynamic || player.hasNext();
+    if (player != null) {
+      Timeline timeline = player.getCurrentTimeline();
+      if (!timeline.isEmpty() && !player.isPlayingAd()) {
+        timeline.getWindow(player.getCurrentWindowIndex(), window);
+        boolean isSeekable = window.isSeekable;
+        enableSeeking = isSeekable;
+        enablePrevious = isSeekable || !window.isDynamic || player.hasPrevious();
+        enableRewind = isSeekable && rewindMs > 0;
+        enableFastForward = isSeekable && fastForwardMs > 0;
+        enableNext = window.isDynamic || player.hasNext();
+      }
     }
+
     setButtonEnabled(enablePrevious, previousButton);
+    setButtonEnabled(enableRewind, rewindButton);
+    setButtonEnabled(enableFastForward, fastForwardButton);
     setButtonEnabled(enableNext, nextButton);
-    setButtonEnabled(fastForwardMs > 0 && isSeekable, fastForwardButton);
-    setButtonEnabled(rewindMs > 0 && isSeekable, rewindButton);
     if (timeBar != null) {
-      timeBar.setEnabled(isSeekable);
+      timeBar.setEnabled(enableSeeking);
     }
   }
 
@@ -862,7 +870,7 @@ public class PlayerControlView extends FrameLayout {
     view.setVisibility(VISIBLE);
   }
 
-  private void previous() {
+  private void previous(Player player) {
     Timeline timeline = player.getCurrentTimeline();
     if (timeline.isEmpty() || player.isPlayingAd()) {
       return;
@@ -873,13 +881,13 @@ public class PlayerControlView extends FrameLayout {
     if (previousWindowIndex != C.INDEX_UNSET
         && (player.getCurrentPosition() <= MAX_POSITION_FOR_SEEK_TO_PREVIOUS
             || (window.isDynamic && !window.isSeekable))) {
-      seekTo(previousWindowIndex, C.TIME_UNSET);
+      seekTo(player, previousWindowIndex, C.TIME_UNSET);
     } else {
-      seekTo(0);
+      seekTo(player, 0);
     }
   }
 
-  private void next() {
+  private void next(Player player) {
     Timeline timeline = player.getCurrentTimeline();
     if (timeline.isEmpty() || player.isPlayingAd()) {
       return;
@@ -887,29 +895,29 @@ public class PlayerControlView extends FrameLayout {
     int windowIndex = player.getCurrentWindowIndex();
     int nextWindowIndex = player.getNextWindowIndex();
     if (nextWindowIndex != C.INDEX_UNSET) {
-      seekTo(nextWindowIndex, C.TIME_UNSET);
+      seekTo(player, nextWindowIndex, C.TIME_UNSET);
     } else if (timeline.getWindow(windowIndex, window).isDynamic) {
-      seekTo(windowIndex, C.TIME_UNSET);
+      seekTo(player, windowIndex, C.TIME_UNSET);
     }
   }
 
-  private void rewind() {
-    if (rewindMs > 0) {
-      seekTo(player.getCurrentPosition() - rewindMs);
+  private void rewind(Player player) {
+    if (player.isCurrentWindowSeekable() && rewindMs > 0) {
+      seekTo(player, player.getCurrentPosition() - rewindMs);
     }
   }
 
-  private void fastForward() {
-    if (fastForwardMs > 0) {
-      seekTo(player.getCurrentPosition() + fastForwardMs);
+  private void fastForward(Player player) {
+    if (player.isCurrentWindowSeekable() && fastForwardMs > 0) {
+      seekTo(player, player.getCurrentPosition() + fastForwardMs);
     }
   }
 
-  private void seekTo(long positionMs) {
-    seekTo(player.getCurrentWindowIndex(), positionMs);
+  private void seekTo(Player player, long positionMs) {
+    seekTo(player, player.getCurrentWindowIndex(), positionMs);
   }
 
-  private boolean seekTo(int windowIndex, long positionMs) {
+  private boolean seekTo(Player player, int windowIndex, long positionMs) {
     long durationMs = player.getDuration();
     if (durationMs != C.TIME_UNSET) {
       positionMs = Math.min(positionMs, durationMs);
@@ -918,7 +926,7 @@ public class PlayerControlView extends FrameLayout {
     return controlDispatcher.dispatchSeekTo(player, windowIndex, positionMs);
   }
 
-  private void seekToTimeBarPosition(long positionMs) {
+  private void seekToTimeBarPosition(Player player, long positionMs) {
     int windowIndex;
     Timeline timeline = player.getCurrentTimeline();
     if (multiWindowTimeBar && !timeline.isEmpty()) {
@@ -939,7 +947,7 @@ public class PlayerControlView extends FrameLayout {
     } else {
       windowIndex = player.getCurrentWindowIndex();
     }
-    boolean dispatched = seekTo(windowIndex, positionMs);
+    boolean dispatched = seekTo(player, windowIndex, positionMs);
     if (!dispatched) {
       // The seek wasn't dispatched then the progress bar scrubber will be in the wrong position.
       // Trigger a progress update to snap it back.
@@ -1001,9 +1009,9 @@ public class PlayerControlView extends FrameLayout {
     }
     if (event.getAction() == KeyEvent.ACTION_DOWN) {
       if (keyCode == KeyEvent.KEYCODE_MEDIA_FAST_FORWARD) {
-        fastForward();
+        fastForward(player);
       } else if (keyCode == KeyEvent.KEYCODE_MEDIA_REWIND) {
-        rewind();
+        rewind(player);
       } else if (event.getRepeatCount() == 0) {
         switch (keyCode) {
           case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:
@@ -1016,10 +1024,10 @@ public class PlayerControlView extends FrameLayout {
             controlDispatcher.dispatchSetPlayWhenReady(player, false);
             break;
           case KeyEvent.KEYCODE_MEDIA_NEXT:
-            next();
+            next(player);
             break;
           case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
-            previous();
+            previous(player);
             break;
           default:
             break;
@@ -1086,7 +1094,7 @@ public class PlayerControlView extends FrameLayout {
     public void onScrubStop(TimeBar timeBar, long position, boolean canceled) {
       scrubbing = false;
       if (!canceled && player != null) {
-        seekToTimeBarPosition(position);
+        seekToTimeBarPosition(player, position);
       }
     }
 
@@ -1124,32 +1132,34 @@ public class PlayerControlView extends FrameLayout {
 
     @Override
     public void onClick(View view) {
-      if (player != null) {
-        if (nextButton == view) {
-          next();
-        } else if (previousButton == view) {
-          previous();
-        } else if (fastForwardButton == view) {
-          fastForward();
-        } else if (rewindButton == view) {
-          rewind();
-        } else if (playButton == view) {
-          if (player.getPlaybackState() == Player.STATE_IDLE) {
-            if (playbackPreparer != null) {
-              playbackPreparer.preparePlayback();
-            }
-          } else if (player.getPlaybackState() == Player.STATE_ENDED) {
-            controlDispatcher.dispatchSeekTo(player, player.getCurrentWindowIndex(), C.TIME_UNSET);
+      Player player = PlayerControlView.this.player;
+      if (player == null) {
+        return;
+      }
+      if (nextButton == view) {
+        next(player);
+      } else if (previousButton == view) {
+        previous(player);
+      } else if (fastForwardButton == view) {
+        fastForward(player);
+      } else if (rewindButton == view) {
+        rewind(player);
+      } else if (playButton == view) {
+        if (player.getPlaybackState() == Player.STATE_IDLE) {
+          if (playbackPreparer != null) {
+            playbackPreparer.preparePlayback();
           }
-          controlDispatcher.dispatchSetPlayWhenReady(player, true);
-        } else if (pauseButton == view) {
-          controlDispatcher.dispatchSetPlayWhenReady(player, false);
-        } else if (repeatToggleButton == view) {
-          controlDispatcher.dispatchSetRepeatMode(
-              player, RepeatModeUtil.getNextRepeatMode(player.getRepeatMode(), repeatToggleModes));
-        } else if (shuffleButton == view) {
-          controlDispatcher.dispatchSetShuffleModeEnabled(player, !player.getShuffleModeEnabled());
+        } else if (player.getPlaybackState() == Player.STATE_ENDED) {
+          controlDispatcher.dispatchSeekTo(player, player.getCurrentWindowIndex(), C.TIME_UNSET);
         }
+        controlDispatcher.dispatchSetPlayWhenReady(player, true);
+      } else if (pauseButton == view) {
+        controlDispatcher.dispatchSetPlayWhenReady(player, false);
+      } else if (repeatToggleButton == view) {
+        controlDispatcher.dispatchSetRepeatMode(
+            player, RepeatModeUtil.getNextRepeatMode(player.getRepeatMode(), repeatToggleModes));
+      } else if (shuffleButton == view) {
+        controlDispatcher.dispatchSetShuffleModeEnabled(player, !player.getShuffleModeEnabled());
       }
     }
   }
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
index a125f31932..fff59b09cd 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
@@ -299,8 +299,9 @@ public class PlayerNotificationManager {
   private final Map<String, NotificationCompat.Action> playbackActions;
   private final Map<String, NotificationCompat.Action> customActions;
   private final int instanceId;
+  private final Timeline.Window window;
 
-  private @Nullable Player player;
+  @Nullable private Player player;
   private ControlDispatcher controlDispatcher;
   private boolean isNotificationStarted;
   private int currentNotificationTag;
@@ -485,7 +486,8 @@ public class PlayerNotificationManager {
     this.mediaDescriptionAdapter = mediaDescriptionAdapter;
     this.notificationListener = notificationListener;
     this.customActionReceiver = customActionReceiver;
-    this.controlDispatcher = new DefaultControlDispatcher();
+    controlDispatcher = new DefaultControlDispatcher();
+    window = new Timeline.Window();
     instanceId = instanceIdCounter++;
     mainHandler = new Handler(Looper.getMainLooper());
     notificationManager = NotificationManagerCompat.from(context);
@@ -968,15 +970,25 @@ public class PlayerNotificationManager {
    * action name is ignored.
    */
   protected List<String> getActions(Player player) {
-    boolean isPlayingAd = player.isPlayingAd();
+    boolean enablePrevious = false;
+    boolean enableRewind = false;
+    boolean enableFastForward = false;
+    boolean enableNext = false;
+    Timeline timeline = player.getCurrentTimeline();
+    if (!timeline.isEmpty() && !player.isPlayingAd()) {
+      timeline.getWindow(player.getCurrentWindowIndex(), window);
+      enablePrevious = window.isSeekable || !window.isDynamic || player.hasPrevious();
+      enableRewind = rewindMs > 0;
+      enableFastForward = fastForwardMs > 0;
+      enableNext = window.isDynamic || player.hasNext();
+    }
+
     List<String> stringActions = new ArrayList<>();
-    if (!isPlayingAd) {
-      if (useNavigationActions) {
-        stringActions.add(ACTION_PREVIOUS);
-      }
-      if (rewindMs > 0) {
-        stringActions.add(ACTION_REWIND);
-      }
+    if (useNavigationActions && enablePrevious) {
+      stringActions.add(ACTION_PREVIOUS);
+    }
+    if (enableRewind) {
+      stringActions.add(ACTION_REWIND);
     }
     if (usePlayPauseActions) {
       if (player.getPlayWhenReady()) {
@@ -985,13 +997,11 @@ public class PlayerNotificationManager {
         stringActions.add(ACTION_PLAY);
       }
     }
-    if (!isPlayingAd) {
-      if (fastForwardMs > 0) {
-        stringActions.add(ACTION_FAST_FORWARD);
-      }
-      if (useNavigationActions && player.getNextWindowIndex() != C.INDEX_UNSET) {
-        stringActions.add(ACTION_NEXT);
-      }
+    if (enableFastForward) {
+      stringActions.add(ACTION_FAST_FORWARD);
+    }
+    if (useNavigationActions && enableNext) {
+      stringActions.add(ACTION_NEXT);
     }
     if (customActionReceiver != null) {
       stringActions.addAll(customActionReceiver.getCustomActions(player));
@@ -1011,6 +1021,7 @@ public class PlayerNotificationManager {
    * @param actionNames The names of the actions included in the notification.
    * @param player The player for which state to build a notification.
    */
+  @SuppressWarnings("unused")
   protected int[] getActionIndicesForCompactView(List<String> actionNames, Player player) {
     int pauseActionIndex = actionNames.indexOf(ACTION_PAUSE);
     int playActionIndex = actionNames.indexOf(ACTION_PLAY);
@@ -1067,6 +1078,62 @@ public class PlayerNotificationManager {
     return actions;
   }
 
+  private void previous(Player player) {
+    Timeline timeline = player.getCurrentTimeline();
+    if (timeline.isEmpty() || player.isPlayingAd()) {
+      return;
+    }
+    int windowIndex = player.getCurrentWindowIndex();
+    timeline.getWindow(windowIndex, window);
+    int previousWindowIndex = player.getPreviousWindowIndex();
+    if (previousWindowIndex != C.INDEX_UNSET
+        && (player.getCurrentPosition() <= MAX_POSITION_FOR_SEEK_TO_PREVIOUS
+            || (window.isDynamic && !window.isSeekable))) {
+      seekTo(player, previousWindowIndex, C.TIME_UNSET);
+    } else {
+      seekTo(player, 0);
+    }
+  }
+
+  private void next(Player player) {
+    Timeline timeline = player.getCurrentTimeline();
+    if (timeline.isEmpty() || player.isPlayingAd()) {
+      return;
+    }
+    int windowIndex = player.getCurrentWindowIndex();
+    int nextWindowIndex = player.getNextWindowIndex();
+    if (nextWindowIndex != C.INDEX_UNSET) {
+      seekTo(player, nextWindowIndex, C.TIME_UNSET);
+    } else if (timeline.getWindow(windowIndex, window).isDynamic) {
+      seekTo(player, windowIndex, C.TIME_UNSET);
+    }
+  }
+
+  private void rewind(Player player) {
+    if (player.isCurrentWindowSeekable() && rewindMs > 0) {
+      seekTo(player, Math.max(player.getCurrentPosition() - rewindMs, 0));
+    }
+  }
+
+  private void fastForward(Player player) {
+    if (player.isCurrentWindowSeekable() && fastForwardMs > 0) {
+      seekTo(player, player.getCurrentPosition() + fastForwardMs);
+    }
+  }
+
+  private void seekTo(Player player, long positionMs) {
+    seekTo(player, player.getCurrentWindowIndex(), positionMs);
+  }
+
+  private void seekTo(Player player, int windowIndex, long positionMs) {
+    long duration = player.getDuration();
+    if (duration != C.TIME_UNSET) {
+      positionMs = Math.min(positionMs, duration);
+    }
+    positionMs = Math.max(positionMs, 0);
+    controlDispatcher.dispatchSeekTo(player, windowIndex, positionMs);
+  }
+
   private static PendingIntent createBroadcastIntent(
       String action, Context context, int instanceId) {
     Intent intent = new Intent(action).setPackage(context.getPackageName());
@@ -1119,13 +1186,6 @@ public class PlayerNotificationManager {
 
   private class NotificationBroadcastReceiver extends BroadcastReceiver {
 
-    private final Timeline.Window window;
-
-    /** Creates the broadcast receiver. */
-    public NotificationBroadcastReceiver() {
-      window = new Timeline.Window();
-    }
-
     @Override
     public void onReceive(Context context, Intent intent) {
       Player player = PlayerNotificationManager.this.player;
@@ -1137,25 +1197,14 @@ public class PlayerNotificationManager {
       String action = intent.getAction();
       if (ACTION_PLAY.equals(action) || ACTION_PAUSE.equals(action)) {
         controlDispatcher.dispatchSetPlayWhenReady(player, ACTION_PLAY.equals(action));
-      } else if (ACTION_FAST_FORWARD.equals(action) || ACTION_REWIND.equals(action)) {
-        long increment = ACTION_FAST_FORWARD.equals(action) ? fastForwardMs : -rewindMs;
-        controlDispatcher.dispatchSeekTo(
-            player, player.getCurrentWindowIndex(), player.getCurrentPosition() + increment);
-      } else if (ACTION_NEXT.equals(action)) {
-        int nextWindowIndex = player.getNextWindowIndex();
-        if (nextWindowIndex != C.INDEX_UNSET) {
-          controlDispatcher.dispatchSeekTo(player, nextWindowIndex, C.TIME_UNSET);
-        }
       } else if (ACTION_PREVIOUS.equals(action)) {
-        player.getCurrentTimeline().getWindow(player.getCurrentWindowIndex(), window);
-        int previousWindowIndex = player.getPreviousWindowIndex();
-        if (previousWindowIndex != C.INDEX_UNSET
-            && (player.getCurrentPosition() <= MAX_POSITION_FOR_SEEK_TO_PREVIOUS
-                || (window.isDynamic && !window.isSeekable))) {
-          controlDispatcher.dispatchSeekTo(player, previousWindowIndex, C.TIME_UNSET);
-        } else {
-          controlDispatcher.dispatchSeekTo(player, player.getCurrentWindowIndex(), C.TIME_UNSET);
-        }
+        previous(player);
+      } else if (ACTION_REWIND.equals(action)) {
+        rewind(player);
+      } else if (ACTION_FAST_FORWARD.equals(action)) {
+        fastForward(player);
+      } else if (ACTION_NEXT.equals(action)) {
+        next(player);
       } else if (ACTION_STOP.equals(action)) {
         controlDispatcher.dispatchStop(player, true);
         stopNotification();

From afebaed0c58bfc3e36eaf16fa57c9469a310a746 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 12 Nov 2018 04:43:43 -0800
Subject: [PATCH 193/832] Make support-media-compat an API dependency

The extension cannot be used without also using support-media-compat
(e.g. to instantiate a MediaSessionCompat). So it may as well be an
API dependency.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=221072128
---
 extensions/mediasession/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/mediasession/build.gradle b/extensions/mediasession/build.gradle
index da04b0aec3..5fb25c6382 100644
--- a/extensions/mediasession/build.gradle
+++ b/extensions/mediasession/build.gradle
@@ -31,7 +31,7 @@ android {
 
 dependencies {
     implementation project(modulePrefix + 'library-core')
-    implementation 'com.android.support:support-media-compat:' + supportLibraryVersion
+    api 'com.android.support:support-media-compat:' + supportLibraryVersion
 }
 
 ext {

From 51461d7e0022394a1d2f68b2281020d769532e3e Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Mon, 12 Nov 2018 05:11:37 -0800
Subject: [PATCH 194/832] Add constructor to DefaultShuffleOrder to support
 sideloaded shuffle orders

Issue: #4915

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=221075615
---
 .../android/exoplayer2/source/ShuffleOrder.java | 11 +++++++++++
 .../exoplayer2/source/ShuffleOrderTest.java     | 17 +++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ShuffleOrder.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ShuffleOrder.java
index 750c42bbd0..90e2576d76 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ShuffleOrder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ShuffleOrder.java
@@ -55,6 +55,17 @@ public interface ShuffleOrder {
       this(length, new Random(randomSeed));
     }
 
+    /**
+     * Creates an instance with a specified shuffle order and the specified random seed. The random
+     * seed is used for {@link #cloneAndInsert(int, int)} invocations.
+     *
+     * @param shuffledIndices The shuffled indices to use as order.
+     * @param randomSeed A random seed.
+     */
+    public DefaultShuffleOrder(int[] shuffledIndices, long randomSeed) {
+      this(Arrays.copyOf(shuffledIndices, shuffledIndices.length), new Random(randomSeed));
+    }
+
     private DefaultShuffleOrder(int length, Random random) {
       this(createShuffledList(length, random), random);
     }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java
index e15c8f0aaa..06f39409e7 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java
@@ -79,6 +79,23 @@ public final class ShuffleOrderTest {
     }
   }
 
+  @Test
+  public void testSideloadedShuffleOrder() {
+    int[] shuffledIndices = new int[] {2, 1, 0, 4, 3};
+    ShuffleOrder shuffleOrder = new DefaultShuffleOrder(shuffledIndices, RANDOM_SEED);
+    assertThat(shuffleOrder.getFirstIndex()).isEqualTo(2);
+    assertThat(shuffleOrder.getLastIndex()).isEqualTo(3);
+    for (int i = 0; i < 4; i++) {
+      assertThat(shuffleOrder.getNextIndex(shuffledIndices[i])).isEqualTo(shuffledIndices[i + 1]);
+    }
+    assertThat(shuffleOrder.getNextIndex(3)).isEqualTo(C.INDEX_UNSET);
+    for (int i = 4; i > 0; i--) {
+      assertThat(shuffleOrder.getPreviousIndex(shuffledIndices[i]))
+          .isEqualTo(shuffledIndices[i - 1]);
+    }
+    assertThat(shuffleOrder.getPreviousIndex(2)).isEqualTo(C.INDEX_UNSET);
+  }
+
   private static void assertShuffleOrderCorrectness(ShuffleOrder shuffleOrder, int length) {
     assertThat(shuffleOrder.getLength()).isEqualTo(length);
     if (length == 0) {

From 9ca019b8f808a38fea3a467cff200ff7ebf876ce Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 12 Nov 2018 05:18:03 -0800
Subject: [PATCH 195/832] PlaybackNotificationManager should show play button
 in ENDED state

- This brings it in line with PlayerControlView. The play action is displayed
instead, and pressing it seeks to the default position of the current window.
- Do the same for MediaSessionConnector
- Add support for PlaybackPreparer consistent with PlayerControlView

Issue: #5072

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=221076008
---
 .../mediasession/MediaSessionConnector.java   |  9 +++++-
 .../ui/PlayerNotificationManager.java         | 32 +++++++++++++++++--
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
index 0cb590b65e..27ce380a6d 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
@@ -703,7 +703,7 @@ public final class MediaSessionConnector {
       case Player.STATE_READY:
         return playWhenReady ? PlaybackStateCompat.STATE_PLAYING : PlaybackStateCompat.STATE_PAUSED;
       case Player.STATE_ENDED:
-        return PlaybackStateCompat.STATE_PAUSED;
+        return PlaybackStateCompat.STATE_STOPPED;
       default:
         return PlaybackStateCompat.STATE_NONE;
     }
@@ -934,6 +934,13 @@ public final class MediaSessionConnector {
     @Override
     public void onPlay() {
       if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_PLAY)) {
+        if (player.getPlaybackState() == Player.STATE_IDLE) {
+          if (playbackPreparer != null) {
+            playbackPreparer.onPrepare();
+          }
+        } else if (player.getPlaybackState() == Player.STATE_ENDED) {
+          controlDispatcher.dispatchSeekTo(player, player.getCurrentWindowIndex(), C.TIME_UNSET);
+        }
         controlDispatcher.dispatchSetPlayWhenReady(player, /* playWhenReady= */ true);
       }
     }
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
index fff59b09cd..30c19d5f82 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
@@ -37,6 +37,7 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ControlDispatcher;
 import com.google.android.exoplayer2.DefaultControlDispatcher;
 import com.google.android.exoplayer2.PlaybackParameters;
+import com.google.android.exoplayer2.PlaybackPreparer;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.util.Assertions;
@@ -302,6 +303,7 @@ public class PlayerNotificationManager {
   private final Timeline.Window window;
 
   @Nullable private Player player;
+  @Nullable private PlaybackPreparer playbackPreparer;
   private ControlDispatcher controlDispatcher;
   private boolean isNotificationStarted;
   private int currentNotificationTag;
@@ -562,6 +564,15 @@ public class PlayerNotificationManager {
     }
   }
 
+  /**
+   * Sets the {@link PlaybackPreparer}.
+   *
+   * @param playbackPreparer The {@link PlaybackPreparer}.
+   */
+  public void setPlaybackPreparer(@Nullable PlaybackPreparer playbackPreparer) {
+    this.playbackPreparer = playbackPreparer;
+  }
+
   /**
    * Sets the {@link ControlDispatcher}.
    *
@@ -991,7 +1002,7 @@ public class PlayerNotificationManager {
       stringActions.add(ACTION_REWIND);
     }
     if (usePlayPauseActions) {
-      if (player.getPlayWhenReady()) {
+      if (isPlaying(player)) {
         stringActions.add(ACTION_PAUSE);
       } else {
         stringActions.add(ACTION_PLAY);
@@ -1134,6 +1145,12 @@ public class PlayerNotificationManager {
     controlDispatcher.dispatchSeekTo(player, windowIndex, positionMs);
   }
 
+  private boolean isPlaying(Player player) {
+    return player.getPlaybackState() != Player.STATE_ENDED
+        && player.getPlaybackState() != Player.STATE_IDLE
+        && player.getPlayWhenReady();
+  }
+
   private static PendingIntent createBroadcastIntent(
       String action, Context context, int instanceId) {
     Intent intent = new Intent(action).setPackage(context.getPackageName());
@@ -1195,8 +1212,17 @@ public class PlayerNotificationManager {
         return;
       }
       String action = intent.getAction();
-      if (ACTION_PLAY.equals(action) || ACTION_PAUSE.equals(action)) {
-        controlDispatcher.dispatchSetPlayWhenReady(player, ACTION_PLAY.equals(action));
+      if (ACTION_PLAY.equals(action)) {
+        if (player.getPlaybackState() == Player.STATE_IDLE) {
+          if (playbackPreparer != null) {
+            playbackPreparer.preparePlayback();
+          }
+        } else if (player.getPlaybackState() == Player.STATE_ENDED) {
+          controlDispatcher.dispatchSeekTo(player, player.getCurrentWindowIndex(), C.TIME_UNSET);
+        }
+        controlDispatcher.dispatchSetPlayWhenReady(player, /* playWhenReady= */ true);
+      } else if (ACTION_PAUSE.equals(action)) {
+        controlDispatcher.dispatchSetPlayWhenReady(player, /* playWhenReady= */ false);
       } else if (ACTION_PREVIOUS.equals(action)) {
         previous(player);
       } else if (ACTION_REWIND.equals(action)) {

From f5af6e8f169e9be98353ac8951275e5d44ff5d15 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 12 Nov 2018 05:45:14 -0800
Subject: [PATCH 196/832] Document need to call MediaSessionCompat.setActive

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=221078075
---
 .../exoplayer2/ext/mediasession/MediaSessionConnector.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
index 27ce380a6d..de14cbf6d7 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
@@ -55,6 +55,11 @@ import java.util.Map;
 /**
  * Connects a {@link MediaSessionCompat} to a {@link Player}.
  *
+ * <p>This connector does <em>not</em> call {@link MediaSessionCompat#setActive(boolean)}, and so
+ * application code is responsible for making the session active when desired. A session must be
+ * active for transport controls to be displayed (e.g. on the lock screen) and for it to receive
+ * media button events.
+ *
  * <p>The connector listens for actions sent by the media session's controller and implements these
  * actions by calling appropriate player methods. The playback state of the media session is
  * automatically synced with the player. The connector can also be optionally extended by providing

From c20b157bd7feae35ffdcb84cc46647ba8f23e208 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 12 Nov 2018 14:06:46 -0800
Subject: [PATCH 197/832] Wire up experiment to use AdaptiveTrackSelection
 based selections

LegacyVideoTrackSelection is the previous implementation (unchanged).
VideoTrackSelection is rewritten to extend AdaptiveTrackSelection.

An experiment is added to allow use of the new VideoTrackSelection
implementation. It's envisaged that this transition will be more or
less a no-op change. The experiment flag is only in case of bugs
during roll-out, and will be removed with LegacyVideoTrackSelection
upon successful transition.

VideoTrackSelection also implements discard-on-trick-play-exit, which
was a TODO in the previous implementation.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=221153827
---
 .../AdaptiveTrackSelection.java               | 60 ++++++++++++++++---
 1 file changed, 51 insertions(+), 9 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
index 2c74d2412d..e1ccf5a0f7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
@@ -255,7 +255,7 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
   private final Clock clock;
   private final Format[] formats;
   private final int[] formatBitrates;
-  private final int[] estimatedBitrates;
+  private final int[] trackBitrates;
 
   private TrackBitrateEstimator trackBitrateEstimator;
   private float playbackSpeed;
@@ -338,7 +338,7 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
     trackBitrateEstimator = TrackBitrateEstimator.DEFAULT;
     formats = new Format[length];
     formatBitrates = new int[length];
-    estimatedBitrates = new int[length];
+    trackBitrates = new int[length];
     for (int i = 0; i < length; i++) {
       @SuppressWarnings("nullness:method.invocation.invalid")
       Format format = getFormat(i);
@@ -380,11 +380,12 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
       MediaChunkIterator[] mediaChunkIterators) {
     long nowMs = clock.elapsedRealtime();
 
-    trackBitrateEstimator.getBitrates(formats, queue, mediaChunkIterators, estimatedBitrates);
+    // Update the estimated track bitrates.
+    trackBitrateEstimator.getBitrates(formats, queue, mediaChunkIterators, trackBitrates);
 
     // Stash the current selection, then make a new one.
     int currentSelectedIndex = selectedIndex;
-    selectedIndex = determineIdealSelectedIndex(nowMs, estimatedBitrates);
+    selectedIndex = determineIdealSelectedIndex(nowMs, trackBitrates);
     if (selectedIndex == currentSelectedIndex) {
       return;
     }
@@ -429,10 +430,10 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
   @Override
   public int evaluateQueueSize(long playbackPositionUs, List<? extends MediaChunk> queue) {
     long nowMs = clock.elapsedRealtime();
-    if (lastBufferEvaluationMs != C.TIME_UNSET
-        && nowMs - lastBufferEvaluationMs < minTimeBetweenBufferReevaluationMs) {
+    if (!shouldEvaluateQueueSize(nowMs)) {
       return queue.size();
     }
+
     lastBufferEvaluationMs = nowMs;
     if (queue.isEmpty()) {
       return 0;
@@ -443,6 +444,7 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
     long playoutBufferedDurationBeforeLastChunkUs =
         Util.getPlayoutDurationForMediaDuration(
             lastChunk.startTimeUs - playbackPositionUs, playbackSpeed);
+    long minDurationToRetainAfterDiscardUs = getMinDurationToRetainAfterDiscardUs();
     if (playoutBufferedDurationBeforeLastChunkUs < minDurationToRetainAfterDiscardUs) {
       return queueSize;
     }
@@ -468,19 +470,59 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
     return queueSize;
   }
 
+  /**
+   * Called when updating the selected track to determine whether a candidate track can be selected.
+   *
+   * @param format The {@link Format} of the candidate track.
+   * @param trackBitrate The estimated bitrate of the track. May differ from {@link Format#bitrate}
+   *     if a more accurate estimate of the current track bitrate is available.
+   * @param playbackSpeed The current playback speed.
+   * @param effectiveBitrate The bitrate available to this selection.
+   * @return Whether this {@link Format} can be selected.
+   */
+  @SuppressWarnings("unused")
+  protected boolean canSelectFormat(
+      Format format, int trackBitrate, float playbackSpeed, long effectiveBitrate) {
+    return Math.round(trackBitrate * playbackSpeed) <= effectiveBitrate;
+  }
+
+  /**
+   * Called from {@link #evaluateQueueSize(long, List)} to determine whether an evaluation should be
+   * performed.
+   *
+   * @param nowMs The current value of {@link Clock#elapsedRealtime()}.
+   * @return Whether an evaluation should be performed.
+   */
+  protected boolean shouldEvaluateQueueSize(long nowMs) {
+    return lastBufferEvaluationMs == C.TIME_UNSET
+        || nowMs - lastBufferEvaluationMs >= minTimeBetweenBufferReevaluationMs;
+  }
+
+  /**
+   * Called from {@link #evaluateQueueSize(long, List)} to determine the minimum duration of buffer
+   * to retain after discarding chunks.
+   *
+   * @return The minimum duration of buffer to retain after discarding chunks, in microseconds.
+   */
+  protected long getMinDurationToRetainAfterDiscardUs() {
+    return minDurationToRetainAfterDiscardUs;
+  }
+
   /**
    * Computes the ideal selected index ignoring buffer health.
    *
    * @param nowMs The current time in the timebase of {@link Clock#elapsedRealtime()}, or {@link
    *     Long#MIN_VALUE} to ignore blacklisting.
-   * @param bitrates Track bitrates.
+   * @param trackBitrates The estimated track bitrates. May differ from format bitrates if more
+   *     accurate estimates of the current track bitrates are available.
    */
-  private int determineIdealSelectedIndex(long nowMs, int[] bitrates) {
+  private int determineIdealSelectedIndex(long nowMs, int[] trackBitrates) {
     long effectiveBitrate = (long) (bandwidthMeter.getBitrateEstimate() * bandwidthFraction);
     int lowestBitrateNonBlacklistedIndex = 0;
     for (int i = 0; i < length; i++) {
       if (nowMs == Long.MIN_VALUE || !isBlacklisted(i, nowMs)) {
-        if (Math.round(bitrates[i] * playbackSpeed) <= effectiveBitrate) {
+        Format format = getFormat(i);
+        if (canSelectFormat(format, trackBitrates[i], playbackSpeed, effectiveBitrate)) {
           return i;
         } else {
           lowestBitrateNonBlacklistedIndex = i;

From 866b088d0bf7be3daf87c1ac324bb5d6a1ba78c4 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 14 Nov 2018 06:44:38 -0800
Subject: [PATCH 198/832] Noop cleanup of binary seeking / duration reading.

This is a precursor for fixing the ref'd issue. These classes are
well tested, so the tests passing should give you reasonable
confidence I didn't break anything :).

Issue: #5097

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=221435824
---
 .../extractor/BinarySearchSeeker.java         | 91 ++++++++-----------
 .../extractor/ts/PsBinarySearchSeeker.java    | 15 ++-
 .../extractor/ts/PsDurationReader.java        | 30 +++---
 .../extractor/ts/TsBinarySearchSeeker.java    | 22 ++---
 .../extractor/ts/TsDurationReader.java        | 31 +++----
 5 files changed, 87 insertions(+), 102 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java
index 022b5b4c75..e984261145 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java
@@ -42,31 +42,16 @@ public abstract class BinarySearchSeeker {
   protected interface TimestampSeeker {
 
     /**
-     * Searches for a given timestamp from the input.
+     * Searches a limited window of the provided input for a target timestamp. The size of the
+     * window is implementation specific, but should be small enough such that it's reasonable for
+     * multiple such reads to occur during a seek operation.
      *
-     * <p>Given a target timestamp and an input stream, this seeker will try to read up to a range
-     * of {@code searchRangeBytes} bytes from that input, look for all available timestamps from all
-     * frames in that range, compare those with the target timestamp, and return one of the {@link
-     * TimestampSearchResult}.
-     *
-     * @param input The {@link ExtractorInput} from which data should be read.
-     * @param targetTimestamp The target timestamp that we are looking for.
-     * @param outputFrameHolder If {@link TimestampSearchResult#RESULT_TARGET_TIMESTAMP_FOUND} is
+     * @param input The {@link ExtractorInput} from which data should be peeked.
+     * @param targetTimestamp The target timestamp.
+     * @param outputFrameHolder If {@link TimestampSearchResult#TYPE_TARGET_TIMESTAMP_FOUND} is
      *     returned, this holder may be updated to hold the extracted frame that contains the target
      *     frame/sample associated with the target timestamp.
-     * @return A {@link TimestampSearchResult}, that includes a {@link TimestampSearchResult#result}
-     *     value, and other necessary info:
-     *     <ul>
-     *       <li>{@link TimestampSearchResult#RESULT_NO_TIMESTAMP} is returned if there is no
-     *           timestamp in the reading range.
-     *       <li>{@link TimestampSearchResult#RESULT_POSITION_UNDERESTIMATED} is returned if all
-     *           timestamps in the range are smaller than the target timestamp.
-     *       <li>{@link TimestampSearchResult#RESULT_POSITION_OVERESTIMATED} is returned if all
-     *           timestamps in the range are larger than the target timestamp.
-     *       <li>{@link TimestampSearchResult#RESULT_TARGET_TIMESTAMP_FOUND} is returned if this
-     *           seeker can find a timestamp that it deems close enough to the given target.
-     *     </ul>
-     *
+     * @return A {@link TimestampSearchResult} that describes the result of the search.
      * @throws IOException If an error occurred reading from the input.
      * @throws InterruptedException If the thread was interrupted.
      */
@@ -232,22 +217,22 @@ public abstract class BinarySearchSeeker {
           timestampSeeker.searchForTimestamp(
               input, seekOperationParams.getTargetTimePosition(), outputFrameHolder);
 
-      switch (timestampSearchResult.result) {
-        case TimestampSearchResult.RESULT_POSITION_OVERESTIMATED:
+      switch (timestampSearchResult.type) {
+        case TimestampSearchResult.TYPE_POSITION_OVERESTIMATED:
           seekOperationParams.updateSeekCeiling(
               timestampSearchResult.timestampToUpdate, timestampSearchResult.bytePositionToUpdate);
           break;
-        case TimestampSearchResult.RESULT_POSITION_UNDERESTIMATED:
+        case TimestampSearchResult.TYPE_POSITION_UNDERESTIMATED:
           seekOperationParams.updateSeekFloor(
               timestampSearchResult.timestampToUpdate, timestampSearchResult.bytePositionToUpdate);
           break;
-        case TimestampSearchResult.RESULT_TARGET_TIMESTAMP_FOUND:
+        case TimestampSearchResult.TYPE_TARGET_TIMESTAMP_FOUND:
           markSeekOperationFinished(
               /* foundTargetFrame= */ true, timestampSearchResult.bytePositionToUpdate);
           skipInputUntilPosition(input, timestampSearchResult.bytePositionToUpdate);
           return seekToPosition(
               input, timestampSearchResult.bytePositionToUpdate, seekPositionHolder);
-        case TimestampSearchResult.RESULT_NO_TIMESTAMP:
+        case TimestampSearchResult.TYPE_NO_TIMESTAMP:
           // We can't find any timestamp in the search range from the search position.
           // Give up, and just continue reading from the last search position in this case.
           markSeekOperationFinished(/* foundTargetFrame= */ false, searchPosition);
@@ -434,45 +419,49 @@ public abstract class BinarySearchSeeker {
    */
   public static final class TimestampSearchResult {
 
-    public static final int RESULT_TARGET_TIMESTAMP_FOUND = 0;
-    public static final int RESULT_POSITION_OVERESTIMATED = -1;
-    public static final int RESULT_POSITION_UNDERESTIMATED = -2;
-    public static final int RESULT_NO_TIMESTAMP = -3;
+    /** The search found a timestamp that it deems close enough to the given target. */
+    public static final int TYPE_TARGET_TIMESTAMP_FOUND = 0;
+    /** The search found only timestamps larger than the target timestamp. */
+    public static final int TYPE_POSITION_OVERESTIMATED = -1;
+    /** The search found only timestamps smaller than the target timestamp. */
+    public static final int TYPE_POSITION_UNDERESTIMATED = -2;
+    /** The search didn't find any timestamps. */
+    public static final int TYPE_NO_TIMESTAMP = -3;
 
     @Documented
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({
-      RESULT_TARGET_TIMESTAMP_FOUND,
-      RESULT_POSITION_OVERESTIMATED,
-      RESULT_POSITION_UNDERESTIMATED,
-      RESULT_NO_TIMESTAMP
+      TYPE_TARGET_TIMESTAMP_FOUND,
+      TYPE_POSITION_OVERESTIMATED,
+      TYPE_POSITION_UNDERESTIMATED,
+      TYPE_NO_TIMESTAMP
     })
-    @interface SearchResult {}
+    @interface Type {}
 
     public static final TimestampSearchResult NO_TIMESTAMP_IN_RANGE_RESULT =
-        new TimestampSearchResult(RESULT_NO_TIMESTAMP, C.TIME_UNSET, C.POSITION_UNSET);
+        new TimestampSearchResult(TYPE_NO_TIMESTAMP, C.TIME_UNSET, C.POSITION_UNSET);
 
-    /** @see TimestampSeeker */
-    private final @SearchResult int result;
+    /** The type of the result. */
+    @Type private final int type;
 
     /**
-     * When {@code result} is {@link #RESULT_POSITION_OVERESTIMATED}, the {@link
-     * SeekOperationParams#ceilingTimePosition} should be updated with this value. When {@code
-     * result} is {@link #RESULT_POSITION_UNDERESTIMATED}, the {@link
+     * When {@link #type} is {@link #TYPE_POSITION_OVERESTIMATED}, the {@link
+     * SeekOperationParams#ceilingTimePosition} should be updated with this value. When {@link
+     * #type} is {@link #TYPE_POSITION_UNDERESTIMATED}, the {@link
      * SeekOperationParams#floorTimePosition} should be updated with this value.
      */
     private final long timestampToUpdate;
     /**
-     * When {@code result} is {@link #RESULT_POSITION_OVERESTIMATED}, the {@link
-     * SeekOperationParams#ceilingBytePosition} should be updated with this value. When {@code
-     * result} is {@link #RESULT_POSITION_UNDERESTIMATED}, the {@link
+     * When {@link #type} is {@link #TYPE_POSITION_OVERESTIMATED}, the {@link
+     * SeekOperationParams#ceilingBytePosition} should be updated with this value. When {@link
+     * #type} is {@link #TYPE_POSITION_UNDERESTIMATED}, the {@link
      * SeekOperationParams#floorBytePosition} should be updated with this value.
      */
     private final long bytePositionToUpdate;
 
     private TimestampSearchResult(
-        @SearchResult int result, long timestampToUpdate, long bytePositionToUpdate) {
-      this.result = result;
+        @Type int type, long timestampToUpdate, long bytePositionToUpdate) {
+      this.type = type;
       this.timestampToUpdate = timestampToUpdate;
       this.bytePositionToUpdate = bytePositionToUpdate;
     }
@@ -485,7 +474,7 @@ public abstract class BinarySearchSeeker {
     public static TimestampSearchResult overestimatedResult(
         long newCeilingTimestamp, long newCeilingBytePosition) {
       return new TimestampSearchResult(
-          RESULT_POSITION_OVERESTIMATED, newCeilingTimestamp, newCeilingBytePosition);
+          TYPE_POSITION_OVERESTIMATED, newCeilingTimestamp, newCeilingBytePosition);
     }
 
     /**
@@ -496,11 +485,11 @@ public abstract class BinarySearchSeeker {
     public static TimestampSearchResult underestimatedResult(
         long newFloorTimestamp, long newCeilingBytePosition) {
       return new TimestampSearchResult(
-          RESULT_POSITION_UNDERESTIMATED, newFloorTimestamp, newCeilingBytePosition);
+          TYPE_POSITION_UNDERESTIMATED, newFloorTimestamp, newCeilingBytePosition);
     }
 
     /**
-     * Returns a result to signal that the target timestamp has been found at the {@code
+     * Returns a result to signal that the target timestamp has been found at {@code
      * resultBytePosition}, and the seek operation can stop.
      *
      * <p>Note that when this value is returned from {@link
@@ -509,7 +498,7 @@ public abstract class BinarySearchSeeker {
      */
     public static TimestampSearchResult targetFoundResult(long resultBytePosition) {
       return new TimestampSearchResult(
-          RESULT_TARGET_TIMESTAMP_FOUND, C.TIME_UNSET, resultBytePosition);
+          TYPE_TARGET_TIMESTAMP_FOUND, C.TIME_UNSET, resultBytePosition);
     }
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsBinarySearchSeeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsBinarySearchSeeker.java
index e8c207f75d..1180dd486e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsBinarySearchSeeker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsBinarySearchSeeker.java
@@ -53,10 +53,9 @@ import java.io.IOException;
   /**
    * A seeker that looks for a given SCR timestamp at a given position in a PS stream.
    *
-   * <p>Given a SCR timestamp, and a position within a PS stream, this seeker will try to read a
-   * range of up to {@link #TIMESTAMP_SEARCH_BYTES} bytes from that stream position, look for all
-   * packs in that range, and then compare the SCR timestamps (if available) of these packets vs the
-   * target timestamp.
+   * <p>Given a SCR timestamp, and a position within a PS stream, this seeker will peek up to {@link
+   * #TIMESTAMP_SEARCH_BYTES} bytes from that stream position, look for all packs in that range, and
+   * then compare the SCR timestamps (if available) of these packets to the target timestamp.
    */
   private static final class PsScrSeeker implements TimestampSeeker {
 
@@ -73,10 +72,10 @@ import java.io.IOException;
         ExtractorInput input, long targetTimestamp, OutputFrameHolder outputFrameHolder)
         throws IOException, InterruptedException {
       long inputPosition = input.getPosition();
-      int bytesToRead =
-          (int) Math.min(TIMESTAMP_SEARCH_BYTES, input.getLength() - input.getPosition());
-      packetBuffer.reset(bytesToRead);
-      input.peekFully(packetBuffer.data, /* offset= */ 0, bytesToRead);
+      int bytesToSearch = (int) Math.min(TIMESTAMP_SEARCH_BYTES, input.getLength() - inputPosition);
+
+      input.peekFully(packetBuffer.data, /* offset= */ 0, bytesToSearch);
+      packetBuffer.reset(bytesToSearch);
 
       return searchForScrValueInBuffer(packetBuffer, targetTimestamp, inputPosition);
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsDurationReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsDurationReader.java
index 3b52206235..077a35f4a7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsDurationReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsDurationReader.java
@@ -38,7 +38,7 @@ import java.io.IOException;
  */
 /* package */ final class PsDurationReader {
 
-  private static final int DURATION_READ_BYTES = 20000;
+  private static final int TIMESTAMP_SEARCH_BYTES = 20000;
 
   private final TimestampAdjuster scrTimestampAdjuster;
   private final ParsableByteArray packetBuffer;
@@ -56,7 +56,7 @@ import java.io.IOException;
     firstScrValue = C.TIME_UNSET;
     lastScrValue = C.TIME_UNSET;
     durationUs = C.TIME_UNSET;
-    packetBuffer = new ParsableByteArray(DURATION_READ_BYTES);
+    packetBuffer = new ParsableByteArray(TIMESTAMP_SEARCH_BYTES);
   }
 
   /** Returns true if a PS duration has been read. */
@@ -136,16 +136,16 @@ import java.io.IOException;
 
   private int readFirstScrValue(ExtractorInput input, PositionHolder seekPositionHolder)
       throws IOException, InterruptedException {
-    if (input.getPosition() != 0) {
-      seekPositionHolder.position = 0;
+    int bytesToSearch = (int) Math.min(TIMESTAMP_SEARCH_BYTES, input.getLength());
+    int searchStartPosition = 0;
+    if (input.getPosition() != searchStartPosition) {
+      seekPositionHolder.position = searchStartPosition;
       return Extractor.RESULT_SEEK;
     }
 
-    int bytesToRead = (int) Math.min(DURATION_READ_BYTES, input.getLength());
     input.resetPeekPosition();
-    input.peekFully(packetBuffer.data, /* offset= */ 0, bytesToRead);
-    packetBuffer.setPosition(0);
-    packetBuffer.setLimit(bytesToRead);
+    input.peekFully(packetBuffer.data, /* offset= */ 0, bytesToSearch);
+    packetBuffer.reset(bytesToSearch);
 
     firstScrValue = readFirstScrValueFromBuffer(packetBuffer);
     isFirstScrValueRead = true;
@@ -172,17 +172,17 @@ import java.io.IOException;
 
   private int readLastScrValue(ExtractorInput input, PositionHolder seekPositionHolder)
       throws IOException, InterruptedException {
-    int bytesToRead = (int) Math.min(DURATION_READ_BYTES, input.getLength());
-    long bufferStartStreamPosition = input.getLength() - bytesToRead;
-    if (input.getPosition() != bufferStartStreamPosition) {
-      seekPositionHolder.position = bufferStartStreamPosition;
+    long inputLength = input.getLength();
+    int bytesToSearch = (int) Math.min(TIMESTAMP_SEARCH_BYTES, inputLength);
+    long searchStartPosition = inputLength - bytesToSearch;
+    if (input.getPosition() != searchStartPosition) {
+      seekPositionHolder.position = searchStartPosition;
       return Extractor.RESULT_SEEK;
     }
 
     input.resetPeekPosition();
-    input.peekFully(packetBuffer.data, /* offset= */ 0, bytesToRead);
-    packetBuffer.setPosition(0);
-    packetBuffer.setLimit(bytesToRead);
+    input.peekFully(packetBuffer.data, /* offset= */ 0, bytesToSearch);
+    packetBuffer.reset(bytesToSearch);
 
     lastScrValue = readLastScrValueFromBuffer(packetBuffer);
     isLastScrValueRead = true;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsBinarySearchSeeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsBinarySearchSeeker.java
index 29aa0d55d2..e9b051592d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsBinarySearchSeeker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsBinarySearchSeeker.java
@@ -33,10 +33,8 @@ import java.io.IOException;
 /* package */ final class TsBinarySearchSeeker extends BinarySearchSeeker {
 
   private static final long SEEK_TOLERANCE_US = 100_000;
-  private static final int MINIMUM_SEARCH_RANGE_BYTES = TsExtractor.TS_PACKET_SIZE * 5;
-  private static final int TIMESTAMP_SEARCH_PACKETS = 200;
-  private static final int TIMESTAMP_SEARCH_BYTES =
-      TsExtractor.TS_PACKET_SIZE * TIMESTAMP_SEARCH_PACKETS;
+  private static final int MINIMUM_SEARCH_RANGE_BYTES = 5 * TsExtractor.TS_PACKET_SIZE;
+  private static final int TIMESTAMP_SEARCH_BYTES = 200 * TsExtractor.TS_PACKET_SIZE;
 
   public TsBinarySearchSeeker(
       TimestampAdjuster pcrTimestampAdjuster, long streamDurationUs, long inputLength, int pcrPid) {
@@ -56,10 +54,10 @@ import java.io.IOException;
    * A {@link TimestampSeeker} implementation that looks for a given PCR timestamp at a given
    * position in a TS stream.
    *
-   * <p>Given a PCR timestamp, and a position within a TS stream, this seeker will try to read up to
-   * {@link #TIMESTAMP_SEARCH_PACKETS} TS packets from that stream position, look for all packet
-   * with PID equals to PCR_PID, and then compare the PCR timestamps (if available) of these packets
-   * vs the target timestamp.
+   * <p>Given a PCR timestamp, and a position within a TS stream, this seeker will peek up to {@link
+   * #TIMESTAMP_SEARCH_BYTES} from that stream position, look for all packets with PID equal to
+   * PCR_PID, and then compare the PCR timestamps (if available) of these packets to the target
+   * timestamp.
    */
   private static final class TsPcrSeeker implements TimestampSeeker {
 
@@ -78,10 +76,10 @@ import java.io.IOException;
         ExtractorInput input, long targetTimestamp, OutputFrameHolder outputFrameHolder)
         throws IOException, InterruptedException {
       long inputPosition = input.getPosition();
-      int bytesToRead =
-          (int) Math.min(TIMESTAMP_SEARCH_BYTES, input.getLength() - input.getPosition());
-      packetBuffer.reset(bytesToRead);
-      input.peekFully(packetBuffer.data, /* offset= */ 0, bytesToRead);
+      int bytesToSearch = (int) Math.min(TIMESTAMP_SEARCH_BYTES, input.getLength() - inputPosition);
+
+      input.peekFully(packetBuffer.data, /* offset= */ 0, bytesToSearch);
+      packetBuffer.reset(bytesToSearch);
 
       return searchForPcrValueInBuffer(packetBuffer, targetTimestamp, inputPosition);
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsDurationReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsDurationReader.java
index 350337cc86..4401083324 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsDurationReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsDurationReader.java
@@ -35,8 +35,7 @@ import java.io.IOException;
  */
 /* package */ final class TsDurationReader {
 
-  private static final int DURATION_READ_PACKETS = 200;
-  private static final int DURATION_READ_BYTES = TsExtractor.TS_PACKET_SIZE * DURATION_READ_PACKETS;
+  private static final int TIMESTAMP_SEARCH_BYTES = 200 * TsExtractor.TS_PACKET_SIZE;
 
   private final TimestampAdjuster pcrTimestampAdjuster;
   private final ParsableByteArray packetBuffer;
@@ -54,7 +53,7 @@ import java.io.IOException;
     firstPcrValue = C.TIME_UNSET;
     lastPcrValue = C.TIME_UNSET;
     durationUs = C.TIME_UNSET;
-    packetBuffer = new ParsableByteArray(DURATION_READ_BYTES);
+    packetBuffer = new ParsableByteArray(TIMESTAMP_SEARCH_BYTES);
   }
 
   /** Returns true if a TS duration has been read. */
@@ -124,16 +123,16 @@ import java.io.IOException;
 
   private int readFirstPcrValue(ExtractorInput input, PositionHolder seekPositionHolder, int pcrPid)
       throws IOException, InterruptedException {
-    if (input.getPosition() != 0) {
-      seekPositionHolder.position = 0;
+    int bytesToSearch = (int) Math.min(TIMESTAMP_SEARCH_BYTES, input.getLength());
+    int searchStartPosition = 0;
+    if (input.getPosition() != searchStartPosition) {
+      seekPositionHolder.position = searchStartPosition;
       return Extractor.RESULT_SEEK;
     }
 
-    int bytesToRead = (int) Math.min(DURATION_READ_BYTES, input.getLength());
     input.resetPeekPosition();
-    input.peekFully(packetBuffer.data, /* offset= */ 0, bytesToRead);
-    packetBuffer.setPosition(0);
-    packetBuffer.setLimit(bytesToRead);
+    input.peekFully(packetBuffer.data, /* offset= */ 0, bytesToSearch);
+    packetBuffer.reset(bytesToSearch);
 
     firstPcrValue = readFirstPcrValueFromBuffer(packetBuffer, pcrPid);
     isFirstPcrValueRead = true;
@@ -159,17 +158,17 @@ import java.io.IOException;
 
   private int readLastPcrValue(ExtractorInput input, PositionHolder seekPositionHolder, int pcrPid)
       throws IOException, InterruptedException {
-    int bytesToRead = (int) Math.min(DURATION_READ_BYTES, input.getLength());
-    long bufferStartStreamPosition = input.getLength() - bytesToRead;
-    if (input.getPosition() != bufferStartStreamPosition) {
-      seekPositionHolder.position = bufferStartStreamPosition;
+    long inputLength = input.getLength();
+    int bytesToSearch = (int) Math.min(TIMESTAMP_SEARCH_BYTES, inputLength);
+    long searchStartPosition = inputLength - bytesToSearch;
+    if (input.getPosition() != searchStartPosition) {
+      seekPositionHolder.position = searchStartPosition;
       return Extractor.RESULT_SEEK;
     }
 
     input.resetPeekPosition();
-    input.peekFully(packetBuffer.data, /* offset= */ 0, bytesToRead);
-    packetBuffer.setPosition(0);
-    packetBuffer.setLimit(bytesToRead);
+    input.peekFully(packetBuffer.data, /* offset= */ 0, bytesToSearch);
+    packetBuffer.reset(bytesToSearch);
 
     lastPcrValue = readLastPcrValueFromBuffer(packetBuffer, pcrPid);
     isLastPcrValueRead = true;

From 76eb06d6f2e6cd3fe605878bb3880b87ec1c9c7e Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 14 Nov 2018 06:58:42 -0800
Subject: [PATCH 199/832] Add Timeline to nullness check

This allows client code to run nullability checks.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=221437215
---
 .../google/android/exoplayer2/Timeline.java   | 49 +++++++++++++------
 1 file changed, 33 insertions(+), 16 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java b/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java
index 61a31f7db5..14769a17e5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java
@@ -120,7 +120,7 @@ public abstract class Timeline {
   public static final class Window {
 
     /** A tag for the window. Not necessarily unique. */
-    public @Nullable Object tag;
+    @Nullable public Object tag;
 
     /**
      * The start time of the presentation to which this window belongs in milliseconds since the
@@ -264,14 +264,15 @@ public abstract class Timeline {
   public static final class Period {
 
     /**
-     * An identifier for the period. Not necessarily unique.
+     * An identifier for the period. Not necessarily unique. May be null if the ids of the period
+     * are not required.
      */
-    public Object id;
+    @Nullable public Object id;
 
     /**
-     * A unique identifier for the period.
+     * A unique identifier for the period. May be null if the ids of the period are not required.
      */
-    public Object uid;
+    @Nullable public Object uid;
 
     /**
      * The index of the window to which this period belongs.
@@ -286,11 +287,18 @@ public abstract class Timeline {
     private long positionInWindowUs;
     private AdPlaybackState adPlaybackState;
 
+    /** Creates a new instance with no ad playback state. */
+    public Period() {
+      adPlaybackState = AdPlaybackState.NONE;
+    }
+
     /**
      * Sets the data held by this period.
      *
-     * @param id An identifier for the period. Not necessarily unique.
-     * @param uid A unique identifier for the period.
+     * @param id An identifier for the period. Not necessarily unique. May be null if the ids of the
+     *     period are not required.
+     * @param uid A unique identifier for the period. May be null if the ids of the period are not
+     *     required.
      * @param windowIndex The index of the window to which this period belongs.
      * @param durationUs The duration of this period in microseconds, or {@link C#TIME_UNSET} if
      *     unknown.
@@ -299,7 +307,11 @@ public abstract class Timeline {
      *     period is not within the window.
      * @return This period, for convenience.
      */
-    public Period set(Object id, Object uid, int windowIndex, long durationUs,
+    public Period set(
+        @Nullable Object id,
+        @Nullable Object uid,
+        int windowIndex,
+        long durationUs,
         long positionInWindowUs) {
       return set(id, uid, windowIndex, durationUs, positionInWindowUs, AdPlaybackState.NONE);
     }
@@ -307,8 +319,10 @@ public abstract class Timeline {
     /**
      * Sets the data held by this period.
      *
-     * @param id An identifier for the period. Not necessarily unique.
-     * @param uid A unique identifier for the period.
+     * @param id An identifier for the period. Not necessarily unique. May be null if the ids of the
+     *     period are not required.
+     * @param uid A unique identifier for the period. May be null if the ids of the period are not
+     *     required.
      * @param windowIndex The index of the window to which this period belongs.
      * @param durationUs The duration of this period in microseconds, or {@link C#TIME_UNSET} if
      *     unknown.
@@ -320,8 +334,8 @@ public abstract class Timeline {
      * @return This period, for convenience.
      */
     public Period set(
-        Object id,
-        Object uid,
+        @Nullable Object id,
+        @Nullable Object uid,
         int windowIndex,
         long durationUs,
         long positionInWindowUs,
@@ -704,7 +718,9 @@ public abstract class Timeline {
    */
   public final Pair<Object, Long> getPeriodPosition(
       Window window, Period period, int windowIndex, long windowPositionUs) {
-    return getPeriodPosition(window, period, windowIndex, windowPositionUs, 0);
+    return Assertions.checkNotNull(
+        getPeriodPosition(
+            window, period, windowIndex, windowPositionUs, /* defaultPositionProjectionUs= */ 0));
   }
 
   /**
@@ -721,6 +737,7 @@ public abstract class Timeline {
    *     is {@link C#TIME_UNSET}, {@code defaultPositionProjectionUs} is non-zero, and the window's
    *     position could not be projected by {@code defaultPositionProjectionUs}.
    */
+  @Nullable
   public final Pair<Object, Long> getPeriodPosition(
       Window window,
       Period period,
@@ -743,7 +760,7 @@ public abstract class Timeline {
       periodPositionUs -= periodDurationUs;
       periodDurationUs = getPeriod(++periodIndex, period, /* setIds= */ true).getDurationUs();
     }
-    return Pair.create(period.uid, periodPositionUs);
+    return Pair.create(Assertions.checkNotNull(period.uid), periodPositionUs);
   }
 
   /**
@@ -758,8 +775,8 @@ public abstract class Timeline {
   }
 
   /**
-   * Populates a {@link Period} with data for the period at the specified index. Does not populate
-   * {@link Period#id} and {@link Period#uid}.
+   * Populates a {@link Period} with data for the period at the specified index. {@link Period#id}
+   * and {@link Period#uid} will be set to null.
    *
    * @param periodIndex The index of the period.
    * @param period The {@link Period} to populate. Must not be null.

From 5e6174fe3809684f8749c8bd11b9254b345ea434 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 14 Nov 2018 07:13:10 -0800
Subject: [PATCH 200/832] DASH: Fix detection of end of live events

The remaining work is to split Window.isDynamic so that it's
possible to represent a window that wont be appended to, but
may still be removed from.

Issue: #4780

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=221439220
---
 RELEASENOTES.md                               |  2 +
 .../google/android/exoplayer2/Timeline.java   |  9 ++-
 .../source/dash/DashMediaSource.java          | 25 +++-----
 .../source/dash/DefaultDashChunkSource.java   | 15 ++---
 .../source/dash/PlayerEmsgHandler.java        | 60 ++++---------------
 5 files changed, 34 insertions(+), 77 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index f16ac3ee81..b39c3ca30d 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,6 +2,8 @@
 
 ### dev-v2 (not yet released) ###
 
+* DASH: Fix detecting the end of live events
+  ([#4780](https://github.com/google/ExoPlayer/issues/4780)).
 * Support for playing spherical videos on Daydream.
 * Improve decoder re-use between playbacks. TODO: Write and link a blog post
   here ([#2826](https://github.com/google/ExoPlayer/issues/2826)).
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java b/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java
index 14769a17e5..45cb37e919 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java
@@ -139,9 +139,12 @@ public abstract class Timeline {
      */
     public boolean isSeekable;
 
-    /**
-     * Whether this window may change when the timeline is updated.
-     */
+    // TODO: Split this to better describe which parts of the window might change. For example it
+    // should be possible to individually determine whether the start and end positions of the
+    // window may change relative to the underlying periods. For an example of where it's useful to
+    // know that the end position is fixed whilst the start position may still change, see:
+    // https://github.com/google/ExoPlayer/issues/4780.
+    /** Whether this window may change when the timeline is updated. */
     public boolean isDynamic;
 
     /**
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
index 0c05be873a..8ee859b8bd 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
@@ -376,7 +376,6 @@ public final class DashMediaSource extends BaseMediaSource {
 
   private int staleManifestReloadAttempt;
   private long expiredManifestPublishTimeUs;
-  private boolean dynamicMediaPresentationEnded;
 
   private int firstPeriodId;
 
@@ -679,7 +678,6 @@ public final class DashMediaSource extends BaseMediaSource {
     elapsedRealtimeOffsetMs = 0;
     staleManifestReloadAttempt = 0;
     expiredManifestPublishTimeUs = C.TIME_UNSET;
-    dynamicMediaPresentationEnded = false;
     firstPeriodId = 0;
     periodsById.clear();
   }
@@ -691,10 +689,6 @@ public final class DashMediaSource extends BaseMediaSource {
     startLoadingManifest();
   }
 
-  /* package */ void onDashLiveMediaPresentationEndSignalEncountered() {
-    this.dynamicMediaPresentationEnded = true;
-  }
-
   /* package */ void onDashManifestPublishTimeExpired(long expiredManifestPublishTimeUs) {
     if (this.expiredManifestPublishTimeUs == C.TIME_UNSET
         || this.expiredManifestPublishTimeUs < expiredManifestPublishTimeUs) {
@@ -734,9 +728,8 @@ public final class DashMediaSource extends BaseMediaSource {
         // behind.
         Log.w(TAG, "Loaded out of sync manifest");
         isManifestStale = true;
-      } else if (dynamicMediaPresentationEnded
-          || (expiredManifestPublishTimeUs != C.TIME_UNSET
-              && newManifest.publishTimeMs * 1000 <= expiredManifestPublishTimeUs)) {
+      } else if (expiredManifestPublishTimeUs != C.TIME_UNSET
+          && newManifest.publishTimeMs * 1000 <= expiredManifestPublishTimeUs) {
         // If we receive a dynamic manifest that's older than expected (i.e. its publish time has
         // expired, or it's dynamic and we know the presentation has ended), then this manifest is
         // stale.
@@ -745,8 +738,6 @@ public final class DashMediaSource extends BaseMediaSource {
             "Loaded stale dynamic manifest: "
                 + newManifest.publishTimeMs
                 + ", "
-                + dynamicMediaPresentationEnded
-                + ", "
                 + expiredManifestPublishTimeUs);
         isManifestStale = true;
       }
@@ -763,7 +754,6 @@ public final class DashMediaSource extends BaseMediaSource {
       staleManifestReloadAttempt = 0;
     }
 
-
     manifest = newManifest;
     manifestLoadPending &= manifest.dynamic;
     manifestLoadStartTimestampMs = elapsedRealtimeMs - loadDurationMs;
@@ -1170,12 +1160,16 @@ public final class DashMediaSource extends BaseMediaSource {
       long windowDefaultStartPositionUs = getAdjustedWindowDefaultStartPositionUs(
           defaultPositionProjectionUs);
       Object tag = setTag ? windowTag : null;
+      boolean isDynamic =
+          manifest.dynamic
+              && manifest.minUpdatePeriodMs != C.TIME_UNSET
+              && manifest.durationMs == C.TIME_UNSET;
       return window.set(
           tag,
           presentationStartTimeMs,
           windowStartTimeMs,
           /* isSeekable= */ true,
-          manifest.dynamic,
+          isDynamic,
           windowDefaultStartPositionUs,
           windowDurationUs,
           /* firstPeriodIndex= */ 0,
@@ -1253,11 +1247,6 @@ public final class DashMediaSource extends BaseMediaSource {
     public void onDashManifestPublishTimeExpired(long expiredManifestPublishTimeUs) {
       DashMediaSource.this.onDashManifestPublishTimeExpired(expiredManifestPublishTimeUs);
     }
-
-    @Override
-    public void onDashLiveMediaPresentationEndSignalEncountered() {
-      DashMediaSource.this.onDashLiveMediaPresentationEndSignalEncountered();
-    }
   }
 
   private final class ManifestCallback implements Loader.Callback<ParsingLoadable<DashManifest>> {
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
index d989cdf2f7..33890a6767 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
@@ -318,9 +318,12 @@ public class DefaultDashChunkSource implements DashChunkSource {
       }
     }
 
+    long periodDurationUs = representationHolder.periodDurationUs;
+    boolean periodEnded = periodDurationUs != C.TIME_UNSET;
+
     if (representationHolder.getSegmentCount() == 0) {
       // The index doesn't define any segments.
-      out.endOfStream = !manifest.dynamic || (periodIndex < manifest.getPeriodCount() - 1);
+      out.endOfStream = periodEnded;
       return;
     }
 
@@ -343,17 +346,15 @@ public class DefaultDashChunkSource implements DashChunkSource {
       fatalError = new BehindLiveWindowException();
       return;
     }
+
     if (segmentNum > lastAvailableSegmentNum
         || (missingLastSegment && segmentNum >= lastAvailableSegmentNum)) {
-      // The segment is beyond the end of the period. We know the period will not be extended if the
-      // manifest is static, or if there's a period after this one.
-      out.endOfStream = !manifest.dynamic || (periodIndex < manifest.getPeriodCount() - 1);
+      // The segment is beyond the end of the period.
+      out.endOfStream = periodEnded;
       return;
     }
 
-    long periodDurationUs = representationHolder.periodDurationUs;
-    if (periodDurationUs != C.TIME_UNSET
-        && representationHolder.getSegmentStartTimeUs(segmentNum) >= periodDurationUs) {
+    if (periodEnded && representationHolder.getSegmentStartTimeUs(segmentNum) >= periodDurationUs) {
       // The period duration clips the period to a position before the segment.
       out.endOfStream = true;
       return;
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/PlayerEmsgHandler.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/PlayerEmsgHandler.java
index 46d70ca714..3ab9f470c3 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/PlayerEmsgHandler.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/PlayerEmsgHandler.java
@@ -60,8 +60,7 @@ import java.util.TreeMap;
  */
 public final class PlayerEmsgHandler implements Handler.Callback {
 
-  private static final int EMSG_MEDIA_PRESENTATION_ENDED = 1;
-  private static final int EMSG_MANIFEST_EXPIRED = 2;
+  private static final int EMSG_MANIFEST_EXPIRED = 1;
 
   /** Callbacks for player emsg events encountered during DASH live stream. */
   public interface PlayerEmsgCallback {
@@ -75,9 +74,6 @@ public final class PlayerEmsgHandler implements Handler.Callback {
      * @param expiredManifestPublishTimeUs The manifest publish time that has been expired.
      */
     void onDashManifestPublishTimeExpired(long expiredManifestPublishTimeUs);
-
-    /** Called when a media presentation end signal is encountered during live stream. * */
-    void onDashLiveMediaPresentationEndSignalEncountered();
   }
 
   private final Allocator allocator;
@@ -88,7 +84,6 @@ public final class PlayerEmsgHandler implements Handler.Callback {
 
   private DashManifest manifest;
 
-  private boolean dynamicMediaPresentationEnded;
   private long expiredManifestPublishTimeUs;
   private long lastLoadedChunkEndTimeUs;
   private long lastLoadedChunkEndTimeBeforeRefreshUs;
@@ -134,21 +129,15 @@ public final class PlayerEmsgHandler implements Handler.Callback {
       return true;
     }
     boolean manifestRefreshNeeded = false;
-    if (dynamicMediaPresentationEnded) {
-      // The manifest we have is dynamic, but we know a non-dynamic one representing the final state
-      // should be available.
-      manifestRefreshNeeded = true;
-    } else {
-      // Find the smallest publishTime (greater than or equal to the current manifest's publish
-      // time) that has a corresponding expiry time.
-      Map.Entry<Long, Long> expiredEntry = ceilingExpiryEntryForPublishTime(manifest.publishTimeMs);
-      if (expiredEntry != null) {
-        long expiredPointUs = expiredEntry.getValue();
-        if (expiredPointUs < presentationPositionUs) {
-          expiredManifestPublishTimeUs = expiredEntry.getKey();
-          notifyManifestPublishTimeExpired();
-          manifestRefreshNeeded = true;
-        }
+    // Find the smallest publishTime (greater than or equal to the current manifest's publish time)
+    // that has a corresponding expiry time.
+    Map.Entry<Long, Long> expiredEntry = ceilingExpiryEntryForPublishTime(manifest.publishTimeMs);
+    if (expiredEntry != null) {
+      long expiredPointUs = expiredEntry.getValue();
+      if (expiredPointUs < presentationPositionUs) {
+        expiredManifestPublishTimeUs = expiredEntry.getKey();
+        notifyManifestPublishTimeExpired();
+        manifestRefreshNeeded = true;
       }
     }
     if (manifestRefreshNeeded) {
@@ -221,9 +210,6 @@ public final class PlayerEmsgHandler implements Handler.Callback {
       return true;
     }
     switch (message.what) {
-      case (EMSG_MEDIA_PRESENTATION_ENDED):
-        handleMediaPresentationEndedMessageEncountered();
-        return true;
       case (EMSG_MANIFEST_EXPIRED):
         ManifestExpiryEventInfo messageObj = (ManifestExpiryEventInfo) message.obj;
         handleManifestExpiredMessage(
@@ -248,11 +234,6 @@ public final class PlayerEmsgHandler implements Handler.Callback {
     }
   }
 
-  private void handleMediaPresentationEndedMessageEncountered() {
-    dynamicMediaPresentationEnded = true;
-    notifySourceMediaPresentationEnded();
-  }
-
   private @Nullable Map.Entry<Long, Long> ceilingExpiryEntryForPublishTime(long publishTimeMs) {
     return manifestPublishTimeToExpiryTimeUs.ceilingEntry(publishTimeMs);
   }
@@ -273,10 +254,6 @@ public final class PlayerEmsgHandler implements Handler.Callback {
     playerEmsgCallback.onDashManifestPublishTimeExpired(expiredManifestPublishTimeUs);
   }
 
-  private void notifySourceMediaPresentationEnded() {
-    playerEmsgCallback.onDashLiveMediaPresentationEndSignalEncountered();
-  }
-
   /** Requests DASH media manifest to be refreshed if necessary. */
   private void maybeNotifyDashManifestRefreshNeeded() {
     if (lastLoadedChunkEndTimeBeforeRefreshUs != C.TIME_UNSET
@@ -298,12 +275,6 @@ public final class PlayerEmsgHandler implements Handler.Callback {
     }
   }
 
-  private static boolean isMessageSignalingMediaPresentationEnded(EventMessage eventMessage) {
-    // According to section 4.5.2.1 DASH-IF IOP, if both presentation time delta and event duration
-    // are zero, the media presentation is ended.
-    return eventMessage.presentationTimeUs == 0 && eventMessage.durationMs == 0;
-  }
-
   /** Handles emsg messages for a specific track for the player. */
   public final class PlayerTrackEmsgHandler implements TrackOutput {
 
@@ -413,16 +384,7 @@ public final class PlayerEmsgHandler implements Handler.Callback {
       if (manifestPublishTimeMsInEmsg == C.TIME_UNSET) {
         return;
       }
-
-      if (isMessageSignalingMediaPresentationEnded(eventMessage)) {
-        onMediaPresentationEndedMessageEncountered();
-      } else {
-        onManifestExpiredMessageEncountered(eventTimeUs, manifestPublishTimeMsInEmsg);
-      }
-    }
-
-    private void onMediaPresentationEndedMessageEncountered() {
-      handler.sendMessage(handler.obtainMessage(EMSG_MEDIA_PRESENTATION_ENDED));
+      onManifestExpiredMessageEncountered(eventTimeUs, manifestPublishTimeMsInEmsg);
     }
 
     private void onManifestExpiredMessageEncountered(

From b77109148e500b1d0271aa97dd99fe808fd5474d Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 14 Nov 2018 08:40:42 -0800
Subject: [PATCH 201/832] Workaround for TS seeking

- Increase the search window size to fix TS seeking for problematic
  media we've had provided to us.
- As per my comments on the issue, we should look at doing more here
  to better fix the problem. This will solve the worst of the
  immediate problem, however.
- The memory usage is non-trivial, particularly with the increased
  search window size. I've made the allocations only live whilst
  determining duration and seeking to address this. I've done the same
  for PS just for consistency.

Issue: #5097

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=221449988
---
 RELEASENOTES.md                               |  2 ++
 .../extractor/BinarySearchSeeker.java         |  4 ++++
 .../extractor/ts/PsBinarySearchSeeker.java    | 10 ++++++--
 .../extractor/ts/PsDurationReader.java        |  8 ++++---
 .../extractor/ts/TsBinarySearchSeeker.java    | 12 +++++++---
 .../extractor/ts/TsDurationReader.java        | 10 ++++----
 .../exoplayer2/util/ParsableByteArray.java    | 24 ++++++++++++-------
 .../core/src/test/assets/ts/sample.ts.1.dump  | 18 ++++++++------
 .../core/src/test/assets/ts/sample.ts.2.dump  | 18 ++++++++------
 9 files changed, 72 insertions(+), 34 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index b39c3ca30d..f54fa79605 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -4,6 +4,8 @@
 
 * DASH: Fix detecting the end of live events
   ([#4780](https://github.com/google/ExoPlayer/issues/4780)).
+* Support seeking for a wider range of MPEG-TS streams
+  ([#5097](https://github.com/google/ExoPlayer/issues/5097)).
 * Support for playing spherical videos on Daydream.
 * Improve decoder re-use between playbacks. TODO: Write and link a blog post
   here ([#2826](https://github.com/google/ExoPlayer/issues/2826)).
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java
index e984261145..af40206ede 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java
@@ -58,6 +58,9 @@ public abstract class BinarySearchSeeker {
     TimestampSearchResult searchForTimestamp(
         ExtractorInput input, long targetTimestamp, OutputFrameHolder outputFrameHolder)
         throws IOException, InterruptedException;
+
+    /** Called when a seek operation finishes. */
+    default void onSeekFinished() {}
   }
 
   /**
@@ -256,6 +259,7 @@ public abstract class BinarySearchSeeker {
 
   protected final void markSeekOperationFinished(boolean foundTargetFrame, long resultPosition) {
     seekOperationParams = null;
+    timestampSeeker.onSeekFinished();
     onSeekOperationFinished(foundTargetFrame, resultPosition);
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsBinarySearchSeeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsBinarySearchSeeker.java
index 1180dd486e..4efd38b7eb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsBinarySearchSeeker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsBinarySearchSeeker.java
@@ -20,6 +20,7 @@ import com.google.android.exoplayer2.extractor.BinarySearchSeeker;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.TimestampAdjuster;
+import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
 
 /**
@@ -64,7 +65,7 @@ import java.io.IOException;
 
     private PsScrSeeker(TimestampAdjuster scrTimestampAdjuster) {
       this.scrTimestampAdjuster = scrTimestampAdjuster;
-      packetBuffer = new ParsableByteArray(TIMESTAMP_SEARCH_BYTES);
+      packetBuffer = new ParsableByteArray();
     }
 
     @Override
@@ -74,12 +75,17 @@ import java.io.IOException;
       long inputPosition = input.getPosition();
       int bytesToSearch = (int) Math.min(TIMESTAMP_SEARCH_BYTES, input.getLength() - inputPosition);
 
-      input.peekFully(packetBuffer.data, /* offset= */ 0, bytesToSearch);
       packetBuffer.reset(bytesToSearch);
+      input.peekFully(packetBuffer.data, /* offset= */ 0, bytesToSearch);
 
       return searchForScrValueInBuffer(packetBuffer, targetTimestamp, inputPosition);
     }
 
+    @Override
+    public void onSeekFinished() {
+      packetBuffer.reset(Util.EMPTY_BYTE_ARRAY);
+    }
+
     private TimestampSearchResult searchForScrValueInBuffer(
         ParsableByteArray packetBuffer, long targetScrTimeUs, long bufferStartOffset) {
       int startOfLastPacketPosition = C.POSITION_UNSET;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsDurationReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsDurationReader.java
index 077a35f4a7..b0cdf7eb79 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsDurationReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsDurationReader.java
@@ -21,6 +21,7 @@ import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.extractor.PositionHolder;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.TimestampAdjuster;
+import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
 
 /**
@@ -56,7 +57,7 @@ import java.io.IOException;
     firstScrValue = C.TIME_UNSET;
     lastScrValue = C.TIME_UNSET;
     durationUs = C.TIME_UNSET;
-    packetBuffer = new ParsableByteArray(TIMESTAMP_SEARCH_BYTES);
+    packetBuffer = new ParsableByteArray();
   }
 
   /** Returns true if a PS duration has been read. */
@@ -129,6 +130,7 @@ import java.io.IOException;
   }
 
   private int finishReadDuration(ExtractorInput input) {
+    packetBuffer.reset(Util.EMPTY_BYTE_ARRAY);
     isDurationRead = true;
     input.resetPeekPosition();
     return Extractor.RESULT_CONTINUE;
@@ -143,9 +145,9 @@ import java.io.IOException;
       return Extractor.RESULT_SEEK;
     }
 
+    packetBuffer.reset(bytesToSearch);
     input.resetPeekPosition();
     input.peekFully(packetBuffer.data, /* offset= */ 0, bytesToSearch);
-    packetBuffer.reset(bytesToSearch);
 
     firstScrValue = readFirstScrValueFromBuffer(packetBuffer);
     isFirstScrValueRead = true;
@@ -180,9 +182,9 @@ import java.io.IOException;
       return Extractor.RESULT_SEEK;
     }
 
+    packetBuffer.reset(bytesToSearch);
     input.resetPeekPosition();
     input.peekFully(packetBuffer.data, /* offset= */ 0, bytesToSearch);
-    packetBuffer.reset(bytesToSearch);
 
     lastScrValue = readLastScrValueFromBuffer(packetBuffer);
     isLastScrValueRead = true;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsBinarySearchSeeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsBinarySearchSeeker.java
index e9b051592d..ea2519d2e9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsBinarySearchSeeker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsBinarySearchSeeker.java
@@ -20,6 +20,7 @@ import com.google.android.exoplayer2.extractor.BinarySearchSeeker;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.TimestampAdjuster;
+import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
 
 /**
@@ -34,7 +35,7 @@ import java.io.IOException;
 
   private static final long SEEK_TOLERANCE_US = 100_000;
   private static final int MINIMUM_SEARCH_RANGE_BYTES = 5 * TsExtractor.TS_PACKET_SIZE;
-  private static final int TIMESTAMP_SEARCH_BYTES = 200 * TsExtractor.TS_PACKET_SIZE;
+  private static final int TIMESTAMP_SEARCH_BYTES = 600 * TsExtractor.TS_PACKET_SIZE;
 
   public TsBinarySearchSeeker(
       TimestampAdjuster pcrTimestampAdjuster, long streamDurationUs, long inputLength, int pcrPid) {
@@ -68,7 +69,7 @@ import java.io.IOException;
     public TsPcrSeeker(int pcrPid, TimestampAdjuster pcrTimestampAdjuster) {
       this.pcrPid = pcrPid;
       this.pcrTimestampAdjuster = pcrTimestampAdjuster;
-      packetBuffer = new ParsableByteArray(TIMESTAMP_SEARCH_BYTES);
+      packetBuffer = new ParsableByteArray();
     }
 
     @Override
@@ -78,8 +79,8 @@ import java.io.IOException;
       long inputPosition = input.getPosition();
       int bytesToSearch = (int) Math.min(TIMESTAMP_SEARCH_BYTES, input.getLength() - inputPosition);
 
-      input.peekFully(packetBuffer.data, /* offset= */ 0, bytesToSearch);
       packetBuffer.reset(bytesToSearch);
+      input.peekFully(packetBuffer.data, /* offset= */ 0, bytesToSearch);
 
       return searchForPcrValueInBuffer(packetBuffer, targetTimestamp, inputPosition);
     }
@@ -131,5 +132,10 @@ import java.io.IOException;
         return TimestampSearchResult.NO_TIMESTAMP_IN_RANGE_RESULT;
       }
     }
+
+    @Override
+    public void onSeekFinished() {
+      packetBuffer.reset(Util.EMPTY_BYTE_ARRAY);
+    }
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsDurationReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsDurationReader.java
index 4401083324..804a643414 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsDurationReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsDurationReader.java
@@ -21,6 +21,7 @@ import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.extractor.PositionHolder;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.TimestampAdjuster;
+import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
 
 /**
@@ -35,7 +36,7 @@ import java.io.IOException;
  */
 /* package */ final class TsDurationReader {
 
-  private static final int TIMESTAMP_SEARCH_BYTES = 200 * TsExtractor.TS_PACKET_SIZE;
+  private static final int TIMESTAMP_SEARCH_BYTES = 600 * TsExtractor.TS_PACKET_SIZE;
 
   private final TimestampAdjuster pcrTimestampAdjuster;
   private final ParsableByteArray packetBuffer;
@@ -53,7 +54,7 @@ import java.io.IOException;
     firstPcrValue = C.TIME_UNSET;
     lastPcrValue = C.TIME_UNSET;
     durationUs = C.TIME_UNSET;
-    packetBuffer = new ParsableByteArray(TIMESTAMP_SEARCH_BYTES);
+    packetBuffer = new ParsableByteArray();
   }
 
   /** Returns true if a TS duration has been read. */
@@ -116,6 +117,7 @@ import java.io.IOException;
   }
 
   private int finishReadDuration(ExtractorInput input) {
+    packetBuffer.reset(Util.EMPTY_BYTE_ARRAY);
     isDurationRead = true;
     input.resetPeekPosition();
     return Extractor.RESULT_CONTINUE;
@@ -130,9 +132,9 @@ import java.io.IOException;
       return Extractor.RESULT_SEEK;
     }
 
+    packetBuffer.reset(bytesToSearch);
     input.resetPeekPosition();
     input.peekFully(packetBuffer.data, /* offset= */ 0, bytesToSearch);
-    packetBuffer.reset(bytesToSearch);
 
     firstPcrValue = readFirstPcrValueFromBuffer(packetBuffer, pcrPid);
     isFirstPcrValueRead = true;
@@ -166,9 +168,9 @@ import java.io.IOException;
       return Extractor.RESULT_SEEK;
     }
 
+    packetBuffer.reset(bytesToSearch);
     input.resetPeekPosition();
     input.peekFully(packetBuffer.data, /* offset= */ 0, bytesToSearch);
-    packetBuffer.reset(bytesToSearch);
 
     lastPcrValue = readLastPcrValueFromBuffer(packetBuffer, pcrPid);
     isLastPcrValueRead = true;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java b/library/core/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java
index 464061153f..b928ffc02b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java
@@ -67,6 +67,12 @@ public final class ParsableByteArray {
     this.limit = limit;
   }
 
+  /** Sets the position and limit to zero. */
+  public void reset() {
+    position = 0;
+    limit = 0;
+  }
+
   /**
    * Resets the position to zero and the limit to the specified value. If the limit exceeds the
    * capacity, {@code data} is replaced with a new array of sufficient size.
@@ -77,6 +83,16 @@ public final class ParsableByteArray {
     reset(capacity() < limit ? new byte[limit] : data, limit);
   }
 
+  /**
+   * Updates the instance to wrap {@code data}, and resets the position to zero and the limit to
+   * {@code data.length}.
+   *
+   * @param data The array to wrap.
+   */
+  public void reset(byte[] data) {
+    reset(data, data.length);
+  }
+
   /**
    * Updates the instance to wrap {@code data}, and resets the position to zero.
    *
@@ -89,14 +105,6 @@ public final class ParsableByteArray {
     position = 0;
   }
 
-  /**
-   * Sets the position and limit to zero.
-   */
-  public void reset() {
-    position = 0;
-    limit = 0;
-  }
-
   /**
    * Returns the number of bytes yet to be read.
    */
diff --git a/library/core/src/test/assets/ts/sample.ts.1.dump b/library/core/src/test/assets/ts/sample.ts.1.dump
index 7454a02141..5c361e1246 100644
--- a/library/core/src/test/assets/ts/sample.ts.1.dump
+++ b/library/core/src/test/assets/ts/sample.ts.1.dump
@@ -26,10 +26,14 @@ track 256:
     drmInitData = -
     initializationData:
       data = length 22, hash CE183139
-  total output bytes = 24315
-  sample count = 1
+  total output bytes = 45026
+  sample count = 2
   sample 0:
-    time = 55611
+    time = 55610
+    flags = 1
+    data = length 20711, hash 34341E8
+  sample 1:
+    time = 88977
     flags = 0
     data = length 18112, hash EC44B35B
 track 257:
@@ -57,19 +61,19 @@ track 257:
   total output bytes = 5015
   sample count = 4
   sample 0:
-    time = 11333
+    time = 44699
     flags = 1
     data = length 1253, hash 727FD1C6
   sample 1:
-    time = 37455
+    time = 70821
     flags = 1
     data = length 1254, hash 73FB07B8
   sample 2:
-    time = 63578
+    time = 96944
     flags = 1
     data = length 1254, hash 73FB07B8
   sample 3:
-    time = 89700
+    time = 123066
     flags = 1
     data = length 1254, hash 73FB07B8
 track 8448:
diff --git a/library/core/src/test/assets/ts/sample.ts.2.dump b/library/core/src/test/assets/ts/sample.ts.2.dump
index c7cef05b93..cec91ae2b9 100644
--- a/library/core/src/test/assets/ts/sample.ts.2.dump
+++ b/library/core/src/test/assets/ts/sample.ts.2.dump
@@ -26,10 +26,14 @@ track 256:
     drmInitData = -
     initializationData:
       data = length 22, hash CE183139
-  total output bytes = 24315
-  sample count = 1
+  total output bytes = 45026
+  sample count = 2
   sample 0:
-    time = 77855
+    time = 77854
+    flags = 1
+    data = length 20711, hash 34341E8
+  sample 1:
+    time = 111221
     flags = 0
     data = length 18112, hash EC44B35B
 track 257:
@@ -57,19 +61,19 @@ track 257:
   total output bytes = 5015
   sample count = 4
   sample 0:
-    time = 33577
+    time = 66943
     flags = 1
     data = length 1253, hash 727FD1C6
   sample 1:
-    time = 59699
+    time = 93065
     flags = 1
     data = length 1254, hash 73FB07B8
   sample 2:
-    time = 85822
+    time = 119188
     flags = 1
     data = length 1254, hash 73FB07B8
   sample 3:
-    time = 111944
+    time = 145310
     flags = 1
     data = length 1254, hash 73FB07B8
 track 8448:

From 67b662158ca7de98b4c592c3a4aa427254636ab1 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 15 Nov 2018 06:59:10 -0800
Subject: [PATCH 202/832] Add binarySearchCeil method for integers

This matches the binarySearchFloor method overload.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=221617114
---
 .../google/android/exoplayer2/util/Util.java  | 43 ++++++++++++++++---
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
index 410e1c174c..8b1760b54a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
@@ -638,7 +638,7 @@ public final class Util {
     if (index < 0) {
       index = -(index + 2);
     } else {
-      while ((--index) >= 0 && array[index] == value) {}
+      while (--index >= 0 && array[index] == value) {}
       if (inclusive) {
         index++;
       }
@@ -670,7 +670,7 @@ public final class Util {
     if (index < 0) {
       index = -(index + 2);
     } else {
-      while ((--index) >= 0 && array[index] == value) {}
+      while (--index >= 0 && array[index] == value) {}
       if (inclusive) {
         index++;
       }
@@ -706,7 +706,7 @@ public final class Util {
     if (index < 0) {
       index = -(index + 2);
     } else {
-      while ((--index) >= 0 && list.get(index).compareTo(value) == 0) {}
+      while (--index >= 0 && list.get(index).compareTo(value) == 0) {}
       if (inclusive) {
         index++;
       }
@@ -714,6 +714,39 @@ public final class Util {
     return stayInBounds ? Math.max(0, index) : index;
   }
 
+  /**
+   * Returns the index of the smallest element in {@code array} that is greater than (or optionally
+   * equal to) a specified {@code value}.
+   *
+   * <p>The search is performed using a binary search algorithm, so the array must be sorted. If the
+   * array contains multiple elements equal to {@code value} and {@code inclusive} is true, the
+   * index of the last one will be returned.
+   *
+   * @param array The array to search.
+   * @param value The value being searched for.
+   * @param inclusive If the value is present in the array, whether to return the corresponding
+   *     index. If false then the returned index corresponds to the smallest element strictly
+   *     greater than the value.
+   * @param stayInBounds If true, then {@code (a.length - 1)} will be returned in the case that the
+   *     value is greater than the largest element in the array. If false then {@code a.length} will
+   *     be returned.
+   * @return The index of the smallest element in {@code array} that is greater than (or optionally
+   *     equal to) {@code value}.
+   */
+  public static int binarySearchCeil(
+      int[] array, int value, boolean inclusive, boolean stayInBounds) {
+    int index = Arrays.binarySearch(array, value);
+    if (index < 0) {
+      index = ~index;
+    } else {
+      while (++index < array.length && array[index] == value) {}
+      if (inclusive) {
+        index--;
+      }
+    }
+    return stayInBounds ? Math.min(array.length - 1, index) : index;
+  }
+
   /**
    * Returns the index of the smallest element in {@code array} that is greater than (or optionally
    * equal to) a specified {@code value}.
@@ -739,7 +772,7 @@ public final class Util {
     if (index < 0) {
       index = ~index;
     } else {
-      while ((++index) < array.length && array[index] == value) {}
+      while (++index < array.length && array[index] == value) {}
       if (inclusive) {
         index--;
       }
@@ -777,7 +810,7 @@ public final class Util {
       index = ~index;
     } else {
       int listSize = list.size();
-      while ((++index) < listSize && list.get(index).compareTo(value) == 0) {}
+      while (++index < listSize && list.get(index).compareTo(value) == 0) {}
       if (inclusive) {
         index--;
       }

From 7cf62a03f0f2d8fc7c2f83a69c3d81125dbec185 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 15 Nov 2018 09:40:33 -0800
Subject: [PATCH 203/832] Ensure DefaultLoadControl.Builder is single-use.

This is needed because the allocator can't be reused for example.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=221638233
---
 .../android/exoplayer2/DefaultLoadControl.java     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java b/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
index 97a56b844c..032b932191 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
@@ -79,6 +79,7 @@ public class DefaultLoadControl implements LoadControl {
     private PriorityTaskManager priorityTaskManager;
     private int backBufferDurationMs;
     private boolean retainBackBufferFromKeyframe;
+    private boolean createDefaultLoadControlCalled;
 
     /** Constructs a new instance. */
     public Builder() {
@@ -99,8 +100,10 @@ public class DefaultLoadControl implements LoadControl {
      *
      * @param allocator The {@link DefaultAllocator}.
      * @return This builder, for convenience.
+     * @throws IllegalStateException If {@link #createDefaultLoadControl()} has already been called.
      */
     public Builder setAllocator(DefaultAllocator allocator) {
+      Assertions.checkState(!createDefaultLoadControlCalled);
       this.allocator = allocator;
       return this;
     }
@@ -118,12 +121,14 @@ public class DefaultLoadControl implements LoadControl {
      *     for playback to resume after a rebuffer, in milliseconds. A rebuffer is defined to be
      *     caused by buffer depletion rather than a user action.
      * @return This builder, for convenience.
+     * @throws IllegalStateException If {@link #createDefaultLoadControl()} has already been called.
      */
     public Builder setBufferDurationsMs(
         int minBufferMs,
         int maxBufferMs,
         int bufferForPlaybackMs,
         int bufferForPlaybackAfterRebufferMs) {
+      Assertions.checkState(!createDefaultLoadControlCalled);
       this.minBufferMs = minBufferMs;
       this.maxBufferMs = maxBufferMs;
       this.bufferForPlaybackMs = bufferForPlaybackMs;
@@ -137,8 +142,10 @@ public class DefaultLoadControl implements LoadControl {
      *
      * @param targetBufferBytes The target buffer size in bytes.
      * @return This builder, for convenience.
+     * @throws IllegalStateException If {@link #createDefaultLoadControl()} has already been called.
      */
     public Builder setTargetBufferBytes(int targetBufferBytes) {
+      Assertions.checkState(!createDefaultLoadControlCalled);
       this.targetBufferBytes = targetBufferBytes;
       return this;
     }
@@ -150,8 +157,10 @@ public class DefaultLoadControl implements LoadControl {
      * @param prioritizeTimeOverSizeThresholds Whether the load control prioritizes buffer time
      *     constraints over buffer size constraints.
      * @return This builder, for convenience.
+     * @throws IllegalStateException If {@link #createDefaultLoadControl()} has already been called.
      */
     public Builder setPrioritizeTimeOverSizeThresholds(boolean prioritizeTimeOverSizeThresholds) {
+      Assertions.checkState(!createDefaultLoadControlCalled);
       this.prioritizeTimeOverSizeThresholds = prioritizeTimeOverSizeThresholds;
       return this;
     }
@@ -161,8 +170,10 @@ public class DefaultLoadControl implements LoadControl {
      *
      * @param priorityTaskManager The {@link PriorityTaskManager} to use.
      * @return This builder, for convenience.
+     * @throws IllegalStateException If {@link #createDefaultLoadControl()} has already been called.
      */
     public Builder setPriorityTaskManager(PriorityTaskManager priorityTaskManager) {
+      Assertions.checkState(!createDefaultLoadControlCalled);
       this.priorityTaskManager = priorityTaskManager;
       return this;
     }
@@ -175,8 +186,10 @@ public class DefaultLoadControl implements LoadControl {
      * @param retainBackBufferFromKeyframe Whether the back buffer is retained from the previous
      *     keyframe.
      * @return This builder, for convenience.
+     * @throws IllegalStateException If {@link #createDefaultLoadControl()} has already been called.
      */
     public Builder setBackBuffer(int backBufferDurationMs, boolean retainBackBufferFromKeyframe) {
+      Assertions.checkState(!createDefaultLoadControlCalled);
       this.backBufferDurationMs = backBufferDurationMs;
       this.retainBackBufferFromKeyframe = retainBackBufferFromKeyframe;
       return this;
@@ -184,6 +197,7 @@ public class DefaultLoadControl implements LoadControl {
 
     /** Creates a {@link DefaultLoadControl}. */
     public DefaultLoadControl createDefaultLoadControl() {
+      createDefaultLoadControlCalled = true;
       if (allocator == null) {
         allocator = new DefaultAllocator(true, C.DEFAULT_BUFFER_SEGMENT_SIZE);
       }

From 9dd814fcfe96c61c18c8a292478a141e5f27b6c4 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 15 Nov 2018 09:46:19 -0800
Subject: [PATCH 204/832] Improve DefaultLoadControl.shouldContinueLoading for
 the minBuffer=maxBuffer case.

Currently no path may be chosen if
minBufferUs == maxBufferUs == bufferedDurationUs.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=221639199
---
 .../android/exoplayer2/DefaultLoadControl.java       |  2 +-
 .../android/exoplayer2/DefaultLoadControlTest.java   | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java b/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
index 032b932191..c109ed81c1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
@@ -385,7 +385,7 @@ public class DefaultLoadControl implements LoadControl {
     }
     if (bufferedDurationUs < minBufferUs) {
       isBuffering = prioritizeTimeOverSizeThresholds || !targetBufferSizeReached;
-    } else if (bufferedDurationUs > maxBufferUs || targetBufferSizeReached) {
+    } else if (bufferedDurationUs >= maxBufferUs || targetBufferSizeReached) {
       isBuffering = false;
     } // Else don't change the buffering state
     if (priorityTaskManager != null && isBuffering != wasBuffering) {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/DefaultLoadControlTest.java b/library/core/src/test/java/com/google/android/exoplayer2/DefaultLoadControlTest.java
index b066cc263a..93ec5e0264 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/DefaultLoadControlTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/DefaultLoadControlTest.java
@@ -48,15 +48,15 @@ public class DefaultLoadControlTest {
     createDefaultLoadControl();
     assertThat(loadControl.shouldContinueLoading(/* bufferedDurationUs= */ 0, SPEED)).isTrue();
     assertThat(loadControl.shouldContinueLoading(MIN_BUFFER_US, SPEED)).isTrue();
-    assertThat(loadControl.shouldContinueLoading(MAX_BUFFER_US, SPEED)).isTrue();
-    assertThat(loadControl.shouldContinueLoading(MAX_BUFFER_US + 1, SPEED)).isFalse();
+    assertThat(loadControl.shouldContinueLoading(MAX_BUFFER_US - 1, SPEED)).isTrue();
+    assertThat(loadControl.shouldContinueLoading(MAX_BUFFER_US, SPEED)).isFalse();
   }
 
   @Test
   public void testShouldNotContinueLoadingOnceBufferingStopped_untilBelowMinBuffer() {
     createDefaultLoadControl();
-    assertThat(loadControl.shouldContinueLoading(MAX_BUFFER_US + 1, SPEED)).isFalse();
     assertThat(loadControl.shouldContinueLoading(MAX_BUFFER_US, SPEED)).isFalse();
+    assertThat(loadControl.shouldContinueLoading(MAX_BUFFER_US - 1, SPEED)).isFalse();
     assertThat(loadControl.shouldContinueLoading(MIN_BUFFER_US, SPEED)).isFalse();
     assertThat(loadControl.shouldContinueLoading(MIN_BUFFER_US - 1, SPEED)).isTrue();
   }
@@ -69,7 +69,7 @@ public class DefaultLoadControlTest {
     assertThat(loadControl.shouldContinueLoading(/* bufferedDurationUs= */ 0, SPEED)).isTrue();
     assertThat(loadControl.shouldContinueLoading(MIN_BUFFER_US - 1, SPEED)).isTrue();
     assertThat(loadControl.shouldContinueLoading(MIN_BUFFER_US, SPEED)).isFalse();
-    assertThat(loadControl.shouldContinueLoading(MAX_BUFFER_US + 1, SPEED)).isFalse();
+    assertThat(loadControl.shouldContinueLoading(MAX_BUFFER_US, SPEED)).isFalse();
   }
 
   @Test
@@ -82,7 +82,7 @@ public class DefaultLoadControlTest {
 
     assertThat(loadControl.shouldContinueLoading(/* bufferedDurationUs= */ 0, SPEED)).isFalse();
     assertThat(loadControl.shouldContinueLoading(MIN_BUFFER_US, SPEED)).isFalse();
-    assertThat(loadControl.shouldContinueLoading(MAX_BUFFER_US + 1, SPEED)).isFalse();
+    assertThat(loadControl.shouldContinueLoading(MAX_BUFFER_US, SPEED)).isFalse();
   }
 
   @Test
@@ -100,7 +100,7 @@ public class DefaultLoadControlTest {
   public void testShouldNotContinueLoadingWithMaxBufferReached_inFastPlayback() {
     createDefaultLoadControl();
 
-    assertThat(loadControl.shouldContinueLoading(MAX_BUFFER_US + 1, /* playbackSpeed= */ 100f))
+    assertThat(loadControl.shouldContinueLoading(MAX_BUFFER_US, /* playbackSpeed= */ 100f))
         .isFalse();
   }
 

From c096e156b1c167e615f717e790682c6817995853 Mon Sep 17 00:00:00 2001
From: mdoucleff <mdoucleff@google.com>
Date: Fri, 16 Nov 2018 15:47:03 -0800
Subject: [PATCH 205/832] Interpret single-item audio stream edit lists as
 audio padding specification.  Use the information to strip out padding from
 decoded audio streams.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=221865861
---
 .../extractor/mp4/FragmentedMp4Extractor.java | 22 ++++++++++++++-----
 .../exoplayer2/extractor/mp4/Track.java       | 14 ++++++++++++
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
index 0f1fd8f649..72bcaa9fe2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
@@ -53,10 +53,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 
-/**
- * Extracts data from the FMP4 container format.
- */
-public final class FragmentedMp4Extractor implements Extractor {
+/** Extracts data from the FMP4 container format. */
+public class FragmentedMp4Extractor implements Extractor {
 
   /** Factory for {@link FragmentedMp4Extractor} instances. */
   public static final ExtractorsFactory FACTORY =
@@ -486,8 +484,15 @@ public final class FragmentedMp4Extractor implements Extractor {
     for (int i = 0; i < moovContainerChildrenSize; i++) {
       Atom.ContainerAtom atom = moov.containerChildren.get(i);
       if (atom.type == Atom.TYPE_trak) {
-        Track track = AtomParsers.parseTrak(atom, moov.getLeafAtomOfType(Atom.TYPE_mvhd), duration,
-            drmInitData, (flags & FLAG_WORKAROUND_IGNORE_EDIT_LISTS) != 0, false);
+        Track track =
+            modifyTrack(
+                AtomParsers.parseTrak(
+                    atom,
+                    moov.getLeafAtomOfType(Atom.TYPE_mvhd),
+                    duration,
+                    drmInitData,
+                    (flags & FLAG_WORKAROUND_IGNORE_EDIT_LISTS) != 0,
+                    false));
         if (track != null) {
           tracks.put(track.id, track);
         }
@@ -517,6 +522,11 @@ public final class FragmentedMp4Extractor implements Extractor {
     }
   }
 
+  @Nullable
+  protected Track modifyTrack(@Nullable Track track) {
+    return track;
+  }
+
   private DefaultSampleValues getDefaultSampleValues(
       SparseArray<DefaultSampleValues> defaultSampleValuesArray, int trackId) {
     if (defaultSampleValuesArray.size() == 1) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java
index 59cd602209..b4a7b278cf 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java
@@ -128,4 +128,18 @@ public final class Track {
         : sampleDescriptionEncryptionBoxes[sampleDescriptionIndex];
   }
 
+  public Track copyWithFormat(Format format) {
+    return new Track(
+        id,
+        type,
+        timescale,
+        movieTimescale,
+        durationUs,
+        format,
+        sampleTransformation,
+        sampleDescriptionEncryptionBoxes,
+        nalUnitLengthFieldLength,
+        editListDurations,
+        editListMediaTimes);
+  }
 }

From f48ad85b196a9adab622bd4185d5073c01416cd9 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Mon, 19 Nov 2018 06:18:55 -0800
Subject: [PATCH 206/832] Add experiment to use WindowedTrackBitrateEstimator

WindowedTrackBitrateEstimator, uses future and past chunks in a window
of time to estimate track bitrate values.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=222065409
---
 .../WindowedTrackBitrateEstimator.java        | 21 ++++++++++---------
 .../WindowedTrackBitrateEstimatorTest.java    | 16 +++++++-------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimator.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimator.java
index 960b22e83b..0def71c800 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimator.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimator.java
@@ -17,6 +17,7 @@
 package com.google.android.exoplayer2.trackselection;
 
 import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.chunk.MediaChunk;
 import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
@@ -25,22 +26,22 @@ import java.util.List;
 /** A {@link TrackBitrateEstimator} which derives estimates from a window of time. */
 public final class WindowedTrackBitrateEstimator implements TrackBitrateEstimator {
 
-  private final long maxFutureDurationUs;
   private final long maxPastDurationUs;
+  private final long maxFutureDurationUs;
   private final boolean useFormatBitrateAsLowerBound;
 
   /**
-   * @param maxFutureDurationUs Maximum duration of future chunks to be included in average bitrate
-   *     values, in microseconds.
-   * @param maxPastDurationUs Maximum duration of past chunks to be included in average bitrate
-   *     values, in microseconds.
-   * @param useFormatBitrateAsLowerBound Whether to return the estimated bitrate only if it's higher
-   *     than the bitrate of the track's format.
+   * @param maxPastDurationMs Maximum duration of past chunks to be included in average bitrate
+   *     values, in milliseconds.
+   * @param maxFutureDurationMs Maximum duration of future chunks to be included in average bitrate
+   *     values, in milliseconds.
+   * @param useFormatBitrateAsLowerBound Whether to use the bitrate of the track's format as a lower
+   *     bound for the estimated bitrate.
    */
   public WindowedTrackBitrateEstimator(
-      long maxFutureDurationUs, long maxPastDurationUs, boolean useFormatBitrateAsLowerBound) {
-    this.maxFutureDurationUs = maxFutureDurationUs;
-    this.maxPastDurationUs = maxPastDurationUs;
+      long maxPastDurationMs, long maxFutureDurationMs, boolean useFormatBitrateAsLowerBound) {
+    this.maxPastDurationUs = C.msToUs(maxPastDurationMs);
+    this.maxFutureDurationUs = C.msToUs(maxFutureDurationMs);
     this.useFormatBitrateAsLowerBound = useFormatBitrateAsLowerBound;
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimatorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimatorTest.java
index 59c5092fc0..52b52e1df4 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimatorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimatorTest.java
@@ -35,14 +35,14 @@ import org.robolectric.RobolectricTestRunner;
 @RunWith(RobolectricTestRunner.class)
 public class WindowedTrackBitrateEstimatorTest {
 
-  private static final long MAX_DURATION_US = 30 * C.MICROS_PER_SECOND;
+  private static final long MAX_DURATION_MS = 30_000;
 
   @Test
   public void getBitrates_zeroMaxDuration_returnsFormatBitrates() {
     WindowedTrackBitrateEstimator estimator =
         new WindowedTrackBitrateEstimator(
-            /* maxFutureDurationUs= */ 0,
-            /* maxPastDurationUs= */ 0,
+            /* maxPastDurationMs= */ 0,
+            /* maxFutureDurationMs= */ 0,
             /* useFormatBitrateAsLowerBound= */ false);
     MediaChunk chunk = createMediaChunk(/* formatBitrate= */ 5, /* actualBitrate= */ 10);
     MediaChunkIterator iterator1 = createMediaChunkIteratorWithBitrate(8);
@@ -64,7 +64,7 @@ public class WindowedTrackBitrateEstimatorTest {
   public void getBitrates_futureMaxDurationSet_returnsEstimateUsingFutureChunks() {
     WindowedTrackBitrateEstimator estimator =
         new WindowedTrackBitrateEstimator(
-            MAX_DURATION_US, /* maxPastDurationUs= */ 0, /* useFormatBitrateAsLowerBound= */ false);
+            /* maxPastDurationMs= */ 0, MAX_DURATION_MS, /* useFormatBitrateAsLowerBound= */ false);
     MediaChunk chunk = createMediaChunk(/* formatBitrate= */ 5, /* actualBitrate= */ 10);
     MediaChunkIterator iterator1 = createMediaChunkIteratorWithBitrate(8);
     MediaChunkIterator iterator2 = createMediaChunkIteratorWithBitrate(16);
@@ -85,8 +85,8 @@ public class WindowedTrackBitrateEstimatorTest {
   public void getBitrates_pastMaxDurationSet_returnsEstimateUsingPastChunks() {
     WindowedTrackBitrateEstimator estimator =
         new WindowedTrackBitrateEstimator(
-            /* maxFutureDurationUs= */ 0,
-            MAX_DURATION_US,
+            MAX_DURATION_MS,
+            /* maxFutureDurationMs= */ 0,
             /* useFormatBitrateAsLowerBound= */ false);
     MediaChunk chunk = createMediaChunk(/* formatBitrate= */ 5, /* actualBitrate= */ 10);
     MediaChunkIterator iterator1 = createMediaChunkIteratorWithBitrate(8);
@@ -109,7 +109,7 @@ public class WindowedTrackBitrateEstimatorTest {
       getBitrates_useFormatBitrateAsLowerBoundSetTrue_returnsEstimateIfOnlyHigherThanFormat() {
     WindowedTrackBitrateEstimator estimator =
         new WindowedTrackBitrateEstimator(
-            MAX_DURATION_US, MAX_DURATION_US, /* useFormatBitrateAsLowerBound= */ true);
+            MAX_DURATION_MS, MAX_DURATION_MS, /* useFormatBitrateAsLowerBound= */ true);
     MediaChunk chunk = createMediaChunk(/* formatBitrate= */ 5, /* actualBitrate= */ 10);
     MediaChunkIterator iterator1 = createMediaChunkIteratorWithBitrate(80);
     MediaChunkIterator iterator2 = createMediaChunkIteratorWithBitrate(16);
@@ -130,7 +130,7 @@ public class WindowedTrackBitrateEstimatorTest {
   public void getBitrates_bitratesArrayGiven_returnsTheSameArray() {
     WindowedTrackBitrateEstimator estimator =
         new WindowedTrackBitrateEstimator(
-            MAX_DURATION_US, MAX_DURATION_US, /* useFormatBitrateAsLowerBound= */ true);
+            MAX_DURATION_MS, MAX_DURATION_MS, /* useFormatBitrateAsLowerBound= */ true);
     MediaChunk chunk = createMediaChunk(/* formatBitrate= */ 5, /* actualBitrate= */ 10);
     MediaChunkIterator iterator1 = createMediaChunkIteratorWithBitrate(8);
     MediaChunkIterator iterator2 = createMediaChunkIteratorWithBitrate(16);

From a3c046983765b26688e8ac0e24a1539172594f7a Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 19 Nov 2018 09:23:11 -0800
Subject: [PATCH 207/832] Update IMA SDK and Play Services Ads versions

Since version 17.0 play-services-ads requires specifying AD_MANAGER_APP=true in
AndroidManifest.xml, so add this in the IMA extension's manifest. See also
https://developers.google.com/ad-manager/mobile-ads-sdk/android/quick-start.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=222087771
---
 extensions/ima/build.gradle                 | 6 +++---
 extensions/ima/src/main/AndroidManifest.xml | 8 ++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle
index 7fc7935cac..22196ff3ab 100644
--- a/extensions/ima/build.gradle
+++ b/extensions/ima/build.gradle
@@ -31,13 +31,13 @@ android {
 }
 
 dependencies {
-    api 'com.google.ads.interactivemedia.v3:interactivemedia:3.9.4'
+    api 'com.google.ads.interactivemedia.v3:interactivemedia:3.10.2'
     implementation project(modulePrefix + 'library-core')
-    implementation 'com.google.android.gms:play-services-ads:15.0.1'
+    implementation 'com.google.android.gms:play-services-ads:17.1.1'
     // These dependencies are necessary to force the supportLibraryVersion of
     // com.android.support:support-v4 and com.android.support:customtabs to be
     // used. Else older versions are used, for example via:
-    // com.google.android.gms:play-services-ads:15.0.1
+    // com.google.android.gms:play-services-ads:17.1.1
     // |-- com.android.support:customtabs:26.1.0
     implementation 'com.android.support:support-v4:' + supportLibraryVersion
     implementation 'com.android.support:customtabs:' + supportLibraryVersion
diff --git a/extensions/ima/src/main/AndroidManifest.xml b/extensions/ima/src/main/AndroidManifest.xml
index 1bb79ff21d..226b15cb34 100644
--- a/extensions/ima/src/main/AndroidManifest.xml
+++ b/extensions/ima/src/main/AndroidManifest.xml
@@ -15,6 +15,10 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer2.ext.ima">
-  <meta-data android:name="com.google.android.gms.version"
-      android:value="@integer/google_play_services_version"/>
+  <application>
+    <meta-data android:name="com.google.android.gms.ads.AD_MANAGER_APP"
+        android:value="true"/>
+    <meta-data android:name="com.google.android.gms.version"
+        android:value="@integer/google_play_services_version"/>
+  </application>
 </manifest>

From edff52ba5f5dad51a868ea57011a22f1ce47528d Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 20 Nov 2018 03:36:02 -0800
Subject: [PATCH 208/832] Add buffer size based adaptive track selection.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=222221294
---
 .../exoplayer2/DefaultLoadControl.java        |   3 +-
 .../exoplayer2/ExoPlayerImplInternal.java     |  17 +
 .../BufferSizeAdaptationBuilder.java          | 499 ++++++++++++++++++
 .../trackselection/TrackSelection.java        |   7 +
 4 files changed, 525 insertions(+), 1 deletion(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java b/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
index c109ed81c1..f076043678 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
@@ -197,9 +197,10 @@ public class DefaultLoadControl implements LoadControl {
 
     /** Creates a {@link DefaultLoadControl}. */
     public DefaultLoadControl createDefaultLoadControl() {
+      Assertions.checkState(!createDefaultLoadControlCalled);
       createDefaultLoadControlCalled = true;
       if (allocator == null) {
-        allocator = new DefaultAllocator(true, C.DEFAULT_BUFFER_SEGMENT_SIZE);
+        allocator = new DefaultAllocator(/* trimOnReset= */ true, C.DEFAULT_BUFFER_SEGMENT_SIZE);
       }
       return new DefaultLoadControl(
           allocator,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index 08e1cbfe2b..2a161b79bd 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -774,6 +774,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
     for (Renderer renderer : enabledRenderers) {
       renderer.resetPosition(rendererPositionUs);
     }
+    notifyTrackSelectionDiscontinuity();
   }
 
   private void setPlaybackParametersInternal(PlaybackParameters playbackParameters) {
@@ -1172,6 +1173,22 @@ import java.util.concurrent.atomic.AtomicBoolean;
     }
   }
 
+  private void notifyTrackSelectionDiscontinuity() {
+    MediaPeriodHolder periodHolder = queue.getFrontPeriod();
+    while (periodHolder != null) {
+      TrackSelectorResult trackSelectorResult = periodHolder.getTrackSelectorResult();
+      if (trackSelectorResult != null) {
+        TrackSelection[] trackSelections = trackSelectorResult.selections.getAll();
+        for (TrackSelection trackSelection : trackSelections) {
+          if (trackSelection != null) {
+            trackSelection.onDiscontinuity();
+          }
+        }
+      }
+      periodHolder = periodHolder.getNext();
+    }
+  }
+
   private boolean shouldTransitionToReadyState(boolean renderersReadyOrEnded) {
     if (enabledRenderers.length == 0) {
       // If there are no enabled renderers, determine whether we're ready based on the timeline.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java
new file mode 100644
index 0000000000..6239dd04ad
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java
@@ -0,0 +1,499 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.trackselection;
+
+import android.support.annotation.Nullable;
+import android.util.Pair;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.DefaultLoadControl;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.LoadControl;
+import com.google.android.exoplayer2.source.TrackGroup;
+import com.google.android.exoplayer2.source.chunk.MediaChunk;
+import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
+import com.google.android.exoplayer2.upstream.BandwidthMeter;
+import com.google.android.exoplayer2.upstream.DefaultAllocator;
+import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.Clock;
+import com.google.android.exoplayer2.util.PriorityTaskManager;
+import java.util.List;
+
+/**
+ * Builder for a {@link TrackSelection.Factory} and {@link LoadControl} that implement buffer size
+ * based track adaptation.
+ */
+public final class BufferSizeAdaptationBuilder {
+
+  /** Dynamic filter for formats, which is applied when selecting a new track. */
+  public interface DynamicFormatFilter {
+
+    /** Filter which allows all formats. */
+    DynamicFormatFilter NO_FILTER = (format, trackBitrate) -> true;
+
+    /**
+     * Called when updating the selected track to determine whether a candidate track is allowed. If
+     * no format is allowed or eligible, the lowest quality format will be used.
+     *
+     * @param format The {@link Format} of the candidate track.
+     * @param trackBitrate The estimated bitrate of the track. May differ from {@link
+     *     Format#bitrate} if a more accurate estimate of the current track bitrate is available.
+     */
+    boolean isFormatAllowed(Format format, int trackBitrate);
+  }
+
+  /**
+   * The default minimum duration of media that the player will attempt to ensure is buffered at all
+   * times, in milliseconds.
+   */
+  public static final int DEFAULT_MIN_BUFFER_MS = 15000;
+
+  /**
+   * The default maximum duration of media that the player will attempt to buffer, in milliseconds.
+   */
+  public static final int DEFAULT_MAX_BUFFER_MS = 50000;
+
+  /**
+   * The default duration of media that must be buffered for playback to start or resume following a
+   * user action such as a seek, in milliseconds.
+   */
+  public static final int DEFAULT_BUFFER_FOR_PLAYBACK_MS =
+      DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_MS;
+
+  /**
+   * The default duration of media that must be buffered for playback to resume after a rebuffer, in
+   * milliseconds. A rebuffer is defined to be caused by buffer depletion rather than a user action.
+   */
+  public static final int DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS =
+      DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS;
+
+  /**
+   * The default offset the current duration of buffered media must deviate from the ideal duration
+   * of buffered media for the currently selected format, before the selected format is changed.
+   */
+  public static final int DEFAULT_HYSTERESIS_BUFFER_MS = 5000;
+
+  /**
+   * During start-up phase, the default fraction of the available bandwidth that the selection
+   * should consider available for use. Setting to a value less than 1 is recommended to account for
+   * inaccuracies in the bandwidth estimator.
+   */
+  public static final float DEFAULT_START_UP_BANDWIDTH_FRACTION =
+      AdaptiveTrackSelection.DEFAULT_BANDWIDTH_FRACTION;
+
+  /**
+   * During start-up phase, the default minimum duration of buffered media required for the selected
+   * track to switch to one of higher quality based on measured bandwidth.
+   */
+  public static final int DEFAULT_START_UP_MIN_BUFFER_FOR_QUALITY_INCREASE_MS =
+      AdaptiveTrackSelection.DEFAULT_MIN_DURATION_FOR_QUALITY_INCREASE_MS;
+
+  @Nullable private DefaultAllocator allocator;
+  private Clock clock;
+  private int minBufferMs;
+  private int maxBufferMs;
+  private int bufferForPlaybackMs;
+  private int bufferForPlaybackAfterRebufferMs;
+  private int hysteresisBufferMs;
+  private float startUpBandwidthFraction;
+  private int startUpMinBufferForQualityIncreaseMs;
+  @Nullable private PriorityTaskManager priorityTaskManager;
+  private DynamicFormatFilter dynamicFormatFilter;
+  boolean buildCalled;
+
+  /** Creates builder with default values. */
+  public BufferSizeAdaptationBuilder() {
+    clock = Clock.DEFAULT;
+    minBufferMs = DEFAULT_MIN_BUFFER_MS;
+    maxBufferMs = DEFAULT_MAX_BUFFER_MS;
+    bufferForPlaybackMs = DEFAULT_BUFFER_FOR_PLAYBACK_MS;
+    bufferForPlaybackAfterRebufferMs = DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS;
+    hysteresisBufferMs = DEFAULT_HYSTERESIS_BUFFER_MS;
+    startUpBandwidthFraction = DEFAULT_START_UP_BANDWIDTH_FRACTION;
+    startUpMinBufferForQualityIncreaseMs = DEFAULT_START_UP_MIN_BUFFER_FOR_QUALITY_INCREASE_MS;
+    dynamicFormatFilter = DynamicFormatFilter.NO_FILTER;
+  }
+
+  /**
+   * Set the clock to use. Should only be set for testing purposes.
+   *
+   * @param clock The {@link Clock}.
+   * @return This builder, for convenience.
+   * @throws IllegalStateException If {@link #buildPlayerComponents()} has already been called.
+   */
+  public BufferSizeAdaptationBuilder setClock(Clock clock) {
+    Assertions.checkState(!buildCalled);
+    this.clock = clock;
+    return this;
+  }
+
+  /**
+   * Sets the {@link DefaultAllocator} used by the loader.
+   *
+   * @param allocator The {@link DefaultAllocator}.
+   * @return This builder, for convenience.
+   * @throws IllegalStateException If {@link #buildPlayerComponents()} has already been called.
+   */
+  public BufferSizeAdaptationBuilder setAllocator(DefaultAllocator allocator) {
+    Assertions.checkState(!buildCalled);
+    this.allocator = allocator;
+    return this;
+  }
+
+  /**
+   * Sets the buffer duration parameters.
+   *
+   * @param minBufferMs The minimum duration of media that the player will attempt to ensure is
+   *     buffered at all times, in milliseconds.
+   * @param maxBufferMs The maximum duration of media that the player will attempt to buffer, in
+   *     milliseconds.
+   * @param bufferForPlaybackMs The duration of media that must be buffered for playback to start or
+   *     resume following a user action such as a seek, in milliseconds.
+   * @param bufferForPlaybackAfterRebufferMs The default duration of media that must be buffered for
+   *     playback to resume after a rebuffer, in milliseconds. A rebuffer is defined to be caused by
+   *     buffer depletion rather than a user action.
+   * @return This builder, for convenience.
+   * @throws IllegalStateException If {@link #buildPlayerComponents()} has already been called.
+   */
+  public BufferSizeAdaptationBuilder setBufferDurationsMs(
+      int minBufferMs,
+      int maxBufferMs,
+      int bufferForPlaybackMs,
+      int bufferForPlaybackAfterRebufferMs) {
+    Assertions.checkState(!buildCalled);
+    this.minBufferMs = minBufferMs;
+    this.maxBufferMs = maxBufferMs;
+    this.bufferForPlaybackMs = bufferForPlaybackMs;
+    this.bufferForPlaybackAfterRebufferMs = bufferForPlaybackAfterRebufferMs;
+    return this;
+  }
+
+  /**
+   * Sets the hysteresis buffer used to prevent repeated format switching.
+   *
+   * @param hysteresisBufferMs The offset the current duration of buffered media must deviate from
+   *     the ideal duration of buffered media for the currently selected format, before the selected
+   *     format is changed. This value must be smaller than {@code maxBufferMs - minBufferMs}.
+   * @return This builder, for convenience.
+   * @throws IllegalStateException If {@link #buildPlayerComponents()} has already been called.
+   */
+  public BufferSizeAdaptationBuilder setHysteresisBufferMs(int hysteresisBufferMs) {
+    Assertions.checkState(!buildCalled);
+    this.hysteresisBufferMs = hysteresisBufferMs;
+    return this;
+  }
+
+  /**
+   * Sets track selection parameters used during the start-up phase before the selection can be made
+   * purely on based on buffer size. During the start-up phase the selection is based on the current
+   * bandwidth estimate.
+   *
+   * @param bandwidthFraction The fraction of the available bandwidth that the selection should
+   *     consider available for use. Setting to a value less than 1 is recommended to account for
+   *     inaccuracies in the bandwidth estimator.
+   * @param minBufferForQualityIncreaseMs The minimum duration of buffered media required for the
+   *     selected track to switch to one of higher quality.
+   * @return This builder, for convenience.
+   * @throws IllegalStateException If {@link #buildPlayerComponents()} has already been called.
+   */
+  public BufferSizeAdaptationBuilder setStartUpTrackSelectionParameters(
+      float bandwidthFraction, int minBufferForQualityIncreaseMs) {
+    Assertions.checkState(!buildCalled);
+    this.startUpBandwidthFraction = bandwidthFraction;
+    this.startUpMinBufferForQualityIncreaseMs = minBufferForQualityIncreaseMs;
+    return this;
+  }
+
+  /**
+   * Sets the {@link PriorityTaskManager} to use.
+   *
+   * @param priorityTaskManager The {@link PriorityTaskManager}.
+   * @return This builder, for convenience.
+   * @throws IllegalStateException If {@link #buildPlayerComponents()} has already been called.
+   */
+  public BufferSizeAdaptationBuilder setPriorityTaskManager(
+      PriorityTaskManager priorityTaskManager) {
+    Assertions.checkState(!buildCalled);
+    this.priorityTaskManager = priorityTaskManager;
+    return this;
+  }
+
+  /**
+   * Sets the {@link DynamicFormatFilter} to use when updating the selected track.
+   *
+   * @param dynamicFormatFilter The {@link DynamicFormatFilter}.
+   * @return This builder, for convenience.
+   * @throws IllegalStateException If {@link #buildPlayerComponents()} has already been called.
+   */
+  public BufferSizeAdaptationBuilder setDynamicFormatFilter(
+      DynamicFormatFilter dynamicFormatFilter) {
+    Assertions.checkState(!buildCalled);
+    this.dynamicFormatFilter = dynamicFormatFilter;
+    return this;
+  }
+
+  /**
+   * Builds player components for buffer size based track adaptation.
+   *
+   * @return A pair of a {@link TrackSelection.Factory} and a {@link LoadControl}, which should be
+   *     used to construct the player.
+   */
+  public Pair<TrackSelection.Factory, LoadControl> buildPlayerComponents() {
+    Assertions.checkArgument(hysteresisBufferMs < maxBufferMs - minBufferMs);
+    Assertions.checkState(!buildCalled);
+    buildCalled = true;
+
+    DefaultLoadControl.Builder loadControlBuilder =
+        new DefaultLoadControl.Builder()
+            .setTargetBufferBytes(/* targetBufferBytes = */ Integer.MAX_VALUE)
+            .setBufferDurationsMs(
+                /* minBufferMs= */ maxBufferMs,
+                maxBufferMs,
+                bufferForPlaybackMs,
+                bufferForPlaybackAfterRebufferMs);
+    if (priorityTaskManager != null) {
+      loadControlBuilder.setPriorityTaskManager(priorityTaskManager);
+    }
+    if (allocator != null) {
+      loadControlBuilder.setAllocator(allocator);
+    }
+
+    TrackSelection.Factory trackSelectionFactory =
+        new TrackSelection.Factory() {
+          @Override
+          public TrackSelection createTrackSelection(
+              TrackGroup group, BandwidthMeter bandwidthMeter, int... tracks) {
+            return new BufferSizeAdaptiveTrackSelection(
+                group,
+                tracks,
+                bandwidthMeter,
+                minBufferMs,
+                maxBufferMs,
+                hysteresisBufferMs,
+                startUpBandwidthFraction,
+                startUpMinBufferForQualityIncreaseMs,
+                dynamicFormatFilter,
+                clock);
+          }
+        };
+
+    return Pair.create(trackSelectionFactory, loadControlBuilder.createDefaultLoadControl());
+  }
+
+  private static final class BufferSizeAdaptiveTrackSelection extends BaseTrackSelection {
+
+    private static final int BITRATE_BLACKLISTED = Format.NO_VALUE;
+
+    private final BandwidthMeter bandwidthMeter;
+    private final Clock clock;
+    private final DynamicFormatFilter dynamicFormatFilter;
+    private final int[] formatBitrates;
+    private final long minBufferUs;
+    private final long maxBufferUs;
+    private final long hysteresisBufferUs;
+    private final float startUpBandwidthFraction;
+    private final long startUpMinBufferForQualityIncreaseUs;
+    private final int minBitrate;
+    private final int maxBitrate;
+    private final double bitrateToBufferFunctionSlope;
+    private final double bitrateToBufferFunctionIntercept;
+
+    private boolean isInSteadyState;
+    private int selectedIndex;
+    private int selectionReason;
+    private float playbackSpeed;
+
+    private BufferSizeAdaptiveTrackSelection(
+        TrackGroup trackGroup,
+        int[] tracks,
+        BandwidthMeter bandwidthMeter,
+        int minBufferMs,
+        int maxBufferMs,
+        int hysteresisBufferMs,
+        float startUpBandwidthFraction,
+        int startUpMinBufferForQualityIncreaseMs,
+        DynamicFormatFilter dynamicFormatFilter,
+        Clock clock) {
+      super(trackGroup, tracks);
+      this.bandwidthMeter = bandwidthMeter;
+      this.minBufferUs = C.msToUs(minBufferMs);
+      this.maxBufferUs = C.msToUs(maxBufferMs);
+      this.hysteresisBufferUs = C.msToUs(hysteresisBufferMs);
+      this.startUpBandwidthFraction = startUpBandwidthFraction;
+      this.startUpMinBufferForQualityIncreaseUs = C.msToUs(startUpMinBufferForQualityIncreaseMs);
+      this.dynamicFormatFilter = dynamicFormatFilter;
+      this.clock = clock;
+
+      formatBitrates = new int[length];
+      maxBitrate = getFormat(/* index= */ 0).bitrate;
+      minBitrate = getFormat(/* index= */ length - 1).bitrate;
+      selectionReason = C.SELECTION_REASON_INITIAL;
+      playbackSpeed = 1.0f;
+
+      // We use a log-linear function to map from bitrate to buffer size:
+      // buffer = slope * ln(bitrate) + intercept,
+      // with buffer(minBitrate) = minBuffer and buffer(maxBitrate) = maxBuffer - hysteresisBuffer.
+      bitrateToBufferFunctionSlope =
+          (maxBufferUs - hysteresisBufferUs - minBufferUs) / Math.log(maxBitrate / minBitrate);
+      bitrateToBufferFunctionIntercept =
+          minBufferUs - bitrateToBufferFunctionSlope * Math.log(minBitrate);
+
+      updateFormatBitrates(/* nowMs= */ Long.MIN_VALUE);
+      selectedIndex = selectIdealIndexUsingBandwidth();
+    }
+
+    @Override
+    public void onPlaybackSpeed(float playbackSpeed) {
+      this.playbackSpeed = playbackSpeed;
+    }
+
+    @Override
+    public void onDiscontinuity() {
+      isInSteadyState = false;
+    }
+
+    @Override
+    public int getSelectedIndex() {
+      return selectedIndex;
+    }
+
+    @Override
+    public int getSelectionReason() {
+      return selectionReason;
+    }
+
+    @Override
+    @Nullable
+    public Object getSelectionData() {
+      return null;
+    }
+
+    @Override
+    public void updateSelectedTrack(
+        long playbackPositionUs,
+        long bufferedDurationUs,
+        long availableDurationUs,
+        List<? extends MediaChunk> queue,
+        MediaChunkIterator[] mediaChunkIterators) {
+      updateFormatBitrates(/* nowMs= */ clock.elapsedRealtime());
+      long bufferUs = getCurrentPeriodBufferedDurationUs(playbackPositionUs, bufferedDurationUs);
+      int oldSelectedIndex = selectedIndex;
+      if (isInSteadyState) {
+        selectIndexSteadyState(bufferUs);
+      } else {
+        selectIndexStartUpPhase(bufferUs);
+      }
+      if (selectedIndex != oldSelectedIndex) {
+        selectionReason = C.SELECTION_REASON_ADAPTIVE;
+      }
+    }
+
+    // Steady state.
+
+    private void selectIndexSteadyState(long bufferUs) {
+      if (isOutsideHysteresis(bufferUs)) {
+        selectedIndex = selectIdealIndexUsingBufferSize(bufferUs);
+      }
+    }
+
+    private boolean isOutsideHysteresis(long bufferUs) {
+      if (formatBitrates[selectedIndex] == BITRATE_BLACKLISTED) {
+        return true;
+      }
+      long targetBufferForCurrentBitrateUs =
+          getTargetBufferForBitrateUs(formatBitrates[selectedIndex]);
+      long bufferDiffUs = bufferUs - targetBufferForCurrentBitrateUs;
+      return Math.abs(bufferDiffUs) > hysteresisBufferUs;
+    }
+
+    private int selectIdealIndexUsingBufferSize(long bufferUs) {
+      int lowestBitrateNonBlacklistedIndex = 0;
+      for (int i = 0; i < formatBitrates.length; i++) {
+        if (formatBitrates[i] != BITRATE_BLACKLISTED) {
+          if (getTargetBufferForBitrateUs(formatBitrates[i]) < bufferUs
+              && dynamicFormatFilter.isFormatAllowed(getFormat(i), formatBitrates[i])) {
+            return i;
+          }
+          lowestBitrateNonBlacklistedIndex = i;
+        }
+      }
+      return lowestBitrateNonBlacklistedIndex;
+    }
+
+    // Startup.
+
+    private void selectIndexStartUpPhase(long bufferUs) {
+      int startUpSelectedIndex = selectIdealIndexUsingBandwidth();
+      int steadyStateSelectedIndex = selectIdealIndexUsingBufferSize(bufferUs);
+      if (steadyStateSelectedIndex <= selectedIndex) {
+        // Switch to steady state if we have enough buffer to maintain current selection.
+        selectedIndex = steadyStateSelectedIndex;
+        isInSteadyState = true;
+      } else {
+        if (bufferUs < startUpMinBufferForQualityIncreaseUs
+            && startUpSelectedIndex < selectedIndex
+            && formatBitrates[selectedIndex] != BITRATE_BLACKLISTED) {
+          // Switching up from a non-blacklisted track is only allowed if we have enough buffer.
+          return;
+        }
+        selectedIndex = startUpSelectedIndex;
+      }
+    }
+
+    private int selectIdealIndexUsingBandwidth() {
+      long effectiveBitrate =
+          (long) (bandwidthMeter.getBitrateEstimate() * startUpBandwidthFraction);
+      int lowestBitrateNonBlacklistedIndex = 0;
+      for (int i = 0; i < formatBitrates.length; i++) {
+        if (formatBitrates[i] != BITRATE_BLACKLISTED) {
+          if (Math.round(formatBitrates[i] * playbackSpeed) <= effectiveBitrate
+              && dynamicFormatFilter.isFormatAllowed(getFormat(i), formatBitrates[i])) {
+            return i;
+          }
+          lowestBitrateNonBlacklistedIndex = i;
+        }
+      }
+      return lowestBitrateNonBlacklistedIndex;
+    }
+
+    // Utility methods.
+
+    private void updateFormatBitrates(long nowMs) {
+      for (int i = 0; i < length; i++) {
+        if (nowMs == Long.MIN_VALUE || !isBlacklisted(i, nowMs)) {
+          formatBitrates[i] = getFormat(i).bitrate;
+        } else {
+          formatBitrates[i] = BITRATE_BLACKLISTED;
+        }
+      }
+    }
+
+    private long getTargetBufferForBitrateUs(int bitrate) {
+      if (bitrate <= minBitrate) {
+        return minBufferUs;
+      }
+      if (bitrate >= maxBitrate) {
+        return maxBufferUs - hysteresisBufferUs;
+      }
+      return (int)
+          (bitrateToBufferFunctionSlope * Math.log(bitrate) + bitrateToBufferFunctionIntercept);
+    }
+
+    private static long getCurrentPeriodBufferedDurationUs(
+        long playbackPositionUs, long bufferedDurationUs) {
+      return playbackPositionUs >= 0 ? bufferedDurationUs : playbackPositionUs + bufferedDurationUs;
+    }
+  }
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java
index a7c0658708..5645380b5d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java
@@ -154,6 +154,13 @@ public interface TrackSelection {
    */
   void onPlaybackSpeed(float speed);
 
+  /**
+   * Called to notify the selection of a position discontinuity.
+   *
+   * <p>This happens when the playback position jumps, e.g., as a result of a seek being performed.
+   */
+  default void onDiscontinuity() {}
+
   /**
    * @deprecated Use and implement {@link #updateSelectedTrack(long, long, long, List,
    *     MediaChunkIterator[])} instead.

From 771db2c9fcd312a653d9a215f28f29f6157bbe7d Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 20 Nov 2018 04:45:11 -0800
Subject: [PATCH 209/832] Move playWhenReady update out of PlaybackInfoUpdate.

The update is actually unrelated and putting it all in one large update
object complicates adding the same update mechanism for other values.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=222226825
---
 .../android/exoplayer2/ExoPlayerImpl.java     | 87 +++++++++++--------
 1 file changed, 51 insertions(+), 36 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index 6124a6c18b..2c9f949d09 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -61,7 +61,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
   private final Handler internalPlayerHandler;
   private final CopyOnWriteArraySet<Player.EventListener> listeners;
   private final Timeline.Period period;
-  private final ArrayDeque<PlaybackInfoUpdate> pendingPlaybackInfoUpdates;
+  private final ArrayDeque<Runnable> pendingListenerNotifications;
 
   private MediaSource mediaSource;
   private boolean playWhenReady;
@@ -128,7 +128,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
           }
         };
     playbackInfo = PlaybackInfo.createDummy(/* startPositionUs= */ 0, emptyTrackSelectorResult);
-    pendingPlaybackInfoUpdates = new ArrayDeque<>();
+    pendingListenerNotifications = new ArrayDeque<>();
     internalPlayer =
         new ExoPlayerImplInternal(
             renderers,
@@ -222,8 +222,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
         /* positionDiscontinuity= */ false,
         /* ignored */ DISCONTINUITY_REASON_INTERNAL,
         TIMELINE_CHANGE_REASON_RESET,
-        /* seekProcessed= */ false,
-        /* playWhenReadyChanged= */ false);
+        /* seekProcessed= */ false);
   }
 
   @Override
@@ -239,13 +238,8 @@ import java.util.concurrent.CopyOnWriteArraySet;
     }
     if (this.playWhenReady != playWhenReady) {
       this.playWhenReady = playWhenReady;
-      updatePlaybackInfo(
-          playbackInfo,
-          /* positionDiscontinuity= */ false,
-          /* ignored */ DISCONTINUITY_REASON_INTERNAL,
-          /* ignored */ TIMELINE_CHANGE_REASON_RESET,
-          /* seekProcessed= */ false,
-          /* playWhenReadyChanged= */ true);
+      notifyListeners(
+          new PlayWhenReadyUpdate(listeners, playWhenReady, playbackInfo.playbackState));
     }
   }
 
@@ -390,8 +384,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
         /* positionDiscontinuity= */ false,
         /* ignored */ DISCONTINUITY_REASON_INTERNAL,
         TIMELINE_CHANGE_REASON_RESET,
-        /* seekProcessed= */ false,
-        /* playWhenReadyChanged= */ false);
+        /* seekProcessed= */ false);
   }
 
   @Override
@@ -651,8 +644,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
           positionDiscontinuity,
           positionDiscontinuityReason,
           timelineChangeReason,
-          seekProcessed,
-          /* playWhenReadyChanged= */ false);
+          seekProcessed);
     }
   }
 
@@ -694,29 +686,32 @@ import java.util.concurrent.CopyOnWriteArraySet;
       boolean positionDiscontinuity,
       @Player.DiscontinuityReason int positionDiscontinuityReason,
       @Player.TimelineChangeReason int timelineChangeReason,
-      boolean seekProcessed,
-      boolean playWhenReadyChanged) {
-    boolean isRunningRecursiveListenerNotification = !pendingPlaybackInfoUpdates.isEmpty();
-    pendingPlaybackInfoUpdates.addLast(
+      boolean seekProcessed) {
+    // Assign playback info immediately such that all getters return the right values.
+    PlaybackInfo previousPlaybackInfo = this.playbackInfo;
+    this.playbackInfo = playbackInfo;
+    notifyListeners(
         new PlaybackInfoUpdate(
             playbackInfo,
-            /* previousPlaybackInfo= */ this.playbackInfo,
+            previousPlaybackInfo,
             listeners,
             trackSelector,
             positionDiscontinuity,
             positionDiscontinuityReason,
             timelineChangeReason,
             seekProcessed,
-            playWhenReady,
-            playWhenReadyChanged));
-    // Assign playback info immediately such that all getters return the right values.
-    this.playbackInfo = playbackInfo;
+            playWhenReady));
+  }
+
+  private void notifyListeners(Runnable listenerNotificationRunnable) {
+    boolean isRunningRecursiveListenerNotification = !pendingListenerNotifications.isEmpty();
+    pendingListenerNotifications.addLast(listenerNotificationRunnable);
     if (isRunningRecursiveListenerNotification) {
       return;
     }
-    while (!pendingPlaybackInfoUpdates.isEmpty()) {
-      pendingPlaybackInfoUpdates.peekFirst().notifyListeners();
-      pendingPlaybackInfoUpdates.removeFirst();
+    while (!pendingListenerNotifications.isEmpty()) {
+      pendingListenerNotifications.peekFirst().run();
+      pendingListenerNotifications.removeFirst();
     }
   }
 
@@ -731,7 +726,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
     return playbackInfo.timeline.isEmpty() || pendingOperationAcks > 0;
   }
 
-  private static final class PlaybackInfoUpdate {
+  private static final class PlaybackInfoUpdate implements Runnable {
 
     private final PlaybackInfo playbackInfo;
     private final Set<Player.EventListener> listeners;
@@ -740,11 +735,11 @@ import java.util.concurrent.CopyOnWriteArraySet;
     private final @Player.DiscontinuityReason int positionDiscontinuityReason;
     private final @Player.TimelineChangeReason int timelineChangeReason;
     private final boolean seekProcessed;
-    private final boolean playWhenReady;
-    private final boolean playbackStateOrPlayWhenReadyChanged;
+    private final boolean playbackStateChanged;
     private final boolean timelineOrManifestChanged;
     private final boolean isLoadingChanged;
     private final boolean trackSelectorResultChanged;
+    private final boolean playWhenReady;
 
     public PlaybackInfoUpdate(
         PlaybackInfo playbackInfo,
@@ -755,8 +750,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
         @Player.DiscontinuityReason int positionDiscontinuityReason,
         @Player.TimelineChangeReason int timelineChangeReason,
         boolean seekProcessed,
-        boolean playWhenReady,
-        boolean playWhenReadyChanged) {
+        boolean playWhenReady) {
       this.playbackInfo = playbackInfo;
       this.listeners = listeners;
       this.trackSelector = trackSelector;
@@ -765,8 +759,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
       this.timelineChangeReason = timelineChangeReason;
       this.seekProcessed = seekProcessed;
       this.playWhenReady = playWhenReady;
-      playbackStateOrPlayWhenReadyChanged =
-          playWhenReadyChanged || previousPlaybackInfo.playbackState != playbackInfo.playbackState;
+      playbackStateChanged = previousPlaybackInfo.playbackState != playbackInfo.playbackState;
       timelineOrManifestChanged =
           previousPlaybackInfo.timeline != playbackInfo.timeline
               || previousPlaybackInfo.manifest != playbackInfo.manifest;
@@ -775,7 +768,8 @@ import java.util.concurrent.CopyOnWriteArraySet;
           previousPlaybackInfo.trackSelectorResult != playbackInfo.trackSelectorResult;
     }
 
-    public void notifyListeners() {
+    @Override
+    public void run() {
       if (timelineOrManifestChanged || timelineChangeReason == TIMELINE_CHANGE_REASON_PREPARED) {
         for (Player.EventListener listener : listeners) {
           listener.onTimelineChanged(
@@ -799,7 +793,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
           listener.onLoadingChanged(playbackInfo.isLoading);
         }
       }
-      if (playbackStateOrPlayWhenReadyChanged) {
+      if (playbackStateChanged) {
         for (Player.EventListener listener : listeners) {
           listener.onPlayerStateChanged(playWhenReady, playbackInfo.playbackState);
         }
@@ -811,4 +805,25 @@ import java.util.concurrent.CopyOnWriteArraySet;
       }
     }
   }
+
+  private static final class PlayWhenReadyUpdate implements Runnable {
+
+    private final Set<Player.EventListener> listeners;
+    private final boolean playWhenReady;
+    private final int playbackState;
+
+    public PlayWhenReadyUpdate(
+        Set<Player.EventListener> listeners, boolean playWhenReady, int playbackState) {
+      this.listeners = listeners;
+      this.playWhenReady = playWhenReady;
+      this.playbackState = playbackState;
+    }
+
+    @Override
+    public void run() {
+      for (Player.EventListener listener : listeners) {
+        listener.onPlayerStateChanged(playWhenReady, playbackState);
+      }
+    }
+  }
 }

From b7ab570094240b051e3dc4914b7bceffe2749b0e Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 20 Nov 2018 04:46:42 -0800
Subject: [PATCH 210/832] Use serialized listener notification for all listener
 notifications.

This ensures that all callbacks use the same notification mechanism.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=222226913
---
 .../android/exoplayer2/ExoPlayerImpl.java     | 53 +++++++------------
 .../android/exoplayer2/ExoPlayerTest.java     |  7 ++-
 2 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index 2c9f949d09..41c71b21d5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -238,8 +238,8 @@ import java.util.concurrent.CopyOnWriteArraySet;
     }
     if (this.playWhenReady != playWhenReady) {
       this.playWhenReady = playWhenReady;
-      notifyListeners(
-          new PlayWhenReadyUpdate(listeners, playWhenReady, playbackInfo.playbackState));
+      int playbackState = playbackInfo.playbackState;
+      notifyListeners(listener -> listener.onPlayerStateChanged(playWhenReady, playbackState));
     }
   }
 
@@ -253,9 +253,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
     if (this.repeatMode != repeatMode) {
       this.repeatMode = repeatMode;
       internalPlayer.setRepeatMode(repeatMode);
-      for (Player.EventListener listener : listeners) {
-        listener.onRepeatModeChanged(repeatMode);
-      }
+      notifyListeners(listener -> listener.onRepeatModeChanged(repeatMode));
     }
   }
 
@@ -269,9 +267,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
     if (this.shuffleModeEnabled != shuffleModeEnabled) {
       this.shuffleModeEnabled = shuffleModeEnabled;
       internalPlayer.setShuffleModeEnabled(shuffleModeEnabled);
-      for (Player.EventListener listener : listeners) {
-        listener.onShuffleModeEnabledChanged(shuffleModeEnabled);
-      }
+      notifyListeners(listener -> listener.onShuffleModeEnabledChanged(shuffleModeEnabled));
     }
   }
 
@@ -320,9 +316,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
       maskingPeriodIndex = timeline.getIndexOfPeriod(periodUidAndPosition.first);
     }
     internalPlayer.seekTo(timeline, windowIndex, C.msToUs(positionMs));
-    for (Player.EventListener listener : listeners) {
-      listener.onPositionDiscontinuity(DISCONTINUITY_REASON_SEEK);
-    }
+    notifyListeners(listener -> listener.onPositionDiscontinuity(DISCONTINUITY_REASON_SEEK));
   }
 
   @Override
@@ -594,17 +588,13 @@ import java.util.concurrent.CopyOnWriteArraySet;
         PlaybackParameters playbackParameters = (PlaybackParameters) msg.obj;
         if (!this.playbackParameters.equals(playbackParameters)) {
           this.playbackParameters = playbackParameters;
-          for (Player.EventListener listener : listeners) {
-            listener.onPlaybackParametersChanged(playbackParameters);
-          }
+          notifyListeners(listener -> listener.onPlaybackParametersChanged(playbackParameters));
         }
         break;
       case ExoPlayerImplInternal.MSG_ERROR:
         ExoPlaybackException playbackError = (ExoPlaybackException) msg.obj;
         this.playbackError = playbackError;
-        for (Player.EventListener listener : listeners) {
-          listener.onPlayerError(playbackError);
-        }
+        notifyListeners(listener -> listener.onPlayerError(playbackError));
         break;
       default:
         throw new IllegalStateException();
@@ -703,6 +693,15 @@ import java.util.concurrent.CopyOnWriteArraySet;
             playWhenReady));
   }
 
+  private void notifyListeners(ListenerInvocation listenerInvocation) {
+    notifyListeners(
+        () -> {
+          for (Player.EventListener listener : listeners) {
+            listenerInvocation.invokeListener(listener);
+          }
+        });
+  }
+
   private void notifyListeners(Runnable listenerNotificationRunnable) {
     boolean isRunningRecursiveListenerNotification = !pendingListenerNotifications.isEmpty();
     pendingListenerNotifications.addLast(listenerNotificationRunnable);
@@ -806,24 +805,8 @@ import java.util.concurrent.CopyOnWriteArraySet;
     }
   }
 
-  private static final class PlayWhenReadyUpdate implements Runnable {
+  private interface ListenerInvocation {
 
-    private final Set<Player.EventListener> listeners;
-    private final boolean playWhenReady;
-    private final int playbackState;
-
-    public PlayWhenReadyUpdate(
-        Set<Player.EventListener> listeners, boolean playWhenReady, int playbackState) {
-      this.listeners = listeners;
-      this.playWhenReady = playWhenReady;
-      this.playbackState = playbackState;
-    }
-
-    @Override
-    public void run() {
-      for (Player.EventListener listener : listeners) {
-        listener.onPlayerStateChanged(playWhenReady, playbackState);
-      }
-    }
+    void invokeListener(Player.EventListener listener);
   }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
index d131ed0f51..1ae9e7a3ea 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
@@ -498,12 +498,12 @@ public final class ExoPlayerTest {
             .waitForPlaybackState(Player.STATE_READY)
             .seek(10)
             // Start playback and wait until playback reaches second window.
-            .play()
-            .waitForPositionDiscontinuity()
+            .playUntilStartOfWindow(/* windowIndex= */ 1)
             // Seek twice in concession, expecting the first seek to be replaced (and thus except
             // only on seek processed callback).
             .seek(5)
             .seek(60)
+            .play()
             .build();
     final List<Integer> playbackStatesWhenSeekProcessed = new ArrayList<>();
     EventListener eventListener =
@@ -2058,8 +2058,11 @@ public final class ExoPlayerTest {
             .pause()
             .waitForPlaybackState(Player.STATE_READY)
             .seek(/* windowIndex= */ 0, /* positionMs= */ 9999)
+            .waitForSeekProcessed()
             .seek(/* windowIndex= */ 0, /* positionMs= */ 1)
+            .waitForSeekProcessed()
             .seek(/* windowIndex= */ 0, /* positionMs= */ 9999)
+            .waitForSeekProcessed()
             .play()
             .build();
     ExoPlayerTestRunner testRunner =

From 55cc0df558089da0197757d517af5ba8beaa067b Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 20 Nov 2018 04:57:12 -0800
Subject: [PATCH 211/832] Create actual copy of listener list instead of just
 copying the reference.

Forwarding the listeners to the notification update is meant to ensure we
only notify the listeners which were registered at the time the event happened

However, we currently just copy the reference to the actual list instead of
doing a deep copy of the listeners.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=222227735
---
 .../android/exoplayer2/ExoPlayerImpl.java     | 112 ++++++++++++------
 1 file changed, 77 insertions(+), 35 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index 41c71b21d5..ccd95a7922 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -37,8 +37,7 @@ import com.google.android.exoplayer2.util.Util;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 /** An {@link ExoPlayer} implementation. Instances can be obtained from {@link ExoPlayerFactory}. */
 /* package */ final class ExoPlayerImpl extends BasePlayer implements ExoPlayer {
@@ -59,7 +58,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
   private final Handler eventHandler;
   private final ExoPlayerImplInternal internalPlayer;
   private final Handler internalPlayerHandler;
-  private final CopyOnWriteArraySet<Player.EventListener> listeners;
+  private final CopyOnWriteArrayList<ListenerHolder> listeners;
   private final Timeline.Period period;
   private final ArrayDeque<Runnable> pendingListenerNotifications;
 
@@ -111,7 +110,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
     this.playWhenReady = false;
     this.repeatMode = Player.REPEAT_MODE_OFF;
     this.shuffleModeEnabled = false;
-    this.listeners = new CopyOnWriteArraySet<>();
+    this.listeners = new CopyOnWriteArrayList<>();
     emptyTrackSelectorResult =
         new TrackSelectorResult(
             new RendererConfiguration[renderers.length],
@@ -172,12 +171,17 @@ import java.util.concurrent.CopyOnWriteArraySet;
 
   @Override
   public void addListener(Player.EventListener listener) {
-    listeners.add(listener);
+    listeners.addIfAbsent(new ListenerHolder(listener));
   }
 
   @Override
   public void removeListener(Player.EventListener listener) {
-    listeners.remove(listener);
+    for (ListenerHolder listenerHolder : listeners) {
+      if (listenerHolder.listener.equals(listener)) {
+        listenerHolder.release();
+        listeners.remove(listenerHolder);
+      }
+    }
   }
 
   @Override
@@ -694,12 +698,8 @@ import java.util.concurrent.CopyOnWriteArraySet;
   }
 
   private void notifyListeners(ListenerInvocation listenerInvocation) {
-    notifyListeners(
-        () -> {
-          for (Player.EventListener listener : listeners) {
-            listenerInvocation.invokeListener(listener);
-          }
-        });
+    CopyOnWriteArrayList<ListenerHolder> listenerSnapshot = new CopyOnWriteArrayList<>(listeners);
+    notifyListeners(() -> invokeAll(listenerSnapshot, listenerInvocation));
   }
 
   private void notifyListeners(Runnable listenerNotificationRunnable) {
@@ -728,7 +728,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
   private static final class PlaybackInfoUpdate implements Runnable {
 
     private final PlaybackInfo playbackInfo;
-    private final Set<Player.EventListener> listeners;
+    private final CopyOnWriteArrayList<ListenerHolder> listenerSnapshot;
     private final TrackSelector trackSelector;
     private final boolean positionDiscontinuity;
     private final @Player.DiscontinuityReason int positionDiscontinuityReason;
@@ -743,7 +743,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
     public PlaybackInfoUpdate(
         PlaybackInfo playbackInfo,
         PlaybackInfo previousPlaybackInfo,
-        Set<Player.EventListener> listeners,
+        CopyOnWriteArrayList<ListenerHolder> listeners,
         TrackSelector trackSelector,
         boolean positionDiscontinuity,
         @Player.DiscontinuityReason int positionDiscontinuityReason,
@@ -751,7 +751,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
         boolean seekProcessed,
         boolean playWhenReady) {
       this.playbackInfo = playbackInfo;
-      this.listeners = listeners;
+      this.listenerSnapshot = new CopyOnWriteArrayList<>(listeners);
       this.trackSelector = trackSelector;
       this.positionDiscontinuity = positionDiscontinuity;
       this.positionDiscontinuityReason = positionDiscontinuityReason;
@@ -770,43 +770,85 @@ import java.util.concurrent.CopyOnWriteArraySet;
     @Override
     public void run() {
       if (timelineOrManifestChanged || timelineChangeReason == TIMELINE_CHANGE_REASON_PREPARED) {
-        for (Player.EventListener listener : listeners) {
-          listener.onTimelineChanged(
-              playbackInfo.timeline, playbackInfo.manifest, timelineChangeReason);
-        }
+        invokeAll(
+            listenerSnapshot,
+            listener ->
+                listener.onTimelineChanged(
+                    playbackInfo.timeline, playbackInfo.manifest, timelineChangeReason));
       }
       if (positionDiscontinuity) {
-        for (Player.EventListener listener : listeners) {
-          listener.onPositionDiscontinuity(positionDiscontinuityReason);
-        }
+        invokeAll(
+            listenerSnapshot,
+            listener -> listener.onPositionDiscontinuity(positionDiscontinuityReason));
       }
       if (trackSelectorResultChanged) {
         trackSelector.onSelectionActivated(playbackInfo.trackSelectorResult.info);
-        for (Player.EventListener listener : listeners) {
-          listener.onTracksChanged(
-              playbackInfo.trackGroups, playbackInfo.trackSelectorResult.selections);
-        }
+        invokeAll(
+            listenerSnapshot,
+            listener ->
+                listener.onTracksChanged(
+                    playbackInfo.trackGroups, playbackInfo.trackSelectorResult.selections));
       }
       if (isLoadingChanged) {
-        for (Player.EventListener listener : listeners) {
-          listener.onLoadingChanged(playbackInfo.isLoading);
-        }
+        invokeAll(listenerSnapshot, listener -> listener.onLoadingChanged(playbackInfo.isLoading));
       }
       if (playbackStateChanged) {
-        for (Player.EventListener listener : listeners) {
-          listener.onPlayerStateChanged(playWhenReady, playbackInfo.playbackState);
-        }
+        invokeAll(
+            listenerSnapshot,
+            listener -> listener.onPlayerStateChanged(playWhenReady, playbackInfo.playbackState));
       }
       if (seekProcessed) {
-        for (Player.EventListener listener : listeners) {
-          listener.onSeekProcessed();
-        }
+        invokeAll(listenerSnapshot, EventListener::onSeekProcessed);
       }
     }
   }
 
+  private static void invokeAll(
+      CopyOnWriteArrayList<ListenerHolder> listeners, ListenerInvocation listenerInvocation) {
+    for (ListenerHolder listenerHolder : listeners) {
+      listenerHolder.invoke(listenerInvocation);
+    }
+  }
+
   private interface ListenerInvocation {
 
     void invokeListener(Player.EventListener listener);
   }
+
+  private static final class ListenerHolder {
+
+    private final Player.EventListener listener;
+
+    private boolean released;
+
+    public ListenerHolder(Player.EventListener listener) {
+      this.listener = listener;
+    }
+
+    public void release() {
+      released = true;
+    }
+
+    public void invoke(ListenerInvocation listenerInvocation) {
+      if (!released) {
+        listenerInvocation.invokeListener(listener);
+      }
+    }
+
+    @Override
+    public boolean equals(Object other) {
+      if (this == other) {
+        return true;
+      }
+      if (other == null || getClass() != other.getClass()) {
+        return false;
+      }
+      return listener.equals(((ListenerHolder) other).listener);
+    }
+
+    @Override
+    public int hashCode() {
+      return listener.hashCode();
+    }
+  }
 }

From 527f2cf730bb7fe45e9c6075b34d927bc6a17626 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Tue, 20 Nov 2018 05:32:51 -0800
Subject: [PATCH 212/832] Add TrackSelection.Factory createTrackSelections

createTrackSelections decides whether to create an adaptive or a fixed track seletion to create.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=222231011
---
 .../trackselection/DefaultTrackSelector.java  | 183 ++++++++----------
 .../trackselection/TrackSelection.java        |  47 +++++
 .../android/exoplayer2/ExoPlayerTest.java     |   2 +-
 .../playbacktests/gts/DashTestRunner.java     |  22 +--
 .../testutil/FakeTrackSelector.java           |  78 +++++---
 5 files changed, 196 insertions(+), 136 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
index d40afa3acc..06b11b3d67 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -1006,8 +1006,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
      * @param groups The {@link TrackGroupArray}.
      * @return The override, or null if no override exists.
      */
-    public final @Nullable SelectionOverride getSelectionOverride(
-        int rendererIndex, TrackGroupArray groups) {
+    @Nullable
+    public final SelectionOverride getSelectionOverride(int rendererIndex, TrackGroupArray groups) {
       Map<TrackGroupArray, SelectionOverride> overrides = selectionOverrides.get(rendererIndex);
       return overrides != null ? overrides.get(groups) : null;
     }
@@ -1327,10 +1327,9 @@ public class DefaultTrackSelector extends MappingTrackSelector {
   private static final int[] NO_TRACKS = new int[0];
   private static final int WITHIN_RENDERER_CAPABILITIES_BONUS = 1000;
 
-  private final TrackSelection.Factory adaptiveTrackSelectionFactory;
+  private final TrackSelection.Factory trackSelectionFactory;
   private final AtomicReference<Parameters> parametersReference;
 
-  /** Constructs an instance that uses a default factory to create adaptive track selections. */
   public DefaultTrackSelector() {
     this(new AdaptiveTrackSelection.Factory());
   }
@@ -1345,13 +1344,9 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     this(new AdaptiveTrackSelection.Factory(bandwidthMeter));
   }
 
-  /**
-   * Constructs an instance that uses a factory to create adaptive track selections.
-   *
-   * @param adaptiveTrackSelectionFactory A factory for adaptive {@link TrackSelection}s.
-   */
-  public DefaultTrackSelector(TrackSelection.Factory adaptiveTrackSelectionFactory) {
-    this.adaptiveTrackSelectionFactory = adaptiveTrackSelectionFactory;
+  /** @param trackSelectionFactory A factory for {@link TrackSelection}s. */
+  public DefaultTrackSelector(TrackSelection.Factory trackSelectionFactory) {
+    this.trackSelectionFactory = trackSelectionFactory;
     parametersReference = new AtomicReference<>(Parameters.DEFAULT);
   }
 
@@ -1420,8 +1415,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
 
   /** @deprecated Use {@link Parameters#getSelectionOverride(int, TrackGroupArray)}. */
   @Deprecated
-  public final @Nullable SelectionOverride getSelectionOverride(
-      int rendererIndex, TrackGroupArray groups) {
+  @Nullable
+  public final SelectionOverride getSelectionOverride(int rendererIndex, TrackGroupArray groups) {
     return getParameters().getSelectionOverride(rendererIndex, groups);
   }
 
@@ -1460,7 +1455,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           throws ExoPlaybackException {
     Parameters params = parametersReference.get();
     int rendererCount = mappedTrackInfo.getRendererCount();
-    @NullableType TrackSelection[] rendererTrackSelections =
+    TrackSelection.@NullableType Definition[] definitions =
         selectAllTracks(
             mappedTrackInfo,
             rendererFormatSupports,
@@ -1470,28 +1465,24 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     // Apply track disabling and overriding.
     for (int i = 0; i < rendererCount; i++) {
       if (params.getRendererDisabled(i)) {
-        rendererTrackSelections[i] = null;
-      } else {
-        TrackGroupArray rendererTrackGroups = mappedTrackInfo.getTrackGroups(i);
-        if (params.hasSelectionOverride(i, rendererTrackGroups)) {
-          SelectionOverride override = params.getSelectionOverride(i, rendererTrackGroups);
-          if (override == null) {
-            rendererTrackSelections[i] = null;
-          } else if (override.length == 1) {
-            rendererTrackSelections[i] =
-                new FixedTrackSelection(
-                    rendererTrackGroups.get(override.groupIndex), override.tracks[0]);
-          } else {
-            rendererTrackSelections[i] =
-                adaptiveTrackSelectionFactory.createTrackSelection(
-                    rendererTrackGroups.get(override.groupIndex),
-                    getBandwidthMeter(),
-                    override.tracks);
-          }
-        }
+        definitions[i] = null;
+        continue;
+      }
+      TrackGroupArray rendererTrackGroups = mappedTrackInfo.getTrackGroups(i);
+      if (params.hasSelectionOverride(i, rendererTrackGroups)) {
+        SelectionOverride override = params.getSelectionOverride(i, rendererTrackGroups);
+        definitions[i] =
+            override == null
+                ? null
+                : new TrackSelection.Definition(
+                    rendererTrackGroups.get(override.groupIndex), override.tracks);
       }
     }
 
+    @NullableType
+    TrackSelection[] rendererTrackSelections =
+        trackSelectionFactory.createTrackSelections(definitions, getBandwidthMeter());
+
     // Initialize the renderer configurations to the default configuration for all renderers with
     // selections, and null otherwise.
     @NullableType RendererConfiguration[] rendererConfigurations =
@@ -1530,32 +1521,33 @@ public class DefaultTrackSelector extends MappingTrackSelector {
    *     each mapped track, indexed by renderer, track group and track (in that order).
    * @param rendererMixedMimeTypeAdaptationSupports The result of {@link
    *     RendererCapabilities#supportsMixedMimeTypeAdaptation()} for each renderer.
-   * @return Track selections for each renderer. A null selection indicates the renderer should be
-   *     disabled, unless RendererCapabilities#getTrackType()} is {@link C#TRACK_TYPE_NONE}.
+   * @return The {@link TrackSelection.Definition}s for the renderers. A null entry indicates no
+   *     selection was made.
    * @throws ExoPlaybackException If an error occurs while selecting the tracks.
    */
-  protected @NullableType TrackSelection[] selectAllTracks(
+  protected TrackSelection.@NullableType Definition[] selectAllTracks(
       MappedTrackInfo mappedTrackInfo,
       int[][][] rendererFormatSupports,
       int[] rendererMixedMimeTypeAdaptationSupports,
       Parameters params)
       throws ExoPlaybackException {
     int rendererCount = mappedTrackInfo.getRendererCount();
-    @NullableType TrackSelection[] rendererTrackSelections = new TrackSelection[rendererCount];
+    TrackSelection.@NullableType Definition[] definitions =
+        new TrackSelection.Definition[rendererCount];
 
     boolean seenVideoRendererWithMappedTracks = false;
     boolean selectedVideoTracks = false;
     for (int i = 0; i < rendererCount; i++) {
       if (C.TRACK_TYPE_VIDEO == mappedTrackInfo.getRendererType(i)) {
         if (!selectedVideoTracks) {
-          rendererTrackSelections[i] =
+          definitions[i] =
               selectVideoTrack(
                   mappedTrackInfo.getTrackGroups(i),
                   rendererFormatSupports[i],
                   rendererMixedMimeTypeAdaptationSupports[i],
                   params,
-                  adaptiveTrackSelectionFactory);
-          selectedVideoTracks = rendererTrackSelections[i] != null;
+                  /* enableAdaptiveTrackSelection= */ true);
+          selectedVideoTracks = definitions[i] != null;
         }
         seenVideoRendererWithMappedTracks |= mappedTrackInfo.getTrackGroups(i).length > 0;
       }
@@ -1572,49 +1564,49 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           // Already done. Do nothing.
           break;
         case C.TRACK_TYPE_AUDIO:
-          Pair<TrackSelection, AudioTrackScore> audioSelection =
+          Pair<TrackSelection.Definition, AudioTrackScore> audioSelection =
               selectAudioTrack(
                   mappedTrackInfo.getTrackGroups(i),
                   rendererFormatSupports[i],
                   rendererMixedMimeTypeAdaptationSupports[i],
                   params,
-                  seenVideoRendererWithMappedTracks ? null : adaptiveTrackSelectionFactory);
+                  !seenVideoRendererWithMappedTracks);
           if (audioSelection != null
               && (selectedAudioTrackScore == null
                   || audioSelection.second.compareTo(selectedAudioTrackScore) > 0)) {
             if (selectedAudioRendererIndex != C.INDEX_UNSET) {
               // We've already made a selection for another audio renderer, but it had a lower
               // score. Clear the selection for that renderer.
-              rendererTrackSelections[selectedAudioRendererIndex] = null;
+              definitions[selectedAudioRendererIndex] = null;
             }
-            rendererTrackSelections[i] = audioSelection.first;
+            definitions[i] = audioSelection.first;
             selectedAudioTrackScore = audioSelection.second;
             selectedAudioRendererIndex = i;
           }
           break;
         case C.TRACK_TYPE_TEXT:
-          Pair<TrackSelection, Integer> textSelection =
+          Pair<TrackSelection.Definition, Integer> textSelection =
               selectTextTrack(mappedTrackInfo.getTrackGroups(i), rendererFormatSupports[i], params);
           if (textSelection != null && textSelection.second > selectedTextTrackScore) {
             if (selectedTextRendererIndex != C.INDEX_UNSET) {
               // We've already made a selection for another text renderer, but it had a lower score.
               // Clear the selection for that renderer.
-              rendererTrackSelections[selectedTextRendererIndex] = null;
+              definitions[selectedTextRendererIndex] = null;
             }
-            rendererTrackSelections[i] = textSelection.first;
+            definitions[i] = textSelection.first;
             selectedTextTrackScore = textSelection.second;
             selectedTextRendererIndex = i;
           }
           break;
         default:
-          rendererTrackSelections[i] =
+          definitions[i] =
               selectOtherTrack(
                   trackType, mappedTrackInfo.getTrackGroups(i), rendererFormatSupports[i], params);
           break;
       }
     }
 
-    return rendererTrackSelections;
+    return definitions;
   }
 
   // Video track selection implementation.
@@ -1629,45 +1621,38 @@ public class DefaultTrackSelector extends MappingTrackSelector {
    * @param mixedMimeTypeAdaptationSupports The result of {@link
    *     RendererCapabilities#supportsMixedMimeTypeAdaptation()} for the renderer.
    * @param params The selector's current constraint parameters.
-   * @param adaptiveTrackSelectionFactory A factory for generating adaptive track selections, or
-   *     null if a fixed track selection is required.
-   * @return The {@link TrackSelection} for the renderer, or null if no selection was made.
+   * @param enableAdaptiveTrackSelection Whether adaptive track selection is allowed.
+   * @return The {@link TrackSelection.Definition} for the renderer, or null if no selection was
+   *     made.
    * @throws ExoPlaybackException If an error occurs while selecting the tracks.
    */
-  protected @Nullable TrackSelection selectVideoTrack(
+  @Nullable
+  protected TrackSelection.Definition selectVideoTrack(
       TrackGroupArray groups,
       int[][] formatSupports,
       int mixedMimeTypeAdaptationSupports,
       Parameters params,
-      @Nullable TrackSelection.Factory adaptiveTrackSelectionFactory)
+      boolean enableAdaptiveTrackSelection)
       throws ExoPlaybackException {
-    TrackSelection selection = null;
+    TrackSelection.Definition definition = null;
     if (!params.forceHighestSupportedBitrate
         && !params.forceLowestBitrate
-        && adaptiveTrackSelectionFactory != null) {
-      selection =
-          selectAdaptiveVideoTrack(
-              groups,
-              formatSupports,
-              mixedMimeTypeAdaptationSupports,
-              params,
-              adaptiveTrackSelectionFactory,
-              getBandwidthMeter());
+        && enableAdaptiveTrackSelection) {
+      definition =
+          selectAdaptiveVideoTrack(groups, formatSupports, mixedMimeTypeAdaptationSupports, params);
     }
-    if (selection == null) {
-      selection = selectFixedVideoTrack(groups, formatSupports, params);
+    if (definition == null) {
+      definition = selectFixedVideoTrack(groups, formatSupports, params);
     }
-    return selection;
+    return definition;
   }
 
-  private static @Nullable TrackSelection selectAdaptiveVideoTrack(
+  @Nullable
+  private static TrackSelection.Definition selectAdaptiveVideoTrack(
       TrackGroupArray groups,
       int[][] formatSupport,
       int mixedMimeTypeAdaptationSupports,
-      Parameters params,
-      TrackSelection.Factory adaptiveTrackSelectionFactory,
-      BandwidthMeter bandwidthMeter)
-      throws ExoPlaybackException {
+      Parameters params) {
     int requiredAdaptiveSupport =
         params.allowVideoNonSeamlessAdaptiveness
             ? (RendererCapabilities.ADAPTIVE_NOT_SEAMLESS | RendererCapabilities.ADAPTIVE_SEAMLESS)
@@ -1691,8 +1676,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
               params.viewportHeight,
               params.viewportOrientationMayChange);
       if (adaptiveTracks.length > 0) {
-        return adaptiveTrackSelectionFactory.createTrackSelection(
-            group, bandwidthMeter, adaptiveTracks);
+        return new TrackSelection.Definition(group, adaptiveTracks);
       }
     }
     return null;
@@ -1835,7 +1819,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
         && (format.bitrate == Format.NO_VALUE || format.bitrate <= maxVideoBitrate);
   }
 
-  private static @Nullable TrackSelection selectFixedVideoTrack(
+  @Nullable
+  private static TrackSelection.Definition selectFixedVideoTrack(
       TrackGroupArray groups, int[][] formatSupports, Parameters params) {
     TrackGroup selectedGroup = null;
     int selectedTrackIndex = 0;
@@ -1897,8 +1882,9 @@ public class DefaultTrackSelector extends MappingTrackSelector {
         }
       }
     }
-    return selectedGroup == null ? null
-        : new FixedTrackSelection(selectedGroup, selectedTrackIndex);
+    return selectedGroup == null
+        ? null
+        : new TrackSelection.Definition(selectedGroup, selectedTrackIndex);
   }
 
   // Audio track selection implementation.
@@ -1913,19 +1899,19 @@ public class DefaultTrackSelector extends MappingTrackSelector {
    * @param mixedMimeTypeAdaptationSupports The result of {@link
    *     RendererCapabilities#supportsMixedMimeTypeAdaptation()} for the renderer.
    * @param params The selector's current constraint parameters.
-   * @param adaptiveTrackSelectionFactory A factory for generating adaptive track selections, or
-   *     null if a fixed track selection is required.
-   * @return The {@link TrackSelection} and corresponding {@link AudioTrackScore}, or null if no
-   *     selection was made.
+   * @param enableAdaptiveTrackSelection Whether adaptive track selection is allowed.
+   * @return The {@link TrackSelection.Definition} and corresponding {@link AudioTrackScore}, or
+   *     null if no selection was made.
    * @throws ExoPlaybackException If an error occurs while selecting the tracks.
    */
   @SuppressWarnings("unused")
-  protected @Nullable Pair<TrackSelection, AudioTrackScore> selectAudioTrack(
+  @Nullable
+  protected Pair<TrackSelection.Definition, AudioTrackScore> selectAudioTrack(
       TrackGroupArray groups,
       int[][] formatSupports,
       int mixedMimeTypeAdaptationSupports,
       Parameters params,
-      @Nullable TrackSelection.Factory adaptiveTrackSelectionFactory)
+      boolean enableAdaptiveTrackSelection)
       throws ExoPlaybackException {
     int selectedTrackIndex = C.INDEX_UNSET;
     int selectedGroupIndex = C.INDEX_UNSET;
@@ -1958,10 +1944,10 @@ public class DefaultTrackSelector extends MappingTrackSelector {
 
     TrackGroup selectedGroup = groups.get(selectedGroupIndex);
 
-    TrackSelection selection = null;
+    TrackSelection.Definition definition = null;
     if (!params.forceHighestSupportedBitrate
         && !params.forceLowestBitrate
-        && adaptiveTrackSelectionFactory != null) {
+        && enableAdaptiveTrackSelection) {
       // If the group of the track with the highest score allows it, try to enable adaptation.
       int[] adaptiveTracks =
           getAdaptiveAudioTracks(
@@ -1970,17 +1956,15 @@ public class DefaultTrackSelector extends MappingTrackSelector {
               params.allowAudioMixedMimeTypeAdaptiveness,
               params.allowAudioMixedSampleRateAdaptiveness);
       if (adaptiveTracks.length > 0) {
-        selection =
-            adaptiveTrackSelectionFactory.createTrackSelection(
-                selectedGroup, getBandwidthMeter(), adaptiveTracks);
+        definition = new TrackSelection.Definition(selectedGroup, adaptiveTracks);
       }
     }
-    if (selection == null) {
+    if (definition == null) {
       // We didn't make an adaptive selection, so make a fixed one instead.
-      selection = new FixedTrackSelection(selectedGroup, selectedTrackIndex);
+      definition = new TrackSelection.Definition(selectedGroup, selectedTrackIndex);
     }
 
-    return Pair.create(selection, Assertions.checkNotNull(selectedTrackScore));
+    return Pair.create(definition, Assertions.checkNotNull(selectedTrackScore));
   }
 
   private static int[] getAdaptiveAudioTracks(
@@ -2076,11 +2060,12 @@ public class DefaultTrackSelector extends MappingTrackSelector {
    * @param formatSupport The result of {@link RendererCapabilities#supportsFormat} for each mapped
    *     track, indexed by track group index and track index (in that order).
    * @param params The selector's current constraint parameters.
-   * @return The {@link TrackSelection} and corresponding track score, or null if no selection was
-   *     made.
+   * @return The {@link TrackSelection.Definition} and corresponding track score, or null if no
+   *     selection was made.
    * @throws ExoPlaybackException If an error occurs while selecting the tracks.
    */
-  protected @Nullable Pair<TrackSelection, Integer> selectTextTrack(
+  @Nullable
+  protected Pair<TrackSelection.Definition, Integer> selectTextTrack(
       TrackGroupArray groups, int[][] formatSupport, Parameters params)
       throws ExoPlaybackException {
     TrackGroup selectedGroup = null;
@@ -2138,7 +2123,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     return selectedGroup == null
         ? null
         : Pair.create(
-            new FixedTrackSelection(selectedGroup, selectedTrackIndex), selectedTrackScore);
+            new TrackSelection.Definition(selectedGroup, selectedTrackIndex), selectedTrackScore);
   }
 
   // General track selection methods.
@@ -2155,7 +2140,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
    * @return The {@link TrackSelection} for the renderer, or null if no selection was made.
    * @throws ExoPlaybackException If an error occurs while selecting the tracks.
    */
-  protected @Nullable TrackSelection selectOtherTrack(
+  @Nullable
+  protected TrackSelection.Definition selectOtherTrack(
       int trackType, TrackGroupArray groups, int[][] formatSupport, Parameters params)
       throws ExoPlaybackException {
     TrackGroup selectedGroup = null;
@@ -2181,8 +2167,9 @@ public class DefaultTrackSelector extends MappingTrackSelector {
         }
       }
     }
-    return selectedGroup == null ? null
-        : new FixedTrackSelection(selectedGroup, selectedTrackIndex);
+    return selectedGroup == null
+        ? null
+        : new TrackSelection.Definition(selectedGroup, selectedTrackIndex);
   }
 
   // Utility methods.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java
index 5645380b5d..13e823da29 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java
@@ -22,7 +22,9 @@ import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.chunk.MediaChunk;
 import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
 import com.google.android.exoplayer2.upstream.BandwidthMeter;
+import com.google.android.exoplayer2.util.Assertions;
 import java.util.List;
+import org.checkerframework.checker.nullness.compatqual.NullableType;
 
 /**
  * A track selection consisting of a static subset of selected tracks belonging to a {@link
@@ -35,6 +37,24 @@ import java.util.List;
  */
 public interface TrackSelection {
 
+  /** Contains of a subset of selected tracks belonging to a {@link TrackGroup}. */
+  final class Definition {
+    /** The {@link TrackGroup} which tracks belong to. */
+    public final TrackGroup group;
+    /** The indices of the selected tracks in {@link #group}. */
+    public final int[] tracks;
+
+    /**
+     * @param group The {@link TrackGroup}. Must not be null.
+     * @param tracks The indices of the selected tracks within the {@link TrackGroup}. Must not be
+     *     null or empty. May be in any order.
+     */
+    public Definition(TrackGroup group, int... tracks) {
+      this.group = group;
+      this.tracks = tracks;
+    }
+  }
+
   /**
    * Factory for {@link TrackSelection} instances.
    */
@@ -51,6 +71,33 @@ public interface TrackSelection {
      */
     TrackSelection createTrackSelection(
         TrackGroup group, BandwidthMeter bandwidthMeter, int... tracks);
+
+    /**
+     * Creates a new selection for each {@link Definition}.
+     *
+     * @param definitions A {@link Definition} array. May include null values.
+     * @param bandwidthMeter A {@link BandwidthMeter} which can be used to select tracks.
+     * @return The created selections. For null entries in {@code definitions} returns null values.
+     */
+    default @NullableType TrackSelection[] createTrackSelections(
+        @NullableType Definition[] definitions, BandwidthMeter bandwidthMeter) {
+      TrackSelection[] selections = new TrackSelection[definitions.length];
+      boolean createdAdaptiveTrackSelection = false;
+      for (int i = 0; i < definitions.length; i++) {
+        Definition definition = definitions[i];
+        if (definition == null) {
+          continue;
+        }
+        if (definition.tracks.length > 1) {
+          Assertions.checkState(!createdAdaptiveTrackSelection);
+          createdAdaptiveTrackSelection = true;
+          selections[i] = createTrackSelection(definition.group, bandwidthMeter, definition.tracks);
+        } else {
+          selections[i] = new FixedTrackSelection(definition.group, definition.tracks[0]);
+        }
+      }
+      return selections;
+    }
   }
 
   /**
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
index 1ae9e7a3ea..1502809f17 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
@@ -773,7 +773,7 @@ public final class ExoPlayerTest {
     }
     // There are 2 renderers, and track selections are made twice. The second time one renderer is
     // disabled, so only one out of the two track selections is enabled.
-    assertThat(createdTrackSelections).hasSize(4);
+    assertThat(createdTrackSelections).hasSize(3);
     assertThat(numSelectionsEnabled).isEqualTo(3);
   }
 
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
index 6ec2a825c3..eb69cc88da 100644
--- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
+++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
@@ -50,7 +50,6 @@ 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;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
@@ -382,6 +381,7 @@ public final class DashTestRunner {
 
     private DashTestTrackSelector(String tag, String audioFormatId, String[] videoFormatIds,
         boolean canIncludeAdditionalVideoFormats) {
+      super(new RandomTrackSelection.Factory(/* seed= */ 0));
       this.tag = tag;
       this.audioFormatId = audioFormatId;
       this.videoFormatIds = videoFormatIds;
@@ -389,7 +389,7 @@ public final class DashTestRunner {
     }
 
     @Override
-    protected TrackSelection[] selectAllTracks(
+    protected TrackSelection.Definition[] selectAllTracks(
         MappedTrackInfo mappedTrackInfo,
         int[][][] rendererFormatSupports,
         int[] rendererMixedMimeTypeAdaptationSupports,
@@ -403,22 +403,22 @@ public final class DashTestRunner {
       TrackGroupArray audioTrackGroups = mappedTrackInfo.getTrackGroups(AUDIO_RENDERER_INDEX);
       Assertions.checkState(videoTrackGroups.length == 1);
       Assertions.checkState(audioTrackGroups.length == 1);
-      TrackSelection[] selections = new TrackSelection[mappedTrackInfo.getRendererCount()];
-      selections[VIDEO_RENDERER_INDEX] =
-          new RandomTrackSelection(
+      TrackSelection.Definition[] definitions =
+          new TrackSelection.Definition[mappedTrackInfo.getRendererCount()];
+      definitions[VIDEO_RENDERER_INDEX] =
+          new TrackSelection.Definition(
               videoTrackGroups.get(0),
               getVideoTrackIndices(
                   videoTrackGroups.get(0),
                   rendererFormatSupports[VIDEO_RENDERER_INDEX][0],
                   videoFormatIds,
-                  canIncludeAdditionalVideoFormats),
-              0 /* seed */);
-      selections[AUDIO_RENDERER_INDEX] =
-          new FixedTrackSelection(
+                  canIncludeAdditionalVideoFormats));
+      definitions[AUDIO_RENDERER_INDEX] =
+          new TrackSelection.Definition(
               audioTrackGroups.get(0), getTrackIndex(audioTrackGroups.get(0), audioFormatId));
       includedAdditionalVideoFormats =
-          selections[VIDEO_RENDERER_INDEX].length() > videoFormatIds.length;
-      return selections;
+          definitions[VIDEO_RENDERER_INDEX].tracks.length > videoFormatIds.length;
+      return definitions;
     }
 
     private int[] getVideoTrackIndices(
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackSelector.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackSelector.java
index d3eca63461..6d37961005 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackSelector.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackSelector.java
@@ -15,21 +15,19 @@
  */
 package com.google.android.exoplayer2.testutil;
 
-import android.support.annotation.NonNull;
-import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
+import com.google.android.exoplayer2.upstream.BandwidthMeter;
 import java.util.ArrayList;
 import java.util.List;
 
 /** A fake {@link MappingTrackSelector} that returns {@link FakeTrackSelection}s. */
 public class FakeTrackSelector extends DefaultTrackSelector {
 
-  private final List<FakeTrackSelection> trackSelections = new ArrayList<>();
-  private final boolean mayReuseTrackSelection;
+  private final FakeTrackSelectionFactory fakeTrackSelectionFactory;
 
   public FakeTrackSelector() {
     this(false);
@@ -41,43 +39,71 @@ public class FakeTrackSelector extends DefaultTrackSelector {
    *     using the same {@link TrackGroup}.
    */
   public FakeTrackSelector(boolean mayReuseTrackSelection) {
-    this.mayReuseTrackSelection = mayReuseTrackSelection;
+    this(new FakeTrackSelectionFactory(mayReuseTrackSelection));
+  }
+
+  private FakeTrackSelector(FakeTrackSelectionFactory fakeTrackSelectionFactory) {
+    super(fakeTrackSelectionFactory);
+    this.fakeTrackSelectionFactory = fakeTrackSelectionFactory;
   }
 
   @Override
-  protected TrackSelection[] selectAllTracks(
+  protected TrackSelection.Definition[] selectAllTracks(
       MappedTrackInfo mappedTrackInfo,
       int[][][] rendererFormatSupports,
       int[] rendererMixedMimeTypeAdaptationSupports,
-      Parameters params)
-      throws ExoPlaybackException {
+      Parameters params) {
     int rendererCount = mappedTrackInfo.getRendererCount();
-    TrackSelection[] selections = new TrackSelection[rendererCount];
+    TrackSelection.Definition[] definitions = new TrackSelection.Definition[rendererCount];
     for (int i = 0; i < rendererCount; i++) {
       TrackGroupArray trackGroupArray = mappedTrackInfo.getTrackGroups(i);
       boolean hasTracks = trackGroupArray.length > 0;
-      selections[i] = hasTracks ? reuseOrCreateTrackSelection(trackGroupArray.get(0)) : null;
+      definitions[i] = hasTracks ? new TrackSelection.Definition(trackGroupArray.get(0)) : null;
     }
-    return selections;
-  }
-
-  @NonNull
-  private FakeTrackSelection reuseOrCreateTrackSelection(TrackGroup trackGroup) {
-    if (mayReuseTrackSelection) {
-      for (FakeTrackSelection trackSelection : trackSelections) {
-        if (trackSelection.getTrackGroup().equals(trackGroup)) {
-          return trackSelection;
-        }
-      }
-    }
-    FakeTrackSelection trackSelection = new FakeTrackSelection(trackGroup);
-    trackSelections.add(trackSelection);
-    return trackSelection;
+    return definitions;
   }
 
   /** Returns list of all {@link FakeTrackSelection}s that this track selector has made so far. */
   public List<FakeTrackSelection> getAllTrackSelections() {
-    return trackSelections;
+    return fakeTrackSelectionFactory.trackSelections;
   }
 
+  private static class FakeTrackSelectionFactory implements TrackSelection.Factory {
+
+    private final List<FakeTrackSelection> trackSelections;
+    private final boolean mayReuseTrackSelection;
+
+    public FakeTrackSelectionFactory(boolean mayReuseTrackSelection) {
+      this.mayReuseTrackSelection = mayReuseTrackSelection;
+      trackSelections = new ArrayList<>();
+    }
+
+    @Override
+    public TrackSelection createTrackSelection(
+        TrackGroup trackGroup, BandwidthMeter bandwidthMeter, int... tracks) {
+      if (mayReuseTrackSelection) {
+        for (FakeTrackSelection trackSelection : trackSelections) {
+          if (trackSelection.getTrackGroup().equals(trackGroup)) {
+            return trackSelection;
+          }
+        }
+      }
+      FakeTrackSelection trackSelection = new FakeTrackSelection(trackGroup);
+      trackSelections.add(trackSelection);
+      return trackSelection;
+    }
+
+    @Override
+    public TrackSelection[] createTrackSelections(
+        TrackSelection.Definition[] definitions, BandwidthMeter bandwidthMeter) {
+      TrackSelection[] selections = new TrackSelection[definitions.length];
+      for (int i = 0; i < definitions.length; i++) {
+        TrackSelection.Definition definition = definitions[i];
+        if (definition != null) {
+          selections[i] = createTrackSelection(definition.group, bandwidthMeter, definition.tracks);
+        }
+      }
+      return selections;
+    }
+  }
 }

From 651db9159e512b15c119d826c51edb30714d500f Mon Sep 17 00:00:00 2001
From: Arnold Szabo <szaboaarnold@gmail.com>
Date: Thu, 22 Nov 2018 11:09:44 +0200
Subject: [PATCH 213/832] #1583 - Adding support for pixel defined regions

---
 .../exoplayer2/text/ttml/TtmlDecoder.java     | 116 +++++++++++++++---
 ...egion.xml => bitmap_percentage_region.xml} |   0
 .../test/assets/ttml/bitmap_pixel_region.xml  |  23 ++++
 .../assets/ttml/bitmap_unsupported_region.xml |   2 +-
 .../exoplayer2/text/ttml/TtmlDecoderTest.java |  34 ++++-
 .../exoplayer2/ui/SubtitlePainter.java        |  32 -----
 6 files changed, 155 insertions(+), 52 deletions(-)
 rename library/core/src/test/assets/ttml/{bitmap_region.xml => bitmap_percentage_region.xml} (100%)
 create mode 100644 library/core/src/test/assets/ttml/bitmap_pixel_region.xml

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java
index 378ec602c4..a6946669b5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java
@@ -78,6 +78,8 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
   private static final Pattern FONT_SIZE = Pattern.compile("^(([0-9]*.)?[0-9]+)(px|em|%)$");
   private static final Pattern PERCENTAGE_COORDINATES =
       Pattern.compile("^(\\d+\\.?\\d*?)% (\\d+\\.?\\d*?)%$");
+  private static final Pattern PIXEL_COORDINATES =
+      Pattern.compile("^(\\d+\\.?\\d*?)px (\\d+\\.?\\d*?)px$");
   private static final Pattern CELL_RESOLUTION = Pattern.compile("^(\\d+) (\\d+)$");
 
   private static final int DEFAULT_FRAME_RATE = 30;
@@ -116,6 +118,7 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
       int eventType = xmlParser.getEventType();
       FrameAndTickRate frameAndTickRate = DEFAULT_FRAME_AND_TICK_RATE;
       CellResolution cellResolution = DEFAULT_CELL_RESOLUTION;
+      TtsExtent ttsExtent = null;
       while (eventType != XmlPullParser.END_DOCUMENT) {
         TtmlNode parent = nodeStack.peek();
         if (unsupportedNodeDepth == 0) {
@@ -124,12 +127,13 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
             if (TtmlNode.TAG_TT.equals(name)) {
               frameAndTickRate = parseFrameAndTickRates(xmlParser);
               cellResolution = parseCellResolution(xmlParser, DEFAULT_CELL_RESOLUTION);
+              ttsExtent = parseTtsExtent(xmlParser);
             }
             if (!isSupportedTag(name)) {
               Log.i(TAG, "Ignoring unsupported tag: " + xmlParser.getName());
               unsupportedNodeDepth++;
             } else if (TtmlNode.TAG_HEAD.equals(name)) {
-              parseHeader(xmlParser, globalStyles, cellResolution, regionMap, imageMap);
+              parseHeader(xmlParser, globalStyles, cellResolution, ttsExtent, regionMap, imageMap);
             } else {
               try {
                 TtmlNode node = parseNode(xmlParser, parent, regionMap, frameAndTickRate);
@@ -228,10 +232,30 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
     }
   }
 
+  private TtsExtent parseTtsExtent(XmlPullParser xmlParser) {
+    String ttsExtent = XmlPullParserUtil.getAttributeValue(xmlParser, TtmlNode.ATTR_TTS_EXTENT);
+    if (ttsExtent != null) {
+      Matcher extentMatcher = PIXEL_COORDINATES.matcher(ttsExtent);
+      if (extentMatcher.matches()) {
+        try {
+          int width = Integer.parseInt(extentMatcher.group(1));
+          int height = Integer.parseInt(extentMatcher.group(2));
+          return new TtsExtent(width, height);
+        } catch (NumberFormatException e) {
+          Log.w(TAG, "Ignoring tts extent");
+          return null;
+        }
+      }
+    }
+
+    return null;
+  }
+
   private Map<String, TtmlStyle> parseHeader(
       XmlPullParser xmlParser,
       Map<String, TtmlStyle> globalStyles,
       CellResolution cellResolution,
+      TtsExtent ttsExtent,
       Map<String, TtmlRegion> globalRegions,
       Map<String, String> imageMap)
       throws IOException, XmlPullParserException {
@@ -249,7 +273,7 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
           globalStyles.put(style.getId(), style);
         }
       } else if (XmlPullParserUtil.isStartTag(xmlParser, TtmlNode.TAG_REGION)) {
-        TtmlRegion ttmlRegion = parseRegionAttributes(xmlParser, cellResolution);
+        TtmlRegion ttmlRegion = parseRegionAttributes(xmlParser, cellResolution, ttsExtent);
         if (ttmlRegion != null) {
           globalRegions.put(ttmlRegion.id, ttmlRegion);
         }
@@ -276,12 +300,13 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
 
   /**
    * Parses a region declaration.
-   *
-   * <p>If the region defines an origin and extent, it is required that they're defined as
-   * percentages of the viewport. Region declarations that define origin and extent in other formats
-   * are unsupported, and null is returned.
+   * <p>
+   * Supports both percentage and pixel defined regions. In case of pixel defined regions
+   * the passed {@code ttsExtent} is used as a reference window to convert the pixel values
+   * to fractions. In case of missing tts:extent the pixel defined regions can't be parsed,
+   * and null is returned.
    */
-  private TtmlRegion parseRegionAttributes(XmlPullParser xmlParser, CellResolution cellResolution) {
+  private TtmlRegion parseRegionAttributes(XmlPullParser xmlParser, CellResolution cellResolution, TtsExtent ttsExtent) {
     String regionId = XmlPullParserUtil.getAttributeValue(xmlParser, TtmlNode.ATTR_ID);
     if (regionId == null) {
       return null;
@@ -289,17 +314,39 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
 
     float position;
     float line;
+
     String regionOrigin = XmlPullParserUtil.getAttributeValue(xmlParser, TtmlNode.ATTR_TTS_ORIGIN);
     if (regionOrigin != null) {
-      Matcher originMatcher = PERCENTAGE_COORDINATES.matcher(regionOrigin);
-      if (originMatcher.matches()) {
+
+      Matcher originPercentageMatcher = PERCENTAGE_COORDINATES.matcher(regionOrigin);
+      Matcher originPixelMatcher = PIXEL_COORDINATES.matcher(regionOrigin);
+
+      if (originPercentageMatcher.matches()) {
         try {
-          position = Float.parseFloat(originMatcher.group(1)) / 100f;
-          line = Float.parseFloat(originMatcher.group(2)) / 100f;
+          position = Float.parseFloat(originPercentageMatcher.group(1)) / 100f;
+          line = Float.parseFloat(originPercentageMatcher.group(2)) / 100f;
         } catch (NumberFormatException e) {
           Log.w(TAG, "Ignoring region with malformed origin: " + regionOrigin);
           return null;
         }
+      } else if (originPixelMatcher.matches()) {
+        if (ttsExtent == null) {
+          Log.w(TAG, "Ignoring region with missing tts extent: " + regionOrigin);
+          return null;
+        }
+
+        try {
+          int width = Integer.parseInt(originPixelMatcher.group(1));
+          int height = Integer.parseInt(originPixelMatcher.group(2));
+
+          // Convert pixel values to fractions
+          position =  width / (float) ttsExtent.width;
+          line = height / (float) ttsExtent.height;
+
+        } catch (NumberFormatException e) {
+          Log.w(TAG, "Ignoring region with malformed extent: " + regionOrigin);
+          return null;
+        }
       } else {
         Log.w(TAG, "Ignoring region with unsupported origin: " + regionOrigin);
         return null;
@@ -318,11 +365,32 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
     float height;
     String regionExtent = XmlPullParserUtil.getAttributeValue(xmlParser, TtmlNode.ATTR_TTS_EXTENT);
     if (regionExtent != null) {
-      Matcher extentMatcher = PERCENTAGE_COORDINATES.matcher(regionExtent);
-      if (extentMatcher.matches()) {
+
+      Matcher extentPercentageMatcher = PERCENTAGE_COORDINATES.matcher(regionExtent);
+      Matcher extentPixelMatcher = PIXEL_COORDINATES.matcher(regionExtent);
+
+      if (extentPercentageMatcher.matches()) {
         try {
-          width = Float.parseFloat(extentMatcher.group(1)) / 100f;
-          height = Float.parseFloat(extentMatcher.group(2)) / 100f;
+          width = Float.parseFloat(extentPercentageMatcher.group(1)) / 100f;
+          height = Float.parseFloat(extentPercentageMatcher.group(2)) / 100f;
+        } catch (NumberFormatException e) {
+          Log.w(TAG, "Ignoring region with malformed extent: " + regionOrigin);
+          return null;
+        }
+      } else if (extentPixelMatcher.matches()) {
+        if (ttsExtent == null) {
+          Log.w(TAG, "Ignoring region with missing tts extent: " + regionOrigin);
+          return null;
+        }
+
+        try {
+          int extentWidth = Integer.parseInt(extentPixelMatcher.group(1));
+          int extentHeight = Integer.parseInt(extentPixelMatcher.group(2));
+
+          // Convert pixel values to fractions
+          width =  extentWidth / (float) ttsExtent.width;
+          height =  extentHeight / (float) ttsExtent.height;
+
         } catch (NumberFormatException e) {
           Log.w(TAG, "Ignoring region with malformed extent: " + regionOrigin);
           return null;
@@ -668,7 +736,9 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
     }
   }
 
-  /** Represents the cell resolution for a TTML file. */
+  /**
+   * Represents the cell resolution for a TTML file.
+   */
   private static final class CellResolution {
     final int columns;
     final int rows;
@@ -678,4 +748,18 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
       this.rows = rows;
     }
   }
+
+  /**
+   * Represents the tts:extent for a TTML file, used as a
+   * reference window when the regions are defined by pixels
+   */
+  private static final class TtsExtent {
+    final int width;
+    final int height;
+
+    TtsExtent(int width, int height) {
+      this.width = width;
+      this.height = height;
+    }
+  }
 }
diff --git a/library/core/src/test/assets/ttml/bitmap_region.xml b/library/core/src/test/assets/ttml/bitmap_percentage_region.xml
similarity index 100%
rename from library/core/src/test/assets/ttml/bitmap_region.xml
rename to library/core/src/test/assets/ttml/bitmap_percentage_region.xml
diff --git a/library/core/src/test/assets/ttml/bitmap_pixel_region.xml b/library/core/src/test/assets/ttml/bitmap_pixel_region.xml
new file mode 100644
index 0000000000..611d8c7dce
--- /dev/null
+++ b/library/core/src/test/assets/ttml/bitmap_pixel_region.xml
@@ -0,0 +1,23 @@
+<tt xmlns="http://www.w3.org/ns/ttml" xmlns:ttm="http://www.w3.org/ns/ttml#metadata" xmlns:tts="http://www.w3.org/ns/ttml#styling" xmlns:smpte="http://www.smpte-ra.org/schemas/2052-1/2010/smpte-tt" xml:lang="eng" tts:extent="1280px 720px">
+    <head>
+        <metadata>
+            <smpte:image imagetype="PNG" encoding="Base64" xml:id="img_0">
+                iVBORw0KGgoAAAANSUhEUgAAAXAAAABICAYAAADvR65LAAAACXBIWXMAAAsTAAALEwEAmpwYAAANIUlEQVR4nO2d/5GjSA+GNVVfALMh4EyucAIXxDiGCWFiwKngukwghA1h74/vxMia/t3qNtjvU7W1u8Ygtbp53agFvL2/v/8hAAAAh+N/j3YAAABAGRBwAAA4KBBwAAA4KC8j4MMwEBHRuq4P9qQ/vdv+yrFOBTECFhxawFNPgnEc6Xw+ExHRPM90u92a+7YXerZ9HEc6nU50Op2IiGhZFprnGSKleOXxCGwxE/BxHLd/uwYkb1+WpeqE1iLBLMuy/XEdX54wRyEW01RCbbeyMQwDnc/nzRYRBfvjWUmN517Ho9V4eDTP0o4YJgLOJ+/pdHLOKMZxpMvlQkRE0zQVn9B8HC3eknmeq2zsBSmI8zw3EUJLG1K85Y/psiyWLu+aHn3WkqP7zzxLO1IwEXB92ezbzsEsQYu3Fge2wX+etcNKaC2iwzDc9cs0TU896wFgL5gKuEug9cldIqxyhk/0c5bNNng7xOMbGYuWcZF9jPgD0IdqAY8JdGx2nkJsYWxdV1rXFcLhoXVcQiktAEA7igScqz+I6MeCotwmt7N4l5ZP+VIntZT4k7NP7Luu7fqKQsc4N3Ytbej+1p9pm67PYrYs4l3SDzlYx7PVeAwdI8f/Hn1Zsm9tP9SOtdz21WYosgVclkAR3QdIpjnkdv77crls4ltaPlU72/N1bKzkTadxUvaRsXItrLrKyfgzPQhLY9fShus4cmzIdms/2Cbvp+NTG2+XDT4Gp3lcNlLbHotDajx7jkcr/3v0Zcm+pf1gNdb02A+NI+mrhO2mjr9sAT+dTj8cldtCAqtn4yVwh5T+ALDvLj9Pp5NTaIdhoMvl4my3r/KGbZ3PZ1qWxbuw6ion89kpzTO3suEbC7IaRbbb98Ovv1cab2lDnsCaZVl+nOjaBlFe6qk0nj3Ho6X/PfqyZN/cdliNtZxxFKqmy52NZws4/0IwoXpWKdhStHMFiG2yLT75SsqE2B9XG/h4evYgO1jvJ39FLXLNXMWhxVHarU0hWdmQcdQlhPrfEletuEyxWcQ71M/yhJPb+XP+k9qfNfFsMR7ZXuo5UeN/bV/6fC3ZN7cd1mONjy3HEJdP8/5sU44/uV8u2QJ+u902Zz4+PojIPe2XjnJgS3N067rSPM/O3JYMXsol2TzPd6I/DAMty7IFWp+4crDI6he5Hw8YCwFf15Wu1+uWS+OT2LK23coGjwV5c1VKX8v+4v/LWbpFvGP9zPblmJEzo9PplJTTJaqLp+V4lNuXZaHr9Rr1vdb/0r6M+Vqyb247rMeaFmk50eRtevLgSjdxW1KoqkKJXR5KR2vFh4/vynHJf8cuH7Wv67pug1BfCukFBtkO/lGR/ozjiEoYig8+LZyMZbxj/ewSDbm9FzXjUZ78epLjmr23ILUvc3zt0c7WY0366JsMuK48mi9iMjIAOemTGm632zawXTnMlEueHF907kzvyyebLwcG3Pgu7y3jbVmp1JKa8ejL70vhaC3gqX2Z42uPdrYea/pHWPooNYy/V9pPxQIuBVrDq7rsrCWy5lteusv8plU6g48nbWtk+3LypsAN4h2G48OTFR0PGb9Hx6fG1x7tbDnWfIKshf3r62ubAJfc9p8s4PohUvJvmUti5Hadd7SaFXAOVua82GavdIbuZNAWxPubI1351fj6qHa2GGvrutI0TbQsy12OnOg7Z9+kjNAl0nKbD520b4Er5wTAM5OSmtxLGqnG1yO1MxVebNV5dpkaJkqraksWcLnSHMofhbbV5HpS/Ou9AEV0/8t8tIF0RBDv/1Nb2dWTGl8f2c6asea6Q1nDQk70fWOPq3IlRLKAy/IcLq/hMhgJp0x4u5x1t+4Ea/HW+Sq9kiwXcvn7oBzEO8yjJikl1Pjao509xlpokVQjq+ykDzHNzFrElHWY7Jg2oJ22EG25KOrLoctLD6vKF70SfT6f70rPdHrIZ9M1EGWbYvSoKOhVtRDCKt57oEU8ZXxC5XMWz0ap9b/GV8t2+tphOdZ4kVXa0Hokt43jGNTOHIpupWeHXY3i7ZYnmMwNuWzLhQAim7pzeSxd6cK29fPJXXWejBbr0JoC0f2g1O2z+mHsYSOXmng/mh7xlPGRN8oxfJ7M85x8I08r/2t8rdk3tR1WY01mHLRNmXom+r5ZjO3IK4GSeBcLuEugLZ79HUM3kn1ipmkyXSzlSxvuJA5+ik3dOVz3mfpL63p8AH+ee3I+0kYONfHeA63j6YsP0f154EoL9Pa/xtfadqa0w3Ks+c5v12STv+9Dp55DFAl4LD1ilcJg5G2orudZsL1QmWLIH+mv63syP6UvjXx3ovF+8upB2tPPEPH5patrSuIaa3utjVj8UvyQlMY7xb6ln759U+LZajzGzoMe/lv5WrNvajtqxpq0JdMxof154it1TB8np+/e3t/f/yR98z94lu0TcIv8W4p9TWzGzy85DT35LNQul+3UqwzffvLzmF+S3Pr21LbX2EiJX8yPmF8p8a7t55R25Prt8qfFeCSyufK18D/lmKXnT+q+OeM6d6yN40hfX19E9D1Lzz2HdMaCKF83swUcAABeHSngn5+fD7vj1eSdmAAAAPoDAQcAgIMCAQcAgIMCAQcAgIMCAQcAgAL2cCcwBBwAADKRVSePfOY6yggBAOCgvP39B/od4p9fvxAgAB7EX79/vz3ahz2DFAoAABwUCDgAABwUCDgAABwUCPhOaP0QsBb08Hnvcdm7f6141XbvDQh4Q1IHOb8Pj4iy3kj9SHr4vPe47N2/Vrxqu/cIBNyYcRzvngvMyGcY+14JR0S7fVGBi5DP/LhRoro62UfFJdX/I/abBa/a7r0BATeEX5cUeuMOvwj6mS89+X2f/D7DPb7+LMTR/QevAwTcCC3erlcpyT+h92cehR4+HzEurwD6ZR9AwA3gGZt8756cZfObN3xv39nLbbk59PD5iHF5BdAv+wECboDrXXhyhr2uK63rGhzsRzwRevh8xLi8AuiXfQABN8KXOkklVLHi25ZbyuX6fk05mO948gdNL+jm2ukRF72vhf8lPliW5vn6JnRs3ifFh979AtxAwI0JLWD6CJVl6W1sw/WW+9DLhF37SH9zy8FcPvNnWgAvl8tmL8dO67j47JX47xP8mA86/Vbit68d7K/2Sy+iy+9LH5Zlcba1d78APxBwY/iEzxXEUFkWb5Mi4bLrqm5JqYzx2S3xWQsB+yavUPYQl5g9fYyY/9qXFB+GYaDL5eK1WVNjLY+p/ZeL6LLiRsM/WqH29uoX4AYCbgDPKHjg8ozKugztdDptthhpU89q9OxOpndcteq1LMtC0zRtbWekvy2qF3Lj4qPG/5K+keKt9+PPa8eObIe8F0GjhViO4VIfrPoF+IGAG7CuK83z7Myd8iC2uGyc5/nuB2EYBlqWhS6Xy2ZTzpakEPC+t9tty/P6Zl6lrOtK1+t1y3XySdp6ppUblxb+1/YN25C2WTyv12t+UP5Djj3+v15gn6Zp+zcR3flQ8yNv1S/ADwTcCB6Irhyq/HfNZbG+fF/XdTtB9YyaRZr3k3a5KsZ6Bv4ocuKyBx9038gfCD0ZqJ2psoiG9tfb2Hei7/FbYn8P/fLsQMANud1u2+DUQk50P6MpEfGc9INv0bL0eHtmD+0o7RseL67jhW78yvErp3ImlLcusQ3aAgE3RtZ8y+oPubBzPp+7XDpKkUCucV9w3/CPuuuuXfn/VuNFVyhZCjhoDwS8Ibfbbcs5E92vzo/jiPwfIKI2C8opyAol1wInRHz/QMA7oPOaODEAk3LjV4tUhBbvaZrurtQ+Pj62xUawXyDgnZCLNwAwehGzF/rGHn01iPz1MYCAd6S3eMsfjNht1KAfe/gxl+sj4LhAwA3gG2aIyFuy5buhphVSJHw3kvQQkNoqikfTwn8up4uVCbZ8doguE9QzcFwpHgMIuAG6bNC1GKTv7GstaLKWl4ju8p1E9TdpxGwzuu1HqIjp4b9cE9F9Q/TdP/M8V93I40Pbkp/pNoP9AgE3Rp/sRPezmWmaur2GikWCxYAfytRjduV6tAB/3kKQrGntP894WbzlA7N0CWGL9Jd8/EPIPtg3EHAD+GTU9d46ZRK6nT6UUolt4+36e/I2adet/UTuhzelEvNLV96UpI1axCXVbor/NT7Iu3ddKbaaxy/E2sxjY1mWH1eP8imCJcdv2S/gnre///x5tA+75p9fv7IC5Mstxy69+SW6vsd3+rZJmyEb8iW97M/5fN5KxT4/P7Pr0lP9kljasIhLiBT/LXxw2alN1cT8cn1X2ib6FvDc2Fv2y1+/f79F3H9pIOARcgX8SIzjSF9fX0RUJuAAtAYCHgYplBcGuU4Ajg0E/ImRl8b6clU/EQ8AcDwg4E+MrECRz2Ym+vnSAIg4AMcDAv7E6OdK88KRrpDBm1EAOCYQ8CeGH6JF9PNFE0Q/X/QAADgWqEKJ8AxVKJzv1nXgR7grErw2qEIJAwGP8AwCDsBRgYCH+RdHEwkWLXE/8gAAAABJRU5ErkJggg==
+            </smpte:image>
+            <smpte:image imagetype="PNG" encoding="Base64" xml:id="img_1">
+                iVBORw0KGgoAAAANSUhEUgAAAaAAAAAkCAIAAABAAnl0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAIBklEQVR4nO1d65GrPAz1nfkKSAu4FWglqeXWQFohrZhW7o8zaBS/kB+QhE/nx86uA5YsnT1+CHb/3G43o1AoFFfEf592QKFQKI6CCpxCobgsVOAUCsVloQL3SxiGwRizruuht5TiBBM/hJ+Lxs85XAQVuJ/BOI7TNBljlmV5vV4H3XKCVxfGz0Xj5xwuRaXAjeOIb7ygoN05J58QqCuOoh7+PyAu8sZULjK3lOIEE5fBB6ORT1MK105fjcANwzBNk7XWU/1xHB+PhzFmnmehPOEWa63X7pxblsU5d8lZpSOQi2maEK4jZoUTTCjaoWmKokbgrLWQJOdc2I74VnRLd6Gfx+OBWUU1jlAXWMWZ0Bx9FeoFzhOyYRhI9Spmj2VZaJGM/jEdoU/VOMOCoNH4WmiOvg3FApcSstSyTg5ODpwmQOCmaVK6ABqH74fm6KsgFTjUkg0TMt5I7VC39sIzWGI3jOMY5Q05kLIVeiL0TXJZx4c2hO3hj5QOnpeObh9qopon8rTmTVTctbtT2R1U46hTDlekqdHDipHWpanuSkAkcFRLNix8tH+kdnx9PB6QucbC8+v1ggkgLNeSS8YY51xYkeAlcPOeeBQxUkShnqPdUo0l31WIYRhQhHHOPZ/PqJ/c1v1+hxUUbbzL8COndSbyIfUlbh9kojqAYbhCi8iXZyLqMPXj1cRS6aBoUAs8D6+JmpNQa3fI0XuL0pRC9/T1SlOR0RAigeOJ4Y3cM6+9y1Hrsiywa60dhoGvXHBCxy+GRS86dDt95X56zIYAhd1aa0mPotfYoKCcAepcfDh8LNQJL1XzKw2r6Idu0OIiE4dMBKLe9jXRHkCTTatzjv+2cxPmnR4IO/LrBSF8ciJa7o8u5aJPXUiolYKE7fI0pXBE+rqkqdSoB5HAQS+5017+SNRI17o84YEOU0rKfaDTuujGAb55Q4DQcNGkINJAaP0IPeLX8N7orrxY0KfoEz9623wSPs7RVHDmeeZzD7kU3iKJwAkmGgMosUhx82pWQB0n4TZ1S9wouj1Prd1OMmwvSlMKjemLClOmZ3maGjkjErjX6wWT9/vdBCtzSj8C3fcBHAicMYZPs+u6zvNsNsmARnhrXQ6UaBGLYRicc9gq8lDyiNPo6MAFhiisy7JgpGQabNudjbEm5Vnk8s2Fj9QtxdF1XZ/PJzlALlVH4AQT7QGUWAQ/6TeTFl9yNfHAucEjIDwPklArg122F6Upher04UqbLgY2pqmRM2VVVJtY91L+Tnu8kBvCJGbeBYKDO4yLvYUh7Qc97V7X1TvRN9u6Bu3rui7Lgq52F0TkTChq9Cn4RLZMp+eqdiNwgoleAdy16JGe2ruM0SPe7i0Sau2iiO11KEofpQnpozk7WgxsSVM7ZwoEjozt7k9PA7mUp++uY5TIzCj4NZ45osIu4XgWMU3xkIIomKDIVhcGn5CaoiBXB7DIYkfAQywZipIioZYQQrbXofp3BJqVmSxbRt3OmQKBIyHjjZigzGFsiy5kxnGkkfdKOfWQCZZl5WPyx1uO5U95vOnXMCHzevPar4H2AH4EfDnz9+9fzEbyN6Ik1MrgCLbXITUQnsru6WvkzI7ARYPr1XSonW+tu6w7UupGR358Mjkz65n5aheOHVHTnIFGbyb8yKL4HLQE8HzgFMxthT9+AN/4LNQuvoHtuzjHqzrO7AhcWJ82QU3aM790/bME3qTB8w3Oof1+v0NeT0BGdyR6RMsBCqPX4eUFrjGAHwEO8vl5EzJo09XDdnwD278E1ZzZETi31Xf5ZjhcKPLGXsdGtPk1QS3ZGDPPM2fVyccxjcXicKWG3kLhO61ocybaA/gpQObM9hTrdPCrhN/AdgmiO62+qObMjsBR+RkzCSq19Cm2pWgnDepFXL4k9NbA3ePID1lSTxLw+kAL+DEc9ex9E/3x19ErgN8AyA1NRZmnTyTUSuGrzmFTA+le8Y8are5hv8hAD56YYE3Bl299J2T+4Dg/0eMn9HxOa/y14ZWgaZqiT9bQNdHKdNErcjxt3uKXtxcNAc4fuixqNNExgB3hMYfvGzjGcYySfxcSaqVQx/aDmJAaSHQh0t1oNWekr2rZ2IMgaO8yMGvt/X53rPRLi3PeOX3PS7c29iZZKfiTNaEhLI/pGjoZoWsQByF9vRFx+Y4KXwb87YiD9rYdTfQKYBd4KabvQy5hunVbIaj0JEFCLYmHebafwIToQGghctCJSiNnCgRu6foH4EIT3rmpe3/QmTdibMS5Lrue1+tlt2Njr2fafWMWRaBD6/I9CM1L5l3saPdqSqK6bG/s0pl3d6XoZaJXALuAS9W0vZQavdJuTyqEH/HDmRQk1Ep5WMT2o5kQpo+cmee5b3UxY9SUcEYqcKl9qHChkULqdrf9yXLPolewt+w1t2jiU53TbMzbn8+ne38HGFdykaXDF+KQ21D0cAzmpdCHlG/54dAsZ4MHFYsikEJHE10CWDGosJHrDh+mCbQMVJzeX0dP+Ry1LqFWiAq2Z9KUQnv6woVIRc+ZW1o48+d2u2U+BrBYC+Wmy7kJP6QEJIsX/q9quKhH/wlOWORKjSj0J/XHW/g18tWW51vKAZOIan44UZ8rIhBFXxONASy1KPTEbe9LRrlk3nctpjBHRkatKIRsrzPRmL5M7jqmKRyakDMigVMoFIpfhP5fVIVCcVmowCkUistCBU6hUFwWKnAKheKyUIFTKBSXhQqcQqG4LFTgFArFZfEPuuTdBr3uWzgAAAAASUVORK5CYII=
+            </smpte:image>
+        </metadata>
+        <styling>
+            <style/>
+        </styling>
+        <layout>
+            <region xml:id="region_0" tts:extent="653px 86px" tts:origin="307px 562px"/>
+            <region xml:id="region_1" tts:extent="730px 43px" tts:origin="269px 612px"/>
+        </layout>
+    </head>
+    <body>
+        <div begin="00:00:00.200" end="00:00:03.000" region="region_0" smpte:backgroundImage="#img_0"/>
+        <div begin="00:00:03.200" end="00:00:06.937" region="region_1" smpte:backgroundImage="#img_1"/>
+    </body>
+</tt>
\ No newline at end of file
diff --git a/library/core/src/test/assets/ttml/bitmap_unsupported_region.xml b/library/core/src/test/assets/ttml/bitmap_unsupported_region.xml
index 611d8c7dce..94c90e0f3d 100644
--- a/library/core/src/test/assets/ttml/bitmap_unsupported_region.xml
+++ b/library/core/src/test/assets/ttml/bitmap_unsupported_region.xml
@@ -1,4 +1,4 @@
-<tt xmlns="http://www.w3.org/ns/ttml" xmlns:ttm="http://www.w3.org/ns/ttml#metadata" xmlns:tts="http://www.w3.org/ns/ttml#styling" xmlns:smpte="http://www.smpte-ra.org/schemas/2052-1/2010/smpte-tt" xml:lang="eng" tts:extent="1280px 720px">
+<tt xmlns="http://www.w3.org/ns/ttml" xmlns:ttm="http://www.w3.org/ns/ttml#metadata" xmlns:tts="http://www.w3.org/ns/ttml#styling" xmlns:smpte="http://www.smpte-ra.org/schemas/2052-1/2010/smpte-tt" xml:lang="eng">
     <head>
         <metadata>
             <smpte:image imagetype="PNG" encoding="Base64" xml:id="img_0">
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java
index 3f0dc708ad..11ab96d2e8 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java
@@ -63,7 +63,8 @@ public final class TtmlDecoderTest {
   private static final String FONT_SIZE_INVALID_TTML_FILE = "ttml/font_size_invalid.xml";
   private static final String FONT_SIZE_EMPTY_TTML_FILE = "ttml/font_size_empty.xml";
   private static final String FRAME_RATE_TTML_FILE = "ttml/frame_rate.xml";
-  private static final String BITMAP_REGION_FILE = "ttml/bitmap_region.xml";
+  private static final String BITMAP_REGION_FILE = "ttml/bitmap_percentage_region.xml";
+  private static final String BITMAP_PIXEL_REGION_FILE = "ttml/bitmap_pixel_region.xml";
   private static final String BITMAP_UNSUPPORTED_REGION_FILE = "ttml/bitmap_unsupported_region.xml";
 
   @Test
@@ -502,7 +503,7 @@ public final class TtmlDecoderTest {
   }
 
   @Test
-  public void testBitmapWithRegion() throws IOException, SubtitleDecoderException{
+  public void testBitmapPercentageRegion() throws IOException, SubtitleDecoderException {
     TtmlSubtitle subtitle = getSubtitle(BITMAP_REGION_FILE);
     List<Cue> output = subtitle.getCues(1000000);
     assertThat(output).hasSize(1);
@@ -540,7 +541,34 @@ public final class TtmlDecoderTest {
   }
 
   @Test
-  public void testBitmapWithUnsupportedRegion() throws IOException, SubtitleDecoderException{
+  public void testBitmapPixelRegion() throws IOException, SubtitleDecoderException {
+    TtmlSubtitle subtitle = getSubtitle(BITMAP_PIXEL_REGION_FILE);
+    List<Cue> output = subtitle.getCues(1000000);
+    assertThat(output).hasSize(1);
+    Cue ttmlCue = output.get(0);
+
+    assertThat(ttmlCue.text).isEqualTo(null);
+    assertThat(ttmlCue.bitmap).isNotNull();
+    assertThat(ttmlCue.position).isEqualTo(307f / 1280f);
+    assertThat(ttmlCue.line).isEqualTo(562f / 720f);
+    assertThat(ttmlCue.size).isEqualTo(653f / 1280f);
+    // bitmap should be displayed at its natural height for the specified width (= size)
+    assertThat(ttmlCue.bitmapHeight).isEqualTo(Cue.DIMEN_UNSET);
+
+    output = subtitle.getCues(4000000);
+    ttmlCue = output.get(0);
+
+    assertThat(ttmlCue.text).isEqualTo(null);
+    assertThat(ttmlCue.bitmap).isNotNull();
+    assertThat(ttmlCue.position).isEqualTo(269f / 1280f);
+    assertThat(ttmlCue.line).isEqualTo(612f / 720f);
+    assertThat(ttmlCue.size).isEqualTo(730f / 1280f);
+    // bitmap should be displayed at its natural height for the specified width (= size)
+    assertThat(ttmlCue.bitmapHeight).isEqualTo(Cue.DIMEN_UNSET);
+  }
+
+  @Test
+  public void testBitmapUnsupportedRegion() throws IOException, SubtitleDecoderException{
     TtmlSubtitle subtitle = getSubtitle(BITMAP_UNSUPPORTED_REGION_FILE);
     List<Cue> output = subtitle.getCues(1000000);
     assertThat(output).hasSize(1);
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java
index b881792576..4f22362de6 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java
@@ -357,38 +357,6 @@ import com.google.android.exoplayer2.util.Util;
   private void setupBitmapLayout() {
     int parentWidth = parentRight - parentLeft;
     int parentHeight = parentBottom - parentTop;
-
-    // Default position
-    if (cuePosition == Cue.DIMEN_UNSET) {
-      cuePositionAnchor = Cue.ANCHOR_TYPE_MIDDLE;
-      cuePosition = 0.5f;
-    }
-
-    // Default line
-    if (cueLine == Cue.DIMEN_UNSET) {
-      cueLineAnchor = Cue.ANCHOR_TYPE_MIDDLE;
-      cueLine = 0.85f;
-    }
-
-    // Default width and height
-    if (cueSize == Cue.DIMEN_UNSET) {
-      // Scale up by height to be 10% of the parent's height
-      cueBitmapHeight = 0.1f;
-
-      float heightInParent = parentHeight * cueBitmapHeight;
-      float widthInParent = heightInParent * ((float) cueBitmap.getWidth() / cueBitmap.getHeight());
-      cueSize = widthInParent / parentWidth;
-
-      // If by the previous scaling the width exceeds 50% of the parent's width
-      // then scale back to 50% by width and adjust its height to keep the aspect ratio
-      if (cueSize > 0.5f) {
-        cueSize = 0.5f;
-        widthInParent = parentWidth * cueSize;
-        heightInParent = widthInParent * ((float) cueBitmap.getHeight() / cueBitmap.getWidth());
-        cueBitmapHeight = heightInParent / parentHeight;
-      }
-    }
-
     float anchorX = parentLeft + (parentWidth * cuePosition);
     float anchorY = parentTop + (parentHeight * cueLine);
     int width = Math.round(parentWidth * cueSize);

From 6ebb6124bbcc8645f8e7bae4905a6439a1b3ad33 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 20 Nov 2018 09:33:47 -0800
Subject: [PATCH 214/832] Offline refactor step 1a - Make DownloadAction
 concrete

1. Pull up all subclasses of DownloadAction into DownloadAction
2. Add DownloaderFactory for Downloader instantiation, and DefaultDownloaderFactory
   to replace the instantiation logic being removed from the DownloadAction
   subclasses.

This change will upgrade existing action files gracefully (i.e. it does not
lose compatibility with the existing offline implementation, other than some
minor breaking changes to the API).

TODOs:

1. Move test methods from the XDownloadActionTest classes into DownloadActionTest.
   This will be done in a subsequent CL. There's a lot of consolidation that can
   be done here, including de-duplicating some of the test code added in this CL.
2. Look at merging DownloaderConstructorHelper into DefaultDownloaderFactory.
3. Use customCacheKey in DASH/HLS/SS Downloaders, for completeness.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=222258983
---
 .../exoplayer2/demo/DemoApplication.java      |   7 +-
 .../exoplayer2/demo/DownloadTracker.java      |  13 +-
 library/core/proguard-rules.txt               |  17 +-
 .../exoplayer2/offline/ActionFile.java        |   8 +-
 .../offline/DefaultDownloaderFactory.java     | 120 ++++++
 .../exoplayer2/offline/DownloadAction.java    | 279 +++++++------
 .../exoplayer2/offline/DownloadManager.java   |  79 ++--
 .../exoplayer2/offline/DownloaderFactory.java |  28 ++
 .../offline/ProgressiveDownloadAction.java    | 138 -------
 .../offline/ProgressiveDownloadHelper.java    |  16 +-
 .../offline/ProgressiveDownloader.java        |   3 +-
 .../offline/SegmentDownloadAction.java        | 138 -------
 .../exoplayer2/offline/ActionFileTest.java    | 160 ++------
 .../offline/DefaultDownloaderFactoryTest.java |  49 +++
 .../offline/DownloadManagerTest.java          | 369 +++++++++---------
 .../ProgressiveDownloadActionTest.java        |  72 +++-
 .../dash/offline/DashDownloadAction.java      |  84 ----
 .../dash/offline/DashDownloadHelper.java      |  11 +-
 .../dash/offline/DashDownloadActionTest.java  |  66 +++-
 .../dash/offline/DashDownloaderTest.java      |  25 ++
 .../dash/offline/DownloadManagerDashTest.java |  17 +-
 .../dash/offline/DownloadServiceDashTest.java |  17 +-
 .../source/hls/offline/HlsDownloadAction.java |  97 -----
 .../source/hls/offline/HlsDownloadHelper.java |  16 +-
 .../hls/offline/HlsDownloadActionTest.java    |  58 +--
 .../source/hls/offline/HlsDownloaderTest.java |  25 ++
 .../offline/SsDownloadAction.java             |  97 -----
 .../offline/SsDownloadHelper.java             |  11 +-
 .../offline/SsDownloadActionTest.java         |  58 +--
 .../offline/SsDownloaderTest.java             |  55 +++
 30 files changed, 955 insertions(+), 1178 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderFactory.java
 delete mode 100644 library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadAction.java
 delete mode 100644 library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloadAction.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactoryTest.java
 delete mode 100644 library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadAction.java
 delete mode 100644 library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadAction.java
 delete mode 100644 library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadAction.java
 create mode 100644 library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
index ac8be7dc16..65d5096f30 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2.demo;
 
 import android.app.Application;
+import com.google.android.exoplayer2.offline.DefaultDownloaderFactory;
 import com.google.android.exoplayer2.offline.DownloadManager;
 import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
 import com.google.android.exoplayer2.upstream.DataSource;
@@ -87,10 +88,10 @@ public class DemoApplication extends Application {
           new DownloaderConstructorHelper(getDownloadCache(), buildHttpDataSourceFactory());
       downloadManager =
           new DownloadManager(
-              downloaderConstructorHelper,
+              new File(getDownloadDirectory(), DOWNLOAD_ACTION_FILE),
+              new DefaultDownloaderFactory(downloaderConstructorHelper),
               MAX_SIMULTANEOUS_DOWNLOADS,
-              DownloadManager.DEFAULT_MIN_RETRY_COUNT,
-              new File(getDownloadDirectory(), DOWNLOAD_ACTION_FILE));
+              DownloadManager.DEFAULT_MIN_RETRY_COUNT);
       downloadTracker =
           new DownloadTracker(
               /* context= */ this,
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index b0619a82fd..422411d849 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -81,11 +81,7 @@ public class DownloadTracker implements DownloadManager.Listener {
   private final ActionFile actionFile;
   private final Handler actionFileWriteHandler;
 
-  public DownloadTracker(
-      Context context,
-      DataSource.Factory dataSourceFactory,
-      File actionFile,
-      DownloadAction.Deserializer... deserializers) {
+  public DownloadTracker(Context context, DataSource.Factory dataSourceFactory, File actionFile) {
     this.context = context.getApplicationContext();
     this.dataSourceFactory = dataSourceFactory;
     this.actionFile = new ActionFile(actionFile);
@@ -95,8 +91,7 @@ public class DownloadTracker implements DownloadManager.Listener {
     HandlerThread actionFileWriteThread = new HandlerThread("DownloadTracker");
     actionFileWriteThread.start();
     actionFileWriteHandler = new Handler(actionFileWriteThread.getLooper());
-    loadTrackedActions(
-        deserializers.length > 0 ? deserializers : DownloadAction.getDefaultDeserializers());
+    loadTrackedActions();
   }
 
   public void addListener(Listener listener) {
@@ -158,9 +153,9 @@ public class DownloadTracker implements DownloadManager.Listener {
 
   // Internal methods
 
-  private void loadTrackedActions(DownloadAction.Deserializer[] deserializers) {
+  private void loadTrackedActions() {
     try {
-      DownloadAction[] allActions = actionFile.load(deserializers);
+      DownloadAction[] allActions = actionFile.load();
       for (DownloadAction action : allActions) {
         trackedDownloadStates.put(action.uri, action);
       }
diff --git a/library/core/proguard-rules.txt b/library/core/proguard-rules.txt
index a5c50a78f5..5aec86ba8c 100644
--- a/library/core/proguard-rules.txt
+++ b/library/core/proguard-rules.txt
@@ -30,10 +30,19 @@
   <init>();
 }
 
-# Constructors accessed via reflection in DownloadAction
--dontnote com.google.android.exoplayer2.source.dash.offline.DashDownloadAction
--dontnote com.google.android.exoplayer2.source.hls.offline.HlsDownloadAction
--dontnote com.google.android.exoplayer2.source.smoothstreaming.offline.SsDownloadAction
+# Constructors accessed via reflection in DefaultDownloaderFactory
+-dontnote com.google.android.exoplayer2.source.dash.offline.DashDownloader
+-keepclassmembers class com.google.android.exoplayer2.source.dash.offline.DashDownloader {
+  <init>(android.net.Uri, java.util.List, com.google.android.exoplayer2.offlineDownloaderConstructorHelper);
+}
+-dontnote com.google.android.exoplayer2.source.hls.offline.HlsDownloader
+-keepclassmembers class com.google.android.exoplayer2.source.hls.offline.HlsDownloader {
+  <init>(android.net.Uri, java.util.List, com.google.android.exoplayer2.offlineDownloaderConstructorHelper);
+}
+-dontnote com.google.android.exoplayer2.source.smoothstreaming.offline.SsDownloader
+-keepclassmembers class com.google.android.exoplayer2.source.smoothstreaming.offline.SsDownloader {
+  <init>(android.net.Uri, java.util.List, com.google.android.exoplayer2.offlineDownloaderConstructorHelper);
+}
 
 # Don't warn about checkerframework
 -dontwarn org.checkerframework.**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
index e37e09a090..f77c83b33b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
@@ -15,7 +15,6 @@
  */
 package com.google.android.exoplayer2.offline;
 
-import com.google.android.exoplayer2.offline.DownloadAction.Deserializer;
 import com.google.android.exoplayer2.util.AtomicFile;
 import com.google.android.exoplayer2.util.Util;
 import java.io.DataInputStream;
@@ -45,11 +44,10 @@ public final class ActionFile {
   /**
    * Loads {@link DownloadAction}s from file.
    *
-   * @param deserializers {@link Deserializer}s to deserialize DownloadActions.
    * @return Loaded DownloadActions. If the action file doesn't exists returns an empty array.
    * @throws IOException If there is an error during loading.
    */
-  public DownloadAction[] load(Deserializer... deserializers) throws IOException {
+  public DownloadAction[] load() throws IOException {
     if (!actionFile.exists()) {
       return new DownloadAction[0];
     }
@@ -64,7 +62,7 @@ public final class ActionFile {
       int actionCount = dataInputStream.readInt();
       DownloadAction[] actions = new DownloadAction[actionCount];
       for (int i = 0; i < actionCount; i++) {
-        actions[i] = DownloadAction.deserializeFromStream(deserializers, dataInputStream);
+        actions[i] = DownloadAction.deserializeFromStream(dataInputStream);
       }
       return actions;
     } finally {
@@ -85,7 +83,7 @@ public final class ActionFile {
       output.writeInt(VERSION);
       output.writeInt(downloadActions.length);
       for (DownloadAction action : downloadActions) {
-        DownloadAction.serializeToStream(action, output);
+        action.serializeToStream(output);
       }
       atomicFile.endWrite(output);
       // Avoid calling close twice.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java
new file mode 100644
index 0000000000..63ec72f358
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.offline;
+
+import android.net.Uri;
+import android.support.annotation.Nullable;
+import java.lang.reflect.Constructor;
+import java.util.List;
+
+/**
+ * Default {@link DownloaderFactory}, supporting creation of progressive, DASH, HLS and
+ * SmoothStreaming downloaders. Note that for the latter three, the corresponding library module
+ * must be built into the application.
+ */
+public class DefaultDownloaderFactory implements DownloaderFactory {
+
+  @Nullable private static final Constructor<? extends Downloader> DASH_DOWNLOADER_CONSTRUCTOR;
+  @Nullable private static final Constructor<? extends Downloader> HLS_DOWNLOADER_CONSTRUCTOR;
+  @Nullable private static final Constructor<? extends Downloader> SS_DOWNLOADER_CONSTRUCTOR;
+
+  static {
+    Constructor<? extends Downloader> dashDownloaderConstructor = null;
+    try {
+      // LINT.IfChange
+      dashDownloaderConstructor =
+          getDownloaderConstructor(
+              Class.forName("com.google.android.exoplayer2.source.dash.offline.DashDownloader"));
+      // LINT.ThenChange(../../../../../../../../proguard-rules.txt)
+    } catch (ClassNotFoundException e) {
+      // Expected if the app was built without the DASH module.
+    }
+    DASH_DOWNLOADER_CONSTRUCTOR = dashDownloaderConstructor;
+    Constructor<? extends Downloader> hlsDownloaderConstructor = null;
+    try {
+      // LINT.IfChange
+      hlsDownloaderConstructor =
+          getDownloaderConstructor(
+              Class.forName("com.google.android.exoplayer2.source.hls.offline.HlsDownloader"));
+      // LINT.ThenChange(../../../../../../../../proguard-rules.txt)
+    } catch (ClassNotFoundException e) {
+      // Expected if the app was built without the HLS module.
+    }
+    HLS_DOWNLOADER_CONSTRUCTOR = hlsDownloaderConstructor;
+    Constructor<? extends Downloader> ssDownloaderConstructor = null;
+    try {
+      // LINT.IfChange
+      ssDownloaderConstructor =
+          getDownloaderConstructor(
+              Class.forName(
+                  "com.google.android.exoplayer2.source.smoothstreaming.offline.SsDownloader"));
+      // LINT.ThenChange(../../../../../../../../proguard-rules.txt)
+    } catch (ClassNotFoundException e) {
+      // Expected if the app was built without the SmoothStreaming module.
+    }
+    SS_DOWNLOADER_CONSTRUCTOR = ssDownloaderConstructor;
+  }
+
+  private final DownloaderConstructorHelper downloaderConstructorHelper;
+
+  /** @param downloaderConstructorHelper A helper for instantiating downloaders. */
+  public DefaultDownloaderFactory(DownloaderConstructorHelper downloaderConstructorHelper) {
+    this.downloaderConstructorHelper = downloaderConstructorHelper;
+  }
+
+  @Override
+  public Downloader createDownloader(DownloadAction action) {
+    switch (action.type) {
+      case DownloadAction.TYPE_PROGRESSIVE:
+        return new ProgressiveDownloader(
+            action.uri, action.customCacheKey, downloaderConstructorHelper);
+      case DownloadAction.TYPE_DASH:
+        return createDownloader(action, DASH_DOWNLOADER_CONSTRUCTOR);
+      case DownloadAction.TYPE_HLS:
+        return createDownloader(action, HLS_DOWNLOADER_CONSTRUCTOR);
+      case DownloadAction.TYPE_SS:
+        return createDownloader(action, SS_DOWNLOADER_CONSTRUCTOR);
+      default:
+        throw new IllegalArgumentException("Unsupported type: " + action.type);
+    }
+  }
+
+  private Downloader createDownloader(
+      DownloadAction action, @Nullable Constructor<? extends Downloader> constructor) {
+    if (constructor == null) {
+      throw new IllegalStateException("Module missing for: " + action.type);
+    }
+    try {
+      // TODO: Support customCacheKey in DASH/HLS/SS, for completeness.
+      return constructor.newInstance(action.uri, action.getKeys(), downloaderConstructorHelper);
+    } catch (Exception e) {
+      throw new RuntimeException("Failed to instantiate downloader for: " + action.type, e);
+    }
+  }
+
+  // LINT.IfChange
+  private static Constructor<? extends Downloader> getDownloaderConstructor(Class<?> clazz) {
+    try {
+      return clazz
+          .asSubclass(Downloader.class)
+          .getConstructor(Uri.class, List.class, DownloaderConstructorHelper.class);
+    } catch (NoSuchMethodException e) {
+      // The downloader is present, but the expected constructor is missing.
+      throw new RuntimeException("DASH downloader constructor missing", e);
+    }
+  }
+  // LINT.ThenChange(../../../../../../../../proguard-rules.txt)
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
index e9868ceea0..46f5c78e55 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
@@ -25,147 +25,124 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
 /** Contains the necessary parameters for a download or remove action. */
-public abstract class DownloadAction {
+public final class DownloadAction {
 
-  /** Used to deserialize {@link DownloadAction}s. */
-  public abstract static class Deserializer {
+  /** Type for progressive downloads. */
+  public static final String TYPE_PROGRESSIVE = "progressive";
+  /** Type for DASH downloads. */
+  public static final String TYPE_DASH = "dash";
+  /** Type for HLS downloads. */
+  public static final String TYPE_HLS = "hls";
+  /** Type for SmoothStreaming downloads. */
+  public static final String TYPE_SS = "ss";
 
-    public final String type;
-    public final int version;
-
-    public Deserializer(String type, int version) {
-      this.type = type;
-      this.version = version;
-    }
-
-    /**
-     * Deserializes an action from the {@code input}.
-     *
-     * @param version The version of the serialized action.
-     * @param input The stream from which to read the action.
-     * @see DownloadAction#writeToStream(DataOutputStream)
-     */
-    public abstract DownloadAction readFromStream(int version, DataInputStream input)
-        throws IOException;
-  }
-
-  private static @Nullable Deserializer[] defaultDeserializers;
-
-  /** Returns available default {@link Deserializer}s. */
-  public static synchronized Deserializer[] getDefaultDeserializers() {
-    if (defaultDeserializers != null) {
-      return defaultDeserializers;
-    }
-    Deserializer[] deserializers = new Deserializer[4];
-    int count = 0;
-    deserializers[count++] = ProgressiveDownloadAction.DESERIALIZER;
-    Class<?> clazz;
-    // Full class names used for constructor args so the LINT rule triggers if any of them move.
-    try {
-      // LINT.IfChange
-      clazz = Class.forName("com.google.android.exoplayer2.source.dash.offline.DashDownloadAction");
-      // LINT.ThenChange(../../../../../../../../../dash/proguard-rules.txt)
-      deserializers[count++] = getDeserializer(clazz);
-    } catch (Exception e) {
-      // Do nothing.
-    }
-    try {
-      // LINT.IfChange
-      clazz = Class.forName("com.google.android.exoplayer2.source.hls.offline.HlsDownloadAction");
-      // LINT.ThenChange(../../../../../../../../../hls/proguard-rules.txt)
-      deserializers[count++] = getDeserializer(clazz);
-    } catch (Exception e) {
-      // Do nothing.
-    }
-    try {
-      // LINT.IfChange
-      clazz =
-          Class.forName(
-              "com.google.android.exoplayer2.source.smoothstreaming.offline.SsDownloadAction");
-      // LINT.ThenChange(../../../../../../../../../smoothstreaming/proguard-rules.txt)
-      deserializers[count++] = getDeserializer(clazz);
-    } catch (Exception e) {
-      // Do nothing.
-    }
-    defaultDeserializers = Arrays.copyOf(Assertions.checkNotNull(deserializers), count);
-    return defaultDeserializers;
-  }
+  private static final int VERSION = 2;
 
   /**
-   * Deserializes one action that was serialized with {@link #serializeToStream(DownloadAction,
-   * OutputStream)} from the {@code input}, using the {@link Deserializer}s that supports the
-   * action's type.
+   * Deserializes one action that was serialized with {@link #serializeToStream(OutputStream)} from
+   * the {@code input}.
    *
    * <p>The caller is responsible for closing the given {@link InputStream}.
    *
-   * @param deserializers {@link Deserializer}s for supported actions.
-   * @param input The stream from which to read the action.
+   * @param input The stream from which to read.
    * @return The deserialized action.
    * @throws IOException If there is an IO error reading from {@code input}, or if the action type
    *     isn't supported by any of the {@code deserializers}.
    */
-  public static DownloadAction deserializeFromStream(
-      Deserializer[] deserializers, InputStream input) throws IOException {
-    // Don't close the stream as it closes the underlying stream too.
-    DataInputStream dataInputStream = new DataInputStream(input);
-    String type = dataInputStream.readUTF();
-    int version = dataInputStream.readInt();
-    for (Deserializer deserializer : deserializers) {
-      if (type.equals(deserializer.type) && deserializer.version >= version) {
-        return deserializer.readFromStream(version, dataInputStream);
-      }
-    }
-    throw new DownloadException("No deserializer found for:" + type + ", " + version);
+  public static DownloadAction deserializeFromStream(InputStream input) throws IOException {
+    return readFromStream(new DataInputStream(input));
   }
 
-  /** Serializes {@code action} type and data into the {@code output}. */
-  public static void serializeToStream(DownloadAction action, OutputStream output)
-      throws IOException {
-    // Don't close the stream as it closes the underlying stream too.
-    DataOutputStream dataOutputStream = new DataOutputStream(output);
-    dataOutputStream.writeUTF(action.type);
-    dataOutputStream.writeInt(action.version);
-    action.writeToStream(dataOutputStream);
-    dataOutputStream.flush();
+  /**
+   * Creates a DASH download action.
+   *
+   * @param type The type of the action.
+   * @param uri The URI of the media to be downloaded.
+   * @param keys Keys of tracks to be downloaded. If empty, all tracks will be downloaded.
+   * @param customCacheKey A custom key for cache indexing, or null.
+   * @param data Optional custom data for this action. If {@code null} an empty array will be used.
+   */
+  public static DownloadAction createDownloadAction(
+      String type,
+      Uri uri,
+      List<StreamKey> keys,
+      @Nullable String customCacheKey,
+      @Nullable byte[] data) {
+    return new DownloadAction(type, uri, /* isRemoveAction= */ false, keys, customCacheKey, data);
+  }
+
+  /**
+   * Creates a DASH remove action.
+   *
+   * @param type The type of the action.
+   * @param uri The URI of the media to be removed.
+   * @param customCacheKey A custom key for cache indexing, or null.
+   * @param data Optional custom data for this action. If {@code null} an empty array will be used.
+   */
+  public static DownloadAction createRemoveAction(
+      String type, Uri uri, @Nullable String customCacheKey, @Nullable byte[] data) {
+    return new DownloadAction(
+        type, uri, /* isRemoveAction= */ true, Collections.emptyList(), customCacheKey, data);
   }
 
   /** The type of the action. */
   public final String type;
-  /** The action version. */
-  public final int version;
   /** The uri being downloaded or removed. */
   public final Uri uri;
   /** Whether this is a remove action. If false, this is a download action. */
   public final boolean isRemoveAction;
+  /**
+   * Keys of tracks to be downloaded. If empty, all tracks will be downloaded. Empty if this action
+   * is a remove action.
+   */
+  public final List<StreamKey> keys;
+  /** A custom key for cache indexing, or null. */
+  @Nullable public final String customCacheKey;
   /** Custom data for this action. May be empty. */
   public final byte[] data;
 
   /**
    * @param type The type of the action.
-   * @param version The action version.
    * @param uri The uri being downloaded or removed.
    * @param isRemoveAction Whether this is a remove action. If false, this is a download action.
+   * @param keys Keys of tracks to be downloaded. If empty, all tracks will be downloaded. Empty if
+   *     this action is a remove action.
+   * @param customCacheKey A custom key for cache indexing, or null.
    * @param data Optional custom data for this action.
    */
-  protected DownloadAction(
-      String type, int version, Uri uri, boolean isRemoveAction, @Nullable byte[] data) {
+  private DownloadAction(
+      String type,
+      Uri uri,
+      boolean isRemoveAction,
+      List<StreamKey> keys,
+      @Nullable String customCacheKey,
+      @Nullable byte[] data) {
     this.type = type;
-    this.version = version;
     this.uri = uri;
     this.isRemoveAction = isRemoveAction;
+    this.customCacheKey = customCacheKey;
     this.data = data != null ? data : Util.EMPTY_BYTE_ARRAY;
+    if (isRemoveAction) {
+      Assertions.checkArgument(keys.isEmpty());
+      this.keys = Collections.emptyList();
+    } else {
+      ArrayList<StreamKey> mutableKeys = new ArrayList<>(keys);
+      Collections.sort(mutableKeys);
+      this.keys = Collections.unmodifiableList(mutableKeys);
+    }
   }
 
   /** Serializes itself into a byte array. */
-  public final byte[] toByteArray() {
+  public byte[] toByteArray() {
     ByteArrayOutputStream output = new ByteArrayOutputStream();
     try {
-      serializeToStream(this, output);
+      serializeToStream(output);
     } catch (IOException e) {
       // ByteArrayOutputStream shouldn't throw IOException.
       throw new IllegalStateException();
@@ -175,46 +152,118 @@ public abstract class DownloadAction {
 
   /** Returns whether this is an action for the same media as the {@code other}. */
   public boolean isSameMedia(DownloadAction other) {
-    return uri.equals(other.uri);
+    return customCacheKey == null
+        ? other.customCacheKey == null && uri.equals(other.uri)
+        : customCacheKey.equals(other.customCacheKey);
   }
 
   /** Returns keys of tracks to be downloaded. */
   public List<StreamKey> getKeys() {
-    return Collections.emptyList();
+    return keys;
   }
 
-  /** Serializes itself into the {@code output}. */
-  protected abstract void writeToStream(DataOutputStream output) throws IOException;
-
-  /** Creates a {@link Downloader} with the given parameters. */
-  public abstract Downloader createDownloader(
-      DownloaderConstructorHelper downloaderConstructorHelper);
-
-  @SuppressWarnings("EqualsGetClass")
   @Override
   public boolean equals(@Nullable Object o) {
-    if (o == null || getClass() != o.getClass()) {
+    if (!(o instanceof DownloadAction)) {
       return false;
     }
     DownloadAction that = (DownloadAction) o;
     return type.equals(that.type)
-        && version == that.version
         && uri.equals(that.uri)
         && isRemoveAction == that.isRemoveAction
+        && keys.equals(that.keys)
+        && Util.areEqual(customCacheKey, that.customCacheKey)
         && Arrays.equals(data, that.data);
   }
 
   @Override
-  public int hashCode() {
-    int result = uri.hashCode();
+  public final int hashCode() {
+    int result = type.hashCode();
+    result = 31 * result + uri.hashCode();
     result = 31 * result + (isRemoveAction ? 1 : 0);
+    result = 31 * result + keys.hashCode();
+    result = 31 * result + (customCacheKey != null ? customCacheKey.hashCode() : 0);
     result = 31 * result + Arrays.hashCode(data);
     return result;
   }
 
-  private static Deserializer getDeserializer(Class<?> clazz)
-      throws NoSuchFieldException, IllegalAccessException {
-    Object value = clazz.getDeclaredField("DESERIALIZER").get(null);
-    return (Deserializer) Assertions.checkNotNull(value);
+  // Serialization.
+
+  /**
+   * Serializes this action into an {@link OutputStream}.
+   *
+   * @param output The stream to write to.
+   */
+  public final void serializeToStream(OutputStream output) throws IOException {
+    // Don't close the stream as it closes the underlying stream too.
+    DataOutputStream dataOutputStream = new DataOutputStream(output);
+    dataOutputStream.writeUTF(type);
+    dataOutputStream.writeInt(VERSION);
+    dataOutputStream.writeUTF(uri.toString());
+    dataOutputStream.writeBoolean(isRemoveAction);
+    dataOutputStream.writeInt(data.length);
+    dataOutputStream.write(data);
+    dataOutputStream.writeInt(keys.size());
+    for (int i = 0; i < keys.size(); i++) {
+      StreamKey key = keys.get(i);
+      dataOutputStream.writeInt(key.periodIndex);
+      dataOutputStream.writeInt(key.groupIndex);
+      dataOutputStream.writeInt(key.trackIndex);
+    }
+    dataOutputStream.writeBoolean(customCacheKey != null);
+    if (customCacheKey != null) {
+      dataOutputStream.writeUTF(customCacheKey);
+    }
+    dataOutputStream.flush();
+  }
+
+  private static DownloadAction readFromStream(DataInputStream input) throws IOException {
+    String type = input.readUTF();
+    int version = input.readInt();
+
+    Uri uri = Uri.parse(input.readUTF());
+    boolean isRemoveAction = input.readBoolean();
+    int dataLength = input.readInt();
+    byte[] data = new byte[dataLength];
+    input.readFully(data);
+
+    // Serialized version 0 progressive actions did not contain keys.
+    boolean isLegacyProgressive = version == 0 && TYPE_PROGRESSIVE.equals(type);
+    List<StreamKey> keys = new ArrayList<>();
+    if (!isLegacyProgressive) {
+      int keyCount = input.readInt();
+      for (int i = 0; i < keyCount; i++) {
+        keys.add(readKey(type, version, input));
+      }
+    }
+
+    // Serialized version 0 and 1 DASH/HLS/SS actions did not contain a custom cache key.
+    boolean isLegacySegmented =
+        version < 2 && (TYPE_DASH.equals(type) || TYPE_HLS.equals(type) || TYPE_SS.equals(type));
+    String customCacheKey = null;
+    if (!isLegacySegmented) {
+      customCacheKey = input.readBoolean() ? input.readUTF() : null;
+    }
+
+    return new DownloadAction(type, uri, isRemoveAction, keys, customCacheKey, data);
+  }
+
+  private static StreamKey readKey(String type, int version, DataInputStream input)
+      throws IOException {
+    int periodIndex;
+    int groupIndex;
+    int trackIndex;
+
+    // Serialized version 0 HLS/SS actions did not contain a period index.
+    if ((TYPE_HLS.equals(type) || TYPE_SS.equals(type)) && version == 0) {
+      periodIndex = 0;
+      groupIndex = input.readInt();
+      trackIndex = input.readInt();
+    } else {
+      periodIndex = input.readInt();
+      groupIndex = input.readInt();
+      trackIndex = input.readInt();
+    }
+    return new StreamKey(periodIndex, groupIndex, trackIndex);
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 3757517f5d..9437a410fc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -28,9 +28,6 @@ import android.os.Looper;
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.offline.DownloadAction.Deserializer;
-import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.upstream.cache.Cache;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
@@ -85,11 +82,10 @@ public final class DownloadManager {
   private static final String TAG = "DownloadManager";
   private static final boolean DEBUG = false;
 
-  private final DownloaderConstructorHelper downloaderConstructorHelper;
   private final int maxActiveDownloadTasks;
   private final int minRetryCount;
   private final ActionFile actionFile;
-  private final DownloadAction.Deserializer[] deserializers;
+  private final DownloaderFactory downloaderFactory;
   private final ArrayList<Task> tasks;
   private final ArrayList<Task> activeDownloadTasks;
   private final Handler handler;
@@ -102,71 +98,34 @@ public final class DownloadManager {
   private boolean released;
   private boolean downloadsStopped;
 
-  /**
-   * Creates a {@link DownloadManager}.
-   *
-   * @param cache Cache instance to be used to store downloaded data.
-   * @param upstreamDataSourceFactory A {@link DataSource.Factory} for creating data sources for
-   *     downloading upstream data.
-   * @param actionSaveFile File to save active actions.
-   * @param deserializers Used to deserialize {@link DownloadAction}s. If empty, {@link
-   *     DownloadAction#getDefaultDeserializers()} is used instead.
-   */
-  public DownloadManager(
-      Cache cache,
-      DataSource.Factory upstreamDataSourceFactory,
-      File actionSaveFile,
-      Deserializer... deserializers) {
-    this(
-        new DownloaderConstructorHelper(cache, upstreamDataSourceFactory),
-        actionSaveFile,
-        deserializers);
-  }
-
   /**
    * Constructs a {@link DownloadManager}.
    *
-   * @param constructorHelper A {@link DownloaderConstructorHelper} to create {@link Downloader}s
-   *     for downloading data.
    * @param actionFile The file in which active actions are saved.
-   * @param deserializers Used to deserialize {@link DownloadAction}s. If empty, {@link
-   *     DownloadAction#getDefaultDeserializers()} is used instead.
+   * @param downloaderFactory A factory for creating {@link Downloader}s.
    */
-  public DownloadManager(
-      DownloaderConstructorHelper constructorHelper,
-      File actionFile,
-      Deserializer... deserializers) {
+  public DownloadManager(File actionFile, DownloaderFactory downloaderFactory) {
     this(
-        constructorHelper,
-        DEFAULT_MAX_SIMULTANEOUS_DOWNLOADS,
-        DEFAULT_MIN_RETRY_COUNT,
-        actionFile,
-        deserializers);
+        actionFile, downloaderFactory, DEFAULT_MAX_SIMULTANEOUS_DOWNLOADS, DEFAULT_MIN_RETRY_COUNT);
   }
 
   /**
    * Constructs a {@link DownloadManager}.
    *
-   * @param constructorHelper A {@link DownloaderConstructorHelper} to create {@link Downloader}s
-   *     for downloading data.
+   * @param actionFile The file in which active actions are saved.
+   * @param downloaderFactory A factory for creating {@link Downloader}s.
    * @param maxSimultaneousDownloads The maximum number of simultaneous download tasks.
    * @param minRetryCount The minimum number of times a task must be retried before failing.
-   * @param actionFile The file in which active actions are saved.
-   * @param deserializers Used to deserialize {@link DownloadAction}s. If empty, {@link
-   *     DownloadAction#getDefaultDeserializers()} is used instead.
    */
   public DownloadManager(
-      DownloaderConstructorHelper constructorHelper,
-      int maxSimultaneousDownloads,
-      int minRetryCount,
       File actionFile,
-      Deserializer... deserializers) {
-    this.downloaderConstructorHelper = constructorHelper;
+      DownloaderFactory downloaderFactory,
+      int maxSimultaneousDownloads,
+      int minRetryCount) {
+    this.actionFile = new ActionFile(actionFile);
+    this.downloaderFactory = downloaderFactory;
     this.maxActiveDownloadTasks = maxSimultaneousDownloads;
     this.minRetryCount = minRetryCount;
-    this.actionFile = new ActionFile(actionFile);
-    this.deserializers =
-        deserializers.length > 0 ? deserializers : DownloadAction.getDefaultDeserializers();
     this.downloadsStopped = true;
 
     tasks = new ArrayList<>();
@@ -239,7 +198,7 @@ public final class DownloadManager {
   public int handleAction(byte[] actionData) throws IOException {
     Assertions.checkState(!released);
     ByteArrayInputStream input = new ByteArrayInputStream(actionData);
-    DownloadAction action = DownloadAction.deserializeFromStream(deserializers, input);
+    DownloadAction action = DownloadAction.deserializeFromStream(input);
     return handleAction(action);
   }
 
@@ -344,7 +303,7 @@ public final class DownloadManager {
   }
 
   private Task addTaskForAction(DownloadAction action) {
-    Task task = new Task(nextTaskId++, this, action, minRetryCount);
+    Task task = new Task(nextTaskId++, this, downloaderFactory, action, minRetryCount);
     tasks.add(task);
     logd("Task is added", task);
     return task;
@@ -450,7 +409,7 @@ public final class DownloadManager {
         () -> {
           DownloadAction[] loadedActions;
           try {
-            loadedActions = actionFile.load(DownloadManager.this.deserializers);
+            loadedActions = actionFile.load();
             logd("Action file is loaded.");
           } catch (Throwable e) {
             Log.e(TAG, "Action file loading failed.", e);
@@ -642,6 +601,7 @@ public final class DownloadManager {
 
     private final int id;
     private final DownloadManager downloadManager;
+    private final DownloaderFactory downloaderFactory;
     private final DownloadAction action;
     private final int minRetryCount;
     private volatile @InternalState int currentState;
@@ -650,9 +610,14 @@ public final class DownloadManager {
     private Throwable error;
 
     private Task(
-        int id, DownloadManager downloadManager, DownloadAction action, int minRetryCount) {
+        int id,
+        DownloadManager downloadManager,
+        DownloaderFactory downloaderFactory,
+        DownloadAction action,
+        int minRetryCount) {
       this.id = id;
       this.downloadManager = downloadManager;
+      this.downloaderFactory = downloaderFactory;
       this.action = action;
       this.currentState = STATE_QUEUED;
       this.minRetryCount = minRetryCount;
@@ -807,7 +772,7 @@ public final class DownloadManager {
       logd("Task is started", this);
       Throwable error = null;
       try {
-        downloader = action.createDownloader(downloadManager.downloaderConstructorHelper);
+        downloader = downloaderFactory.createDownloader(action);
         if (action.isRemoveAction) {
           downloader.remove();
         } else {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderFactory.java
new file mode 100644
index 0000000000..a2699e560f
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderFactory.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.offline;
+
+/** Creates {@link Downloader Downloaders} for given {@link DownloadAction DownloadActions}. */
+public interface DownloaderFactory {
+
+  /**
+   * Creates a {@link Downloader} to perform the given {@link DownloadAction}.
+   *
+   * @param action The action.
+   * @return The downloader.
+   */
+  Downloader createDownloader(DownloadAction action);
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadAction.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadAction.java
deleted file mode 100644
index 7ced2fa41b..0000000000
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadAction.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.offline;
-
-import android.net.Uri;
-import android.support.annotation.Nullable;
-import com.google.android.exoplayer2.upstream.cache.CacheUtil;
-import com.google.android.exoplayer2.util.Util;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-/** An action to download or remove downloaded progressive streams. */
-public final class ProgressiveDownloadAction extends DownloadAction {
-
-  private static final String TYPE = "progressive";
-  private static final int VERSION = 0;
-
-  public static final Deserializer DESERIALIZER =
-      new Deserializer(TYPE, VERSION) {
-        @Override
-        public ProgressiveDownloadAction readFromStream(int version, DataInputStream input)
-            throws IOException {
-          Uri uri = Uri.parse(input.readUTF());
-          boolean isRemoveAction = input.readBoolean();
-          int dataLength = input.readInt();
-          byte[] data = new byte[dataLength];
-          input.readFully(data);
-          String customCacheKey = input.readBoolean() ? input.readUTF() : null;
-          return new ProgressiveDownloadAction(uri, isRemoveAction, data, customCacheKey);
-        }
-      };
-
-  private final @Nullable String customCacheKey;
-
-  /**
-   * Creates a progressive stream download action.
-   *
-   * @param uri Uri of the data to be downloaded.
-   * @param data Optional custom data for this action.
-   * @param customCacheKey A custom key that uniquely identifies the original stream. If not null it
-   *     is used for cache indexing.
-   */
-  public static ProgressiveDownloadAction createDownloadAction(
-      Uri uri, @Nullable byte[] data, @Nullable String customCacheKey) {
-    return new ProgressiveDownloadAction(uri, /* isRemoveAction= */ false, data, customCacheKey);
-  }
-
-  /**
-   * Creates a progressive stream remove action.
-   *
-   * @param uri Uri of the data to be removed.
-   * @param data Optional custom data for this action.
-   * @param customCacheKey A custom key that uniquely identifies the original stream. If not null it
-   *     is used for cache indexing.
-   */
-  public static ProgressiveDownloadAction createRemoveAction(
-      Uri uri, @Nullable byte[] data, @Nullable String customCacheKey) {
-    return new ProgressiveDownloadAction(uri, /* isRemoveAction= */ true, data, customCacheKey);
-  }
-
-  /**
-   * @param uri Uri of the data to be downloaded.
-   * @param isRemoveAction Whether this is a remove action. If false, this is a download action.
-   * @param data Optional custom data for this action.
-   * @param customCacheKey A custom key that uniquely identifies the original stream. If not null it
-   *     is used for cache indexing.
-   * @deprecated Use {@link #createDownloadAction(Uri, byte[], String)} or {@link
-   *     #createRemoveAction(Uri, byte[], String)}.
-   */
-  @Deprecated
-  public ProgressiveDownloadAction(
-      Uri uri, boolean isRemoveAction, @Nullable byte[] data, @Nullable String customCacheKey) {
-    super(TYPE, VERSION, uri, isRemoveAction, data);
-    this.customCacheKey = customCacheKey;
-  }
-
-  @Override
-  public ProgressiveDownloader createDownloader(DownloaderConstructorHelper constructorHelper) {
-    return new ProgressiveDownloader(uri, customCacheKey, constructorHelper);
-  }
-
-  @Override
-  protected void writeToStream(DataOutputStream output) throws IOException {
-    output.writeUTF(uri.toString());
-    output.writeBoolean(isRemoveAction);
-    output.writeInt(data.length);
-    output.write(data);
-    boolean customCacheKeySet = customCacheKey != null;
-    output.writeBoolean(customCacheKeySet);
-    if (customCacheKeySet) {
-      output.writeUTF(customCacheKey);
-    }
-  }
-
-  @Override
-  public boolean isSameMedia(DownloadAction other) {
-    return ((other instanceof ProgressiveDownloadAction)
-        && getCacheKey().equals(((ProgressiveDownloadAction) other).getCacheKey()));
-  }
-
-  @Override
-  public boolean equals(@Nullable Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!super.equals(o)) {
-      return false;
-    }
-    ProgressiveDownloadAction that = (ProgressiveDownloadAction) o;
-    return Util.areEqual(customCacheKey, that.customCacheKey);
-  }
-
-  @Override
-  public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (customCacheKey != null ? customCacheKey.hashCode() : 0);
-    return result;
-  }
-
-  private String getCacheKey() {
-    return customCacheKey != null ? customCacheKey : CacheUtil.generateKey(uri);
-  }
-
-}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java
index 473209803a..f2022c3b46 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.offline;
 import android.net.Uri;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.source.TrackGroupArray;
+import java.util.Collections;
 import java.util.List;
 
 /** A {@link DownloadHelper} for progressive streams. */
@@ -51,13 +52,18 @@ public final class ProgressiveDownloadHelper extends DownloadHelper {
   }
 
   @Override
-  public ProgressiveDownloadAction getDownloadAction(
-      @Nullable byte[] data, List<TrackKey> trackKeys) {
-    return ProgressiveDownloadAction.createDownloadAction(uri, data, customCacheKey);
+  public DownloadAction getDownloadAction(@Nullable byte[] data, List<TrackKey> trackKeys) {
+    return DownloadAction.createDownloadAction(
+        DownloadAction.TYPE_PROGRESSIVE,
+        uri,
+        /* keys= */ Collections.emptyList(),
+        customCacheKey,
+        data);
   }
 
   @Override
-  public ProgressiveDownloadAction getRemoveAction(@Nullable byte[] data) {
-    return ProgressiveDownloadAction.createRemoveAction(uri, data, customCacheKey);
+  public DownloadAction getRemoveAction(@Nullable byte[] data) {
+    return DownloadAction.createRemoveAction(
+        DownloadAction.TYPE_PROGRESSIVE, uri, customCacheKey, data);
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
index adb1c80b0e..eedb5f7b00 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2.offline;
 
 import android.net.Uri;
+import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.upstream.DataSpec;
 import com.google.android.exoplayer2.upstream.cache.Cache;
@@ -47,7 +48,7 @@ public final class ProgressiveDownloader implements Downloader {
    * @param constructorHelper A {@link DownloaderConstructorHelper} instance.
    */
   public ProgressiveDownloader(
-      Uri uri, String customCacheKey, DownloaderConstructorHelper constructorHelper) {
+      Uri uri, @Nullable String customCacheKey, DownloaderConstructorHelper constructorHelper) {
     this.dataSpec = new DataSpec(uri, 0, C.LENGTH_UNSET, customCacheKey, 0);
     this.cache = constructorHelper.getCache();
     this.dataSource = constructorHelper.createCacheDataSource();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloadAction.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloadAction.java
deleted file mode 100644
index 403b4e797b..0000000000
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloadAction.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.offline;
-
-import android.net.Uri;
-import android.support.annotation.Nullable;
-import com.google.android.exoplayer2.util.Assertions;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/** {@link DownloadAction} for {@link SegmentDownloader}s. */
-public abstract class SegmentDownloadAction extends DownloadAction {
-
-  /** Base class for {@link SegmentDownloadAction} {@link Deserializer}s. */
-  protected abstract static class SegmentDownloadActionDeserializer extends Deserializer {
-
-    public SegmentDownloadActionDeserializer(String type, int version) {
-      super(type, version);
-    }
-
-    @Override
-    public final DownloadAction readFromStream(int version, DataInputStream input)
-        throws IOException {
-      Uri uri = Uri.parse(input.readUTF());
-      boolean isRemoveAction = input.readBoolean();
-      int dataLength = input.readInt();
-      byte[] data = new byte[dataLength];
-      input.readFully(data);
-      int keyCount = input.readInt();
-      List<StreamKey> keys = new ArrayList<>();
-      for (int i = 0; i < keyCount; i++) {
-        keys.add(readKey(version, input));
-      }
-      return createDownloadAction(uri, isRemoveAction, data, keys);
-    }
-
-    /** Deserializes a key from the {@code input}. */
-    protected StreamKey readKey(int version, DataInputStream input) throws IOException {
-      int periodIndex = input.readInt();
-      int groupIndex = input.readInt();
-      int trackIndex = input.readInt();
-      return new StreamKey(periodIndex, groupIndex, trackIndex);
-    }
-
-    /** Returns a {@link DownloadAction}. */
-    protected abstract DownloadAction createDownloadAction(
-        Uri manifestUri, boolean isRemoveAction, byte[] data, List<StreamKey> keys);
-  }
-
-  public final List<StreamKey> keys;
-
-  /**
-   * @param type The type of the action.
-   * @param version The action version.
-   * @param uri The URI of the media being downloaded.
-   * @param isRemoveAction Whether the data will be removed. If {@code false} it will be downloaded.
-   * @param data Optional custom data for this action. If {@code null} an empty array will be used.
-   * @param keys Keys of tracks to be downloaded. If empty, all tracks will be downloaded. If {@code
-   *     removeAction} is true, {@code keys} must be empty.
-   */
-  protected SegmentDownloadAction(
-      String type,
-      int version,
-      Uri uri,
-      boolean isRemoveAction,
-      @Nullable byte[] data,
-      List<StreamKey> keys) {
-    super(type, version, uri, isRemoveAction, data);
-    if (isRemoveAction) {
-      Assertions.checkArgument(keys.isEmpty());
-      this.keys = Collections.emptyList();
-    } else {
-      ArrayList<StreamKey> mutableKeys = new ArrayList<>(keys);
-      Collections.sort(mutableKeys);
-      this.keys = Collections.unmodifiableList(mutableKeys);
-    }
-  }
-
-  @Override
-  public List<StreamKey> getKeys() {
-    return keys;
-  }
-
-  @Override
-  public final void writeToStream(DataOutputStream output) throws IOException {
-    output.writeUTF(uri.toString());
-    output.writeBoolean(isRemoveAction);
-    output.writeInt(data.length);
-    output.write(data);
-    output.writeInt(keys.size());
-    for (int i = 0; i < keys.size(); i++) {
-      writeKey(output, keys.get(i));
-    }
-  }
-
-  @Override
-  public boolean equals(@Nullable Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!super.equals(o)) {
-      return false;
-    }
-    SegmentDownloadAction that = (SegmentDownloadAction) o;
-    return keys.equals(that.keys);
-  }
-
-  @Override
-  public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + keys.hashCode();
-    return result;
-  }
-
-  /** Serializes the {@code key} into the {@code output}. */
-  private void writeKey(DataOutputStream output, StreamKey key) throws IOException {
-    output.writeInt(key.periodIndex);
-    output.writeInt(key.groupIndex);
-    output.writeInt(key.trackIndex);
-  }
-}
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
index 634d541d39..d5621ff12c 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
@@ -18,13 +18,13 @@ package com.google.android.exoplayer2.offline;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
-import com.google.android.exoplayer2.offline.DownloadAction.Deserializer;
+import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.util.Util;
-import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.util.Collections;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -38,10 +38,22 @@ import org.robolectric.RuntimeEnvironment;
 public class ActionFileTest {
 
   private File tempFile;
+  private DownloadAction action1;
+  private DownloadAction action2;
 
   @Before
   public void setUp() throws Exception {
     tempFile = Util.createTempFile(RuntimeEnvironment.application, "ExoPlayerTest");
+    action1 =
+        buildAction(
+            DownloadAction.TYPE_PROGRESSIVE,
+            Uri.parse("http://test1.uri"),
+            TestUtil.buildTestData(16));
+    action2 =
+        buildAction(
+            DownloadAction.TYPE_PROGRESSIVE,
+            Uri.parse("http://test2.uri"),
+            TestUtil.buildTestData(32));
   }
 
   @After
@@ -78,44 +90,32 @@ public class ActionFileTest {
 
   @Test
   public void testLoadAction() throws Exception {
-    byte[] data = Util.getUtf8Bytes("321");
     DownloadAction[] actions =
         loadActions(
             new Object[] {
               ActionFile.VERSION,
               1, // Action count
-              "type2", // Action 1
-              FakeDownloadAction.VERSION,
-              data,
-            },
-            new FakeDeserializer("type2"));
+              action1
+            });
     assertThat(actions).isNotNull();
     assertThat(actions).hasLength(1);
-    assertAction(actions[0], "type2", FakeDownloadAction.VERSION, data);
+    assertThat(actions[0]).isEqualTo(action1);
   }
 
   @Test
   public void testLoadActions() throws Exception {
-    byte[] data1 = Util.getUtf8Bytes("123");
-    byte[] data2 = Util.getUtf8Bytes("321");
     DownloadAction[] actions =
         loadActions(
             new Object[] {
               ActionFile.VERSION,
               2, // Action count
-              "type1", // Action 1
-              FakeDownloadAction.VERSION,
-              data1,
-              "type2", // Action 2
-              FakeDownloadAction.VERSION,
-              data2,
-            },
-            new FakeDeserializer("type1"),
-            new FakeDeserializer("type2"));
+              action1,
+              action2,
+            });
     assertThat(actions).isNotNull();
     assertThat(actions).hasLength(2);
-    assertAction(actions[0], "type1", FakeDownloadAction.VERSION, data1);
-    assertAction(actions[1], "type2", FakeDownloadAction.VERSION, data2);
+    assertThat(actions[0]).isEqualTo(action1);
+    assertThat(actions[1]).isEqualTo(action2);
   }
 
   @Test
@@ -125,90 +125,39 @@ public class ActionFileTest {
           new Object[] {
             ActionFile.VERSION + 1,
             1, // Action count
-            "type2", // Action 1
-            FakeDownloadAction.VERSION,
-            Util.getUtf8Bytes("321"),
-          },
-          new FakeDeserializer("type2"));
+            action1,
+          });
       Assert.fail();
     } catch (IOException e) {
       // Expected exception.
     }
   }
 
-  @Test
-  public void testLoadNotSupportedActionVersion() throws Exception {
-    try {
-      loadActions(
-          new Object[] {
-            ActionFile.VERSION,
-            1, // Action count
-            "type2", // Action 1
-            FakeDownloadAction.VERSION + 1,
-            Util.getUtf8Bytes("321"),
-          },
-          new FakeDeserializer("type2"));
-      Assert.fail();
-    } catch (IOException e) {
-      // Expected exception.
-    }
-  }
-
-  @Test
-  public void testLoadNotSupportedType() throws Exception {
-    try {
-      loadActions(
-          new Object[] {
-            ActionFile.VERSION,
-            1, // Action count
-            "type2", // Action 1
-            FakeDownloadAction.VERSION,
-            Util.getUtf8Bytes("321"),
-          },
-          new FakeDeserializer("type1"));
-      Assert.fail();
-    } catch (DownloadException e) {
-      // Expected exception.
-    }
-  }
-
   @Test
   public void testStoreAndLoadNoActions() throws Exception {
-    doTestSerializationRoundTrip(new DownloadAction[0]);
+    doTestSerializationRoundTrip();
   }
 
   @Test
   public void testStoreAndLoadActions() throws Exception {
-    doTestSerializationRoundTrip(
-        new DownloadAction[] {
-          new FakeDownloadAction("type1", Util.getUtf8Bytes("123")),
-          new FakeDownloadAction("type2", Util.getUtf8Bytes("321")),
-        },
-        new FakeDeserializer("type1"),
-        new FakeDeserializer("type2"));
+    doTestSerializationRoundTrip(action1, action2);
   }
 
-  private void doTestSerializationRoundTrip(DownloadAction[] actions,
-      Deserializer... deserializers) throws IOException {
+  private void doTestSerializationRoundTrip(DownloadAction... actions) throws IOException {
     ActionFile actionFile = new ActionFile(tempFile);
     actionFile.store(actions);
-    assertThat(actionFile.load(deserializers)).isEqualTo(actions);
+    assertThat(actionFile.load()).isEqualTo(actions);
   }
 
-  private DownloadAction[] loadActions(Object[] values, Deserializer... deserializers)
-      throws IOException {
+  private DownloadAction[] loadActions(Object[] values) throws IOException {
     FileOutputStream fileOutputStream = new FileOutputStream(tempFile);
     DataOutputStream dataOutputStream = new DataOutputStream(fileOutputStream);
     try {
       for (Object value : values) {
         if (value instanceof Integer) {
           dataOutputStream.writeInt((Integer) value);
-        } else if (value instanceof String) {
-          dataOutputStream.writeUTF((String) value);
-        } else if (value instanceof byte[]) {
-          byte[] data = (byte[]) value;
-          dataOutputStream.writeInt(data.length);
-          dataOutputStream.write(data);
+        } else if (value instanceof DownloadAction) {
+          ((DownloadAction) value).serializeToStream(dataOutputStream);
         } else {
           throw new IllegalArgumentException();
         }
@@ -216,50 +165,11 @@ public class ActionFileTest {
     } finally {
       dataOutputStream.close();
     }
-    return new ActionFile(tempFile).load(deserializers);
+    return new ActionFile(tempFile).load();
   }
 
-  private static void assertAction(DownloadAction action, String type, int version, byte[] data) {
-    assertThat(action).isInstanceOf(FakeDownloadAction.class);
-    assertThat(action.type).isEqualTo(type);
-    assertThat(((FakeDownloadAction) action).version).isEqualTo(version);
-    assertThat(((FakeDownloadAction) action).data).isEqualTo(data);
+  private static DownloadAction buildAction(String type, Uri uri, byte[] data) {
+    return DownloadAction.createDownloadAction(
+        type, uri, /* keys= */ Collections.emptyList(), /* customCacheKey= */ null, data);
   }
-
-  private static class FakeDeserializer extends Deserializer {
-
-    FakeDeserializer(String type) {
-      super(type, FakeDownloadAction.VERSION);
-    }
-
-    @Override
-    public DownloadAction readFromStream(int version, DataInputStream input) throws IOException {
-      int dataLength = input.readInt();
-      byte[] data = new byte[dataLength];
-      input.readFully(data);
-      return new FakeDownloadAction(type, data);
-    }
-  }
-
-  private static class FakeDownloadAction extends DownloadAction {
-
-    public static final int VERSION = 0;
-
-    private FakeDownloadAction(String type, byte[] data) {
-      super(type, VERSION, Uri.parse("http://test.com"), /* isRemoveAction= */ false, data);
-    }
-
-    @Override
-    protected void writeToStream(DataOutputStream output) throws IOException {
-      output.writeInt(data.length);
-      output.write(data);
-    }
-
-    @Override
-    public Downloader createDownloader(DownloaderConstructorHelper downloaderConstructorHelper) {
-      return null;
-    }
-
-  }
-
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactoryTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactoryTest.java
new file mode 100644
index 0000000000..346d033e1a
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactoryTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.offline;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.net.Uri;
+import com.google.android.exoplayer2.upstream.DummyDataSource;
+import com.google.android.exoplayer2.upstream.cache.Cache;
+import java.util.Collections;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.robolectric.RobolectricTestRunner;
+
+/** Unit tests for {@link DefaultDownloaderFactory}. */
+@RunWith(RobolectricTestRunner.class)
+public final class DefaultDownloaderFactoryTest {
+
+  @Test
+  public void createProgressiveDownloader() throws Exception {
+    DownloaderConstructorHelper constructorHelper =
+        new DownloaderConstructorHelper(Mockito.mock(Cache.class), DummyDataSource.FACTORY);
+    DownloaderFactory factory = new DefaultDownloaderFactory(constructorHelper);
+
+    Downloader downloader =
+        factory.createDownloader(
+            DownloadAction.createDownloadAction(
+                DownloadAction.TYPE_PROGRESSIVE,
+                Uri.parse("https://www.test.com/download"),
+                /* keys= */ Collections.emptyList(),
+                /* customCacheKey= */ null,
+                /* data= */ null));
+    assertThat(downloader).isInstanceOf(ProgressiveDownloader.class);
+  }
+}
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index 234377895f..3778641378 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -25,19 +25,17 @@ import com.google.android.exoplayer2.offline.DownloadManager.TaskState.State;
 import com.google.android.exoplayer2.testutil.DummyMainThread;
 import com.google.android.exoplayer2.testutil.RobolectricUtil;
 import com.google.android.exoplayer2.testutil.TestDownloadManagerListener;
-import com.google.android.exoplayer2.upstream.DummyDataSource;
-import com.google.android.exoplayer2.upstream.cache.Cache;
 import com.google.android.exoplayer2.util.Util;
-import java.io.DataOutputStream;
 import java.io.File;
 import java.io.IOException;
+import java.util.Collections;
+import java.util.IdentityHashMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
@@ -63,6 +61,7 @@ public class DownloadManagerTest {
   private DummyMainThread dummyMainThread;
   private File actionFile;
   private TestDownloadManagerListener downloadManagerListener;
+  private FakeDownloaderFactory downloaderFactory;
   private DownloadManager downloadManager;
 
   @Before
@@ -73,6 +72,7 @@ public class DownloadManagerTest {
     uri3 = Uri.parse("http://abc.com/media3");
     dummyMainThread = new DummyMainThread();
     actionFile = Util.createTempFile(RuntimeEnvironment.application, "ExoPlayerTest");
+    downloaderFactory = new FakeDownloaderFactory();
     setUpDownloadManager(100);
   }
 
@@ -85,24 +85,24 @@ public class DownloadManagerTest {
 
   @Test
   public void testDownloadActionRuns() throws Throwable {
-    doTestActionRuns(createDownloadAction(uri1));
+    doTestDownloaderRuns(createDownloadRunner(uri1));
   }
 
   @Test
   public void testRemoveActionRuns() throws Throwable {
-    doTestActionRuns(createRemoveAction(uri1));
+    doTestDownloaderRuns(createRemoveRunner(uri1));
   }
 
   @Test
   public void testDownloadRetriesThenFails() throws Throwable {
-    FakeDownloadAction downloadAction = createDownloadAction(uri1);
-    downloadAction.post();
-    FakeDownloader fakeDownloader = downloadAction.getFakeDownloader();
+    DownloadRunner downloadRunner = createDownloadRunner(uri1);
+    downloadRunner.postAction();
+    FakeDownloader fakeDownloader = downloadRunner.downloader;
     fakeDownloader.enableDownloadIOException = true;
     for (int i = 0; i <= MIN_RETRY_COUNT; i++) {
       fakeDownloader.assertStarted(MAX_RETRY_DELAY).unblock();
     }
-    downloadAction.assertFailed();
+    downloadRunner.assertFailed();
     downloadManagerListener.clearDownloadError();
 
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
@@ -110,23 +110,23 @@ public class DownloadManagerTest {
 
   @Test
   public void testDownloadNoRetryWhenCanceled() throws Throwable {
-    FakeDownloadAction downloadAction = createDownloadAction(uri1).ignoreInterrupts();
-    downloadAction.getFakeDownloader().enableDownloadIOException = true;
-    downloadAction.post().assertStarted();
+    DownloadRunner downloadRunner = createDownloadRunner(uri1).ignoreInterrupts();
+    downloadRunner.downloader.enableDownloadIOException = true;
+    downloadRunner.postAction().assertStarted();
 
-    FakeDownloadAction removeAction = createRemoveAction(uri1).post();
+    DownloadRunner removeRunner = createRemoveRunner(uri1).postAction();
 
-    downloadAction.unblock().assertCanceled();
-    removeAction.unblock();
+    downloadRunner.unblock().assertCanceled();
+    removeRunner.unblock();
 
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
   @Test
   public void testDownloadRetriesThenContinues() throws Throwable {
-    FakeDownloadAction downloadAction = createDownloadAction(uri1);
-    downloadAction.post();
-    FakeDownloader fakeDownloader = downloadAction.getFakeDownloader();
+    DownloadRunner downloadRunner = createDownloadRunner(uri1);
+    downloadRunner.postAction();
+    FakeDownloader fakeDownloader = downloadRunner.downloader;
     fakeDownloader.enableDownloadIOException = true;
     for (int i = 0; i <= MIN_RETRY_COUNT; i++) {
       fakeDownloader.assertStarted(MAX_RETRY_DELAY);
@@ -135,7 +135,7 @@ public class DownloadManagerTest {
       }
       fakeDownloader.unblock();
     }
-    downloadAction.assertCompleted();
+    downloadRunner.assertCompleted();
 
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
@@ -143,9 +143,9 @@ public class DownloadManagerTest {
   @Test
   @SuppressWarnings({"NonAtomicVolatileUpdate", "NonAtomicOperationOnVolatileField"})
   public void testDownloadRetryCountResetsOnProgress() throws Throwable {
-    FakeDownloadAction downloadAction = createDownloadAction(uri1);
-    downloadAction.post();
-    FakeDownloader fakeDownloader = downloadAction.getFakeDownloader();
+    DownloadRunner downloadRunner = createDownloadRunner(uri1);
+    downloadRunner.postAction();
+    FakeDownloader fakeDownloader = downloadRunner.downloader;
     fakeDownloader.enableDownloadIOException = true;
     fakeDownloader.downloadedBytes = 0;
     for (int i = 0; i <= MIN_RETRY_COUNT + 10; i++) {
@@ -156,61 +156,61 @@ public class DownloadManagerTest {
       }
       fakeDownloader.unblock();
     }
-    downloadAction.assertCompleted();
+    downloadRunner.assertCompleted();
 
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
   @Test
   public void testDifferentMediaDownloadActionsStartInParallel() throws Throwable {
-    doTestActionsRunInParallel(createDownloadAction(uri1), createDownloadAction(uri2));
+    doTestDownloadersRunInParallel(createDownloadRunner(uri1), createDownloadRunner(uri2));
   }
 
   @Test
   public void testDifferentMediaDifferentActionsStartInParallel() throws Throwable {
-    doTestActionsRunInParallel(createDownloadAction(uri1), createRemoveAction(uri2));
+    doTestDownloadersRunInParallel(createDownloadRunner(uri1), createRemoveRunner(uri2));
   }
 
   @Test
   public void testSameMediaDownloadActionsStartInParallel() throws Throwable {
-    doTestActionsRunInParallel(createDownloadAction(uri1), createDownloadAction(uri1));
+    doTestDownloadersRunInParallel(createDownloadRunner(uri1), createDownloadRunner(uri1));
   }
 
   @Test
   public void testSameMediaRemoveActionWaitsDownloadAction() throws Throwable {
-    doTestActionsRunSequentially(createDownloadAction(uri1), createRemoveAction(uri1));
+    doTestDownloadersRunSequentially(createDownloadRunner(uri1), createRemoveRunner(uri1));
   }
 
   @Test
   public void testSameMediaDownloadActionWaitsRemoveAction() throws Throwable {
-    doTestActionsRunSequentially(createRemoveAction(uri1), createDownloadAction(uri1));
+    doTestDownloadersRunSequentially(createRemoveRunner(uri1), createDownloadRunner(uri1));
   }
 
   @Test
   public void testSameMediaRemoveActionWaitsRemoveAction() throws Throwable {
-    doTestActionsRunSequentially(createRemoveAction(uri1), createRemoveAction(uri1));
+    doTestDownloadersRunSequentially(createRemoveRunner(uri1), createRemoveRunner(uri1));
   }
 
   @Test
   public void testSameMediaMultipleActions() throws Throwable {
-    FakeDownloadAction downloadAction1 = createDownloadAction(uri1).ignoreInterrupts();
-    FakeDownloadAction downloadAction2 = createDownloadAction(uri1).ignoreInterrupts();
-    FakeDownloadAction removeAction1 = createRemoveAction(uri1);
-    FakeDownloadAction downloadAction3 = createDownloadAction(uri1);
-    FakeDownloadAction removeAction2 = createRemoveAction(uri1);
+    DownloadRunner downloadAction1 = createDownloadRunner(uri1).ignoreInterrupts();
+    DownloadRunner downloadAction2 = createDownloadRunner(uri1).ignoreInterrupts();
+    DownloadRunner removeAction1 = createRemoveRunner(uri1);
+    DownloadRunner downloadAction3 = createDownloadRunner(uri1);
+    DownloadRunner removeAction2 = createRemoveRunner(uri1);
 
     // Two download actions run in parallel.
-    downloadAction1.post().assertStarted();
-    downloadAction2.post().assertStarted();
+    downloadAction1.postAction().assertStarted();
+    downloadAction2.postAction().assertStarted();
     // removeAction1 is added. It interrupts the two download actions' threads but they are
     // configured to ignore it so removeAction1 doesn't start.
-    removeAction1.post().assertDoesNotStart();
+    removeAction1.postAction().assertDoesNotStart();
 
     // downloadAction2 finishes but it isn't enough to start removeAction1.
     downloadAction2.unblock().assertCanceled();
     removeAction1.assertDoesNotStart();
-    // downloadAction3 is post to DownloadManager but it waits for removeAction1 to finish.
-    downloadAction3.post().assertDoesNotStart();
+    // downloadAction3 is postAction to DownloadManager but it waits for removeAction1 to finish.
+    downloadAction3.postAction().assertDoesNotStart();
 
     // When downloadAction1 finishes, removeAction1 starts.
     downloadAction1.unblock().assertCanceled();
@@ -220,7 +220,7 @@ public class DownloadManagerTest {
 
     // removeAction2 is posted. removeAction1 and downloadAction3 is canceled so removeAction2
     // starts immediately.
-    removeAction2.post();
+    removeAction2.postAction();
     removeAction1.assertCanceled();
     downloadAction3.assertCanceled();
     removeAction2.assertStarted().unblock().assertCompleted();
@@ -229,13 +229,13 @@ public class DownloadManagerTest {
 
   @Test
   public void testMultipleRemoveActionWaitsLastCancelsAllOther() throws Throwable {
-    FakeDownloadAction removeAction1 = createRemoveAction(uri1).ignoreInterrupts();
-    FakeDownloadAction removeAction2 = createRemoveAction(uri1);
-    FakeDownloadAction removeAction3 = createRemoveAction(uri1);
+    DownloadRunner removeAction1 = createRemoveRunner(uri1).ignoreInterrupts();
+    DownloadRunner removeAction2 = createRemoveRunner(uri1);
+    DownloadRunner removeAction3 = createRemoveRunner(uri1);
 
-    removeAction1.post().assertStarted();
-    removeAction2.post().assertDoesNotStart();
-    removeAction3.post().assertDoesNotStart();
+    removeAction1.postAction().assertStarted();
+    removeAction2.postAction().assertDoesNotStart();
+    removeAction3.postAction().assertDoesNotStart();
 
     removeAction2.assertCanceled();
 
@@ -247,30 +247,30 @@ public class DownloadManagerTest {
 
   @Test
   public void testGetTasks() throws Throwable {
-    FakeDownloadAction removeAction = createRemoveAction(uri1);
-    FakeDownloadAction downloadAction1 = createDownloadAction(uri1);
-    FakeDownloadAction downloadAction2 = createDownloadAction(uri1);
+    DownloadRunner removeAction = createRemoveRunner(uri1);
+    DownloadRunner downloadAction1 = createDownloadRunner(uri1);
+    DownloadRunner downloadAction2 = createDownloadRunner(uri1);
 
-    removeAction.post().assertStarted();
-    downloadAction1.post().assertDoesNotStart();
-    downloadAction2.post().assertDoesNotStart();
+    removeAction.postAction().assertStarted();
+    downloadAction1.postAction().assertDoesNotStart();
+    downloadAction2.postAction().assertDoesNotStart();
 
     TaskState[] states = downloadManager.getAllTaskStates();
     assertThat(states).hasLength(3);
-    assertThat(states[0].action).isEqualTo(removeAction);
-    assertThat(states[1].action).isEqualTo(downloadAction1);
-    assertThat(states[2].action).isEqualTo(downloadAction2);
+    assertThat(states[0].action).isEqualTo(removeAction.action);
+    assertThat(states[1].action).isEqualTo(downloadAction1.action);
+    assertThat(states[2].action).isEqualTo(downloadAction2.action);
   }
 
   @Test
   public void testMultipleWaitingDownloadActionStartsInParallel() throws Throwable {
-    FakeDownloadAction removeAction = createRemoveAction(uri1);
-    FakeDownloadAction downloadAction1 = createDownloadAction(uri1);
-    FakeDownloadAction downloadAction2 = createDownloadAction(uri1);
+    DownloadRunner removeAction = createRemoveRunner(uri1);
+    DownloadRunner downloadAction1 = createDownloadRunner(uri1);
+    DownloadRunner downloadAction2 = createDownloadRunner(uri1);
 
-    removeAction.post().assertStarted();
-    downloadAction1.post().assertDoesNotStart();
-    downloadAction2.post().assertDoesNotStart();
+    removeAction.postAction().assertStarted();
+    downloadAction1.postAction().assertDoesNotStart();
+    downloadAction2.postAction().assertDoesNotStart();
 
     removeAction.unblock().assertCompleted();
     downloadAction1.assertStarted();
@@ -283,75 +283,75 @@ public class DownloadManagerTest {
 
   @Test
   public void testDifferentMediaDownloadActionsPreserveOrder() throws Throwable {
-    FakeDownloadAction removeAction = createRemoveAction(uri1).ignoreInterrupts();
-    FakeDownloadAction downloadAction1 = createDownloadAction(uri1);
-    FakeDownloadAction downloadAction2 = createDownloadAction(uri2);
+    DownloadRunner removeRunner = createRemoveRunner(uri1).ignoreInterrupts();
+    DownloadRunner downloadRunner1 = createDownloadRunner(uri1);
+    DownloadRunner downloadRunner2 = createDownloadRunner(uri2);
 
-    removeAction.post().assertStarted();
-    downloadAction1.post().assertDoesNotStart();
-    downloadAction2.post().assertDoesNotStart();
+    removeRunner.postAction().assertStarted();
+    downloadRunner1.postAction().assertDoesNotStart();
+    downloadRunner2.postAction().assertDoesNotStart();
 
-    removeAction.unblock().assertCompleted();
-    downloadAction1.assertStarted();
-    downloadAction2.assertStarted();
-    downloadAction1.unblock().assertCompleted();
-    downloadAction2.unblock().assertCompleted();
+    removeRunner.unblock().assertCompleted();
+    downloadRunner1.assertStarted();
+    downloadRunner2.assertStarted();
+    downloadRunner1.unblock().assertCompleted();
+    downloadRunner2.unblock().assertCompleted();
 
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
   @Test
   public void testDifferentMediaRemoveActionsDoNotPreserveOrder() throws Throwable {
-    FakeDownloadAction downloadAction = createDownloadAction(uri1).ignoreInterrupts();
-    FakeDownloadAction removeAction1 = createRemoveAction(uri1);
-    FakeDownloadAction removeAction2 = createRemoveAction(uri2);
+    DownloadRunner downloadRunner = createDownloadRunner(uri1).ignoreInterrupts();
+    DownloadRunner removeRunner1 = createRemoveRunner(uri1);
+    DownloadRunner removeRunner2 = createRemoveRunner(uri2);
 
-    downloadAction.post().assertStarted();
-    removeAction1.post().assertDoesNotStart();
-    removeAction2.post().assertStarted();
+    downloadRunner.postAction().assertStarted();
+    removeRunner1.postAction().assertDoesNotStart();
+    removeRunner2.postAction().assertStarted();
 
-    downloadAction.unblock().assertCanceled();
-    removeAction2.unblock().assertCompleted();
+    downloadRunner.unblock().assertCanceled();
+    removeRunner2.unblock().assertCompleted();
 
-    removeAction1.assertStarted();
-    removeAction1.unblock().assertCompleted();
+    removeRunner1.assertStarted();
+    removeRunner1.unblock().assertCompleted();
 
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
   @Test
   public void testStopAndResume() throws Throwable {
-    FakeDownloadAction download1Action = createDownloadAction(uri1);
-    FakeDownloadAction remove2Action = createRemoveAction(uri2);
-    FakeDownloadAction download2Action = createDownloadAction(uri2);
-    FakeDownloadAction remove1Action = createRemoveAction(uri1);
-    FakeDownloadAction download3Action = createDownloadAction(uri3);
+    DownloadRunner download1Runner = createDownloadRunner(uri1);
+    DownloadRunner remove2Runner = createRemoveRunner(uri2);
+    DownloadRunner download2Runner = createDownloadRunner(uri2);
+    DownloadRunner remove1Runner = createRemoveRunner(uri1);
+    DownloadRunner download3Runner = createDownloadRunner(uri3);
 
-    download1Action.post().assertStarted();
-    remove2Action.post().assertStarted();
-    download2Action.post().assertDoesNotStart();
+    download1Runner.postAction().assertStarted();
+    remove2Runner.postAction().assertStarted();
+    download2Runner.postAction().assertDoesNotStart();
 
     runOnMainThread(() -> downloadManager.stopDownloads());
 
-    download1Action.assertStopped();
+    download1Runner.assertStopped();
 
     // remove actions aren't stopped.
-    remove2Action.unblock().assertCompleted();
-    // Although remove2Action is finished, download2Action doesn't start.
-    download2Action.assertDoesNotStart();
+    remove2Runner.unblock().assertCompleted();
+    // Although remove2 is finished, download2 doesn't start.
+    download2Runner.assertDoesNotStart();
 
     // When a new remove action is added, it cancels stopped download actions with the same media.
-    remove1Action.post();
-    download1Action.assertCanceled();
-    remove1Action.assertStarted().unblock().assertCompleted();
+    remove1Runner.postAction();
+    download1Runner.assertCanceled();
+    remove1Runner.assertStarted().unblock().assertCompleted();
 
     // New download actions can be added but they don't start.
-    download3Action.post().assertDoesNotStart();
+    download3Runner.postAction().assertDoesNotStart();
 
     runOnMainThread(() -> downloadManager.startDownloads());
 
-    download2Action.assertStarted().unblock().assertCompleted();
-    download3Action.assertStarted().unblock().assertCompleted();
+    download2Runner.assertStarted().unblock().assertCompleted();
+    download3Runner.assertStarted().unblock().assertCompleted();
 
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
@@ -359,34 +359,34 @@ public class DownloadManagerTest {
   @Test
   public void testResumeBeforeTotallyStopped() throws Throwable {
     setUpDownloadManager(2);
-    FakeDownloadAction download1Action = createDownloadAction(uri1).ignoreInterrupts();
-    FakeDownloadAction download2Action = createDownloadAction(uri2);
-    FakeDownloadAction download3Action = createDownloadAction(uri3);
+    DownloadRunner download1Runner = createDownloadRunner(uri1).ignoreInterrupts();
+    DownloadRunner download2Runner = createDownloadRunner(uri2);
+    DownloadRunner download3Runner = createDownloadRunner(uri3);
 
-    download1Action.post().assertStarted();
-    download2Action.post().assertStarted();
-    // download3Action doesn't start as DM was configured to run two downloads in parallel.
-    download3Action.post().assertDoesNotStart();
+    download1Runner.postAction().assertStarted();
+    download2Runner.postAction().assertStarted();
+    // download3 doesn't start as DM was configured to run two downloads in parallel.
+    download3Runner.postAction().assertDoesNotStart();
 
     runOnMainThread(() -> downloadManager.stopDownloads());
 
-    // download1Action doesn't stop yet as it ignores interrupts.
-    download2Action.assertStopped();
+    // download1 doesn't stop yet as it ignores interrupts.
+    download2Runner.assertStopped();
 
     runOnMainThread(() -> downloadManager.startDownloads());
 
-    // download2Action starts immediately.
-    download2Action.assertStarted();
+    // download2 starts immediately.
+    download2Runner.assertStarted();
 
-    // download3Action doesn't start as download1Action still holds its slot.
-    download3Action.assertDoesNotStart();
+    // download3 doesn't start as download1 still holds its slot.
+    download3Runner.assertDoesNotStart();
 
-    // when unblocked download1Action stops and starts immediately.
-    download1Action.unblock().assertStopped().assertStarted();
+    // when unblocked download1 stops and starts immediately.
+    download1Runner.unblock().assertStopped().assertStarted();
 
-    download1Action.unblock();
-    download2Action.unblock();
-    download3Action.unblock();
+    download1Runner.unblock();
+    download2Runner.unblock();
+    download3Runner.unblock();
 
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
@@ -400,12 +400,7 @@ public class DownloadManagerTest {
           () -> {
             downloadManager =
                 new DownloadManager(
-                    new DownloaderConstructorHelper(
-                        Mockito.mock(Cache.class), DummyDataSource.FACTORY),
-                    maxActiveDownloadTasks,
-                    MIN_RETRY_COUNT,
-                    actionFile,
-                    ProgressiveDownloadAction.DESERIALIZER);
+                    actionFile, downloaderFactory, maxActiveDownloadTasks, MIN_RETRY_COUNT);
             downloadManagerListener =
                 new TestDownloadManagerListener(downloadManager, dummyMainThread);
             downloadManager.addListener(downloadManagerListener);
@@ -424,104 +419,104 @@ public class DownloadManagerTest {
     }
   }
 
-  private void doTestActionRuns(FakeDownloadAction action) throws Throwable {
-    action.post().assertStarted().unblock().assertCompleted();
+  private void doTestDownloaderRuns(DownloadRunner runner) throws Throwable {
+    runner.postAction().assertStarted().unblock().assertCompleted();
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
-  private void doTestActionsRunSequentially(FakeDownloadAction action1, FakeDownloadAction action2)
+  private void doTestDownloadersRunSequentially(DownloadRunner runner1, DownloadRunner runner2)
       throws Throwable {
-    action1.ignoreInterrupts().post().assertStarted();
-    action2.post().assertDoesNotStart();
+    runner1.ignoreInterrupts().postAction().assertStarted();
+    runner2.postAction().assertDoesNotStart();
 
-    action1.unblock();
-    action2.assertStarted();
+    runner1.unblock();
+    runner2.assertStarted();
 
-    action2.unblock().assertCompleted();
+    runner2.unblock().assertCompleted();
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
-  private void doTestActionsRunInParallel(FakeDownloadAction action1, FakeDownloadAction action2)
+  private void doTestDownloadersRunInParallel(DownloadRunner runner1, DownloadRunner runner2)
       throws Throwable {
-    action1.post().assertStarted();
-    action2.post().assertStarted();
-    action1.unblock().assertCompleted();
-    action2.unblock().assertCompleted();
+    runner1.postAction().assertStarted();
+    runner2.postAction().assertStarted();
+    runner1.unblock().assertCompleted();
+    runner2.unblock().assertCompleted();
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
-  private FakeDownloadAction createDownloadAction(Uri uri) {
-    return new FakeDownloadAction(uri, /* isRemoveAction= */ false);
+  private DownloadRunner createDownloadRunner(Uri uri) {
+    return new DownloadRunner(uri, /* isRemoveAction= */ false);
   }
 
-  private FakeDownloadAction createRemoveAction(Uri uri) {
-    return new FakeDownloadAction(uri, /* isRemoveAction= */ true);
+  private DownloadRunner createRemoveRunner(Uri uri) {
+    return new DownloadRunner(uri, /* isRemoveAction= */ true);
   }
 
   private void runOnMainThread(final Runnable r) {
     dummyMainThread.runOnMainThread(r);
   }
 
-  private class FakeDownloadAction extends DownloadAction {
+  private class DownloadRunner {
 
-    private final FakeDownloader downloader;
+    public final DownloadAction action;
+    public final FakeDownloader downloader;
 
-    private FakeDownloadAction(Uri uri, boolean isRemoveAction) {
-      super("Fake", /* version= */ 0, uri, isRemoveAction, /* data= */ null);
-      this.downloader = new FakeDownloader(isRemoveAction);
+    private DownloadRunner(Uri uri, boolean isRemoveAction) {
+      action =
+          isRemoveAction
+              ? DownloadAction.createRemoveAction(
+                  DownloadAction.TYPE_PROGRESSIVE,
+                  uri,
+                  /* customCacheKey= */ null,
+                  /* data= */ null)
+              : DownloadAction.createDownloadAction(
+                  DownloadAction.TYPE_PROGRESSIVE,
+                  uri,
+                  /* keys= */ Collections.emptyList(),
+                  /* customCacheKey= */ null,
+                  /* data= */ null);
+      downloader = new FakeDownloader(isRemoveAction);
+      downloaderFactory.putFakeDownloader(action, downloader);
     }
 
-    @Override
-    protected void writeToStream(DataOutputStream output) {
-      // do nothing.
-    }
-
-    @Override
-    public Downloader createDownloader(DownloaderConstructorHelper downloaderConstructorHelper) {
-      return downloader;
-    }
-
-    private FakeDownloader getFakeDownloader() {
-      return downloader;
-    }
-
-    private FakeDownloadAction post() {
-      runOnMainThread(() -> downloadManager.handleAction(FakeDownloadAction.this));
+    private DownloadRunner postAction() {
+      runOnMainThread(() -> downloadManager.handleAction(action));
       return this;
     }
 
-    private FakeDownloadAction assertDoesNotStart() throws InterruptedException {
+    private DownloadRunner assertDoesNotStart() throws InterruptedException {
       Thread.sleep(ASSERT_FALSE_TIME);
       assertThat(downloader.started.getCount()).isEqualTo(1);
       return this;
     }
 
-    private FakeDownloadAction assertStarted() throws InterruptedException {
+    private DownloadRunner assertStarted() throws InterruptedException {
       downloader.assertStarted(ASSERT_TRUE_TIMEOUT);
       return assertState(TaskState.STATE_STARTED);
     }
 
-    private FakeDownloadAction assertCompleted() {
+    private DownloadRunner assertCompleted() {
       return assertState(TaskState.STATE_COMPLETED);
     }
 
-    private FakeDownloadAction assertFailed() {
+    private DownloadRunner assertFailed() {
       return assertState(TaskState.STATE_FAILED);
     }
 
-    private FakeDownloadAction assertCanceled() {
+    private DownloadRunner assertCanceled() {
       return assertState(TaskState.STATE_CANCELED);
     }
 
-    private FakeDownloadAction assertStopped() {
+    private DownloadRunner assertStopped() {
       return assertState(TaskState.STATE_QUEUED);
     }
 
-    private FakeDownloadAction assertState(@State int expectedState) {
+    private DownloadRunner assertState(@State int expectedState) {
       while (true) {
         Integer state = null;
         try {
-          state = downloadManagerListener.pollStateChange(this, ASSERT_TRUE_TIMEOUT);
+          state = downloadManagerListener.pollStateChange(action, ASSERT_TRUE_TIMEOUT);
         } catch (InterruptedException e) {
           fail(e.getMessage());
         }
@@ -531,36 +526,54 @@ public class DownloadManagerTest {
       }
     }
 
-    private FakeDownloadAction unblock() {
+    private DownloadRunner unblock() {
       downloader.unblock();
       return this;
     }
 
-    private FakeDownloadAction ignoreInterrupts() {
+    private DownloadRunner ignoreInterrupts() {
       downloader.ignoreInterrupts = true;
       return this;
     }
   }
 
+  private static class FakeDownloaderFactory implements DownloaderFactory {
+
+    public IdentityHashMap<DownloadAction, FakeDownloader> downloaders;
+
+    public FakeDownloaderFactory() {
+      downloaders = new IdentityHashMap<>();
+    }
+
+    public void putFakeDownloader(DownloadAction action, FakeDownloader downloader) {
+      downloaders.put(action, downloader);
+    }
+
+    @Override
+    public Downloader createDownloader(DownloadAction action) {
+      return downloaders.get(action);
+    }
+  }
+
   private static class FakeDownloader implements Downloader {
 
     private final com.google.android.exoplayer2.util.ConditionVariable blocker;
-    private final boolean isRemoveAction;
+    private final boolean isRemove;
 
     private CountDownLatch started;
     private boolean ignoreInterrupts;
     private volatile boolean enableDownloadIOException;
     private volatile int downloadedBytes = C.LENGTH_UNSET;
 
-    private FakeDownloader(boolean isRemoveAction) {
-      this.isRemoveAction = isRemoveAction;
+    private FakeDownloader(boolean isRemove) {
+      this.isRemove = isRemove;
       this.started = new CountDownLatch(1);
       this.blocker = new com.google.android.exoplayer2.util.ConditionVariable();
     }
 
     @Override
     public void download() throws InterruptedException, IOException {
-      assertThat(isRemoveAction).isFalse();
+      assertThat(isRemove).isFalse();
       started.countDown();
       block();
       if (enableDownloadIOException) {
@@ -575,7 +588,7 @@ public class DownloadManagerTest {
 
     @Override
     public void remove() throws InterruptedException {
-      assertThat(isRemoveAction).isTrue();
+      assertThat(isRemove).isTrue();
       started.countDown();
       block();
     }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/ProgressiveDownloadActionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/ProgressiveDownloadActionTest.java
index df5e7dd044..8f7bb51fd8 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/ProgressiveDownloadActionTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/ProgressiveDownloadActionTest.java
@@ -18,21 +18,19 @@ package com.google.android.exoplayer2.offline;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
-import com.google.android.exoplayer2.upstream.DummyDataSource;
-import com.google.android.exoplayer2.upstream.cache.Cache;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.util.Collections;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 
-/** Unit tests for {@link ProgressiveDownloadAction}. */
+// TODO: Merge into DownloadActionTest
+/** Unit tests for progressive {@link DownloadAction}s. */
 @RunWith(RobolectricTestRunner.class)
 public class ProgressiveDownloadActionTest {
 
@@ -57,15 +55,6 @@ public class ProgressiveDownloadActionTest {
     assertThat(action2.isRemoveAction).isTrue();
   }
 
-  @Test
-  public void testCreateDownloader() throws Exception {
-    MockitoAnnotations.initMocks(this);
-    DownloadAction action = createDownloadAction(uri1, null);
-    DownloaderConstructorHelper constructorHelper =
-        new DownloaderConstructorHelper(Mockito.mock(Cache.class), DummyDataSource.FACTORY);
-    assertThat(action.createDownloader(constructorHelper)).isNotNull();
-  }
-
   @Test
   public void testSameUriCacheKeyDifferentAction_IsSameMedia() throws Exception {
     DownloadAction action1 = createRemoveAction(uri1, null);
@@ -139,6 +128,13 @@ public class ProgressiveDownloadActionTest {
     doTestSerializationRoundTrip(createRemoveAction(uri2, "key"));
   }
 
+  @Test
+  public void testSerializerVersion0() throws Exception {
+    doTestLegacySerializationRoundTrip(createDownloadAction(uri1, "key"));
+    doTestLegacySerializationRoundTrip(createRemoveAction(uri1, "key"));
+    doTestLegacySerializationRoundTrip(createDownloadAction(uri2, "key"));
+  }
+
   private void assertSameMedia(DownloadAction action1, DownloadAction action2) {
     assertThat(action1.isSameMedia(action2)).isTrue();
     assertThat(action2.isSameMedia(action1)).isTrue();
@@ -149,25 +145,61 @@ public class ProgressiveDownloadActionTest {
     assertThat(action2.isSameMedia(action1)).isFalse();
   }
 
+  private static void assertEqual(DownloadAction action1, DownloadAction action2) {
+    assertThat(action1).isEqualTo(action2);
+    assertThat(action2).isEqualTo(action1);
+  }
+
   private static void doTestSerializationRoundTrip(DownloadAction action) throws IOException {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     DataOutputStream output = new DataOutputStream(out);
-    DownloadAction.serializeToStream(action, output);
+    action.serializeToStream(output);
 
     ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
     DataInputStream input = new DataInputStream(in);
-    DownloadAction action2 =
-        DownloadAction.deserializeFromStream(
-            new DownloadAction.Deserializer[] {ProgressiveDownloadAction.DESERIALIZER}, input);
+    DownloadAction action2 = DownloadAction.deserializeFromStream(input);
 
     assertThat(action2).isEqualTo(action);
   }
 
+  private static void doTestLegacySerializationRoundTrip(DownloadAction action) throws IOException {
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    DataOutputStream output = new DataOutputStream(out);
+    DataOutputStream dataOutputStream = new DataOutputStream(output);
+    dataOutputStream.writeUTF(action.type);
+    dataOutputStream.writeInt(/* version= */ 0);
+    dataOutputStream.writeUTF(action.uri.toString());
+    dataOutputStream.writeBoolean(action.isRemoveAction);
+    dataOutputStream.writeInt(action.data.length);
+    dataOutputStream.write(action.data);
+    boolean customCacheKeySet = action.customCacheKey != null;
+    output.writeBoolean(customCacheKeySet);
+    if (customCacheKeySet) {
+      output.writeUTF(action.customCacheKey);
+    }
+    dataOutputStream.flush();
+
+    assertEqual(action, deserializeActionFromStream(out));
+  }
+
+  private static DownloadAction deserializeActionFromStream(ByteArrayOutputStream out)
+      throws IOException {
+    ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
+    DataInputStream input = new DataInputStream(in);
+    return DownloadAction.deserializeFromStream(input);
+  }
+
   private static DownloadAction createDownloadAction(Uri uri1, String customCacheKey) {
-    return ProgressiveDownloadAction.createDownloadAction(uri1, null, customCacheKey);
+    return DownloadAction.createDownloadAction(
+        DownloadAction.TYPE_PROGRESSIVE,
+        uri1,
+        /* keys= */ Collections.emptyList(),
+        customCacheKey,
+        /* data= */ null);
   }
 
   private static DownloadAction createRemoveAction(Uri uri1, String customCacheKey) {
-    return ProgressiveDownloadAction.createRemoveAction(uri1, null, customCacheKey);
+    return DownloadAction.createRemoveAction(
+        DownloadAction.TYPE_PROGRESSIVE, uri1, customCacheKey, /* data= */ null);
   }
 }
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadAction.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadAction.java
deleted file mode 100644
index f36a018e5b..0000000000
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadAction.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.source.dash.offline;
-
-import android.net.Uri;
-import android.support.annotation.Nullable;
-import com.google.android.exoplayer2.offline.DownloadAction;
-import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
-import com.google.android.exoplayer2.offline.SegmentDownloadAction;
-import com.google.android.exoplayer2.offline.StreamKey;
-import java.util.Collections;
-import java.util.List;
-
-/** An action to download or remove downloaded DASH streams. */
-public final class DashDownloadAction extends SegmentDownloadAction {
-
-  private static final String TYPE = "dash";
-  private static final int VERSION = 0;
-
-  public static final Deserializer DESERIALIZER =
-      new SegmentDownloadActionDeserializer(TYPE, VERSION) {
-        @Override
-        protected DownloadAction createDownloadAction(
-            Uri uri, boolean isRemoveAction, byte[] data, List<StreamKey> keys) {
-          return new DashDownloadAction(uri, isRemoveAction, data, keys);
-        }
-      };
-
-  /**
-   * Creates a DASH download action.
-   *
-   * @param uri The URI of the media to be downloaded.
-   * @param data Optional custom data for this action. If {@code null} an empty array will be used.
-   * @param keys Keys of tracks to be downloaded. If empty, all tracks will be downloaded.
-   */
-  public static DashDownloadAction createDownloadAction(
-      Uri uri, @Nullable byte[] data, List<StreamKey> keys) {
-    return new DashDownloadAction(uri, /* isRemoveAction= */ false, data, keys);
-  }
-
-  /**
-   * Creates a DASH remove action.
-   *
-   * @param uri The URI of the media to be removed.
-   * @param data Optional custom data for this action. If {@code null} an empty array will be used.
-   */
-  public static DashDownloadAction createRemoveAction(Uri uri, @Nullable byte[] data) {
-    return new DashDownloadAction(uri, /* isRemoveAction= */ true, data, Collections.emptyList());
-  }
-
-  /**
-   * @param uri The DASH manifest URI.
-   * @param isRemoveAction Whether the data will be removed. If {@code false} it will be downloaded.
-   * @param data Optional custom data for this action.
-   * @param keys Keys of representations to be downloaded. If empty, all representations are
-   *     downloaded. If {@code removeAction} is true, {@code keys} must be empty.
-   * @deprecated Use {@link #createDownloadAction(Uri, byte[], List)} or {@link
-   *     #createRemoveAction(Uri, byte[])}.
-   */
-  @Deprecated
-  public DashDownloadAction(
-      Uri uri, boolean isRemoveAction, @Nullable byte[] data, List<StreamKey> keys) {
-    super(TYPE, VERSION, uri, isRemoveAction, data, keys);
-  }
-
-  @Override
-  public DashDownloader createDownloader(DownloaderConstructorHelper constructorHelper) {
-    return new DashDownloader(uri, keys, constructorHelper);
-  }
-
-}
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java
index 91e41b9ded..5b3ca3664b 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java
@@ -19,6 +19,7 @@ import android.net.Uri;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.offline.TrackKey;
@@ -86,13 +87,15 @@ public final class DashDownloadHelper extends DownloadHelper {
   }
 
   @Override
-  public DashDownloadAction getDownloadAction(@Nullable byte[] data, List<TrackKey> trackKeys) {
-    return DashDownloadAction.createDownloadAction(uri, data, toStreamKeys(trackKeys));
+  public DownloadAction getDownloadAction(@Nullable byte[] data, List<TrackKey> trackKeys) {
+    return DownloadAction.createDownloadAction(
+        DownloadAction.TYPE_DASH, uri, toStreamKeys(trackKeys), /* customCacheKey= */ null, data);
   }
 
   @Override
-  public DashDownloadAction getRemoveAction(@Nullable byte[] data) {
-    return DashDownloadAction.createRemoveAction(uri, data);
+  public DownloadAction getRemoveAction(@Nullable byte[] data) {
+    return DownloadAction.createRemoveAction(
+        DownloadAction.TYPE_DASH, uri, /* customCacheKey= */ null, data);
   }
 
   private static List<StreamKey> toStreamKeys(List<TrackKey> trackKeys) {
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadActionTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadActionTest.java
index 0ebf6bb628..f3f6c8aa5c 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadActionTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadActionTest.java
@@ -19,10 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
 import com.google.android.exoplayer2.offline.DownloadAction;
-import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
-import com.google.android.exoplayer2.upstream.DummyDataSource;
-import com.google.android.exoplayer2.upstream.cache.Cache;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
@@ -33,11 +30,10 @@ import java.util.Collections;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 
-/** Unit tests for {@link DashDownloadAction}. */
+// TODO: Merge into DownloadActionTest
+/** Unit tests for DASH {@link DownloadAction}s. */
 @RunWith(RobolectricTestRunner.class)
 public class DashDownloadActionTest {
 
@@ -62,15 +58,6 @@ public class DashDownloadActionTest {
     assertThat(action2.isRemoveAction).isTrue();
   }
 
-  @Test
-  public void testCreateDownloader() {
-    MockitoAnnotations.initMocks(this);
-    DownloadAction action = createDownloadAction(uri1);
-    DownloaderConstructorHelper constructorHelper =
-        new DownloaderConstructorHelper(Mockito.mock(Cache.class), DummyDataSource.FACTORY);
-    assertThat(action.createDownloader(constructorHelper)).isNotNull();
-  }
-
   @Test
   public void testSameUriDifferentAction_IsSameMedia() {
     DownloadAction action1 = createRemoveAction(uri1);
@@ -141,6 +128,14 @@ public class DashDownloadActionTest {
         createDownloadAction(uri2, new StreamKey(0, 0, 0), new StreamKey(1, 1, 1)));
   }
 
+  @Test
+  public void testSerializerVersion0() throws Exception {
+    doTestLegacySerializationRoundTrip(createDownloadAction(uri1));
+    doTestLegacySerializationRoundTrip(createRemoveAction(uri1));
+    doTestLegacySerializationRoundTrip(
+        createDownloadAction(uri2, new StreamKey(0, 0, 0), new StreamKey(1, 1, 1)));
+  }
+
   private static void assertNotEqual(DownloadAction action1, DownloadAction action2) {
     assertThat(action1).isNotEqualTo(action2);
     assertThat(action2).isNotEqualTo(action1);
@@ -154,24 +149,53 @@ public class DashDownloadActionTest {
   private static void doTestSerializationRoundTrip(DownloadAction action) throws IOException {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     DataOutputStream output = new DataOutputStream(out);
-    DownloadAction.serializeToStream(action, output);
+    action.serializeToStream(output);
 
     ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
     DataInputStream input = new DataInputStream(in);
-    DownloadAction action2 =
-        DownloadAction.deserializeFromStream(
-            new DownloadAction.Deserializer[] {DashDownloadAction.DESERIALIZER}, input);
+    DownloadAction action2 = DownloadAction.deserializeFromStream(input);
 
     assertThat(action).isEqualTo(action2);
   }
 
+  private static void doTestLegacySerializationRoundTrip(DownloadAction action) throws IOException {
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    DataOutputStream output = new DataOutputStream(out);
+    DataOutputStream dataOutputStream = new DataOutputStream(output);
+    dataOutputStream.writeUTF(action.type);
+    dataOutputStream.writeInt(/* version= */ 0);
+    dataOutputStream.writeUTF(action.uri.toString());
+    dataOutputStream.writeBoolean(action.isRemoveAction);
+    dataOutputStream.writeInt(action.data.length);
+    dataOutputStream.write(action.data);
+    dataOutputStream.writeInt(action.keys.size());
+    for (int i = 0; i < action.keys.size(); i++) {
+      StreamKey key = action.keys.get(i);
+      dataOutputStream.writeInt(key.periodIndex);
+      dataOutputStream.writeInt(key.groupIndex);
+      dataOutputStream.writeInt(key.trackIndex);
+    }
+    dataOutputStream.flush();
+
+    assertEqual(action, deserializeActionFromStream(out));
+  }
+
+  private static DownloadAction deserializeActionFromStream(ByteArrayOutputStream out)
+      throws IOException {
+    ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
+    DataInputStream input = new DataInputStream(in);
+    return DownloadAction.deserializeFromStream(input);
+  }
+
   private static DownloadAction createDownloadAction(Uri uri, StreamKey... keys) {
     ArrayList<StreamKey> keysList = new ArrayList<>();
     Collections.addAll(keysList, keys);
-    return DashDownloadAction.createDownloadAction(uri, null, keysList);
+    return DownloadAction.createDownloadAction(
+        DownloadAction.TYPE_DASH, uri, keysList, /* customCacheKey= */ null, /* data= */ null);
   }
 
   private static DownloadAction createRemoveAction(Uri uri) {
-    return DashDownloadAction.createRemoveAction(uri, null);
+    return DownloadAction.createRemoveAction(
+        DownloadAction.TYPE_DASH, uri, /* customCacheKey= */ null, /* data= */ null);
   }
 }
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
index a597d780e0..76699217e3 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
@@ -25,14 +25,21 @@ import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import android.net.Uri;
+import com.google.android.exoplayer2.offline.DefaultDownloaderFactory;
+import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadException;
+import com.google.android.exoplayer2.offline.Downloader;
 import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
+import com.google.android.exoplayer2.offline.DownloaderFactory;
 import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.testutil.FakeDataSet;
 import com.google.android.exoplayer2.testutil.FakeDataSource;
 import com.google.android.exoplayer2.testutil.FakeDataSource.Factory;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.upstream.DataSpec;
+import com.google.android.exoplayer2.upstream.DummyDataSource;
+import com.google.android.exoplayer2.upstream.cache.Cache;
 import com.google.android.exoplayer2.upstream.cache.NoOpCacheEvictor;
 import com.google.android.exoplayer2.upstream.cache.SimpleCache;
 import com.google.android.exoplayer2.util.Util;
@@ -44,6 +51,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
@@ -67,6 +75,23 @@ public class DashDownloaderTest {
     Util.recursiveDelete(tempFolder);
   }
 
+  @Test
+  public void testCreateWithDefaultDownloaderFactory() throws Exception {
+    DownloaderConstructorHelper constructorHelper =
+        new DownloaderConstructorHelper(Mockito.mock(Cache.class), DummyDataSource.FACTORY);
+    DownloaderFactory factory = new DefaultDownloaderFactory(constructorHelper);
+
+    Downloader downloader =
+        factory.createDownloader(
+            DownloadAction.createDownloadAction(
+                DownloadAction.TYPE_DASH,
+                Uri.parse("https://www.test.com/download"),
+                Collections.singletonList(new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0)),
+                /* customCacheKey= */ null,
+                /* data= */ null));
+    assertThat(downloader).isInstanceOf(DashDownloader.class);
+  }
+
   @Test
   public void testDownloadRepresentation() throws Exception {
     FakeDataSet fakeDataSet =
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
index 88d4ed6a9d..f0cab7532f 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
@@ -25,6 +25,7 @@ import android.content.Context;
 import android.net.Uri;
 import android.os.ConditionVariable;
 import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.offline.DefaultDownloaderFactory;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadManager;
 import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
@@ -238,11 +239,11 @@ public class DownloadManagerDashTest {
           Factory fakeDataSourceFactory = new FakeDataSource.Factory().setFakeDataSet(fakeDataSet);
           downloadManager =
               new DownloadManager(
-                  new DownloaderConstructorHelper(cache, fakeDataSourceFactory),
-                  /* maxSimultaneousDownloads= */ 1,
-                  /* minRetryCount= */ 3,
                   actionFile,
-                  DashDownloadAction.DESERIALIZER);
+                  new DefaultDownloaderFactory(
+                      new DownloaderConstructorHelper(cache, fakeDataSourceFactory)),
+                  /* maxSimultaneousDownloads= */ 1,
+                  /* minRetryCount= */ 3);
 
           downloadManagerListener =
               new TestDownloadManagerListener(downloadManager, dummyMainThread);
@@ -257,9 +258,13 @@ public class DownloadManagerDashTest {
     Collections.addAll(keysList, keys);
     DownloadAction result;
     if (isRemoveAction) {
-      result = DashDownloadAction.createRemoveAction(uri, data);
+      result =
+          DownloadAction.createRemoveAction(
+              DownloadAction.TYPE_DASH, uri, /* customCacheKey= */ null, data);
     } else {
-      result = DashDownloadAction.createDownloadAction(uri, data, keysList);
+      result =
+          DownloadAction.createDownloadAction(
+              DownloadAction.TYPE_DASH, uri, keysList, /* customCacheKey= */ null, data);
     }
     return result;
   }
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
index 70a64f5524..2466a42049 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
@@ -24,6 +24,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.offline.DefaultDownloaderFactory;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadManager;
 import com.google.android.exoplayer2.offline.DownloadService;
@@ -116,11 +117,11 @@ public class DownloadServiceDashTest {
           actionFile.delete();
           final DownloadManager dashDownloadManager =
               new DownloadManager(
-                  new DownloaderConstructorHelper(cache, fakeDataSourceFactory),
-                  1,
-                  3,
                   actionFile,
-                  DashDownloadAction.DESERIALIZER);
+                  new DefaultDownloaderFactory(
+                      new DownloaderConstructorHelper(cache, fakeDataSourceFactory)),
+                  /* maxSimultaneousDownloads= */ 1,
+                  /* minRetryCount= */ 3);
           downloadManagerListener =
               new TestDownloadManagerListener(dashDownloadManager, dummyMainThread);
           dashDownloadManager.addListener(downloadManagerListener);
@@ -211,9 +212,13 @@ public class DownloadServiceDashTest {
     Collections.addAll(keysList, keys);
     DownloadAction result;
     if (isRemoveAction) {
-      result = DashDownloadAction.createRemoveAction(uri, data);
+      result =
+          DownloadAction.createRemoveAction(
+              DownloadAction.TYPE_DASH, uri, /* customCacheKey= */ null, data);
     } else {
-      result = DashDownloadAction.createDownloadAction(uri, data, keysList);
+      result =
+          DownloadAction.createDownloadAction(
+              DownloadAction.TYPE_DASH, uri, keysList, /* customCacheKey= */ null, data);
     }
     return result;
   }
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadAction.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadAction.java
deleted file mode 100644
index c54a9a7dd3..0000000000
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadAction.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.source.hls.offline;
-
-import android.net.Uri;
-import android.support.annotation.Nullable;
-import com.google.android.exoplayer2.offline.DownloadAction;
-import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
-import com.google.android.exoplayer2.offline.SegmentDownloadAction;
-import com.google.android.exoplayer2.offline.StreamKey;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-
-/** An action to download or remove downloaded HLS streams. */
-public final class HlsDownloadAction extends SegmentDownloadAction {
-
-  private static final String TYPE = "hls";
-  private static final int VERSION = 1;
-
-  public static final Deserializer DESERIALIZER =
-      new SegmentDownloadActionDeserializer(TYPE, VERSION) {
-
-        @Override
-        protected StreamKey readKey(int version, DataInputStream input) throws IOException {
-          if (version > 0) {
-            return super.readKey(version, input);
-          }
-          int renditionGroup = input.readInt();
-          int trackIndex = input.readInt();
-          return new StreamKey(renditionGroup, trackIndex);
-        }
-
-        @Override
-        protected DownloadAction createDownloadAction(
-            Uri uri, boolean isRemoveAction, byte[] data, List<StreamKey> keys) {
-          return new HlsDownloadAction(uri, isRemoveAction, data, keys);
-        }
-      };
-
-  /**
-   * Creates a HLS download action.
-   *
-   * @param uri The URI of the media to be downloaded.
-   * @param data Optional custom data for this action. If {@code null} an empty array will be used.
-   * @param keys Keys of tracks to be downloaded. If empty, all tracks will be downloaded.
-   */
-  public static HlsDownloadAction createDownloadAction(
-      Uri uri, @Nullable byte[] data, List<StreamKey> keys) {
-    return new HlsDownloadAction(uri, /* isRemoveAction= */ false, data, keys);
-  }
-
-  /**
-   * Creates a HLS remove action.
-   *
-   * @param uri The URI of the media to be removed.
-   * @param data Optional custom data for this action. If {@code null} an empty array will be used.
-   */
-  public static HlsDownloadAction createRemoveAction(Uri uri, @Nullable byte[] data) {
-    return new HlsDownloadAction(uri, /* isRemoveAction= */ true, data, Collections.emptyList());
-  }
-
-  /**
-   * @param uri The HLS playlist URI.
-   * @param isRemoveAction Whether the data will be removed. If {@code false} it will be downloaded.
-   * @param data Optional custom data for this action.
-   * @param keys Keys of renditions to be downloaded. If empty, all renditions are downloaded. If
-   *     {@code removeAction} is true, {@code keys} must empty.
-   * @deprecated Use {@link #createDownloadAction(Uri, byte[], List)} or {@link
-   *     #createRemoveAction(Uri, byte[])}.
-   */
-  @Deprecated
-  public HlsDownloadAction(
-      Uri uri, boolean isRemoveAction, @Nullable byte[] data, List<StreamKey> keys) {
-    super(TYPE, VERSION, uri, isRemoveAction, data, keys);
-  }
-
-  @Override
-  public HlsDownloader createDownloader(DownloaderConstructorHelper constructorHelper) {
-    return new HlsDownloader(uri, keys, constructorHelper);
-  }
-
-}
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java
index fcbe06993e..1aae136231 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java
@@ -19,6 +19,7 @@ import android.net.Uri;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.offline.TrackKey;
@@ -97,15 +98,20 @@ public final class HlsDownloadHelper extends DownloadHelper {
   }
 
   @Override
-  public HlsDownloadAction getDownloadAction(@Nullable byte[] data, List<TrackKey> trackKeys) {
+  public DownloadAction getDownloadAction(@Nullable byte[] data, List<TrackKey> trackKeys) {
     Assertions.checkNotNull(renditionGroups);
-    return HlsDownloadAction.createDownloadAction(
-        uri, data, toStreamKeys(trackKeys, renditionGroups));
+    return DownloadAction.createDownloadAction(
+        DownloadAction.TYPE_HLS,
+        uri,
+        toStreamKeys(trackKeys, renditionGroups),
+        /* customCacheKey= */ null,
+        data);
   }
 
   @Override
-  public HlsDownloadAction getRemoveAction(@Nullable byte[] data) {
-    return HlsDownloadAction.createRemoveAction(uri, data);
+  public DownloadAction getRemoveAction(@Nullable byte[] data) {
+    return DownloadAction.createRemoveAction(
+        DownloadAction.TYPE_HLS, uri, /* customCacheKey= */ null, data);
   }
 
   private static Format[] toFormats(List<HlsMasterPlaylist.HlsUrl> hlsUrls) {
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadActionTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadActionTest.java
index 778ecadddd..5e2870bc3a 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadActionTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadActionTest.java
@@ -19,10 +19,8 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
 import com.google.android.exoplayer2.offline.DownloadAction;
-import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
-import com.google.android.exoplayer2.upstream.DummyDataSource;
-import com.google.android.exoplayer2.upstream.cache.Cache;
+import com.google.android.exoplayer2.util.Assertions;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
@@ -33,11 +31,10 @@ import java.util.Collections;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 
-/** Unit tests for {@link HlsDownloadAction}. */
+// TODO: Merge into DownloadActionTest
+/** Unit tests for HLS {@link DownloadAction}s. */
 @RunWith(RobolectricTestRunner.class)
 public class HlsDownloadActionTest {
 
@@ -62,15 +59,6 @@ public class HlsDownloadActionTest {
     assertThat(action2.isRemoveAction).isTrue();
   }
 
-  @Test
-  public void testCreateDownloader() {
-    MockitoAnnotations.initMocks(this);
-    DownloadAction action = createDownloadAction(uri1);
-    DownloaderConstructorHelper constructorHelper =
-        new DownloaderConstructorHelper(Mockito.mock(Cache.class), DummyDataSource.FACTORY);
-    assertThat(action.createDownloader(constructorHelper)).isNotNull();
-  }
-
   @Test
   public void testSameUriDifferentAction_IsSameMedia() {
     DownloadAction action1 = createRemoveAction(uri1);
@@ -140,10 +128,18 @@ public class HlsDownloadActionTest {
 
   @Test
   public void testSerializerVersion0() throws Exception {
-    doTestSerializationV0RoundTrip(createDownloadAction(uri1));
-    doTestSerializationV0RoundTrip(createRemoveAction(uri1));
-    doTestSerializationV0RoundTrip(
-        createDownloadAction(uri2, new StreamKey(0, 0), new StreamKey(1, 1)));
+    doTestLegacySerializationRoundTrip(createDownloadAction(uri1), /* version= */ 0);
+    doTestLegacySerializationRoundTrip(createRemoveAction(uri1), /* version= */ 0);
+    doTestLegacySerializationRoundTrip(
+        createDownloadAction(uri2, new StreamKey(0, 0), new StreamKey(1, 1)), /* version= */ 0);
+  }
+
+  @Test
+  public void testSerializerVersion1() throws Exception {
+    doTestLegacySerializationRoundTrip(createDownloadAction(uri1), /* version= */ 1);
+    doTestLegacySerializationRoundTrip(createRemoveAction(uri1), /* version= */ 1);
+    doTestLegacySerializationRoundTrip(
+        createDownloadAction(uri2, new StreamKey(0, 0), new StreamKey(1, 1)), /* version= */ 1);
   }
 
   private static void assertNotEqual(DownloadAction action1, DownloadAction action2) {
@@ -159,17 +155,19 @@ public class HlsDownloadActionTest {
   private static void doTestSerializationRoundTrip(DownloadAction action) throws IOException {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     DataOutputStream output = new DataOutputStream(out);
-    DownloadAction.serializeToStream(action, output);
+    action.serializeToStream(output);
 
     assertEqual(action, deserializeActionFromStream(out));
   }
 
-  private static void doTestSerializationV0RoundTrip(HlsDownloadAction action) throws IOException {
+  private static void doTestLegacySerializationRoundTrip(DownloadAction action, int version)
+      throws IOException {
+    Assertions.checkState(version == 0 || version == 1);
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     DataOutputStream output = new DataOutputStream(out);
     DataOutputStream dataOutputStream = new DataOutputStream(output);
     dataOutputStream.writeUTF(action.type);
-    dataOutputStream.writeInt(/* version */ 0);
+    dataOutputStream.writeInt(version);
     dataOutputStream.writeUTF(action.uri.toString());
     dataOutputStream.writeBoolean(action.isRemoveAction);
     dataOutputStream.writeInt(action.data.length);
@@ -177,6 +175,9 @@ public class HlsDownloadActionTest {
     dataOutputStream.writeInt(action.keys.size());
     for (int i = 0; i < action.keys.size(); i++) {
       StreamKey key = action.keys.get(i);
+      if (version == 1) {
+        dataOutputStream.writeInt(key.periodIndex);
+      }
       dataOutputStream.writeInt(key.groupIndex);
       dataOutputStream.writeInt(key.trackIndex);
     }
@@ -189,17 +190,18 @@ public class HlsDownloadActionTest {
       throws IOException {
     ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
     DataInputStream input = new DataInputStream(in);
-    return DownloadAction.deserializeFromStream(
-        new DownloadAction.Deserializer[] {HlsDownloadAction.DESERIALIZER}, input);
+    return DownloadAction.deserializeFromStream(input);
   }
 
-  private static HlsDownloadAction createDownloadAction(Uri uri, StreamKey... keys) {
+  private static DownloadAction createDownloadAction(Uri uri, StreamKey... keys) {
     ArrayList<StreamKey> keysList = new ArrayList<>();
     Collections.addAll(keysList, keys);
-    return HlsDownloadAction.createDownloadAction(uri, null, keysList);
+    return DownloadAction.createDownloadAction(
+        DownloadAction.TYPE_HLS, uri, keysList, /* customCacheKey= */ null, /* data= */ null);
   }
 
-  private static HlsDownloadAction createRemoveAction(Uri uri) {
-    return HlsDownloadAction.createRemoveAction(uri, null);
+  private static DownloadAction createRemoveAction(Uri uri) {
+    return DownloadAction.createRemoveAction(
+        DownloadAction.TYPE_HLS, uri, /* customCacheKey= */ null, /* data= */ null);
   }
 }
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
index 825988994e..90ccbba2de 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
@@ -35,21 +35,29 @@ import static com.google.android.exoplayer2.testutil.CacheAsserts.assertCachedDa
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
+import com.google.android.exoplayer2.offline.DefaultDownloaderFactory;
+import com.google.android.exoplayer2.offline.DownloadAction;
+import com.google.android.exoplayer2.offline.Downloader;
 import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
+import com.google.android.exoplayer2.offline.DownloaderFactory;
 import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist;
 import com.google.android.exoplayer2.testutil.FakeDataSet;
 import com.google.android.exoplayer2.testutil.FakeDataSource.Factory;
+import com.google.android.exoplayer2.upstream.DummyDataSource;
+import com.google.android.exoplayer2.upstream.cache.Cache;
 import com.google.android.exoplayer2.upstream.cache.NoOpCacheEvictor;
 import com.google.android.exoplayer2.upstream.cache.SimpleCache;
 import com.google.android.exoplayer2.util.Util;
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mockito;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
@@ -84,6 +92,23 @@ public class HlsDownloaderTest {
     Util.recursiveDelete(tempFolder);
   }
 
+  @Test
+  public void testCreateWithDefaultDownloaderFactory() throws Exception {
+    DownloaderConstructorHelper constructorHelper =
+        new DownloaderConstructorHelper(Mockito.mock(Cache.class), DummyDataSource.FACTORY);
+    DownloaderFactory factory = new DefaultDownloaderFactory(constructorHelper);
+
+    Downloader downloader =
+        factory.createDownloader(
+            DownloadAction.createDownloadAction(
+                DownloadAction.TYPE_HLS,
+                Uri.parse("https://www.test.com/download"),
+                Collections.singletonList(new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0)),
+                /* customCacheKey= */ null,
+                /* data= */ null));
+    assertThat(downloader).isInstanceOf(HlsDownloader.class);
+  }
+
   @Test
   public void testCounterMethods() throws Exception {
     HlsDownloader downloader =
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadAction.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadAction.java
deleted file mode 100644
index ad2196fd74..0000000000
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadAction.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.source.smoothstreaming.offline;
-
-import android.net.Uri;
-import android.support.annotation.Nullable;
-import com.google.android.exoplayer2.offline.DownloadAction;
-import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
-import com.google.android.exoplayer2.offline.SegmentDownloadAction;
-import com.google.android.exoplayer2.offline.StreamKey;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-
-/** An action to download or remove downloaded SmoothStreaming streams. */
-public final class SsDownloadAction extends SegmentDownloadAction {
-
-  private static final String TYPE = "ss";
-  private static final int VERSION = 1;
-
-  public static final Deserializer DESERIALIZER =
-      new SegmentDownloadActionDeserializer(TYPE, VERSION) {
-
-        @Override
-        protected StreamKey readKey(int version, DataInputStream input) throws IOException {
-          if (version > 0) {
-            return super.readKey(version, input);
-          }
-          int groupIndex = input.readInt();
-          int trackIndex = input.readInt();
-          return new StreamKey(groupIndex, trackIndex);
-        }
-
-        @Override
-        protected DownloadAction createDownloadAction(
-            Uri uri, boolean isRemoveAction, byte[] data, List<StreamKey> keys) {
-          return new SsDownloadAction(uri, isRemoveAction, data, keys);
-        }
-      };
-
-  /**
-   * Creates a SmoothStreaming download action.
-   *
-   * @param uri The URI of the media to be downloaded.
-   * @param data Optional custom data for this action. If {@code null} an empty array will be used.
-   * @param keys Keys of tracks to be downloaded. If empty, all tracks will be downloaded.
-   */
-  public static SsDownloadAction createDownloadAction(
-      Uri uri, @Nullable byte[] data, List<StreamKey> keys) {
-    return new SsDownloadAction(uri, /* isRemoveAction= */ false, data, keys);
-  }
-
-  /**
-   * Creates a SmoothStreaming remove action.
-   *
-   * @param uri The URI of the media to be removed.
-   * @param data Optional custom data for this action. If {@code null} an empty array will be used.
-   */
-  public static SsDownloadAction createRemoveAction(Uri uri, @Nullable byte[] data) {
-    return new SsDownloadAction(uri, /* isRemoveAction= */ true, data, Collections.emptyList());
-  }
-
-  /**
-   * @param uri The SmoothStreaming manifest URI.
-   * @param isRemoveAction Whether the data will be removed. If {@code false} it will be downloaded.
-   * @param data Optional custom data for this action.
-   * @param keys Keys of streams to be downloaded. If empty, all streams are downloaded. If {@code
-   *     removeAction} is true, {@code keys} must be empty.
-   * @deprecated Use {@link #createDownloadAction(Uri, byte[], List)} or {@link
-   *     #createRemoveAction(Uri, byte[])}.
-   */
-  @Deprecated
-  public SsDownloadAction(
-      Uri uri, boolean isRemoveAction, @Nullable byte[] data, List<StreamKey> keys) {
-    super(TYPE, VERSION, uri, isRemoveAction, data, keys);
-  }
-
-  @Override
-  public SsDownloader createDownloader(DownloaderConstructorHelper constructorHelper) {
-    return new SsDownloader(uri, keys, constructorHelper);
-  }
-
-}
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java
index 5125beff1c..815e4337bd 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.source.smoothstreaming.offline;
 import android.net.Uri;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.offline.TrackKey;
@@ -76,13 +77,15 @@ public final class SsDownloadHelper extends DownloadHelper {
   }
 
   @Override
-  public SsDownloadAction getDownloadAction(@Nullable byte[] data, List<TrackKey> trackKeys) {
-    return SsDownloadAction.createDownloadAction(uri, data, toStreamKeys(trackKeys));
+  public DownloadAction getDownloadAction(@Nullable byte[] data, List<TrackKey> trackKeys) {
+    return DownloadAction.createDownloadAction(
+        DownloadAction.TYPE_SS, uri, toStreamKeys(trackKeys), /* customCacheKey= */ null, data);
   }
 
   @Override
-  public SsDownloadAction getRemoveAction(@Nullable byte[] data) {
-    return SsDownloadAction.createRemoveAction(uri, data);
+  public DownloadAction getRemoveAction(@Nullable byte[] data) {
+    return DownloadAction.createRemoveAction(
+        DownloadAction.TYPE_SS, uri, /* customCacheKey= */ null, data);
   }
 
   private static List<StreamKey> toStreamKeys(List<TrackKey> trackKeys) {
diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadActionTest.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadActionTest.java
index fea03902ec..a9d6e9f9c8 100644
--- a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadActionTest.java
+++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadActionTest.java
@@ -19,10 +19,8 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
 import com.google.android.exoplayer2.offline.DownloadAction;
-import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
-import com.google.android.exoplayer2.upstream.DummyDataSource;
-import com.google.android.exoplayer2.upstream.cache.Cache;
+import com.google.android.exoplayer2.util.Assertions;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
@@ -33,11 +31,10 @@ import java.util.Collections;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 
-/** Unit tests for {@link SsDownloadAction}. */
+// TODO: Merge into DownloadActionTest
+/** Unit tests for SmoothStreaming {@link DownloadAction}s. */
 @RunWith(RobolectricTestRunner.class)
 public class SsDownloadActionTest {
 
@@ -62,15 +59,6 @@ public class SsDownloadActionTest {
     assertThat(action2.isRemoveAction).isTrue();
   }
 
-  @Test
-  public void testCreateDownloader() {
-    MockitoAnnotations.initMocks(this);
-    DownloadAction action = createDownloadAction(uri1);
-    DownloaderConstructorHelper constructorHelper =
-        new DownloaderConstructorHelper(Mockito.mock(Cache.class), DummyDataSource.FACTORY);
-    assertThat(action.createDownloader(constructorHelper)).isNotNull();
-  }
-
   @Test
   public void testSameUriDifferentAction_IsSameMedia() {
     DownloadAction action1 = createRemoveAction(uri1);
@@ -140,10 +128,18 @@ public class SsDownloadActionTest {
 
   @Test
   public void testSerializerVersion0() throws Exception {
-    doTestSerializationV0RoundTrip(createDownloadAction(uri1));
-    doTestSerializationV0RoundTrip(createRemoveAction(uri1));
-    doTestSerializationV0RoundTrip(
-        createDownloadAction(uri2, new StreamKey(0, 0), new StreamKey(1, 1)));
+    doTestLegacySerializationRoundTrip(createDownloadAction(uri1), /* version= */ 0);
+    doTestLegacySerializationRoundTrip(createRemoveAction(uri1), /* version= */ 0);
+    doTestLegacySerializationRoundTrip(
+        createDownloadAction(uri2, new StreamKey(0, 0), new StreamKey(1, 1)), /* version= */ 0);
+  }
+
+  @Test
+  public void testSerializerVersion1() throws Exception {
+    doTestLegacySerializationRoundTrip(createDownloadAction(uri1), /* version= */ 1);
+    doTestLegacySerializationRoundTrip(createRemoveAction(uri1), /* version= */ 1);
+    doTestLegacySerializationRoundTrip(
+        createDownloadAction(uri2, new StreamKey(0, 0), new StreamKey(1, 1)), /* version= */ 1);
   }
 
   private static void assertNotEqual(DownloadAction action1, DownloadAction action2) {
@@ -159,17 +155,19 @@ public class SsDownloadActionTest {
   private static void doTestSerializationRoundTrip(DownloadAction action) throws IOException {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     DataOutputStream output = new DataOutputStream(out);
-    DownloadAction.serializeToStream(action, output);
+    action.serializeToStream(output);
 
     assertEqual(action, deserializeActionFromStream(out));
   }
 
-  private static void doTestSerializationV0RoundTrip(SsDownloadAction action) throws IOException {
+  private static void doTestLegacySerializationRoundTrip(DownloadAction action, int version)
+      throws IOException {
+    Assertions.checkState(version == 0 || version == 1);
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     DataOutputStream output = new DataOutputStream(out);
     DataOutputStream dataOutputStream = new DataOutputStream(output);
     dataOutputStream.writeUTF(action.type);
-    dataOutputStream.writeInt(/* version */ 0);
+    dataOutputStream.writeInt(version);
     dataOutputStream.writeUTF(action.uri.toString());
     dataOutputStream.writeBoolean(action.isRemoveAction);
     dataOutputStream.writeInt(action.data.length);
@@ -177,6 +175,9 @@ public class SsDownloadActionTest {
     dataOutputStream.writeInt(action.keys.size());
     for (int i = 0; i < action.keys.size(); i++) {
       StreamKey key = action.keys.get(i);
+      if (version == 1) {
+        dataOutputStream.writeInt(key.periodIndex);
+      }
       dataOutputStream.writeInt(key.groupIndex);
       dataOutputStream.writeInt(key.trackIndex);
     }
@@ -189,17 +190,18 @@ public class SsDownloadActionTest {
       throws IOException {
     ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
     DataInputStream input = new DataInputStream(in);
-    return DownloadAction.deserializeFromStream(
-        new DownloadAction.Deserializer[] {SsDownloadAction.DESERIALIZER}, input);
+    return DownloadAction.deserializeFromStream(input);
   }
 
-  private static SsDownloadAction createDownloadAction(Uri uri, StreamKey... keys) {
+  private static DownloadAction createDownloadAction(Uri uri, StreamKey... keys) {
     ArrayList<StreamKey> keysList = new ArrayList<>();
     Collections.addAll(keysList, keys);
-    return SsDownloadAction.createDownloadAction(uri, null, keysList);
+    return DownloadAction.createDownloadAction(
+        DownloadAction.TYPE_SS, uri, keysList, /* customCacheKey= */ null, /* data= */ null);
   }
 
-  private static SsDownloadAction createRemoveAction(Uri uri) {
-    return SsDownloadAction.createRemoveAction(uri, null);
+  private static DownloadAction createRemoveAction(Uri uri) {
+    return DownloadAction.createRemoveAction(
+        DownloadAction.TYPE_SS, uri, /* customCacheKey= */ null, /* data= */ null);
   }
 }
diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java
new file mode 100644
index 0000000000..e47ffec64f
--- /dev/null
+++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.source.smoothstreaming.offline;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.net.Uri;
+import com.google.android.exoplayer2.offline.DefaultDownloaderFactory;
+import com.google.android.exoplayer2.offline.DownloadAction;
+import com.google.android.exoplayer2.offline.Downloader;
+import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
+import com.google.android.exoplayer2.offline.DownloaderFactory;
+import com.google.android.exoplayer2.offline.StreamKey;
+import com.google.android.exoplayer2.upstream.DummyDataSource;
+import com.google.android.exoplayer2.upstream.cache.Cache;
+import java.util.Collections;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.robolectric.RobolectricTestRunner;
+
+/** Unit tests for {@link SsDownloader}. */
+@RunWith(RobolectricTestRunner.class)
+public final class SsDownloaderTest {
+
+  @Test
+  public void createWithDefaultDownloaderFactory() throws Exception {
+    DownloaderConstructorHelper constructorHelper =
+        new DownloaderConstructorHelper(Mockito.mock(Cache.class), DummyDataSource.FACTORY);
+    DownloaderFactory factory = new DefaultDownloaderFactory(constructorHelper);
+
+    Downloader downloader =
+        factory.createDownloader(
+            DownloadAction.createDownloadAction(
+                DownloadAction.TYPE_SS,
+                Uri.parse("https://www.test.com/download"),
+                Collections.singletonList(new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0)),
+                /* customCacheKey= */ null,
+                /* data= */ null));
+    assertThat(downloader).isInstanceOf(SsDownloader.class);
+  }
+}

From 10eaa7d74876a7e36ab9341b407af29e5a53502f Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Tue, 20 Nov 2018 13:03:52 -0800
Subject: [PATCH 215/832] Replace BandwidthMeter with BandwidthProvider in
 AdaptiveTrackSelection

BandwidthProvider allows bandwidth allocation logic to be customized.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=222293581
---
 .../AdaptiveTrackSelection.java               | 56 ++++++++++++++++---
 1 file changed, 49 insertions(+), 7 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
index e1ccf5a0f7..bd2b3f1a05 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
@@ -225,11 +225,10 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
           new AdaptiveTrackSelection(
               group,
               tracks,
-              bandwidthMeter,
+              new DefaultBandwidthProvider(bandwidthMeter, bandwidthFraction),
               minDurationForQualityIncreaseMs,
               maxDurationForQualityDecreaseMs,
               minDurationToRetainAfterDiscardMs,
-              bandwidthFraction,
               bufferedFractionToLiveEdgeForQualityIncrease,
               minTimeBetweenBufferReevaluationMs,
               clock);
@@ -245,11 +244,10 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
   public static final float DEFAULT_BUFFERED_FRACTION_TO_LIVE_EDGE_FOR_QUALITY_INCREASE = 0.75f;
   public static final long DEFAULT_MIN_TIME_BETWEEN_BUFFER_REEVALUTATION_MS = 2000;
 
-  private final BandwidthMeter bandwidthMeter;
+  private final BandwidthProvider bandwidthProvider;
   private final long minDurationForQualityIncreaseUs;
   private final long maxDurationForQualityDecreaseUs;
   private final long minDurationToRetainAfterDiscardUs;
-  private final float bandwidthFraction;
   private final float bufferedFractionToLiveEdgeForQualityIncrease;
   private final long minTimeBetweenBufferReevaluationMs;
   private final Clock clock;
@@ -322,12 +320,33 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
       float bufferedFractionToLiveEdgeForQualityIncrease,
       long minTimeBetweenBufferReevaluationMs,
       Clock clock) {
+    this(
+        group,
+        tracks,
+        new DefaultBandwidthProvider(bandwidthMeter, bandwidthFraction),
+        minDurationForQualityIncreaseMs,
+        maxDurationForQualityDecreaseMs,
+        minDurationToRetainAfterDiscardMs,
+        bufferedFractionToLiveEdgeForQualityIncrease,
+        minTimeBetweenBufferReevaluationMs,
+        clock);
+  }
+
+  private AdaptiveTrackSelection(
+      TrackGroup group,
+      int[] tracks,
+      BandwidthProvider bandwidthProvider,
+      long minDurationForQualityIncreaseMs,
+      long maxDurationForQualityDecreaseMs,
+      long minDurationToRetainAfterDiscardMs,
+      float bufferedFractionToLiveEdgeForQualityIncrease,
+      long minTimeBetweenBufferReevaluationMs,
+      Clock clock) {
     super(group, tracks);
-    this.bandwidthMeter = bandwidthMeter;
+    this.bandwidthProvider = bandwidthProvider;
     this.minDurationForQualityIncreaseUs = minDurationForQualityIncreaseMs * 1000L;
     this.maxDurationForQualityDecreaseUs = maxDurationForQualityDecreaseMs * 1000L;
     this.minDurationToRetainAfterDiscardUs = minDurationToRetainAfterDiscardMs * 1000L;
-    this.bandwidthFraction = bandwidthFraction;
     this.bufferedFractionToLiveEdgeForQualityIncrease =
         bufferedFractionToLiveEdgeForQualityIncrease;
     this.minTimeBetweenBufferReevaluationMs = minTimeBetweenBufferReevaluationMs;
@@ -517,7 +536,7 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
    *     accurate estimates of the current track bitrates are available.
    */
   private int determineIdealSelectedIndex(long nowMs, int[] trackBitrates) {
-    long effectiveBitrate = (long) (bandwidthMeter.getBitrateEstimate() * bandwidthFraction);
+    long effectiveBitrate = bandwidthProvider.getAllocatedBandwidth();
     int lowestBitrateNonBlacklistedIndex = 0;
     for (int i = 0; i < length; i++) {
       if (nowMs == Long.MIN_VALUE || !isBlacklisted(i, nowMs)) {
@@ -539,4 +558,27 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
         ? (long) (availableDurationUs * bufferedFractionToLiveEdgeForQualityIncrease)
         : minDurationForQualityIncreaseUs;
   }
+
+  /** Provides the allocated bandwidth. */
+  private interface BandwidthProvider {
+
+    /** Returns the allocated bitrate. */
+    long getAllocatedBandwidth();
+  }
+
+  private static final class DefaultBandwidthProvider implements BandwidthProvider {
+
+    private final BandwidthMeter bandwidthMeter;
+    private final float bandwidthFraction;
+
+    /* package */ DefaultBandwidthProvider(BandwidthMeter bandwidthMeter, float bandwidthFraction) {
+      this.bandwidthMeter = bandwidthMeter;
+      this.bandwidthFraction = bandwidthFraction;
+    }
+
+    @Override
+    public long getAllocatedBandwidth() {
+      return (long) (bandwidthMeter.getBitrateEstimate() * bandwidthFraction);
+    }
+  }
 }

From 1699fbfa74f127a5b4cef5770db8d71e23e0d43c Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 21 Nov 2018 03:24:54 -0800
Subject: [PATCH 216/832] Add experimental option to subtract non-allocatable
 bandwidth.

This allows to account for bandwidth used by fixed track selections.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=222383736
---
 .../AdaptiveTrackSelection.java               | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
index bd2b3f1a05..f7188fbf72 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
@@ -380,6 +380,18 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
     this.trackBitrateEstimator = trackBitrateEstimator;
   }
 
+  /**
+   * Sets the non-allocatable bandwidth, which shouldn't be considered available.
+   *
+   * <p>This method is experimental, and will be renamed or removed in a future release.
+   *
+   * @param nonAllocatableBandwidth The non-allocatable bandwidth in bits per second.
+   */
+  public void experimental_setNonAllocatableBandwidth(long nonAllocatableBandwidth) {
+    ((DefaultBandwidthProvider) bandwidthProvider)
+        .experimental_setNonAllocatableBandwidth(nonAllocatableBandwidth);
+  }
+
   @Override
   public void enable() {
     lastBufferEvaluationMs = C.TIME_UNSET;
@@ -571,6 +583,8 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
     private final BandwidthMeter bandwidthMeter;
     private final float bandwidthFraction;
 
+    private long nonAllocatableBandwidth;
+
     /* package */ DefaultBandwidthProvider(BandwidthMeter bandwidthMeter, float bandwidthFraction) {
       this.bandwidthMeter = bandwidthMeter;
       this.bandwidthFraction = bandwidthFraction;
@@ -578,7 +592,12 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
 
     @Override
     public long getAllocatedBandwidth() {
-      return (long) (bandwidthMeter.getBitrateEstimate() * bandwidthFraction);
+      long totalBandwidth = (long) (bandwidthMeter.getBitrateEstimate() * bandwidthFraction);
+      return Math.max(0L, totalBandwidth - nonAllocatableBandwidth);
+    }
+
+    /* package */ void experimental_setNonAllocatableBandwidth(long nonAllocatableBandwidth) {
+      this.nonAllocatableBandwidth = nonAllocatableBandwidth;
     }
   }
 }

From 42cb2c0d622200bb8dad3307642a633bf6cc0ee2 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 21 Nov 2018 04:06:51 -0800
Subject: [PATCH 217/832] Add test that DefaultDataSource is able to build an
 RtmpDataSource

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=222387374
---
 extensions/rtmp/build.gradle                  |  2 +
 extensions/rtmp/src/test/AndroidManifest.xml  | 17 +++++++
 .../ext/rtmp/DefaultDataSourceTest.java       | 45 +++++++++++++++++++
 3 files changed, 64 insertions(+)
 create mode 100644 extensions/rtmp/src/test/AndroidManifest.xml
 create mode 100644 extensions/rtmp/src/test/java/com/google/android/exoplayer2/ext/rtmp/DefaultDataSourceTest.java

diff --git a/extensions/rtmp/build.gradle b/extensions/rtmp/build.gradle
index 2f2c65980a..af02ee2eaa 100644
--- a/extensions/rtmp/build.gradle
+++ b/extensions/rtmp/build.gradle
@@ -33,6 +33,8 @@ dependencies {
     implementation project(modulePrefix + 'library-core')
     implementation 'net.butterflytv.utils:rtmp-client:3.0.1'
     implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+    testImplementation 'junit:junit:' + junitVersion
+    testImplementation 'org.robolectric:robolectric:' + robolectricVersion
 }
 
 ext {
diff --git a/extensions/rtmp/src/test/AndroidManifest.xml b/extensions/rtmp/src/test/AndroidManifest.xml
new file mode 100644
index 0000000000..7eab4e2d59
--- /dev/null
+++ b/extensions/rtmp/src/test/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest package="com.google.android.exoplayer2.ext.rtmp"/>
diff --git a/extensions/rtmp/src/test/java/com/google/android/exoplayer2/ext/rtmp/DefaultDataSourceTest.java b/extensions/rtmp/src/test/java/com/google/android/exoplayer2/ext/rtmp/DefaultDataSourceTest.java
new file mode 100644
index 0000000000..f4753798b8
--- /dev/null
+++ b/extensions/rtmp/src/test/java/com/google/android/exoplayer2/ext/rtmp/DefaultDataSourceTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.ext.rtmp;
+
+import android.net.Uri;
+import com.google.android.exoplayer2.upstream.DataSpec;
+import com.google.android.exoplayer2.upstream.DefaultDataSource;
+import java.io.IOException;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+/** Unit test for {@link DefaultDataSource} with RTMP URIs. */
+@RunWith(RobolectricTestRunner.class)
+public final class DefaultDataSourceTest {
+
+  @Test
+  public void openRtmpDataSpec_instantiatesRtmpDataSourceViaReflection() throws IOException {
+    DefaultDataSource dataSource =
+        new DefaultDataSource(
+            RuntimeEnvironment.application, "userAgent", /* allowCrossProtocolRedirects= */ false);
+    DataSpec dataSpec = new DataSpec(Uri.parse("rtmp://test.com/stream"));
+    try {
+      dataSource.open(dataSpec);
+    } catch (UnsatisfiedLinkError e) {
+      // RtmpDataSource was successfully instantiated (test run using Gradle).
+    } catch (UnsupportedOperationException e) {
+      // RtmpDataSource was successfully instantiated (test run using Blaze).
+    }
+  }
+}

From 265462bcbd41a7de2b28152222ca77428a899408 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 21 Nov 2018 05:09:46 -0800
Subject: [PATCH 218/832] Support Opus and Flac in MP4/DASH

Issue: #4883

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=222392621
---
 RELEASENOTES.md                               |  2 ++
 .../exoplayer2/extractor/mp4/Atom.java        |  4 +++
 .../exoplayer2/extractor/mp4/AtomParsers.java | 26 +++++++++++++++++--
 .../android/exoplayer2/util/MimeTypes.java    |  4 ++-
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index f54fa79605..03148e314e 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,6 +2,8 @@
 
 ### dev-v2 (not yet released) ###
 
+* MP4: Support Opus and FLAC in the MP4 container, and in DASH
+  ([#4883](https://github.com/google/ExoPlayer/issues/4883)).
 * DASH: Fix detecting the end of live events
   ([#4780](https://github.com/google/ExoPlayer/issues/4780)).
 * Support seeking for a wider range of MPEG-TS streams
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
index a20195139f..440e577c7d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
@@ -145,6 +145,10 @@ import java.util.List;
   public static final int TYPE_alac = Util.getIntegerCodeForString("alac");
   public static final int TYPE_alaw = Util.getIntegerCodeForString("alaw");
   public static final int TYPE_ulaw = Util.getIntegerCodeForString("ulaw");
+  public static final int TYPE_Opus = Util.getIntegerCodeForString("Opus");
+  public static final int TYPE_dOps = Util.getIntegerCodeForString("dOps");
+  public static final int TYPE_fLaC = Util.getIntegerCodeForString("fLaC");
+  public static final int TYPE_dfLa = Util.getIntegerCodeForString("dfLa");
 
   public final int type;
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
index 0cda3fafa8..e3d56489a6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
@@ -58,6 +58,9 @@ import java.util.List;
    */
   private static final int MAX_GAPLESS_TRIM_SIZE_SAMPLES = 3;
 
+  /** The magic signature for an Opus Identification header, as defined in RFC-7845. */
+  private static final byte[] opusMagic = Util.getUtf8Bytes("OpusHead");
+
   /**
    * Parses a trak atom (defined in 14496-12).
    *
@@ -679,7 +682,9 @@ import java.util.List;
           || childAtomType == Atom.TYPE__mp3
           || childAtomType == Atom.TYPE_alac
           || childAtomType == Atom.TYPE_alaw
-          || childAtomType == Atom.TYPE_ulaw) {
+          || childAtomType == Atom.TYPE_ulaw
+          || childAtomType == Atom.TYPE_Opus
+          || childAtomType == Atom.TYPE_fLaC) {
         parseAudioSampleEntry(stsd, childAtomType, childStartPosition, childAtomSize, trackId,
             language, isQuickTime, drmInitData, out, i);
       } else if (childAtomType == Atom.TYPE_TTML || childAtomType == Atom.TYPE_tx3g
@@ -976,6 +981,10 @@ import java.util.List;
       mimeType = MimeTypes.AUDIO_ALAW;
     } else if (atomType == Atom.TYPE_ulaw) {
       mimeType = MimeTypes.AUDIO_MLAW;
+    } else if (atomType == Atom.TYPE_Opus) {
+      mimeType = MimeTypes.AUDIO_OPUS;
+    } else if (atomType == Atom.TYPE_fLaC) {
+      mimeType = MimeTypes.AUDIO_FLAC;
     }
 
     byte[] initializationData = null;
@@ -1016,7 +1025,20 @@ import java.util.List;
       } else if (childAtomType == Atom.TYPE_alac) {
         initializationData = new byte[childAtomSize];
         parent.setPosition(childPosition);
-        parent.readBytes(initializationData, 0, childAtomSize);
+        parent.readBytes(initializationData, /* offset= */ 0, childAtomSize);
+      } else if (childAtomType == Atom.TYPE_dOps) {
+        // Build an Opus Identification Header (defined in RFC-7845) by concatenating the Opus Magic
+        // Signature and the body of the dOps atom.
+        int childAtomBodySize = childAtomSize - Atom.HEADER_SIZE;
+        initializationData = new byte[opusMagic.length + childAtomBodySize];
+        System.arraycopy(opusMagic, 0, initializationData, 0, opusMagic.length);
+        parent.setPosition(childPosition + Atom.HEADER_SIZE);
+        parent.readBytes(initializationData, opusMagic.length, childAtomBodySize);
+      } else if (childAtomSize == Atom.TYPE_dfLa) {
+        int childAtomBodySize = childAtomSize - Atom.FULL_HEADER_SIZE;
+        initializationData = new byte[childAtomBodySize];
+        parent.setPosition(childPosition + Atom.FULL_HEADER_SIZE);
+        parent.readBytes(initializationData, /* offset= */ 0, childAtomBodySize);
       }
       childPosition += childAtomSize;
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java b/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
index f56aac7c70..e506ae1b19 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
@@ -207,7 +207,7 @@ public final class MimeTypes {
     if (codec == null) {
       return null;
     }
-    codec = codec.trim();
+    codec = Util.toLowerInvariant(codec.trim());
     if (codec.startsWith("avc1") || codec.startsWith("avc3")) {
       return MimeTypes.VIDEO_H264;
     } else if (codec.startsWith("hev1") || codec.startsWith("hvc1")) {
@@ -245,6 +245,8 @@ public final class MimeTypes {
       return MimeTypes.AUDIO_OPUS;
     } else if (codec.startsWith("vorbis")) {
       return MimeTypes.AUDIO_VORBIS;
+    } else if (codec.startsWith("flac")) {
+      return MimeTypes.AUDIO_FLAC;
     } else {
       return getCustomMimeTypeForCodec(codec);
     }

From 5f12b065a44668483c0da661654ed889e8891c5f Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 21 Nov 2018 05:58:24 -0800
Subject: [PATCH 219/832] Support removal of ranges from ShuffleOrders

This allows more efficient range removals and is consistent with addition,
which supports adding multiple elements in a single operation.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=222396310
---
 .../source/ConcatenatingMediaSource.java      |  6 +-
 .../exoplayer2/source/ShuffleOrder.java       | 29 +++----
 .../exoplayer2/source/ShuffleOrderTest.java   | 78 +++++++++++--------
 .../exoplayer2/testutil/FakeShuffleOrder.java |  4 +-
 4 files changed, 65 insertions(+), 52 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
index 830ab52e19..1d247af8f3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
@@ -570,9 +570,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
         if (fromIndex == 0 && toIndex == shuffleOrder.getLength()) {
           shuffleOrder = shuffleOrder.cloneAndClear();
         } else {
-          for (int index = toIndex - 1; index >= fromIndex; index--) {
-            shuffleOrder = shuffleOrder.cloneAndRemove(index);
-          }
+          shuffleOrder = shuffleOrder.cloneAndRemove(fromIndex, toIndex);
         }
         for (int index = toIndex - 1; index >= fromIndex; index--) {
           removeMediaSourceInternal(index);
@@ -581,7 +579,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
         break;
       case MSG_MOVE:
         MessageData<Integer> moveMessage = (MessageData<Integer>) Util.castNonNull(message);
-        shuffleOrder = shuffleOrder.cloneAndRemove(moveMessage.index);
+        shuffleOrder = shuffleOrder.cloneAndRemove(moveMessage.index, moveMessage.index + 1);
         shuffleOrder = shuffleOrder.cloneAndInsert(moveMessage.customData, 1);
         moveMediaSourceInternal(moveMessage.index, moveMessage.customData);
         scheduleListenerNotification(moveMessage.actionOnCompletion);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ShuffleOrder.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ShuffleOrder.java
index 90e2576d76..5af9dbd20a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ShuffleOrder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ShuffleOrder.java
@@ -135,15 +135,16 @@ public interface ShuffleOrder {
     }
 
     @Override
-    public ShuffleOrder cloneAndRemove(int removalIndex) {
-      int[] newShuffled = new int[shuffled.length - 1];
-      boolean foundRemovedElement = false;
+    public ShuffleOrder cloneAndRemove(int indexFrom, int indexToExclusive) {
+      int numberOfElementsToRemove = indexToExclusive - indexFrom;
+      int[] newShuffled = new int[shuffled.length - numberOfElementsToRemove];
+      int foundElementsCount = 0;
       for (int i = 0; i < shuffled.length; i++) {
-        if (shuffled[i] == removalIndex) {
-          foundRemovedElement = true;
+        if (shuffled[i] >= indexFrom && shuffled[i] < indexToExclusive) {
+          foundElementsCount++;
         } else {
-          newShuffled[foundRemovedElement ? i - 1 : i] = shuffled[i] > removalIndex
-              ? shuffled[i] - 1 : shuffled[i];
+          newShuffled[i - foundElementsCount] =
+              shuffled[i] >= indexFrom ? shuffled[i] - numberOfElementsToRemove : shuffled[i];
         }
       }
       return new DefaultShuffleOrder(newShuffled, new Random(random.nextLong()));
@@ -213,8 +214,8 @@ public interface ShuffleOrder {
     }
 
     @Override
-    public ShuffleOrder cloneAndRemove(int removalIndex) {
-      return new UnshuffledShuffleOrder(length - 1);
+    public ShuffleOrder cloneAndRemove(int indexFrom, int indexToExclusive) {
+      return new UnshuffledShuffleOrder(length - indexToExclusive + indexFrom);
     }
 
     @Override
@@ -268,12 +269,14 @@ public interface ShuffleOrder {
   ShuffleOrder cloneAndInsert(int insertionIndex, int insertionCount);
 
   /**
-   * Returns a copy of the shuffle order with one element removed.
+   * Returns a copy of the shuffle order with a range of elements removed.
    *
-   * @param removalIndex The index of the element in the unshuffled order which is to be removed.
-   * @return A copy of this {@link ShuffleOrder} without the removed element.
+   * @param indexFrom The starting index in the unshuffled order of the range to remove.
+   * @param indexToExclusive The smallest index (must be greater or equal to {@code indexFrom}) that
+   *     will not be removed.
+   * @return A copy of this {@link ShuffleOrder} without the elements in the removed range.
    */
-  ShuffleOrder cloneAndRemove(int removalIndex);
+  ShuffleOrder cloneAndRemove(int indexFrom, int indexToExclusive);
 
   /** Returns a copy of the shuffle order with all elements removed. */
   ShuffleOrder cloneAndClear();
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java
index 06f39409e7..430ceb87f1 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java
@@ -45,10 +45,32 @@ public final class ShuffleOrderTest {
         testCloneAndInsert(new DefaultShuffleOrder(initialLength, RANDOM_SEED), insertionPoint, 5);
       }
     }
-    testCloneAndRemove(new DefaultShuffleOrder(5, RANDOM_SEED), 0);
-    testCloneAndRemove(new DefaultShuffleOrder(5, RANDOM_SEED), 2);
-    testCloneAndRemove(new DefaultShuffleOrder(5, RANDOM_SEED), 4);
-    testCloneAndRemove(new DefaultShuffleOrder(1, RANDOM_SEED), 0);
+    testCloneAndRemove(new DefaultShuffleOrder(5, RANDOM_SEED), 0, 1);
+    testCloneAndRemove(new DefaultShuffleOrder(5, RANDOM_SEED), 2, 3);
+    testCloneAndRemove(new DefaultShuffleOrder(5, RANDOM_SEED), 4, 5);
+    testCloneAndRemove(new DefaultShuffleOrder(1, RANDOM_SEED), 0, 1);
+    testCloneAndRemove(new DefaultShuffleOrder(1000, RANDOM_SEED), 0, 1000);
+    testCloneAndRemove(new DefaultShuffleOrder(1000, RANDOM_SEED), 0, 999);
+    testCloneAndRemove(new DefaultShuffleOrder(1000, RANDOM_SEED), 0, 500);
+    testCloneAndRemove(new DefaultShuffleOrder(1000, RANDOM_SEED), 100, 600);
+    testCloneAndRemove(new DefaultShuffleOrder(1000, RANDOM_SEED), 500, 1000);
+  }
+
+  @Test
+  public void testDefaultShuffleOrderSideloaded() {
+    int[] shuffledIndices = new int[] {2, 1, 0, 4, 3};
+    ShuffleOrder shuffleOrder = new DefaultShuffleOrder(shuffledIndices, RANDOM_SEED);
+    assertThat(shuffleOrder.getFirstIndex()).isEqualTo(2);
+    assertThat(shuffleOrder.getLastIndex()).isEqualTo(3);
+    for (int i = 0; i < 4; i++) {
+      assertThat(shuffleOrder.getNextIndex(shuffledIndices[i])).isEqualTo(shuffledIndices[i + 1]);
+    }
+    assertThat(shuffleOrder.getNextIndex(3)).isEqualTo(C.INDEX_UNSET);
+    for (int i = 4; i > 0; i--) {
+      assertThat(shuffleOrder.getPreviousIndex(shuffledIndices[i]))
+          .isEqualTo(shuffledIndices[i - 1]);
+    }
+    assertThat(shuffleOrder.getPreviousIndex(2)).isEqualTo(C.INDEX_UNSET);
   }
 
   @Test
@@ -63,10 +85,15 @@ public final class ShuffleOrderTest {
         testCloneAndInsert(new UnshuffledShuffleOrder(initialLength), insertionPoint, 5);
       }
     }
-    testCloneAndRemove(new UnshuffledShuffleOrder(5), 0);
-    testCloneAndRemove(new UnshuffledShuffleOrder(5), 2);
-    testCloneAndRemove(new UnshuffledShuffleOrder(5), 4);
-    testCloneAndRemove(new UnshuffledShuffleOrder(1), 0);
+    testCloneAndRemove(new UnshuffledShuffleOrder(5), 0, 1);
+    testCloneAndRemove(new UnshuffledShuffleOrder(5), 2, 3);
+    testCloneAndRemove(new UnshuffledShuffleOrder(5), 4, 5);
+    testCloneAndRemove(new UnshuffledShuffleOrder(1), 0, 1);
+    testCloneAndRemove(new UnshuffledShuffleOrder(1000), 0, 1000);
+    testCloneAndRemove(new UnshuffledShuffleOrder(1000), 0, 999);
+    testCloneAndRemove(new UnshuffledShuffleOrder(1000), 0, 500);
+    testCloneAndRemove(new UnshuffledShuffleOrder(1000), 100, 600);
+    testCloneAndRemove(new UnshuffledShuffleOrder(1000), 500, 1000);
   }
 
   @Test
@@ -79,23 +106,6 @@ public final class ShuffleOrderTest {
     }
   }
 
-  @Test
-  public void testSideloadedShuffleOrder() {
-    int[] shuffledIndices = new int[] {2, 1, 0, 4, 3};
-    ShuffleOrder shuffleOrder = new DefaultShuffleOrder(shuffledIndices, RANDOM_SEED);
-    assertThat(shuffleOrder.getFirstIndex()).isEqualTo(2);
-    assertThat(shuffleOrder.getLastIndex()).isEqualTo(3);
-    for (int i = 0; i < 4; i++) {
-      assertThat(shuffleOrder.getNextIndex(shuffledIndices[i])).isEqualTo(shuffledIndices[i + 1]);
-    }
-    assertThat(shuffleOrder.getNextIndex(3)).isEqualTo(C.INDEX_UNSET);
-    for (int i = 4; i > 0; i--) {
-      assertThat(shuffleOrder.getPreviousIndex(shuffledIndices[i]))
-          .isEqualTo(shuffledIndices[i - 1]);
-    }
-    assertThat(shuffleOrder.getPreviousIndex(2)).isEqualTo(C.INDEX_UNSET);
-  }
-
   private static void assertShuffleOrderCorrectness(ShuffleOrder shuffleOrder, int length) {
     assertThat(shuffleOrder.getLength()).isEqualTo(length);
     if (length == 0) {
@@ -137,22 +147,24 @@ public final class ShuffleOrderTest {
     }
   }
 
-  private static void testCloneAndRemove(ShuffleOrder shuffleOrder, int position) {
-    ShuffleOrder newOrder = shuffleOrder.cloneAndRemove(position);
-    assertShuffleOrderCorrectness(newOrder, shuffleOrder.getLength() - 1);
+  private static void testCloneAndRemove(
+      ShuffleOrder shuffleOrder, int indexFrom, int indexToExclusive) {
+    int numberOfElementsToRemove = indexToExclusive - indexFrom;
+    ShuffleOrder newOrder = shuffleOrder.cloneAndRemove(indexFrom, indexToExclusive);
+    assertShuffleOrderCorrectness(newOrder, shuffleOrder.getLength() - numberOfElementsToRemove);
     // Assert all elements still have the relative same order
     for (int i = 0; i < shuffleOrder.getLength(); i++) {
-      if (i == position) {
+      if (i >= indexFrom && i < indexToExclusive) {
         continue;
       }
       int expectedNextIndex = shuffleOrder.getNextIndex(i);
-      if (expectedNextIndex == position) {
+      while (expectedNextIndex >= indexFrom && expectedNextIndex < indexToExclusive) {
         expectedNextIndex = shuffleOrder.getNextIndex(expectedNextIndex);
       }
-      if (expectedNextIndex != C.INDEX_UNSET && expectedNextIndex >= position) {
-        expectedNextIndex--;
+      if (expectedNextIndex != C.INDEX_UNSET && expectedNextIndex >= indexFrom) {
+        expectedNextIndex -= numberOfElementsToRemove;
       }
-      int newNextIndex = newOrder.getNextIndex(i < position ? i : i - 1);
+      int newNextIndex = newOrder.getNextIndex(i < indexFrom ? i : i - numberOfElementsToRemove);
       assertThat(newNextIndex).isEqualTo(expectedNextIndex);
     }
   }
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeShuffleOrder.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeShuffleOrder.java
index cb70c75bdb..4b3a0d5051 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeShuffleOrder.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeShuffleOrder.java
@@ -61,8 +61,8 @@ public final class FakeShuffleOrder implements ShuffleOrder {
   }
 
   @Override
-  public ShuffleOrder cloneAndRemove(int removalIndex) {
-    return new FakeShuffleOrder(length - 1);
+  public ShuffleOrder cloneAndRemove(int indexFrom, int indexToExclusive) {
+    return new FakeShuffleOrder(length - indexToExclusive + indexFrom);
   }
 
   @Override

From dd47bfffb0b981031a80e8f9a3d1e5ddf6ff4ace Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 21 Nov 2018 07:38:37 -0800
Subject: [PATCH 220/832] Fix HLS ID3 sniffing

The input.getLength() check is invalid because the length may be
unknown (i.e. if the server doesn't include a Content-Length
response header when serving chunks).

Issue: #5063 (tangentially related only)

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=222406347
---
 .../android/exoplayer2/source/hls/HlsMediaChunk.java  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
index a0dd66785d..cfb7d1c675 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
@@ -32,6 +32,7 @@ import com.google.android.exoplayer2.upstream.DataSpec;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.TimestampAdjuster;
 import com.google.android.exoplayer2.util.Util;
+import java.io.EOFException;
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -312,8 +313,10 @@ import java.util.concurrent.atomic.AtomicInteger;
    */
   private long peekId3PrivTimestamp(ExtractorInput input) throws IOException, InterruptedException {
     input.resetPeekPosition();
-    if (input.getLength() < Id3Decoder.ID3_HEADER_LENGTH
-        || !input.peekFully(id3Data.data, 0, Id3Decoder.ID3_HEADER_LENGTH, true)) {
+    try {
+      input.peekFully(id3Data.data, 0, Id3Decoder.ID3_HEADER_LENGTH);
+    } catch (EOFException e) {
+      // The input isn't long enough for there to be any ID3 data.
       return C.TIME_UNSET;
     }
     id3Data.reset(Id3Decoder.ID3_HEADER_LENGTH);
@@ -329,9 +332,7 @@ import java.util.concurrent.atomic.AtomicInteger;
       id3Data.reset(requiredCapacity);
       System.arraycopy(data, 0, id3Data.data, 0, Id3Decoder.ID3_HEADER_LENGTH);
     }
-    if (!input.peekFully(id3Data.data, Id3Decoder.ID3_HEADER_LENGTH, id3Size, true)) {
-      return C.TIME_UNSET;
-    }
+    input.peekFully(id3Data.data, Id3Decoder.ID3_HEADER_LENGTH, id3Size);
     Metadata metadata = id3Decoder.decode(id3Data.data, id3Size);
     if (metadata == null) {
       return C.TIME_UNSET;

From fd2f8eaba8604bef2c1fadf3e70a2154772790dd Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 21 Nov 2018 07:41:27 -0800
Subject: [PATCH 221/832] Make ABR playback tests more resilient to
 HostActivity failures.

We currently fail the entire playback tests if we exceed a start timeout
or the test gets stopped forcefully. This is problematic as the start timeout
may happen from time to time for the ABR tests and we'd still like to have the
remaining playbacks.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=222406639
---
 .../exoplayer2/testutil/HostActivity.java     | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/HostActivity.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/HostActivity.java
index 257b66a3d0..8f2b977f08 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/HostActivity.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/HostActivity.java
@@ -99,7 +99,7 @@ public final class HostActivity extends Activity implements SurfaceHolder.Callba
    *     is exceeded then the test will fail.
    */
   public void runTest(HostedTest hostedTest, long timeoutMs) {
-    runTest(hostedTest, timeoutMs, true);
+    runTest(hostedTest, timeoutMs, /* failOnTimeoutOrForceStop= */ true);
   }
 
   /**
@@ -107,9 +107,11 @@ public final class HostActivity extends Activity implements SurfaceHolder.Callba
    *
    * @param hostedTest The test to execute.
    * @param timeoutMs The number of milliseconds to wait for the test to finish.
-   * @param failOnTimeout Whether the test fails when the timeout is exceeded.
+   * @param failOnTimeoutOrForceStop Whether the test fails when a timeout is exceeded or the test
+   *     is stopped forcefully.
    */
-  public void runTest(final HostedTest hostedTest, long timeoutMs, boolean failOnTimeout) {
+  public void runTest(
+      final HostedTest hostedTest, long timeoutMs, boolean failOnTimeoutOrForceStop) {
     Assertions.checkArgument(timeoutMs > 0);
     Assertions.checkState(Thread.currentThread() != getMainLooper().getThread());
     Assertions.checkState(this.hostedTest == null);
@@ -128,7 +130,9 @@ public final class HostActivity extends Activity implements SurfaceHolder.Callba
       String message =
           "Test failed to start. Display may be turned off or keyguard may be present.";
       Log.e(TAG, message);
-      fail(message);
+      if (failOnTimeoutOrForceStop) {
+        fail(message);
+      }
     }
 
     if (hostedTest.blockUntilStopped(timeoutMs)) {
@@ -140,13 +144,15 @@ public final class HostActivity extends Activity implements SurfaceHolder.Callba
         String message = "Test force stopped. Activity may have been paused whilst "
             + "test was in progress.";
         Log.e(TAG, message);
-        fail(message);
+        if (failOnTimeoutOrForceStop) {
+          fail(message);
+        }
       }
     } else {
       runOnUiThread(hostedTest::forceStop);
       String message = "Test timed out after " + timeoutMs + " ms.";
       Log.e(TAG, message);
-      if (failOnTimeout) {
+      if (failOnTimeoutOrForceStop) {
         fail(message);
       }
     }
@@ -234,5 +240,4 @@ public final class HostActivity extends Activity implements SurfaceHolder.Callba
       forcedStopped = hostedTest.forceStop();
     }
   }
-
 }

From dd2cba04ddea84e069f427d0dd45a086a7ab6d86 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 22 Nov 2018 04:39:26 -0800
Subject: [PATCH 222/832] Offline refactor step 1b - Consolidate tests

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=222529260
---
 .../exoplayer2/offline/ActionFileTest.java    |   1 +
 .../offline/DownloadActionTest.java           | 333 ++++++++++++++++++
 .../ProgressiveDownloadActionTest.java        | 205 -----------
 .../dash/offline/DashDownloadActionTest.java  | 201 -----------
 .../hls/offline/HlsDownloadActionTest.java    | 207 -----------
 .../offline/SsDownloadActionTest.java         | 207 -----------
 6 files changed, 334 insertions(+), 820 deletions(-)
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
 delete mode 100644 library/core/src/test/java/com/google/android/exoplayer2/offline/ProgressiveDownloadActionTest.java
 delete mode 100644 library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadActionTest.java
 delete mode 100644 library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadActionTest.java
 delete mode 100644 library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadActionTest.java

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
index d5621ff12c..2e3da2cc7f 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
@@ -149,6 +149,7 @@ public class ActionFileTest {
     assertThat(actionFile.load()).isEqualTo(actions);
   }
 
+  // TODO: Remove this method and add assets for invalid and legacy serialized action files.
   private DownloadAction[] loadActions(Object[] values) throws IOException {
     FileOutputStream fileOutputStream = new FileOutputStream(tempFile);
     DataOutputStream dataOutputStream = new DataOutputStream(fileOutputStream);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
new file mode 100644
index 0000000000..e2d4287d6b
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
@@ -0,0 +1,333 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.offline;
+
+import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_DASH;
+import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_HLS;
+import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_PROGRESSIVE;
+import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_SS;
+import static com.google.common.truth.Truth.assertThat;
+
+import android.net.Uri;
+import com.google.android.exoplayer2.testutil.TestUtil;
+import com.google.android.exoplayer2.util.Assertions;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Unit tests for {@link DownloadAction}. */
+@RunWith(RobolectricTestRunner.class)
+public class DownloadActionTest {
+
+  private Uri uri1;
+  private Uri uri2;
+  private byte[] data;
+
+  @Before
+  public void setUp() {
+    uri1 = Uri.parse("http://test/1.uri");
+    uri2 = Uri.parse("http://test/2.uri");
+    data = TestUtil.buildTestData(32);
+  }
+
+  @Test
+  public void testDownloadActionIsNotRemoveAction() {
+    DownloadAction action = createDownloadAction(uri1);
+    assertThat(action.isRemoveAction).isFalse();
+  }
+
+  @Test
+  public void testRemoveActionIsRemoveAction() {
+    DownloadAction action2 = createRemoveAction(uri1);
+    assertThat(action2.isRemoveAction).isTrue();
+  }
+
+  @Test
+  public void testSameUri_IsSameMedia() {
+    DownloadAction action1 = createDownloadAction(uri1);
+    DownloadAction action2 = createDownloadAction(uri1);
+    assertThat(action1.isSameMedia(action2)).isTrue();
+  }
+
+  @Test
+  public void testSameUriDifferentAction_IsSameMedia() {
+    DownloadAction action1 = createDownloadAction(uri1);
+    DownloadAction action2 = createRemoveAction(uri1);
+    assertThat(action1.isSameMedia(action2)).isTrue();
+  }
+
+  @Test
+  public void testDifferentUri_IsNotSameMedia() {
+    DownloadAction action1 = createDownloadAction(uri1);
+    DownloadAction action2 = createDownloadAction(uri2);
+    assertThat(action1.isSameMedia(action2)).isFalse();
+  }
+
+  @Test
+  public void testSameCacheKeyDifferentUri_IsSameMedia() {
+    DownloadAction action1 = DownloadAction.createRemoveAction(TYPE_DASH, uri1, "key123", data);
+    DownloadAction action2 = DownloadAction.createRemoveAction(TYPE_DASH, uri2, "key123", data);
+    assertThat(action1.isSameMedia(action2)).isTrue();
+  }
+
+  @Test
+  public void testDifferentCacheDifferentUri_IsNotSameMedia() {
+    DownloadAction action1 = DownloadAction.createRemoveAction(TYPE_DASH, uri1, "key123", data);
+    DownloadAction action2 = DownloadAction.createRemoveAction(TYPE_DASH, uri2, "key456", data);
+    assertThat(action1.isSameMedia(action2)).isFalse();
+  }
+
+  @SuppressWarnings("EqualsWithItself")
+  @Test
+  public void testEquals() {
+    DownloadAction action1 = createRemoveAction(uri1);
+    assertThat(action1.equals(action1)).isTrue();
+
+    DownloadAction action2 = createRemoveAction(uri1);
+    DownloadAction action3 = createRemoveAction(uri1);
+    assertEqual(action2, action3);
+
+    DownloadAction action4 = createRemoveAction(uri1);
+    DownloadAction action5 = createDownloadAction(uri1);
+    assertNotEqual(action4, action5);
+
+    DownloadAction action6 = createDownloadAction(uri1);
+    DownloadAction action7 = createDownloadAction(uri1, new StreamKey(0, 0, 0));
+    assertNotEqual(action6, action7);
+
+    DownloadAction action8 = createDownloadAction(uri1, new StreamKey(0, 1, 1));
+    DownloadAction action9 = createDownloadAction(uri1, new StreamKey(0, 0, 0));
+    assertNotEqual(action8, action9);
+
+    DownloadAction action10 = createRemoveAction(uri1);
+    DownloadAction action11 = createRemoveAction(uri2);
+    assertNotEqual(action10, action11);
+
+    DownloadAction action12 =
+        createDownloadAction(uri1, new StreamKey(0, 0, 0), new StreamKey(0, 1, 1));
+    DownloadAction action13 =
+        createDownloadAction(uri1, new StreamKey(0, 1, 1), new StreamKey(0, 0, 0));
+    assertEqual(action12, action13);
+
+    DownloadAction action14 = createDownloadAction(uri1, new StreamKey(0, 0, 0));
+    DownloadAction action15 =
+        createDownloadAction(uri1, new StreamKey(0, 1, 1), new StreamKey(0, 0, 0));
+    assertNotEqual(action14, action15);
+
+    DownloadAction action16 = createDownloadAction(uri1);
+    DownloadAction action17 = createDownloadAction(uri1);
+    assertEqual(action16, action17);
+  }
+
+  @Test
+  public void testSerializerWriteRead() throws Exception {
+    assertSerializationRoundTrip(
+        DownloadAction.createDownloadAction(
+            TYPE_DASH,
+            uri1,
+            toList(new StreamKey(0, 1, 2), new StreamKey(3, 4, 5)),
+            "key123",
+            data));
+    assertSerializationRoundTrip(
+        DownloadAction.createRemoveAction(TYPE_DASH, uri1, "key123", data));
+  }
+
+  @Test
+  public void testSerializerProgressiveVersion0() throws Exception {
+    assertLegacySerializationRoundTrip(
+        DownloadAction.createDownloadAction(
+            TYPE_PROGRESSIVE, uri1, Collections.emptyList(), "key123", data),
+        /* version= */ 0);
+    assertLegacySerializationRoundTrip(
+        DownloadAction.createRemoveAction(TYPE_PROGRESSIVE, uri1, "key123", data),
+        /* version= */ 0);
+  }
+
+  @Test
+  public void testSerializerDashVersion0() throws Exception {
+    assertLegacySerializationRoundTrip(
+        DownloadAction.createDownloadAction(
+            TYPE_DASH,
+            uri1,
+            toList(new StreamKey(0, 1, 2), new StreamKey(3, 4, 5)),
+            /* customCacheKey= */ null,
+            data),
+        /* version= */ 0);
+    assertLegacySerializationRoundTrip(
+        DownloadAction.createRemoveAction(TYPE_DASH, uri1, /* customCacheKey= */ null, data),
+        /* version= */ 0);
+  }
+
+  @Test
+  public void testSerializerHlsVersion0() throws Exception {
+    assertLegacySerializationRoundTrip(
+        DownloadAction.createDownloadAction(
+            TYPE_HLS,
+            uri1,
+            toList(new StreamKey(0, 1), new StreamKey(2, 3)),
+            /* customCacheKey= */ null,
+            data),
+        /* version= */ 0);
+    assertLegacySerializationRoundTrip(
+        DownloadAction.createRemoveAction(TYPE_HLS, uri1, /* customCacheKey= */ null, data),
+        /* version= */ 0);
+  }
+
+  @Test
+  public void testSerializerHlsVersion1() throws Exception {
+    assertLegacySerializationRoundTrip(
+        DownloadAction.createDownloadAction(
+            TYPE_HLS,
+            uri1,
+            toList(new StreamKey(0, 1, 2), new StreamKey(3, 4, 5)),
+            /* customCacheKey= */ null,
+            data),
+        /* version= */ 1);
+    assertLegacySerializationRoundTrip(
+        DownloadAction.createRemoveAction(TYPE_HLS, uri1, /* customCacheKey= */ null, data),
+        /* version= */ 1);
+  }
+
+  @Test
+  public void testSerializerSsVersion0() throws Exception {
+    assertLegacySerializationRoundTrip(
+        DownloadAction.createDownloadAction(
+            TYPE_SS,
+            uri1,
+            toList(new StreamKey(0, 1), new StreamKey(2, 3)),
+            /* customCacheKey= */ null,
+            data),
+        /* version= */ 0);
+    assertLegacySerializationRoundTrip(
+        DownloadAction.createRemoveAction(TYPE_SS, uri1, /* customCacheKey= */ null, data),
+        /* version= */ 0);
+  }
+
+  @Test
+  public void testSerializerSsVersion1() throws Exception {
+    assertLegacySerializationRoundTrip(
+        DownloadAction.createDownloadAction(
+            TYPE_SS,
+            uri1,
+            toList(new StreamKey(0, 1, 2), new StreamKey(3, 4, 5)),
+            /* customCacheKey= */ null,
+            data),
+        /* version= */ 1);
+    assertLegacySerializationRoundTrip(
+        DownloadAction.createRemoveAction(TYPE_SS, uri1, /* customCacheKey= */ null, data),
+        /* version= */ 1);
+  }
+
+  private DownloadAction createDownloadAction(Uri uri, StreamKey... keys) {
+    return DownloadAction.createDownloadAction(
+        TYPE_DASH, uri, toList(keys), /* customCacheKey= */ null, data);
+  }
+
+  private DownloadAction createRemoveAction(Uri uri) {
+    return DownloadAction.createRemoveAction(TYPE_DASH, uri, /* customCacheKey= */ null, data);
+  }
+
+  private static void assertNotEqual(DownloadAction action1, DownloadAction action2) {
+    assertThat(action1).isNotEqualTo(action2);
+    assertThat(action2).isNotEqualTo(action1);
+  }
+
+  private static void assertEqual(DownloadAction action1, DownloadAction action2) {
+    assertThat(action1).isEqualTo(action2);
+    assertThat(action2).isEqualTo(action1);
+  }
+
+  private static void assertSerializationRoundTrip(DownloadAction action) throws IOException {
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    DataOutputStream output = new DataOutputStream(out);
+    action.serializeToStream(output);
+
+    assertEqual(action, deserializeActionFromStream(out));
+  }
+
+  // TODO: Remove this method and add assets for legacy serialized actions.
+  private static void assertLegacySerializationRoundTrip(DownloadAction action, int version)
+      throws IOException {
+    String type = action.type;
+    Assertions.checkState(
+        version == 0 || ((TYPE_HLS.equals(type) || TYPE_SS.equals(type)) && version == 1));
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    DataOutputStream output = new DataOutputStream(out);
+    DataOutputStream dataOutputStream = new DataOutputStream(output);
+    dataOutputStream.writeUTF(type);
+    dataOutputStream.writeInt(version);
+    dataOutputStream.writeUTF(action.uri.toString());
+    dataOutputStream.writeBoolean(action.isRemoveAction);
+    dataOutputStream.writeInt(action.data.length);
+    dataOutputStream.write(action.data);
+    boolean isLegacyProgressive = version == 0 && TYPE_PROGRESSIVE.equals(type);
+    if (isLegacyProgressive) {
+      // Serialized version 0 progressive actions did not contain keys.
+      Assertions.checkState(action.keys.isEmpty());
+    } else {
+      dataOutputStream.writeInt(action.keys.size());
+      for (int i = 0; i < action.keys.size(); i++) {
+        StreamKey key = action.keys.get(i);
+        // Serialized version 0 HLS/SS actions did not contain key period indices.
+        boolean isLegacyHlsOrSs = version == 0 && (TYPE_HLS.equals(type) || TYPE_SS.equals(type));
+        if (isLegacyHlsOrSs) {
+          // Serialized version 0 progressive actions did not contain keys.
+          Assertions.checkState(key.periodIndex == 0);
+        } else {
+          dataOutputStream.writeInt(key.periodIndex);
+        }
+        dataOutputStream.writeInt(key.groupIndex);
+        dataOutputStream.writeInt(key.trackIndex);
+      }
+    }
+    boolean isLegacySegmented =
+        version < 2 && (TYPE_DASH.equals(type) || TYPE_HLS.equals(type) || TYPE_SS.equals(type));
+    if (isLegacySegmented) {
+      // Serialized version 0 and 1 DASH/HLS/SS actions did not contain a custom cache key.
+      Assertions.checkState(action.customCacheKey == null);
+    } else {
+      dataOutputStream.writeBoolean(action.customCacheKey != null);
+      if (action.customCacheKey != null) {
+        dataOutputStream.writeUTF(action.customCacheKey);
+      }
+    }
+    dataOutputStream.flush();
+
+    assertEqual(action, deserializeActionFromStream(out));
+  }
+
+  private static DownloadAction deserializeActionFromStream(ByteArrayOutputStream out)
+      throws IOException {
+    ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
+    DataInputStream input = new DataInputStream(in);
+    return DownloadAction.deserializeFromStream(input);
+  }
+
+  private static List<StreamKey> toList(StreamKey... keys) {
+    ArrayList<StreamKey> keysList = new ArrayList<>();
+    Collections.addAll(keysList, keys);
+    return keysList;
+  }
+}
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/ProgressiveDownloadActionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/ProgressiveDownloadActionTest.java
deleted file mode 100644
index 8f7bb51fd8..0000000000
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/ProgressiveDownloadActionTest.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.offline;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.net.Uri;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.Collections;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-// TODO: Merge into DownloadActionTest
-/** Unit tests for progressive {@link DownloadAction}s. */
-@RunWith(RobolectricTestRunner.class)
-public class ProgressiveDownloadActionTest {
-
-  private Uri uri1;
-  private Uri uri2;
-
-  @Before
-  public void setUp() {
-    uri1 = Uri.parse("http://test1.uri");
-    uri2 = Uri.parse("http://test2.uri");
-  }
-
-  @Test
-  public void testDownloadActionIsNotRemoveAction() throws Exception {
-    DownloadAction action = createDownloadAction(uri1, null);
-    assertThat(action.isRemoveAction).isFalse();
-  }
-
-  @Test
-  public void testRemoveActionisRemoveAction() throws Exception {
-    DownloadAction action2 = createRemoveAction(uri1, null);
-    assertThat(action2.isRemoveAction).isTrue();
-  }
-
-  @Test
-  public void testSameUriCacheKeyDifferentAction_IsSameMedia() throws Exception {
-    DownloadAction action1 = createRemoveAction(uri1, null);
-    DownloadAction action2 = createDownloadAction(uri1, null);
-    assertSameMedia(action1, action2);
-  }
-
-  @Test
-  public void testNullCacheKeyDifferentUriAction_IsNotSameMedia() throws Exception {
-    DownloadAction action3 = createRemoveAction(uri2, null);
-    DownloadAction action4 = createDownloadAction(uri1, null);
-    assertNotSameMedia(action3, action4);
-  }
-
-  @Test
-  public void testSameCacheKeyDifferentUriAction_IsSameMedia() throws Exception {
-    DownloadAction action5 = createRemoveAction(uri2, "key");
-    DownloadAction action6 = createDownloadAction(uri1, "key");
-    assertSameMedia(action5, action6);
-  }
-
-  @Test
-  public void testSameUriDifferentCacheKeyAction_IsNotSameMedia() throws Exception {
-    DownloadAction action7 = createRemoveAction(uri1, "key");
-    DownloadAction action8 = createDownloadAction(uri1, "key2");
-    assertNotSameMedia(action7, action8);
-  }
-
-  @Test
-  public void testSameUriNullCacheKeyAction_IsNotSameMedia() throws Exception {
-    DownloadAction action1 = createRemoveAction(uri1, "key");
-    DownloadAction action2 = createDownloadAction(uri1, null);
-    assertNotSameMedia(action1, action2);
-  }
-
-  @Test
-  public void testEquals() throws Exception {
-    DownloadAction action1 = createRemoveAction(uri1, null);
-    assertThat(action1.equals(action1)).isTrue();
-
-    DownloadAction action2 = createRemoveAction(uri1, null);
-    DownloadAction action3 = createRemoveAction(uri1, null);
-    assertThat(action2.equals(action3)).isTrue();
-
-    DownloadAction action4 = createRemoveAction(uri1, null);
-    DownloadAction action5 = createDownloadAction(uri1, null);
-    assertThat(action4.equals(action5)).isFalse();
-
-    DownloadAction action6 = createRemoveAction(uri1, null);
-    DownloadAction action7 = createRemoveAction(uri1, "key");
-    assertThat(action6.equals(action7)).isFalse();
-
-    DownloadAction action8 = createRemoveAction(uri1, "key2");
-    DownloadAction action9 = createRemoveAction(uri1, "key");
-    assertThat(action8.equals(action9)).isFalse();
-
-    DownloadAction action10 = createRemoveAction(uri1, null);
-    DownloadAction action11 = createRemoveAction(uri2, null);
-    assertThat(action10.equals(action11)).isFalse();
-  }
-
-  @Test
-  public void testSerializerGetType() throws Exception {
-    DownloadAction action = createDownloadAction(uri1, null);
-    assertThat(action.type).isNotNull();
-  }
-
-  @Test
-  public void testSerializerWriteRead() throws Exception {
-    doTestSerializationRoundTrip(createDownloadAction(uri1, null));
-    doTestSerializationRoundTrip(createRemoveAction(uri2, "key"));
-  }
-
-  @Test
-  public void testSerializerVersion0() throws Exception {
-    doTestLegacySerializationRoundTrip(createDownloadAction(uri1, "key"));
-    doTestLegacySerializationRoundTrip(createRemoveAction(uri1, "key"));
-    doTestLegacySerializationRoundTrip(createDownloadAction(uri2, "key"));
-  }
-
-  private void assertSameMedia(DownloadAction action1, DownloadAction action2) {
-    assertThat(action1.isSameMedia(action2)).isTrue();
-    assertThat(action2.isSameMedia(action1)).isTrue();
-  }
-
-  private void assertNotSameMedia(DownloadAction action1, DownloadAction action2) {
-    assertThat(action1.isSameMedia(action2)).isFalse();
-    assertThat(action2.isSameMedia(action1)).isFalse();
-  }
-
-  private static void assertEqual(DownloadAction action1, DownloadAction action2) {
-    assertThat(action1).isEqualTo(action2);
-    assertThat(action2).isEqualTo(action1);
-  }
-
-  private static void doTestSerializationRoundTrip(DownloadAction action) throws IOException {
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    DataOutputStream output = new DataOutputStream(out);
-    action.serializeToStream(output);
-
-    ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-    DataInputStream input = new DataInputStream(in);
-    DownloadAction action2 = DownloadAction.deserializeFromStream(input);
-
-    assertThat(action2).isEqualTo(action);
-  }
-
-  private static void doTestLegacySerializationRoundTrip(DownloadAction action) throws IOException {
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    DataOutputStream output = new DataOutputStream(out);
-    DataOutputStream dataOutputStream = new DataOutputStream(output);
-    dataOutputStream.writeUTF(action.type);
-    dataOutputStream.writeInt(/* version= */ 0);
-    dataOutputStream.writeUTF(action.uri.toString());
-    dataOutputStream.writeBoolean(action.isRemoveAction);
-    dataOutputStream.writeInt(action.data.length);
-    dataOutputStream.write(action.data);
-    boolean customCacheKeySet = action.customCacheKey != null;
-    output.writeBoolean(customCacheKeySet);
-    if (customCacheKeySet) {
-      output.writeUTF(action.customCacheKey);
-    }
-    dataOutputStream.flush();
-
-    assertEqual(action, deserializeActionFromStream(out));
-  }
-
-  private static DownloadAction deserializeActionFromStream(ByteArrayOutputStream out)
-      throws IOException {
-    ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-    DataInputStream input = new DataInputStream(in);
-    return DownloadAction.deserializeFromStream(input);
-  }
-
-  private static DownloadAction createDownloadAction(Uri uri1, String customCacheKey) {
-    return DownloadAction.createDownloadAction(
-        DownloadAction.TYPE_PROGRESSIVE,
-        uri1,
-        /* keys= */ Collections.emptyList(),
-        customCacheKey,
-        /* data= */ null);
-  }
-
-  private static DownloadAction createRemoveAction(Uri uri1, String customCacheKey) {
-    return DownloadAction.createRemoveAction(
-        DownloadAction.TYPE_PROGRESSIVE, uri1, customCacheKey, /* data= */ null);
-  }
-}
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadActionTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadActionTest.java
deleted file mode 100644
index f3f6c8aa5c..0000000000
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadActionTest.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.source.dash.offline;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.net.Uri;
-import com.google.android.exoplayer2.offline.DownloadAction;
-import com.google.android.exoplayer2.offline.StreamKey;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-// TODO: Merge into DownloadActionTest
-/** Unit tests for DASH {@link DownloadAction}s. */
-@RunWith(RobolectricTestRunner.class)
-public class DashDownloadActionTest {
-
-  private Uri uri1;
-  private Uri uri2;
-
-  @Before
-  public void setUp() {
-    uri1 = Uri.parse("http://test1.uri");
-    uri2 = Uri.parse("http://test2.uri");
-  }
-
-  @Test
-  public void testDownloadActionIsNotRemoveAction() {
-    DownloadAction action = createDownloadAction(uri1);
-    assertThat(action.isRemoveAction).isFalse();
-  }
-
-  @Test
-  public void testRemoveActionIsRemoveAction() {
-    DownloadAction action2 = createRemoveAction(uri1);
-    assertThat(action2.isRemoveAction).isTrue();
-  }
-
-  @Test
-  public void testSameUriDifferentAction_IsSameMedia() {
-    DownloadAction action1 = createRemoveAction(uri1);
-    DownloadAction action2 = createDownloadAction(uri1);
-    assertThat(action1.isSameMedia(action2)).isTrue();
-  }
-
-  @Test
-  public void testDifferentUriAndAction_IsNotSameMedia() {
-    DownloadAction action3 = createRemoveAction(uri2);
-    DownloadAction action4 = createDownloadAction(uri1);
-    assertThat(action3.isSameMedia(action4)).isFalse();
-  }
-
-  @SuppressWarnings("EqualsWithItself")
-  @Test
-  public void testEquals() {
-    DownloadAction action1 = createRemoveAction(uri1);
-    assertThat(action1.equals(action1)).isTrue();
-
-    DownloadAction action2 = createRemoveAction(uri1);
-    DownloadAction action3 = createRemoveAction(uri1);
-    assertEqual(action2, action3);
-
-    DownloadAction action4 = createRemoveAction(uri1);
-    DownloadAction action5 = createDownloadAction(uri1);
-    assertNotEqual(action4, action5);
-
-    DownloadAction action6 = createDownloadAction(uri1);
-    DownloadAction action7 = createDownloadAction(uri1, new StreamKey(0, 0, 0));
-    assertNotEqual(action6, action7);
-
-    DownloadAction action8 = createDownloadAction(uri1, new StreamKey(1, 1, 1));
-    DownloadAction action9 = createDownloadAction(uri1, new StreamKey(0, 0, 0));
-    assertNotEqual(action8, action9);
-
-    DownloadAction action10 = createRemoveAction(uri1);
-    DownloadAction action11 = createRemoveAction(uri2);
-    assertNotEqual(action10, action11);
-
-    DownloadAction action12 =
-        createDownloadAction(uri1, new StreamKey(0, 0, 0), new StreamKey(1, 1, 1));
-    DownloadAction action13 =
-        createDownloadAction(uri1, new StreamKey(1, 1, 1), new StreamKey(0, 0, 0));
-    assertEqual(action12, action13);
-
-    DownloadAction action14 = createDownloadAction(uri1, new StreamKey(0, 0, 0));
-    DownloadAction action15 =
-        createDownloadAction(uri1, new StreamKey(1, 1, 1), new StreamKey(0, 0, 0));
-    assertNotEqual(action14, action15);
-
-    DownloadAction action16 = createDownloadAction(uri1);
-    DownloadAction action17 = createDownloadAction(uri1);
-    assertEqual(action16, action17);
-  }
-
-  @Test
-  public void testSerializerGetType() {
-    DownloadAction action = createDownloadAction(uri1);
-    assertThat(action.type).isNotNull();
-  }
-
-  @Test
-  public void testSerializerWriteRead() throws Exception {
-    doTestSerializationRoundTrip(createDownloadAction(uri1));
-    doTestSerializationRoundTrip(createRemoveAction(uri1));
-    doTestSerializationRoundTrip(
-        createDownloadAction(uri2, new StreamKey(0, 0, 0), new StreamKey(1, 1, 1)));
-  }
-
-  @Test
-  public void testSerializerVersion0() throws Exception {
-    doTestLegacySerializationRoundTrip(createDownloadAction(uri1));
-    doTestLegacySerializationRoundTrip(createRemoveAction(uri1));
-    doTestLegacySerializationRoundTrip(
-        createDownloadAction(uri2, new StreamKey(0, 0, 0), new StreamKey(1, 1, 1)));
-  }
-
-  private static void assertNotEqual(DownloadAction action1, DownloadAction action2) {
-    assertThat(action1).isNotEqualTo(action2);
-    assertThat(action2).isNotEqualTo(action1);
-  }
-
-  private static void assertEqual(DownloadAction action1, DownloadAction action2) {
-    assertThat(action1).isEqualTo(action2);
-    assertThat(action2).isEqualTo(action1);
-  }
-
-  private static void doTestSerializationRoundTrip(DownloadAction action) throws IOException {
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    DataOutputStream output = new DataOutputStream(out);
-    action.serializeToStream(output);
-
-    ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-    DataInputStream input = new DataInputStream(in);
-    DownloadAction action2 = DownloadAction.deserializeFromStream(input);
-
-    assertThat(action).isEqualTo(action2);
-  }
-
-  private static void doTestLegacySerializationRoundTrip(DownloadAction action) throws IOException {
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    DataOutputStream output = new DataOutputStream(out);
-    DataOutputStream dataOutputStream = new DataOutputStream(output);
-    dataOutputStream.writeUTF(action.type);
-    dataOutputStream.writeInt(/* version= */ 0);
-    dataOutputStream.writeUTF(action.uri.toString());
-    dataOutputStream.writeBoolean(action.isRemoveAction);
-    dataOutputStream.writeInt(action.data.length);
-    dataOutputStream.write(action.data);
-    dataOutputStream.writeInt(action.keys.size());
-    for (int i = 0; i < action.keys.size(); i++) {
-      StreamKey key = action.keys.get(i);
-      dataOutputStream.writeInt(key.periodIndex);
-      dataOutputStream.writeInt(key.groupIndex);
-      dataOutputStream.writeInt(key.trackIndex);
-    }
-    dataOutputStream.flush();
-
-    assertEqual(action, deserializeActionFromStream(out));
-  }
-
-  private static DownloadAction deserializeActionFromStream(ByteArrayOutputStream out)
-      throws IOException {
-    ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-    DataInputStream input = new DataInputStream(in);
-    return DownloadAction.deserializeFromStream(input);
-  }
-
-  private static DownloadAction createDownloadAction(Uri uri, StreamKey... keys) {
-    ArrayList<StreamKey> keysList = new ArrayList<>();
-    Collections.addAll(keysList, keys);
-    return DownloadAction.createDownloadAction(
-        DownloadAction.TYPE_DASH, uri, keysList, /* customCacheKey= */ null, /* data= */ null);
-  }
-
-  private static DownloadAction createRemoveAction(Uri uri) {
-    return DownloadAction.createRemoveAction(
-        DownloadAction.TYPE_DASH, uri, /* customCacheKey= */ null, /* data= */ null);
-  }
-}
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadActionTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadActionTest.java
deleted file mode 100644
index 5e2870bc3a..0000000000
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadActionTest.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.source.hls.offline;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.net.Uri;
-import com.google.android.exoplayer2.offline.DownloadAction;
-import com.google.android.exoplayer2.offline.StreamKey;
-import com.google.android.exoplayer2.util.Assertions;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-// TODO: Merge into DownloadActionTest
-/** Unit tests for HLS {@link DownloadAction}s. */
-@RunWith(RobolectricTestRunner.class)
-public class HlsDownloadActionTest {
-
-  private Uri uri1;
-  private Uri uri2;
-
-  @Before
-  public void setUp() {
-    uri1 = Uri.parse("http://test1.uri");
-    uri2 = Uri.parse("http://test2.uri");
-  }
-
-  @Test
-  public void testDownloadActionIsNotRemoveAction() {
-    DownloadAction action = createDownloadAction(uri1);
-    assertThat(action.isRemoveAction).isFalse();
-  }
-
-  @Test
-  public void testRemoveActionIsRemoveAction() {
-    DownloadAction action2 = createRemoveAction(uri1);
-    assertThat(action2.isRemoveAction).isTrue();
-  }
-
-  @Test
-  public void testSameUriDifferentAction_IsSameMedia() {
-    DownloadAction action1 = createRemoveAction(uri1);
-    DownloadAction action2 = createDownloadAction(uri1);
-    assertThat(action1.isSameMedia(action2)).isTrue();
-  }
-
-  @Test
-  public void testDifferentUriAndAction_IsNotSameMedia() {
-    DownloadAction action3 = createRemoveAction(uri2);
-    DownloadAction action4 = createDownloadAction(uri1);
-    assertThat(action3.isSameMedia(action4)).isFalse();
-  }
-
-  @SuppressWarnings("EqualsWithItself")
-  @Test
-  public void testEquals() {
-    DownloadAction action1 = createRemoveAction(uri1);
-    assertThat(action1.equals(action1)).isTrue();
-
-    DownloadAction action2 = createRemoveAction(uri1);
-    DownloadAction action3 = createRemoveAction(uri1);
-    assertEqual(action2, action3);
-
-    DownloadAction action4 = createRemoveAction(uri1);
-    DownloadAction action5 = createDownloadAction(uri1);
-    assertNotEqual(action4, action5);
-
-    DownloadAction action6 = createDownloadAction(uri1);
-    DownloadAction action7 = createDownloadAction(uri1, new StreamKey(0, 0));
-    assertNotEqual(action6, action7);
-
-    DownloadAction action8 = createDownloadAction(uri1, new StreamKey(1, 1));
-    DownloadAction action9 = createDownloadAction(uri1, new StreamKey(0, 0));
-    assertNotEqual(action8, action9);
-
-    DownloadAction action10 = createRemoveAction(uri1);
-    DownloadAction action11 = createRemoveAction(uri2);
-    assertNotEqual(action10, action11);
-
-    DownloadAction action12 = createDownloadAction(uri1, new StreamKey(0, 0), new StreamKey(1, 1));
-    DownloadAction action13 = createDownloadAction(uri1, new StreamKey(1, 1), new StreamKey(0, 0));
-    assertEqual(action12, action13);
-
-    DownloadAction action14 = createDownloadAction(uri1, new StreamKey(0, 0));
-    DownloadAction action15 = createDownloadAction(uri1, new StreamKey(1, 1), new StreamKey(0, 0));
-    assertNotEqual(action14, action15);
-
-    DownloadAction action16 = createDownloadAction(uri1);
-    DownloadAction action17 = createDownloadAction(uri1);
-    assertEqual(action16, action17);
-  }
-
-  @Test
-  public void testSerializerGetType() {
-    DownloadAction action = createDownloadAction(uri1);
-    assertThat(action.type).isNotNull();
-  }
-
-  @Test
-  public void testSerializerWriteRead() throws Exception {
-    doTestSerializationRoundTrip(createDownloadAction(uri1));
-    doTestSerializationRoundTrip(createRemoveAction(uri1));
-    doTestSerializationRoundTrip(
-        createDownloadAction(uri2, new StreamKey(0, 0), new StreamKey(1, 1)));
-  }
-
-  @Test
-  public void testSerializerVersion0() throws Exception {
-    doTestLegacySerializationRoundTrip(createDownloadAction(uri1), /* version= */ 0);
-    doTestLegacySerializationRoundTrip(createRemoveAction(uri1), /* version= */ 0);
-    doTestLegacySerializationRoundTrip(
-        createDownloadAction(uri2, new StreamKey(0, 0), new StreamKey(1, 1)), /* version= */ 0);
-  }
-
-  @Test
-  public void testSerializerVersion1() throws Exception {
-    doTestLegacySerializationRoundTrip(createDownloadAction(uri1), /* version= */ 1);
-    doTestLegacySerializationRoundTrip(createRemoveAction(uri1), /* version= */ 1);
-    doTestLegacySerializationRoundTrip(
-        createDownloadAction(uri2, new StreamKey(0, 0), new StreamKey(1, 1)), /* version= */ 1);
-  }
-
-  private static void assertNotEqual(DownloadAction action1, DownloadAction action2) {
-    assertThat(action1).isNotEqualTo(action2);
-    assertThat(action2).isNotEqualTo(action1);
-  }
-
-  private static void assertEqual(DownloadAction action1, DownloadAction action2) {
-    assertThat(action1).isEqualTo(action2);
-    assertThat(action2).isEqualTo(action1);
-  }
-
-  private static void doTestSerializationRoundTrip(DownloadAction action) throws IOException {
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    DataOutputStream output = new DataOutputStream(out);
-    action.serializeToStream(output);
-
-    assertEqual(action, deserializeActionFromStream(out));
-  }
-
-  private static void doTestLegacySerializationRoundTrip(DownloadAction action, int version)
-      throws IOException {
-    Assertions.checkState(version == 0 || version == 1);
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    DataOutputStream output = new DataOutputStream(out);
-    DataOutputStream dataOutputStream = new DataOutputStream(output);
-    dataOutputStream.writeUTF(action.type);
-    dataOutputStream.writeInt(version);
-    dataOutputStream.writeUTF(action.uri.toString());
-    dataOutputStream.writeBoolean(action.isRemoveAction);
-    dataOutputStream.writeInt(action.data.length);
-    dataOutputStream.write(action.data);
-    dataOutputStream.writeInt(action.keys.size());
-    for (int i = 0; i < action.keys.size(); i++) {
-      StreamKey key = action.keys.get(i);
-      if (version == 1) {
-        dataOutputStream.writeInt(key.periodIndex);
-      }
-      dataOutputStream.writeInt(key.groupIndex);
-      dataOutputStream.writeInt(key.trackIndex);
-    }
-    dataOutputStream.flush();
-
-    assertEqual(action, deserializeActionFromStream(out));
-  }
-
-  private static DownloadAction deserializeActionFromStream(ByteArrayOutputStream out)
-      throws IOException {
-    ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-    DataInputStream input = new DataInputStream(in);
-    return DownloadAction.deserializeFromStream(input);
-  }
-
-  private static DownloadAction createDownloadAction(Uri uri, StreamKey... keys) {
-    ArrayList<StreamKey> keysList = new ArrayList<>();
-    Collections.addAll(keysList, keys);
-    return DownloadAction.createDownloadAction(
-        DownloadAction.TYPE_HLS, uri, keysList, /* customCacheKey= */ null, /* data= */ null);
-  }
-
-  private static DownloadAction createRemoveAction(Uri uri) {
-    return DownloadAction.createRemoveAction(
-        DownloadAction.TYPE_HLS, uri, /* customCacheKey= */ null, /* data= */ null);
-  }
-}
diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadActionTest.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadActionTest.java
deleted file mode 100644
index a9d6e9f9c8..0000000000
--- a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadActionTest.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.source.smoothstreaming.offline;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.net.Uri;
-import com.google.android.exoplayer2.offline.DownloadAction;
-import com.google.android.exoplayer2.offline.StreamKey;
-import com.google.android.exoplayer2.util.Assertions;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-// TODO: Merge into DownloadActionTest
-/** Unit tests for SmoothStreaming {@link DownloadAction}s. */
-@RunWith(RobolectricTestRunner.class)
-public class SsDownloadActionTest {
-
-  private Uri uri1;
-  private Uri uri2;
-
-  @Before
-  public void setUp() {
-    uri1 = Uri.parse("http://test/1.uri");
-    uri2 = Uri.parse("http://test/2.uri");
-  }
-
-  @Test
-  public void testDownloadActionIsNotRemoveAction() {
-    DownloadAction action = createDownloadAction(uri1);
-    assertThat(action.isRemoveAction).isFalse();
-  }
-
-  @Test
-  public void testRemoveActionIsRemoveAction() {
-    DownloadAction action2 = createRemoveAction(uri1);
-    assertThat(action2.isRemoveAction).isTrue();
-  }
-
-  @Test
-  public void testSameUriDifferentAction_IsSameMedia() {
-    DownloadAction action1 = createRemoveAction(uri1);
-    DownloadAction action2 = createDownloadAction(uri1);
-    assertThat(action1.isSameMedia(action2)).isTrue();
-  }
-
-  @Test
-  public void testDifferentUriAndAction_IsNotSameMedia() {
-    DownloadAction action3 = createRemoveAction(uri2);
-    DownloadAction action4 = createDownloadAction(uri1);
-    assertThat(action3.isSameMedia(action4)).isFalse();
-  }
-
-  @SuppressWarnings("EqualsWithItself")
-  @Test
-  public void testEquals() {
-    DownloadAction action1 = createRemoveAction(uri1);
-    assertThat(action1.equals(action1)).isTrue();
-
-    DownloadAction action2 = createRemoveAction(uri1);
-    DownloadAction action3 = createRemoveAction(uri1);
-    assertEqual(action2, action3);
-
-    DownloadAction action4 = createRemoveAction(uri1);
-    DownloadAction action5 = createDownloadAction(uri1);
-    assertNotEqual(action4, action5);
-
-    DownloadAction action6 = createDownloadAction(uri1);
-    DownloadAction action7 = createDownloadAction(uri1, new StreamKey(0, 0));
-    assertNotEqual(action6, action7);
-
-    DownloadAction action8 = createDownloadAction(uri1, new StreamKey(1, 1));
-    DownloadAction action9 = createDownloadAction(uri1, new StreamKey(0, 0));
-    assertNotEqual(action8, action9);
-
-    DownloadAction action10 = createRemoveAction(uri1);
-    DownloadAction action11 = createRemoveAction(uri2);
-    assertNotEqual(action10, action11);
-
-    DownloadAction action12 = createDownloadAction(uri1, new StreamKey(0, 0), new StreamKey(1, 1));
-    DownloadAction action13 = createDownloadAction(uri1, new StreamKey(1, 1), new StreamKey(0, 0));
-    assertEqual(action12, action13);
-
-    DownloadAction action14 = createDownloadAction(uri1, new StreamKey(0, 0));
-    DownloadAction action15 = createDownloadAction(uri1, new StreamKey(1, 1), new StreamKey(0, 0));
-    assertNotEqual(action14, action15);
-
-    DownloadAction action16 = createDownloadAction(uri1);
-    DownloadAction action17 = createDownloadAction(uri1);
-    assertEqual(action16, action17);
-  }
-
-  @Test
-  public void testSerializerGetType() {
-    DownloadAction action = createDownloadAction(uri1);
-    assertThat(action.type).isNotNull();
-  }
-
-  @Test
-  public void testSerializerWriteRead() throws Exception {
-    doTestSerializationRoundTrip(createDownloadAction(uri1));
-    doTestSerializationRoundTrip(createRemoveAction(uri1));
-    doTestSerializationRoundTrip(
-        createDownloadAction(uri2, new StreamKey(0, 0), new StreamKey(1, 1)));
-  }
-
-  @Test
-  public void testSerializerVersion0() throws Exception {
-    doTestLegacySerializationRoundTrip(createDownloadAction(uri1), /* version= */ 0);
-    doTestLegacySerializationRoundTrip(createRemoveAction(uri1), /* version= */ 0);
-    doTestLegacySerializationRoundTrip(
-        createDownloadAction(uri2, new StreamKey(0, 0), new StreamKey(1, 1)), /* version= */ 0);
-  }
-
-  @Test
-  public void testSerializerVersion1() throws Exception {
-    doTestLegacySerializationRoundTrip(createDownloadAction(uri1), /* version= */ 1);
-    doTestLegacySerializationRoundTrip(createRemoveAction(uri1), /* version= */ 1);
-    doTestLegacySerializationRoundTrip(
-        createDownloadAction(uri2, new StreamKey(0, 0), new StreamKey(1, 1)), /* version= */ 1);
-  }
-
-  private static void assertNotEqual(DownloadAction action1, DownloadAction action2) {
-    assertThat(action1).isNotEqualTo(action2);
-    assertThat(action2).isNotEqualTo(action1);
-  }
-
-  private static void assertEqual(DownloadAction action1, DownloadAction action2) {
-    assertThat(action1).isEqualTo(action2);
-    assertThat(action2).isEqualTo(action1);
-  }
-
-  private static void doTestSerializationRoundTrip(DownloadAction action) throws IOException {
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    DataOutputStream output = new DataOutputStream(out);
-    action.serializeToStream(output);
-
-    assertEqual(action, deserializeActionFromStream(out));
-  }
-
-  private static void doTestLegacySerializationRoundTrip(DownloadAction action, int version)
-      throws IOException {
-    Assertions.checkState(version == 0 || version == 1);
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    DataOutputStream output = new DataOutputStream(out);
-    DataOutputStream dataOutputStream = new DataOutputStream(output);
-    dataOutputStream.writeUTF(action.type);
-    dataOutputStream.writeInt(version);
-    dataOutputStream.writeUTF(action.uri.toString());
-    dataOutputStream.writeBoolean(action.isRemoveAction);
-    dataOutputStream.writeInt(action.data.length);
-    dataOutputStream.write(action.data);
-    dataOutputStream.writeInt(action.keys.size());
-    for (int i = 0; i < action.keys.size(); i++) {
-      StreamKey key = action.keys.get(i);
-      if (version == 1) {
-        dataOutputStream.writeInt(key.periodIndex);
-      }
-      dataOutputStream.writeInt(key.groupIndex);
-      dataOutputStream.writeInt(key.trackIndex);
-    }
-    dataOutputStream.flush();
-
-    assertEqual(action, deserializeActionFromStream(out));
-  }
-
-  private static DownloadAction deserializeActionFromStream(ByteArrayOutputStream out)
-      throws IOException {
-    ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-    DataInputStream input = new DataInputStream(in);
-    return DownloadAction.deserializeFromStream(input);
-  }
-
-  private static DownloadAction createDownloadAction(Uri uri, StreamKey... keys) {
-    ArrayList<StreamKey> keysList = new ArrayList<>();
-    Collections.addAll(keysList, keys);
-    return DownloadAction.createDownloadAction(
-        DownloadAction.TYPE_SS, uri, keysList, /* customCacheKey= */ null, /* data= */ null);
-  }
-
-  private static DownloadAction createRemoveAction(Uri uri) {
-    return DownloadAction.createRemoveAction(
-        DownloadAction.TYPE_SS, uri, /* customCacheKey= */ null, /* data= */ null);
-  }
-}

From 56e4860cb0683de34cd464aa85abaa733a959a29 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Fri, 23 Nov 2018 12:28:23 +0000
Subject: [PATCH 223/832] Remove stray proguard files

---
 extensions/ima/src/main/proguard-rules.txt          | 6 ------
 library/dash/src/main/proguard-rules.txt            | 7 -------
 library/hls/src/main/proguard-rules.txt             | 7 -------
 library/smoothstreaming/src/main/proguard-rules.txt | 7 -------
 4 files changed, 27 deletions(-)
 delete mode 100644 extensions/ima/src/main/proguard-rules.txt
 delete mode 100644 library/dash/src/main/proguard-rules.txt
 delete mode 100644 library/hls/src/main/proguard-rules.txt
 delete mode 100644 library/smoothstreaming/src/main/proguard-rules.txt

diff --git a/extensions/ima/src/main/proguard-rules.txt b/extensions/ima/src/main/proguard-rules.txt
deleted file mode 100644
index feef3daf7a..0000000000
--- a/extensions/ima/src/main/proguard-rules.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# Proguard rules specific to the IMA extension.
-
--keep class com.google.ads.interactivemedia.** { *; }
--keep interface com.google.ads.interactivemedia.** { *; }
--keep class com.google.obf.** { *; }
--keep interface com.google.obf.** { *; }
diff --git a/library/dash/src/main/proguard-rules.txt b/library/dash/src/main/proguard-rules.txt
deleted file mode 100644
index f8725fff4d..0000000000
--- a/library/dash/src/main/proguard-rules.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Proguard rules specific to the dash module.
-
-# Constructors accessed via reflection in SegmentDownloadAction
--dontnote com.google.android.exoplayer2.source.dash.offline.DashDownloadAction
--keepclassmembers class com.google.android.exoplayer2.source.dash.offline.DashDownloadAction {
-  static ** DESERIALIZER;
-}
diff --git a/library/hls/src/main/proguard-rules.txt b/library/hls/src/main/proguard-rules.txt
deleted file mode 100644
index 3b8d1bb4ac..0000000000
--- a/library/hls/src/main/proguard-rules.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Proguard rules specific to the hls module.
-
-# Constructors accessed via reflection in SegmentDownloadAction
--dontnote com.google.android.exoplayer2.source.hls.offline.HlsDownloadAction
--keepclassmembers class com.google.android.exoplayer2.source.hls.offline.HlsDownloadAction {
-  static ** DESERIALIZER;
-}
diff --git a/library/smoothstreaming/src/main/proguard-rules.txt b/library/smoothstreaming/src/main/proguard-rules.txt
deleted file mode 100644
index d14244d783..0000000000
--- a/library/smoothstreaming/src/main/proguard-rules.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Proguard rules specific to the smoothstreaming module.
-
-# Constructors accessed via reflection in SegmentDownloadAction
--dontnote com.google.android.exoplayer2.source.smoothstreaming.offline.SsDownloadAction
--keepclassmembers class com.google.android.exoplayer2.source.smoothstreaming.offline.SsDownloadAction {
-  static ** DESERIALIZER;
-}

From f8a3c135e5ba0216053a9a041f4020888579b6f5 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 22 Nov 2018 17:32:04 +0000
Subject: [PATCH 224/832] Use overflow-save add operation for blacklisting
 duration.

This allows to specify open-ended blacklisting with Long.MAX_VALUE.

PiperOrigin-RevId: 222550939
---
 .../com/google/android/exoplayer2/castdemo/DemoUtil.java    | 1 -
 .../exoplayer2/trackselection/BaseTrackSelection.java       | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
index 0ff2e09a39..5291e78c45 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
@@ -70,7 +70,6 @@ import java.util.List;
             .setMimeType(MIME_TYPE_VIDEO_MP4)
             .setMedia("https://html5demos.com/assets/dizzy.mp4")
             .buildAndClear());
-
     SAMPLES = Collections.unmodifiableList(samples);
 
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BaseTrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BaseTrackSelection.java
index 9a15cbae14..798b6ce810 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BaseTrackSelection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BaseTrackSelection.java
@@ -22,6 +22,7 @@ import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.chunk.MediaChunk;
 import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.Util;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
@@ -160,7 +161,10 @@ public abstract class BaseTrackSelection implements TrackSelection {
     if (!canBlacklist) {
       return false;
     }
-    blacklistUntilTimes[index] = Math.max(blacklistUntilTimes[index], nowMs + blacklistDurationMs);
+    blacklistUntilTimes[index] =
+        Math.max(
+            blacklistUntilTimes[index],
+            Util.addWithOverflowDefault(nowMs, blacklistDurationMs, Long.MAX_VALUE));
     return true;
   }
 

From 1a9705e247623abd93b665b712976d11ced12e53 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 23 Nov 2018 09:13:57 +0000
Subject: [PATCH 225/832] Fix show_buffering attribute values.

The corresponding IntDef has changed without updating the attribute values.

Issue:#5139
PiperOrigin-RevId: 222598044
---
 RELEASENOTES.md                          | 2 ++
 library/ui/src/main/res/values/attrs.xml | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 03148e314e..f7766696dd 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -16,6 +16,8 @@
 * Include channel count in audio capabilities check
   ([#4690](https://github.com/google/ExoPlayer/issues/4690)).
 * Do not retry failed loads whose error is `FileNotFoundException`.
+* Fix issue with applying the `show_buffering` attribute in `PlayerView`
+  ([#5139](https://github.com/google/ExoPlayer/issues/5139)).
 
 ### 2.9.1 ###
 
diff --git a/library/ui/src/main/res/values/attrs.xml b/library/ui/src/main/res/values/attrs.xml
index 89f873edf7..c13622f182 100644
--- a/library/ui/src/main/res/values/attrs.xml
+++ b/library/ui/src/main/res/values/attrs.xml
@@ -53,8 +53,8 @@
     <attr name="auto_show" format="boolean"/>
     <attr name="show_buffering" format="enum">
       <enum name="never" value="0"/>
-      <enum name="always" value="1"/>
-      <enum name="when_playing" value="2"/>
+      <enum name="when_playing" value="1"/>
+      <enum name="always" value="2"/>
     </attr>
     <attr name="keep_content_on_player_reset" format="boolean"/>
     <attr name="resize_mode"/>

From fe41f17c387b7c18a818c8cf2a1ebcdfbd36836a Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 23 Nov 2018 11:46:24 +0000
Subject: [PATCH 226/832] Move listener invocation classes to BasePlayer

PiperOrigin-RevId: 222609579
---
 .../google/android/exoplayer2/BasePlayer.java | 54 +++++++++++++++++++
 .../android/exoplayer2/ExoPlayerImpl.java     | 42 ---------------
 2 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java
index eb3bd4f91a..4c1b84b4fd 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java
@@ -135,4 +135,58 @@ public abstract class BasePlayer implements Player {
     @RepeatMode int repeatMode = getRepeatMode();
     return repeatMode == REPEAT_MODE_ONE ? REPEAT_MODE_OFF : repeatMode;
   }
+
+  /** Holds a listener reference. */
+  protected static final class ListenerHolder {
+
+    /**
+     * The listener on which {link #invoke} will execute {@link ListenerInvocation listener
+     * invocations}.
+     */
+    public final Player.EventListener listener;
+
+    private boolean released;
+
+    public ListenerHolder(Player.EventListener listener) {
+      this.listener = listener;
+    }
+
+    /** Prevents any further {@link ListenerInvocation} to be executed on {@link #listener}. */
+    public void release() {
+      released = true;
+    }
+
+    /**
+     * Executes the given {@link ListenerInvocation} on {@link #listener}. Does nothing if {@link
+     * #release} has been called on this instance.
+     */
+    public void invoke(ListenerInvocation listenerInvocation) {
+      if (!released) {
+        listenerInvocation.invokeListener(listener);
+      }
+    }
+
+    @Override
+    public boolean equals(@Nullable Object other) {
+      if (this == other) {
+        return true;
+      }
+      if (other == null || getClass() != other.getClass()) {
+        return false;
+      }
+      return listener.equals(((ListenerHolder) other).listener);
+    }
+
+    @Override
+    public int hashCode() {
+      return listener.hashCode();
+    }
+  }
+
+  /** Parameterized invocation of a {@link Player.EventListener} method. */
+  protected interface ListenerInvocation {
+
+    /** Executes the invocation on the given {@link Player.EventListener}. */
+    void invokeListener(Player.EventListener listener);
+  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index ccd95a7922..a56c8e3b90 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -809,46 +809,4 @@ import java.util.concurrent.CopyOnWriteArrayList;
       listenerHolder.invoke(listenerInvocation);
     }
   }
-
-  private interface ListenerInvocation {
-
-    void invokeListener(Player.EventListener listener);
-  }
-
-  private static final class ListenerHolder {
-
-    private final Player.EventListener listener;
-
-    private boolean released;
-
-    public ListenerHolder(Player.EventListener listener) {
-      this.listener = listener;
-    }
-
-    public void release() {
-      released = true;
-    }
-
-    public void invoke(ListenerInvocation listenerInvocation) {
-      if (!released) {
-        listenerInvocation.invokeListener(listener);
-      }
-    }
-
-    @Override
-    public boolean equals(Object other) {
-      if (this == other) {
-        return true;
-      }
-      if (other == null || getClass() != other.getClass()) {
-        return false;
-      }
-      return listener.equals(((ListenerHolder) other).listener);
-    }
-
-    @Override
-    public int hashCode() {
-      return listener.hashCode();
-    }
-  }
 }

From d3095cccfed3c6efd393118508e3094493234e9c Mon Sep 17 00:00:00 2001
From: BrainCrumbz <BrainCrumbz@users.noreply.github.com>
Date: Fri, 23 Nov 2018 12:36:43 +0000
Subject: [PATCH 227/832] Merge #5126: fix(playlist): always call onCompletion
 when moving media sources

Imported from GitHub PR https://github.com/google/ExoPlayer/pull/5126

Closes #5125
Merge 55a4c1e15de7f100f37e38119f1da360910fd1e3 into fe41f17c387b7c18a818c8cf2a1ebcdfbd36836a

PiperOrigin-RevId: 222612873
---
 .../android/exoplayer2/source/ConcatenatingMediaSource.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
index 1d247af8f3..1f3b01182a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
@@ -365,6 +365,9 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
   public final synchronized void moveMediaSource(
       int currentIndex, int newIndex, @Nullable Runnable actionOnCompletion) {
     if (currentIndex == newIndex) {
+      if (actionOnCompletion != null) {
+        actionOnCompletion.run();
+      }
       return;
     }
     mediaSourcesPublic.add(newIndex, mediaSourcesPublic.remove(currentIndex));

From ea8696d820bbb6def20acc241f3e9c063c5f34a5 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 23 Nov 2018 16:20:18 +0000
Subject: [PATCH 228/832] Ensure changes are reflected into attrs

PiperOrigin-RevId: 222628386
---
 .../google/android/exoplayer2/ui/PlayerView.java   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
index 7e693111ab..41ddd3c7eb 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
@@ -241,11 +241,7 @@ import java.util.List;
  */
 public class PlayerView extends FrameLayout {
 
-  private static final int SURFACE_TYPE_NONE = 0;
-  private static final int SURFACE_TYPE_SURFACE_VIEW = 1;
-  private static final int SURFACE_TYPE_TEXTURE_VIEW = 2;
-  private static final int SURFACE_TYPE_MONO360_VIEW = 3;
-
+  // LINT.IfChange
   /**
    * Determines when the buffering view is shown. One of {@link #SHOW_BUFFERING_NEVER}, {@link
    * #SHOW_BUFFERING_WHEN_PLAYING} or {@link #SHOW_BUFFERING_ALWAYS}.
@@ -266,6 +262,14 @@ public class PlayerView extends FrameLayout {
    * buffering} state.
    */
   public static final int SHOW_BUFFERING_ALWAYS = 2;
+  // LINT.ThenChange(../../../../../../res/values/attrs.xml)
+
+  // LINT.IfChange
+  private static final int SURFACE_TYPE_NONE = 0;
+  private static final int SURFACE_TYPE_SURFACE_VIEW = 1;
+  private static final int SURFACE_TYPE_TEXTURE_VIEW = 2;
+  private static final int SURFACE_TYPE_MONO360_VIEW = 3;
+  // LINT.ThenChange(../../../../../../res/values/attrs.xml)
 
   private final AspectRatioFrameLayout contentFrame;
   private final View shutterView;

From 121606825533394c7dea518b872c1e40c0905803 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 23 Nov 2018 16:55:26 +0000
Subject: [PATCH 229/832] Add Lint.IfChange/ThenChange for repeat modes

PiperOrigin-RevId: 222630411
---
 .../java/com/google/android/exoplayer2/util/RepeatModeUtil.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/RepeatModeUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/util/RepeatModeUtil.java
index 5816e40623..cc23c9763c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/RepeatModeUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/RepeatModeUtil.java
@@ -26,6 +26,7 @@ import java.lang.annotation.RetentionPolicy;
  */
 public final class RepeatModeUtil {
 
+  // LINT.IfChange
   /**
    * Set of repeat toggle modes. Can be combined using bit-wise operations. Possible flag values are
    * {@link #REPEAT_TOGGLE_MODE_NONE}, {@link #REPEAT_TOGGLE_MODE_ONE} and {@link
@@ -47,6 +48,7 @@ public final class RepeatModeUtil {
   public static final int REPEAT_TOGGLE_MODE_ONE = 1;
   /** "Repeat All" button enabled. */
   public static final int REPEAT_TOGGLE_MODE_ALL = 1 << 1; // 2
+  // LINT.ThenChange(../../../../../../../../../ui/src/main/res/values/attrs.xml)
 
   private RepeatModeUtil() {
     // Prevent instantiation.

From 0c385a854d1c54f794789b390a5793a43a0eb147 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 23 Nov 2018 17:37:46 +0000
Subject: [PATCH 230/832] Clarify contribution branch

PiperOrigin-RevId: 222632883
---
 CONTRIBUTING.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 43c4809480..94b349b217 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,9 +16,8 @@ all of the information requested in the issue template.
 ## Pull requests ##
 
 We will also consider high quality pull requests. These should normally merge
-into the `dev-vX` branch with the highest major version number. Bug fixes may
-be suitable for merging into older `dev-vX` branches. Before a pull request can
-be accepted you must submit a Contributor License Agreement, as described below.
+into the `dev-v2` branch. Before a pull request can be accepted you must submit
+a Contributor License Agreement, as described below.
 
 [dev]: https://github.com/google/ExoPlayer/tree/dev
 

From e2e1c459c8e41cecfae0d89fe826cd030e92de91 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Fri, 23 Nov 2018 17:46:26 +0000
Subject: [PATCH 231/832] Merge #5140: Cea608 - Check parity and valid bits

Imported from GitHub PR https://github.com/google/ExoPlayer/pull/5140

https://github.com/google/ExoPlayer/pull/5086 moved onto the right branch.
Merge 8822e188d24c1d9b3ed101918763b16e46c8debc into 0c385a854d1c54f794789b390a5793a43a0eb147

PiperOrigin-RevId: 222633340
---
 .../exoplayer2/text/cea/Cea608Decoder.java    | 71 +++++++++++++++++--
 1 file changed, 65 insertions(+), 6 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
index 60cdda06c4..31616b7101 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
@@ -46,7 +46,6 @@ public final class Cea608Decoder extends CeaDecoder {
 
   private static final int NTSC_CC_FIELD_1 = 0x00;
   private static final int NTSC_CC_FIELD_2 = 0x01;
-  private static final int CC_VALID_608_ID = 0x04;
 
   private static final int CC_MODE_UNKNOWN = 0;
   private static final int CC_MODE_ROLL_UP = 1;
@@ -179,6 +178,41 @@ public final class Cea608Decoder extends CeaDecoder {
     0xC5, 0xE5, 0xD8, 0xF8, 0x250C, 0x2510, 0x2514, 0x2518
   };
 
+  private static final boolean[] ODD_PARITY_BYTE_TABLE = {
+    false, true, true, false, true, false, false, true, // 0
+    true, false, false, true, false, true, true, false, // 8
+    true, false, false, true, false, true, true, false, // 16
+    false, true, true, false, true, false, false, true, // 24
+    true, false, false, true, false, true, true, false, // 32
+    false, true, true, false, true, false, false, true, // 40
+    false, true, true, false, true, false, false, true, // 48
+    true, false, false, true, false, true, true, false, // 56
+    true, false, false, true, false, true, true, false, // 64
+    false, true, true, false, true, false, false, true, // 72
+    false, true, true, false, true, false, false, true, // 80
+    true, false, false, true, false, true, true, false, // 88
+    false, true, true, false, true, false, false, true, // 96
+    true, false, false, true, false, true, true, false, // 104
+    true, false, false, true, false, true, true, false, // 112
+    false, true, true, false, true, false, false, true, // 120
+    true, false, false, true, false, true, true, false, // 128
+    false, true, true, false, true, false, false, true, // 136
+    false, true, true, false, true, false, false, true, // 144
+    true, false, false, true, false, true, true, false, // 152
+    false, true, true, false, true, false, false, true, // 160
+    true, false, false, true, false, true, true, false, // 168
+    true, false, false, true, false, true, true, false, // 176
+    false, true, true, false, true, false, false, true, // 184
+    false, true, true, false, true, false, false, true, // 192
+    true, false, false, true, false, true, true, false, // 200
+    true, false, false, true, false, true, true, false, // 208
+    false, true, true, false, true, false, false, true, // 216
+    true, false, false, true, false, true, true, false, // 224
+    false, true, true, false, true, false, false, true, // 232
+    false, true, true, false, true, false, false, true, // 240
+    true, false, false, true, false, true, true, false, // 248
+  };
+
   private final ParsableByteArray ccData;
   private final int packetLength;
   private final int selectedField;
@@ -191,6 +225,7 @@ public final class Cea608Decoder extends CeaDecoder {
   private int captionMode;
   private int captionRowCount;
 
+  private boolean captionValid;
   private boolean repeatableControlSet;
   private byte repeatableControlCc1;
   private byte repeatableControlCc2;
@@ -229,6 +264,7 @@ public final class Cea608Decoder extends CeaDecoder {
     setCaptionMode(CC_MODE_UNKNOWN);
     setCaptionRowCount(DEFAULT_CAPTIONS_ROW_COUNT);
     resetCueBuilders();
+    captionValid = false;
     repeatableControlSet = false;
     repeatableControlCc1 = 0;
     repeatableControlCc2 = 0;
@@ -259,31 +295,54 @@ public final class Cea608Decoder extends CeaDecoder {
     while (ccData.bytesLeft() >= packetLength) {
       byte ccDataHeader = packetLength == 2 ? CC_IMPLICIT_DATA_HEADER
           : (byte) ccData.readUnsignedByte();
-      byte ccData1 = (byte) (ccData.readUnsignedByte() & 0x7F); // strip the parity bit
-      byte ccData2 = (byte) (ccData.readUnsignedByte() & 0x7F); // strip the parity bit
 
       // Only examine valid CEA-608 packets
       // TODO: We're currently ignoring the top 5 marker bits, which should all be 1s according
       // to the CEA-608 specification. We need to determine if the data should be handled
       // differently when that is not the case.
-      if ((ccDataHeader & (CC_VALID_FLAG | CC_TYPE_FLAG)) != CC_VALID_608_ID) {
+
+      if ((ccDataHeader & CC_TYPE_FLAG) != 0) {
+        // Do not process anything that is not part of the 608 byte stream.
         continue;
       }
 
-      // Only examine packets within the selected field
       if ((selectedField == 1 && (ccDataHeader & CC_FIELD_FLAG) != NTSC_CC_FIELD_1)
           || (selectedField == 2 && (ccDataHeader & CC_FIELD_FLAG) != NTSC_CC_FIELD_2)) {
+        // Do not process packets not within the selected field.
         continue;
       }
 
-      // Ignore empty captions.
+      int ccByte1 = ccData.readUnsignedByte();
+      int ccByte2 = ccData.readUnsignedByte();
+
+      // Strip the parity bit from each byte to get CC data.
+      byte ccData1 = (byte) (ccByte1 & 0x7F);
+      byte ccData2 = (byte) (ccByte2 & 0x7F);
+
       if (ccData1 == 0 && ccData2 == 0) {
+        // Ignore empty captions.
+        continue;
+      }
+
+      if ((ccDataHeader & CC_VALID_FLAG) != CC_VALID_FLAG) {
+        if (captionValid) {
+          // The encoder has flipped the validity bit to indicate closed captions are being turned.
+          resetCueBuilders();
+          captionValid = false;
+          captionDataProcessed = true;
+        }
         continue;
       }
 
       // If we've reached this point then there is data to process; flag that work has been done.
       captionDataProcessed = true;
 
+      if (!ODD_PARITY_BYTE_TABLE[ccByte1] || !ODD_PARITY_BYTE_TABLE[ccByte2]) {
+        // The data is invalid.
+        resetCueBuilders();
+        continue;
+      }
+
       // Special North American character set.
       // ccData1 - 0|0|0|1|C|0|0|1
       // ccData2 - 0|0|1|1|X|X|X|X

From 799bf16764f3cdb267897c30a933e5364856a3a4 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 23 Nov 2018 17:58:45 +0000
Subject: [PATCH 232/832] Pull reading of data bytes back above
 if(...){continue} clauses

PiperOrigin-RevId: 222633838
---
 .../exoplayer2/text/cea/Cea608Decoder.java      | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
index 31616b7101..a481ebb0d0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
@@ -293,28 +293,27 @@ public final class Cea608Decoder extends CeaDecoder {
     boolean captionDataProcessed = false;
     boolean isRepeatableControl = false;
     while (ccData.bytesLeft() >= packetLength) {
-      byte ccDataHeader = packetLength == 2 ? CC_IMPLICIT_DATA_HEADER
+      byte ccHeader = packetLength == 2 ? CC_IMPLICIT_DATA_HEADER
           : (byte) ccData.readUnsignedByte();
+      int ccByte1 = ccData.readUnsignedByte();
+      int ccByte2 = ccData.readUnsignedByte();
 
       // Only examine valid CEA-608 packets
       // TODO: We're currently ignoring the top 5 marker bits, which should all be 1s according
       // to the CEA-608 specification. We need to determine if the data should be handled
       // differently when that is not the case.
 
-      if ((ccDataHeader & CC_TYPE_FLAG) != 0) {
+      if ((ccHeader & CC_TYPE_FLAG) != 0) {
         // Do not process anything that is not part of the 608 byte stream.
         continue;
       }
 
-      if ((selectedField == 1 && (ccDataHeader & CC_FIELD_FLAG) != NTSC_CC_FIELD_1)
-          || (selectedField == 2 && (ccDataHeader & CC_FIELD_FLAG) != NTSC_CC_FIELD_2)) {
+      if ((selectedField == 1 && (ccHeader & CC_FIELD_FLAG) != NTSC_CC_FIELD_1)
+          || (selectedField == 2 && (ccHeader & CC_FIELD_FLAG) != NTSC_CC_FIELD_2)) {
         // Do not process packets not within the selected field.
         continue;
       }
 
-      int ccByte1 = ccData.readUnsignedByte();
-      int ccByte2 = ccData.readUnsignedByte();
-
       // Strip the parity bit from each byte to get CC data.
       byte ccData1 = (byte) (ccByte1 & 0x7F);
       byte ccData2 = (byte) (ccByte2 & 0x7F);
@@ -324,9 +323,9 @@ public final class Cea608Decoder extends CeaDecoder {
         continue;
       }
 
-      if ((ccDataHeader & CC_VALID_FLAG) != CC_VALID_FLAG) {
+      if ((ccHeader & CC_VALID_FLAG) != CC_VALID_FLAG) {
         if (captionValid) {
-          // The encoder has flipped the validity bit to indicate closed captions are being turned.
+          // The encoder has flipped the validity bit to indicate captions are being turned off.
           resetCueBuilders();
           captionValid = false;
           captionDataProcessed = true;

From 166acad93dac6ddfe3aa71c11b18e07008a0e71b Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Mon, 26 Nov 2018 10:50:49 +0000
Subject: [PATCH 233/832] Noop fix to WebvttDecoder

We already have tests for comment blocks, and they already
pass because we discard the comment when we fail to parse it
as a cue. We should just skip it directly, however.
---
 .../google/android/exoplayer2/text/webvtt/WebvttDecoder.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java
index 327428af36..06d3c14970 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java
@@ -110,7 +110,7 @@ public final class WebvttDecoder extends SimpleSubtitleDecoder {
         foundEvent = EVENT_END_OF_FILE;
       } else if (STYLE_START.equals(line)) {
         foundEvent = EVENT_STYLE_BLOCK;
-      } else if (COMMENT_START.startsWith(line)) {
+      } else if (line.startsWith(COMMENT_START)) {
         foundEvent = EVENT_COMMENT;
       } else {
         foundEvent = EVENT_CUE;

From 03101444aff3b321931bba059dcae5d9459d2d56 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 26 Nov 2018 10:38:14 +0000
Subject: [PATCH 234/832] Update content url for IMA demo app

The existing one seems to be dead, and isn't https.

PiperOrigin-RevId: 222795996
---
 demos/ima/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demos/ima/src/main/res/values/strings.xml b/demos/ima/src/main/res/values/strings.xml
index 67a7f06f8b..2eb5700bf0 100644
--- a/demos/ima/src/main/res/values/strings.xml
+++ b/demos/ima/src/main/res/values/strings.xml
@@ -17,7 +17,7 @@
 
   <string name="application_name">Exo IMA Demo</string>
 
-  <string name="content_url"><![CDATA[http://rmcdn.2mdn.net/MotifFiles/html/1248596/android_1330378998288.mp4]]></string>
+  <string name="content_url"><![CDATA[https://storage.googleapis.com/exoplayer-test-media-1/mkv/android-screens-lavf-56.36.100-aac-avc-main-1280x720.mkv]]></string>
 
   <string name="ad_tag_url"><![CDATA[https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/124319096/external/single_ad_samples&ciu_szs=300x250&impl=s&gdfp_req=1&env=vp&output=vast&unviewed_position_start=1&cust_params=deployment%3Ddevsite%26sample_ct%3Dlinear&correlator=]]></string>
 

From 17eadcc4335cf9079b3ebbd419fde94cff989906 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 26 Nov 2018 10:58:41 +0000
Subject: [PATCH 235/832] Fix Cea608 caption valid

PiperOrigin-RevId: 222797622
---
 .../google/android/exoplayer2/text/cea/Cea608Decoder.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
index a481ebb0d0..8742a6344e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
@@ -298,7 +298,6 @@ public final class Cea608Decoder extends CeaDecoder {
       int ccByte1 = ccData.readUnsignedByte();
       int ccByte2 = ccData.readUnsignedByte();
 
-      // Only examine valid CEA-608 packets
       // TODO: We're currently ignoring the top 5 marker bits, which should all be 1s according
       // to the CEA-608 specification. We need to determine if the data should be handled
       // differently when that is not the case.
@@ -323,11 +322,12 @@ public final class Cea608Decoder extends CeaDecoder {
         continue;
       }
 
-      if ((ccHeader & CC_VALID_FLAG) != CC_VALID_FLAG) {
-        if (captionValid) {
+      boolean previousCaptionValid = captionValid;
+      captionValid = (ccHeader & CC_VALID_FLAG) == CC_VALID_FLAG;
+      if (!captionValid) {
+        if (previousCaptionValid) {
           // The encoder has flipped the validity bit to indicate captions are being turned off.
           resetCueBuilders();
-          captionValid = false;
           captionDataProcessed = true;
         }
         continue;

From 40c65dbcea913447cf97a6fe900b291547c02de1 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 26 Nov 2018 11:48:11 +0000
Subject: [PATCH 236/832] Move deserialization code to a more natural location

- Add DownloadAction.fromByteArray for symmetry with toByteArray
- Make DownloadService call fromByteArray, for symmetry with calls
  to toByteArray

PiperOrigin-RevId: 222801703
---
 .../exoplayer2/offline/DownloadAction.java    | 17 ++++++++++--
 .../exoplayer2/offline/DownloadManager.java   | 16 ------------
 .../exoplayer2/offline/DownloadService.java   |  2 +-
 .../offline/DownloadActionTest.java           | 26 ++++++++++++++++---
 4 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
index 46f5c78e55..ddbb6cdea9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
@@ -19,6 +19,7 @@ import android.net.Uri;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -44,6 +45,18 @@ public final class DownloadAction {
 
   private static final int VERSION = 2;
 
+  /**
+   * Deserializes an action from the {@code data}.
+   *
+   * @param data The action data to deserialize.
+   * @return The deserialized action.
+   * @throws IOException If the data could not be deserialized.
+   */
+  public static DownloadAction fromByteArray(byte[] data) throws IOException {
+    ByteArrayInputStream input = new ByteArrayInputStream(data);
+    return deserializeFromStream(input);
+  }
+
   /**
    * Deserializes one action that was serialized with {@link #serializeToStream(OutputStream)} from
    * the {@code input}.
@@ -52,8 +65,8 @@ public final class DownloadAction {
    *
    * @param input The stream from which to read.
    * @return The deserialized action.
-   * @throws IOException If there is an IO error reading from {@code input}, or if the action type
-   *     isn't supported by any of the {@code deserializers}.
+   * @throws IOException If there is an IO error reading from {@code input}, or if the data could
+   *     not be deserialized.
    */
   public static DownloadAction deserializeFromStream(InputStream input) throws IOException {
     return readFromStream(new DataInputStream(input));
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 9437a410fc..4208521cc6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -31,7 +31,6 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
-import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.lang.annotation.Documented;
@@ -187,21 +186,6 @@ public final class DownloadManager {
     }
   }
 
-  /**
-   * Deserializes an action from {@code actionData}, and calls {@link
-   * #handleAction(DownloadAction)}.
-   *
-   * @param actionData Serialized version of the action to be executed.
-   * @return The id of the newly created task.
-   * @throws IOException If an error occurs deserializing the action.
-   */
-  public int handleAction(byte[] actionData) throws IOException {
-    Assertions.checkState(!released);
-    ByteArrayInputStream input = new ByteArrayInputStream(actionData);
-    DownloadAction action = DownloadAction.deserializeFromStream(input);
-    return handleAction(action);
-  }
-
   /**
    * Handles the given action. A task is created and added to the task queue. If it's a remove
    * action then any download tasks for the same media are immediately canceled.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index e9492f6b87..cfca8ede79 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -259,7 +259,7 @@ public abstract class DownloadService extends Service {
           Log.e(TAG, "Ignoring ADD action with no action data");
         } else {
           try {
-            downloadManager.handleAction(actionData);
+            downloadManager.handleAction(DownloadAction.fromByteArray(actionData));
           } catch (IOException e) {
             Log.e(TAG, "Failed to handle ADD action", e);
           }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
index e2d4287d6b..dc34d7e1a3 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
@@ -19,6 +19,7 @@ import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_DASH;
 import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_HLS;
 import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_PROGRESSIVE;
 import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_SS;
+import static com.google.android.exoplayer2.offline.DownloadAction.fromByteArray;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
@@ -142,15 +143,28 @@ public class DownloadActionTest {
   }
 
   @Test
-  public void testSerializerWriteRead() throws Exception {
-    assertSerializationRoundTrip(
+  public void testStreamSerialization() throws Exception {
+    assertStreamSerializationRoundTrip(
         DownloadAction.createDownloadAction(
             TYPE_DASH,
             uri1,
             toList(new StreamKey(0, 1, 2), new StreamKey(3, 4, 5)),
             "key123",
             data));
-    assertSerializationRoundTrip(
+    assertStreamSerializationRoundTrip(
+        DownloadAction.createRemoveAction(TYPE_DASH, uri1, "key123", data));
+  }
+
+  @Test
+  public void testArraySerialization() throws Exception {
+    assertArraySerializationRoundTrip(
+        DownloadAction.createDownloadAction(
+            TYPE_DASH,
+            uri1,
+            toList(new StreamKey(0, 1, 2), new StreamKey(3, 4, 5)),
+            "key123",
+            data));
+    assertArraySerializationRoundTrip(
         DownloadAction.createRemoveAction(TYPE_DASH, uri1, "key123", data));
   }
 
@@ -259,7 +273,7 @@ public class DownloadActionTest {
     assertThat(action2).isEqualTo(action1);
   }
 
-  private static void assertSerializationRoundTrip(DownloadAction action) throws IOException {
+  private static void assertStreamSerializationRoundTrip(DownloadAction action) throws IOException {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     DataOutputStream output = new DataOutputStream(out);
     action.serializeToStream(output);
@@ -267,6 +281,10 @@ public class DownloadActionTest {
     assertEqual(action, deserializeActionFromStream(out));
   }
 
+  private static void assertArraySerializationRoundTrip(DownloadAction action) throws IOException {
+    assertEqual(action, fromByteArray(action.toByteArray()));
+  }
+
   // TODO: Remove this method and add assets for legacy serialized actions.
   private static void assertLegacySerializationRoundTrip(DownloadAction action, int version)
       throws IOException {

From d6b6600a28b959ef9b9e1f3bb3135f2e81355f13 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 26 Nov 2018 12:10:02 +0000
Subject: [PATCH 237/832] Fix unnecessary media playlist requests when playing
 live streams

Issue: #5059
PiperOrigin-RevId: 222803511
---
 RELEASENOTES.md                                           | 2 ++
 .../android/exoplayer2/source/hls/HlsChunkSource.java     | 8 +++++---
 .../source/hls/playlist/DefaultHlsPlaylistTracker.java    | 4 ++--
 .../source/hls/playlist/HlsPlaylistTracker.java           | 4 +++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index f7766696dd..2a90cba3d5 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,6 +2,8 @@
 
 ### dev-v2 (not yet released) ###
 
+* HLS: Fix issue causing unnecessary media playlist requests when playing live
+  streams ([#5059](https://github.com/google/ExoPlayer/issues/5059)).
 * MP4: Support Opus and FLAC in the MP4 container, and in DASH
   ([#4883](https://github.com/google/ExoPlayer/issues/4883)).
 * DASH: Fix detecting the end of live events
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
index f000187827..d01476d004 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
@@ -262,7 +262,8 @@ import java.util.List;
       // Retry when playlist is refreshed.
       return;
     }
-    HlsMediaPlaylist mediaPlaylist = playlistTracker.getPlaylistSnapshot(selectedUrl);
+    HlsMediaPlaylist mediaPlaylist =
+        playlistTracker.getPlaylistSnapshot(selectedUrl, /* isForPlayback= */ true);
     independentSegments = mediaPlaylist.hasIndependentSegments;
 
     updateLiveEdgeTimeUs(mediaPlaylist);
@@ -279,7 +280,7 @@ import java.util.List;
         // behind the live window.
         selectedVariantIndex = oldVariantIndex;
         selectedUrl = variants[selectedVariantIndex];
-        mediaPlaylist = playlistTracker.getPlaylistSnapshot(selectedUrl);
+        mediaPlaylist = playlistTracker.getPlaylistSnapshot(selectedUrl, /* isForPlayback= */ true);
         startOfPlaylistInPeriodUs =
             mediaPlaylist.startTimeUs - playlistTracker.getInitialStartTimeUs();
         chunkMediaSequence = previous.getNextChunkIndex();
@@ -435,7 +436,8 @@ import java.util.List;
         chunkIterators[i] = MediaChunkIterator.EMPTY;
         continue;
       }
-      HlsMediaPlaylist playlist = playlistTracker.getPlaylistSnapshot(variantUrl);
+      HlsMediaPlaylist playlist =
+          playlistTracker.getPlaylistSnapshot(variantUrl, /* isForPlayback= */ false);
       long startOfPlaylistInPeriodUs =
           playlist.startTimeUs - playlistTracker.getInitialStartTimeUs();
       boolean switchingVariant = variantIndex != oldVariantIndex;
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
index 4e34c556e0..4269b66d30 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
@@ -162,9 +162,9 @@ public final class DefaultHlsPlaylistTracker
   }
 
   @Override
-  public HlsMediaPlaylist getPlaylistSnapshot(HlsUrl url) {
+  public HlsMediaPlaylist getPlaylistSnapshot(HlsUrl url, boolean isForPlayback) {
     HlsMediaPlaylist snapshot = playlistBundles.get(url).getPlaylistSnapshot();
-    if (snapshot != null) {
+    if (snapshot != null && isForPlayback) {
       maybeSetPrimaryUrl(url);
     }
     return snapshot;
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java
index b83ae43f47..c73c9fa835 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java
@@ -167,11 +167,13 @@ public interface HlsPlaylistTracker {
    * HlsUrl}.
    *
    * @param url The {@link HlsUrl} corresponding to the requested media playlist.
+   * @param isForPlayback Whether the caller might use the snapshot to request media segments for
+   *     playback. If true, the primary playlist may be updated to the one requested.
    * @return The most recent snapshot of the playlist referenced by the provided {@link HlsUrl}. May
    *     be null if no snapshot has been loaded yet.
    */
   @Nullable
-  HlsMediaPlaylist getPlaylistSnapshot(HlsUrl url);
+  HlsMediaPlaylist getPlaylistSnapshot(HlsUrl url, boolean isForPlayback);
 
   /**
    * Returns the start time of the first loaded primary playlist, or {@link C#TIME_UNSET} if no

From 3e150b54f42908f3bd7d7fdb8b93f87c95bbacb4 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 26 Nov 2018 12:30:23 +0000
Subject: [PATCH 238/832] Assume text tracks in protected SmoothStreaming are
 not protected

Issue: #4838
PiperOrigin-RevId: 222805051
---
 .../source/smoothstreaming/manifest/SsManifestParser.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java
index cc09b5ff11..3d5ade403a 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java
@@ -378,8 +378,12 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
         DrmInitData drmInitData = new DrmInitData(new SchemeData(protectionElement.uuid,
             MimeTypes.VIDEO_MP4, protectionElement.data));
         for (StreamElement streamElement : streamElementArray) {
-          for (int i = 0; i < streamElement.formats.length; i++) {
-            streamElement.formats[i] = streamElement.formats[i].copyWithDrmInitData(drmInitData);
+          int type = streamElement.type;
+          if (type == C.TRACK_TYPE_VIDEO || type == C.TRACK_TYPE_AUDIO) {
+            Format[] formats = streamElement.formats;
+            for (int i = 0; i < formats.length; i++) {
+              formats[i] = formats[i].copyWithDrmInitData(drmInitData);
+            }
           }
         }
       }

From 30e753ea1df77fb64caf48484cc2aee830374a7b Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 26 Nov 2018 13:21:02 +0000
Subject: [PATCH 239/832] Provide Cronet request and response data for
 subclasses.

Subclasses may want to analyze, log and react to the Cronet-specific
connection data.

Issue:#5134
PiperOrigin-RevId: 222809441
---
 .../exoplayer2/ext/cronet/CronetDataSource.java     | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java b/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java
index af85401100..ab10f41d8f 100644
--- a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java
+++ b/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2.ext.cronet;
 
 import android.net.Uri;
+import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
@@ -455,6 +456,18 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
     }
   }
 
+  /** Returns current {@link UrlRequest}. May be null if the data source is not opened. */
+  @Nullable
+  protected UrlRequest getCurrentUrlRequest() {
+    return currentUrlRequest;
+  }
+
+  /** Returns current {@link UrlResponseInfo}. May be null if the data source is not opened. */
+  @Nullable
+  protected UrlResponseInfo getCurrentUrlResponseInfo() {
+    return responseInfo;
+  }
+
   // Internal methods.
 
   private UrlRequest.Builder buildRequestBuilder(DataSpec dataSpec) throws IOException {

From a31a3f3c73246b2ea49d6c2c8c0e7875459c2ba0 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 26 Nov 2018 15:13:16 +0000
Subject: [PATCH 240/832] Simplify DownloadActionTest legacy tests using assets

PiperOrigin-RevId: 222819933
---
 .../assets/download-actions/dash-download-v0  | Bin 0 -> 94 bytes
 .../assets/download-actions/dash-remove-v0    | Bin 0 -> 70 bytes
 .../assets/download-actions/hls-download-v0   | Bin 0 -> 85 bytes
 .../assets/download-actions/hls-download-v1   | Bin 0 -> 93 bytes
 .../assets/download-actions/hls-remove-v0     | Bin 0 -> 69 bytes
 .../assets/download-actions/hls-remove-v1     | Bin 0 -> 69 bytes
 .../download-actions/progressive-download-v0  | Bin 0 -> 82 bytes
 .../download-actions/progressive-remove-v0    | Bin 0 -> 82 bytes
 .../assets/download-actions/ss-download-v0    | Bin 0 -> 84 bytes
 .../assets/download-actions/ss-download-v1    | Bin 0 -> 92 bytes
 .../test/assets/download-actions/ss-remove-v0 | Bin 0 -> 68 bytes
 .../test/assets/download-actions/ss-remove-v1 | Bin 0 -> 68 bytes
 .../offline/DownloadActionTest.java           | 145 ++++++------------
 13 files changed, 50 insertions(+), 95 deletions(-)
 create mode 100644 library/core/src/test/assets/download-actions/dash-download-v0
 create mode 100644 library/core/src/test/assets/download-actions/dash-remove-v0
 create mode 100644 library/core/src/test/assets/download-actions/hls-download-v0
 create mode 100644 library/core/src/test/assets/download-actions/hls-download-v1
 create mode 100644 library/core/src/test/assets/download-actions/hls-remove-v0
 create mode 100644 library/core/src/test/assets/download-actions/hls-remove-v1
 create mode 100644 library/core/src/test/assets/download-actions/progressive-download-v0
 create mode 100644 library/core/src/test/assets/download-actions/progressive-remove-v0
 create mode 100644 library/core/src/test/assets/download-actions/ss-download-v0
 create mode 100644 library/core/src/test/assets/download-actions/ss-download-v1
 create mode 100644 library/core/src/test/assets/download-actions/ss-remove-v0
 create mode 100644 library/core/src/test/assets/download-actions/ss-remove-v1

diff --git a/library/core/src/test/assets/download-actions/dash-download-v0 b/library/core/src/test/assets/download-actions/dash-download-v0
new file mode 100644
index 0000000000000000000000000000000000000000..980f0000b7ab3253f9fd35d8e6c06e86f2b54383
GIT binary patch
literal 94
zcmZQzNl7fuU;qKZjFOT9D}DWv)Z!9-L%q_XOpvI;;cF?o%#R)_P|~VdWz>DjcApmC
iV^((aDFxFar}{fQC;_Tr0x1LnMj!^UnSq!Eh*<&lRu+E%

literal 0
HcmV?d00001

diff --git a/library/core/src/test/assets/download-actions/dash-remove-v0 b/library/core/src/test/assets/download-actions/dash-remove-v0
new file mode 100644
index 0000000000000000000000000000000000000000..03e37b1e0de90a8a4a8569888240b8fdea654e2e
GIT binary patch
literal 70
zcmZQzNl7fuU;qKZjFOT9D}DWv)Z!9-L%q_XOh%xn!r^NvyUdRsDp1m@S!L9H%66X?
V-(yyG^C<<>BB%O0JSYKa1pwQC7H<Fm

literal 0
HcmV?d00001

diff --git a/library/core/src/test/assets/download-actions/hls-download-v0 b/library/core/src/test/assets/download-actions/hls-download-v0
new file mode 100644
index 0000000000000000000000000000000000000000..88c46b8b09d1f2c7e26a07e552168043ba576aed
GIT binary patch
literal 85
zcmZQz&d4cd00F^_l9B=|ef^Tu;u3vBz0#sgkf_4pYbm?Tj~*&e(yCcy)P2f!pBCR^
cR(A6#1=Av@`a3)*0jgmFDFgyWAO^9S0VL)Y8~^|S

literal 0
HcmV?d00001

diff --git a/library/core/src/test/assets/download-actions/hls-download-v1 b/library/core/src/test/assets/download-actions/hls-download-v1
new file mode 100644
index 0000000000000000000000000000000000000000..9a3ab7129e70e60cdc7b66e375e761886ef9a963
GIT binary patch
literal 93
zcmZQz&d4cdU|?Wm5X>kkDX`MlFG(#f(Kpm9Ey@H6GbkLsma@zI=%E57t(sLv-KT8#
lY4JT~WjCKvFfDSbzr%wPpc*ESLLguSVi21dh*^M`6#&*W7A61y

literal 0
HcmV?d00001

diff --git a/library/core/src/test/assets/download-actions/hls-remove-v0 b/library/core/src/test/assets/download-actions/hls-remove-v0
new file mode 100644
index 0000000000000000000000000000000000000000..163dfed1bfb03d30af96afaeda1bb0d1a7568199
GIT binary patch
literal 69
zcmZQz&d4cd00F^_l9B=|ef^Tu;u3vBz0#sgMxdy|;cF?o%#R)_P|~VdWz>DjcApmC
UV^((aDFxFar}{fQC;@2&0K<6}6#xJL

literal 0
HcmV?d00001

diff --git a/library/core/src/test/assets/download-actions/hls-remove-v1 b/library/core/src/test/assets/download-actions/hls-remove-v1
new file mode 100644
index 0000000000000000000000000000000000000000..35fbd3271867515e32712899cbd8a38134de785e
GIT binary patch
literal 69
zcmZQz&d4cdU|?Wm5X>kkDX`MlFG(#f(Kpm9Ey`pBiYpwxma@zI=%E57t(sLv-KT8#
XY4JT~WjCKvFfDSbzr%wPpc)1M!?qR{

literal 0
HcmV?d00001

diff --git a/library/core/src/test/assets/download-actions/progressive-download-v0 b/library/core/src/test/assets/download-actions/progressive-download-v0
new file mode 100644
index 0000000000000000000000000000000000000000..618419e1834c57409b857dd7d7b4084e3d1d41d9
GIT binary patch
literal 82
zcmZSJE-1=RFG?*g&MZr100F^_l9B=|ef^Tu;u3vBz0#sgkf_4pYbm?Tj~*&e(yCcy
i)P2f!pBCR^R(A6#1=Av@`a3)*VPs&-POUUFG6n!c;~R7U

literal 0
HcmV?d00001

diff --git a/library/core/src/test/assets/download-actions/progressive-remove-v0 b/library/core/src/test/assets/download-actions/progressive-remove-v0
new file mode 100644
index 0000000000000000000000000000000000000000..7a522b85f4cb345ec110dc64f876670a1e54a6a1
GIT binary patch
literal 82
zcmZSJE-1=RFG?*g&MZr100F^_l9B=|ef^Tu;u3vBz0#sgMxdy|;cF?o%#R)_P|~Vd
jWz>DjcApmCV^((aDFxFar}{fQC}Ct^%TBE{G%^MNL=hWx

literal 0
HcmV?d00001

diff --git a/library/core/src/test/assets/download-actions/ss-download-v0 b/library/core/src/test/assets/download-actions/ss-download-v0
new file mode 100644
index 0000000000000000000000000000000000000000..da0d2f6be56ae2e8e6ffa2f09829f20e0049388f
GIT binary patch
literal 84
zcmZQzDlTRK0l|!tk^(Dz{gTw;5`9Cx(xOa|sKViEDZ9*%9x71Ms##^!ead#97T;r5
bcJnC((;}z(J3J@>s$l{t1Oi4N2C<m|1r-&#

literal 0
HcmV?d00001

diff --git a/library/core/src/test/assets/download-actions/ss-download-v1 b/library/core/src/test/assets/download-actions/ss-download-v1
new file mode 100644
index 0000000000000000000000000000000000000000..9db30a8af5c49c6beca5eec630dac788cd9531d3
GIT binary patch
literal 92
zcmZQzDlTSVU|?hr%qS@-u+rBrNi8nXH`FUF$^;5CC>*|)vdjGFp#mkXnpH;Kr)>9W
k@jYf`H=j~4Epn>A!-Eo_8YYlJAYcSy5Stl@S%8=o0JBpS!~g&Q

literal 0
HcmV?d00001

diff --git a/library/core/src/test/assets/download-actions/ss-remove-v0 b/library/core/src/test/assets/download-actions/ss-remove-v0
new file mode 100644
index 0000000000000000000000000000000000000000..a3811cd4ce0b0130f6d2c40a69ef02a503ea24be
GIT binary patch
literal 68
zcmZQzDlTRK0l|!tk^(Dz{gTw;5`9Cx(xOa8ps2#(Ybm?Tj~*&e(yCcy)P2f!pBCR^
TR(A6#1=Av@`a3)*0ciyQsmK+x

literal 0
HcmV?d00001

diff --git a/library/core/src/test/assets/download-actions/ss-remove-v1 b/library/core/src/test/assets/download-actions/ss-remove-v1
new file mode 100644
index 0000000000000000000000000000000000000000..fd3c8c194c95464e77923993a8c2ffdc60eea99e
GIT binary patch
literal 68
zcmZQzDlTSVU|?hr%qS@-u+rBrNi8nXH`FUF%47tJD;&O-vdjGFp#mkXnpH;Kr)>9W
W@jYf`H=j~4Epn>A!-Eo_8U_HW1r@Xa

literal 0
HcmV?d00001

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
index dc34d7e1a3..01976583bc 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
@@ -19,17 +19,16 @@ import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_DASH;
 import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_HLS;
 import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_PROGRESSIVE;
 import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_SS;
-import static com.google.android.exoplayer2.offline.DownloadAction.fromByteArray;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
 import com.google.android.exoplayer2.testutil.TestUtil;
-import com.google.android.exoplayer2.util.Assertions;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -37,6 +36,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 
 /** Unit tests for {@link DownloadAction}. */
 @RunWith(RobolectricTestRunner.class)
@@ -143,7 +143,7 @@ public class DownloadActionTest {
   }
 
   @Test
-  public void testStreamSerialization() throws Exception {
+  public void testSerializerWriteRead() throws Exception {
     assertStreamSerializationRoundTrip(
         DownloadAction.createDownloadAction(
             TYPE_DASH,
@@ -170,88 +170,88 @@ public class DownloadActionTest {
 
   @Test
   public void testSerializerProgressiveVersion0() throws Exception {
-    assertLegacySerializationRoundTrip(
+    assertDeserialization(
+        "progressive-download-v0",
         DownloadAction.createDownloadAction(
-            TYPE_PROGRESSIVE, uri1, Collections.emptyList(), "key123", data),
-        /* version= */ 0);
-    assertLegacySerializationRoundTrip(
-        DownloadAction.createRemoveAction(TYPE_PROGRESSIVE, uri1, "key123", data),
-        /* version= */ 0);
+            TYPE_PROGRESSIVE, uri1, Collections.emptyList(), "key123", data));
+    assertDeserialization(
+        "progressive-remove-v0",
+        DownloadAction.createRemoveAction(TYPE_PROGRESSIVE, uri1, "key123", data));
   }
 
   @Test
   public void testSerializerDashVersion0() throws Exception {
-    assertLegacySerializationRoundTrip(
+    assertDeserialization(
+        "dash-download-v0",
         DownloadAction.createDownloadAction(
             TYPE_DASH,
             uri1,
             toList(new StreamKey(0, 1, 2), new StreamKey(3, 4, 5)),
             /* customCacheKey= */ null,
-            data),
-        /* version= */ 0);
-    assertLegacySerializationRoundTrip(
-        DownloadAction.createRemoveAction(TYPE_DASH, uri1, /* customCacheKey= */ null, data),
-        /* version= */ 0);
+            data));
+    assertDeserialization(
+        "dash-remove-v0",
+        DownloadAction.createRemoveAction(TYPE_DASH, uri1, /* customCacheKey= */ null, data));
   }
 
   @Test
   public void testSerializerHlsVersion0() throws Exception {
-    assertLegacySerializationRoundTrip(
+    assertDeserialization(
+        "hls-download-v0",
         DownloadAction.createDownloadAction(
             TYPE_HLS,
             uri1,
             toList(new StreamKey(0, 1), new StreamKey(2, 3)),
             /* customCacheKey= */ null,
-            data),
-        /* version= */ 0);
-    assertLegacySerializationRoundTrip(
-        DownloadAction.createRemoveAction(TYPE_HLS, uri1, /* customCacheKey= */ null, data),
-        /* version= */ 0);
+            data));
+    assertDeserialization(
+        "hls-remove-v0",
+        DownloadAction.createRemoveAction(TYPE_HLS, uri1, /* customCacheKey= */ null, data));
   }
 
   @Test
   public void testSerializerHlsVersion1() throws Exception {
-    assertLegacySerializationRoundTrip(
+    assertDeserialization(
+        "hls-download-v1",
         DownloadAction.createDownloadAction(
             TYPE_HLS,
             uri1,
             toList(new StreamKey(0, 1, 2), new StreamKey(3, 4, 5)),
             /* customCacheKey= */ null,
-            data),
-        /* version= */ 1);
-    assertLegacySerializationRoundTrip(
-        DownloadAction.createRemoveAction(TYPE_HLS, uri1, /* customCacheKey= */ null, data),
-        /* version= */ 1);
+            data));
+    assertDeserialization(
+        "hls-remove-v1",
+        DownloadAction.createRemoveAction(TYPE_HLS, uri1, /* customCacheKey= */ null, data));
   }
 
   @Test
   public void testSerializerSsVersion0() throws Exception {
-    assertLegacySerializationRoundTrip(
+    assertDeserialization(
+        "ss-download-v0",
         DownloadAction.createDownloadAction(
             TYPE_SS,
             uri1,
             toList(new StreamKey(0, 1), new StreamKey(2, 3)),
             /* customCacheKey= */ null,
-            data),
-        /* version= */ 0);
-    assertLegacySerializationRoundTrip(
-        DownloadAction.createRemoveAction(TYPE_SS, uri1, /* customCacheKey= */ null, data),
-        /* version= */ 0);
+            data));
+    assertDeserialization(
+        "ss-remove-v0",
+        DownloadAction.createRemoveAction(TYPE_SS, uri1, /* customCacheKey= */ null, data));
   }
 
   @Test
   public void testSerializerSsVersion1() throws Exception {
-    assertLegacySerializationRoundTrip(
+    assertDeserialization(
+        "ss-download-v1",
         DownloadAction.createDownloadAction(
             TYPE_SS,
             uri1,
             toList(new StreamKey(0, 1, 2), new StreamKey(3, 4, 5)),
             /* customCacheKey= */ null,
-            data),
-        /* version= */ 1);
-    assertLegacySerializationRoundTrip(
-        DownloadAction.createRemoveAction(TYPE_SS, uri1, /* customCacheKey= */ null, data),
-        /* version= */ 1);
+            data));
+    assertDeserialization(
+        "ss-remove-v1",
+        DownloadAction.createRemoveAction(TYPE_SS, uri1, /* customCacheKey= */ null, data));
   }
 
   private DownloadAction createDownloadAction(Uri uri, StreamKey... keys) {
@@ -278,69 +278,24 @@ public class DownloadActionTest {
     DataOutputStream output = new DataOutputStream(out);
     action.serializeToStream(output);
 
-    assertEqual(action, deserializeActionFromStream(out));
+    ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
+    DataInputStream input = new DataInputStream(in);
+    DownloadAction deserializedAction = DownloadAction.deserializeFromStream(input);
+
+    assertEqual(action, deserializedAction);
   }
 
   private static void assertArraySerializationRoundTrip(DownloadAction action) throws IOException {
-    assertEqual(action, fromByteArray(action.toByteArray()));
+    assertEqual(action, DownloadAction.fromByteArray(action.toByteArray()));
   }
 
-  // TODO: Remove this method and add assets for legacy serialized actions.
-  private static void assertLegacySerializationRoundTrip(DownloadAction action, int version)
+  private static void assertDeserialization(String fileName, DownloadAction expectedAction)
       throws IOException {
-    String type = action.type;
-    Assertions.checkState(
-        version == 0 || ((TYPE_HLS.equals(type) || TYPE_SS.equals(type)) && version == 1));
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    DataOutputStream output = new DataOutputStream(out);
-    DataOutputStream dataOutputStream = new DataOutputStream(output);
-    dataOutputStream.writeUTF(type);
-    dataOutputStream.writeInt(version);
-    dataOutputStream.writeUTF(action.uri.toString());
-    dataOutputStream.writeBoolean(action.isRemoveAction);
-    dataOutputStream.writeInt(action.data.length);
-    dataOutputStream.write(action.data);
-    boolean isLegacyProgressive = version == 0 && TYPE_PROGRESSIVE.equals(type);
-    if (isLegacyProgressive) {
-      // Serialized version 0 progressive actions did not contain keys.
-      Assertions.checkState(action.keys.isEmpty());
-    } else {
-      dataOutputStream.writeInt(action.keys.size());
-      for (int i = 0; i < action.keys.size(); i++) {
-        StreamKey key = action.keys.get(i);
-        // Serialized version 0 HLS/SS actions did not contain key period indices.
-        boolean isLegacyHlsOrSs = version == 0 && (TYPE_HLS.equals(type) || TYPE_SS.equals(type));
-        if (isLegacyHlsOrSs) {
-          // Serialized version 0 progressive actions did not contain keys.
-          Assertions.checkState(key.periodIndex == 0);
-        } else {
-          dataOutputStream.writeInt(key.periodIndex);
-        }
-        dataOutputStream.writeInt(key.groupIndex);
-        dataOutputStream.writeInt(key.trackIndex);
-      }
-    }
-    boolean isLegacySegmented =
-        version < 2 && (TYPE_DASH.equals(type) || TYPE_HLS.equals(type) || TYPE_SS.equals(type));
-    if (isLegacySegmented) {
-      // Serialized version 0 and 1 DASH/HLS/SS actions did not contain a custom cache key.
-      Assertions.checkState(action.customCacheKey == null);
-    } else {
-      dataOutputStream.writeBoolean(action.customCacheKey != null);
-      if (action.customCacheKey != null) {
-        dataOutputStream.writeUTF(action.customCacheKey);
-      }
-    }
-    dataOutputStream.flush();
+    InputStream input =
+        TestUtil.getInputStream(RuntimeEnvironment.application, "download-actions/" + fileName);
+    DownloadAction deserializedAction = DownloadAction.deserializeFromStream(input);
 
-    assertEqual(action, deserializeActionFromStream(out));
-  }
-
-  private static DownloadAction deserializeActionFromStream(ByteArrayOutputStream out)
-      throws IOException {
-    ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-    DataInputStream input = new DataInputStream(in);
-    return DownloadAction.deserializeFromStream(input);
+    assertEqual(deserializedAction, expectedAction);
   }
 
   private static List<StreamKey> toList(StreamKey... keys) {

From f4d9deddaf6b9e213d160435d79f43ee6be3bb44 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 26 Nov 2018 15:28:18 +0000
Subject: [PATCH 241/832] Remove spurious VisibleForTesting annotation

It needs to have package visiblity, otherwise nothing can use it.

PiperOrigin-RevId: 222821546
---
 .../google/android/exoplayer2/ui/spherical/TouchTracker.java    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/TouchTracker.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/TouchTracker.java
index 08c4779cf7..dfafd448c9 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/TouchTracker.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/TouchTracker.java
@@ -19,7 +19,6 @@ import android.content.Context;
 import android.graphics.PointF;
 import android.support.annotation.BinderThread;
 import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;
@@ -45,7 +44,6 @@ import android.view.View;
  * a nicer UI. An even more advanced UI would reproject the user's touch point into 3D and drag the
  * Mesh as the user moves their finger. However, that requires quaternion interpolation.
  */
-@VisibleForTesting
 /* package */ class TouchTracker extends GestureDetector.SimpleOnGestureListener
     implements View.OnTouchListener, OrientationListener.Listener {
 

From d1e49f20744d2beab7b41bc110e1e53a8de0a73f Mon Sep 17 00:00:00 2001
From: Zsolt Matyas <zmmatyas@amazon.com>
Date: Wed, 7 Nov 2018 14:07:09 -0800
Subject: [PATCH 242/832] CEA608: PAINT-ON Mode must keep the last shown
 captions on the screen

[Problem]
PAINT-ON mode is not implemented. From the compliance tests:
* RDC command has no effect except to select paint-on style.
* Next data are written directly to the display upon receipt.
* If other captioning is already on the screen, the four-row
limit is still in effect.

[Solution]
It is a rare use case, we do not support overriding characters in
existing cueBuilders as PAINT-ON would require. But several
compliance tests check if the screen is cleared when the mode
switch happens. We must keep the old captions when switching
to PAINT-ON mode

[Test]
- Live Over-the-Air content, beginning of commercials often uses
PAINT-ON mode
---
 .../exoplayer2/text/cea/Cea608Decoder.java      | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
index 8742a6344e..e93a53b713 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
@@ -559,8 +559,19 @@ public final class Cea608Decoder extends CeaDecoder {
     int oldCaptionMode = this.captionMode;
     this.captionMode = captionMode;
 
-    // Clear the working memory.
+    // Clear the cues and cueBuilders except for Paint-on mode. Paint-on mode may modify characters
+    // already on the screen. This feature is not fully supported, but we need to keep the previous
+    // screen content shown
+    if (captionMode == CC_MODE_PAINT_ON) {
+      // update the Mode member of all existing cueBuilders even if we are mid-row
+      for (CueBuilder builder : cueBuilders) {
+        builder.setCaptionMode(captionMode);
+      }
+      return;
+    }
+
     resetCueBuilders();
+
     if (oldCaptionMode == CC_MODE_PAINT_ON || captionMode == CC_MODE_ROLL_UP
         || captionMode == CC_MODE_UNKNOWN) {
       // When switching from paint-on or to roll-up or unknown, we also need to clear the caption.
@@ -653,6 +664,10 @@ public final class Cea608Decoder extends CeaDecoder {
       setCaptionRowCount(captionRowCount);
     }
 
+    public void setCaptionMode(int captionMode) {
+      this.captionMode = captionMode;
+    }
+
     public void reset(int captionMode) {
       this.captionMode = captionMode;
       cueStyles.clear();

From e31730590974e801d74d329562155f13a387f63a Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 26 Nov 2018 16:53:41 +0000
Subject: [PATCH 243/832] Remove custom data from remove actions

A remove action will eventually just be the unique ID of the download
that should be removed. This is a step toward that goal.

PiperOrigin-RevId: 222832456
---
 .../exoplayer2/demo/DownloadTracker.java      |  3 +-
 .../exoplayer2/offline/DownloadAction.java    | 30 ++++++++++++++-----
 .../exoplayer2/offline/DownloadHelper.java    |  3 +-
 .../offline/ProgressiveDownloadHelper.java    |  5 ++--
 .../offline/DownloadActionTest.java           | 27 ++++++++---------
 .../offline/DownloadManagerTest.java          |  5 +---
 .../dash/offline/DashDownloadHelper.java      |  4 +--
 .../dash/offline/DownloadManagerDashTest.java |  2 +-
 .../dash/offline/DownloadServiceDashTest.java |  2 +-
 .../source/hls/offline/HlsDownloadHelper.java |  4 +--
 .../offline/SsDownloadHelper.java             |  4 +--
 11 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index 422411d849..9c225a21b1 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -116,8 +116,7 @@ public class DownloadTracker implements DownloadManager.Listener {
 
   public void toggleDownload(Activity activity, String name, Uri uri, String extension) {
     if (isDownloaded(uri)) {
-      DownloadAction removeAction =
-          getDownloadHelper(uri, extension).getRemoveAction(Util.getUtf8Bytes(name));
+      DownloadAction removeAction = getDownloadHelper(uri, extension).getRemoveAction();
       startServiceWithAction(removeAction);
     } else {
       StartDownloadDialogHelper helper =
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
index ddbb6cdea9..2c7b5069b9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
@@ -96,12 +96,16 @@ public final class DownloadAction {
    * @param type The type of the action.
    * @param uri The URI of the media to be removed.
    * @param customCacheKey A custom key for cache indexing, or null.
-   * @param data Optional custom data for this action. If {@code null} an empty array will be used.
    */
   public static DownloadAction createRemoveAction(
-      String type, Uri uri, @Nullable String customCacheKey, @Nullable byte[] data) {
+      String type, Uri uri, @Nullable String customCacheKey) {
     return new DownloadAction(
-        type, uri, /* isRemoveAction= */ true, Collections.emptyList(), customCacheKey, data);
+        type,
+        uri,
+        /* isRemoveAction= */ true,
+        Collections.emptyList(),
+        customCacheKey,
+        /* data= */ null);
   }
 
   /** The type of the action. */
@@ -127,7 +131,7 @@ public final class DownloadAction {
    * @param keys Keys of tracks to be downloaded. If empty, all tracks will be downloaded. Empty if
    *     this action is a remove action.
    * @param customCacheKey A custom key for cache indexing, or null.
-   * @param data Optional custom data for this action.
+   * @param data Custom data for this action. Null if this action is a remove action.
    */
   private DownloadAction(
       String type,
@@ -140,14 +144,16 @@ public final class DownloadAction {
     this.uri = uri;
     this.isRemoveAction = isRemoveAction;
     this.customCacheKey = customCacheKey;
-    this.data = data != null ? data : Util.EMPTY_BYTE_ARRAY;
     if (isRemoveAction) {
       Assertions.checkArgument(keys.isEmpty());
+      Assertions.checkArgument(data == null);
       this.keys = Collections.emptyList();
+      this.data = Util.EMPTY_BYTE_ARRAY;
     } else {
       ArrayList<StreamKey> mutableKeys = new ArrayList<>(keys);
       Collections.sort(mutableKeys);
       this.keys = Collections.unmodifiableList(mutableKeys);
+      this.data = data != null ? data : Util.EMPTY_BYTE_ARRAY;
     }
   }
 
@@ -236,9 +242,19 @@ public final class DownloadAction {
 
     Uri uri = Uri.parse(input.readUTF());
     boolean isRemoveAction = input.readBoolean();
+
     int dataLength = input.readInt();
-    byte[] data = new byte[dataLength];
-    input.readFully(data);
+    byte[] data;
+    if (dataLength != 0) {
+      data = new byte[dataLength];
+      input.readFully(data);
+      if (isRemoveAction) {
+        // Remove actions are no longer permitted to have data.
+        data = null;
+      }
+    } else {
+      data = null;
+    }
 
     // Serialized version 0 progressive actions did not contain keys.
     boolean isLegacyProgressive = version == 0 && TYPE_PROGRESSIVE.equals(type);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index bb82df7a48..905619c6f0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -103,8 +103,7 @@ public abstract class DownloadHelper {
   /**
    * Builds a {@link DownloadAction} for removing the media. May be called in any state.
    *
-   * @param data Application provided data to store in {@link DownloadAction#data}.
    * @return The built {@link DownloadAction}.
    */
-  public abstract DownloadAction getRemoveAction(@Nullable byte[] data);
+  public abstract DownloadAction getRemoveAction();
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java
index f2022c3b46..6c1ceafd93 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java
@@ -62,8 +62,7 @@ public final class ProgressiveDownloadHelper extends DownloadHelper {
   }
 
   @Override
-  public DownloadAction getRemoveAction(@Nullable byte[] data) {
-    return DownloadAction.createRemoveAction(
-        DownloadAction.TYPE_PROGRESSIVE, uri, customCacheKey, data);
+  public DownloadAction getRemoveAction() {
+    return DownloadAction.createRemoveAction(DownloadAction.TYPE_PROGRESSIVE, uri, customCacheKey);
   }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
index 01976583bc..9d057e0f56 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
@@ -88,15 +88,15 @@ public class DownloadActionTest {
 
   @Test
   public void testSameCacheKeyDifferentUri_IsSameMedia() {
-    DownloadAction action1 = DownloadAction.createRemoveAction(TYPE_DASH, uri1, "key123", data);
-    DownloadAction action2 = DownloadAction.createRemoveAction(TYPE_DASH, uri2, "key123", data);
+    DownloadAction action1 = DownloadAction.createRemoveAction(TYPE_DASH, uri1, "key123");
+    DownloadAction action2 = DownloadAction.createRemoveAction(TYPE_DASH, uri2, "key123");
     assertThat(action1.isSameMedia(action2)).isTrue();
   }
 
   @Test
   public void testDifferentCacheDifferentUri_IsNotSameMedia() {
-    DownloadAction action1 = DownloadAction.createRemoveAction(TYPE_DASH, uri1, "key123", data);
-    DownloadAction action2 = DownloadAction.createRemoveAction(TYPE_DASH, uri2, "key456", data);
+    DownloadAction action1 = DownloadAction.createRemoveAction(TYPE_DASH, uri1, "key123");
+    DownloadAction action2 = DownloadAction.createRemoveAction(TYPE_DASH, uri2, "key456");
     assertThat(action1.isSameMedia(action2)).isFalse();
   }
 
@@ -152,7 +152,7 @@ public class DownloadActionTest {
             "key123",
             data));
     assertStreamSerializationRoundTrip(
-        DownloadAction.createRemoveAction(TYPE_DASH, uri1, "key123", data));
+        DownloadAction.createRemoveAction(TYPE_DASH, uri1, "key123"));
   }
 
   @Test
@@ -164,8 +164,7 @@ public class DownloadActionTest {
             toList(new StreamKey(0, 1, 2), new StreamKey(3, 4, 5)),
             "key123",
             data));
-    assertArraySerializationRoundTrip(
-        DownloadAction.createRemoveAction(TYPE_DASH, uri1, "key123", data));
+    assertArraySerializationRoundTrip(DownloadAction.createRemoveAction(TYPE_DASH, uri1, "key123"));
   }
 
   @Test
@@ -176,7 +175,7 @@ public class DownloadActionTest {
             TYPE_PROGRESSIVE, uri1, Collections.emptyList(), "key123", data));
     assertDeserialization(
         "progressive-remove-v0",
-        DownloadAction.createRemoveAction(TYPE_PROGRESSIVE, uri1, "key123", data));
+        DownloadAction.createRemoveAction(TYPE_PROGRESSIVE, uri1, "key123"));
   }
 
   @Test
@@ -191,7 +190,7 @@ public class DownloadActionTest {
             data));
     assertDeserialization(
         "dash-remove-v0",
-        DownloadAction.createRemoveAction(TYPE_DASH, uri1, /* customCacheKey= */ null, data));
+        DownloadAction.createRemoveAction(TYPE_DASH, uri1, /* customCacheKey= */ null));
   }
 
   @Test
@@ -206,7 +205,7 @@ public class DownloadActionTest {
             data));
     assertDeserialization(
         "hls-remove-v0",
-        DownloadAction.createRemoveAction(TYPE_HLS, uri1, /* customCacheKey= */ null, data));
+        DownloadAction.createRemoveAction(TYPE_HLS, uri1, /* customCacheKey= */ null));
   }
 
   @Test
@@ -221,7 +220,7 @@ public class DownloadActionTest {
             data));
     assertDeserialization(
         "hls-remove-v1",
-        DownloadAction.createRemoveAction(TYPE_HLS, uri1, /* customCacheKey= */ null, data));
+        DownloadAction.createRemoveAction(TYPE_HLS, uri1, /* customCacheKey= */ null));
   }
 
   @Test
@@ -236,7 +235,7 @@ public class DownloadActionTest {
             data));
     assertDeserialization(
         "ss-remove-v0",
-        DownloadAction.createRemoveAction(TYPE_SS, uri1, /* customCacheKey= */ null, data));
+        DownloadAction.createRemoveAction(TYPE_SS, uri1, /* customCacheKey= */ null));
   }
 
   @Test
@@ -251,7 +250,7 @@ public class DownloadActionTest {
             data));
     assertDeserialization(
         "ss-remove-v1",
-        DownloadAction.createRemoveAction(TYPE_SS, uri1, /* customCacheKey= */ null, data));
+        DownloadAction.createRemoveAction(TYPE_SS, uri1, /* customCacheKey= */ null));
   }
 
   private DownloadAction createDownloadAction(Uri uri, StreamKey... keys) {
@@ -260,7 +259,7 @@ public class DownloadActionTest {
   }
 
   private DownloadAction createRemoveAction(Uri uri) {
-    return DownloadAction.createRemoveAction(TYPE_DASH, uri, /* customCacheKey= */ null, data);
+    return DownloadAction.createRemoveAction(TYPE_DASH, uri, /* customCacheKey= */ null);
   }
 
   private static void assertNotEqual(DownloadAction action1, DownloadAction action2) {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index 3778641378..f21f16b8ce 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -466,10 +466,7 @@ public class DownloadManagerTest {
       action =
           isRemoveAction
               ? DownloadAction.createRemoveAction(
-                  DownloadAction.TYPE_PROGRESSIVE,
-                  uri,
-                  /* customCacheKey= */ null,
-                  /* data= */ null)
+                  DownloadAction.TYPE_PROGRESSIVE, uri, /* customCacheKey= */ null)
               : DownloadAction.createDownloadAction(
                   DownloadAction.TYPE_PROGRESSIVE,
                   uri,
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java
index 5b3ca3664b..9c6a24d1b2 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java
@@ -93,9 +93,9 @@ public final class DashDownloadHelper extends DownloadHelper {
   }
 
   @Override
-  public DownloadAction getRemoveAction(@Nullable byte[] data) {
+  public DownloadAction getRemoveAction() {
     return DownloadAction.createRemoveAction(
-        DownloadAction.TYPE_DASH, uri, /* customCacheKey= */ null, data);
+        DownloadAction.TYPE_DASH, uri, /* customCacheKey= */ null);
   }
 
   private static List<StreamKey> toStreamKeys(List<TrackKey> trackKeys) {
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
index f0cab7532f..8c61432f66 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
@@ -260,7 +260,7 @@ public class DownloadManagerDashTest {
     if (isRemoveAction) {
       result =
           DownloadAction.createRemoveAction(
-              DownloadAction.TYPE_DASH, uri, /* customCacheKey= */ null, data);
+              DownloadAction.TYPE_DASH, uri, /* customCacheKey= */ null);
     } else {
       result =
           DownloadAction.createDownloadAction(
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
index 2466a42049..09f62fa776 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
@@ -214,7 +214,7 @@ public class DownloadServiceDashTest {
     if (isRemoveAction) {
       result =
           DownloadAction.createRemoveAction(
-              DownloadAction.TYPE_DASH, uri, /* customCacheKey= */ null, data);
+              DownloadAction.TYPE_DASH, uri, /* customCacheKey= */ null);
     } else {
       result =
           DownloadAction.createDownloadAction(
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java
index 1aae136231..d4cbd8b638 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java
@@ -109,9 +109,9 @@ public final class HlsDownloadHelper extends DownloadHelper {
   }
 
   @Override
-  public DownloadAction getRemoveAction(@Nullable byte[] data) {
+  public DownloadAction getRemoveAction() {
     return DownloadAction.createRemoveAction(
-        DownloadAction.TYPE_HLS, uri, /* customCacheKey= */ null, data);
+        DownloadAction.TYPE_HLS, uri, /* customCacheKey= */ null);
   }
 
   private static Format[] toFormats(List<HlsMasterPlaylist.HlsUrl> hlsUrls) {
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java
index 815e4337bd..d7083400cd 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java
@@ -83,9 +83,9 @@ public final class SsDownloadHelper extends DownloadHelper {
   }
 
   @Override
-  public DownloadAction getRemoveAction(@Nullable byte[] data) {
+  public DownloadAction getRemoveAction() {
     return DownloadAction.createRemoveAction(
-        DownloadAction.TYPE_SS, uri, /* customCacheKey= */ null, data);
+        DownloadAction.TYPE_SS, uri, /* customCacheKey= */ null);
   }
 
   private static List<StreamKey> toStreamKeys(List<TrackKey> trackKeys) {

From aacb212c174c802282b976d067148c3140cdb3d1 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 27 Nov 2018 11:02:11 +0000
Subject: [PATCH 244/832] Remove duplicate CacheAsserts class

PiperOrigin-RevId: 222963935
---
 .../upstream/cache/CacheAsserts.java          | 140 ------------------
 .../upstream/cache/CacheDataSourceTest.java   |   6 +-
 .../upstream/cache/CacheUtilTest.java         |   4 +-
 .../exoplayer2/testutil/CacheAsserts.java     |  38 ++---
 4 files changed, 24 insertions(+), 164 deletions(-)
 delete mode 100644 library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheAsserts.java

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheAsserts.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheAsserts.java
deleted file mode 100644
index 9304dc6dc3..0000000000
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheAsserts.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.upstream.cache;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import android.net.Uri;
-import com.google.android.exoplayer2.testutil.FakeDataSet;
-import com.google.android.exoplayer2.testutil.FakeDataSet.FakeData;
-import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.upstream.DataSourceInputStream;
-import com.google.android.exoplayer2.upstream.DataSpec;
-import com.google.android.exoplayer2.upstream.DummyDataSource;
-import com.google.android.exoplayer2.util.Util;
-import java.io.IOException;
-import java.util.ArrayList;
-
-/** Assertion methods for {@link com.google.android.exoplayer2.upstream.cache.Cache}. */
-/* package */ final class CacheAsserts {
-
-  /**
-   * Asserts that the cache content is equal to the data in the {@code fakeDataSet}.
-   *
-   * @throws IOException If an error occurred reading from the Cache.
-   */
-  public static void assertCachedData(Cache cache, FakeDataSet fakeDataSet) throws IOException {
-    ArrayList<FakeData> allData = fakeDataSet.getAllData();
-    Uri[] uris = new Uri[allData.size()];
-    for (int i = 0; i < allData.size(); i++) {
-      uris[i] = allData.get(i).uri;
-    }
-    assertCachedData(cache, fakeDataSet, uris);
-  }
-
-  /**
-   * Asserts that the cache content is equal to the given subset of data in the {@code fakeDataSet}.
-   *
-   * @throws IOException If an error occurred reading from the Cache.
-   */
-  public static void assertCachedData(Cache cache, FakeDataSet fakeDataSet, String... uriStrings)
-      throws IOException {
-    Uri[] uris = new Uri[uriStrings.length];
-    for (int i = 0; i < uriStrings.length; i++) {
-      uris[i] = Uri.parse(uriStrings[i]);
-    }
-    assertCachedData(cache, fakeDataSet, uris);
-  }
-
-  /**
-   * Asserts that the cache content is equal to the given subset of data in the {@code fakeDataSet}.
-   *
-   * @throws IOException If an error occurred reading from the Cache.
-   */
-  public static void assertCachedData(Cache cache, FakeDataSet fakeDataSet, Uri... uris)
-      throws IOException {
-    int totalLength = 0;
-    for (Uri uri : uris) {
-      byte[] data = fakeDataSet.getData(uri).getData();
-      assertDataCached(cache, uri, data);
-      totalLength += data.length;
-    }
-    assertThat(cache.getCacheSpace()).isEqualTo(totalLength);
-  }
-
-  /**
-   * Asserts that the cache contains the given subset of data in the {@code fakeDataSet}.
-   *
-   * @throws IOException If an error occurred reading from the Cache.
-   */
-  public static void assertDataCached(Cache cache, FakeDataSet fakeDataSet, Uri... uris)
-      throws IOException {
-    for (Uri uri : uris) {
-      assertDataCached(cache, uri, fakeDataSet.getData(uri).getData());
-    }
-  }
-
-  /**
-   * Asserts that the cache contains the given data for {@code uriString} or not.
-   *
-   * @throws IOException If an error occurred reading from the Cache.
-   */
-  public static void assertDataCached(Cache cache, Uri uri, byte[] expected) throws IOException {
-    DataSource dataSource = new CacheDataSource(cache, DummyDataSource.INSTANCE, 0);
-    DataSpec dataSpec = new DataSpec(uri, DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH);
-    String messageToPrepend = "Cached data doesn't match expected for '" + uri + "'";
-    assertReadData(dataSource, dataSpec, expected, messageToPrepend);
-  }
-
-  /**
-   * Asserts that the read data from {@code dataSource} specified by {@code dataSpec} is equal to
-   * {@code expected} or not.
-   *
-   * @throws IOException If an error occurred reading from the Cache.
-   */
-  public static void assertReadData(
-      DataSource dataSource, DataSpec dataSpec, byte[] expected, String messageToPrepend)
-      throws IOException {
-    DataSourceInputStream inputStream = new DataSourceInputStream(dataSource, dataSpec);
-    byte[] bytes = null;
-    try {
-      bytes = Util.toByteArray(inputStream);
-    } catch (IOException e) {
-      // Ignore
-    } finally {
-      inputStream.close();
-    }
-    assertWithMessage(messageToPrepend).that(bytes).isEqualTo(expected);
-  }
-
-  /** Asserts that there is no cache content for the given {@code uriStrings}. */
-  public static void assertDataNotCached(Cache cache, String... uriStrings) {
-    for (String uriString : uriStrings) {
-      assertWithMessage("There is cached data for '" + uriString + "'")
-          .that(cache.getCachedSpans(CacheUtil.generateKey(Uri.parse(uriString))))
-          .isEmpty();
-    }
-  }
-
-  /** Asserts that the cache is empty. */
-  public static void assertCacheEmpty(Cache cache) {
-    assertThat(cache.getCacheSpace()).isEqualTo(0);
-  }
-
-  private CacheAsserts() {}
-
-}
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
index 55d05eb7d4..c198caeeb1 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
@@ -15,12 +15,13 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
-import static com.google.android.exoplayer2.upstream.cache.CacheAsserts.assertCacheEmpty;
+import static com.google.android.exoplayer2.testutil.CacheAsserts.assertCacheEmpty;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import android.net.Uri;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.testutil.CacheAsserts;
 import com.google.android.exoplayer2.testutil.FakeDataSet.FakeData;
 import com.google.android.exoplayer2.testutil.FakeDataSource;
 import com.google.android.exoplayer2.testutil.TestUtil;
@@ -566,8 +567,7 @@ public final class CacheDataSourceTest {
     cacheDataSource.close();
 
     byte[] expected = Arrays.copyOfRange(TEST_DATA, position, position + testDataLength);
-    CacheAsserts.assertReadData(
-        cacheDataSource, dataSpec, expected, "Cached data doesn't match the original data");
+    CacheAsserts.assertReadData(cacheDataSource, dataSpec, expected);
   }
 
   private CacheDataSource createCacheDataSource(boolean setReadException,
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
index 36fb78894f..dba71ab9db 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
@@ -18,8 +18,8 @@ package com.google.android.exoplayer2.upstream.cache;
 import static android.net.Uri.EMPTY;
 import static android.net.Uri.parse;
 import static com.google.android.exoplayer2.C.LENGTH_UNSET;
-import static com.google.android.exoplayer2.upstream.cache.CacheAsserts.assertCacheEmpty;
-import static com.google.android.exoplayer2.upstream.cache.CacheAsserts.assertCachedData;
+import static com.google.android.exoplayer2.testutil.CacheAsserts.assertCacheEmpty;
+import static com.google.android.exoplayer2.testutil.CacheAsserts.assertCachedData;
 import static com.google.android.exoplayer2.upstream.cache.CacheUtil.generateKey;
 import static com.google.android.exoplayer2.upstream.cache.CacheUtil.getKey;
 import static com.google.common.truth.Truth.assertThat;
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/CacheAsserts.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/CacheAsserts.java
index 6d3b15ac7a..9d6fbe37e7 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/CacheAsserts.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/CacheAsserts.java
@@ -21,11 +21,12 @@ import static com.google.common.truth.Truth.assertWithMessage;
 import android.net.Uri;
 import com.google.android.exoplayer2.testutil.FakeDataSet.FakeData;
 import com.google.android.exoplayer2.upstream.DataSource;
+import com.google.android.exoplayer2.upstream.DataSourceInputStream;
 import com.google.android.exoplayer2.upstream.DataSpec;
 import com.google.android.exoplayer2.upstream.DummyDataSource;
 import com.google.android.exoplayer2.upstream.cache.Cache;
 import com.google.android.exoplayer2.upstream.cache.CacheDataSource;
-import com.google.android.exoplayer2.upstream.cache.CacheUtil;
+import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
 import java.util.ArrayList;
 
@@ -76,18 +77,6 @@ public final class CacheAsserts {
     assertThat(cache.getCacheSpace()).isEqualTo(totalLength);
   }
 
-  /**
-   * Asserts that the cache contains the given subset of data in the {@code fakeDataSet}.
-   *
-   * @throws IOException If an error occurred reading from the Cache.
-   */
-  public static void assertDataCached(Cache cache, FakeDataSet fakeDataSet, Uri... uris)
-      throws IOException {
-    for (Uri uri : uris) {
-      assertDataCached(cache, uri, fakeDataSet.getData(uri).getData());
-    }
-  }
-
   /**
    * Asserts that the cache contains the given data for {@code uriString}.
    *
@@ -117,13 +106,24 @@ public final class CacheAsserts {
     }
   }
 
-  /** Asserts that there is no cache content for the given {@code uriStrings}. */
-  public static void assertDataNotCached(Cache cache, String... uriStrings) {
-    for (String uriString : uriStrings) {
-      assertWithMessage("There is cached data for '" + uriString + "',")
-          .that(cache.getCachedSpans(CacheUtil.generateKey(Uri.parse(uriString))).isEmpty())
-          .isTrue();
+  /**
+   * Asserts that the read data from {@code dataSource} specified by {@code dataSpec} is equal to
+   * {@code expected} or not.
+   *
+   * @throws IOException If an error occurred reading from the Cache.
+   */
+  public static void assertReadData(DataSource dataSource, DataSpec dataSpec, byte[] expected)
+      throws IOException {
+    DataSourceInputStream inputStream = new DataSourceInputStream(dataSource, dataSpec);
+    byte[] bytes = null;
+    try {
+      bytes = Util.toByteArray(inputStream);
+    } catch (IOException e) {
+      // Ignore
+    } finally {
+      inputStream.close();
     }
+    assertThat(bytes).isEqualTo(expected);
   }
 
   /** Asserts that the cache is empty. */

From 681919269042e93efaed9a74c118799127e05ab5 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 27 Nov 2018 11:11:22 +0000
Subject: [PATCH 245/832] Clean up CacheDataSourceTest

PiperOrigin-RevId: 222965111
---
 .../upstream/cache/CacheDataSourceTest.java   | 372 ++++++++----------
 1 file changed, 165 insertions(+), 207 deletions(-)

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
index c198caeeb1..d76b2d5afb 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
@@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import android.net.Uri;
+import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.CacheAsserts;
 import com.google.android.exoplayer2.testutil.FakeDataSet.FakeData;
@@ -47,21 +48,29 @@ public final class CacheDataSourceTest {
 
   private static final byte[] TEST_DATA = new byte[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
   private static final int MAX_CACHE_FILE_SIZE = 3;
-  private static final String CACHE_KEY_PREFIX = "myCacheKeyFactoryPrefix";
+  private static final String DATASPEC_KEY = "dataSpecKey";
 
   private Uri testDataUri;
-  private String fixedCacheKey;
-  private String expectedCacheKey;
+  private DataSpec unboundedDataSpec;
+  private DataSpec boundedDataSpec;
+  private DataSpec unboundedDataSpecWithKey;
+  private DataSpec boundedDataSpecWithKey;
+  private String defaultCacheKey;
+  private String customCacheKey;
+  private CacheKeyFactory cacheKeyFactory;
   private File tempFolder;
   private SimpleCache cache;
-  private CacheKeyFactory cacheKeyFactory;
 
   @Before
   public void setUp() throws Exception {
-    testDataUri = Uri.parse("test_data");
-    fixedCacheKey = CacheUtil.generateKey(testDataUri);
-    expectedCacheKey = fixedCacheKey;
-    cacheKeyFactory = dataSpec -> CACHE_KEY_PREFIX + "." + CacheUtil.generateKey(dataSpec.uri);
+    testDataUri = Uri.parse("https://www.test.com/data");
+    unboundedDataSpec = buildDataSpec(/* unbounded= */ true, /* key= */ null);
+    boundedDataSpec = buildDataSpec(/* unbounded= */ false, /* key= */ null);
+    unboundedDataSpecWithKey = buildDataSpec(/* unbounded= */ true, DATASPEC_KEY);
+    boundedDataSpecWithKey = buildDataSpec(/* unbounded= */ false, DATASPEC_KEY);
+    defaultCacheKey = CacheUtil.DEFAULT_CACHE_KEY_FACTORY.buildCacheKey(unboundedDataSpec);
+    customCacheKey = "customKey." + defaultCacheKey;
+    cacheKeyFactory = dataSpec -> customCacheKey;
     tempFolder = Util.createTempDirectory(RuntimeEnvironment.application, "ExoPlayerTest");
     cache = new SimpleCache(tempFolder, new NoOpCacheEvictor());
   }
@@ -74,7 +83,7 @@ public final class CacheDataSourceTest {
   @Test
   public void testMaxCacheFileSize() throws Exception {
     CacheDataSource cacheDataSource = createCacheDataSource(false, false);
-    assertReadDataContentLength(cacheDataSource, false, false);
+    assertReadDataContentLength(cacheDataSource, boundedDataSpec, false, false);
     for (String key : cache.getKeys()) {
       for (CacheSpan cacheSpan : cache.getCachedSpans(key)) {
         assertThat(cacheSpan.length <= MAX_CACHE_FILE_SIZE).isTrue();
@@ -85,231 +94,180 @@ public final class CacheDataSourceTest {
 
   @Test
   public void testCacheAndReadUnboundedRequest() throws Exception {
-    assertCacheAndRead(/* unboundedRequest= */ true, /* simulateUnknownLength= */ false);
+    assertCacheAndRead(unboundedDataSpec, /* unknownLength= */ false);
   }
 
   @Test
   public void testCacheAndReadUnknownLength() throws Exception {
-    assertCacheAndRead(/* unboundedRequest= */ false, /* simulateUnknownLength= */ true);
+    assertCacheAndRead(boundedDataSpec, /* unknownLength= */ true);
   }
 
   @Test
   public void testCacheAndReadUnboundedRequestUnknownLength() throws Exception {
-    assertCacheAndRead(/* unboundedRequest= */ true, /* simulateUnknownLength= */ true);
+    assertCacheAndRead(unboundedDataSpec, /* unknownLength= */ true);
   }
 
   @Test
   public void testCacheAndRead() throws Exception {
-    assertCacheAndRead(/* unboundedRequest= */ false, /* simulateUnknownLength= */ false);
+    assertCacheAndRead(boundedDataSpec, /* unknownLength= */ false);
   }
 
   @Test
   public void testUnsatisfiableRange() throws Exception {
     // Bounded request but the content length is unknown. This forces all data to be cached but not
-    // the length
-    assertCacheAndRead(/* unboundedRequest= */ false, /* simulateUnknownLength= */ true);
+    // the length.
+    assertCacheAndRead(boundedDataSpec, /* unknownLength= */ true);
 
     // Now do an unbounded request. This will read all of the data from cache and then try to read
     // more from upstream which will cause to a 416 so CDS will store the length.
     CacheDataSource cacheDataSource =
-        createCacheDataSource(/* setReadException= */ true, /* simulateUnknownLength= */ true);
+        createCacheDataSource(/* setReadException= */ true, /* unknownLength= */ true);
     assertReadDataContentLength(
-        cacheDataSource, /* unboundedRequest= */ true, /* unknownLength= */ true);
+        cacheDataSource, unboundedDataSpec, /* unknownLength= */ true, /* customCacheKey= */ false);
 
-    // If the user try to access off range then it should throw an IOException
+    // If the user try to access off range then it should throw an IOException.
     try {
       cacheDataSource =
-          createCacheDataSource(/* setReadException= */ false, /* simulateUnknownLength= */ false);
-      cacheDataSource.open(new DataSpec(testDataUri, TEST_DATA.length, 5, fixedCacheKey));
+          createCacheDataSource(/* setReadException= */ false, /* unknownLength= */ false);
+      cacheDataSource.open(buildDataSpec(TEST_DATA.length, /* length= */ 1, defaultCacheKey));
       fail();
     } catch (IOException e) {
-      // success
+      // Expected.
     }
   }
 
   @Test
   public void testCacheAndReadUnboundedRequestWithCacheKeyFactoryWithNullDataSpecCacheKey()
       throws Exception {
-    fixedCacheKey = null;
-    expectedCacheKey =
-        cacheKeyFactory.buildCacheKey(
-            new DataSpec(testDataUri, TEST_DATA.length, 5, /* key= */ null));
-
-    assertCacheAndRead(
-        /* unboundedRequest= */ true, /* simulateUnknownLength= */ false, cacheKeyFactory);
+    assertCacheAndRead(unboundedDataSpec, /* unknownLength= */ false, cacheKeyFactory);
   }
 
   @Test
   public void testCacheAndReadUnknownLengthWithCacheKeyFactoryOverridingWithNullDataSpecCacheKey()
       throws Exception {
-    fixedCacheKey = null;
-    expectedCacheKey =
-        cacheKeyFactory.buildCacheKey(
-            new DataSpec(testDataUri, TEST_DATA.length, 5, /* key= */ null));
-
-    assertCacheAndRead(
-        /* unboundedRequest= */ false, /* simulateUnknownLength= */ true, cacheKeyFactory);
+    assertCacheAndRead(boundedDataSpec, /* unknownLength= */ true, cacheKeyFactory);
   }
 
   @Test
   public void
       testCacheAndReadUnboundedRequestUnknownLengthWithCacheKeyFactoryWithNullDataSpecCacheKey()
           throws Exception {
-    fixedCacheKey = null;
-    expectedCacheKey =
-        cacheKeyFactory.buildCacheKey(
-            new DataSpec(testDataUri, TEST_DATA.length, 5, /* key= */ null));
-
-    assertCacheAndRead(
-        /* unboundedRequest= */ true, /* simulateUnknownLength= */ true, cacheKeyFactory);
+    assertCacheAndRead(unboundedDataSpec, /* unknownLength= */ true, cacheKeyFactory);
   }
 
   @Test
   public void testCacheAndReadWithCacheKeyFactoryWithNullDataSpecCacheKey() throws Exception {
-    fixedCacheKey = null;
-    expectedCacheKey =
-        cacheKeyFactory.buildCacheKey(
-            new DataSpec(testDataUri, TEST_DATA.length, 5, /* key= */ null));
-
-    assertCacheAndRead(
-        /* unboundedRequest= */ false, /* simulateUnknownLength= */ false, cacheKeyFactory);
+    assertCacheAndRead(boundedDataSpec, /* unknownLength= */ false, cacheKeyFactory);
   }
 
   @Test
   public void testUnsatisfiableRangeWithCacheKeyFactoryNullDataSpecCacheKey() throws Exception {
-    fixedCacheKey = null;
-    expectedCacheKey =
-        cacheKeyFactory.buildCacheKey(
-            new DataSpec(testDataUri, TEST_DATA.length, 5, /* key= */ null));
-
     // Bounded request but the content length is unknown. This forces all data to be cached but not
-    // the length
-    assertCacheAndRead(
-        /* unboundedRequest= */ false, /* simulateUnknownLength= */ true, cacheKeyFactory);
+    // the length.
+    assertCacheAndRead(boundedDataSpec, /* unknownLength= */ true, cacheKeyFactory);
 
     // Now do an unbounded request. This will read all of the data from cache and then try to read
     // more from upstream which will cause to a 416 so CDS will store the length.
     CacheDataSource cacheDataSource =
         createCacheDataSource(
-            /* setReadException= */ true, /* simulateUnknownLength= */ true, cacheKeyFactory);
+            /* setReadException= */ true, /* unknownLength= */ true, cacheKeyFactory);
     assertReadDataContentLength(
-        cacheDataSource, /* unboundedRequest= */ true, /* unknownLength= */ true);
+        cacheDataSource, unboundedDataSpec, /* unknownLength= */ true, /* customCacheKey= */ true);
 
-    // If the user try to access off range then it should throw an IOException
+    // If the user try to access off range then it should throw an IOException.
     try {
       cacheDataSource =
           createCacheDataSource(
-              /* setReadException= */ false, /* simulateUnknownLength= */ false, cacheKeyFactory);
-      cacheDataSource.open(new DataSpec(testDataUri, TEST_DATA.length, 5, fixedCacheKey));
+              /* setReadException= */ false, /* unknownLength= */ false, cacheKeyFactory);
+      cacheDataSource.open(buildDataSpec(TEST_DATA.length, /* length= */ 1, customCacheKey));
       fail();
     } catch (IOException e) {
-      // success
+      // Expected.
     }
   }
 
   @Test
   public void testCacheAndReadUnboundedRequestWithCacheKeyFactoryOverridingDataSpecCacheKey()
       throws Exception {
-    fixedCacheKey = CacheUtil.generateKey(testDataUri);
-    expectedCacheKey =
-        cacheKeyFactory.buildCacheKey(
-            new DataSpec(testDataUri, TEST_DATA.length, 5, fixedCacheKey));
-
-    assertCacheAndRead(true, false, cacheKeyFactory);
+    assertCacheAndRead(unboundedDataSpecWithKey, false, cacheKeyFactory);
   }
 
   @Test
   public void testCacheAndReadUnknownLengthWithCacheKeyFactoryOverridingDataSpecCacheKey()
       throws Exception {
-    fixedCacheKey = CacheUtil.generateKey(testDataUri);
-    expectedCacheKey =
-        cacheKeyFactory.buildCacheKey(
-            new DataSpec(testDataUri, TEST_DATA.length, 5, fixedCacheKey));
-
-    assertCacheAndRead(false, true, cacheKeyFactory);
+    assertCacheAndRead(boundedDataSpecWithKey, true, cacheKeyFactory);
   }
 
   @Test
   public void
       testCacheAndReadUnboundedRequestUnknownLengthWithCacheKeyFactoryOverridingDataSpecCacheKey()
           throws Exception {
-    fixedCacheKey = CacheUtil.generateKey(testDataUri);
-    expectedCacheKey =
-        cacheKeyFactory.buildCacheKey(
-            new DataSpec(testDataUri, TEST_DATA.length, 5, fixedCacheKey));
-
-    assertCacheAndRead(
-        /* unboundedRequest= */ true, /* simulateUnknownLength= */ true, cacheKeyFactory);
+    assertCacheAndRead(unboundedDataSpecWithKey, /* unknownLength= */ true, cacheKeyFactory);
   }
 
   @Test
   public void testCacheAndReadWithCacheKeyFactoryOverridingDataSpecCacheKey() throws Exception {
-    fixedCacheKey = CacheUtil.generateKey(testDataUri);
-    expectedCacheKey =
-        cacheKeyFactory.buildCacheKey(
-            new DataSpec(testDataUri, TEST_DATA.length, 5, fixedCacheKey));
-
-    assertCacheAndRead(
-        /* unboundedRequest= */ false, /* simulateUnknownLength= */ false, cacheKeyFactory);
+    assertCacheAndRead(boundedDataSpecWithKey, /* unknownLength= */ false, cacheKeyFactory);
   }
 
   @Test
   public void testUnsatisfiableRangeWithCacheKeyFactoryOverridingDataSpecCacheKey()
       throws Exception {
-    fixedCacheKey = CacheUtil.generateKey(testDataUri);
-    expectedCacheKey =
-        cacheKeyFactory.buildCacheKey(
-            new DataSpec(testDataUri, TEST_DATA.length, 5, fixedCacheKey));
-
     // Bounded request but the content length is unknown. This forces all data to be cached but not
-    // the length
-    assertCacheAndRead(
-        /* unboundedRequest= */ false, /* simulateUnknownLength= */ true, cacheKeyFactory);
+    // the length.
+    assertCacheAndRead(boundedDataSpecWithKey, /* unknownLength= */ true, cacheKeyFactory);
 
     // Now do an unbounded request. This will read all of the data from cache and then try to read
     // more from upstream which will cause to a 416 so CDS will store the length.
     CacheDataSource cacheDataSource =
         createCacheDataSource(
-            /* setReadException= */ true, /* simulateUnknownLength= */ true, cacheKeyFactory);
+            /* setReadException= */ true, /* unknownLength= */ true, cacheKeyFactory);
     assertReadDataContentLength(
-        cacheDataSource, /* unboundedRequest= */ true, /* unknownLength= */ true);
+        cacheDataSource,
+        unboundedDataSpecWithKey,
+        /* unknownLength= */ true,
+        /* customCacheKey= */ true);
 
-    // If the user try to access off range then it should throw an IOException
+    // If the user try to access off range then it should throw an IOException.
     try {
       cacheDataSource =
           createCacheDataSource(
-              /* setReadException= */ false, /* simulateUnknownLength= */ false, cacheKeyFactory);
-      cacheDataSource.open(new DataSpec(testDataUri, TEST_DATA.length, 5, fixedCacheKey));
+              /* setReadException= */ false, /* unknownLength= */ false, cacheKeyFactory);
+      cacheDataSource.open(buildDataSpec(TEST_DATA.length, /* length= */ 1, customCacheKey));
       fail();
     } catch (IOException e) {
-      // success
+      // Expected.
     }
   }
 
   @Test
   public void testContentLengthEdgeCases() throws Exception {
-    // Read partial at EOS but don't cross it so length is unknown
+    DataSpec dataSpec = buildDataSpec(TEST_DATA.length - 2, 2);
+
+    // Read partial at EOS but don't cross it so length is unknown.
     CacheDataSource cacheDataSource = createCacheDataSource(false, true);
-    assertReadData(cacheDataSource, true, TEST_DATA.length - 2, 2);
-    assertThat(cache.getContentLength(expectedCacheKey)).isEqualTo(C.LENGTH_UNSET);
+    assertReadData(cacheDataSource, dataSpec, true);
+    assertThat(cache.getContentLength(defaultCacheKey)).isEqualTo(C.LENGTH_UNSET);
 
     // Now do an unbounded request for whole data. This will cause a bounded request from upstream.
     // End of data from upstream shouldn't be mixed up with EOS and cause length set wrong.
     cacheDataSource = createCacheDataSource(false, true);
-    assertReadDataContentLength(cacheDataSource, true, true);
+    assertReadDataContentLength(cacheDataSource, unboundedDataSpec, true, false);
 
-    // Now the length set correctly do an unbounded request with offset
+    // Now the length set correctly do an unbounded request with offset.
     assertThat(
             cacheDataSource.open(
-                new DataSpec(testDataUri, TEST_DATA.length - 2, C.LENGTH_UNSET, expectedCacheKey)))
+                buildDataSpec(TEST_DATA.length - 2, C.LENGTH_UNSET, defaultCacheKey)))
         .isEqualTo(2);
 
-    // An unbounded request with offset for not cached content
-    assertThat(
-            cacheDataSource.open(
-                new DataSpec(
-                    Uri.parse("notCachedUri"), TEST_DATA.length - 2, C.LENGTH_UNSET, null)))
-        .isEqualTo(C.LENGTH_UNSET);
+    // An unbounded request with offset for not cached content.
+    dataSpec =
+        new DataSpec(
+            Uri.parse("https://www.test.com/other"),
+            TEST_DATA.length - 2,
+            C.LENGTH_UNSET,
+            /* key= */ null);
+    assertThat(cacheDataSource.open(dataSpec)).isEqualTo(C.LENGTH_UNSET);
   }
 
   @Test
@@ -322,13 +280,12 @@ public final class CacheDataSourceTest {
         .setSimulateUnknownLength(true);
     CacheDataSource cacheDataSource = new CacheDataSource(cache, upstream, 0);
 
-    int flags = DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH;
-    cacheDataSource.open(new DataSpec(testDataUri, 0, C.LENGTH_UNSET, expectedCacheKey, flags));
+    cacheDataSource.open(unboundedDataSpec);
     TestUtil.readToEnd(cacheDataSource);
     cacheDataSource.close();
 
     assertThat(upstream.getAndClearOpenedDataSpecs()).hasLength(1);
-    assertThat(cache.getContentLength(expectedCacheKey)).isEqualTo(TEST_DATA.length);
+    assertThat(cache.getContentLength(defaultCacheKey)).isEqualTo(TEST_DATA.length);
   }
 
   @Test
@@ -339,7 +296,7 @@ public final class CacheDataSourceTest {
         new CacheDataSource(
             cache, upstream, CacheDataSource.FLAG_IGNORE_CACHE_FOR_UNSET_LENGTH_REQUESTS);
 
-    cacheDataSource.open(new DataSpec(testDataUri, 0, C.LENGTH_UNSET, expectedCacheKey));
+    cacheDataSource.open(unboundedDataSpec);
     TestUtil.readToEnd(cacheDataSource);
     cacheDataSource.close();
 
@@ -349,7 +306,7 @@ public final class CacheDataSourceTest {
   @Test
   public void testReadOnlyCache() throws Exception {
     CacheDataSource cacheDataSource = createCacheDataSource(false, false, 0, null);
-    assertReadDataContentLength(cacheDataSource, false, false);
+    assertReadDataContentLength(cacheDataSource, boundedDataSpec, false, false);
     assertCacheEmpty(cache);
   }
 
@@ -368,13 +325,11 @@ public final class CacheDataSourceTest {
         new CacheDataSource(cache, upstream, new FileDataSource(), null, 0, null);
 
     // Open source and read some data from upstream as the data hasn't cached yet.
-    DataSpec dataSpec = new DataSpec(testDataUri, 0, C.LENGTH_UNSET, fixedCacheKey);
-    cacheDataSource.open(dataSpec);
+    cacheDataSource.open(unboundedDataSpec);
     byte[] buffer = new byte[1024];
     cacheDataSource.read(buffer, 0, buffer.length);
 
-    // Cache the data.
-    // Although we use another FakeDataSource instance, it shouldn't matter.
+    // Cache the data. Although we use another FakeDataSource instance, it shouldn't matter.
     FakeDataSource upstream2 =
         new FakeDataSource(
             new FakeDataSource()
@@ -382,7 +337,8 @@ public final class CacheDataSourceTest {
                 .newDefaultData()
                 .appendReadData(1024 * 1024)
                 .endData());
-    CacheUtil.cache(dataSpec, cache, upstream2, /* counters= */ null, /* isCanceled= */ null);
+    CacheUtil.cache(
+        unboundedDataSpec, cache, upstream2, /* counters= */ null, /* isCanceled= */ null);
 
     // Read the rest of the data.
     TestUtil.readToEnd(cacheDataSource);
@@ -401,7 +357,7 @@ public final class CacheDataSourceTest {
         .appendReadData(1);
 
     // Lock the content on the cache.
-    SimpleCacheSpan cacheSpan = cache.startReadWriteNonBlocking(expectedCacheKey, 0);
+    SimpleCacheSpan cacheSpan = cache.startReadWriteNonBlocking(defaultCacheKey, 0);
     assertThat(cacheSpan).isNotNull();
     assertThat(cacheSpan.isHoleSpan()).isTrue();
 
@@ -409,8 +365,7 @@ public final class CacheDataSourceTest {
     CacheDataSource cacheDataSource = new CacheDataSource(cache, upstream, 0);
 
     // Open source and read some data from upstream without writing to cache as the data is locked.
-    DataSpec dataSpec = new DataSpec(testDataUri, 0, C.LENGTH_UNSET, fixedCacheKey);
-    cacheDataSource.open(dataSpec);
+    cacheDataSource.open(unboundedDataSpec);
     byte[] buffer = new byte[1024];
     cacheDataSource.read(buffer, 0, buffer.length);
 
@@ -418,8 +373,7 @@ public final class CacheDataSourceTest {
     cache.releaseHoleSpan(cacheSpan);
     assertCacheEmpty(cache);
 
-    // Cache the data.
-    // Although we use another FakeDataSource instance, it shouldn't matter.
+    // Cache the data. Although we use another FakeDataSource instance, it shouldn't matter.
     FakeDataSource upstream2 =
         new FakeDataSource(
             new FakeDataSource()
@@ -427,7 +381,8 @@ public final class CacheDataSourceTest {
                 .newDefaultData()
                 .appendReadData(1024 * 1024)
                 .endData());
-    CacheUtil.cache(dataSpec, cache, upstream2, /* counters= */ null, /* isCanceled= */ null);
+    CacheUtil.cache(
+        unboundedDataSpec, cache, upstream2, /* counters= */ null, /* isCanceled= */ null);
 
     // Read the rest of the data.
     TestUtil.readToEnd(cacheDataSource);
@@ -439,10 +394,12 @@ public final class CacheDataSourceTest {
       throws Exception {
     // Create a fake data source with a 1 KB default data.
     FakeDataSource upstream = new FakeDataSource();
-    upstream.getDataSet().newDefaultData().appendReadData(1024).endData();
+    int dataLength = 1024;
+    upstream.getDataSet().newDefaultData().appendReadData(dataLength).endData();
 
     // Cache the latter half of the data.
-    DataSpec dataSpec = new DataSpec(testDataUri, 512, C.LENGTH_UNSET, fixedCacheKey);
+    int halfDataLength = 512;
+    DataSpec dataSpec = buildDataSpec(halfDataLength, C.LENGTH_UNSET);
     CacheUtil.cache(dataSpec, cache, upstream, /* counters= */ null, /* isCanceled= */ null);
 
     // Create cache read-only CacheDataSource.
@@ -450,12 +407,11 @@ public final class CacheDataSourceTest {
         new CacheDataSource(cache, upstream, new FileDataSource(), null, 0, null);
 
     // Open source and read some data from upstream as the data hasn't cached yet.
-    dataSpec = new DataSpec(testDataUri, 0, C.LENGTH_UNSET, fixedCacheKey);
-    cacheDataSource.open(dataSpec);
+    cacheDataSource.open(unboundedDataSpec);
     TestUtil.readExactly(cacheDataSource, 100);
 
     // Delete cached data.
-    CacheUtil.remove(cache, expectedCacheKey);
+    CacheUtil.remove(cache, defaultCacheKey);
     assertCacheEmpty(cache);
 
     // Read the rest of the data.
@@ -473,21 +429,20 @@ public final class CacheDataSourceTest {
 
     // Cache the latter half of the data.
     int halfDataLength = 512;
-    DataSpec dataSpec = new DataSpec(testDataUri, halfDataLength, C.LENGTH_UNSET, fixedCacheKey);
+    DataSpec dataSpec = buildDataSpec(/* position= */ 0, halfDataLength);
     CacheUtil.cache(dataSpec, cache, upstream, /* counters= */ null, /* isCanceled= */ null);
 
     // Create blocking CacheDataSource.
     CacheDataSource cacheDataSource =
         new CacheDataSource(cache, upstream, CacheDataSource.FLAG_BLOCK_ON_CACHE);
 
-    dataSpec = new DataSpec(testDataUri, 0, C.LENGTH_UNSET, fixedCacheKey);
-    cacheDataSource.open(dataSpec);
+    cacheDataSource.open(unboundedDataSpec);
 
     // Read the first half from upstream as it hasn't cached yet.
     TestUtil.readExactly(cacheDataSource, halfDataLength);
 
     // Delete the cached latter half.
-    NavigableSet<CacheSpan> cachedSpans = cache.getCachedSpans(expectedCacheKey);
+    NavigableSet<CacheSpan> cachedSpans = cache.getCachedSpans(defaultCacheKey);
     for (CacheSpan cachedSpan : cachedSpans) {
       if (cachedSpan.position >= halfDataLength) {
         try {
@@ -503,115 +458,106 @@ public final class CacheDataSourceTest {
     cacheDataSource.close();
   }
 
-  private void assertCacheAndRead(boolean unboundedRequest, boolean simulateUnknownLength)
-      throws IOException {
-    // Read all data from upstream and write to cache
-    CacheDataSource cacheDataSource = createCacheDataSource(false, simulateUnknownLength);
-    assertReadDataContentLength(cacheDataSource, unboundedRequest, simulateUnknownLength);
-
-    // Just read from cache
-    cacheDataSource = createCacheDataSource(true, simulateUnknownLength);
-    assertReadDataContentLength(
-        cacheDataSource,
-        unboundedRequest,
-        // Length is already cached.
-        /* unknownLength= */ false);
+  private void assertCacheAndRead(DataSpec dataSpec, boolean unknownLength) throws IOException {
+    assertCacheAndRead(dataSpec, unknownLength, /* cacheKeyFactory= */ null);
   }
 
   private void assertCacheAndRead(
-      boolean unboundedRequest, boolean simulateUnknownLength, CacheKeyFactory cacheKeyFactory)
+      DataSpec dataSpec, boolean unknownLength, @Nullable CacheKeyFactory cacheKeyFactory)
       throws IOException {
-    // Read all data from upstream and write to cache
+    // Read all data from upstream and write to cache.
     CacheDataSource cacheDataSource =
-        createCacheDataSource(
-            /* setReadException= */ false, simulateUnknownLength, cacheKeyFactory);
-    assertReadDataContentLength(cacheDataSource, unboundedRequest, simulateUnknownLength);
+        createCacheDataSource(/* setReadException= */ false, unknownLength, cacheKeyFactory);
+    assertReadDataContentLength(cacheDataSource, dataSpec, unknownLength, cacheKeyFactory != null);
 
-    // Just read from cache
+    // Just read from cache.
     cacheDataSource =
-        createCacheDataSource(/* setReadException= */ true, simulateUnknownLength, cacheKeyFactory);
+        createCacheDataSource(/* setReadException= */ true, unknownLength, cacheKeyFactory);
     assertReadDataContentLength(
         cacheDataSource,
-        unboundedRequest,
-        // Length is already cached.
-        /* unknownLength= */ false);
+        dataSpec,
+        /* unknownLength= */ false,
+        /* customCacheKey= */ cacheKeyFactory != null);
   }
 
   /**
    * Reads data until EOI and compares it to {@link #TEST_DATA}. Also checks content length returned
    * from open() call and the cached content length.
    */
-  private void assertReadDataContentLength(CacheDataSource cacheDataSource,
-      boolean unboundedRequest, boolean unknownLength) throws IOException {
-    int length = unboundedRequest ? C.LENGTH_UNSET : TEST_DATA.length;
-    assertReadData(cacheDataSource, unknownLength, 0, length);
-    // If !unboundedRequest, CacheDataSource doesn't reach EOS so shouldn't cache content length
-    assertThat(cache.getContentLength(expectedCacheKey))
-        .isEqualTo(!unboundedRequest ? C.LENGTH_UNSET : TEST_DATA.length);
+  private void assertReadDataContentLength(
+      CacheDataSource cacheDataSource,
+      DataSpec dataSpec,
+      boolean unknownLength,
+      boolean customCacheKey)
+      throws IOException {
+    assertReadData(cacheDataSource, dataSpec, unknownLength);
+    // If the request was unbounded then the content length should be cached, either because the
+    // content length was known or because EOS was read. If the request was bounded then the content
+    // length will not have been determined.
+    assertThat(cache.getContentLength(customCacheKey ? this.customCacheKey : defaultCacheKey))
+        .isEqualTo(dataSpec.length == C.LENGTH_UNSET ? TEST_DATA.length : C.LENGTH_UNSET);
   }
 
-  private void assertReadData(CacheDataSource cacheDataSource, boolean unknownLength, int position,
-      int length) throws IOException {
-    int testDataLength = TEST_DATA.length - position;
-    if (length != C.LENGTH_UNSET) {
-      testDataLength = Math.min(testDataLength, length);
+  private void assertReadData(
+      CacheDataSource cacheDataSource, DataSpec dataSpec, boolean unknownLength)
+      throws IOException {
+    int position = (int) dataSpec.absoluteStreamPosition;
+    int requestLength = (int) dataSpec.length;
+    int readLength = TEST_DATA.length - position;
+    if (requestLength != C.LENGTH_UNSET) {
+      readLength = Math.min(readLength, requestLength);
     }
-    DataSpec dataSpec =
-        new DataSpec(
-            testDataUri,
-            position,
-            length,
-            fixedCacheKey,
-            DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH);
-    assertThat(cacheDataSource.open(dataSpec)).isEqualTo(unknownLength ? length : testDataLength);
+    assertThat(cacheDataSource.open(dataSpec))
+        .isEqualTo(unknownLength ? requestLength : readLength);
     cacheDataSource.close();
 
-    byte[] expected = Arrays.copyOfRange(TEST_DATA, position, position + testDataLength);
+    byte[] expected = Arrays.copyOfRange(TEST_DATA, position, position + readLength);
     CacheAsserts.assertReadData(cacheDataSource, dataSpec, expected);
   }
 
-  private CacheDataSource createCacheDataSource(boolean setReadException,
-      boolean simulateUnknownLength) {
-    return createCacheDataSource(setReadException, simulateUnknownLength,
-        CacheDataSource.FLAG_BLOCK_ON_CACHE);
+  private CacheDataSource createCacheDataSource(boolean setReadException, boolean unknownLength) {
+    return createCacheDataSource(
+        setReadException, unknownLength, CacheDataSource.FLAG_BLOCK_ON_CACHE);
   }
 
   private CacheDataSource createCacheDataSource(
-      boolean setReadException, boolean simulateUnknownLength, CacheKeyFactory cacheKeyFactory) {
+      boolean setReadException, boolean unknownLength, CacheKeyFactory cacheKeyFactory) {
     return createCacheDataSource(
         setReadException,
-        simulateUnknownLength,
+        unknownLength,
         CacheDataSource.FLAG_BLOCK_ON_CACHE,
         new CacheDataSink(cache, MAX_CACHE_FILE_SIZE),
         cacheKeyFactory);
   }
 
-  private CacheDataSource createCacheDataSource(boolean setReadException,
-      boolean simulateUnknownLength, @CacheDataSource.Flags int flags) {
-    return createCacheDataSource(setReadException, simulateUnknownLength, flags,
-        new CacheDataSink(cache, MAX_CACHE_FILE_SIZE));
-  }
-
-  private CacheDataSource createCacheDataSource(boolean setReadException,
-      boolean simulateUnknownLength, @CacheDataSource.Flags int flags,
-      CacheDataSink cacheWriteDataSink) {
+  private CacheDataSource createCacheDataSource(
+      boolean setReadException, boolean unknownLength, @CacheDataSource.Flags int flags) {
     return createCacheDataSource(
-        setReadException,
-        simulateUnknownLength,
-        flags,
-        cacheWriteDataSink,
-        /* cacheKeyFactory= */ null);
+        setReadException, unknownLength, flags, new CacheDataSink(cache, MAX_CACHE_FILE_SIZE));
   }
 
   private CacheDataSource createCacheDataSource(
       boolean setReadException,
-      boolean simulateUnknownLength,
+      boolean unknownLength,
+      @CacheDataSource.Flags int flags,
+      CacheDataSink cacheWriteDataSink) {
+    return createCacheDataSource(
+        setReadException, unknownLength, flags, cacheWriteDataSink, /* cacheKeyFactory= */ null);
+  }
+
+  private CacheDataSource createCacheDataSource(
+      boolean setReadException,
+      boolean unknownLength,
       @CacheDataSource.Flags int flags,
       CacheDataSink cacheWriteDataSink,
       CacheKeyFactory cacheKeyFactory) {
     FakeDataSource upstream = new FakeDataSource();
-    FakeData fakeData = upstream.getDataSet().newDefaultData()
-        .setSimulateUnknownLength(simulateUnknownLength).appendReadData(TEST_DATA);
+    FakeData fakeData =
+        upstream
+            .getDataSet()
+            .newDefaultData()
+            .setSimulateUnknownLength(unknownLength)
+            .appendReadData(TEST_DATA);
     if (setReadException) {
       fakeData.appendReadError(new IOException("Shouldn't read from upstream"));
     }
@@ -625,4 +571,16 @@ public final class CacheDataSourceTest {
         cacheKeyFactory);
   }
 
+  private DataSpec buildDataSpec(boolean unbounded, @Nullable String key) {
+    return buildDataSpec(/* position= */ 0, unbounded ? C.LENGTH_UNSET : TEST_DATA.length, key);
+  }
+
+  private DataSpec buildDataSpec(long position, long length) {
+    return buildDataSpec(position, length, /* key= */ null);
+  }
+
+  private DataSpec buildDataSpec(long position, long length, @Nullable String key) {
+    return new DataSpec(
+        testDataUri, position, length, key, DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH);
+  }
 }

From 1ce33362c94a693b766d42f0dddc8bae2b8a5340 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 27 Nov 2018 13:14:22 +0000
Subject: [PATCH 246/832] Strip private ID3 data from HLS sample formats

Issue: #5063
PiperOrigin-RevId: 222975020
---
 RELEASENOTES.md                               |  7 ++-
 .../exoplayer2/source/SampleQueue.java        |  6 +--
 .../exoplayer2/source/hls/HlsMediaChunk.java  |  2 +-
 .../source/hls/HlsSampleStreamWrapper.java    | 54 ++++++++++++++++++-
 4 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 2a90cba3d5..af974df8aa 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,8 +2,11 @@
 
 ### dev-v2 (not yet released) ###
 
-* HLS: Fix issue causing unnecessary media playlist requests when playing live
-  streams ([#5059](https://github.com/google/ExoPlayer/issues/5059)).
+* HLS:
+  * Fix issue causing unnecessary media playlist requests when playing live
+    streams ([#5059](https://github.com/google/ExoPlayer/issues/5059)).
+  * Fix decoder re-instantiation issue for packed audio streams
+    ([#5063](https://github.com/google/ExoPlayer/issues/5063)).
 * MP4: Support Opus and FLAC in the MP4 container, and in DASH
   ([#4883](https://github.com/google/ExoPlayer/issues/4883)).
 * DASH: Fix detecting the end of live events
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
index d6f18665f4..ecc720c656 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
@@ -30,10 +30,8 @@ import java.io.EOFException;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
-/**
- * A queue of media samples.
- */
-public final class SampleQueue implements TrackOutput {
+/** A queue of media samples. */
+public class SampleQueue implements TrackOutput {
 
   /**
    * A listener for changes to the upstream format.
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
index cfb7d1c675..2995f8b0aa 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
@@ -42,7 +42,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  */
 /* package */ final class HlsMediaChunk extends MediaChunk {
 
-  private static final String PRIV_TIMESTAMP_FRAME_OWNER =
+  public static final String PRIV_TIMESTAMP_FRAME_OWNER =
       "com.apple.streaming.transportStreamTimestamp";
 
   private static final AtomicInteger uidSource = new AtomicInteger();
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
index e60dacb8f4..39598c4cd8 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2.source.hls;
 
 import android.os.Handler;
+import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.FormatHolder;
@@ -24,6 +25,8 @@ import com.google.android.exoplayer2.extractor.DummyTrackOutput;
 import com.google.android.exoplayer2.extractor.ExtractorOutput;
 import com.google.android.exoplayer2.extractor.SeekMap;
 import com.google.android.exoplayer2.extractor.TrackOutput;
+import com.google.android.exoplayer2.metadata.Metadata;
+import com.google.android.exoplayer2.metadata.id3.PrivFrame;
 import com.google.android.exoplayer2.source.MediaSourceEventListener.EventDispatcher;
 import com.google.android.exoplayer2.source.SampleQueue;
 import com.google.android.exoplayer2.source.SampleQueue.UpstreamFormatChangedListener;
@@ -791,7 +794,7 @@ import java.util.List;
         return createDummyTrackOutput(id, type);
       }
     }
-    SampleQueue trackOutput = new SampleQueue(allocator);
+    SampleQueue trackOutput = new PrivTimestampStrippingSampleQueue(allocator);
     trackOutput.setSampleOffsetUs(sampleOffsetUs);
     trackOutput.sourceId(chunkUid);
     trackOutput.setUpstreamFormatChangeListener(this);
@@ -1126,4 +1129,53 @@ import java.util.List;
     Log.w(TAG, "Unmapped track with id " + id + " of type " + type);
     return new DummyTrackOutput();
   }
+
+  private static final class PrivTimestampStrippingSampleQueue extends SampleQueue {
+
+    public PrivTimestampStrippingSampleQueue(Allocator allocator) {
+      super(allocator);
+    }
+
+    @Override
+    public void format(Format format) {
+      super.format(format.copyWithMetadata(getAdjustedMetadata(format.metadata)));
+    }
+
+    /**
+     * Strips the private timestamp frame from metadata, if present. See:
+     * https://github.com/google/ExoPlayer/issues/5063
+     */
+    @Nullable
+    private Metadata getAdjustedMetadata(@Nullable Metadata metadata) {
+      if (metadata == null) {
+        return null;
+      }
+      int length = metadata.length();
+      int transportStreamTimestampMetadataIndex = C.INDEX_UNSET;
+      for (int i = 0; i < length; i++) {
+        Metadata.Entry metadataEntry = metadata.get(i);
+        if (metadataEntry instanceof PrivFrame) {
+          PrivFrame privFrame = (PrivFrame) metadataEntry;
+          if (HlsMediaChunk.PRIV_TIMESTAMP_FRAME_OWNER.equals(privFrame.owner)) {
+            transportStreamTimestampMetadataIndex = i;
+            break;
+          }
+        }
+      }
+      if (transportStreamTimestampMetadataIndex == C.INDEX_UNSET) {
+        return metadata;
+      }
+      if (length == 1) {
+        return null;
+      }
+      Metadata.Entry[] newMetadataEntries = new Metadata.Entry[length - 1];
+      for (int i = 0; i < length; i++) {
+        if (i != transportStreamTimestampMetadataIndex) {
+          int newIndex = i < transportStreamTimestampMetadataIndex ? i : i - 1;
+          newMetadataEntries[newIndex] = metadata.get(i);
+        }
+      }
+      return new Metadata(newMetadataEntries);
+    }
+  }
 }

From 19a6f904e549c09ce15af8e6d469a80a1fc23826 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 27 Nov 2018 13:56:46 +0000
Subject: [PATCH 247/832] Reformat cast DemoUtil

PiperOrigin-RevId: 222978255
---
 .../com/google/android/exoplayer2/castdemo/DemoUtil.java    | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
index 5291e78c45..369cb8ab90 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
@@ -21,9 +21,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-/**
- * Utility methods and constants for the Cast demo application.
- */
+/** Utility methods and constants for the Cast demo application. */
 /* package */ final class DemoUtil {
 
   public static final String MIME_TYPE_DASH = MimeTypes.APPLICATION_MPD;
@@ -71,9 +69,7 @@ import java.util.List;
             .setMedia("https://html5demos.com/assets/dizzy.mp4")
             .buildAndClear());
     SAMPLES = Collections.unmodifiableList(samples);
-
   }
 
   private DemoUtil() {}
-
 }

From 05a79a417a8ef5e1f38092531494cfc0d074f9c9 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 27 Nov 2018 13:58:44 +0000
Subject: [PATCH 248/832] Fall back to TYPE_ROTATION_VECTOR if
 TYPE_GAME_ROTATION_VECTOR unavailable

Issue: #5119
PiperOrigin-RevId: 222978448
---
 RELEASENOTES.md                                |  3 +++
 .../ui/spherical/SphericalSurfaceView.java     | 18 ++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index af974df8aa..7e2c57b037 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -11,6 +11,9 @@
   ([#4883](https://github.com/google/ExoPlayer/issues/4883)).
 * DASH: Fix detecting the end of live events
   ([#4780](https://github.com/google/ExoPlayer/issues/4780)).
+* Spherical video: Fall back to `TYPE_ROTATION_VECTOR` if
+  `TYPE_GAME_ROTATION_VECTOR` is unavailable
+  ([#5119](https://github.com/google/ExoPlayer/issues/5119)).
 * Support seeking for a wider range of MPEG-TS streams
   ([#5097](https://github.com/google/ExoPlayer/issues/5097)).
 * Support for playing spherical videos on Daydream.
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java
index 8665852de7..36589c5e34 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java
@@ -102,12 +102,18 @@ public final class SphericalSurfaceView extends GLSurfaceView {
     // Configure sensors and touch.
     sensorManager =
         (SensorManager) Assertions.checkNotNull(context.getSystemService(Context.SENSOR_SERVICE));
-    // TYPE_GAME_ROTATION_VECTOR is the easiest sensor since it handles all the complex math for
-    // fusion. It's used instead of TYPE_ROTATION_VECTOR since the latter uses the magnetometer on
-    // devices. When used indoors, the magnetometer can take some time to settle depending on the
-    // device and amount of metal in the environment.
-    int type = Util.SDK_INT >= 18 ? Sensor.TYPE_GAME_ROTATION_VECTOR : Sensor.TYPE_ROTATION_VECTOR;
-    orientationSensor = sensorManager.getDefaultSensor(type);
+    Sensor orientationSensor = null;
+    if (Util.SDK_INT >= 18) {
+      // TYPE_GAME_ROTATION_VECTOR is the easiest sensor since it handles all the complex math for
+      // fusion. It's used instead of TYPE_ROTATION_VECTOR since the latter uses the magnetometer on
+      // devices. When used indoors, the magnetometer can take some time to settle depending on the
+      // device and amount of metal in the environment.
+      orientationSensor = sensorManager.getDefaultSensor(Sensor.TYPE_GAME_ROTATION_VECTOR);
+    }
+    if (orientationSensor == null) {
+      orientationSensor = sensorManager.getDefaultSensor(Sensor.TYPE_ROTATION_VECTOR);
+    }
+    this.orientationSensor = orientationSensor;
 
     scene = new SceneRenderer();
     renderer = new Renderer(scene);

From 510749fa15de05898b371e17e6fcef6b5975190a Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Wed, 28 Nov 2018 08:26:41 +0000
Subject: [PATCH 249/832] Handle metadata failing to decode in MetadataRenderer

Issue: #5149
PiperOrigin-RevId: 223121651
---
 RELEASENOTES.md                                          | 2 ++
 .../android/exoplayer2/metadata/MetadataRenderer.java    | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 7e2c57b037..6c902a221f 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -26,6 +26,8 @@
 * Do not retry failed loads whose error is `FileNotFoundException`.
 * Fix issue with applying the `show_buffering` attribute in `PlayerView`
   ([#5139](https://github.com/google/ExoPlayer/issues/5139)).
+* Fix issue where null `Metadata` was output when it failed to decode
+  ([#5149](https://github.com/google/ExoPlayer/issues/5149)).
 
 ### 2.9.1 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataRenderer.java
index 152eb97e0c..864616e810 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataRenderer.java
@@ -129,9 +129,12 @@ public final class MetadataRenderer extends BaseRenderer implements Callback {
           buffer.subsampleOffsetUs = formatHolder.format.subsampleOffsetUs;
           buffer.flip();
           int index = (pendingMetadataIndex + pendingMetadataCount) % MAX_PENDING_METADATA_COUNT;
-          pendingMetadata[index] = decoder.decode(buffer);
-          pendingMetadataTimestamps[index] = buffer.timeUs;
-          pendingMetadataCount++;
+          Metadata metadata = decoder.decode(buffer);
+          if (metadata != null) {
+            pendingMetadata[index] = metadata;
+            pendingMetadataTimestamps[index] = buffer.timeUs;
+            pendingMetadataCount++;
+          }
         }
       }
     }

From f45943b4fbda8c102174a44161d3259bd509c49a Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 28 Nov 2018 11:41:33 +0000
Subject: [PATCH 250/832] Bump for 2.9.2

PiperOrigin-RevId: 223141203
---
 RELEASENOTES.md                                   | 15 +++++++++------
 constants.gradle                                  |  4 ++--
 .../android/exoplayer2/ExoPlayerLibraryInfo.java  |  6 +++---
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 6c902a221f..7221b8b98e 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,6 +2,15 @@
 
 ### dev-v2 (not yet released) ###
 
+* Support for playing spherical videos on Daydream.
+* Improve decoder re-use between playbacks. TODO: Write and link a blog post
+  here ([#2826](https://github.com/google/ExoPlayer/issues/2826)).
+* Add options for controlling audio track selections to `DefaultTrackSelector`
+  ([#3314](https://github.com/google/ExoPlayer/issues/3314)).
+* Do not retry failed loads whose error is `FileNotFoundException`.
+
+### 2.9.2 ###
+
 * HLS:
   * Fix issue causing unnecessary media playlist requests when playing live
     streams ([#5059](https://github.com/google/ExoPlayer/issues/5059)).
@@ -16,14 +25,8 @@
   ([#5119](https://github.com/google/ExoPlayer/issues/5119)).
 * Support seeking for a wider range of MPEG-TS streams
   ([#5097](https://github.com/google/ExoPlayer/issues/5097)).
-* Support for playing spherical videos on Daydream.
-* Improve decoder re-use between playbacks. TODO: Write and link a blog post
-  here ([#2826](https://github.com/google/ExoPlayer/issues/2826)).
-* Add options for controlling audio track selections to `DefaultTrackSelector`
-  ([#3314](https://github.com/google/ExoPlayer/issues/3314)).
 * Include channel count in audio capabilities check
   ([#4690](https://github.com/google/ExoPlayer/issues/4690)).
-* Do not retry failed loads whose error is `FileNotFoundException`.
 * Fix issue with applying the `show_buffering` attribute in `PlayerView`
   ([#5139](https://github.com/google/ExoPlayer/issues/5139)).
 * Fix issue where null `Metadata` was output when it failed to decode
diff --git a/constants.gradle b/constants.gradle
index dd277c722c..cac4f6d78b 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -13,8 +13,8 @@
 // limitations under the License.
 project.ext {
     // ExoPlayer version and version code.
-    releaseVersion = '2.9.1'
-    releaseVersionCode = 2009001
+    releaseVersion = '2.9.2'
+    releaseVersionCode = 2009002
     // Important: ExoPlayer specifies a minSdkVersion of 14 because various
     // components provided by the library may be of use on older devices.
     // However, please note that the core media playback functionality provided
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
index c4dda9e957..c30fe160c9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
@@ -29,11 +29,11 @@ public final class ExoPlayerLibraryInfo {
 
   /** The version of the library expressed as a string, for example "1.2.3". */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION_INT) or vice versa.
-  public static final String VERSION = "2.9.1";
+  public static final String VERSION = "2.9.2";
 
   /** The version of the library expressed as {@code "ExoPlayerLib/" + VERSION}. */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
-  public static final String VERSION_SLASHY = "ExoPlayerLib/2.9.1";
+  public static final String VERSION_SLASHY = "ExoPlayerLib/2.9.2";
 
   /**
    * The version of the library expressed as an integer, for example 1002003.
@@ -43,7 +43,7 @@ public final class ExoPlayerLibraryInfo {
    * integer version 123045006 (123-045-006).
    */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
-  public static final int VERSION_INT = 2009001;
+  public static final int VERSION_INT = 2009002;
 
   /**
    * Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions}

From 699fee9727b0ace91e46a20c3de7186a05976fb2 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Wed, 28 Nov 2018 18:31:53 +0000
Subject: [PATCH 251/832] Replace remaining stbl assertions with warnings

Issue: #5162
PiperOrigin-RevId: 223193019
---
 RELEASENOTES.md                               |  3 ++
 .../exoplayer2/extractor/mp4/AtomParsers.java | 43 ++++++++++++-------
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 7221b8b98e..d7c7082f3c 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -31,6 +31,9 @@
   ([#5139](https://github.com/google/ExoPlayer/issues/5139)).
 * Fix issue where null `Metadata` was output when it failed to decode
   ([#5149](https://github.com/google/ExoPlayer/issues/5149)).
+* Fix playback of some invalid but playable MP4 streams by replacing assertions
+  with logged warnings in sample table parsing code
+  ([#5162](https://github.com/google/ExoPlayer/issues/5162)).
 
 ### 2.9.1 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
index e3d56489a6..d085156f2b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
@@ -236,8 +236,6 @@ import java.util.List;
           sizes = Arrays.copyOf(sizes, sampleCount);
           timestamps = Arrays.copyOf(timestamps, sampleCount);
           flags = Arrays.copyOf(flags, sampleCount);
-          remainingSamplesAtTimestampOffset = 0;
-          remainingTimestampOffsetChanges = 0;
           break;
         }
 
@@ -293,23 +291,38 @@ import java.util.List;
       }
       duration = timestampTimeUnits + timestampOffset;
 
-      Assertions.checkArgument(remainingSamplesAtTimestampOffset == 0);
-      // Remove trailing ctts entries with 0-valued sample counts.
+      // If the stbl's child boxes are not consistent the container is malformed, but the stream may
+      // still be playable.
+      boolean isCttsValid = true;
       while (remainingTimestampOffsetChanges > 0) {
-        Assertions.checkArgument(ctts.readUnsignedIntToInt() == 0);
+        if (ctts.readUnsignedIntToInt() != 0) {
+          isCttsValid = false;
+          break;
+        }
         ctts.readInt(); // Ignore offset.
         remainingTimestampOffsetChanges--;
       }
-
-      // If the stbl's child boxes are not consistent the container is malformed, but the stream may
-      // still be playable.
-      if (remainingSynchronizationSamples != 0 || remainingSamplesAtTimestampDelta != 0
-          || remainingSamplesInChunk != 0 || remainingTimestampDeltaChanges != 0) {
-        Log.w(TAG, "Inconsistent stbl box for track " + track.id
-            + ": remainingSynchronizationSamples " + remainingSynchronizationSamples
-            + ", remainingSamplesAtTimestampDelta " + remainingSamplesAtTimestampDelta
-            + ", remainingSamplesInChunk " + remainingSamplesInChunk
-            + ", remainingTimestampDeltaChanges " + remainingTimestampDeltaChanges);
+      if (remainingSynchronizationSamples != 0
+          || remainingSamplesAtTimestampDelta != 0
+          || remainingSamplesInChunk != 0
+          || remainingTimestampDeltaChanges != 0
+          || remainingSamplesAtTimestampOffset != 0
+          || !isCttsValid) {
+        Log.w(
+            TAG,
+            "Inconsistent stbl box for track "
+                + track.id
+                + ": remainingSynchronizationSamples "
+                + remainingSynchronizationSamples
+                + ", remainingSamplesAtTimestampDelta "
+                + remainingSamplesAtTimestampDelta
+                + ", remainingSamplesInChunk "
+                + remainingSamplesInChunk
+                + ", remainingTimestampDeltaChanges "
+                + remainingTimestampDeltaChanges
+                + ", remainingSamplesAtTimestampOffset "
+                + remainingSamplesAtTimestampOffset
+                + (!isCttsValid ? ", ctts invalid" : ""));
       }
     } else {
       long[] chunkOffsetsBytes = new long[chunkIterator.length];

From 59cf8c1edfbd625f7138cd5563c273d9c40a9a8c Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 28 Nov 2018 19:39:04 +0000
Subject: [PATCH 252/832] Add missing dot at the end of RELEASENOTES item

PiperOrigin-RevId: 223206504
---
 RELEASENOTES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index d7c7082f3c..bae43931c8 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -55,7 +55,7 @@
 * DASH: Parse ProgramInformation element if present in the manifest.
 * HLS:
   * Add constructor to `DefaultHlsExtractorFactory` for adding TS payload
-    reader factory flags
+    reader factory flags.
   * Fix bug in segment sniffing
     ([#5039](https://github.com/google/ExoPlayer/issues/5039)).
   ([#4861](https://github.com/google/ExoPlayer/issues/4861)).

From 1093aaf1853672ed5161fa21640dcb29f13c18bc Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 29 Nov 2018 10:30:39 +0000
Subject: [PATCH 253/832] Specify a version for the FFmpeg dependency

Issue: #5154
PiperOrigin-RevId: 223314749
---
 extensions/ffmpeg/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/ffmpeg/README.md b/extensions/ffmpeg/README.md
index d5a37db013..52dacf8166 100644
--- a/extensions/ffmpeg/README.md
+++ b/extensions/ffmpeg/README.md
@@ -46,7 +46,7 @@ HOST_PLATFORM="linux-x86_64"
   be supported. See the [Supported formats][] page for more details of the
   available flags.
 
-For example, to fetch and build for armeabi-v7a,
+For example, to fetch and build FFmpeg release 4.0 for armeabi-v7a,
   arm64-v8a and x86 on Linux x86_64:
 
 ```
@@ -71,7 +71,7 @@ COMMON_OPTIONS="\
     " && \
 cd "${FFMPEG_EXT_PATH}/jni" && \
 (git -C ffmpeg pull || git clone git://source.ffmpeg.org/ffmpeg ffmpeg) && \
-cd ffmpeg && \
+cd ffmpeg && git checkout release/4.0 && \
 ./configure \
     --libdir=android-libs/armeabi-v7a \
     --arch=arm \

From 282cf303a4ad321fa97e73faa8a133c130c8dd95 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 29 Nov 2018 12:15:51 +0000
Subject: [PATCH 254/832] Fix clearkey DRM UUID passed to MediaCrypto

PiperOrigin-RevId: 223324279
---
 RELEASENOTES.md                                    |  1 +
 .../android/exoplayer2/drm/FrameworkMediaDrm.java  | 14 ++++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index bae43931c8..55db12d56e 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -8,6 +8,7 @@
 * Add options for controlling audio track selections to `DefaultTrackSelector`
   ([#3314](https://github.com/google/ExoPlayer/issues/3314)).
 * Do not retry failed loads whose error is `FileNotFoundException`.
+* Fix UUID passed to `MediaCrypto` when using `C.CLEARKEY_UUID` before API 27.
 
 ### 2.9.2 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
index 1f862546ae..fda85a759c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
@@ -70,9 +70,7 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
     Assertions.checkNotNull(uuid);
     Assertions.checkArgument(!C.COMMON_PSSH_UUID.equals(uuid), "Use C.CLEARKEY_UUID instead");
     this.uuid = uuid;
-    // ClearKey had to be accessed using the Common PSSH UUID prior to API level 27.
-    this.mediaDrm =
-        new MediaDrm(Util.SDK_INT < 27 && C.CLEARKEY_UUID.equals(uuid) ? C.COMMON_PSSH_UUID : uuid);
+    this.mediaDrm = new MediaDrm(adjustUuid(uuid));
     if (C.WIDEVINE_UUID.equals(uuid) && needsForceWidevineL3Workaround()) {
       forceWidevineL3(mediaDrm);
     }
@@ -152,7 +150,6 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
   @Override
   public byte[] provideKeyResponse(byte[] scope, byte[] response)
       throws NotProvisionedException, DeniedByServerException {
-
     if (C.CLEARKEY_UUID.equals(uuid)) {
       response = ClearKeyUtil.adjustResponseData(response);
     }
@@ -212,8 +209,8 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
     // indicate that it required secure video decoders [Internal ref: b/11428937].
     boolean forceAllowInsecureDecoderComponents = Util.SDK_INT < 21
         && C.WIDEVINE_UUID.equals(uuid) && "L3".equals(getPropertyString("securityLevel"));
-    return new FrameworkMediaCrypto(new MediaCrypto(uuid, initData),
-        forceAllowInsecureDecoderComponents);
+    return new FrameworkMediaCrypto(
+        new MediaCrypto(adjustUuid(uuid), initData), forceAllowInsecureDecoderComponents);
   }
 
   private static SchemeData getSchemeData(UUID uuid, List<SchemeData> schemeDatas) {
@@ -271,6 +268,11 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
     return schemeDatas.get(0);
   }
 
+  private static UUID adjustUuid(UUID uuid) {
+    // ClearKey had to be accessed using the Common PSSH UUID prior to API level 27.
+    return Util.SDK_INT < 27 && C.CLEARKEY_UUID.equals(uuid) ? C.COMMON_PSSH_UUID : uuid;
+  }
+
   private static byte[] adjustRequestInitData(UUID uuid, byte[] initData) {
     // Prior to L the Widevine CDM required data to be extracted from the PSSH atom. Some Amazon
     // devices also required data to be extracted from the PSSH atom for PlayReady.

From ea483f8c8e2778bcaa7f0254b9390886640cb09b Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 30 Nov 2018 08:40:17 +0000
Subject: [PATCH 255/832] Fix some potential Uri nullness violations.

PiperOrigin-RevId: 223476569
---
 .../google/android/exoplayer2/upstream/DefaultDataSource.java | 3 ++-
 .../main/java/com/google/android/exoplayer2/util/Util.java    | 3 ++-
 .../exoplayer2/source/smoothstreaming/manifest/SsUtil.java    | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java
index 6504562c58..808252fb15 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java
@@ -228,7 +228,8 @@ public final class DefaultDataSource implements DataSource {
     // Choose the correct source for the scheme.
     String scheme = dataSpec.uri.getScheme();
     if (Util.isLocalFileUri(dataSpec.uri)) {
-      if (dataSpec.uri.getPath().startsWith("/android_asset/")) {
+      String uriPath = dataSpec.uri.getPath();
+      if (uriPath != null && uriPath.startsWith("/android_asset/")) {
         dataSource = getAssetDataSource();
       } else {
         dataSource = getFileDataSource();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
index 8b1760b54a..9c2f426de5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
@@ -204,7 +204,8 @@ public final class Util {
     }
     for (Uri uri : uris) {
       if ("http".equals(uri.getScheme())
-          && !NetworkSecurityPolicy.getInstance().isCleartextTrafficPermitted(uri.getHost())) {
+          && !NetworkSecurityPolicy.getInstance()
+              .isCleartextTrafficPermitted(Assertions.checkNotNull(uri.getHost()))) {
         // The security policy prevents cleartext traffic.
         return false;
       }
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsUtil.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsUtil.java
index 4adf6acff7..b54b2abc74 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsUtil.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsUtil.java
@@ -23,7 +23,9 @@ public final class SsUtil {
 
   /** Returns a fixed SmoothStreaming client manifest {@link Uri}. */
   public static Uri fixManifestUri(Uri manifestUri) {
-    if (Util.toLowerInvariant(manifestUri.getLastPathSegment()).matches("manifest(\\(.+\\))?")) {
+    String lastPathSegment = manifestUri.getLastPathSegment();
+    if (lastPathSegment != null
+        && Util.toLowerInvariant(lastPathSegment).matches("manifest(\\(.+\\))?")) {
       return manifestUri;
     }
     return Uri.withAppendedPath(manifestUri, "Manifest");

From beae7c9df5199cd76a39115ab0d884e60883e462 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 30 Nov 2018 16:08:41 +0000
Subject: [PATCH 256/832] Don't resolve UtcTiming element for static manifests

It doesn't do anything useful in this case.

PiperOrigin-RevId: 223516909
---
 .../exoplayer2/source/dash/DashMediaPeriod.java        |  8 ++++----
 .../exoplayer2/source/dash/DashMediaSource.java        | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java
index 5c9a933508..d0a12b9688 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java
@@ -65,7 +65,7 @@ import java.util.List;
   private final DashChunkSource.Factory chunkSourceFactory;
   private final @Nullable TransferListener transferListener;
   private final LoadErrorHandlingPolicy loadErrorHandlingPolicy;
-  private final long elapsedRealtimeOffset;
+  private final long elapsedRealtimeOffsetMs;
   private final LoaderErrorThrower manifestLoaderErrorThrower;
   private final Allocator allocator;
   private final TrackGroupArray trackGroups;
@@ -93,7 +93,7 @@ import java.util.List;
       @Nullable TransferListener transferListener,
       LoadErrorHandlingPolicy loadErrorHandlingPolicy,
       EventDispatcher eventDispatcher,
-      long elapsedRealtimeOffset,
+      long elapsedRealtimeOffsetMs,
       LoaderErrorThrower manifestLoaderErrorThrower,
       Allocator allocator,
       CompositeSequenceableLoaderFactory compositeSequenceableLoaderFactory,
@@ -105,7 +105,7 @@ import java.util.List;
     this.transferListener = transferListener;
     this.loadErrorHandlingPolicy = loadErrorHandlingPolicy;
     this.eventDispatcher = eventDispatcher;
-    this.elapsedRealtimeOffset = elapsedRealtimeOffset;
+    this.elapsedRealtimeOffsetMs = elapsedRealtimeOffsetMs;
     this.manifestLoaderErrorThrower = manifestLoaderErrorThrower;
     this.allocator = allocator;
     this.compositeSequenceableLoaderFactory = compositeSequenceableLoaderFactory;
@@ -593,7 +593,7 @@ import java.util.List;
             trackGroupInfo.adaptationSetIndices,
             selection,
             trackGroupInfo.trackType,
-            elapsedRealtimeOffset,
+            elapsedRealtimeOffsetMs,
             enableEventMessageTrack,
             enableCea608Track,
             trackPlayerEmsgHandler,
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
index 8ee859b8bd..b04fcf7247 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
@@ -710,17 +710,17 @@ public final class DashMediaSource extends BaseMediaSource {
         loadable.bytesLoaded());
     DashManifest newManifest = loadable.getResult();
 
-    int periodCount = manifest == null ? 0 : manifest.getPeriodCount();
+    int oldPeriodCount = manifest == null ? 0 : manifest.getPeriodCount();
     int removedPeriodCount = 0;
     long newFirstPeriodStartTimeMs = newManifest.getPeriod(0).startMs;
-    while (removedPeriodCount < periodCount
+    while (removedPeriodCount < oldPeriodCount
         && manifest.getPeriod(removedPeriodCount).startMs < newFirstPeriodStartTimeMs) {
       removedPeriodCount++;
     }
 
     if (newManifest.dynamic) {
       boolean isManifestStale = false;
-      if (periodCount - removedPeriodCount > newManifest.getPeriodCount()) {
+      if (oldPeriodCount - removedPeriodCount > newManifest.getPeriodCount()) {
         // After discarding old periods, we should never have more periods than listed in the new
         // manifest. That would mean that a previously announced period is no longer advertised. If
         // this condition occurs, assume that we are hitting a manifest server that is out of sync
@@ -770,8 +770,8 @@ public final class DashMediaSource extends BaseMediaSource {
       }
     }
 
-    if (periodCount == 0) {
-      if (manifest.utcTiming != null) {
+    if (oldPeriodCount == 0) {
+      if (manifest.dynamic && manifest.utcTiming != null) {
         resolveUtcTimingElement(manifest.utcTiming);
       } else {
         processManifest(true);

From 88af944891efb1876d1ee3651dc018d20b8906d6 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 30 Nov 2018 16:20:49 +0000
Subject: [PATCH 257/832] Move CachedContentIndex and SimpleCacheSpan tests to
 robolectric

PiperOrigin-RevId: 223518390
---
 .../cache/CachedContentIndexTest.java         |  8 +++---
 .../upstream/cache/SimpleCacheSpanTest.java   | 27 +++++++------------
 2 files changed, 14 insertions(+), 21 deletions(-)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java (98%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java (87%)

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
similarity index 98%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
index 964f7266b5..6080f6eccd 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
@@ -20,8 +20,6 @@ import static com.google.common.truth.Truth.assertWithMessage;
 
 import android.net.Uri;
 import android.util.SparseArray;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Util;
 import java.io.File;
@@ -34,9 +32,11 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 
 /** Tests {@link CachedContentIndex}. */
-@RunWith(AndroidJUnit4.class)
+@RunWith(RobolectricTestRunner.class)
 public class CachedContentIndexTest {
 
   private final byte[] testIndexV1File = {
@@ -79,7 +79,7 @@ public class CachedContentIndexTest {
   @Before
   public void setUp() throws Exception {
     cacheDir =
-        Util.createTempDirectory(InstrumentationRegistry.getTargetContext(), "ExoPlayerTest");
+        Util.createTempDirectory(RuntimeEnvironment.application, "ExoPlayerTest");
     index = new CachedContentIndex(cacheDir);
   }
 
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java
similarity index 87%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java
index c422bf33fa..c5d740340f 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java
@@ -18,8 +18,6 @@ package com.google.android.exoplayer2.upstream.cache;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
 import com.google.android.exoplayer2.util.Util;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -31,14 +29,13 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 
 /** Unit tests for {@link SimpleCacheSpan}. */
-@RunWith(AndroidJUnit4.class)
+@RunWith(RobolectricTestRunner.class)
 public class SimpleCacheSpanTest {
 
-  private CachedContentIndex index;
-  private File cacheDir;
-
   public static File createCacheSpanFile(File cacheDir, int id, long offset, int length,
       long lastAccessTimestamp) throws IOException {
     File cacheFile = SimpleCacheSpan.getCacheFile(cacheDir, id, offset, lastAccessTimestamp);
@@ -46,17 +43,13 @@ public class SimpleCacheSpanTest {
     return cacheFile;
   }
 
-  public static CacheSpan createCacheSpan(CachedContentIndex index, File cacheDir, String key,
-      long offset, int length, long lastAccessTimestamp) throws IOException {
-    int id = index.assignIdForKey(key);
-    File cacheFile = createCacheSpanFile(cacheDir, id, offset, length, lastAccessTimestamp);
-    return SimpleCacheSpan.createCacheEntry(cacheFile, index);
-  }
+  private CachedContentIndex index;
+  private File cacheDir;
 
   @Before
   public void setUp() throws Exception {
     cacheDir =
-        Util.createTempDirectory(InstrumentationRegistry.getTargetContext(), "ExoPlayerTest");
+        Util.createTempDirectory(RuntimeEnvironment.application, "ExoPlayerTest");
     index = new CachedContentIndex(cacheDir);
   }
 
@@ -86,12 +79,12 @@ public class SimpleCacheSpanTest {
 
   @Test
   public void testUpgradeFileName() throws Exception {
-    String key = "asd\u00aa";
+    String key = "abc%def";
     int id = index.assignIdForKey(key);
     File v3file = createTestFile(id + ".0.1.v3.exo");
-    File v2file = createTestFile("asd%aa.1.2.v2.exo");
-    File wrongEscapedV2file = createTestFile("asd%za.3.4.v2.exo");
-    File v1File = createTestFile("asd\u00aa.5.6.v1.exo");
+    File v2file = createTestFile("abc%25def.1.2.v2.exo"); // %25 is '%' after escaping
+    File wrongEscapedV2file = createTestFile("abc%2Gdef.3.4.v2.exo"); // 2G is invalid hex
+    File v1File = createTestFile("abc%def.5.6.v1.exo"); // V1 did not escape
 
     for (File file : cacheDir.listFiles()) {
       SimpleCacheSpan cacheEntry = SimpleCacheSpan.createCacheEntry(file, index);

From 8ee1af2aeaed0ce8c0c94f103cf148239c52ec60 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 30 Nov 2018 16:34:59 +0000
Subject: [PATCH 258/832] Update release notes for 2.9.2

PiperOrigin-RevId: 223520119
---
 RELEASENOTES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 55db12d56e..614e8ba794 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -8,7 +8,6 @@
 * Add options for controlling audio track selections to `DefaultTrackSelector`
   ([#3314](https://github.com/google/ExoPlayer/issues/3314)).
 * Do not retry failed loads whose error is `FileNotFoundException`.
-* Fix UUID passed to `MediaCrypto` when using `C.CLEARKEY_UUID` before API 27.
 
 ### 2.9.2 ###
 
@@ -35,6 +34,7 @@
 * Fix playback of some invalid but playable MP4 streams by replacing assertions
   with logged warnings in sample table parsing code
   ([#5162](https://github.com/google/ExoPlayer/issues/5162)).
+* Fix UUID passed to `MediaCrypto` when using `C.CLEARKEY_UUID` before API 27.
 
 ### 2.9.1 ###
 

From 8ffef3d6322cef16255bb2448680bb9d7920904b Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 30 Nov 2018 17:29:56 +0000
Subject: [PATCH 259/832] Add clarification to TextOutput doc.

The list may be empty if no cues are available.

PiperOrigin-RevId: 223527105
---
 .../java/com/google/android/exoplayer2/text/TextOutput.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/TextOutput.java b/library/core/src/main/java/com/google/android/exoplayer2/text/TextOutput.java
index 5a08db94cb..aa3b4e5557 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/TextOutput.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/TextOutput.java
@@ -25,8 +25,7 @@ public interface TextOutput {
   /**
    * Called when there is a change in the {@link Cue}s.
    *
-   * @param cues The {@link Cue}s.
+   * @param cues The {@link Cue}s. May be empty.
    */
   void onCues(List<Cue> cues);
-
 }

From a1b8e17ed149b557fcfa261825f21d327cd433e3 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 30 Nov 2018 18:21:45 +0000
Subject: [PATCH 260/832] Remove Representation.contentId. It doesn't really
 make sense.

PiperOrigin-RevId: 223535353
---
 .../source/dash/manifest/Representation.java  | 43 +++++++++----------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Representation.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Representation.java
index 44daa1d016..c6f07ee6d4 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Representation.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Representation.java
@@ -35,19 +35,10 @@ public abstract class Representation {
   public static final long REVISION_ID_DEFAULT = -1;
 
   /**
-   * Identifies the piece of content to which this {@link Representation} belongs.
-   * <p>
-   * For example, all {@link Representation}s belonging to a video should have the same content
-   * identifier that uniquely identifies that video.
-   */
-  public final String contentId;
-  /**
-   * Identifies the revision of the content.
-   * <p>
-   * If the media for a given ({@link #contentId} can change over time without a change to the
-   * {@link #format}'s {@link Format#id} (e.g. as a result of re-encoding the media with an
-   * updated encoder), then this identifier must uniquely identify the revision of the media. The
-   * timestamp at which the media was encoded is often a suitable.
+   * Identifies the revision of the media contained within the representation. If the content can
+   * change over time (e.g. as a result of re-encoding the media with an updated encoder), then this
+   * identified can be set to uniquely identify the revision of the media. The timestamp at which
+   * the media was encoded is often a suitable.
    */
   public final long revisionId;
   /**
@@ -121,17 +112,20 @@ public abstract class Representation {
       return new SingleSegmentRepresentation(contentId, revisionId, format, baseUrl,
           (SingleSegmentBase) segmentBase, inbandEventStreams, customCacheKey, C.LENGTH_UNSET);
     } else if (segmentBase instanceof MultiSegmentBase) {
-      return new MultiSegmentRepresentation(contentId, revisionId, format, baseUrl,
-          (MultiSegmentBase) segmentBase, inbandEventStreams);
+      return new MultiSegmentRepresentation(
+          revisionId, format, baseUrl, (MultiSegmentBase) segmentBase, inbandEventStreams);
     } else {
       throw new IllegalArgumentException("segmentBase must be of type SingleSegmentBase or "
           + "MultiSegmentBase");
     }
   }
 
-  private Representation(String contentId, long revisionId, Format format, String baseUrl,
-      SegmentBase segmentBase, List<Descriptor> inbandEventStreams) {
-    this.contentId = contentId;
+  private Representation(
+      long revisionId,
+      Format format,
+      String baseUrl,
+      SegmentBase segmentBase,
+      List<Descriptor> inbandEventStreams) {
     this.revisionId = revisionId;
     this.format = format;
     this.baseUrl = baseUrl;
@@ -225,7 +219,7 @@ public abstract class Representation {
     public SingleSegmentRepresentation(String contentId, long revisionId, Format format,
         String baseUrl, SingleSegmentBase segmentBase, List<Descriptor> inbandEventStreams,
         String customCacheKey, long contentLength) {
-      super(contentId, revisionId, format, baseUrl, segmentBase, inbandEventStreams);
+      super(revisionId, format, baseUrl, segmentBase, inbandEventStreams);
       this.uri = Uri.parse(baseUrl);
       this.indexUri = segmentBase.getIndex();
       this.cacheKey = customCacheKey != null ? customCacheKey
@@ -263,16 +257,19 @@ public abstract class Representation {
     private final MultiSegmentBase segmentBase;
 
     /**
-     * @param contentId Identifies the piece of content to which this representation belongs.
      * @param revisionId Identifies the revision of the content.
      * @param format The format of the representation.
      * @param baseUrl The base URL of the representation.
      * @param segmentBase The segment base underlying the representation.
      * @param inbandEventStreams The in-band event streams in the representation. May be null.
      */
-    public MultiSegmentRepresentation(String contentId, long revisionId, Format format,
-        String baseUrl, MultiSegmentBase segmentBase, List<Descriptor> inbandEventStreams) {
-      super(contentId, revisionId, format, baseUrl, segmentBase, inbandEventStreams);
+    public MultiSegmentRepresentation(
+        long revisionId,
+        Format format,
+        String baseUrl,
+        MultiSegmentBase segmentBase,
+        List<Descriptor> inbandEventStreams) {
+      super(revisionId, format, baseUrl, segmentBase, inbandEventStreams);
       this.segmentBase = segmentBase;
     }
 

From d650f8e0e38ba55aca8eb5ec863b7a027fc0c735 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 30 Nov 2018 18:37:02 +0000
Subject: [PATCH 261/832] Remove ability to inject content-id via
 DashManifestParser

It doesn't make sense for multi-period manifest

PiperOrigin-RevId: 223537958
---
 .../dash/manifest/DashManifestParser.java     | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
index f017ae64ad..e52bb71d2a 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
@@ -66,21 +66,9 @@ public class DashManifestParser extends DefaultHandler
   private static final Pattern CEA_708_ACCESSIBILITY_PATTERN =
       Pattern.compile("([1-9]|[1-5][0-9]|6[0-3])=.*");
 
-  private final String contentId;
   private final XmlPullParserFactory xmlParserFactory;
 
-  /**
-   * Equivalent to calling {@code new DashManifestParser(null)}.
-   */
   public DashManifestParser() {
-    this(null);
-  }
-
-  /**
-   * @param contentId An optional content identifier to include in the parsed manifest.
-   */
-  public DashManifestParser(String contentId) {
-    this.contentId = contentId;
     try {
       xmlParserFactory = XmlPullParserFactory.newInstance();
     } catch (XmlPullParserException e) {
@@ -355,8 +343,9 @@ public class DashManifestParser extends DefaultHandler
     // Build the representations.
     List<Representation> representations = new ArrayList<>(representationInfos.size());
     for (int i = 0; i < representationInfos.size(); i++) {
-      representations.add(buildRepresentation(representationInfos.get(i), contentId,
-          drmSchemeType, drmSchemeDatas, inbandEventStreams));
+      representations.add(
+          buildRepresentation(
+              representationInfos.get(i), drmSchemeType, drmSchemeDatas, inbandEventStreams));
     }
 
     return buildAdaptationSet(id, contentType, representations, accessibilityDescriptors,
@@ -664,8 +653,10 @@ public class DashManifestParser extends DefaultHandler
         id, label, containerMimeType, sampleMimeType, codecs, bitrate, selectionFlags, language);
   }
 
-  protected Representation buildRepresentation(RepresentationInfo representationInfo,
-      String contentId, String extraDrmSchemeType, ArrayList<SchemeData> extraDrmSchemeDatas,
+  protected Representation buildRepresentation(
+      RepresentationInfo representationInfo,
+      String extraDrmSchemeType,
+      ArrayList<SchemeData> extraDrmSchemeDatas,
       ArrayList<Descriptor> extraInbandEventStreams) {
     Format format = representationInfo.format;
     String drmSchemeType = representationInfo.drmSchemeType != null
@@ -679,8 +670,13 @@ public class DashManifestParser extends DefaultHandler
     }
     ArrayList<Descriptor> inbandEventStreams = representationInfo.inbandEventStreams;
     inbandEventStreams.addAll(extraInbandEventStreams);
-    return Representation.newInstance(contentId, representationInfo.revisionId, format,
-        representationInfo.baseUrl, representationInfo.segmentBase, inbandEventStreams);
+    return Representation.newInstance(
+        /* contentId= */ null,
+        representationInfo.revisionId,
+        format,
+        representationInfo.baseUrl,
+        representationInfo.segmentBase,
+        inbandEventStreams);
   }
 
   // SegmentBase, SegmentList and SegmentTemplate parsing.

From d98ab35a61f746330e9b608d3d34e5410ce342ab Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 30 Nov 2018 22:57:29 +0000
Subject: [PATCH 262/832] Add several devices to setOutputSurface workaround: -
 Asus ZenFone GO (ASUS_X00AD_2) - Sugar S9 (i9031) - Redmi Note 3 (kate)

These devices trigger native crashes similar to
https://github.com/google/ExoPlayer/issues/4460

I'm not sure why Asus Zenfone Go (model: ZB500KL, device: ASUS_X00AD_2) was removed here
https://github.com/google/ExoPlayer/commit/73af056da39b6ebead767d3d4c6e3162cc4c344c

PiperOrigin-RevId: 223580393
---
 .../android/exoplayer2/video/MediaCodecVideoRenderer.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index 2851325c75..67586fe672 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -1338,6 +1338,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
           case "A7010a48":
           case "A7020a48":
           case "AquaPowerM":
+          case "ASUS_X00AD_2":
           case "Aura_Note_2":
           case "BLACK-1X":
           case "BRAVIA_ATV2":
@@ -1378,6 +1379,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
           case "HWBLN-H":
           case "HWCAM-H":
           case "HWVNS-H":
+          case "i9031":
           case "iball8735_9806":
           case "Infinix-X572":
           case "iris60":
@@ -1385,6 +1387,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
           case "j2xlteins":
           case "JGZ":
           case "K50a40":
+          case "kate":
           case "le_x6":
           case "LS-5017":
           case "M5c":

From ffbb0da8932b28a0bb21f49eb02cf39275044bdd Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 30 Nov 2018 23:01:07 +0000
Subject: [PATCH 263/832] Prevent Cea608Decoder from generating Subtitles with
 null Cues list.

PiperOrigin-RevId: 223580953
---
 RELEASENOTES.md                                              | 1 +
 .../google/android/exoplayer2/text/cea/Cea608Decoder.java    | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 614e8ba794..d7bd90055e 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -8,6 +8,7 @@
 * Add options for controlling audio track selections to `DefaultTrackSelector`
   ([#3314](https://github.com/google/ExoPlayer/issues/3314)).
 * Do not retry failed loads whose error is `FileNotFoundException`.
+* Prevent Cea608Decoder from generating Subtitles with null Cues list
 
 ### 2.9.2 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
index 8742a6344e..613393ed06 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
@@ -33,6 +33,7 @@ import com.google.android.exoplayer2.text.SubtitleInputBuffer;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -509,7 +510,7 @@ public final class Cea608Decoder extends CeaDecoder {
 
     switch (cc2) {
       case CTRL_ERASE_DISPLAYED_MEMORY:
-        cues = null;
+        cues = Collections.emptyList();
         if (captionMode == CC_MODE_ROLL_UP || captionMode == CC_MODE_PAINT_ON) {
           resetCueBuilders();
         }
@@ -564,7 +565,7 @@ public final class Cea608Decoder extends CeaDecoder {
     if (oldCaptionMode == CC_MODE_PAINT_ON || captionMode == CC_MODE_ROLL_UP
         || captionMode == CC_MODE_UNKNOWN) {
       // When switching from paint-on or to roll-up or unknown, we also need to clear the caption.
-      cues = null;
+      cues = Collections.emptyList();
     }
   }
 

From 8a359bb1fb6d63f80a98e497f2c778eee568a8d7 Mon Sep 17 00:00:00 2001
From: GiuseppePiscopo <GiuseppePiscopo@users.noreply.github.com>
Date: Mon, 3 Dec 2018 15:17:36 +0100
Subject: [PATCH 264/832] feat(MediaSource): client code can get the tag of a
 MediaSource

---
 .../exoplayer2/ext/ima/ImaAdsMediaSource.java        |  6 ++++++
 .../exoplayer2/source/ClippingMediaSource.java       |  6 ++++++
 .../exoplayer2/source/ConcatenatingMediaSource.java  | 12 ++++++++++++
 .../exoplayer2/source/ExtractorMediaSource.java      |  6 ++++++
 .../exoplayer2/source/LoopingMediaSource.java        |  6 ++++++
 .../android/exoplayer2/source/MediaSource.java       |  5 +++++
 .../exoplayer2/source/MergingMediaSource.java        |  6 ++++++
 .../exoplayer2/source/SingleSampleMediaSource.java   |  8 ++++++++
 .../exoplayer2/source/ads/AdsMediaSource.java        |  6 ++++++
 .../exoplayer2/source/dash/DashMediaSource.java      |  6 ++++++
 .../exoplayer2/source/hls/HlsMediaSource.java        |  6 ++++++
 .../source/smoothstreaming/SsMediaSource.java        |  6 ++++++
 .../android/exoplayer2/testutil/FakeMediaSource.java |  8 ++++++++
 13 files changed, 87 insertions(+)

diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java
index 400061d019..d9c13e07b9 100644
--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java
+++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java
@@ -100,6 +100,12 @@ public final class ImaAdsMediaSource extends BaseMediaSource implements SourceIn
     adsMediaSource.releasePeriod(mediaPeriod);
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return adsMediaSource.getTag();
+  }
+
   @Override
   public void releaseSourceInternal() {
     adsMediaSource.releaseSource(/* listener= */ this);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
index 3916d41b61..90047f9741 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
@@ -224,6 +224,12 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> {
     }
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return mediaSource.getTag();
+  }
+
   @Override
   public void releaseSourceInternal() {
     super.releaseSourceInternal();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
index 1f3b01182a..f6fd497f3d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
@@ -508,6 +508,12 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
     maybeReleaseChildSource(holder);
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return null;
+  }
+
   @Override
   public final void releaseSourceInternal() {
     super.releaseSourceInternal();
@@ -1069,6 +1075,12 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
       // Do nothing.
     }
 
+    @Override
+    @Nullable
+    public Object getTag() {
+      return null;
+    }
+
     @Override
     protected void releaseSourceInternal() {
       // Do nothing.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
index 66af3a7e62..c669aaa574 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
@@ -395,6 +395,12 @@ public final class ExtractorMediaSource extends BaseMediaSource
     ((ExtractorMediaPeriod) mediaPeriod).release();
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return tag;
+  }
+
   @Override
   public void releaseSourceInternal() {
     // Do nothing.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java
index 78a1e75d90..fd012277a7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java
@@ -95,6 +95,12 @@ public final class LoopingMediaSource extends CompositeMediaSource<Void> {
     }
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return childSource.getTag();
+  }
+
   @Override
   protected void onChildSourceInfoRefreshed(
       Void id, MediaSource mediaSource, Timeline timeline, @Nullable Object manifest) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
index d8335131f9..8a7f861893 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
@@ -275,6 +275,11 @@ public interface MediaSource {
    */
   void releasePeriod(MediaPeriod mediaPeriod);
 
+  /**
+   * Returns the tag set on media source, or null when none was set.
+   */
+  Object getTag();
+
   /**
    * Removes a listener for timeline and/or manifest updates and releases the source if no longer
    * required.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java
index ecb4b10c6a..bfe0800d35 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java
@@ -137,6 +137,12 @@ public final class MergingMediaSource extends CompositeMediaSource<Integer> {
     }
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return mediaSources.length > 0 ? mediaSources[0].getTag() : null;
+  }
+
   @Override
   public void releaseSourceInternal() {
     super.releaseSourceInternal();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
index 1ac6207454..57a0440b06 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
@@ -185,6 +185,7 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
   private final LoadErrorHandlingPolicy loadErrorHandlingPolicy;
   private final boolean treatLoadErrorsAsEndOfStream;
   private final Timeline timeline;
+  private final @Nullable Object tag;
 
   private @Nullable TransferListener transferListener;
 
@@ -287,6 +288,7 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
     this.durationUs = durationUs;
     this.loadErrorHandlingPolicy = loadErrorHandlingPolicy;
     this.treatLoadErrorsAsEndOfStream = treatLoadErrorsAsEndOfStream;
+    this.tag = tag;
     dataSpec =
         new DataSpec(uri, DataSpec.FLAG_ALLOW_GZIP | DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH);
     timeline =
@@ -327,6 +329,12 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
     ((SingleSampleMediaPeriod) mediaPeriod).release();
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return tag;
+  }
+
   @Override
   public void releaseSourceInternal() {
     // Do nothing.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
index 7fc0f22bf3..0944cc2ff2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
@@ -387,6 +387,12 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
     deferredMediaPeriod.releasePeriod();
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return contentMediaSource.getTag();
+  }
+
   @Override
   public void releaseSourceInternal() {
     super.releaseSourceInternal();
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
index b04fcf7247..9068f62d37 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
@@ -658,6 +658,12 @@ public final class DashMediaSource extends BaseMediaSource {
     periodsById.remove(dashMediaPeriod.id);
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return tag;
+  }
+
   @Override
   public void releaseSourceInternal() {
     manifestLoadPending = false;
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
index a075dacf3a..1af68dc2ec 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
@@ -425,6 +425,12 @@ public final class HlsMediaSource extends BaseMediaSource
     ((HlsMediaPeriod) mediaPeriod).release();
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return tag;
+  }
+
   @Override
   public void releaseSourceInternal() {
     playlistTracker.stop();
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
index a756b7f4f1..9b2001bb48 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
@@ -549,6 +549,12 @@ public final class SsMediaSource extends BaseMediaSource
     mediaPeriods.remove(period);
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return tag;
+  }
+
   @Override
   public void releaseSourceInternal() {
     manifest = sideloadedManifest ? manifest : null;
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
index 2fca4f42c7..f00274dbf8 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
@@ -133,6 +133,14 @@ public class FakeMediaSource extends BaseMediaSource {
     fakeMediaPeriod.release();
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    boolean hasTimeline = timeline != null && !timeline.isEmpty();
+
+    return hasTimeline ? timeline.getWindow(0, new Timeline.Window()).tag : null;
+  }
+
   @Override
   public void releaseSourceInternal() {
     assertThat(preparedSource).isTrue();

From b278b02816c9b188eb90fc97d00c05557848bb5b Mon Sep 17 00:00:00 2001
From: GiuseppePiscopo <GiuseppePiscopo@users.noreply.github.com>
Date: Mon, 3 Dec 2018 18:21:37 +0100
Subject: [PATCH 265/832] chore(MediaSource): move getTag after
 removeEventListener

---
 .../exoplayer2/ext/ima/ImaAdsMediaSource.java    | 12 ++++++------
 .../exoplayer2/source/ClippingMediaSource.java   | 12 ++++++------
 .../source/ConcatenatingMediaSource.java         | 12 ++++++------
 .../exoplayer2/source/ExtractorMediaSource.java  | 12 ++++++------
 .../exoplayer2/source/LoopingMediaSource.java    | 12 ++++++------
 .../android/exoplayer2/source/MediaSource.java   | 10 +++++-----
 .../exoplayer2/source/MergingMediaSource.java    | 12 ++++++------
 .../source/SingleSampleMediaSource.java          | 12 ++++++------
 .../exoplayer2/source/ads/AdsMediaSource.java    | 12 ++++++------
 .../exoplayer2/source/dash/DashMediaSource.java  | 12 ++++++------
 .../exoplayer2/source/hls/HlsMediaSource.java    | 12 ++++++------
 .../source/smoothstreaming/SsMediaSource.java    | 12 ++++++------
 .../exoplayer2/testutil/FakeMediaSource.java     | 16 ++++++++--------
 13 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java
index d9c13e07b9..85042c4354 100644
--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java
+++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java
@@ -76,6 +76,12 @@ public final class ImaAdsMediaSource extends BaseMediaSource implements SourceIn
         adUiViewGroup, eventHandler, eventListener);
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return adsMediaSource.getTag();
+  }
+
   @Override
   public void prepareSourceInternal(
       final ExoPlayer player,
@@ -100,12 +106,6 @@ public final class ImaAdsMediaSource extends BaseMediaSource implements SourceIn
     adsMediaSource.releasePeriod(mediaPeriod);
   }
 
-  @Override
-  @Nullable
-  public Object getTag() {
-    return adsMediaSource.getTag();
-  }
-
   @Override
   public void releaseSourceInternal() {
     adsMediaSource.releaseSource(/* listener= */ this);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
index 90047f9741..1dbb41dfb0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
@@ -186,6 +186,12 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> {
     window = new Timeline.Window();
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return mediaSource.getTag();
+  }
+
   @Override
   public void prepareSourceInternal(
       ExoPlayer player,
@@ -224,12 +230,6 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> {
     }
   }
 
-  @Override
-  @Nullable
-  public Object getTag() {
-    return mediaSource.getTag();
-  }
-
   @Override
   public void releaseSourceInternal() {
     super.releaseSourceInternal();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
index f6fd497f3d..26667e641f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
@@ -453,6 +453,12 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
     }
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return null;
+  }
+
   @Override
   public final synchronized void prepareSourceInternal(
       ExoPlayer player,
@@ -508,12 +514,6 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
     maybeReleaseChildSource(holder);
   }
 
-  @Override
-  @Nullable
-  public Object getTag() {
-    return null;
-  }
-
   @Override
   public final void releaseSourceInternal() {
     super.releaseSourceInternal();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
index c669aaa574..085b5dba71 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
@@ -358,6 +358,12 @@ public final class ExtractorMediaSource extends BaseMediaSource
     this.tag = tag;
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return tag;
+  }
+
   @Override
   public void prepareSourceInternal(
       ExoPlayer player,
@@ -395,12 +401,6 @@ public final class ExtractorMediaSource extends BaseMediaSource
     ((ExtractorMediaPeriod) mediaPeriod).release();
   }
 
-  @Override
-  @Nullable
-  public Object getTag() {
-    return tag;
-  }
-
   @Override
   public void releaseSourceInternal() {
     // Do nothing.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java
index fd012277a7..cac15d5ed9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java
@@ -64,6 +64,12 @@ public final class LoopingMediaSource extends CompositeMediaSource<Void> {
     mediaPeriodToChildMediaPeriodId = new HashMap<>();
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return childSource.getTag();
+  }
+
   @Override
   public void prepareSourceInternal(
       ExoPlayer player,
@@ -95,12 +101,6 @@ public final class LoopingMediaSource extends CompositeMediaSource<Void> {
     }
   }
 
-  @Override
-  @Nullable
-  public Object getTag() {
-    return childSource.getTag();
-  }
-
   @Override
   protected void onChildSourceInfoRefreshed(
       Void id, MediaSource mediaSource, Timeline timeline, @Nullable Object manifest) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
index 8a7f861893..acd5dd3e2e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
@@ -219,6 +219,11 @@ public interface MediaSource {
    */
   void removeEventListener(MediaSourceEventListener eventListener);
 
+  /**
+   * Returns the tag set on the media source, or null when none was set.
+   */
+  @Nullable Object getTag();
+
   /**
    * Starts source preparation if not yet started, and adds a listener for timeline and/or manifest
    * updates.
@@ -275,11 +280,6 @@ public interface MediaSource {
    */
   void releasePeriod(MediaPeriod mediaPeriod);
 
-  /**
-   * Returns the tag set on media source, or null when none was set.
-   */
-  Object getTag();
-
   /**
    * Removes a listener for timeline and/or manifest updates and releases the source if no longer
    * required.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java
index bfe0800d35..573e97cb13 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java
@@ -98,6 +98,12 @@ public final class MergingMediaSource extends CompositeMediaSource<Integer> {
     timelines = new Timeline[mediaSources.length];
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return mediaSources.length > 0 ? mediaSources[0].getTag() : null;
+  }
+
   @Override
   public void prepareSourceInternal(
       ExoPlayer player,
@@ -137,12 +143,6 @@ public final class MergingMediaSource extends CompositeMediaSource<Integer> {
     }
   }
 
-  @Override
-  @Nullable
-  public Object getTag() {
-    return mediaSources.length > 0 ? mediaSources[0].getTag() : null;
-  }
-
   @Override
   public void releaseSourceInternal() {
     super.releaseSourceInternal();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
index 57a0440b06..a8f0c0b678 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
@@ -297,6 +297,12 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
 
   // MediaSource implementation.
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return tag;
+  }
+
   @Override
   public void prepareSourceInternal(
       ExoPlayer player,
@@ -329,12 +335,6 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
     ((SingleSampleMediaPeriod) mediaPeriod).release();
   }
 
-  @Override
-  @Nullable
-  public Object getTag() {
-    return tag;
-  }
-
   @Override
   public void releaseSourceInternal() {
     // Do nothing.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
index 0944cc2ff2..19ddbd2c54 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
@@ -319,6 +319,12 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
     adsLoader.setSupportedContentTypes(adMediaSourceFactory.getSupportedTypes());
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return contentMediaSource.getTag();
+  }
+
   @Override
   public void prepareSourceInternal(
       final ExoPlayer player,
@@ -387,12 +393,6 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
     deferredMediaPeriod.releasePeriod();
   }
 
-  @Override
-  @Nullable
-  public Object getTag() {
-    return contentMediaSource.getTag();
-  }
-
   @Override
   public void releaseSourceInternal() {
     super.releaseSourceInternal();
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
index 9068f62d37..1f08a43731 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
@@ -607,6 +607,12 @@ public final class DashMediaSource extends BaseMediaSource {
 
   // MediaSource implementation.
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return tag;
+  }
+
   @Override
   public void prepareSourceInternal(
       ExoPlayer player,
@@ -658,12 +664,6 @@ public final class DashMediaSource extends BaseMediaSource {
     periodsById.remove(dashMediaPeriod.id);
   }
 
-  @Override
-  @Nullable
-  public Object getTag() {
-    return tag;
-  }
-
   @Override
   public void releaseSourceInternal() {
     manifestLoadPending = false;
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
index 1af68dc2ec..a9b0c579ac 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
@@ -390,6 +390,12 @@ public final class HlsMediaSource extends BaseMediaSource
     this.tag = tag;
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return tag;
+  }
+
   @Override
   public void prepareSourceInternal(
       ExoPlayer player,
@@ -425,12 +431,6 @@ public final class HlsMediaSource extends BaseMediaSource
     ((HlsMediaPeriod) mediaPeriod).release();
   }
 
-  @Override
-  @Nullable
-  public Object getTag() {
-    return tag;
-  }
-
   @Override
   public void releaseSourceInternal() {
     playlistTracker.stop();
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
index 9b2001bb48..103a52a55a 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
@@ -503,6 +503,12 @@ public final class SsMediaSource extends BaseMediaSource
 
   // MediaSource implementation.
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return tag;
+  }
+
   @Override
   public void prepareSourceInternal(
       ExoPlayer player,
@@ -549,12 +555,6 @@ public final class SsMediaSource extends BaseMediaSource
     mediaPeriods.remove(period);
   }
 
-  @Override
-  @Nullable
-  public Object getTag() {
-    return tag;
-  }
-
   @Override
   public void releaseSourceInternal() {
     manifest = sideloadedManifest ? manifest : null;
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
index f00274dbf8..7291b83ff6 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
@@ -88,6 +88,14 @@ public class FakeMediaSource extends BaseMediaSource {
     this.trackGroupArray = trackGroupArray;
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    boolean hasTimeline = timeline != null && !timeline.isEmpty();
+
+    return hasTimeline ? timeline.getWindow(0, new Timeline.Window()).tag : null;
+  }
+
   @Override
   public synchronized void prepareSourceInternal(
       ExoPlayer player,
@@ -133,14 +141,6 @@ public class FakeMediaSource extends BaseMediaSource {
     fakeMediaPeriod.release();
   }
 
-  @Override
-  @Nullable
-  public Object getTag() {
-    boolean hasTimeline = timeline != null && !timeline.isEmpty();
-
-    return hasTimeline ? timeline.getWindow(0, new Timeline.Window()).tag : null;
-  }
-
   @Override
   public void releaseSourceInternal() {
     assertThat(preparedSource).isTrue();

From a11a8716ef0560fcd2d714a5d74978d036c99694 Mon Sep 17 00:00:00 2001
From: GiuseppePiscopo <GiuseppePiscopo@users.noreply.github.com>
Date: Mon, 3 Dec 2018 18:24:38 +0100
Subject: [PATCH 266/832] feat(MediaSource): provide getTag default
 implementation

---
 .../com/google/android/exoplayer2/source/MediaSource.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
index acd5dd3e2e..a96893ea26 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
@@ -222,7 +222,9 @@ public interface MediaSource {
   /**
    * Returns the tag set on the media source, or null when none was set.
    */
-  @Nullable Object getTag();
+  @Nullable default Object getTag() {
+    return null;
+  }
 
   /**
    * Starts source preparation if not yet started, and adds a listener for timeline and/or manifest

From 24f2cbb2154cf3e1e8459adb032983a888e905bb Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Sat, 1 Dec 2018 02:01:20 +0000
Subject: [PATCH 267/832] updateQueuedPeriods(): If known duration changed for
 a media period, remove all media periods after

PiperOrigin-RevId: 223603915
---
 .../android/exoplayer2/MediaPeriodQueue.java      | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
index de09fc13a1..7fa2abe149 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
@@ -307,7 +307,11 @@ import com.google.android.exoplayer2.util.Assertions;
     MediaPeriodHolder periodHolder = getFrontPeriod();
     while (periodHolder != null) {
       if (previousPeriodHolder == null) {
+        long previousDurationUs = periodHolder.info.durationUs;
         periodHolder.info = getUpdatedMediaPeriodInfo(periodHolder.info);
+        if (!canKeepAfterMediaPeriodHolder(periodHolder, previousDurationUs)) {
+          return !removeAfter(periodHolder);
+        }
       } else {
         // Check this period holder still follows the previous one, based on the new timeline.
         if (periodIndex == C.INDEX_UNSET
@@ -326,6 +330,8 @@ import com.google.android.exoplayer2.util.Assertions;
         // Check the media period information matches the new timeline.
         if (!canKeepMediaPeriodHolder(periodHolder, periodInfo)) {
           return !removeAfter(previousPeriodHolder);
+        } else if (!canKeepAfterMediaPeriodHolder(periodHolder, periodInfo.durationUs)) {
+          return !removeAfter(periodHolder);
         }
       }
 
@@ -468,6 +474,15 @@ import com.google.android.exoplayer2.util.Assertions;
         && periodHolderInfo.id.equals(info.id);
   }
 
+  /**
+   * Returns whether periods after {@code periodHolder} can be kept for playing given its previous
+   * duration.
+   */
+  private boolean canKeepAfterMediaPeriodHolder(
+      MediaPeriodHolder periodHolder, long previousDurationUs) {
+    return previousDurationUs == C.TIME_UNSET || previousDurationUs == periodHolder.info.durationUs;
+  }
+
   /**
    * Updates the queue for any playback mode change, and returns whether the change was fully
    * handled. If not, it is necessary to seek to the current playback position.

From 9f1e32f11292bdab5414c0874917a7466e2d2fdf Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 3 Dec 2018 14:21:09 +0000
Subject: [PATCH 268/832] Add experimental flag to
 AdaptiveTrackSelection.Factory to block fixed track bandwidth

This option to block bandwidth already exists on the AdaptiveTrackSelection itself
but it's not currently possible to forward the total fixed track bandwidth
automatically.

PiperOrigin-RevId: 223785139
---
 .../AdaptiveTrackSelection.java               | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
index f7188fbf72..66b49555ef 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
@@ -26,6 +26,7 @@ import com.google.android.exoplayer2.upstream.BandwidthMeter;
 import com.google.android.exoplayer2.util.Clock;
 import com.google.android.exoplayer2.util.Util;
 import java.util.List;
+import org.checkerframework.checker.nullness.compatqual.NullableType;
 
 /**
  * A bandwidth based adaptive {@link TrackSelection}, whose selected track is updated to be the one
@@ -48,6 +49,7 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
     private final Clock clock;
 
     private TrackBitrateEstimator trackBitrateEstimator;
+    private boolean blockFixedTrackSelectionBandwidth;
 
     /** Creates an adaptive track selection factory with default parameters. */
     public Factory() {
@@ -215,6 +217,15 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
       this.trackBitrateEstimator = trackBitrateEstimator;
     }
 
+    /**
+     * Enables blocking of the total fixed track selection bandwidth.
+     *
+     * <p>This method is experimental, and will be renamed or removed in a future release.
+     */
+    public void experimental_enableBlockFixedTrackSelectionBandwidth() {
+      this.blockFixedTrackSelectionBandwidth = true;
+    }
+
     @Override
     public AdaptiveTrackSelection createTrackSelection(
         TrackGroup group, BandwidthMeter bandwidthMeter, int... tracks) {
@@ -235,6 +246,34 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
       adaptiveTrackSelection.experimental_setTrackBitrateEstimator(trackBitrateEstimator);
       return adaptiveTrackSelection;
     }
+
+    @Override
+    public @NullableType TrackSelection[] createTrackSelections(
+        @NullableType Definition[] definitions, BandwidthMeter bandwidthMeter) {
+      TrackSelection[] selections = new TrackSelection[definitions.length];
+      AdaptiveTrackSelection adaptiveSelection = null;
+      int totalFixedBandwidth = 0;
+      for (int i = 0; i < definitions.length; i++) {
+        Definition definition = definitions[i];
+        if (definition == null) {
+          continue;
+        }
+        if (definition.tracks.length > 1) {
+          selections[i] = createTrackSelection(definition.group, bandwidthMeter, definition.tracks);
+          adaptiveSelection = (AdaptiveTrackSelection) selections[i];
+        } else {
+          selections[i] = new FixedTrackSelection(definition.group, definition.tracks[0]);
+          int trackBitrate = definition.group.getFormat(definition.tracks[0]).bitrate;
+          if (trackBitrate != Format.NO_VALUE) {
+            totalFixedBandwidth += trackBitrate;
+          }
+        }
+      }
+      if (blockFixedTrackSelectionBandwidth && adaptiveSelection != null) {
+        adaptiveSelection.experimental_setNonAllocatableBandwidth(totalFixedBandwidth);
+      }
+      return selections;
+    }
   }
 
   public static final int DEFAULT_MIN_DURATION_FOR_QUALITY_INCREASE_MS = 10000;

From 500b1faf145666d8dcdee9db415929d8885e470b Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Mon, 3 Dec 2018 14:50:57 +0000
Subject: [PATCH 269/832] Add Downloader.getTotalBytes() method

PiperOrigin-RevId: 223787832
---
 .../exoplayer2/offline/Downloader.java        |  3 ++
 .../offline/ProgressiveDownloader.java        |  5 ++++
 .../exoplayer2/offline/SegmentDownloader.java | 28 ++++++++++++++++---
 .../offline/DownloadManagerTest.java          |  7 ++++-
 4 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java
index 10523d6bc6..b050e9770d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java
@@ -38,6 +38,9 @@ public interface Downloader {
   /** Returns the total number of downloaded bytes. */
   long getDownloadedBytes();
 
+  /** Returns the total size of the media, or {@link C#LENGTH_UNSET} if unknown. */
+  long getTotalBytes();
+
   /**
    * Returns the estimated download percentage, or {@link C#PERCENTAGE_UNSET} if no estimate is
    * available.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
index eedb5f7b00..1a241f0b4e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
@@ -86,6 +86,11 @@ public final class ProgressiveDownloader implements Downloader {
     return cachingCounters.totalCachedBytes();
   }
 
+  @Override
+  public long getTotalBytes() {
+    return cachingCounters.contentLength;
+  }
+
   @Override
   public float getDownloadPercentage() {
     long contentLength = cachingCounters.contentLength;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
index 2fdaaa4cbd..62a6a9294a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
@@ -72,6 +72,7 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
   private volatile int totalSegments;
   private volatile int downloadedSegments;
   private volatile long downloadedBytes;
+  private volatile long totalBytes;
 
   /**
    * @param manifestUri The {@link Uri} of the manifest to be downloaded.
@@ -88,6 +89,7 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
     this.offlineDataSource = constructorHelper.createOfflineCacheDataSource();
     this.priorityTaskManager = constructorHelper.getPriorityTaskManager();
     totalSegments = C.LENGTH_UNSET;
+    totalBytes = C.LENGTH_UNSET;
     isCanceled = new AtomicBoolean();
   }
 
@@ -142,9 +144,18 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
     return downloadedBytes;
   }
 
+  @Override
+  public long getTotalBytes() {
+    return totalBytes;
+  }
+
   @Override
   public final float getDownloadPercentage() {
     // Take local snapshot of the volatile fields
+    long totalBytes = this.totalBytes;
+    if (totalBytes != C.LENGTH_UNSET) {
+      return totalBytes == 0 ? 100f : (downloadedBytes * 100f) / totalBytes;
+    }
     int totalSegments = this.totalSegments;
     int downloadedSegments = this.downloadedSegments;
     if (totalSegments == C.LENGTH_UNSET || downloadedSegments == C.LENGTH_UNSET) {
@@ -211,16 +222,25 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
     totalSegments = segments.size();
     downloadedSegments = 0;
     downloadedBytes = 0;
+    long totalBytes = 0;
     for (int i = segments.size() - 1; i >= 0; i--) {
       Segment segment = segments.get(i);
       CacheUtil.getCached(segment.dataSpec, cache, cachingCounters);
       downloadedBytes += cachingCounters.alreadyCachedBytes;
-      if (cachingCounters.alreadyCachedBytes == cachingCounters.contentLength) {
-        // The segment is fully downloaded.
-        downloadedSegments++;
-        segments.remove(i);
+      if (cachingCounters.contentLength != C.LENGTH_UNSET) {
+        if (cachingCounters.alreadyCachedBytes == cachingCounters.contentLength) {
+          // The segment is fully downloaded.
+          downloadedSegments++;
+          segments.remove(i);
+        }
+        if (totalBytes != C.LENGTH_UNSET) {
+          totalBytes += cachingCounters.contentLength;
+        }
+      } else {
+        totalBytes = C.LENGTH_UNSET;
       }
     }
+    this.totalBytes = totalBytes;
     return segments;
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index f21f16b8ce..294e8a14a2 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -623,9 +623,14 @@ public class DownloadManagerTest {
       return downloadedBytes;
     }
 
+    @Override
+    public long getTotalBytes() {
+      return C.LENGTH_UNSET;
+    }
+
     @Override
     public float getDownloadPercentage() {
-      return Float.NaN;
+      return C.PERCENTAGE_UNSET;
     }
   }
 }

From f196630863dbb96442a6e4d850ce0dc6432e901f Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 3 Dec 2018 16:02:27 +0000
Subject: [PATCH 270/832] Remove contentId from Representation
 creators/constructor

PiperOrigin-RevId: 223796377
---
 .../dash/manifest/DashManifestParser.java     |  1 -
 .../source/dash/manifest/Representation.java  | 92 +++++++++++--------
 .../exoplayer2/source/dash/DashUtilTest.java  |  2 +-
 .../dash/manifest/DashManifestTest.java       |  3 +-
 .../dash/manifest/RepresentationTest.java     | 61 ------------
 5 files changed, 57 insertions(+), 102 deletions(-)
 delete mode 100644 library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/RepresentationTest.java

diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
index e52bb71d2a..c501172dd4 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
@@ -671,7 +671,6 @@ public class DashManifestParser extends DefaultHandler
     ArrayList<Descriptor> inbandEventStreams = representationInfo.inbandEventStreams;
     inbandEventStreams.addAll(extraInbandEventStreams);
     return Representation.newInstance(
-        /* contentId= */ null,
         representationInfo.revisionId,
         format,
         representationInfo.baseUrl,
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Representation.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Representation.java
index c6f07ee6d4..0884bcc65c 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Representation.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Representation.java
@@ -35,10 +35,10 @@ public abstract class Representation {
   public static final long REVISION_ID_DEFAULT = -1;
 
   /**
-   * Identifies the revision of the media contained within the representation. If the content can
-   * change over time (e.g. as a result of re-encoding the media with an updated encoder), then this
-   * identified can be set to uniquely identify the revision of the media. The timestamp at which
-   * the media was encoded is often a suitable.
+   * Identifies the revision of the media contained within the representation. If the media can
+   * change over time (e.g. as a result of it being re-encoded), then this identifier can be set to
+   * uniquely identify the revision of the media. The timestamp at which the media was encoded is
+   * often a suitable.
    */
   public final long revisionId;
   /**
@@ -63,22 +63,20 @@ public abstract class Representation {
   /**
    * Constructs a new instance.
    *
-   * @param contentId Identifies the piece of content to which this representation belongs.
    * @param revisionId Identifies the revision of the content.
    * @param format The format of the representation.
    * @param baseUrl The base URL.
    * @param segmentBase A segment base element for the representation.
    * @return The constructed instance.
    */
-  public static Representation newInstance(String contentId, long revisionId, Format format,
-      String baseUrl, SegmentBase segmentBase) {
-    return newInstance(contentId, revisionId, format, baseUrl, segmentBase, null);
+  public static Representation newInstance(
+      long revisionId, Format format, String baseUrl, SegmentBase segmentBase) {
+    return newInstance(revisionId, format, baseUrl, segmentBase, null);
   }
 
   /**
    * Constructs a new instance.
    *
-   * @param contentId Identifies the piece of content to which this representation belongs.
    * @param revisionId Identifies the revision of the content.
    * @param format The format of the representation.
    * @param baseUrl The base URL.
@@ -86,31 +84,43 @@ public abstract class Representation {
    * @param inbandEventStreams The in-band event streams in the representation. May be null.
    * @return The constructed instance.
    */
-  public static Representation newInstance(String contentId, long revisionId, Format format,
-      String baseUrl, SegmentBase segmentBase, List<Descriptor> inbandEventStreams) {
-    return newInstance(contentId, revisionId, format, baseUrl, segmentBase, inbandEventStreams,
-        null);
+  public static Representation newInstance(
+      long revisionId,
+      Format format,
+      String baseUrl,
+      SegmentBase segmentBase,
+      List<Descriptor> inbandEventStreams) {
+    return newInstance(revisionId, format, baseUrl, segmentBase, inbandEventStreams, null);
   }
 
   /**
    * Constructs a new instance.
    *
-   * @param contentId Identifies the piece of content to which this representation belongs.
    * @param revisionId Identifies the revision of the content.
    * @param format The format of the representation.
    * @param baseUrl The base URL of the representation.
    * @param segmentBase A segment base element for the representation.
    * @param inbandEventStreams The in-band event streams in the representation. May be null.
-   * @param customCacheKey A custom value to be returned from {@link #getCacheKey()}, or null. This
+   * @param cacheKey An optional key to be returned from {@link #getCacheKey()}, or null. This
    *     parameter is ignored if {@code segmentBase} consists of multiple segments.
    * @return The constructed instance.
    */
-  public static Representation newInstance(String contentId, long revisionId, Format format,
-      String baseUrl, SegmentBase segmentBase, List<Descriptor> inbandEventStreams,
-      String customCacheKey) {
+  public static Representation newInstance(
+      long revisionId,
+      Format format,
+      String baseUrl,
+      SegmentBase segmentBase,
+      List<Descriptor> inbandEventStreams,
+      String cacheKey) {
     if (segmentBase instanceof SingleSegmentBase) {
-      return new SingleSegmentRepresentation(contentId, revisionId, format, baseUrl,
-          (SingleSegmentBase) segmentBase, inbandEventStreams, customCacheKey, C.LENGTH_UNSET);
+      return new SingleSegmentRepresentation(
+          revisionId,
+          format,
+          baseUrl,
+          (SingleSegmentBase) segmentBase,
+          inbandEventStreams,
+          cacheKey,
+          C.LENGTH_UNSET);
     } else if (segmentBase instanceof MultiSegmentBase) {
       return new MultiSegmentRepresentation(
           revisionId, format, baseUrl, (MultiSegmentBase) segmentBase, inbandEventStreams);
@@ -156,10 +166,7 @@ public abstract class Representation {
    */
   public abstract DashSegmentIndex getIndex();
 
-  /**
-   * Returns a cache key for the representation if a custom cache key or content id has been
-   * provided and there is only single segment.
-   */
+  /** Returns a cache key for the representation if set, or null. */
   public abstract String getCacheKey();
 
   /**
@@ -182,7 +189,6 @@ public abstract class Representation {
     private final SingleSegmentIndex segmentIndex;
 
     /**
-     * @param contentId Identifies the piece of content to which this representation belongs.
      * @param revisionId Identifies the revision of the content.
      * @param format The format of the representation.
      * @param uri The uri of the media.
@@ -191,39 +197,49 @@ public abstract class Representation {
      * @param indexStart The offset of the first byte of index data.
      * @param indexEnd The offset of the last byte of index data.
      * @param inbandEventStreams The in-band event streams in the representation. May be null.
-     * @param customCacheKey A custom value to be returned from {@link #getCacheKey()}, or null.
+     * @param cacheKey An optional key to be returned from {@link #getCacheKey()}, or null.
      * @param contentLength The content length, or {@link C#LENGTH_UNSET} if unknown.
      */
-    public static SingleSegmentRepresentation newInstance(String contentId, long revisionId,
-        Format format, String uri, long initializationStart, long initializationEnd,
-        long indexStart, long indexEnd, List<Descriptor> inbandEventStreams, String customCacheKey,
+    public static SingleSegmentRepresentation newInstance(
+        long revisionId,
+        Format format,
+        String uri,
+        long initializationStart,
+        long initializationEnd,
+        long indexStart,
+        long indexEnd,
+        List<Descriptor> inbandEventStreams,
+        String cacheKey,
         long contentLength) {
       RangedUri rangedUri = new RangedUri(null, initializationStart,
           initializationEnd - initializationStart + 1);
       SingleSegmentBase segmentBase = new SingleSegmentBase(rangedUri, 1, 0, indexStart,
           indexEnd - indexStart + 1);
-      return new SingleSegmentRepresentation(contentId, revisionId,
-          format, uri, segmentBase, inbandEventStreams, customCacheKey, contentLength);
+      return new SingleSegmentRepresentation(
+          revisionId, format, uri, segmentBase, inbandEventStreams, cacheKey, contentLength);
     }
 
     /**
-     * @param contentId Identifies the piece of content to which this representation belongs.
      * @param revisionId Identifies the revision of the content.
      * @param format The format of the representation.
      * @param baseUrl The base URL of the representation.
      * @param segmentBase The segment base underlying the representation.
      * @param inbandEventStreams The in-band event streams in the representation. May be null.
-     * @param customCacheKey A custom value to be returned from {@link #getCacheKey()}, or null.
+     * @param cacheKey An optional key to be returned from {@link #getCacheKey()}, or null.
      * @param contentLength The content length, or {@link C#LENGTH_UNSET} if unknown.
      */
-    public SingleSegmentRepresentation(String contentId, long revisionId, Format format,
-        String baseUrl, SingleSegmentBase segmentBase, List<Descriptor> inbandEventStreams,
-        String customCacheKey, long contentLength) {
+    public SingleSegmentRepresentation(
+        long revisionId,
+        Format format,
+        String baseUrl,
+        SingleSegmentBase segmentBase,
+        List<Descriptor> inbandEventStreams,
+        String cacheKey,
+        long contentLength) {
       super(revisionId, format, baseUrl, segmentBase, inbandEventStreams);
       this.uri = Uri.parse(baseUrl);
       this.indexUri = segmentBase.getIndex();
-      this.cacheKey = customCacheKey != null ? customCacheKey
-          : contentId != null ? contentId + "." + format.id + "." + revisionId : null;
+      this.cacheKey = cacheKey;
       this.contentLength = contentLength;
       // If we have an index uri then the index is defined externally, and we shouldn't return one
       // directly. If we don't, then we can't do better than an index defining a single segment.
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java
index c09c765d83..3f5d317519 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java
@@ -89,7 +89,7 @@ public final class DashUtilTest {
     if (drmInitData != null) {
       format = format.copyWithDrmInitData(drmInitData);
     }
-    return Representation.newInstance("", 0, format, "", new SingleSegmentBase());
+    return Representation.newInstance(0, format, "", new SingleSegmentBase());
   }
 
   private static DrmInitData newDrmInitData() {
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java
index 0d08df42e9..d0820aa9b7 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java
@@ -214,7 +214,8 @@ public class DashManifestTest {
   }
 
   private static Representation newRepresentation() {
-    return Representation.newInstance("", 0, DUMMY_FORMAT, "", DUMMY_SEGMENT_BASE);
+    return Representation.newInstance(
+        /* revisionId= */ 0, DUMMY_FORMAT, /* baseUrl= */ "", DUMMY_SEGMENT_BASE);
   }
 
   private static DashManifest newDashManifest(int duration, Period... periods) {
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/RepresentationTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/RepresentationTest.java
deleted file mode 100644
index 12c0b9239e..0000000000
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/RepresentationTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.source.dash.manifest;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.android.exoplayer2.Format;
-import com.google.android.exoplayer2.source.dash.manifest.SegmentBase.SingleSegmentBase;
-import com.google.android.exoplayer2.util.MimeTypes;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-/** Unit test for {@link Representation}. */
-@RunWith(RobolectricTestRunner.class)
-public class RepresentationTest {
-
-  @Test
-  public void testGetCacheKey() {
-    String uri = "http://www.google.com";
-    SegmentBase base = new SingleSegmentBase(new RangedUri(null, 0, 1), 1, 0, 1, 1);
-    Format format = createVideoContainerFormat("0");
-    Representation representation =
-        Representation.newInstance("test_stream_1", 3, format, uri, base);
-    assertThat(representation.getCacheKey()).isEqualTo("test_stream_1.0.3");
-
-    format = createVideoContainerFormat("150");
-    representation =
-        Representation.newInstance(
-            "test_stream_1", Representation.REVISION_ID_DEFAULT, format, uri, base);
-    assertThat(representation.getCacheKey()).isEqualTo("test_stream_1.150.-1");
-  }
-
-  private static Format createVideoContainerFormat(String id) {
-    return Format.createVideoContainerFormat(
-        id,
-        "label",
-        /* containerMimeType= */ MimeTypes.APPLICATION_MP4,
-        /* sampleMimeType= */ MimeTypes.VIDEO_H264,
-        /* codecs= */ null,
-        /* bitrate= */ 2500000,
-        /* width= */ 1920,
-        /* height= */ 1080,
-        /* frameRate= */ Format.NO_VALUE,
-        /* initializationData= */ null,
-        /* selectionFlags= */ 0);
-  }
-}

From 87a74ee021daabadea95501e89454eefba9a8ff0 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 3 Dec 2018 16:08:01 +0000
Subject: [PATCH 271/832] Simplify DownloadManager.Task to use external state

PiperOrigin-RevId: 223797364
---
 .../exoplayer2/offline/DownloadManager.java   | 264 ++++++------------
 1 file changed, 88 insertions(+), 176 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 4208521cc6..c5645bedf0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -30,7 +30,6 @@ import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
-import com.google.android.exoplayer2.util.Util;
 import java.io.File;
 import java.io.IOException;
 import java.lang.annotation.Documented;
@@ -39,6 +38,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArraySet;
+import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 /**
  * Manages multiple stream download and remove requests.
@@ -199,7 +199,7 @@ public final class DownloadManager {
     if (initialized) {
       saveActions();
       maybeStartTasks();
-      if (task.currentState == STATE_QUEUED) {
+      if (task.state == STATE_QUEUED) {
         // Task did not change out of its initial state, and so its initial state won't have been
         // reported to listeners. Do so now.
         notifyListenersTaskStateChange(task);
@@ -231,7 +231,7 @@ public final class DownloadManager {
     for (int i = 0; i < tasks.size(); i++) {
       Task task = tasks.get(i);
       if (task.id == taskId) {
-        return task.getDownloadState();
+        return task.getTaskState();
       }
     }
     return null;
@@ -242,7 +242,7 @@ public final class DownloadManager {
     Assertions.checkState(!released);
     TaskState[] states = new TaskState[tasks.size()];
     for (int i = 0; i < states.length; i++) {
-      states[i] = tasks.get(i).getDownloadState();
+      states[i] = tasks.get(i).getTaskState();
     }
     return states;
   }
@@ -260,7 +260,7 @@ public final class DownloadManager {
       return false;
     }
     for (int i = 0; i < tasks.size(); i++) {
-      if (tasks.get(i).isActive()) {
+      if (tasks.get(i).isStarted()) {
         return false;
       }
     }
@@ -365,7 +365,7 @@ public final class DownloadManager {
     if (released) {
       return;
     }
-    boolean stopped = !task.isActive();
+    boolean stopped = !task.isStarted();
     if (stopped) {
       activeDownloadTasks.remove(task);
     }
@@ -382,7 +382,7 @@ public final class DownloadManager {
 
   private void notifyListenersTaskStateChange(Task task) {
     logd("Task state is changed", task);
-    TaskState taskState = task.getDownloadState();
+    TaskState taskState = task.getTaskState();
     for (Listener listener : listeners) {
       listener.onTaskStateChanged(this, taskState);
     }
@@ -422,7 +422,7 @@ public final class DownloadManager {
                 maybeStartTasks();
                 for (int i = 0; i < tasks.size(); i++) {
                   Task task = tasks.get(i);
-                  if (task.currentState == STATE_QUEUED) {
+                  if (task.state == STATE_QUEUED) {
                     // Task did not change out of its initial state, and so its initial state
                     // won't have been reported to listeners. Do so now.
                     notifyListenersTaskStateChange(task);
@@ -525,7 +525,7 @@ public final class DownloadManager {
     public final long downloadedBytes;
 
     /** If {@link #state} is {@link #STATE_FAILED} then this is the cause, otherwise null. */
-    public final Throwable error;
+    @Nullable public final Throwable error;
 
     private TaskState(
         int taskId,
@@ -533,7 +533,7 @@ public final class DownloadManager {
         @State int state,
         float downloadPercentage,
         long downloadedBytes,
-        Throwable error) {
+        @Nullable Throwable error) {
       this.taskId = taskId;
       this.action = action;
       this.state = state;
@@ -546,52 +546,28 @@ public final class DownloadManager {
 
   private static final class Task implements Runnable {
 
-    /**
-     * Task states. One of {@link TaskState#STATE_QUEUED}, {@link TaskState#STATE_STARTED}, {@link
-     * TaskState#STATE_COMPLETED}, {@link TaskState#STATE_CANCELED}, {@link TaskState#STATE_FAILED},
-     * {@link #STATE_QUEUED_CANCELING}, {@link #STATE_STARTED_CANCELING} or {@link
-     * #STATE_STARTED_STOPPING}.
-     *
-     * <p>Transition diagram:
-     *
-     * <pre>
-     *    ┌───→ q_canceling ┬→ canceled
-     *    │     s_canceling ┘
-     *    │         ↑
-     * queued → started ────┬→ completed
-     *    ↑         ↓       └→ failed
-     *    └──── s_stopping
-     * </pre>
-     */
+    /** Target states for the download thread. */
     @Documented
     @Retention(RetentionPolicy.SOURCE)
-    @IntDef({
-      STATE_QUEUED,
-      STATE_STARTED,
-      STATE_COMPLETED,
-      STATE_CANCELED,
-      STATE_FAILED,
-      STATE_QUEUED_CANCELING,
-      STATE_STARTED_CANCELING,
-      STATE_STARTED_STOPPING
-    })
-    public @interface InternalState {}
-    /** The task is about to be canceled. */
-    public static final int STATE_QUEUED_CANCELING = 5;
-    /** The task is about to be canceled. */
-    public static final int STATE_STARTED_CANCELING = 6;
-    /** The task is about to be stopped. */
-    public static final int STATE_STARTED_STOPPING = 7;
+    @IntDef({STATE_COMPLETED, STATE_QUEUED, STATE_CANCELED})
+    public @interface TargetState {}
 
     private final int id;
     private final DownloadManager downloadManager;
     private final DownloaderFactory downloaderFactory;
     private final DownloadAction action;
     private final int minRetryCount;
-    private volatile @InternalState int currentState;
-    private volatile Downloader downloader;
-    private Thread thread;
-    private Throwable error;
+    /** The current state of the task. */
+    @TaskState.State private int state;
+    /**
+     * When started, this is the target state that the task will transition to when the download
+     * thread stops.
+     */
+    @TargetState private volatile int targetState;
+
+    @MonotonicNonNull private volatile Downloader downloader;
+    @MonotonicNonNull private Thread thread;
+    @MonotonicNonNull private Throwable error;
 
     private Task(
         int id,
@@ -603,150 +579,93 @@ public final class DownloadManager {
       this.downloadManager = downloadManager;
       this.downloaderFactory = downloaderFactory;
       this.action = action;
-      this.currentState = STATE_QUEUED;
       this.minRetryCount = minRetryCount;
+      state = STATE_QUEUED;
+      targetState = STATE_COMPLETED;
     }
 
-    public TaskState getDownloadState() {
-      int externalState = getExternalState();
-      return new TaskState(
-          id, action, externalState, getDownloadPercentage(), getDownloadedBytes(), error);
+    public TaskState getTaskState() {
+      float downloadPercentage = C.PERCENTAGE_UNSET;
+      long downloadedBytes = 0;
+      if (downloader != null) {
+        downloadPercentage = downloader.getDownloadPercentage();
+        downloadedBytes = downloader.getDownloadedBytes();
+      }
+      return new TaskState(id, action, state, downloadPercentage, downloadedBytes, error);
     }
 
     /** Returns whether the task is finished. */
     public boolean isFinished() {
-      return currentState == STATE_FAILED
-          || currentState == STATE_COMPLETED
-          || currentState == STATE_CANCELED;
+      return state == STATE_FAILED || state == STATE_COMPLETED || state == STATE_CANCELED;
     }
 
     /** Returns whether the task is started. */
-    public boolean isActive() {
-      return currentState == STATE_QUEUED_CANCELING
-          || currentState == STATE_STARTED
-          || currentState == STATE_STARTED_STOPPING
-          || currentState == STATE_STARTED_CANCELING;
-    }
-
-    /**
-     * Returns the estimated download percentage, or {@link C#PERCENTAGE_UNSET} if no estimate is
-     * available.
-     */
-    public float getDownloadPercentage() {
-      return downloader != null ? downloader.getDownloadPercentage() : C.PERCENTAGE_UNSET;
-    }
-
-    /** Returns the total number of downloaded bytes. */
-    public long getDownloadedBytes() {
-      return downloader != null ? downloader.getDownloadedBytes() : 0;
+    public boolean isStarted() {
+      return state == STATE_STARTED;
     }
 
     @Override
     public String toString() {
-      if (!DEBUG) {
-        return super.toString();
-      }
       return action.type
           + ' '
           + (action.isRemoveAction ? "remove" : "download")
           + ' '
-          + toString(action.data)
+          + TaskState.getStateString(state)
           + ' '
-          + getStateString();
+          + TaskState.getStateString(targetState);
     }
 
-    private static String toString(byte[] data) {
-      if (data.length > 100) {
-        return "<data is too long>";
-      } else {
-        return '\'' + Util.fromUtf8Bytes(data) + '\'';
-      }
+    public boolean canStart() {
+      return state == STATE_QUEUED;
     }
 
-    private String getStateString() {
-      switch (currentState) {
-        case STATE_QUEUED_CANCELING:
-        case STATE_STARTED_CANCELING:
-          return "CANCELING";
-        case STATE_STARTED_STOPPING:
-          return "STOPPING";
-        case STATE_QUEUED:
-        case STATE_STARTED:
-        case STATE_COMPLETED:
-        case STATE_CANCELED:
-        case STATE_FAILED:
-        default:
-          return TaskState.getStateString(currentState);
-      }
-    }
-
-    private int getExternalState() {
-      switch (currentState) {
-        case STATE_QUEUED_CANCELING:
-          return STATE_QUEUED;
-        case STATE_STARTED_CANCELING:
-        case STATE_STARTED_STOPPING:
-          return STATE_STARTED;
-        case STATE_QUEUED:
-        case STATE_STARTED:
-        case STATE_COMPLETED:
-        case STATE_CANCELED:
-        case STATE_FAILED:
-        default:
-          return currentState;
-      }
-    }
-
-    private void start() {
-      if (changeStateAndNotify(STATE_QUEUED, STATE_STARTED)) {
+    public void start() {
+      if (state == STATE_QUEUED) {
+        state = STATE_STARTED;
+        targetState = STATE_COMPLETED;
+        downloadManager.onTaskStateChange(this);
         thread = new Thread(this);
         thread.start();
       }
     }
 
-    private boolean canStart() {
-      return currentState == STATE_QUEUED;
-    }
-
-    private void cancel() {
-      if (changeStateAndNotify(STATE_QUEUED, STATE_QUEUED_CANCELING)) {
-        downloadManager.handler.post(
-            () -> changeStateAndNotify(STATE_QUEUED_CANCELING, STATE_CANCELED));
-      } else if (changeStateAndNotify(STATE_STARTED, STATE_STARTED_CANCELING)) {
-        cancelDownload();
+    public void cancel() {
+      if (state == STATE_STARTED) {
+        stopDownloadThread(STATE_CANCELED);
+      } else if (state == STATE_QUEUED) {
+        state = STATE_CANCELED;
+        downloadManager.handler.post(() -> downloadManager.onTaskStateChange(this));
       }
     }
 
-    private void stop() {
-      if (changeStateAndNotify(STATE_STARTED, STATE_STARTED_STOPPING)) {
-        logd("Stopping", this);
-        cancelDownload();
+    public void stop() {
+      if (state == STATE_STARTED && targetState == STATE_COMPLETED) {
+        stopDownloadThread(STATE_QUEUED);
       }
     }
 
-    private boolean changeStateAndNotify(@InternalState int oldState, @InternalState int newState) {
-      return changeStateAndNotify(oldState, newState, null);
-    }
+    // Internal methods running on the main thread.
 
-    private boolean changeStateAndNotify(
-        @InternalState int oldState, @InternalState int newState, Throwable error) {
-      if (currentState != oldState) {
-        return false;
-      }
-      currentState = newState;
-      this.error = error;
-      boolean isInternalState = currentState != getExternalState();
-      if (!isInternalState) {
-        downloadManager.onTaskStateChange(this);
-      }
-      return true;
-    }
-
-    private void cancelDownload() {
+    private void stopDownloadThread(@TargetState int targetState) {
+      this.targetState = targetState;
+      // TODO: The possibility of downloader being null here may prevent the download thread from
+      // stopping in a timely way. Fix this.
       if (downloader != null) {
         downloader.cancel();
       }
-      thread.interrupt();
+      Assertions.checkNotNull(thread).interrupt();
+    }
+
+    private void onDownloadThreadStopped(@Nullable Throwable finalError) {
+      @TaskState.State int finalState = targetState;
+      if (targetState == STATE_COMPLETED && finalError != null) {
+        finalState = STATE_FAILED;
+      } else {
+        finalError = null;
+      }
+      state = finalState;
+      error = finalError;
+      downloadManager.onTaskStateChange(this);
     }
 
     // Methods running on download thread.
@@ -762,39 +681,32 @@ public final class DownloadManager {
         } else {
           int errorCount = 0;
           long errorPosition = C.LENGTH_UNSET;
-          while (!Thread.interrupted()) {
+          while (targetState == STATE_COMPLETED) {
             try {
               downloader.download();
               break;
             } catch (IOException e) {
-              long downloadedBytes = downloader.getDownloadedBytes();
-              if (downloadedBytes != errorPosition) {
-                logd("Reset error count. downloadedBytes = " + downloadedBytes, this);
-                errorPosition = downloadedBytes;
-                errorCount = 0;
+              if (targetState == STATE_COMPLETED) {
+                long downloadedBytes = downloader.getDownloadedBytes();
+                if (downloadedBytes != errorPosition) {
+                  logd("Reset error count. downloadedBytes = " + downloadedBytes, this);
+                  errorPosition = downloadedBytes;
+                  errorCount = 0;
+                }
+                if (++errorCount > minRetryCount) {
+                  throw e;
+                }
+                logd("Download error. Retry " + errorCount, this);
+                Thread.sleep(getRetryDelayMillis(errorCount));
               }
-              if (currentState != STATE_STARTED || ++errorCount > minRetryCount) {
-                throw e;
-              }
-              logd("Download error. Retry " + errorCount, this);
-              Thread.sleep(getRetryDelayMillis(errorCount));
             }
           }
         }
-      } catch (Throwable e){
+      } catch (Throwable e) {
         error = e;
       }
       final Throwable finalError = error;
-      downloadManager.handler.post(
-          () -> {
-            if (changeStateAndNotify(
-                    STATE_STARTED, finalError != null ? STATE_FAILED : STATE_COMPLETED, finalError)
-                || changeStateAndNotify(STATE_STARTED_CANCELING, STATE_CANCELED)
-                || changeStateAndNotify(STATE_STARTED_STOPPING, STATE_QUEUED)) {
-              return;
-            }
-            throw new IllegalStateException();
-          });
+      downloadManager.handler.post(() -> onDownloadThreadStopped(finalError));
     }
 
     private int getRetryDelayMillis(int errorCount) {

From 8de149eb78f58b67892292920acfec6c72a56f40 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 3 Dec 2018 20:07:01 +0000
Subject: [PATCH 272/832] Use custom cache key factory for removal as well as
 downloading

Issue #5013

PiperOrigin-RevId: 223838303
---
 .../offline/DownloaderConstructorHelper.java  |  8 ++
 .../offline/ProgressiveDownloader.java        | 10 +-
 .../exoplayer2/offline/SegmentDownloader.java | 16 ++--
 .../exoplayer2/upstream/cache/CacheUtil.java  | 66 +++++++++----
 .../upstream/cache/CacheDataSourceTest.java   | 32 ++++++-
 .../upstream/cache/CacheUtilTest.java         | 95 +++++++++++--------
 6 files changed, 154 insertions(+), 73 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java
index 28e898216d..74b918c06d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java
@@ -27,12 +27,14 @@ import com.google.android.exoplayer2.upstream.cache.CacheDataSinkFactory;
 import com.google.android.exoplayer2.upstream.cache.CacheDataSource;
 import com.google.android.exoplayer2.upstream.cache.CacheDataSourceFactory;
 import com.google.android.exoplayer2.upstream.cache.CacheKeyFactory;
+import com.google.android.exoplayer2.upstream.cache.CacheUtil;
 import com.google.android.exoplayer2.util.PriorityTaskManager;
 
 /** A helper class that holds necessary parameters for {@link Downloader} construction. */
 public final class DownloaderConstructorHelper {
 
   private final Cache cache;
+  @Nullable private final CacheKeyFactory cacheKeyFactory;
   @Nullable private final PriorityTaskManager priorityTaskManager;
   private final CacheDataSourceFactory onlineCacheDataSourceFactory;
   private final CacheDataSourceFactory offlineCacheDataSourceFactory;
@@ -130,6 +132,7 @@ public final class DownloaderConstructorHelper {
             cacheKeyFactory);
     this.cache = cache;
     this.priorityTaskManager = priorityTaskManager;
+    this.cacheKeyFactory = cacheKeyFactory;
   }
 
   /** Returns the {@link Cache} instance. */
@@ -137,6 +140,11 @@ public final class DownloaderConstructorHelper {
     return cache;
   }
 
+  /** Returns the {@link CacheKeyFactory}. */
+  public CacheKeyFactory getCacheKeyFactory() {
+    return cacheKeyFactory != null ? cacheKeyFactory : CacheUtil.DEFAULT_CACHE_KEY_FACTORY;
+  }
+
   /** Returns a {@link PriorityTaskManager} instance. */
   public PriorityTaskManager getPriorityTaskManager() {
     // Return a dummy PriorityTaskManager if none is provided. Create a new PriorityTaskManager
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
index 1a241f0b4e..41f0944b75 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
@@ -21,6 +21,7 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.upstream.DataSpec;
 import com.google.android.exoplayer2.upstream.cache.Cache;
 import com.google.android.exoplayer2.upstream.cache.CacheDataSource;
+import com.google.android.exoplayer2.upstream.cache.CacheKeyFactory;
 import com.google.android.exoplayer2.upstream.cache.CacheUtil;
 import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
 import com.google.android.exoplayer2.util.PriorityTaskManager;
@@ -37,6 +38,7 @@ public final class ProgressiveDownloader implements Downloader {
   private final DataSpec dataSpec;
   private final Cache cache;
   private final CacheDataSource dataSource;
+  private final CacheKeyFactory cacheKeyFactory;
   private final PriorityTaskManager priorityTaskManager;
   private final CacheUtil.CachingCounters cachingCounters;
   private final AtomicBoolean isCanceled;
@@ -49,9 +51,12 @@ public final class ProgressiveDownloader implements Downloader {
    */
   public ProgressiveDownloader(
       Uri uri, @Nullable String customCacheKey, DownloaderConstructorHelper constructorHelper) {
-    this.dataSpec = new DataSpec(uri, 0, C.LENGTH_UNSET, customCacheKey, 0);
+    this.dataSpec =
+        new DataSpec(
+            uri, /* absoluteStreamPosition= */ 0, C.LENGTH_UNSET, customCacheKey, /* flags= */ 0);
     this.cache = constructorHelper.getCache();
     this.dataSource = constructorHelper.createCacheDataSource();
+    this.cacheKeyFactory = constructorHelper.getCacheKeyFactory();
     this.priorityTaskManager = constructorHelper.getPriorityTaskManager();
     cachingCounters = new CachingCounters();
     isCanceled = new AtomicBoolean();
@@ -64,6 +69,7 @@ public final class ProgressiveDownloader implements Downloader {
       CacheUtil.cache(
           dataSpec,
           cache,
+          cacheKeyFactory,
           dataSource,
           new byte[BUFFER_SIZE_BYTES],
           priorityTaskManager,
@@ -101,6 +107,6 @@ public final class ProgressiveDownloader implements Downloader {
 
   @Override
   public void remove() {
-    CacheUtil.remove(cache, CacheUtil.getKey(dataSpec));
+    CacheUtil.remove(dataSpec, cache, cacheKeyFactory);
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
index 62a6a9294a..e55d2a1baf 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
@@ -22,6 +22,7 @@ import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DataSpec;
 import com.google.android.exoplayer2.upstream.cache.Cache;
 import com.google.android.exoplayer2.upstream.cache.CacheDataSource;
+import com.google.android.exoplayer2.upstream.cache.CacheKeyFactory;
 import com.google.android.exoplayer2.upstream.cache.CacheUtil;
 import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
 import com.google.android.exoplayer2.util.PriorityTaskManager;
@@ -62,10 +63,11 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
   private static final int BUFFER_SIZE_BYTES = 128 * 1024;
 
   private final Uri manifestUri;
-  private final PriorityTaskManager priorityTaskManager;
   private final Cache cache;
   private final CacheDataSource dataSource;
   private final CacheDataSource offlineDataSource;
+  private final CacheKeyFactory cacheKeyFactory;
+  private final PriorityTaskManager priorityTaskManager;
   private final ArrayList<StreamKey> streamKeys;
   private final AtomicBoolean isCanceled;
 
@@ -87,6 +89,7 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
     this.cache = constructorHelper.getCache();
     this.dataSource = constructorHelper.createCacheDataSource();
     this.offlineDataSource = constructorHelper.createOfflineCacheDataSource();
+    this.cacheKeyFactory = constructorHelper.getCacheKeyFactory();
     this.priorityTaskManager = constructorHelper.getPriorityTaskManager();
     totalSegments = C.LENGTH_UNSET;
     totalBytes = C.LENGTH_UNSET;
@@ -117,6 +120,7 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
           CacheUtil.cache(
               segments.get(i).dataSpec,
               cache,
+              cacheKeyFactory,
               dataSource,
               buffer,
               priorityTaskManager,
@@ -170,13 +174,13 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
       M manifest = getManifest(offlineDataSource, manifestUri);
       List<Segment> segments = getSegments(offlineDataSource, manifest, true);
       for (int i = 0; i < segments.size(); i++) {
-        removeUri(segments.get(i).dataSpec.uri);
+        removeDataSpec(segments.get(i).dataSpec);
       }
     } catch (IOException e) {
       // Ignore exceptions when removing.
     } finally {
       // Always attempt to remove the manifest.
-      removeUri(manifestUri);
+      removeDataSpec(new DataSpec(manifestUri));
     }
   }
 
@@ -225,7 +229,7 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
     long totalBytes = 0;
     for (int i = segments.size() - 1; i >= 0; i--) {
       Segment segment = segments.get(i);
-      CacheUtil.getCached(segment.dataSpec, cache, cachingCounters);
+      CacheUtil.getCached(segment.dataSpec, cache, cacheKeyFactory, cachingCounters);
       downloadedBytes += cachingCounters.alreadyCachedBytes;
       if (cachingCounters.contentLength != C.LENGTH_UNSET) {
         if (cachingCounters.alreadyCachedBytes == cachingCounters.contentLength) {
@@ -244,8 +248,8 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
     return segments;
   }
 
-  private void removeUri(Uri uri) {
-    CacheUtil.remove(cache, CacheUtil.generateKey(uri));
+  private void removeDataSpec(DataSpec dataSpec) {
+    CacheUtil.remove(dataSpec, cache, cacheKeyFactory);
   }
 
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
index cee22375a9..1a44fb3144 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
@@ -54,8 +54,9 @@ public final class CacheUtil {
   /** Default buffer size to be used while caching. */
   public static final int DEFAULT_BUFFER_SIZE_BYTES = 128 * 1024;
 
-  /** Default {@link CacheKeyFactory} that calls through to {@link #getKey}. */
-  public static final CacheKeyFactory DEFAULT_CACHE_KEY_FACTORY = CacheUtil::getKey;
+  /** Default {@link CacheKeyFactory}. */
+  public static final CacheKeyFactory DEFAULT_CACHE_KEY_FACTORY =
+      (dataSpec) -> dataSpec.key != null ? dataSpec.key : generateKey(dataSpec.uri);
 
   /**
    * Generates a cache key out of the given {@link Uri}.
@@ -67,26 +68,21 @@ public final class CacheUtil {
   }
 
   /**
-   * Returns the {@code dataSpec.key} if not null, otherwise generates a cache key out of {@code
-   * dataSpec.uri}
-   *
-   * @param dataSpec Defines a content which the requested key is for.
-   */
-  public static String getKey(DataSpec dataSpec) {
-    return dataSpec.key != null ? dataSpec.key : generateKey(dataSpec.uri);
-  }
-
-  /**
-   * Sets a {@link CachingCounters} to contain the number of bytes already downloaded and the
-   * length for the content defined by a {@code dataSpec}. {@link CachingCounters#newlyCachedBytes}
-   * is reset to 0.
+   * Sets a {@link CachingCounters} to contain the number of bytes already downloaded and the length
+   * for the content defined by a {@code dataSpec}. {@link CachingCounters#newlyCachedBytes} is
+   * reset to 0.
    *
    * @param dataSpec Defines the data to be checked.
    * @param cache A {@link Cache} which has the data.
+   * @param cacheKeyFactory An optional factory for cache keys.
    * @param counters The {@link CachingCounters} to update.
    */
-  public static void getCached(DataSpec dataSpec, Cache cache, CachingCounters counters) {
-    String key = getKey(dataSpec);
+  public static void getCached(
+      DataSpec dataSpec,
+      Cache cache,
+      @Nullable CacheKeyFactory cacheKeyFactory,
+      CachingCounters counters) {
+    String key = buildCacheKey(dataSpec, cacheKeyFactory);
     long start = dataSpec.absoluteStreamPosition;
     long left = dataSpec.length != C.LENGTH_UNSET ? dataSpec.length : cache.getContentLength(key);
     counters.contentLength = left;
@@ -114,6 +110,7 @@ public final class CacheUtil {
    *
    * @param dataSpec Defines the data to be cached.
    * @param cache A {@link Cache} to store the data.
+   * @param cacheKeyFactory An optional factory for cache keys.
    * @param upstream A {@link DataSource} for reading data not in the cache.
    * @param counters If not null, updated during caching.
    * @param isCanceled An optional flag that will interrupt caching if set to true.
@@ -123,6 +120,7 @@ public final class CacheUtil {
   public static void cache(
       DataSpec dataSpec,
       Cache cache,
+      @Nullable CacheKeyFactory cacheKeyFactory,
       DataSource upstream,
       @Nullable CachingCounters counters,
       @Nullable AtomicBoolean isCanceled)
@@ -130,6 +128,7 @@ public final class CacheUtil {
     cache(
         dataSpec,
         cache,
+        cacheKeyFactory,
         new CacheDataSource(cache, upstream),
         new byte[DEFAULT_BUFFER_SIZE_BYTES],
         /* priorityTaskManager= */ null,
@@ -151,6 +150,7 @@ public final class CacheUtil {
    *
    * @param dataSpec Defines the data to be cached.
    * @param cache A {@link Cache} to store the data.
+   * @param cacheKeyFactory An optional factory for cache keys.
    * @param dataSource A {@link CacheDataSource} that works on the {@code cache}.
    * @param buffer The buffer to be used while caching.
    * @param priorityTaskManager If not null it's used to check whether it is allowed to proceed with
@@ -166,6 +166,7 @@ public final class CacheUtil {
   public static void cache(
       DataSpec dataSpec,
       Cache cache,
+      @Nullable CacheKeyFactory cacheKeyFactory,
       CacheDataSource dataSource,
       byte[] buffer,
       PriorityTaskManager priorityTaskManager,
@@ -179,13 +180,13 @@ public final class CacheUtil {
 
     if (counters != null) {
       // Initialize the CachingCounter values.
-      getCached(dataSpec, cache, counters);
+      getCached(dataSpec, cache, cacheKeyFactory, counters);
     } else {
       // Dummy CachingCounters. No need to initialize as they will not be visible to the caller.
       counters = new CachingCounters();
     }
 
-    String key = getKey(dataSpec);
+    String key = buildCacheKey(dataSpec, cacheKeyFactory);
     long start = dataSpec.absoluteStreamPosition;
     long left = dataSpec.length != C.LENGTH_UNSET ? dataSpec.length : cache.getContentLength(key);
     while (left != 0) {
@@ -296,18 +297,41 @@ public final class CacheUtil {
     }
   }
 
-  /** Removes all of the data in the {@code cache} pointed by the {@code key}. */
+  /**
+   * Removes all of the data specified by the {@code dataSpec}.
+   *
+   * @param dataSpec Defines the data to be removed.
+   * @param cache A {@link Cache} to store the data.
+   * @param cacheKeyFactory An optional factory for cache keys.
+   */
+  public static void remove(
+      DataSpec dataSpec, Cache cache, @Nullable CacheKeyFactory cacheKeyFactory) {
+    remove(cache, buildCacheKey(dataSpec, cacheKeyFactory));
+  }
+
+  /**
+   * Removes all of the data specified by the {@code key}.
+   *
+   * @param cache A {@link Cache} to store the data.
+   * @param key The key whose data should be removed.
+   */
   public static void remove(Cache cache, String key) {
     NavigableSet<CacheSpan> cachedSpans = cache.getCachedSpans(key);
     for (CacheSpan cachedSpan : cachedSpans) {
       try {
         cache.removeSpan(cachedSpan);
       } catch (Cache.CacheException e) {
-        // do nothing
+        // Do nothing.
       }
     }
   }
 
+  private static String buildCacheKey(
+      DataSpec dataSpec, @Nullable CacheKeyFactory cacheKeyFactory) {
+    return (cacheKeyFactory != null ? cacheKeyFactory : DEFAULT_CACHE_KEY_FACTORY)
+        .buildCacheKey(dataSpec);
+  }
+
   private static void throwExceptionIfInterruptedOrCancelled(AtomicBoolean isCanceled)
       throws InterruptedException {
     if (Thread.interrupted() || (isCanceled != null && isCanceled.get())) {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
index d76b2d5afb..83126ce34a 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
@@ -338,7 +338,12 @@ public final class CacheDataSourceTest {
                 .appendReadData(1024 * 1024)
                 .endData());
     CacheUtil.cache(
-        unboundedDataSpec, cache, upstream2, /* counters= */ null, /* isCanceled= */ null);
+        unboundedDataSpec,
+        cache,
+        /* cacheKeyFactory= */ null,
+        upstream2,
+        /* counters= */ null,
+        /* isCanceled= */ null);
 
     // Read the rest of the data.
     TestUtil.readToEnd(cacheDataSource);
@@ -382,7 +387,12 @@ public final class CacheDataSourceTest {
                 .appendReadData(1024 * 1024)
                 .endData());
     CacheUtil.cache(
-        unboundedDataSpec, cache, upstream2, /* counters= */ null, /* isCanceled= */ null);
+        unboundedDataSpec,
+        cache,
+        /* cacheKeyFactory= */ null,
+        upstream2,
+        /* counters= */ null,
+        /* isCanceled= */ null);
 
     // Read the rest of the data.
     TestUtil.readToEnd(cacheDataSource);
@@ -400,7 +410,13 @@ public final class CacheDataSourceTest {
     // Cache the latter half of the data.
     int halfDataLength = 512;
     DataSpec dataSpec = buildDataSpec(halfDataLength, C.LENGTH_UNSET);
-    CacheUtil.cache(dataSpec, cache, upstream, /* counters= */ null, /* isCanceled= */ null);
+    CacheUtil.cache(
+        dataSpec,
+        cache,
+        /* cacheKeyFactory= */ null,
+        upstream,
+        /* counters= */ null,
+        /* isCanceled= */ null);
 
     // Create cache read-only CacheDataSource.
     CacheDataSource cacheDataSource =
@@ -411,7 +427,7 @@ public final class CacheDataSourceTest {
     TestUtil.readExactly(cacheDataSource, 100);
 
     // Delete cached data.
-    CacheUtil.remove(cache, defaultCacheKey);
+    CacheUtil.remove(unboundedDataSpec, cache, /* cacheKeyFactory= */ null);
     assertCacheEmpty(cache);
 
     // Read the rest of the data.
@@ -430,7 +446,13 @@ public final class CacheDataSourceTest {
     // Cache the latter half of the data.
     int halfDataLength = 512;
     DataSpec dataSpec = buildDataSpec(/* position= */ 0, halfDataLength);
-    CacheUtil.cache(dataSpec, cache, upstream, /* counters= */ null, /* isCanceled= */ null);
+    CacheUtil.cache(
+        dataSpec,
+        cache,
+        /* cacheKeyFactory= */ null,
+        upstream,
+        /* counters= */ null,
+        /* isCanceled= */ null);
 
     // Create blocking CacheDataSource.
     CacheDataSource cacheDataSource =
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
index dba71ab9db..d0bdfa2b83 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
@@ -15,13 +15,9 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
-import static android.net.Uri.EMPTY;
-import static android.net.Uri.parse;
 import static com.google.android.exoplayer2.C.LENGTH_UNSET;
 import static com.google.android.exoplayer2.testutil.CacheAsserts.assertCacheEmpty;
 import static com.google.android.exoplayer2.testutil.CacheAsserts.assertCachedData;
-import static com.google.android.exoplayer2.upstream.cache.CacheUtil.generateKey;
-import static com.google.android.exoplayer2.upstream.cache.CacheUtil.getKey;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
@@ -107,50 +103,40 @@ public final class CacheUtilTest {
 
   @Test
   public void testGenerateKey() throws Exception {
-    assertThat(generateKey(EMPTY)).isNotNull();
+    assertThat(CacheUtil.generateKey(Uri.EMPTY)).isNotNull();
 
     Uri testUri = Uri.parse("test");
     String key = CacheUtil.generateKey(testUri);
     assertThat(key).isNotNull();
 
-    // Should generate the same key for the same input
-    assertThat(generateKey(testUri)).isEqualTo(key);
+    // Should generate the same key for the same input.
+    assertThat(CacheUtil.generateKey(testUri)).isEqualTo(key);
 
-    // Should generate different key for different input
-    assertThat(key.equals(generateKey(parse("test2")))).isFalse();
-  }
-
-  @Test
-  public void testGetKey() throws Exception {
-    Uri testUri = Uri.parse("test");
-    String key = "key";
-    // If DataSpec.key is present, returns it
-    assertThat(getKey(new DataSpec(testUri, 0, LENGTH_UNSET, key))).isEqualTo(key);
-    // If not generates a new one using DataSpec.uri
-    assertThat(getKey(new DataSpec(testUri, 0, LENGTH_UNSET, null)))
-        .isEqualTo(generateKey(testUri));
+    // Should generate different key for different input.
+    assertThat(key.equals(CacheUtil.generateKey(Uri.parse("test2")))).isFalse();
   }
 
   @Test
   public void testDefaultCacheKeyFactory_buildCacheKey() throws Exception {
     Uri testUri = Uri.parse("test");
     String key = "key";
-    // If DataSpec.key is present, returns it
+    // If DataSpec.key is present, returns it.
     assertThat(
             CacheUtil.DEFAULT_CACHE_KEY_FACTORY.buildCacheKey(
                 new DataSpec(testUri, 0, LENGTH_UNSET, key)))
         .isEqualTo(key);
-    // If not generates a new one using DataSpec.uri
+    // If not generates a new one using DataSpec.uri.
     assertThat(
             CacheUtil.DEFAULT_CACHE_KEY_FACTORY.buildCacheKey(
                 new DataSpec(testUri, 0, LENGTH_UNSET, null)))
-        .isEqualTo(generateKey(testUri));
+        .isEqualTo(testUri.toString());
   }
 
   @Test
   public void testGetCachedNoData() throws Exception {
     CachingCounters counters = new CachingCounters();
-    CacheUtil.getCached(new DataSpec(Uri.parse("test")), mockCache, counters);
+    CacheUtil.getCached(
+        new DataSpec(Uri.parse("test")), mockCache, /* cacheKeyFactory= */ null, counters);
 
     assertCounters(counters, 0, 0, C.LENGTH_UNSET);
   }
@@ -160,7 +146,8 @@ public final class CacheUtilTest {
     // Mock there is 100 bytes cached at the beginning
     mockCache.spansAndGaps = new int[] {100};
     CachingCounters counters = new CachingCounters();
-    CacheUtil.getCached(new DataSpec(Uri.parse("test")), mockCache, counters);
+    CacheUtil.getCached(
+        new DataSpec(Uri.parse("test")), mockCache, /* cacheKeyFactory= */ null, counters);
 
     assertCounters(counters, 100, 0, C.LENGTH_UNSET);
   }
@@ -169,7 +156,8 @@ public final class CacheUtilTest {
   public void testGetCachedNoDataKnownLength() throws Exception {
     mockCache.contentLength = 1000;
     CachingCounters counters = new CachingCounters();
-    CacheUtil.getCached(new DataSpec(Uri.parse("test")), mockCache, counters);
+    CacheUtil.getCached(
+        new DataSpec(Uri.parse("test")), mockCache, /* cacheKeyFactory= */ null, counters);
 
     assertCounters(counters, 0, 0, 1000);
   }
@@ -179,7 +167,8 @@ public final class CacheUtilTest {
     mockCache.contentLength = 1000;
     mockCache.spansAndGaps = new int[] {100, 100, 200};
     CachingCounters counters = new CachingCounters();
-    CacheUtil.getCached(new DataSpec(Uri.parse("test")), mockCache, counters);
+    CacheUtil.getCached(
+        new DataSpec(Uri.parse("test")), mockCache, /* cacheKeyFactory= */ null, counters);
 
     assertCounters(counters, 300, 0, 1000);
   }
@@ -191,7 +180,12 @@ public final class CacheUtilTest {
 
     CachingCounters counters = new CachingCounters();
     CacheUtil.cache(
-        new DataSpec(Uri.parse("test_data")), cache, dataSource, counters, /* isCanceled= */ null);
+        new DataSpec(Uri.parse("test_data")),
+        cache,
+        /* cacheKeyFactory= */ null,
+        dataSource,
+        counters,
+        /* isCanceled= */ null);
 
     assertCounters(counters, 0, 100, 100);
     assertCachedData(cache, fakeDataSet);
@@ -205,11 +199,18 @@ public final class CacheUtilTest {
     Uri testUri = Uri.parse("test_data");
     DataSpec dataSpec = new DataSpec(testUri, 10, 20, null);
     CachingCounters counters = new CachingCounters();
-    CacheUtil.cache(dataSpec, cache, dataSource, counters, /* isCanceled= */ null);
+    CacheUtil.cache(
+        dataSpec, cache, /* cacheKeyFactory= */ null, dataSource, counters, /* isCanceled= */ null);
 
     assertCounters(counters, 0, 20, 20);
 
-    CacheUtil.cache(new DataSpec(testUri), cache, dataSource, counters, /* isCanceled= */ null);
+    CacheUtil.cache(
+        new DataSpec(testUri),
+        cache,
+        /* cacheKeyFactory= */ null,
+        dataSource,
+        counters,
+        /* isCanceled= */ null);
 
     assertCounters(counters, 20, 80, 100);
     assertCachedData(cache, fakeDataSet);
@@ -224,7 +225,8 @@ public final class CacheUtilTest {
 
     DataSpec dataSpec = new DataSpec(Uri.parse("test_data"));
     CachingCounters counters = new CachingCounters();
-    CacheUtil.cache(dataSpec, cache, dataSource, counters, /* isCanceled= */ null);
+    CacheUtil.cache(
+        dataSpec, cache, /* cacheKeyFactory= */ null, dataSource, counters, /* isCanceled= */ null);
 
     assertCounters(counters, 0, 100, 100);
     assertCachedData(cache, fakeDataSet);
@@ -240,11 +242,18 @@ public final class CacheUtilTest {
     Uri testUri = Uri.parse("test_data");
     DataSpec dataSpec = new DataSpec(testUri, 10, 20, null);
     CachingCounters counters = new CachingCounters();
-    CacheUtil.cache(dataSpec, cache, dataSource, counters, /* isCanceled= */ null);
+    CacheUtil.cache(
+        dataSpec, cache, /* cacheKeyFactory= */ null, dataSource, counters, /* isCanceled= */ null);
 
     assertCounters(counters, 0, 20, 20);
 
-    CacheUtil.cache(new DataSpec(testUri), cache, dataSource, counters, /* isCanceled= */ null);
+    CacheUtil.cache(
+        new DataSpec(testUri),
+        cache,
+        /* cacheKeyFactory= */ null,
+        dataSource,
+        counters,
+        /* isCanceled= */ null);
 
     assertCounters(counters, 20, 80, 100);
     assertCachedData(cache, fakeDataSet);
@@ -258,7 +267,8 @@ public final class CacheUtilTest {
     Uri testUri = Uri.parse("test_data");
     DataSpec dataSpec = new DataSpec(testUri, 0, 1000, null);
     CachingCounters counters = new CachingCounters();
-    CacheUtil.cache(dataSpec, cache, dataSource, counters, /* isCanceled= */ null);
+    CacheUtil.cache(
+        dataSpec, cache, /* cacheKeyFactory= */ null, dataSource, counters, /* isCanceled= */ null);
 
     assertCounters(counters, 0, 100, 1000);
     assertCachedData(cache, fakeDataSet);
@@ -276,6 +286,7 @@ public final class CacheUtilTest {
       CacheUtil.cache(
           dataSpec,
           cache,
+          /* cacheKeyFactory= */ null,
           new CacheDataSource(cache, dataSource),
           new byte[CacheUtil.DEFAULT_BUFFER_SIZE_BYTES],
           /* priorityTaskManager= */ null,
@@ -304,7 +315,12 @@ public final class CacheUtilTest {
     FakeDataSource dataSource = new FakeDataSource(fakeDataSet);
 
     CacheUtil.cache(
-        new DataSpec(Uri.parse("test_data")), cache, dataSource, counters, /* isCanceled= */ null);
+        new DataSpec(Uri.parse("test_data")),
+        cache,
+        /* cacheKeyFactory= */ null,
+        dataSource,
+        counters,
+        /* isCanceled= */ null);
 
     assertCounters(counters, 0, 300, 300);
     assertCachedData(cache, fakeDataSet);
@@ -316,10 +332,12 @@ public final class CacheUtilTest {
     FakeDataSource dataSource = new FakeDataSource(fakeDataSet);
 
     Uri uri = Uri.parse("test_data");
+    DataSpec dataSpec = new DataSpec(uri);
     CacheUtil.cache(
-        new DataSpec(uri),
+        dataSpec,
         cache,
-        // set maxCacheFileSize to 10 to make sure there are multiple spans
+        /* cacheKeyFactory= */ null,
+        // Set maxCacheFileSize to 10 to make sure there are multiple spans.
         new CacheDataSource(cache, dataSource, 0, 10),
         new byte[CacheUtil.DEFAULT_BUFFER_SIZE_BYTES],
         /* priorityTaskManager= */ null,
@@ -327,7 +345,7 @@ public final class CacheUtilTest {
         /* counters= */ null,
         /* isCanceled= */ null,
         true);
-    CacheUtil.remove(cache, CacheUtil.generateKey(uri));
+    CacheUtil.remove(dataSpec, cache, /* cacheKeyFactory= */ null);
 
     assertCacheEmpty(cache);
   }
@@ -338,5 +356,4 @@ public final class CacheUtilTest {
     assertThat(counters.newlyCachedBytes).isEqualTo(newlyCachedBytes);
     assertThat(counters.contentLength).isEqualTo(contentLength);
   }
-
 }

From 8a566fb330918eb029a05fe8b558f4045358f15b Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 4 Dec 2018 14:16:20 +0000
Subject: [PATCH 273/832] Converge DownloadHelper implementations.

Moving most of the logic to the base DownloaderHelper helps to implement track
selection for downloading in a single place instead of multiple places.

PiperOrigin-RevId: 223964869
---
 .../exoplayer2/offline/DownloadHelper.java    | 89 ++++++++++++++++---
 .../offline/ProgressiveDownloadHelper.java    | 35 ++------
 .../dash/offline/DashDownloadHelper.java      | 68 +++++---------
 .../source/hls/offline/HlsDownloadHelper.java | 61 ++++---------
 .../offline/SsDownloadHelper.java             | 44 ++-------
 5 files changed, 126 insertions(+), 171 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index 905619c6f0..044bd8cc8a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -15,15 +15,21 @@
  */
 package com.google.android.exoplayer2.offline;
 
+import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
 import java.util.List;
 
-/** A helper for initializing and removing downloads. */
-public abstract class DownloadHelper {
+/**
+ * A helper for initializing and removing downloads.
+ *
+ * @param <T> The manifest type.
+ */
+public abstract class DownloadHelper<T> {
 
   /** A callback to be notified when the {@link DownloadHelper} is prepared. */
   public interface Callback {
@@ -44,6 +50,26 @@ public abstract class DownloadHelper {
     void onPrepareError(DownloadHelper helper, IOException e);
   }
 
+  private final String downloadType;
+  private final Uri uri;
+  @Nullable private final String cacheKey;
+
+  @Nullable private T manifest;
+  @Nullable private TrackGroupArray[] trackGroupArrays;
+
+  /**
+   * Create download helper.
+   *
+   * @param downloadType A download type. This value will be used as {@link DownloadAction#type}.
+   * @param uri A {@link Uri}.
+   * @param cacheKey An optional cache key.
+   */
+  public DownloadHelper(String downloadType, Uri uri, @Nullable String cacheKey) {
+    this.downloadType = downloadType;
+    this.uri = uri;
+    this.cacheKey = cacheKey;
+  }
+
   /**
    * Initializes the helper for starting a download.
    *
@@ -51,14 +77,15 @@ public abstract class DownloadHelper {
    *     will be invoked on the calling thread unless that thread does not have an associated {@link
    *     Looper}, in which case it will be called on the application's main thread.
    */
-  public void prepare(final Callback callback) {
+  public final void prepare(final Callback callback) {
     final Handler handler =
         new Handler(Looper.myLooper() != null ? Looper.myLooper() : Looper.getMainLooper());
     new Thread() {
       @Override
       public void run() {
         try {
-          prepareInternal();
+          manifest = loadManifest(uri);
+          trackGroupArrays = getTrackGroupArrays(manifest);
           handler.post(() -> callback.onPrepared(DownloadHelper.this));
         } catch (final IOException e) {
           handler.post(() -> callback.onPrepareError(DownloadHelper.this, e));
@@ -67,18 +94,20 @@ public abstract class DownloadHelper {
     }.start();
   }
 
-  /**
-   * Called on a background thread during preparation.
-   *
-   * @throws IOException If preparation fails.
-   */
-  protected abstract void prepareInternal() throws IOException;
+  /** Returns the manifest. Must not be called until after preparation completes. */
+  public final T getManifest() {
+    Assertions.checkNotNull(manifest);
+    return manifest;
+  }
 
   /**
    * Returns the number of periods for which media is available. Must not be called until after
    * preparation completes.
    */
-  public abstract int getPeriodCount();
+  public final int getPeriodCount() {
+    Assertions.checkNotNull(trackGroupArrays);
+    return trackGroupArrays.length;
+  }
 
   /**
    * Returns the track groups for the given period. Must not be called until after preparation
@@ -88,7 +117,10 @@ public abstract class DownloadHelper {
    * @return The track groups for the period. May be {@link TrackGroupArray#EMPTY} for single stream
    *     content.
    */
-  public abstract TrackGroupArray getTrackGroups(int periodIndex);
+  public final TrackGroupArray getTrackGroups(int periodIndex) {
+    Assertions.checkNotNull(trackGroupArrays);
+    return trackGroupArrays[periodIndex];
+  }
 
   /**
    * Builds a {@link DownloadAction} for downloading the specified tracks. Must not be called until
@@ -98,12 +130,41 @@ public abstract class DownloadHelper {
    * @param trackKeys The selected tracks. If empty, all streams will be downloaded.
    * @return The built {@link DownloadAction}.
    */
-  public abstract DownloadAction getDownloadAction(@Nullable byte[] data, List<TrackKey> trackKeys);
+  public final DownloadAction getDownloadAction(@Nullable byte[] data, List<TrackKey> trackKeys) {
+    return DownloadAction.createDownloadAction(
+        downloadType, uri, toStreamKeys(trackKeys), cacheKey, data);
+  }
 
   /**
    * Builds a {@link DownloadAction} for removing the media. May be called in any state.
    *
    * @return The built {@link DownloadAction}.
    */
-  public abstract DownloadAction getRemoveAction();
+  public final DownloadAction getRemoveAction() {
+    return DownloadAction.createRemoveAction(downloadType, uri, cacheKey);
+  }
+
+  /**
+   * Loads the manifest. This method is called on a background thread.
+   *
+   * @param uri The manifest uri.
+   * @throws IOException If loading fails.
+   */
+  protected abstract T loadManifest(Uri uri) throws IOException;
+
+  /**
+   * Returns the track group arrays for each period in the manifest.
+   *
+   * @param manifest The manifest.
+   * @return An array of {@link TrackGroupArray}s. One for each period in the manifest.
+   */
+  protected abstract TrackGroupArray[] getTrackGroupArrays(T manifest);
+
+  /**
+   * Converts a list of {@link TrackKey track keys} to {@link StreamKey stream keys}.
+   *
+   * @param trackKeys A list of track keys.
+   * @return A corresponding list of stream keys.
+   */
+  protected abstract List<StreamKey> toStreamKeys(List<TrackKey> trackKeys);
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java
index 6c1ceafd93..70587694c4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java
@@ -22,47 +22,28 @@ import java.util.Collections;
 import java.util.List;
 
 /** A {@link DownloadHelper} for progressive streams. */
-public final class ProgressiveDownloadHelper extends DownloadHelper {
-
-  private final Uri uri;
-  private final @Nullable String customCacheKey;
+public final class ProgressiveDownloadHelper extends DownloadHelper<Void> {
 
   public ProgressiveDownloadHelper(Uri uri) {
     this(uri, null);
   }
 
   public ProgressiveDownloadHelper(Uri uri, @Nullable String customCacheKey) {
-    this.uri = uri;
-    this.customCacheKey = customCacheKey;
+    super(DownloadAction.TYPE_PROGRESSIVE, uri, customCacheKey);
   }
 
   @Override
-  protected void prepareInternal() {
-    // Do nothing.
+  protected Void loadManifest(Uri uri) {
+    return null;
   }
 
   @Override
-  public int getPeriodCount() {
-    return 1;
+  protected TrackGroupArray[] getTrackGroupArrays(Void manifest) {
+    return new TrackGroupArray[] {TrackGroupArray.EMPTY};
   }
 
   @Override
-  public TrackGroupArray getTrackGroups(int periodIndex) {
-    return TrackGroupArray.EMPTY;
-  }
-
-  @Override
-  public DownloadAction getDownloadAction(@Nullable byte[] data, List<TrackKey> trackKeys) {
-    return DownloadAction.createDownloadAction(
-        DownloadAction.TYPE_PROGRESSIVE,
-        uri,
-        /* keys= */ Collections.emptyList(),
-        customCacheKey,
-        data);
-  }
-
-  @Override
-  public DownloadAction getRemoveAction() {
-    return DownloadAction.createRemoveAction(DownloadAction.TYPE_PROGRESSIVE, uri, customCacheKey);
+  protected List<StreamKey> toStreamKeys(List<TrackKey> trackKeys) {
+    return Collections.emptyList();
   }
 }
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java
index 9c6a24d1b2..f4e43f4641 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java
@@ -16,7 +16,6 @@
 package com.google.android.exoplayer2.source.dash.offline;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.offline.DownloadAction;
@@ -31,74 +30,49 @@ import com.google.android.exoplayer2.source.dash.manifest.DashManifestParser;
 import com.google.android.exoplayer2.source.dash.manifest.Representation;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.ParsingLoadable;
-import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 /** A {@link DownloadHelper} for DASH streams. */
-public final class DashDownloadHelper extends DownloadHelper {
+public final class DashDownloadHelper extends DownloadHelper<DashManifest> {
 
-  private final Uri uri;
   private final DataSource.Factory manifestDataSourceFactory;
 
-  private @MonotonicNonNull DashManifest manifest;
-
   public DashDownloadHelper(Uri uri, DataSource.Factory manifestDataSourceFactory) {
-    this.uri = uri;
+    super(DownloadAction.TYPE_DASH, uri, /* cacheKey= */ null);
     this.manifestDataSourceFactory = manifestDataSourceFactory;
   }
 
   @Override
-  protected void prepareInternal() throws IOException {
+  protected DashManifest loadManifest(Uri uri) throws IOException {
     DataSource dataSource = manifestDataSourceFactory.createDataSource();
-    manifest =
-        ParsingLoadable.load(dataSource, new DashManifestParser(), uri, C.DATA_TYPE_MANIFEST);
-  }
-
-  /** Returns the DASH manifest. Must not be called until after preparation completes. */
-  public DashManifest getManifest() {
-    Assertions.checkNotNull(manifest);
-    return manifest;
+    return ParsingLoadable.load(dataSource, new DashManifestParser(), uri, C.DATA_TYPE_MANIFEST);
   }
 
   @Override
-  public int getPeriodCount() {
-    Assertions.checkNotNull(manifest);
-    return manifest.getPeriodCount();
-  }
-
-  @Override
-  public TrackGroupArray getTrackGroups(int periodIndex) {
-    Assertions.checkNotNull(manifest);
-    List<AdaptationSet> adaptationSets = manifest.getPeriod(periodIndex).adaptationSets;
-    TrackGroup[] trackGroups = new TrackGroup[adaptationSets.size()];
-    for (int i = 0; i < trackGroups.length; i++) {
-      List<Representation> representations = adaptationSets.get(i).representations;
-      Format[] formats = new Format[representations.size()];
-      int representationsCount = representations.size();
-      for (int j = 0; j < representationsCount; j++) {
-        formats[j] = representations.get(j).format;
+  public TrackGroupArray[] getTrackGroupArrays(DashManifest manifest) {
+    int periodCount = manifest.getPeriodCount();
+    TrackGroupArray[] trackGroupArrays = new TrackGroupArray[periodCount];
+    for (int periodIndex = 0; periodIndex < periodCount; periodIndex++) {
+      List<AdaptationSet> adaptationSets = manifest.getPeriod(periodIndex).adaptationSets;
+      TrackGroup[] trackGroups = new TrackGroup[adaptationSets.size()];
+      for (int i = 0; i < trackGroups.length; i++) {
+        List<Representation> representations = adaptationSets.get(i).representations;
+        Format[] formats = new Format[representations.size()];
+        int representationsCount = representations.size();
+        for (int j = 0; j < representationsCount; j++) {
+          formats[j] = representations.get(j).format;
+        }
+        trackGroups[i] = new TrackGroup(formats);
       }
-      trackGroups[i] = new TrackGroup(formats);
+      trackGroupArrays[periodIndex] = new TrackGroupArray(trackGroups);
     }
-    return new TrackGroupArray(trackGroups);
+    return trackGroupArrays;
   }
 
   @Override
-  public DownloadAction getDownloadAction(@Nullable byte[] data, List<TrackKey> trackKeys) {
-    return DownloadAction.createDownloadAction(
-        DownloadAction.TYPE_DASH, uri, toStreamKeys(trackKeys), /* customCacheKey= */ null, data);
-  }
-
-  @Override
-  public DownloadAction getRemoveAction() {
-    return DownloadAction.createRemoveAction(
-        DownloadAction.TYPE_DASH, uri, /* customCacheKey= */ null);
-  }
-
-  private static List<StreamKey> toStreamKeys(List<TrackKey> trackKeys) {
+  protected List<StreamKey> toStreamKeys(List<TrackKey> trackKeys) {
     List<StreamKey> streamKeys = new ArrayList<>(trackKeys.size());
     for (int i = 0; i < trackKeys.size(); i++) {
       TrackKey trackKey = trackKeys.get(i);
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java
index d4cbd8b638..c6ebe8e294 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java
@@ -16,7 +16,6 @@
 package com.google.android.exoplayer2.source.hls.offline;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.offline.DownloadAction;
@@ -36,46 +35,31 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 /** A {@link DownloadHelper} for HLS streams. */
-public final class HlsDownloadHelper extends DownloadHelper {
+public final class HlsDownloadHelper extends DownloadHelper<HlsPlaylist> {
 
-  private final Uri uri;
   private final DataSource.Factory manifestDataSourceFactory;
 
-  private @MonotonicNonNull HlsPlaylist playlist;
   private int[] renditionGroups;
 
   public HlsDownloadHelper(Uri uri, DataSource.Factory manifestDataSourceFactory) {
-    this.uri = uri;
+    super(DownloadAction.TYPE_HLS, uri, /* cacheKey= */ null);
     this.manifestDataSourceFactory = manifestDataSourceFactory;
   }
 
   @Override
-  protected void prepareInternal() throws IOException {
+  protected HlsPlaylist loadManifest(Uri uri) throws IOException {
     DataSource dataSource = manifestDataSourceFactory.createDataSource();
-    playlist = ParsingLoadable.load(dataSource, new HlsPlaylistParser(), uri, C.DATA_TYPE_MANIFEST);
-  }
-
-  /** Returns the HLS playlist. Must not be called until after preparation completes. */
-  public HlsPlaylist getPlaylist() {
-    Assertions.checkNotNull(playlist);
-    return playlist;
+    return ParsingLoadable.load(dataSource, new HlsPlaylistParser(), uri, C.DATA_TYPE_MANIFEST);
   }
 
   @Override
-  public int getPeriodCount() {
-    Assertions.checkNotNull(playlist);
-    return 1;
-  }
-
-  @Override
-  public TrackGroupArray getTrackGroups(int periodIndex) {
+  protected TrackGroupArray[] getTrackGroupArrays(HlsPlaylist playlist) {
     Assertions.checkNotNull(playlist);
     if (playlist instanceof HlsMediaPlaylist) {
       renditionGroups = new int[0];
-      return TrackGroupArray.EMPTY;
+      return new TrackGroupArray[] {TrackGroupArray.EMPTY};
     }
     // TODO: Generate track groups as in playback. Reverse the mapping in getDownloadAction.
     HlsMasterPlaylist masterPlaylist = (HlsMasterPlaylist) playlist;
@@ -94,24 +78,18 @@ public final class HlsDownloadHelper extends DownloadHelper {
       renditionGroups[trackGroupIndex] = HlsMasterPlaylist.GROUP_INDEX_SUBTITLE;
       trackGroups[trackGroupIndex++] = new TrackGroup(toFormats(masterPlaylist.subtitles));
     }
-    return new TrackGroupArray(Arrays.copyOf(trackGroups, trackGroupIndex));
+    return new TrackGroupArray[] {new TrackGroupArray(Arrays.copyOf(trackGroups, trackGroupIndex))};
   }
 
   @Override
-  public DownloadAction getDownloadAction(@Nullable byte[] data, List<TrackKey> trackKeys) {
-    Assertions.checkNotNull(renditionGroups);
-    return DownloadAction.createDownloadAction(
-        DownloadAction.TYPE_HLS,
-        uri,
-        toStreamKeys(trackKeys, renditionGroups),
-        /* customCacheKey= */ null,
-        data);
-  }
-
-  @Override
-  public DownloadAction getRemoveAction() {
-    return DownloadAction.createRemoveAction(
-        DownloadAction.TYPE_HLS, uri, /* customCacheKey= */ null);
+  protected List<StreamKey> toStreamKeys(List<TrackKey> trackKeys) {
+    List<StreamKey> representationKeys = new ArrayList<>(trackKeys.size());
+    for (int i = 0; i < trackKeys.size(); i++) {
+      TrackKey trackKey = trackKeys.get(i);
+      representationKeys.add(
+          new StreamKey(renditionGroups[trackKey.groupIndex], trackKey.trackIndex));
+    }
+    return representationKeys;
   }
 
   private static Format[] toFormats(List<HlsMasterPlaylist.HlsUrl> hlsUrls) {
@@ -121,13 +99,4 @@ public final class HlsDownloadHelper extends DownloadHelper {
     }
     return formats;
   }
-
-  private static List<StreamKey> toStreamKeys(List<TrackKey> trackKeys, int[] groups) {
-    List<StreamKey> representationKeys = new ArrayList<>(trackKeys.size());
-    for (int i = 0; i < trackKeys.size(); i++) {
-      TrackKey trackKey = trackKeys.get(i);
-      representationKeys.add(new StreamKey(groups[trackKey.groupIndex], trackKey.trackIndex));
-    }
-    return representationKeys;
-  }
 }
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java
index d7083400cd..154ac30ac6 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java
@@ -16,7 +16,6 @@
 package com.google.android.exoplayer2.source.smoothstreaming.offline;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadHelper;
@@ -28,67 +27,38 @@ import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest;
 import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifestParser;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.ParsingLoadable;
-import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 /** A {@link DownloadHelper} for SmoothStreaming streams. */
-public final class SsDownloadHelper extends DownloadHelper {
+public final class SsDownloadHelper extends DownloadHelper<SsManifest> {
 
-  private final Uri uri;
   private final DataSource.Factory manifestDataSourceFactory;
 
-  private @MonotonicNonNull SsManifest manifest;
-
   public SsDownloadHelper(Uri uri, DataSource.Factory manifestDataSourceFactory) {
-    this.uri = uri;
+    super(DownloadAction.TYPE_SS, uri, /* cacheKey= */ null);
     this.manifestDataSourceFactory = manifestDataSourceFactory;
   }
 
   @Override
-  protected void prepareInternal() throws IOException {
+  protected SsManifest loadManifest(Uri uri) throws IOException {
     DataSource dataSource = manifestDataSourceFactory.createDataSource();
-    manifest = ParsingLoadable.load(dataSource, new SsManifestParser(), uri, C.DATA_TYPE_MANIFEST);
-  }
-
-  /** Returns the SmoothStreaming manifest. Must not be called until after preparation completes. */
-  public SsManifest getManifest() {
-    Assertions.checkNotNull(manifest);
-    return manifest;
+    return ParsingLoadable.load(dataSource, new SsManifestParser(), uri, C.DATA_TYPE_MANIFEST);
   }
 
   @Override
-  public int getPeriodCount() {
-    Assertions.checkNotNull(manifest);
-    return 1;
-  }
-
-  @Override
-  public TrackGroupArray getTrackGroups(int periodIndex) {
-    Assertions.checkNotNull(manifest);
+  protected TrackGroupArray[] getTrackGroupArrays(SsManifest manifest) {
     SsManifest.StreamElement[] streamElements = manifest.streamElements;
     TrackGroup[] trackGroups = new TrackGroup[streamElements.length];
     for (int i = 0; i < streamElements.length; i++) {
       trackGroups[i] = new TrackGroup(streamElements[i].formats);
     }
-    return new TrackGroupArray(trackGroups);
+    return new TrackGroupArray[] {new TrackGroupArray(trackGroups)};
   }
 
   @Override
-  public DownloadAction getDownloadAction(@Nullable byte[] data, List<TrackKey> trackKeys) {
-    return DownloadAction.createDownloadAction(
-        DownloadAction.TYPE_SS, uri, toStreamKeys(trackKeys), /* customCacheKey= */ null, data);
-  }
-
-  @Override
-  public DownloadAction getRemoveAction() {
-    return DownloadAction.createRemoveAction(
-        DownloadAction.TYPE_SS, uri, /* customCacheKey= */ null);
-  }
-
-  private static List<StreamKey> toStreamKeys(List<TrackKey> trackKeys) {
+  protected List<StreamKey> toStreamKeys(List<TrackKey> trackKeys) {
     List<StreamKey> representationKeys = new ArrayList<>(trackKeys.size());
     for (int i = 0; i < trackKeys.size(); i++) {
       TrackKey trackKey = trackKeys.get(i);

From 976a21f1392d92746f8c2f8377372b4dc00f709b Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 4 Dec 2018 17:30:08 +0000
Subject: [PATCH 274/832] Add no-op defaults to
 Video(Audio)RendererEventListener.

This is in line with how Player.EventListener and AnalyticsListener methods are
defined and helps to only implement the callbacks needed.

PiperOrigin-RevId: 223991262
---
 .../audio/AudioRendererEventListener.java     | 18 ++++++-----
 .../video/VideoRendererEventListener.java     | 32 +++++++++----------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java
index 7c3c1481fc..eff7bc8de2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java
@@ -25,7 +25,8 @@ import com.google.android.exoplayer2.decoder.DecoderCounters;
 import com.google.android.exoplayer2.util.Assertions;
 
 /**
- * Listener of audio {@link Renderer} events.
+ * Listener of audio {@link Renderer} events. All methods have no-op default implementations to
+ * allow selective overrides.
  */
 public interface AudioRendererEventListener {
 
@@ -35,14 +36,14 @@ public interface AudioRendererEventListener {
    * @param counters {@link DecoderCounters} that will be updated by the renderer for as long as it
    *     remains enabled.
    */
-  void onAudioEnabled(DecoderCounters counters);
+  default void onAudioEnabled(DecoderCounters counters) {}
 
   /**
    * Called when the audio session is set.
    *
    * @param audioSessionId The audio session id.
    */
-  void onAudioSessionId(int audioSessionId);
+  default void onAudioSessionId(int audioSessionId) {}
 
   /**
    * Called when a decoder is created.
@@ -52,15 +53,15 @@ public interface AudioRendererEventListener {
    *     finished.
    * @param initializationDurationMs The time taken to initialize the decoder in milliseconds.
    */
-  void onAudioDecoderInitialized(String decoderName, long initializedTimestampMs,
-      long initializationDurationMs);
+  default void onAudioDecoderInitialized(
+      String decoderName, long initializedTimestampMs, long initializationDurationMs) {}
 
   /**
    * Called when the format of the media being consumed by the renderer changes.
    *
    * @param format The new format.
    */
-  void onAudioInputFormatChanged(Format format);
+  default void onAudioInputFormatChanged(Format format) {}
 
   /**
    * Called when an {@link AudioSink} underrun occurs.
@@ -71,14 +72,15 @@ public interface AudioRendererEventListener {
    *     as the buffered media can have a variable bitrate so the duration may be unknown.
    * @param elapsedSinceLastFeedMs The time since the {@link AudioSink} was last fed data.
    */
-  void onAudioSinkUnderrun(int bufferSize, long bufferSizeMs, long elapsedSinceLastFeedMs);
+  default void onAudioSinkUnderrun(
+      int bufferSize, long bufferSizeMs, long elapsedSinceLastFeedMs) {}
 
   /**
    * Called when the renderer is disabled.
    *
    * @param counters {@link DecoderCounters} that were updated by the renderer.
    */
-  void onAudioDisabled(DecoderCounters counters);
+  default void onAudioDisabled(DecoderCounters counters) {}
 
   /**
    * Dispatches events to a {@link AudioRendererEventListener}.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java b/library/core/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java
index 617211afb7..7d78ba03c7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java
@@ -26,7 +26,8 @@ import com.google.android.exoplayer2.decoder.DecoderCounters;
 import com.google.android.exoplayer2.util.Assertions;
 
 /**
- * Listener of video {@link Renderer} events.
+ * Listener of video {@link Renderer} events. All methods have no-op default implementations to
+ * allow selective overrides.
  */
 public interface VideoRendererEventListener {
 
@@ -36,7 +37,7 @@ public interface VideoRendererEventListener {
    * @param counters {@link DecoderCounters} that will be updated by the renderer for as long as it
    *     remains enabled.
    */
-  void onVideoEnabled(DecoderCounters counters);
+  default void onVideoEnabled(DecoderCounters counters) {}
 
   /**
    * Called when a decoder is created.
@@ -46,15 +47,15 @@ public interface VideoRendererEventListener {
    *     finished.
    * @param initializationDurationMs The time taken to initialize the decoder in milliseconds.
    */
-  void onVideoDecoderInitialized(String decoderName, long initializedTimestampMs,
-      long initializationDurationMs);
+  default void onVideoDecoderInitialized(
+      String decoderName, long initializedTimestampMs, long initializationDurationMs) {}
 
   /**
    * Called when the format of the media being consumed by the renderer changes.
    *
    * @param format The new format.
    */
-  void onVideoInputFormatChanged(Format format);
+  default void onVideoInputFormatChanged(Format format) {}
 
   /**
    * Called to report the number of frames dropped by the renderer. Dropped frames are reported
@@ -62,12 +63,11 @@ public interface VideoRendererEventListener {
    * reaches a specified threshold whilst the renderer is started.
    *
    * @param count The number of dropped frames.
-   * @param elapsedMs The duration in milliseconds over which the frames were dropped. This
-   *     duration is timed from when the renderer was started or from when dropped frames were
-   *     last reported (whichever was more recent), and not from when the first of the reported
-   *     drops occurred.
+   * @param elapsedMs The duration in milliseconds over which the frames were dropped. This duration
+   *     is timed from when the renderer was started or from when dropped frames were last reported
+   *     (whichever was more recent), and not from when the first of the reported drops occurred.
    */
-  void onDroppedFrames(int count, long elapsedMs);
+  default void onDroppedFrames(int count, long elapsedMs) {}
 
   /**
    * Called before a frame is rendered for the first time since setting the surface, and each time
@@ -82,12 +82,12 @@ public interface VideoRendererEventListener {
    *     this is not possible. Applications that use {@link TextureView} can apply the rotation by
    *     calling {@link TextureView#setTransform}. Applications that do not expect to encounter
    *     rotated videos can safely ignore this parameter.
-   * @param pixelWidthHeightRatio The width to height ratio of each pixel. For the normal case
-   *     of square pixels this will be equal to 1.0. Different values are indicative of anamorphic
+   * @param pixelWidthHeightRatio The width to height ratio of each pixel. For the normal case of
+   *     square pixels this will be equal to 1.0. Different values are indicative of anamorphic
    *     content.
    */
-  void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees,
-      float pixelWidthHeightRatio);
+  default void onVideoSizeChanged(
+      int width, int height, int unappliedRotationDegrees, float pixelWidthHeightRatio) {}
 
   /**
    * Called when a frame is rendered for the first time since setting the surface, and when a frame
@@ -96,14 +96,14 @@ public interface VideoRendererEventListener {
    * @param surface The {@link Surface} to which a first frame has been rendered, or {@code null} if
    *     the renderer renders to something that isn't a {@link Surface}.
    */
-  void onRenderedFirstFrame(@Nullable Surface surface);
+  default void onRenderedFirstFrame(@Nullable Surface surface) {}
 
   /**
    * Called when the renderer is disabled.
    *
    * @param counters {@link DecoderCounters} that were updated by the renderer.
    */
-  void onVideoDisabled(DecoderCounters counters);
+  default void onVideoDisabled(DecoderCounters counters) {}
 
   /**
    * Dispatches events to a {@link VideoRendererEventListener}.

From 5bbe3ae7d6f65db9e0e97076da84ead7fe5f907e Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 4 Dec 2018 17:45:50 +0000
Subject: [PATCH 275/832] Cache data with unknown length by default

We currently default to not caching data if the content length
cannot be resolved once the DataSource has been open. The
reason for this is to avoid caching progressive live streams.
By doing this we were accidentally not caching in other places
where caching is possible, such as DASH/SS/HLS segments during
playback if the server doesn't include a Content-Length header.
Also HLS encryption key chunks, which were very unlikely to be
cached during playback because we explicitly set FLAG_ALLOW_GZIP
(which normally stops content length from resolving) without
setting FLAG_ALLOW_CACHING_UNKNOWN_LENGTH.

It seems like a good idea to flip the default at this point,
and explicitly disable caching in the one case where we want
that to happen.

PiperOrigin-RevId: 223994110
---
 RELEASENOTES.md                               |  3 ++
 .../source/ExtractorMediaPeriod.java          | 16 ++++++++--
 .../source/SingleSampleMediaSource.java       |  3 +-
 .../android/exoplayer2/upstream/DataSpec.java | 29 +++++++++----------
 .../exoplayer2/upstream/ParsingLoadable.java  |  6 +---
 .../upstream/cache/CacheDataSink.java         |  2 +-
 .../exoplayer2/upstream/cache/CacheUtil.java  |  2 +-
 .../upstream/cache/CacheDataSourceTest.java   |  3 +-
 .../exoplayer2/testutil/CacheAsserts.java     |  2 +-
 9 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index d7bd90055e..ec11b5b7ed 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -9,6 +9,9 @@
   ([#3314](https://github.com/google/ExoPlayer/issues/3314)).
 * Do not retry failed loads whose error is `FileNotFoundException`.
 * Prevent Cea608Decoder from generating Subtitles with null Cues list
+* Caching: Cache data with unknown length by default. The previous flag to opt in
+  to this behavior (`DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH`) has been
+  replaced with an opt out flag (`DataSpec.FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN`).
 
 ### 2.9.2 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java
index 49209023e6..cb154eed30 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java
@@ -850,6 +850,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     private DataSpec dataSpec;
     private long length;
 
+    @SuppressWarnings("method.invocation.invalid")
     public ExtractingLoadable(
         Uri uri,
         DataSource dataSource,
@@ -864,7 +865,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
       this.positionHolder = new PositionHolder();
       this.pendingExtractorSeek = true;
       this.length = C.LENGTH_UNSET;
-      dataSpec = new DataSpec(uri, positionHolder.position, C.LENGTH_UNSET, customCacheKey);
+      dataSpec = buildDataSpec(/* position= */ 0);
     }
 
     // Loadable implementation.
@@ -881,7 +882,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
         ExtractorInput input = null;
         try {
           long position = positionHolder.position;
-          dataSpec = new DataSpec(uri, position, C.LENGTH_UNSET, customCacheKey);
+          dataSpec = buildDataSpec(position);
           length = dataSource.open(dataSpec);
           if (length != C.LENGTH_UNSET) {
             length += position;
@@ -915,6 +916,17 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 
     // Internal methods.
 
+    private DataSpec buildDataSpec(long position) {
+      // Disable caching if the content length cannot be resolved, since this is indicative of a
+      // progressive live stream.
+      return new DataSpec(
+          uri,
+          position,
+          C.LENGTH_UNSET,
+          customCacheKey,
+          DataSpec.FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN);
+    }
+
     private void setLoadPosition(long position, long timeUs) {
       positionHolder.position = position;
       seekTimeUs = timeUs;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
index 1ac6207454..218bc84b11 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
@@ -287,8 +287,7 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
     this.durationUs = durationUs;
     this.loadErrorHandlingPolicy = loadErrorHandlingPolicy;
     this.treatLoadErrorsAsEndOfStream = treatLoadErrorsAsEndOfStream;
-    dataSpec =
-        new DataSpec(uri, DataSpec.FLAG_ALLOW_GZIP | DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH);
+    dataSpec = new DataSpec(uri, DataSpec.FLAG_ALLOW_GZIP);
     timeline =
         new SinglePeriodTimeline(durationUs, /* isSeekable= */ true, /* isDynamic= */ false, tag);
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java
index 4a4cc021f4..c33c7c823f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java
@@ -32,32 +32,29 @@ public final class DataSpec {
 
   /**
    * The flags that apply to any request for data. Possible flag values are {@link #FLAG_ALLOW_GZIP}
-   * and {@link #FLAG_ALLOW_CACHING_UNKNOWN_LENGTH}.
+   * and {@link #FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN}.
    */
   @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef(
       flag = true,
-      value = {FLAG_ALLOW_GZIP, FLAG_ALLOW_CACHING_UNKNOWN_LENGTH})
+      value = {FLAG_ALLOW_GZIP, FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN})
   public @interface Flags {}
   /**
-   * Permits an underlying network stack to request that the server use gzip compression.
-   * <p>
-   * Should not typically be set if the data being requested is already compressed (e.g. most audio
-   * and video requests). May be set when requesting other data.
-   * <p>
-   * When a {@link DataSource} is used to request data with this flag set, and if the
-   * {@link DataSource} does make a network request, then the value returned from
-   * {@link DataSource#open(DataSpec)} will typically be {@link C#LENGTH_UNSET}. The data read from
-   * {@link DataSource#read(byte[], int, int)} will be the decompressed data.
+   * Allows an underlying network stack to request that the server use gzip compression.
+   *
+   * <p>Should not typically be set if the data being requested is already compressed (e.g. most
+   * audio and video requests). May be set when requesting other data.
+   *
+   * <p>When a {@link DataSource} is used to request data with this flag set, and if the {@link
+   * DataSource} does make a network request, then the value returned from {@link
+   * DataSource#open(DataSpec)} will typically be {@link C#LENGTH_UNSET}. The data read from {@link
+   * DataSource#read(byte[], int, int)} will be the decompressed data.
    */
   public static final int FLAG_ALLOW_GZIP = 1;
 
-  /**
-   * Permits content to be cached even if its length can not be resolved. Typically this's the case
-   * for progressive live streams and when {@link #FLAG_ALLOW_GZIP} is used.
-   */
-  public static final int FLAG_ALLOW_CACHING_UNKNOWN_LENGTH = 1 << 1; // 2
+  /** Prevents caching if the length cannot be resolved when the {@link DataSource} is opened. */
+  public static final int FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN = 1 << 1; // 2
 
   /**
    * The set of HTTP methods that are supported by ExoPlayer {@link HttpDataSource}s. One of {@link
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java
index cdcb3787fa..48e03a0083 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java
@@ -91,11 +91,7 @@ public final class ParsingLoadable<T> implements Loadable {
    * @param parser Parses the object from the response.
    */
   public ParsingLoadable(DataSource dataSource, Uri uri, int type, Parser<? extends T> parser) {
-    this(
-        dataSource,
-        new DataSpec(uri, DataSpec.FLAG_ALLOW_GZIP | DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH),
-        type,
-        parser);
+    this(dataSource, new DataSpec(uri, DataSpec.FLAG_ALLOW_GZIP), type, parser);
   }
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
index 8d310015f8..e9c3379280 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
@@ -121,7 +121,7 @@ public final class CacheDataSink implements DataSink {
   @Override
   public void open(DataSpec dataSpec) throws CacheDataSinkException {
     if (dataSpec.length == C.LENGTH_UNSET
-        && !dataSpec.isFlagSet(DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH)) {
+        && dataSpec.isFlagSet(DataSpec.FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN)) {
       this.dataSpec = null;
       return;
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
index 1a44fb3144..fd4937ef86 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
@@ -268,7 +268,7 @@ public final class CacheUtil {
                 dataSpec.position + absoluteStreamPosition - dataSpec.absoluteStreamPosition,
                 C.LENGTH_UNSET,
                 dataSpec.key,
-                dataSpec.flags | DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH);
+                dataSpec.flags);
         long resolvedLength = dataSource.open(dataSpec);
         if (counters.contentLength == C.LENGTH_UNSET && resolvedLength != C.LENGTH_UNSET) {
           counters.contentLength = dataSpec.absoluteStreamPosition + resolvedLength;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
index 83126ce34a..9182074eb9 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
@@ -602,7 +602,6 @@ public final class CacheDataSourceTest {
   }
 
   private DataSpec buildDataSpec(long position, long length, @Nullable String key) {
-    return new DataSpec(
-        testDataUri, position, length, key, DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH);
+    return new DataSpec(testDataUri, position, length, key);
   }
 }
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/CacheAsserts.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/CacheAsserts.java
index 9d6fbe37e7..664532d3ff 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/CacheAsserts.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/CacheAsserts.java
@@ -83,7 +83,7 @@ public final class CacheAsserts {
    * @throws IOException If an error occurred reading from the Cache.
    */
   public static void assertDataCached(Cache cache, Uri uri, byte[] expected) throws IOException {
-    DataSpec dataSpec = new DataSpec(uri, DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH);
+    DataSpec dataSpec = new DataSpec(uri);
     assertDataCached(cache, dataSpec, expected);
   }
 

From f8b85739b13eb423e092fd8a0f7078527cf2f42b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 4 Dec 2018 22:38:01 +0000
Subject: [PATCH 276/832] Fix race condition that could cause downloader not to
 be canceled

PiperOrigin-RevId: 224048465
---
 .../android/exoplayer2/offline/DownloadManager.java    | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index c5645bedf0..4a76c80d64 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -565,7 +565,7 @@ public final class DownloadManager {
      */
     @TargetState private volatile int targetState;
 
-    @MonotonicNonNull private volatile Downloader downloader;
+    @MonotonicNonNull private Downloader downloader;
     @MonotonicNonNull private Thread thread;
     @MonotonicNonNull private Throwable error;
 
@@ -624,6 +624,7 @@ public final class DownloadManager {
         state = STATE_STARTED;
         targetState = STATE_COMPLETED;
         downloadManager.onTaskStateChange(this);
+        downloader = downloaderFactory.createDownloader(action);
         thread = new Thread(this);
         thread.start();
       }
@@ -648,11 +649,7 @@ public final class DownloadManager {
 
     private void stopDownloadThread(@TargetState int targetState) {
       this.targetState = targetState;
-      // TODO: The possibility of downloader being null here may prevent the download thread from
-      // stopping in a timely way. Fix this.
-      if (downloader != null) {
-        downloader.cancel();
-      }
+      Assertions.checkNotNull(downloader).cancel();
       Assertions.checkNotNull(thread).interrupt();
     }
 
@@ -675,7 +672,6 @@ public final class DownloadManager {
       logd("Task is started", this);
       Throwable error = null;
       try {
-        downloader = downloaderFactory.createDownloader(action);
         if (action.isRemoveAction) {
           downloader.remove();
         } else {

From 22a8aa311bf37936e4e4d51b3ab40863ea5d885d Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 4 Dec 2018 23:28:11 +0000
Subject: [PATCH 277/832] Clean up requesting non-media segments in downloader
 implementations

- Enable GZIP for media playlist + encryption key chunk requests in
  HLS, as we do during playback
- Pass around DataSpecs rather than Uris. This will be needed for if
  we add manifest cacheKey support (which seems like a good idea for
  completeness, if nothing else)

PiperOrigin-RevId: 224057139
---
 .../exoplayer2/offline/SegmentDownloader.java | 22 ++++--
 .../exoplayer2/upstream/ParsingLoadable.java  | 18 +++++
 .../source/dash/offline/DashDownloader.java   | 10 ++-
 .../source/hls/offline/HlsDownloader.java     | 74 ++++++++++---------
 .../smoothstreaming/offline/SsDownloader.java |  4 +-
 5 files changed, 81 insertions(+), 47 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
index e55d2a1baf..1b32abff60 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
@@ -62,7 +62,7 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
 
   private static final int BUFFER_SIZE_BYTES = 128 * 1024;
 
-  private final Uri manifestUri;
+  private final DataSpec manifestDataSpec;
   private final Cache cache;
   private final CacheDataSource dataSource;
   private final CacheDataSource offlineDataSource;
@@ -84,7 +84,7 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
    */
   public SegmentDownloader(
       Uri manifestUri, List<StreamKey> streamKeys, DownloaderConstructorHelper constructorHelper) {
-    this.manifestUri = manifestUri;
+    this.manifestDataSpec = getCompressibleDataSpec(manifestUri);
     this.streamKeys = new ArrayList<>(streamKeys);
     this.cache = constructorHelper.getCache();
     this.dataSource = constructorHelper.createCacheDataSource();
@@ -171,7 +171,7 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
   @Override
   public final void remove() throws InterruptedException {
     try {
-      M manifest = getManifest(offlineDataSource, manifestUri);
+      M manifest = getManifest(offlineDataSource, manifestDataSpec);
       List<Segment> segments = getSegments(offlineDataSource, manifest, true);
       for (int i = 0; i < segments.size(); i++) {
         removeDataSpec(segments.get(i).dataSpec);
@@ -180,7 +180,7 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
       // Ignore exceptions when removing.
     } finally {
       // Always attempt to remove the manifest.
-      removeDataSpec(new DataSpec(manifestUri));
+      removeDataSpec(manifestDataSpec);
     }
   }
 
@@ -190,11 +190,11 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
    * Loads and parses the manifest.
    *
    * @param dataSource The {@link DataSource} through which to load.
-   * @param uri The manifest uri.
+   * @param dataSpec The manifest {@link DataSpec}.
    * @return The manifest.
    * @throws IOException If an error occurs reading data.
    */
-  protected abstract M getManifest(DataSource dataSource, Uri uri) throws IOException;
+  protected abstract M getManifest(DataSource dataSource, DataSpec dataSpec) throws IOException;
 
   /**
    * Returns a list of all downloadable {@link Segment}s for a given manifest.
@@ -217,7 +217,7 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
   // Writes to downloadedSegments and downloadedBytes are safe. See the comment on download().
   @SuppressWarnings("NonAtomicVolatileUpdate")
   private List<Segment> initDownload() throws IOException, InterruptedException {
-    M manifest = getManifest(dataSource, manifestUri);
+    M manifest = getManifest(dataSource, manifestDataSpec);
     if (!streamKeys.isEmpty()) {
       manifest = manifest.copy(streamKeys);
     }
@@ -252,4 +252,12 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
     CacheUtil.remove(dataSpec, cache, cacheKeyFactory);
   }
 
+  protected static DataSpec getCompressibleDataSpec(Uri uri) {
+    return new DataSpec(
+        uri,
+        /* absoluteStreamPosition= */ 0,
+        /* length= */ C.LENGTH_UNSET,
+        /* key= */ null,
+        /* flags= */ DataSpec.FLAG_ALLOW_GZIP);
+  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java
index 48e03a0083..b41f1aa09f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java
@@ -69,6 +69,24 @@ public final class ParsingLoadable<T> implements Loadable {
     return Assertions.checkNotNull(loadable.getResult());
   }
 
+  /**
+   * Loads a single parsable object.
+   *
+   * @param dataSource The {@link DataSource} through which the object should be read.
+   * @param parser The {@link Parser} to parse the object from the response.
+   * @param dataSpec The {@link DataSpec} of the object to read.
+   * @param type The type of the data. One of the {@link C}{@code DATA_TYPE_*} constants.
+   * @return The parsed object
+   * @throws IOException Thrown if there is an error while loading or parsing.
+   */
+  public static <T> T load(
+      DataSource dataSource, Parser<? extends T> parser, DataSpec dataSpec, int type)
+      throws IOException {
+    ParsingLoadable<T> loadable = new ParsingLoadable<>(dataSource, dataSpec, type, parser);
+    loadable.load();
+    return Assertions.checkNotNull(loadable.getResult());
+  }
+
   /**
    * The {@link DataSpec} that defines the data to be loaded.
    */
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.java
index 68120d6177..5dad468724 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.java
@@ -28,11 +28,13 @@ import com.google.android.exoplayer2.source.dash.DashUtil;
 import com.google.android.exoplayer2.source.dash.DashWrappingSegmentIndex;
 import com.google.android.exoplayer2.source.dash.manifest.AdaptationSet;
 import com.google.android.exoplayer2.source.dash.manifest.DashManifest;
+import com.google.android.exoplayer2.source.dash.manifest.DashManifestParser;
 import com.google.android.exoplayer2.source.dash.manifest.Period;
 import com.google.android.exoplayer2.source.dash.manifest.RangedUri;
 import com.google.android.exoplayer2.source.dash.manifest.Representation;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DataSpec;
+import com.google.android.exoplayer2.upstream.ParsingLoadable;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -73,8 +75,9 @@ public final class DashDownloader extends SegmentDownloader<DashManifest> {
   }
 
   @Override
-  protected DashManifest getManifest(DataSource dataSource, Uri uri) throws IOException {
-    return DashUtil.loadManifest(dataSource, uri);
+  protected DashManifest getManifest(DataSource dataSource, DataSpec dataSpec) throws IOException {
+    return ParsingLoadable.load(
+        dataSource, new DashManifestParser(), dataSpec, C.DATA_TYPE_MANIFEST);
   }
 
   @Override
@@ -121,8 +124,7 @@ public final class DashDownloader extends SegmentDownloader<DashManifest> {
         if (!allowIncompleteList) {
           throw e;
         }
-        // Loading failed, but generating an incomplete segment list is allowed. Advance to the next
-        // representation.
+        // Generating an incomplete segment list is allowed. Advance to the next representation.
         continue;
       }
 
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java
index 85f41df359..a0f64f298e 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java
@@ -71,35 +71,37 @@ public final class HlsDownloader extends SegmentDownloader<HlsPlaylist> {
   }
 
   @Override
-  protected HlsPlaylist getManifest(DataSource dataSource, Uri uri) throws IOException {
-    return loadManifest(dataSource, uri);
+  protected HlsPlaylist getManifest(DataSource dataSource, DataSpec dataSpec) throws IOException {
+    return loadManifest(dataSource, dataSpec);
   }
 
   @Override
   protected List<Segment> getSegments(
       DataSource dataSource, HlsPlaylist playlist, boolean allowIncompleteList) throws IOException {
-    ArrayList<Uri> mediaPlaylistUris = new ArrayList<>();
+    String baseUri = playlist.baseUri;
+
+    ArrayList<DataSpec> mediaPlaylistDataSpecs = new ArrayList<>();
     if (playlist instanceof HlsMasterPlaylist) {
       HlsMasterPlaylist masterPlaylist = (HlsMasterPlaylist) playlist;
-      addResolvedUris(masterPlaylist.baseUri, masterPlaylist.variants, mediaPlaylistUris);
-      addResolvedUris(masterPlaylist.baseUri, masterPlaylist.audios, mediaPlaylistUris);
-      addResolvedUris(masterPlaylist.baseUri, masterPlaylist.subtitles, mediaPlaylistUris);
+      addMediaPlaylistDataSpecs(baseUri, masterPlaylist.variants, mediaPlaylistDataSpecs);
+      addMediaPlaylistDataSpecs(baseUri, masterPlaylist.audios, mediaPlaylistDataSpecs);
+      addMediaPlaylistDataSpecs(baseUri, masterPlaylist.subtitles, mediaPlaylistDataSpecs);
     } else {
-      mediaPlaylistUris.add(Uri.parse(playlist.baseUri));
+      mediaPlaylistDataSpecs.add(SegmentDownloader.getCompressibleDataSpec(Uri.parse(baseUri)));
     }
-    ArrayList<Segment> segments = new ArrayList<>();
 
+    ArrayList<Segment> segments = new ArrayList<>();
     HashSet<Uri> seenEncryptionKeyUris = new HashSet<>();
-    for (Uri mediaPlaylistUri : mediaPlaylistUris) {
+    for (DataSpec mediaPlaylistDataSpec : mediaPlaylistDataSpecs) {
+      segments.add(new Segment(/* startTimeUs= */ 0, mediaPlaylistDataSpec));
       HlsMediaPlaylist mediaPlaylist;
       try {
-        mediaPlaylist = (HlsMediaPlaylist) loadManifest(dataSource, mediaPlaylistUri);
-        segments.add(new Segment(mediaPlaylist.startTimeUs, new DataSpec(mediaPlaylistUri)));
+        mediaPlaylist = (HlsMediaPlaylist) loadManifest(dataSource, mediaPlaylistDataSpec);
       } catch (IOException e) {
         if (!allowIncompleteList) {
           throw e;
         }
-        segments.add(new Segment(0, new DataSpec(mediaPlaylistUri)));
+        // Generating an incomplete segment list is allowed. Advance to the next media playlist.
         continue;
       }
       HlsMediaPlaylist.Segment lastInitSegment = null;
@@ -109,39 +111,43 @@ public final class HlsDownloader extends SegmentDownloader<HlsPlaylist> {
         HlsMediaPlaylist.Segment initSegment = segment.initializationSegment;
         if (initSegment != null && initSegment != lastInitSegment) {
           lastInitSegment = initSegment;
-          addSegment(segments, mediaPlaylist, initSegment, seenEncryptionKeyUris);
+          addSegment(mediaPlaylist, initSegment, seenEncryptionKeyUris, segments);
         }
-        addSegment(segments, mediaPlaylist, segment, seenEncryptionKeyUris);
+        addSegment(mediaPlaylist, segment, seenEncryptionKeyUris, segments);
       }
     }
     return segments;
   }
 
-  private static HlsPlaylist loadManifest(DataSource dataSource, Uri uri) throws IOException {
-    return ParsingLoadable.load(dataSource, new HlsPlaylistParser(), uri, C.DATA_TYPE_MANIFEST);
+  private void addMediaPlaylistDataSpecs(String baseUri, List<HlsUrl> urls, List<DataSpec> out) {
+    for (int i = 0; i < urls.size(); i++) {
+      Uri playlistUri = UriUtil.resolveToUri(baseUri, urls.get(i).url);
+      out.add(SegmentDownloader.getCompressibleDataSpec(playlistUri));
+    }
   }
 
-  private static void addSegment(
-      ArrayList<Segment> segments,
+  private static HlsPlaylist loadManifest(DataSource dataSource, DataSpec dataSpec)
+      throws IOException {
+    return ParsingLoadable.load(
+        dataSource, new HlsPlaylistParser(), dataSpec, C.DATA_TYPE_MANIFEST);
+  }
+
+  private void addSegment(
       HlsMediaPlaylist mediaPlaylist,
-      HlsMediaPlaylist.Segment hlsSegment,
-      HashSet<Uri> seenEncryptionKeyUris) {
-    long startTimeUs = mediaPlaylist.startTimeUs + hlsSegment.relativeStartTimeUs;
-    if (hlsSegment.fullSegmentEncryptionKeyUri != null) {
-      Uri keyUri = UriUtil.resolveToUri(mediaPlaylist.baseUri,
-          hlsSegment.fullSegmentEncryptionKeyUri);
+      HlsMediaPlaylist.Segment segment,
+      HashSet<Uri> seenEncryptionKeyUris,
+      ArrayList<Segment> out) {
+    String baseUri = mediaPlaylist.baseUri;
+    long startTimeUs = mediaPlaylist.startTimeUs + segment.relativeStartTimeUs;
+    if (segment.fullSegmentEncryptionKeyUri != null) {
+      Uri keyUri = UriUtil.resolveToUri(baseUri, segment.fullSegmentEncryptionKeyUri);
       if (seenEncryptionKeyUris.add(keyUri)) {
-        segments.add(new Segment(startTimeUs, new DataSpec(keyUri)));
+        out.add(new Segment(startTimeUs, SegmentDownloader.getCompressibleDataSpec(keyUri)));
       }
     }
-    Uri resolvedUri = UriUtil.resolveToUri(mediaPlaylist.baseUri, hlsSegment.url);
-    segments.add(new Segment(startTimeUs,
-        new DataSpec(resolvedUri, hlsSegment.byterangeOffset, hlsSegment.byterangeLength, null)));
-  }
-
-  private static void addResolvedUris(String baseUri, List<HlsUrl> urls, List<Uri> out) {
-    for (int i = 0; i < urls.size(); i++) {
-      out.add(UriUtil.resolveToUri(baseUri, urls.get(i).url));
-    }
+    Uri segmentUri = UriUtil.resolveToUri(baseUri, segment.url);
+    DataSpec dataSpec =
+        new DataSpec(segmentUri, segment.byterangeOffset, segment.byterangeLength, /* key= */ null);
+    out.add(new Segment(startTimeUs, dataSpec));
   }
 }
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java
index 84ef251e5f..18820ca49c 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java
@@ -68,8 +68,8 @@ public final class SsDownloader extends SegmentDownloader<SsManifest> {
   }
 
   @Override
-  protected SsManifest getManifest(DataSource dataSource, Uri uri) throws IOException {
-    return ParsingLoadable.load(dataSource, new SsManifestParser(), uri, C.DATA_TYPE_MANIFEST);
+  protected SsManifest getManifest(DataSource dataSource, DataSpec dataSpec) throws IOException {
+    return ParsingLoadable.load(dataSource, new SsManifestParser(), dataSpec, C.DATA_TYPE_MANIFEST);
   }
 
   @Override

From b993367a3b9e5c1d1b0a74795bc1249d3c97c85c Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 5 Dec 2018 09:48:23 +0000
Subject: [PATCH 278/832] Add util method to extract renderer capabilities.

This instantiates the renderers and extract the capabilities. None of the known
renderes incurs any overhead during instantiation.

PiperOrigin-RevId: 224118511
---
 .../google/android/exoplayer2/util/Util.java  | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
index 9c2f426de5..7bea5de8ba 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
@@ -48,8 +48,15 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ParserException;
+import com.google.android.exoplayer2.Renderer;
+import com.google.android.exoplayer2.RendererCapabilities;
+import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.SeekParameters;
+import com.google.android.exoplayer2.audio.AudioRendererEventListener;
+import com.google.android.exoplayer2.drm.DrmSessionManager;
+import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
 import com.google.android.exoplayer2.upstream.DataSource;
+import com.google.android.exoplayer2.video.VideoRendererEventListener;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.File;
@@ -1842,6 +1849,32 @@ public final class Util {
     return displaySize;
   }
 
+  /**
+   * Extract renderer capabilities for the renderers created by the provided renderers factory.
+   *
+   * @param renderersFactory A {@link RenderersFactory}.
+   * @param drmSessionManager An optional {@link DrmSessionManager} used by the renderers.
+   * @return The {@link RendererCapabilities} for each renderer created by the {@code
+   *     renderersFactory}.
+   */
+  public static RendererCapabilities[] getRendererCapabilities(
+      RenderersFactory renderersFactory,
+      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager) {
+    Renderer[] renderers =
+        renderersFactory.createRenderers(
+            new Handler(),
+            new VideoRendererEventListener() {},
+            new AudioRendererEventListener() {},
+            (cues) -> {},
+            (metadata) -> {},
+            drmSessionManager);
+    RendererCapabilities[] capabilities = new RendererCapabilities[renderers.length];
+    for (int i = 0; i < renderers.length; i++) {
+      capabilities[i] = renderers[i].getCapabilities();
+    }
+    return capabilities;
+  }
+
   @Nullable
   private static String getSystemProperty(String name) {
     try {

From 80807534f03b966d7aaa00a63809e8ecc773ebcf Mon Sep 17 00:00:00 2001
From: Zsolt Matyas <zmmatyas@amazon.com>
Date: Wed, 7 Nov 2018 15:12:12 -0800
Subject: [PATCH 279/832] CEA608: Match alignment of consecutive lines in
 POP-ON mode

[Problem]
As the alignment of each lineas are calculated individually, the
artificially introduced CENTER and RIGHT alignments can be mixed
with each other and with the default LEFT alignment. The mixed results
look worse than just using the original DEFAULT, and the readability
is radically decreased.

[Solution]
Pre-calculate the alignment for each line, and use the leftmost of them
for all lines. The intention of caption provider could be different, but
the worst case scenario is that we revert back everything to LEFT
alignment that is the only option in the CEA608 standard so we
show everything at the exact location it is set in the content.
The readability is never worse than the one given by the content
provider.

[Test]
This should influence CEA608 pop-up cations only. (Not roll up).
Test various live channels with this change.
Note: Beginning of commercials tend to have PAINT-ON mode as that
is immediately showing incoming characters, not just at the end
of the line like POP-on mode.
---
 .../exoplayer2/text/cea/Cea608Decoder.java    | 88 ++++++++++++++-----
 1 file changed, 67 insertions(+), 21 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
index e93a53b713..2c4562c4de 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
@@ -542,8 +542,28 @@ public final class Cea608Decoder extends CeaDecoder {
 
   private List<Cue> getDisplayCues() {
     List<Cue> displayCues = new ArrayList<>();
-    for (int i = 0; i < cueBuilders.size(); i++) {
-      Cue cue = cueBuilders.get(i).build();
+
+    // CEA608 does not define Center and right alignment, content providers artificially introduced
+    // them by adding whitespaces before the real caption characters to get more visually appealing
+    // results. This decoder tries to optimize by switching to center or right alignment based on
+    // the number of whitespaces on the left and right side of the lines.
+    // This works in many cases, but has a side effect:
+    // consecutive lines on the screen might be differently aligned depending in the leftover
+    // space and the accuracy of the whitespace balancing of the original caption provider.
+    // Fixing this by introducing a new rule: lines shown at the same time, should be aligned the
+    // same way with the left most alignment being the highest priority. This will result in any
+    // exoPlayer optimisation only kick in when all lines can be re-aligned.
+    // LEFT is dominant as that was the only existing option in the original CEA608 standard, so
+    // the new worst case scenario is "showing the content exactly as the content provider
+    // intended"
+    int leftMostAnchor = Cue.ANCHOR_TYPE_END;
+    int cueCount = cueBuilders.size();
+    for (int i = 0; i < cueCount; i++) {
+      leftMostAnchor = Math.min(cueBuilders.get(i).calculatePreferredAlignment(), leftMostAnchor);
+    }
+
+    for (int i = 0; i < cueCount; i++) {
+      Cue cue = cueBuilders.get(i).build(leftMostAnchor);
       if (cue != null) {
         displayCues.add(cue);
       }
@@ -656,6 +676,9 @@ public final class Cea608Decoder extends CeaDecoder {
     private int captionMode;
     private int captionRowCount;
 
+    private SpannableStringBuilder finalCueString;
+    private int startPadding;
+    private int endPadding;
     public CueBuilder(int captionMode, int captionRowCount) {
       cueStyles = new ArrayList<>();
       rolledUpCaptions = new ArrayList<>();
@@ -805,46 +828,67 @@ public final class Cea608Decoder extends CeaDecoder {
       return new SpannableString(builder);
     }
 
-    public Cue build() {
-      SpannableStringBuilder cueString = new SpannableStringBuilder();
+    public int calculatePreferredAlignment() {
+      finalCueString = new SpannableStringBuilder();
+
       // Add any rolled up captions, separated by new lines.
       for (int i = 0; i < rolledUpCaptions.size(); i++) {
-        cueString.append(rolledUpCaptions.get(i));
-        cueString.append('\n');
+        finalCueString.append(rolledUpCaptions.get(i));
+        finalCueString.append('\n');
       }
       // Add the current line.
-      cueString.append(buildSpannableString());
+      finalCueString.append(buildSpannableString());
 
-      if (cueString.length() == 0) {
+      if (finalCueString.length() == 0) {
+        // The cue is empty, it does not influence alignment
+        return Cue.ANCHOR_TYPE_END;
+      }
+
+      // The number of empty columns before the start of the text, in the range [0-31].
+      startPadding = indent + tabOffset;
+      // The number of empty columns after the end of the text, in the same range.
+      endPadding = SCREEN_CHARWIDTH - startPadding - finalCueString.length();
+      int startEndPaddingDelta = startPadding - endPadding;
+
+      if (captionMode == CC_MODE_POP_ON && (Math.abs(startEndPaddingDelta) < 3 || endPadding < 0)) {
+        return Cue.ANCHOR_TYPE_MIDDLE;
+      } else if (captionMode == CC_MODE_POP_ON && startEndPaddingDelta > 0 && endPadding < 4) {
+        // endPadding check added to avoid RIGHT aligning short texts close to the middle of the
+        // screen
+        return Cue.ANCHOR_TYPE_END;
+      }
+      return Cue.ANCHOR_TYPE_START;
+    }
+
+    public Cue build(int positionAnchor) {
+
+      // Making sure, no-one calls build() without having the alignment function called first
+      if (finalCueString == null) {
+        calculatePreferredAlignment();
+      }
+
+      if (finalCueString.length() == 0) {
         // The cue is empty.
         return null;
       }
 
       float position;
-      int positionAnchor;
-      // The number of empty columns before the start of the text, in the range [0-31].
-      int startPadding = indent + tabOffset;
-      // The number of empty columns after the end of the text, in the same range.
-      int endPadding = SCREEN_CHARWIDTH - startPadding - cueString.length();
-      int startEndPaddingDelta = startPadding - endPadding;
-      if (captionMode == CC_MODE_POP_ON && (Math.abs(startEndPaddingDelta) < 3 || endPadding < 0)) {
+
+      if (positionAnchor == Cue.ANCHOR_TYPE_MIDDLE) {
         // Treat approximately centered pop-on captions as middle aligned. We also treat captions
         // that are wider than they should be in this way. See
         // https://github.com/google/ExoPlayer/issues/3534.
         position = 0.5f;
-        positionAnchor = Cue.ANCHOR_TYPE_MIDDLE;
-      } else if (captionMode == CC_MODE_POP_ON && startEndPaddingDelta > 0) {
+      } else if (positionAnchor == Cue.ANCHOR_TYPE_END) {
         // Treat pop-on captions with less padding at the end than the start as end aligned.
         position = (float) (SCREEN_CHARWIDTH - endPadding) / SCREEN_CHARWIDTH;
         // Adjust the position to fit within the safe area.
         position = position * 0.8f + 0.1f;
-        positionAnchor = Cue.ANCHOR_TYPE_END;
       } else {
         // For all other cases assume start aligned.
         position = (float) startPadding / SCREEN_CHARWIDTH;
         // Adjust the position to fit within the safe area.
         position = position * 0.8f + 0.1f;
-        positionAnchor = Cue.ANCHOR_TYPE_START;
       }
 
       int lineAnchor;
@@ -863,8 +907,10 @@ public final class Cea608Decoder extends CeaDecoder {
         line = row;
       }
 
-      return new Cue(cueString, Alignment.ALIGN_NORMAL, line, Cue.LINE_TYPE_NUMBER, lineAnchor,
-          position, positionAnchor, Cue.DIMEN_UNSET);
+      Cue result = new Cue(finalCueString, Alignment.ALIGN_NORMAL, line, Cue.LINE_TYPE_NUMBER,
+              lineAnchor, position, positionAnchor, Cue.DIMEN_UNSET);
+      finalCueString = null;
+      return result;
     }
 
     @Override

From ea2d1f89b732af245225dd052a2ef889a99dc010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Seroczy=C5=84ski?= <androidches@gmail.com>
Date: Fri, 7 Dec 2018 15:49:19 +0100
Subject: [PATCH 280/832] Blacklist OMX.SEC.mp3.dec and
 OMX.brcm.audio.mp3.decoder on Samsung devices

---
 .../android/exoplayer2/mediacodec/MediaCodecUtil.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
index 893601a859..58604edccc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
@@ -318,7 +318,14 @@ public final class MediaCodecUtil {
     }
 
     // Work around https://github.com/google/ExoPlayer/issues/4519.
-    if ("OMX.SEC.mp3.dec".equals(name) && "SM-T530".equals(Util.MODEL)) {
+    if (("OMX.SEC.mp3.dec".equals(name) || "OMX.brcm.audio.mp3.decoder".equals(name))
+        && ("GT-I9515".equals(Util.MODEL)
+        || "GT-I9152".equals(Util.MODEL)
+        || "GT-P5220".equals(Util.MODEL)
+        || "SM-G350".equals(Util.MODEL)
+        || "SM-S7580".equals(Util.MODEL)
+        || "SM-T231".equals(Util.MODEL)
+        || "SM-T530".equals(Util.MODEL))) {
       return false;
     }
 

From 66e8a32766af42ae6310f335d2096baa62ad1ce1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Seroczy=C5=84ski?= <androidches@gmail.com>
Date: Fri, 7 Dec 2018 15:59:44 +0100
Subject: [PATCH 281/832] Blacklist OMX.SEC.mp3.dec and
 OMX.brcm.audio.mp3.decoder on Samsung devices

---
 RELEASENOTES.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index ec11b5b7ed..80d9badfb9 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -12,7 +12,8 @@
 * Caching: Cache data with unknown length by default. The previous flag to opt in
   to this behavior (`DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH`) has been
   replaced with an opt out flag (`DataSpec.FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN`).
-
+* MP3: Fix issue where streams would play twice on Samsung devices
+  ([#4519](https://github.com/google/ExoPlayer/issues/4519)).
 ### 2.9.2 ###
 
 * HLS:

From 9a5096ee6459411267d61277244306cb86e97634 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 6 Dec 2018 09:05:09 +0000
Subject: [PATCH 282/832] Disable post processing on Nvidia devices

PiperOrigin-RevId: 224291309
---
 RELEASENOTES.md                               |  6 ++--
 .../video/MediaCodecVideoRenderer.java        | 35 ++++++++++---------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index ec11b5b7ed..95c098e151 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -9,9 +9,11 @@
   ([#3314](https://github.com/google/ExoPlayer/issues/3314)).
 * Do not retry failed loads whose error is `FileNotFoundException`.
 * Prevent Cea608Decoder from generating Subtitles with null Cues list
-* Caching: Cache data with unknown length by default. The previous flag to opt in
-  to this behavior (`DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH`) has been
+* Caching: Cache data with unknown length by default. The previous flag to opt
+  in to this behavior (`DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH`) has been
   replaced with an opt out flag (`DataSpec.FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN`).
+* Disable post processing on Nvidia devices, as it breaks decode-only frame
+  skippping.
 
 ### 2.9.2 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index 67586fe672..7bbab55a1e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -98,7 +98,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
   private final EventDispatcher eventDispatcher;
   private final long allowedJoiningTimeMs;
   private final int maxDroppedFramesToNotify;
-  private final boolean deviceNeedsAutoFrcWorkaround;
+  private final boolean deviceNeedsNoPostProcessWorkaround;
   private final long[] pendingOutputStreamOffsetsUs;
   private final long[] pendingOutputStreamSwitchTimesUs;
 
@@ -226,7 +226,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
     this.context = context.getApplicationContext();
     frameReleaseTimeHelper = new VideoFrameReleaseTimeHelper(this.context);
     eventDispatcher = new EventDispatcher(eventHandler, eventListener);
-    deviceNeedsAutoFrcWorkaround = deviceNeedsAutoFrcWorkaround();
+    deviceNeedsNoPostProcessWorkaround = deviceNeedsNoPostProcessWorkaround();
     pendingOutputStreamOffsetsUs = new long[MAX_PENDING_OUTPUT_STREAM_OFFSET_COUNT];
     pendingOutputStreamSwitchTimesUs = new long[MAX_PENDING_OUTPUT_STREAM_OFFSET_COUNT];
     outputStreamOffsetUs = C.TIME_UNSET;
@@ -484,7 +484,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
             format,
             codecMaxValues,
             codecOperatingRate,
-            deviceNeedsAutoFrcWorkaround,
+            deviceNeedsNoPostProcessWorkaround,
             tunnelingAudioSessionId);
     if (surface == null) {
       Assertions.checkState(shouldUseDummySurface(codecInfo));
@@ -1036,8 +1036,8 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
    * @param codecMaxValues Codec max values that should be used when configuring the decoder.
    * @param codecOperatingRate The codec operating rate, or {@link #CODEC_OPERATING_RATE_UNSET} if
    *     no codec operating rate should be set.
-   * @param deviceNeedsAutoFrcWorkaround Whether the device is known to enable frame-rate conversion
-   *     logic that negatively impacts ExoPlayer.
+   * @param deviceNeedsNoPostProcessWorkaround Whether the device is known to do post processing by
+   *     default that isn't compatible with ExoPlayer.
    * @param tunnelingAudioSessionId The audio session id to use for tunneling, or {@link
    *     C#AUDIO_SESSION_ID_UNSET} if tunneling should not be enabled.
    * @return The framework {@link MediaFormat} that should be used to configure the decoder.
@@ -1047,7 +1047,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
       Format format,
       CodecMaxValues codecMaxValues,
       float codecOperatingRate,
-      boolean deviceNeedsAutoFrcWorkaround,
+      boolean deviceNeedsNoPostProcessWorkaround,
       int tunnelingAudioSessionId) {
     MediaFormat mediaFormat = new MediaFormat();
     // Set format parameters that should always be set.
@@ -1071,7 +1071,8 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
         mediaFormat.setFloat(MediaFormat.KEY_OPERATING_RATE, codecOperatingRate);
       }
     }
-    if (deviceNeedsAutoFrcWorkaround) {
+    if (deviceNeedsNoPostProcessWorkaround) {
+      mediaFormat.setInteger("no-post-process", 1);
       mediaFormat.setInteger("auto-frc", 0);
     }
     if (tunnelingAudioSessionId != C.AUDIO_SESSION_ID_UNSET) {
@@ -1265,21 +1266,21 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
   }
 
   /**
-   * Returns whether the device is known to enable frame-rate conversion logic that negatively
-   * impacts ExoPlayer.
-   * <p>
-   * If true is returned then we explicitly disable the feature.
+   * Returns whether the device is known to do post processing by default that isn't compatible with
+   * ExoPlayer.
    *
-   * @return True if the device is known to enable frame-rate conversion logic that negatively
-   *     impacts ExoPlayer. False otherwise.
+   * @return Whether the device is known to do post processing by default that isn't compatible with
+   *     ExoPlayer.
    */
-  private static boolean deviceNeedsAutoFrcWorkaround() {
-    // nVidia Shield prior to M tries to adjust the playback rate to better map the frame-rate of
+  private static boolean deviceNeedsNoPostProcessWorkaround() {
+    // Nvidia devices prior to M try to adjust the playback rate to better map the frame-rate of
     // content to the refresh rate of the display. For example playback of 23.976fps content is
     // adjusted to play at 1.001x speed when the output display is 60Hz. Unfortunately the
     // implementation causes ExoPlayer's reported playback position to drift out of sync. Captions
-    // also lose sync [Internal: b/26453592].
-    return Util.SDK_INT <= 22 && "foster".equals(Util.DEVICE) && "NVIDIA".equals(Util.MANUFACTURER);
+    // also lose sync [Internal: b/26453592]. Even after M, the devices may apply post processing
+    // operations that can modify frame output timestamps, which is incompatible with ExoPlayer's
+    // logic for skipping decode-only frames.
+    return "NVIDIA".equals(Util.MANUFACTURER);
   }
 
   /*

From 5776bed190ef7792fb3553db6e78a4e4119f3840 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 6 Dec 2018 10:54:45 +0000
Subject: [PATCH 283/832] TrackSelection.Factory clean-up.

We currently have two factory methods where it is completely unclear which one needs
to be overridden.

This change deprecates the old one, adds a Util method to easily map back from the new
to the old behaviour, and updates all implementations of the now deprecated method in
our code.

PiperOrigin-RevId: 224303560
---
 RELEASENOTES.md                               |  9 ++-
 .../AdaptiveTrackSelection.java               | 60 +++++++++----------
 .../BufferSizeAdaptationBuilder.java          | 31 ++++++----
 .../trackselection/FixedTrackSelection.java   | 12 ++--
 .../trackselection/RandomTrackSelection.java  |  9 ++-
 .../trackselection/TrackSelection.java        | 43 +++++--------
 .../trackselection/TrackSelectionUtil.java    | 44 ++++++++++++++
 .../AdaptiveTrackSelectionTest.java           | 16 +++--
 .../testutil/FakeTrackSelector.java           | 28 ++++-----
 9 files changed, 151 insertions(+), 101 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 95c098e151..ad2956cb4d 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -5,10 +5,13 @@
 * Support for playing spherical videos on Daydream.
 * Improve decoder re-use between playbacks. TODO: Write and link a blog post
   here ([#2826](https://github.com/google/ExoPlayer/issues/2826)).
-* Add options for controlling audio track selections to `DefaultTrackSelector`
-  ([#3314](https://github.com/google/ExoPlayer/issues/3314)).
+* Track selection:
+  * Add options for controlling audio track selections to `DefaultTrackSelector`
+    ([#3314](https://github.com/google/ExoPlayer/issues/3314)).
+  * Update `TrackSelection.Factory` interface to support creating all track
+    selections together.
 * Do not retry failed loads whose error is `FileNotFoundException`.
-* Prevent Cea608Decoder from generating Subtitles with null Cues list
+* Prevent Cea608Decoder from generating Subtitles with null Cues list.
 * Caching: Cache data with unknown length by default. The previous flag to opt
   in to this behavior (`DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH`) has been
   replaced with an opt out flag (`DataSpec.FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN`).
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
index 66b49555ef..b39a5d19f0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
@@ -227,8 +227,36 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
     }
 
     @Override
-    public AdaptiveTrackSelection createTrackSelection(
-        TrackGroup group, BandwidthMeter bandwidthMeter, int... tracks) {
+    public @NullableType TrackSelection[] createTrackSelections(
+        @NullableType Definition[] definitions, BandwidthMeter bandwidthMeter) {
+      TrackSelection[] selections = new TrackSelection[definitions.length];
+      AdaptiveTrackSelection adaptiveSelection = null;
+      int totalFixedBandwidth = 0;
+      for (int i = 0; i < definitions.length; i++) {
+        Definition definition = definitions[i];
+        if (definition == null) {
+          continue;
+        }
+        if (definition.tracks.length > 1) {
+          adaptiveSelection =
+              createAdaptiveTrackSelection(definition.group, bandwidthMeter, definition.tracks);
+          selections[i] = adaptiveSelection;
+        } else {
+          selections[i] = new FixedTrackSelection(definition.group, definition.tracks[0]);
+          int trackBitrate = definition.group.getFormat(definition.tracks[0]).bitrate;
+          if (trackBitrate != Format.NO_VALUE) {
+            totalFixedBandwidth += trackBitrate;
+          }
+        }
+      }
+      if (blockFixedTrackSelectionBandwidth && adaptiveSelection != null) {
+        adaptiveSelection.experimental_setNonAllocatableBandwidth(totalFixedBandwidth);
+      }
+      return selections;
+    }
+
+    private AdaptiveTrackSelection createAdaptiveTrackSelection(
+        TrackGroup group, BandwidthMeter bandwidthMeter, int[] tracks) {
       if (this.bandwidthMeter != null) {
         bandwidthMeter = this.bandwidthMeter;
       }
@@ -246,34 +274,6 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
       adaptiveTrackSelection.experimental_setTrackBitrateEstimator(trackBitrateEstimator);
       return adaptiveTrackSelection;
     }
-
-    @Override
-    public @NullableType TrackSelection[] createTrackSelections(
-        @NullableType Definition[] definitions, BandwidthMeter bandwidthMeter) {
-      TrackSelection[] selections = new TrackSelection[definitions.length];
-      AdaptiveTrackSelection adaptiveSelection = null;
-      int totalFixedBandwidth = 0;
-      for (int i = 0; i < definitions.length; i++) {
-        Definition definition = definitions[i];
-        if (definition == null) {
-          continue;
-        }
-        if (definition.tracks.length > 1) {
-          selections[i] = createTrackSelection(definition.group, bandwidthMeter, definition.tracks);
-          adaptiveSelection = (AdaptiveTrackSelection) selections[i];
-        } else {
-          selections[i] = new FixedTrackSelection(definition.group, definition.tracks[0]);
-          int trackBitrate = definition.group.getFormat(definition.tracks[0]).bitrate;
-          if (trackBitrate != Format.NO_VALUE) {
-            totalFixedBandwidth += trackBitrate;
-          }
-        }
-      }
-      if (blockFixedTrackSelectionBandwidth && adaptiveSelection != null) {
-        adaptiveSelection.experimental_setNonAllocatableBandwidth(totalFixedBandwidth);
-      }
-      return selections;
-    }
   }
 
   public static final int DEFAULT_MIN_DURATION_FOR_QUALITY_INCREASE_MS = 10000;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java
index 6239dd04ad..5c8350cb1d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java
@@ -24,12 +24,14 @@ import com.google.android.exoplayer2.LoadControl;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.chunk.MediaChunk;
 import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
+import com.google.android.exoplayer2.trackselection.TrackSelection.Definition;
 import com.google.android.exoplayer2.upstream.BandwidthMeter;
 import com.google.android.exoplayer2.upstream.DefaultAllocator;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Clock;
 import com.google.android.exoplayer2.util.PriorityTaskManager;
 import java.util.List;
+import org.checkerframework.checker.nullness.compatqual.NullableType;
 
 /**
  * Builder for a {@link TrackSelection.Factory} and {@link LoadControl} that implement buffer size
@@ -273,19 +275,22 @@ public final class BufferSizeAdaptationBuilder {
     TrackSelection.Factory trackSelectionFactory =
         new TrackSelection.Factory() {
           @Override
-          public TrackSelection createTrackSelection(
-              TrackGroup group, BandwidthMeter bandwidthMeter, int... tracks) {
-            return new BufferSizeAdaptiveTrackSelection(
-                group,
-                tracks,
-                bandwidthMeter,
-                minBufferMs,
-                maxBufferMs,
-                hysteresisBufferMs,
-                startUpBandwidthFraction,
-                startUpMinBufferForQualityIncreaseMs,
-                dynamicFormatFilter,
-                clock);
+          public @NullableType TrackSelection[] createTrackSelections(
+              @NullableType Definition[] definitions, BandwidthMeter bandwidthMeter) {
+            return TrackSelectionUtil.createTrackSelectionsForDefinitions(
+                definitions,
+                definition ->
+                    new BufferSizeAdaptiveTrackSelection(
+                        definition.group,
+                        definition.tracks,
+                        bandwidthMeter,
+                        minBufferMs,
+                        maxBufferMs,
+                        hysteresisBufferMs,
+                        startUpBandwidthFraction,
+                        startUpMinBufferForQualityIncreaseMs,
+                        dynamicFormatFilter,
+                        clock));
           }
         };
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/FixedTrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/FixedTrackSelection.java
index 7755e437ce..79b5d93dc7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/FixedTrackSelection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/FixedTrackSelection.java
@@ -21,8 +21,8 @@ import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.chunk.MediaChunk;
 import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
 import com.google.android.exoplayer2.upstream.BandwidthMeter;
-import com.google.android.exoplayer2.util.Assertions;
 import java.util.List;
+import org.checkerframework.checker.nullness.compatqual.NullableType;
 
 /**
  * A {@link TrackSelection} consisting of a single track.
@@ -56,10 +56,12 @@ public final class FixedTrackSelection extends BaseTrackSelection {
     }
 
     @Override
-    public FixedTrackSelection createTrackSelection(
-        TrackGroup group, BandwidthMeter bandwidthMeter, int... tracks) {
-      Assertions.checkArgument(tracks.length == 1);
-      return new FixedTrackSelection(group, tracks[0], reason, data);
+    public @NullableType TrackSelection[] createTrackSelections(
+        @NullableType Definition[] definitions, BandwidthMeter bandwidthMeter) {
+      return TrackSelectionUtil.createTrackSelectionsForDefinitions(
+          definitions,
+          definition ->
+              new FixedTrackSelection(definition.group, definition.tracks[0], reason, data));
     }
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/RandomTrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/RandomTrackSelection.java
index e3c643670b..217a16e4a6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/RandomTrackSelection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/RandomTrackSelection.java
@@ -24,6 +24,7 @@ import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
 import com.google.android.exoplayer2.upstream.BandwidthMeter;
 import java.util.List;
 import java.util.Random;
+import org.checkerframework.checker.nullness.compatqual.NullableType;
 
 /**
  * A {@link TrackSelection} whose selected track is updated randomly.
@@ -49,9 +50,11 @@ public final class RandomTrackSelection extends BaseTrackSelection {
     }
 
     @Override
-    public RandomTrackSelection createTrackSelection(
-        TrackGroup group, BandwidthMeter bandwidthMeter, int... tracks) {
-      return new RandomTrackSelection(group, tracks, random);
+    public @NullableType TrackSelection[] createTrackSelections(
+        @NullableType Definition[] definitions, BandwidthMeter bandwidthMeter) {
+      return TrackSelectionUtil.createTrackSelectionsForDefinitions(
+          definitions,
+          definition -> new RandomTrackSelection(definition.group, definition.tracks, random));
     }
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java
index 13e823da29..251c0ac76b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java
@@ -21,8 +21,8 @@ import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.chunk.MediaChunk;
 import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
+import com.google.android.exoplayer2.trackselection.TrackSelectionUtil.AdaptiveTrackSelectionFactory;
 import com.google.android.exoplayer2.upstream.BandwidthMeter;
-import com.google.android.exoplayer2.util.Assertions;
 import java.util.List;
 import org.checkerframework.checker.nullness.compatqual.NullableType;
 
@@ -61,42 +61,31 @@ public interface TrackSelection {
   interface Factory {
 
     /**
-     * Creates a new selection.
-     *
-     * @param group The {@link TrackGroup}. Must not be null.
-     * @param bandwidthMeter A {@link BandwidthMeter} which can be used to select tracks.
-     * @param tracks The indices of the selected tracks within the {@link TrackGroup}. Must not be
-     *     null or empty. May be in any order.
-     * @return The created selection.
+     * @deprecated Implement {@link #createTrackSelections(Definition[], BandwidthMeter)} instead.
+     *     Calling {@link TrackSelectionUtil#createTrackSelectionsForDefinitions(Definition[],
+     *     AdaptiveTrackSelectionFactory)} helps to create a single adaptive track selection in the
+     *     same way as using this deprecated method.
      */
-    TrackSelection createTrackSelection(
-        TrackGroup group, BandwidthMeter bandwidthMeter, int... tracks);
+    @Deprecated
+    default TrackSelection createTrackSelection(
+        TrackGroup group, BandwidthMeter bandwidthMeter, int... tracks) {
+      throw new UnsupportedOperationException();
+    }
 
     /**
      * Creates a new selection for each {@link Definition}.
      *
      * @param definitions A {@link Definition} array. May include null values.
      * @param bandwidthMeter A {@link BandwidthMeter} which can be used to select tracks.
-     * @return The created selections. For null entries in {@code definitions} returns null values.
+     * @return The created selections. Must have the same length as {@code definitions} and may
+     *     include null values.
      */
+    @SuppressWarnings("deprecation")
     default @NullableType TrackSelection[] createTrackSelections(
         @NullableType Definition[] definitions, BandwidthMeter bandwidthMeter) {
-      TrackSelection[] selections = new TrackSelection[definitions.length];
-      boolean createdAdaptiveTrackSelection = false;
-      for (int i = 0; i < definitions.length; i++) {
-        Definition definition = definitions[i];
-        if (definition == null) {
-          continue;
-        }
-        if (definition.tracks.length > 1) {
-          Assertions.checkState(!createdAdaptiveTrackSelection);
-          createdAdaptiveTrackSelection = true;
-          selections[i] = createTrackSelection(definition.group, bandwidthMeter, definition.tracks);
-        } else {
-          selections[i] = new FixedTrackSelection(definition.group, definition.tracks[0]);
-        }
-      }
-      return selections;
+      return TrackSelectionUtil.createTrackSelectionsForDefinitions(
+          definitions,
+          definition -> createTrackSelection(definition.group, bandwidthMeter, definition.tracks));
     }
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
index 947f64be2c..7800495a62 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
@@ -22,15 +22,59 @@ import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.chunk.MediaChunk;
 import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
 import com.google.android.exoplayer2.source.chunk.MediaChunkListIterator;
+import com.google.android.exoplayer2.trackselection.TrackSelection.Definition;
 import com.google.android.exoplayer2.util.Assertions;
 import java.util.Arrays;
 import java.util.List;
+import org.checkerframework.checker.nullness.compatqual.NullableType;
 
 /** Track selection related utility methods. */
 public final class TrackSelectionUtil {
 
   private TrackSelectionUtil() {}
 
+  /** Functional interface to create a single adaptive track selection. */
+  public interface AdaptiveTrackSelectionFactory {
+
+    /**
+     * Creates an adaptive track selection for the provided track selection definition.
+     *
+     * @param trackSelectionDefinition A {@link Definition} for the track selection.
+     * @return The created track selection.
+     */
+    TrackSelection createAdaptiveTrackSelection(Definition trackSelectionDefinition);
+  }
+
+  /**
+   * Creates track selections for an array of track selection definitions, with at most one
+   * multi-track adaptive selection.
+   *
+   * @param definitions The list of track selection {@link Definition definitions}. May include null
+   *     values.
+   * @param adaptiveTrackSelectionFactory A factory for the multi-track adaptive track selection.
+   * @return The array of created track selection. For null entries in {@code definitions} returns
+   *     null values.
+   */
+  public static @NullableType TrackSelection[] createTrackSelectionsForDefinitions(
+      @NullableType Definition[] definitions,
+      AdaptiveTrackSelectionFactory adaptiveTrackSelectionFactory) {
+    TrackSelection[] selections = new TrackSelection[definitions.length];
+    boolean createdAdaptiveTrackSelection = false;
+    for (int i = 0; i < definitions.length; i++) {
+      Definition definition = definitions[i];
+      if (definition == null) {
+        continue;
+      }
+      if (definition.tracks.length > 1 && !createdAdaptiveTrackSelection) {
+        createdAdaptiveTrackSelection = true;
+        selections[i] = adaptiveTrackSelectionFactory.createAdaptiveTrackSelection(definition);
+      } else {
+        selections[i] = new FixedTrackSelection(definition.group, definition.tracks[0]);
+      }
+    }
+    return selections;
+  }
+
   /**
    * Returns average bitrate for chunks in bits per second. Chunks are included in average until
    * {@code maxDurationMs} or the first unknown length chunk.
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
index 29018a520c..c3836e63f6 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
@@ -32,6 +32,7 @@ import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
 import com.google.android.exoplayer2.testutil.FakeClock;
 import com.google.android.exoplayer2.testutil.FakeMediaChunk;
+import com.google.android.exoplayer2.trackselection.TrackSelection.Definition;
 import com.google.android.exoplayer2.upstream.BandwidthMeter;
 import com.google.android.exoplayer2.util.MimeTypes;
 import java.util.ArrayList;
@@ -66,15 +67,20 @@ public final class AdaptiveTrackSelectionTest {
   }
 
   @Test
+  @SuppressWarnings("deprecation")
   public void testFactoryUsesInitiallyProvidedBandwidthMeter() {
     BandwidthMeter initialBandwidthMeter = mock(BandwidthMeter.class);
     BandwidthMeter injectedBandwidthMeter = mock(BandwidthMeter.class);
-    Format format = videoFormat(/* bitrate= */ 500, /* width= */ 320, /* height= */ 240);
-    @SuppressWarnings("deprecation")
-    AdaptiveTrackSelection adaptiveTrackSelection =
+    Format format1 = videoFormat(/* bitrate= */ 500, /* width= */ 320, /* height= */ 240);
+    Format format2 = videoFormat(/* bitrate= */ 1000, /* width= */ 640, /* height= */ 480);
+    TrackSelection[] trackSelections =
         new AdaptiveTrackSelection.Factory(initialBandwidthMeter)
-            .createTrackSelection(new TrackGroup(format), injectedBandwidthMeter, /* tracks= */ 0);
-    adaptiveTrackSelection.updateSelectedTrack(
+            .createTrackSelections(
+                new Definition[] {
+                  new Definition(new TrackGroup(format1, format2), /* tracks= */ 0, 1)
+                },
+                injectedBandwidthMeter);
+    trackSelections[0].updateSelectedTrack(
         /* playbackPositionUs= */ 0,
         /* bufferedDurationUs= */ 0,
         /* availableDurationUs= */ C.TIME_UNSET,
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackSelector.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackSelector.java
index 6d37961005..ac39ba8de6 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackSelector.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackSelector.java
@@ -79,8 +79,19 @@ public class FakeTrackSelector extends DefaultTrackSelector {
     }
 
     @Override
-    public TrackSelection createTrackSelection(
-        TrackGroup trackGroup, BandwidthMeter bandwidthMeter, int... tracks) {
+    public TrackSelection[] createTrackSelections(
+        TrackSelection.Definition[] definitions, BandwidthMeter bandwidthMeter) {
+      TrackSelection[] selections = new TrackSelection[definitions.length];
+      for (int i = 0; i < definitions.length; i++) {
+        TrackSelection.Definition definition = definitions[i];
+        if (definition != null) {
+          selections[i] = createTrackSelection(definition.group);
+        }
+      }
+      return selections;
+    }
+
+    private TrackSelection createTrackSelection(TrackGroup trackGroup) {
       if (mayReuseTrackSelection) {
         for (FakeTrackSelection trackSelection : trackSelections) {
           if (trackSelection.getTrackGroup().equals(trackGroup)) {
@@ -92,18 +103,5 @@ public class FakeTrackSelector extends DefaultTrackSelector {
       trackSelections.add(trackSelection);
       return trackSelection;
     }
-
-    @Override
-    public TrackSelection[] createTrackSelections(
-        TrackSelection.Definition[] definitions, BandwidthMeter bandwidthMeter) {
-      TrackSelection[] selections = new TrackSelection[definitions.length];
-      for (int i = 0; i < definitions.length; i++) {
-        TrackSelection.Definition definition = definitions[i];
-        if (definition != null) {
-          selections[i] = createTrackSelection(definition.group, bandwidthMeter, definition.tracks);
-        }
-      }
-      return selections;
-    }
   }
 }

From 891961d5e11e558cec9bf87062a7230d46d3a819 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 6 Dec 2018 11:56:27 +0000
Subject: [PATCH 284/832] Revert usage of MediaItems for Cast demo sample list

PiperOrigin-RevId: 224308973
---
 .../DefaultReceiverPlayerManager.java         |  2 +-
 .../android/exoplayer2/castdemo/DemoUtil.java | 75 +++++++++++--------
 .../exoplayer2/castdemo/MainActivity.java     | 26 ++++---
 3 files changed, 60 insertions(+), 43 deletions(-)

diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java
index daaac9486e..f4678fc541 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java
@@ -268,7 +268,7 @@ import java.util.ArrayList;
   public void onTimelineChanged(
       Timeline timeline, @Nullable Object manifest, @TimelineChangeReason int reason) {
     updateCurrentItemIndex();
-    if (timeline.isEmpty()) {
+    if (currentPlayer == castPlayer && timeline.isEmpty()) {
       castMediaQueueCreationPending = true;
     }
   }
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
index 369cb8ab90..776ed1a3bd 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
@@ -15,7 +15,6 @@
  */
 package com.google.android.exoplayer2.castdemo;
 
-import com.google.android.exoplayer2.ext.cast.MediaItem;
 import com.google.android.exoplayer2.util.MimeTypes;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -24,50 +23,64 @@ import java.util.List;
 /** Utility methods and constants for the Cast demo application. */
 /* package */ final class DemoUtil {
 
+  /** Represents a media sample. */
+  public static final class Sample {
+
+    /** The uri of the media content. */
+    public final String uri;
+    /** The name of the sample. */
+    public final String name;
+    /** The mime type of the sample media content. */
+    public final String mimeType;
+
+    /**
+     * @param uri See {@link #uri}.
+     * @param name See {@link #name}.
+     * @param mimeType See {@link #mimeType}.
+     */
+    public Sample(String uri, String name, String mimeType) {
+      this.uri = uri;
+      this.name = name;
+      this.mimeType = mimeType;
+    }
+
+    @Override
+    public String toString() {
+      return name;
+    }
+  }
+
   public static final String MIME_TYPE_DASH = MimeTypes.APPLICATION_MPD;
   public static final String MIME_TYPE_HLS = MimeTypes.APPLICATION_M3U8;
   public static final String MIME_TYPE_SS = MimeTypes.APPLICATION_SS;
   public static final String MIME_TYPE_VIDEO_MP4 = MimeTypes.VIDEO_MP4;
 
   /** The list of samples available in the cast demo app. */
-  public static final List<MediaItem> SAMPLES;
+  public static final List<Sample> SAMPLES;
 
   static {
     // App samples.
-    ArrayList<MediaItem> samples = new ArrayList<>();
-    MediaItem.Builder sampleBuilder = new MediaItem.Builder();
+    ArrayList<Sample> samples = new ArrayList<>();
 
     samples.add(
-        sampleBuilder
-            .setTitle("DASH (clear,MP4,H264)")
-            .setMimeType(MIME_TYPE_DASH)
-            .setMedia("https://storage.googleapis.com/wvmedia/clear/h264/tears/tears.mpd")
-            .buildAndClear());
-
+        new Sample(
+            "https://storage.googleapis.com/wvmedia/clear/h264/tears/tears.mpd",
+            "DASH (clear,MP4,H264)",
+            MIME_TYPE_DASH));
     samples.add(
-        sampleBuilder
-            .setTitle("Tears of Steel (HLS)")
-            .setMimeType(MIME_TYPE_HLS)
-            .setMedia(
-                "https://commondatastorage.googleapis.com/gtv-videos-bucket/CastVideos/"
-                    + "hls/TearsOfSteel.m3u8")
-            .buildAndClear());
-
+        new Sample(
+            "https://commondatastorage.googleapis.com/gtv-videos-bucket/CastVideos/"
+                + "hls/TearsOfSteel.m3u8",
+            "Tears of Steel (HLS)",
+            MIME_TYPE_HLS));
     samples.add(
-        sampleBuilder
-            .setTitle("HLS Basic (TS)")
-            .setMimeType(MIME_TYPE_HLS)
-            .setMedia(
-                "https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_4x3"
-                    + "/bipbop_4x3_variant.m3u8")
-            .buildAndClear());
-
+        new Sample(
+            "https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_4x3"
+                + "/bipbop_4x3_variant.m3u8",
+            "HLS Basic (TS)",
+            MIME_TYPE_HLS));
     samples.add(
-        sampleBuilder
-            .setTitle("Dizzy (MP4)")
-            .setMimeType(MIME_TYPE_VIDEO_MP4)
-            .setMedia("https://html5demos.com/assets/dizzy.mp4")
-            .buildAndClear());
+        new Sample("https://html5demos.com/assets/dizzy.mp4", "Dizzy (MP4)", MIME_TYPE_VIDEO_MP4));
     SAMPLES = Collections.unmodifiableList(samples);
   }
 
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
index 8ebfee1294..5278776070 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.castdemo;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.support.v4.graphics.ColorUtils;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
@@ -50,6 +49,8 @@ import com.google.android.gms.cast.framework.CastContext;
 public class MainActivity extends AppCompatActivity
     implements OnClickListener, PlayerManager.QueuePositionListener {
 
+  private final MediaItem.Builder mediaItemBuilder;
+
   private PlayerView localPlayerView;
   private PlayerControlView castControlView;
   private PlayerManager playerManager;
@@ -57,6 +58,10 @@ public class MainActivity extends AppCompatActivity
   private MediaQueueListAdapter mediaQueueListAdapter;
   private CastContext castContext;
 
+  public MainActivity() {
+    mediaItemBuilder = new MediaItem.Builder();
+  }
+
   // Activity lifecycle methods.
 
   @Override
@@ -154,7 +159,14 @@ public class MainActivity extends AppCompatActivity
     sampleList.setAdapter(new SampleListAdapter(this));
     sampleList.setOnItemClickListener(
         (parent, view, position, id) -> {
-          playerManager.addItem(DemoUtil.SAMPLES.get(position));
+          DemoUtil.Sample sample = DemoUtil.SAMPLES.get(position);
+          playerManager.addItem(
+              mediaItemBuilder
+                  .clear()
+                  .setMedia(sample.uri)
+                  .setTitle(sample.name)
+                  .setMimeType(sample.mimeType)
+                  .build());
           mediaQueueListAdapter.notifyItemInserted(playerManager.getMediaQueueSize() - 1);
         });
     return dialogList;
@@ -254,19 +266,11 @@ public class MainActivity extends AppCompatActivity
 
   }
 
-  private static final class SampleListAdapter extends ArrayAdapter<MediaItem> {
+  private static final class SampleListAdapter extends ArrayAdapter<DemoUtil.Sample> {
 
     public SampleListAdapter(Context context) {
       super(context, android.R.layout.simple_list_item_1, DemoUtil.SAMPLES);
     }
-
-    @Override
-    public View getView(int position, @Nullable View convertView, ViewGroup parent) {
-      TextView view = (TextView) super.getView(position, convertView, parent);
-      MediaItem sample = DemoUtil.SAMPLES.get(position);
-      view.setText(sample.title);
-      return view;
-    }
   }
 
 }

From 73da205279ec775c9e89c78dc7c64fc0143b7125 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 6 Dec 2018 12:04:48 +0000
Subject: [PATCH 285/832] Add receiver flavor to CastDemo

PiperOrigin-RevId: 224310086
---
 demos/cast/build.gradle                 | 10 ++++++++++
 demos/cast/src/main/AndroidManifest.xml |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/demos/cast/build.gradle b/demos/cast/build.gradle
index 915bc10b7c..8af52a787e 100644
--- a/demos/cast/build.gradle
+++ b/demos/cast/build.gradle
@@ -49,6 +49,16 @@ android {
         disable 'MissingTranslation'
     }
 
+    flavorDimensions "receiver"
+
+    productFlavors {
+        defaultCast {
+            dimension "receiver"
+            manifestPlaceholders =
+                    [castOptionsProvider: "com.google.android.exoplayer2.ext.cast.DefaultCastOptionsProvider"]
+        }
+    }
+
 }
 
 dependencies {
diff --git a/demos/cast/src/main/AndroidManifest.xml b/demos/cast/src/main/AndroidManifest.xml
index ae16776333..c556721863 100644
--- a/demos/cast/src/main/AndroidManifest.xml
+++ b/demos/cast/src/main/AndroidManifest.xml
@@ -23,7 +23,7 @@
       android:largeHeap="true" android:allowBackup="false">
 
     <meta-data android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
-        android:value="com.google.android.exoplayer2.ext.cast.DefaultCastOptionsProvider" />
+        android:value="${castOptionsProvider}" />
 
     <activity android:name="com.google.android.exoplayer2.castdemo.MainActivity"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"

From c48b77d1ec614872128a3420660242202f78cce1 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 6 Dec 2018 13:48:09 +0000
Subject: [PATCH 286/832] Use media source tag in dummy timeline.

This is now possible as it's directly accessible from the media source.

Issue:#5177
Issue:#5155
PiperOrigin-RevId: 224321917
---
 .../source/ConcatenatingMediaSource.java      | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
index 26667e641f..e3114298f3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
@@ -826,7 +826,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
 
     public MediaSourceHolder(MediaSource mediaSource) {
       this.mediaSource = mediaSource;
-      this.timeline = new DeferredTimeline();
+      this.timeline = DeferredTimeline.createWithDummyTimeline(mediaSource.getTag());
       this.activeMediaPeriods = new ArrayList<>();
       this.uid = new Object();
     }
@@ -951,10 +951,18 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
   private static final class DeferredTimeline extends ForwardingTimeline {
 
     private static final Object DUMMY_ID = new Object();
-    private static final DummyTimeline DUMMY_TIMELINE = new DummyTimeline();
 
     private final Object replacedId;
 
+    /**
+     * Returns an instance with a dummy timeline using the provided window tag.
+     *
+     * @param windowTag A window tag.
+     */
+    public static DeferredTimeline createWithDummyTimeline(@Nullable Object windowTag) {
+      return new DeferredTimeline(new DummyTimeline(windowTag), DUMMY_ID);
+    }
+
     /**
      * Returns an instance with a real timeline, replacing the provided period ID with the already
      * assigned dummy period ID.
@@ -968,11 +976,6 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
       return new DeferredTimeline(timeline, firstPeriodUid);
     }
 
-    /** Creates deferred timeline exposing a {@link DummyTimeline}. */
-    public DeferredTimeline() {
-      this(DUMMY_TIMELINE, DUMMY_ID);
-    }
-
     private DeferredTimeline(Timeline timeline, Object replacedId) {
       super(timeline);
       this.replacedId = replacedId;
@@ -1016,6 +1019,12 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
   /** Dummy placeholder timeline with one dynamic window with a period of indeterminate duration. */
   private static final class DummyTimeline extends Timeline {
 
+    @Nullable private final Object tag;
+
+    public DummyTimeline(@Nullable Object tag) {
+      this.tag = tag;
+    }
+
     @Override
     public int getWindowCount() {
       return 1;
@@ -1025,7 +1034,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
     public Window getWindow(
         int windowIndex, Window window, boolean setTag, long defaultPositionProjectionUs) {
       return window.set(
-          /* tag= */ null,
+          tag,
           /* presentationStartTimeMs= */ C.TIME_UNSET,
           /* windowStartTimeMs= */ C.TIME_UNSET,
           /* isSeekable= */ false,

From 17e8c55425e04a5cf355df2e840ff384f678862a Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Fri, 7 Dec 2018 11:42:23 +0000
Subject: [PATCH 287/832] Extract DownloadThread class from
 DownloadManager.Task

PiperOrigin-RevId: 224492268
---
 .../exoplayer2/offline/DownloadManager.java   | 58 ++++++++++++++-----
 1 file changed, 45 insertions(+), 13 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 4a76c80d64..35ad625cdb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -544,7 +544,7 @@ public final class DownloadManager {
 
   }
 
-  private static final class Task implements Runnable {
+  private static final class Task {
 
     /** Target states for the download thread. */
     @Documented
@@ -566,7 +566,7 @@ public final class DownloadManager {
     @TargetState private volatile int targetState;
 
     @MonotonicNonNull private Downloader downloader;
-    @MonotonicNonNull private Thread thread;
+    @MonotonicNonNull private DownloadThread downloadThread;
     @MonotonicNonNull private Throwable error;
 
     private Task(
@@ -625,8 +625,9 @@ public final class DownloadManager {
         targetState = STATE_COMPLETED;
         downloadManager.onTaskStateChange(this);
         downloader = downloaderFactory.createDownloader(action);
-        thread = new Thread(this);
-        thread.start();
+        downloadThread =
+            new DownloadThread(
+                this, downloader, action.isRemoveAction, minRetryCount, downloadManager.handler);
       }
     }
 
@@ -649,8 +650,7 @@ public final class DownloadManager {
 
     private void stopDownloadThread(@TargetState int targetState) {
       this.targetState = targetState;
-      Assertions.checkNotNull(downloader).cancel();
-      Assertions.checkNotNull(thread).interrupt();
+      Assertions.checkNotNull(downloadThread).cancel();
     }
 
     private void onDownloadThreadStopped(@Nullable Throwable finalError) {
@@ -664,35 +664,67 @@ public final class DownloadManager {
       error = finalError;
       downloadManager.onTaskStateChange(this);
     }
+  }
+
+  private static class DownloadThread implements Runnable {
+
+    private final Task task;
+    private final Downloader downloader;
+    private final boolean remove;
+    private final int minRetryCount;
+    private final Handler callbackHandler;
+    private final Thread thread;
+    private volatile boolean isCanceled;
+
+    private DownloadThread(
+        Task task,
+        Downloader downloader,
+        boolean remove,
+        int minRetryCount,
+        Handler callbackHandler) {
+      this.task = task;
+      this.downloader = downloader;
+      this.remove = remove;
+      this.minRetryCount = minRetryCount;
+      this.callbackHandler = callbackHandler;
+      thread = new Thread(this);
+      thread.start();
+    }
+
+    public void cancel() {
+      isCanceled = true;
+      downloader.cancel();
+      thread.interrupt();
+    }
 
     // Methods running on download thread.
 
     @Override
     public void run() {
-      logd("Task is started", this);
+      logd("Task is started", task);
       Throwable error = null;
       try {
-        if (action.isRemoveAction) {
+        if (remove) {
           downloader.remove();
         } else {
           int errorCount = 0;
           long errorPosition = C.LENGTH_UNSET;
-          while (targetState == STATE_COMPLETED) {
+          while (!isCanceled) {
             try {
               downloader.download();
               break;
             } catch (IOException e) {
-              if (targetState == STATE_COMPLETED) {
+              if (!isCanceled) {
                 long downloadedBytes = downloader.getDownloadedBytes();
                 if (downloadedBytes != errorPosition) {
-                  logd("Reset error count. downloadedBytes = " + downloadedBytes, this);
+                  logd("Reset error count. downloadedBytes = " + downloadedBytes, task);
                   errorPosition = downloadedBytes;
                   errorCount = 0;
                 }
                 if (++errorCount > minRetryCount) {
                   throw e;
                 }
-                logd("Download error. Retry " + errorCount, this);
+                logd("Download error. Retry " + errorCount, task);
                 Thread.sleep(getRetryDelayMillis(errorCount));
               }
             }
@@ -702,7 +734,7 @@ public final class DownloadManager {
         error = e;
       }
       final Throwable finalError = error;
-      downloadManager.handler.post(() -> onDownloadThreadStopped(finalError));
+      callbackHandler.post(() -> task.onDownloadThreadStopped(isCanceled ? null : finalError));
     }
 
     private int getRetryDelayMillis(int errorCount) {

From 771aa080f643f9f315852ee83f453a852548843f Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Fri, 7 Dec 2018 14:39:11 +0000
Subject: [PATCH 288/832] Add totalBytes to TaskState

PiperOrigin-RevId: 224506700
---
 .../android/exoplayer2/offline/DownloadManager.java      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 35ad625cdb..969b8c2e11 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -523,6 +523,8 @@ public final class DownloadManager {
     public final float downloadPercentage;
     /** The total number of downloaded bytes. */
     public final long downloadedBytes;
+    /** The total size of the media, or {@link C#LENGTH_UNSET} if unknown. */
+    public final long totalBytes;
 
     /** If {@link #state} is {@link #STATE_FAILED} then this is the cause, otherwise null. */
     @Nullable public final Throwable error;
@@ -533,12 +535,14 @@ public final class DownloadManager {
         @State int state,
         float downloadPercentage,
         long downloadedBytes,
+        long totalBytes,
         @Nullable Throwable error) {
       this.taskId = taskId;
       this.action = action;
       this.state = state;
       this.downloadPercentage = downloadPercentage;
       this.downloadedBytes = downloadedBytes;
+      this.totalBytes = totalBytes;
       this.error = error;
     }
 
@@ -587,11 +591,14 @@ public final class DownloadManager {
     public TaskState getTaskState() {
       float downloadPercentage = C.PERCENTAGE_UNSET;
       long downloadedBytes = 0;
+      long totalBytes = C.LENGTH_UNSET;
       if (downloader != null) {
         downloadPercentage = downloader.getDownloadPercentage();
         downloadedBytes = downloader.getDownloadedBytes();
+        totalBytes = downloader.getTotalBytes();
       }
-      return new TaskState(id, action, state, downloadPercentage, downloadedBytes, error);
+      return new TaskState(
+          id, action, state, downloadPercentage, downloadedBytes, totalBytes, error);
     }
 
     /** Returns whether the task is finished. */

From 22948f2eda7b7cfb8ac4ff413b9a0cfe0d2aa0a9 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 7 Dec 2018 16:22:00 +0000
Subject: [PATCH 289/832] Use TrackSelector in DownloadHelper.

This adds the basic track selection capabilties (including tests).
The new capabilities are not exposed yet through the DownloadHelper implementations
and there will also be more helper methods (e.g. to select multiple audio lanuages at
once).

PiperOrigin-RevId: 224518477
---
 .../exoplayer2/offline/DownloadHelper.java    | 375 ++++++++++++++-
 .../android/exoplayer2/offline/TrackKey.java  |  21 +
 .../offline/DownloadHelperTest.java           | 451 ++++++++++++++++++
 3 files changed, 830 insertions(+), 17 deletions(-)
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index 044bd8cc8a..9ee8b0e3a4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -19,18 +19,67 @@ import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
 import android.support.annotation.Nullable;
+import android.util.SparseIntArray;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ExoPlaybackException;
+import com.google.android.exoplayer2.Renderer;
+import com.google.android.exoplayer2.RendererCapabilities;
+import com.google.android.exoplayer2.RenderersFactory;
+import com.google.android.exoplayer2.Timeline;
+import com.google.android.exoplayer2.drm.DrmSessionManager;
+import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
+import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
+import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.trackselection.BaseTrackSelection;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.Parameters;
+import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo;
+import com.google.android.exoplayer2.trackselection.TrackSelection;
+import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
+import com.google.android.exoplayer2.upstream.BandwidthMeter;
+import com.google.android.exoplayer2.upstream.TransferListener;
 import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import org.checkerframework.checker.nullness.compatqual.NullableType;
+import org.checkerframework.checker.nullness.qual.EnsuresNonNull;
+import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
+import org.checkerframework.checker.nullness.qual.RequiresNonNull;
 
 /**
  * A helper for initializing and removing downloads.
  *
+ * <p>The helper extracts track information from the media, selects tracks for downloading, and
+ * creates {@link DownloadAction download actions} based on the selected tracks.
+ *
+ * <p>A typical usage of DownloadHelper follows these steps:
+ *
+ * <ol>
+ *   <li>Construct the download helper with information about the {@link RenderersFactory renderers}
+ *       and {@link DefaultTrackSelector.Parameters parameters} for track selection.
+ *   <li>Prepare the helper using {@link #prepare(Callback)} and wait for the callback.
+ *   <li>Optional: Inspect the selected tracks using {@link #getMappedTrackInfo(int)} and {@link
+ *       #getTrackSelections(int, int)}, and make adjustments using {@link
+ *       #clearTrackSelections(int)}, {@link #replaceTrackSelections(int, Parameters)} and {@link
+ *       #addTrackSelection(int, Parameters)}.
+ *   <li>Create download actions for the selected track using {@link #getDownloadAction(byte[])}.
+ * </ol>
+ *
  * @param <T> The manifest type.
  */
 public abstract class DownloadHelper<T> {
 
+  /**
+   * The default parameters used for track selection for downloading. This default selects the
+   * highest bitrate audio and video tracks which are supported by the renderers.
+   */
+  public static final DefaultTrackSelector.Parameters DEFAULT_TRACK_SELECTOR_PARAMETERS =
+      new DefaultTrackSelector.ParametersBuilder().setForceHighestSupportedBitrate(true).build();
+
   /** A callback to be notified when the {@link DownloadHelper} is prepared. */
   public interface Callback {
 
@@ -39,7 +88,7 @@ public abstract class DownloadHelper<T> {
      *
      * @param helper The reporting {@link DownloadHelper}.
      */
-    void onPrepared(DownloadHelper helper);
+    void onPrepared(DownloadHelper<?> helper);
 
     /**
      * Called when preparation fails.
@@ -47,15 +96,22 @@ public abstract class DownloadHelper<T> {
      * @param helper The reporting {@link DownloadHelper}.
      * @param e The error.
      */
-    void onPrepareError(DownloadHelper helper, IOException e);
+    void onPrepareError(DownloadHelper<?> helper, IOException e);
   }
 
   private final String downloadType;
   private final Uri uri;
   @Nullable private final String cacheKey;
+  private final DefaultTrackSelector trackSelector;
+  private final RendererCapabilities[] rendererCapabilities;
+  private final SparseIntArray scratchSet;
 
+  private int currentTrackSelectionPeriodIndex;
   @Nullable private T manifest;
-  @Nullable private TrackGroupArray[] trackGroupArrays;
+  private TrackGroupArray @MonotonicNonNull [] trackGroupArrays;
+  private MappedTrackInfo @MonotonicNonNull [] mappedTrackInfos;
+  private List<TrackSelection> @MonotonicNonNull [][] trackSelectionsByPeriodAndRenderer;
+  private List<TrackSelection> @MonotonicNonNull [][] immutableTrackSelectionsByPeriodAndRenderer;
 
   /**
    * Create download helper.
@@ -65,9 +121,45 @@ public abstract class DownloadHelper<T> {
    * @param cacheKey An optional cache key.
    */
   public DownloadHelper(String downloadType, Uri uri, @Nullable String cacheKey) {
+    // TODO: Remove as soon as all implementations have been updated to the new constructor.
+    this(
+        downloadType,
+        uri,
+        cacheKey,
+        DEFAULT_TRACK_SELECTOR_PARAMETERS,
+        /* renderersFactory= */ (handler, videoListener, audioListener, metadata, text, drm) ->
+            new Renderer[0],
+        /* drmSessionManager= */ null);
+  }
+
+  /**
+   * Creates download helper.
+   *
+   * @param downloadType A download type. This value will be used as {@link DownloadAction#type}.
+   * @param uri A {@link Uri}.
+   * @param cacheKey An optional cache key.
+   * @param trackSelectorParameters {@link DefaultTrackSelector.Parameters} for selecting tracks for
+   *     downloading.
+   * @param renderersFactory The {@link RenderersFactory} creating the renderers for which tracks
+   *     are selected.
+   * @param drmSessionManager An optional {@link DrmSessionManager} used by the renderers created by
+   *     {@code renderersFactory}.
+   */
+  public DownloadHelper(
+      String downloadType,
+      Uri uri,
+      @Nullable String cacheKey,
+      DefaultTrackSelector.Parameters trackSelectorParameters,
+      RenderersFactory renderersFactory,
+      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager) {
     this.downloadType = downloadType;
     this.uri = uri;
     this.cacheKey = cacheKey;
+    this.trackSelector = new DefaultTrackSelector(new DownloadTrackSelection.Factory());
+    this.rendererCapabilities = Util.getRendererCapabilities(renderersFactory, drmSessionManager);
+    this.scratchSet = new SparseIntArray();
+    trackSelector.setParameters(trackSelectorParameters);
+    trackSelector.init(/* listener= */ () -> {}, new DummyBandwidthMeter());
   }
 
   /**
@@ -77,21 +169,28 @@ public abstract class DownloadHelper<T> {
    *     will be invoked on the calling thread unless that thread does not have an associated {@link
    *     Looper}, in which case it will be called on the application's main thread.
    */
-  public final void prepare(final Callback callback) {
-    final Handler handler =
+  public final void prepare(Callback callback) {
+    Handler handler =
         new Handler(Looper.myLooper() != null ? Looper.myLooper() : Looper.getMainLooper());
-    new Thread() {
-      @Override
-      public void run() {
-        try {
-          manifest = loadManifest(uri);
-          trackGroupArrays = getTrackGroupArrays(manifest);
-          handler.post(() -> callback.onPrepared(DownloadHelper.this));
-        } catch (final IOException e) {
-          handler.post(() -> callback.onPrepareError(DownloadHelper.this, e));
-        }
-      }
-    }.start();
+    new Thread(
+            () -> {
+              try {
+                manifest = loadManifest(uri);
+                trackGroupArrays = getTrackGroupArrays(manifest);
+                initializeTrackSelectionLists(trackGroupArrays.length, rendererCapabilities.length);
+                mappedTrackInfos = new MappedTrackInfo[trackGroupArrays.length];
+                for (int i = 0; i < trackGroupArrays.length; i++) {
+                  TrackSelectorResult trackSelectorResult = runTrackSelection(/* periodIndex= */ i);
+                  trackSelector.onSelectionActivated(trackSelectorResult.info);
+                  mappedTrackInfos[i] =
+                      Assertions.checkNotNull(trackSelector.getCurrentMappedTrackInfo());
+                }
+                handler.post(() -> callback.onPrepared(DownloadHelper.this));
+              } catch (final IOException e) {
+                handler.post(() -> callback.onPrepareError(DownloadHelper.this, e));
+              }
+            })
+        .start();
   }
 
   /** Returns the manifest. Must not be called until after preparation completes. */
@@ -113,6 +212,8 @@ public abstract class DownloadHelper<T> {
    * Returns the track groups for the given period. Must not be called until after preparation
    * completes.
    *
+   * <p>Use {@link #getMappedTrackInfo(int)} to get the track groups mapped to renderers.
+   *
    * @param periodIndex The period index.
    * @return The track groups for the period. May be {@link TrackGroupArray#EMPTY} for single stream
    *     content.
@@ -122,6 +223,107 @@ public abstract class DownloadHelper<T> {
     return trackGroupArrays[periodIndex];
   }
 
+  /**
+   * Returns the mapped track info for the given period. Must not be called until after preparation
+   * completes.
+   *
+   * @param periodIndex The period index.
+   * @return The {@link MappedTrackInfo} for the period.
+   */
+  public final MappedTrackInfo getMappedTrackInfo(int periodIndex) {
+    Assertions.checkNotNull(mappedTrackInfos);
+    return mappedTrackInfos[periodIndex];
+  }
+
+  /**
+   * Returns all {@link TrackSelection track selections} for a period and renderer. Must not be
+   * called until after preparation completes.
+   *
+   * @param periodIndex The period index.
+   * @param rendererIndex The renderer index.
+   * @return A list of selected {@link TrackSelection track selections}.
+   */
+  public final List<TrackSelection> getTrackSelections(int periodIndex, int rendererIndex) {
+    Assertions.checkNotNull(immutableTrackSelectionsByPeriodAndRenderer);
+    return immutableTrackSelectionsByPeriodAndRenderer[periodIndex][rendererIndex];
+  }
+
+  /**
+   * Clears the selection of tracks for a period. Must not be called until after preparation
+   * completes.
+   *
+   * @param periodIndex The period index for which track selections are cleared.
+   */
+  public final void clearTrackSelections(int periodIndex) {
+    Assertions.checkNotNull(trackSelectionsByPeriodAndRenderer);
+    for (int i = 0; i < rendererCapabilities.length; i++) {
+      trackSelectionsByPeriodAndRenderer[periodIndex][i].clear();
+    }
+  }
+
+  /**
+   * Replaces a selection of tracks to be downloaded. Must not be called until after preparation
+   * completes.
+   *
+   * @param periodIndex The period index for which the track selection is replaced.
+   * @param trackSelectorParameters The {@link DefaultTrackSelector.Parameters} to obtain the new
+   *     selection of tracks.
+   */
+  public final void replaceTrackSelections(
+      int periodIndex, DefaultTrackSelector.Parameters trackSelectorParameters) {
+    clearTrackSelections(periodIndex);
+    addTrackSelection(periodIndex, trackSelectorParameters);
+  }
+
+  /**
+   * Adds a selection of tracks to be downloaded. Must not be called until after preparation
+   * completes.
+   *
+   * @param periodIndex The period index this track selection is added for.
+   * @param trackSelectorParameters The {@link DefaultTrackSelector.Parameters} to obtain the new
+   *     selection of tracks.
+   */
+  public final void addTrackSelection(
+      int periodIndex, DefaultTrackSelector.Parameters trackSelectorParameters) {
+    Assertions.checkNotNull(trackGroupArrays);
+    Assertions.checkNotNull(trackSelectionsByPeriodAndRenderer);
+    trackSelector.setParameters(trackSelectorParameters);
+    runTrackSelection(periodIndex);
+  }
+
+  /**
+   * Builds a {@link DownloadAction} for downloading the selected tracks. Must not be called until
+   * after preparation completes.
+   *
+   * @param data Application provided data to store in {@link DownloadAction#data}.
+   * @return The built {@link DownloadAction}.
+   */
+  public final DownloadAction getDownloadAction(@Nullable byte[] data) {
+    Assertions.checkNotNull(trackSelectionsByPeriodAndRenderer);
+    Assertions.checkNotNull(trackGroupArrays);
+    List<TrackKey> trackKeys = new ArrayList<>();
+    int periodCount = trackSelectionsByPeriodAndRenderer.length;
+    for (int periodIndex = 0; periodIndex < periodCount; periodIndex++) {
+      int rendererCount = trackSelectionsByPeriodAndRenderer[periodIndex].length;
+      for (int rendererIndex = 0; rendererIndex < rendererCount; rendererIndex++) {
+        List<TrackSelection> trackSelectionList =
+            trackSelectionsByPeriodAndRenderer[periodIndex][rendererIndex];
+        for (int selectionIndex = 0; selectionIndex < trackSelectionList.size(); selectionIndex++) {
+          TrackSelection trackSelection = trackSelectionList.get(selectionIndex);
+          int trackGroupIndex =
+              trackGroupArrays[periodIndex].indexOf(trackSelection.getTrackGroup());
+          int trackCount = trackSelection.length();
+          for (int trackListIndex = 0; trackListIndex < trackCount; trackListIndex++) {
+            int trackIndex = trackSelection.getIndexInTrackGroup(trackListIndex);
+            trackKeys.add(new TrackKey(periodIndex, trackGroupIndex, trackIndex));
+          }
+        }
+      }
+    }
+    return DownloadAction.createDownloadAction(
+        downloadType, uri, toStreamKeys(trackKeys), cacheKey, data);
+  }
+
   /**
    * Builds a {@link DownloadAction} for downloading the specified tracks. Must not be called until
    * after preparation completes.
@@ -131,6 +333,7 @@ public abstract class DownloadHelper<T> {
    * @return The built {@link DownloadAction}.
    */
   public final DownloadAction getDownloadAction(@Nullable byte[] data, List<TrackKey> trackKeys) {
+    // TODO: Remove as soon as all usages have been updated to new getDownloadAction method.
     return DownloadAction.createDownloadAction(
         downloadType, uri, toStreamKeys(trackKeys), cacheKey, data);
   }
@@ -167,4 +370,142 @@ public abstract class DownloadHelper<T> {
    * @return A corresponding list of stream keys.
    */
   protected abstract List<StreamKey> toStreamKeys(List<TrackKey> trackKeys);
+
+  @SuppressWarnings("unchecked")
+  @EnsuresNonNull("trackSelectionsByPeriodAndRenderer")
+  private void initializeTrackSelectionLists(int periodCount, int rendererCount) {
+    trackSelectionsByPeriodAndRenderer =
+        (List<TrackSelection>[][]) new List<?>[periodCount][rendererCount];
+    immutableTrackSelectionsByPeriodAndRenderer =
+        (List<TrackSelection>[][]) new List<?>[periodCount][rendererCount];
+    for (int i = 0; i < periodCount; i++) {
+      for (int j = 0; j < rendererCount; j++) {
+        trackSelectionsByPeriodAndRenderer[i][j] = new ArrayList<>();
+        immutableTrackSelectionsByPeriodAndRenderer[i][j] =
+            Collections.unmodifiableList(trackSelectionsByPeriodAndRenderer[i][j]);
+      }
+    }
+  }
+
+  /**
+   * Runs the track selection for a given period index with the current parameters. The selected
+   * tracks will be added to {@link #trackSelectionsByPeriodAndRenderer}.
+   */
+  // Intentional reference comparison of track group instances.
+  @SuppressWarnings("ReferenceEquality")
+  @RequiresNonNull({"trackGroupArrays", "trackSelectionsByPeriodAndRenderer"})
+  private TrackSelectorResult runTrackSelection(int periodIndex) {
+    // TODO: Use actual timeline and media period id.
+    MediaPeriodId dummyMediaPeriodId = new MediaPeriodId(new Object());
+    Timeline dummyTimeline = Timeline.EMPTY;
+    currentTrackSelectionPeriodIndex = periodIndex;
+    try {
+      TrackSelectorResult trackSelectorResult =
+          trackSelector.selectTracks(
+              rendererCapabilities,
+              trackGroupArrays[periodIndex],
+              dummyMediaPeriodId,
+              dummyTimeline);
+      for (int i = 0; i < trackSelectorResult.length; i++) {
+        TrackSelection newSelection = trackSelectorResult.selections.get(i);
+        if (newSelection == null) {
+          continue;
+        }
+        List<TrackSelection> existingSelectionList =
+            trackSelectionsByPeriodAndRenderer[currentTrackSelectionPeriodIndex][i];
+        boolean mergedWithExistingSelection = false;
+        for (int j = 0; j < existingSelectionList.size(); j++) {
+          TrackSelection existingSelection = existingSelectionList.get(j);
+          if (existingSelection.getTrackGroup() == newSelection.getTrackGroup()) {
+            // Merge with existing selection.
+            scratchSet.clear();
+            for (int k = 0; k < existingSelection.length(); k++) {
+              scratchSet.put(existingSelection.getIndexInTrackGroup(k), 0);
+            }
+            for (int k = 0; k < newSelection.length(); k++) {
+              scratchSet.put(newSelection.getIndexInTrackGroup(k), 0);
+            }
+            int[] mergedTracks = new int[scratchSet.size()];
+            for (int k = 0; k < scratchSet.size(); k++) {
+              mergedTracks[k] = scratchSet.keyAt(k);
+            }
+            existingSelectionList.set(
+                j, new DownloadTrackSelection(existingSelection.getTrackGroup(), mergedTracks));
+            mergedWithExistingSelection = true;
+            break;
+          }
+        }
+        if (!mergedWithExistingSelection) {
+          existingSelectionList.add(newSelection);
+        }
+      }
+      return trackSelectorResult;
+    } catch (ExoPlaybackException e) {
+      // DefaultTrackSelector does not throw exceptions during track selection.
+      throw new UnsupportedOperationException(e);
+    }
+  }
+
+  private static final class DownloadTrackSelection extends BaseTrackSelection {
+
+    private static final class Factory implements TrackSelection.Factory {
+
+      @Override
+      public @NullableType TrackSelection[] createTrackSelections(
+          @NullableType Definition[] definitions, BandwidthMeter bandwidthMeter) {
+        @NullableType TrackSelection[] selections = new TrackSelection[definitions.length];
+        for (int i = 0; i < definitions.length; i++) {
+          selections[i] =
+              definitions[i] == null
+                  ? null
+                  : new DownloadTrackSelection(definitions[i].group, definitions[i].tracks);
+        }
+        return selections;
+      }
+    }
+
+    public DownloadTrackSelection(TrackGroup trackGroup, int[] tracks) {
+      super(trackGroup, tracks);
+    }
+
+    @Override
+    public int getSelectedIndex() {
+      return 0;
+    }
+
+    @Override
+    public int getSelectionReason() {
+      return C.SELECTION_REASON_UNKNOWN;
+    }
+
+    @Nullable
+    @Override
+    public Object getSelectionData() {
+      return null;
+    }
+  }
+
+  private static final class DummyBandwidthMeter implements BandwidthMeter {
+
+    @Override
+    public long getBitrateEstimate() {
+      return 0;
+    }
+
+    @Nullable
+    @Override
+    public TransferListener getTransferListener() {
+      return null;
+    }
+
+    @Override
+    public void addEventListener(Handler eventHandler, EventListener eventListener) {
+      // Do nothing.
+    }
+
+    @Override
+    public void removeEventListener(EventListener eventListener) {
+      // Do nothing.
+    }
+  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/TrackKey.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/TrackKey.java
index f6a411c3a1..2dcc790d02 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/TrackKey.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/TrackKey.java
@@ -15,6 +15,8 @@
  */
 package com.google.android.exoplayer2.offline;
 
+import android.support.annotation.Nullable;
+
 /**
  * Identifies a given track by the index of the containing period, the index of the containing group
  * within the period, and the index of the track within the group.
@@ -38,4 +40,23 @@ public final class TrackKey {
     this.groupIndex = groupIndex;
     this.trackIndex = trackIndex;
   }
+
+  @Override
+  public boolean equals(@Nullable Object other) {
+    if (this == other) {
+      return true;
+    }
+    if (other == null || getClass() != other.getClass()) {
+      return false;
+    }
+    TrackKey that = (TrackKey) other;
+    return periodIndex == that.periodIndex
+        && groupIndex == that.groupIndex
+        && trackIndex == that.trackIndex;
+  }
+
+  @Override
+  public int hashCode() {
+    return 31 * (31 * periodIndex + groupIndex) + trackIndex;
+  }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
new file mode 100644
index 0000000000..eb3ea767e3
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
@@ -0,0 +1,451 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.offline;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.net.Uri;
+import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.Renderer;
+import com.google.android.exoplayer2.RenderersFactory;
+import com.google.android.exoplayer2.offline.DownloadHelper.Callback;
+import com.google.android.exoplayer2.source.TrackGroup;
+import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.testutil.FakeRenderer;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.ParametersBuilder;
+import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo;
+import com.google.android.exoplayer2.trackselection.TrackSelection;
+import com.google.android.exoplayer2.util.ConditionVariable;
+import com.google.android.exoplayer2.util.MimeTypes;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.shadows.ShadowLooper;
+
+/** Unit tests for {@link DownloadHelper}. */
+@RunWith(RobolectricTestRunner.class)
+public class DownloadHelperTest {
+
+  private static final String TEST_DOWNLOAD_TYPE = "downloadType";
+  private static final String TEST_CACHE_KEY = "cacheKey";
+  private static final ManifestType TEST_MANIFEST = new ManifestType();
+  private static final List<StreamKey> testStreamKeys =
+      Arrays.asList(new StreamKey(0, 1, 2), new StreamKey(1, 3, 4));
+
+  private static final Format VIDEO_FORMAT_LOW = createVideoFormat(/* bitrate= */ 200_000);
+  private static final Format VIDEO_FORMAT_HIGH = createVideoFormat(/* bitrate= */ 800_000);
+  private static final Format AUDIO_FORMAT_US = createAudioFormat(/* language= */ "US");
+  private static final Format AUDIO_FORMAT_ZH = createAudioFormat(/* language= */ "ZH");
+  private static final Format TEXT_FORMAT_US = createTextFormat(/* language= */ "US");
+  private static final Format TEXT_FORMAT_ZH = createTextFormat(/* language= */ "ZH");
+
+  private static final TrackGroup TRACK_GROUP_VIDEO_BOTH =
+      new TrackGroup(VIDEO_FORMAT_LOW, VIDEO_FORMAT_HIGH);
+  private static final TrackGroup TRACK_GROUP_VIDEO_SINGLE = new TrackGroup(VIDEO_FORMAT_LOW);
+  private static final TrackGroup TRACK_GROUP_AUDIO_US = new TrackGroup(AUDIO_FORMAT_US);
+  private static final TrackGroup TRACK_GROUP_AUDIO_ZH = new TrackGroup(AUDIO_FORMAT_ZH);
+  private static final TrackGroup TRACK_GROUP_TEXT_US = new TrackGroup(TEXT_FORMAT_US);
+  private static final TrackGroup TRACK_GROUP_TEXT_ZH = new TrackGroup(TEXT_FORMAT_ZH);
+  private static final TrackGroupArray TRACK_GROUP_ARRAY_ALL =
+      new TrackGroupArray(
+          TRACK_GROUP_VIDEO_BOTH,
+          TRACK_GROUP_AUDIO_US,
+          TRACK_GROUP_AUDIO_ZH,
+          TRACK_GROUP_TEXT_US,
+          TRACK_GROUP_TEXT_ZH);
+  private static final TrackGroupArray TRACK_GROUP_ARRAY_SINGLE =
+      new TrackGroupArray(TRACK_GROUP_VIDEO_SINGLE, TRACK_GROUP_AUDIO_US);
+  private static final TrackGroupArray[] TRACK_GROUP_ARRAYS =
+      new TrackGroupArray[] {TRACK_GROUP_ARRAY_ALL, TRACK_GROUP_ARRAY_SINGLE};
+
+  private Uri testUri;
+
+  private FakeDownloadHelper downloadHelper;
+
+  @Before
+  public void setUp() {
+    testUri = Uri.parse("http://test.uri");
+
+    FakeRenderer videoRenderer = new FakeRenderer(VIDEO_FORMAT_LOW, VIDEO_FORMAT_HIGH);
+    FakeRenderer audioRenderer = new FakeRenderer(AUDIO_FORMAT_US, AUDIO_FORMAT_ZH);
+    FakeRenderer textRenderer = new FakeRenderer(TEXT_FORMAT_US, TEXT_FORMAT_ZH);
+    RenderersFactory renderersFactory =
+        (handler, videoListener, audioListener, metadata, text, drm) ->
+            new Renderer[] {textRenderer, audioRenderer, videoRenderer};
+
+    downloadHelper = new FakeDownloadHelper(testUri, renderersFactory);
+  }
+
+  @Test
+  public void getManifest_returnsManifest() throws Exception {
+    prepareDownloadHelper(downloadHelper);
+
+    ManifestType manifest = downloadHelper.getManifest();
+
+    assertThat(manifest).isEqualTo(TEST_MANIFEST);
+  }
+
+  @Test
+  public void getPeriodCount_returnsPeriodCount() throws Exception {
+    prepareDownloadHelper(downloadHelper);
+
+    int periodCount = downloadHelper.getPeriodCount();
+
+    assertThat(periodCount).isEqualTo(2);
+  }
+
+  @Test
+  public void getTrackGroups_returnsTrackGroups() throws Exception {
+    prepareDownloadHelper(downloadHelper);
+
+    TrackGroupArray trackGroupArrayPeriod0 = downloadHelper.getTrackGroups(/* periodIndex= */ 0);
+    TrackGroupArray trackGroupArrayPeriod1 = downloadHelper.getTrackGroups(/* periodIndex= */ 1);
+
+    assertThat(trackGroupArrayPeriod0).isEqualTo(TRACK_GROUP_ARRAYS[0]);
+    assertThat(trackGroupArrayPeriod1).isEqualTo(TRACK_GROUP_ARRAYS[1]);
+  }
+
+  @Test
+  public void getMappedTrackInfo_returnsMappedTrackInfo() throws Exception {
+    prepareDownloadHelper(downloadHelper);
+
+    MappedTrackInfo mappedTracks0 = downloadHelper.getMappedTrackInfo(/* periodIndex= */ 0);
+    MappedTrackInfo mappedTracks1 = downloadHelper.getMappedTrackInfo(/* periodIndex= */ 1);
+
+    assertThat(mappedTracks0.getRendererCount()).isEqualTo(3);
+    assertThat(mappedTracks0.getRendererType(/* rendererIndex= */ 0)).isEqualTo(C.TRACK_TYPE_TEXT);
+    assertThat(mappedTracks0.getRendererType(/* rendererIndex= */ 1)).isEqualTo(C.TRACK_TYPE_AUDIO);
+    assertThat(mappedTracks0.getRendererType(/* rendererIndex= */ 2)).isEqualTo(C.TRACK_TYPE_VIDEO);
+    assertThat(mappedTracks0.getTrackGroups(/* rendererIndex= */ 0).length).isEqualTo(2);
+    assertThat(mappedTracks0.getTrackGroups(/* rendererIndex= */ 1).length).isEqualTo(2);
+    assertThat(mappedTracks0.getTrackGroups(/* rendererIndex= */ 2).length).isEqualTo(1);
+    assertThat(mappedTracks0.getTrackGroups(/* rendererIndex= */ 0).get(/* index= */ 0))
+        .isEqualTo(TRACK_GROUP_TEXT_US);
+    assertThat(mappedTracks0.getTrackGroups(/* rendererIndex= */ 0).get(/* index= */ 1))
+        .isEqualTo(TRACK_GROUP_TEXT_ZH);
+    assertThat(mappedTracks0.getTrackGroups(/* rendererIndex= */ 1).get(/* index= */ 0))
+        .isEqualTo(TRACK_GROUP_AUDIO_US);
+    assertThat(mappedTracks0.getTrackGroups(/* rendererIndex= */ 1).get(/* index= */ 1))
+        .isEqualTo(TRACK_GROUP_AUDIO_ZH);
+    assertThat(mappedTracks0.getTrackGroups(/* rendererIndex= */ 2).get(/* index= */ 0))
+        .isEqualTo(TRACK_GROUP_VIDEO_BOTH);
+
+    assertThat(mappedTracks1.getRendererCount()).isEqualTo(3);
+    assertThat(mappedTracks1.getRendererType(/* rendererIndex= */ 0)).isEqualTo(C.TRACK_TYPE_TEXT);
+    assertThat(mappedTracks1.getRendererType(/* rendererIndex= */ 1)).isEqualTo(C.TRACK_TYPE_AUDIO);
+    assertThat(mappedTracks1.getRendererType(/* rendererIndex= */ 2)).isEqualTo(C.TRACK_TYPE_VIDEO);
+    assertThat(mappedTracks1.getTrackGroups(/* rendererIndex= */ 0).length).isEqualTo(0);
+    assertThat(mappedTracks1.getTrackGroups(/* rendererIndex= */ 1).length).isEqualTo(1);
+    assertThat(mappedTracks1.getTrackGroups(/* rendererIndex= */ 2).length).isEqualTo(1);
+    assertThat(mappedTracks1.getTrackGroups(/* rendererIndex= */ 1).get(/* index= */ 0))
+        .isEqualTo(TRACK_GROUP_AUDIO_US);
+    assertThat(mappedTracks1.getTrackGroups(/* rendererIndex= */ 2).get(/* index= */ 0))
+        .isEqualTo(TRACK_GROUP_VIDEO_SINGLE);
+  }
+
+  @Test
+  public void getTrackSelections_returnsInitialSelection() throws Exception {
+    prepareDownloadHelper(downloadHelper);
+
+    List<TrackSelection> selectedText0 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 0, /* rendererIndex= */ 0);
+    List<TrackSelection> selectedAudio0 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 0, /* rendererIndex= */ 1);
+    List<TrackSelection> selectedVideo0 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 0, /* rendererIndex= */ 2);
+    List<TrackSelection> selectedText1 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 1, /* rendererIndex= */ 0);
+    List<TrackSelection> selectedAudio1 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 1, /* rendererIndex= */ 1);
+    List<TrackSelection> selectedVideo1 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 1, /* rendererIndex= */ 2);
+
+    assertSingleTrackSelectionEquals(selectedText0, TRACK_GROUP_TEXT_US, 0);
+    assertSingleTrackSelectionEquals(selectedAudio0, TRACK_GROUP_AUDIO_US, 0);
+    assertSingleTrackSelectionEquals(selectedVideo0, TRACK_GROUP_VIDEO_BOTH, 1);
+
+    assertThat(selectedText1).isEmpty();
+    assertSingleTrackSelectionEquals(selectedAudio1, TRACK_GROUP_AUDIO_US, 0);
+    assertSingleTrackSelectionEquals(selectedVideo1, TRACK_GROUP_VIDEO_SINGLE, 0);
+  }
+
+  @Test
+  public void getTrackSelections_afterClearTrackSelections_isEmpty() throws Exception {
+    prepareDownloadHelper(downloadHelper);
+
+    // Clear only one period selection to verify second period selection is untouched.
+    downloadHelper.clearTrackSelections(/* periodIndex= */ 0);
+    List<TrackSelection> selectedText0 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 0, /* rendererIndex= */ 0);
+    List<TrackSelection> selectedAudio0 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 0, /* rendererIndex= */ 1);
+    List<TrackSelection> selectedVideo0 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 0, /* rendererIndex= */ 2);
+    List<TrackSelection> selectedText1 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 1, /* rendererIndex= */ 0);
+    List<TrackSelection> selectedAudio1 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 1, /* rendererIndex= */ 1);
+    List<TrackSelection> selectedVideo1 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 1, /* rendererIndex= */ 2);
+
+    assertThat(selectedText0).isEmpty();
+    assertThat(selectedAudio0).isEmpty();
+    assertThat(selectedVideo0).isEmpty();
+
+    // Verify
+    assertThat(selectedText1).isEmpty();
+    assertSingleTrackSelectionEquals(selectedAudio1, TRACK_GROUP_AUDIO_US, 0);
+    assertSingleTrackSelectionEquals(selectedVideo1, TRACK_GROUP_VIDEO_SINGLE, 0);
+  }
+
+  @Test
+  public void getTrackSelections_afterReplaceTrackSelections_returnsNewSelections()
+      throws Exception {
+    prepareDownloadHelper(downloadHelper);
+    DefaultTrackSelector.Parameters parameters =
+        new ParametersBuilder()
+            .setPreferredAudioLanguage("ZH")
+            .setPreferredTextLanguage("ZH")
+            .setRendererDisabled(/* rendererIndex= */ 2, true)
+            .build();
+
+    // Replace only one period selection to verify second period selection is untouched.
+    downloadHelper.replaceTrackSelections(/* periodIndex= */ 0, parameters);
+    List<TrackSelection> selectedText0 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 0, /* rendererIndex= */ 0);
+    List<TrackSelection> selectedAudio0 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 0, /* rendererIndex= */ 1);
+    List<TrackSelection> selectedVideo0 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 0, /* rendererIndex= */ 2);
+    List<TrackSelection> selectedText1 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 1, /* rendererIndex= */ 0);
+    List<TrackSelection> selectedAudio1 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 1, /* rendererIndex= */ 1);
+    List<TrackSelection> selectedVideo1 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 1, /* rendererIndex= */ 2);
+
+    assertSingleTrackSelectionEquals(selectedText0, TRACK_GROUP_TEXT_ZH, 0);
+    assertSingleTrackSelectionEquals(selectedAudio0, TRACK_GROUP_AUDIO_ZH, 0);
+    assertThat(selectedVideo0).isEmpty();
+
+    assertThat(selectedText1).isEmpty();
+    assertSingleTrackSelectionEquals(selectedAudio1, TRACK_GROUP_AUDIO_US, 0);
+    assertSingleTrackSelectionEquals(selectedVideo1, TRACK_GROUP_VIDEO_SINGLE, 0);
+  }
+
+  @Test
+  public void getTrackSelections_afterAddTrackSelections_returnsCombinedSelections()
+      throws Exception {
+    prepareDownloadHelper(downloadHelper);
+    // Select parameters to require some merging of track groups because the new parameters add
+    // all video tracks to initial video single track selection.
+    DefaultTrackSelector.Parameters parameters =
+        new ParametersBuilder()
+            .setPreferredAudioLanguage("ZH")
+            .setPreferredTextLanguage("US")
+            .build();
+
+    // Add only to one period selection to verify second period selection is untouched.
+    downloadHelper.addTrackSelection(/* periodIndex= */ 0, parameters);
+    List<TrackSelection> selectedText0 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 0, /* rendererIndex= */ 0);
+    List<TrackSelection> selectedAudio0 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 0, /* rendererIndex= */ 1);
+    List<TrackSelection> selectedVideo0 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 0, /* rendererIndex= */ 2);
+    List<TrackSelection> selectedText1 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 1, /* rendererIndex= */ 0);
+    List<TrackSelection> selectedAudio1 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 1, /* rendererIndex= */ 1);
+    List<TrackSelection> selectedVideo1 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 1, /* rendererIndex= */ 2);
+
+    assertSingleTrackSelectionEquals(selectedText0, TRACK_GROUP_TEXT_US, 0);
+    assertThat(selectedAudio0).hasSize(2);
+    assertTrackSelectionEquals(selectedAudio0.get(0), TRACK_GROUP_AUDIO_US, 0);
+    assertTrackSelectionEquals(selectedAudio0.get(1), TRACK_GROUP_AUDIO_ZH, 0);
+    assertSingleTrackSelectionEquals(selectedVideo0, TRACK_GROUP_VIDEO_BOTH, 0, 1);
+
+    assertThat(selectedText1).isEmpty();
+    assertSingleTrackSelectionEquals(selectedAudio1, TRACK_GROUP_AUDIO_US, 0);
+    assertSingleTrackSelectionEquals(selectedVideo1, TRACK_GROUP_VIDEO_SINGLE, 0);
+  }
+
+  @Test
+  public void getDownloadAction_createsDownloadAction_withAllSelectedTracks() throws Exception {
+    prepareDownloadHelper(downloadHelper);
+    // Ensure we have track groups with multiple indices, renderers with multiple track groups and
+    // also renderers without any track groups.
+    DefaultTrackSelector.Parameters parameters =
+        new ParametersBuilder()
+            .setPreferredAudioLanguage("ZH")
+            .setPreferredTextLanguage("US")
+            .build();
+    downloadHelper.addTrackSelection(/* periodIndex= */ 0, parameters);
+    byte[] data = new byte[10];
+    Arrays.fill(data, (byte) 123);
+
+    DownloadAction downloadAction = downloadHelper.getDownloadAction(data);
+
+    assertThat(downloadAction.type).isEqualTo(TEST_DOWNLOAD_TYPE);
+    assertThat(downloadAction.uri).isEqualTo(testUri);
+    assertThat(downloadAction.customCacheKey).isEqualTo(TEST_CACHE_KEY);
+    assertThat(downloadAction.isRemoveAction).isFalse();
+    assertThat(downloadAction.data).isEqualTo(data);
+    assertThat(downloadAction.keys).isEqualTo(testStreamKeys);
+    assertThat(downloadHelper.lastCreatedTrackKeys)
+        .containsExactly(
+            new TrackKey(/* periodIndex= */ 0, /* groupIndex= */ 0, /* trackIndex= */ 0),
+            new TrackKey(/* periodIndex= */ 0, /* groupIndex= */ 0, /* trackIndex= */ 1),
+            new TrackKey(/* periodIndex= */ 0, /* groupIndex= */ 1, /* trackIndex= */ 0),
+            new TrackKey(/* periodIndex= */ 0, /* groupIndex= */ 2, /* trackIndex= */ 0),
+            new TrackKey(/* periodIndex= */ 0, /* groupIndex= */ 3, /* trackIndex= */ 0),
+            new TrackKey(/* periodIndex= */ 1, /* groupIndex= */ 0, /* trackIndex= */ 0),
+            new TrackKey(/* periodIndex= */ 1, /* groupIndex= */ 1, /* trackIndex= */ 0));
+  }
+
+  @Test
+  public void getRemoveAction_returnsRemoveAction() {
+    DownloadAction removeAction = downloadHelper.getRemoveAction();
+
+    assertThat(removeAction.type).isEqualTo(TEST_DOWNLOAD_TYPE);
+    assertThat(removeAction.uri).isEqualTo(testUri);
+    assertThat(removeAction.customCacheKey).isEqualTo(TEST_CACHE_KEY);
+    assertThat(removeAction.isRemoveAction).isTrue();
+  }
+
+  private static void prepareDownloadHelper(FakeDownloadHelper downloadHelper) throws Exception {
+    AtomicReference<Exception> prepareException = new AtomicReference<>(null);
+    ConditionVariable preparedCondition = new ConditionVariable();
+    downloadHelper.prepare(
+        new Callback() {
+          @Override
+          public void onPrepared(DownloadHelper<?> helper) {
+            preparedCondition.open();
+          }
+
+          @Override
+          public void onPrepareError(DownloadHelper<?> helper, IOException e) {
+            prepareException.set(e);
+            preparedCondition.open();
+          }
+        });
+    while (!preparedCondition.block(0)) {
+      ShadowLooper.runMainLooperToNextTask();
+    }
+    if (prepareException.get() != null) {
+      throw prepareException.get();
+    }
+  }
+
+  private static Format createVideoFormat(int bitrate) {
+    return Format.createVideoSampleFormat(
+        /* id= */ null,
+        /* sampleMimeType= */ MimeTypes.VIDEO_H264,
+        /* codecs= */ null,
+        /* bitrate= */ bitrate,
+        /* maxInputSize= */ Format.NO_VALUE,
+        /* width= */ 480,
+        /* height= */ 360,
+        /* frameRate= */ Format.NO_VALUE,
+        /* initializationData= */ null,
+        /* drmInitData= */ null);
+  }
+
+  private static Format createAudioFormat(String language) {
+    return Format.createAudioSampleFormat(
+        /* id= */ null,
+        /* sampleMimeType= */ MimeTypes.AUDIO_AAC,
+        /* codecs= */ null,
+        /* bitrate= */ 48000,
+        /* maxInputSize= */ Format.NO_VALUE,
+        /* channelCount= */ 2,
+        /* sampleRate */ 44100,
+        /* initializationData= */ null,
+        /* drmInitData= */ null,
+        /* selectionFlags= */ C.SELECTION_FLAG_DEFAULT,
+        /* language= */ language);
+  }
+
+  private static Format createTextFormat(String language) {
+    return Format.createTextSampleFormat(
+        /* id= */ null,
+        /* sampleMimeType= */ MimeTypes.TEXT_VTT,
+        /* selectionFlags= */ C.SELECTION_FLAG_DEFAULT,
+        /* language= */ language);
+  }
+
+  private static void assertSingleTrackSelectionEquals(
+      List<TrackSelection> trackSelectionList, TrackGroup trackGroup, int... tracks) {
+    assertThat(trackSelectionList).hasSize(1);
+    assertTrackSelectionEquals(trackSelectionList.get(0), trackGroup, tracks);
+  }
+
+  private static void assertTrackSelectionEquals(
+      TrackSelection trackSelection, TrackGroup trackGroup, int... tracks) {
+    assertThat(trackSelection.getTrackGroup()).isEqualTo(trackGroup);
+    assertThat(trackSelection.length()).isEqualTo(tracks.length);
+    int[] selectedTracksInGroup = new int[trackSelection.length()];
+    for (int i = 0; i < trackSelection.length(); i++) {
+      selectedTracksInGroup[i] = trackSelection.getIndexInTrackGroup(i);
+    }
+    Arrays.sort(selectedTracksInGroup);
+    Arrays.sort(tracks);
+    assertThat(selectedTracksInGroup).isEqualTo(tracks);
+  }
+
+  private static final class ManifestType {}
+
+  private static final class FakeDownloadHelper extends DownloadHelper<ManifestType> {
+
+    @Nullable public List<TrackKey> lastCreatedTrackKeys;
+
+    public FakeDownloadHelper(Uri testUri, RenderersFactory renderersFactory) {
+      super(
+          TEST_DOWNLOAD_TYPE,
+          testUri,
+          TEST_CACHE_KEY,
+          DownloadHelper.DEFAULT_TRACK_SELECTOR_PARAMETERS,
+          renderersFactory,
+          /* drmSessionManager= */ null);
+    }
+
+    @Override
+    protected ManifestType loadManifest(Uri uri) throws IOException {
+      return TEST_MANIFEST;
+    }
+
+    @Override
+    protected TrackGroupArray[] getTrackGroupArrays(ManifestType manifest) {
+      assertThat(manifest).isEqualTo(TEST_MANIFEST);
+      return TRACK_GROUP_ARRAYS;
+    }
+
+    @Override
+    protected List<StreamKey> toStreamKeys(List<TrackKey> trackKeys) {
+      lastCreatedTrackKeys = trackKeys;
+      return testStreamKeys;
+    }
+  }
+}

From 480bb50b54bbd51b0fef7e5836eb8d42b38dcf9b Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Sat, 8 Dec 2018 14:29:14 +0000
Subject: [PATCH 290/832] Add DownloadActionUtil class

PiperOrigin-RevId: 224647076
---
 .../offline/DownloadActionUtil.java           |  79 +++++
 .../offline/DownloadActionUtilTest.java       | 335 ++++++++++++++++++
 2 files changed, 414 insertions(+)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadActionUtil.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionUtilTest.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadActionUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadActionUtil.java
new file mode 100644
index 0000000000..f722f9b59b
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadActionUtil.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.offline;
+
+import com.google.android.exoplayer2.util.Assertions;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.HashSet;
+
+/** {@link DownloadAction} related utility methods. */
+public class DownloadActionUtil {
+
+  private DownloadActionUtil() {}
+
+  /**
+   * Merge {@link DownloadAction}s in {@code actionQueue} to minimum number of actions.
+   *
+   * <p>All actions must have the same type and must be for the same media.
+   *
+   * @param actionQueue Queue of actions. Must not be empty.
+   * @return The first action in the queue.
+   */
+  public static DownloadAction mergeActions(ArrayDeque<DownloadAction> actionQueue) {
+    DownloadAction removeAction = null;
+    DownloadAction downloadAction = null;
+    HashSet<StreamKey> keys = new HashSet<>();
+    boolean downloadAllTracks = false;
+    DownloadAction firstAction = Assertions.checkNotNull(actionQueue.peek());
+
+    while (!actionQueue.isEmpty()) {
+      DownloadAction action = actionQueue.remove();
+      Assertions.checkState(action.type.equals(firstAction.type));
+      Assertions.checkState(action.isSameMedia(firstAction));
+      if (action.isRemoveAction) {
+        removeAction = action;
+        downloadAction = null;
+        keys.clear();
+        downloadAllTracks = false;
+      } else {
+        if (!downloadAllTracks) {
+          if (action.keys.isEmpty()) {
+            downloadAllTracks = true;
+            keys.clear();
+          } else {
+            keys.addAll(action.keys);
+          }
+        }
+        downloadAction = action;
+      }
+    }
+
+    if (removeAction != null) {
+      actionQueue.add(removeAction);
+    }
+    if (downloadAction != null) {
+      actionQueue.add(
+          DownloadAction.createDownloadAction(
+              downloadAction.type,
+              downloadAction.uri,
+              new ArrayList<>(keys),
+              downloadAction.customCacheKey,
+              downloadAction.data));
+    }
+    return Assertions.checkNotNull(actionQueue.peek());
+  }
+}
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionUtilTest.java
new file mode 100644
index 0000000000..a494057a05
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionUtilTest.java
@@ -0,0 +1,335 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.offline;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
+
+import android.net.Uri;
+import java.util.ArrayDeque;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link DownloadActionUtil} class. */
+@RunWith(RobolectricTestRunner.class)
+public class DownloadActionUtilTest {
+  private Uri uri1;
+  private Uri uri2;
+
+  @Before
+  public void setUp() throws Exception {
+    uri1 = Uri.parse("http://abc.com/media1");
+    uri2 = Uri.parse("http://abc.com/media2");
+  }
+
+  @Test
+  public void mergeActions_ifQueueEmpty_throwsException() {
+    try {
+      DownloadActionUtil.mergeActions(toActionQueue());
+      fail();
+    } catch (Exception e) {
+      // Expected.
+    }
+  }
+
+  @Test
+  public void mergeActions_ifOneActionInQueue_returnsTheSameAction() {
+    DownloadAction action = createDownloadAction(uri1);
+
+    assertThat(DownloadActionUtil.mergeActions(toActionQueue(action))).isEqualTo(action);
+  }
+
+  @Test
+  public void mergeActions_ifActionsHaveDifferentType_throwsException() {
+    DownloadAction downloadAction1 =
+        DownloadAction.createDownloadAction(
+            DownloadAction.TYPE_PROGRESSIVE,
+            uri1,
+            Collections.emptyList(),
+            /* customCacheKey= */ null,
+            /* data= */ null);
+    DownloadAction downloadAction2 =
+        DownloadAction.createDownloadAction(
+            DownloadAction.TYPE_DASH,
+            uri1,
+            Collections.emptyList(),
+            /* customCacheKey= */ null,
+            /* data= */ null);
+    ArrayDeque<DownloadAction> actionQueue = toActionQueue(downloadAction1, downloadAction2);
+
+    try {
+      DownloadActionUtil.mergeActions(actionQueue);
+      fail();
+    } catch (Exception e) {
+      // Expected.
+    }
+  }
+
+  @Test
+  public void mergeActions_ifActionsHaveDifferentCacheKeys_throwsException() {
+    DownloadAction downloadAction1 =
+        DownloadAction.createDownloadAction(
+            DownloadAction.TYPE_PROGRESSIVE,
+            uri1,
+            Collections.emptyList(),
+            /* customCacheKey= */ "cacheKey1",
+            /* data= */ null);
+    DownloadAction downloadAction2 =
+        DownloadAction.createDownloadAction(
+            DownloadAction.TYPE_PROGRESSIVE,
+            uri1,
+            Collections.emptyList(),
+            /* customCacheKey= */ "cacheKey2",
+            /* data= */ null);
+    ArrayDeque<DownloadAction> actionQueue = toActionQueue(downloadAction1, downloadAction2);
+
+    try {
+      DownloadActionUtil.mergeActions(actionQueue);
+      fail();
+    } catch (Exception e) {
+      // Expected.
+    }
+  }
+
+  @Test
+  public void mergeActions_nullCacheKeyAndDifferentUrl_throwsException() {
+    DownloadAction downloadAction1 =
+        DownloadAction.createDownloadAction(
+            DownloadAction.TYPE_PROGRESSIVE,
+            uri1,
+            Collections.emptyList(),
+            /* customCacheKey= */ null,
+            /* data= */ null);
+    DownloadAction downloadAction2 =
+        DownloadAction.createDownloadAction(
+            DownloadAction.TYPE_PROGRESSIVE,
+            uri2,
+            Collections.emptyList(),
+            /* customCacheKey= */ null,
+            /* data= */ null);
+    ArrayDeque<DownloadAction> actionQueue = toActionQueue(downloadAction1, downloadAction2);
+
+    try {
+      DownloadActionUtil.mergeActions(actionQueue);
+      fail();
+    } catch (Exception e) {
+      // Expected.
+    }
+  }
+
+  @Test
+  public void mergeActions_sameCacheKeyAndDifferentUrl_latterUrlUsed() {
+    DownloadAction downloadAction1 =
+        DownloadAction.createDownloadAction(
+            DownloadAction.TYPE_PROGRESSIVE,
+            uri1,
+            Collections.emptyList(),
+            /* customCacheKey= */ "cacheKey1",
+            /* data= */ null);
+    DownloadAction downloadAction2 =
+        DownloadAction.createDownloadAction(
+            DownloadAction.TYPE_PROGRESSIVE,
+            uri2,
+            Collections.emptyList(),
+            /* customCacheKey= */ "cacheKey1",
+            /* data= */ null);
+    ArrayDeque<DownloadAction> actionQueue = toActionQueue(downloadAction1, downloadAction2);
+
+    DownloadActionUtil.mergeActions(actionQueue);
+
+    DownloadAction mergedAction = DownloadActionUtil.mergeActions(actionQueue);
+
+    assertThat(mergedAction.uri).isEqualTo(uri2);
+  }
+
+  @Test
+  public void mergeActions_differentData_latterDataUsed() {
+    byte[] data1 = "data1".getBytes();
+    DownloadAction downloadAction1 =
+        DownloadAction.createDownloadAction(
+            DownloadAction.TYPE_PROGRESSIVE,
+            uri1,
+            Collections.emptyList(),
+            /* customCacheKey= */ null,
+            /* data= */ data1);
+    byte[] data2 = "data2".getBytes();
+    DownloadAction downloadAction2 =
+        DownloadAction.createDownloadAction(
+            DownloadAction.TYPE_PROGRESSIVE,
+            uri1,
+            Collections.emptyList(),
+            /* customCacheKey= */ null,
+            /* data= */ data2);
+    ArrayDeque<DownloadAction> actionQueue = toActionQueue(downloadAction1, downloadAction2);
+
+    DownloadActionUtil.mergeActions(actionQueue);
+
+    DownloadAction mergedAction = DownloadActionUtil.mergeActions(actionQueue);
+
+    assertThat(mergedAction.data).isEqualTo(data2);
+  }
+
+  @Test
+  public void mergeActions_ifRemoveActionLast_returnsRemoveAction() {
+    DownloadAction downloadAction = createDownloadAction(uri1);
+    DownloadAction removeAction = createRemoveAction(uri1);
+    ArrayDeque<DownloadAction> actionQueue = toActionQueue(downloadAction, removeAction);
+
+    DownloadAction action = DownloadActionUtil.mergeActions(actionQueue);
+
+    assertThat(action).isEqualTo(removeAction);
+    assertThat(actionQueue).containsExactly(removeAction);
+  }
+
+  @Test
+  public void mergeActions_downloadActionAfterRemove_returnsRemoveKeepsDownload() {
+    DownloadAction removeAction = createRemoveAction(uri1);
+    DownloadAction downloadAction = createDownloadAction(uri1);
+    ArrayDeque<DownloadAction> actionQueue = toActionQueue(removeAction, downloadAction);
+
+    DownloadAction action = DownloadActionUtil.mergeActions(actionQueue);
+
+    assertThat(action).isEqualTo(removeAction);
+    assertThat(actionQueue).containsExactly(removeAction, downloadAction);
+  }
+
+  @Test
+  public void mergeActions_downloadActionsAfterRemove_returnsRemoveMergesDownloads() {
+    DownloadAction removeAction = createRemoveAction(uri1);
+    StreamKey streamKey1 = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
+    DownloadAction downloadAction1 =
+        createDownloadAction(uri1, Collections.singletonList(streamKey1));
+    StreamKey streamKey2 = new StreamKey(/* groupIndex= */ 1, /* trackIndex= */ 1);
+    DownloadAction downloadAction2 =
+        createDownloadAction(uri1, Collections.singletonList(streamKey2));
+    ArrayDeque<DownloadAction> actionQueue =
+        toActionQueue(removeAction, downloadAction1, downloadAction2);
+    DownloadAction mergedDownloadAction =
+        createDownloadAction(uri1, Arrays.asList(streamKey1, streamKey2));
+
+    DownloadAction action = DownloadActionUtil.mergeActions(actionQueue);
+
+    assertThat(action).isEqualTo(removeAction);
+    assertThat(actionQueue).containsExactly(removeAction, mergedDownloadAction);
+  }
+
+  @Test
+  public void mergeActions_actionBeforeRemove_ignoresActionBeforeRemove() {
+    DownloadAction removeAction = createRemoveAction(uri1);
+    StreamKey streamKey1 = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
+    DownloadAction downloadAction1 =
+        createDownloadAction(uri1, Collections.singletonList(streamKey1));
+    StreamKey streamKey2 = new StreamKey(/* groupIndex= */ 1, /* trackIndex= */ 1);
+    DownloadAction downloadAction2 =
+        createDownloadAction(uri1, Collections.singletonList(streamKey2));
+    StreamKey streamKey3 = new StreamKey(/* groupIndex= */ 2, /* trackIndex= */ 2);
+    DownloadAction downloadAction3 =
+        createDownloadAction(uri1, Collections.singletonList(streamKey3));
+    ArrayDeque<DownloadAction> actionQueue =
+        toActionQueue(downloadAction1, removeAction, downloadAction2, downloadAction3);
+    DownloadAction mergedDownloadAction =
+        createDownloadAction(uri1, Arrays.asList(streamKey2, streamKey3));
+
+    DownloadAction action = DownloadActionUtil.mergeActions(actionQueue);
+
+    assertThat(action).isEqualTo(removeAction);
+    assertThat(actionQueue).containsExactly(removeAction, mergedDownloadAction);
+  }
+
+  @Test
+  public void mergeActions_returnsMergedAction() {
+    StreamKey streamKey1 = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
+    StreamKey streamKey2 = new StreamKey(/* groupIndex= */ 1, /* trackIndex= */ 1);
+    StreamKey[] keys1 = new StreamKey[] {streamKey1};
+    StreamKey[] keys2 = new StreamKey[] {streamKey2};
+    StreamKey[] expectedKeys = new StreamKey[] {streamKey1, streamKey2};
+
+    doTestMergeActionsReturnsMergedKeys(keys1, keys2, expectedKeys);
+  }
+
+  @Test
+  public void mergeActions_returnsUniqueKeys() {
+    StreamKey streamKey1 = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
+    StreamKey streamKey1Copy = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
+    StreamKey streamKey2 = new StreamKey(/* groupIndex= */ 1, /* trackIndex= */ 1);
+    StreamKey[] keys1 = new StreamKey[] {streamKey1};
+    StreamKey[] keys2 = new StreamKey[] {streamKey2, streamKey1Copy};
+    StreamKey[] expectedKeys = new StreamKey[] {streamKey1, streamKey2};
+
+    doTestMergeActionsReturnsMergedKeys(keys1, keys2, expectedKeys);
+  }
+
+  @Test
+  public void mergeActions_ifFirstActionKeysEmpty_returnsEmptyKeys() {
+    StreamKey streamKey1 = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
+    StreamKey streamKey2 = new StreamKey(/* groupIndex= */ 1, /* trackIndex= */ 1);
+    StreamKey[] keys1 = new StreamKey[] {};
+    StreamKey[] keys2 = new StreamKey[] {streamKey2, streamKey1};
+    StreamKey[] expectedKeys = new StreamKey[] {};
+
+    doTestMergeActionsReturnsMergedKeys(keys1, keys2, expectedKeys);
+  }
+
+  @Test
+  public void mergeActions_ifNotFirstActionKeysEmpty_returnsEmptyKeys() {
+    StreamKey streamKey1 = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
+    StreamKey streamKey2 = new StreamKey(/* groupIndex= */ 1, /* trackIndex= */ 1);
+    StreamKey[] keys1 = new StreamKey[] {streamKey2, streamKey1};
+    StreamKey[] keys2 = new StreamKey[] {};
+    StreamKey[] expectedKeys = new StreamKey[] {};
+
+    doTestMergeActionsReturnsMergedKeys(keys1, keys2, expectedKeys);
+  }
+
+  private void doTestMergeActionsReturnsMergedKeys(
+      StreamKey[] keys1, StreamKey[] keys2, StreamKey[] expectedKeys) {
+    DownloadAction action1 = createDownloadAction(uri1, Arrays.asList(keys1));
+    DownloadAction action2 = createDownloadAction(uri1, Arrays.asList(keys2));
+    ArrayDeque<DownloadAction> actionQueue = toActionQueue(action1, action2);
+
+    DownloadAction mergedAction = DownloadActionUtil.mergeActions(actionQueue);
+
+    assertThat(mergedAction.type).isEqualTo(action1.type);
+    assertThat(mergedAction.uri).isEqualTo(action1.uri);
+    assertThat(mergedAction.customCacheKey).isEqualTo(action1.customCacheKey);
+    assertThat(mergedAction.isRemoveAction).isEqualTo(action1.isRemoveAction);
+    assertThat(mergedAction.keys).containsExactly((Object[]) expectedKeys);
+    assertThat(actionQueue).containsExactly(mergedAction);
+  }
+
+  private ArrayDeque<DownloadAction> toActionQueue(DownloadAction... actions) {
+    return new ArrayDeque<>(Arrays.asList(actions));
+  }
+
+  private static DownloadAction createDownloadAction(Uri uri) {
+    return createDownloadAction(uri, Collections.emptyList());
+  }
+
+  private static DownloadAction createDownloadAction(Uri uri, List<StreamKey> keys) {
+    return DownloadAction.createDownloadAction(
+        DownloadAction.TYPE_PROGRESSIVE, uri, keys, /* customCacheKey= */ null, /* data= */ null);
+  }
+
+  private static DownloadAction createRemoveAction(Uri uri) {
+    return DownloadAction.createRemoveAction(
+        DownloadAction.TYPE_PROGRESSIVE, uri, /* customCacheKey= */ null);
+  }
+}

From b23b86d137ab94084fd056a5f73f91af8eaafde0 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Sun, 9 Dec 2018 19:05:09 +0000
Subject: [PATCH 291/832] Apply EOS flush workaround to stvm8 devices

Issue:#5203
PiperOrigin-RevId: 224726041
---
 .../android/exoplayer2/mediacodec/MediaCodecRenderer.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index 2d936afc2a..b578467933 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -1693,7 +1693,8 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
    */
   private static boolean codecNeedsEosFlushWorkaround(String name) {
     return (Util.SDK_INT <= 23 && "OMX.google.vorbis.decoder".equals(name))
-        || (Util.SDK_INT <= 19 && "hb2000".equals(Util.DEVICE)
+        || (Util.SDK_INT <= 19
+            && ("hb2000".equals(Util.DEVICE) || "stvm8".equals(Util.DEVICE))
             && ("OMX.amlogic.avc.decoder.awesome".equals(name)
                 || "OMX.amlogic.avc.decoder.awesome.secure".equals(name)));
   }

From a02dba210c787f415339acb3f0619afdce26ffb6 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 10 Dec 2018 12:58:56 +0000
Subject: [PATCH 292/832] Remove no-longer-true documentation

PiperOrigin-RevId: 224793600
---
 .../com/google/android/exoplayer2/upstream/DataSpec.java     | 5 +----
 .../android/exoplayer2/upstream/cache/CacheDataSource.java   | 4 ----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java
index c33c7c823f..ef0efe6140 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java
@@ -108,10 +108,7 @@ public final class DataSpec {
    * {@link DataSpec} is not intended to be used in conjunction with a cache.
    */
   public final @Nullable String key;
-  /**
-   * Request flags. Currently {@link #FLAG_ALLOW_GZIP} and
-   * {@link #FLAG_ALLOW_CACHING_UNKNOWN_LENGTH} are the only supported flags.
-   */
+  /** Request {@link Flags flags}. */
   public final @Flags int flags;
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
index eaf72cf7fb..757f2892ae 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
@@ -42,10 +42,6 @@ import java.util.Map;
  * A {@link DataSource} that reads and writes a {@link Cache}. Requests are fulfilled from the cache
  * when possible. When data is not cached it is requested from an upstream {@link DataSource} and
  * written into the cache.
- *
- * <p>By default requests whose length can not be resolved are not cached. This is to prevent
- * caching of progressive live streams, which should usually not be cached. Caching of this kind of
- * requests can be enabled per request with {@link DataSpec#FLAG_ALLOW_CACHING_UNKNOWN_LENGTH}.
  */
 public final class CacheDataSource implements DataSource {
 

From 6a6b211233c8cd4d6e1f07610f978430176f75d6 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 10 Dec 2018 13:43:51 +0000
Subject: [PATCH 293/832] Update DownloadHelper constructors and their usage in
 the demo app.

PiperOrigin-RevId: 224797598
---
 .../exoplayer2/demo/DemoApplication.java      | 13 +++++
 .../exoplayer2/demo/DownloadTracker.java      | 31 +++++++----
 .../exoplayer2/demo/PlayerActivity.java       | 11 ++--
 .../demo/SampleChooserActivity.java           |  7 ++-
 .../exoplayer2/offline/DownloadHelper.java    | 20 -------
 .../offline/ProgressiveDownloadHelper.java    | 24 +++++++--
 .../dash/offline/DashDownloadHelper.java      | 53 ++++++++++++++++++-
 .../source/hls/offline/HlsDownloadHelper.java | 53 ++++++++++++++++++-
 .../offline/SsDownloadHelper.java             | 53 ++++++++++++++++++-
 9 files changed, 216 insertions(+), 49 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
index 65d5096f30..9b72df8d98 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
@@ -16,6 +16,8 @@
 package com.google.android.exoplayer2.demo;
 
 import android.app.Application;
+import com.google.android.exoplayer2.DefaultRenderersFactory;
+import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.offline.DefaultDownloaderFactory;
 import com.google.android.exoplayer2.offline.DownloadManager;
 import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
@@ -72,6 +74,17 @@ public class DemoApplication extends Application {
     return "withExtensions".equals(BuildConfig.FLAVOR);
   }
 
+  public RenderersFactory buildRenderersFactory(boolean preferExtensionRenderer) {
+    @DefaultRenderersFactory.ExtensionRendererMode
+    int extensionRendererMode =
+        useExtensionRenderers()
+            ? (preferExtensionRenderer
+                ? DefaultRenderersFactory.EXTENSION_RENDERER_MODE_PREFER
+                : DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON)
+            : DefaultRenderersFactory.EXTENSION_RENDERER_MODE_OFF;
+    return new DefaultRenderersFactory(this, extensionRendererMode);
+  }
+
   public DownloadManager getDownloadManager() {
     initDownloadManager();
     return downloadManager;
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index 9c225a21b1..df549a92ae 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -28,6 +28,7 @@ import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.Toast;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.offline.ActionFile;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadHelper;
@@ -114,13 +115,20 @@ public class DownloadTracker implements DownloadManager.Listener {
     return trackedDownloadStates.get(uri).getKeys();
   }
 
-  public void toggleDownload(Activity activity, String name, Uri uri, String extension) {
+  public void toggleDownload(
+      Activity activity,
+      String name,
+      Uri uri,
+      String extension,
+      RenderersFactory renderersFactory) {
     if (isDownloaded(uri)) {
-      DownloadAction removeAction = getDownloadHelper(uri, extension).getRemoveAction();
+      DownloadAction removeAction =
+          getDownloadHelper(uri, extension, renderersFactory).getRemoveAction();
       startServiceWithAction(removeAction);
     } else {
       StartDownloadDialogHelper helper =
-          new StartDownloadDialogHelper(activity, getDownloadHelper(uri, extension), name);
+          new StartDownloadDialogHelper(
+              activity, getDownloadHelper(uri, extension, renderersFactory), name);
       helper.prepare();
     }
   }
@@ -192,15 +200,16 @@ public class DownloadTracker implements DownloadManager.Listener {
     DownloadService.startWithAction(context, DemoDownloadService.class, action, false);
   }
 
-  private DownloadHelper getDownloadHelper(Uri uri, String extension) {
+  private DownloadHelper<?> getDownloadHelper(
+      Uri uri, String extension, RenderersFactory renderersFactory) {
     int type = Util.inferContentType(uri, extension);
     switch (type) {
       case C.TYPE_DASH:
-        return new DashDownloadHelper(uri, dataSourceFactory);
+        return new DashDownloadHelper(uri, dataSourceFactory, renderersFactory);
       case C.TYPE_SS:
-        return new SsDownloadHelper(uri, dataSourceFactory);
+        return new SsDownloadHelper(uri, dataSourceFactory, renderersFactory);
       case C.TYPE_HLS:
-        return new HlsDownloadHelper(uri, dataSourceFactory);
+        return new HlsDownloadHelper(uri, dataSourceFactory, renderersFactory);
       case C.TYPE_OTHER:
         return new ProgressiveDownloadHelper(uri);
       default:
@@ -211,7 +220,7 @@ public class DownloadTracker implements DownloadManager.Listener {
   private final class StartDownloadDialogHelper
       implements DownloadHelper.Callback, DialogInterface.OnClickListener {
 
-    private final DownloadHelper downloadHelper;
+    private final DownloadHelper<?> downloadHelper;
     private final String name;
 
     private final AlertDialog.Builder builder;
@@ -221,7 +230,7 @@ public class DownloadTracker implements DownloadManager.Listener {
     private final ListView representationList;
 
     public StartDownloadDialogHelper(
-        Activity activity, DownloadHelper downloadHelper, String name) {
+        Activity activity, DownloadHelper<?> downloadHelper, String name) {
       this.downloadHelper = downloadHelper;
       this.name = name;
       builder =
@@ -248,7 +257,7 @@ public class DownloadTracker implements DownloadManager.Listener {
     }
 
     @Override
-    public void onPrepared(DownloadHelper helper) {
+    public void onPrepared(DownloadHelper<?> helper) {
       for (int i = 0; i < downloadHelper.getPeriodCount(); i++) {
         TrackGroupArray trackGroups = downloadHelper.getTrackGroups(i);
         for (int j = 0; j < trackGroups.length; j++) {
@@ -266,7 +275,7 @@ public class DownloadTracker implements DownloadManager.Listener {
     }
 
     @Override
-    public void onPrepareError(DownloadHelper helper, IOException e) {
+    public void onPrepareError(DownloadHelper<?> helper, IOException e) {
       Toast.makeText(
               context.getApplicationContext(), R.string.download_start_error, Toast.LENGTH_LONG)
           .show();
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 ffa9bafa4f..6252fa3b3f 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
@@ -35,11 +35,11 @@ import android.widget.TextView;
 import android.widget.Toast;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.C.ContentType;
-import com.google.android.exoplayer2.DefaultRenderersFactory;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayerFactory;
 import com.google.android.exoplayer2.PlaybackPreparer;
 import com.google.android.exoplayer2.Player;
+import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.drm.DefaultDrmSessionManager;
 import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
@@ -416,13 +416,8 @@ public class PlayerActivity extends Activity
 
       boolean preferExtensionDecoders =
           intent.getBooleanExtra(PREFER_EXTENSION_DECODERS_EXTRA, false);
-      @DefaultRenderersFactory.ExtensionRendererMode int extensionRendererMode =
-          ((DemoApplication) getApplication()).useExtensionRenderers()
-              ? (preferExtensionDecoders ? DefaultRenderersFactory.EXTENSION_RENDERER_MODE_PREFER
-              : DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON)
-              : DefaultRenderersFactory.EXTENSION_RENDERER_MODE_OFF;
-      DefaultRenderersFactory renderersFactory =
-          new DefaultRenderersFactory(this, extensionRendererMode);
+      RenderersFactory renderersFactory =
+          ((DemoApplication) getApplication()).buildRenderersFactory(preferExtensionDecoders);
 
       trackSelector = new DefaultTrackSelector(trackSelectionFactory);
       trackSelector.setParameters(trackSelectorParameters);
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 20e27d8d48..5db52fd575 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
@@ -37,6 +37,7 @@ import android.widget.ImageButton;
 import android.widget.TextView;
 import android.widget.Toast;
 import com.google.android.exoplayer2.ParserException;
+import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.offline.DownloadService;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DataSourceInputStream;
@@ -177,7 +178,11 @@ public class SampleChooserActivity extends Activity
           .show();
     } else {
       UriSample uriSample = (UriSample) sample;
-      downloadTracker.toggleDownload(this, sample.name, uriSample.uri, uriSample.extension);
+      RenderersFactory renderersFactory =
+          ((DemoApplication) getApplication())
+              .buildRenderersFactory(isNonNullAndChecked(preferExtensionDecodersMenuItem));
+      downloadTracker.toggleDownload(
+          this, sample.name, uriSample.uri, uriSample.extension, renderersFactory);
     }
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index 9ee8b0e3a4..152aaf2121 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -22,7 +22,6 @@ import android.support.annotation.Nullable;
 import android.util.SparseIntArray;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
-import com.google.android.exoplayer2.Renderer;
 import com.google.android.exoplayer2.RendererCapabilities;
 import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.Timeline;
@@ -113,25 +112,6 @@ public abstract class DownloadHelper<T> {
   private List<TrackSelection> @MonotonicNonNull [][] trackSelectionsByPeriodAndRenderer;
   private List<TrackSelection> @MonotonicNonNull [][] immutableTrackSelectionsByPeriodAndRenderer;
 
-  /**
-   * Create download helper.
-   *
-   * @param downloadType A download type. This value will be used as {@link DownloadAction#type}.
-   * @param uri A {@link Uri}.
-   * @param cacheKey An optional cache key.
-   */
-  public DownloadHelper(String downloadType, Uri uri, @Nullable String cacheKey) {
-    // TODO: Remove as soon as all implementations have been updated to the new constructor.
-    this(
-        downloadType,
-        uri,
-        cacheKey,
-        DEFAULT_TRACK_SELECTOR_PARAMETERS,
-        /* renderersFactory= */ (handler, videoListener, audioListener, metadata, text, drm) ->
-            new Renderer[0],
-        /* drmSessionManager= */ null);
-  }
-
   /**
    * Creates download helper.
    *
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java
index 70587694c4..851a08c869 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.offline;
 
 import android.net.Uri;
 import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.Renderer;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import java.util.Collections;
 import java.util.List;
@@ -24,12 +25,29 @@ import java.util.List;
 /** A {@link DownloadHelper} for progressive streams. */
 public final class ProgressiveDownloadHelper extends DownloadHelper<Void> {
 
+  /**
+   * Creates download helper for progressive streams.
+   *
+   * @param uri The stream {@link Uri}.
+   */
   public ProgressiveDownloadHelper(Uri uri) {
-    this(uri, null);
+    this(uri, /* cacheKey= */ null);
   }
 
-  public ProgressiveDownloadHelper(Uri uri, @Nullable String customCacheKey) {
-    super(DownloadAction.TYPE_PROGRESSIVE, uri, customCacheKey);
+  /**
+   * Creates download helper for progressive streams.
+   *
+   * @param uri The stream {@link Uri}.
+   * @param cacheKey An optional cache key.
+   */
+  public ProgressiveDownloadHelper(Uri uri, @Nullable String cacheKey) {
+    super(
+        DownloadAction.TYPE_PROGRESSIVE,
+        uri,
+        cacheKey,
+        DownloadHelper.DEFAULT_TRACK_SELECTOR_PARAMETERS,
+        (handler, videoListener, audioListener, metadata, text, drm) -> new Renderer[0],
+        /* drmSessionManager= */ null);
   }
 
   @Override
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java
index f4e43f4641..81f791b98d 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java
@@ -16,8 +16,12 @@
 package com.google.android.exoplayer2.source.dash.offline;
 
 import android.net.Uri;
+import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.RenderersFactory;
+import com.google.android.exoplayer2.drm.DrmSessionManager;
+import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
@@ -28,6 +32,7 @@ import com.google.android.exoplayer2.source.dash.manifest.AdaptationSet;
 import com.google.android.exoplayer2.source.dash.manifest.DashManifest;
 import com.google.android.exoplayer2.source.dash.manifest.DashManifestParser;
 import com.google.android.exoplayer2.source.dash.manifest.Representation;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.ParsingLoadable;
 import java.io.IOException;
@@ -39,8 +44,52 @@ public final class DashDownloadHelper extends DownloadHelper<DashManifest> {
 
   private final DataSource.Factory manifestDataSourceFactory;
 
-  public DashDownloadHelper(Uri uri, DataSource.Factory manifestDataSourceFactory) {
-    super(DownloadAction.TYPE_DASH, uri, /* cacheKey= */ null);
+  /**
+   * Creates a DASH download helper.
+   *
+   * <p>The helper uses {@link DownloadHelper#DEFAULT_TRACK_SELECTOR_PARAMETERS} for track selection
+   * and does not support drm protected content.
+   *
+   * @param uri A manifest {@link Uri}.
+   * @param manifestDataSourceFactory A {@link DataSource.Factory} used to load the manifest.
+   * @param renderersFactory The {@link RenderersFactory} creating the renderers for which tracks
+   *     are selected.
+   */
+  public DashDownloadHelper(
+      Uri uri, DataSource.Factory manifestDataSourceFactory, RenderersFactory renderersFactory) {
+    this(
+        uri,
+        manifestDataSourceFactory,
+        DownloadHelper.DEFAULT_TRACK_SELECTOR_PARAMETERS,
+        renderersFactory,
+        /* drmSessionManager= */ null);
+  }
+
+  /**
+   * Creates a DASH download helper.
+   *
+   * @param uri A manifest {@link Uri}.
+   * @param manifestDataSourceFactory A {@link DataSource.Factory} used to load the manifest.
+   * @param trackSelectorParameters {@link DefaultTrackSelector.Parameters} for selecting tracks for
+   *     downloading.
+   * @param renderersFactory The {@link RenderersFactory} creating the renderers for which tracks
+   *     are selected.
+   * @param drmSessionManager An optional {@link DrmSessionManager} used by the renderers created by
+   *     {@code renderersFactory}.
+   */
+  public DashDownloadHelper(
+      Uri uri,
+      DataSource.Factory manifestDataSourceFactory,
+      DefaultTrackSelector.Parameters trackSelectorParameters,
+      RenderersFactory renderersFactory,
+      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager) {
+    super(
+        DownloadAction.TYPE_DASH,
+        uri,
+        /* cacheKey= */ null,
+        trackSelectorParameters,
+        renderersFactory,
+        drmSessionManager);
     this.manifestDataSourceFactory = manifestDataSourceFactory;
   }
 
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java
index c6ebe8e294..1f704a1e08 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java
@@ -16,8 +16,12 @@
 package com.google.android.exoplayer2.source.hls.offline;
 
 import android.net.Uri;
+import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.RenderersFactory;
+import com.google.android.exoplayer2.drm.DrmSessionManager;
+import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
@@ -28,6 +32,7 @@ import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist;
 import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylist;
 import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylistParser;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.ParsingLoadable;
 import com.google.android.exoplayer2.util.Assertions;
@@ -43,8 +48,52 @@ public final class HlsDownloadHelper extends DownloadHelper<HlsPlaylist> {
 
   private int[] renditionGroups;
 
-  public HlsDownloadHelper(Uri uri, DataSource.Factory manifestDataSourceFactory) {
-    super(DownloadAction.TYPE_HLS, uri, /* cacheKey= */ null);
+  /**
+   * Creates a HLS download helper.
+   *
+   * <p>The helper uses {@link DownloadHelper#DEFAULT_TRACK_SELECTOR_PARAMETERS} for track selection
+   * and does not support drm protected content.
+   *
+   * @param uri A manifest {@link Uri}.
+   * @param manifestDataSourceFactory A {@link DataSource.Factory} used to load the manifest.
+   * @param renderersFactory The {@link RenderersFactory} creating the renderers for which tracks
+   *     are selected.
+   */
+  public HlsDownloadHelper(
+      Uri uri, DataSource.Factory manifestDataSourceFactory, RenderersFactory renderersFactory) {
+    this(
+        uri,
+        manifestDataSourceFactory,
+        DownloadHelper.DEFAULT_TRACK_SELECTOR_PARAMETERS,
+        renderersFactory,
+        /* drmSessionManager= */ null);
+  }
+
+  /**
+   * Creates a HLS download helper.
+   *
+   * @param uri A manifest {@link Uri}.
+   * @param manifestDataSourceFactory A {@link DataSource.Factory} used to load the manifest.
+   * @param trackSelectorParameters {@link DefaultTrackSelector.Parameters} for selecting tracks for
+   *     downloading.
+   * @param renderersFactory The {@link RenderersFactory} creating the renderers for which tracks
+   *     are selected.
+   * @param drmSessionManager An optional {@link DrmSessionManager} used by the renderers created by
+   *     {@code renderersFactory}.
+   */
+  public HlsDownloadHelper(
+      Uri uri,
+      DataSource.Factory manifestDataSourceFactory,
+      DefaultTrackSelector.Parameters trackSelectorParameters,
+      RenderersFactory renderersFactory,
+      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager) {
+    super(
+        DownloadAction.TYPE_HLS,
+        uri,
+        /* cacheKey= */ null,
+        trackSelectorParameters,
+        renderersFactory,
+        drmSessionManager);
     this.manifestDataSourceFactory = manifestDataSourceFactory;
   }
 
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java
index 154ac30ac6..877e1bcb46 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java
@@ -16,7 +16,11 @@
 package com.google.android.exoplayer2.source.smoothstreaming.offline;
 
 import android.net.Uri;
+import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.RenderersFactory;
+import com.google.android.exoplayer2.drm.DrmSessionManager;
+import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
@@ -25,6 +29,7 @@ import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest;
 import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifestParser;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.ParsingLoadable;
 import java.io.IOException;
@@ -36,8 +41,52 @@ public final class SsDownloadHelper extends DownloadHelper<SsManifest> {
 
   private final DataSource.Factory manifestDataSourceFactory;
 
-  public SsDownloadHelper(Uri uri, DataSource.Factory manifestDataSourceFactory) {
-    super(DownloadAction.TYPE_SS, uri, /* cacheKey= */ null);
+  /**
+   * Creates a SmoothStreaming download helper.
+   *
+   * <p>The helper uses {@link DownloadHelper#DEFAULT_TRACK_SELECTOR_PARAMETERS} for track selection
+   * and does not support drm protected content.
+   *
+   * @param uri A manifest {@link Uri}.
+   * @param manifestDataSourceFactory A {@link DataSource.Factory} used to load the manifest.
+   * @param renderersFactory The {@link RenderersFactory} creating the renderers for which tracks
+   *     are selected.
+   */
+  public SsDownloadHelper(
+      Uri uri, DataSource.Factory manifestDataSourceFactory, RenderersFactory renderersFactory) {
+    this(
+        uri,
+        manifestDataSourceFactory,
+        DownloadHelper.DEFAULT_TRACK_SELECTOR_PARAMETERS,
+        renderersFactory,
+        /* drmSessionManager= */ null);
+  }
+
+  /**
+   * Creates a SmoothStreaming download helper.
+   *
+   * @param uri A manifest {@link Uri}.
+   * @param manifestDataSourceFactory A {@link DataSource.Factory} used to load the manifest.
+   * @param trackSelectorParameters {@link DefaultTrackSelector.Parameters} for selecting tracks for
+   *     downloading.
+   * @param renderersFactory The {@link RenderersFactory} creating the renderers for which tracks
+   *     are selected.
+   * @param drmSessionManager An optional {@link DrmSessionManager} used by the renderers created by
+   *     {@code renderersFactory}.
+   */
+  public SsDownloadHelper(
+      Uri uri,
+      DataSource.Factory manifestDataSourceFactory,
+      DefaultTrackSelector.Parameters trackSelectorParameters,
+      RenderersFactory renderersFactory,
+      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager) {
+    super(
+        DownloadAction.TYPE_SS,
+        uri,
+        /* cacheKey= */ null,
+        trackSelectorParameters,
+        renderersFactory,
+        drmSessionManager);
     this.manifestDataSourceFactory = manifestDataSourceFactory;
   }
 

From c819856530d394a2352a68e7ce92e8a83a8d7071 Mon Sep 17 00:00:00 2001
From: Mattia Iavarone <mat.iavarone@gmail.com>
Date: Tue, 11 Dec 2018 22:07:40 +0100
Subject: [PATCH 294/832] Add protected method to override the
 AspectRatioFrameLayout aspect ratio

---
 .../google/android/exoplayer2/ui/PlayerView.java  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
index 41ddd3c7eb..d64f5aa61b 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
@@ -1031,6 +1031,19 @@ public class PlayerView extends FrameLayout {
     return subtitleView;
   }
 
+  /**
+   * Called to notify the {@link AspectRatioFrameLayout} of the new video aspect ratio.
+   * The default implementation will simply forward the aspect ratio to
+   * {@link AspectRatioFrameLayout#setAspectRatio(float)}. Subclasses can override this
+   * method, for example, to apply aspect ratio constraints.
+   *
+   * @param aspectRatioFrameLayout the video surface view container
+   * @param widthHeightRatio the computed aspect ratio
+   */
+  protected void onDispatchVideoAspectRatio(@NonNull AspectRatioFrameLayout aspectRatioFrameLayout, float widthHeightRatio) {
+    aspectRatioFrameLayout.setAspectRatio(widthHeightRatio);
+  }
+
   @Override
   public boolean onTouchEvent(MotionEvent ev) {
     if (ev.getActionMasked() != MotionEvent.ACTION_DOWN) {
@@ -1355,7 +1368,7 @@ public class PlayerView extends FrameLayout {
         videoAspectRatio = 0;
       }
 
-      contentFrame.setAspectRatio(videoAspectRatio);
+      onDispatchVideoAspectRatio(contentFrame, videoAspectRatio);
     }
 
     @Override

From 2f365e5a4b1721c43edc03fe9071008d3e81aaea Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 10 Dec 2018 20:07:42 +0000
Subject: [PATCH 295/832] Don't write CachedContentIndex to disk on key removal

Issue: #5136
PiperOrigin-RevId: 224857629
---
 RELEASENOTES.md                               | 12 ++++--
 .../exoplayer2/upstream/cache/Cache.java      |  2 +-
 .../upstream/cache/CachedContentIndex.java    | 39 ++++++++++++++++++-
 .../upstream/cache/SimpleCache.java           | 34 +++++++---------
 .../upstream/cache/CacheDataSourceTest.java   |  6 +--
 .../upstream/cache/SimpleCacheTest.java       | 35 +++++++++++++++++
 6 files changed, 97 insertions(+), 31 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index ad2956cb4d..337ff54ee8 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -12,9 +12,15 @@
     selections together.
 * Do not retry failed loads whose error is `FileNotFoundException`.
 * Prevent Cea608Decoder from generating Subtitles with null Cues list.
-* Caching: Cache data with unknown length by default. The previous flag to opt
-  in to this behavior (`DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH`) has been
-  replaced with an opt out flag (`DataSpec.FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN`).
+* Offline:
+  * Speed up removal of segmented downloads
+    ([#5136](https://github.com/google/ExoPlayer/issues/5136)).
+* Caching:
+  * Improve performance of `SimpleCache`.
+  * Cache data with unknown length by default. The previous flag to opt in to
+    this behavior (`DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH`) has been
+    replaced with an opt out flag
+    (`DataSpec.FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN`).
 * Disable post processing on Nvidia devices, as it breaks decode-only frame
   skippping.
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
index a769e9acac..b5b5dc64e6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
@@ -82,7 +82,7 @@ public interface Cache {
    * Releases the cache. This method must be called when the cache is no longer required. The cache
    * must not be used after calling this method.
    */
-  void release() throws CacheException;
+  void release();
 
   /**
    * Registers a listener to listen for changes to a given key.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
index 19160c73d4..a744917230 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.upstream.cache;
 
 import android.support.annotation.VisibleForTesting;
 import android.util.SparseArray;
+import android.util.SparseBooleanArray;
 import com.google.android.exoplayer2.upstream.cache.Cache.CacheException;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.AtomicFile;
@@ -42,6 +43,7 @@ import javax.crypto.CipherOutputStream;
 import javax.crypto.NoSuchPaddingException;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
+import org.checkerframework.checker.nullness.compatqual.NullableType;
 
 /** Maintains the index of cached content. */
 /* package */ class CachedContentIndex {
@@ -53,7 +55,30 @@ import javax.crypto.spec.SecretKeySpec;
   private static final int FLAG_ENCRYPTED_INDEX = 1;
 
   private final HashMap<String, CachedContent> keyToContent;
-  private final SparseArray<String> idToKey;
+  /**
+   * Maps assigned ids to their corresponding keys. Also contains (id -> null) entries for ids that
+   * have been removed from the index since it was last stored. This prevents reuse of these ids,
+   * which is necessary to avoid clashes that could otherwise occur as a result of the sequence:
+   *
+   * <p>[1] (key1, id1) is removed from the in-memory index ... the index is not stored to disk ...
+   * [2] id1 is reused for a different key2 ... the index is not stored to disk ... [3] A file for
+   * key2 is partially written using a path corresponding to id1 ... the process is killed before
+   * the index is stored to disk ... [4] The index is read from disk, causing the partially written
+   * file to be incorrectly associated to key1
+   *
+   * <p>By avoiding id reuse in step [2], a new id2 will be used instead. Step [4] will then delete
+   * the partially written file because the index does not contain an entry for id2.
+   *
+   * <p>When the index is next stored (id -> null) entries are removed, making the ids eligible for
+   * reuse.
+   */
+  private final SparseArray<@NullableType String> idToKey;
+  /**
+   * Tracks ids for which (id -> null) entries are present in idToKey, so that they can be removed
+   * efficiently when the index is next stored.
+   */
+  private final SparseBooleanArray removedIds;
+
   private final AtomicFile atomicFile;
   private final Cipher cipher;
   private final SecretKeySpec secretKeySpec;
@@ -105,6 +130,7 @@ import javax.crypto.spec.SecretKeySpec;
     }
     keyToContent = new HashMap<>();
     idToKey = new SparseArray<>();
+    removedIds = new SparseBooleanArray();
     atomicFile = new AtomicFile(new File(cacheDir, FILE_NAME));
   }
 
@@ -125,6 +151,12 @@ import javax.crypto.spec.SecretKeySpec;
     }
     writeFile();
     changed = false;
+    // Make ids that were removed since the index was last stored eligible for re-use.
+    int removedIdCount = removedIds.size();
+    for (int i = 0; i < removedIdCount; i++) {
+      idToKey.remove(removedIds.keyAt(i));
+    }
+    removedIds.clear();
   }
 
   /**
@@ -169,8 +201,11 @@ import javax.crypto.spec.SecretKeySpec;
     CachedContent cachedContent = keyToContent.get(key);
     if (cachedContent != null && cachedContent.isEmpty() && !cachedContent.isLocked()) {
       keyToContent.remove(key);
-      idToKey.remove(cachedContent.id);
       changed = true;
+      // Keep an entry in idToKey to stop the id from being reused until the index is next stored.
+      idToKey.put(cachedContent.id, /* value= */ null);
+      // Track that the entry should be removed from idToKey when the index is next stored.
+      removedIds.put(cachedContent.id, /* value= */ true);
     }
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index 1fd6dc63bc..a3ec3b1f05 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -146,13 +146,16 @@ public final class SimpleCache implements Cache {
   }
 
   @Override
-  public synchronized void release() throws CacheException {
+  public synchronized void release() {
     if (released) {
       return;
     }
     listeners.clear();
+    removeStaleSpans();
     try {
-      removeStaleSpansAndCachedContents();
+      index.store();
+    } catch (CacheException e) {
+      Log.e(TAG, "Storing index file failed", e);
     } finally {
       unlockFolder(cacheDir);
       released = true;
@@ -265,7 +268,7 @@ public final class SimpleCache implements Cache {
     if (!cacheDir.exists()) {
       // For some reason the cache directory doesn't exist. Make a best effort to create it.
       cacheDir.mkdirs();
-      removeStaleSpansAndCachedContents();
+      removeStaleSpans();
     }
     evictor.onStartFile(this, key, position, maxLength);
     return SimpleCacheSpan.getCacheFile(
@@ -311,9 +314,9 @@ public final class SimpleCache implements Cache {
   }
 
   @Override
-  public synchronized void removeSpan(CacheSpan span) throws CacheException {
+  public synchronized void removeSpan(CacheSpan span) {
     Assertions.checkState(!released);
-    removeSpan(span, true);
+    removeSpanInternal(span);
   }
 
   @Override
@@ -379,7 +382,7 @@ public final class SimpleCache implements Cache {
       if (span.isCached && !span.file.exists()) {
         // The file has been deleted from under us. It's likely that other files will have been
         // deleted too, so scan the whole in-memory representation.
-        removeStaleSpansAndCachedContents();
+        removeStaleSpans();
         continue;
       }
       return span;
@@ -431,27 +434,21 @@ public final class SimpleCache implements Cache {
     notifySpanAdded(span);
   }
 
-  private void removeSpan(CacheSpan span, boolean removeEmptyCachedContent) throws CacheException {
+  private void removeSpanInternal(CacheSpan span) {
     CachedContent cachedContent = index.get(span.key);
     if (cachedContent == null || !cachedContent.removeSpan(span)) {
       return;
     }
     totalSpace -= span.length;
-    try {
-      if (removeEmptyCachedContent) {
-        index.maybeRemove(cachedContent.key);
-        index.store();
-      }
-    } finally {
-      notifySpanRemoved(span);
-    }
+    index.maybeRemove(cachedContent.key);
+    notifySpanRemoved(span);
   }
 
   /**
    * Scans all of the cached spans in the in-memory representation, removing any for which files no
    * longer exist.
    */
-  private void removeStaleSpansAndCachedContents() throws CacheException {
+  private void removeStaleSpans() {
     ArrayList<CacheSpan> spansToBeRemoved = new ArrayList<>();
     for (CachedContent cachedContent : index.getAll()) {
       for (CacheSpan span : cachedContent.getSpans()) {
@@ -461,11 +458,8 @@ public final class SimpleCache implements Cache {
       }
     }
     for (int i = 0; i < spansToBeRemoved.size(); i++) {
-      // Remove span but not CachedContent to prevent multiple index.store() calls.
-      removeSpan(spansToBeRemoved.get(i), false);
+      removeSpanInternal(spansToBeRemoved.get(i));
     }
-    index.removeEmpty();
-    index.store();
   }
 
   private void notifySpanRemoved(CacheSpan span) {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
index 9182074eb9..236f8f6641 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
@@ -467,11 +467,7 @@ public final class CacheDataSourceTest {
     NavigableSet<CacheSpan> cachedSpans = cache.getCachedSpans(defaultCacheKey);
     for (CacheSpan cachedSpan : cachedSpans) {
       if (cachedSpan.position >= halfDataLength) {
-        try {
-          cache.removeSpan(cachedSpan);
-        } catch (Cache.CacheException e) {
-          // do nothing
-        }
+        cache.removeSpan(cachedSpan);
       }
     }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
index a4e444386a..15bbb8c108 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
@@ -47,6 +47,7 @@ import org.robolectric.RuntimeEnvironment;
 public class SimpleCacheTest {
 
   private static final String KEY_1 = "key1";
+  private static final String KEY_2 = "key2";
 
   private File cacheDir;
 
@@ -152,6 +153,40 @@ public class SimpleCacheTest {
     assertCachedDataReadCorrect(cacheSpan2);
   }
 
+  @Test
+  public void testReloadCacheWithoutRelease() throws Exception {
+    SimpleCache simpleCache = getSimpleCache();
+
+    // Write data for KEY_1.
+    CacheSpan cacheSpan1 = simpleCache.startReadWrite(KEY_1, 0);
+    addCache(simpleCache, KEY_1, 0, 15);
+    simpleCache.releaseHoleSpan(cacheSpan1);
+    // Write and remove data for KEY_2.
+    CacheSpan cacheSpan2 = simpleCache.startReadWrite(KEY_2, 0);
+    addCache(simpleCache, KEY_2, 0, 15);
+    simpleCache.releaseHoleSpan(cacheSpan2);
+    simpleCache.removeSpan(simpleCache.getCachedSpans(KEY_2).first());
+
+    // Don't release the cache. This means the index file wont have been written to disk after the
+    // data for KEY_2 was removed. Move the cache instead, so we can reload it without failing the
+    // folder locking check.
+    File cacheDir2 = Util.createTempFile(RuntimeEnvironment.application, "ExoPlayerTest");
+    cacheDir2.delete();
+    cacheDir.renameTo(cacheDir2);
+
+    // Reload the cache from its new location.
+    simpleCache = new SimpleCache(cacheDir2, new NoOpCacheEvictor());
+
+    // Read data back for KEY_1.
+    CacheSpan cacheSpan3 = simpleCache.startReadWrite(KEY_1, 0);
+    assertCachedDataReadCorrect(cacheSpan3);
+
+    // Check the entry for KEY_2 was removed when the cache was reloaded.
+    assertThat(simpleCache.getCachedSpans(KEY_2)).isEmpty();
+
+    Util.recursiveDelete(cacheDir2);
+  }
+
   @Test
   public void testEncryptedIndex() throws Exception {
     byte[] key = "Bar12345Bar12345".getBytes(C.UTF8_NAME); // 128 bit key

From 272a5e59f20e5466cdbe09c70774133496c8cc92 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 11 Dec 2018 15:48:59 +0000
Subject: [PATCH 296/832] Use download icon instead of play icon for download
 notification.

PiperOrigin-RevId: 225001681
---
 .../google/android/exoplayer2/demo/DemoDownloadService.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
index 7d1ab16ce4..024ca62579 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
@@ -53,7 +53,7 @@ public class DemoDownloadService extends DownloadService {
   protected Notification getForegroundNotification(TaskState[] taskStates) {
     return DownloadNotificationUtil.buildProgressNotification(
         /* context= */ this,
-        R.drawable.exo_controls_play,
+        R.drawable.ic_download,
         CHANNEL_ID,
         /* contentIntent= */ null,
         /* message= */ null,
@@ -70,7 +70,7 @@ public class DemoDownloadService extends DownloadService {
       notification =
           DownloadNotificationUtil.buildDownloadCompletedNotification(
               /* context= */ this,
-              R.drawable.exo_controls_play,
+              R.drawable.ic_download_done,
               CHANNEL_ID,
               /* contentIntent= */ null,
               Util.fromUtf8Bytes(taskState.action.data));
@@ -78,7 +78,7 @@ public class DemoDownloadService extends DownloadService {
       notification =
           DownloadNotificationUtil.buildDownloadFailedNotification(
               /* context= */ this,
-              R.drawable.exo_controls_play,
+              R.drawable.ic_download_done,
               CHANNEL_ID,
               /* contentIntent= */ null,
               Util.fromUtf8Bytes(taskState.action.data));

From 8d137c2e6187e7cf0ef9fc58d968d4d52412134a Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 11 Dec 2018 15:50:54 +0000
Subject: [PATCH 297/832] Fix manifest uri in SsDownloadHelper.

This is the same as in SsMediaSource.

PiperOrigin-RevId: 225001911
---
 .../source/smoothstreaming/offline/SsDownloadHelper.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java
index 877e1bcb46..58393c26e8 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java
@@ -29,6 +29,7 @@ import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest;
 import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifestParser;
+import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsUtil;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.ParsingLoadable;
@@ -93,7 +94,8 @@ public final class SsDownloadHelper extends DownloadHelper<SsManifest> {
   @Override
   protected SsManifest loadManifest(Uri uri) throws IOException {
     DataSource dataSource = manifestDataSourceFactory.createDataSource();
-    return ParsingLoadable.load(dataSource, new SsManifestParser(), uri, C.DATA_TYPE_MANIFEST);
+    Uri fixedUri = SsUtil.fixManifestUri(uri);
+    return ParsingLoadable.load(dataSource, new SsManifestParser(), fixedUri, C.DATA_TYPE_MANIFEST);
   }
 
   @Override

From defbd046753fd90d7b9dd700f1bdb0b3621c027c Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 11 Dec 2018 17:13:57 +0000
Subject: [PATCH 298/832] Update StartDownloadDialogHelper to use
 TrackSelectionView.

This is now possible as the download helper uses a track selector.

PiperOrigin-RevId: 225014517
---
 .../exoplayer2/demo/DownloadTracker.java      | 188 +++++++++++++-----
 .../src/main/res/drawable-hdpi/ic_edit.png    | Bin 0 -> 304 bytes
 .../src/main/res/drawable-mdpi/ic_edit.png    | Bin 0 -> 242 bytes
 .../src/main/res/drawable-xhdpi/ic_edit.png   | Bin 0 -> 299 bytes
 .../src/main/res/drawable-xxhdpi/ic_edit.png  | Bin 0 -> 413 bytes
 .../src/main/res/drawable-xxxhdpi/ic_edit.png | Bin 0 -> 449 bytes
 .../main/res/layout/download_track_item.xml   |  53 +++++
 .../main/res/layout/start_download_dialog.xml |   5 +-
 demos/main/src/main/res/values/strings.xml    |   4 +
 .../exoplayer2/ui/TrackSelectionView.java     | 115 +++++++----
 10 files changed, 276 insertions(+), 89 deletions(-)
 create mode 100755 demos/main/src/main/res/drawable-hdpi/ic_edit.png
 create mode 100755 demos/main/src/main/res/drawable-mdpi/ic_edit.png
 create mode 100755 demos/main/src/main/res/drawable-xhdpi/ic_edit.png
 create mode 100755 demos/main/src/main/res/drawable-xxhdpi/ic_edit.png
 create mode 100755 demos/main/src/main/res/drawable-xxxhdpi/ic_edit.png
 create mode 100644 demos/main/src/main/res/layout/download_track_item.xml

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index df549a92ae..b746757fca 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -19,13 +19,17 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.HandlerThread;
+import android.support.annotation.Nullable;
+import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 import android.widget.Toast;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.RenderersFactory;
@@ -37,20 +41,21 @@ import com.google.android.exoplayer2.offline.DownloadManager.TaskState;
 import com.google.android.exoplayer2.offline.DownloadService;
 import com.google.android.exoplayer2.offline.ProgressiveDownloadHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
-import com.google.android.exoplayer2.offline.TrackKey;
-import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.source.dash.offline.DashDownloadHelper;
 import com.google.android.exoplayer2.source.hls.offline.HlsDownloadHelper;
 import com.google.android.exoplayer2.source.smoothstreaming.offline.SsDownloadHelper;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
+import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo;
+import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.ui.DefaultTrackNameProvider;
 import com.google.android.exoplayer2.ui.TrackNameProvider;
+import com.google.android.exoplayer2.ui.TrackSelectionView;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -126,10 +131,8 @@ public class DownloadTracker implements DownloadManager.Listener {
           getDownloadHelper(uri, extension, renderersFactory).getRemoveAction();
       startServiceWithAction(removeAction);
     } else {
-      StartDownloadDialogHelper helper =
-          new StartDownloadDialogHelper(
-              activity, getDownloadHelper(uri, extension, renderersFactory), name);
-      helper.prepare();
+      new StartDownloadDialogHelper(
+          activity, getDownloadHelper(uri, extension, renderersFactory), name);
     }
   }
 
@@ -217,61 +220,56 @@ public class DownloadTracker implements DownloadManager.Listener {
     }
   }
 
+  @SuppressWarnings("UngroupedOverloads")
   private final class StartDownloadDialogHelper
-      implements DownloadHelper.Callback, DialogInterface.OnClickListener {
+      implements DownloadHelper.Callback,
+          DialogInterface.OnClickListener,
+          View.OnClickListener,
+          TrackSelectionView.DialogCallback {
 
     private final DownloadHelper<?> downloadHelper;
     private final String name;
+    private final LayoutInflater dialogInflater;
+    private final AlertDialog dialog;
+    private final LinearLayout selectionList;
 
-    private final AlertDialog.Builder builder;
-    private final View dialogView;
-    private final List<TrackKey> trackKeys;
-    private final ArrayAdapter<String> trackTitles;
-    private final ListView representationList;
+    private MappedTrackInfo mappedTrackInfo;
+    private DefaultTrackSelector.Parameters parameters;
 
-    public StartDownloadDialogHelper(
+    private StartDownloadDialogHelper(
         Activity activity, DownloadHelper<?> downloadHelper, String name) {
       this.downloadHelper = downloadHelper;
       this.name = name;
-      builder =
+      AlertDialog.Builder builder =
           new AlertDialog.Builder(activity)
-              .setTitle(R.string.exo_download_description)
+              .setTitle(R.string.download_preparing)
               .setPositiveButton(android.R.string.ok, this)
               .setNegativeButton(android.R.string.cancel, null);
 
       // Inflate with the builder's context to ensure the correct style is used.
-      LayoutInflater dialogInflater = LayoutInflater.from(builder.getContext());
-      dialogView = dialogInflater.inflate(R.layout.start_download_dialog, null);
+      dialogInflater = LayoutInflater.from(builder.getContext());
+      selectionList = (LinearLayout) dialogInflater.inflate(R.layout.start_download_dialog, null);
+      builder.setView(selectionList);
+      dialog = builder.create();
+      dialog.show();
+      dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
 
-      trackKeys = new ArrayList<>();
-      trackTitles =
-          new ArrayAdapter<>(
-              builder.getContext(), android.R.layout.simple_list_item_multiple_choice);
-      representationList = dialogView.findViewById(R.id.representation_list);
-      representationList.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
-      representationList.setAdapter(trackTitles);
-    }
-
-    public void prepare() {
+      parameters = DownloadHelper.DEFAULT_TRACK_SELECTOR_PARAMETERS;
       downloadHelper.prepare(this);
     }
 
+    // DownloadHelper.Callback implementation.
+
     @Override
     public void onPrepared(DownloadHelper<?> helper) {
-      for (int i = 0; i < downloadHelper.getPeriodCount(); i++) {
-        TrackGroupArray trackGroups = downloadHelper.getTrackGroups(i);
-        for (int j = 0; j < trackGroups.length; j++) {
-          TrackGroup trackGroup = trackGroups.get(j);
-          for (int k = 0; k < trackGroup.length; k++) {
-            trackKeys.add(new TrackKey(i, j, k));
-            trackTitles.add(trackNameProvider.getTrackName(trackGroup.getFormat(k)));
-          }
-        }
+      if (helper.getPeriodCount() < 1) {
+        onPrepareError(downloadHelper, new IOException("Content is empty."));
+        return;
       }
-      if (!trackKeys.isEmpty()) {
-        builder.setView(dialogView);
-      }
-      builder.create().show();
+      mappedTrackInfo = downloadHelper.getMappedTrackInfo(/* periodIndex= */ 0);
+      updateSelectionList();
+      dialog.setTitle(R.string.exo_download_description);
+      dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true);
     }
 
     @Override
@@ -280,21 +278,107 @@ public class DownloadTracker implements DownloadManager.Listener {
               context.getApplicationContext(), R.string.download_start_error, Toast.LENGTH_LONG)
           .show();
       Log.e(TAG, "Failed to start download", e);
+      dialog.cancel();
     }
 
+    // View.OnClickListener implementation.
+
+    @Override
+    public void onClick(View v) {
+      Integer rendererIndex = (Integer) v.getTag();
+      String dialogTitle = getTrackTypeString(mappedTrackInfo.getRendererType(rendererIndex));
+      Pair<AlertDialog, TrackSelectionView> dialogPair =
+          TrackSelectionView.getDialog(
+              dialog.getContext(),
+              dialogTitle,
+              mappedTrackInfo,
+              rendererIndex,
+              parameters,
+              /* callback= */ this);
+      dialogPair.second.setShowDisableOption(true);
+      dialogPair.second.setAllowAdaptiveSelections(false);
+      dialogPair.first.show();
+    }
+
+    // TrackSelectionView.DialogCallback implementation.
+
+    @Override
+    public void onTracksSelected(DefaultTrackSelector.Parameters parameters) {
+      for (int i = 0; i < downloadHelper.getPeriodCount(); i++) {
+        downloadHelper.replaceTrackSelections(/* periodIndex= */ i, parameters);
+      }
+      this.parameters = parameters;
+      updateSelectionList();
+    }
+
+    // DialogInterface.OnClickListener implementation.
+
     @Override
     public void onClick(DialogInterface dialog, int which) {
-      ArrayList<TrackKey> selectedTrackKeys = new ArrayList<>();
-      for (int i = 0; i < representationList.getChildCount(); i++) {
-        if (representationList.isItemChecked(i)) {
-          selectedTrackKeys.add(trackKeys.get(i));
+      DownloadAction downloadAction = downloadHelper.getDownloadAction(Util.getUtf8Bytes(name));
+      startDownload(downloadAction);
+    }
+
+    // Internal methods.
+
+    private void updateSelectionList() {
+      selectionList.removeAllViews();
+      for (int i = 0; i < mappedTrackInfo.getRendererCount(); i++) {
+        TrackGroupArray trackGroupArray = mappedTrackInfo.getTrackGroups(i);
+        if (trackGroupArray.length == 0) {
+          continue;
+        }
+        String trackTypeString =
+            getTrackTypeString(mappedTrackInfo.getRendererType(/* rendererIndex= */ i));
+        if (trackTypeString == null) {
+          return;
+        }
+        String trackSelectionsString = getTrackSelectionString(/* rendererIndex= */ i);
+        View view = dialogInflater.inflate(R.layout.download_track_item, selectionList, false);
+        TextView trackTitleView = view.findViewById(R.id.track_title);
+        TextView trackDescView = view.findViewById(R.id.track_desc);
+        ImageButton editButton = view.findViewById(R.id.edit_button);
+        trackTitleView.setText(trackTypeString);
+        trackDescView.setText(trackSelectionsString);
+        editButton.setTag(i);
+        editButton.setOnClickListener(this);
+        selectionList.addView(view);
+      }
+    }
+
+    private String getTrackSelectionString(int rendererIndex) {
+      List<TrackSelection> trackSelections =
+          downloadHelper.getTrackSelections(/* periodIndex= */ 0, rendererIndex);
+      String selectedTracks = "";
+      Resources resources = selectionList.getResources();
+      for (int i = 0; i < trackSelections.size(); i++) {
+        TrackSelection selection = trackSelections.get(i);
+        for (int j = 0; j < selection.length(); j++) {
+          String trackName = trackNameProvider.getTrackName(selection.getFormat(j));
+          if (i == 0 && j == 0) {
+            selectedTracks = trackName;
+          } else {
+            selectedTracks = resources.getString(R.string.exo_item_list, selectedTracks, trackName);
+          }
         }
       }
-      if (!selectedTrackKeys.isEmpty() || trackKeys.isEmpty()) {
-        // We have selected keys, or we're dealing with single stream content.
-        DownloadAction downloadAction =
-            downloadHelper.getDownloadAction(Util.getUtf8Bytes(name), selectedTrackKeys);
-        startDownload(downloadAction);
+      return selectedTracks.isEmpty()
+          ? resources.getString(R.string.exo_track_selection_none)
+          : selectedTracks;
+    }
+
+    @Nullable
+    private String getTrackTypeString(int trackType) {
+      Resources resources = selectionList.getResources();
+      switch (trackType) {
+        case C.TRACK_TYPE_VIDEO:
+          return resources.getString(R.string.exo_track_selection_title_video);
+        case C.TRACK_TYPE_AUDIO:
+          return resources.getString(R.string.exo_track_selection_title_audio);
+        case C.TRACK_TYPE_TEXT:
+          return resources.getString(R.string.exo_track_selection_title_text);
+        default:
+          return null;
       }
     }
   }
diff --git a/demos/main/src/main/res/drawable-hdpi/ic_edit.png b/demos/main/src/main/res/drawable-hdpi/ic_edit.png
new file mode 100755
index 0000000000000000000000000000000000000000..25678d6de970f4cf8d98452f9f2d184b7b126530
GIT binary patch
literal 304
zcmV-00nh%4P)<h;3K|Lk000e1NJLTq001@s001@!1ONa4CQPDM0002@Nkl<ZcmeIy
zGh#qN6h`6G$2RJyimR|n6YVuNo7m<CVjDO1+#AjL7w|m}KHr}$oj^<qrin8)sYbmp
zhB)JL$5f$OB;%Km1sB7#K<Zq*AO>6_%g=JPwp^mikG-9oSGg>A)DUNEQ7GKnBdXOc
zb-7*PQXg=G1UmhNg)4f(jS}LD8t3f6_9=hBO%bj@$qo^YE~3;Z;VO{SDA^HJTF32k
z>v2a-zd`jA_y?&$ODY5>#aL1cp884&mek76p++sK@LxxzSW@d&RE!-3MRpVv*-=pR
zeo7OY5=tGLA_{CU6$*;%C@8X{Ae5p<i@@jmlbr+X{2@z^j?>Wq0000<MNUMnLSTXu
C@_;P>

literal 0
HcmV?d00001

diff --git a/demos/main/src/main/res/drawable-mdpi/ic_edit.png b/demos/main/src/main/res/drawable-mdpi/ic_edit.png
new file mode 100755
index 0000000000000000000000000000000000000000..dffcd9f61a79913ea289c0a255afab2494532cb8
GIT binary patch
literal 242
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8LpPEQxdkP61PXBycKC5SjY{LHpc
zpe;qhMag4^gF=JcLh&2SJPi!CNfB)(6NCON>^}Bjm${TRdqe-a`6dbO^2MC0jl#+N
zY7r|J8t`3d3|K65<?Icn4eJAE&fEDRiP@pgK*Xg=O`w8nDyQ(`tWSw8QQS+@Erj>g
zZD3lEp76xldx~nQ+rEieGdE3)+%mIs?~Fx_JF5(fLwfhjcr0%?k)OGeIhZrKMQd3?
pd&@?rLlKJ1%$k;)3}VmiWn};V$;>=IlNaa-22WQ%mvv4FO#m$xRv-WX

literal 0
HcmV?d00001

diff --git a/demos/main/src/main/res/drawable-xhdpi/ic_edit.png b/demos/main/src/main/res/drawable-xhdpi/ic_edit.png
new file mode 100755
index 0000000000000000000000000000000000000000..82f8563d1e2af42787d9f75cbed64d07b1358815
GIT binary patch
literal 299
zcmV+`0o4A9P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0002;Nkl<ZcmeIs
z#Z^QB5Cze~-BQ5U$eI91fJn%KG;nu!*F139GxoPgV}0Hnx+;N76h+a$sf8wFYG9KT
zDHf?ipjxg-C38--4k!7DN*zw}4&^$W<TXllILQkX<6bYXq~3jsBHZiykTgtz8fgHR
zs_8V69(*{*ywGhT-S}`)q>Q9~FOH2gL;-(VWx_F#oH%==NEt|;90SRjV<5S545S`k
zj)COD@g^BK22#5t$M6_M!O0iSj2fpnIKk26l&f(zf)kwJ1SdFo%31zv4qxPy^5=<h
xP~)J+L5+hN2Q?0A9Mm|daZuwR#fhRQiqaQ2&GRn2nYRD{002ovPDHLkV1l7Veq8_n

literal 0
HcmV?d00001

diff --git a/demos/main/src/main/res/drawable-xxhdpi/ic_edit.png b/demos/main/src/main/res/drawable-xxhdpi/ic_edit.png
new file mode 100755
index 0000000000000000000000000000000000000000..f00b4b68c5b0bba9c2703eb3f167aabd1507e1e6
GIT binary patch
literal 413
zcmV;O0b>4%P)<h;3K|Lk000e1NJLTq003+N003+V1ONa4C2yZb0004GNkl<ZcmeIy
zfks3@0EOWL0w_pH=urZMY_L)`Ar=u56wm?z0(!L&L<l4TQg)+5D5I{+nmPUdd4c=6
zGb5@eA|fIpqBV_lu6?a2ssp`f_PJ;6Dy9>ozBbNenHI@1Es|wgB+Il&mT8eJ(*jrl
zv{TKXh0}(qv?nd8+7|V_iw?9wz5nM?8$D=eH6Oc&9<=RxStZ(KLwBseD$%Z5d=<^=
zM;oiUj{RvrXzK-9!z}N<Kx>>;qFuMoD$|;0nYLP{waW7DinNAVW!g<^tTL_ojykhU
zTdtio?TqqnP0M1HX#p(L7UEd_A9z@>MzCPbGgz>usjNd-b848%dWQuI7A#natU)U4
z4Hhg|u>Lt~E0y&M3)WwQ1#2^p<tCXd!va}`1+okaWEmF7GAxi~SRl)=K$c;FtS&IK
z_M|+RS#dD4;$UXQ!OV(-nH2yFU`d;r{IVSp5fKp)Q7wG{7@3bcn_pyC00000NkvXX
Hu0mjf*r2N$

literal 0
HcmV?d00001

diff --git a/demos/main/src/main/res/drawable-xxxhdpi/ic_edit.png b/demos/main/src/main/res/drawable-xxxhdpi/ic_edit.png
new file mode 100755
index 0000000000000000000000000000000000000000..a9f99417fba794c79ac31281ddb405d41d4162fb
GIT binary patch
literal 449
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ)^zFm`ylIEGX(zP-fg=8`DU`mkS+
zL3E{7i@=uU4!1nHGnE<LxE3AiNEA@aWZuqT{BT~+>RJ1r+gex5nWW+gLQCpzMa{jw
zWY_t-*E4&w6lJeDmlp3{x%ZOH`8B)rt5?0fq{P4IOtZ#E1umNoCjLbSnl(N^nO~1I
zzgT4D(or`xLp<<*UUtih`sY`r7ro9}F?rXjvyGkiq90YRUH6Vnttz{Fx%8ZjJ5uK_
zxTL@R$m40UF0k9iS<p9of9O2Lj%B46jQmv&33q;QQL<@V5j*ekfz2#|(Kh<`pPzK8
zP!gQy(V{N+kkduFLI}(j0J1BX1n0HJKKdEVf2f(AU(TlDgUr{@4=Rr}v!BoUX!Gs!
zgPSn%2M3`FbZ#cv^Usq6stxN-zjVGiot=N)w#pB1`3EN-a>C$W75)X8@<1#bQVkQs
jLVG@3IR_GoDzyv`b*-KC%d=hrqlUrL)z4*}Q$iB}4BWod

literal 0
HcmV?d00001

diff --git a/demos/main/src/main/res/layout/download_track_item.xml b/demos/main/src/main/res/layout/download_track_item.xml
new file mode 100644
index 0000000000..fe1c62b391
--- /dev/null
+++ b/demos/main/src/main/res/layout/download_track_item.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="12dp"
+    android:paddingEnd="12dp"
+    android:orientation="horizontal"
+    android:gravity="center_vertical">
+
+  <LinearLayout
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/track_title"
+        android:textStyle="bold"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingTop="4dp"/>
+
+    <TextView
+        android:id="@+id/track_desc"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingBottom="4dp"/>
+
+  </LinearLayout>
+
+  <ImageButton
+      android:id="@+id/edit_button"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:background="@android:color/transparent"
+      android:contentDescription="@string/download_edit_track"
+      android:src="@drawable/ic_edit"/>
+
+</LinearLayout>
diff --git a/demos/main/src/main/res/layout/start_download_dialog.xml b/demos/main/src/main/res/layout/start_download_dialog.xml
index acb9af5d97..c182047ff8 100644
--- a/demos/main/src/main/res/layout/start_download_dialog.xml
+++ b/demos/main/src/main/res/layout/start_download_dialog.xml
@@ -13,7 +13,8 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<ListView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/representation_list"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/selection_list"
+    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"/>
diff --git a/demos/main/src/main/res/values/strings.xml b/demos/main/src/main/res/values/strings.xml
index 40f065b18e..7ac5a65a49 100644
--- a/demos/main/src/main/res/values/strings.xml
+++ b/demos/main/src/main/res/values/strings.xml
@@ -51,6 +51,10 @@
 
   <string name="ima_not_loaded">Playing sample without ads, as the IMA extension was not loaded</string>
 
+  <string name="download_edit_track">Edit selection</string>
+
+  <string name="download_preparing">Preparing download…</string>
+
   <string name="download_start_error">Failed to start download</string>
 
   <string name="download_playlist_unsupported">This demo app does not support downloading playlists</string>
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
index 3f09ac2427..fd78631337 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
@@ -15,7 +15,6 @@
  */
 package com.google.android.exoplayer2.ui;
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
@@ -33,13 +32,25 @@ import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.SelectionOverride;
-import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
+import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo;
 import com.google.android.exoplayer2.util.Assertions;
 import java.util.Arrays;
+import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 /** A view for making track selections. */
 public class TrackSelectionView extends LinearLayout {
 
+  /** Callback which is invoked when a track selection has been made. */
+  public interface DialogCallback {
+
+    /**
+     * Called when track are selected.
+     *
+     * @param parameters The {@link DefaultTrackSelector.Parameters} for the selected tracks.
+     */
+    void onTracksSelected(DefaultTrackSelector.Parameters parameters);
+  }
+
   private final int selectableItemBackgroundResourceId;
   private final LayoutInflater inflater;
   private final CheckedTextView disableView;
@@ -51,35 +62,64 @@ public class TrackSelectionView extends LinearLayout {
   private TrackNameProvider trackNameProvider;
   private CheckedTextView[][] trackViews;
 
-  private DefaultTrackSelector trackSelector;
+  private @MonotonicNonNull MappedTrackInfo mappedTrackInfo;
   private int rendererIndex;
+  private DefaultTrackSelector.Parameters parameters;
   private TrackGroupArray trackGroups;
   private boolean isDisabled;
-  private @Nullable SelectionOverride override;
+  @Nullable private SelectionOverride override;
 
   /**
    * Gets a pair consisting of a dialog and the {@link TrackSelectionView} that will be shown by it.
    *
-   * @param activity The parent activity.
+   * <p>The dialog shows the current configuration of the provided {@code TrackSelector} and updates
+   * the parameters when closing the dialog.
+   *
+   * @param context The parent context.
    * @param title The dialog's title.
    * @param trackSelector The track selector.
    * @param rendererIndex The index of the renderer.
    * @return The dialog and the {@link TrackSelectionView} that will be shown by it.
    */
   public static Pair<AlertDialog, TrackSelectionView> getDialog(
-      Activity activity,
+      Context context, CharSequence title, DefaultTrackSelector trackSelector, int rendererIndex) {
+    return getDialog(
+        context,
+        title,
+        Assertions.checkNotNull(trackSelector.getCurrentMappedTrackInfo()),
+        rendererIndex,
+        trackSelector.getParameters(),
+        trackSelector::setParameters);
+  }
+
+  /**
+   * Gets a pair consisting of a dialog and the {@link TrackSelectionView} that will be shown by it.
+   *
+   * @param context The parent context.
+   * @param title The dialog's title.
+   * @param mappedTrackInfo The {@link MappedTrackInfo}.
+   * @param rendererIndex The index of the renderer.
+   * @param parameters The {@link DefaultTrackSelector.Parameters}.
+   * @param callback The {@link DialogCallback} invoked when the dialog is closed successfully.
+   * @return The dialog and the {@link TrackSelectionView} that will be shown by it.
+   */
+  public static Pair<AlertDialog, TrackSelectionView> getDialog(
+      Context context,
       CharSequence title,
-      DefaultTrackSelector trackSelector,
-      int rendererIndex) {
-    AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+      MappedTrackInfo mappedTrackInfo,
+      int rendererIndex,
+      DefaultTrackSelector.Parameters parameters,
+      DialogCallback callback) {
+    AlertDialog.Builder builder = new AlertDialog.Builder(context);
 
     // Inflate with the builder's context to ensure the correct style is used.
     LayoutInflater dialogInflater = LayoutInflater.from(builder.getContext());
     View dialogView = dialogInflater.inflate(R.layout.exo_track_selection_dialog, null);
 
-    final TrackSelectionView selectionView = dialogView.findViewById(R.id.exo_track_selection_view);
-    selectionView.init(trackSelector, rendererIndex);
-    Dialog.OnClickListener okClickListener = (dialog, which) -> selectionView.applySelection();
+    TrackSelectionView selectionView = dialogView.findViewById(R.id.exo_track_selection_view);
+    selectionView.init(mappedTrackInfo, rendererIndex, parameters);
+    Dialog.OnClickListener okClickListener =
+        (dialog, which) -> callback.onTracksSelected(selectionView.getSelectionParameters());
 
     AlertDialog dialog =
         builder
@@ -113,6 +153,8 @@ public class TrackSelectionView extends LinearLayout {
     inflater = LayoutInflater.from(context);
     componentListener = new ComponentListener();
     trackNameProvider = new DefaultTrackNameProvider(getResources());
+    parameters = DefaultTrackSelector.Parameters.DEFAULT;
+    trackGroups = TrackGroupArray.EMPTY;
 
     // View for disabling the renderer.
     disableView =
@@ -176,18 +218,35 @@ public class TrackSelectionView extends LinearLayout {
   }
 
   /**
-   * Initialize the view to select tracks for a specified renderer using a {@link
-   * DefaultTrackSelector}.
+   * Initialize the view to select tracks for a specified renderer using {@link MappedTrackInfo} and
+   * a set of {@link DefaultTrackSelector.Parameters}.
    *
-   * @param trackSelector The {@link DefaultTrackSelector}.
+   * @param mappedTrackInfo The {@link MappedTrackInfo}.
    * @param rendererIndex The index of the renderer.
+   * @param parameters The {@link DefaultTrackSelector.Parameters}.
    */
-  public void init(DefaultTrackSelector trackSelector, int rendererIndex) {
-    this.trackSelector = trackSelector;
+  public void init(
+      MappedTrackInfo mappedTrackInfo,
+      int rendererIndex,
+      DefaultTrackSelector.Parameters parameters) {
+    this.mappedTrackInfo = mappedTrackInfo;
     this.rendererIndex = rendererIndex;
+    this.parameters = parameters;
     updateViews();
   }
 
+  /** Returns the {@link DefaultTrackSelector.Parameters} for the current selection. */
+  public DefaultTrackSelector.Parameters getSelectionParameters() {
+    DefaultTrackSelector.ParametersBuilder parametersBuilder = parameters.buildUpon();
+    parametersBuilder.setRendererDisabled(rendererIndex, isDisabled);
+    if (override != null) {
+      parametersBuilder.setSelectionOverride(rendererIndex, trackGroups, override);
+    } else {
+      parametersBuilder.clearSelectionOverrides(rendererIndex);
+    }
+    return parametersBuilder.build();
+  }
+
   // Private methods.
 
   private void updateViews() {
@@ -196,9 +255,7 @@ public class TrackSelectionView extends LinearLayout {
       removeViewAt(i);
     }
 
-    MappingTrackSelector.MappedTrackInfo trackInfo =
-        trackSelector == null ? null : trackSelector.getCurrentMappedTrackInfo();
-    if (trackSelector == null || trackInfo == null) {
+    if (mappedTrackInfo == null) {
       // The view is not initialized.
       disableView.setEnabled(false);
       defaultView.setEnabled(false);
@@ -207,9 +264,8 @@ public class TrackSelectionView extends LinearLayout {
     disableView.setEnabled(true);
     defaultView.setEnabled(true);
 
-    trackGroups = trackInfo.getTrackGroups(rendererIndex);
+    trackGroups = mappedTrackInfo.getTrackGroups(rendererIndex);
 
-    DefaultTrackSelector.Parameters parameters = trackSelector.getParameters();
     isDisabled = parameters.getRendererDisabled(rendererIndex);
     override = parameters.getSelectionOverride(rendererIndex, trackGroups);
 
@@ -220,7 +276,7 @@ public class TrackSelectionView extends LinearLayout {
       boolean enableAdaptiveSelections =
           allowAdaptiveSelections
               && trackGroups.get(groupIndex).length > 1
-              && trackInfo.getAdaptiveSupport(rendererIndex, groupIndex, false)
+              && mappedTrackInfo.getAdaptiveSupport(rendererIndex, groupIndex, false)
                   != RendererCapabilities.ADAPTIVE_NOT_SUPPORTED;
       trackViews[groupIndex] = new CheckedTextView[group.length];
       for (int trackIndex = 0; trackIndex < group.length; trackIndex++) {
@@ -235,7 +291,7 @@ public class TrackSelectionView extends LinearLayout {
             (CheckedTextView) inflater.inflate(trackViewLayoutId, this, false);
         trackView.setBackgroundResource(selectableItemBackgroundResourceId);
         trackView.setText(trackNameProvider.getTrackName(group.getFormat(trackIndex)));
-        if (trackInfo.getTrackSupport(rendererIndex, groupIndex, trackIndex)
+        if (mappedTrackInfo.getTrackSupport(rendererIndex, groupIndex, trackIndex)
             == RendererCapabilities.FORMAT_HANDLED) {
           trackView.setFocusable(true);
           trackView.setTag(Pair.create(groupIndex, trackIndex));
@@ -263,17 +319,6 @@ public class TrackSelectionView extends LinearLayout {
     }
   }
 
-  private void applySelection() {
-    DefaultTrackSelector.ParametersBuilder parametersBuilder = trackSelector.buildUponParameters();
-    parametersBuilder.setRendererDisabled(rendererIndex, isDisabled);
-    if (override != null) {
-      parametersBuilder.setSelectionOverride(rendererIndex, trackGroups, override);
-    } else {
-      parametersBuilder.clearSelectionOverrides(rendererIndex);
-    }
-    trackSelector.setParameters(parametersBuilder);
-  }
-
   private void onClick(View view) {
     if (view == disableView) {
       onDisableViewClicked();

From 05bfeca50b001298da4cffee53b22e983831aaa6 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 11 Dec 2018 18:19:07 +0000
Subject: [PATCH 299/832] Enable setOutputSurfaceWorkaround for dangal

Issue: #5169
PiperOrigin-RevId: 225025357
---
 RELEASENOTES.md                               |   2 +
 .../video/MediaCodecVideoRenderer.java        | 312 +++++++++---------
 2 files changed, 161 insertions(+), 153 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 337ff54ee8..ab7cb9fd76 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -23,6 +23,8 @@
     (`DataSpec.FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN`).
 * Disable post processing on Nvidia devices, as it breaks decode-only frame
   skippping.
+* Workaround for MiTV (dangal) issue when swapping output surface
+  ([#5169](https://github.com/google/ExoPlayer/issues/5169)).
 
 ### 2.9.2 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index 7bbab55a1e..0ca5f0eaa5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -1306,163 +1306,169 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
    *     incorrectly.
    */
   protected boolean codecNeedsSetOutputSurfaceWorkaround(String name) {
-    if (Util.SDK_INT >= 27 || name.startsWith("OMX.google")) {
-      // Devices running API level 27 or later should also be unaffected. Google OMX decoders are
-      // not known to have this issue on any API level.
+    if (name.startsWith("OMX.google")) {
+      // Google OMX decoders are not known to have this issue on any API level.
       return false;
     }
-    // Work around:
-    // https://github.com/google/ExoPlayer/issues/3236,
-    // https://github.com/google/ExoPlayer/issues/3355,
-    // https://github.com/google/ExoPlayer/issues/3439,
-    // https://github.com/google/ExoPlayer/issues/3724,
-    // https://github.com/google/ExoPlayer/issues/3835,
-    // https://github.com/google/ExoPlayer/issues/4006,
-    // https://github.com/google/ExoPlayer/issues/4084,
-    // https://github.com/google/ExoPlayer/issues/4104,
-    // https://github.com/google/ExoPlayer/issues/4134,
-    // https://github.com/google/ExoPlayer/issues/4315,
-    // https://github.com/google/ExoPlayer/issues/4419,
-    // https://github.com/google/ExoPlayer/issues/4460,
-    // https://github.com/google/ExoPlayer/issues/4468.
     synchronized (MediaCodecVideoRenderer.class) {
       if (!evaluatedDeviceNeedsSetOutputSurfaceWorkaround) {
-        switch (Util.DEVICE) {
-          case "1601":
-          case "1713":
-          case "1714":
-          case "A10-70F":
-          case "A1601":
-          case "A2016a40":
-          case "A7000-a":
-          case "A7000plus":
-          case "A7010a48":
-          case "A7020a48":
-          case "AquaPowerM":
-          case "ASUS_X00AD_2":
-          case "Aura_Note_2":
-          case "BLACK-1X":
-          case "BRAVIA_ATV2":
-          case "C1":
-          case "ComioS1":
-          case "CP8676_I02":
-          case "CPH1609":
-          case "CPY83_I00":
-          case "cv1":
-          case "cv3":
-          case "deb":
-          case "E5643":
-          case "ELUGA_A3_Pro":
-          case "ELUGA_Note":
-          case "ELUGA_Prim":
-          case "ELUGA_Ray_X":
-          case "EverStar_S":
-          case "F3111":
-          case "F3113":
-          case "F3116":
-          case "F3211":
-          case "F3213":
-          case "F3215":
-          case "F3311":
-          case "flo":
-          case "GiONEE_CBL7513":
-          case "GiONEE_GBL7319":
-          case "GIONEE_GBL7360":
-          case "GIONEE_SWW1609":
-          case "GIONEE_SWW1627":
-          case "GIONEE_SWW1631":
-          case "GIONEE_WBL5708":
-          case "GIONEE_WBL7365":
-          case "GIONEE_WBL7519":
-          case "griffin":
-          case "htc_e56ml_dtul":
-          case "hwALE-H":
-          case "HWBLN-H":
-          case "HWCAM-H":
-          case "HWVNS-H":
-          case "i9031":
-          case "iball8735_9806":
-          case "Infinix-X572":
-          case "iris60":
-          case "itel_S41":
-          case "j2xlteins":
-          case "JGZ":
-          case "K50a40":
-          case "kate":
-          case "le_x6":
-          case "LS-5017":
-          case "M5c":
-          case "manning":
-          case "marino_f":
-          case "MEIZU_M5":
-          case "mh":
-          case "mido":
-          case "MX6":
-          case "namath":
-          case "nicklaus_f":
-          case "NX541J":
-          case "NX573J":
-          case "OnePlus5T":
-          case "p212":
-          case "P681":
-          case "P85":
-          case "panell_d":
-          case "panell_dl":
-          case "panell_ds":
-          case "panell_dt":
-          case "PB2-670M":
-          case "PGN528":
-          case "PGN610":
-          case "PGN611":
-          case "Phantom6":
-          case "Pixi4-7_3G":
-          case "Pixi5-10_4G":
-          case "PLE":
-          case "PRO7S":
-          case "Q350":
-          case "Q4260":
-          case "Q427":
-          case "Q4310":
-          case "Q5":
-          case "QM16XE_U":
-          case "QX1":
-          case "santoni":
-          case "Slate_Pro":
-          case "SVP-DTV15":
-          case "s905x018":
-          case "taido_row":
-          case "TB3-730F":
-          case "TB3-730X":
-          case "TB3-850F":
-          case "TB3-850M":
-          case "tcl_eu":
-          case "V1":
-          case "V23GB":
-          case "V5":
-          case "vernee_M5":
-          case "watson":
-          case "whyred":
-          case "woods_f":
-          case "woods_fn":
-          case "X3_HK":
-          case "XE2X":
-          case "XT1663":
-          case "Z12_PRO":
-          case "Z80":
-            deviceNeedsSetOutputSurfaceWorkaround = true;
-            break;
-          default:
-            // Do nothing.
-            break;
-        }
-        switch (Util.MODEL) {
-          case "AFTA":
-          case "AFTN":
-            deviceNeedsSetOutputSurfaceWorkaround = true;
-            break;
-          default:
-            // Do nothing.
-            break;
+        if (Util.SDK_INT <= 27 && "dangal".equals(Util.DEVICE)) {
+          // Dangal is affected on API level 27: https://github.com/google/ExoPlayer/issues/5169.
+          deviceNeedsSetOutputSurfaceWorkaround = true;
+        } else if (Util.SDK_INT >= 27) {
+          // In general, devices running API level 27 or later should be unaffected. Do nothing.
+        } else {
+          // Enable the workaround on a per-device basis. Works around:
+          // https://github.com/google/ExoPlayer/issues/3236,
+          // https://github.com/google/ExoPlayer/issues/3355,
+          // https://github.com/google/ExoPlayer/issues/3439,
+          // https://github.com/google/ExoPlayer/issues/3724,
+          // https://github.com/google/ExoPlayer/issues/3835,
+          // https://github.com/google/ExoPlayer/issues/4006,
+          // https://github.com/google/ExoPlayer/issues/4084,
+          // https://github.com/google/ExoPlayer/issues/4104,
+          // https://github.com/google/ExoPlayer/issues/4134,
+          // https://github.com/google/ExoPlayer/issues/4315,
+          // https://github.com/google/ExoPlayer/issues/4419,
+          // https://github.com/google/ExoPlayer/issues/4460,
+          // https://github.com/google/ExoPlayer/issues/4468.
+          switch (Util.DEVICE) {
+            case "1601":
+            case "1713":
+            case "1714":
+            case "A10-70F":
+            case "A1601":
+            case "A2016a40":
+            case "A7000-a":
+            case "A7000plus":
+            case "A7010a48":
+            case "A7020a48":
+            case "AquaPowerM":
+            case "ASUS_X00AD_2":
+            case "Aura_Note_2":
+            case "BLACK-1X":
+            case "BRAVIA_ATV2":
+            case "C1":
+            case "ComioS1":
+            case "CP8676_I02":
+            case "CPH1609":
+            case "CPY83_I00":
+            case "cv1":
+            case "cv3":
+            case "deb":
+            case "E5643":
+            case "ELUGA_A3_Pro":
+            case "ELUGA_Note":
+            case "ELUGA_Prim":
+            case "ELUGA_Ray_X":
+            case "EverStar_S":
+            case "F3111":
+            case "F3113":
+            case "F3116":
+            case "F3211":
+            case "F3213":
+            case "F3215":
+            case "F3311":
+            case "flo":
+            case "GiONEE_CBL7513":
+            case "GiONEE_GBL7319":
+            case "GIONEE_GBL7360":
+            case "GIONEE_SWW1609":
+            case "GIONEE_SWW1627":
+            case "GIONEE_SWW1631":
+            case "GIONEE_WBL5708":
+            case "GIONEE_WBL7365":
+            case "GIONEE_WBL7519":
+            case "griffin":
+            case "htc_e56ml_dtul":
+            case "hwALE-H":
+            case "HWBLN-H":
+            case "HWCAM-H":
+            case "HWVNS-H":
+            case "i9031":
+            case "iball8735_9806":
+            case "Infinix-X572":
+            case "iris60":
+            case "itel_S41":
+            case "j2xlteins":
+            case "JGZ":
+            case "K50a40":
+            case "kate":
+            case "le_x6":
+            case "LS-5017":
+            case "M5c":
+            case "manning":
+            case "marino_f":
+            case "MEIZU_M5":
+            case "mh":
+            case "mido":
+            case "MX6":
+            case "namath":
+            case "nicklaus_f":
+            case "NX541J":
+            case "NX573J":
+            case "OnePlus5T":
+            case "p212":
+            case "P681":
+            case "P85":
+            case "panell_d":
+            case "panell_dl":
+            case "panell_ds":
+            case "panell_dt":
+            case "PB2-670M":
+            case "PGN528":
+            case "PGN610":
+            case "PGN611":
+            case "Phantom6":
+            case "Pixi4-7_3G":
+            case "Pixi5-10_4G":
+            case "PLE":
+            case "PRO7S":
+            case "Q350":
+            case "Q4260":
+            case "Q427":
+            case "Q4310":
+            case "Q5":
+            case "QM16XE_U":
+            case "QX1":
+            case "santoni":
+            case "Slate_Pro":
+            case "SVP-DTV15":
+            case "s905x018":
+            case "taido_row":
+            case "TB3-730F":
+            case "TB3-730X":
+            case "TB3-850F":
+            case "TB3-850M":
+            case "tcl_eu":
+            case "V1":
+            case "V23GB":
+            case "V5":
+            case "vernee_M5":
+            case "watson":
+            case "whyred":
+            case "woods_f":
+            case "woods_fn":
+            case "X3_HK":
+            case "XE2X":
+            case "XT1663":
+            case "Z12_PRO":
+            case "Z80":
+              deviceNeedsSetOutputSurfaceWorkaround = true;
+              break;
+            default:
+              // Do nothing.
+              break;
+          }
+          switch (Util.MODEL) {
+            case "AFTA":
+            case "AFTN":
+              deviceNeedsSetOutputSurfaceWorkaround = true;
+              break;
+            default:
+              // Do nothing.
+              break;
+          }
         }
         evaluatedDeviceNeedsSetOutputSurfaceWorkaround = true;
       }

From 230a798f238d676a4954f17d61f3b4d7930cbda7 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Tue, 11 Dec 2018 21:29:12 +0000
Subject: [PATCH 300/832] Create only one task for all DownloadActions for the
 same content

PiperOrigin-RevId: 225060323
---
 RELEASENOTES.md                               |   2 +
 .../exoplayer2/offline/DownloadManager.java   | 145 ++--
 .../offline/DownloadManagerTest.java          | 785 ++++++++++--------
 .../testutil/TestDownloadManagerListener.java |  28 +-
 4 files changed, 536 insertions(+), 424 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index ab7cb9fd76..8076d1e203 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -25,6 +25,8 @@
   skippping.
 * Workaround for MiTV (dangal) issue when swapping output surface
   ([#5169](https://github.com/google/ExoPlayer/issues/5169)).
+* DownloadManager:
+  * Create only one task for all DownloadActions for the same content.
 
 ### 2.9.2 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 969b8c2e11..c40a6ac9fd 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -15,7 +15,6 @@
  */
 package com.google.android.exoplayer2.offline;
 
-import static com.google.android.exoplayer2.offline.DownloadManager.TaskState.STATE_CANCELED;
 import static com.google.android.exoplayer2.offline.DownloadManager.TaskState.STATE_COMPLETED;
 import static com.google.android.exoplayer2.offline.DownloadManager.TaskState.STATE_FAILED;
 import static com.google.android.exoplayer2.offline.DownloadManager.TaskState.STATE_QUEUED;
@@ -35,6 +34,7 @@ import java.io.IOException;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArraySet;
@@ -187,11 +187,13 @@ public final class DownloadManager {
   }
 
   /**
-   * Handles the given action. A task is created and added to the task queue. If it's a remove
-   * action then any download tasks for the same media are immediately canceled.
+   * Handles the given action.
+   *
+   * <p>A task is created and added to the task queue if there isn't one already for the same
+   * content.
    *
    * @param action The action to be executed.
-   * @return The id of the newly created task.
+   * @return The id of the newly created or the existing task.
    */
   public int handleAction(DownloadAction action) {
     Assertions.checkState(!released);
@@ -218,8 +220,10 @@ public final class DownloadManager {
   public int getDownloadCount() {
     int count = 0;
     for (int i = 0; i < tasks.size(); i++) {
-      if (!tasks.get(i).action.isRemoveAction) {
-        count++;
+      for (DownloadAction action : tasks.get(i).actionQueue) {
+        if (!action.isRemoveAction) {
+          count++;
+        }
       }
     }
     return count;
@@ -287,6 +291,14 @@ public final class DownloadManager {
   }
 
   private Task addTaskForAction(DownloadAction action) {
+    for (int i = 0; i < tasks.size(); i++) {
+      Task task = tasks.get(i);
+      if (task.action.isSameMedia(action)) {
+        task.addAction(action);
+        logd("Action is added to existing task", task);
+        return task;
+      }
+    }
     Task task = new Task(nextTaskId++, this, downloaderFactory, action, minRetryCount);
     tasks.add(task);
     logd("Task is added", task);
@@ -298,12 +310,8 @@ public final class DownloadManager {
    *
    * <ul>
    *   <li>It hasn't started yet.
-   *   <li>There are no preceding conflicting tasks.
-   *   <li>If it's a download task then there are no preceding download tasks on hold and the
-   *       maximum number of active downloads hasn't been reached.
+   *   <li>If it's a download task then the maximum number of active downloads hasn't been reached.
    * </ul>
-   *
-   * If the task is a remove action then preceding conflicting tasks are canceled.
    */
   private void maybeStartTasks() {
     if (!initialized || released) {
@@ -317,31 +325,8 @@ public final class DownloadManager {
       if (!task.canStart()) {
         continue;
       }
-
-      DownloadAction action = task.action;
-      boolean isRemoveAction = action.isRemoveAction;
-      if (!isRemoveAction && skipDownloadActions) {
-        continue;
-      }
-
-      boolean canStartTask = true;
-      for (int j = 0; j < i; j++) {
-        Task otherTask = tasks.get(j);
-        if (otherTask.action.isSameMedia(action)) {
-          if (isRemoveAction) {
-            canStartTask = false;
-            logd(task + " clashes with " + otherTask);
-            otherTask.cancel();
-            // Continue loop to cancel any other preceding clashing tasks.
-          } else if (otherTask.action.isRemoveAction) {
-            canStartTask = false;
-            skipDownloadActions = true;
-            break;
-          }
-        }
-      }
-
-      if (canStartTask) {
+      boolean isRemoveAction = task.action.isRemoveAction;
+      if (isRemoveAction || !skipDownloadActions) {
         task.start();
         if (!isRemoveAction) {
           activeDownloadTasks.add(task);
@@ -436,14 +421,15 @@ public final class DownloadManager {
     if (released) {
       return;
     }
-    final DownloadAction[] actions = new DownloadAction[tasks.size()];
+    ArrayList<DownloadAction> actions = new ArrayList<>(tasks.size());
     for (int i = 0; i < tasks.size(); i++) {
-      actions[i] = tasks.get(i).action;
+      actions.addAll(tasks.get(i).actionQueue);
     }
+    final DownloadAction[] actionsArray = actions.toArray(new DownloadAction[0]);
     fileIOHandler.post(
         () -> {
           try {
-            actionFile.store(actions);
+            actionFile.store(actionsArray);
             logd("Actions persisted.");
           } catch (IOException e) {
             Log.e(TAG, "Persisting actions failed.", e);
@@ -465,20 +451,19 @@ public final class DownloadManager {
   public static final class TaskState {
 
     /**
-     * Task states. One of {@link #STATE_QUEUED}, {@link #STATE_STARTED}, {@link #STATE_COMPLETED},
-     * {@link #STATE_CANCELED} or {@link #STATE_FAILED}.
+     * Task states. One of {@link #STATE_QUEUED}, {@link #STATE_STARTED}, {@link #STATE_COMPLETED}
+     * or {@link #STATE_FAILED}.
      *
      * <p>Transition diagram:
      *
      * <pre>
-     *    ┌────────┬─────→ canceled
      * queued ↔ started ┬→ completed
      *                  └→ failed
      * </pre>
      */
     @Documented
     @Retention(RetentionPolicy.SOURCE)
-    @IntDef({STATE_QUEUED, STATE_STARTED, STATE_COMPLETED, STATE_CANCELED, STATE_FAILED})
+    @IntDef({STATE_QUEUED, STATE_STARTED, STATE_COMPLETED, STATE_FAILED})
     public @interface State {}
     /** The task is waiting to be started. */
     public static final int STATE_QUEUED = 0;
@@ -486,10 +471,8 @@ public final class DownloadManager {
     public static final int STATE_STARTED = 1;
     /** The task completed. */
     public static final int STATE_COMPLETED = 2;
-    /** The task was canceled. */
-    public static final int STATE_CANCELED = 3;
     /** The task failed. */
-    public static final int STATE_FAILED = 4;
+    public static final int STATE_FAILED = 3;
 
     /** Returns the state string for the given state value. */
     public static String getStateString(@State int state) {
@@ -500,8 +483,6 @@ public final class DownloadManager {
           return "STARTED";
         case STATE_COMPLETED:
           return "COMPLETED";
-        case STATE_CANCELED:
-          return "CANCELED";
         case STATE_FAILED:
           return "FAILED";
         default:
@@ -553,14 +534,15 @@ public final class DownloadManager {
     /** Target states for the download thread. */
     @Documented
     @Retention(RetentionPolicy.SOURCE)
-    @IntDef({STATE_COMPLETED, STATE_QUEUED, STATE_CANCELED})
+    @IntDef({STATE_QUEUED, STATE_COMPLETED})
     public @interface TargetState {}
 
     private final int id;
     private final DownloadManager downloadManager;
     private final DownloaderFactory downloaderFactory;
-    private final DownloadAction action;
     private final int minRetryCount;
+    private final ArrayDeque<DownloadAction> actionQueue;
+    private DownloadAction action;
     /** The current state of the task. */
     @TaskState.State private int state;
     /**
@@ -586,6 +568,26 @@ public final class DownloadManager {
       this.minRetryCount = minRetryCount;
       state = STATE_QUEUED;
       targetState = STATE_COMPLETED;
+      actionQueue = new ArrayDeque<>();
+      actionQueue.add(action);
+    }
+
+    public void addAction(DownloadAction newAction) {
+      Assertions.checkState(action.type.equals(newAction.type));
+      actionQueue.add(newAction);
+      DownloadAction updatedAction = DownloadActionUtil.mergeActions(actionQueue);
+      if (action.equals(updatedAction)) {
+        return;
+      }
+      if (state == STATE_STARTED) {
+        if (targetState == STATE_COMPLETED) {
+          stopDownloadThread();
+        }
+      } else {
+        Assertions.checkState(state == STATE_QUEUED);
+        action = updatedAction;
+        downloadManager.onTaskStateChange(this);
+      }
     }
 
     public TaskState getTaskState() {
@@ -603,7 +605,7 @@ public final class DownloadManager {
 
     /** Returns whether the task is finished. */
     public boolean isFinished() {
-      return state == STATE_FAILED || state == STATE_COMPLETED || state == STATE_CANCELED;
+      return state == STATE_FAILED || state == STATE_COMPLETED;
     }
 
     /** Returns whether the task is started. */
@@ -629,46 +631,45 @@ public final class DownloadManager {
     public void start() {
       if (state == STATE_QUEUED) {
         state = STATE_STARTED;
+        action = actionQueue.peek();
         targetState = STATE_COMPLETED;
-        downloadManager.onTaskStateChange(this);
         downloader = downloaderFactory.createDownloader(action);
         downloadThread =
             new DownloadThread(
                 this, downloader, action.isRemoveAction, minRetryCount, downloadManager.handler);
-      }
-    }
-
-    public void cancel() {
-      if (state == STATE_STARTED) {
-        stopDownloadThread(STATE_CANCELED);
-      } else if (state == STATE_QUEUED) {
-        state = STATE_CANCELED;
-        downloadManager.handler.post(() -> downloadManager.onTaskStateChange(this));
+        downloadManager.onTaskStateChange(this);
       }
     }
 
     public void stop() {
-      if (state == STATE_STARTED && targetState == STATE_COMPLETED) {
-        stopDownloadThread(STATE_QUEUED);
+      if (state == STATE_STARTED) {
+        stopDownloadThread();
       }
     }
 
     // Internal methods running on the main thread.
 
-    private void stopDownloadThread(@TargetState int targetState) {
-      this.targetState = targetState;
+    private void stopDownloadThread() {
+      this.targetState = TaskState.STATE_QUEUED;
       Assertions.checkNotNull(downloadThread).cancel();
     }
 
     private void onDownloadThreadStopped(@Nullable Throwable finalError) {
-      @TaskState.State int finalState = targetState;
-      if (targetState == STATE_COMPLETED && finalError != null) {
-        finalState = STATE_FAILED;
-      } else {
-        finalError = null;
+      state = targetState;
+      error = null;
+      if (targetState == STATE_COMPLETED) {
+        if (finalError != null) {
+          state = STATE_FAILED;
+          error = finalError;
+        } else {
+          actionQueue.remove();
+          if (!actionQueue.isEmpty()) {
+            // Don't continue running. Wait to be restarted by maybeStartTasks().
+            state = STATE_QUEUED;
+            action = actionQueue.peek();
+          }
+        }
       }
-      state = finalState;
-      error = finalError;
       downloadManager.onTaskStateChange(this);
     }
   }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index 294e8a14a2..85eed83d4a 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -28,10 +28,12 @@ import com.google.android.exoplayer2.testutil.TestDownloadManagerListener;
 import com.google.android.exoplayer2.util.Util;
 import java.io.File;
 import java.io.IOException;
-import java.util.Collections;
-import java.util.IdentityHashMap;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -52,7 +54,9 @@ public class DownloadManagerTest {
   private static final int ASSERT_FALSE_TIME = 1000;
   /* Maximum retry delay in DownloadManager. */
   private static final int MAX_RETRY_DELAY = 5000;
-
+  /* Maximum number of times a downloader can be restarted before doing a released check. */
+  private static final int MAX_STARTS_BEFORE_RELEASED = 1;
+  /** The minimum number of times a task must be retried before failing. */
   private static final int MIN_RETRY_COUNT = 3;
 
   private Uri uri1;
@@ -84,309 +88,329 @@ public class DownloadManagerTest {
   }
 
   @Test
-  public void testDownloadActionRuns() throws Throwable {
-    doTestDownloaderRuns(createDownloadRunner(uri1));
+  public void downloadRunner_multipleInstancePerContent_throwsException() {
+    boolean exceptionThrown = false;
+    try {
+      new DownloadRunner(uri1);
+      new DownloadRunner(uri1);
+      // can't put fail() here as it would be caught in the catch below.
+    } catch (Throwable e) {
+      exceptionThrown = true;
+    }
+    assertThat(exceptionThrown).isTrue();
   }
 
   @Test
-  public void testRemoveActionRuns() throws Throwable {
-    doTestDownloaderRuns(createRemoveRunner(uri1));
+  public void downloadRunner_handleActionReturnsDifferentTaskId_throwsException() {
+    DownloadRunner runner = new DownloadRunner(uri1).postDownloadAction();
+    TaskWrapper task = runner.getTask();
+    runner.setTask(new TaskWrapper(task.taskId + 10000));
+    boolean exceptionThrown = false;
+    try {
+      runner.postDownloadAction();
+      // can't put fail() here as it would be caught in the catch below.
+    } catch (Throwable e) {
+      exceptionThrown = true;
+    }
+    assertThat(exceptionThrown).isTrue();
   }
 
   @Test
-  public void testDownloadRetriesThenFails() throws Throwable {
-    DownloadRunner downloadRunner = createDownloadRunner(uri1);
-    downloadRunner.postAction();
-    FakeDownloader fakeDownloader = downloadRunner.downloader;
-    fakeDownloader.enableDownloadIOException = true;
+  public void multipleActionsForTheSameContent_executedOnTheSameTask() {
+    // Two download actions on first task
+    new DownloadRunner(uri1).postDownloadAction().postDownloadAction();
+    // One download, one remove actions on second task
+    new DownloadRunner(uri2).postDownloadAction().postRemoveAction();
+    // Two remove actions on third task
+    new DownloadRunner(uri3).postRemoveAction().postRemoveAction();
+  }
+
+  @Test
+  public void actionsForDifferentContent_executedOnDifferentTasks() {
+    TaskWrapper task1 = new DownloadRunner(uri1).postDownloadAction().getTask();
+    TaskWrapper task2 = new DownloadRunner(uri2).postDownloadAction().getTask();
+    TaskWrapper task3 = new DownloadRunner(uri3).postRemoveAction().getTask();
+
+    assertThat(task1).isNoneOf(task2, task3);
+    assertThat(task2).isNotEqualTo(task3);
+  }
+
+  @Test
+  public void postDownloadAction_downloads() throws Throwable {
+    DownloadRunner runner = new DownloadRunner(uri1);
+    TaskWrapper task = runner.postDownloadAction().getTask();
+    task.assertStarted();
+    runner.getDownloader(0).unblock().assertReleased().assertStartCount(1);
+    task.assertCompleted();
+    runner.assertCreatedDownloaderCount(1);
+    downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
+  }
+
+  @Test
+  public void postRemoveAction_removes() throws Throwable {
+    DownloadRunner runner = new DownloadRunner(uri1);
+    TaskWrapper task = runner.postRemoveAction().getTask();
+    task.assertStarted();
+    runner.getDownloader(0).unblock().assertReleased().assertStartCount(1);
+    task.assertCompleted();
+    runner.assertCreatedDownloaderCount(1);
+    downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
+  }
+
+  @Test
+  public void downloadFails_retriesThenTaskFails() throws Throwable {
+    DownloadRunner runner = new DownloadRunner(uri1);
+    runner.postDownloadAction();
+    FakeDownloader downloader = runner.getDownloader(0);
+
     for (int i = 0; i <= MIN_RETRY_COUNT; i++) {
-      fakeDownloader.assertStarted(MAX_RETRY_DELAY).unblock();
+      downloader.assertStarted(MAX_RETRY_DELAY).fail();
     }
-    downloadRunner.assertFailed();
-    downloadManagerListener.clearDownloadError();
 
-    downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
+    downloader.assertReleased().assertStartCount(MIN_RETRY_COUNT + 1);
+    runner.getTask().assertFailed();
+    downloadManagerListener.blockUntilTasksComplete();
   }
 
   @Test
-  public void testDownloadNoRetryWhenCanceled() throws Throwable {
-    DownloadRunner downloadRunner = createDownloadRunner(uri1).ignoreInterrupts();
-    downloadRunner.downloader.enableDownloadIOException = true;
-    downloadRunner.postAction().assertStarted();
+  public void downloadFails_retries() throws Throwable {
+    DownloadRunner runner = new DownloadRunner(uri1);
+    runner.postDownloadAction();
+    FakeDownloader downloader = runner.getDownloader(0);
 
-    DownloadRunner removeRunner = createRemoveRunner(uri1).postAction();
-
-    downloadRunner.unblock().assertCanceled();
-    removeRunner.unblock();
-
-    downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
-  }
-
-  @Test
-  public void testDownloadRetriesThenContinues() throws Throwable {
-    DownloadRunner downloadRunner = createDownloadRunner(uri1);
-    downloadRunner.postAction();
-    FakeDownloader fakeDownloader = downloadRunner.downloader;
-    fakeDownloader.enableDownloadIOException = true;
-    for (int i = 0; i <= MIN_RETRY_COUNT; i++) {
-      fakeDownloader.assertStarted(MAX_RETRY_DELAY);
-      if (i == MIN_RETRY_COUNT) {
-        fakeDownloader.enableDownloadIOException = false;
-      }
-      fakeDownloader.unblock();
+    for (int i = 0; i < MIN_RETRY_COUNT; i++) {
+      downloader.assertStarted(MAX_RETRY_DELAY).fail();
     }
-    downloadRunner.assertCompleted();
+    downloader.assertStarted(MAX_RETRY_DELAY).unblock();
 
-    downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
+    downloader.assertReleased().assertStartCount(MIN_RETRY_COUNT + 1);
+    runner.getTask().assertCompleted();
+    downloadManagerListener.blockUntilTasksComplete();
   }
 
   @Test
-  @SuppressWarnings({"NonAtomicVolatileUpdate", "NonAtomicOperationOnVolatileField"})
-  public void testDownloadRetryCountResetsOnProgress() throws Throwable {
-    DownloadRunner downloadRunner = createDownloadRunner(uri1);
-    downloadRunner.postAction();
-    FakeDownloader fakeDownloader = downloadRunner.downloader;
-    fakeDownloader.enableDownloadIOException = true;
-    fakeDownloader.downloadedBytes = 0;
-    for (int i = 0; i <= MIN_RETRY_COUNT + 10; i++) {
-      fakeDownloader.assertStarted(MAX_RETRY_DELAY);
-      fakeDownloader.downloadedBytes++;
-      if (i == MIN_RETRY_COUNT + 10) {
-        fakeDownloader.enableDownloadIOException = false;
-      }
-      fakeDownloader.unblock();
+  public void downloadProgressOnRetry_retryCountResets() throws Throwable {
+    DownloadRunner runner = new DownloadRunner(uri1);
+    runner.postDownloadAction();
+    FakeDownloader downloader = runner.getDownloader(0);
+
+    int tooManyRetries = MIN_RETRY_COUNT + 10;
+    for (int i = 0; i < tooManyRetries; i++) {
+      downloader.increaseDownloadedByteCount();
+      downloader.assertStarted(MAX_RETRY_DELAY).fail();
     }
-    downloadRunner.assertCompleted();
+    downloader.assertStarted(MAX_RETRY_DELAY).unblock();
 
+    downloader.assertReleased().assertStartCount(tooManyRetries + 1);
+    runner.getTask().assertCompleted();
+    downloadManagerListener.blockUntilTasksComplete();
+  }
+
+  @Test
+  public void removeCancelsDownload() throws Throwable {
+    DownloadRunner runner = new DownloadRunner(uri1);
+    FakeDownloader downloader1 = runner.getDownloader(0);
+
+    runner.postDownloadAction();
+    downloader1.assertStarted();
+    runner.postRemoveAction();
+
+    downloader1.assertCanceled().assertStartCount(1);
+    runner.getDownloader(1).unblock().assertNotCanceled();
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
   @Test
-  public void testDifferentMediaDownloadActionsStartInParallel() throws Throwable {
-    doTestDownloadersRunInParallel(createDownloadRunner(uri1), createDownloadRunner(uri2));
-  }
+  public void downloadNotCancelRemove() throws Throwable {
+    DownloadRunner runner = new DownloadRunner(uri1);
+    FakeDownloader downloader1 = runner.getDownloader(0);
 
-  @Test
-  public void testDifferentMediaDifferentActionsStartInParallel() throws Throwable {
-    doTestDownloadersRunInParallel(createDownloadRunner(uri1), createRemoveRunner(uri2));
-  }
+    runner.postRemoveAction();
+    downloader1.assertStarted();
+    runner.postDownloadAction();
 
-  @Test
-  public void testSameMediaDownloadActionsStartInParallel() throws Throwable {
-    doTestDownloadersRunInParallel(createDownloadRunner(uri1), createDownloadRunner(uri1));
-  }
-
-  @Test
-  public void testSameMediaRemoveActionWaitsDownloadAction() throws Throwable {
-    doTestDownloadersRunSequentially(createDownloadRunner(uri1), createRemoveRunner(uri1));
-  }
-
-  @Test
-  public void testSameMediaDownloadActionWaitsRemoveAction() throws Throwable {
-    doTestDownloadersRunSequentially(createRemoveRunner(uri1), createDownloadRunner(uri1));
-  }
-
-  @Test
-  public void testSameMediaRemoveActionWaitsRemoveAction() throws Throwable {
-    doTestDownloadersRunSequentially(createRemoveRunner(uri1), createRemoveRunner(uri1));
-  }
-
-  @Test
-  public void testSameMediaMultipleActions() throws Throwable {
-    DownloadRunner downloadAction1 = createDownloadRunner(uri1).ignoreInterrupts();
-    DownloadRunner downloadAction2 = createDownloadRunner(uri1).ignoreInterrupts();
-    DownloadRunner removeAction1 = createRemoveRunner(uri1);
-    DownloadRunner downloadAction3 = createDownloadRunner(uri1);
-    DownloadRunner removeAction2 = createRemoveRunner(uri1);
-
-    // Two download actions run in parallel.
-    downloadAction1.postAction().assertStarted();
-    downloadAction2.postAction().assertStarted();
-    // removeAction1 is added. It interrupts the two download actions' threads but they are
-    // configured to ignore it so removeAction1 doesn't start.
-    removeAction1.postAction().assertDoesNotStart();
-
-    // downloadAction2 finishes but it isn't enough to start removeAction1.
-    downloadAction2.unblock().assertCanceled();
-    removeAction1.assertDoesNotStart();
-    // downloadAction3 is postAction to DownloadManager but it waits for removeAction1 to finish.
-    downloadAction3.postAction().assertDoesNotStart();
-
-    // When downloadAction1 finishes, removeAction1 starts.
-    downloadAction1.unblock().assertCanceled();
-    removeAction1.assertStarted();
-    // downloadAction3 still waits removeAction1
-    downloadAction3.assertDoesNotStart();
-
-    // removeAction2 is posted. removeAction1 and downloadAction3 is canceled so removeAction2
-    // starts immediately.
-    removeAction2.postAction();
-    removeAction1.assertCanceled();
-    downloadAction3.assertCanceled();
-    removeAction2.assertStarted().unblock().assertCompleted();
+    downloader1.unblock().assertNotCanceled();
+    runner.getDownloader(1).unblock().assertNotCanceled();
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
   @Test
-  public void testMultipleRemoveActionWaitsLastCancelsAllOther() throws Throwable {
-    DownloadRunner removeAction1 = createRemoveRunner(uri1).ignoreInterrupts();
-    DownloadRunner removeAction2 = createRemoveRunner(uri1);
-    DownloadRunner removeAction3 = createRemoveRunner(uri1);
+  public void secondSameRemoveActionIgnored() throws Throwable {
+    DownloadRunner runner = new DownloadRunner(uri1);
+    FakeDownloader downloader1 = runner.getDownloader(0);
 
-    removeAction1.postAction().assertStarted();
-    removeAction2.postAction().assertDoesNotStart();
-    removeAction3.postAction().assertDoesNotStart();
-
-    removeAction2.assertCanceled();
-
-    removeAction1.unblock().assertCanceled();
-    removeAction3.assertStarted().unblock().assertCompleted();
+    runner.postRemoveAction();
+    downloader1.assertStarted();
+    runner.postRemoveAction();
 
+    downloader1.unblock().assertNotCanceled();
+    runner.getTask().assertCompleted();
+    runner.assertCreatedDownloaderCount(1);
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
   @Test
-  public void testGetTasks() throws Throwable {
-    DownloadRunner removeAction = createRemoveRunner(uri1);
-    DownloadRunner downloadAction1 = createDownloadRunner(uri1);
-    DownloadRunner downloadAction2 = createDownloadRunner(uri1);
+  public void secondSameDownloadActionIgnored() throws Throwable {
+    DownloadRunner runner = new DownloadRunner(uri1);
+    FakeDownloader downloader1 = runner.getDownloader(0);
 
-    removeAction.postAction().assertStarted();
-    downloadAction1.postAction().assertDoesNotStart();
-    downloadAction2.postAction().assertDoesNotStart();
+    runner.postDownloadAction();
+    downloader1.assertStarted();
+    runner.postDownloadAction();
+
+    downloader1.unblock().assertNotCanceled();
+    runner.getTask().assertCompleted();
+    runner.assertCreatedDownloaderCount(1);
+    downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
+  }
+
+  @Test
+  public void differentDownloadActionsMerged() throws Throwable {
+    DownloadRunner runner = new DownloadRunner(uri1);
+    FakeDownloader downloader1 = runner.getDownloader(0);
+
+    StreamKey streamKey1 = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
+    StreamKey streamKey2 = new StreamKey(/* groupIndex= */ 1, /* trackIndex= */ 1);
+
+    runner.postDownloadAction(streamKey1);
+    downloader1.assertStarted();
+    runner.postDownloadAction(streamKey2);
+
+    downloader1.unblock().assertCanceled();
+
+    FakeDownloader downloader2 = runner.getDownloader(1);
+    downloader2.assertStarted();
+    assertThat(downloader2.action.keys).containsExactly(streamKey1, streamKey2);
+    downloader2.unblock();
+
+    runner.getTask().assertCompleted();
+    runner.assertCreatedDownloaderCount(2);
+    downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
+  }
+
+  @Test
+  public void actionsForDifferentContent_executedInParallel() throws Throwable {
+    DownloadRunner runner1 = new DownloadRunner(uri1).postDownloadAction();
+    DownloadRunner runner2 = new DownloadRunner(uri2).postDownloadAction();
+    FakeDownloader downloader1 = runner1.getDownloader(0);
+    FakeDownloader downloader2 = runner2.getDownloader(0);
+
+    downloader1.assertStarted();
+    downloader2.assertStarted();
+    downloader1.unblock();
+    downloader2.unblock();
+
+    runner1.getTask().assertCompleted();
+    runner2.getTask().assertCompleted();
+    downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
+  }
+
+  @Test
+  public void actionsForDifferentContent_ifMaxDownloadIs1_executedSequentially() throws Throwable {
+    setUpDownloadManager(1);
+    DownloadRunner runner1 = new DownloadRunner(uri1).postDownloadAction();
+    DownloadRunner runner2 = new DownloadRunner(uri2).postDownloadAction();
+    FakeDownloader downloader1 = runner1.getDownloader(0);
+    FakeDownloader downloader2 = runner2.getDownloader(0);
+
+    downloader1.assertStarted();
+    downloader2.assertDoesNotStart();
+    downloader1.unblock();
+    downloader2.assertStarted();
+    downloader2.unblock();
+
+    runner1.getTask().assertCompleted();
+    runner2.getTask().assertCompleted();
+    downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
+  }
+
+  @Test
+  public void removeActionForDifferentContent_ifMaxDownloadIs1_executedInParallel()
+      throws Throwable {
+    setUpDownloadManager(1);
+    DownloadRunner runner1 = new DownloadRunner(uri1).postDownloadAction();
+    DownloadRunner runner2 = new DownloadRunner(uri2).postRemoveAction();
+    FakeDownloader downloader1 = runner1.getDownloader(0);
+    FakeDownloader downloader2 = runner2.getDownloader(0);
+
+    downloader1.assertStarted();
+    downloader2.assertStarted();
+    downloader1.unblock();
+    downloader2.unblock();
+
+    runner1.getTask().assertCompleted();
+    runner2.getTask().assertCompleted();
+    downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
+  }
+
+  @Test
+  public void downloadActionFollowingRemove_ifMaxDownloadIs1_isNotStarted() throws Throwable {
+    setUpDownloadManager(1);
+    DownloadRunner runner1 = new DownloadRunner(uri1).postDownloadAction();
+    DownloadRunner runner2 = new DownloadRunner(uri2).postRemoveAction().postDownloadAction();
+    FakeDownloader downloader1 = runner1.getDownloader(0);
+    FakeDownloader downloader2 = runner2.getDownloader(0);
+    FakeDownloader downloader3 = runner2.getDownloader(1);
+
+    downloader1.assertStarted();
+    downloader2.assertStarted();
+    downloader2.unblock();
+    downloader3.assertDoesNotStart();
+    downloader1.unblock();
+    downloader3.assertStarted();
+    downloader3.unblock();
+
+    runner1.getTask().assertCompleted();
+    runner2.getTask().assertCompleted();
+    downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
+  }
+
+  @Test
+  public void getTasks_returnTasks() {
+    TaskWrapper task1 = new DownloadRunner(uri1).postDownloadAction().getTask();
+    TaskWrapper task2 = new DownloadRunner(uri2).postDownloadAction().getTask();
+    TaskWrapper task3 = new DownloadRunner(uri3).postRemoveAction().getTask();
 
     TaskState[] states = downloadManager.getAllTaskStates();
+
     assertThat(states).hasLength(3);
-    assertThat(states[0].action).isEqualTo(removeAction.action);
-    assertThat(states[1].action).isEqualTo(downloadAction1.action);
-    assertThat(states[2].action).isEqualTo(downloadAction2.action);
+    int[] taskIds = {task1.taskId, task2.taskId, task3.taskId};
+    int[] stateTaskIds = {states[0].taskId, states[1].taskId, states[2].taskId};
+    assertThat(stateTaskIds).isEqualTo(taskIds);
   }
 
   @Test
-  public void testMultipleWaitingDownloadActionStartsInParallel() throws Throwable {
-    DownloadRunner removeAction = createRemoveRunner(uri1);
-    DownloadRunner downloadAction1 = createDownloadRunner(uri1);
-    DownloadRunner downloadAction2 = createDownloadRunner(uri1);
+  public void stopAndResume() throws Throwable {
+    DownloadRunner runner1 = new DownloadRunner(uri1);
+    DownloadRunner runner2 = new DownloadRunner(uri2);
+    DownloadRunner runner3 = new DownloadRunner(uri3);
 
-    removeAction.postAction().assertStarted();
-    downloadAction1.postAction().assertDoesNotStart();
-    downloadAction2.postAction().assertDoesNotStart();
-
-    removeAction.unblock().assertCompleted();
-    downloadAction1.assertStarted();
-    downloadAction2.assertStarted();
-    downloadAction1.unblock().assertCompleted();
-    downloadAction2.unblock().assertCompleted();
-
-    downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
-  }
-
-  @Test
-  public void testDifferentMediaDownloadActionsPreserveOrder() throws Throwable {
-    DownloadRunner removeRunner = createRemoveRunner(uri1).ignoreInterrupts();
-    DownloadRunner downloadRunner1 = createDownloadRunner(uri1);
-    DownloadRunner downloadRunner2 = createDownloadRunner(uri2);
-
-    removeRunner.postAction().assertStarted();
-    downloadRunner1.postAction().assertDoesNotStart();
-    downloadRunner2.postAction().assertDoesNotStart();
-
-    removeRunner.unblock().assertCompleted();
-    downloadRunner1.assertStarted();
-    downloadRunner2.assertStarted();
-    downloadRunner1.unblock().assertCompleted();
-    downloadRunner2.unblock().assertCompleted();
-
-    downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
-  }
-
-  @Test
-  public void testDifferentMediaRemoveActionsDoNotPreserveOrder() throws Throwable {
-    DownloadRunner downloadRunner = createDownloadRunner(uri1).ignoreInterrupts();
-    DownloadRunner removeRunner1 = createRemoveRunner(uri1);
-    DownloadRunner removeRunner2 = createRemoveRunner(uri2);
-
-    downloadRunner.postAction().assertStarted();
-    removeRunner1.postAction().assertDoesNotStart();
-    removeRunner2.postAction().assertStarted();
-
-    downloadRunner.unblock().assertCanceled();
-    removeRunner2.unblock().assertCompleted();
-
-    removeRunner1.assertStarted();
-    removeRunner1.unblock().assertCompleted();
-
-    downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
-  }
-
-  @Test
-  public void testStopAndResume() throws Throwable {
-    DownloadRunner download1Runner = createDownloadRunner(uri1);
-    DownloadRunner remove2Runner = createRemoveRunner(uri2);
-    DownloadRunner download2Runner = createDownloadRunner(uri2);
-    DownloadRunner remove1Runner = createRemoveRunner(uri1);
-    DownloadRunner download3Runner = createDownloadRunner(uri3);
-
-    download1Runner.postAction().assertStarted();
-    remove2Runner.postAction().assertStarted();
-    download2Runner.postAction().assertDoesNotStart();
+    runner1.postDownloadAction().getTask().assertStarted();
+    runner2.postRemoveAction().getTask().assertStarted();
+    runner2.postDownloadAction();
 
     runOnMainThread(() -> downloadManager.stopDownloads());
 
-    download1Runner.assertStopped();
+    runner1.getTask().assertQueued();
 
     // remove actions aren't stopped.
-    remove2Runner.unblock().assertCompleted();
+    runner2.getDownloader(0).unblock().assertReleased();
+    runner2.getTask().assertQueued();
     // Although remove2 is finished, download2 doesn't start.
-    download2Runner.assertDoesNotStart();
+    runner2.getDownloader(1).assertDoesNotStart();
 
     // When a new remove action is added, it cancels stopped download actions with the same media.
-    remove1Runner.postAction();
-    download1Runner.assertCanceled();
-    remove1Runner.assertStarted().unblock().assertCompleted();
+    runner1.postRemoveAction();
+    runner1.getDownloader(1).assertStarted().unblock();
+    runner1.getTask().assertCompleted();
 
     // New download actions can be added but they don't start.
-    download3Runner.postAction().assertDoesNotStart();
+    runner3.postDownloadAction().getDownloader(0).assertDoesNotStart();
 
     runOnMainThread(() -> downloadManager.startDownloads());
 
-    download2Runner.assertStarted().unblock().assertCompleted();
-    download3Runner.assertStarted().unblock().assertCompleted();
-
-    downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
-  }
-
-  @Test
-  public void testResumeBeforeTotallyStopped() throws Throwable {
-    setUpDownloadManager(2);
-    DownloadRunner download1Runner = createDownloadRunner(uri1).ignoreInterrupts();
-    DownloadRunner download2Runner = createDownloadRunner(uri2);
-    DownloadRunner download3Runner = createDownloadRunner(uri3);
-
-    download1Runner.postAction().assertStarted();
-    download2Runner.postAction().assertStarted();
-    // download3 doesn't start as DM was configured to run two downloads in parallel.
-    download3Runner.postAction().assertDoesNotStart();
-
-    runOnMainThread(() -> downloadManager.stopDownloads());
-
-    // download1 doesn't stop yet as it ignores interrupts.
-    download2Runner.assertStopped();
-
-    runOnMainThread(() -> downloadManager.startDownloads());
-
-    // download2 starts immediately.
-    download2Runner.assertStarted();
-
-    // download3 doesn't start as download1 still holds its slot.
-    download3Runner.assertDoesNotStart();
-
-    // when unblocked download1 stops and starts immediately.
-    download1Runner.unblock().assertStopped().assertStarted();
-
-    download1Runner.unblock();
-    download2Runner.unblock();
-    download3Runner.unblock();
+    runner2.getDownloader(1).assertStarted().unblock();
+    runner3.getDownloader(0).assertStarted().unblock();
 
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
@@ -419,101 +443,105 @@ public class DownloadManagerTest {
     }
   }
 
-  private void doTestDownloaderRuns(DownloadRunner runner) throws Throwable {
-    runner.postAction().assertStarted().unblock().assertCompleted();
-    downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
-  }
-
-  private void doTestDownloadersRunSequentially(DownloadRunner runner1, DownloadRunner runner2)
-      throws Throwable {
-    runner1.ignoreInterrupts().postAction().assertStarted();
-    runner2.postAction().assertDoesNotStart();
-
-    runner1.unblock();
-    runner2.assertStarted();
-
-    runner2.unblock().assertCompleted();
-    downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
-  }
-
-  private void doTestDownloadersRunInParallel(DownloadRunner runner1, DownloadRunner runner2)
-      throws Throwable {
-    runner1.postAction().assertStarted();
-    runner2.postAction().assertStarted();
-    runner1.unblock().assertCompleted();
-    runner2.unblock().assertCompleted();
-    downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
-  }
-
-  private DownloadRunner createDownloadRunner(Uri uri) {
-    return new DownloadRunner(uri, /* isRemoveAction= */ false);
-  }
-
-  private DownloadRunner createRemoveRunner(Uri uri) {
-    return new DownloadRunner(uri, /* isRemoveAction= */ true);
-  }
-
   private void runOnMainThread(final Runnable r) {
     dummyMainThread.runOnMainThread(r);
   }
 
-  private class DownloadRunner {
+  private final class DownloadRunner {
 
-    public final DownloadAction action;
-    public final FakeDownloader downloader;
+    private final Uri uri;
+    private final ArrayList<FakeDownloader> downloaders;
+    private int createdDownloaderCount = 0;
+    private FakeDownloader downloader;
+    private TaskWrapper taskWrapper;
 
-    private DownloadRunner(Uri uri, boolean isRemoveAction) {
-      action =
-          isRemoveAction
-              ? DownloadAction.createRemoveAction(
-                  DownloadAction.TYPE_PROGRESSIVE, uri, /* customCacheKey= */ null)
-              : DownloadAction.createDownloadAction(
-                  DownloadAction.TYPE_PROGRESSIVE,
-                  uri,
-                  /* keys= */ Collections.emptyList(),
-                  /* customCacheKey= */ null,
-                  /* data= */ null);
-      downloader = new FakeDownloader(isRemoveAction);
-      downloaderFactory.putFakeDownloader(action, downloader);
+    private DownloadRunner(Uri uri) {
+      this.uri = uri;
+      downloaders = new ArrayList<>();
+      downloader = addDownloader();
+      downloaderFactory.registerDownloadRunner(this);
     }
 
-    private DownloadRunner postAction() {
-      runOnMainThread(() -> downloadManager.handleAction(action));
+    private DownloadRunner postRemoveAction() {
+      return postAction(createRemoveAction(uri));
+    }
+
+    private DownloadRunner postDownloadAction(StreamKey... keys) {
+      return postAction(createDownloadAction(uri, keys));
+    }
+
+    private DownloadRunner postAction(DownloadAction action) {
+      AtomicInteger taskIdHolder = new AtomicInteger();
+      runOnMainThread(() -> taskIdHolder.set(downloadManager.handleAction(action)));
+      int taskId = taskIdHolder.get();
+      if (taskWrapper == null) {
+        taskWrapper = new TaskWrapper(taskId);
+      } else {
+        assertThat(taskId).isEqualTo(taskWrapper.taskId);
+      }
       return this;
     }
 
-    private DownloadRunner assertDoesNotStart() throws InterruptedException {
-      Thread.sleep(ASSERT_FALSE_TIME);
-      assertThat(downloader.started.getCount()).isEqualTo(1);
-      return this;
+    private synchronized FakeDownloader addDownloader() {
+      FakeDownloader fakeDownloader = new FakeDownloader();
+      downloaders.add(fakeDownloader);
+      return fakeDownloader;
     }
 
-    private DownloadRunner assertStarted() throws InterruptedException {
-      downloader.assertStarted(ASSERT_TRUE_TIMEOUT);
+    private synchronized FakeDownloader getDownloader(int index) {
+      while (downloaders.size() <= index) {
+        addDownloader();
+      }
+      return downloaders.get(index);
+    }
+
+    private synchronized Downloader createDownloader(DownloadAction action) {
+      downloader = getDownloader(createdDownloaderCount++);
+      downloader.action = action;
+      return downloader;
+    }
+
+    private TaskWrapper getTask() {
+      return taskWrapper;
+    }
+
+    public void setTask(TaskWrapper taskWrapper) {
+      this.taskWrapper = taskWrapper;
+    }
+
+    private void assertCreatedDownloaderCount(int count) {
+      assertThat(createdDownloaderCount).isEqualTo(count);
+    }
+  }
+
+  private final class TaskWrapper {
+    private final int taskId;
+
+    private TaskWrapper(int taskId) {
+      this.taskId = taskId;
+    }
+
+    private TaskWrapper assertStarted() throws InterruptedException {
       return assertState(TaskState.STATE_STARTED);
     }
 
-    private DownloadRunner assertCompleted() {
+    private TaskWrapper assertCompleted() {
       return assertState(TaskState.STATE_COMPLETED);
     }
 
-    private DownloadRunner assertFailed() {
+    private TaskWrapper assertFailed() {
       return assertState(TaskState.STATE_FAILED);
     }
 
-    private DownloadRunner assertCanceled() {
-      return assertState(TaskState.STATE_CANCELED);
-    }
-
-    private DownloadRunner assertStopped() {
+    private TaskWrapper assertQueued() {
       return assertState(TaskState.STATE_QUEUED);
     }
 
-    private DownloadRunner assertState(@State int expectedState) {
+    private TaskWrapper assertState(@State int expectedState) {
       while (true) {
         Integer state = null;
         try {
-          state = downloadManagerListener.pollStateChange(action, ASSERT_TRUE_TIMEOUT);
+          state = downloadManagerListener.pollStateChange(taskId, ASSERT_TRUE_TIMEOUT);
         } catch (InterruptedException e) {
           fail(e.getMessage());
         }
@@ -523,69 +551,98 @@ public class DownloadManagerTest {
       }
     }
 
-    private DownloadRunner unblock() {
-      downloader.unblock();
-      return this;
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) {
+        return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
+      return taskId == ((TaskWrapper) o).taskId;
     }
 
-    private DownloadRunner ignoreInterrupts() {
-      downloader.ignoreInterrupts = true;
-      return this;
+    @Override
+    public int hashCode() {
+      return taskId;
     }
   }
 
-  private static class FakeDownloaderFactory implements DownloaderFactory {
+  private static DownloadAction createDownloadAction(Uri uri, StreamKey... keys) {
+    return DownloadAction.createDownloadAction(
+        DownloadAction.TYPE_PROGRESSIVE,
+        uri,
+        Arrays.asList(keys),
+        /* customCacheKey= */ null,
+        /* data= */ null);
+  }
 
-    public IdentityHashMap<DownloadAction, FakeDownloader> downloaders;
+  private static DownloadAction createRemoveAction(Uri uri) {
+    return DownloadAction.createRemoveAction(
+        DownloadAction.TYPE_PROGRESSIVE, uri, /* customCacheKey= */ null);
+  }
+
+  private static final class FakeDownloaderFactory implements DownloaderFactory {
+
+    private final HashMap<Uri, DownloadRunner> downloaders;
 
     public FakeDownloaderFactory() {
-      downloaders = new IdentityHashMap<>();
+      downloaders = new HashMap<>();
     }
 
-    public void putFakeDownloader(DownloadAction action, FakeDownloader downloader) {
-      downloaders.put(action, downloader);
+    public void registerDownloadRunner(DownloadRunner downloadRunner) {
+      assertThat(downloaders.put(downloadRunner.uri, downloadRunner)).isNull();
     }
 
     @Override
     public Downloader createDownloader(DownloadAction action) {
-      return downloaders.get(action);
+      return downloaders.get(action.uri).createDownloader(action);
     }
   }
 
-  private static class FakeDownloader implements Downloader {
+  private static final class FakeDownloader implements Downloader {
 
     private final com.google.android.exoplayer2.util.ConditionVariable blocker;
-    private final boolean isRemove;
 
+    private DownloadAction action;
     private CountDownLatch started;
-    private boolean ignoreInterrupts;
+    private volatile boolean interrupted;
+    private volatile boolean cancelled;
     private volatile boolean enableDownloadIOException;
-    private volatile int downloadedBytes = C.LENGTH_UNSET;
+    private volatile int downloadedBytes;
+    private volatile int startCount;
 
-    private FakeDownloader(boolean isRemove) {
-      this.isRemove = isRemove;
+    private FakeDownloader() {
       this.started = new CountDownLatch(1);
       this.blocker = new com.google.android.exoplayer2.util.ConditionVariable();
+      downloadedBytes = C.LENGTH_UNSET;
     }
 
+    @SuppressWarnings({"NonAtomicOperationOnVolatileField", "NonAtomicVolatileUpdate"})
     @Override
     public void download() throws InterruptedException, IOException {
-      assertThat(isRemove).isFalse();
+      // It's ok to update this directly as no other thread will update it.
+      startCount++;
+      assertThat(action.isRemoveAction).isFalse();
       started.countDown();
       block();
       if (enableDownloadIOException) {
+        enableDownloadIOException = false;
         throw new IOException();
       }
     }
 
     @Override
     public void cancel() {
-      // Do nothing.
+      cancelled = true;
     }
 
+    @SuppressWarnings({"NonAtomicOperationOnVolatileField", "NonAtomicVolatileUpdate"})
     @Override
     public void remove() throws InterruptedException {
-      assertThat(isRemove).isTrue();
+      // It's ok to update this directly as no other thread will update it.
+      startCount++;
+      assertThat(action.isRemoveAction).isTrue();
       started.countDown();
       block();
     }
@@ -597,9 +654,8 @@ public class DownloadManagerTest {
             blocker.block();
             break;
           } catch (InterruptedException e) {
-            if (!ignoreInterrupts) {
-              throw e;
-            }
+            interrupted = true;
+            throw e;
           }
         }
       } finally {
@@ -607,17 +663,56 @@ public class DownloadManagerTest {
       }
     }
 
+    private FakeDownloader assertStarted() throws InterruptedException {
+      return assertStarted(ASSERT_TRUE_TIMEOUT);
+    }
+
     private FakeDownloader assertStarted(int timeout) throws InterruptedException {
       assertThat(started.await(timeout, TimeUnit.MILLISECONDS)).isTrue();
       started = new CountDownLatch(1);
       return this;
     }
 
+    private FakeDownloader assertStartCount(int count) throws InterruptedException {
+      assertThat(startCount).isEqualTo(count);
+      return this;
+    }
+
+    private FakeDownloader assertReleased() throws InterruptedException {
+      int count = 0;
+      while (started.await(ASSERT_TRUE_TIMEOUT, TimeUnit.MILLISECONDS)) {
+        if (count++ >= MAX_STARTS_BEFORE_RELEASED) {
+          fail();
+        }
+        started = new CountDownLatch(1);
+      }
+      return this;
+    }
+
+    private FakeDownloader assertCanceled() throws InterruptedException {
+      assertReleased();
+      assertThat(interrupted).isTrue();
+      assertThat(cancelled).isTrue();
+      return this;
+    }
+
+    private FakeDownloader assertNotCanceled() throws InterruptedException {
+      assertReleased();
+      assertThat(interrupted).isFalse();
+      assertThat(cancelled).isFalse();
+      return this;
+    }
+
     private FakeDownloader unblock() {
       blocker.open();
       return this;
     }
 
+    private FakeDownloader fail() {
+      enableDownloadIOException = true;
+      return unblock();
+    }
+
     @Override
     public long getDownloadedBytes() {
       return downloadedBytes;
@@ -632,5 +727,15 @@ public class DownloadManagerTest {
     public float getDownloadPercentage() {
       return C.PERCENTAGE_UNSET;
     }
+
+    private void assertDoesNotStart() throws InterruptedException {
+      Thread.sleep(ASSERT_FALSE_TIME);
+      assertThat(started.getCount()).isEqualTo(1);
+    }
+
+    @SuppressWarnings({"NonAtomicOperationOnVolatileField", "NonAtomicVolatileUpdate"})
+    private void increaseDownloadedByteCount() {
+      downloadedBytes++;
+    }
   }
 }
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
index 7e0ffc1772..2e07dbdd69 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.testutil;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadManager;
 import java.util.HashMap;
 import java.util.concurrent.ArrayBlockingQueue;
@@ -31,7 +30,7 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
 
   private final DownloadManager downloadManager;
   private final DummyMainThread dummyMainThread;
-  private final HashMap<DownloadAction, ArrayBlockingQueue<Integer>> actionStates;
+  private final HashMap<Integer, ArrayBlockingQueue<Integer>> actionStates;
 
   private CountDownLatch downloadFinishedCondition;
   private Throwable downloadError;
@@ -43,8 +42,8 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
     actionStates = new HashMap<>();
   }
 
-  public int pollStateChange(DownloadAction action, long timeoutMs) throws InterruptedException {
-    return getStateQueue(action).poll(timeoutMs, TimeUnit.MILLISECONDS);
+  public Integer pollStateChange(int taskId, long timeoutMs) throws InterruptedException {
+    return getStateQueue(taskId).poll(timeoutMs, TimeUnit.MILLISECONDS);
   }
 
   public void clearDownloadError() {
@@ -62,7 +61,7 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
     if (taskState.state == DownloadManager.TaskState.STATE_FAILED && downloadError == null) {
       downloadError = taskState.error;
     }
-    getStateQueue(taskState.action).add(taskState.state);
+    getStateQueue(taskState.taskId).add(taskState.state);
   }
 
   @Override
@@ -77,6 +76,14 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
    * error.
    */
   public void blockUntilTasksCompleteAndThrowAnyDownloadError() throws Throwable {
+    blockUntilTasksComplete();
+    if (downloadError != null) {
+      throw new Exception(downloadError);
+    }
+  }
+
+  /** Blocks until all remove and download tasks are complete. Task errors are ignored. */
+  public void blockUntilTasksComplete() throws InterruptedException {
     synchronized (this) {
       downloadFinishedCondition = new CountDownLatch(1);
     }
@@ -87,17 +94,14 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
           }
         });
     assertThat(downloadFinishedCondition.await(TIMEOUT, TimeUnit.MILLISECONDS)).isTrue();
-    if (downloadError != null) {
-      throw new Exception(downloadError);
-    }
   }
 
-  private ArrayBlockingQueue<Integer> getStateQueue(DownloadAction action) {
+  private ArrayBlockingQueue<Integer> getStateQueue(int taskId) {
     synchronized (actionStates) {
-      if (!actionStates.containsKey(action)) {
-        actionStates.put(action, new ArrayBlockingQueue<>(10));
+      if (!actionStates.containsKey(taskId)) {
+        actionStates.put(taskId, new ArrayBlockingQueue<>(10));
       }
-      return actionStates.get(action);
+      return actionStates.get(taskId);
     }
   }
 }

From 4bf42bd2ad1ed24620088cb1dfc33872006d1d33 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 12 Dec 2018 09:40:43 +0000
Subject: [PATCH 301/832] Rename TaskState to DownloadState

PiperOrigin-RevId: 225145311
---
 RELEASENOTES.md                               |   1 +
 .../exoplayer2/demo/DemoDownloadService.java  |  20 +-
 .../exoplayer2/demo/DownloadTracker.java      |  10 +-
 .../exoplayer2/offline/DownloadManager.java   | 302 +++++++++---------
 .../exoplayer2/offline/DownloadService.java   |  41 +--
 .../offline/DownloadManagerTest.java          |  16 +-
 .../ui/DownloadNotificationUtil.java          |  22 +-
 .../testutil/TestDownloadManagerListener.java |  10 +-
 8 files changed, 205 insertions(+), 217 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 8076d1e203..7b5b503168 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -27,6 +27,7 @@
   ([#5169](https://github.com/google/ExoPlayer/issues/5169)).
 * DownloadManager:
   * Create only one task for all DownloadActions for the same content.
+  * Rename TaskState to DownloadState.
 
 ### 2.9.2 ###
 
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
index 024ca62579..9671999bb2 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.demo;
 
 import android.app.Notification;
 import com.google.android.exoplayer2.offline.DownloadManager;
-import com.google.android.exoplayer2.offline.DownloadManager.TaskState;
+import com.google.android.exoplayer2.offline.DownloadManager.DownloadState;
 import com.google.android.exoplayer2.offline.DownloadService;
 import com.google.android.exoplayer2.scheduler.PlatformScheduler;
 import com.google.android.exoplayer2.ui.DownloadNotificationUtil;
@@ -50,40 +50,40 @@ public class DemoDownloadService extends DownloadService {
   }
 
   @Override
-  protected Notification getForegroundNotification(TaskState[] taskStates) {
+  protected Notification getForegroundNotification(DownloadState[] downloadStates) {
     return DownloadNotificationUtil.buildProgressNotification(
         /* context= */ this,
         R.drawable.ic_download,
         CHANNEL_ID,
         /* contentIntent= */ null,
         /* message= */ null,
-        taskStates);
+        downloadStates);
   }
 
   @Override
-  protected void onTaskStateChanged(TaskState taskState) {
-    if (taskState.action.isRemoveAction) {
+  protected void onDownloadStateChanged(DownloadState downloadState) {
+    if (downloadState.action.isRemoveAction) {
       return;
     }
     Notification notification = null;
-    if (taskState.state == TaskState.STATE_COMPLETED) {
+    if (downloadState.state == DownloadState.STATE_COMPLETED) {
       notification =
           DownloadNotificationUtil.buildDownloadCompletedNotification(
               /* context= */ this,
               R.drawable.ic_download_done,
               CHANNEL_ID,
               /* contentIntent= */ null,
-              Util.fromUtf8Bytes(taskState.action.data));
-    } else if (taskState.state == TaskState.STATE_FAILED) {
+              Util.fromUtf8Bytes(downloadState.action.data));
+    } else if (downloadState.state == DownloadState.STATE_FAILED) {
       notification =
           DownloadNotificationUtil.buildDownloadFailedNotification(
               /* context= */ this,
               R.drawable.ic_download_done,
               CHANNEL_ID,
               /* contentIntent= */ null,
-              Util.fromUtf8Bytes(taskState.action.data));
+              Util.fromUtf8Bytes(downloadState.action.data));
     }
-    int notificationId = FOREGROUND_NOTIFICATION_ID + 1 + taskState.taskId;
+    int notificationId = FOREGROUND_NOTIFICATION_ID + 1 + downloadState.id;
     NotificationUtil.setNotification(this, notificationId, notification);
   }
 }
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index b746757fca..6afacca064 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -37,7 +37,7 @@ import com.google.android.exoplayer2.offline.ActionFile;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadHelper;
 import com.google.android.exoplayer2.offline.DownloadManager;
-import com.google.android.exoplayer2.offline.DownloadManager.TaskState;
+import com.google.android.exoplayer2.offline.DownloadManager.DownloadState;
 import com.google.android.exoplayer2.offline.DownloadService;
 import com.google.android.exoplayer2.offline.ProgressiveDownloadHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
@@ -144,11 +144,11 @@ public class DownloadTracker implements DownloadManager.Listener {
   }
 
   @Override
-  public void onTaskStateChanged(DownloadManager downloadManager, TaskState taskState) {
-    DownloadAction action = taskState.action;
+  public void onDownloadStateChanged(DownloadManager downloadManager, DownloadState downloadState) {
+    DownloadAction action = downloadState.action;
     Uri uri = action.uri;
-    if ((action.isRemoveAction && taskState.state == TaskState.STATE_COMPLETED)
-        || (!action.isRemoveAction && taskState.state == TaskState.STATE_FAILED)) {
+    if ((action.isRemoveAction && downloadState.state == DownloadState.STATE_COMPLETED)
+        || (!action.isRemoveAction && downloadState.state == DownloadState.STATE_FAILED)) {
       // A download has been removed, or has failed. Stop tracking it.
       if (trackedDownloadStates.remove(uri) != null) {
         handleTrackedDownloadStatesChanged();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index c40a6ac9fd..a4b21c9aa5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -15,10 +15,10 @@
  */
 package com.google.android.exoplayer2.offline;
 
-import static com.google.android.exoplayer2.offline.DownloadManager.TaskState.STATE_COMPLETED;
-import static com.google.android.exoplayer2.offline.DownloadManager.TaskState.STATE_FAILED;
-import static com.google.android.exoplayer2.offline.DownloadManager.TaskState.STATE_QUEUED;
-import static com.google.android.exoplayer2.offline.DownloadManager.TaskState.STATE_STARTED;
+import static com.google.android.exoplayer2.offline.DownloadManager.DownloadState.STATE_COMPLETED;
+import static com.google.android.exoplayer2.offline.DownloadManager.DownloadState.STATE_FAILED;
+import static com.google.android.exoplayer2.offline.DownloadManager.DownloadState.STATE_QUEUED;
+import static com.google.android.exoplayer2.offline.DownloadManager.DownloadState.STATE_STARTED;
 
 import android.os.ConditionVariable;
 import android.os.Handler;
@@ -58,41 +58,41 @@ public final class DownloadManager {
      */
     void onInitialized(DownloadManager downloadManager);
     /**
-     * Called when the state of a task changes.
+     * Called when the state of a download changes.
      *
      * @param downloadManager The reporting instance.
-     * @param taskState The state of the task.
+     * @param downloadState The state of the download.
      */
-    void onTaskStateChanged(DownloadManager downloadManager, TaskState taskState);
+    void onDownloadStateChanged(DownloadManager downloadManager, DownloadState downloadState);
 
     /**
-     * Called when there is no active task left.
+     * Called when there is no active download left.
      *
      * @param downloadManager The reporting instance.
      */
     void onIdle(DownloadManager downloadManager);
   }
 
-  /** The default maximum number of simultaneous download tasks. */
+  /** The default maximum number of simultaneous downloads. */
   public static final int DEFAULT_MAX_SIMULTANEOUS_DOWNLOADS = 1;
-  /** The default minimum number of times a task must be retried before failing. */
+  /** The default minimum number of times a download must be retried before failing. */
   public static final int DEFAULT_MIN_RETRY_COUNT = 5;
 
   private static final String TAG = "DownloadManager";
   private static final boolean DEBUG = false;
 
-  private final int maxActiveDownloadTasks;
+  private final int maxActiveDownloads;
   private final int minRetryCount;
   private final ActionFile actionFile;
   private final DownloaderFactory downloaderFactory;
-  private final ArrayList<Task> tasks;
-  private final ArrayList<Task> activeDownloadTasks;
+  private final ArrayList<Download> downloads;
+  private final ArrayList<Download> activeDownloads;
   private final Handler handler;
   private final HandlerThread fileIOThread;
   private final Handler fileIOHandler;
   private final CopyOnWriteArraySet<Listener> listeners;
 
-  private int nextTaskId;
+  private int nextDownloadId;
   private boolean initialized;
   private boolean released;
   private boolean downloadsStopped;
@@ -113,8 +113,8 @@ public final class DownloadManager {
    *
    * @param actionFile The file in which active actions are saved.
    * @param downloaderFactory A factory for creating {@link Downloader}s.
-   * @param maxSimultaneousDownloads The maximum number of simultaneous download tasks.
-   * @param minRetryCount The minimum number of times a task must be retried before failing.
+   * @param maxSimultaneousDownloads The maximum number of simultaneous downloads.
+   * @param minRetryCount The minimum number of times a download must be retried before failing.
    */
   public DownloadManager(
       File actionFile,
@@ -123,12 +123,12 @@ public final class DownloadManager {
       int minRetryCount) {
     this.actionFile = new ActionFile(actionFile);
     this.downloaderFactory = downloaderFactory;
-    this.maxActiveDownloadTasks = maxSimultaneousDownloads;
+    this.maxActiveDownloads = maxSimultaneousDownloads;
     this.minRetryCount = minRetryCount;
     this.downloadsStopped = true;
 
-    tasks = new ArrayList<>();
-    activeDownloadTasks = new ArrayList<>();
+    downloads = new ArrayList<>();
+    activeDownloads = new ArrayList<>();
 
     Looper looper = Looper.myLooper();
     if (looper == null) {
@@ -164,23 +164,23 @@ public final class DownloadManager {
     listeners.remove(listener);
   }
 
-  /** Starts the download tasks. */
+  /** Starts the downloads. */
   public void startDownloads() {
     Assertions.checkState(!released);
     if (downloadsStopped) {
       downloadsStopped = false;
-      maybeStartTasks();
+      maybeStartDownloads();
       logd("Downloads are started");
     }
   }
 
-  /** Stops all of the download tasks. Call {@link #startDownloads()} to restart tasks. */
+  /** Stops all of the downloads. Call {@link #startDownloads()} to restart downloads. */
   public void stopDownloads() {
     Assertions.checkState(!released);
     if (!downloadsStopped) {
       downloadsStopped = true;
-      for (int i = 0; i < activeDownloadTasks.size(); i++) {
-        activeDownloadTasks.get(i).stop();
+      for (int i = 0; i < activeDownloads.size(); i++) {
+        activeDownloads.get(i).stop();
       }
       logd("Downloads are stopping");
     }
@@ -189,64 +189,50 @@ public final class DownloadManager {
   /**
    * Handles the given action.
    *
-   * <p>A task is created and added to the task queue if there isn't one already for the same
-   * content.
-   *
    * @param action The action to be executed.
-   * @return The id of the newly created or the existing task.
+   * @return The id of the newly created or the existing download.
    */
   public int handleAction(DownloadAction action) {
     Assertions.checkState(!released);
-    Task task = addTaskForAction(action);
+    Download download = getDownloadForAction(action);
     if (initialized) {
       saveActions();
-      maybeStartTasks();
-      if (task.state == STATE_QUEUED) {
-        // Task did not change out of its initial state, and so its initial state won't have been
+      maybeStartDownloads();
+      if (download.state == STATE_QUEUED) {
+        // Download did not change out of its initial state, and so its initial state won't have
+        // been
         // reported to listeners. Do so now.
-        notifyListenersTaskStateChange(task);
+        notifyListenersDownloadStateChange(download);
       }
     }
-    return task.id;
+    return download.id;
   }
 
-  /** Returns the number of tasks. */
-  public int getTaskCount() {
-    Assertions.checkState(!released);
-    return tasks.size();
-  }
-
-  /** Returns the number of download tasks. */
+  /** Returns the number of downloads. */
   public int getDownloadCount() {
-    int count = 0;
-    for (int i = 0; i < tasks.size(); i++) {
-      for (DownloadAction action : tasks.get(i).actionQueue) {
-        if (!action.isRemoveAction) {
-          count++;
-        }
-      }
-    }
-    return count;
+    Assertions.checkState(!released);
+    return downloads.size();
   }
 
-  /** Returns the state of a task, or null if no such task exists */
-  public @Nullable TaskState getTaskState(int taskId) {
+  /** Returns the state of a download, or null if no such download exists */
+  @Nullable
+  public DownloadState getDownloadState(int downloadId) {
     Assertions.checkState(!released);
-    for (int i = 0; i < tasks.size(); i++) {
-      Task task = tasks.get(i);
-      if (task.id == taskId) {
-        return task.getTaskState();
+    for (int i = 0; i < downloads.size(); i++) {
+      Download download = downloads.get(i);
+      if (download.id == downloadId) {
+        return download.getDownloadState();
       }
     }
     return null;
   }
 
-  /** Returns the states of all current tasks. */
-  public TaskState[] getAllTaskStates() {
+  /** Returns the states of all current downloads. */
+  public DownloadState[] getAllDownloadStates() {
     Assertions.checkState(!released);
-    TaskState[] states = new TaskState[tasks.size()];
+    DownloadState[] states = new DownloadState[downloads.size()];
     for (int i = 0; i < states.length; i++) {
-      states[i] = tasks.get(i).getTaskState();
+      states[i] = downloads.get(i).getDownloadState();
     }
     return states;
   }
@@ -257,14 +243,14 @@ public final class DownloadManager {
     return initialized;
   }
 
-  /** Returns whether there are no active tasks. */
+  /** Returns whether there are no active downloads. */
   public boolean isIdle() {
     Assertions.checkState(!released);
     if (!initialized) {
       return false;
     }
-    for (int i = 0; i < tasks.size(); i++) {
-      if (tasks.get(i).isStarted()) {
+    for (int i = 0; i < downloads.size(); i++) {
+      if (downloads.get(i).isStarted()) {
         return false;
       }
     }
@@ -272,16 +258,17 @@ public final class DownloadManager {
   }
 
   /**
-   * Stops all of the tasks and releases resources. If the action file isn't up to date, waits for
-   * the changes to be written. The manager must not be accessed after this method has been called.
+   * Stops all of the downloads and releases resources. If the action file isn't up to date, waits
+   * for the changes to be written. The manager must not be accessed after this method has been
+   * called.
    */
   public void release() {
     if (released) {
       return;
     }
     released = true;
-    for (int i = 0; i < tasks.size(); i++) {
-      tasks.get(i).stop();
+    for (int i = 0; i < downloads.size(); i++) {
+      downloads.get(i).stop();
     }
     final ConditionVariable fileIOFinishedCondition = new ConditionVariable();
     fileIOHandler.post(fileIOFinishedCondition::open);
@@ -290,47 +277,47 @@ public final class DownloadManager {
     logd("Released");
   }
 
-  private Task addTaskForAction(DownloadAction action) {
-    for (int i = 0; i < tasks.size(); i++) {
-      Task task = tasks.get(i);
-      if (task.action.isSameMedia(action)) {
-        task.addAction(action);
-        logd("Action is added to existing task", task);
-        return task;
+  private Download getDownloadForAction(DownloadAction action) {
+    for (int i = 0; i < downloads.size(); i++) {
+      Download download = downloads.get(i);
+      if (download.action.isSameMedia(action)) {
+        download.addAction(action);
+        logd("Action is added to existing download", download);
+        return download;
       }
     }
-    Task task = new Task(nextTaskId++, this, downloaderFactory, action, minRetryCount);
-    tasks.add(task);
-    logd("Task is added", task);
-    return task;
+    Download download =
+        new Download(nextDownloadId++, this, downloaderFactory, action, minRetryCount);
+    downloads.add(download);
+    logd("Download is added", download);
+    return download;
   }
 
   /**
-   * Iterates through the task queue and starts any task if all of the following are true:
+   * Iterates through the download queue and starts any download if all of the following are true:
    *
    * <ul>
    *   <li>It hasn't started yet.
-   *   <li>If it's a download task then the maximum number of active downloads hasn't been reached.
+   *   <li>The maximum number of active downloads hasn't been reached.
    * </ul>
    */
-  private void maybeStartTasks() {
+  private void maybeStartDownloads() {
     if (!initialized || released) {
       return;
     }
 
-    boolean skipDownloadActions = downloadsStopped
-        || activeDownloadTasks.size() == maxActiveDownloadTasks;
-    for (int i = 0; i < tasks.size(); i++) {
-      Task task = tasks.get(i);
-      if (!task.canStart()) {
+    boolean skipDownloads = downloadsStopped || activeDownloads.size() == maxActiveDownloads;
+    for (int i = 0; i < downloads.size(); i++) {
+      Download download = downloads.get(i);
+      if (!download.canStart()) {
         continue;
       }
-      boolean isRemoveAction = task.action.isRemoveAction;
-      if (isRemoveAction || !skipDownloadActions) {
-        task.start();
+      boolean isRemoveAction = download.action.isRemoveAction;
+      if (isRemoveAction || !skipDownloads) {
+        download.start();
         if (!isRemoveAction) {
-          activeDownloadTasks.add(task);
-          skipDownloadActions = activeDownloadTasks.size() == maxActiveDownloadTasks;
+          activeDownloads.add(download);
+          skipDownloads = activeDownloads.size() == maxActiveDownloads;
         }
       }
     }
@@ -346,30 +333,30 @@ public final class DownloadManager {
     }
   }
 
-  private void onTaskStateChange(Task task) {
+  private void onDownloadStateChange(Download download) {
     if (released) {
       return;
     }
-    boolean stopped = !task.isStarted();
+    boolean stopped = !download.isStarted();
     if (stopped) {
-      activeDownloadTasks.remove(task);
+      activeDownloads.remove(download);
     }
-    notifyListenersTaskStateChange(task);
-    if (task.isFinished()) {
-      tasks.remove(task);
+    notifyListenersDownloadStateChange(download);
+    if (download.isFinished()) {
+      downloads.remove(download);
       saveActions();
     }
     if (stopped) {
-      maybeStartTasks();
+      maybeStartDownloads();
       maybeNotifyListenersIdle();
     }
   }
 
-  private void notifyListenersTaskStateChange(Task task) {
-    logd("Task state is changed", task);
-    TaskState taskState = task.getTaskState();
+  private void notifyListenersDownloadStateChange(Download download) {
+    logd("Download state is changed", download);
+    DownloadState downloadState = download.getDownloadState();
     for (Listener listener : listeners) {
-      listener.onTaskStateChanged(this, taskState);
+      listener.onDownloadStateChanged(this, downloadState);
     }
   }
 
@@ -390,27 +377,27 @@ public final class DownloadManager {
                 if (released) {
                   return;
                 }
-                List<Task> pendingTasks = new ArrayList<>(tasks);
-                tasks.clear();
+                List<Download> pendingDownloads = new ArrayList<>(downloads);
+                downloads.clear();
                 for (DownloadAction action : actions) {
-                  addTaskForAction(action);
+                  getDownloadForAction(action);
                 }
-                logd("Tasks are created.");
+                logd("Downloads are created.");
                 initialized = true;
                 for (Listener listener : listeners) {
                   listener.onInitialized(DownloadManager.this);
                 }
-                if (!pendingTasks.isEmpty()) {
-                  tasks.addAll(pendingTasks);
+                if (!pendingDownloads.isEmpty()) {
+                  downloads.addAll(pendingDownloads);
                   saveActions();
                 }
-                maybeStartTasks();
-                for (int i = 0; i < tasks.size(); i++) {
-                  Task task = tasks.get(i);
-                  if (task.state == STATE_QUEUED) {
-                    // Task did not change out of its initial state, and so its initial state
+                maybeStartDownloads();
+                for (int i = 0; i < downloads.size(); i++) {
+                  Download download = downloads.get(i);
+                  if (download.state == STATE_QUEUED) {
+                    // Download did not change out of its initial state, and so its initial state
                     // won't have been reported to listeners. Do so now.
-                    notifyListenersTaskStateChange(task);
+                    notifyListenersDownloadStateChange(download);
                   }
                 }
               });
@@ -421,9 +408,9 @@ public final class DownloadManager {
     if (released) {
       return;
     }
-    ArrayList<DownloadAction> actions = new ArrayList<>(tasks.size());
-    for (int i = 0; i < tasks.size(); i++) {
-      actions.addAll(tasks.get(i).actionQueue);
+    ArrayList<DownloadAction> actions = new ArrayList<>(downloads.size());
+    for (int i = 0; i < downloads.size(); i++) {
+      actions.addAll(downloads.get(i).actionQueue);
     }
     final DownloadAction[] actionsArray = actions.toArray(new DownloadAction[0]);
     fileIOHandler.post(
@@ -443,16 +430,16 @@ public final class DownloadManager {
     }
   }
 
-  private static void logd(String message, Task task) {
-    logd(message + ": " + task);
+  private static void logd(String message, Download download) {
+    logd(message + ": " + download);
   }
 
-  /** Represents state of a task. */
-  public static final class TaskState {
+  /** Represents state of a download. */
+  public static final class DownloadState {
 
     /**
-     * Task states. One of {@link #STATE_QUEUED}, {@link #STATE_STARTED}, {@link #STATE_COMPLETED}
-     * or {@link #STATE_FAILED}.
+     * Download states. One of {@link #STATE_QUEUED}, {@link #STATE_STARTED}, {@link
+     * #STATE_COMPLETED} or {@link #STATE_FAILED}.
      *
      * <p>Transition diagram:
      *
@@ -465,13 +452,13 @@ public final class DownloadManager {
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({STATE_QUEUED, STATE_STARTED, STATE_COMPLETED, STATE_FAILED})
     public @interface State {}
-    /** The task is waiting to be started. */
+    /** The download is waiting to be started. */
     public static final int STATE_QUEUED = 0;
-    /** The task is currently started. */
+    /** The download is currently started. */
     public static final int STATE_STARTED = 1;
-    /** The task completed. */
+    /** The download completed. */
     public static final int STATE_COMPLETED = 2;
-    /** The task failed. */
+    /** The download failed. */
     public static final int STATE_FAILED = 3;
 
     /** Returns the state string for the given state value. */
@@ -490,16 +477,15 @@ public final class DownloadManager {
       }
     }
 
-    /** The unique task id. */
-    public final int taskId;
+    /** The unique download id. */
+    public final int id;
     /** The action being executed. */
     public final DownloadAction action;
-    /** The state of the task. */
+    /** The state of the download. */
     public final @State int state;
 
     /**
-     * The estimated download percentage, or {@link C#PERCENTAGE_UNSET} if no estimate is available
-     * or if this is a removal task.
+     * The estimated download percentage, or {@link C#PERCENTAGE_UNSET} if no estimate is available.
      */
     public final float downloadPercentage;
     /** The total number of downloaded bytes. */
@@ -510,15 +496,15 @@ public final class DownloadManager {
     /** If {@link #state} is {@link #STATE_FAILED} then this is the cause, otherwise null. */
     @Nullable public final Throwable error;
 
-    private TaskState(
-        int taskId,
+    private DownloadState(
+        int id,
         DownloadAction action,
         @State int state,
         float downloadPercentage,
         long downloadedBytes,
         long totalBytes,
         @Nullable Throwable error) {
-      this.taskId = taskId;
+      this.id = id;
       this.action = action;
       this.state = state;
       this.downloadPercentage = downloadPercentage;
@@ -529,7 +515,7 @@ public final class DownloadManager {
 
   }
 
-  private static final class Task {
+  private static final class Download {
 
     /** Target states for the download thread. */
     @Documented
@@ -543,10 +529,10 @@ public final class DownloadManager {
     private final int minRetryCount;
     private final ArrayDeque<DownloadAction> actionQueue;
     private DownloadAction action;
-    /** The current state of the task. */
-    @TaskState.State private int state;
+    /** The current state of the download. */
+    @DownloadState.State private int state;
     /**
-     * When started, this is the target state that the task will transition to when the download
+     * When started, this is the target state that the download will transition to when the download
      * thread stops.
      */
     @TargetState private volatile int targetState;
@@ -555,7 +541,7 @@ public final class DownloadManager {
     @MonotonicNonNull private DownloadThread downloadThread;
     @MonotonicNonNull private Throwable error;
 
-    private Task(
+    private Download(
         int id,
         DownloadManager downloadManager,
         DownloaderFactory downloaderFactory,
@@ -586,11 +572,11 @@ public final class DownloadManager {
       } else {
         Assertions.checkState(state == STATE_QUEUED);
         action = updatedAction;
-        downloadManager.onTaskStateChange(this);
+        downloadManager.onDownloadStateChange(this);
       }
     }
 
-    public TaskState getTaskState() {
+    public DownloadState getDownloadState() {
       float downloadPercentage = C.PERCENTAGE_UNSET;
       long downloadedBytes = 0;
       long totalBytes = C.LENGTH_UNSET;
@@ -599,16 +585,16 @@ public final class DownloadManager {
         downloadedBytes = downloader.getDownloadedBytes();
         totalBytes = downloader.getTotalBytes();
       }
-      return new TaskState(
+      return new DownloadState(
           id, action, state, downloadPercentage, downloadedBytes, totalBytes, error);
     }
 
-    /** Returns whether the task is finished. */
+    /** Returns whether the download is finished. */
     public boolean isFinished() {
       return state == STATE_FAILED || state == STATE_COMPLETED;
     }
 
-    /** Returns whether the task is started. */
+    /** Returns whether the download is started. */
     public boolean isStarted() {
       return state == STATE_STARTED;
     }
@@ -619,9 +605,9 @@ public final class DownloadManager {
           + ' '
           + (action.isRemoveAction ? "remove" : "download")
           + ' '
-          + TaskState.getStateString(state)
+          + DownloadState.getStateString(state)
           + ' '
-          + TaskState.getStateString(targetState);
+          + DownloadState.getStateString(targetState);
     }
 
     public boolean canStart() {
@@ -637,7 +623,7 @@ public final class DownloadManager {
         downloadThread =
             new DownloadThread(
                 this, downloader, action.isRemoveAction, minRetryCount, downloadManager.handler);
-        downloadManager.onTaskStateChange(this);
+        downloadManager.onDownloadStateChange(this);
       }
     }
 
@@ -650,7 +636,7 @@ public final class DownloadManager {
     // Internal methods running on the main thread.
 
     private void stopDownloadThread() {
-      this.targetState = TaskState.STATE_QUEUED;
+      this.targetState = DownloadState.STATE_QUEUED;
       Assertions.checkNotNull(downloadThread).cancel();
     }
 
@@ -664,19 +650,19 @@ public final class DownloadManager {
         } else {
           actionQueue.remove();
           if (!actionQueue.isEmpty()) {
-            // Don't continue running. Wait to be restarted by maybeStartTasks().
+            // Don't continue running. Wait to be restarted by maybeStartDownloads().
             state = STATE_QUEUED;
             action = actionQueue.peek();
           }
         }
       }
-      downloadManager.onTaskStateChange(this);
+      downloadManager.onDownloadStateChange(this);
     }
   }
 
   private static class DownloadThread implements Runnable {
 
-    private final Task task;
+    private final Download download;
     private final Downloader downloader;
     private final boolean remove;
     private final int minRetryCount;
@@ -685,12 +671,12 @@ public final class DownloadManager {
     private volatile boolean isCanceled;
 
     private DownloadThread(
-        Task task,
+        Download download,
         Downloader downloader,
         boolean remove,
         int minRetryCount,
         Handler callbackHandler) {
-      this.task = task;
+      this.download = download;
       this.downloader = downloader;
       this.remove = remove;
       this.minRetryCount = minRetryCount;
@@ -709,7 +695,7 @@ public final class DownloadManager {
 
     @Override
     public void run() {
-      logd("Task is started", task);
+      logd("Download is started", download);
       Throwable error = null;
       try {
         if (remove) {
@@ -725,14 +711,14 @@ public final class DownloadManager {
               if (!isCanceled) {
                 long downloadedBytes = downloader.getDownloadedBytes();
                 if (downloadedBytes != errorPosition) {
-                  logd("Reset error count. downloadedBytes = " + downloadedBytes, task);
+                  logd("Reset error count. downloadedBytes = " + downloadedBytes, download);
                   errorPosition = downloadedBytes;
                   errorCount = 0;
                 }
                 if (++errorCount > minRetryCount) {
                   throw e;
                 }
-                logd("Download error. Retry " + errorCount, task);
+                logd("Download error. Retry " + errorCount, download);
                 Thread.sleep(getRetryDelayMillis(errorCount));
               }
             }
@@ -742,7 +728,7 @@ public final class DownloadManager {
         error = e;
       }
       final Throwable finalError = error;
-      callbackHandler.post(() -> task.onDownloadThreadStopped(isCanceled ? null : finalError));
+      callbackHandler.post(() -> download.onDownloadThreadStopped(isCanceled ? null : finalError));
     }
 
     private int getRetryDelayMillis(int errorCount) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index cfca8ede79..d49b33d2ae 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -24,7 +24,7 @@ import android.os.IBinder;
 import android.os.Looper;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
-import com.google.android.exoplayer2.offline.DownloadManager.TaskState;
+import com.google.android.exoplayer2.offline.DownloadManager.DownloadState;
 import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.scheduler.RequirementsWatcher;
 import com.google.android.exoplayer2.scheduler.Scheduler;
@@ -71,9 +71,9 @@ public abstract class DownloadService extends Service {
   private static final String TAG = "DownloadService";
   private static final boolean DEBUG = false;
 
-  // Keep the requirements helper for each DownloadService as long as there are tasks (and the
-  // process is running). This allows tasks to resume when there's no scheduler. It may also allow
-  // tasks the resume more quickly than when relying on the scheduler alone.
+  // Keep the requirements helper for each DownloadService as long as there are downloads (and the
+  // process is running). This allows downloads to resume when there's no scheduler. It may also
+  // allow downloads the resume more quickly than when relying on the scheduler alone.
   private static final HashMap<Class<? extends DownloadService>, RequirementsHelper>
       requirementsHelpers = new HashMap<>();
   private static final Requirements DEFAULT_REQUIREMENTS =
@@ -99,7 +99,7 @@ public abstract class DownloadService extends Service {
    * <p>If {@code foregroundNotificationId} isn't {@link #FOREGROUND_NOTIFICATION_ID_NONE} (value
    * {@value #FOREGROUND_NOTIFICATION_ID_NONE}) the service runs in the foreground with {@link
    * #DEFAULT_FOREGROUND_NOTIFICATION_UPDATE_INTERVAL}. In that case {@link
-   * #getForegroundNotification(TaskState[])} should be overridden in the subclass.
+   * #getForegroundNotification(DownloadState[])} should be overridden in the subclass.
    *
    * @param foregroundNotificationId The notification id for the foreground notification, or {@link
    *     #FOREGROUND_NOTIFICATION_ID_NONE} (value {@value #FOREGROUND_NOTIFICATION_ID_NONE})
@@ -110,7 +110,7 @@ public abstract class DownloadService extends Service {
 
   /**
    * Creates a DownloadService which will run in the foreground. {@link
-   * #getForegroundNotification(TaskState[])} should be overridden in the subclass.
+   * #getForegroundNotification(DownloadState[])} should be overridden in the subclass.
    *
    * @param foregroundNotificationId The notification id for the foreground notification, must not
    *     be 0.
@@ -128,7 +128,7 @@ public abstract class DownloadService extends Service {
 
   /**
    * Creates a DownloadService which will run in the foreground. {@link
-   * #getForegroundNotification(TaskState[])} should be overridden in the subclass.
+   * #getForegroundNotification(DownloadState[])} should be overridden in the subclass.
    *
    * @param foregroundNotificationId The notification id for the foreground notification. Must not
    *     be 0.
@@ -338,29 +338,29 @@ public abstract class DownloadService extends Service {
    *
    * <p>Returns a notification to be displayed when this service running in the foreground.
    *
-   * <p>This method is called when there is a task state change and periodically while there are
-   * active tasks. The periodic update interval can be set using {@link #DownloadService(int,
+   * <p>This method is called when there is a download state change and periodically while there are
+   * active downloads. The periodic update interval can be set using {@link #DownloadService(int,
    * long)}.
    *
    * <p>On API level 26 and above, this method may also be called just before the service stops,
-   * with an empty {@code taskStates} array. The returned notification is used to satisfy system
+   * with an empty {@code downloadStates} array. The returned notification is used to satisfy system
    * requirements for foreground services.
    *
-   * @param taskStates The states of all current tasks.
+   * @param downloadStates The states of all current downloads.
    * @return The foreground notification to display.
    */
-  protected Notification getForegroundNotification(TaskState[] taskStates) {
+  protected Notification getForegroundNotification(DownloadState[] downloadStates) {
     throw new IllegalStateException(
         getClass().getName()
             + " is started in the foreground but getForegroundNotification() is not implemented.");
   }
 
   /**
-   * Called when the state of a task changes.
+   * Called when the state of a download changes.
    *
-   * @param taskState The state of the task.
+   * @param downloadState The state of the download.
    */
-  protected void onTaskStateChanged(TaskState taskState) {
+  protected void onDownloadStateChanged(DownloadState downloadState) {
     // Do nothing.
   }
 
@@ -428,10 +428,11 @@ public abstract class DownloadService extends Service {
     }
 
     @Override
-    public void onTaskStateChanged(DownloadManager downloadManager, TaskState taskState) {
-      DownloadService.this.onTaskStateChanged(taskState);
+    public void onDownloadStateChanged(
+        DownloadManager downloadManager, DownloadState downloadState) {
+      DownloadService.this.onDownloadStateChanged(downloadState);
       if (foregroundNotificationUpdater != null) {
-        if (taskState.state == TaskState.STATE_STARTED) {
+        if (downloadState.state == DownloadState.STATE_STARTED) {
           foregroundNotificationUpdater.startPeriodicUpdates();
         } else {
           foregroundNotificationUpdater.update();
@@ -471,8 +472,8 @@ public abstract class DownloadService extends Service {
     }
 
     public void update() {
-      TaskState[] taskStates = downloadManager.getAllTaskStates();
-      startForeground(notificationId, getForegroundNotification(taskStates));
+      DownloadState[] downloadStates = downloadManager.getAllDownloadStates();
+      startForeground(notificationId, getForegroundNotification(downloadStates));
       notificationDisplayed = true;
       if (periodicUpdatesStarted) {
         handler.removeCallbacks(this);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index 85eed83d4a..db498a84cf 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -20,8 +20,8 @@ import static org.junit.Assert.fail;
 
 import android.net.Uri;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.offline.DownloadManager.TaskState;
-import com.google.android.exoplayer2.offline.DownloadManager.TaskState.State;
+import com.google.android.exoplayer2.offline.DownloadManager.DownloadState;
+import com.google.android.exoplayer2.offline.DownloadManager.DownloadState.State;
 import com.google.android.exoplayer2.testutil.DummyMainThread;
 import com.google.android.exoplayer2.testutil.RobolectricUtil;
 import com.google.android.exoplayer2.testutil.TestDownloadManagerListener;
@@ -371,11 +371,11 @@ public class DownloadManagerTest {
     TaskWrapper task2 = new DownloadRunner(uri2).postDownloadAction().getTask();
     TaskWrapper task3 = new DownloadRunner(uri3).postRemoveAction().getTask();
 
-    TaskState[] states = downloadManager.getAllTaskStates();
+    DownloadState[] states = downloadManager.getAllDownloadStates();
 
     assertThat(states).hasLength(3);
     int[] taskIds = {task1.taskId, task2.taskId, task3.taskId};
-    int[] stateTaskIds = {states[0].taskId, states[1].taskId, states[2].taskId};
+    int[] stateTaskIds = {states[0].id, states[1].id, states[2].id};
     assertThat(stateTaskIds).isEqualTo(taskIds);
   }
 
@@ -522,19 +522,19 @@ public class DownloadManagerTest {
     }
 
     private TaskWrapper assertStarted() throws InterruptedException {
-      return assertState(TaskState.STATE_STARTED);
+      return assertState(DownloadState.STATE_STARTED);
     }
 
     private TaskWrapper assertCompleted() {
-      return assertState(TaskState.STATE_COMPLETED);
+      return assertState(DownloadState.STATE_COMPLETED);
     }
 
     private TaskWrapper assertFailed() {
-      return assertState(TaskState.STATE_FAILED);
+      return assertState(DownloadState.STATE_FAILED);
     }
 
     private TaskWrapper assertQueued() {
-      return assertState(TaskState.STATE_QUEUED);
+      return assertState(DownloadState.STATE_QUEUED);
     }
 
     private TaskWrapper assertState(@State int expectedState) {
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java
index 97832abfc7..3f98da06f0 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java
@@ -23,7 +23,7 @@ import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.v4.app.NotificationCompat;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.offline.DownloadManager.TaskState;
+import com.google.android.exoplayer2.offline.DownloadManager.DownloadState;
 
 /** Helper for creating download notifications. */
 public final class DownloadNotificationUtil {
@@ -33,7 +33,7 @@ public final class DownloadNotificationUtil {
   private DownloadNotificationUtil() {}
 
   /**
-   * Returns a progress notification for the given task states.
+   * Returns a progress notification for the given download states.
    *
    * @param context A context for accessing resources.
    * @param smallIcon A small icon for the notification.
@@ -41,7 +41,7 @@ public final class DownloadNotificationUtil {
    *     above.
    * @param contentIntent An optional content intent to send when the notification is clicked.
    * @param message An optional message to display on the notification.
-   * @param taskStates The task states.
+   * @param downloadStates The download states.
    * @return The notification.
    */
   public static Notification buildProgressNotification(
@@ -50,28 +50,28 @@ public final class DownloadNotificationUtil {
       String channelId,
       @Nullable PendingIntent contentIntent,
       @Nullable String message,
-      TaskState[] taskStates) {
+      DownloadState[] downloadStates) {
     float totalPercentage = 0;
     int downloadTaskCount = 0;
     boolean allDownloadPercentagesUnknown = true;
     boolean haveDownloadedBytes = false;
     boolean haveDownloadTasks = false;
     boolean haveRemoveTasks = false;
-    for (TaskState taskState : taskStates) {
-      if (taskState.state != TaskState.STATE_STARTED
-          && taskState.state != TaskState.STATE_COMPLETED) {
+    for (DownloadState downloadState : downloadStates) {
+      if (downloadState.state != DownloadState.STATE_STARTED
+          && downloadState.state != DownloadState.STATE_COMPLETED) {
         continue;
       }
-      if (taskState.action.isRemoveAction) {
+      if (downloadState.action.isRemoveAction) {
         haveRemoveTasks = true;
         continue;
       }
       haveDownloadTasks = true;
-      if (taskState.downloadPercentage != C.PERCENTAGE_UNSET) {
+      if (downloadState.downloadPercentage != C.PERCENTAGE_UNSET) {
         allDownloadPercentagesUnknown = false;
-        totalPercentage += taskState.downloadPercentage;
+        totalPercentage += downloadState.downloadPercentage;
       }
-      haveDownloadedBytes |= taskState.downloadedBytes > 0;
+      haveDownloadedBytes |= downloadState.downloadedBytes > 0;
       downloadTaskCount++;
     }
 
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
index 2e07dbdd69..b178743060 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.testutil;
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.android.exoplayer2.offline.DownloadManager;
+import com.google.android.exoplayer2.offline.DownloadManager.DownloadState;
 import java.util.HashMap;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.CountDownLatch;
@@ -56,12 +57,11 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
   }
 
   @Override
-  public void onTaskStateChanged(
-      DownloadManager downloadManager, DownloadManager.TaskState taskState) {
-    if (taskState.state == DownloadManager.TaskState.STATE_FAILED && downloadError == null) {
-      downloadError = taskState.error;
+  public void onDownloadStateChanged(DownloadManager downloadManager, DownloadState downloadState) {
+    if (downloadState.state == DownloadState.STATE_FAILED && downloadError == null) {
+      downloadError = downloadState.error;
     }
-    getStateQueue(taskState.taskId).add(taskState.state);
+    getStateQueue(downloadState.id).add(downloadState.state);
   }
 
   @Override

From 8cedfc46fb1a8adcf525bc7841d75a9ed910cf07 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 12 Dec 2018 11:01:48 +0000
Subject: [PATCH 302/832] Add failureReason to DownloadState

PiperOrigin-RevId: 225154121
---
 .../exoplayer2/offline/DownloadManager.java   | 45 +++++++++++++++----
 .../testutil/TestDownloadManagerListener.java | 12 ++---
 2 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index a4b21c9aa5..9c6f0893fe 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -15,6 +15,8 @@
  */
 package com.google.android.exoplayer2.offline;
 
+import static com.google.android.exoplayer2.offline.DownloadManager.DownloadState.FAILURE_REASON_NONE;
+import static com.google.android.exoplayer2.offline.DownloadManager.DownloadState.FAILURE_REASON_UNKNOWN;
 import static com.google.android.exoplayer2.offline.DownloadManager.DownloadState.STATE_COMPLETED;
 import static com.google.android.exoplayer2.offline.DownloadManager.DownloadState.STATE_FAILED;
 import static com.google.android.exoplayer2.offline.DownloadManager.DownloadState.STATE_QUEUED;
@@ -461,6 +463,16 @@ public final class DownloadManager {
     /** The download failed. */
     public static final int STATE_FAILED = 3;
 
+    /** Failure reasons. Either {@link #FAILURE_REASON_NONE} or {@link #FAILURE_REASON_UNKNOWN}. */
+    @Documented
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({FAILURE_REASON_NONE, FAILURE_REASON_UNKNOWN})
+    public @interface FailureReason {}
+    /** The download isn't failed. */
+    public static final int FAILURE_REASON_NONE = 0;
+    /** The download is failed because of unknown reason. */
+    public static final int FAILURE_REASON_UNKNOWN = 1;
+
     /** Returns the state string for the given state value. */
     public static String getStateString(@State int state) {
       switch (state) {
@@ -477,6 +489,18 @@ public final class DownloadManager {
       }
     }
 
+    /** Returns the failure string for the given failure reason value. */
+    public static String getFailureString(@FailureReason int failureReason) {
+      switch (failureReason) {
+        case FAILURE_REASON_NONE:
+          return "NO_REASON";
+        case FAILURE_REASON_UNKNOWN:
+          return "UNKNOWN_REASON";
+        default:
+          throw new IllegalStateException();
+      }
+    }
+
     /** The unique download id. */
     public final int id;
     /** The action being executed. */
@@ -493,8 +517,11 @@ public final class DownloadManager {
     /** The total size of the media, or {@link C#LENGTH_UNSET} if unknown. */
     public final long totalBytes;
 
-    /** If {@link #state} is {@link #STATE_FAILED} then this is the cause, otherwise null. */
-    @Nullable public final Throwable error;
+    /**
+     * If {@link #state} is {@link #STATE_FAILED} then this is the cause, otherwise {@link
+     * #FAILURE_REASON_NONE}.
+     */
+    @FailureReason public final int failureReason;
 
     private DownloadState(
         int id,
@@ -503,14 +530,16 @@ public final class DownloadManager {
         float downloadPercentage,
         long downloadedBytes,
         long totalBytes,
-        @Nullable Throwable error) {
+        @FailureReason int failureReason) {
+      Assertions.checkState(
+          failureReason == FAILURE_REASON_NONE ? state != STATE_FAILED : state == STATE_FAILED);
       this.id = id;
       this.action = action;
       this.state = state;
       this.downloadPercentage = downloadPercentage;
       this.downloadedBytes = downloadedBytes;
       this.totalBytes = totalBytes;
-      this.error = error;
+      this.failureReason = failureReason;
     }
 
   }
@@ -539,7 +568,7 @@ public final class DownloadManager {
 
     @MonotonicNonNull private Downloader downloader;
     @MonotonicNonNull private DownloadThread downloadThread;
-    @MonotonicNonNull private Throwable error;
+    @MonotonicNonNull @DownloadState.FailureReason private int failureReason;
 
     private Download(
         int id,
@@ -586,7 +615,7 @@ public final class DownloadManager {
         totalBytes = downloader.getTotalBytes();
       }
       return new DownloadState(
-          id, action, state, downloadPercentage, downloadedBytes, totalBytes, error);
+          id, action, state, downloadPercentage, downloadedBytes, totalBytes, failureReason);
     }
 
     /** Returns whether the download is finished. */
@@ -642,11 +671,11 @@ public final class DownloadManager {
 
     private void onDownloadThreadStopped(@Nullable Throwable finalError) {
       state = targetState;
-      error = null;
+      failureReason = FAILURE_REASON_NONE;
       if (targetState == STATE_COMPLETED) {
         if (finalError != null) {
           state = STATE_FAILED;
-          error = finalError;
+          failureReason = FAILURE_REASON_UNKNOWN;
         } else {
           actionQueue.remove();
           if (!actionQueue.isEmpty()) {
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
index b178743060..3d939c8207 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
@@ -34,7 +34,7 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
   private final HashMap<Integer, ArrayBlockingQueue<Integer>> actionStates;
 
   private CountDownLatch downloadFinishedCondition;
-  private Throwable downloadError;
+  @DownloadState.FailureReason private int failureReason;
 
   public TestDownloadManagerListener(
       DownloadManager downloadManager, DummyMainThread dummyMainThread) {
@@ -48,7 +48,7 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
   }
 
   public void clearDownloadError() {
-    this.downloadError = null;
+    this.failureReason = DownloadState.FAILURE_REASON_NONE;
   }
 
   @Override
@@ -58,8 +58,8 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
 
   @Override
   public void onDownloadStateChanged(DownloadManager downloadManager, DownloadState downloadState) {
-    if (downloadState.state == DownloadState.STATE_FAILED && downloadError == null) {
-      downloadError = downloadState.error;
+    if (downloadState.state == DownloadState.STATE_FAILED) {
+      failureReason = downloadState.failureReason;
     }
     getStateQueue(downloadState.id).add(downloadState.state);
   }
@@ -77,8 +77,8 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
    */
   public void blockUntilTasksCompleteAndThrowAnyDownloadError() throws Throwable {
     blockUntilTasksComplete();
-    if (downloadError != null) {
-      throw new Exception(downloadError);
+    if (failureReason != DownloadState.FAILURE_REASON_NONE) {
+      throw new Exception("Failure reason: " + DownloadState.getFailureString(failureReason));
     }
   }
 

From c03b7e32e2154d6c9940197db4141f7b29654edf Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 12 Dec 2018 11:53:46 +0000
Subject: [PATCH 303/832] Remove TrackKey and its remaining usages.

This is no longer needed as the public API uses TrackSelection as the way to specify
selected tracks.

PiperOrigin-RevId: 225158867
---
 .../exoplayer2/offline/DownloadHelper.java    | 32 +++-------
 .../offline/ProgressiveDownloadHelper.java    |  7 +--
 .../android/exoplayer2/offline/TrackKey.java  | 62 -------------------
 .../offline/DownloadHelperTest.java           | 28 ++++-----
 .../dash/offline/DashDownloadHelper.java      | 12 +---
 .../source/hls/offline/HlsDownloadHelper.java | 15 ++---
 .../offline/SsDownloadHelper.java             | 13 +---
 7 files changed, 34 insertions(+), 135 deletions(-)
 delete mode 100644 library/core/src/main/java/com/google/android/exoplayer2/offline/TrackKey.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index 152aaf2121..e799aff4b2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -281,7 +281,7 @@ public abstract class DownloadHelper<T> {
   public final DownloadAction getDownloadAction(@Nullable byte[] data) {
     Assertions.checkNotNull(trackSelectionsByPeriodAndRenderer);
     Assertions.checkNotNull(trackGroupArrays);
-    List<TrackKey> trackKeys = new ArrayList<>();
+    List<StreamKey> streamKeys = new ArrayList<>();
     int periodCount = trackSelectionsByPeriodAndRenderer.length;
     for (int periodIndex = 0; periodIndex < periodCount; periodIndex++) {
       int rendererCount = trackSelectionsByPeriodAndRenderer[periodIndex].length;
@@ -295,27 +295,12 @@ public abstract class DownloadHelper<T> {
           int trackCount = trackSelection.length();
           for (int trackListIndex = 0; trackListIndex < trackCount; trackListIndex++) {
             int trackIndex = trackSelection.getIndexInTrackGroup(trackListIndex);
-            trackKeys.add(new TrackKey(periodIndex, trackGroupIndex, trackIndex));
+            streamKeys.add(toStreamKey(periodIndex, trackGroupIndex, trackIndex));
           }
         }
       }
     }
-    return DownloadAction.createDownloadAction(
-        downloadType, uri, toStreamKeys(trackKeys), cacheKey, data);
-  }
-
-  /**
-   * Builds a {@link DownloadAction} for downloading the specified tracks. Must not be called until
-   * after preparation completes.
-   *
-   * @param data Application provided data to store in {@link DownloadAction#data}.
-   * @param trackKeys The selected tracks. If empty, all streams will be downloaded.
-   * @return The built {@link DownloadAction}.
-   */
-  public final DownloadAction getDownloadAction(@Nullable byte[] data, List<TrackKey> trackKeys) {
-    // TODO: Remove as soon as all usages have been updated to new getDownloadAction method.
-    return DownloadAction.createDownloadAction(
-        downloadType, uri, toStreamKeys(trackKeys), cacheKey, data);
+    return DownloadAction.createDownloadAction(downloadType, uri, streamKeys, cacheKey, data);
   }
 
   /**
@@ -344,12 +329,15 @@ public abstract class DownloadHelper<T> {
   protected abstract TrackGroupArray[] getTrackGroupArrays(T manifest);
 
   /**
-   * Converts a list of {@link TrackKey track keys} to {@link StreamKey stream keys}.
+   * Converts a track of a track group of a period to the corresponding {@link StreamKey}.
    *
-   * @param trackKeys A list of track keys.
-   * @return A corresponding list of stream keys.
+   * @param periodIndex The index of the containing period.
+   * @param trackGroupIndex The index of the containing track group within the period.
+   * @param trackIndexInTrackGroup The index of the track within the track group.
+   * @return The corresponding {@link StreamKey}.
    */
-  protected abstract List<StreamKey> toStreamKeys(List<TrackKey> trackKeys);
+  protected abstract StreamKey toStreamKey(
+      int periodIndex, int trackGroupIndex, int trackIndexInTrackGroup);
 
   @SuppressWarnings("unchecked")
   @EnsuresNonNull("trackSelectionsByPeriodAndRenderer")
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java
index 851a08c869..2ec14368ca 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java
@@ -19,8 +19,6 @@ import android.net.Uri;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.Renderer;
 import com.google.android.exoplayer2.source.TrackGroupArray;
-import java.util.Collections;
-import java.util.List;
 
 /** A {@link DownloadHelper} for progressive streams. */
 public final class ProgressiveDownloadHelper extends DownloadHelper<Void> {
@@ -61,7 +59,8 @@ public final class ProgressiveDownloadHelper extends DownloadHelper<Void> {
   }
 
   @Override
-  protected List<StreamKey> toStreamKeys(List<TrackKey> trackKeys) {
-    return Collections.emptyList();
+  protected StreamKey toStreamKey(
+      int periodIndex, int trackGroupIndex, int trackIndexInTrackGroup) {
+    return new StreamKey(periodIndex, trackGroupIndex, trackIndexInTrackGroup);
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/TrackKey.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/TrackKey.java
deleted file mode 100644
index 2dcc790d02..0000000000
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/TrackKey.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.offline;
-
-import android.support.annotation.Nullable;
-
-/**
- * Identifies a given track by the index of the containing period, the index of the containing group
- * within the period, and the index of the track within the group.
- */
-public final class TrackKey {
-
-  /** The period index. */
-  public final int periodIndex;
-  /** The group index. */
-  public final int groupIndex;
-  /** The track index. */
-  public final int trackIndex;
-
-  /**
-   * @param periodIndex The period index.
-   * @param groupIndex The group index.
-   * @param trackIndex The track index.
-   */
-  public TrackKey(int periodIndex, int groupIndex, int trackIndex) {
-    this.periodIndex = periodIndex;
-    this.groupIndex = groupIndex;
-    this.trackIndex = trackIndex;
-  }
-
-  @Override
-  public boolean equals(@Nullable Object other) {
-    if (this == other) {
-      return true;
-    }
-    if (other == null || getClass() != other.getClass()) {
-      return false;
-    }
-    TrackKey that = (TrackKey) other;
-    return periodIndex == that.periodIndex
-        && groupIndex == that.groupIndex
-        && trackIndex == that.trackIndex;
-  }
-
-  @Override
-  public int hashCode() {
-    return 31 * (31 * periodIndex + groupIndex) + trackIndex;
-  }
-}
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
index eb3ea767e3..5f287d8685 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.offline;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.Renderer;
@@ -50,8 +49,6 @@ public class DownloadHelperTest {
   private static final String TEST_DOWNLOAD_TYPE = "downloadType";
   private static final String TEST_CACHE_KEY = "cacheKey";
   private static final ManifestType TEST_MANIFEST = new ManifestType();
-  private static final List<StreamKey> testStreamKeys =
-      Arrays.asList(new StreamKey(0, 1, 2), new StreamKey(1, 3, 4));
 
   private static final Format VIDEO_FORMAT_LOW = createVideoFormat(/* bitrate= */ 200_000);
   private static final Format VIDEO_FORMAT_HIGH = createVideoFormat(/* bitrate= */ 800_000);
@@ -313,16 +310,15 @@ public class DownloadHelperTest {
     assertThat(downloadAction.customCacheKey).isEqualTo(TEST_CACHE_KEY);
     assertThat(downloadAction.isRemoveAction).isFalse();
     assertThat(downloadAction.data).isEqualTo(data);
-    assertThat(downloadAction.keys).isEqualTo(testStreamKeys);
-    assertThat(downloadHelper.lastCreatedTrackKeys)
+    assertThat(downloadAction.keys)
         .containsExactly(
-            new TrackKey(/* periodIndex= */ 0, /* groupIndex= */ 0, /* trackIndex= */ 0),
-            new TrackKey(/* periodIndex= */ 0, /* groupIndex= */ 0, /* trackIndex= */ 1),
-            new TrackKey(/* periodIndex= */ 0, /* groupIndex= */ 1, /* trackIndex= */ 0),
-            new TrackKey(/* periodIndex= */ 0, /* groupIndex= */ 2, /* trackIndex= */ 0),
-            new TrackKey(/* periodIndex= */ 0, /* groupIndex= */ 3, /* trackIndex= */ 0),
-            new TrackKey(/* periodIndex= */ 1, /* groupIndex= */ 0, /* trackIndex= */ 0),
-            new TrackKey(/* periodIndex= */ 1, /* groupIndex= */ 1, /* trackIndex= */ 0));
+            new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 0, /* trackIndex= */ 0),
+            new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 0, /* trackIndex= */ 1),
+            new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 1, /* trackIndex= */ 0),
+            new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 2, /* trackIndex= */ 0),
+            new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 3, /* trackIndex= */ 0),
+            new StreamKey(/* periodIndex= */ 1, /* groupIndex= */ 0, /* trackIndex= */ 0),
+            new StreamKey(/* periodIndex= */ 1, /* groupIndex= */ 1, /* trackIndex= */ 0));
   }
 
   @Test
@@ -419,8 +415,6 @@ public class DownloadHelperTest {
 
   private static final class FakeDownloadHelper extends DownloadHelper<ManifestType> {
 
-    @Nullable public List<TrackKey> lastCreatedTrackKeys;
-
     public FakeDownloadHelper(Uri testUri, RenderersFactory renderersFactory) {
       super(
           TEST_DOWNLOAD_TYPE,
@@ -443,9 +437,9 @@ public class DownloadHelperTest {
     }
 
     @Override
-    protected List<StreamKey> toStreamKeys(List<TrackKey> trackKeys) {
-      lastCreatedTrackKeys = trackKeys;
-      return testStreamKeys;
+    protected StreamKey toStreamKey(
+        int periodIndex, int trackGroupIndex, int trackIndexInTrackGroup) {
+      return new StreamKey(periodIndex, trackGroupIndex, trackIndexInTrackGroup);
     }
   }
 }
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java
index 81f791b98d..f86e47ed3d 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java
@@ -25,7 +25,6 @@ import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
-import com.google.android.exoplayer2.offline.TrackKey;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.source.dash.manifest.AdaptationSet;
@@ -36,7 +35,6 @@ import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.ParsingLoadable;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 
 /** A {@link DownloadHelper} for DASH streams. */
@@ -121,12 +119,8 @@ public final class DashDownloadHelper extends DownloadHelper<DashManifest> {
   }
 
   @Override
-  protected List<StreamKey> toStreamKeys(List<TrackKey> trackKeys) {
-    List<StreamKey> streamKeys = new ArrayList<>(trackKeys.size());
-    for (int i = 0; i < trackKeys.size(); i++) {
-      TrackKey trackKey = trackKeys.get(i);
-      streamKeys.add(new StreamKey(trackKey.periodIndex, trackKey.groupIndex, trackKey.trackIndex));
-    }
-    return streamKeys;
+  protected StreamKey toStreamKey(
+      int periodIndex, int trackGroupIndex, int trackIndexInTrackGroup) {
+    return new StreamKey(periodIndex, trackGroupIndex, trackIndexInTrackGroup);
   }
 }
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java
index 1f704a1e08..e0f55aa738 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java
@@ -25,7 +25,6 @@ import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
-import com.google.android.exoplayer2.offline.TrackKey;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist;
@@ -37,7 +36,6 @@ import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.ParsingLoadable;
 import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -110,7 +108,7 @@ public final class HlsDownloadHelper extends DownloadHelper<HlsPlaylist> {
       renditionGroups = new int[0];
       return new TrackGroupArray[] {TrackGroupArray.EMPTY};
     }
-    // TODO: Generate track groups as in playback. Reverse the mapping in getDownloadAction.
+    // TODO: Generate track groups as in playback. Reverse the mapping in toStreamKey.
     HlsMasterPlaylist masterPlaylist = (HlsMasterPlaylist) playlist;
     TrackGroup[] trackGroups = new TrackGroup[3];
     renditionGroups = new int[3];
@@ -131,14 +129,9 @@ public final class HlsDownloadHelper extends DownloadHelper<HlsPlaylist> {
   }
 
   @Override
-  protected List<StreamKey> toStreamKeys(List<TrackKey> trackKeys) {
-    List<StreamKey> representationKeys = new ArrayList<>(trackKeys.size());
-    for (int i = 0; i < trackKeys.size(); i++) {
-      TrackKey trackKey = trackKeys.get(i);
-      representationKeys.add(
-          new StreamKey(renditionGroups[trackKey.groupIndex], trackKey.trackIndex));
-    }
-    return representationKeys;
+  protected StreamKey toStreamKey(
+      int periodIndex, int trackGroupIndex, int trackIndexInTrackGroup) {
+    return new StreamKey(renditionGroups[trackGroupIndex], trackIndexInTrackGroup);
   }
 
   private static Format[] toFormats(List<HlsMasterPlaylist.HlsUrl> hlsUrls) {
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java
index 58393c26e8..b17768f202 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java
@@ -24,7 +24,6 @@ import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
-import com.google.android.exoplayer2.offline.TrackKey;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest;
@@ -34,8 +33,6 @@ import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.ParsingLoadable;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
 /** A {@link DownloadHelper} for SmoothStreaming streams. */
 public final class SsDownloadHelper extends DownloadHelper<SsManifest> {
@@ -109,12 +106,8 @@ public final class SsDownloadHelper extends DownloadHelper<SsManifest> {
   }
 
   @Override
-  protected List<StreamKey> toStreamKeys(List<TrackKey> trackKeys) {
-    List<StreamKey> representationKeys = new ArrayList<>(trackKeys.size());
-    for (int i = 0; i < trackKeys.size(); i++) {
-      TrackKey trackKey = trackKeys.get(i);
-      representationKeys.add(new StreamKey(trackKey.groupIndex, trackKey.trackIndex));
-    }
-    return representationKeys;
+  protected StreamKey toStreamKey(
+      int periodIndex, int trackGroupIndex, int trackIndexInTrackGroup) {
+    return new StreamKey(trackGroupIndex, trackIndexInTrackGroup);
   }
 }

From 7d21154b6284db388b4a2f86e2e617dd5c0f3933 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 12 Dec 2018 13:56:21 +0000
Subject: [PATCH 304/832] Fix release notes

PiperOrigin-RevId: 225170404
---
 RELEASENOTES.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 7b5b503168..ddf841c48b 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -76,10 +76,10 @@
 * DASH: Parse ProgramInformation element if present in the manifest.
 * HLS:
   * Add constructor to `DefaultHlsExtractorFactory` for adding TS payload
-    reader factory flags.
+    reader factory flags
+    ([#4861](https://github.com/google/ExoPlayer/issues/4861)).
   * Fix bug in segment sniffing
     ([#5039](https://github.com/google/ExoPlayer/issues/5039)).
-  ([#4861](https://github.com/google/ExoPlayer/issues/4861)).
 * SubRip: Add support for alignment tags, and remove tags from the displayed
   captions ([#4306](https://github.com/google/ExoPlayer/issues/4306)).
 * Fix issue with blind seeking to windows with non-zero offset in a

From 044066f4b12f41bb6db8cee7ffae444fe5530a7d Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 13 Dec 2018 11:23:55 +0000
Subject: [PATCH 305/832] Add 4K Bravia to output surface workaroud

PiperOrigin-RevId: 225344232
---
 .../google/android/exoplayer2/video/MediaCodecVideoRenderer.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index 0ca5f0eaa5..440bb2fa36 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -1348,6 +1348,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
             case "Aura_Note_2":
             case "BLACK-1X":
             case "BRAVIA_ATV2":
+            case "BRAVIA_ATV3_4K":
             case "C1":
             case "ComioS1":
             case "CP8676_I02":

From 41f76bdb53e5ba82771f30ca643298036df7eb69 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Thu, 13 Dec 2018 13:36:59 +0000
Subject: [PATCH 306/832] Convert DownloadState id to String

For now this id can not be set by client but auto generated using
content cache key and uri.

PiperOrigin-RevId: 225356645
---
 .../exoplayer2/demo/DemoDownloadService.java  |  8 +++--
 .../exoplayer2/offline/DownloadAction.java    | 11 ++++---
 .../exoplayer2/offline/DownloadManager.java   | 33 +++++++++----------
 .../offline/DownloadManagerTest.java          | 21 +++++-------
 .../testutil/TestDownloadManagerListener.java |  6 ++--
 5 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
index 9671999bb2..adb0ae95ca 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
@@ -31,12 +31,15 @@ public class DemoDownloadService extends DownloadService {
   private static final int JOB_ID = 1;
   private static final int FOREGROUND_NOTIFICATION_ID = 1;
 
+  private static int nextNotificationId = FOREGROUND_NOTIFICATION_ID + 1;
+
   public DemoDownloadService() {
     super(
         FOREGROUND_NOTIFICATION_ID,
         DEFAULT_FOREGROUND_NOTIFICATION_UPDATE_INTERVAL,
         CHANNEL_ID,
         R.string.exo_download_notification_channel_name);
+    nextNotificationId = FOREGROUND_NOTIFICATION_ID + 1;
   }
 
   @Override
@@ -82,8 +85,9 @@ public class DemoDownloadService extends DownloadService {
               CHANNEL_ID,
               /* contentIntent= */ null,
               Util.fromUtf8Bytes(downloadState.action.data));
+    } else {
+      return;
     }
-    int notificationId = FOREGROUND_NOTIFICATION_ID + 1 + downloadState.id;
-    NotificationUtil.setNotification(this, notificationId, notification);
+    NotificationUtil.setNotification(this, nextNotificationId++, notification);
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
index 2c7b5069b9..be3f8a503d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
@@ -108,6 +108,8 @@ public final class DownloadAction {
         /* data= */ null);
   }
 
+  /** The unique content id. */
+  public final String id;
   /** The type of the action. */
   public final String type;
   /** The uri being downloaded or removed. */
@@ -140,6 +142,7 @@ public final class DownloadAction {
       List<StreamKey> keys,
       @Nullable String customCacheKey,
       @Nullable byte[] data) {
+    this.id = customCacheKey != null ? customCacheKey : uri.toString();
     this.type = type;
     this.uri = uri;
     this.isRemoveAction = isRemoveAction;
@@ -171,9 +174,7 @@ public final class DownloadAction {
 
   /** Returns whether this is an action for the same media as the {@code other}. */
   public boolean isSameMedia(DownloadAction other) {
-    return customCacheKey == null
-        ? other.customCacheKey == null && uri.equals(other.uri)
-        : customCacheKey.equals(other.customCacheKey);
+    return id.equals(other.id);
   }
 
   /** Returns keys of tracks to be downloaded. */
@@ -187,7 +188,8 @@ public final class DownloadAction {
       return false;
     }
     DownloadAction that = (DownloadAction) o;
-    return type.equals(that.type)
+    return id.equals(that.id)
+        && type.equals(that.type)
         && uri.equals(that.uri)
         && isRemoveAction == that.isRemoveAction
         && keys.equals(that.keys)
@@ -198,6 +200,7 @@ public final class DownloadAction {
   @Override
   public final int hashCode() {
     int result = type.hashCode();
+    result = 31 * result + id.hashCode();
     result = 31 * result + uri.hashCode();
     result = 31 * result + (isRemoveAction ? 1 : 0);
     result = 31 * result + keys.hashCode();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 9c6f0893fe..89aed9f010 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -94,7 +94,6 @@ public final class DownloadManager {
   private final Handler fileIOHandler;
   private final CopyOnWriteArraySet<Listener> listeners;
 
-  private int nextDownloadId;
   private boolean initialized;
   private boolean released;
   private boolean downloadsStopped;
@@ -192,9 +191,8 @@ public final class DownloadManager {
    * Handles the given action.
    *
    * @param action The action to be executed.
-   * @return The id of the newly created or the existing download.
    */
-  public int handleAction(DownloadAction action) {
+  public void handleAction(DownloadAction action) {
     Assertions.checkState(!released);
     Download download = getDownloadForAction(action);
     if (initialized) {
@@ -207,7 +205,6 @@ public final class DownloadManager {
         notifyListenersDownloadStateChange(download);
       }
     }
-    return download.id;
   }
 
   /** Returns the number of downloads. */
@@ -216,13 +213,18 @@ public final class DownloadManager {
     return downloads.size();
   }
 
-  /** Returns the state of a download, or null if no such download exists */
+  /**
+   * Returns {@link DownloadState} for the given content id, or null if no such download exists.
+   *
+   * @param id The unique content id.
+   * @return DownloadState for the given content id, or null if no such download exists.
+   */
   @Nullable
-  public DownloadState getDownloadState(int downloadId) {
+  public DownloadState getDownloadState(String id) {
     Assertions.checkState(!released);
     for (int i = 0; i < downloads.size(); i++) {
       Download download = downloads.get(i);
-      if (download.id == downloadId) {
+      if (download.id.equals(id)) {
         return download.getDownloadState();
       }
     }
@@ -288,8 +290,7 @@ public final class DownloadManager {
         return download;
       }
     }
-    Download download =
-        new Download(nextDownloadId++, this, downloaderFactory, action, minRetryCount);
+    Download download = new Download(this, downloaderFactory, action, minRetryCount);
     downloads.add(download);
     logd("Download is added", download);
     return download;
@@ -501,8 +502,8 @@ public final class DownloadManager {
       }
     }
 
-    /** The unique download id. */
-    public final int id;
+    /** The unique content id. */
+    public final String id;
     /** The action being executed. */
     public final DownloadAction action;
     /** The state of the download. */
@@ -524,7 +525,6 @@ public final class DownloadManager {
     @FailureReason public final int failureReason;
 
     private DownloadState(
-        int id,
         DownloadAction action,
         @State int state,
         float downloadPercentage,
@@ -533,7 +533,7 @@ public final class DownloadManager {
         @FailureReason int failureReason) {
       Assertions.checkState(
           failureReason == FAILURE_REASON_NONE ? state != STATE_FAILED : state == STATE_FAILED);
-      this.id = id;
+      this.id = action.id;
       this.action = action;
       this.state = state;
       this.downloadPercentage = downloadPercentage;
@@ -552,7 +552,7 @@ public final class DownloadManager {
     @IntDef({STATE_QUEUED, STATE_COMPLETED})
     public @interface TargetState {}
 
-    private final int id;
+    private final String id;
     private final DownloadManager downloadManager;
     private final DownloaderFactory downloaderFactory;
     private final int minRetryCount;
@@ -571,12 +571,11 @@ public final class DownloadManager {
     @MonotonicNonNull @DownloadState.FailureReason private int failureReason;
 
     private Download(
-        int id,
         DownloadManager downloadManager,
         DownloaderFactory downloaderFactory,
         DownloadAction action,
         int minRetryCount) {
-      this.id = id;
+      this.id = action.id;
       this.downloadManager = downloadManager;
       this.downloaderFactory = downloaderFactory;
       this.action = action;
@@ -615,7 +614,7 @@ public final class DownloadManager {
         totalBytes = downloader.getTotalBytes();
       }
       return new DownloadState(
-          id, action, state, downloadPercentage, downloadedBytes, totalBytes, failureReason);
+          action, state, downloadPercentage, downloadedBytes, totalBytes, failureReason);
     }
 
     /** Returns whether the download is finished. */
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index db498a84cf..e7d54b4141 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -33,7 +33,6 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -374,8 +373,8 @@ public class DownloadManagerTest {
     DownloadState[] states = downloadManager.getAllDownloadStates();
 
     assertThat(states).hasLength(3);
-    int[] taskIds = {task1.taskId, task2.taskId, task3.taskId};
-    int[] stateTaskIds = {states[0].id, states[1].id, states[2].id};
+    String[] taskIds = {task1.taskId, task2.taskId, task3.taskId};
+    String[] stateTaskIds = {states[0].id, states[1].id, states[2].id};
     assertThat(stateTaskIds).isEqualTo(taskIds);
   }
 
@@ -471,13 +470,11 @@ public class DownloadManagerTest {
     }
 
     private DownloadRunner postAction(DownloadAction action) {
-      AtomicInteger taskIdHolder = new AtomicInteger();
-      runOnMainThread(() -> taskIdHolder.set(downloadManager.handleAction(action)));
-      int taskId = taskIdHolder.get();
+      runOnMainThread(() -> downloadManager.handleAction(action));
       if (taskWrapper == null) {
-        taskWrapper = new TaskWrapper(taskId);
+        taskWrapper = new TaskWrapper(action.id);
       } else {
-        assertThat(taskId).isEqualTo(taskWrapper.taskId);
+        assertThat(action.id).isEqualTo(taskWrapper.taskId);
       }
       return this;
     }
@@ -515,9 +512,9 @@ public class DownloadManagerTest {
   }
 
   private final class TaskWrapper {
-    private final int taskId;
+    private final String taskId;
 
-    private TaskWrapper(int taskId) {
+    private TaskWrapper(String taskId) {
       this.taskId = taskId;
     }
 
@@ -559,12 +556,12 @@ public class DownloadManagerTest {
       if (o == null || getClass() != o.getClass()) {
         return false;
       }
-      return taskId == ((TaskWrapper) o).taskId;
+      return taskId.equals(((TaskWrapper) o).taskId);
     }
 
     @Override
     public int hashCode() {
-      return taskId;
+      return taskId.hashCode();
     }
   }
 
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
index 3d939c8207..e7b850d52b 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
@@ -31,7 +31,7 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
 
   private final DownloadManager downloadManager;
   private final DummyMainThread dummyMainThread;
-  private final HashMap<Integer, ArrayBlockingQueue<Integer>> actionStates;
+  private final HashMap<String, ArrayBlockingQueue<Integer>> actionStates;
 
   private CountDownLatch downloadFinishedCondition;
   @DownloadState.FailureReason private int failureReason;
@@ -43,7 +43,7 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
     actionStates = new HashMap<>();
   }
 
-  public Integer pollStateChange(int taskId, long timeoutMs) throws InterruptedException {
+  public Integer pollStateChange(String taskId, long timeoutMs) throws InterruptedException {
     return getStateQueue(taskId).poll(timeoutMs, TimeUnit.MILLISECONDS);
   }
 
@@ -96,7 +96,7 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
     assertThat(downloadFinishedCondition.await(TIMEOUT, TimeUnit.MILLISECONDS)).isTrue();
   }
 
-  private ArrayBlockingQueue<Integer> getStateQueue(int taskId) {
+  private ArrayBlockingQueue<Integer> getStateQueue(String taskId) {
     synchronized (actionStates) {
       if (!actionStates.containsKey(taskId)) {
         actionStates.put(taskId, new ArrayBlockingQueue<>(10));

From 36f2bead16254d2f1ead9d138825b73525e432f2 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 13 Dec 2018 14:16:18 +0000
Subject: [PATCH 307/832] Clarify StreamKey documentation.

StreamKey makes only sense in the context of a specific manifest type and its only
used for manifest filtering.

PiperOrigin-RevId: 225360357
---
 .../android/exoplayer2/offline/DownloadAction.java   | 12 ++++++------
 .../google/android/exoplayer2/offline/StreamKey.java |  7 +++++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
index be3f8a503d..d809ab4754 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
@@ -77,7 +77,7 @@ public final class DownloadAction {
    *
    * @param type The type of the action.
    * @param uri The URI of the media to be downloaded.
-   * @param keys Keys of tracks to be downloaded. If empty, all tracks will be downloaded.
+   * @param keys Keys of streams to be downloaded. If empty, all streams will be downloaded.
    * @param customCacheKey A custom key for cache indexing, or null.
    * @param data Optional custom data for this action. If {@code null} an empty array will be used.
    */
@@ -117,8 +117,8 @@ public final class DownloadAction {
   /** Whether this is a remove action. If false, this is a download action. */
   public final boolean isRemoveAction;
   /**
-   * Keys of tracks to be downloaded. If empty, all tracks will be downloaded. Empty if this action
-   * is a remove action.
+   * Keys of streams to be downloaded. If empty, all streams will be downloaded. Empty if this
+   * action is a remove action.
    */
   public final List<StreamKey> keys;
   /** A custom key for cache indexing, or null. */
@@ -130,8 +130,8 @@ public final class DownloadAction {
    * @param type The type of the action.
    * @param uri The uri being downloaded or removed.
    * @param isRemoveAction Whether this is a remove action. If false, this is a download action.
-   * @param keys Keys of tracks to be downloaded. If empty, all tracks will be downloaded. Empty if
-   *     this action is a remove action.
+   * @param keys Keys of streams to be downloaded. If empty, all streams will be downloaded. Empty
+   *     if this action is a remove action.
    * @param customCacheKey A custom key for cache indexing, or null.
    * @param data Custom data for this action. Null if this action is a remove action.
    */
@@ -177,7 +177,7 @@ public final class DownloadAction {
     return id.equals(other.id);
   }
 
-  /** Returns keys of tracks to be downloaded. */
+  /** Returns keys of streams to be downloaded. */
   public List<StreamKey> getKeys() {
     return keys;
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/StreamKey.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/StreamKey.java
index 838073cd99..9d51f42979 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/StreamKey.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/StreamKey.java
@@ -19,8 +19,11 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 /**
- * Identifies a given track by the index of the containing period, the index of the containing group
- * within the period, and the index of the track within the group.
+ * Identifies a stream in a {@link FilterableManifest} by the index of the containing period, the
+ * index of the containing group within the period, and the index of the track within the group.
+ *
+ * <p>Note that the interpretation of period, group and index depends on the type of manifest being
+ * filtered.
  */
 public final class StreamKey implements Comparable<StreamKey> {
 

From 383df3f0c311d2ab8658162918e77331fe82bdf4 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Thu, 13 Dec 2018 14:51:10 +0000
Subject: [PATCH 308/832] Add start and update time fields to DownloadState

PiperOrigin-RevId: 225363788
---
 .../exoplayer2/offline/DownloadManager.java   | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 89aed9f010..997f4e09a2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -508,15 +508,16 @@ public final class DownloadManager {
     public final DownloadAction action;
     /** The state of the download. */
     public final @State int state;
-
-    /**
-     * The estimated download percentage, or {@link C#PERCENTAGE_UNSET} if no estimate is available.
-     */
+    /** The estimated download percentage, or {@link C#PERCENTAGE_UNSET} if unavailable. */
     public final float downloadPercentage;
     /** The total number of downloaded bytes. */
     public final long downloadedBytes;
     /** The total size of the media, or {@link C#LENGTH_UNSET} if unknown. */
     public final long totalBytes;
+    /** The first time when download entry is created. */
+    public final long startTimeMs;
+    /** The last update time. */
+    public final long updateTimeMs;
 
     /**
      * If {@link #state} is {@link #STATE_FAILED} then this is the cause, otherwise {@link
@@ -530,7 +531,8 @@ public final class DownloadManager {
         float downloadPercentage,
         long downloadedBytes,
         long totalBytes,
-        @FailureReason int failureReason) {
+        @FailureReason int failureReason,
+        long startTimeMs) {
       Assertions.checkState(
           failureReason == FAILURE_REASON_NONE ? state != STATE_FAILED : state == STATE_FAILED);
       this.id = action.id;
@@ -540,6 +542,8 @@ public final class DownloadManager {
       this.downloadedBytes = downloadedBytes;
       this.totalBytes = totalBytes;
       this.failureReason = failureReason;
+      this.startTimeMs = startTimeMs;
+      updateTimeMs = System.currentTimeMillis();
     }
 
   }
@@ -556,6 +560,7 @@ public final class DownloadManager {
     private final DownloadManager downloadManager;
     private final DownloaderFactory downloaderFactory;
     private final int minRetryCount;
+    private final long startTimeMs;
     private final ArrayDeque<DownloadAction> actionQueue;
     private DownloadAction action;
     /** The current state of the download. */
@@ -580,6 +585,7 @@ public final class DownloadManager {
       this.downloaderFactory = downloaderFactory;
       this.action = action;
       this.minRetryCount = minRetryCount;
+      this.startTimeMs = System.currentTimeMillis();
       state = STATE_QUEUED;
       targetState = STATE_COMPLETED;
       actionQueue = new ArrayDeque<>();
@@ -614,7 +620,13 @@ public final class DownloadManager {
         totalBytes = downloader.getTotalBytes();
       }
       return new DownloadState(
-          action, state, downloadPercentage, downloadedBytes, totalBytes, failureReason);
+          action,
+          state,
+          downloadPercentage,
+          downloadedBytes,
+          totalBytes,
+          failureReason,
+          startTimeMs);
     }
 
     /** Returns whether the download is finished. */

From 9c4258fef94f853b728232c57863cab041b7ba97 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 13 Dec 2018 16:17:14 +0000
Subject: [PATCH 309/832] Clarify that the shutter can prevent flicker

PiperOrigin-RevId: 225374071
---
 .../java/com/google/android/exoplayer2/ui/PlayerView.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
index e000ca3162..2b35c8d50c 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
@@ -186,8 +186,9 @@ import java.util.List;
  *         <li>Type: {@link AspectRatioFrameLayout}
  *       </ul>
  *   <li><b>{@code exo_shutter}</b> - A view that's made visible when video should be hidden. This
- *       view is typically an opaque view that covers the video surface view, thereby obscuring it
- *       when visible.
+ *       view is typically an opaque view that covers the video surface, thereby obscuring it when
+ *       visible. Obscuring the surface in this way also helps to prevent flicker at the start of
+ *       playback when {@code surface_type="surface_view"}
  *       <ul>
  *         <li>Type: {@link View}
  *       </ul>

From 9ed2a393b0612fd152608b9f5eebde1ca1f52d8e Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 13 Dec 2018 16:40:42 +0000
Subject: [PATCH 310/832] Add FilterableMediaPeriod interface and
 SmoothStreaming implementation.

This interface allows to put the mapping from tracks to StreamKeys in the same place
where we map manifest to tracks.

PiperOrigin-RevId: 225377033
---
 .../android/exoplayer2/offline/StreamKey.java |  8 +++---
 .../exoplayer2/source/MediaPeriod.java        | 19 ++++++++++++++
 .../source/smoothstreaming/SsMediaPeriod.java | 25 +++++++++++++------
 3 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/StreamKey.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/StreamKey.java
index 9d51f42979..1caeaca61e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/StreamKey.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/StreamKey.java
@@ -19,11 +19,11 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 /**
- * Identifies a stream in a {@link FilterableManifest} by the index of the containing period, the
- * index of the containing group within the period, and the index of the track within the group.
+ * A key for a subset of media which can be separately loaded (a "stream").
  *
- * <p>Note that the interpretation of period, group and index depends on the type of manifest being
- * filtered.
+ * <p>The stream key consists of a period index, a group index within the period and a track index
+ * within the group. The interpretation of these indices depends on the type of media for which the
+ * stream key is used.
  */
 public final class StreamKey implements Comparable<StreamKey> {
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java
index b7f5a07b60..532131ba7d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java
@@ -19,8 +19,11 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.SeekParameters;
 import com.google.android.exoplayer2.Timeline;
+import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
 import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
 import org.checkerframework.checker.nullness.compatqual.NullableType;
 
 /**
@@ -83,6 +86,22 @@ public interface MediaPeriod extends SequenceableLoader {
    */
   TrackGroupArray getTrackGroups();
 
+  /**
+   * Returns a list of {@link StreamKey stream keys} which allow to filter the media in this period
+   * to load only the parts needed to play the provided {@link TrackSelection}.
+   *
+   * <p>This method is only called after the period has been prepared.
+   *
+   * @param trackSelection The {@link TrackSelection} describing the tracks for which stream keys
+   *     are requested.
+   * @return The corresponding {@link StreamKey stream keys} for the selected tracks, or an empty
+   *     list if filtering is not possible and the entire media needs to be loaded to play the
+   *     selected tracks.
+   */
+  default List<StreamKey> getStreamKeys(TrackSelection trackSelection) {
+    return Collections.emptyList();
+  }
+
   /**
    * Performs a track selection.
    *
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java
index 14b54bc471..fc22c45c5a 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java
@@ -20,6 +20,7 @@ import android.util.Base64;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.SeekParameters;
 import com.google.android.exoplayer2.extractor.mp4.TrackEncryptionBox;
+import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.source.CompositeSequenceableLoaderFactory;
 import com.google.android.exoplayer2.source.MediaPeriod;
 import com.google.android.exoplayer2.source.MediaSourceEventListener.EventDispatcher;
@@ -37,12 +38,11 @@ import com.google.android.exoplayer2.upstream.LoaderErrorThrower;
 import com.google.android.exoplayer2.upstream.TransferListener;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.List;
 
-/**
- * A SmoothStreaming {@link MediaPeriod}.
- */
-/* package */ final class SsMediaPeriod implements MediaPeriod,
-    SequenceableLoader.Callback<ChunkSampleStream<SsChunkSource>> {
+/** A SmoothStreaming {@link MediaPeriod}. */
+/* package */ final class SsMediaPeriod
+    implements MediaPeriod, SequenceableLoader.Callback<ChunkSampleStream<SsChunkSource>> {
 
   private static final int INITIALIZATION_VECTOR_SIZE = 8;
 
@@ -112,6 +112,8 @@ import java.util.ArrayList;
     eventDispatcher.mediaPeriodReleased();
   }
 
+  // MediaPeriod implementation.
+
   @Override
   public void prepare(Callback callback, long positionUs) {
     this.callback = callback;
@@ -157,6 +159,16 @@ import java.util.ArrayList;
     return positionUs;
   }
 
+  @Override
+  public List<StreamKey> getStreamKeys(TrackSelection trackSelection) {
+    List<StreamKey> streamKeys = new ArrayList<>(trackSelection.length());
+    int streamElementIndex = trackGroups.indexOf(trackSelection.getTrackGroup());
+    for (int i = 0; i < trackSelection.length(); i++) {
+      streamKeys.add(new StreamKey(streamElementIndex, trackSelection.getIndexInTrackGroup(i)));
+    }
+    return streamKeys;
+  }
+
   @Override
   public void discardBuffer(long positionUs, boolean toKeyframe) {
     for (ChunkSampleStream<SsChunkSource> sampleStream : sampleStreams) {
@@ -211,7 +223,7 @@ import java.util.ArrayList;
     return positionUs;
   }
 
-  // SequenceableLoader.Callback implementation
+  // SequenceableLoader.Callback implementation.
 
   @Override
   public void onContinueLoadingRequested(ChunkSampleStream<SsChunkSource> sampleStream) {
@@ -277,5 +289,4 @@ import java.util.ArrayList;
     data[firstPosition] = data[secondPosition];
     data[secondPosition] = temp;
   }
-
 }

From c2c5e560e99de66b735a6bc5243ae0840c70c350 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 13 Dec 2018 16:58:39 +0000
Subject: [PATCH 311/832] Add missing ..

PiperOrigin-RevId: 225379305
---
 .../main/java/com/google/android/exoplayer2/ui/PlayerView.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
index 2b35c8d50c..1adc557142 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
@@ -188,7 +188,7 @@ import java.util.List;
  *   <li><b>{@code exo_shutter}</b> - A view that's made visible when video should be hidden. This
  *       view is typically an opaque view that covers the video surface, thereby obscuring it when
  *       visible. Obscuring the surface in this way also helps to prevent flicker at the start of
- *       playback when {@code surface_type="surface_view"}
+ *       playback when {@code surface_type="surface_view"}.
  *       <ul>
  *         <li>Type: {@link View}
  *       </ul>

From 03d6f1370b4191f9998f79867813bbeb56bcc2aa Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 13 Dec 2018 17:25:43 +0000
Subject: [PATCH 312/832] Add Nexus Player to output surface workaround

PiperOrigin-RevId: 225383173
---
 .../google/android/exoplayer2/video/MediaCodecVideoRenderer.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index 440bb2fa36..49f6be9763 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -1371,6 +1371,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
             case "F3215":
             case "F3311":
             case "flo":
+            case "fugu":
             case "GiONEE_CBL7513":
             case "GiONEE_GBL7319":
             case "GIONEE_GBL7360":

From 845f54a46741a19e086b5c83b7497ea6d2ee50ad Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 13 Dec 2018 17:26:01 +0000
Subject: [PATCH 313/832] Remove Cache.[get|set]ContentLength

Problem: There is nothing in the Cache interface that enforces that
these methods are implemented by reading/writing content metadata,
however our own code (CacheDataSource) relies on this property since
it mixes use of [get|set]ContentLength and use of metadata. Using
metadata is the right approach because it minimizes the number of
index writes (e.g. it allows the redirect URI and the content length
to be committed by a single write).

Solution: Remove [get|set]ContentLength, which are redundant anyway,
and use metadata everywhere. Also expose the keys being used through
the public API; there's no particular reason why they shouldn't be.
We previously had an API for getting and setting content length, but
no API for getting and setting redirect uri.
PiperOrigin-RevId: 225383211
---
 .../exoplayer2/upstream/cache/Cache.java      | 21 +-----
 .../upstream/cache/CacheDataSource.java       | 19 +++---
 .../exoplayer2/upstream/cache/CacheUtil.java  | 10 ++-
 .../upstream/cache/CachedContent.java         |  4 +-
 .../upstream/cache/ContentMetadata.java       | 53 +++++++++++----
 .../cache/ContentMetadataInternal.java        | 66 -------------------
 .../cache/ContentMetadataMutations.java       | 41 ++++++++++--
 .../cache/DefaultContentMetadata.java         | 42 +++++++-----
 .../upstream/cache/SimpleCache.java           | 14 +---
 .../upstream/cache/CacheDataSourceTest.java   | 10 ++-
 .../upstream/cache/CacheUtilTest.java         |  7 +-
 .../cache/CachedContentIndexTest.java         | 16 ++---
 .../upstream/cache/SimpleCacheTest.java       | 26 +++++---
 13 files changed, 160 insertions(+), 169 deletions(-)
 delete mode 100644 library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadataInternal.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
index b5b5dc64e6..8641746c74 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
@@ -62,7 +62,7 @@ public interface Cache {
     void onSpanTouched(Cache cache, CacheSpan oldSpan, CacheSpan newSpan);
 
   }
-  
+
   /**
    * Thrown when an error is encountered when writing data.
    */
@@ -223,25 +223,6 @@ public interface Cache {
    */
   long getCachedLength(String key, long position, long length);
 
-  /**
-   * Sets the content length for the given key.
-   *
-   * @param key The cache key for the data.
-   * @param length The length of the data.
-   * @throws CacheException If an error is encountered.
-   */
-  void setContentLength(String key, long length) throws CacheException;
-
-  /**
-   * Returns the content length for the given key if one set, or {@link
-   * com.google.android.exoplayer2.C#LENGTH_UNSET} otherwise.
-   *
-   * @param key The cache key for the data.
-   * @return The content length for the given key if one set, or {@link
-   *     com.google.android.exoplayer2.C#LENGTH_UNSET} otherwise.
-   */
-  long getContentLength(String key);
-
   /**
    * Applies {@code mutations} to the {@link ContentMetadata} for the given key. A new {@link
    * CachedContent} is added if there isn't one already with the given key.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
index 757f2892ae..1b4b28d67e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
@@ -299,7 +299,7 @@ public final class CacheDataSource implements DataSource {
       if (dataSpec.length != C.LENGTH_UNSET || currentRequestIgnoresCache) {
         bytesRemaining = dataSpec.length;
       } else {
-        bytesRemaining = cache.getContentLength(key);
+        bytesRemaining = ContentMetadata.getContentLength(cache.getContentMetadata(key));
         if (bytesRemaining != C.LENGTH_UNSET) {
           bytesRemaining -= dataSpec.position;
           if (bytesRemaining <= 0) {
@@ -484,16 +484,12 @@ public final class CacheDataSource implements DataSource {
     ContentMetadataMutations mutations = new ContentMetadataMutations();
     if (currentDataSpecLengthUnset && resolvedLength != C.LENGTH_UNSET) {
       bytesRemaining = resolvedLength;
-      ContentMetadataInternal.setContentLength(mutations, readPosition + bytesRemaining);
+      ContentMetadataMutations.setContentLength(mutations, readPosition + bytesRemaining);
     }
     if (isReadingFromUpstream()) {
       actualUri = currentDataSource.getUri();
       boolean isRedirected = !uri.equals(actualUri);
-      if (isRedirected) {
-        ContentMetadataInternal.setRedirectedUri(mutations, actualUri);
-      } else {
-        ContentMetadataInternal.removeRedirectedUri(mutations);
-      }
+      ContentMetadataMutations.setRedirectedUri(mutations, isRedirected ? actualUri : null);
     }
     if (isWritingToCache()) {
       cache.applyContentMetadataMutations(key, mutations);
@@ -503,14 +499,15 @@ public final class CacheDataSource implements DataSource {
   private void setNoBytesRemainingAndMaybeStoreLength() throws IOException {
     bytesRemaining = 0;
     if (isWritingToCache()) {
-      cache.setContentLength(key, readPosition);
+      ContentMetadataMutations mutations = new ContentMetadataMutations();
+      ContentMetadataMutations.setContentLength(mutations, readPosition);
+      cache.applyContentMetadataMutations(key, mutations);
     }
   }
 
   private static Uri getRedirectedUriOrDefault(Cache cache, String key, Uri defaultUri) {
-    ContentMetadata contentMetadata = cache.getContentMetadata(key);
-    Uri redirectedUri = ContentMetadataInternal.getRedirectedUri(contentMetadata);
-    return redirectedUri == null ? defaultUri : redirectedUri;
+    Uri redirectedUri = ContentMetadata.getRedirectedUri(cache.getContentMetadata(key));
+    return redirectedUri != null ? redirectedUri : defaultUri;
   }
 
   private static boolean isCausedByPositionOutOfRange(IOException e) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
index fd4937ef86..9714df6ad0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
@@ -84,7 +84,10 @@ public final class CacheUtil {
       CachingCounters counters) {
     String key = buildCacheKey(dataSpec, cacheKeyFactory);
     long start = dataSpec.absoluteStreamPosition;
-    long left = dataSpec.length != C.LENGTH_UNSET ? dataSpec.length : cache.getContentLength(key);
+    long left =
+        dataSpec.length != C.LENGTH_UNSET
+            ? dataSpec.length
+            : ContentMetadata.getContentLength(cache.getContentMetadata(key));
     counters.contentLength = left;
     counters.alreadyCachedBytes = 0;
     counters.newlyCachedBytes = 0;
@@ -188,7 +191,10 @@ public final class CacheUtil {
 
     String key = buildCacheKey(dataSpec, cacheKeyFactory);
     long start = dataSpec.absoluteStreamPosition;
-    long left = dataSpec.length != C.LENGTH_UNSET ? dataSpec.length : cache.getContentLength(key);
+    long left =
+        dataSpec.length != C.LENGTH_UNSET
+            ? dataSpec.length
+            : ContentMetadata.getContentLength(cache.getContentMetadata(key));
     while (left != 0) {
       throwExceptionIfInterruptedOrCancelled(isCanceled);
       long blockLength =
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java
index 4d15de5932..5494454d54 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java
@@ -55,7 +55,7 @@ import java.util.TreeSet;
     if (version < VERSION_METADATA_INTRODUCED) {
       long length = input.readLong();
       ContentMetadataMutations mutations = new ContentMetadataMutations();
-      ContentMetadataInternal.setContentLength(mutations, length);
+      ContentMetadataMutations.setContentLength(mutations, length);
       cachedContent.applyMetadataMutations(mutations);
     } else {
       cachedContent.metadata = DefaultContentMetadata.readFromStream(input);
@@ -216,7 +216,7 @@ import java.util.TreeSet;
     int result = id;
     result = 31 * result + key.hashCode();
     if (version < VERSION_METADATA_INTRODUCED) {
-      long length = ContentMetadataInternal.getContentLength(metadata);
+      long length = ContentMetadata.getContentLength(metadata);
       result = 31 * result + (int) (length ^ (length >>> 32));
     } else {
       result = 31 * result + metadata.hashCode();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadata.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadata.java
index aacd11f915..f0075343ad 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadata.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadata.java
@@ -15,44 +15,73 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
+import android.net.Uri;
+import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.C;
+
 /**
  * Interface for an immutable snapshot of keyed metadata.
- *
- * <p>Internal metadata names are prefixed with {@value #INTERNAL_METADATA_NAME_PREFIX}. Custom
- * metadata names should avoid this prefix to prevent clashes.
  */
 public interface ContentMetadata {
 
-  /** Prefix of internal metadata names. */
-  String INTERNAL_METADATA_NAME_PREFIX = "exo_";
+  /**
+   * Prefix for custom metadata keys. Applications can use keys starting with this prefix without
+   * any risk of their keys colliding with ones defined by the ExoPlayer library.
+   */
+  @SuppressWarnings("unused")
+  String KEY_CUSTOM_PREFIX = "custom_";
+  /** Key for redirected uri (type: String). */
+  String KEY_REDIRECTED_URI = "exo_redir";
+  /** Key for content length in bytes (type: long). */
+  String KEY_CONTENT_LENGTH = "exo_len";
 
   /**
    * Returns a metadata value.
    *
-   * @param name Name of the metadata to be returned.
+   * @param key Key of the metadata to be returned.
    * @param defaultValue Value to return if the metadata doesn't exist.
    * @return The metadata value.
    */
-  byte[] get(String name, byte[] defaultValue);
+  @Nullable
+  byte[] get(String key, @Nullable byte[] defaultValue);
 
   /**
    * Returns a metadata value.
    *
-   * @param name Name of the metadata to be returned.
+   * @param key Key of the metadata to be returned.
    * @param defaultValue Value to return if the metadata doesn't exist.
    * @return The metadata value.
    */
-  String get(String name, String defaultValue);
+  @Nullable
+  String get(String key, @Nullable String defaultValue);
 
   /**
    * Returns a metadata value.
    *
-   * @param name Name of the metadata to be returned.
+   * @param key Key of the metadata to be returned.
    * @param defaultValue Value to return if the metadata doesn't exist.
    * @return The metadata value.
    */
-  long get(String name, long defaultValue);
+  long get(String key, long defaultValue);
 
   /** Returns whether the metadata is available. */
-  boolean contains(String name);
+  boolean contains(String key);
+
+  /**
+   * Returns the value stored under {@link #KEY_CONTENT_LENGTH}, or {@link C#LENGTH_UNSET} if not
+   * set.
+   */
+  static long getContentLength(ContentMetadata contentMetadata) {
+    return contentMetadata.get(KEY_CONTENT_LENGTH, C.LENGTH_UNSET);
+  }
+
+  /**
+   * Returns the value stored under {@link #KEY_REDIRECTED_URI} as a {@link Uri}, or {code null} if
+   * not set.
+   */
+  @Nullable
+  static Uri getRedirectedUri(ContentMetadata contentMetadata) {
+    String redirectedUri = contentMetadata.get(KEY_REDIRECTED_URI, (String) null);
+    return redirectedUri == null ? null : Uri.parse(redirectedUri);
+  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadataInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadataInternal.java
deleted file mode 100644
index 0065018260..0000000000
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadataInternal.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.upstream.cache;
-
-import android.net.Uri;
-import android.support.annotation.Nullable;
-import com.google.android.exoplayer2.C;
-
-/** Helper classes to easily access and modify internal metadata values. */
-/* package */ final class ContentMetadataInternal {
-
-  private static final String PREFIX = ContentMetadata.INTERNAL_METADATA_NAME_PREFIX;
-  private static final String METADATA_NAME_REDIRECTED_URI = PREFIX + "redir";
-  private static final String METADATA_NAME_CONTENT_LENGTH = PREFIX + "len";
-
-  /** Returns the content length metadata, or {@link C#LENGTH_UNSET} if not set. */
-  public static long getContentLength(ContentMetadata contentMetadata) {
-    return contentMetadata.get(METADATA_NAME_CONTENT_LENGTH, C.LENGTH_UNSET);
-  }
-
-  /** Adds a mutation to set content length metadata value. */
-  public static void setContentLength(ContentMetadataMutations mutations, long length) {
-    mutations.set(METADATA_NAME_CONTENT_LENGTH, length);
-  }
-
-  /** Adds a mutation to remove content length metadata value. */
-  public static void removeContentLength(ContentMetadataMutations mutations) {
-    mutations.remove(METADATA_NAME_CONTENT_LENGTH);
-  }
-
-  /** Returns the redirected uri metadata, or {@code null} if not set. */
-  public @Nullable static Uri getRedirectedUri(ContentMetadata contentMetadata) {
-    String redirectedUri = contentMetadata.get(METADATA_NAME_REDIRECTED_URI, (String) null);
-    return redirectedUri == null ? null : Uri.parse(redirectedUri);
-  }
-
-  /**
-   * Adds a mutation to set redirected uri metadata value. Passing {@code null} as {@code uri} isn't
-   * allowed.
-   */
-  public static void setRedirectedUri(ContentMetadataMutations mutations, Uri uri) {
-    mutations.set(METADATA_NAME_REDIRECTED_URI, uri.toString());
-  }
-
-  /** Adds a mutation to remove redirected uri metadata value. */
-  public static void removeRedirectedUri(ContentMetadataMutations mutations) {
-    mutations.remove(METADATA_NAME_REDIRECTED_URI);
-  }
-
-  private ContentMetadataInternal() {
-    // Prevent instantiation.
-  }
-}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadataMutations.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadataMutations.java
index 70154b0308..fb3f6e362d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadataMutations.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadataMutations.java
@@ -15,6 +15,9 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
+import android.net.Uri;
+import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -30,6 +33,36 @@ import java.util.Map.Entry;
  */
 public class ContentMetadataMutations {
 
+  /**
+   * Adds a mutation to set the {@link ContentMetadata#KEY_CONTENT_LENGTH} value, or to remove any
+   * existing value if {@link C#LENGTH_UNSET} is passed.
+   *
+   * @param mutations The mutations to modify.
+   * @param length The length value, or {@link C#LENGTH_UNSET} to remove any existing entry.
+   * @return The mutations instance, for convenience.
+   */
+  public static ContentMetadataMutations setContentLength(
+      ContentMetadataMutations mutations, long length) {
+    return mutations.set(ContentMetadata.KEY_CONTENT_LENGTH, length);
+  }
+
+  /**
+   * Adds a mutation to set the {@link ContentMetadata#KEY_REDIRECTED_URI} value, or to remove any
+   * existing entry if {@code null} is passed.
+   *
+   * @param mutations The mutations to modify.
+   * @param uri The {@link Uri} value, or {@code null} to remove any existing entry.
+   * @return The mutations instance, for convenience.
+   */
+  public static ContentMetadataMutations setRedirectedUri(
+      ContentMetadataMutations mutations, @Nullable Uri uri) {
+    if (uri == null) {
+      return mutations.remove(ContentMetadata.KEY_REDIRECTED_URI);
+    } else {
+      return mutations.set(ContentMetadata.KEY_REDIRECTED_URI, uri.toString());
+    }
+  }
+
   private final Map<String, Object> editedValues;
   private final List<String> removedValues;
 
@@ -45,7 +78,7 @@ public class ContentMetadataMutations {
    *
    * @param name The name of the metadata value.
    * @param value The value to be set.
-   * @return This Editor instance, for convenience.
+   * @return This instance, for convenience.
    */
   public ContentMetadataMutations set(String name, String value) {
     return checkAndSet(name, value);
@@ -56,7 +89,7 @@ public class ContentMetadataMutations {
    *
    * @param name The name of the metadata value.
    * @param value The value to be set.
-   * @return This Editor instance, for convenience.
+   * @return This instance, for convenience.
    */
   public ContentMetadataMutations set(String name, long value) {
     return checkAndSet(name, value);
@@ -68,7 +101,7 @@ public class ContentMetadataMutations {
    *
    * @param name The name of the metadata value.
    * @param value The value to be set.
-   * @return This Editor instance, for convenience.
+   * @return This instance, for convenience.
    */
   public ContentMetadataMutations set(String name, byte[] value) {
     return checkAndSet(name, Arrays.copyOf(value, value.length));
@@ -78,7 +111,7 @@ public class ContentMetadataMutations {
    * Adds a mutation to remove a metadata value.
    *
    * @param name The name of the metadata value.
-   * @return This Editor instance, for convenience.
+   * @return This instance, for convenience.
    */
   public ContentMetadataMutations remove(String name) {
     removedValues.add(name);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadata.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadata.java
index e16ff5483a..843dd19444 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadata.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadata.java
@@ -64,6 +64,10 @@ public final class DefaultContentMetadata implements ContentMetadata {
 
   private final Map<String, byte[]> metadata;
 
+  public DefaultContentMetadata() {
+    this(Collections.emptyMap());
+  }
+
   private DefaultContentMetadata(Map<String, byte[]> metadata) {
     this.metadata = Collections.unmodifiableMap(metadata);
   }
@@ -74,7 +78,7 @@ public final class DefaultContentMetadata implements ContentMetadata {
    */
   public DefaultContentMetadata copyWithMutationsApplied(ContentMetadataMutations mutations) {
     Map<String, byte[]> mutatedMetadata = applyMutations(metadata, mutations);
-    if (isMetadataEqual(mutatedMetadata)) {
+    if (isMetadataEqual(metadata, mutatedMetadata)) {
       return this;
     }
     return new DefaultContentMetadata(mutatedMetadata);
@@ -97,7 +101,8 @@ public final class DefaultContentMetadata implements ContentMetadata {
   }
 
   @Override
-  public final byte[] get(String name, byte[] defaultValue) {
+  @Nullable
+  public final byte[] get(String name, @Nullable byte[] defaultValue) {
     if (metadata.containsKey(name)) {
       byte[] bytes = metadata.get(name);
       return Arrays.copyOf(bytes, bytes.length);
@@ -107,7 +112,8 @@ public final class DefaultContentMetadata implements ContentMetadata {
   }
 
   @Override
-  public final String get(String name, String defaultValue) {
+  @Nullable
+  public final String get(String name, @Nullable String defaultValue) {
     if (metadata.containsKey(name)) {
       byte[] bytes = metadata.get(name);
       return new String(bytes, Charset.forName(C.UTF8_NAME));
@@ -139,21 +145,7 @@ public final class DefaultContentMetadata implements ContentMetadata {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    return isMetadataEqual(((DefaultContentMetadata) o).metadata);
-  }
-
-  private boolean isMetadataEqual(Map<String, byte[]> otherMetadata) {
-    if (metadata.size() != otherMetadata.size()) {
-      return false;
-    }
-    for (Entry<String, byte[]> entry : metadata.entrySet()) {
-      byte[] value = entry.getValue();
-      byte[] otherValue = otherMetadata.get(entry.getKey());
-      if (!Arrays.equals(value, otherValue)) {
-        return false;
-      }
-    }
-    return true;
+    return isMetadataEqual(metadata, ((DefaultContentMetadata) o).metadata);
   }
 
   @Override
@@ -168,6 +160,20 @@ public final class DefaultContentMetadata implements ContentMetadata {
     return hashCode;
   }
 
+  private static boolean isMetadataEqual(Map<String, byte[]> first, Map<String, byte[]> second) {
+    if (first.size() != second.size()) {
+      return false;
+    }
+    for (Entry<String, byte[]> entry : first.entrySet()) {
+      byte[] value = entry.getValue();
+      byte[] otherValue = second.get(entry.getKey());
+      if (!Arrays.equals(value, otherValue)) {
+        return false;
+      }
+    }
+    return true;
+  }
+
   private static Map<String, byte[]> applyMutations(
       Map<String, byte[]> otherMetadata, ContentMetadataMutations mutations) {
     HashMap<String, byte[]> metadata = new HashMap<>(otherMetadata);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index a3ec3b1f05..8bcf1758fa 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -293,7 +293,7 @@ public final class SimpleCache implements Cache {
       return;
     }
     // Check if the span conflicts with the set content length
-    long length = ContentMetadataInternal.getContentLength(cachedContent.getMetadata());
+    long length = ContentMetadata.getContentLength(cachedContent.getMetadata());
     if (length != C.LENGTH_UNSET) {
       Assertions.checkState((span.position + span.length) <= length);
     }
@@ -333,18 +333,6 @@ public final class SimpleCache implements Cache {
     return cachedContent != null ? cachedContent.getCachedBytesLength(position, length) : -length;
   }
 
-  @Override
-  public synchronized void setContentLength(String key, long length) throws CacheException {
-    ContentMetadataMutations mutations = new ContentMetadataMutations();
-    ContentMetadataInternal.setContentLength(mutations, length);
-    applyContentMetadataMutations(key, mutations);
-  }
-
-  @Override
-  public synchronized long getContentLength(String key) {
-    return ContentMetadataInternal.getContentLength(getContentMetadata(key));
-  }
-
   @Override
   public synchronized void applyContentMetadataMutations(
       String key, ContentMetadataMutations mutations) throws CacheException {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
index 236f8f6641..666fa87e9e 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
@@ -247,7 +247,8 @@ public final class CacheDataSourceTest {
     // Read partial at EOS but don't cross it so length is unknown.
     CacheDataSource cacheDataSource = createCacheDataSource(false, true);
     assertReadData(cacheDataSource, dataSpec, true);
-    assertThat(cache.getContentLength(defaultCacheKey)).isEqualTo(C.LENGTH_UNSET);
+    assertThat(ContentMetadata.getContentLength(cache.getContentMetadata(defaultCacheKey)))
+        .isEqualTo(C.LENGTH_UNSET);
 
     // Now do an unbounded request for whole data. This will cause a bounded request from upstream.
     // End of data from upstream shouldn't be mixed up with EOS and cause length set wrong.
@@ -285,7 +286,8 @@ public final class CacheDataSourceTest {
     cacheDataSource.close();
 
     assertThat(upstream.getAndClearOpenedDataSpecs()).hasLength(1);
-    assertThat(cache.getContentLength(defaultCacheKey)).isEqualTo(TEST_DATA.length);
+    assertThat(ContentMetadata.getContentLength(cache.getContentMetadata(defaultCacheKey)))
+        .isEqualTo(TEST_DATA.length);
   }
 
   @Test
@@ -512,7 +514,9 @@ public final class CacheDataSourceTest {
     // If the request was unbounded then the content length should be cached, either because the
     // content length was known or because EOS was read. If the request was bounded then the content
     // length will not have been determined.
-    assertThat(cache.getContentLength(customCacheKey ? this.customCacheKey : defaultCacheKey))
+    ContentMetadata metadata =
+        cache.getContentMetadata(customCacheKey ? this.customCacheKey : defaultCacheKey);
+    assertThat(ContentMetadata.getContentLength(metadata))
         .isEqualTo(dataSpec.length == C.LENGTH_UNSET ? TEST_DATA.length : C.LENGTH_UNSET);
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
index d0bdfa2b83..4fbe93888e 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
@@ -79,8 +79,11 @@ public final class CacheUtilTest {
     }
 
     @Override
-    public long getContentLength(String key) {
-      return contentLength;
+    public ContentMetadata getContentMetadata(String key) {
+      DefaultContentMetadata metadata = new DefaultContentMetadata();
+      ContentMetadataMutations mutations = new ContentMetadataMutations();
+      ContentMetadataMutations.setContentLength(mutations, contentLength);
+      return metadata.copyWithMutationsApplied(mutations);
     }
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
index 6080f6eccd..57913f3652 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
@@ -154,11 +154,11 @@ public class CachedContentIndexTest {
 
     assertThat(index.assignIdForKey("ABCDE")).isEqualTo(5);
     ContentMetadata metadata = index.get("ABCDE").getMetadata();
-    assertThat(ContentMetadataInternal.getContentLength(metadata)).isEqualTo(10);
+    assertThat(ContentMetadata.getContentLength(metadata)).isEqualTo(10);
 
     assertThat(index.assignIdForKey("KLMNO")).isEqualTo(2);
     ContentMetadata metadata2 = index.get("KLMNO").getMetadata();
-    assertThat(ContentMetadataInternal.getContentLength(metadata2)).isEqualTo(2560);
+    assertThat(ContentMetadata.getContentLength(metadata2)).isEqualTo(2560);
   }
 
   @Test
@@ -172,12 +172,12 @@ public class CachedContentIndexTest {
 
     assertThat(index.assignIdForKey("ABCDE")).isEqualTo(5);
     ContentMetadata metadata = index.get("ABCDE").getMetadata();
-    assertThat(ContentMetadataInternal.getContentLength(metadata)).isEqualTo(10);
-    assertThat(ContentMetadataInternal.getRedirectedUri(metadata)).isEqualTo(Uri.parse("abcde"));
+    assertThat(ContentMetadata.getContentLength(metadata)).isEqualTo(10);
+    assertThat(ContentMetadata.getRedirectedUri(metadata)).isEqualTo(Uri.parse("abcde"));
 
     assertThat(index.assignIdForKey("KLMNO")).isEqualTo(2);
     ContentMetadata metadata2 = index.get("KLMNO").getMetadata();
-    assertThat(ContentMetadataInternal.getContentLength(metadata2)).isEqualTo(2560);
+    assertThat(ContentMetadata.getContentLength(metadata2)).isEqualTo(2560);
   }
 
   @Test
@@ -297,11 +297,11 @@ public class CachedContentIndexTest {
   private void assertStoredAndLoadedEqual(CachedContentIndex index, CachedContentIndex index2)
       throws IOException {
     ContentMetadataMutations mutations1 = new ContentMetadataMutations();
-    ContentMetadataInternal.setContentLength(mutations1, 2560);
+    ContentMetadataMutations.setContentLength(mutations1, 2560);
     index.getOrAdd("KLMNO").applyMetadataMutations(mutations1);
     ContentMetadataMutations mutations2 = new ContentMetadataMutations();
-    ContentMetadataInternal.setContentLength(mutations2, 10);
-    ContentMetadataInternal.setRedirectedUri(mutations2, Uri.parse("abcde"));
+    ContentMetadataMutations.setContentLength(mutations2, 10);
+    ContentMetadataMutations.setRedirectedUri(mutations2, Uri.parse("abcde"));
     index.getOrAdd("ABCDE").applyMetadataMutations(mutations2);
     index.store();
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
index 15bbb8c108..c2b7f481fa 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
@@ -106,18 +106,26 @@ public class SimpleCacheTest {
   }
 
   @Test
-  public void testSetGetLength() throws Exception {
+  public void testSetGetContentMetadata() throws Exception {
     SimpleCache simpleCache = getSimpleCache();
 
-    assertThat(simpleCache.getContentLength(KEY_1)).isEqualTo(LENGTH_UNSET);
+    assertThat(ContentMetadata.getContentLength(simpleCache.getContentMetadata(KEY_1)))
+        .isEqualTo(LENGTH_UNSET);
 
-    simpleCache.setContentLength(KEY_1, 15);
-    assertThat(simpleCache.getContentLength(KEY_1)).isEqualTo(15);
+    ContentMetadataMutations mutations = new ContentMetadataMutations();
+    ContentMetadataMutations.setContentLength(mutations, 15);
+    simpleCache.applyContentMetadataMutations(KEY_1, mutations);
+    assertThat(ContentMetadata.getContentLength(simpleCache.getContentMetadata(KEY_1)))
+        .isEqualTo(15);
 
     simpleCache.startReadWrite(KEY_1, 0);
     addCache(simpleCache, KEY_1, 0, 15);
-    simpleCache.setContentLength(KEY_1, 150);
-    assertThat(simpleCache.getContentLength(KEY_1)).isEqualTo(150);
+
+    mutations = new ContentMetadataMutations();
+    ContentMetadataMutations.setContentLength(mutations, 150);
+    simpleCache.applyContentMetadataMutations(KEY_1, mutations);
+    assertThat(ContentMetadata.getContentLength(simpleCache.getContentMetadata(KEY_1)))
+        .isEqualTo(150);
 
     addCache(simpleCache, KEY_1, 140, 10);
 
@@ -125,14 +133,16 @@ public class SimpleCacheTest {
 
     // Check if values are kept after cache is reloaded.
     SimpleCache simpleCache2 = getSimpleCache();
-    assertThat(simpleCache2.getContentLength(KEY_1)).isEqualTo(150);
+    assertThat(ContentMetadata.getContentLength(simpleCache2.getContentMetadata(KEY_1)))
+        .isEqualTo(150);
 
     // Removing the last span shouldn't cause the length be change next time cache loaded
     SimpleCacheSpan lastSpan = simpleCache2.startReadWrite(KEY_1, 145);
     simpleCache2.removeSpan(lastSpan);
     simpleCache2.release();
     simpleCache2 = getSimpleCache();
-    assertThat(simpleCache2.getContentLength(KEY_1)).isEqualTo(150);
+    assertThat(ContentMetadata.getContentLength(simpleCache2.getContentMetadata(KEY_1)))
+        .isEqualTo(150);
   }
 
   @Test

From 173ddd6ee70a241f1b1251d4ec0172eb386fa06a Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 14 Dec 2018 11:16:33 +0000
Subject: [PATCH 314/832] Add simplified adaptive media source stream key
 filter to factory classes.

This change only simplifies the API by using the ManifestParser internally.

PiperOrigin-RevId: 225516193
---
 RELEASENOTES.md                               |  2 +
 .../exoplayer2/demo/PlayerActivity.java       | 14 ++---
 .../offline/FilteringManifestParser.java      | 13 +++--
 .../source/dash/DashMediaSource.java          | 29 +++++++++-
 .../exoplayer2/source/hls/HlsMediaSource.java | 26 ++++++++-
 .../DefaultHlsPlaylistParserFactory.java      | 25 +--------
 .../FilteringHlsPlaylistParserFactory.java    | 55 +++++++++++++++++++
 .../source/smoothstreaming/SsMediaSource.java | 29 +++++++++-
 8 files changed, 147 insertions(+), 46 deletions(-)
 create mode 100644 library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/FilteringHlsPlaylistParserFactory.java

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index ddf841c48b..70862367f8 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -15,6 +15,8 @@
 * Offline:
   * Speed up removal of segmented downloads
     ([#5136](https://github.com/google/ExoPlayer/issues/5136)).
+  * Add `setStreamKeys` method to factories of DASH, SmoothStreaming and HLS
+    media sources to simplify filtering by downloaded streams.
 * Caching:
   * Improve performance of `SimpleCache`.
   * Cache data with unknown length by default. The previous flag to opt in to
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 6252fa3b3f..75a0905733 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
@@ -48,7 +48,6 @@ import com.google.android.exoplayer2.drm.HttpMediaDrmCallback;
 import com.google.android.exoplayer2.drm.UnsupportedDrmException;
 import com.google.android.exoplayer2.mediacodec.MediaCodecRenderer.DecoderInitializationException;
 import com.google.android.exoplayer2.mediacodec.MediaCodecUtil.DecoderQueryException;
-import com.google.android.exoplayer2.offline.FilteringManifestParser;
 import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.source.BehindLiveWindowException;
 import com.google.android.exoplayer2.source.ConcatenatingMediaSource;
@@ -58,11 +57,8 @@ import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.source.ads.AdsLoader;
 import com.google.android.exoplayer2.source.ads.AdsMediaSource;
 import com.google.android.exoplayer2.source.dash.DashMediaSource;
-import com.google.android.exoplayer2.source.dash.manifest.DashManifestParser;
 import com.google.android.exoplayer2.source.hls.HlsMediaSource;
-import com.google.android.exoplayer2.source.hls.playlist.DefaultHlsPlaylistParserFactory;
 import com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource;
-import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifestParser;
 import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo;
@@ -472,21 +468,19 @@ public class PlayerActivity extends Activity
   @SuppressWarnings("unchecked")
   private MediaSource buildMediaSource(Uri uri, @Nullable String overrideExtension) {
     @ContentType int type = Util.inferContentType(uri, overrideExtension);
+    List<StreamKey> offlineStreamKeys = getOfflineStreamKeys(uri);
     switch (type) {
       case C.TYPE_DASH:
         return new DashMediaSource.Factory(dataSourceFactory)
-            .setManifestParser(
-                new FilteringManifestParser<>(new DashManifestParser(), getOfflineStreamKeys(uri)))
+            .setStreamKeys(offlineStreamKeys)
             .createMediaSource(uri);
       case C.TYPE_SS:
         return new SsMediaSource.Factory(dataSourceFactory)
-            .setManifestParser(
-                new FilteringManifestParser<>(new SsManifestParser(), getOfflineStreamKeys(uri)))
+            .setStreamKeys(offlineStreamKeys)
             .createMediaSource(uri);
       case C.TYPE_HLS:
         return new HlsMediaSource.Factory(dataSourceFactory)
-            .setPlaylistParserFactory(
-                new DefaultHlsPlaylistParserFactory(getOfflineStreamKeys(uri)))
+            .setStreamKeys(offlineStreamKeys)
             .createMediaSource(uri);
       case C.TYPE_OTHER:
         return new ExtractorMediaSource.Factory(dataSourceFactory).createMediaSource(uri);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/FilteringManifestParser.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/FilteringManifestParser.java
index c32cdf7126..c25e5099cf 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/FilteringManifestParser.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/FilteringManifestParser.java
@@ -16,22 +16,27 @@
 package com.google.android.exoplayer2.offline;
 
 import android.net.Uri;
+import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.upstream.ParsingLoadable.Parser;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
 
-/** A manifest parser that includes only the streams identified by the given stream keys. */
+/**
+ * A manifest parser that includes only the streams identified by the given stream keys.
+ *
+ * @param <T> The {@link FilterableManifest} type.
+ */
 public final class FilteringManifestParser<T extends FilterableManifest<T>> implements Parser<T> {
 
-  private final Parser<T> parser;
-  private final List<StreamKey> streamKeys;
+  private final Parser<? extends T> parser;
+  @Nullable private final List<StreamKey> streamKeys;
 
   /**
    * @param parser A parser for the manifest that will be filtered.
    * @param streamKeys The stream keys. If null or empty then filtering will not occur.
    */
-  public FilteringManifestParser(Parser<T> parser, List<StreamKey> streamKeys) {
+  public FilteringManifestParser(Parser<? extends T> parser, @Nullable List<StreamKey> streamKeys) {
     this.parser = parser;
     this.streamKeys = streamKeys;
   }
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
index 1f08a43731..c5ce70cfd3 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
@@ -26,6 +26,8 @@ import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.Timeline;
+import com.google.android.exoplayer2.offline.FilteringManifestParser;
+import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.source.BaseMediaSource;
 import com.google.android.exoplayer2.source.CompositeSequenceableLoaderFactory;
 import com.google.android.exoplayer2.source.DefaultCompositeSequenceableLoaderFactory;
@@ -59,6 +61,7 @@ import java.io.InputStreamReader;
 import java.nio.charset.Charset;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
 import java.util.regex.Matcher;
@@ -75,15 +78,16 @@ public final class DashMediaSource extends BaseMediaSource {
   public static final class Factory implements AdsMediaSource.MediaSourceFactory {
 
     private final DashChunkSource.Factory chunkSourceFactory;
-    private final @Nullable DataSource.Factory manifestDataSourceFactory;
+    @Nullable private final DataSource.Factory manifestDataSourceFactory;
 
-    private @Nullable ParsingLoadable.Parser<? extends DashManifest> manifestParser;
+    @Nullable private ParsingLoadable.Parser<? extends DashManifest> manifestParser;
+    @Nullable private List<StreamKey> streamKeys;
     private CompositeSequenceableLoaderFactory compositeSequenceableLoaderFactory;
     private LoadErrorHandlingPolicy loadErrorHandlingPolicy;
     private long livePresentationDelayMs;
     private boolean livePresentationDelayOverridesManifest;
     private boolean isCreateCalled;
-    private @Nullable Object tag;
+    @Nullable private Object tag;
 
     /**
      * Creates a new factory for {@link DashMediaSource}s.
@@ -210,6 +214,19 @@ public final class DashMediaSource extends BaseMediaSource {
       return this;
     }
 
+    /**
+     * Sets a list of {@link StreamKey stream keys} by which the manifest is filtered.
+     *
+     * @param streamKeys A list of {@link StreamKey stream keys}.
+     * @return This factory, for convenience.
+     * @throws IllegalStateException If one of the {@code create} methods has already been called.
+     */
+    public Factory setStreamKeys(List<StreamKey> streamKeys) {
+      Assertions.checkState(!isCreateCalled);
+      this.streamKeys = streamKeys;
+      return this;
+    }
+
     /**
      * Sets the factory to create composite {@link SequenceableLoader}s for when this media source
      * loads data from multiple streams (video, audio etc...). The default is an instance of {@link
@@ -240,6 +257,9 @@ public final class DashMediaSource extends BaseMediaSource {
     public DashMediaSource createMediaSource(DashManifest manifest) {
       Assertions.checkArgument(!manifest.dynamic);
       isCreateCalled = true;
+      if (streamKeys != null && !streamKeys.isEmpty()) {
+        manifest = manifest.copy(streamKeys);
+      }
       return new DashMediaSource(
           manifest,
           /* manifestUri= */ null,
@@ -281,6 +301,9 @@ public final class DashMediaSource extends BaseMediaSource {
       if (manifestParser == null) {
         manifestParser = new DashManifestParser();
       }
+      if (streamKeys != null) {
+        manifestParser = new FilteringManifestParser<>(manifestParser, streamKeys);
+      }
       return new DashMediaSource(
           /* manifest= */ null,
           Assertions.checkNotNull(manifestUri),
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
index a9b0c579ac..20374fad69 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
@@ -22,6 +22,7 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.extractor.Extractor;
+import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.source.BaseMediaSource;
 import com.google.android.exoplayer2.source.CompositeSequenceableLoaderFactory;
 import com.google.android.exoplayer2.source.DefaultCompositeSequenceableLoaderFactory;
@@ -34,6 +35,7 @@ import com.google.android.exoplayer2.source.SinglePeriodTimeline;
 import com.google.android.exoplayer2.source.ads.AdsMediaSource;
 import com.google.android.exoplayer2.source.hls.playlist.DefaultHlsPlaylistParserFactory;
 import com.google.android.exoplayer2.source.hls.playlist.DefaultHlsPlaylistTracker;
+import com.google.android.exoplayer2.source.hls.playlist.FilteringHlsPlaylistParserFactory;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist;
 import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylist;
 import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylistParser;
@@ -64,12 +66,13 @@ public final class HlsMediaSource extends BaseMediaSource
 
     private HlsExtractorFactory extractorFactory;
     private HlsPlaylistParserFactory playlistParserFactory;
+    @Nullable private List<StreamKey> streamKeys;
     private HlsPlaylistTracker.Factory playlistTrackerFactory;
     private CompositeSequenceableLoaderFactory compositeSequenceableLoaderFactory;
     private LoadErrorHandlingPolicy loadErrorHandlingPolicy;
     private boolean allowChunklessPreparation;
     private boolean isCreateCalled;
-    private @Nullable Object tag;
+    @Nullable private Object tag;
 
     /**
      * Creates a new factory for {@link HlsMediaSource}s.
@@ -164,8 +167,8 @@ public final class HlsMediaSource extends BaseMediaSource
     }
 
     /**
-     * Sets the factory from which playlist parsers will be obtained. The default value is created
-     * by calling {@link DefaultHlsPlaylistParserFactory#DefaultHlsPlaylistParserFactory()}.
+     * Sets the factory from which playlist parsers will be obtained. The default value is a {@link
+     * DefaultHlsPlaylistParserFactory}.
      *
      * @param playlistParserFactory An {@link HlsPlaylistParserFactory}.
      * @return This factory, for convenience.
@@ -177,6 +180,19 @@ public final class HlsMediaSource extends BaseMediaSource
       return this;
     }
 
+    /**
+     * Sets a list of {@link StreamKey stream keys} by which the playlists are filtered.
+     *
+     * @param streamKeys A list of {@link StreamKey stream keys}.
+     * @return This factory, for convenience.
+     * @throws IllegalStateException If one of the {@code create} methods has already been called.
+     */
+    public Factory setStreamKeys(List<StreamKey> streamKeys) {
+      Assertions.checkState(!isCreateCalled);
+      this.streamKeys = streamKeys;
+      return this;
+    }
+
     /**
      * Sets the {@link HlsPlaylistTracker} factory. The default value is {@link
      * DefaultHlsPlaylistTracker#FACTORY}.
@@ -232,6 +248,10 @@ public final class HlsMediaSource extends BaseMediaSource
     @Override
     public HlsMediaSource createMediaSource(Uri playlistUri) {
       isCreateCalled = true;
+      if (streamKeys != null) {
+        playlistParserFactory =
+            new FilteringHlsPlaylistParserFactory(playlistParserFactory, streamKeys);
+      }
       return new HlsMediaSource(
           playlistUri,
           hlsDataSourceFactory,
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistParserFactory.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistParserFactory.java
index 9058980c73..d185e2a3e8 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistParserFactory.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistParserFactory.java
@@ -15,40 +15,19 @@
  */
 package com.google.android.exoplayer2.source.hls.playlist;
 
-import com.google.android.exoplayer2.offline.FilteringManifestParser;
-import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.upstream.ParsingLoadable;
-import java.util.Collections;
-import java.util.List;
 
 /** Default implementation for {@link HlsPlaylistParserFactory}. */
 public final class DefaultHlsPlaylistParserFactory implements HlsPlaylistParserFactory {
 
-  private final List<StreamKey> streamKeys;
-
-  /** Creates an instance that does not filter any parsing results. */
-  public DefaultHlsPlaylistParserFactory() {
-    this(Collections.emptyList());
-  }
-
-  /**
-   * Creates an instance that filters the parsing results using the given {@code streamKeys}.
-   *
-   * @param streamKeys See {@link
-   *     FilteringManifestParser#FilteringManifestParser(ParsingLoadable.Parser, List)}.
-   */
-  public DefaultHlsPlaylistParserFactory(List<StreamKey> streamKeys) {
-    this.streamKeys = streamKeys;
-  }
-
   @Override
   public ParsingLoadable.Parser<HlsPlaylist> createPlaylistParser() {
-    return new FilteringManifestParser<>(new HlsPlaylistParser(), streamKeys);
+    return new HlsPlaylistParser();
   }
 
   @Override
   public ParsingLoadable.Parser<HlsPlaylist> createPlaylistParser(
       HlsMasterPlaylist masterPlaylist) {
-    return new FilteringManifestParser<>(new HlsPlaylistParser(masterPlaylist), streamKeys);
+    return new HlsPlaylistParser(masterPlaylist);
   }
 }
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/FilteringHlsPlaylistParserFactory.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/FilteringHlsPlaylistParserFactory.java
new file mode 100644
index 0000000000..2d7ad5a78a
--- /dev/null
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/FilteringHlsPlaylistParserFactory.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.source.hls.playlist;
+
+import com.google.android.exoplayer2.offline.FilteringManifestParser;
+import com.google.android.exoplayer2.offline.StreamKey;
+import com.google.android.exoplayer2.upstream.ParsingLoadable;
+import java.util.List;
+
+/**
+ * A {@link HlsPlaylistParserFactory} that includes only the streams identified by the given stream
+ * keys.
+ */
+public final class FilteringHlsPlaylistParserFactory implements HlsPlaylistParserFactory {
+
+  private final HlsPlaylistParserFactory hlsPlaylistParserFactory;
+  private final List<StreamKey> streamKeys;
+
+  /**
+   * @param hlsPlaylistParserFactory A factory for the parsers of the playlists which will be
+   *     filtered.
+   * @param streamKeys The stream keys. If null or empty then filtering will not occur.
+   */
+  public FilteringHlsPlaylistParserFactory(
+      HlsPlaylistParserFactory hlsPlaylistParserFactory, List<StreamKey> streamKeys) {
+    this.hlsPlaylistParserFactory = hlsPlaylistParserFactory;
+    this.streamKeys = streamKeys;
+  }
+
+  @Override
+  public ParsingLoadable.Parser<HlsPlaylist> createPlaylistParser() {
+    return new FilteringManifestParser<>(
+        hlsPlaylistParserFactory.createPlaylistParser(), streamKeys);
+  }
+
+  @Override
+  public ParsingLoadable.Parser<HlsPlaylist> createPlaylistParser(
+      HlsMasterPlaylist masterPlaylist) {
+    return new FilteringManifestParser<>(
+        hlsPlaylistParserFactory.createPlaylistParser(masterPlaylist), streamKeys);
+  }
+}
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
index 103a52a55a..1923c4b08a 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
@@ -24,6 +24,8 @@ import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.Timeline;
+import com.google.android.exoplayer2.offline.FilteringManifestParser;
+import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.source.BaseMediaSource;
 import com.google.android.exoplayer2.source.CompositeSequenceableLoaderFactory;
 import com.google.android.exoplayer2.source.DefaultCompositeSequenceableLoaderFactory;
@@ -50,6 +52,7 @@ import com.google.android.exoplayer2.upstream.TransferListener;
 import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.List;
 
 /** A SmoothStreaming {@link MediaSource}. */
 public final class SsMediaSource extends BaseMediaSource
@@ -63,14 +66,15 @@ public final class SsMediaSource extends BaseMediaSource
   public static final class Factory implements AdsMediaSource.MediaSourceFactory {
 
     private final SsChunkSource.Factory chunkSourceFactory;
-    private final @Nullable DataSource.Factory manifestDataSourceFactory;
+    @Nullable private final DataSource.Factory manifestDataSourceFactory;
 
-    private @Nullable ParsingLoadable.Parser<? extends SsManifest> manifestParser;
+    @Nullable private ParsingLoadable.Parser<? extends SsManifest> manifestParser;
+    @Nullable private List<StreamKey> streamKeys;
     private CompositeSequenceableLoaderFactory compositeSequenceableLoaderFactory;
     private LoadErrorHandlingPolicy loadErrorHandlingPolicy;
     private long livePresentationDelayMs;
     private boolean isCreateCalled;
-    private @Nullable Object tag;
+    @Nullable private Object tag;
 
     /**
      * Creates a new factory for {@link SsMediaSource}s.
@@ -178,6 +182,19 @@ public final class SsMediaSource extends BaseMediaSource
       return this;
     }
 
+    /**
+     * Sets a list of {@link StreamKey stream keys} by which the manifest is filtered.
+     *
+     * @param streamKeys A list of {@link StreamKey stream keys}.
+     * @return This factory, for convenience.
+     * @throws IllegalStateException If one of the {@code create} methods has already been called.
+     */
+    public Factory setStreamKeys(List<StreamKey> streamKeys) {
+      Assertions.checkState(!isCreateCalled);
+      this.streamKeys = streamKeys;
+      return this;
+    }
+
     /**
      * Sets the factory to create composite {@link SequenceableLoader}s for when this media source
      * loads data from multiple streams (video, audio etc.). The default is an instance of {@link
@@ -208,6 +225,9 @@ public final class SsMediaSource extends BaseMediaSource
     public SsMediaSource createMediaSource(SsManifest manifest) {
       Assertions.checkArgument(!manifest.isLive);
       isCreateCalled = true;
+      if (streamKeys != null && !streamKeys.isEmpty()) {
+        manifest = manifest.copy(streamKeys);
+      }
       return new SsMediaSource(
           manifest,
           /* manifestUri= */ null,
@@ -248,6 +268,9 @@ public final class SsMediaSource extends BaseMediaSource
       if (manifestParser == null) {
         manifestParser = new SsManifestParser();
       }
+      if (streamKeys != null) {
+        manifestParser = new FilteringManifestParser<>(manifestParser, streamKeys);
+      }
       return new SsMediaSource(
           /* manifest= */ null,
           Assertions.checkNotNull(manifestUri),

From bbf222854a54f65f56a73e530b48da571c7257f9 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 14 Dec 2018 13:55:12 +0000
Subject: [PATCH 315/832] Remove unused interface method

PiperOrigin-RevId: 225528632
---
 .../exoplayer2/ext/mediasession/TimelineQueueEditor.java   | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
index 093913fd8c..b92d7a27b7 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
@@ -65,13 +65,6 @@ public final class TimelineQueueEditor
    * {@link MediaSessionConnector}.
    */
   public interface QueueDataAdapter {
-    /**
-     * Gets the {@link MediaDescriptionCompat} for a {@code position}.
-     *
-     * @param position The position in the queue for which to provide a description.
-     * @return A {@link MediaDescriptionCompat}.
-     */
-    MediaDescriptionCompat getMediaDescription(int position);
     /**
      * Adds a {@link MediaDescriptionCompat} at the given {@code position}.
      *

From 3390b21618d0ca17e3e983e878bb4f81b43d9ef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Seroczy=C5=84ski?= <androidches@gmail.com>
Date: Mon, 17 Dec 2018 10:58:27 +0100
Subject: [PATCH 316/832] Blacklist OMX.SEC.mp3.dec and
 OMX.brcm.audio.mp3.decoder on Samsung devices

---
 .../exoplayer2/mediacodec/MediaCodecUtil.java        | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
index 58604edccc..db7d1a8575 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
@@ -318,16 +318,18 @@ public final class MediaCodecUtil {
     }
 
     // Work around https://github.com/google/ExoPlayer/issues/4519.
-    if (("OMX.SEC.mp3.dec".equals(name) || "OMX.brcm.audio.mp3.decoder".equals(name))
-        && ("GT-I9515".equals(Util.MODEL)
-        || "GT-I9152".equals(Util.MODEL)
+    if ("OMX.SEC.mp3.dec".equals(name) && ("GT-I9152".equals(Util.MODEL)
         || "GT-P5220".equals(Util.MODEL)
-        || "SM-G350".equals(Util.MODEL)
-        || "SM-S7580".equals(Util.MODEL)
         || "SM-T231".equals(Util.MODEL)
         || "SM-T530".equals(Util.MODEL))) {
       return false;
     }
+    if (("OMX.SEC.mp3.dec".equals(name) || "OMX.brcm.audio.mp3.decoder".equals(name))
+        && ("GT-I9515".equals(Util.MODEL)
+        || "GT-S7580".equals(Util.MODEL)
+        || "SM-G350".equals(Util.MODEL))) {
+      return false;
+    }
 
     // Work around https://github.com/google/ExoPlayer/issues/1528 and
     // https://github.com/google/ExoPlayer/issues/3171.

From 4aabff96342c29b4bfaa421965896ed84fb1e9cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Seroczy=C5=84ski?= <androidches@gmail.com>
Date: Mon, 17 Dec 2018 12:50:11 +0100
Subject: [PATCH 317/832] Blacklist OMX.SEC.mp3.dec and
 OMX.brcm.audio.mp3.decoder on Samsung devices

---
 .../google/android/exoplayer2/mediacodec/MediaCodecUtil.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
index db7d1a8575..8122bbe2fe 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
@@ -318,14 +318,14 @@ public final class MediaCodecUtil {
     }
 
     // Work around https://github.com/google/ExoPlayer/issues/4519.
-    if ("OMX.SEC.mp3.dec".equals(name) && ("GT-I9152".equals(Util.MODEL)
+    if ("OMX.SEC.mp3.dec".equals(name) && ("GT-I9515".equals(Util.MODEL)
         || "GT-P5220".equals(Util.MODEL)
         || "SM-T231".equals(Util.MODEL)
         || "SM-T530".equals(Util.MODEL))) {
       return false;
     }
     if (("OMX.SEC.mp3.dec".equals(name) || "OMX.brcm.audio.mp3.decoder".equals(name))
-        && ("GT-I9515".equals(Util.MODEL)
+        && ("GT-I9152".equals(Util.MODEL)
         || "GT-S7580".equals(Util.MODEL)
         || "SM-G350".equals(Util.MODEL))) {
       return false;

From 1a3d735bc33ccc4f6c6227f33eb4812f5e162ebc Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 14 Dec 2018 16:03:42 +0000
Subject: [PATCH 318/832] Add assertion helper to verify
 MediaSource/TrackGroups/TrackSelection/StreamKey cycle.

This is useful to write integration tests for MediaSources which check that the
stream keys returned by getStreamKeys are compatible with the respective manifest
parser.

PiperOrigin-RevId: 225542606
---
 .../testutil/MediaPeriodAsserts.java          | 178 ++++++++++++++++++
 1 file changed, 178 insertions(+)
 create mode 100644 testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaPeriodAsserts.java

diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaPeriodAsserts.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaPeriodAsserts.java
new file mode 100644
index 0000000000..48b9128caf
--- /dev/null
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaPeriodAsserts.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.testutil;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.offline.FilterableManifest;
+import com.google.android.exoplayer2.offline.StreamKey;
+import com.google.android.exoplayer2.source.MediaPeriod;
+import com.google.android.exoplayer2.source.MediaPeriod.Callback;
+import com.google.android.exoplayer2.source.TrackGroup;
+import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.trackselection.BaseTrackSelection;
+import com.google.android.exoplayer2.trackselection.TrackSelection;
+import com.google.android.exoplayer2.util.ConditionVariable;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
+/** Assertion methods for {@link MediaPeriod}. */
+public final class MediaPeriodAsserts {
+
+  /**
+   * Interface to create media periods for testing based on a {@link FilterableManifest}.
+   *
+   * @param <T> The type of {@link FilterableManifest}.
+   */
+  public interface FilterableManifestMediaPeriodFactory<T extends FilterableManifest<T>> {
+
+    /** Returns media period based on the provided filterable manifest. */
+    MediaPeriod createMediaPeriod(T manifest);
+  }
+
+  private MediaPeriodAsserts() {}
+
+  /**
+   * Asserts that the values returns by {@link MediaPeriod#getStreamKeys(TrackSelection)} are
+   * compatible with a {@link FilterableManifest} using these stream keys.
+   *
+   * @param mediaPeriodFactory A factory to create a {@link MediaPeriod} based on a manifest.
+   * @param manifest The manifest which is to be tested.
+   */
+  public static <T extends FilterableManifest<T>>
+      void assertGetStreamKeysAndManifestFilterIntegration(
+          FilterableManifestMediaPeriodFactory<T> mediaPeriodFactory, T manifest) {
+    MediaPeriod mediaPeriod = mediaPeriodFactory.createMediaPeriod(manifest);
+    TrackGroupArray trackGroupArray = getTrackGroups(mediaPeriod);
+
+    for (int i = 0; i < trackGroupArray.length; i++) {
+      TrackGroup trackGroup = trackGroupArray.get(i);
+
+      // For each track group, create various test selections.
+      List<TrackSelection> testSelections = new ArrayList<>();
+      for (int j = 0; j < trackGroup.length; j++) {
+        testSelections.add(new TestTrackSelection(trackGroup, j));
+      }
+      if (trackGroup.length > 1) {
+        testSelections.add(new TestTrackSelection(trackGroup, 0, 1));
+      }
+      if (trackGroup.length > 2) {
+        int[] allTracks = new int[trackGroup.length];
+        for (int j = 0; j < trackGroup.length; j++) {
+          allTracks[j] = j;
+        }
+        testSelections.add(new TestTrackSelection(trackGroup, allTracks));
+      }
+
+      // Get stream keys for each selection and check that the resulting filtered manifest includes
+      // at least the same subset of tracks.
+      for (TrackSelection testSelection : testSelections) {
+        List<StreamKey> streamKeys = mediaPeriod.getStreamKeys(testSelection);
+        T filteredManifest = manifest.copy(streamKeys);
+        MediaPeriod filteredMediaPeriod = mediaPeriodFactory.createMediaPeriod(filteredManifest);
+        TrackGroupArray filteredTrackGroupArray = getTrackGroups(filteredMediaPeriod);
+        Format[] expectedFormats = new Format[testSelection.length()];
+        for (int k = 0; k < testSelection.length(); k++) {
+          expectedFormats[k] = testSelection.getFormat(k);
+        }
+        assertOneTrackGroupContainsFormats(filteredTrackGroupArray, expectedFormats);
+      }
+    }
+  }
+
+  private static void assertOneTrackGroupContainsFormats(
+      TrackGroupArray trackGroupArray, Format[] formats) {
+    boolean foundSubset = false;
+    for (int i = 0; i < trackGroupArray.length; i++) {
+      if (containsFormats(trackGroupArray.get(i), formats)) {
+        foundSubset = true;
+        break;
+      }
+    }
+    assertThat(foundSubset).isTrue();
+  }
+
+  private static boolean containsFormats(TrackGroup trackGroup, Format[] formats) {
+    HashSet<Format> allFormats = new HashSet<>();
+    for (int i = 0; i < trackGroup.length; i++) {
+      allFormats.add(trackGroup.getFormat(i));
+    }
+    for (int i = 0; i < formats.length; i++) {
+      if (!allFormats.remove(formats[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  private static TrackGroupArray getTrackGroups(MediaPeriod mediaPeriod) {
+    AtomicReference<TrackGroupArray> trackGroupArray = new AtomicReference<>(null);
+    DummyMainThread dummyMainThread = new DummyMainThread();
+    dummyMainThread.runOnMainThread(
+        () -> {
+          ConditionVariable preparedCondition = new ConditionVariable();
+          mediaPeriod.prepare(
+              new Callback() {
+                @Override
+                public void onPrepared(MediaPeriod mediaPeriod) {
+                  preparedCondition.open();
+                }
+
+                @Override
+                public void onContinueLoadingRequested(MediaPeriod source) {
+                  // Ignore.
+                }
+              },
+              /* positionUs= */ 0);
+          try {
+            preparedCondition.block();
+          } catch (InterruptedException e) {
+            // Ignore.
+          }
+          trackGroupArray.set(mediaPeriod.getTrackGroups());
+        });
+    dummyMainThread.release();
+    return trackGroupArray.get();
+  }
+
+  private static final class TestTrackSelection extends BaseTrackSelection {
+
+    public TestTrackSelection(TrackGroup trackGroup, int... tracks) {
+      super(trackGroup, tracks);
+    }
+
+    @Override
+    public int getSelectedIndex() {
+      return 0;
+    }
+
+    @Override
+    public int getSelectionReason() {
+      return C.SELECTION_REASON_UNKNOWN;
+    }
+
+    @Nullable
+    @Override
+    public Object getSelectionData() {
+      return null;
+    }
+  }
+}

From 28dca0b339f0c01c17ec641686871f205e7ccd7f Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Fri, 14 Dec 2018 16:57:29 +0000
Subject: [PATCH 319/832] Add method to Requirements to get not met
 requirements

PiperOrigin-RevId: 225549778
---
 .../jobdispatcher/JobDispatcherScheduler.java |  2 +-
 .../scheduler/PlatformScheduler.java          |  2 +-
 .../exoplayer2/scheduler/Requirements.java    | 70 +++++++++++++++----
 3 files changed, 60 insertions(+), 14 deletions(-)

diff --git a/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java b/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java
index b7818546f9..677d3c2ebd 100644
--- a/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java
+++ b/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java
@@ -129,7 +129,7 @@ public final class JobDispatcherScheduler implements Scheduler {
     Bundle extras = new Bundle();
     extras.putString(KEY_SERVICE_ACTION, serviceAction);
     extras.putString(KEY_SERVICE_PACKAGE, servicePackage);
-    extras.putInt(KEY_REQUIREMENTS, requirements.getRequirementsData());
+    extras.putInt(KEY_REQUIREMENTS, requirements.getRequirements());
     builder.setExtras(extras);
 
     return builder.build();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java
index ed06d3745a..b8272dc036 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java
@@ -130,7 +130,7 @@ public final class PlatformScheduler implements Scheduler {
     PersistableBundle extras = new PersistableBundle();
     extras.putString(KEY_SERVICE_ACTION, serviceAction);
     extras.putString(KEY_SERVICE_PACKAGE, servicePackage);
-    extras.putInt(KEY_REQUIREMENTS, requirements.getRequirementsData());
+    extras.putInt(KEY_REQUIREMENTS, requirements.getRequirements());
     builder.setExtras(extras);
 
     return builder.build();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
index 5acd31ee0d..4019d1ae70 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
@@ -25,6 +25,7 @@ import android.net.NetworkInfo;
 import android.os.BatteryManager;
 import android.os.PowerManager;
 import android.support.annotation.IntDef;
+import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
 import java.lang.annotation.Documented;
@@ -50,22 +51,49 @@ public final class Requirements {
     NETWORK_TYPE_METERED,
   })
   public @interface NetworkType {}
+
+  /**
+   * Requirement flags.
+   *
+   * <p>Combination of the following values is possible:
+   *
+   * <ul>
+   *   <li>Only one of {@link #NETWORK_TYPE_ANY}, {@link #NETWORK_TYPE_UNMETERED}, {@link
+   *       #NETWORK_TYPE_NOT_ROAMING} or {@link #NETWORK_TYPE_METERED}.
+   *   <li>{@link #DEVICE_IDLE}
+   *   <li>{@link #DEVICE_CHARGING}
+   *       <ul>
+   */
+  @Documented
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef(
+      flag = true,
+      value = {
+        NETWORK_TYPE_ANY,
+        NETWORK_TYPE_UNMETERED,
+        NETWORK_TYPE_NOT_ROAMING,
+        NETWORK_TYPE_METERED,
+        DEVICE_IDLE,
+        DEVICE_CHARGING
+      })
+  public @interface RequirementFlags {}
+
   /** This job doesn't require network connectivity. */
   public static final int NETWORK_TYPE_NONE = 0;
   /** This job requires network connectivity. */
   public static final int NETWORK_TYPE_ANY = 1;
   /** This job requires network connectivity that is unmetered. */
-  public static final int NETWORK_TYPE_UNMETERED = 2;
+  public static final int NETWORK_TYPE_UNMETERED = 1 << 1;
   /** This job requires network connectivity that is not roaming. */
-  public static final int NETWORK_TYPE_NOT_ROAMING = 3;
+  public static final int NETWORK_TYPE_NOT_ROAMING = 1 << 2;
   /** This job requires metered connectivity such as most cellular data networks. */
-  public static final int NETWORK_TYPE_METERED = 4;
+  public static final int NETWORK_TYPE_METERED = 1 << 3;
   /** This job requires the device to be idle. */
-  private static final int DEVICE_IDLE = 8;
+  public static final int DEVICE_IDLE = 1 << 4;
   /** This job requires the device to be charging. */
-  private static final int DEVICE_CHARGING = 16;
+  public static final int DEVICE_CHARGING = 1 << 5;
 
-  private static final int NETWORK_TYPE_MASK = 7;
+  private static final int NETWORK_TYPE_MASK = 0b1111;
 
   private static final String TAG = "Requirements";
 
@@ -86,7 +114,7 @@ public final class Requirements {
     }
   }
 
-  private final int requirements;
+  @RequirementFlags private final int requirements;
 
   /**
    * @param networkType Required network type.
@@ -97,9 +125,12 @@ public final class Requirements {
     this(networkType | (charging ? DEVICE_CHARGING : 0) | (idle ? DEVICE_IDLE : 0));
   }
 
-  /** @param requirementsData The value returned by {@link #getRequirementsData()}. */
-  public Requirements(int requirementsData) {
-    this.requirements = requirementsData;
+  /** @param requirements A combination of requirement flags. */
+  public Requirements(@RequirementFlags int requirements) {
+    this.requirements = requirements;
+    int networkType = getRequiredNetworkType();
+    // Check if only one network type is specified.
+    Assertions.checkState((networkType & (networkType - 1)) == 0);
   }
 
   /** Returns required network type. */
@@ -121,6 +152,7 @@ public final class Requirements {
    * Returns whether the requirements are met.
    *
    * @param context Any context.
+   * @return Whether the requirements are met.
    */
   public boolean checkRequirements(Context context) {
     return checkNetworkRequirements(context)
@@ -128,8 +160,22 @@ public final class Requirements {
         && checkIdleRequirement(context);
   }
 
-  /** Returns the encoded requirements data which can be used with {@link #Requirements(int)}. */
-  public int getRequirementsData() {
+  /**
+   * Returns the requirement flags that are not met, or 0.
+   *
+   * @param context Any context.
+   * @return The requirement flags that are not met, or 0.
+   */
+  @RequirementFlags
+  public int getNotMetRequirements(Context context) {
+    return (!checkNetworkRequirements(context) ? getRequiredNetworkType() : 0)
+        | (!checkChargingRequirement(context) ? DEVICE_CHARGING : 0)
+        | (!checkIdleRequirement(context) ? DEVICE_IDLE : 0);
+  }
+
+  /** Returns the requirement flags. */
+  @RequirementFlags
+  public int getRequirements() {
     return requirements;
   }
 

From 9198e4cf7a27dbf0dbb81e07b7ea2824cf3c3812 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Fri, 14 Dec 2018 17:52:16 +0000
Subject: [PATCH 320/832] Make RequirementsWatcher notify listener on not met
 requirements change

PiperOrigin-RevId: 225557638
---
 .../scheduler/RequirementsWatcher.java        | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
index d1eb28cc2a..021c10439a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
@@ -44,14 +44,15 @@ public final class RequirementsWatcher {
   public interface Listener {
 
     /**
-     * Called when the requirements are met.
+     * Called when all of the requirements are met.
      *
      * @param requirementsWatcher Calling instance.
      */
     void requirementsMet(RequirementsWatcher requirementsWatcher);
 
     /**
-     * Called when the requirements are not met.
+     * Called when there is at least one not met requirement and there is a change on which of the
+     * requirements are not met.
      *
      * @param requirementsWatcher Calling instance.
      */
@@ -65,7 +66,7 @@ public final class RequirementsWatcher {
   private final Requirements requirements;
   private DeviceStatusChangeReceiver receiver;
 
-  private boolean requirementsWereMet;
+  private int notMetRequirements;
   private CapabilityValidatedCallback networkCallback;
 
   /**
@@ -87,7 +88,7 @@ public final class RequirementsWatcher {
   public void start() {
     Assertions.checkNotNull(Looper.myLooper());
 
-    requirementsWereMet = requirements.checkRequirements(context);
+    notMetRequirements = requirements.getNotMetRequirements(context);
 
     IntentFilter filter = new IntentFilter();
     if (requirements.getRequiredNetworkType() != Requirements.NETWORK_TYPE_NONE) {
@@ -159,13 +160,13 @@ public final class RequirementsWatcher {
   }
 
   private void checkRequirements() {
-    boolean requirementsAreMet = requirements.checkRequirements(context);
-    if (requirementsAreMet == requirementsWereMet) {
-      logd("requirementsAreMet is still " + requirementsAreMet);
+    int notMetRequirements = requirements.getNotMetRequirements(context);
+    if (this.notMetRequirements == notMetRequirements) {
+      logd("notMetRequirements hasn't changed: " + notMetRequirements);
       return;
     }
-    requirementsWereMet = requirementsAreMet;
-    if (requirementsAreMet) {
+    this.notMetRequirements = notMetRequirements;
+    if (notMetRequirements == 0) {
       logd("start job");
       listener.requirementsMet(this);
     } else {

From d5e53d11f7dafedb94209a82fcf6c85c7399a962 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 17 Dec 2018 10:48:01 +0000
Subject: [PATCH 321/832] Add Player.MetadataComponent for completeness

PiperOrigin-RevId: 225795581
---
 .../exoplayer2/ext/cast/CastPlayer.java       |  9 +++++++
 .../android/exoplayer2/ExoPlayerImpl.java     |  9 +++++++
 .../com/google/android/exoplayer2/Player.java | 25 +++++++++++++++++
 .../android/exoplayer2/SimpleExoPlayer.java   | 27 +++++++++++--------
 .../exoplayer2/testutil/StubExoPlayer.java    |  5 ++++
 5 files changed, 64 insertions(+), 11 deletions(-)

diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
index 584ac68305..871c28b785 100644
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
@@ -266,20 +266,29 @@ public final class CastPlayer extends BasePlayer {
   // Player implementation.
 
   @Override
+  @Nullable
   public AudioComponent getAudioComponent() {
     return null;
   }
 
   @Override
+  @Nullable
   public VideoComponent getVideoComponent() {
     return null;
   }
 
   @Override
+  @Nullable
   public TextComponent getTextComponent() {
     return null;
   }
 
+  @Override
+  @Nullable
+  public MetadataComponent getMetadataComponent() {
+    return null;
+  }
+
   @Override
   public Looper getApplicationLooper() {
     return Looper.getMainLooper();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index a56c8e3b90..05a80279a3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -145,20 +145,29 @@ import java.util.concurrent.CopyOnWriteArrayList;
   }
 
   @Override
+  @Nullable
   public AudioComponent getAudioComponent() {
     return null;
   }
 
   @Override
+  @Nullable
   public VideoComponent getVideoComponent() {
     return null;
   }
 
   @Override
+  @Nullable
   public TextComponent getTextComponent() {
     return null;
   }
 
+  @Override
+  @Nullable
+  public MetadataComponent getMetadataComponent() {
+    return null;
+  }
+
   @Override
   public Looper getPlaybackLooper() {
     return internalPlayer.getPlaybackLooper();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Player.java b/library/core/src/main/java/com/google/android/exoplayer2/Player.java
index 16f8aa2878..e3441fb2a7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Player.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Player.java
@@ -26,6 +26,7 @@ import com.google.android.exoplayer2.C.VideoScalingMode;
 import com.google.android.exoplayer2.audio.AudioAttributes;
 import com.google.android.exoplayer2.audio.AudioListener;
 import com.google.android.exoplayer2.audio.AuxEffectInfo;
+import com.google.android.exoplayer2.metadata.MetadataOutput;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.text.TextOutput;
 import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
@@ -299,6 +300,24 @@ public interface Player {
     void removeTextOutput(TextOutput listener);
   }
 
+  /** The metadata component of a {@link Player}. */
+  interface MetadataComponent {
+
+    /**
+     * Adds a {@link MetadataOutput} to receive metadata.
+     *
+     * @param output The output to register.
+     */
+    void addMetadataOutput(MetadataOutput output);
+
+    /**
+     * Removes a {@link MetadataOutput}.
+     *
+     * @param output The output to remove.
+     */
+    void removeMetadataOutput(MetadataOutput output);
+  }
+
   /**
    * Listener of changes in player state. All methods have no-op default implementations to allow
    * selective overrides.
@@ -533,6 +552,12 @@ public interface Player {
   @Nullable
   TextComponent getTextComponent();
 
+  /**
+   * Returns the component of this player for metadata output, or null if metadata is not supported.
+   */
+  @Nullable
+  MetadataComponent getMetadataComponent();
+
   /**
    * Returns the {@link Looper} associated with the application thread that's used to access the
    * player and on which player events are received.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index 4ca6b51ce2..b44259f50b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -65,7 +65,11 @@ import java.util.concurrent.CopyOnWriteArraySet;
  */
 @TargetApi(16)
 public class SimpleExoPlayer extends BasePlayer
-    implements ExoPlayer, Player.AudioComponent, Player.VideoComponent, Player.TextComponent {
+    implements ExoPlayer,
+        Player.AudioComponent,
+        Player.VideoComponent,
+        Player.TextComponent,
+        Player.MetadataComponent {
 
   /** @deprecated Use {@link com.google.android.exoplayer2.video.VideoListener}. */
   @Deprecated
@@ -243,20 +247,29 @@ public class SimpleExoPlayer extends BasePlayer
   }
 
   @Override
+  @Nullable
   public AudioComponent getAudioComponent() {
     return this;
   }
 
   @Override
+  @Nullable
   public VideoComponent getVideoComponent() {
     return this;
   }
 
   @Override
+  @Nullable
   public TextComponent getTextComponent() {
     return this;
   }
 
+  @Override
+  @Nullable
+  public MetadataComponent getMetadataComponent() {
+    return this;
+  }
+
   /**
    * Sets the video scaling mode.
    *
@@ -713,20 +726,12 @@ public class SimpleExoPlayer extends BasePlayer
     removeTextOutput(output);
   }
 
-  /**
-   * Adds a {@link MetadataOutput} to receive metadata.
-   *
-   * @param listener The output to register.
-   */
+  @Override
   public void addMetadataOutput(MetadataOutput listener) {
     metadataOutputs.add(listener);
   }
 
-  /**
-   * Removes a {@link MetadataOutput}.
-   *
-   * @param listener The output to remove.
-   */
+  @Override
   public void removeMetadataOutput(MetadataOutput listener) {
     metadataOutputs.remove(listener);
   }
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
index 1ac19591c0..a0d8c7f9d8 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
@@ -49,6 +49,11 @@ public abstract class StubExoPlayer extends BasePlayer implements ExoPlayer {
     throw new UnsupportedOperationException();
   }
 
+  @Override
+  public MetadataComponent getMetadataComponent() {
+    throw new UnsupportedOperationException();
+  }
+
   @Override
   public Looper getPlaybackLooper() {
     throw new UnsupportedOperationException();

From 8202cb2d2a58e47cd1f53a4f0a8989124ffa2df6 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Mon, 17 Dec 2018 11:10:25 +0000
Subject: [PATCH 322/832] Mitigate the need for FLAG_ALLOW_NON_IDR_KEYFRAMES

Use random access indicator in transport streams

Issue:#1967
Issue:#2020
Issue:#2182
Issue:#2469
Issue:#2581
Issue:#2748
Issue:#2939
Issue:#2979
Issue:#3316
Issue:#3574
Issue:#3709
Issue:#3747
Issue:#4103
Issue:#4184
Issue:#4355
Issue:#4538
Issue:#4719
Issue:#4861
Issue:#4925
Issue:#4951
Issue:#5108
Issue:#5186
PiperOrigin-RevId: 225798044
---
 RELEASENOTES.md                               |  2 +
 .../exoplayer2/extractor/ts/Ac3Extractor.java |  4 +-
 .../exoplayer2/extractor/ts/Ac3Reader.java    |  2 +-
 .../extractor/ts/AdtsExtractor.java           |  4 +-
 .../exoplayer2/extractor/ts/AdtsReader.java   |  2 +-
 .../exoplayer2/extractor/ts/DtsReader.java    |  2 +-
 .../extractor/ts/DvbSubtitleReader.java       |  6 +-
 .../extractor/ts/ElementaryStreamReader.java  |  4 +-
 .../exoplayer2/extractor/ts/H262Reader.java   |  3 +-
 .../exoplayer2/extractor/ts/H264Reader.java   | 91 +++++++++++++------
 .../exoplayer2/extractor/ts/H265Reader.java   |  3 +-
 .../exoplayer2/extractor/ts/Id3Reader.java    |  6 +-
 .../exoplayer2/extractor/ts/LatmReader.java   |  2 +-
 .../extractor/ts/MpegAudioReader.java         |  2 +-
 .../exoplayer2/extractor/ts/PesReader.java    |  8 +-
 .../exoplayer2/extractor/ts/PsExtractor.java  |  2 +-
 .../extractor/ts/SectionReader.java           |  3 +-
 .../exoplayer2/extractor/ts/TsExtractor.java  | 16 +++-
 .../extractor/ts/TsPayloadReader.java         | 40 ++++++--
 .../extractor/ts/AdtsReaderTest.java          |  4 +-
 .../extractor/ts/SectionReaderTest.java       | 31 ++++---
 .../extractor/ts/TsExtractorTest.java         |  2 +-
 22 files changed, 161 insertions(+), 78 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index aca11cb403..cc604b5a5a 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,6 +2,8 @@
 
 ### dev-v2 (not yet released) ###
 
+* Use Transport Stream's random access indicator to minimize the need for
+  FLAG_ALLOW_NON_IDR_KEYFRAMES.
 * Support for playing spherical videos on Daydream.
 * Improve decoder re-use between playbacks. TODO: Write and link a blog post
   here ([#2826](https://github.com/google/ExoPlayer/issues/2826)).
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Extractor.java
index 93ce15a7ab..3741d52294 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Extractor.java
@@ -15,6 +15,8 @@
  */
 package com.google.android.exoplayer2.extractor.ts;
 
+import static com.google.android.exoplayer2.extractor.ts.TsPayloadReader.FLAG_DATA_ALIGNMENT_INDICATOR;
+
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.audio.Ac3Util;
 import com.google.android.exoplayer2.extractor.Extractor;
@@ -140,7 +142,7 @@ public final class Ac3Extractor implements Extractor {
 
     if (!startedPacket) {
       // Pass data to the reader as though it's contained within a single infinitely long packet.
-      reader.packetStarted(firstSampleTimestampUs, true);
+      reader.packetStarted(firstSampleTimestampUs, FLAG_DATA_ALIGNMENT_INDICATOR);
       startedPacket = true;
     }
     // TODO: Make it possible for the reader to consume the dataSource directly, so that it becomes
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java
index 2ef9704a7a..93724be92d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java
@@ -100,7 +100,7 @@ public final class Ac3Reader implements ElementaryStreamReader {
   }
 
   @Override
-  public void packetStarted(long pesTimeUs, boolean dataAlignmentIndicator) {
+  public void packetStarted(long pesTimeUs, @TsPayloadReader.Flags int flags) {
     timeUs = pesTimeUs;
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java
index 04a6b571bd..77b79fa19f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java
@@ -15,6 +15,8 @@
  */
 package com.google.android.exoplayer2.extractor.ts;
 
+import static com.google.android.exoplayer2.extractor.ts.TsPayloadReader.FLAG_DATA_ALIGNMENT_INDICATOR;
+
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
@@ -202,7 +204,7 @@ public final class AdtsExtractor implements Extractor {
 
     if (!startedPacket) {
       // Pass data to the reader as though it's contained within a single infinitely long packet.
-      reader.packetStarted(firstSampleTimestampUs, true);
+      reader.packetStarted(firstSampleTimestampUs, FLAG_DATA_ALIGNMENT_INDICATOR);
       startedPacket = true;
     }
     // TODO: Make it possible for reader to consume the dataSource directly, so that it becomes
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java
index e31f67c77c..589b543170 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java
@@ -141,7 +141,7 @@ public final class AdtsReader implements ElementaryStreamReader {
   }
 
   @Override
-  public void packetStarted(long pesTimeUs, boolean dataAlignmentIndicator) {
+  public void packetStarted(long pesTimeUs, @TsPayloadReader.Flags int flags) {
     timeUs = pesTimeUs;
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DtsReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DtsReader.java
index 2e45853951..1f9b0e79d4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DtsReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DtsReader.java
@@ -80,7 +80,7 @@ public final class DtsReader implements ElementaryStreamReader {
   }
 
   @Override
-  public void packetStarted(long pesTimeUs, boolean dataAlignmentIndicator) {
+  public void packetStarted(long pesTimeUs, @TsPayloadReader.Flags int flags) {
     timeUs = pesTimeUs;
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DvbSubtitleReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DvbSubtitleReader.java
index 0944d1810e..3f0a772b1c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DvbSubtitleReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DvbSubtitleReader.java
@@ -15,6 +15,8 @@
  */
 package com.google.android.exoplayer2.extractor.ts;
 
+import static com.google.android.exoplayer2.extractor.ts.TsPayloadReader.FLAG_DATA_ALIGNMENT_INDICATOR;
+
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.extractor.ExtractorOutput;
@@ -73,8 +75,8 @@ public final class DvbSubtitleReader implements ElementaryStreamReader {
   }
 
   @Override
-  public void packetStarted(long pesTimeUs, boolean dataAlignmentIndicator) {
-    if (!dataAlignmentIndicator) {
+  public void packetStarted(long pesTimeUs, @TsPayloadReader.Flags int flags) {
+    if ((flags & FLAG_DATA_ALIGNMENT_INDICATOR) == 0) {
       return;
     }
     writingSample = true;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/ElementaryStreamReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/ElementaryStreamReader.java
index fa7f78c8c0..e022fc237b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/ElementaryStreamReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/ElementaryStreamReader.java
@@ -43,9 +43,9 @@ public interface ElementaryStreamReader {
    * Called when a packet starts.
    *
    * @param pesTimeUs The timestamp associated with the packet.
-   * @param dataAlignmentIndicator The data alignment indicator associated with the packet.
+   * @param flags See {@link TsPayloadReader.Flags}.
    */
-  void packetStarted(long pesTimeUs, boolean dataAlignmentIndicator);
+  void packetStarted(long pesTimeUs, @TsPayloadReader.Flags int flags);
 
   /**
    * Consumes (possibly partial) data from the current packet.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H262Reader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H262Reader.java
index e9827893ee..1564157d44 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H262Reader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H262Reader.java
@@ -107,7 +107,8 @@ public final class H262Reader implements ElementaryStreamReader {
   }
 
   @Override
-  public void packetStarted(long pesTimeUs, boolean dataAlignmentIndicator) {
+  public void packetStarted(long pesTimeUs, @TsPayloadReader.Flags int flags) {
+    // TODO (Internal b/32267012): Consider using random access indicator.
     this.pesTimeUs = pesTimeUs;
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H264Reader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H264Reader.java
index 45e094f69d..d249c1b9da 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H264Reader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H264Reader.java
@@ -15,6 +15,8 @@
  */
 package com.google.android.exoplayer2.extractor.ts;
 
+import static com.google.android.exoplayer2.extractor.ts.TsPayloadReader.FLAG_RANDOM_ACCESS_INDICATOR;
+
 import android.util.SparseArray;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
@@ -56,9 +58,12 @@ public final class H264Reader implements ElementaryStreamReader {
   // State that should not be reset on seek.
   private boolean hasOutputFormat;
 
-  // Per packet state that gets reset at the start of each packet.
+  // Per PES packet state that gets reset at the start of each PES packet.
   private long pesTimeUs;
 
+  // State inherited from the TS packet header.
+  private boolean randomAccessIndicator;
+
   // Scratch variables to avoid allocations.
   private final ParsableByteArray seiWrapper;
 
@@ -88,6 +93,7 @@ public final class H264Reader implements ElementaryStreamReader {
     sei.reset();
     sampleReader.reset();
     totalBytesWritten = 0;
+    randomAccessIndicator = false;
   }
 
   @Override
@@ -100,8 +106,9 @@ public final class H264Reader implements ElementaryStreamReader {
   }
 
   @Override
-  public void packetStarted(long pesTimeUs, boolean dataAlignmentIndicator) {
+  public void packetStarted(long pesTimeUs, @TsPayloadReader.Flags int flags) {
     this.pesTimeUs = pesTimeUs;
+    randomAccessIndicator |= (flags & FLAG_RANDOM_ACCESS_INDICATOR) != 0;
   }
 
   @Override
@@ -220,12 +227,17 @@ public final class H264Reader implements ElementaryStreamReader {
       seiWrapper.setPosition(4); // NAL prefix and nal_unit() header.
       seiReader.consume(pesTimeUs, seiWrapper);
     }
-    sampleReader.endNalUnit(position, offset);
+    boolean sampleIsKeyFrame =
+        sampleReader.endNalUnit(position, offset, hasOutputFormat, randomAccessIndicator);
+    if (sampleIsKeyFrame) {
+      // This is either an IDR frame or the first I-frame since the random access indicator, so mark
+      // it as a keyframe. Clear the flag so that subsequent non-IDR I-frames are not marked as
+      // keyframes until we see another random access indicator.
+      randomAccessIndicator = false;
+    }
   }
 
-  /**
-   * Consumes a stream of NAL units and outputs samples.
-   */
+  /** Consumes a stream of NAL units and outputs samples. */
   private static final class SampleReader {
 
     private static final int DEFAULT_BUFFER_SIZE = 128;
@@ -430,11 +442,12 @@ public final class H264Reader implements ElementaryStreamReader {
       isFilling = false;
     }
 
-    public void endNalUnit(long position, int offset) {
+    public boolean endNalUnit(
+        long position, int offset, boolean hasOutputFormat, boolean randomAccessIndicator) {
       if (nalUnitType == NAL_UNIT_TYPE_AUD
           || (detectAccessUnits && sliceHeader.isFirstVclNalUnitOfPicture(previousSliceHeader))) {
         // If the NAL unit ending is the start of a new sample, output the previous one.
-        if (readingSample) {
+        if (hasOutputFormat && readingSample) {
           int nalUnitLength = (int) (position - nalUnitStartPosition);
           outputSample(offset + nalUnitLength);
         }
@@ -443,8 +456,12 @@ public final class H264Reader implements ElementaryStreamReader {
         sampleIsKeyframe = false;
         readingSample = true;
       }
-      sampleIsKeyframe |= nalUnitType == NAL_UNIT_TYPE_IDR || (allowNonIdrKeyframes
-          && nalUnitType == NAL_UNIT_TYPE_NON_IDR && sliceHeader.isISlice());
+      boolean treatIFrameAsKeyframe =
+          allowNonIdrKeyframes ? sliceHeader.isISlice() : randomAccessIndicator;
+      sampleIsKeyframe |=
+          nalUnitType == NAL_UNIT_TYPE_IDR
+              || (treatIFrameAsKeyframe && nalUnitType == NAL_UNIT_TYPE_NON_IDR);
+      return sampleIsKeyframe;
     }
 
     private void outputSample(int offset) {
@@ -486,10 +503,21 @@ public final class H264Reader implements ElementaryStreamReader {
         hasSliceType = true;
       }
 
-      public void setAll(SpsData spsData, int nalRefIdc, int sliceType, int frameNum,
-          int picParameterSetId, boolean fieldPicFlag, boolean bottomFieldFlagPresent,
-          boolean bottomFieldFlag, boolean idrPicFlag, int idrPicId, int picOrderCntLsb,
-          int deltaPicOrderCntBottom, int deltaPicOrderCnt0, int deltaPicOrderCnt1) {
+      public void setAll(
+          SpsData spsData,
+          int nalRefIdc,
+          int sliceType,
+          int frameNum,
+          int picParameterSetId,
+          boolean fieldPicFlag,
+          boolean bottomFieldFlagPresent,
+          boolean bottomFieldFlag,
+          boolean idrPicFlag,
+          int idrPicId,
+          int picOrderCntLsb,
+          int deltaPicOrderCntBottom,
+          int deltaPicOrderCnt0,
+          int deltaPicOrderCnt1) {
         this.spsData = spsData;
         this.nalRefIdc = nalRefIdc;
         this.sliceType = sliceType;
@@ -514,23 +542,26 @@ public final class H264Reader implements ElementaryStreamReader {
 
       private boolean isFirstVclNalUnitOfPicture(SliceHeaderData other) {
         // See ISO 14496-10 subsection 7.4.1.2.4.
-        return isComplete && (!other.isComplete || frameNum != other.frameNum
-            || picParameterSetId != other.picParameterSetId || fieldPicFlag != other.fieldPicFlag
-            || (bottomFieldFlagPresent && other.bottomFieldFlagPresent
-                && bottomFieldFlag != other.bottomFieldFlag)
-            || (nalRefIdc != other.nalRefIdc && (nalRefIdc == 0 || other.nalRefIdc == 0))
-            || (spsData.picOrderCountType == 0 && other.spsData.picOrderCountType == 0
-                && (picOrderCntLsb != other.picOrderCntLsb
-                    || deltaPicOrderCntBottom != other.deltaPicOrderCntBottom))
-            || (spsData.picOrderCountType == 1 && other.spsData.picOrderCountType == 1
-                && (deltaPicOrderCnt0 != other.deltaPicOrderCnt0
-                    || deltaPicOrderCnt1 != other.deltaPicOrderCnt1))
-            || idrPicFlag != other.idrPicFlag
-            || (idrPicFlag && other.idrPicFlag && idrPicId != other.idrPicId));
+        return isComplete
+            && (!other.isComplete
+                || frameNum != other.frameNum
+                || picParameterSetId != other.picParameterSetId
+                || fieldPicFlag != other.fieldPicFlag
+                || (bottomFieldFlagPresent
+                    && other.bottomFieldFlagPresent
+                    && bottomFieldFlag != other.bottomFieldFlag)
+                || (nalRefIdc != other.nalRefIdc && (nalRefIdc == 0 || other.nalRefIdc == 0))
+                || (spsData.picOrderCountType == 0
+                    && other.spsData.picOrderCountType == 0
+                    && (picOrderCntLsb != other.picOrderCntLsb
+                        || deltaPicOrderCntBottom != other.deltaPicOrderCntBottom))
+                || (spsData.picOrderCountType == 1
+                    && other.spsData.picOrderCountType == 1
+                    && (deltaPicOrderCnt0 != other.deltaPicOrderCnt0
+                        || deltaPicOrderCnt1 != other.deltaPicOrderCnt1))
+                || idrPicFlag != other.idrPicFlag
+                || (idrPicFlag && other.idrPicFlag && idrPicId != other.idrPicId));
       }
-
     }
-
   }
-
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java
index 13d679c47c..88bde53746 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java
@@ -104,7 +104,8 @@ public final class H265Reader implements ElementaryStreamReader {
   }
 
   @Override
-  public void packetStarted(long pesTimeUs, boolean dataAlignmentIndicator) {
+  public void packetStarted(long pesTimeUs, @TsPayloadReader.Flags int flags) {
+    // TODO (Internal b/32267012): Consider using random access indicator.
     this.pesTimeUs = pesTimeUs;
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Id3Reader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Id3Reader.java
index 0f0f2ad981..f936fb9e43 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Id3Reader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Id3Reader.java
@@ -15,6 +15,8 @@
  */
 package com.google.android.exoplayer2.extractor.ts;
 
+import static com.google.android.exoplayer2.extractor.ts.TsPayloadReader.FLAG_DATA_ALIGNMENT_INDICATOR;
+
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.extractor.ExtractorOutput;
@@ -63,8 +65,8 @@ public final class Id3Reader implements ElementaryStreamReader {
   }
 
   @Override
-  public void packetStarted(long pesTimeUs, boolean dataAlignmentIndicator) {
-    if (!dataAlignmentIndicator) {
+  public void packetStarted(long pesTimeUs, @TsPayloadReader.Flags int flags) {
+    if ((flags & FLAG_DATA_ALIGNMENT_INDICATOR) == 0) {
       return;
     }
     writingSample = true;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/LatmReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/LatmReader.java
index f401a6e736..2a633c191d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/LatmReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/LatmReader.java
@@ -93,7 +93,7 @@ public final class LatmReader implements ElementaryStreamReader {
   }
 
   @Override
-  public void packetStarted(long pesTimeUs, boolean dataAlignmentIndicator) {
+  public void packetStarted(long pesTimeUs, @TsPayloadReader.Flags int flags) {
     timeUs = pesTimeUs;
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/MpegAudioReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/MpegAudioReader.java
index effa7d7c96..393e297818 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/MpegAudioReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/MpegAudioReader.java
@@ -83,7 +83,7 @@ public final class MpegAudioReader implements ElementaryStreamReader {
   }
 
   @Override
-  public void packetStarted(long pesTimeUs, boolean dataAlignmentIndicator) {
+  public void packetStarted(long pesTimeUs, @TsPayloadReader.Flags int flags) {
     timeUs = pesTimeUs;
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PesReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PesReader.java
index 91cd548367..ff755f4ece 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PesReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PesReader.java
@@ -78,9 +78,8 @@ public final class PesReader implements TsPayloadReader {
   }
 
   @Override
-  public final void consume(ParsableByteArray data, boolean payloadUnitStartIndicator)
-      throws ParserException {
-    if (payloadUnitStartIndicator) {
+  public final void consume(ParsableByteArray data, @Flags int flags) throws ParserException {
+    if ((flags & FLAG_PAYLOAD_UNIT_START_INDICATOR) != 0) {
       switch (state) {
         case STATE_FINDING_HEADER:
         case STATE_READING_HEADER:
@@ -122,7 +121,8 @@ public final class PesReader implements TsPayloadReader {
           if (continueRead(data, pesScratch.data, readLength)
               && continueRead(data, null, extendedHeaderLength)) {
             parseHeaderExtension();
-            reader.packetStarted(timeUs, dataAlignmentIndicator);
+            flags |= dataAlignmentIndicator ? FLAG_DATA_ALIGNMENT_INDICATOR : 0;
+            reader.packetStarted(timeUs, flags);
             setState(STATE_READING_BODY);
           }
           break;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java
index c7a082aeac..f453a9cc43 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java
@@ -343,7 +343,7 @@ public final class PsExtractor implements Extractor {
       data.readBytes(pesScratch.data, 0, extendedHeaderLength);
       pesScratch.setPosition(0);
       parseHeaderExtension();
-      pesPayloadReader.packetStarted(timeUs, true);
+      pesPayloadReader.packetStarted(timeUs, TsPayloadReader.FLAG_DATA_ALIGNMENT_INDICATOR);
       pesPayloadReader.consume(data);
       // We always have complete PES packets with program stream.
       pesPayloadReader.packetFinished();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionReader.java
index d217cfcb7a..101a1f74d9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionReader.java
@@ -57,7 +57,8 @@ public final class SectionReader implements TsPayloadReader {
   }
 
   @Override
-  public void consume(ParsableByteArray data, boolean payloadUnitStartIndicator) {
+  public void consume(ParsableByteArray data, @Flags int flags) {
+    boolean payloadUnitStartIndicator = (flags & FLAG_PAYLOAD_UNIT_START_INDICATOR) != 0;
     int payloadStartPosition = C.POSITION_UNSET;
     if (payloadUnitStartIndicator) {
       int payloadStartOffset = data.readUnsignedByte();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java
index f47a481d7e..d91842423d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java
@@ -15,6 +15,8 @@
  */
 package com.google.android.exoplayer2.extractor.ts;
 
+import static com.google.android.exoplayer2.extractor.ts.TsPayloadReader.FLAG_PAYLOAD_UNIT_START_INDICATOR;
+
 import android.support.annotation.IntDef;
 import android.util.SparseArray;
 import android.util.SparseBooleanArray;
@@ -279,6 +281,8 @@ public final class TsExtractor implements Extractor {
       return RESULT_CONTINUE;
     }
 
+    @TsPayloadReader.Flags int packetHeaderFlags = 0;
+
     // Note: See ISO/IEC 13818-1, section 2.4.3.2 for details of the header format.
     int tsPacketHeader = tsPacketBuffer.readInt();
     if ((tsPacketHeader & 0x800000) != 0) { // transport_error_indicator
@@ -286,7 +290,7 @@ public final class TsExtractor implements Extractor {
       tsPacketBuffer.setPosition(endOfPacket);
       return RESULT_CONTINUE;
     }
-    boolean payloadUnitStartIndicator = (tsPacketHeader & 0x400000) != 0;
+    packetHeaderFlags |= (tsPacketHeader & 0x400000) != 0 ? FLAG_PAYLOAD_UNIT_START_INDICATOR : 0;
     // Ignoring transport_priority (tsPacketHeader & 0x200000)
     int pid = (tsPacketHeader & 0x1FFF00) >> 8;
     // Ignoring transport_scrambling_control (tsPacketHeader & 0xC0)
@@ -317,14 +321,20 @@ public final class TsExtractor implements Extractor {
     // Skip the adaptation field.
     if (adaptationFieldExists) {
       int adaptationFieldLength = tsPacketBuffer.readUnsignedByte();
-      tsPacketBuffer.skipBytes(adaptationFieldLength);
+      int adaptationFieldFlags = tsPacketBuffer.readUnsignedByte();
+
+      packetHeaderFlags |=
+          (adaptationFieldFlags & 0x40) != 0 // random_access_indicator.
+              ? TsPayloadReader.FLAG_RANDOM_ACCESS_INDICATOR
+              : 0;
+      tsPacketBuffer.skipBytes(adaptationFieldLength - 1 /* flags */);
     }
 
     // Read the payload.
     boolean wereTracksEnded = tracksEnded;
     if (shouldConsumePacketPayload(pid)) {
       tsPacketBuffer.setLimit(endOfPacket);
-      payloadReader.consume(tsPacketBuffer, payloadUnitStartIndicator);
+      payloadReader.consume(tsPacketBuffer, packetHeaderFlags);
       tsPacketBuffer.setLimit(limit);
     }
     if (mode != MODE_HLS && !wereTracksEnded && tracksEnded && inputLength != C.LENGTH_UNSET) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsPayloadReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsPayloadReader.java
index 2ea25bb2e0..a034b05696 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsPayloadReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsPayloadReader.java
@@ -15,12 +15,16 @@
  */
 package com.google.android.exoplayer2.extractor.ts;
 
+import android.support.annotation.IntDef;
 import android.util.SparseArray;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.extractor.ExtractorOutput;
 import com.google.android.exoplayer2.extractor.TrackOutput;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.TimestampAdjuster;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.util.Collections;
 import java.util.List;
 
@@ -174,6 +178,29 @@ public interface TsPayloadReader {
 
   }
 
+  /**
+   * Contextual flags indicating the presence of indicators in the TS packet or PES packet headers.
+   */
+  @Documented
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef(
+      flag = true,
+      value = {
+        FLAG_PAYLOAD_UNIT_START_INDICATOR,
+        FLAG_RANDOM_ACCESS_INDICATOR,
+        FLAG_DATA_ALIGNMENT_INDICATOR
+      })
+  @interface Flags {}
+
+  /** Indicates the presence of the payload_unit_start_indicator in the TS packet header. */
+  int FLAG_PAYLOAD_UNIT_START_INDICATOR = 1;
+  /**
+   * Indicates the presence of the random_access_indicator in the TS packet header adaptation field.
+   */
+  int FLAG_RANDOM_ACCESS_INDICATOR = 1 << 1;
+  /** Indicates the presence of the data_alignment_indicator in the PES header. */
+  int FLAG_DATA_ALIGNMENT_INDICATOR = 1 << 2;
+
   /**
    * Initializes the payload reader.
    *
@@ -187,10 +214,10 @@ public interface TsPayloadReader {
 
   /**
    * Notifies the reader that a seek has occurred.
-   * <p>
-   * Following a call to this method, the data passed to the next invocation of
-   * {@link #consume(ParsableByteArray, boolean)} will not be a continuation of the data that was
-   * previously passed. Hence the reader should reset any internal state.
+   *
+   * <p>Following a call to this method, the data passed to the next invocation of {@link #consume}
+   * will not be a continuation of the data that was previously passed. Hence the reader should
+   * reset any internal state.
    */
   void seek();
 
@@ -198,9 +225,8 @@ public interface TsPayloadReader {
    * Consumes the payload of a TS packet.
    *
    * @param data The TS packet. The position will be set to the start of the payload.
-   * @param payloadUnitStartIndicator Whether payloadUnitStartIndicator was set on the TS packet.
+   * @param flags See {@link Flags}.
    * @throws ParserException If the payload could not be parsed.
    */
-  void consume(ParsableByteArray data, boolean payloadUnitStartIndicator) throws ParserException;
-
+  void consume(ParsableByteArray data, @Flags int flags) throws ParserException;
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java
index f7cfd6ccaf..62da914f5b 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java
@@ -15,6 +15,8 @@
  */
 package com.google.android.exoplayer2.extractor.ts;
 
+import static com.google.android.exoplayer2.extractor.ts.TsPayloadReader.FLAG_DATA_ALIGNMENT_INDICATOR;
+
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.TrackIdGenerator;
@@ -198,7 +200,7 @@ public class AdtsReaderTest {
 
   private void maybeStartPacket() {
     if (firstFeed) {
-      adtsReader.packetStarted(0, true);
+      adtsReader.packetStarted(0, FLAG_DATA_ALIGNMENT_INDICATOR);
       firstFeed = false;
     }
   }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java
index 713d986d21..7bff736b4a 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor.ts;
 
+import static com.google.android.exoplayer2.extractor.ts.TsPayloadReader.FLAG_PAYLOAD_UNIT_START_INDICATOR;
 import static com.google.common.truth.Truth.assertThat;
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
@@ -55,7 +56,7 @@ public final class SectionReaderTest {
   public void testSingleOnePacketSection() {
     packetPayload[0] = 3;
     insertTableSection(4, (byte) 99, 3);
-    reader.consume(new ParsableByteArray(packetPayload), true);
+    reader.consume(new ParsableByteArray(packetPayload), FLAG_PAYLOAD_UNIT_START_INDICATOR);
     assertThat(payloadReader.parsedTableIds).isEqualTo(singletonList(99));
   }
 
@@ -65,12 +66,12 @@ public final class SectionReaderTest {
     insertTableSection(4, (byte) 100, 3); // This section header spreads across both packets.
 
     ParsableByteArray firstPacket = new ParsableByteArray(packetPayload, 5);
-    reader.consume(firstPacket, true);
+    reader.consume(firstPacket, FLAG_PAYLOAD_UNIT_START_INDICATOR);
     assertThat(payloadReader.parsedTableIds).isEmpty();
 
     ParsableByteArray secondPacket = new ParsableByteArray(packetPayload);
     secondPacket.setPosition(5);
-    reader.consume(secondPacket, false);
+    reader.consume(secondPacket, /* flags= */ 0);
     assertThat(payloadReader.parsedTableIds).isEqualTo(singletonList(100));
   }
 
@@ -85,12 +86,12 @@ public final class SectionReaderTest {
     insertTableSection(54, (byte) 105, 10);
 
     ParsableByteArray firstPacket = new ParsableByteArray(packetPayload, 40);
-    reader.consume(firstPacket, true);
+    reader.consume(firstPacket, FLAG_PAYLOAD_UNIT_START_INDICATOR);
     assertThat(payloadReader.parsedTableIds).isEqualTo(asList(101, 102, 103));
 
     ParsableByteArray secondPacket = new ParsableByteArray(packetPayload);
     secondPacket.setPosition(40);
-    reader.consume(secondPacket, true);
+    reader.consume(secondPacket, FLAG_PAYLOAD_UNIT_START_INDICATOR);
     assertThat(payloadReader.parsedTableIds).isEqualTo(asList(101, 102, 103, 104, 105));
   }
 
@@ -105,22 +106,22 @@ public final class SectionReaderTest {
     insertTableSection(318, (byte) 108, 10);
 
     ParsableByteArray firstPacket = new ParsableByteArray(packetPayload, 100);
-    reader.consume(firstPacket, true);
+    reader.consume(firstPacket, FLAG_PAYLOAD_UNIT_START_INDICATOR);
     assertThat(payloadReader.parsedTableIds).isEmpty();
 
     ParsableByteArray secondPacket = new ParsableByteArray(packetPayload, 200);
     secondPacket.setPosition(100);
-    reader.consume(secondPacket, false);
+    reader.consume(secondPacket, /* flags= */ 0);
     assertThat(payloadReader.parsedTableIds).isEmpty();
 
     ParsableByteArray thirdPacket = new ParsableByteArray(packetPayload, 300);
     thirdPacket.setPosition(200);
-    reader.consume(thirdPacket, false);
+    reader.consume(thirdPacket, /* flags= */ 0);
     assertThat(payloadReader.parsedTableIds).isEmpty();
 
     ParsableByteArray fourthPacket = new ParsableByteArray(packetPayload);
     fourthPacket.setPosition(300);
-    reader.consume(fourthPacket, true);
+    reader.consume(fourthPacket, FLAG_PAYLOAD_UNIT_START_INDICATOR);
     assertThat(payloadReader.parsedTableIds).isEqualTo(asList(107, 108));
   }
 
@@ -135,24 +136,24 @@ public final class SectionReaderTest {
     insertTableSection(318, (byte) 111, 10);
 
     ParsableByteArray firstPacket = new ParsableByteArray(packetPayload, 100);
-    reader.consume(firstPacket, true);
+    reader.consume(firstPacket, FLAG_PAYLOAD_UNIT_START_INDICATOR);
     assertThat(payloadReader.parsedTableIds).isEmpty();
 
     ParsableByteArray secondPacket = new ParsableByteArray(packetPayload, 200);
     secondPacket.setPosition(100);
-    reader.consume(secondPacket, false);
+    reader.consume(secondPacket, /* flags= */ 0);
     assertThat(payloadReader.parsedTableIds).isEmpty();
 
     ParsableByteArray thirdPacket = new ParsableByteArray(packetPayload, 300);
     thirdPacket.setPosition(200);
-    reader.consume(thirdPacket, false);
+    reader.consume(thirdPacket, /* flags= */ 0);
     assertThat(payloadReader.parsedTableIds).isEmpty();
 
     reader.seek();
 
     ParsableByteArray fourthPacket = new ParsableByteArray(packetPayload);
     fourthPacket.setPosition(300);
-    reader.consume(fourthPacket, true);
+    reader.consume(fourthPacket, FLAG_PAYLOAD_UNIT_START_INDICATOR);
     assertThat(payloadReader.parsedTableIds).isEqualTo(singletonList(111));
   }
 
@@ -165,9 +166,9 @@ public final class SectionReaderTest {
     byte[] incorrectCrcPat = Arrays.copyOf(correctCrcPat, correctCrcPat.length);
     // Crc field is incorrect, and should not be passed to the payload reader.
     incorrectCrcPat[16]--;
-    reader.consume(new ParsableByteArray(correctCrcPat), true);
+    reader.consume(new ParsableByteArray(correctCrcPat), FLAG_PAYLOAD_UNIT_START_INDICATOR);
     assertThat(payloadReader.parsedTableIds).isEqualTo(singletonList(0));
-    reader.consume(new ParsableByteArray(incorrectCrcPat), true);
+    reader.consume(new ParsableByteArray(incorrectCrcPat), FLAG_PAYLOAD_UNIT_START_INDICATOR);
     assertThat(payloadReader.parsedTableIds).isEqualTo(singletonList(0));
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java
index 332fbe384a..beaa5ffa83 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java
@@ -202,7 +202,7 @@ public final class TsExtractorTest {
     }
 
     @Override
-    public void packetStarted(long pesTimeUs, boolean dataAlignmentIndicator) {}
+    public void packetStarted(long pesTimeUs, @TsPayloadReader.Flags int flags) {}
 
     @Override
     public void consume(ParsableByteArray data) {}

From ee14b1fa40c91fd79dec87ac424d1b7adc83c320 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 17 Dec 2018 13:29:56 +0000
Subject: [PATCH 323/832] Add test for SsMediaPeriod.getStreamKeys

PiperOrigin-RevId: 225811310
---
 .../smoothstreaming/SsMediaPeriodTest.java    | 118 ++++++++++++++++++
 .../source/smoothstreaming/SsTestUtils.java   |  85 +++++++++++++
 .../manifest/SsManifestTest.java              |  42 ++-----
 3 files changed, 215 insertions(+), 30 deletions(-)
 create mode 100644 library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriodTest.java
 create mode 100644 library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsTestUtils.java

diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriodTest.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriodTest.java
new file mode 100644
index 0000000000..f4feef3949
--- /dev/null
+++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriodTest.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.source.smoothstreaming;
+
+import static com.google.android.exoplayer2.source.smoothstreaming.SsTestUtils.createSsManifest;
+import static com.google.android.exoplayer2.source.smoothstreaming.SsTestUtils.createStreamElement;
+import static org.mockito.Mockito.mock;
+
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.source.CompositeSequenceableLoaderFactory;
+import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
+import com.google.android.exoplayer2.source.MediaSourceEventListener.EventDispatcher;
+import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest;
+import com.google.android.exoplayer2.testutil.MediaPeriodAsserts;
+import com.google.android.exoplayer2.testutil.MediaPeriodAsserts.FilterableManifestMediaPeriodFactory;
+import com.google.android.exoplayer2.testutil.RobolectricUtil;
+import com.google.android.exoplayer2.upstream.Allocator;
+import com.google.android.exoplayer2.upstream.LoadErrorHandlingPolicy;
+import com.google.android.exoplayer2.upstream.LoaderErrorThrower;
+import com.google.android.exoplayer2.upstream.TransferListener;
+import com.google.android.exoplayer2.util.MimeTypes;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/** Unit tests for {@link SsMediaPeriod}. */
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {RobolectricUtil.CustomLooper.class, RobolectricUtil.CustomMessageQueue.class})
+public class SsMediaPeriodTest {
+
+  @Test
+  public void getSteamKeys_isCompatibleWithSsManifestFilter() {
+    SsManifest testManifest =
+        createSsManifest(
+            createStreamElement(
+                /* name= */ "video",
+                C.TRACK_TYPE_VIDEO,
+                createVideoFormat(/* bitrate= */ 200000),
+                createVideoFormat(/* bitrate= */ 400000),
+                createVideoFormat(/* bitrate= */ 800000)),
+            createStreamElement(
+                /* name= */ "audio",
+                C.TRACK_TYPE_AUDIO,
+                createAudioFormat(/* bitrate= */ 48000),
+                createAudioFormat(/* bitrate= */ 96000)),
+            createStreamElement(
+                /* name= */ "text", C.TRACK_TYPE_TEXT, createTextFormat(/* language= */ "eng")));
+    FilterableManifestMediaPeriodFactory<SsManifest> mediaPeriodFactory =
+        manifest ->
+            new SsMediaPeriod(
+                manifest,
+                mock(SsChunkSource.Factory.class),
+                mock(TransferListener.class),
+                mock(CompositeSequenceableLoaderFactory.class),
+                mock(LoadErrorHandlingPolicy.class),
+                new EventDispatcher()
+                    .withParameters(
+                        /* windowIndex= */ 0,
+                        /* mediaPeriodId= */ new MediaPeriodId(/* periodUid= */ new Object()),
+                        /* mediaTimeOffsetMs= */ 0),
+                mock(LoaderErrorThrower.class),
+                mock(Allocator.class));
+
+    MediaPeriodAsserts.assertGetStreamKeysAndManifestFilterIntegration(
+        mediaPeriodFactory, testManifest);
+  }
+
+  private static Format createVideoFormat(int bitrate) {
+    return Format.createContainerFormat(
+        /* id= */ null,
+        /* label= */ null,
+        MimeTypes.VIDEO_MP4,
+        MimeTypes.VIDEO_H264,
+        /* codecs= */ null,
+        bitrate,
+        /* selectionFlags= */ 0,
+        /* language= */ null);
+  }
+
+  private static Format createAudioFormat(int bitrate) {
+    return Format.createContainerFormat(
+        /* id= */ null,
+        /* label= */ null,
+        MimeTypes.AUDIO_MP4,
+        MimeTypes.AUDIO_AAC,
+        /* codecs= */ null,
+        bitrate,
+        /* selectionFlags= */ 0,
+        /* language= */ null);
+  }
+
+  private static Format createTextFormat(String language) {
+    return Format.createContainerFormat(
+        /* id= */ null,
+        /* label= */ null,
+        MimeTypes.APPLICATION_MP4,
+        MimeTypes.TEXT_VTT,
+        /* codecs= */ null,
+        /* bitrate= */ Format.NO_VALUE,
+        /* selectionFlags= */ 0,
+        language);
+  }
+}
diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsTestUtils.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsTestUtils.java
new file mode 100644
index 0000000000..4a2b23edc4
--- /dev/null
+++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsTestUtils.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.source.smoothstreaming;
+
+import android.util.Base64;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest;
+import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest.ProtectionElement;
+import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest.StreamElement;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+
+/** Util methods for SmoothStreaming tests. */
+public class SsTestUtils {
+
+  private static final int TEST_MAJOR_VERSION = 1;
+  private static final int TEST_MINOR_VERSION = 2;
+  private static final int TEST_TIMESCALE = 1000;
+  private static final int TEST_DURATION = 5000;
+  private static final int TEST_DVR_WINDOW_LENGTH = 0;
+  private static final int TEST_LOOKAHEAD_COUNT = 0;
+  private static final boolean TEST_IS_LIVE = false;
+  private static final String TEST_BASE_URI = "baseUri";
+  private static final String TEST_CHUNK_TEMPLATE = "chunkTemplate";
+  private static final String TEST_SUB_TYPE = "subType";
+  private static final int TEST_MAX_WIDTH = 1024;
+  private static final int TEST_MAX_HEIGHT = 768;
+  private static final String TEST_LANGUAGE = "eng";
+  private static final ProtectionElement TEST_PROTECTION_ELEMENT =
+      new ProtectionElement(
+          C.WIDEVINE_UUID,
+          ("<KID>"
+                  + Base64.encodeToString(new byte[] {0, 1, 2, 3, 4, 5, 6, 7}, Base64.DEFAULT)
+                  + "</KID>")
+              .getBytes(StandardCharsets.UTF_16LE));
+
+  private SsTestUtils() {}
+
+  /** Creates test manifest with the given stream elements. */
+  public static SsManifest createSsManifest(StreamElement... streamElements) {
+    return new SsManifest(
+        TEST_MAJOR_VERSION,
+        TEST_MINOR_VERSION,
+        TEST_TIMESCALE,
+        TEST_DURATION,
+        TEST_DVR_WINDOW_LENGTH,
+        TEST_LOOKAHEAD_COUNT,
+        TEST_IS_LIVE,
+        TEST_PROTECTION_ELEMENT,
+        streamElements);
+  }
+
+  /** Creates test video stream element with the given name, track type and formats. */
+  public static StreamElement createStreamElement(String name, int trackType, Format... formats) {
+    return new StreamElement(
+        TEST_BASE_URI,
+        TEST_CHUNK_TEMPLATE,
+        trackType,
+        TEST_SUB_TYPE,
+        TEST_TIMESCALE,
+        name,
+        TEST_MAX_WIDTH,
+        TEST_MAX_HEIGHT,
+        TEST_MAX_WIDTH,
+        TEST_MAX_HEIGHT,
+        TEST_LANGUAGE,
+        formats,
+        /* chunkStartTimes= */ Collections.emptyList(),
+        /* lastChunkDuration= */ 0);
+  }
+}
diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestTest.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestTest.java
index dc8d6754f5..ea32c34348 100644
--- a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestTest.java
+++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestTest.java
@@ -15,12 +15,13 @@
  */
 package com.google.android.exoplayer2.source.smoothstreaming.manifest;
 
+import static com.google.android.exoplayer2.source.smoothstreaming.SsTestUtils.createSsManifest;
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.offline.StreamKey;
-import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest.ProtectionElement;
+import com.google.android.exoplayer2.source.smoothstreaming.SsTestUtils;
 import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest.StreamElement;
 import com.google.android.exoplayer2.util.MimeTypes;
 import java.util.Arrays;
@@ -35,14 +36,12 @@ import org.robolectric.RobolectricTestRunner;
 @RunWith(RobolectricTestRunner.class)
 public class SsManifestTest {
 
-  private static final ProtectionElement DUMMY_PROTECTION_ELEMENT =
-      new ProtectionElement(C.WIDEVINE_UUID, new byte[] {0, 1, 2});
-
   @Test
   public void testCopy() throws Exception {
     Format[][] formats = newFormats(2, 3);
     SsManifest sourceManifest =
-        newSsManifest(newStreamElement("1", formats[0]), newStreamElement("2", formats[1]));
+        createSsManifest(
+            createStreamElement("1", formats[0]), createStreamElement("2", formats[1]));
 
     List<StreamKey> keys =
         Arrays.asList(new StreamKey(0, 0), new StreamKey(0, 2), new StreamKey(1, 0));
@@ -52,9 +51,9 @@ public class SsManifestTest {
     SsManifest copyManifest = sourceManifest.copy(keys);
 
     SsManifest expectedManifest =
-        newSsManifest(
-            newStreamElement("1", formats[0][0], formats[0][2]),
-            newStreamElement("2", formats[1][0]));
+        createSsManifest(
+            createStreamElement("1", formats[0][0], formats[0][2]),
+            createStreamElement("2", formats[1][0]));
     assertManifestEquals(expectedManifest, copyManifest);
   }
 
@@ -62,13 +61,14 @@ public class SsManifestTest {
   public void testCopyRemoveStreamElement() throws Exception {
     Format[][] formats = newFormats(2, 3);
     SsManifest sourceManifest =
-        newSsManifest(newStreamElement("1", formats[0]), newStreamElement("2", formats[1]));
+        createSsManifest(
+            createStreamElement("1", formats[0]), createStreamElement("2", formats[1]));
 
     List<StreamKey> keys = Collections.singletonList(new StreamKey(1, 0));
 
     SsManifest copyManifest = sourceManifest.copy(keys);
 
-    SsManifest expectedManifest = newSsManifest(newStreamElement("2", formats[1][0]));
+    SsManifest expectedManifest = createSsManifest(createStreamElement("2", formats[1][0]));
     assertManifestEquals(expectedManifest, copyManifest);
   }
 
@@ -109,26 +109,8 @@ public class SsManifestTest {
     return formats;
   }
 
-  private static SsManifest newSsManifest(StreamElement... streamElements) {
-    return new SsManifest(1, 2, 1000, 5000, 0, 0, false, DUMMY_PROTECTION_ELEMENT, streamElements);
-  }
-
-  private static StreamElement newStreamElement(String name, Format... formats) {
-    return new StreamElement(
-        "baseUri",
-        "chunkTemplate",
-        C.TRACK_TYPE_VIDEO,
-        "subType",
-        1000,
-        name,
-        1024,
-        768,
-        1024,
-        768,
-        null,
-        formats,
-        Collections.emptyList(),
-        0);
+  private static StreamElement createStreamElement(String name, Format... formats) {
+    return SsTestUtils.createStreamElement(name, C.TRACK_TYPE_VIDEO, formats);
   }
 
   private static Format newFormat(String id) {

From 768f48e1d9c225cf3286528d3aebc835b276be7e Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Mon, 17 Dec 2018 13:45:40 +0000
Subject: [PATCH 324/832] Update the Cast framework dependency

PiperOrigin-RevId: 225812585
---
 extensions/cast/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/cast/build.gradle b/extensions/cast/build.gradle
index f6821d5cd2..0baa074d4a 100644
--- a/extensions/cast/build.gradle
+++ b/extensions/cast/build.gradle
@@ -31,7 +31,7 @@ android {
 }
 
 dependencies {
-    api 'com.google.android.gms:play-services-cast-framework:16.0.3'
+    api 'com.google.android.gms:play-services-cast-framework:16.1.2'
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion
     implementation project(modulePrefix + 'library-core')

From f4fd3b12e6beb4e5c49bb8e6afa53b7e85a524da Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Mon, 17 Dec 2018 13:52:56 +0000
Subject: [PATCH 325/832] Handle failure to get Cast context more gracefully

Issue:#4160
Issue:#4743
PiperOrigin-RevId: 225813243
---
 .../exoplayer2/castdemo/MainActivity.java     | 24 ++++++++++++++-
 .../cast_context_error_message_layout.xml     | 29 +++++++++++++++++++
 demos/cast/src/main/res/values/strings.xml    |  2 ++
 3 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 demos/cast/src/main/res/layout/cast_context_error_message_layout.xml

diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
index 5278776070..9d4c3ec87f 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
@@ -41,6 +41,7 @@ import com.google.android.exoplayer2.ui.PlayerView;
 import com.google.android.gms.cast.CastMediaControlIntent;
 import com.google.android.gms.cast.framework.CastButtonFactory;
 import com.google.android.gms.cast.framework.CastContext;
+import com.google.android.gms.dynamite.DynamiteModule;
 
 /**
  * An activity that plays video using {@link SimpleExoPlayer} and supports casting using ExoPlayer's
@@ -68,7 +69,20 @@ public class MainActivity extends AppCompatActivity
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     // Getting the cast context later than onStart can cause device discovery not to take place.
-    castContext = CastContext.getSharedInstance(this);
+    try {
+      castContext = CastContext.getSharedInstance(this);
+    } catch (RuntimeException e) {
+      Throwable cause = e.getCause();
+      while (cause != null) {
+        if (cause instanceof DynamiteModule.LoadingException) {
+          setContentView(R.layout.cast_context_error_message_layout);
+          return;
+        }
+        cause = cause.getCause();
+      }
+      // Unknown error. We propagate it.
+      throw e;
+    }
 
     setContentView(R.layout.main_activity);
 
@@ -98,6 +112,10 @@ public class MainActivity extends AppCompatActivity
   @Override
   public void onResume() {
     super.onResume();
+    if (castContext == null) {
+      // There is no Cast context to work with. Do nothing.
+      return;
+    }
     String applicationId = castContext.getCastOptions().getReceiverApplicationId();
     switch (applicationId) {
       case CastMediaControlIntent.DEFAULT_MEDIA_RECEIVER_APPLICATION_ID:
@@ -118,6 +136,10 @@ public class MainActivity extends AppCompatActivity
   @Override
   public void onPause() {
     super.onPause();
+    if (castContext == null) {
+      // Nothing to release.
+      return;
+    }
     mediaQueueListAdapter.notifyItemRangeRemoved(0, mediaQueueListAdapter.getItemCount());
     mediaQueueList.setAdapter(null);
     playerManager.release();
diff --git a/demos/cast/src/main/res/layout/cast_context_error_message_layout.xml b/demos/cast/src/main/res/layout/cast_context_error_message_layout.xml
new file mode 100644
index 0000000000..6d3260de38
--- /dev/null
+++ b/demos/cast/src/main/res/layout/cast_context_error_message_layout.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
+
+  <TextView
+    android:id="@+id/textView"
+    android:layout_width="0dp"
+    android:layout_height="match_parent"
+    android:layout_weight="1"
+    android:textSize="20sp"
+    android:gravity="center"
+    android:text="@string/cast_context_error"/>
+</LinearLayout>
diff --git a/demos/cast/src/main/res/values/strings.xml b/demos/cast/src/main/res/values/strings.xml
index 3505c40400..58f5233412 100644
--- a/demos/cast/src/main/res/values/strings.xml
+++ b/demos/cast/src/main/res/values/strings.xml
@@ -22,4 +22,6 @@
 
   <string name="sample_list_dialog_title">Add samples</string>
 
+  <string name="cast_context_error">Failed to get Cast context. Try updating Google Play Services and restart the app.</string>
+
 </resources>

From 3d6707e2c43ee25a4110ede383694f4573cd7d08 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Mon, 17 Dec 2018 15:41:04 +0000
Subject: [PATCH 326/832] Don't create Downloads until DownloadManager is
 initialized

PiperOrigin-RevId: 225824428
---
 .../exoplayer2/offline/DownloadManager.java   | 19 +++++++++++--------
 .../offline/DownloadManagerTest.java          |  2 +-
 .../dash/offline/DownloadManagerDashTest.java |  1 -
 .../dash/offline/DownloadServiceDashTest.java |  1 -
 .../exoplayer2/testutil/DummyMainThread.java  | 14 ++++++++++++--
 .../testutil/TestDownloadManagerListener.java | 13 ++++++++++++-
 6 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 997f4e09a2..6e45604531 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -38,7 +38,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.CopyOnWriteArraySet;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
@@ -93,6 +92,7 @@ public final class DownloadManager {
   private final HandlerThread fileIOThread;
   private final Handler fileIOHandler;
   private final CopyOnWriteArraySet<Listener> listeners;
+  private final ArrayDeque<DownloadAction> actionQueue;
 
   private boolean initialized;
   private boolean released;
@@ -142,6 +142,7 @@ public final class DownloadManager {
     fileIOHandler = new Handler(fileIOThread.getLooper());
 
     listeners = new CopyOnWriteArraySet<>();
+    actionQueue = new ArrayDeque<>();
 
     loadActions();
     logd("Created");
@@ -194,8 +195,8 @@ public final class DownloadManager {
    */
   public void handleAction(DownloadAction action) {
     Assertions.checkState(!released);
-    Download download = getDownloadForAction(action);
     if (initialized) {
+      Download download = getOrAddDownloadForAction(action);
       saveActions();
       maybeStartDownloads();
       if (download.state == STATE_QUEUED) {
@@ -204,6 +205,8 @@ public final class DownloadManager {
         // reported to listeners. Do so now.
         notifyListenersDownloadStateChange(download);
       }
+    } else {
+      actionQueue.add(action);
     }
   }
 
@@ -281,7 +284,7 @@ public final class DownloadManager {
     logd("Released");
   }
 
-  private Download getDownloadForAction(DownloadAction action) {
+  private Download getOrAddDownloadForAction(DownloadAction action) {
     for (int i = 0; i < downloads.size(); i++) {
       Download download = downloads.get(i);
       if (download.action.isSameMedia(action)) {
@@ -380,18 +383,18 @@ public final class DownloadManager {
                 if (released) {
                   return;
                 }
-                List<Download> pendingDownloads = new ArrayList<>(downloads);
-                downloads.clear();
                 for (DownloadAction action : actions) {
-                  getDownloadForAction(action);
+                  getOrAddDownloadForAction(action);
                 }
                 logd("Downloads are created.");
                 initialized = true;
                 for (Listener listener : listeners) {
                   listener.onInitialized(DownloadManager.this);
                 }
-                if (!pendingDownloads.isEmpty()) {
-                  downloads.addAll(pendingDownloads);
+                if (!actionQueue.isEmpty()) {
+                  while (!actionQueue.isEmpty()) {
+                    getOrAddDownloadForAction(actionQueue.remove());
+                  }
                   saveActions();
                 }
                 maybeStartDownloads();
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index e7d54b4141..e9720c8d3b 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -426,9 +426,9 @@ public class DownloadManagerTest {
                     actionFile, downloaderFactory, maxActiveDownloadTasks, MIN_RETRY_COUNT);
             downloadManagerListener =
                 new TestDownloadManagerListener(downloadManager, dummyMainThread);
-            downloadManager.addListener(downloadManagerListener);
             downloadManager.startDownloads();
           });
+      downloadManagerListener.waitUntilInitialized();
     } catch (Throwable throwable) {
       throw new Exception(throwable);
     }
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
index 8c61432f66..abe868bcfb 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
@@ -247,7 +247,6 @@ public class DownloadManagerDashTest {
 
           downloadManagerListener =
               new TestDownloadManagerListener(downloadManager, dummyMainThread);
-          downloadManager.addListener(downloadManagerListener);
           downloadManager.startDownloads();
         });
   }
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
index 09f62fa776..adae0d7b04 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
@@ -124,7 +124,6 @@ public class DownloadServiceDashTest {
                   /* minRetryCount= */ 3);
           downloadManagerListener =
               new TestDownloadManagerListener(dashDownloadManager, dummyMainThread);
-          dashDownloadManager.addListener(downloadManagerListener);
           dashDownloadManager.startDownloads();
 
           dashDownloadService =
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/DummyMainThread.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/DummyMainThread.java
index 858d287196..982fcdf558 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/DummyMainThread.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/DummyMainThread.java
@@ -21,6 +21,8 @@ import android.os.ConditionVariable;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
+import com.google.android.exoplayer2.util.Util;
+import java.util.concurrent.atomic.AtomicReference;
 
 /** Helper class to simulate main/UI thread in tests. */
 public final class DummyMainThread {
@@ -58,13 +60,21 @@ public final class DummyMainThread {
     if (Looper.myLooper() == handler.getLooper()) {
       runnable.run();
     } else {
-      final ConditionVariable finishedCondition = new ConditionVariable();
+      ConditionVariable finishedCondition = new ConditionVariable();
+      AtomicReference<Throwable> thrown = new AtomicReference<>();
       handler.post(
           () -> {
-            runnable.run();
+            try {
+              runnable.run();
+            } catch (Throwable t) {
+              thrown.set(t);
+            }
             finishedCondition.open();
           });
       assertThat(finishedCondition.block(timeoutMs)).isTrue();
+      if (thrown.get() != null) {
+        Util.sneakyThrow(thrown.get());
+      }
     }
   }
 
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
index e7b850d52b..c844e777c2 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.testutil;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import android.os.ConditionVariable;
 import com.google.android.exoplayer2.offline.DownloadManager;
 import com.google.android.exoplayer2.offline.DownloadManager.DownloadState;
 import java.util.HashMap;
@@ -28,10 +29,12 @@ import java.util.concurrent.TimeUnit;
 public final class TestDownloadManagerListener implements DownloadManager.Listener {
 
   private static final int TIMEOUT = 1000;
+  private static final int INITIALIZATION_TIMEOUT = 10000;
 
   private final DownloadManager downloadManager;
   private final DummyMainThread dummyMainThread;
   private final HashMap<String, ArrayBlockingQueue<Integer>> actionStates;
+  private final ConditionVariable initializedCondition;
 
   private CountDownLatch downloadFinishedCondition;
   @DownloadState.FailureReason private int failureReason;
@@ -41,6 +44,8 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
     this.downloadManager = downloadManager;
     this.dummyMainThread = dummyMainThread;
     actionStates = new HashMap<>();
+    initializedCondition = new ConditionVariable();
+    downloadManager.addListener(this);
   }
 
   public Integer pollStateChange(String taskId, long timeoutMs) throws InterruptedException {
@@ -53,7 +58,13 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
 
   @Override
   public void onInitialized(DownloadManager downloadManager) {
-    // Do nothing.
+    initializedCondition.open();
+  }
+
+  public void waitUntilInitialized() {
+    if (!downloadManager.isInitialized()) {
+      assertThat(initializedCondition.block(INITIALIZATION_TIMEOUT)).isTrue();
+    }
   }
 
   @Override

From 3dc72a690c29f843794c7809aa59e5f8b1574355 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Mon, 17 Dec 2018 18:34:31 +0000
Subject: [PATCH 327/832] Remove targetState in DownloadManager.Download

PiperOrigin-RevId: 225849846
---
 .../exoplayer2/offline/DownloadManager.java   | 29 +++++--------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 6e45604531..e8cfa498e2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -553,12 +553,6 @@ public final class DownloadManager {
 
   private static final class Download {
 
-    /** Target states for the download thread. */
-    @Documented
-    @Retention(RetentionPolicy.SOURCE)
-    @IntDef({STATE_QUEUED, STATE_COMPLETED})
-    public @interface TargetState {}
-
     private final String id;
     private final DownloadManager downloadManager;
     private final DownloaderFactory downloaderFactory;
@@ -568,11 +562,6 @@ public final class DownloadManager {
     private DownloadAction action;
     /** The current state of the download. */
     @DownloadState.State private int state;
-    /**
-     * When started, this is the target state that the download will transition to when the download
-     * thread stops.
-     */
-    @TargetState private volatile int targetState;
 
     @MonotonicNonNull private Downloader downloader;
     @MonotonicNonNull private DownloadThread downloadThread;
@@ -590,7 +579,6 @@ public final class DownloadManager {
       this.minRetryCount = minRetryCount;
       this.startTimeMs = System.currentTimeMillis();
       state = STATE_QUEUED;
-      targetState = STATE_COMPLETED;
       actionQueue = new ArrayDeque<>();
       actionQueue.add(action);
     }
@@ -603,9 +591,7 @@ public final class DownloadManager {
         return;
       }
       if (state == STATE_STARTED) {
-        if (targetState == STATE_COMPLETED) {
-          stopDownloadThread();
-        }
+        stopDownloadThread();
       } else {
         Assertions.checkState(state == STATE_QUEUED);
         action = updatedAction;
@@ -648,9 +634,7 @@ public final class DownloadManager {
           + ' '
           + (action.isRemoveAction ? "remove" : "download")
           + ' '
-          + DownloadState.getStateString(state)
-          + ' '
-          + DownloadState.getStateString(targetState);
+          + DownloadState.getStateString(state);
     }
 
     public boolean canStart() {
@@ -661,7 +645,6 @@ public final class DownloadManager {
       if (state == STATE_QUEUED) {
         state = STATE_STARTED;
         action = actionQueue.peek();
-        targetState = STATE_COMPLETED;
         downloader = downloaderFactory.createDownloader(action);
         downloadThread =
             new DownloadThread(
@@ -679,14 +662,12 @@ public final class DownloadManager {
     // Internal methods running on the main thread.
 
     private void stopDownloadThread() {
-      this.targetState = DownloadState.STATE_QUEUED;
       Assertions.checkNotNull(downloadThread).cancel();
     }
 
     private void onDownloadThreadStopped(@Nullable Throwable finalError) {
-      state = targetState;
       failureReason = FAILURE_REASON_NONE;
-      if (targetState == STATE_COMPLETED) {
+      if (!downloadThread.isCanceled) {
         if (finalError != null) {
           state = STATE_FAILED;
           failureReason = FAILURE_REASON_UNKNOWN;
@@ -696,8 +677,12 @@ public final class DownloadManager {
             // Don't continue running. Wait to be restarted by maybeStartDownloads().
             state = STATE_QUEUED;
             action = actionQueue.peek();
+          } else {
+            state = STATE_COMPLETED;
           }
         }
+      } else {
+        state = STATE_QUEUED;
       }
       downloadManager.onDownloadStateChange(this);
     }

From ee2e89e0cdc4b9800e129db16433d7647b464ce5 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Tue, 18 Dec 2018 10:49:16 +0000
Subject: [PATCH 328/832] Remove DownloadManager Download interim state when
 created

When a Download is created it's set to queued state but doesn't notify
listeners about this state. DownloadManager checks if it can start the
download. After this checks it notifies the listeners.

With this change Download can immediately check if it can be started and
sends correct notification.

PiperOrigin-RevId: 225967129
---
 .../exoplayer2/offline/DownloadManager.java   | 81 ++++++++-----------
 1 file changed, 33 insertions(+), 48 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index e8cfa498e2..1c6875e341 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -196,15 +196,8 @@ public final class DownloadManager {
   public void handleAction(DownloadAction action) {
     Assertions.checkState(!released);
     if (initialized) {
-      Download download = getOrAddDownloadForAction(action);
+      addDownloadForAction(action);
       saveActions();
-      maybeStartDownloads();
-      if (download.state == STATE_QUEUED) {
-        // Download did not change out of its initial state, and so its initial state won't have
-        // been
-        // reported to listeners. Do so now.
-        notifyListenersDownloadStateChange(download);
-      }
     } else {
       actionQueue.add(action);
     }
@@ -284,19 +277,18 @@ public final class DownloadManager {
     logd("Released");
   }
 
-  private Download getOrAddDownloadForAction(DownloadAction action) {
+  private void addDownloadForAction(DownloadAction action) {
     for (int i = 0; i < downloads.size(); i++) {
       Download download = downloads.get(i);
       if (download.action.isSameMedia(action)) {
         download.addAction(action);
         logd("Action is added to existing download", download);
-        return download;
+        return;
       }
     }
     Download download = new Download(this, downloaderFactory, action, minRetryCount);
     downloads.add(download);
     logd("Download is added", download);
-    return download;
   }
 
   /**
@@ -311,22 +303,21 @@ public final class DownloadManager {
     if (!initialized || released) {
       return;
     }
-
-    boolean skipDownloads = downloadsStopped || activeDownloads.size() == maxActiveDownloads;
     for (int i = 0; i < downloads.size(); i++) {
-      Download download = downloads.get(i);
-      if (!download.canStart()) {
-        continue;
-      }
-      boolean isRemoveAction = download.action.isRemoveAction;
-      if (isRemoveAction || !skipDownloads) {
-        download.start();
-        if (!isRemoveAction) {
-          activeDownloads.add(download);
-          skipDownloads = activeDownloads.size() == maxActiveDownloads;
-        }
+      maybeStartDownload(downloads.get(i));
+    }
+  }
+
+  private boolean maybeStartDownload(Download download) {
+    if (download.action.isRemoveAction) {
+      return download.start();
+    } else if (!downloadsStopped && activeDownloads.size() < maxActiveDownloads) {
+      if (download.start()) {
+        activeDownloads.add(download);
+        return true;
       }
     }
+    return false;
   }
 
   private void maybeNotifyListenersIdle() {
@@ -384,7 +375,7 @@ public final class DownloadManager {
                   return;
                 }
                 for (DownloadAction action : actions) {
-                  getOrAddDownloadForAction(action);
+                  addDownloadForAction(action);
                 }
                 logd("Downloads are created.");
                 initialized = true;
@@ -393,19 +384,10 @@ public final class DownloadManager {
                 }
                 if (!actionQueue.isEmpty()) {
                   while (!actionQueue.isEmpty()) {
-                    getOrAddDownloadForAction(actionQueue.remove());
+                    addDownloadForAction(actionQueue.remove());
                   }
                   saveActions();
                 }
-                maybeStartDownloads();
-                for (int i = 0; i < downloads.size(); i++) {
-                  Download download = downloads.get(i);
-                  if (download.state == STATE_QUEUED) {
-                    // Download did not change out of its initial state, and so its initial state
-                    // won't have been reported to listeners. Do so now.
-                    notifyListenersDownloadStateChange(download);
-                  }
-                }
               });
         });
   }
@@ -581,6 +563,11 @@ public final class DownloadManager {
       state = STATE_QUEUED;
       actionQueue = new ArrayDeque<>();
       actionQueue.add(action);
+      if (!downloadManager.maybeStartDownload(this)) {
+        // If download is started, listeners are already notified about the started state. Otherwise
+        // notify them here about the queued state.
+        downloadManager.onDownloadStateChange(this);
+      }
     }
 
     public void addAction(DownloadAction newAction) {
@@ -637,20 +624,18 @@ public final class DownloadManager {
           + DownloadState.getStateString(state);
     }
 
-    public boolean canStart() {
-      return state == STATE_QUEUED;
-    }
-
-    public void start() {
-      if (state == STATE_QUEUED) {
-        state = STATE_STARTED;
-        action = actionQueue.peek();
-        downloader = downloaderFactory.createDownloader(action);
-        downloadThread =
-            new DownloadThread(
-                this, downloader, action.isRemoveAction, minRetryCount, downloadManager.handler);
-        downloadManager.onDownloadStateChange(this);
+    public boolean start() {
+      if (state != STATE_QUEUED) {
+        return false;
       }
+      state = STATE_STARTED;
+      action = actionQueue.peek();
+      downloader = downloaderFactory.createDownloader(action);
+      downloadThread =
+          new DownloadThread(
+              this, downloader, action.isRemoveAction, minRetryCount, downloadManager.handler);
+      downloadManager.onDownloadStateChange(this);
+      return true;
     }
 
     public void stop() {

From 0e8e9621c005913ab4d4240c9e1b336eb2a7e42c Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 18 Dec 2018 14:58:01 +0000
Subject: [PATCH 329/832] Use the true bitrate for CBR MP3 seeking

PiperOrigin-RevId: 225989898
---
 RELEASENOTES.md                               |  1 +
 .../exoplayer2/extractor/MpegAudioHeader.java | 59 ++++++++++++-------
 .../test/assets/mp3/play-trimmed.mp3.0.dump   |  2 +-
 .../test/assets/mp3/play-trimmed.mp3.1.dump   |  2 +-
 .../test/assets/mp3/play-trimmed.mp3.2.dump   |  2 +-
 .../test/assets/mp3/play-trimmed.mp3.3.dump   |  2 +-
 6 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 0edff22658..9871277717 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -7,6 +7,7 @@
 * Support for playing spherical videos on Daydream.
 * Improve decoder re-use between playbacks. TODO: Write and link a blog post
   here ([#2826](https://github.com/google/ExoPlayer/issues/2826)).
+* Use the true bitrate for constant-bitrate MP3 seeking.
 * Track selection:
   * Add options for controlling audio track selections to `DefaultTrackSelector`
     ([#3314](https://github.com/google/ExoPlayer/issues/3314)).
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/MpegAudioHeader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/MpegAudioHeader.java
index ab49ca5454..87bb992082 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/MpegAudioHeader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/MpegAudioHeader.java
@@ -34,16 +34,26 @@ public final class MpegAudioHeader {
   private static final String[] MIME_TYPE_BY_LAYER =
       new String[] {MimeTypes.AUDIO_MPEG_L1, MimeTypes.AUDIO_MPEG_L2, MimeTypes.AUDIO_MPEG};
   private static final int[] SAMPLING_RATE_V1 = {44100, 48000, 32000};
-  private static final int[] BITRATE_V1_L1 =
-      {32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448};
-  private static final int[] BITRATE_V2_L1 =
-      {32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256};
-  private static final int[] BITRATE_V1_L2 =
-      {32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384};
-  private static final int[] BITRATE_V1_L3 =
-      {32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320};
-  private static final int[] BITRATE_V2 =
-      {8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160};
+  private static final int[] BITRATE_V1_L1 = {
+    32000, 64000, 96000, 128000, 160000, 192000, 224000, 256000, 288000, 320000, 352000, 384000,
+    416000, 448000
+  };
+  private static final int[] BITRATE_V2_L1 = {
+    32000, 48000, 56000, 64000, 80000, 96000, 112000, 128000, 144000, 160000, 176000, 192000,
+    224000, 256000
+  };
+  private static final int[] BITRATE_V1_L2 = {
+    32000, 48000, 56000, 64000, 80000, 96000, 112000, 128000, 160000, 192000, 224000, 256000,
+    320000, 384000
+  };
+  private static final int[] BITRATE_V1_L3 = {
+    32000, 40000, 48000, 56000, 64000, 80000, 96000, 112000, 128000, 160000, 192000, 224000, 256000,
+    320000
+  };
+  private static final int[] BITRATE_V2 = {
+    8000, 16000, 24000, 32000, 40000, 48000, 56000, 64000, 80000, 96000, 112000, 128000, 144000,
+    160000
+  };
 
   /**
    * Returns the size of the frame associated with {@code header}, or {@link C#LENGTH_UNSET} if it
@@ -89,7 +99,7 @@ public final class MpegAudioHeader {
     if (layer == 3) {
       // Layer I (layer == 3)
       bitrate = version == 3 ? BITRATE_V1_L1[bitrateIndex - 1] : BITRATE_V2_L1[bitrateIndex - 1];
-      return (12000 * bitrate / samplingRate + padding) * 4;
+      return (12 * bitrate / samplingRate + padding) * 4;
     } else {
       // Layer II (layer == 2) or III (layer == 1)
       if (version == 3) {
@@ -102,10 +112,10 @@ public final class MpegAudioHeader {
 
     if (version == 3) {
       // Version 1
-      return 144000 * bitrate / samplingRate + padding;
+      return 144 * bitrate / samplingRate + padding;
     } else {
       // Version 2 or 2.5
-      return (layer == 1 ? 72000 : 144000) * bitrate / samplingRate + padding;
+      return (layer == 1 ? 72 : 144) * bitrate / samplingRate + padding;
     }
   }
 
@@ -159,7 +169,7 @@ public final class MpegAudioHeader {
     if (layer == 3) {
       // Layer I (layer == 3)
       bitrate = version == 3 ? BITRATE_V1_L1[bitrateIndex - 1] : BITRATE_V2_L1[bitrateIndex - 1];
-      frameSize = (12000 * bitrate / sampleRate + padding) * 4;
+      frameSize = (12 * bitrate / sampleRate + padding) * 4;
       samplesPerFrame = 384;
     } else {
       // Layer II (layer == 2) or III (layer == 1)
@@ -167,19 +177,22 @@ public final class MpegAudioHeader {
         // Version 1
         bitrate = layer == 2 ? BITRATE_V1_L2[bitrateIndex - 1] : BITRATE_V1_L3[bitrateIndex - 1];
         samplesPerFrame = 1152;
-        frameSize = 144000 * bitrate / sampleRate + padding;
+        frameSize = 144 * bitrate / sampleRate + padding;
       } else {
         // Version 2 or 2.5.
         bitrate = BITRATE_V2[bitrateIndex - 1];
         samplesPerFrame = layer == 1 ? 576 : 1152;
-        frameSize = (layer == 1 ? 72000 : 144000) * bitrate / sampleRate + padding;
+        frameSize = (layer == 1 ? 72 : 144) * bitrate / sampleRate + padding;
       }
     }
 
+    // Calculate the bitrate in the same way Mp3Extractor calculates sample timestamps so that
+    // seeking to a given timestamp and playing from the start up to that timestamp give the same
+    // results for CBR streams. See also [internal: b/120390268].
+    bitrate = 8 * frameSize * sampleRate / samplesPerFrame;
     String mimeType = MIME_TYPE_BY_LAYER[3 - layer];
     int channels = ((headerData >> 6) & 3) == 3 ? 1 : 2;
-    header.setValues(version, mimeType, frameSize, sampleRate, channels, bitrate * 1000,
-        samplesPerFrame);
+    header.setValues(version, mimeType, frameSize, sampleRate, channels, bitrate, samplesPerFrame);
     return true;
   }
 
@@ -198,8 +211,14 @@ public final class MpegAudioHeader {
   /** Number of samples stored in the frame. */
   public int samplesPerFrame;
 
-  private void setValues(int version, String mimeType, int frameSize, int sampleRate, int channels,
-      int bitrate, int samplesPerFrame) {
+  private void setValues(
+      int version,
+      String mimeType,
+      int frameSize,
+      int sampleRate,
+      int channels,
+      int bitrate,
+      int samplesPerFrame) {
     this.version = version;
     this.mimeType = mimeType;
     this.frameSize = frameSize;
diff --git a/library/core/src/test/assets/mp3/play-trimmed.mp3.0.dump b/library/core/src/test/assets/mp3/play-trimmed.mp3.0.dump
index 96b0cd259c..d4df3ffeba 100644
--- a/library/core/src/test/assets/mp3/play-trimmed.mp3.0.dump
+++ b/library/core/src/test/assets/mp3/play-trimmed.mp3.0.dump
@@ -1,6 +1,6 @@
 seekMap:
   isSeekable = true
-  duration = 26125
+  duration = 26122
   getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 1
 track 0:
diff --git a/library/core/src/test/assets/mp3/play-trimmed.mp3.1.dump b/library/core/src/test/assets/mp3/play-trimmed.mp3.1.dump
index 96b0cd259c..d4df3ffeba 100644
--- a/library/core/src/test/assets/mp3/play-trimmed.mp3.1.dump
+++ b/library/core/src/test/assets/mp3/play-trimmed.mp3.1.dump
@@ -1,6 +1,6 @@
 seekMap:
   isSeekable = true
-  duration = 26125
+  duration = 26122
   getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 1
 track 0:
diff --git a/library/core/src/test/assets/mp3/play-trimmed.mp3.2.dump b/library/core/src/test/assets/mp3/play-trimmed.mp3.2.dump
index 96b0cd259c..d4df3ffeba 100644
--- a/library/core/src/test/assets/mp3/play-trimmed.mp3.2.dump
+++ b/library/core/src/test/assets/mp3/play-trimmed.mp3.2.dump
@@ -1,6 +1,6 @@
 seekMap:
   isSeekable = true
-  duration = 26125
+  duration = 26122
   getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 1
 track 0:
diff --git a/library/core/src/test/assets/mp3/play-trimmed.mp3.3.dump b/library/core/src/test/assets/mp3/play-trimmed.mp3.3.dump
index 96b0cd259c..d4df3ffeba 100644
--- a/library/core/src/test/assets/mp3/play-trimmed.mp3.3.dump
+++ b/library/core/src/test/assets/mp3/play-trimmed.mp3.3.dump
@@ -1,6 +1,6 @@
 seekMap:
   isSeekable = true
-  duration = 26125
+  duration = 26122
   getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 1
 track 0:

From 4f8b09830717b8a29aa2bab7e75833d5880f78c5 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 19 Dec 2018 19:30:09 +0000
Subject: [PATCH 330/832] Blacklist OMX.SEC.mp3.dec for more devices

Issue #4519

PiperOrigin-RevId: 226205245
---
 .../exoplayer2/mediacodec/MediaCodecUtil.java | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
index f6cc6a8344..4d971d461e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
@@ -319,19 +319,20 @@ public final class MediaCodecUtil {
 
     // Work around https://github.com/google/ExoPlayer/issues/4519.
     if ("OMX.SEC.mp3.dec".equals(name)
-        && ("GT-I9152".equals(Util.MODEL)
-            || "GT-I9515".equals(Util.MODEL)
-            || "GT-P5220".equals(Util.MODEL)
-            || "GT-S7580".equals(Util.MODEL)
-            || "SM-G350".equals(Util.MODEL)
-            || "SM-T231".equals(Util.MODEL)
-            || "SM-T530".equals(Util.MODEL))) {
+        && (Util.MODEL.startsWith("GT-I9152")
+            || Util.MODEL.startsWith("GT-I9515")
+            || Util.MODEL.startsWith("GT-P5220")
+            || Util.MODEL.startsWith("GT-S7580")
+            || Util.MODEL.startsWith("SM-G350")
+            || Util.MODEL.startsWith("SM-G386")
+            || Util.MODEL.startsWith("SM-T231")
+            || Util.MODEL.startsWith("SM-T530"))) {
       return false;
     }
     if ("OMX.brcm.audio.mp3.decoder".equals(name)
-        && ("GT-I9152".equals(Util.MODEL)
-            || "GT-S7580".equals(Util.MODEL)
-            || "SM-G350".equals(Util.MODEL))) {
+        && (Util.MODEL.startsWith("GT-I9152")
+            || Util.MODEL.startsWith("GT-S7580")
+            || Util.MODEL.startsWith("SM-G350"))) {
       return false;
     }
 

From bad8ec59521759d67fc60b7c6b9046f8628ad645 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 20 Dec 2018 09:05:08 +0000
Subject: [PATCH 331/832] Relax audio decoder capability checks

Issue: #5145
PiperOrigin-RevId: 226297129
---
 RELEASENOTES.md                                    | 14 +++++++++-----
 .../exoplayer2/mediacodec/MediaCodecInfo.java      | 10 ++++++++--
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 88f8fe7593..76bc8ff723 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -3,7 +3,7 @@
 ### dev-v2 (not yet released) ###
 
 * Use Transport Stream's random access indicator to minimize the need for
-  FLAG_ALLOW_NON_IDR_KEYFRAMES.
+  `FLAG_ALLOW_NON_IDR_KEYFRAMES`.
 * Support for playing spherical videos on Daydream.
 * Improve decoder re-use between playbacks. TODO: Write and link a blog post
   here ([#2826](https://github.com/google/ExoPlayer/issues/2826)).
@@ -35,10 +35,14 @@
 * DownloadManager:
   * Create only one task for all DownloadActions for the same content.
   * Rename TaskState to DownloadState.
-* MP3:
-  * Use the true bitrate for constant-bitrate MP3 seeking.
-  * Fix issue where streams would play twice on some Samsung devices
-    ([#4519](https://github.com/google/ExoPlayer/issues/4519)).
+* Audio:
+  * Fix issue where some audio formats were incorrectly marked as being
+    unplayable due to underreported audio decoder capabilities
+    ([#5145](https://github.com/google/ExoPlayer/issues/5145)).
+  * MP3:
+    * Use the true bitrate for constant-bitrate MP3 seeking.
+    * Fix issue where streams would play twice on some Samsung devices
+      ([#4519](https://github.com/google/ExoPlayer/issues/4519)).
 * Add support for SHOUTcast ICY metadata
   ([#3735](https://github.com/google/ExoPlayer/issues/3735)).
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java
index 32f6bd5409..107ab9efd8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java
@@ -248,9 +248,15 @@ public final class MediaCodecInfo {
       // If we don't know any better, we assume that the profile and level are supported.
       return true;
     }
+    int profile = codecProfileAndLevel.first;
+    int level = codecProfileAndLevel.second;
+    if (!isVideo && profile != CodecProfileLevel.AACObjectXHE) {
+      // Some devices/builds underreport audio capabilities, so assume support except for xHE-AAC
+      // which may not be widely supported. See https://github.com/google/ExoPlayer/issues/5145.
+      return true;
+    }
     for (CodecProfileLevel capabilities : getProfileLevels()) {
-      if (capabilities.profile == codecProfileAndLevel.first
-          && capabilities.level >= codecProfileAndLevel.second) {
+      if (capabilities.profile == profile && capabilities.level >= level) {
         return true;
       }
     }

From d3ecbf75b2b70d81dd6030baf29baaf9c58d2343 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 20 Dec 2018 14:00:03 +0000
Subject: [PATCH 332/832] Fix buffer size for renderers with TRACK_TYPE_NONE

This includes NoSampleRenderers.

PiperOrigin-RevId: 226323693
---
 .../java/com/google/android/exoplayer2/util/Util.java    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
index 7bea5de8ba..1e1153d367 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
@@ -1481,11 +1481,12 @@ public final class Util {
   }
 
   /**
-   * Maps a {@link C} {@code TRACK_TYPE_*} constant to the corresponding {@link C}
-   * {@code DEFAULT_*_BUFFER_SIZE} constant.
+   * Maps a {@link C} {@code TRACK_TYPE_*} constant to the corresponding {@link C} {@code
+   * DEFAULT_*_BUFFER_SIZE} constant.
    *
    * @param trackType The track type.
    * @return The corresponding default buffer size in bytes.
+   * @throws IllegalArgumentException If the track type is an unrecognized or custom track type.
    */
   public static int getDefaultBufferSize(int trackType) {
     switch (trackType) {
@@ -1501,8 +1502,10 @@ public final class Util {
         return C.DEFAULT_METADATA_BUFFER_SIZE;
       case C.TRACK_TYPE_CAMERA_MOTION:
         return C.DEFAULT_CAMERA_MOTION_BUFFER_SIZE;
+      case C.TRACK_TYPE_NONE:
+        return 0;
       default:
-        throw new IllegalStateException();
+        throw new IllegalArgumentException();
     }
   }
 

From a16f4aec90817eaa41d66c2c368877f8b6b22d8e Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 20 Dec 2018 18:30:38 +0000
Subject: [PATCH 333/832] Fix out of data Javadoc

PiperOrigin-RevId: 226356758
---
 .../android/exoplayer2/upstream/cache/CacheDataSink.java   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
index e9c3379280..6767548c15 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
@@ -30,10 +30,9 @@ import java.io.OutputStream;
 /**
  * Writes data into a cache.
  *
- * <p>If the {@link DataSpec} object used with {@link #open(DataSpec)} method call has the {@code
- * length} field set to {@link C#LENGTH_UNSET} but {@link
- * DataSpec#FLAG_ALLOW_CACHING_UNKNOWN_LENGTH} isn't set then {@link #write(byte[], int, int)} calls
- * are ignored.
+ * <p>If the {@link DataSpec} passed to {@link #open(DataSpec)} has the {@code length} field set to
+ * {@link C#LENGTH_UNSET} and {@link DataSpec#FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN} set, then {@link
+ * #write(byte[], int, int)} calls are ignored.
  */
 public final class CacheDataSink implements DataSink {
 

From f4d741a5653ea0beb81563b805ad6911c2963d8e Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 20 Dec 2018 18:30:57 +0000
Subject: [PATCH 334/832] Bump for 2.9.3

PiperOrigin-RevId: 226356810
---
 RELEASENOTES.md                               | 35 +++++++++----------
 constants.gradle                              |  4 +--
 .../exoplayer2/ExoPlayerLibraryInfo.java      |  6 ++--
 3 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 76bc8ff723..78cf1ff493 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,8 +2,6 @@
 
 ### dev-v2 (not yet released) ###
 
-* Use Transport Stream's random access indicator to minimize the need for
-  `FLAG_ALLOW_NON_IDR_KEYFRAMES`.
 * Support for playing spherical videos on Daydream.
 * Improve decoder re-use between playbacks. TODO: Write and link a blog post
   here ([#2826](https://github.com/google/ExoPlayer/issues/2826)).
@@ -12,11 +10,7 @@
     ([#3314](https://github.com/google/ExoPlayer/issues/3314)).
   * Update `TrackSelection.Factory` interface to support creating all track
     selections together.
-* Captions:
-  * Support PNG subtitles in SMPTE-TT
-    ([#1583](https://github.com/google/ExoPlayer/issues/1583)).
 * Do not retry failed loads whose error is `FileNotFoundException`.
-* Prevent Cea608Decoder from generating Subtitles with null Cues list.
 * Offline:
   * Speed up removal of segmented downloads
     ([#5136](https://github.com/google/ExoPlayer/issues/5136)).
@@ -28,24 +22,29 @@
     this behavior (`DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH`) has been
     replaced with an opt out flag
     (`DataSpec.FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN`).
-* Disable post processing on Nvidia devices, as it breaks decode-only frame
-  skippping.
-* Workaround for MiTV (dangal) issue when swapping output surface
-  ([#5169](https://github.com/google/ExoPlayer/issues/5169)).
 * DownloadManager:
   * Create only one task for all DownloadActions for the same content.
   * Rename TaskState to DownloadState.
-* Audio:
-  * Fix issue where some audio formats were incorrectly marked as being
-    unplayable due to underreported audio decoder capabilities
-    ([#5145](https://github.com/google/ExoPlayer/issues/5145)).
-  * MP3:
-    * Use the true bitrate for constant-bitrate MP3 seeking.
-    * Fix issue where streams would play twice on some Samsung devices
-      ([#4519](https://github.com/google/ExoPlayer/issues/4519)).
 * Add support for SHOUTcast ICY metadata
   ([#3735](https://github.com/google/ExoPlayer/issues/3735)).
 
+### 2.9.3 ###
+
+* Captions: Support PNG subtitles in SMPTE-TT
+  ([#1583](https://github.com/google/ExoPlayer/issues/1583)).
+* MPEG-TS: Use random access indicators to minimize the need for
+  `FLAG_ALLOW_NON_IDR_KEYFRAMES`.
+* MP3:
+  * Use the true bitrate for constant-bitrate MP3 seeking.
+  * Fix issue where streams would play twice on some Samsung devices
+    ([#4519](https://github.com/google/ExoPlayer/issues/4519)).
+* Fix regression where some audio formats were incorrectly marked as being
+  unplayable due to under-reporting of platform decoder capabilities
+  ([#5145](https://github.com/google/ExoPlayer/issues/5145)).
+* Fix decode-only frame skipping on Nvidia Shield TV devices.
+* Workaround for MiTV (dangal) issue when swapping output surface
+  ([#5169](https://github.com/google/ExoPlayer/issues/5169)).
+
 ### 2.9.2 ###
 
 * HLS:
diff --git a/constants.gradle b/constants.gradle
index cac4f6d78b..ac801d2d3b 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -13,8 +13,8 @@
 // limitations under the License.
 project.ext {
     // ExoPlayer version and version code.
-    releaseVersion = '2.9.2'
-    releaseVersionCode = 2009002
+    releaseVersion = '2.9.3'
+    releaseVersionCode = 2009003
     // Important: ExoPlayer specifies a minSdkVersion of 14 because various
     // components provided by the library may be of use on older devices.
     // However, please note that the core media playback functionality provided
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
index c30fe160c9..792f6cf651 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
@@ -29,11 +29,11 @@ public final class ExoPlayerLibraryInfo {
 
   /** The version of the library expressed as a string, for example "1.2.3". */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION_INT) or vice versa.
-  public static final String VERSION = "2.9.2";
+  public static final String VERSION = "2.9.3";
 
   /** The version of the library expressed as {@code "ExoPlayerLib/" + VERSION}. */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
-  public static final String VERSION_SLASHY = "ExoPlayerLib/2.9.2";
+  public static final String VERSION_SLASHY = "ExoPlayerLib/2.9.3";
 
   /**
    * The version of the library expressed as an integer, for example 1002003.
@@ -43,7 +43,7 @@ public final class ExoPlayerLibraryInfo {
    * integer version 123045006 (123-045-006).
    */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
-  public static final int VERSION_INT = 2009002;
+  public static final int VERSION_INT = 2009003;
 
   /**
    * Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions}

From ae40208d92b19535d12d81ebb38f95fe90ba155c Mon Sep 17 00:00:00 2001
From: ybai001 <ybai@dolby.com>
Date: Mon, 24 Dec 2018 09:38:52 +0800
Subject: [PATCH 335/832] Add AC-4 format support

 * Add AC-4 MIME type definition
 * Add AC-4 format support in Mp4Extractor and TsExtractor
 * Add AC-4 Extractor
 * Add AC-4 playback support in MPEG-4, MPEG-DASH, TS and HLS
---
 .../java/com/google/android/exoplayer2/C.java |   9 +-
 .../android/exoplayer2/audio/Ac4Util.java     | 269 ++++++++++++++++++
 .../exoplayer2/audio/DefaultAudioSink.java    |   4 +
 .../audio/MediaCodecAudioRenderer.java        |   5 +
 .../extractor/DefaultExtractorsFactory.java   |   6 +-
 .../exoplayer2/extractor/mp4/Atom.java        |   2 +
 .../exoplayer2/extractor/mp4/AtomParsers.java |   8 +
 .../extractor/mp4/FragmentedMp4Extractor.java |   8 +
 .../extractor/mp4/Mp4Extractor.java           |   9 +
 .../exoplayer2/extractor/ts/Ac4Extractor.java | 162 +++++++++++
 .../exoplayer2/extractor/ts/Ac4Reader.java    | 215 ++++++++++++++
 .../ts/DefaultTsPayloadReaderFactory.java     |   2 +
 .../exoplayer2/extractor/ts/TsExtractor.java  |  14 +
 .../android/exoplayer2/util/MimeTypes.java    |   7 +
 .../hls/DefaultHlsExtractorFactory.java       |  14 +
 15 files changed, 729 insertions(+), 5 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Extractor.java
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/C.java b/library/core/src/main/java/com/google/android/exoplayer2/C.java
index fac9818d9e..315551fa62 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/C.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/C.java
@@ -143,8 +143,8 @@ public final class C {
    * {@link #ENCODING_INVALID}, {@link #ENCODING_PCM_8BIT}, {@link #ENCODING_PCM_16BIT}, {@link
    * #ENCODING_PCM_24BIT}, {@link #ENCODING_PCM_32BIT}, {@link #ENCODING_PCM_FLOAT}, {@link
    * #ENCODING_PCM_MU_LAW}, {@link #ENCODING_PCM_A_LAW}, {@link #ENCODING_AC3}, {@link
-   * #ENCODING_E_AC3}, {@link #ENCODING_DTS}, {@link #ENCODING_DTS_HD} or {@link
-   * #ENCODING_DOLBY_TRUEHD}.
+   * #ENCODING_E_AC3}, {@link #ENCODING_DTS}, {@link #ENCODING_DTS_HD}, {@link
+   * #ENCODING_DOLBY_TRUEHD} or {@link #ENCODING_AC4}.
    */
   @Documented
   @Retention(RetentionPolicy.SOURCE)
@@ -162,7 +162,8 @@ public final class C {
     ENCODING_E_AC3,
     ENCODING_DTS,
     ENCODING_DTS_HD,
-    ENCODING_DOLBY_TRUEHD
+    ENCODING_DOLBY_TRUEHD,
+    ENCODING_AC4
   })
   public @interface Encoding {}
 
@@ -212,6 +213,8 @@ public final class C {
   public static final int ENCODING_DTS_HD = AudioFormat.ENCODING_DTS_HD;
   /** @see AudioFormat#ENCODING_DOLBY_TRUEHD */
   public static final int ENCODING_DOLBY_TRUEHD = AudioFormat.ENCODING_DOLBY_TRUEHD;
+  /** @see AudioFormat#ENCODING_AC4 */
+  public static final int ENCODING_AC4 = AudioFormat.ENCODING_AC4;
 
   /**
    * Stream types for an {@link android.media.AudioTrack}. One of {@link #STREAM_TYPE_ALARM}, {@link
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java
new file mode 100644
index 0000000000..9b845a14d4
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java
@@ -0,0 +1,269 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.audio;
+
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.drm.DrmInitData;
+import com.google.android.exoplayer2.util.MimeTypes;
+import com.google.android.exoplayer2.util.ParsableBitArray;
+import com.google.android.exoplayer2.util.ParsableByteArray;
+import java.nio.ByteBuffer;
+
+/**
+ * Utility methods for parsing AC-4 frames, which are access units in AC-4 bitstreams.
+ */
+public final class Ac4Util {
+
+  /**
+   * Holds sample format information as presented by a syncframe header.
+   */
+  public static final class SyncFrameInfo {
+
+    /**
+     * The sample mime type of the bitstream is {@link MimeTypes#AUDIO_AC4}.
+     */
+    public final String mimeType;
+    /**
+     * The bitstream version.
+     */
+    public final int bitstreamVersion;
+    /**
+     * The audio sampling rate in Hz.
+     */
+    public final int sampleRate;
+    /**
+     * The number of audio channels
+     */
+    public final int channelCount;
+    /**
+     * The size of the frame.
+     */
+    public final int frameSize;
+    /**
+     * Number of audio samples in the frame.
+     */
+    public final int sampleCount;
+
+    private SyncFrameInfo(
+        String mimeType,
+        int bitstreamVersion,
+        int channelCount,
+        int sampleRate,
+        int frameSize,
+        int sampleCount) {
+      this.mimeType = mimeType;
+      this.bitstreamVersion = bitstreamVersion;
+      this.channelCount = channelCount;
+      this.sampleRate = sampleRate;
+      this.frameSize = frameSize;
+      this.sampleCount = sampleCount;
+    }
+  }
+
+  /**
+   * The channel count of AC-4 stream.
+   */
+  // TODO: Parse AC-4 stream channel count.
+  public static final int CHANNEL_COUNT_2 = 2;
+  /**
+   * The header size for AC-4 parser. Only needs to be as big as we need to read, not the full
+   * header size.
+   */
+  public static final int HEADER_SIZE_FOR_PARSER = 16;
+  /**
+   * Number of audio samples in the frame. Defined in IEC61937-14:2017 table 5 and 6. This table
+   * provides the number of samples per frame at the playback sampling frequency of 48kHz. For
+   * 44.1kHz, only frame_rate_index(13) is valid and corresponding sample count is 2048.
+   */
+  private static final int[] SAMPLE_COUNT = new int[] {
+      /* [ 0]  23.976 fps */ 2002,
+      /* [ 1]  24     fps */ 2000,
+      /* [ 2]  25     fps */ 1920,
+      /* [ 3]  29.97  fps */ 1601,  // 1601 | 1602 | 1601 | 1602 | 1602
+      /* [ 4]  30     fps */ 1600,
+      /* [ 5]  47.95  fps */ 1001,
+      /* [ 6]  48     fps */ 1000,
+      /* [ 7]  50     fps */  960,
+      /* [ 8]  59.94  fps */  800,  //  800 |  801 |  801 |  801 |  801
+      /* [ 9]  60     fps */  800,
+      /* [10] 100     fps */  480,
+      /* [11] 119.88  fps */  400,  //  400 |  400 |  401 |  400 |  401
+      /* [12] 120     fps */  400,
+      /* [13]  23.438 fps */ 2048
+  };
+
+  /**
+   * Returns the AC-4 format given {@code data} containing the AC4SpecificBox according to ETSI TS
+   * 103 190-1 Annex E. The reading position of {@code data} will be modified.
+   *
+   * @param data The AC4SpecificBox to parse.
+   * @param trackId The track identifier to set on the format.
+   * @param language The language to set on the format.
+   * @param drmInitData {@link DrmInitData} to be included in the format.
+   * @return The AC-4 format parsed from data in the header.
+   */
+  public static Format parseAc4AnnexEFormat(
+      ParsableByteArray data, String trackId, String language, DrmInitData drmInitData) {
+    data.skipBytes(1);
+    int sampleRate = ((data.readUnsignedByte() & 0x20) >> 5 == 1) ? 48000 : 44100;
+    return Format.createAudioSampleFormat(
+        trackId,
+        MimeTypes.AUDIO_AC4,
+        null,
+        Format.NO_VALUE,
+        Format.NO_VALUE,
+        CHANNEL_COUNT_2,
+        sampleRate,
+        null,
+        drmInitData,
+        0,
+        language);
+  }
+
+  private static int readVariableBits(ParsableBitArray data, int nbits) {
+    int value = 0;
+    while (true) {
+      int moreBits;
+      value += data.readBits(nbits);
+      moreBits = data.readBits(1);
+      if (moreBits == 0)
+        break;
+      value++;
+      value <<= nbits;
+    }
+    return value;
+  }
+
+  /**
+   * Returns AC-4 format information given {@code data} containing a syncframe. The reading
+   * position of {@code data} will be modified.
+   *
+   * @param data The data to parse, positioned at the start of the syncframe.
+   * @return The AC-4 format data parsed from the header.
+   */
+  public static SyncFrameInfo parseAc4SyncframeInfo(ParsableBitArray data) {
+    int headerSize = 0;
+    int syncWord  = data.readBits(16);
+    headerSize += 2;
+    int frameSize = data.readBits(16);
+    headerSize += 2;
+    if (frameSize == 0xFFFF) {
+      frameSize = data.readBits(24);
+      headerSize += 3;
+    }
+    frameSize += headerSize;
+    if (syncWord == 0xAC41) {
+      frameSize += 2;
+    }
+    int bitstreamVersion = data.readBits(2);
+    if (bitstreamVersion == 3){
+      bitstreamVersion += readVariableBits(data, 2);
+    }
+    int sequenceCounter = data.readBits(10);
+    if (data.readBits(1) == 1) {
+      if (data.readBits(3) > 0){
+        data.skipBits(2);
+      }
+    }
+    int sampleRate = (data.readBits(1) == 1) ? 48000 : 44100;
+    int frameRateIndex = data.readBits(4);
+    int sampleCount = 0;
+    if (sampleRate == 44100 && frameRateIndex == 13) {
+      sampleCount = SAMPLE_COUNT[frameRateIndex];
+    } else if (sampleRate == 48000 && frameRateIndex < SAMPLE_COUNT.length) {
+      sampleCount = SAMPLE_COUNT[frameRateIndex];
+      switch (sequenceCounter % 5) {
+        case 1:
+        case 3:
+          if (frameRateIndex == 3 || frameRateIndex == 8) {
+            sampleCount++;
+          }
+          break;
+        case 2:
+          if (frameRateIndex == 8 || frameRateIndex == 11) {
+            sampleCount++;
+          }
+          break;
+        case 4:
+          if (frameRateIndex == 3 || frameRateIndex == 8 || frameRateIndex == 11) {
+            sampleCount++;
+          }
+          break;
+        default:
+          break;
+      }
+    }
+    return new SyncFrameInfo(
+        MimeTypes.AUDIO_AC4, bitstreamVersion, CHANNEL_COUNT_2, sampleRate, frameSize, sampleCount);
+  }
+
+  /**
+   * Returns the size in bytes of the given AC-4 syncframe.
+   *
+   * @param data The syncframe to parse.
+   * @return The syncframe size in bytes. {@link C#LENGTH_UNSET} if the input is invalid.
+   */
+  public static int parseAc4SyncframeSize(byte[] data, int syncBytes) {
+    if (data.length < 7) {
+      return C.LENGTH_UNSET;
+    }
+    int headerSize = 2; // syncword
+    int frameSize = ((data[2] & 0xFF) << 8) | (data[3] & 0xFF);
+    headerSize += 2;
+    if (frameSize == 0xFFFF) {
+      frameSize = ((data[4] & 0xFF) << 16) | ((data[5] & 0xFF) << 8) | (data[6] & 0xFF);
+      headerSize += 3;
+    }
+    if (syncBytes == 0xAC41) {
+      headerSize += 2;
+    }
+    frameSize += headerSize;
+    return frameSize;
+  }
+
+  /**
+   * Reads the number of audio samples represented by the given AC-4 syncframe. The buffer's
+   * position is not modified.
+   *
+   * @param buffer The {@link ByteBuffer} from which to read the syncframe.
+   * @return The number of audio samples represented by the syncframe.
+   */
+  public static int parseAc4SyncframeAudioSampleCount(ByteBuffer buffer) {
+    byte[] bufferBytes = new byte[HEADER_SIZE_FOR_PARSER];
+    buffer.get(bufferBytes);
+    ParsableBitArray data = new ParsableBitArray(bufferBytes);
+    SyncFrameInfo ac4SyncframeInfo = parseAc4SyncframeInfo(data);
+    return ac4SyncframeInfo.sampleCount;
+  }
+
+  /**
+   * Create AC-4 sample header, which includes AC-4 syncword and frame size.
+   *
+   * @param sampleSize The size of AC-4 sample.
+   * @return The AC-4 sample header byte array.
+   */
+  public static ParsableByteArray getAc4SampleHeader(int sampleSize) {
+    // Add AC-4 Syncword 0xAC40 and frame size to create AC-4 syncframe
+    // ETSI TS 103 190-1 V1.3.1, Annex G
+    byte[] ac4SampleHeader  = new byte[] {(byte)0xAC, 0x40, (byte)0xFF, (byte)0xFF,
+        (byte)(sampleSize >> 16 & 0xFF), (byte)(sampleSize >> 8 & 0xFF), (byte)(sampleSize & 0xFF)};
+    return new ParsableByteArray(ac4SampleHeader);
+  }
+
+  private Ac4Util() {}
+
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
index fc515dbdb3..686e2365fd 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
@@ -1202,6 +1202,8 @@ public final class DefaultAudioSink implements AudioSink {
         return 18000 * 1000 / 8;
       case C.ENCODING_DOLBY_TRUEHD:
         return 24500 * 1000 / 8;
+      case C.ENCODING_AC4:
+        return 2688 * 1000 / 8;
       case C.ENCODING_INVALID:
       case C.ENCODING_PCM_16BIT:
       case C.ENCODING_PCM_24BIT:
@@ -1229,6 +1231,8 @@ public final class DefaultAudioSink implements AudioSink {
           ? 0
           : (Ac3Util.parseTrueHdSyncframeAudioSampleCount(buffer, syncframeOffset)
               * Ac3Util.TRUEHD_RECHUNK_SAMPLE_COUNT);
+    } else if (encoding == C.ENCODING_AC4) {
+      return Ac4Util.parseAc4SyncframeAudioSampleCount(buffer);
     } else {
       throw new IllegalStateException("Unexpected audio encoding: " + encoding);
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
index 49c391c4cc..f9749450c3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
@@ -787,6 +787,11 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
         mediaFormat.setFloat(MediaFormat.KEY_OPERATING_RATE, codecOperatingRate);
       }
     }
+    if (MimeTypes.AUDIO_AC4.equals(format.sampleMimeType)) {
+      // Some devices handle AC-4 raw frame by default.
+      // Need to notify the codec to handle AC-4 sync frame.
+      mediaFormat.setInteger("ac4-is-sync", 1);
+    }
     return mediaFormat;
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java
index 54bb617c58..14db0b2ae1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java
@@ -23,6 +23,7 @@ import com.google.android.exoplayer2.extractor.mp4.FragmentedMp4Extractor;
 import com.google.android.exoplayer2.extractor.mp4.Mp4Extractor;
 import com.google.android.exoplayer2.extractor.ogg.OggExtractor;
 import com.google.android.exoplayer2.extractor.ts.Ac3Extractor;
+import com.google.android.exoplayer2.extractor.ts.Ac4Extractor;
 import com.google.android.exoplayer2.extractor.ts.AdtsExtractor;
 import com.google.android.exoplayer2.extractor.ts.DefaultTsPayloadReaderFactory;
 import com.google.android.exoplayer2.extractor.ts.PsExtractor;
@@ -206,7 +207,7 @@ public final class DefaultExtractorsFactory implements ExtractorsFactory {
 
   @Override
   public synchronized Extractor[] createExtractors() {
-    Extractor[] extractors = new Extractor[FLAC_EXTRACTOR_CONSTRUCTOR == null ? 12 : 13];
+    Extractor[] extractors = new Extractor[FLAC_EXTRACTOR_CONSTRUCTOR == null ? 13 : 14];
     extractors[0] = new MatroskaExtractor(matroskaFlags);
     extractors[1] = new FragmentedMp4Extractor(fragmentedMp4Flags);
     extractors[2] = new Mp4Extractor(mp4Flags);
@@ -235,9 +236,10 @@ public final class DefaultExtractorsFactory implements ExtractorsFactory {
                 | (constantBitrateSeekingEnabled
                     ? AmrExtractor.FLAG_ENABLE_CONSTANT_BITRATE_SEEKING
                     : 0));
+    extractors[12] = new Ac4Extractor();
     if (FLAC_EXTRACTOR_CONSTRUCTOR != null) {
       try {
-        extractors[12] = FLAC_EXTRACTOR_CONSTRUCTOR.newInstance();
+        extractors[13] = FLAC_EXTRACTOR_CONSTRUCTOR.newInstance();
       } catch (Exception e) {
         // Should never happen.
         throw new IllegalStateException("Unexpected error creating FLAC extractor", e);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
index 440e577c7d..5f1cf7ecb8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
@@ -67,6 +67,8 @@ import java.util.List;
   public static final int TYPE_dac3 = Util.getIntegerCodeForString("dac3");
   public static final int TYPE_ec_3 = Util.getIntegerCodeForString("ec-3");
   public static final int TYPE_dec3 = Util.getIntegerCodeForString("dec3");
+  public static final int TYPE_ac_4 = Util.getIntegerCodeForString("ac-4");
+  public static final int TYPE_dac4 = Util.getIntegerCodeForString("dac4");
   public static final int TYPE_dtsc = Util.getIntegerCodeForString("dtsc");
   public static final int TYPE_dtsh = Util.getIntegerCodeForString("dtsh");
   public static final int TYPE_dtsl = Util.getIntegerCodeForString("dtsl");
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
index d085156f2b..24b24d5011 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
@@ -22,6 +22,7 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.audio.Ac3Util;
+import com.google.android.exoplayer2.audio.Ac4Util;
 import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.extractor.GaplessInfoHolder;
 import com.google.android.exoplayer2.metadata.Metadata;
@@ -684,6 +685,7 @@ import java.util.List;
           || childAtomType == Atom.TYPE_enca
           || childAtomType == Atom.TYPE_ac_3
           || childAtomType == Atom.TYPE_ec_3
+          || childAtomType == Atom.TYPE_ac_4
           || childAtomType == Atom.TYPE_dtsc
           || childAtomType == Atom.TYPE_dtse
           || childAtomType == Atom.TYPE_dtsh
@@ -974,6 +976,8 @@ import java.util.List;
       mimeType = MimeTypes.AUDIO_AC3;
     } else if (atomType == Atom.TYPE_ec_3) {
       mimeType = MimeTypes.AUDIO_E_AC3;
+    } else if (atomType == Atom.TYPE_ac_4) {
+      mimeType = MimeTypes.AUDIO_AC4;
     } else if (atomType == Atom.TYPE_dtsc) {
       mimeType = MimeTypes.AUDIO_DTS;
     } else if (atomType == Atom.TYPE_dtsh || atomType == Atom.TYPE_dtsl) {
@@ -1031,6 +1035,10 @@ import java.util.List;
         parent.setPosition(Atom.HEADER_SIZE + childPosition);
         out.format = Ac3Util.parseEAc3AnnexFFormat(parent, Integer.toString(trackId), language,
             drmInitData);
+      } else if (childAtomType == Atom.TYPE_dac4) {
+        parent.setPosition(Atom.HEADER_SIZE + childPosition);
+        out.format = Ac4Util.parseAc4AnnexEFormat(parent, Integer.toString(trackId), language,
+            drmInitData);
       } else if (childAtomType == Atom.TYPE_ddts) {
         out.format = Format.createAudioSampleFormat(Integer.toString(trackId), mimeType, null,
             Format.NO_VALUE, Format.NO_VALUE, channelCount, sampleRate, null, drmInitData, 0,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
index 72bcaa9fe2..1d45854647 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
@@ -22,6 +22,7 @@ import android.util.SparseArray;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ParserException;
+import com.google.android.exoplayer2.audio.Ac4Util;
 import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 import com.google.android.exoplayer2.extractor.ChunkIndex;
@@ -1276,10 +1277,17 @@ public class FragmentedMp4Extractor implements Extractor {
         }
       }
     } else {
+      int sampleHeaderSize = 0;
+      if (MimeTypes.AUDIO_AC4.equals(track.format.sampleMimeType)) {
+        ParsableByteArray ac4SampleHeaderData = Ac4Util.getAc4SampleHeader(sampleSize);
+        output.sampleData(ac4SampleHeaderData, ac4SampleHeaderData.capacity());
+        sampleHeaderSize = ac4SampleHeaderData.capacity();
+      }
       while (sampleBytesWritten < sampleSize) {
         int writtenBytes = output.sampleData(input, sampleSize - sampleBytesWritten, false);
         sampleBytesWritten += writtenBytes;
       }
+      sampleSize += sampleHeaderSize;
     }
 
     @C.BufferFlags int sampleFlags = fragment.sampleIsSyncFrameTable[sampleIndex]
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
index ec24bed964..7c9fe2a187 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
@@ -19,6 +19,7 @@ import android.support.annotation.IntDef;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ParserException;
+import com.google.android.exoplayer2.audio.Ac4Util;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.extractor.ExtractorOutput;
@@ -31,6 +32,7 @@ import com.google.android.exoplayer2.extractor.TrackOutput;
 import com.google.android.exoplayer2.extractor.mp4.Atom.ContainerAtom;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.NalUnitUtil;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.Util;
@@ -536,11 +538,18 @@ public final class Mp4Extractor implements Extractor, SeekMap {
         }
       }
     } else {
+      int sampleHeaderSize = 0;
+      if (MimeTypes.AUDIO_AC4.equals(track.track.format.sampleMimeType)) {
+        ParsableByteArray ac4SampleHeaderData = Ac4Util.getAc4SampleHeader(sampleSize);
+        trackOutput.sampleData(ac4SampleHeaderData, ac4SampleHeaderData.capacity());
+        sampleHeaderSize = ac4SampleHeaderData.capacity();
+      }
       while (sampleBytesWritten < sampleSize) {
         int writtenBytes = trackOutput.sampleData(input, sampleSize - sampleBytesWritten, false);
         sampleBytesWritten += writtenBytes;
         sampleCurrentNalBytesRemaining -= writtenBytes;
       }
+      sampleSize += sampleHeaderSize;
     }
     trackOutput.sampleMetadata(track.sampleTable.timestampsUs[sampleIndex],
         track.sampleTable.flags[sampleIndex], sampleSize, 0, null);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Extractor.java
new file mode 100644
index 0000000000..87b106de42
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Extractor.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.extractor.ts;
+
+import static com.google.android.exoplayer2.extractor.ts.TsPayloadReader.FLAG_DATA_ALIGNMENT_INDICATOR;
+
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.audio.Ac4Util;
+import com.google.android.exoplayer2.extractor.Extractor;
+import com.google.android.exoplayer2.extractor.ExtractorInput;
+import com.google.android.exoplayer2.extractor.ExtractorOutput;
+import com.google.android.exoplayer2.extractor.ExtractorsFactory;
+import com.google.android.exoplayer2.extractor.PositionHolder;
+import com.google.android.exoplayer2.extractor.SeekMap;
+import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.TrackIdGenerator;
+import com.google.android.exoplayer2.util.ParsableByteArray;
+import com.google.android.exoplayer2.util.Util;
+
+import java.io.IOException;
+
+/**
+ * Extracts data from AC-4 bitstreams.
+ */
+public final class Ac4Extractor implements Extractor {
+
+  /**
+   * Factory for {@link Ac4Extractor} instances.
+   */
+  public static final ExtractorsFactory FACTORY = () -> new Extractor[] {new Ac4Extractor()};
+
+  /**
+   * The maximum number of bytes to search when sniffing, excluding ID3 information, before giving
+   * up.
+   */
+  private static final int MAX_SNIFF_BYTES = 8 * 1024;
+  private static final int AC40_SYNC_WORD = 0xAC40;
+  private static final int AC41_SYNC_WORD = 0xAC41;
+  /**
+   * Typical AC-4 frame size (in bytes)
+   * The value 16 kB is determined by the maximum frame size used in broadcast applications.
+   */
+  private static final int FRAMELEN_TYPICAL = 16384;  /* in bytes (16 kB) */
+  private static final int ID3_TAG = Util.getIntegerCodeForString("ID3");
+
+  private final long firstSampleTimestampUs;
+  private final Ac4Reader reader;
+  private final ParsableByteArray sampleData;
+
+  private boolean startedPacket;
+
+  public Ac4Extractor() {
+    this(0);
+  }
+
+  public Ac4Extractor(long firstSampleTimestampUs) {
+    this.firstSampleTimestampUs = firstSampleTimestampUs;
+    reader = new Ac4Reader();
+    sampleData = new ParsableByteArray(FRAMELEN_TYPICAL);
+  }
+
+  // Extractor implementation.
+
+  @Override
+  public boolean sniff(ExtractorInput input) throws IOException, InterruptedException {
+    // Skip any ID3 headers.
+    ParsableByteArray scratch = new ParsableByteArray(10);
+    int startPosition = 0;
+    while (true) {
+      input.peekFully(scratch.data, 0, 10);
+      scratch.setPosition(0);
+      if (scratch.readUnsignedInt24() != ID3_TAG) {
+        break;
+      }
+      scratch.skipBytes(3);
+      int length = scratch.readSynchSafeInt();
+      startPosition += 10 + length;
+      input.advancePeekPosition(length);
+    }
+    input.resetPeekPosition();
+    input.advancePeekPosition(startPosition);
+
+    int headerPosition = startPosition;
+    int validFramesCount = 0;
+    while (true) {
+      input.peekFully(scratch.data, 0, 7);
+      scratch.setPosition(0);
+      int syncBytes = scratch.readUnsignedShort();
+      if (syncBytes != AC40_SYNC_WORD && syncBytes != AC41_SYNC_WORD) {
+        validFramesCount = 0;
+        input.resetPeekPosition();
+        if (++headerPosition - startPosition >= MAX_SNIFF_BYTES) {
+          return false;
+        }
+        input.advancePeekPosition(headerPosition);
+      } else {
+        if (++validFramesCount >= 4) {
+          return true;
+        }
+        int frameSize = Ac4Util.parseAc4SyncframeSize(scratch.data, syncBytes);
+        if (frameSize == C.LENGTH_UNSET) {
+          return false;
+        }
+        input.advancePeekPosition(frameSize - 7);
+      }
+    }
+  }
+
+  @Override
+  public void init(ExtractorOutput output) {
+    reader.createTracks(output, new TrackIdGenerator(0, 1));
+    output.endTracks();
+    output.seekMap(new SeekMap.Unseekable(C.TIME_UNSET));
+  }
+
+  @Override
+  public void seek(long position, long timeUs) {
+    startedPacket = false;
+    reader.seek();
+  }
+
+  @Override
+  public void release() {
+    // Do nothing.
+  }
+
+  @Override
+  public int read(ExtractorInput input, PositionHolder seekPosition) throws IOException,
+      InterruptedException {
+    int bytesRead = input.read(sampleData.data, 0, FRAMELEN_TYPICAL);
+    if (bytesRead == C.RESULT_END_OF_INPUT) {
+      return RESULT_END_OF_INPUT;
+    }
+
+    // Feed whatever data we have to the reader, regardless of whether the read finished or not.
+    sampleData.setPosition(0);
+    sampleData.setLimit(bytesRead);
+
+    if (!startedPacket) {
+      // Pass data to the reader as though it's contained within a single infinitely long packet.
+      reader.packetStarted(firstSampleTimestampUs, FLAG_DATA_ALIGNMENT_INDICATOR);
+      startedPacket = true;
+    }
+    // TODO: Make it possible for the reader to consume the dataSource directly, so that it becomes
+    // unnecessary to copy the data through packetBuffer.
+    reader.consume(sampleData);
+    return RESULT_CONTINUE;
+  }
+
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java
new file mode 100644
index 0000000000..f5d50cde92
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java
@@ -0,0 +1,215 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.extractor.ts;
+
+import android.support.annotation.IntDef;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.audio.Ac4Util;
+import com.google.android.exoplayer2.audio.Ac4Util.SyncFrameInfo;
+import com.google.android.exoplayer2.extractor.ExtractorOutput;
+import com.google.android.exoplayer2.extractor.TrackOutput;
+import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.TrackIdGenerator;
+import com.google.android.exoplayer2.util.ParsableBitArray;
+import com.google.android.exoplayer2.util.ParsableByteArray;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Parses a continuous AC-4 byte stream and extracts individual samples.
+ */
+public final class Ac4Reader implements ElementaryStreamReader {
+
+  @Documented
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({STATE_FINDING_SYNC, STATE_READING_HEADER, STATE_READING_SAMPLE})
+  private @interface State {}
+
+  private static final int STATE_FINDING_SYNC = 0;
+  private static final int STATE_READING_HEADER = 1;
+  private static final int STATE_READING_SAMPLE = 2;
+
+  private final ParsableBitArray headerScratchBits;
+  private final ParsableByteArray headerScratchBytes;
+  private final String language;
+
+  private String trackFormatId;
+  private TrackOutput output;
+
+  @State private int state;
+  private int bytesRead;
+
+  // Used to find the header.
+  private boolean lastByteWasAC;
+  private boolean hasCRC;
+
+  // Used when parsing the header.
+  private long sampleDurationUs;
+  private Format format;
+  private int sampleSize;
+
+  // Used when reading the samples.
+  private long timeUs;
+
+  /**
+   * Constructs a new reader for AC-4 elementary streams.
+   */
+  public Ac4Reader() {
+    this(null);
+  }
+
+  /**
+   * Constructs a new reader for AC-4 elementary streams.
+   *
+   * @param language Track language.
+   */
+  public Ac4Reader(String language) {
+    headerScratchBits = new ParsableBitArray(new byte[Ac4Util.HEADER_SIZE_FOR_PARSER]);
+    headerScratchBytes = new ParsableByteArray(headerScratchBits.data);
+    state = STATE_FINDING_SYNC;
+    bytesRead = 0;
+    lastByteWasAC = false;
+    hasCRC = false;
+    this.language = language;
+  }
+
+  @Override
+  public void seek() {
+    state = STATE_FINDING_SYNC;
+    bytesRead = 0;
+    lastByteWasAC = false;
+    hasCRC = false;
+  }
+
+  @Override
+  public void createTracks(ExtractorOutput extractorOutput, TrackIdGenerator generator) {
+    generator.generateNewId();
+    trackFormatId = generator.getFormatId();
+    output = extractorOutput.track(generator.getTrackId(), C.TRACK_TYPE_AUDIO);
+  }
+
+  @Override
+  public void packetStarted(long pesTimeUs, @TsPayloadReader.Flags int flags) {
+    timeUs = pesTimeUs;
+  }
+
+  @Override
+  public void consume(ParsableByteArray data) {
+    while (data.bytesLeft() > 0) {
+      switch (state) {
+        case STATE_FINDING_SYNC:
+          if (skipToNextSync(data)) {
+            state = STATE_READING_HEADER;
+            headerScratchBytes.data[0] = (byte)0xAC;
+            headerScratchBytes.data[1] = 0x40;
+            if (hasCRC)
+              headerScratchBytes.data[1] = 0x41;
+            bytesRead = 2;
+          }
+          break;
+        case STATE_READING_HEADER:
+          if (continueRead(data, headerScratchBytes.data, Ac4Util.HEADER_SIZE_FOR_PARSER)) {
+            parseHeader();
+            headerScratchBytes.setPosition(0);
+            output.sampleData(headerScratchBytes, Ac4Util.HEADER_SIZE_FOR_PARSER);
+            state = STATE_READING_SAMPLE;
+          }
+          break;
+        case STATE_READING_SAMPLE:
+          int bytesToRead = Math.min(data.bytesLeft(), sampleSize - bytesRead);
+          output.sampleData(data, bytesToRead);
+          bytesRead += bytesToRead;
+          if (bytesRead == sampleSize) {
+            output.sampleMetadata(timeUs, C.BUFFER_FLAG_KEY_FRAME, sampleSize, 0, null);
+            timeUs += sampleDurationUs;
+            state = STATE_FINDING_SYNC;
+          }
+          break;
+        default:
+          break;
+      }
+    }
+  }
+
+  @Override
+  public void packetFinished() {
+    // Do nothing.
+  }
+
+  /**
+   * Continues a read from the provided {@code source} into a given {@code target}. It's assumed
+   * that the data should be written into {@code target} starting from an offset of zero.
+   *
+   * @param source The source from which to read.
+   * @param target The target into which data is to be read.
+   * @param targetLength The target length of the read.
+   * @return Whether the target length was reached.
+   */
+  private boolean continueRead(ParsableByteArray source, byte[] target, int targetLength) {
+    int bytesToRead = Math.min(source.bytesLeft(), targetLength - bytesRead);
+    source.readBytes(target, bytesRead, bytesToRead);
+    bytesRead += bytesToRead;
+    return bytesRead == targetLength;
+  }
+
+  /**
+   * Locates the next syncword, advancing the position to the byte that immediately follows it. If a
+   * syncword was not located, the position is advanced to the limit.
+   *
+   * @param pesBuffer The buffer whose position should be advanced.
+   * @return Whether a syncword position was found.
+   */
+  private boolean skipToNextSync(ParsableByteArray pesBuffer) {
+    while (pesBuffer.bytesLeft() > 0) {
+      if (!lastByteWasAC) {
+        lastByteWasAC = (pesBuffer.readUnsignedByte() == 0xAC);
+        continue;
+      }
+      int secondByte = pesBuffer.readUnsignedByte();
+      if (secondByte == 0x40 || secondByte == 0x41) {
+        lastByteWasAC = false;
+        hasCRC = (secondByte == 0x41);
+        return true;
+      } else {
+        lastByteWasAC = (secondByte == 0xAC);
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Parses the sample header.
+   */
+  @SuppressWarnings("ReferenceEquality")
+  private void parseHeader() {
+    headerScratchBits.setPosition(0);
+    SyncFrameInfo frameInfo = Ac4Util.parseAc4SyncframeInfo(headerScratchBits);
+    if (format == null || frameInfo.channelCount != format.channelCount
+        || frameInfo.sampleRate != format.sampleRate
+        || frameInfo.mimeType != format.sampleMimeType) {
+      format = Format.createAudioSampleFormat(trackFormatId, frameInfo.mimeType, null,
+          Format.NO_VALUE, Format.NO_VALUE, frameInfo.channelCount, frameInfo.sampleRate, null,
+          null, 0, language);
+      output.format(format);
+    }
+    sampleSize = frameInfo.frameSize;
+    // In this class a sample is an AC-4 sync frame, but the MediaFormat sample rate specifies the
+    // number of PCM audio samples per second.
+    sampleDurationUs = C.MICROS_PER_SECOND * frameInfo.sampleCount / format.sampleRate;
+  }
+
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java
index a5506e2cfb..488480d10e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java
@@ -142,6 +142,8 @@ public final class DefaultTsPayloadReaderFactory implements TsPayloadReader.Fact
       case TsExtractor.TS_STREAM_TYPE_AC3:
       case TsExtractor.TS_STREAM_TYPE_E_AC3:
         return new PesReader(new Ac3Reader(esInfo.language));
+      case TsExtractor.TS_STREAM_TYPE_AC4:
+        return new PesReader(new Ac4Reader(esInfo.language));
       case TsExtractor.TS_STREAM_TYPE_DTS:
       case TsExtractor.TS_STREAM_TYPE_HDMV_DTS:
         return new PesReader(new DtsReader(esInfo.language));
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java
index f47a481d7e..21dec0d111 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java
@@ -85,6 +85,7 @@ public final class TsExtractor implements Extractor {
   public static final int TS_STREAM_TYPE_DTS = 0x8A;
   public static final int TS_STREAM_TYPE_HDMV_DTS = 0x82;
   public static final int TS_STREAM_TYPE_E_AC3 = 0x87;
+  public static final int TS_STREAM_TYPE_AC4 = 0xAC;  /* DVB/ATSC AC-4 Descriptor */
   public static final int TS_STREAM_TYPE_H262 = 0x02;
   public static final int TS_STREAM_TYPE_H264 = 0x1B;
   public static final int TS_STREAM_TYPE_H265 = 0x24;
@@ -100,6 +101,7 @@ public final class TsExtractor implements Extractor {
 
   private static final long AC3_FORMAT_IDENTIFIER = Util.getIntegerCodeForString("AC-3");
   private static final long E_AC3_FORMAT_IDENTIFIER = Util.getIntegerCodeForString("EAC3");
+  private static final long AC4_FORMAT_IDENTIFIER = Util.getIntegerCodeForString("AC-4");
   private static final long HEVC_FORMAT_IDENTIFIER = Util.getIntegerCodeForString("HEVC");
 
   private static final int BUFFER_SIZE = TS_PACKET_SIZE * 50;
@@ -484,8 +486,11 @@ public final class TsExtractor implements Extractor {
     private static final int TS_PMT_DESC_AC3 = 0x6A;
     private static final int TS_PMT_DESC_EAC3 = 0x7A;
     private static final int TS_PMT_DESC_DTS = 0x7B;
+    private static final int TS_PMT_DESC_DVB_EXT = 0x7F;
     private static final int TS_PMT_DESC_DVBSUBS = 0x59;
 
+    private static final int TS_PMT_DESC_DVB_EXT_AC4 = 0x15;
+
     private final ParsableBitArray pmtScratch;
     private final SparseArray<TsPayloadReader> trackIdToReaderScratch;
     private final SparseIntArray trackIdToPidScratch;
@@ -638,6 +643,8 @@ public final class TsExtractor implements Extractor {
             streamType = TS_STREAM_TYPE_AC3;
           } else if (formatIdentifier == E_AC3_FORMAT_IDENTIFIER) {
             streamType = TS_STREAM_TYPE_E_AC3;
+          } else if (formatIdentifier == AC4_FORMAT_IDENTIFIER) {
+            streamType = TS_STREAM_TYPE_AC4;
           } else if (formatIdentifier == HEVC_FORMAT_IDENTIFIER) {
             streamType = TS_STREAM_TYPE_H265;
           }
@@ -645,6 +652,13 @@ public final class TsExtractor implements Extractor {
           streamType = TS_STREAM_TYPE_AC3;
         } else if (descriptorTag == TS_PMT_DESC_EAC3) { // enhanced_AC-3_descriptor
           streamType = TS_STREAM_TYPE_E_AC3;
+        } else if (descriptorTag == TS_PMT_DESC_DVB_EXT) {
+          // extension descriptor in DVB (ETSI EN 300 468)
+          int descriptorTagExt = data.readUnsignedByte();
+          if (descriptorTagExt == TS_PMT_DESC_DVB_EXT_AC4) {
+            // AC-4_descriptor in DVB (ETSI EN 300 468)
+            streamType = TS_STREAM_TYPE_AC4;
+          }
         } else if (descriptorTag == TS_PMT_DESC_DTS) { // DTS_descriptor
           streamType = TS_STREAM_TYPE_DTS;
         } else if (descriptorTag == TS_PMT_DESC_ISO639_LANG) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java b/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
index e506ae1b19..e6cf5ed95e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
@@ -55,6 +55,7 @@ public final class MimeTypes {
   public static final String AUDIO_AC3 = BASE_TYPE_AUDIO + "/ac3";
   public static final String AUDIO_E_AC3 = BASE_TYPE_AUDIO + "/eac3";
   public static final String AUDIO_E_AC3_JOC = BASE_TYPE_AUDIO + "/eac3-joc";
+  public static final String AUDIO_AC4 = BASE_TYPE_AUDIO + "/ac4";
   public static final String AUDIO_TRUEHD = BASE_TYPE_AUDIO + "/true-hd";
   public static final String AUDIO_DTS = BASE_TYPE_AUDIO + "/vnd.dts";
   public static final String AUDIO_DTS_HD = BASE_TYPE_AUDIO + "/vnd.dts.hd";
@@ -237,6 +238,8 @@ public final class MimeTypes {
       return MimeTypes.AUDIO_E_AC3;
     } else if (codec.startsWith("ec+3")) {
       return MimeTypes.AUDIO_E_AC3_JOC;
+    } else if (codec.startsWith("ac-4") || codec.startsWith("dac4")) {
+      return MimeTypes.AUDIO_AC4;
     } else if (codec.startsWith("dtsc") || codec.startsWith("dtse")) {
       return MimeTypes.AUDIO_DTS;
     } else if (codec.startsWith("dtsh") || codec.startsWith("dtsl")) {
@@ -301,6 +304,8 @@ public final class MimeTypes {
         return MimeTypes.AUDIO_DTS_HD;
       case 0xAD:
         return MimeTypes.AUDIO_OPUS;
+      case 0xAE:
+        return MimeTypes.AUDIO_AC4;
       default:
         return null;
     }
@@ -354,6 +359,8 @@ public final class MimeTypes {
       case MimeTypes.AUDIO_E_AC3:
       case MimeTypes.AUDIO_E_AC3_JOC:
         return C.ENCODING_E_AC3;
+      case MimeTypes.AUDIO_AC4:
+        return C.ENCODING_AC4;
       case MimeTypes.AUDIO_DTS:
         return C.ENCODING_DTS;
       case MimeTypes.AUDIO_DTS_HD:
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
index 8a403c3759..b1e78c22f2 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
@@ -25,6 +25,7 @@ import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.extractor.mp3.Mp3Extractor;
 import com.google.android.exoplayer2.extractor.mp4.FragmentedMp4Extractor;
 import com.google.android.exoplayer2.extractor.ts.Ac3Extractor;
+import com.google.android.exoplayer2.extractor.ts.Ac4Extractor;
 import com.google.android.exoplayer2.extractor.ts.AdtsExtractor;
 import com.google.android.exoplayer2.extractor.ts.DefaultTsPayloadReaderFactory;
 import com.google.android.exoplayer2.extractor.ts.TsExtractor;
@@ -43,6 +44,7 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
 
   public static final String AAC_FILE_EXTENSION = ".aac";
   public static final String AC3_FILE_EXTENSION = ".ac3";
+  public static final String AC4_FILE_EXTENSION = ".ac4";
   public static final String EC3_FILE_EXTENSION = ".ec3";
   public static final String MP3_FILE_EXTENSION = ".mp3";
   public static final String MP4_FILE_EXTENSION = ".mp4";
@@ -94,6 +96,8 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
         return buildResult(new AdtsExtractor());
       } else if (previousExtractor instanceof Ac3Extractor) {
         return buildResult(new Ac3Extractor());
+      } else if (previousExtractor instanceof Ac4Extractor) {
+        return buildResult(new Ac4Extractor());
       } else if (previousExtractor instanceof Mp3Extractor) {
         return buildResult(new Mp3Extractor());
       } else {
@@ -135,6 +139,13 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
       }
     }
 
+    if (!(extractorByFileExtension instanceof Ac4Extractor)) {
+      Ac4Extractor ac4Extractor = new Ac4Extractor();
+      if (sniffQuietly(ac4Extractor, extractorInput)) {
+        return buildResult(ac4Extractor);
+      }
+    }
+
     if (!(extractorByFileExtension instanceof Mp3Extractor)) {
       Mp3Extractor mp3Extractor =
           new Mp3Extractor(/* flags= */ 0, /* forcedFirstSampleTimestampUs= */ 0);
@@ -188,6 +199,8 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
     } else if (lastPathSegment.endsWith(AC3_FILE_EXTENSION)
         || lastPathSegment.endsWith(EC3_FILE_EXTENSION)) {
       return new Ac3Extractor();
+    } else if (lastPathSegment.endsWith(AC4_FILE_EXTENSION)) {
+      return new Ac4Extractor();
     } else if (lastPathSegment.endsWith(MP3_FILE_EXTENSION)) {
       return new Mp3Extractor(/* flags= */ 0, /* forcedFirstSampleTimestampUs= */ 0);
     } else if (lastPathSegment.endsWith(MP4_FILE_EXTENSION)
@@ -254,6 +267,7 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
         extractor,
         extractor instanceof AdtsExtractor
             || extractor instanceof Ac3Extractor
+            || extractor instanceof Ac4Extractor
             || extractor instanceof Mp3Extractor);
   }
 

From 173f36897b9c2df2807bf027839411779f5c1754 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 21 Dec 2018 09:55:42 +0000
Subject: [PATCH 336/832] Update release notes

PiperOrigin-RevId: 226459209
---
 RELEASENOTES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 78cf1ff493..2c008da5f7 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -34,6 +34,8 @@
   ([#1583](https://github.com/google/ExoPlayer/issues/1583)).
 * MPEG-TS: Use random access indicators to minimize the need for
   `FLAG_ALLOW_NON_IDR_KEYFRAMES`.
+* Downloading: Reduce time taken to remove downloads
+  ([#5136](https://github.com/google/ExoPlayer/issues/5136)).
 * MP3:
   * Use the true bitrate for constant-bitrate MP3 seeking.
   * Fix issue where streams would play twice on some Samsung devices

From 3c0107752a465a7f8c1bf258492c88e7982f8857 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Fri, 21 Dec 2018 10:11:21 +0000
Subject: [PATCH 337/832] Add STOPPED state to DownloadManager

PiperOrigin-RevId: 226460891
---
 .../exoplayer2/offline/DownloadManager.java   | 162 +++++++++++-------
 .../offline/DownloadManagerTest.java          |  12 +-
 2 files changed, 114 insertions(+), 60 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 1c6875e341..dad039adab 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -21,6 +21,8 @@ import static com.google.android.exoplayer2.offline.DownloadManager.DownloadStat
 import static com.google.android.exoplayer2.offline.DownloadManager.DownloadState.STATE_FAILED;
 import static com.google.android.exoplayer2.offline.DownloadManager.DownloadState.STATE_QUEUED;
 import static com.google.android.exoplayer2.offline.DownloadManager.DownloadState.STATE_STARTED;
+import static com.google.android.exoplayer2.offline.DownloadManager.DownloadState.STATE_STOPPED;
+import static com.google.android.exoplayer2.offline.DownloadManager.DownloadState.STOP_FLAG_STOPPED;
 
 import android.os.ConditionVariable;
 import android.os.Handler;
@@ -96,7 +98,7 @@ public final class DownloadManager {
 
   private boolean initialized;
   private boolean released;
-  private boolean downloadsStopped;
+  @DownloadState.StopFlags private int stickyStopFlags;
 
   /**
    * Constructs a {@link DownloadManager}.
@@ -126,7 +128,7 @@ public final class DownloadManager {
     this.downloaderFactory = downloaderFactory;
     this.maxActiveDownloads = maxSimultaneousDownloads;
     this.minRetryCount = minRetryCount;
-    this.downloadsStopped = true;
+    this.stickyStopFlags = STOP_FLAG_STOPPED;
 
     downloads = new ArrayList<>();
     activeDownloads = new ArrayList<>();
@@ -169,8 +171,11 @@ public final class DownloadManager {
   /** Starts the downloads. */
   public void startDownloads() {
     Assertions.checkState(!released);
-    if (downloadsStopped) {
-      downloadsStopped = false;
+    if (stickyStopFlags != 0) {
+      stickyStopFlags = 0;
+      for (int i = 0; i < downloads.size(); i++) {
+        downloads.get(i).clearStopFlags(STOP_FLAG_STOPPED);
+      }
       maybeStartDownloads();
       logd("Downloads are started");
     }
@@ -179,10 +184,10 @@ public final class DownloadManager {
   /** Stops all of the downloads. Call {@link #startDownloads()} to restart downloads. */
   public void stopDownloads() {
     Assertions.checkState(!released);
-    if (!downloadsStopped) {
-      downloadsStopped = true;
-      for (int i = 0; i < activeDownloads.size(); i++) {
-        activeDownloads.get(i).stop();
+    if (stickyStopFlags == 0) {
+      stickyStopFlags = STOP_FLAG_STOPPED;
+      for (int i = 0; i < downloads.size(); i++) {
+        downloads.get(i).setStopFlags(STOP_FLAG_STOPPED);
       }
       logd("Downloads are stopping");
     }
@@ -268,7 +273,7 @@ public final class DownloadManager {
     }
     released = true;
     for (int i = 0; i < downloads.size(); i++) {
-      downloads.get(i).stop();
+      downloads.get(i).queue();
     }
     final ConditionVariable fileIOFinishedCondition = new ConditionVariable();
     fileIOHandler.post(fileIOFinishedCondition::open);
@@ -286,7 +291,8 @@ public final class DownloadManager {
         return;
       }
     }
-    Download download = new Download(this, downloaderFactory, action, minRetryCount);
+    Download download =
+        new Download(this, downloaderFactory, action, minRetryCount, stickyStopFlags);
     downloads.add(download);
     logd("Download is added", download);
   }
@@ -308,16 +314,14 @@ public final class DownloadManager {
     }
   }
 
-  private boolean maybeStartDownload(Download download) {
+  private void maybeStartDownload(Download download) {
     if (download.action.isRemoveAction) {
-      return download.start();
-    } else if (!downloadsStopped && activeDownloads.size() < maxActiveDownloads) {
+      download.start();
+    } else if (activeDownloads.size() < maxActiveDownloads) {
       if (download.start()) {
         activeDownloads.add(download);
-        return true;
       }
     }
-    return false;
   }
 
   private void maybeNotifyListenersIdle() {
@@ -426,28 +430,30 @@ public final class DownloadManager {
   public static final class DownloadState {
 
     /**
-     * Download states. One of {@link #STATE_QUEUED}, {@link #STATE_STARTED}, {@link
-     * #STATE_COMPLETED} or {@link #STATE_FAILED}.
+     * Download states. One of {@link #STATE_QUEUED}, {@link #STATE_STOPPED}, {@link #STATE_STARTED}
+     * , {@link #STATE_COMPLETED} or {@link #STATE_FAILED}.
      *
      * <p>Transition diagram:
      *
      * <pre>
-     * queued ↔ started ┬→ completed
-     *                  └→ failed
+     * queued ←┬→ started ┬→ completed
+     *         └→ stopped └→ failed
      * </pre>
      */
     @Documented
     @Retention(RetentionPolicy.SOURCE)
-    @IntDef({STATE_QUEUED, STATE_STARTED, STATE_COMPLETED, STATE_FAILED})
+    @IntDef({STATE_QUEUED, STATE_STOPPED, STATE_STARTED, STATE_COMPLETED, STATE_FAILED})
     public @interface State {}
     /** The download is waiting to be started. */
     public static final int STATE_QUEUED = 0;
+    /** The download is stopped. */
+    public static final int STATE_STOPPED = 1;
     /** The download is currently started. */
-    public static final int STATE_STARTED = 1;
+    public static final int STATE_STARTED = 2;
     /** The download completed. */
-    public static final int STATE_COMPLETED = 2;
+    public static final int STATE_COMPLETED = 3;
     /** The download failed. */
-    public static final int STATE_FAILED = 3;
+    public static final int STATE_FAILED = 4;
 
     /** Failure reasons. Either {@link #FAILURE_REASON_NONE} or {@link #FAILURE_REASON_UNKNOWN}. */
     @Documented
@@ -459,11 +465,23 @@ public final class DownloadManager {
     /** The download is failed because of unknown reason. */
     public static final int FAILURE_REASON_UNKNOWN = 1;
 
+    /** Download stop flags. Possible flag value is {@link #STOP_FLAG_STOPPED}. */
+    @Documented
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef(
+        flag = true,
+        value = {STOP_FLAG_STOPPED})
+    public @interface StopFlags {}
+    /** All downloads are stopped by the application. */
+    public static final int STOP_FLAG_STOPPED = 1;
+
     /** Returns the state string for the given state value. */
     public static String getStateString(@State int state) {
       switch (state) {
         case STATE_QUEUED:
           return "QUEUED";
+        case STATE_STOPPED:
+          return "STOPPED";
         case STATE_STARTED:
           return "STARTED";
         case STATE_COMPLETED:
@@ -503,12 +521,13 @@ public final class DownloadManager {
     public final long startTimeMs;
     /** The last update time. */
     public final long updateTimeMs;
-
     /**
      * If {@link #state} is {@link #STATE_FAILED} then this is the cause, otherwise {@link
      * #FAILURE_REASON_NONE}.
      */
     @FailureReason public final int failureReason;
+    /** Download stop flags. These flags stop downloading any content. */
+    @StopFlags public final int stopFlags;
 
     private DownloadState(
         DownloadAction action,
@@ -517,7 +536,9 @@ public final class DownloadManager {
         long downloadedBytes,
         long totalBytes,
         @FailureReason int failureReason,
+        @StopFlags int stopFlags,
         long startTimeMs) {
+      this.stopFlags = stopFlags;
       Assertions.checkState(
           failureReason == FAILURE_REASON_NONE ? state != STATE_FAILED : state == STATE_FAILED);
       this.id = action.id;
@@ -530,7 +551,6 @@ public final class DownloadManager {
       this.startTimeMs = startTimeMs;
       updateTimeMs = System.currentTimeMillis();
     }
-
   }
 
   private static final class Download {
@@ -548,24 +568,28 @@ public final class DownloadManager {
     @MonotonicNonNull private Downloader downloader;
     @MonotonicNonNull private DownloadThread downloadThread;
     @MonotonicNonNull @DownloadState.FailureReason private int failureReason;
+    @DownloadState.StopFlags private int stopFlags;
 
     private Download(
         DownloadManager downloadManager,
         DownloaderFactory downloaderFactory,
         DownloadAction action,
-        int minRetryCount) {
+        int minRetryCount,
+        int stopFlags) {
       this.id = action.id;
       this.downloadManager = downloadManager;
       this.downloaderFactory = downloaderFactory;
-      this.action = action;
       this.minRetryCount = minRetryCount;
+      this.stopFlags = stopFlags;
       this.startTimeMs = System.currentTimeMillis();
-      state = STATE_QUEUED;
       actionQueue = new ArrayDeque<>();
       actionQueue.add(action);
-      if (!downloadManager.maybeStartDownload(this)) {
-        // If download is started, listeners are already notified about the started state. Otherwise
-        // notify them here about the queued state.
+
+      // Don't notify listeners until we make sure the state doesn't change immediately.
+      state = STATE_QUEUED;
+      setActionAndUpdateState(action);
+      downloadManager.maybeStartDownload(this);
+      if (state == STATE_QUEUED) {
         downloadManager.onDownloadStateChange(this);
       }
     }
@@ -580,9 +604,8 @@ public final class DownloadManager {
       if (state == STATE_STARTED) {
         stopDownloadThread();
       } else {
-        Assertions.checkState(state == STATE_QUEUED);
-        action = updatedAction;
-        downloadManager.onDownloadStateChange(this);
+        Assertions.checkState(state == STATE_QUEUED || state == STATE_STOPPED);
+        setActionAndUpdateState(updatedAction);
       }
     }
 
@@ -602,6 +625,7 @@ public final class DownloadManager {
           downloadedBytes,
           totalBytes,
           failureReason,
+          stopFlags,
           startTimeMs);
     }
 
@@ -617,34 +641,62 @@ public final class DownloadManager {
 
     @Override
     public String toString() {
-      return action.type
-          + ' '
-          + (action.isRemoveAction ? "remove" : "download")
-          + ' '
-          + DownloadState.getStateString(state);
+      String actionString = action.isRemoveAction ? "remove" : "download";
+      return id + ' ' + actionString + ' ' + DownloadState.getStateString(state);
     }
 
     public boolean start() {
       if (state != STATE_QUEUED) {
         return false;
       }
-      state = STATE_STARTED;
-      action = actionQueue.peek();
       downloader = downloaderFactory.createDownloader(action);
       downloadThread =
           new DownloadThread(
               this, downloader, action.isRemoveAction, minRetryCount, downloadManager.handler);
-      downloadManager.onDownloadStateChange(this);
+      setState(STATE_STARTED);
       return true;
     }
 
-    public void stop() {
+    public void setStopFlags(int stopFlags) {
+      updateStopFlags(stopFlags, stopFlags);
+    }
+
+    public void clearStopFlags(int stopFlags) {
+      updateStopFlags(stopFlags, 0);
+    }
+
+    public void queue() {
       if (state == STATE_STARTED) {
         stopDownloadThread();
       }
     }
 
-    // Internal methods running on the main thread.
+    private void updateStopFlags(int mask, int flags) {
+      stopFlags = (flags & mask) | (stopFlags & ~mask);
+      if (stopFlags != 0) {
+        if (!action.isRemoveAction) {
+          if (state == STATE_STARTED) {
+            stopDownloadThread();
+          } else if (state == STATE_QUEUED) {
+            setState(STATE_STOPPED);
+          }
+        }
+      } else if (state == STATE_STOPPED) {
+        setState(STATE_QUEUED);
+      }
+    }
+
+    private void setActionAndUpdateState(DownloadAction action) {
+      this.action = action;
+      setState(!this.action.isRemoveAction && stopFlags != 0 ? STATE_STOPPED : STATE_QUEUED);
+    }
+
+    private void setState(@DownloadState.State int newState) {
+      if (state != newState) {
+        state = newState;
+        downloadManager.onDownloadStateChange(this);
+      }
+    }
 
     private void stopDownloadThread() {
       Assertions.checkNotNull(downloadThread).cancel();
@@ -654,22 +706,17 @@ public final class DownloadManager {
       failureReason = FAILURE_REASON_NONE;
       if (!downloadThread.isCanceled) {
         if (finalError != null) {
-          state = STATE_FAILED;
           failureReason = FAILURE_REASON_UNKNOWN;
-        } else {
-          actionQueue.remove();
-          if (!actionQueue.isEmpty()) {
-            // Don't continue running. Wait to be restarted by maybeStartDownloads().
-            state = STATE_QUEUED;
-            action = actionQueue.peek();
-          } else {
-            state = STATE_COMPLETED;
-          }
+          setState(STATE_FAILED);
+          return;
         }
-      } else {
-        state = STATE_QUEUED;
+        actionQueue.remove();
+      }
+      if (!actionQueue.isEmpty()) {
+        setActionAndUpdateState(actionQueue.peek());
+      } else {
+        setState(STATE_COMPLETED);
       }
-      downloadManager.onDownloadStateChange(this);
     }
   }
 
@@ -748,5 +795,4 @@ public final class DownloadManager {
       return Math.min((errorCount - 1) * 1000, 5000);
     }
   }
-
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index e9720c8d3b..f835cec3e4 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -41,6 +41,7 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowLog;
 
 /** Tests {@link DownloadManager}. */
 @RunWith(RobolectricTestRunner.class)
@@ -69,6 +70,7 @@ public class DownloadManagerTest {
 
   @Before
   public void setUp() throws Exception {
+    ShadowLog.stream = System.out;
     MockitoAnnotations.initMocks(this);
     uri1 = Uri.parse("http://abc.com/media1");
     uri2 = Uri.parse("http://abc.com/media2");
@@ -314,6 +316,7 @@ public class DownloadManagerTest {
 
     downloader1.assertStarted();
     downloader2.assertDoesNotStart();
+    runner2.getTask().assertQueued();
     downloader1.unblock();
     downloader2.assertStarted();
     downloader2.unblock();
@@ -390,11 +393,11 @@ public class DownloadManagerTest {
 
     runOnMainThread(() -> downloadManager.stopDownloads());
 
-    runner1.getTask().assertQueued();
+    runner1.getTask().assertStopped();
 
     // remove actions aren't stopped.
     runner2.getDownloader(0).unblock().assertReleased();
-    runner2.getTask().assertQueued();
+    runner2.getTask().assertStopped();
     // Although remove2 is finished, download2 doesn't start.
     runner2.getDownloader(1).assertDoesNotStart();
 
@@ -534,6 +537,10 @@ public class DownloadManagerTest {
       return assertState(DownloadState.STATE_QUEUED);
     }
 
+    private TaskWrapper assertStopped() {
+      return assertState(DownloadState.STATE_STOPPED);
+    }
+
     private TaskWrapper assertState(@State int expectedState) {
       while (true) {
         Integer state = null;
@@ -542,6 +549,7 @@ public class DownloadManagerTest {
         } catch (InterruptedException e) {
           fail(e.getMessage());
         }
+        assertThat(state).isNotNull();
         if (expectedState == state) {
           return this;
         }

From 9728ac54ba003dbc564e2eaf31d0f2a5e1ba4035 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 21 Dec 2018 15:19:24 +0000
Subject: [PATCH 338/832] Improve doc for setKeepContentOnPlayerReset.

This also applies when seeking or transitioning to unprepared media, which
isn't clear from the current documentation.

Issue:#5267
PiperOrigin-RevId: 226486685
---
 .../java/com/google/android/exoplayer2/ui/PlayerView.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
index 1adc557142..f7f509dfa7 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
@@ -679,8 +679,9 @@ public class PlayerView extends FrameLayout {
   /**
    * Sets whether the currently displayed video frame or media artwork is kept visible when the
    * player is reset. A player reset is defined to mean the player being re-prepared with different
-   * media, {@link Player#stop(boolean)} being called with {@code reset=true}, or the player being
-   * replaced or cleared by calling {@link #setPlayer(Player)}.
+   * media, the player transitioning to unprepared media, {@link Player#stop(boolean)} being called
+   * with {@code reset=true}, or the player being replaced or cleared by calling {@link
+   * #setPlayer(Player)}.
    *
    * <p>If enabled, the currently displayed video frame or media artwork will be kept visible until
    * the player set on the view has been successfully prepared with new media and loaded enough of

From fc6a1ea52264a5f2972602b3bbc90ad1fabba16c Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 24 Dec 2018 14:26:01 +0000
Subject: [PATCH 339/832] Handle rectangular rotation projections in Matroska

See also https://github.com/Matroska-Org/matroska-specification/issues/269.

PiperOrigin-RevId: 226758584
---
 .../java/com/google/android/exoplayer2/C.java | 20 +++++++
 .../extractor/mkv/MatroskaExtractor.java      | 54 +++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/C.java b/library/core/src/main/java/com/google/android/exoplayer2/C.java
index fac9818d9e..77d39fe866 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/C.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/C.java
@@ -896,6 +896,26 @@ public final class C {
    */
   public static final int COLOR_RANGE_FULL = MediaFormat.COLOR_RANGE_FULL;
 
+  /** Video projection types. */
+  @Documented
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({
+    Format.NO_VALUE,
+    PROJECTION_RECTANGULAR,
+    PROJECTION_EQUIRECTANGULAR,
+    PROJECTION_CUBEMAP,
+    PROJECTION_MESH
+  })
+  public @interface Projection {}
+  /** Conventional rectangular projection. */
+  public static final int PROJECTION_RECTANGULAR = 0;
+  /** Equirectangular spherical projection. */
+  public static final int PROJECTION_EQUIRECTANGULAR = 1;
+  /** Cube map projection. */
+  public static final int PROJECTION_CUBEMAP = 2;
+  /** 3-D mesh projection. */
+  public static final int PROJECTION_MESH = 3;
+
   /**
    * Priority for media playback.
    *
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
index 86b750e821..187b9ae443 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
@@ -191,7 +191,11 @@ public final class MatroskaExtractor implements Extractor {
   private static final int ID_CUE_CLUSTER_POSITION = 0xF1;
   private static final int ID_LANGUAGE = 0x22B59C;
   private static final int ID_PROJECTION = 0x7670;
+  private static final int ID_PROJECTION_TYPE = 0x7671;
   private static final int ID_PROJECTION_PRIVATE = 0x7672;
+  private static final int ID_PROJECTION_POSE_YAW = 0x7673;
+  private static final int ID_PROJECTION_POSE_PITCH = 0x7674;
+  private static final int ID_PROJECTION_POSE_ROLL = 0x7675;
   private static final int ID_STEREO_MODE = 0x53B8;
   private static final int ID_COLOUR = 0x55B0;
   private static final int ID_COLOUR_RANGE = 0x55B9;
@@ -760,6 +764,24 @@ public final class MatroskaExtractor implements Extractor {
       case ID_MAX_FALL:
         currentTrack.maxFrameAverageLuminance = (int) value;
         break;
+      case ID_PROJECTION_TYPE:
+        switch ((int) value) {
+          case 0:
+            currentTrack.projectionType = C.PROJECTION_RECTANGULAR;
+            break;
+          case 1:
+            currentTrack.projectionType = C.PROJECTION_EQUIRECTANGULAR;
+            break;
+          case 2:
+            currentTrack.projectionType = C.PROJECTION_CUBEMAP;
+            break;
+          case 3:
+            currentTrack.projectionType = C.PROJECTION_MESH;
+            break;
+          default:
+            break;
+        }
+        break;
       default:
         break;
     }
@@ -803,6 +825,15 @@ public final class MatroskaExtractor implements Extractor {
       case ID_LUMNINANCE_MIN:
         currentTrack.minMasteringLuminance = (float) value;
         break;
+      case ID_PROJECTION_POSE_YAW:
+        currentTrack.projectionPoseYaw = (float) value;
+        break;
+      case ID_PROJECTION_POSE_PITCH:
+        currentTrack.projectionPosePitch = (float) value;
+        break;
+      case ID_PROJECTION_POSE_ROLL:
+        currentTrack.projectionPoseRoll = (float) value;
+        break;
       default:
         break;
     }
@@ -1465,6 +1496,7 @@ public final class MatroskaExtractor implements Extractor {
         case ID_COLOUR_PRIMARIES:
         case ID_MAX_CLL:
         case ID_MAX_FALL:
+        case ID_PROJECTION_TYPE:
           return TYPE_UNSIGNED_INT;
         case ID_DOC_TYPE:
         case ID_NAME:
@@ -1491,6 +1523,9 @@ public final class MatroskaExtractor implements Extractor {
         case ID_WHITE_POINT_CHROMATICITY_Y:
         case ID_LUMNINANCE_MAX:
         case ID_LUMNINANCE_MIN:
+        case ID_PROJECTION_POSE_YAW:
+        case ID_PROJECTION_POSE_PITCH:
+        case ID_PROJECTION_POSE_ROLL:
           return TYPE_FLOAT;
         default:
           return TYPE_UNKNOWN;
@@ -1631,6 +1666,10 @@ public final class MatroskaExtractor implements Extractor {
     public int displayWidth = Format.NO_VALUE;
     public int displayHeight = Format.NO_VALUE;
     public int displayUnit = DISPLAY_UNIT_PIXELS;
+    @C.Projection public int projectionType = Format.NO_VALUE;
+    public float projectionPoseYaw = 0f;
+    public float projectionPosePitch = 0f;
+    public float projectionPoseRoll = 0f;
     public byte[] projectionData = null;
     @C.StereoMode
     public int stereoMode = Format.NO_VALUE;
@@ -1850,6 +1889,21 @@ public final class MatroskaExtractor implements Extractor {
         } else if ("htc_video_rotA-270".equals(name)) {
           rotationDegrees = 270;
         }
+        if (projectionType == C.PROJECTION_RECTANGULAR
+            && Float.compare(projectionPoseYaw, 0f) == 0
+            && Float.compare(projectionPosePitch, 0f) == 0) {
+          // The range of projectionPoseRoll is [-180, 180].
+          if (Float.compare(projectionPoseRoll, 0f) == 0) {
+            rotationDegrees = 0;
+          } else if (Float.compare(projectionPosePitch, 90f) == 0) {
+            rotationDegrees = 90;
+          } else if (Float.compare(projectionPosePitch, -180f) == 0
+              || Float.compare(projectionPosePitch, 180f) == 0) {
+            rotationDegrees = 180;
+          } else if (Float.compare(projectionPosePitch, -90f) == 0) {
+            rotationDegrees = 270;
+          }
+        }
         format =
             Format.createVideoSampleFormat(
                 Integer.toString(trackId),

From 243b12f37ef06628b119512a8296b25a599bd3f0 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 2 Jan 2019 11:39:46 +0000
Subject: [PATCH 340/832] Remove stray word

PiperOrigin-RevId: 227500707
---
 extensions/rtmp/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/rtmp/README.md b/extensions/rtmp/README.md
index b222bdabd9..3863dff965 100644
--- a/extensions/rtmp/README.md
+++ b/extensions/rtmp/README.md
@@ -39,7 +39,7 @@ either instantiated and injected from application code, or obtained from
 instances of `DataSource.Factory` that are instantiated and injected from
 application code.
 
-`DefaultDataSource` will automatically use uses the RTMP extension whenever it's
+`DefaultDataSource` will automatically use the RTMP extension whenever it's
 available. Hence if your application is using `DefaultDataSource` or
 `DefaultDataSourceFactory`, adding support for RTMP streams is as simple as
 adding a dependency to the RTMP extension as described above. No changes to your

From 3a9557c72f9f8be786a6bdecd8ff5d477d2a8354 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 2 Jan 2019 13:43:19 +0000
Subject: [PATCH 341/832] Don't pass maxCacheFileSize to CacheEvictor if real
 size is unknown

CacheEvictor.onStartFile currently receives a length, which is the
maximum size of the content that might be written. The LRU cache
evictor will make sure there's sufficient space for the specified
size. If the actual size of the content is unknown, CacheDataSink
passes maxCacheFileSize.

The current behavior isn't ideal. It seems valid for a developer to
specify maxCacheFileSize=Long.MAX_VALUE if they don't want any
file fragmentation in the cache. However if they then attempt to
cache something with unknown length, LRU cache will try and make
room for content of length Long.MAX_VALUE, and end up evicting the
entire cache to do so.

This change alters the logic so a length is only passed if the
actual size of the content is known. In other cases C.LENGTH_UNSET
is now passed. The LRU evictor will not evict until after the file
is committed. Note a custom LRU evictor could still opt to evict to
ensure some application specified amount of space, if that's the
desired behavior.

PiperOrigin-RevId: 227509525
---
 .../android/exoplayer2/upstream/cache/Cache.java      |  7 ++++---
 .../exoplayer2/upstream/cache/CacheDataSink.java      | 11 +++++++----
 .../exoplayer2/upstream/cache/CacheEvictor.java       |  7 ++++---
 .../upstream/cache/LeastRecentlyUsedCacheEvictor.java |  7 +++++--
 .../exoplayer2/upstream/cache/SimpleCache.java        |  5 ++---
 5 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
index 8641746c74..f65b9b64fe 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2.upstream.cache;
 
 import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.C;
 import java.io.File;
 import java.io.IOException;
 import java.util.NavigableSet;
@@ -169,12 +170,12 @@ public interface Cache {
    *
    * @param key The cache key for the data.
    * @param position The starting position of the data.
-   * @param maxLength The maximum length of the data to be written. Used only to ensure that there
-   *     is enough space in the cache.
+   * @param length The length of the data being written, or {@link C#LENGTH_UNSET} if unknown. Used
+   *     only to ensure that there is enough space in the cache.
    * @return The file into which data should be written.
    * @throws CacheException If an error is encountered.
    */
-  File startFile(String key, long position, long maxLength) throws CacheException;
+  File startFile(String key, long position, long length) throws CacheException;
 
   /**
    * Commits a file into the cache. Must only be called when holding a corresponding hole {@link
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
index 6767548c15..8390d09843 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
@@ -170,10 +170,13 @@ public final class CacheDataSink implements DataSink {
   }
 
   private void openNextOutputStream() throws IOException {
-    long maxLength = dataSpec.length == C.LENGTH_UNSET ? maxCacheFileSize
-        : Math.min(dataSpec.length - dataSpecBytesWritten, maxCacheFileSize);
-    file = cache.startFile(dataSpec.key, dataSpec.absoluteStreamPosition + dataSpecBytesWritten,
-        maxLength);
+    long length =
+        dataSpec.length == C.LENGTH_UNSET
+            ? C.LENGTH_UNSET
+            : Math.min(dataSpec.length - dataSpecBytesWritten, maxCacheFileSize);
+    file =
+        cache.startFile(
+            dataSpec.key, dataSpec.absoluteStreamPosition + dataSpecBytesWritten, length);
     underlyingFileOutputStream = new FileOutputStream(file);
     if (bufferSize > 0) {
       if (bufferedOutputStream == null) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheEvictor.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheEvictor.java
index 8944b45033..dbec4b78fc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheEvictor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheEvictor.java
@@ -15,6 +15,8 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
+import com.google.android.exoplayer2.C;
+
 /**
  * Evicts data from a {@link Cache}. Implementations should call {@link Cache#removeSpan(CacheSpan)}
  * to evict cache entries based on their eviction policies.
@@ -32,8 +34,7 @@ public interface CacheEvictor extends Cache.Listener {
    * @param cache The source of the event.
    * @param key The key being written.
    * @param position The starting position of the data being written.
-   * @param maxLength The maximum length of the data being written.
+   * @param length The length of the data being written, or {@link C#LENGTH_UNSET} if unknown.
    */
-  void onStartFile(Cache cache, String key, long position, long maxLength);
-
+  void onStartFile(Cache cache, String key, long position, long length);
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictor.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictor.java
index 79d23dd1b0..aa40c1d2fd 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictor.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
+import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.upstream.cache.Cache.CacheException;
 import java.util.Comparator;
 import java.util.TreeSet;
@@ -40,8 +41,10 @@ public final class LeastRecentlyUsedCacheEvictor implements CacheEvictor, Compar
   }
 
   @Override
-  public void onStartFile(Cache cache, String key, long position, long maxLength) {
-    evictCache(cache, maxLength);
+  public void onStartFile(Cache cache, String key, long position, long length) {
+    if (length != C.LENGTH_UNSET) {
+      evictCache(cache, length);
+    }
   }
 
   @Override
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index 8bcf1758fa..80788b5786 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -259,8 +259,7 @@ public final class SimpleCache implements Cache {
   }
 
   @Override
-  public synchronized File startFile(String key, long position, long maxLength)
-      throws CacheException {
+  public synchronized File startFile(String key, long position, long length) throws CacheException {
     Assertions.checkState(!released);
     CachedContent cachedContent = index.get(key);
     Assertions.checkNotNull(cachedContent);
@@ -270,7 +269,7 @@ public final class SimpleCache implements Cache {
       cacheDir.mkdirs();
       removeStaleSpans();
     }
-    evictor.onStartFile(this, key, position, maxLength);
+    evictor.onStartFile(this, key, position, length);
     return SimpleCacheSpan.getCacheFile(
         cacheDir, cachedContent.id, position, System.currentTimeMillis());
   }

From 1e992240194b24663803a6f11e33227f32d58d14 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Wed, 2 Jan 2019 15:04:20 +0000
Subject: [PATCH 342/832] Remove AdsLoader listeners on releasing ImaAdsLoader

Issue: #4114
PiperOrigin-RevId: 227516509
---
 RELEASENOTES.md                                                 | 2 ++
 .../com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 2c008da5f7..cf5dea1288 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -27,6 +27,8 @@
   * Rename TaskState to DownloadState.
 * Add support for SHOUTcast ICY metadata
   ([#3735](https://github.com/google/ExoPlayer/issues/3735)).
+* IMA extension: Clear ads loader listeners on release
+  ([#4114](https://github.com/google/ExoPlayer/issues/4114)).
 
 ### 2.9.3 ###
 
diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
index 40950bceef..0920de126d 100644
--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
+++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
@@ -598,6 +598,8 @@ public final class ImaAdsLoader
       adsManager.destroy();
       adsManager = null;
     }
+    adsLoader.removeAdsLoadedListener(/* adsLoadedListener= */ this);
+    adsLoader.removeAdErrorListener(/* adErrorListener= */ this);
     imaPausedContent = false;
     imaAdState = IMA_AD_STATE_NONE;
     pendingAdLoadError = null;

From ae65bcecd4a654185eed461b18dc59d8bc454fd8 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 2 Jan 2019 15:43:11 +0000
Subject: [PATCH 343/832] Move syncFileDescriptor to use an experimental method

PiperOrigin-RevId: 227520168
---
 .../upstream/cache/CacheDataSink.java         | 45 +++++++------------
 .../android/exoplayer2/util/AtomicFile.java   |  2 +-
 2 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
index 8390d09843..3c33081b16 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
@@ -42,8 +42,8 @@ public final class CacheDataSink implements DataSink {
   private final Cache cache;
   private final long maxCacheFileSize;
   private final int bufferSize;
-  private final boolean syncFileDescriptor;
 
+  private boolean syncFileDescriptor;
   private DataSpec dataSpec;
   private File file;
   private OutputStream outputStream;
@@ -63,18 +63,6 @@ public final class CacheDataSink implements DataSink {
 
   }
 
-  /**
-   * Constructs a CacheDataSink using the {@link #DEFAULT_BUFFER_SIZE}.
-   *
-   * @param cache The cache into which data should be written.
-   * @param maxCacheFileSize The maximum size of a cache file, in bytes. If the sink is opened for
-   *    a {@link DataSpec} whose size exceeds this value, then the data will be fragmented into
-   *    multiple cache files.
-   */
-  public CacheDataSink(Cache cache, long maxCacheFileSize) {
-    this(cache, maxCacheFileSize, DEFAULT_BUFFER_SIZE, true);
-  }
-
   /**
    * Constructs a CacheDataSink using the {@link #DEFAULT_BUFFER_SIZE}.
    *
@@ -82,10 +70,9 @@ public final class CacheDataSink implements DataSink {
    * @param maxCacheFileSize The maximum size of a cache file, in bytes. If the sink is opened for a
    *     {@link DataSpec} whose size exceeds this value, then the data will be fragmented into
    *     multiple cache files.
-   * @param syncFileDescriptor Whether file descriptors are sync'd when closing output streams.
    */
-  public CacheDataSink(Cache cache, long maxCacheFileSize, boolean syncFileDescriptor) {
-    this(cache, maxCacheFileSize, DEFAULT_BUFFER_SIZE, syncFileDescriptor);
+  public CacheDataSink(Cache cache, long maxCacheFileSize) {
+    this(cache, maxCacheFileSize, DEFAULT_BUFFER_SIZE);
   }
 
   /**
@@ -97,23 +84,21 @@ public final class CacheDataSink implements DataSink {
    *     value disables buffering.
    */
   public CacheDataSink(Cache cache, long maxCacheFileSize, int bufferSize) {
-    this(cache, maxCacheFileSize, bufferSize, true);
-  }
-
-  /**
-   * @param cache The cache into which data should be written.
-   * @param maxCacheFileSize The maximum size of a cache file, in bytes. If the sink is opened for a
-   *     {@link DataSpec} whose size exceeds this value, then the data will be fragmented into
-   *     multiple cache files.
-   * @param bufferSize The buffer size in bytes for writing to a cache file. A zero or negative
-   *     value disables buffering.
-   * @param syncFileDescriptor Whether file descriptors are sync'd when closing output streams.
-   */
-  public CacheDataSink(
-      Cache cache, long maxCacheFileSize, int bufferSize, boolean syncFileDescriptor) {
     this.cache = Assertions.checkNotNull(cache);
     this.maxCacheFileSize = maxCacheFileSize;
     this.bufferSize = bufferSize;
+    syncFileDescriptor = true;
+  }
+
+  /**
+   * Sets whether file descriptors are synced when closing output streams.
+   *
+   * <p>This method is experimental, and will be renamed or removed in a future release. It should
+   * only be called before the renderer is used.
+   *
+   * @param syncFileDescriptor Whether file descriptors are synced when closing output streams.
+   */
+  public void experimental_setSyncFileDescriptor(boolean syncFileDescriptor) {
     this.syncFileDescriptor = syncFileDescriptor;
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java b/library/core/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java
index 4bdee5ceea..2466d5a049 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java
@@ -29,7 +29,7 @@ import java.io.OutputStream;
  * has successfully completed.
  *
  * <p>Atomic file guarantees file integrity by ensuring that a file has been completely written and
- * sync'd to disk before removing its backup. As long as the backup file exists, the original file
+ * synced to disk before removing its backup. As long as the backup file exists, the original file
  * is considered to be invalid (left over from a previous attempt to write the file).
  *
  * <p>Atomic file does not confer any file locking semantics. Do not use this class when the file

From 0ed7ddecd781364c8e4eae8f7e21e8b65ef32a05 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 2 Jan 2019 16:21:09 +0000
Subject: [PATCH 344/832] Reduce the number of cache files

- Increase the default cache file size to 5MB
- Recommended a minimum cache file size of 2MB to discourage
  applications from specifying values small enough such that
  unreasonably large numbers of cache files are generated
- Allow maxCacheFileSize=C.LENGTH_UNSET, equivalent to setting it
  to MAX_VALUE. This is just for API consistency with other APIs
  we have that accept LENGTH_UNSET

Issue: #4253
PiperOrigin-RevId: 227524233
---
 .../offline/DownloaderConstructorHelper.java  |  3 +-
 .../upstream/cache/CacheDataSink.java         | 41 +++++++++++++++----
 .../upstream/cache/CacheDataSinkFactory.java  |  1 -
 .../upstream/cache/CacheDataSource.java       | 30 +-------------
 .../cache/CacheDataSourceFactory.java         | 11 +----
 .../upstream/cache/CacheUtilTest.java         |  9 +++-
 6 files changed, 45 insertions(+), 50 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java
index 74b918c06d..100e1a03fe 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java
@@ -23,6 +23,7 @@ import com.google.android.exoplayer2.upstream.DummyDataSource;
 import com.google.android.exoplayer2.upstream.FileDataSourceFactory;
 import com.google.android.exoplayer2.upstream.PriorityDataSourceFactory;
 import com.google.android.exoplayer2.upstream.cache.Cache;
+import com.google.android.exoplayer2.upstream.cache.CacheDataSink;
 import com.google.android.exoplayer2.upstream.cache.CacheDataSinkFactory;
 import com.google.android.exoplayer2.upstream.cache.CacheDataSource;
 import com.google.android.exoplayer2.upstream.cache.CacheDataSourceFactory;
@@ -111,7 +112,7 @@ public final class DownloaderConstructorHelper {
     DataSink.Factory writeDataSinkFactory =
         cacheWriteDataSinkFactory != null
             ? cacheWriteDataSinkFactory
-            : new CacheDataSinkFactory(cache, CacheDataSource.DEFAULT_MAX_CACHE_FILE_SIZE);
+            : new CacheDataSinkFactory(cache, CacheDataSink.DEFAULT_MAX_CACHE_FILE_SIZE);
     onlineCacheDataSourceFactory =
         new CacheDataSourceFactory(
             cache,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
index 3c33081b16..ccec73ab35 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
@@ -20,6 +20,7 @@ import com.google.android.exoplayer2.upstream.DataSink;
 import com.google.android.exoplayer2.upstream.DataSpec;
 import com.google.android.exoplayer2.upstream.cache.Cache.CacheException;
 import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.ReusableBufferedOutputStream;
 import com.google.android.exoplayer2.util.Util;
 import java.io.File;
@@ -36,8 +37,13 @@ import java.io.OutputStream;
  */
 public final class CacheDataSink implements DataSink {
 
+  /** Default {@code maxCacheFileSize} recommended for caching use cases. */
+  public static final long DEFAULT_MAX_CACHE_FILE_SIZE = 5 * 1024 * 1024;
   /** Default buffer size in bytes. */
-  public static final int DEFAULT_BUFFER_SIZE = 20480;
+  public static final int DEFAULT_BUFFER_SIZE = 20 * 1024;
+
+  private static final long MIN_RECOMMENDED_MAX_CACHE_FILE_SIZE = 2 * 1024 * 1024;
+  private static final String TAG = "CacheDataSink";
 
   private final Cache cache;
   private final long maxCacheFileSize;
@@ -64,12 +70,15 @@ public final class CacheDataSink implements DataSink {
   }
 
   /**
-   * Constructs a CacheDataSink using the {@link #DEFAULT_BUFFER_SIZE}.
+   * Constructs an instance using {@link #DEFAULT_BUFFER_SIZE}.
    *
    * @param cache The cache into which data should be written.
-   * @param maxCacheFileSize The maximum size of a cache file, in bytes. If the sink is opened for a
-   *     {@link DataSpec} whose size exceeds this value, then the data will be fragmented into
-   *     multiple cache files.
+   * @param maxCacheFileSize The maximum size of a cache file, in bytes. If a request results in
+   *     data being written whose size exceeds this value, then the data will be fragmented into
+   *     multiple cache files. If set to {@link C#LENGTH_UNSET} then no fragmentation will occur.
+   *     Using a small value allows for finer-grained cache eviction policies, at the cost of
+   *     increased overhead both on the cache implementation and the file system. Values under
+   *     {@code (2 * 1024 * 1024)} are not recommended.
    */
   public CacheDataSink(Cache cache, long maxCacheFileSize) {
     this(cache, maxCacheFileSize, DEFAULT_BUFFER_SIZE);
@@ -77,15 +86,29 @@ public final class CacheDataSink implements DataSink {
 
   /**
    * @param cache The cache into which data should be written.
-   * @param maxCacheFileSize The maximum size of a cache file, in bytes. If the sink is opened for a
-   *     {@link DataSpec} whose size exceeds this value, then the data will be fragmented into
-   *     multiple cache files.
+   * @param maxCacheFileSize The maximum size of a cache file, in bytes. If a request results in
+   *     data being written whose size exceeds this value, then the data will be fragmented into
+   *     multiple cache files. If set to {@link C#LENGTH_UNSET} then no fragmentation will occur.
+   *     Using a small value allows for finer-grained cache eviction policies, at the cost of
+   *     increased overhead both on the cache implementation and the file system. Values under
+   *     {@code (2 * 1024 * 1024)} are not recommended.
    * @param bufferSize The buffer size in bytes for writing to a cache file. A zero or negative
    *     value disables buffering.
    */
   public CacheDataSink(Cache cache, long maxCacheFileSize, int bufferSize) {
+    Assertions.checkState(
+        maxCacheFileSize > 0 || maxCacheFileSize == C.LENGTH_UNSET,
+        "maxCacheFileSize must be positive or C.LENGTH_UNSET.");
+    if (maxCacheFileSize != C.LENGTH_UNSET
+        && maxCacheFileSize < MIN_RECOMMENDED_MAX_CACHE_FILE_SIZE) {
+      Log.w(
+          TAG,
+          "maxCacheFileSize is below the minimum recommended value of "
+              + MIN_RECOMMENDED_MAX_CACHE_FILE_SIZE
+              + ". This may cause poor cache performance.");
+    }
     this.cache = Assertions.checkNotNull(cache);
-    this.maxCacheFileSize = maxCacheFileSize;
+    this.maxCacheFileSize = maxCacheFileSize == C.LENGTH_UNSET ? Long.MAX_VALUE : maxCacheFileSize;
     this.bufferSize = bufferSize;
     syncFileDescriptor = true;
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSinkFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSinkFactory.java
index 0b9ab66508..6dcb14f5fb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSinkFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSinkFactory.java
@@ -46,5 +46,4 @@ public final class CacheDataSinkFactory implements DataSink.Factory {
   public DataSink createDataSink() {
     return new CacheDataSink(cache, maxCacheFileSize, bufferSize);
   }
-
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
index 1b4b28d67e..579f5d05e9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
@@ -45,14 +45,6 @@ import java.util.Map;
  */
 public final class CacheDataSource implements DataSource {
 
-  /**
-   * Default maximum single cache file size.
-   *
-   * @see #CacheDataSource(Cache, DataSource, int)
-   * @see #CacheDataSource(Cache, DataSource, int, long)
-   */
-  public static final long DEFAULT_MAX_CACHE_FILE_SIZE = 2 * 1024 * 1024;
-
   /**
    * Flags controlling the CacheDataSource's behavior. Possible flag values are {@link
    * #FLAG_BLOCK_ON_CACHE}, {@link #FLAG_IGNORE_CACHE_ON_ERROR} and {@link
@@ -163,7 +155,7 @@ public final class CacheDataSource implements DataSource {
    * @param upstream A {@link DataSource} for reading data not in the cache.
    */
   public CacheDataSource(Cache cache, DataSource upstream) {
-    this(cache, upstream, 0, DEFAULT_MAX_CACHE_FILE_SIZE);
+    this(cache, upstream, /* flags= */ 0);
   }
 
   /**
@@ -176,29 +168,11 @@ public final class CacheDataSource implements DataSource {
    *     and {@link #FLAG_IGNORE_CACHE_FOR_UNSET_LENGTH_REQUESTS}, or 0.
    */
   public CacheDataSource(Cache cache, DataSource upstream, @Flags int flags) {
-    this(cache, upstream, flags, DEFAULT_MAX_CACHE_FILE_SIZE);
-  }
-
-  /**
-   * Constructs an instance with default {@link DataSource} and {@link DataSink} instances for
-   * reading and writing the cache. The sink is configured to fragment data such that no single
-   * cache file is greater than maxCacheFileSize bytes.
-   *
-   * @param cache The cache.
-   * @param upstream A {@link DataSource} for reading data not in the cache.
-   * @param flags A combination of {@link #FLAG_BLOCK_ON_CACHE}, {@link #FLAG_IGNORE_CACHE_ON_ERROR}
-   *     and {@link #FLAG_IGNORE_CACHE_FOR_UNSET_LENGTH_REQUESTS}, or 0.
-   * @param maxCacheFileSize The maximum size of a cache file, in bytes. If the cached data size
-   *     exceeds this value, then the data will be fragmented into multiple cache files. The
-   *     finer-grained this is the finer-grained the eviction policy can be.
-   */
-  public CacheDataSource(Cache cache, DataSource upstream, @Flags int flags,
-      long maxCacheFileSize) {
     this(
         cache,
         upstream,
         new FileDataSource(),
-        new CacheDataSink(cache, maxCacheFileSize),
+        new CacheDataSink(cache, CacheDataSink.DEFAULT_MAX_CACHE_FILE_SIZE),
         flags,
         /* eventListener= */ null);
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceFactory.java
index d9f9470fe3..e25c3d7a4a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceFactory.java
@@ -46,20 +46,11 @@ public final class CacheDataSourceFactory implements DataSource.Factory {
   /** @see CacheDataSource#CacheDataSource(Cache, DataSource, int) */
   public CacheDataSourceFactory(
       Cache cache, DataSource.Factory upstreamFactory, @CacheDataSource.Flags int flags) {
-    this(cache, upstreamFactory, flags, CacheDataSource.DEFAULT_MAX_CACHE_FILE_SIZE);
-  }
-
-  /** @see CacheDataSource#CacheDataSource(Cache, DataSource, int, long) */
-  public CacheDataSourceFactory(
-      Cache cache,
-      DataSource.Factory upstreamFactory,
-      @CacheDataSource.Flags int flags,
-      long maxCacheFileSize) {
     this(
         cache,
         upstreamFactory,
         new FileDataSourceFactory(),
-        new CacheDataSinkFactory(cache, maxCacheFileSize),
+        new CacheDataSinkFactory(cache, CacheDataSink.DEFAULT_MAX_CACHE_FILE_SIZE),
         flags,
         /* eventListener= */ null);
   }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
index 4fbe93888e..d1bf734a98 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
@@ -27,6 +27,7 @@ import com.google.android.exoplayer2.testutil.FakeDataSet;
 import com.google.android.exoplayer2.testutil.FakeDataSource;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.upstream.DataSpec;
+import com.google.android.exoplayer2.upstream.FileDataSource;
 import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
 import com.google.android.exoplayer2.util.Util;
 import java.io.EOFException;
@@ -341,7 +342,13 @@ public final class CacheUtilTest {
         cache,
         /* cacheKeyFactory= */ null,
         // Set maxCacheFileSize to 10 to make sure there are multiple spans.
-        new CacheDataSource(cache, dataSource, 0, 10),
+        new CacheDataSource(
+            cache,
+            dataSource,
+            new FileDataSource(),
+            new CacheDataSink(cache, /* maxCacheFileSize= */ 10),
+            /* flags= */ 0,
+            /* eventListener= */ null),
         new byte[CacheUtil.DEFAULT_BUFFER_SIZE_BYTES],
         /* priorityTaskManager= */ null,
         /* priority= */ 0,

From 440824ae5cbef6010a572b39fcdd52ca54d6c915 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 3 Jan 2019 09:04:10 +0000
Subject: [PATCH 345/832] Fix replacement char check

PiperOrigin-RevId: 227646358
---
 .../android/exoplayer2/extractor/mp4/MetadataUtil.java      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java
index 670fe116a6..a4bdf7a268 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java
@@ -103,6 +103,9 @@ import com.google.android.exoplayer2.util.Util;
 
   private static final String LANGUAGE_UNDEFINED = "und";
 
+  private static final int TYPE_TOP_BYTE_COPYRIGHT = 0xA9;
+  private static final int TYPE_TOP_BYTE_REPLACEMENT = 0xFD; // Truncated value of \uFFFD.
+
   private MetadataUtil() {}
 
   /**
@@ -119,8 +122,7 @@ import com.google.android.exoplayer2.util.Util;
     int type = ilst.readInt();
     int typeTopByte = (type >> 24) & 0xFF;
     try {
-      if (typeTopByte == '\u00A9' /* Copyright char */
-          || typeTopByte == '\uFFFD' /* Replacement char */) {
+      if (typeTopByte == TYPE_TOP_BYTE_COPYRIGHT || typeTopByte == TYPE_TOP_BYTE_REPLACEMENT) {
         int shortType = type & 0x00FFFFFF;
         if (shortType == SHORT_TYPE_COMMENT) {
           return parseCommentAttribute(type, ilst);

From 803b878a8aeaa3fa2ed3d53077bad55a572269a2 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 3 Jan 2019 09:36:35 +0000
Subject: [PATCH 346/832] Use Handler instead of ExoPlayer messages in
 ConcatenatingMediaSource

ExoPlayer methods must not be called from any thread besides the specified
app thread. Therefore we shouldn't use them here. Using a regular Handler
instead is fully equivalent.

Issue:#5240
PiperOrigin-RevId: 227650489
---
 RELEASENOTES.md                               |  3 +
 .../source/ConcatenatingMediaSource.java      | 97 +++++++++----------
 2 files changed, 47 insertions(+), 53 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index cf5dea1288..70c5bc5624 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -29,6 +29,9 @@
   ([#3735](https://github.com/google/ExoPlayer/issues/3735)).
 * IMA extension: Clear ads loader listeners on release
   ([#4114](https://github.com/google/ExoPlayer/issues/4114)).
+* Fix issue where sending callbacks for playlist changes may cause problems
+  because of parallel player access
+  ([#5240](https://github.com/google/ExoPlayer/issues/5240)).
 
 ### 2.9.3 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
index e3114298f3..38b8739b7e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
@@ -16,13 +16,12 @@
 package com.google.android.exoplayer2.source;
 
 import android.os.Handler;
+import android.os.Message;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.Pair;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayer;
-import com.google.android.exoplayer2.PlayerMessage;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.source.ConcatenatingMediaSource.MediaSourceHolder;
 import com.google.android.exoplayer2.source.ShuffleOrder.DefaultShuffleOrder;
@@ -45,8 +44,7 @@ import java.util.Map;
  * during playback. It is valid for the same {@link MediaSource} instance to be present more than
  * once in the concatenation. Access to this class is thread-safe.
  */
-public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHolder>
-    implements PlayerMessage.Target {
+public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHolder> {
 
   private static final int MSG_ADD = 0;
   private static final int MSG_REMOVE = 1;
@@ -68,8 +66,8 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
   private final Timeline.Window window;
   private final Timeline.Period period;
 
-  private @Nullable ExoPlayer player;
-  private @Nullable Handler playerApplicationHandler;
+  @Nullable private Handler playbackThreadHandler;
+  @Nullable private Handler applicationThreadHandler;
   private boolean listenerNotificationScheduled;
   private ShuffleOrder shuffleOrder;
   private int windowCount;
@@ -239,12 +237,10 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
       mediaSourceHolders.add(new MediaSourceHolder(mediaSource));
     }
     mediaSourcesPublic.addAll(index, mediaSourceHolders);
-    if (player != null && !mediaSources.isEmpty()) {
-      player
-          .createMessage(this)
-          .setType(MSG_ADD)
-          .setPayload(new MessageData<>(index, mediaSourceHolders, actionOnCompletion))
-          .send();
+    if (playbackThreadHandler != null && !mediaSources.isEmpty()) {
+      playbackThreadHandler
+          .obtainMessage(MSG_ADD, new MessageData<>(index, mediaSourceHolders, actionOnCompletion))
+          .sendToTarget();
     } else if (actionOnCompletion != null) {
       actionOnCompletion.run();
     }
@@ -328,12 +324,10 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
       }
       return;
     }
-    if (player != null) {
-      player
-          .createMessage(this)
-          .setType(MSG_REMOVE)
-          .setPayload(new MessageData<>(fromIndex, toIndex, actionOnCompletion))
-          .send();
+    if (playbackThreadHandler != null) {
+      playbackThreadHandler
+          .obtainMessage(MSG_REMOVE, new MessageData<>(fromIndex, toIndex, actionOnCompletion))
+          .sendToTarget();
     } else if (actionOnCompletion != null) {
       actionOnCompletion.run();
     }
@@ -371,12 +365,10 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
       return;
     }
     mediaSourcesPublic.add(newIndex, mediaSourcesPublic.remove(currentIndex));
-    if (player != null) {
-      player
-          .createMessage(this)
-          .setType(MSG_MOVE)
-          .setPayload(new MessageData<>(currentIndex, newIndex, actionOnCompletion))
-          .send();
+    if (playbackThreadHandler != null) {
+      playbackThreadHandler
+          .obtainMessage(MSG_MOVE, new MessageData<>(currentIndex, newIndex, actionOnCompletion))
+          .sendToTarget();
     } else if (actionOnCompletion != null) {
       actionOnCompletion.run();
     }
@@ -430,8 +422,8 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
    */
   public final synchronized void setShuffleOrder(
       ShuffleOrder shuffleOrder, @Nullable Runnable actionOnCompletion) {
-    ExoPlayer player = this.player;
-    if (player != null) {
+    Handler playbackThreadHandler = this.playbackThreadHandler;
+    if (playbackThreadHandler != null) {
       int size = getSize();
       if (shuffleOrder.getLength() != size) {
         shuffleOrder =
@@ -439,11 +431,11 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
                 .cloneAndClear()
                 .cloneAndInsert(/* insertionIndex= */ 0, /* insertionCount= */ size);
       }
-      player
-          .createMessage(this)
-          .setType(MSG_SET_SHUFFLE_ORDER)
-          .setPayload(new MessageData<>(/* index= */ 0, shuffleOrder, actionOnCompletion))
-          .send();
+      playbackThreadHandler
+          .obtainMessage(
+              MSG_SET_SHUFFLE_ORDER,
+              new MessageData<>(/* index= */ 0, shuffleOrder, actionOnCompletion))
+          .sendToTarget();
     } else {
       this.shuffleOrder =
           shuffleOrder.getLength() > 0 ? shuffleOrder.cloneAndClear() : shuffleOrder;
@@ -465,8 +457,8 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
       boolean isTopLevelSource,
       @Nullable TransferListener mediaTransferListener) {
     super.prepareSourceInternal(player, isTopLevelSource, mediaTransferListener);
-    this.player = player;
-    playerApplicationHandler = new Handler(player.getApplicationLooper());
+    playbackThreadHandler = new Handler(/* callback= */ this::handleMessage);
+    applicationThreadHandler = new Handler(player.getApplicationLooper());
     if (mediaSourcesPublic.isEmpty()) {
       notifyListener();
     } else {
@@ -519,8 +511,8 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
     super.releaseSourceInternal();
     mediaSourceHolders.clear();
     mediaSourceByUid.clear();
-    player = null;
-    playerApplicationHandler = null;
+    playbackThreadHandler = null;
+    applicationThreadHandler = null;
     shuffleOrder = shuffleOrder.cloneAndClear();
     windowCount = 0;
     periodCount = 0;
@@ -556,24 +548,22 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
     return windowIndex + mediaSourceHolder.firstWindowIndexInChild;
   }
 
-  @Override
   @SuppressWarnings("unchecked")
-  public final void handleMessage(int messageType, @Nullable Object message)
-      throws ExoPlaybackException {
-    if (player == null) {
+  private boolean handleMessage(Message msg) {
+    if (playbackThreadHandler == null) {
       // Stale event.
-      return;
+      return false;
     }
-    switch (messageType) {
+    switch (msg.what) {
       case MSG_ADD:
         MessageData<Collection<MediaSourceHolder>> addMessage =
-            (MessageData<Collection<MediaSourceHolder>>) Util.castNonNull(message);
+            (MessageData<Collection<MediaSourceHolder>>) Util.castNonNull(msg.obj);
         shuffleOrder = shuffleOrder.cloneAndInsert(addMessage.index, addMessage.customData.size());
         addMediaSourcesInternal(addMessage.index, addMessage.customData);
         scheduleListenerNotification(addMessage.actionOnCompletion);
         break;
       case MSG_REMOVE:
-        MessageData<Integer> removeMessage = (MessageData<Integer>) Util.castNonNull(message);
+        MessageData<Integer> removeMessage = (MessageData<Integer>) Util.castNonNull(msg.obj);
         int fromIndex = removeMessage.index;
         int toIndex = removeMessage.customData;
         if (fromIndex == 0 && toIndex == shuffleOrder.getLength()) {
@@ -587,7 +577,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
         scheduleListenerNotification(removeMessage.actionOnCompletion);
         break;
       case MSG_MOVE:
-        MessageData<Integer> moveMessage = (MessageData<Integer>) Util.castNonNull(message);
+        MessageData<Integer> moveMessage = (MessageData<Integer>) Util.castNonNull(msg.obj);
         shuffleOrder = shuffleOrder.cloneAndRemove(moveMessage.index, moveMessage.index + 1);
         shuffleOrder = shuffleOrder.cloneAndInsert(moveMessage.customData, 1);
         moveMediaSourceInternal(moveMessage.index, moveMessage.customData);
@@ -595,7 +585,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
         break;
       case MSG_SET_SHUFFLE_ORDER:
         MessageData<ShuffleOrder> shuffleOrderMessage =
-            (MessageData<ShuffleOrder>) Util.castNonNull(message);
+            (MessageData<ShuffleOrder>) Util.castNonNull(msg.obj);
         shuffleOrder = shuffleOrderMessage.customData;
         scheduleListenerNotification(shuffleOrderMessage.actionOnCompletion);
         break;
@@ -603,8 +593,8 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
         notifyListener();
         break;
       case MSG_ON_COMPLETION:
-        List<Runnable> actionsOnCompletion = (List<Runnable>) Util.castNonNull(message);
-        Handler handler = Assertions.checkNotNull(playerApplicationHandler);
+        List<Runnable> actionsOnCompletion = (List<Runnable>) Util.castNonNull(msg.obj);
+        Handler handler = Assertions.checkNotNull(applicationThreadHandler);
         for (int i = 0; i < actionsOnCompletion.size(); i++) {
           handler.post(actionsOnCompletion.get(i));
         }
@@ -612,11 +602,14 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
       default:
         throw new IllegalStateException();
     }
+    return true;
   }
 
   private void scheduleListenerNotification(@Nullable Runnable actionOnCompletion) {
     if (!listenerNotificationScheduled) {
-      Assertions.checkNotNull(player).createMessage(this).setType(MSG_NOTIFY_LISTENER).send();
+      Assertions.checkNotNull(playbackThreadHandler)
+          .obtainMessage(MSG_NOTIFY_LISTENER)
+          .sendToTarget();
       listenerNotificationScheduled = true;
     }
     if (actionOnCompletion != null) {
@@ -636,11 +629,9 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
             mediaSourceHolders, windowCount, periodCount, shuffleOrder, isAtomic),
         /* manifest= */ null);
     if (!actionsOnCompletion.isEmpty()) {
-      Assertions.checkNotNull(player)
-          .createMessage(this)
-          .setType(MSG_ON_COMPLETION)
-          .setPayload(actionsOnCompletion)
-          .send();
+      Assertions.checkNotNull(playbackThreadHandler)
+          .obtainMessage(MSG_ON_COMPLETION, actionsOnCompletion)
+          .sendToTarget();
     }
   }
 

From 7ae768376c0947ab4c49d7c107db233445658019 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Thu, 3 Jan 2019 11:57:33 +0000
Subject: [PATCH 347/832] Prepare DownloadState for upcoming changes

Made DownloadState top level class.
Replaced action field DownloadAction fields.
Added removing, removed and restarting states.
Renamed started state to downloading.

PiperOrigin-RevId: 227664735
---
 RELEASENOTES.md                               |   2 +
 .../exoplayer2/demo/DemoDownloadService.java  |   9 +-
 .../exoplayer2/demo/DownloadTracker.java      |  10 +-
 .../exoplayer2/offline/DownloadManager.java   | 180 +++--------------
 .../exoplayer2/offline/DownloadService.java   |   5 +-
 .../exoplayer2/offline/DownloadState.java     | 189 ++++++++++++++++++
 .../offline/DownloadManagerTest.java          |  55 +++--
 .../ui/DownloadNotificationUtil.java          |  12 +-
 .../testutil/TestDownloadManagerListener.java |   2 +-
 9 files changed, 282 insertions(+), 182 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 70c5bc5624..03e1c77a37 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -25,6 +25,8 @@
 * DownloadManager:
   * Create only one task for all DownloadActions for the same content.
   * Rename TaskState to DownloadState.
+  * Add new states to DownloadState.
+  * Replace DownloadState.action with DownloadAction fields.
 * Add support for SHOUTcast ICY metadata
   ([#3735](https://github.com/google/ExoPlayer/issues/3735)).
 * IMA extension: Clear ads loader listeners on release
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
index adb0ae95ca..70cbe43dd8 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
@@ -17,8 +17,8 @@ package com.google.android.exoplayer2.demo;
 
 import android.app.Notification;
 import com.google.android.exoplayer2.offline.DownloadManager;
-import com.google.android.exoplayer2.offline.DownloadManager.DownloadState;
 import com.google.android.exoplayer2.offline.DownloadService;
+import com.google.android.exoplayer2.offline.DownloadState;
 import com.google.android.exoplayer2.scheduler.PlatformScheduler;
 import com.google.android.exoplayer2.ui.DownloadNotificationUtil;
 import com.google.android.exoplayer2.util.NotificationUtil;
@@ -65,9 +65,6 @@ public class DemoDownloadService extends DownloadService {
 
   @Override
   protected void onDownloadStateChanged(DownloadState downloadState) {
-    if (downloadState.action.isRemoveAction) {
-      return;
-    }
     Notification notification = null;
     if (downloadState.state == DownloadState.STATE_COMPLETED) {
       notification =
@@ -76,7 +73,7 @@ public class DemoDownloadService extends DownloadService {
               R.drawable.ic_download_done,
               CHANNEL_ID,
               /* contentIntent= */ null,
-              Util.fromUtf8Bytes(downloadState.action.data));
+              Util.fromUtf8Bytes(downloadState.customMetadata));
     } else if (downloadState.state == DownloadState.STATE_FAILED) {
       notification =
           DownloadNotificationUtil.buildDownloadFailedNotification(
@@ -84,7 +81,7 @@ public class DemoDownloadService extends DownloadService {
               R.drawable.ic_download_done,
               CHANNEL_ID,
               /* contentIntent= */ null,
-              Util.fromUtf8Bytes(downloadState.action.data));
+              Util.fromUtf8Bytes(downloadState.customMetadata));
     } else {
       return;
     }
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index 6afacca064..08ecdf3be7 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -37,8 +37,8 @@ import com.google.android.exoplayer2.offline.ActionFile;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadHelper;
 import com.google.android.exoplayer2.offline.DownloadManager;
-import com.google.android.exoplayer2.offline.DownloadManager.DownloadState;
 import com.google.android.exoplayer2.offline.DownloadService;
+import com.google.android.exoplayer2.offline.DownloadState;
 import com.google.android.exoplayer2.offline.ProgressiveDownloadHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.source.TrackGroupArray;
@@ -145,12 +145,10 @@ public class DownloadTracker implements DownloadManager.Listener {
 
   @Override
   public void onDownloadStateChanged(DownloadManager downloadManager, DownloadState downloadState) {
-    DownloadAction action = downloadState.action;
-    Uri uri = action.uri;
-    if ((action.isRemoveAction && downloadState.state == DownloadState.STATE_COMPLETED)
-        || (!action.isRemoveAction && downloadState.state == DownloadState.STATE_FAILED)) {
+    if (downloadState.state == DownloadState.STATE_REMOVED
+        || downloadState.state == DownloadState.STATE_FAILED) {
       // A download has been removed, or has failed. Stop tracking it.
-      if (trackedDownloadStates.remove(uri) != null) {
+      if (trackedDownloadStates.remove(downloadState.uri) != null) {
         handleTrackedDownloadStatesChanged();
       }
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index dad039adab..94013bb73f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -15,29 +15,28 @@
  */
 package com.google.android.exoplayer2.offline;
 
-import static com.google.android.exoplayer2.offline.DownloadManager.DownloadState.FAILURE_REASON_NONE;
-import static com.google.android.exoplayer2.offline.DownloadManager.DownloadState.FAILURE_REASON_UNKNOWN;
-import static com.google.android.exoplayer2.offline.DownloadManager.DownloadState.STATE_COMPLETED;
-import static com.google.android.exoplayer2.offline.DownloadManager.DownloadState.STATE_FAILED;
-import static com.google.android.exoplayer2.offline.DownloadManager.DownloadState.STATE_QUEUED;
-import static com.google.android.exoplayer2.offline.DownloadManager.DownloadState.STATE_STARTED;
-import static com.google.android.exoplayer2.offline.DownloadManager.DownloadState.STATE_STOPPED;
-import static com.google.android.exoplayer2.offline.DownloadManager.DownloadState.STOP_FLAG_STOPPED;
+import static com.google.android.exoplayer2.offline.DownloadState.FAILURE_REASON_NONE;
+import static com.google.android.exoplayer2.offline.DownloadState.FAILURE_REASON_UNKNOWN;
+import static com.google.android.exoplayer2.offline.DownloadState.STATE_COMPLETED;
+import static com.google.android.exoplayer2.offline.DownloadState.STATE_DOWNLOADING;
+import static com.google.android.exoplayer2.offline.DownloadState.STATE_FAILED;
+import static com.google.android.exoplayer2.offline.DownloadState.STATE_QUEUED;
+import static com.google.android.exoplayer2.offline.DownloadState.STATE_REMOVED;
+import static com.google.android.exoplayer2.offline.DownloadState.STATE_REMOVING;
+import static com.google.android.exoplayer2.offline.DownloadState.STATE_RESTARTING;
+import static com.google.android.exoplayer2.offline.DownloadState.STATE_STOPPED;
+import static com.google.android.exoplayer2.offline.DownloadState.STOP_FLAG_STOPPED;
 
 import android.os.ConditionVariable;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
-import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
 import java.io.File;
 import java.io.IOException;
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.concurrent.CopyOnWriteArraySet;
@@ -426,133 +425,6 @@ public final class DownloadManager {
     logd(message + ": " + download);
   }
 
-  /** Represents state of a download. */
-  public static final class DownloadState {
-
-    /**
-     * Download states. One of {@link #STATE_QUEUED}, {@link #STATE_STOPPED}, {@link #STATE_STARTED}
-     * , {@link #STATE_COMPLETED} or {@link #STATE_FAILED}.
-     *
-     * <p>Transition diagram:
-     *
-     * <pre>
-     * queued ←┬→ started ┬→ completed
-     *         └→ stopped └→ failed
-     * </pre>
-     */
-    @Documented
-    @Retention(RetentionPolicy.SOURCE)
-    @IntDef({STATE_QUEUED, STATE_STOPPED, STATE_STARTED, STATE_COMPLETED, STATE_FAILED})
-    public @interface State {}
-    /** The download is waiting to be started. */
-    public static final int STATE_QUEUED = 0;
-    /** The download is stopped. */
-    public static final int STATE_STOPPED = 1;
-    /** The download is currently started. */
-    public static final int STATE_STARTED = 2;
-    /** The download completed. */
-    public static final int STATE_COMPLETED = 3;
-    /** The download failed. */
-    public static final int STATE_FAILED = 4;
-
-    /** Failure reasons. Either {@link #FAILURE_REASON_NONE} or {@link #FAILURE_REASON_UNKNOWN}. */
-    @Documented
-    @Retention(RetentionPolicy.SOURCE)
-    @IntDef({FAILURE_REASON_NONE, FAILURE_REASON_UNKNOWN})
-    public @interface FailureReason {}
-    /** The download isn't failed. */
-    public static final int FAILURE_REASON_NONE = 0;
-    /** The download is failed because of unknown reason. */
-    public static final int FAILURE_REASON_UNKNOWN = 1;
-
-    /** Download stop flags. Possible flag value is {@link #STOP_FLAG_STOPPED}. */
-    @Documented
-    @Retention(RetentionPolicy.SOURCE)
-    @IntDef(
-        flag = true,
-        value = {STOP_FLAG_STOPPED})
-    public @interface StopFlags {}
-    /** All downloads are stopped by the application. */
-    public static final int STOP_FLAG_STOPPED = 1;
-
-    /** Returns the state string for the given state value. */
-    public static String getStateString(@State int state) {
-      switch (state) {
-        case STATE_QUEUED:
-          return "QUEUED";
-        case STATE_STOPPED:
-          return "STOPPED";
-        case STATE_STARTED:
-          return "STARTED";
-        case STATE_COMPLETED:
-          return "COMPLETED";
-        case STATE_FAILED:
-          return "FAILED";
-        default:
-          throw new IllegalStateException();
-      }
-    }
-
-    /** Returns the failure string for the given failure reason value. */
-    public static String getFailureString(@FailureReason int failureReason) {
-      switch (failureReason) {
-        case FAILURE_REASON_NONE:
-          return "NO_REASON";
-        case FAILURE_REASON_UNKNOWN:
-          return "UNKNOWN_REASON";
-        default:
-          throw new IllegalStateException();
-      }
-    }
-
-    /** The unique content id. */
-    public final String id;
-    /** The action being executed. */
-    public final DownloadAction action;
-    /** The state of the download. */
-    public final @State int state;
-    /** The estimated download percentage, or {@link C#PERCENTAGE_UNSET} if unavailable. */
-    public final float downloadPercentage;
-    /** The total number of downloaded bytes. */
-    public final long downloadedBytes;
-    /** The total size of the media, or {@link C#LENGTH_UNSET} if unknown. */
-    public final long totalBytes;
-    /** The first time when download entry is created. */
-    public final long startTimeMs;
-    /** The last update time. */
-    public final long updateTimeMs;
-    /**
-     * If {@link #state} is {@link #STATE_FAILED} then this is the cause, otherwise {@link
-     * #FAILURE_REASON_NONE}.
-     */
-    @FailureReason public final int failureReason;
-    /** Download stop flags. These flags stop downloading any content. */
-    @StopFlags public final int stopFlags;
-
-    private DownloadState(
-        DownloadAction action,
-        @State int state,
-        float downloadPercentage,
-        long downloadedBytes,
-        long totalBytes,
-        @FailureReason int failureReason,
-        @StopFlags int stopFlags,
-        long startTimeMs) {
-      this.stopFlags = stopFlags;
-      Assertions.checkState(
-          failureReason == FAILURE_REASON_NONE ? state != STATE_FAILED : state == STATE_FAILED);
-      this.id = action.id;
-      this.action = action;
-      this.state = state;
-      this.downloadPercentage = downloadPercentage;
-      this.downloadedBytes = downloadedBytes;
-      this.totalBytes = totalBytes;
-      this.failureReason = failureReason;
-      this.startTimeMs = startTimeMs;
-      updateTimeMs = System.currentTimeMillis();
-    }
-  }
-
   private static final class Download {
 
     private final String id;
@@ -601,7 +473,7 @@ public final class DownloadManager {
       if (action.equals(updatedAction)) {
         return;
       }
-      if (state == STATE_STARTED) {
+      if (state == STATE_DOWNLOADING) {
         stopDownloadThread();
       } else {
         Assertions.checkState(state == STATE_QUEUED || state == STATE_STOPPED);
@@ -618,15 +490,29 @@ public final class DownloadManager {
         downloadedBytes = downloader.getDownloadedBytes();
         totalBytes = downloader.getTotalBytes();
       }
+      int newState = state;
+      if (action.isRemoveAction) {
+        if (state == STATE_DOWNLOADING) {
+          newState = actionQueue.size() > 1 ? STATE_RESTARTING : STATE_REMOVING;
+        } else if (state == STATE_COMPLETED || state == STATE_FAILED) {
+          newState = STATE_REMOVED;
+        }
+      }
       return new DownloadState(
-          action,
-          state,
+          action.id,
+          action.type,
+          action.uri,
+          action.customCacheKey,
+          newState,
           downloadPercentage,
           downloadedBytes,
           totalBytes,
           failureReason,
           stopFlags,
-          startTimeMs);
+          startTimeMs,
+          /* updateTimeMs= */ System.currentTimeMillis(),
+          action.keys.toArray(new StreamKey[0]),
+          action.data);
     }
 
     /** Returns whether the download is finished. */
@@ -636,7 +522,7 @@ public final class DownloadManager {
 
     /** Returns whether the download is started. */
     public boolean isStarted() {
-      return state == STATE_STARTED;
+      return state == STATE_DOWNLOADING;
     }
 
     @Override
@@ -653,7 +539,7 @@ public final class DownloadManager {
       downloadThread =
           new DownloadThread(
               this, downloader, action.isRemoveAction, minRetryCount, downloadManager.handler);
-      setState(STATE_STARTED);
+      setState(STATE_DOWNLOADING);
       return true;
     }
 
@@ -666,7 +552,7 @@ public final class DownloadManager {
     }
 
     public void queue() {
-      if (state == STATE_STARTED) {
+      if (state == STATE_DOWNLOADING) {
         stopDownloadThread();
       }
     }
@@ -675,7 +561,7 @@ public final class DownloadManager {
       stopFlags = (flags & mask) | (stopFlags & ~mask);
       if (stopFlags != 0) {
         if (!action.isRemoveAction) {
-          if (state == STATE_STARTED) {
+          if (state == STATE_DOWNLOADING) {
             stopDownloadThread();
           } else if (state == STATE_QUEUED) {
             setState(STATE_STOPPED);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index d49b33d2ae..3031a032db 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -24,7 +24,6 @@ import android.os.IBinder;
 import android.os.Looper;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
-import com.google.android.exoplayer2.offline.DownloadManager.DownloadState;
 import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.scheduler.RequirementsWatcher;
 import com.google.android.exoplayer2.scheduler.Scheduler;
@@ -432,7 +431,9 @@ public abstract class DownloadService extends Service {
         DownloadManager downloadManager, DownloadState downloadState) {
       DownloadService.this.onDownloadStateChanged(downloadState);
       if (foregroundNotificationUpdater != null) {
-        if (downloadState.state == DownloadState.STATE_STARTED) {
+        if (downloadState.state == DownloadState.STATE_DOWNLOADING
+            || downloadState.state == DownloadState.STATE_REMOVING
+            || downloadState.state == DownloadState.STATE_RESTARTING) {
           foregroundNotificationUpdater.startPeriodicUpdates();
         } else {
           foregroundNotificationUpdater.update();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
new file mode 100644
index 0000000000..86ea0d51f6
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.exoplayer2.offline;
+
+import android.net.Uri;
+import android.support.annotation.IntDef;
+import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.util.Assertions;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/** Represents state of a download. */
+public final class DownloadState {
+
+  /**
+   * Download states. One of {@link #STATE_QUEUED}, {@link #STATE_STOPPED}, {@link
+   * #STATE_DOWNLOADING}, {@link #STATE_COMPLETED}, {@link #STATE_FAILED}, {@link #STATE_REMOVING},
+   * {@link #STATE_REMOVED} or {@link #STATE_RESTARTING}.
+   */
+  @Documented
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({
+    STATE_QUEUED,
+    STATE_STOPPED,
+    STATE_DOWNLOADING,
+    STATE_COMPLETED,
+    STATE_FAILED,
+    STATE_REMOVING,
+    STATE_REMOVED,
+    STATE_RESTARTING
+  })
+  public @interface State {}
+  /** The download is waiting to be started. */
+  public static final int STATE_QUEUED = 0;
+  /** The download is stopped. */
+  public static final int STATE_STOPPED = 1;
+  /** The download is currently started. */
+  public static final int STATE_DOWNLOADING = 2;
+  /** The download completed. */
+  public static final int STATE_COMPLETED = 3;
+  /** The download failed. */
+  public static final int STATE_FAILED = 4;
+  /** The download is being removed. */
+  public static final int STATE_REMOVING = 5;
+  /** The download is removed. */
+  public static final int STATE_REMOVED = 6;
+  /** The download will restart after all downloaded data is removed. */
+  public static final int STATE_RESTARTING = 7;
+
+  /** Failure reasons. Either {@link #FAILURE_REASON_NONE} or {@link #FAILURE_REASON_UNKNOWN}. */
+  @Documented
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({FAILURE_REASON_NONE, FAILURE_REASON_UNKNOWN})
+  public @interface FailureReason {}
+  /** The download isn't failed. */
+  public static final int FAILURE_REASON_NONE = 0;
+  /** The download is failed because of unknown reason. */
+  public static final int FAILURE_REASON_UNKNOWN = 1;
+
+  /** Download stop flags. Possible flag value is {@link #STOP_FLAG_STOPPED}. */
+  @Documented
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef(
+      flag = true,
+      value = {STOP_FLAG_STOPPED})
+  public @interface StopFlags {}
+  /** All downloads are stopped by the application. */
+  public static final int STOP_FLAG_STOPPED = 1;
+
+  /** Returns the state string for the given state value. */
+  public static String getStateString(@State int state) {
+    switch (state) {
+      case STATE_QUEUED:
+        return "QUEUED";
+      case STATE_STOPPED:
+        return "STOPPED";
+      case STATE_DOWNLOADING:
+        return "DOWNLOADING";
+      case STATE_COMPLETED:
+        return "COMPLETED";
+      case STATE_FAILED:
+        return "FAILED";
+      case STATE_REMOVING:
+        return "REMOVING";
+      case STATE_REMOVED:
+        return "REMOVED";
+      case STATE_RESTARTING:
+        return "RESTARTING";
+      default:
+        throw new IllegalStateException();
+    }
+  }
+
+  /** Returns the failure string for the given failure reason value. */
+  public static String getFailureString(@FailureReason int failureReason) {
+    switch (failureReason) {
+      case FAILURE_REASON_NONE:
+        return "NO_REASON";
+      case FAILURE_REASON_UNKNOWN:
+        return "UNKNOWN_REASON";
+      default:
+        throw new IllegalStateException();
+    }
+  }
+
+  /** The unique content id. */
+  public final String id;
+  /** The type of the content. */
+  public final String type;
+  /** The Uri of the content. */
+  public final Uri uri;
+  /** A custom key for cache indexing. */
+  @Nullable public final String cacheKey;
+  /** The state of the download. */
+  @State public final int state;
+  /** The estimated download percentage, or {@link C#PERCENTAGE_UNSET} if unavailable. */
+  public final float downloadPercentage;
+  /** The total number of downloaded bytes. */
+  public final long downloadedBytes;
+  /** The total size of the media, or {@link C#LENGTH_UNSET} if unknown. */
+  public final long totalBytes;
+  /** The first time when download entry is created. */
+  public final long startTimeMs;
+  /** The last update time. */
+  public final long updateTimeMs;
+  /** Keys of streams to be downloaded. If empty, all streams will be downloaded. */
+  public final StreamKey[] streamKeys;
+  /** Optional custom data. */
+  public final byte[] customMetadata;
+  /**
+   * If {@link #state} is {@link #STATE_FAILED} then this is the cause, otherwise {@link
+   * #FAILURE_REASON_NONE}.
+   */
+  @FailureReason public final int failureReason;
+  /** Download stop flags. These flags stop downloading any content. */
+  public final int stopFlags;
+
+  /* package */ DownloadState(
+      String id,
+      String type,
+      Uri uri,
+      @Nullable String cacheKey,
+      @State int state,
+      float downloadPercentage,
+      long downloadedBytes,
+      long totalBytes,
+      @FailureReason int failureReason,
+      @StopFlags int stopFlags,
+      long startTimeMs,
+      long updateTimeMs,
+      StreamKey[] streamKeys,
+      byte[] customMetadata) {
+    this.stopFlags = stopFlags;
+    Assertions.checkState(
+        failureReason == FAILURE_REASON_NONE ? state != STATE_FAILED : state == STATE_FAILED);
+    // TODO enable this when we start changing state immediately
+    // Assertions.checkState(stopFlags == 0 || (state != STATE_DOWNLOADING && state !=
+    // STATE_QUEUED));
+    this.id = id;
+    this.type = type;
+    this.uri = uri;
+    this.cacheKey = cacheKey;
+    this.streamKeys = streamKeys;
+    this.customMetadata = customMetadata;
+    this.state = state;
+    this.downloadPercentage = downloadPercentage;
+    this.downloadedBytes = downloadedBytes;
+    this.totalBytes = totalBytes;
+    this.failureReason = failureReason;
+    this.startTimeMs = startTimeMs;
+    this.updateTimeMs = updateTimeMs;
+  }
+}
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index f835cec3e4..5902ac894a 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -20,8 +20,7 @@ import static org.junit.Assert.fail;
 
 import android.net.Uri;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.offline.DownloadManager.DownloadState;
-import com.google.android.exoplayer2.offline.DownloadManager.DownloadState.State;
+import com.google.android.exoplayer2.offline.DownloadState.State;
 import com.google.android.exoplayer2.testutil.DummyMainThread;
 import com.google.android.exoplayer2.testutil.RobolectricUtil;
 import com.google.android.exoplayer2.testutil.TestDownloadManagerListener;
@@ -31,6 +30,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import org.junit.After;
@@ -140,7 +140,7 @@ public class DownloadManagerTest {
   public void postDownloadAction_downloads() throws Throwable {
     DownloadRunner runner = new DownloadRunner(uri1);
     TaskWrapper task = runner.postDownloadAction().getTask();
-    task.assertStarted();
+    task.assertDownloading();
     runner.getDownloader(0).unblock().assertReleased().assertStartCount(1);
     task.assertCompleted();
     runner.assertCreatedDownloaderCount(1);
@@ -151,9 +151,9 @@ public class DownloadManagerTest {
   public void postRemoveAction_removes() throws Throwable {
     DownloadRunner runner = new DownloadRunner(uri1);
     TaskWrapper task = runner.postRemoveAction().getTask();
-    task.assertStarted();
+    task.assertRemoving();
     runner.getDownloader(0).unblock().assertReleased().assertStartCount(1);
-    task.assertCompleted();
+    task.assertRemoved();
     runner.assertCreatedDownloaderCount(1);
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
@@ -245,7 +245,7 @@ public class DownloadManagerTest {
     runner.postRemoveAction();
 
     downloader1.unblock().assertNotCanceled();
-    runner.getTask().assertCompleted();
+    runner.getTask().assertRemoved();
     runner.assertCreatedDownloaderCount(1);
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
@@ -341,7 +341,7 @@ public class DownloadManagerTest {
     downloader2.unblock();
 
     runner1.getTask().assertCompleted();
-    runner2.getTask().assertCompleted();
+    runner2.getTask().assertRemoved();
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
@@ -387,8 +387,8 @@ public class DownloadManagerTest {
     DownloadRunner runner2 = new DownloadRunner(uri2);
     DownloadRunner runner3 = new DownloadRunner(uri3);
 
-    runner1.postDownloadAction().getTask().assertStarted();
-    runner2.postRemoveAction().getTask().assertStarted();
+    runner1.postDownloadAction().getTask().assertDownloading();
+    runner2.postRemoveAction().getTask().assertRemoving();
     runner2.postDownloadAction();
 
     runOnMainThread(() -> downloadManager.stopDownloads());
@@ -404,7 +404,7 @@ public class DownloadManagerTest {
     // When a new remove action is added, it cancels stopped download actions with the same media.
     runner1.postRemoveAction();
     runner1.getDownloader(1).assertStarted().unblock();
-    runner1.getTask().assertCompleted();
+    runner1.getTask().assertRemoved();
 
     // New download actions can be added but they don't start.
     runner3.postDownloadAction().getDownloader(0).assertDoesNotStart();
@@ -521,14 +521,22 @@ public class DownloadManagerTest {
       this.taskId = taskId;
     }
 
-    private TaskWrapper assertStarted() throws InterruptedException {
-      return assertState(DownloadState.STATE_STARTED);
+    private TaskWrapper assertDownloading() {
+      return assertState(DownloadState.STATE_DOWNLOADING);
     }
 
     private TaskWrapper assertCompleted() {
       return assertState(DownloadState.STATE_COMPLETED);
     }
 
+    private TaskWrapper assertRemoving() {
+      return assertState(DownloadState.STATE_REMOVING);
+    }
+
+    private TaskWrapper assertRemoved() {
+      return assertState(DownloadState.STATE_REMOVED);
+    }
+
     private TaskWrapper assertFailed() {
       return assertState(DownloadState.STATE_FAILED);
     }
@@ -542,6 +550,7 @@ public class DownloadManagerTest {
     }
 
     private TaskWrapper assertState(@State int expectedState) {
+      ArrayList<Integer> receivedStates = new ArrayList<>();
       while (true) {
         Integer state = null;
         try {
@@ -549,9 +558,25 @@ public class DownloadManagerTest {
         } catch (InterruptedException e) {
           fail(e.getMessage());
         }
-        assertThat(state).isNotNull();
-        if (expectedState == state) {
-          return this;
+        if (state != null) {
+          if (expectedState == state) {
+            return this;
+          }
+          receivedStates.add(state);
+        } else {
+          StringBuilder sb = new StringBuilder();
+          for (int i = 0; i < receivedStates.size(); i++) {
+            if (i > 0) {
+              sb.append(',');
+            }
+            sb.append(DownloadState.getStateString(receivedStates.get(i)));
+          }
+          fail(
+              String.format(
+                  Locale.US,
+                  "expected:<%s> but was:<%s>",
+                  DownloadState.getStateString(expectedState),
+                  sb));
         }
       }
     }
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java
index 3f98da06f0..2d1656af57 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java
@@ -23,7 +23,7 @@ import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.v4.app.NotificationCompat;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.offline.DownloadManager.DownloadState;
+import com.google.android.exoplayer2.offline.DownloadState;
 
 /** Helper for creating download notifications. */
 public final class DownloadNotificationUtil {
@@ -58,12 +58,14 @@ public final class DownloadNotificationUtil {
     boolean haveDownloadTasks = false;
     boolean haveRemoveTasks = false;
     for (DownloadState downloadState : downloadStates) {
-      if (downloadState.state != DownloadState.STATE_STARTED
-          && downloadState.state != DownloadState.STATE_COMPLETED) {
+      if (downloadState.state == DownloadState.STATE_REMOVING
+          || downloadState.state == DownloadState.STATE_RESTARTING
+          || downloadState.state == DownloadState.STATE_REMOVED) {
+        haveRemoveTasks = true;
         continue;
       }
-      if (downloadState.action.isRemoveAction) {
-        haveRemoveTasks = true;
+      if (downloadState.state != DownloadState.STATE_DOWNLOADING
+          && downloadState.state != DownloadState.STATE_COMPLETED) {
         continue;
       }
       haveDownloadTasks = true;
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
index c844e777c2..8216b881f3 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
@@ -19,7 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.os.ConditionVariable;
 import com.google.android.exoplayer2.offline.DownloadManager;
-import com.google.android.exoplayer2.offline.DownloadManager.DownloadState;
+import com.google.android.exoplayer2.offline.DownloadState;
 import java.util.HashMap;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.CountDownLatch;

From 7f266ceb33b6b43b6dddb0c9b2362783e150b452 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 3 Jan 2019 12:26:03 +0000
Subject: [PATCH 348/832] Fix bug when calculating EOF position in mp4 sniffing

PiperOrigin-RevId: 227668426
---
 .../com/google/android/exoplayer2/extractor/mp4/Sniffer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java
index 021c9de654..dce00fa824 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java
@@ -114,7 +114,7 @@ import java.io.IOException;
         // The atom extends to the end of the file.
         long endPosition = input.getLength();
         if (endPosition != C.LENGTH_UNSET) {
-          atomSize = endPosition - input.getPosition() + headerSize;
+          atomSize = endPosition - input.getPeekPosition() + headerSize;
         }
       }
 

From bfc8f9c4d8a063202d0fa858a7f2e94f917fbbdb Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 3 Jan 2019 13:29:00 +0000
Subject: [PATCH 349/832] Enable setOutputSurfaceWorkaround for Huawei P10 lite

Issue:#5312
PiperOrigin-RevId: 227673949
---
 .../android/exoplayer2/video/MediaCodecVideoRenderer.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index 49f6be9763..7c4287710d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -1331,7 +1331,8 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
           // https://github.com/google/ExoPlayer/issues/4315,
           // https://github.com/google/ExoPlayer/issues/4419,
           // https://github.com/google/ExoPlayer/issues/4460,
-          // https://github.com/google/ExoPlayer/issues/4468.
+          // https://github.com/google/ExoPlayer/issues/4468,
+          // https://github.com/google/ExoPlayer/issues/5312.
           switch (Util.DEVICE) {
             case "1601":
             case "1713":
@@ -1387,6 +1388,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
             case "HWBLN-H":
             case "HWCAM-H":
             case "HWVNS-H":
+            case "HWWAS-H":
             case "i9031":
             case "iball8735_9806":
             case "Infinix-X572":

From e4ad90efd0b111e1239e2dfadc2a8ae06794dddc Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 3 Jan 2019 14:54:22 +0000
Subject: [PATCH 350/832] Set Player separately in AdsLoader interface.

Passing the player through MediaSource.prepare is only needed for the AdsLoader
and complicates other usages of MediaSource. Providing the player directly to
the AdsLoader is also in line with the usage pattern of PlayerView and other
components.

Also rename methods to start/stop to better reflect their usage.

PiperOrigin-RevId: 227682112
---
 RELEASENOTES.md                               |  6 +-
 .../exoplayer2/demo/PlayerActivity.java       |  4 ++
 .../exoplayer2/ext/ima/ImaAdsLoader.java      | 37 +++++++---
 .../exoplayer2/ext/ima/ImaAdsLoaderTest.java  | 11 +--
 .../exoplayer2/source/ads/AdsLoader.java      | 69 ++++++++++++-------
 .../exoplayer2/source/ads/AdsMediaSource.java |  4 +-
 6 files changed, 85 insertions(+), 46 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 03e1c77a37..d0eb94d00a 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -29,8 +29,10 @@
   * Replace DownloadState.action with DownloadAction fields.
 * Add support for SHOUTcast ICY metadata
   ([#3735](https://github.com/google/ExoPlayer/issues/3735)).
-* IMA extension: Clear ads loader listeners on release
-  ([#4114](https://github.com/google/ExoPlayer/issues/4114)).
+* IMA extension:
+  * Clear ads loader listeners on release
+    ([#4114](https://github.com/google/ExoPlayer/issues/4114)).
+  * Require setting the `Player` on `AdsLoader` instances before playback.
 * Fix issue where sending callbacks for playlist changes may cause problems
   because of parallel player access
   ([#5240](https://github.com/google/ExoPlayer/issues/5240)).
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 75a0905733..582638b460 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
@@ -523,6 +523,9 @@ public class PlayerActivity extends Activity
       mediaSource = null;
       trackSelector = null;
     }
+    if (adsLoader != null) {
+      adsLoader.setPlayer(null);
+    }
     releaseMediaDrm();
   }
 
@@ -586,6 +589,7 @@ public class PlayerActivity extends Activity
         // The demo app has a non-null overlay frame layout.
         playerView.getOverlayFrameLayout().addView(adUiViewGroup);
       }
+      adsLoader.setPlayer(player);
       AdsMediaSource.MediaSourceFactory adMediaSourceFactory =
           new AdsMediaSource.MediaSourceFactory() {
             @Override
diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
index 0920de126d..311752c7ab 100644
--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
+++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
@@ -47,7 +47,6 @@ import com.google.ads.interactivemedia.v3.api.player.VideoAdPlayer;
 import com.google.ads.interactivemedia.v3.api.player.VideoProgressUpdate;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
-import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
@@ -74,7 +73,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-/** Loads ads using the IMA SDK. All methods are called on the main thread. */
+/**
+ * {@link AdsLoader} using the IMA SDK. All methods must be called on the main thread.
+ *
+ * <p>The player instance that will play the loaded ads must be set before playback using {@link
+ * #setPlayer(Player)}. If the ads loader is no longer required, it must be released by calling
+ * {@link #release()}.
+ */
 public final class ImaAdsLoader
     implements Player.EventListener,
         AdsLoader,
@@ -93,9 +98,9 @@ public final class ImaAdsLoader
 
     private final Context context;
 
-    private @Nullable ImaSdkSettings imaSdkSettings;
-    private @Nullable AdEventListener adEventListener;
-    private @Nullable Set<UiElement> adUiElements;
+    @Nullable private ImaSdkSettings imaSdkSettings;
+    @Nullable private AdEventListener adEventListener;
+    @Nullable private Set<UiElement> adUiElements;
     private int vastLoadTimeoutMs;
     private int mediaLoadTimeoutMs;
     private int mediaBitrate;
@@ -317,10 +322,11 @@ public final class ImaAdsLoader
   private final AdDisplayContainer adDisplayContainer;
   private final com.google.ads.interactivemedia.v3.api.AdsLoader adsLoader;
 
+  @Nullable private Player nextPlayer;
   private Object pendingAdRequestContext;
   private List<String> supportedMimeTypes;
-  private EventListener eventListener;
-  private Player player;
+  @Nullable private EventListener eventListener;
+  @Nullable private Player player;
   private VideoProgressUpdate lastContentProgress;
   private VideoProgressUpdate lastAdProgress;
   private int lastVolumePercentage;
@@ -526,6 +532,14 @@ public final class ImaAdsLoader
 
   // AdsLoader implementation.
 
+  @Override
+  public void setPlayer(@Nullable Player player) {
+    Assertions.checkState(Looper.getMainLooper() == Looper.myLooper());
+    Assertions.checkState(
+        player == null || player.getApplicationLooper() == Looper.getMainLooper());
+    nextPlayer = player;
+  }
+
   @Override
   public void setSupportedContentTypes(@C.ContentType int... contentTypes) {
     List<String> supportedMimeTypes = new ArrayList<>();
@@ -550,9 +564,10 @@ public final class ImaAdsLoader
   }
 
   @Override
-  public void attachPlayer(ExoPlayer player, EventListener eventListener, ViewGroup adUiViewGroup) {
-    Assertions.checkArgument(player.getApplicationLooper() == Looper.getMainLooper());
-    this.player = player;
+  public void start(EventListener eventListener, ViewGroup adUiViewGroup) {
+    Assertions.checkNotNull(
+        nextPlayer, "Set player using adsLoader.setPlayer before preparing the player.");
+    player = nextPlayer;
     this.eventListener = eventListener;
     lastVolumePercentage = 0;
     lastAdProgress = null;
@@ -576,7 +591,7 @@ public final class ImaAdsLoader
   }
 
   @Override
-  public void detachPlayer() {
+  public void stop() {
     if (adsManager != null && imaPausedContent) {
       adPlaybackState =
           adPlaybackState.withAdResumePositionUs(
diff --git a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java
index b0fe731480..0b097f26f0 100644
--- a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java
+++ b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java
@@ -111,7 +111,7 @@ public class ImaAdsLoaderTest {
   @Test
   public void testAttachPlayer_setsAdUiViewGroup() {
     setupPlayback(CONTENT_TIMELINE, PREROLL_ADS_DURATIONS_US, PREROLL_CUE_POINTS_SECONDS);
-    imaAdsLoader.attachPlayer(fakeExoPlayer, adsLoaderListener, adUiViewGroup);
+    imaAdsLoader.start(adsLoaderListener, adUiViewGroup);
 
     verify(adDisplayContainer, atLeastOnce()).setAdContainer(adUiViewGroup);
   }
@@ -119,7 +119,7 @@ public class ImaAdsLoaderTest {
   @Test
   public void testAttachPlayer_updatesAdPlaybackState() {
     setupPlayback(CONTENT_TIMELINE, PREROLL_ADS_DURATIONS_US, PREROLL_CUE_POINTS_SECONDS);
-    imaAdsLoader.attachPlayer(fakeExoPlayer, adsLoaderListener, adUiViewGroup);
+    imaAdsLoader.start(adsLoaderListener, adUiViewGroup);
 
     assertThat(adsLoaderListener.adPlaybackState)
         .isEqualTo(
@@ -131,14 +131,14 @@ public class ImaAdsLoaderTest {
   public void testAttachAfterRelease() {
     setupPlayback(CONTENT_TIMELINE, PREROLL_ADS_DURATIONS_US, PREROLL_CUE_POINTS_SECONDS);
     imaAdsLoader.release();
-    imaAdsLoader.attachPlayer(fakeExoPlayer, adsLoaderListener, adUiViewGroup);
+    imaAdsLoader.start(adsLoaderListener, adUiViewGroup);
   }
 
   @Test
   public void testAttachAndCallbacksAfterRelease() {
     setupPlayback(CONTENT_TIMELINE, PREROLL_ADS_DURATIONS_US, PREROLL_CUE_POINTS_SECONDS);
     imaAdsLoader.release();
-    imaAdsLoader.attachPlayer(fakeExoPlayer, adsLoaderListener, adUiViewGroup);
+    imaAdsLoader.start(adsLoaderListener, adUiViewGroup);
     fakeExoPlayer.setPlayingContentPosition(/* position= */ 0);
     fakeExoPlayer.setState(Player.STATE_READY, true);
 
@@ -166,7 +166,7 @@ public class ImaAdsLoaderTest {
     setupPlayback(CONTENT_TIMELINE, PREROLL_ADS_DURATIONS_US, PREROLL_CUE_POINTS_SECONDS);
 
     // Load the preroll ad.
-    imaAdsLoader.attachPlayer(fakeExoPlayer, adsLoaderListener, adUiViewGroup);
+    imaAdsLoader.start(adsLoaderListener, adUiViewGroup);
     imaAdsLoader.onAdEvent(getAdEvent(AdEventType.LOADED, UNSKIPPABLE_AD));
     imaAdsLoader.loadAd(TEST_URI.toString());
     imaAdsLoader.onAdEvent(getAdEvent(AdEventType.CONTENT_PAUSE_REQUESTED, UNSKIPPABLE_AD));
@@ -210,6 +210,7 @@ public class ImaAdsLoaderTest {
             .setImaFactory(testImaFactory)
             .setImaSdkSettings(imaSdkSettings)
             .buildForAdTag(TEST_URI);
+    imaAdsLoader.setPlayer(fakeExoPlayer);
   }
 
   private static AdEvent getAdEvent(AdEventType adEventType, @Nullable Ad ad) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsLoader.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsLoader.java
index f041542356..51de225414 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsLoader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsLoader.java
@@ -15,9 +15,10 @@
  */
 package com.google.android.exoplayer2.source.ads;
 
+import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.source.ads.AdsMediaSource.AdLoadException;
 import com.google.android.exoplayer2.upstream.DataSpec;
 import java.io.IOException;
@@ -30,16 +31,16 @@ import java.io.IOException;
  * with a new copy of the current {@link AdPlaybackState} whenever further information about ads
  * becomes known (for example, when an ad media URI is available, or an ad has played to the end).
  *
- * <p>{@link #attachPlayer(ExoPlayer, EventListener, ViewGroup)} will be called when the ads media
- * source first initializes, at which point the loader can request ads. If the player enters the
- * background, {@link #detachPlayer()} will be called. Loaders should maintain any ad playback state
- * in preparation for a later call to {@link #attachPlayer(ExoPlayer, EventListener, ViewGroup)}. If
- * an ad is playing when the player is detached, update the ad playback state with the current
- * playback position using {@link AdPlaybackState#withAdResumePositionUs(long)}.
+ * <p>{@link #start(EventListener, ViewGroup)} will be called when the ads media source first
+ * initializes, at which point the loader can request ads. If the player enters the background,
+ * {@link #stop()} will be called. Loaders should maintain any ad playback state in preparation for
+ * a later call to {@link #start(EventListener, ViewGroup)}. If an ad is playing when the player is
+ * detached, update the ad playback state with the current playback position using {@link
+ * AdPlaybackState#withAdResumePositionUs(long)}.
  *
  * <p>If {@link EventListener#onAdPlaybackState(AdPlaybackState)} has been called, the
- * implementation of {@link #attachPlayer(ExoPlayer, EventListener, ViewGroup)} should invoke the
- * same listener to provide the existing playback state to the new player.
+ * implementation of {@link #start(EventListener, ViewGroup)} should invoke the same listener to
+ * provide the existing playback state to the new player.
  */
 public interface AdsLoader {
 
@@ -75,9 +76,34 @@ public interface AdsLoader {
 
   }
 
+  // Methods called by the application.
+
   /**
-   * Sets the supported content types for ad media. Must be called before the first call to
-   * {@link #attachPlayer(ExoPlayer, EventListener, ViewGroup)}. Subsequent calls may be ignored.
+   * Sets the player that will play the loaded ads.
+   *
+   * <p>This method must be called before the player is prepared with media using this ads loader.
+   *
+   * <p>This method must also be called on the main thread and only players which are accessed on
+   * the main thread are supported ({@code player.getApplicationLooper() ==
+   * Looper.getMainLooper()}).
+   *
+   * @param player The player instance that will play the loaded ads. May be null to delete the
+   *     reference to a previously set player.
+   */
+  void setPlayer(@Nullable Player player);
+
+  /**
+   * Releases the loader. Must be called by the application on the main thread when the instance is
+   * no longer needed.
+   */
+  void release();
+
+  // Methods called by AdsMediaSource.
+
+  /**
+   * Sets the supported content types for ad media. Must be called before the first call to {@link
+   * #start(EventListener, ViewGroup)}. Subsequent calls may be ignored. Called on the main thread
+   * by {@link AdsMediaSource}.
    *
    * @param contentTypes The supported content types for ad media. Each element must be one of
    *     {@link C#TYPE_DASH}, {@link C#TYPE_HLS}, {@link C#TYPE_SS} and {@link C#TYPE_OTHER}.
@@ -85,32 +111,23 @@ public interface AdsLoader {
   void setSupportedContentTypes(@C.ContentType int... contentTypes);
 
   /**
-   * Attaches a player that will play ads loaded using this instance. Called on the main thread by
-   * {@link AdsMediaSource}.
+   * Starts using the ads loader for playback. Called on the main thread by {@link AdsMediaSource}.
    *
-   * @param player The player instance that will play the loaded ads. Only players which are
-   *     accessed on the main thread are supported ({@code player.getApplicationLooper() ==
-   *     Looper.getMainLooper()}).
    * @param eventListener Listener for ads loader events.
    * @param adUiViewGroup A {@link ViewGroup} on top of the player that will show any ad UI.
    */
-  void attachPlayer(ExoPlayer player, EventListener eventListener, ViewGroup adUiViewGroup);
+  void start(EventListener eventListener, ViewGroup adUiViewGroup);
 
   /**
-   * Detaches the attached player and event listener. Called on the main thread by
-   * {@link AdsMediaSource}.
+   * Stops using the ads loader for playback and deregisters the event listener. Called on the main
+   * thread by {@link AdsMediaSource}.
    */
-  void detachPlayer();
-
-  /**
-   * Releases the loader. Called by the application on the main thread when the instance is no
-   * longer needed.
-   */
-  void release();
+  void stop();
 
   /**
    * Notifies the ads loader that the player was not able to prepare media for a given ad.
    * Implementations should update the ad playback state as the specified ad has failed to load.
+   * Called on the main thread by {@link AdsMediaSource}.
    *
    * @param adGroupIndex The index of the ad group.
    * @param adIndexInAdGroup The index of the ad in the ad group.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
index 19ddbd2c54..a10bc9019b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
@@ -337,7 +337,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
     final ComponentListener componentListener = new ComponentListener();
     this.componentListener = componentListener;
     prepareChildSource(DUMMY_CONTENT_MEDIA_PERIOD_ID, contentMediaSource);
-    mainHandler.post(() -> adsLoader.attachPlayer(player, componentListener, adUiViewGroup));
+    mainHandler.post(() -> adsLoader.start(componentListener, adUiViewGroup));
   }
 
   @Override
@@ -404,7 +404,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
     adPlaybackState = null;
     adGroupMediaSources = new MediaSource[0][];
     adGroupTimelines = new Timeline[0][];
-    mainHandler.post(adsLoader::detachPlayer);
+    mainHandler.post(adsLoader::stop);
   }
 
   @Override

From c130723929897ad0403eab073cf3fced34f86eb2 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 3 Jan 2019 14:54:37 +0000
Subject: [PATCH 351/832] Replace isTopLevelSource check by period count check
 in AdsMediaSource.

The top level requirement only tried to ensure that the entire timeline only
has one period. This is already asserted by ImaAdsLoader. AdsMediaSource
itself works fine as long as the wrapped timeline has one period only. This
is now asserted instead.

PiperOrigin-RevId: 227682141
---
 .../google/android/exoplayer2/source/ads/AdsMediaSource.java  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
index a10bc9019b..6061b014a7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
@@ -331,9 +331,6 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
       boolean isTopLevelSource,
       @Nullable TransferListener mediaTransferListener) {
     super.prepareSourceInternal(player, isTopLevelSource, mediaTransferListener);
-    Assertions.checkArgument(
-        isTopLevelSource,
-        "AdsMediaSource must be the top-level source used to prepare the player.");
     final ComponentListener componentListener = new ComponentListener();
     this.componentListener = componentListener;
     prepareChildSource(DUMMY_CONTENT_MEDIA_PERIOD_ID, contentMediaSource);
@@ -444,6 +441,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
   }
 
   private void onContentSourceInfoRefreshed(Timeline timeline, Object manifest) {
+    Assertions.checkArgument(timeline.getPeriodCount() == 1);
     contentTimeline = timeline;
     contentManifest = manifest;
     maybeUpdateSourceInfo();

From a940d8bc9d70ea59952ebfe3c60c502a7206825e Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Thu, 3 Jan 2019 14:54:49 +0000
Subject: [PATCH 352/832] Use removing and restarting state internally in
 DownloadManager

PiperOrigin-RevId: 227682159
---
 .../exoplayer2/offline/DownloadManager.java   | 184 ++++++++++--------
 1 file changed, 100 insertions(+), 84 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 94013bb73f..035d3a90b0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -175,7 +175,6 @@ public final class DownloadManager {
       for (int i = 0; i < downloads.size(); i++) {
         downloads.get(i).clearStopFlags(STOP_FLAG_STOPPED);
       }
-      maybeStartDownloads();
       logd("Downloads are started");
     }
   }
@@ -254,7 +253,7 @@ public final class DownloadManager {
       return false;
     }
     for (int i = 0; i < downloads.size(); i++) {
-      if (downloads.get(i).isStarted()) {
+      if (!downloads.get(i).isIdle()) {
         return false;
       }
     }
@@ -284,8 +283,7 @@ public final class DownloadManager {
   private void addDownloadForAction(DownloadAction action) {
     for (int i = 0; i < downloads.size(); i++) {
       Download download = downloads.get(i);
-      if (download.action.isSameMedia(action)) {
-        download.addAction(action);
+      if (download.addAction(action)) {
         logd("Action is added to existing download", download);
         return;
       }
@@ -296,33 +294,27 @@ public final class DownloadManager {
     logd("Download is added", download);
   }
 
-  /**
-   * Iterates through the download queue and starts any download if all of the following are true:
-   *
-   * <ul>
-   *   <li>It hasn't started yet.
-   *   <li>The maximum number of active downloads hasn't been reached.
-   * </ul>
-   */
   private void maybeStartDownloads() {
-    if (!initialized || released) {
-      return;
-    }
     for (int i = 0; i < downloads.size(); i++) {
       maybeStartDownload(downloads.get(i));
     }
   }
 
   private void maybeStartDownload(Download download) {
-    if (download.action.isRemoveAction) {
-      download.start();
-    } else if (activeDownloads.size() < maxActiveDownloads) {
+    if (initialized && !released && activeDownloads.size() < maxActiveDownloads) {
       if (download.start()) {
         activeDownloads.add(download);
       }
     }
   }
 
+  private void maybeRestartDownload(Download download) {
+    Assertions.checkState(activeDownloads.contains(download));
+    if (initialized && !released) {
+      download.start();
+    }
+  }
+
   private void maybeNotifyListenersIdle() {
     if (!isIdle()) {
       return;
@@ -337,8 +329,8 @@ public final class DownloadManager {
     if (released) {
       return;
     }
-    boolean stopped = !download.isStarted();
-    if (stopped) {
+    boolean idle = download.isIdle();
+    if (idle) {
       activeDownloads.remove(download);
     }
     notifyListenersDownloadStateChange(download);
@@ -346,7 +338,7 @@ public final class DownloadManager {
       downloads.remove(download);
       saveActions();
     }
-    if (stopped) {
+    if (idle) {
       maybeStartDownloads();
       maybeNotifyListenersIdle();
     }
@@ -380,17 +372,18 @@ public final class DownloadManager {
                 for (DownloadAction action : actions) {
                   addDownloadForAction(action);
                 }
-                logd("Downloads are created.");
-                initialized = true;
-                for (Listener listener : listeners) {
-                  listener.onInitialized(DownloadManager.this);
-                }
                 if (!actionQueue.isEmpty()) {
                   while (!actionQueue.isEmpty()) {
                     addDownloadForAction(actionQueue.remove());
                   }
                   saveActions();
                 }
+                logd("Downloads are created.");
+                initialized = true;
+                for (Listener listener : listeners) {
+                  listener.onInitialized(DownloadManager.this);
+                }
+                maybeStartDownloads();
               });
         });
   }
@@ -433,7 +426,6 @@ public final class DownloadManager {
     private final int minRetryCount;
     private final long startTimeMs;
     private final ArrayDeque<DownloadAction> actionQueue;
-    private DownloadAction action;
     /** The current state of the download. */
     @DownloadState.State private int state;
 
@@ -456,29 +448,36 @@ public final class DownloadManager {
       this.startTimeMs = System.currentTimeMillis();
       actionQueue = new ArrayDeque<>();
       actionQueue.add(action);
-
-      // Don't notify listeners until we make sure the state doesn't change immediately.
-      state = STATE_QUEUED;
-      setActionAndUpdateState(action);
-      downloadManager.maybeStartDownload(this);
-      if (state == STATE_QUEUED) {
-        downloadManager.onDownloadStateChange(this);
-      }
+      initialize(/* restart= */ false);
     }
 
-    public void addAction(DownloadAction newAction) {
+    public boolean addAction(DownloadAction newAction) {
+      DownloadAction action = actionQueue.peek();
+      if (!action.isSameMedia(newAction)) {
+        return false;
+      }
       Assertions.checkState(action.type.equals(newAction.type));
       actionQueue.add(newAction);
       DownloadAction updatedAction = DownloadActionUtil.mergeActions(actionQueue);
-      if (action.equals(updatedAction)) {
-        return;
-      }
-      if (state == STATE_DOWNLOADING) {
-        stopDownloadThread();
-      } else {
-        Assertions.checkState(state == STATE_QUEUED || state == STATE_STOPPED);
-        setActionAndUpdateState(updatedAction);
+      if (state == STATE_REMOVING) {
+        Assertions.checkState(updatedAction.isRemoveAction);
+        if (actionQueue.size() > 1) {
+          setState(STATE_RESTARTING);
+        }
+      } else if (state == STATE_RESTARTING) {
+        Assertions.checkState(updatedAction.isRemoveAction);
+        if (actionQueue.size() == 1) {
+          setState(STATE_REMOVING);
+        }
+      } else if (!action.equals(updatedAction)) {
+        if (state == STATE_DOWNLOADING) {
+          stopDownloadThread();
+        } else {
+          Assertions.checkState(state == STATE_QUEUED || state == STATE_STOPPED);
+          initialize(/* restart= */ false);
+        }
       }
+      return true;
     }
 
     public DownloadState getDownloadState() {
@@ -490,20 +489,13 @@ public final class DownloadManager {
         downloadedBytes = downloader.getDownloadedBytes();
         totalBytes = downloader.getTotalBytes();
       }
-      int newState = state;
-      if (action.isRemoveAction) {
-        if (state == STATE_DOWNLOADING) {
-          newState = actionQueue.size() > 1 ? STATE_RESTARTING : STATE_REMOVING;
-        } else if (state == STATE_COMPLETED || state == STATE_FAILED) {
-          newState = STATE_REMOVED;
-        }
-      }
+      DownloadAction action = actionQueue.peek();
       return new DownloadState(
           action.id,
           action.type,
           action.uri,
           action.customCacheKey,
-          newState,
+          state,
           downloadPercentage,
           downloadedBytes,
           totalBytes,
@@ -515,30 +507,24 @@ public final class DownloadManager {
           action.data);
     }
 
-    /** Returns whether the download is finished. */
     public boolean isFinished() {
-      return state == STATE_FAILED || state == STATE_COMPLETED;
+      return state == STATE_FAILED || state == STATE_COMPLETED || state == STATE_REMOVED;
     }
 
-    /** Returns whether the download is started. */
-    public boolean isStarted() {
-      return state == STATE_DOWNLOADING;
+    public boolean isIdle() {
+      return state != STATE_DOWNLOADING && state != STATE_REMOVING && state != STATE_RESTARTING;
     }
 
     @Override
     public String toString() {
-      String actionString = action.isRemoveAction ? "remove" : "download";
-      return id + ' ' + actionString + ' ' + DownloadState.getStateString(state);
+      return id + ' ' + DownloadState.getStateString(state);
     }
 
     public boolean start() {
       if (state != STATE_QUEUED) {
         return false;
       }
-      downloader = downloaderFactory.createDownloader(action);
-      downloadThread =
-          new DownloadThread(
-              this, downloader, action.isRemoveAction, minRetryCount, downloadManager.handler);
+      startDownloadThread(actionQueue.peek());
       setState(STATE_DOWNLOADING);
       return true;
     }
@@ -560,28 +546,53 @@ public final class DownloadManager {
     private void updateStopFlags(int mask, int flags) {
       stopFlags = (flags & mask) | (stopFlags & ~mask);
       if (stopFlags != 0) {
-        if (!action.isRemoveAction) {
-          if (state == STATE_DOWNLOADING) {
-            stopDownloadThread();
-          } else if (state == STATE_QUEUED) {
-            setState(STATE_STOPPED);
-          }
+        if (state == STATE_DOWNLOADING) {
+          stopDownloadThread();
+        } else if (state == STATE_QUEUED) {
+          setState(STATE_STOPPED);
         }
       } else if (state == STATE_STOPPED) {
-        setState(STATE_QUEUED);
+        startOrQueue(/* restart= */ false);
       }
     }
 
-    private void setActionAndUpdateState(DownloadAction action) {
-      this.action = action;
-      setState(!this.action.isRemoveAction && stopFlags != 0 ? STATE_STOPPED : STATE_QUEUED);
+    private void initialize(boolean restart) {
+      DownloadAction action = actionQueue.peek();
+      if (action.isRemoveAction) {
+        if (!downloadManager.released) {
+          startDownloadThread(action);
+        }
+        setState(actionQueue.size() == 1 ? STATE_REMOVING : STATE_RESTARTING);
+      } else if (stopFlags != 0) {
+        setState(STATE_STOPPED);
+      } else {
+        startOrQueue(restart);
+      }
+    }
+
+    private void startOrQueue(boolean restart) {
+      // Set to queued state but don't notify listeners until we make sure we can't start now.
+      state = STATE_QUEUED;
+      if (restart) {
+        downloadManager.maybeRestartDownload(this);
+      } else {
+        downloadManager.maybeStartDownload(this);
+      }
+      if (state == STATE_QUEUED) {
+        downloadManager.onDownloadStateChange(this);
+      }
     }
 
     private void setState(@DownloadState.State int newState) {
-      if (state != newState) {
-        state = newState;
-        downloadManager.onDownloadStateChange(this);
-      }
+      state = newState;
+      downloadManager.onDownloadStateChange(this);
+    }
+
+    private void startDownloadThread(DownloadAction action) {
+      downloader = downloaderFactory.createDownloader(action);
+      downloadThread =
+          new DownloadThread(
+              this, downloader, action.isRemoveAction, minRetryCount, downloadManager.handler);
     }
 
     private void stopDownloadThread() {
@@ -591,18 +602,23 @@ public final class DownloadManager {
     private void onDownloadThreadStopped(@Nullable Throwable finalError) {
       failureReason = FAILURE_REASON_NONE;
       if (!downloadThread.isCanceled) {
-        if (finalError != null) {
+        if (finalError != null && state != STATE_REMOVING && state != STATE_RESTARTING) {
           failureReason = FAILURE_REASON_UNKNOWN;
           setState(STATE_FAILED);
           return;
         }
+        if (actionQueue.size() == 1) {
+          if (state == STATE_REMOVING) {
+            setState(STATE_REMOVED);
+          } else {
+            Assertions.checkState(state == STATE_DOWNLOADING);
+            setState(STATE_COMPLETED);
+          }
+          return;
+        }
         actionQueue.remove();
       }
-      if (!actionQueue.isEmpty()) {
-        setActionAndUpdateState(actionQueue.peek());
-      } else {
-        setState(STATE_COMPLETED);
-      }
+      initialize(/* restart= */ state == STATE_DOWNLOADING);
     }
   }
 

From 781ba39097794f1abb0b17867f85a6d2c7279ef4 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Thu, 3 Jan 2019 14:59:40 +0000
Subject: [PATCH 353/832] Disabled test case due to flakiness

PiperOrigin-RevId: 227682600
---
 .../exoplayer2/source/dash/offline/DownloadManagerDashTest.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
index abe868bcfb..ccccb20ccb 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
@@ -201,6 +201,8 @@ public class DownloadManagerDashTest {
     assertCacheEmpty(cache);
   }
 
+  // Disabled due to flakiness [Internal: b/122290449].
+  @Ignore
   @Test
   public void testHandleInterferingRemoveAction() throws Throwable {
     final ConditionVariable downloadInProgressCondition = new ConditionVariable();

From d30375c9a18205cf9c32fe2c5cd4db21e9438f75 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 3 Jan 2019 16:02:48 +0000
Subject: [PATCH 354/832] Prevent IllegalStateException in Mp4 sniffing

If a negative value is read, sniffing should just fail.

PiperOrigin-RevId: 227689568
---
 .../com/google/android/exoplayer2/extractor/mp4/Sniffer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java
index dce00fa824..657a955ab4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java
@@ -109,7 +109,7 @@ import java.io.IOException;
         headerSize = Atom.LONG_HEADER_SIZE;
         input.peekFully(buffer.data, Atom.HEADER_SIZE, Atom.LONG_HEADER_SIZE - Atom.HEADER_SIZE);
         buffer.setLimit(Atom.LONG_HEADER_SIZE);
-        atomSize = buffer.readUnsignedLongToLong();
+        atomSize = buffer.readLong();
       } else if (atomSize == Atom.EXTENDS_TO_END_SIZE) {
         // The atom extends to the end of the file.
         long endPosition = input.getLength();

From d834eeab6fcd68e63bbdd89aa2e029055ee37b10 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 3 Jan 2019 21:01:12 +0000
Subject: [PATCH 355/832] Set MediaSessionConnector components separately

Also support preparation without a player, in line with PlayerView.

PiperOrigin-RevId: 227735260
---
 .../mediasession/MediaSessionConnector.java   | 188 +++++++++---------
 .../RepeatModeActionProvider.java             |   4 +-
 .../mediasession/TimelineQueueNavigator.java  |   2 +-
 3 files changed, 101 insertions(+), 93 deletions(-)

diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
index de14cbf6d7..b4811f040a 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
@@ -67,10 +67,10 @@ import java.util.Map;
  *
  * <ul>
  *   <li>Actions to initiate media playback ({@code PlaybackStateCompat#ACTION_PREPARE_*} and {@code
- *       PlaybackStateCompat#ACTION_PLAY_*}) can be handled by a {@link PlaybackPreparer} passed
- *       when calling {@link #setPlayer(Player, PlaybackPreparer, CustomActionProvider...)}. Custom
- *       actions can be handled by passing one or more {@link CustomActionProvider}s in a similar
- *       way.
+ *       PlaybackStateCompat#ACTION_PLAY_*}) can be handled by a {@link PlaybackPreparer} passed to
+ *       {@link #setPlaybackPreparer(PlaybackPreparer)}.
+ *   <li>Custom actions can be handled by passing one or more {@link CustomActionProvider}s to
+ *       {@link #setCustomActionProviders(CustomActionProvider...)}.
  *   <li>To enable a media queue and navigation within it, you can set a {@link QueueNavigator} by
  *       calling {@link #setQueueNavigator(QueueNavigator)}. Use of {@link TimelineQueueNavigator}
  *       is recommended for most use cases.
@@ -339,21 +339,21 @@ public final class MediaSessionConnector {
   /** The wrapped {@link MediaSessionCompat}. */
   public final MediaSessionCompat mediaSession;
 
-  @Nullable private final MediaMetadataProvider mediaMetadataProvider;
-  private final ExoPlayerEventListener exoPlayerEventListener;
-  private final MediaSessionCallback mediaSessionCallback;
+  private final Looper looper;
+  private final ComponentListener componentListener;
   private final ArrayList<CommandReceiver> commandReceivers;
 
-  private Player player;
   private ControlDispatcher controlDispatcher;
   private CustomActionProvider[] customActionProviders;
   private Map<String, CustomActionProvider> customActionMap;
+  @Nullable private MediaMetadataProvider mediaMetadataProvider;
+  @Nullable private Player player;
   @Nullable private ErrorMessageProvider<? super ExoPlaybackException> errorMessageProvider;
   @Nullable private Pair<Integer, CharSequence> customError;
-  private PlaybackPreparer playbackPreparer;
-  private QueueNavigator queueNavigator;
-  private QueueEditor queueEditor;
-  private RatingCallback ratingCallback;
+  @Nullable private PlaybackPreparer playbackPreparer;
+  @Nullable private QueueNavigator queueNavigator;
+  @Nullable private QueueEditor queueEditor;
+  @Nullable private RatingCallback ratingCallback;
 
   private long enabledPlaybackActions;
   private int rewindMs;
@@ -362,82 +362,60 @@ public final class MediaSessionConnector {
   /**
    * Creates an instance.
    *
-   * <p>Equivalent to {@code MediaSessionConnector(mediaSession, new
-   * DefaultMediaMetadataProvider(mediaSession.getController(), null))}.
-   *
    * @param mediaSession The {@link MediaSessionCompat} to connect to.
    */
   public MediaSessionConnector(MediaSessionCompat mediaSession) {
-    this(
-        mediaSession,
-        new DefaultMediaMetadataProvider(mediaSession.getController(), null));
-  }
-
-  /**
-   * Creates an instance.
-   *
-   * @param mediaSession The {@link MediaSessionCompat} to connect to.
-   * @param mediaMetadataProvider A {@link MediaMetadataProvider} for providing a custom metadata
-   *     object to be published to the media session, or {@code null} if metadata shouldn't be
-   *     published.
-   */
-  public MediaSessionConnector(
-      MediaSessionCompat mediaSession,
-      @Nullable MediaMetadataProvider mediaMetadataProvider) {
     this.mediaSession = mediaSession;
-    this.mediaMetadataProvider = mediaMetadataProvider;
-    mediaSession.setFlags(BASE_MEDIA_SESSION_FLAGS);
-    mediaSessionCallback = new MediaSessionCallback();
-    exoPlayerEventListener = new ExoPlayerEventListener();
-    controlDispatcher = new DefaultControlDispatcher();
-    customActionMap = Collections.emptyMap();
+    looper = Util.getLooper();
+    componentListener = new ComponentListener();
     commandReceivers = new ArrayList<>();
+    controlDispatcher = new DefaultControlDispatcher();
+    customActionProviders = new CustomActionProvider[0];
+    customActionMap = Collections.emptyMap();
+    mediaMetadataProvider =
+        new DefaultMediaMetadataProvider(
+            mediaSession.getController(), /* metadataExtrasPrefix= */ null);
     enabledPlaybackActions = DEFAULT_PLAYBACK_ACTIONS;
     rewindMs = DEFAULT_REWIND_MS;
     fastForwardMs = DEFAULT_FAST_FORWARD_MS;
+    mediaSession.setFlags(BASE_MEDIA_SESSION_FLAGS);
+    mediaSession.setCallback(componentListener, new Handler(looper));
   }
 
   /**
    * Sets the player to be connected to the media session. Must be called on the same thread that is
    * used to access the player.
    *
-   * <p>The order in which any {@link CustomActionProvider}s are passed determines the order of the
-   * actions published with the playback state of the session.
-   *
    * @param player The player to be connected to the {@code MediaSession}, or {@code null} to
    *     disconnect the current player.
-   * @param playbackPreparer An optional {@link PlaybackPreparer} for preparing the player.
-   * @param customActionProviders Optional {@link CustomActionProvider}s to publish and handle
-   *     custom actions.
    */
-  public void setPlayer(
-      @Nullable Player player,
-      @Nullable PlaybackPreparer playbackPreparer,
-      CustomActionProvider... customActionProviders) {
-    Assertions.checkArgument(player == null || player.getApplicationLooper() == Looper.myLooper());
+  public void setPlayer(@Nullable Player player) {
+    Assertions.checkArgument(player == null || player.getApplicationLooper() == looper);
     if (this.player != null) {
-      this.player.removeListener(exoPlayerEventListener);
-      mediaSession.setCallback(null);
+      this.player.removeListener(componentListener);
     }
-
-    unregisterCommandReceiver(this.playbackPreparer);
     this.player = player;
-    this.playbackPreparer = playbackPreparer;
-    registerCommandReceiver(playbackPreparer);
-
-    this.customActionProviders =
-        (player != null && customActionProviders != null)
-            ? customActionProviders
-            : new CustomActionProvider[0];
     if (player != null) {
-      Handler handler = new Handler(Util.getLooper());
-      mediaSession.setCallback(mediaSessionCallback, handler);
-      player.addListener(exoPlayerEventListener);
+      player.addListener(componentListener);
     }
     invalidateMediaSessionPlaybackState();
     invalidateMediaSessionMetadata();
   }
 
+  /**
+   * Sets the {@link PlaybackPreparer}.
+   *
+   * @param playbackPreparer The {@link PlaybackPreparer}.
+   */
+  public void setPlaybackPreparer(@Nullable PlaybackPreparer playbackPreparer) {
+    if (this.playbackPreparer != playbackPreparer) {
+      unregisterCommandReceiver(this.playbackPreparer);
+      this.playbackPreparer = playbackPreparer;
+      registerCommandReceiver(playbackPreparer);
+      invalidateMediaSessionPlaybackState();
+    }
+  }
+
   /**
    * Sets the {@link ControlDispatcher}.
    *
@@ -570,6 +548,32 @@ public final class MediaSessionConnector {
     invalidateMediaSessionPlaybackState();
   }
 
+  /**
+   * Sets custom action providers. The order of the {@link CustomActionProvider}s determines the
+   * order in which the actions are published.
+   *
+   * @param customActionProviders The custom action providers, or null to remove all existing custom
+   *     action providers.
+   */
+  public void setCustomActionProviders(@Nullable CustomActionProvider... customActionProviders) {
+    this.customActionProviders =
+        customActionProviders == null ? new CustomActionProvider[0] : customActionProviders;
+    invalidateMediaSessionPlaybackState();
+  }
+
+  /**
+   * Sets a provider of metadata to be published to the media session.
+   *
+   * @param mediaMetadataProvider The provider of metadata to publish, or {@code null} if no
+   *     metadata should be published.
+   */
+  public void setMediaMetadataProvider(@Nullable MediaMetadataProvider mediaMetadataProvider) {
+    if (this.mediaMetadataProvider != mediaMetadataProvider) {
+      this.mediaMetadataProvider = mediaMetadataProvider;
+      invalidateMediaSessionMetadata();
+    }
+  }
+
   /**
    * Updates the metadata of the media session.
    *
@@ -577,9 +581,11 @@ public final class MediaSessionConnector {
    * changed and the metadata should be updated immediately.
    */
   public final void invalidateMediaSessionMetadata() {
-    if (mediaMetadataProvider != null && player != null) {
-      mediaSession.setMetadata(mediaMetadataProvider.getMetadata(player));
-    }
+    MediaMetadataCompat metadata =
+        mediaMetadataProvider != null && player != null
+            ? mediaMetadataProvider.getMetadata(player)
+            : null;
+    mediaSession.setMetadata(metadata);
   }
 
   /**
@@ -591,7 +597,7 @@ public final class MediaSessionConnector {
   public final void invalidateMediaSessionPlaybackState() {
     PlaybackStateCompat.Builder builder = new PlaybackStateCompat.Builder();
     if (player == null) {
-      builder.setActions(/* capabilities= */ 0).setState(PlaybackStateCompat.STATE_NONE, 0, 0, 0);
+      builder.setActions(buildPrepareActions()).setState(PlaybackStateCompat.STATE_NONE, 0, 0, 0);
       mediaSession.setPlaybackState(builder.build());
       return;
     }
@@ -627,7 +633,7 @@ public final class MediaSessionConnector {
     Bundle extras = new Bundle();
     extras.putFloat(EXTRAS_PITCH, player.getPlaybackParameters().pitch);
     builder
-        .setActions(buildPlaybackActions(player))
+        .setActions(buildPrepareActions() | buildPlaybackActions(player))
         .setActiveQueueItemId(activeQueueItemId)
         .setBufferedPosition(player.getBufferedPosition())
         .setState(
@@ -662,6 +668,12 @@ public final class MediaSessionConnector {
     commandReceivers.remove(commandReceiver);
   }
 
+  private long buildPrepareActions() {
+    return playbackPreparer == null
+        ? 0
+        : (PlaybackPreparer.ACTIONS & playbackPreparer.getSupportedPrepareActions());
+  }
+
   private long buildPlaybackActions(Player player) {
     boolean enableSeeking = false;
     boolean enableRewind = false;
@@ -688,9 +700,6 @@ public final class MediaSessionConnector {
     playbackActions &= enabledPlaybackActions;
 
     long actions = playbackActions;
-    if (playbackPreparer != null) {
-      actions |= (PlaybackPreparer.ACTIONS & playbackPreparer.getSupportedPrepareActions());
-    }
     if (queueNavigator != null) {
       actions |=
           (QueueNavigator.ACTIONS & queueNavigator.getSupportedQueueNavigatorActions(player));
@@ -719,8 +728,7 @@ public final class MediaSessionConnector {
   }
 
   private boolean canDispatchToPlaybackPreparer(long action) {
-    return player != null
-        && playbackPreparer != null
+    return playbackPreparer != null
         && (playbackPreparer.getSupportedPrepareActions() & action) != 0;
   }
 
@@ -738,6 +746,13 @@ public final class MediaSessionConnector {
     return player != null && queueEditor != null;
   }
 
+  private void stopPlayerForPrepare(boolean playWhenReady) {
+    if (player != null) {
+      player.stop();
+      player.setPlayWhenReady(playWhenReady);
+    }
+  }
+
   private void rewind(Player player) {
     if (player.isCurrentWindowSeekable() && rewindMs > 0) {
       seekTo(player, player.getCurrentPosition() - rewindMs);
@@ -865,11 +880,14 @@ public final class MediaSessionConnector {
     }
   }
 
-  private class ExoPlayerEventListener implements Player.EventListener {
+  private class ComponentListener extends MediaSessionCompat.Callback
+      implements Player.EventListener {
 
     private int currentWindowIndex;
     private int currentWindowCount;
 
+    // Player.EventListener implementation.
+
     @Override
     public void onTimelineChanged(
         Timeline timeline, @Nullable Object manifest, @Player.TimelineChangeReason int reason) {
@@ -932,9 +950,8 @@ public final class MediaSessionConnector {
     public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {
       invalidateMediaSessionPlaybackState();
     }
-  }
 
-  private class MediaSessionCallback extends MediaSessionCompat.Callback {
+    // MediaSessionCompat.Callback implementation.
 
     @Override
     public void onPlay() {
@@ -1058,8 +1075,7 @@ public final class MediaSessionConnector {
     @Override
     public void onPrepare() {
       if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PREPARE)) {
-        player.stop();
-        player.setPlayWhenReady(false);
+        stopPlayerForPrepare(/* playWhenReady= */ false);
         playbackPreparer.onPrepare();
       }
     }
@@ -1067,8 +1083,7 @@ public final class MediaSessionConnector {
     @Override
     public void onPrepareFromMediaId(String mediaId, Bundle extras) {
       if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PREPARE_FROM_MEDIA_ID)) {
-        player.stop();
-        player.setPlayWhenReady(false);
+        stopPlayerForPrepare(/* playWhenReady= */ false);
         playbackPreparer.onPrepareFromMediaId(mediaId, extras);
       }
     }
@@ -1076,8 +1091,7 @@ public final class MediaSessionConnector {
     @Override
     public void onPrepareFromSearch(String query, Bundle extras) {
       if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PREPARE_FROM_SEARCH)) {
-        player.stop();
-        player.setPlayWhenReady(false);
+        stopPlayerForPrepare(/* playWhenReady= */ false);
         playbackPreparer.onPrepareFromSearch(query, extras);
       }
     }
@@ -1085,8 +1099,7 @@ public final class MediaSessionConnector {
     @Override
     public void onPrepareFromUri(Uri uri, Bundle extras) {
       if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PREPARE_FROM_URI)) {
-        player.stop();
-        player.setPlayWhenReady(false);
+        stopPlayerForPrepare(/* playWhenReady= */ false);
         playbackPreparer.onPrepareFromUri(uri, extras);
       }
     }
@@ -1094,8 +1107,7 @@ public final class MediaSessionConnector {
     @Override
     public void onPlayFromMediaId(String mediaId, Bundle extras) {
       if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PLAY_FROM_MEDIA_ID)) {
-        player.stop();
-        player.setPlayWhenReady(true);
+        stopPlayerForPrepare(/* playWhenReady= */ true);
         playbackPreparer.onPrepareFromMediaId(mediaId, extras);
       }
     }
@@ -1103,8 +1115,7 @@ public final class MediaSessionConnector {
     @Override
     public void onPlayFromSearch(String query, Bundle extras) {
       if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PLAY_FROM_SEARCH)) {
-        player.stop();
-        player.setPlayWhenReady(true);
+        stopPlayerForPrepare(/* playWhenReady= */ true);
         playbackPreparer.onPrepareFromSearch(query, extras);
       }
     }
@@ -1112,8 +1123,7 @@ public final class MediaSessionConnector {
     @Override
     public void onPlayFromUri(Uri uri, Bundle extras) {
       if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PLAY_FROM_URI)) {
-        player.stop();
-        player.setPlayWhenReady(true);
+        stopPlayerForPrepare(/* playWhenReady= */ true);
         playbackPreparer.onPrepareFromUri(uri, extras);
       }
     }
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/RepeatModeActionProvider.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/RepeatModeActionProvider.java
index b773396198..617b8781f4 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/RepeatModeActionProvider.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/RepeatModeActionProvider.java
@@ -22,9 +22,7 @@ import com.google.android.exoplayer2.ControlDispatcher;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.util.RepeatModeUtil;
 
-/**
- * Provides a custom action for toggling repeat modes.
- */
+/** Provides a custom action for toggling repeat modes. */
 public final class RepeatModeActionProvider implements MediaSessionConnector.CustomActionProvider {
 
   /** The default repeat toggle modes. */
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
index 5d2b37618f..d0047637dd 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
@@ -41,7 +41,7 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
 
   private final MediaSessionCompat mediaSession;
   private final Timeline.Window window;
-  protected final int maxQueueSize;
+  private final int maxQueueSize;
 
   private long activeQueueItemId;
 

From ed1f41db1bc960109dafeb434e313dd91546cf44 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 4 Jan 2019 08:27:21 +0000
Subject: [PATCH 356/832] Parse frame rate from 'mdta' metadata

PiperOrigin-RevId: 227813461
---
 .../com/google/android/exoplayer2/Format.java |  31 +++++
 .../exoplayer2/extractor/mp4/Atom.java        |   3 +-
 .../exoplayer2/extractor/mp4/AtomParsers.java |  88 ++++++++++++--
 .../extractor/mp4/MdtaMetadataEntry.java      | 114 ++++++++++++++++++
 .../extractor/mp4/MetadataUtil.java           | 114 +++++++++++++++---
 .../extractor/mp4/Mp4Extractor.java           |  69 ++++++-----
 .../extractor/mp4/MdtaMetadataEntryTest.java  |  44 +++++++
 7 files changed, 405 insertions(+), 58 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntry.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntryTest.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Format.java b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
index b3d55ac114..6c54c07cde 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Format.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
@@ -1181,6 +1181,37 @@ public final class Format implements Parcelable {
         metadata);
   }
 
+  public Format copyWithFrameRate(float frameRate) {
+    return new Format(
+        id,
+        label,
+        containerMimeType,
+        sampleMimeType,
+        codecs,
+        bitrate,
+        maxInputSize,
+        width,
+        height,
+        frameRate,
+        rotationDegrees,
+        pixelWidthHeightRatio,
+        projectionData,
+        stereoMode,
+        colorInfo,
+        channelCount,
+        sampleRate,
+        pcmEncoding,
+        encoderDelay,
+        encoderPadding,
+        selectionFlags,
+        language,
+        accessibilityChannel,
+        subsampleOffsetUs,
+        initializationData,
+        drmInitData,
+        metadata);
+  }
+
   public Format copyWithDrmInitData(@Nullable DrmInitData drmInitData) {
     return new Format(
         id,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
index 440e577c7d..8d78337617 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-@SuppressWarnings("ConstantField")
+@SuppressWarnings({"ConstantField", "ConstantCaseForConstants"})
 /* package */ abstract class Atom {
 
   /**
@@ -130,6 +130,7 @@ import java.util.List;
   public static final int TYPE_sawb = Util.getIntegerCodeForString("sawb");
   public static final int TYPE_udta = Util.getIntegerCodeForString("udta");
   public static final int TYPE_meta = Util.getIntegerCodeForString("meta");
+  public static final int TYPE_keys = Util.getIntegerCodeForString("keys");
   public static final int TYPE_ilst = Util.getIntegerCodeForString("ilst");
   public static final int TYPE_mean = Util.getIntegerCodeForString("mean");
   public static final int TYPE_name = Util.getIntegerCodeForString("name");
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
index d085156f2b..008a155d1f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.extractor.mp4;
 
 import static com.google.android.exoplayer2.util.MimeTypes.getMimeTypeFromMp4ObjectType;
 
+import android.support.annotation.Nullable;
 import android.util.Pair;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
@@ -39,7 +40,7 @@ import java.util.Collections;
 import java.util.List;
 
 /** Utility methods for parsing MP4 format atom payloads according to ISO 14496-12. */
-@SuppressWarnings("ConstantField")
+@SuppressWarnings({"ConstantField", "ConstantCaseForConstants"})
 /* package */ final class AtomParsers {
 
   private static final String TAG = "AtomParsers";
@@ -51,6 +52,7 @@ import java.util.List;
   private static final int TYPE_subt = Util.getIntegerCodeForString("subt");
   private static final int TYPE_clcp = Util.getIntegerCodeForString("clcp");
   private static final int TYPE_meta = Util.getIntegerCodeForString("meta");
+  private static final int TYPE_mdta = Util.getIntegerCodeForString("mdta");
 
   /**
    * The threshold number of samples to trim from the start/end of an audio track when applying an
@@ -77,7 +79,7 @@ import java.util.List;
       DrmInitData drmInitData, boolean ignoreEditLists, boolean isQuickTime)
       throws ParserException {
     Atom.ContainerAtom mdia = trak.getContainerAtomOfType(Atom.TYPE_mdia);
-    int trackType = parseHdlr(mdia.getLeafAtomOfType(Atom.TYPE_hdlr).data);
+    int trackType = getTrackTypeForHdlr(parseHdlr(mdia.getLeafAtomOfType(Atom.TYPE_hdlr).data));
     if (trackType == C.TRACK_TYPE_UNKNOWN) {
       return null;
     }
@@ -485,6 +487,7 @@ import java.util.List;
    * @param isQuickTime True for QuickTime media. False otherwise.
    * @return Parsed metadata, or null.
    */
+  @Nullable
   public static Metadata parseUdta(Atom.LeafAtom udtaAtom, boolean isQuickTime) {
     if (isQuickTime) {
       // Meta boxes are regular boxes rather than full boxes in QuickTime. For now, don't try and
@@ -499,14 +502,69 @@ import java.util.List;
       int atomType = udtaData.readInt();
       if (atomType == Atom.TYPE_meta) {
         udtaData.setPosition(atomPosition);
-        return parseMetaAtom(udtaData, atomPosition + atomSize);
+        return parseUdtaMeta(udtaData, atomPosition + atomSize);
       }
-      udtaData.skipBytes(atomSize - Atom.HEADER_SIZE);
+      udtaData.setPosition(atomPosition + atomSize);
     }
     return null;
   }
 
-  private static Metadata parseMetaAtom(ParsableByteArray meta, int limit) {
+  /**
+   * Parses a metadata meta atom if it contains metadata with handler 'mdta'.
+   *
+   * @param meta The metadata atom to decode.
+   * @return Parsed metadata, or null.
+   */
+  @Nullable
+  public static Metadata parseMdtaFromMeta(Atom.ContainerAtom meta) {
+    Atom.LeafAtom hdlrAtom = meta.getLeafAtomOfType(Atom.TYPE_hdlr);
+    Atom.LeafAtom keysAtom = meta.getLeafAtomOfType(Atom.TYPE_keys);
+    Atom.LeafAtom ilstAtom = meta.getLeafAtomOfType(Atom.TYPE_ilst);
+    if (hdlrAtom == null
+        || keysAtom == null
+        || ilstAtom == null
+        || AtomParsers.parseHdlr(hdlrAtom.data) != TYPE_mdta) {
+      // There isn't enough information to parse the metadata, or the handler type is unexpected.
+      return null;
+    }
+
+    // Parse metadata keys.
+    ParsableByteArray keys = keysAtom.data;
+    keys.setPosition(Atom.FULL_HEADER_SIZE);
+    int entryCount = keys.readInt();
+    String[] keyNames = new String[entryCount];
+    for (int i = 0; i < entryCount; i++) {
+      int entrySize = keys.readInt();
+      keys.skipBytes(4); // keyNamespace
+      int keySize = entrySize - 8;
+      keyNames[i] = keys.readString(keySize);
+    }
+
+    // Parse metadata items.
+    ParsableByteArray ilst = ilstAtom.data;
+    ilst.setPosition(Atom.HEADER_SIZE);
+    ArrayList<Metadata.Entry> entries = new ArrayList<>();
+    while (ilst.bytesLeft() > Atom.HEADER_SIZE) {
+      int atomPosition = ilst.getPosition();
+      int atomSize = ilst.readInt();
+      int keyIndex = ilst.readInt() - 1;
+      if (keyIndex >= 0 && keyIndex < keyNames.length) {
+        String key = keyNames[keyIndex];
+        Metadata.Entry entry =
+            MetadataUtil.parseMdtaMetadataEntryFromIlst(ilst, atomPosition + atomSize, key);
+        if (entry != null) {
+          entries.add(entry);
+        }
+      } else {
+        Log.w(TAG, "Skipped metadata with unknown key index: " + keyIndex);
+      }
+      ilst.setPosition(atomPosition + atomSize);
+    }
+    return entries.isEmpty() ? null : new Metadata(entries);
+  }
+
+  @Nullable
+  private static Metadata parseUdtaMeta(ParsableByteArray meta, int limit) {
     meta.skipBytes(Atom.FULL_HEADER_SIZE);
     while (meta.getPosition() < limit) {
       int atomPosition = meta.getPosition();
@@ -516,11 +574,12 @@ import java.util.List;
         meta.setPosition(atomPosition);
         return parseIlst(meta, atomPosition + atomSize);
       }
-      meta.skipBytes(atomSize - Atom.HEADER_SIZE);
+      meta.setPosition(atomPosition + atomSize);
     }
     return null;
   }
 
+  @Nullable
   private static Metadata parseIlst(ParsableByteArray ilst, int limit) {
     ilst.skipBytes(Atom.HEADER_SIZE);
     ArrayList<Metadata.Entry> entries = new ArrayList<>();
@@ -610,19 +669,22 @@ import java.util.List;
    * Parses an hdlr atom.
    *
    * @param hdlr The hdlr atom to decode.
-   * @return The track type.
+   * @return The handler value.
    */
   private static int parseHdlr(ParsableByteArray hdlr) {
     hdlr.setPosition(Atom.FULL_HEADER_SIZE + 4);
-    int trackType = hdlr.readInt();
-    if (trackType == TYPE_soun) {
+    return hdlr.readInt();
+  }
+
+  /** Returns the track type for a given handler value. */
+  private static int getTrackTypeForHdlr(int hdlr) {
+    if (hdlr == TYPE_soun) {
       return C.TRACK_TYPE_AUDIO;
-    } else if (trackType == TYPE_vide) {
+    } else if (hdlr == TYPE_vide) {
       return C.TRACK_TYPE_VIDEO;
-    } else if (trackType == TYPE_text || trackType == TYPE_sbtl || trackType == TYPE_subt
-        || trackType == TYPE_clcp) {
+    } else if (hdlr == TYPE_text || hdlr == TYPE_sbtl || hdlr == TYPE_subt || hdlr == TYPE_clcp) {
       return C.TRACK_TYPE_TEXT;
-    } else if (trackType == TYPE_meta) {
+    } else if (hdlr == TYPE_meta) {
       return C.TRACK_TYPE_METADATA;
     } else {
       return C.TRACK_TYPE_UNKNOWN;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntry.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntry.java
new file mode 100644
index 0000000000..517a0a51d5
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntry.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.extractor.mp4;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.metadata.Metadata;
+import java.util.Arrays;
+
+/**
+ * Stores extensible metadata with handler type 'mdta'. See also the QuickTime File Format
+ * Specification.
+ */
+public final class MdtaMetadataEntry implements Metadata.Entry {
+
+  /** The metadata key name. */
+  public final String key;
+  /** The payload. The interpretation of the value depends on {@link #typeIndicator}. */
+  public final byte[] value;
+  /** The four byte locale indicator. */
+  public final int localeIndicator;
+  /** The four byte type indicator. */
+  public final int typeIndicator;
+
+  /** Creates a new metadata entry for the specified metadata key/value. */
+  public MdtaMetadataEntry(String key, byte[] value, int localeIndicator, int typeIndicator) {
+    this.key = key;
+    this.value = value;
+    this.localeIndicator = localeIndicator;
+    this.typeIndicator = typeIndicator;
+  }
+
+  private MdtaMetadataEntry(Parcel in) {
+    key = in.readString();
+    value = new byte[in.readInt()];
+    in.readByteArray(value);
+    localeIndicator = in.readInt();
+    typeIndicator = in.readInt();
+  }
+
+  @Override
+  public boolean equals(@Nullable Object obj) {
+    if (this == obj) {
+      return true;
+    }
+    if (obj == null || getClass() != obj.getClass()) {
+      return false;
+    }
+    MdtaMetadataEntry other = (MdtaMetadataEntry) obj;
+    return key.equals(other.key)
+        && Arrays.equals(value, other.value)
+        && localeIndicator == other.localeIndicator
+        && typeIndicator == other.typeIndicator;
+  }
+
+  @Override
+  public int hashCode() {
+    int result = 17;
+    result = 31 * result + key.hashCode();
+    result = 31 * result + Arrays.hashCode(value);
+    result = 31 * result + localeIndicator;
+    result = 31 * result + typeIndicator;
+    return result;
+  }
+
+  @Override
+  public String toString() {
+    return "mdta: key=" + key;
+  }
+
+  // Parcelable implementation.
+
+  @Override
+  public void writeToParcel(Parcel dest, int flags) {
+    dest.writeString(key);
+    dest.writeInt(value.length);
+    dest.writeByteArray(value);
+    dest.writeInt(localeIndicator);
+    dest.writeInt(typeIndicator);
+  }
+
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  public static final Parcelable.Creator<MdtaMetadataEntry> CREATOR =
+      new Parcelable.Creator<MdtaMetadataEntry>() {
+
+        @Override
+        public MdtaMetadataEntry createFromParcel(Parcel in) {
+          return new MdtaMetadataEntry(in);
+        }
+
+        @Override
+        public MdtaMetadataEntry[] newArray(int size) {
+          return new MdtaMetadataEntry[size];
+        }
+      };
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java
index a4bdf7a268..02522897ce 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java
@@ -16,6 +16,9 @@
 package com.google.android.exoplayer2.extractor.mp4;
 
 import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.extractor.GaplessInfoHolder;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.id3.ApicFrame;
 import com.google.android.exoplayer2.metadata.id3.CommentFrame;
@@ -25,10 +28,9 @@ import com.google.android.exoplayer2.metadata.id3.TextInformationFrame;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.Util;
+import java.nio.ByteBuffer;
 
-/**
- * Parses metadata items stored in ilst atoms.
- */
+/** Utilities for handling metadata in MP4. */
 /* package */ final class MetadataUtil {
 
   private static final String TAG = "MetadataUtil";
@@ -106,17 +108,64 @@ import com.google.android.exoplayer2.util.Util;
   private static final int TYPE_TOP_BYTE_COPYRIGHT = 0xA9;
   private static final int TYPE_TOP_BYTE_REPLACEMENT = 0xFD; // Truncated value of \uFFFD.
 
+  private static final String MDTA_KEY_ANDROID_CAPTURE_FPS = "com.android.capture.fps";
+  private static final int MDTA_TYPE_INDICATOR_FLOAT = 23;
+
   private MetadataUtil() {}
 
   /**
-   * Parses a single ilst element from a {@link ParsableByteArray}. The element is read starting
-   * from the current position of the {@link ParsableByteArray}, and the position is advanced by the
-   * size of the element. The position is advanced even if the element's type is unrecognized.
+   * Returns a {@link Format} that is the same as the input format but includes information from the
+   * specified sources of metadata.
+   */
+  public static Format getFormatWithMetadata(
+      int trackType,
+      Format format,
+      @Nullable Metadata udtaMetadata,
+      @Nullable Metadata mdtaMetadata,
+      GaplessInfoHolder gaplessInfoHolder) {
+    if (trackType == C.TRACK_TYPE_AUDIO) {
+      if (gaplessInfoHolder.hasGaplessInfo()) {
+        format =
+            format.copyWithGaplessInfo(
+                gaplessInfoHolder.encoderDelay, gaplessInfoHolder.encoderPadding);
+      }
+      // We assume all udta metadata is associated with the audio track.
+      if (udtaMetadata != null) {
+        format = format.copyWithMetadata(udtaMetadata);
+      }
+    } else if (trackType == C.TRACK_TYPE_VIDEO && mdtaMetadata != null) {
+      // Populate only metadata keys that are known to be specific to video.
+      for (int i = 0; i < mdtaMetadata.length(); i++) {
+        Metadata.Entry entry = mdtaMetadata.get(i);
+        if (entry instanceof MdtaMetadataEntry) {
+          MdtaMetadataEntry mdtaMetadataEntry = (MdtaMetadataEntry) entry;
+          if (MDTA_KEY_ANDROID_CAPTURE_FPS.equals(mdtaMetadataEntry.key)
+              && mdtaMetadataEntry.typeIndicator == MDTA_TYPE_INDICATOR_FLOAT) {
+            try {
+              float fps = ByteBuffer.wrap(mdtaMetadataEntry.value).asFloatBuffer().get();
+              format = format.copyWithFrameRate(fps);
+              format = format.copyWithMetadata(new Metadata(mdtaMetadataEntry));
+            } catch (NumberFormatException e) {
+              Log.w(TAG, "Ignoring invalid framerate");
+            }
+          }
+        }
+      }
+    }
+    return format;
+  }
+
+  /**
+   * Parses a single userdata ilst element from a {@link ParsableByteArray}. The element is read
+   * starting from the current position of the {@link ParsableByteArray}, and the position is
+   * advanced by the size of the element. The position is advanced even if the element's type is
+   * unrecognized.
    *
    * @param ilst Holds the data to be parsed.
    * @return The parsed element, or null if the element's type was not recognized.
    */
-  public static @Nullable Metadata.Entry parseIlstElement(ParsableByteArray ilst) {
+  @Nullable
+  public static Metadata.Entry parseIlstElement(ParsableByteArray ilst) {
     int position = ilst.getPosition();
     int endPosition = position + ilst.readInt();
     int type = ilst.readInt();
@@ -187,7 +236,36 @@ import com.google.android.exoplayer2.util.Util;
     }
   }
 
-  private static @Nullable TextInformationFrame parseTextAttribute(
+  /**
+   * Parses an 'mdta' metadata entry starting at the current position in an ilst box.
+   *
+   * @param ilst The ilst box.
+   * @param endPosition The end position of the entry in the ilst box.
+   * @param key The mdta metadata entry key for the entry.
+   * @return The parsed element, or null if the entry wasn't recognized.
+   */
+  @Nullable
+  public static MdtaMetadataEntry parseMdtaMetadataEntryFromIlst(
+      ParsableByteArray ilst, int endPosition, String key) {
+    int atomPosition;
+    while ((atomPosition = ilst.getPosition()) < endPosition) {
+      int atomSize = ilst.readInt();
+      int atomType = ilst.readInt();
+      if (atomType == Atom.TYPE_data) {
+        int typeIndicator = ilst.readInt();
+        int localeIndicator = ilst.readInt();
+        int dataSize = atomSize - 16;
+        byte[] value = new byte[dataSize];
+        ilst.readBytes(value, 0, dataSize);
+        return new MdtaMetadataEntry(key, value, localeIndicator, typeIndicator);
+      }
+      ilst.setPosition(atomPosition + atomSize);
+    }
+    return null;
+  }
+
+  @Nullable
+  private static TextInformationFrame parseTextAttribute(
       int type, String id, ParsableByteArray data) {
     int atomSize = data.readInt();
     int atomType = data.readInt();
@@ -200,7 +278,8 @@ import com.google.android.exoplayer2.util.Util;
     return null;
   }
 
-  private static @Nullable CommentFrame parseCommentAttribute(int type, ParsableByteArray data) {
+  @Nullable
+  private static CommentFrame parseCommentAttribute(int type, ParsableByteArray data) {
     int atomSize = data.readInt();
     int atomType = data.readInt();
     if (atomType == Atom.TYPE_data) {
@@ -212,7 +291,8 @@ import com.google.android.exoplayer2.util.Util;
     return null;
   }
 
-  private static @Nullable Id3Frame parseUint8Attribute(
+  @Nullable
+  private static Id3Frame parseUint8Attribute(
       int type,
       String id,
       ParsableByteArray data,
@@ -231,7 +311,8 @@ import com.google.android.exoplayer2.util.Util;
     return null;
   }
 
-  private static @Nullable TextInformationFrame parseIndexAndCountAttribute(
+  @Nullable
+  private static TextInformationFrame parseIndexAndCountAttribute(
       int type, String attributeName, ParsableByteArray data) {
     int atomSize = data.readInt();
     int atomType = data.readInt();
@@ -251,8 +332,8 @@ import com.google.android.exoplayer2.util.Util;
     return null;
   }
 
-  private static @Nullable TextInformationFrame parseStandardGenreAttribute(
-      ParsableByteArray data) {
+  @Nullable
+  private static TextInformationFrame parseStandardGenreAttribute(ParsableByteArray data) {
     int genreCode = parseUint8AttributeValue(data);
     String genreString = (0 < genreCode && genreCode <= STANDARD_GENRES.length)
         ? STANDARD_GENRES[genreCode - 1] : null;
@@ -263,7 +344,8 @@ import com.google.android.exoplayer2.util.Util;
     return null;
   }
 
-  private static @Nullable ApicFrame parseCoverArt(ParsableByteArray data) {
+  @Nullable
+  private static ApicFrame parseCoverArt(ParsableByteArray data) {
     int atomSize = data.readInt();
     int atomType = data.readInt();
     if (atomType == Atom.TYPE_data) {
@@ -287,8 +369,8 @@ import com.google.android.exoplayer2.util.Util;
     return null;
   }
 
-  private static @Nullable Id3Frame parseInternalAttribute(
-      ParsableByteArray data, int endPosition) {
+  @Nullable
+  private static Id3Frame parseInternalAttribute(ParsableByteArray data, int endPosition) {
     String domain = null;
     String name = null;
     int dataAtomPosition = -1;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
index ec24bed964..5356fdb548 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
@@ -75,7 +75,7 @@ public final class Mp4Extractor implements Extractor, SeekMap {
   private static final int STATE_READING_ATOM_PAYLOAD = 1;
   private static final int STATE_READING_SAMPLE = 2;
 
-  // Brand stored in the ftyp atom for QuickTime media.
+  /** Brand stored in the ftyp atom for QuickTime media. */
   private static final int BRAND_QUICKTIME = Util.getIntegerCodeForString("qt  ");
 
   /**
@@ -377,15 +377,21 @@ public final class Mp4Extractor implements Extractor, SeekMap {
     long durationUs = C.TIME_UNSET;
     List<Mp4Track> tracks = new ArrayList<>();
 
-    Metadata metadata = null;
+    // Process metadata.
+    Metadata udtaMetadata = null;
     GaplessInfoHolder gaplessInfoHolder = new GaplessInfoHolder();
     Atom.LeafAtom udta = moov.getLeafAtomOfType(Atom.TYPE_udta);
     if (udta != null) {
-      metadata = AtomParsers.parseUdta(udta, isQuickTime);
-      if (metadata != null) {
-        gaplessInfoHolder.setFromMetadata(metadata);
+      udtaMetadata = AtomParsers.parseUdta(udta, isQuickTime);
+      if (udtaMetadata != null) {
+        gaplessInfoHolder.setFromMetadata(udtaMetadata);
       }
     }
+    Metadata mdtaMetadata = null;
+    Atom.ContainerAtom meta = moov.getContainerAtomOfType(Atom.TYPE_meta);
+    if (meta != null) {
+      mdtaMetadata = AtomParsers.parseMdtaFromMeta(meta);
+    }
 
     boolean ignoreEditLists = (flags & FLAG_WORKAROUND_IGNORE_EDIT_LISTS) != 0;
     ArrayList<TrackSampleTable> trackSampleTables =
@@ -401,15 +407,9 @@ public final class Mp4Extractor implements Extractor, SeekMap {
       // Allow ten source samples per output sample, like the platform extractor.
       int maxInputSize = trackSampleTable.maximumSize + 3 * 10;
       Format format = track.format.copyWithMaxInputSize(maxInputSize);
-      if (track.type == C.TRACK_TYPE_AUDIO) {
-        if (gaplessInfoHolder.hasGaplessInfo()) {
-          format = format.copyWithGaplessInfo(gaplessInfoHolder.encoderDelay,
-              gaplessInfoHolder.encoderPadding);
-        }
-        if (metadata != null) {
-          format = format.copyWithMetadata(metadata);
-        }
-      }
+      format =
+          MetadataUtil.getFormatWithMetadata(
+              track.type, format, udtaMetadata, mdtaMetadata, gaplessInfoHolder);
       mp4Track.trackOutput.format(format);
 
       durationUs =
@@ -716,24 +716,37 @@ public final class Mp4Extractor implements Extractor, SeekMap {
     return false;
   }
 
-  /**
-   * Returns whether the extractor should decode a leaf atom with type {@code atom}.
-   */
+  /** Returns whether the extractor should decode a leaf atom with type {@code atom}. */
   private static boolean shouldParseLeafAtom(int atom) {
-    return atom == Atom.TYPE_mdhd || atom == Atom.TYPE_mvhd || atom == Atom.TYPE_hdlr
-        || atom == Atom.TYPE_stsd || atom == Atom.TYPE_stts || atom == Atom.TYPE_stss
-        || atom == Atom.TYPE_ctts || atom == Atom.TYPE_elst || atom == Atom.TYPE_stsc
-        || atom == Atom.TYPE_stsz || atom == Atom.TYPE_stz2 || atom == Atom.TYPE_stco
-        || atom == Atom.TYPE_co64 || atom == Atom.TYPE_tkhd || atom == Atom.TYPE_ftyp
-        || atom == Atom.TYPE_udta;
+    return atom == Atom.TYPE_mdhd
+        || atom == Atom.TYPE_mvhd
+        || atom == Atom.TYPE_hdlr
+        || atom == Atom.TYPE_stsd
+        || atom == Atom.TYPE_stts
+        || atom == Atom.TYPE_stss
+        || atom == Atom.TYPE_ctts
+        || atom == Atom.TYPE_elst
+        || atom == Atom.TYPE_stsc
+        || atom == Atom.TYPE_stsz
+        || atom == Atom.TYPE_stz2
+        || atom == Atom.TYPE_stco
+        || atom == Atom.TYPE_co64
+        || atom == Atom.TYPE_tkhd
+        || atom == Atom.TYPE_ftyp
+        || atom == Atom.TYPE_udta
+        || atom == Atom.TYPE_keys
+        || atom == Atom.TYPE_ilst;
   }
 
-  /**
-   * Returns whether the extractor should decode a container atom with type {@code atom}.
-   */
+  /** Returns whether the extractor should decode a container atom with type {@code atom}. */
   private static boolean shouldParseContainerAtom(int atom) {
-    return atom == Atom.TYPE_moov || atom == Atom.TYPE_trak || atom == Atom.TYPE_mdia
-        || atom == Atom.TYPE_minf || atom == Atom.TYPE_stbl || atom == Atom.TYPE_edts;
+    return atom == Atom.TYPE_moov
+        || atom == Atom.TYPE_trak
+        || atom == Atom.TYPE_mdia
+        || atom == Atom.TYPE_minf
+        || atom == Atom.TYPE_stbl
+        || atom == Atom.TYPE_edts
+        || atom == Atom.TYPE_meta;
   }
 
   private static final class Mp4Track {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntryTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntryTest.java
new file mode 100644
index 0000000000..2f81836540
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntryTest.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.extractor.mp4;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.os.Parcel;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Test for {@link MdtaMetadataEntry}. */
+@RunWith(RobolectricTestRunner.class)
+public final class MdtaMetadataEntryTest {
+
+  @Test
+  public void testParcelable() {
+    MdtaMetadataEntry mdtaMetadataEntryToParcel =
+        new MdtaMetadataEntry("test", new byte[] {1, 2}, 3, 4);
+
+    Parcel parcel = Parcel.obtain();
+    mdtaMetadataEntryToParcel.writeToParcel(parcel, 0);
+    parcel.setDataPosition(0);
+
+    MdtaMetadataEntry mdtaMetadataEntryFromParcel =
+        MdtaMetadataEntry.CREATOR.createFromParcel(parcel);
+    assertThat(mdtaMetadataEntryFromParcel).isEqualTo(mdtaMetadataEntryToParcel);
+
+    parcel.recycle();
+  }
+}

From 5efbcb4443e17f948a04d5f002f5fde1a452120a Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 4 Jan 2019 09:51:01 +0000
Subject: [PATCH 357/832] Fix nullness issue

PiperOrigin-RevId: 227822937
---
 .../android/exoplayer2/extractor/mp4/MdtaMetadataEntry.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntry.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntry.java
index 517a0a51d5..b458a8f0f4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntry.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntry.java
@@ -19,6 +19,7 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.metadata.Metadata;
+import com.google.android.exoplayer2.util.Util;
 import java.util.Arrays;
 
 /**
@@ -45,7 +46,7 @@ public final class MdtaMetadataEntry implements Metadata.Entry {
   }
 
   private MdtaMetadataEntry(Parcel in) {
-    key = in.readString();
+    key = Util.castNonNull(in.readString());
     value = new byte[in.readInt()];
     in.readByteArray(value);
     localeIndicator = in.readInt();

From 14027bc98e1c569d889361d14586edfae087a162 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 4 Jan 2019 15:07:13 +0000
Subject: [PATCH 358/832] Treat AVERROR_INVALIDDATA as non-fatal

Also configure the FFmpeg context to ignore errors as far as possible (this
appears to have an effect only for certain decoders).

Issue: #5293
PiperOrigin-RevId: 227851397
---
 RELEASENOTES.md                                    |  2 ++
 .../exoplayer2/ext/ffmpeg/FfmpegDecoder.java       | 14 ++++++++++++--
 extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc       | 10 ++++++++--
 .../audio/SimpleDecoderAudioRenderer.java          |  5 ++++-
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index d0eb94d00a..71affdd420 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -33,6 +33,8 @@
   * Clear ads loader listeners on release
     ([#4114](https://github.com/google/ExoPlayer/issues/4114)).
   * Require setting the `Player` on `AdsLoader` instances before playback.
+* FFmpeg extension: Treat invalid data errors as non-fatal to match the behavior
+  of MediaCodec ([#5293](https://github.com/google/ExoPlayer/issues/5293)).
 * Fix issue where sending callbacks for playlist changes may cause problems
   because of parallel player access
   ([#5240](https://github.com/google/ExoPlayer/issues/5240)).
diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoder.java b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoder.java
index 6f3c623f3f..c5b76002fa 100644
--- a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoder.java
+++ b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoder.java
@@ -37,6 +37,10 @@ import java.util.List;
   private static final int OUTPUT_BUFFER_SIZE_16BIT = 65536;
   private static final int OUTPUT_BUFFER_SIZE_32BIT = OUTPUT_BUFFER_SIZE_16BIT * 2;
 
+  // Error codes matching ffmpeg_jni.cc.
+  private static final int DECODER_ERROR_INVALID_DATA = -1;
+  private static final int DECODER_ERROR_OTHER = -2;
+
   private final String codecName;
   private final @Nullable byte[] extraData;
   private final @C.Encoding int encoding;
@@ -106,8 +110,14 @@ import java.util.List;
     int inputSize = inputData.limit();
     ByteBuffer outputData = outputBuffer.init(inputBuffer.timeUs, outputBufferSize);
     int result = ffmpegDecode(nativeContext, inputData, inputSize, outputData, outputBufferSize);
-    if (result < 0) {
-      return new FfmpegDecoderException("Error decoding (see logcat). Code: " + result);
+    if (result == DECODER_ERROR_INVALID_DATA) {
+      // Treat invalid data errors as non-fatal to match the behavior of MediaCodec. No output will
+      // be produced for this buffer, so mark it as decode-only to ensure that the audio sink's
+      // position is reset when more audio is produced.
+      outputBuffer.setFlags(C.BUFFER_FLAG_DECODE_ONLY);
+      return null;
+    } else if (result == DECODER_ERROR_OTHER) {
+      return new FfmpegDecoderException("Error decoding (see logcat).");
     }
     if (!hasOutputFormat) {
       channelCount = ffmpegGetChannelCount(nativeContext);
diff --git a/extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc b/extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc
index 87579ebb9a..dcd4560e4a 100644
--- a/extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc
+++ b/extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc
@@ -63,6 +63,10 @@ static const AVSampleFormat OUTPUT_FORMAT_PCM_16BIT = AV_SAMPLE_FMT_S16;
 // Output format corresponding to AudioFormat.ENCODING_PCM_FLOAT.
 static const AVSampleFormat OUTPUT_FORMAT_PCM_FLOAT = AV_SAMPLE_FMT_FLT;
 
+// Error codes matching FfmpegDecoder.java.
+static const int DECODER_ERROR_INVALID_DATA = -1;
+static const int DECODER_ERROR_OTHER = -2;
+
 /**
  * Returns the AVCodec with the specified name, or NULL if it is not available.
  */
@@ -79,7 +83,7 @@ AVCodecContext *createContext(JNIEnv *env, AVCodec *codec, jbyteArray extraData,
 
 /**
  * Decodes the packet into the output buffer, returning the number of bytes
- * written, or a negative value in the case of an error.
+ * written, or a negative DECODER_ERROR constant value in the case of an error.
  */
 int decodePacket(AVCodecContext *context, AVPacket *packet,
                  uint8_t *outputBuffer, int outputSize);
@@ -238,6 +242,7 @@ AVCodecContext *createContext(JNIEnv *env, AVCodec *codec, jbyteArray extraData,
     context->channels = rawChannelCount;
     context->channel_layout = av_get_default_channel_layout(rawChannelCount);
   }
+  context->err_recognition = AV_EF_IGNORE_ERR;
   int result = avcodec_open2(context, codec, NULL);
   if (result < 0) {
     logError("avcodec_open2", result);
@@ -254,7 +259,8 @@ int decodePacket(AVCodecContext *context, AVPacket *packet,
   result = avcodec_send_packet(context, packet);
   if (result) {
     logError("avcodec_send_packet", result);
-    return result;
+    return result == AVERROR_INVALIDDATA ? DECODER_ERROR_INVALID_DATA
+                                         : DECODER_ERROR_OTHER;
   }
 
   // Dequeue output data until it runs out.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
index 287cae9d41..bfd7bbc165 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
@@ -366,7 +366,10 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
       if (outputBuffer == null) {
         return false;
       }
-      decoderCounters.skippedOutputBufferCount += outputBuffer.skippedOutputBufferCount;
+      if (outputBuffer.skippedOutputBufferCount > 0) {
+        decoderCounters.skippedOutputBufferCount += outputBuffer.skippedOutputBufferCount;
+        audioSink.handleDiscontinuity();
+      }
     }
 
     if (outputBuffer.isEndOfStream()) {

From 0afd9b0d23e2633740d101184db31a4d186ee9cd Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 4 Jan 2019 16:42:40 +0000
Subject: [PATCH 359/832] Update FakeAd overrides

These are part of published IMA SDK 3.10.2.

PiperOrigin-RevId: 227861713
---
 .../java/com/google/android/exoplayer2/ext/ima/FakeAd.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeAd.java b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeAd.java
index b626a08780..59dfc6473c 100644
--- a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeAd.java
+++ b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeAd.java
@@ -64,14 +64,17 @@ import java.util.Set;
         };
   }
 
+  @Override
   public int getVastMediaWidth() {
     throw new UnsupportedOperationException();
   }
 
+  @Override
   public int getVastMediaHeight() {
     throw new UnsupportedOperationException();
   }
 
+  @Override
   public int getVastMediaBitrate() {
     throw new UnsupportedOperationException();
   }

From 682879755561df4a428ea67bd7bafa337d451d91 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 4 Jan 2019 17:55:49 +0000
Subject: [PATCH 360/832] Pass Handler together with Runnable callbacks for
 playlist commands.

We currently either use the app thread returned by the player or the thread
the commands are called on depending on whether the media source is already
prepared or not.

This change lets the application decide which callback thread to use. As a
side effect, we also don't longer need access the player instance passed to
MediaSource.prepare.

PiperOrigin-RevId: 227871111
---
 RELEASENOTES.md                               |   2 +
 .../source/ConcatenatingMediaSource.java      | 308 +++++++++++-------
 .../source/ConcatenatingMediaSourceTest.java  |  34 +-
 3 files changed, 208 insertions(+), 136 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 71affdd420..63941ebf81 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -38,6 +38,8 @@
 * Fix issue where sending callbacks for playlist changes may cause problems
   because of parallel player access
   ([#5240](https://github.com/google/ExoPlayer/issues/5240)).
+* Add `Handler` parameter to `ConcatenatingMediaSource` methods which take a
+  callback `Runnable`.
 
 ### 2.9.3 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
index 38b8739b7e..16fbf67cd6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.source;
 
 import android.os.Handler;
 import android.os.Message;
+import android.support.annotation.GuardedBy;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.Pair;
@@ -28,6 +29,7 @@ import com.google.android.exoplayer2.source.ShuffleOrder.DefaultShuffleOrder;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.upstream.TransferListener;
 import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.EventDispatcher;
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -53,22 +55,21 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
   private static final int MSG_NOTIFY_LISTENER = 4;
   private static final int MSG_ON_COMPLETION = 5;
 
-  // Accessed on the app thread.
+  // Accessed on any thread.
   private final List<MediaSourceHolder> mediaSourcesPublic;
+  @Nullable private Handler playbackThreadHandler;
 
-  // Accessed on the playback thread.
+  // Accessed on the playback thread only.
   private final List<MediaSourceHolder> mediaSourceHolders;
   private final Map<MediaPeriod, MediaSourceHolder> mediaSourceByMediaPeriod;
   private final Map<Object, MediaSourceHolder> mediaSourceByUid;
-  private final List<Runnable> pendingOnCompletionActions;
   private final boolean isAtomic;
   private final boolean useLazyPreparation;
   private final Timeline.Window window;
   private final Timeline.Period period;
 
-  @Nullable private Handler playbackThreadHandler;
-  @Nullable private Handler applicationThreadHandler;
   private boolean listenerNotificationScheduled;
+  private EventDispatcher<Runnable> pendingOnCompletionActions;
   private ShuffleOrder shuffleOrder;
   private int windowCount;
   private int periodCount;
@@ -127,7 +128,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
     this.mediaSourceByUid = new HashMap<>();
     this.mediaSourcesPublic = new ArrayList<>();
     this.mediaSourceHolders = new ArrayList<>();
-    this.pendingOnCompletionActions = new ArrayList<>();
+    this.pendingOnCompletionActions = new EventDispatcher<>();
     this.isAtomic = isAtomic;
     this.useLazyPreparation = useLazyPreparation;
     window = new Timeline.Window();
@@ -141,19 +142,20 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
    * @param mediaSource The {@link MediaSource} to be added to the list.
    */
   public final synchronized void addMediaSource(MediaSource mediaSource) {
-    addMediaSource(mediaSourcesPublic.size(), mediaSource, null);
+    addMediaSource(mediaSourcesPublic.size(), mediaSource);
   }
 
   /**
    * Appends a {@link MediaSource} to the playlist and executes a custom action on completion.
    *
    * @param mediaSource The {@link MediaSource} to be added to the list.
+   * @param handler The {@link Handler} to run {@code actionOnCompletion}.
    * @param actionOnCompletion A {@link Runnable} which is executed immediately after the media
    *     source has been added to the playlist.
    */
   public final synchronized void addMediaSource(
-      MediaSource mediaSource, @Nullable Runnable actionOnCompletion) {
-    addMediaSource(mediaSourcesPublic.size(), mediaSource, actionOnCompletion);
+      MediaSource mediaSource, Handler handler, Runnable actionOnCompletion) {
+    addMediaSource(mediaSourcesPublic.size(), mediaSource, handler, actionOnCompletion);
   }
 
   /**
@@ -164,7 +166,11 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
    * @param mediaSource The {@link MediaSource} to be added to the list.
    */
   public final synchronized void addMediaSource(int index, MediaSource mediaSource) {
-    addMediaSource(index, mediaSource, null);
+    addPublicMediaSources(
+        index,
+        Collections.singletonList(mediaSource),
+        /* handler= */ null,
+        /* actionOnCompletion= */ null);
   }
 
   /**
@@ -173,12 +179,14 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
    * @param index The index at which the new {@link MediaSource} will be inserted. This index must
    *     be in the range of 0 &lt;= index &lt;= {@link #getSize()}.
    * @param mediaSource The {@link MediaSource} to be added to the list.
+   * @param handler The {@link Handler} to run {@code actionOnCompletion}.
    * @param actionOnCompletion A {@link Runnable} which is executed immediately after the media
    *     source has been added to the playlist.
    */
   public final synchronized void addMediaSource(
-      int index, MediaSource mediaSource, @Nullable Runnable actionOnCompletion) {
-    addMediaSources(index, Collections.singletonList(mediaSource), actionOnCompletion);
+      int index, MediaSource mediaSource, Handler handler, Runnable actionOnCompletion) {
+    addPublicMediaSources(
+        index, Collections.singletonList(mediaSource), handler, actionOnCompletion);
   }
 
   /**
@@ -188,7 +196,11 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
    *     sources are added in the order in which they appear in this collection.
    */
   public final synchronized void addMediaSources(Collection<MediaSource> mediaSources) {
-    addMediaSources(mediaSourcesPublic.size(), mediaSources, null);
+    addPublicMediaSources(
+        mediaSourcesPublic.size(),
+        mediaSources,
+        /* handler= */ null,
+        /* actionOnCompletion= */ null);
   }
 
   /**
@@ -197,12 +209,13 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
    *
    * @param mediaSources A collection of {@link MediaSource}s to be added to the list. The media
    *     sources are added in the order in which they appear in this collection.
+   * @param handler The {@link Handler} to run {@code actionOnCompletion}.
    * @param actionOnCompletion A {@link Runnable} which is executed immediately after the media
    *     sources have been added to the playlist.
    */
   public final synchronized void addMediaSources(
-      Collection<MediaSource> mediaSources, @Nullable Runnable actionOnCompletion) {
-    addMediaSources(mediaSourcesPublic.size(), mediaSources, actionOnCompletion);
+      Collection<MediaSource> mediaSources, Handler handler, Runnable actionOnCompletion) {
+    addPublicMediaSources(mediaSourcesPublic.size(), mediaSources, handler, actionOnCompletion);
   }
 
   /**
@@ -214,7 +227,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
    *     sources are added in the order in which they appear in this collection.
    */
   public final synchronized void addMediaSources(int index, Collection<MediaSource> mediaSources) {
-    addMediaSources(index, mediaSources, null);
+    addPublicMediaSources(index, mediaSources, /* handler= */ null, /* actionOnCompletion= */ null);
   }
 
   /**
@@ -224,26 +237,16 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
    *     be in the range of 0 &lt;= index &lt;= {@link #getSize()}.
    * @param mediaSources A collection of {@link MediaSource}s to be added to the list. The media
    *     sources are added in the order in which they appear in this collection.
+   * @param handler The {@link Handler} to run {@code actionOnCompletion}.
    * @param actionOnCompletion A {@link Runnable} which is executed immediately after the media
    *     sources have been added to the playlist.
    */
   public final synchronized void addMediaSources(
-      int index, Collection<MediaSource> mediaSources, @Nullable Runnable actionOnCompletion) {
-    for (MediaSource mediaSource : mediaSources) {
-      Assertions.checkNotNull(mediaSource);
-    }
-    List<MediaSourceHolder> mediaSourceHolders = new ArrayList<>(mediaSources.size());
-    for (MediaSource mediaSource : mediaSources) {
-      mediaSourceHolders.add(new MediaSourceHolder(mediaSource));
-    }
-    mediaSourcesPublic.addAll(index, mediaSourceHolders);
-    if (playbackThreadHandler != null && !mediaSources.isEmpty()) {
-      playbackThreadHandler
-          .obtainMessage(MSG_ADD, new MessageData<>(index, mediaSourceHolders, actionOnCompletion))
-          .sendToTarget();
-    } else if (actionOnCompletion != null) {
-      actionOnCompletion.run();
-    }
+      int index,
+      Collection<MediaSource> mediaSources,
+      Handler handler,
+      Runnable actionOnCompletion) {
+    addPublicMediaSources(index, mediaSources, handler, actionOnCompletion);
   }
 
   /**
@@ -259,26 +262,27 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
    *     range of 0 &lt;= index &lt; {@link #getSize()}.
    */
   public final synchronized void removeMediaSource(int index) {
-    removeMediaSource(index, null);
+    removePublicMediaSources(index, index + 1, /* handler= */ null, /* actionOnCompletion= */ null);
   }
 
   /**
    * Removes a {@link MediaSource} from the playlist and executes a custom action on completion.
    *
    * <p>Note: If you want to move the instance, it's preferable to use {@link #moveMediaSource(int,
-   * int, Runnable)} instead.
+   * int, Handler, Runnable)} instead.
    *
    * <p>Note: If you want to remove a set of contiguous sources, it's preferable to use {@link
-   * #removeMediaSourceRange(int, int, Runnable)} instead.
+   * #removeMediaSourceRange(int, int, Handler, Runnable)} instead.
    *
    * @param index The index at which the media source will be removed. This index must be in the
    *     range of 0 &lt;= index &lt; {@link #getSize()}.
+   * @param handler The {@link Handler} to run {@code actionOnCompletion}.
    * @param actionOnCompletion A {@link Runnable} which is executed immediately after the media
    *     source has been removed from the playlist.
    */
   public final synchronized void removeMediaSource(
-      int index, @Nullable Runnable actionOnCompletion) {
-    removeMediaSourceRange(index, index + 1, actionOnCompletion);
+      int index, Handler handler, Runnable actionOnCompletion) {
+    removePublicMediaSources(index, index + 1, handler, actionOnCompletion);
   }
 
   /**
@@ -296,7 +300,8 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
    *     {@code toIndex} &gt; {@link #getSize()}, {@code fromIndex} &gt; {@code toIndex}
    */
   public final synchronized void removeMediaSourceRange(int fromIndex, int toIndex) {
-    removeMediaSourceRange(fromIndex, toIndex, null);
+    removePublicMediaSources(
+        fromIndex, toIndex, /* handler= */ null, /* actionOnCompletion= */ null);
   }
 
   /**
@@ -310,27 +315,15 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
    *     removed. This index must be in the range of 0 &lt;= index &lt;= {@link #getSize()}.
    * @param toIndex The final range index, pointing to the first media source that will be left
    *     untouched. This index must be in the range of 0 &lt;= index &lt;= {@link #getSize()}.
+   * @param handler The {@link Handler} to run {@code actionOnCompletion}.
    * @param actionOnCompletion A {@link Runnable} which is executed immediately after the media
    *     source range has been removed from the playlist.
    * @throws IllegalArgumentException When the range is malformed, i.e. {@code fromIndex} &lt; 0,
    *     {@code toIndex} &gt; {@link #getSize()}, {@code fromIndex} &gt; {@code toIndex}
    */
   public final synchronized void removeMediaSourceRange(
-      int fromIndex, int toIndex, @Nullable Runnable actionOnCompletion) {
-    Util.removeRange(mediaSourcesPublic, fromIndex, toIndex);
-    if (fromIndex == toIndex) {
-      if (actionOnCompletion != null) {
-        actionOnCompletion.run();
-      }
-      return;
-    }
-    if (playbackThreadHandler != null) {
-      playbackThreadHandler
-          .obtainMessage(MSG_REMOVE, new MessageData<>(fromIndex, toIndex, actionOnCompletion))
-          .sendToTarget();
-    } else if (actionOnCompletion != null) {
-      actionOnCompletion.run();
-    }
+      int fromIndex, int toIndex, Handler handler, Runnable actionOnCompletion) {
+    removePublicMediaSources(fromIndex, toIndex, handler, actionOnCompletion);
   }
 
   /**
@@ -342,7 +335,8 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
    *     range of 0 &lt;= index &lt; {@link #getSize()}.
    */
   public final synchronized void moveMediaSource(int currentIndex, int newIndex) {
-    moveMediaSource(currentIndex, newIndex, null);
+    movePublicMediaSource(
+        currentIndex, newIndex, /* handler= */ null, /* actionOnCompletion= */ null);
   }
 
   /**
@@ -353,40 +347,29 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
    *     in the range of 0 &lt;= index &lt; {@link #getSize()}.
    * @param newIndex The target index of the media source in the playlist. This index must be in the
    *     range of 0 &lt;= index &lt; {@link #getSize()}.
+   * @param handler The {@link Handler} to run {@code actionOnCompletion}.
    * @param actionOnCompletion A {@link Runnable} which is executed immediately after the media
    *     source has been moved.
    */
   public final synchronized void moveMediaSource(
-      int currentIndex, int newIndex, @Nullable Runnable actionOnCompletion) {
-    if (currentIndex == newIndex) {
-      if (actionOnCompletion != null) {
-        actionOnCompletion.run();
-      }
-      return;
-    }
-    mediaSourcesPublic.add(newIndex, mediaSourcesPublic.remove(currentIndex));
-    if (playbackThreadHandler != null) {
-      playbackThreadHandler
-          .obtainMessage(MSG_MOVE, new MessageData<>(currentIndex, newIndex, actionOnCompletion))
-          .sendToTarget();
-    } else if (actionOnCompletion != null) {
-      actionOnCompletion.run();
-    }
+      int currentIndex, int newIndex, Handler handler, Runnable actionOnCompletion) {
+    movePublicMediaSource(currentIndex, newIndex, handler, actionOnCompletion);
   }
 
   /** Clears the playlist. */
   public final synchronized void clear() {
-    clear(/* actionOnCompletion= */ null);
+    removeMediaSourceRange(0, getSize());
   }
 
   /**
    * Clears the playlist and executes a custom action on completion.
    *
+   * @param handler The {@link Handler} to run {@code actionOnCompletion}.
    * @param actionOnCompletion A {@link Runnable} which is executed immediately after the playlist
    *     has been cleared.
    */
-  public final synchronized void clear(@Nullable Runnable actionOnCompletion) {
-    removeMediaSourceRange(0, getSize(), actionOnCompletion);
+  public final synchronized void clear(Handler handler, Runnable actionOnCompletion) {
+    removeMediaSourceRange(0, getSize(), handler, actionOnCompletion);
   }
 
   /** Returns the number of media sources in the playlist. */
@@ -410,41 +393,24 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
    * @param shuffleOrder A {@link ShuffleOrder}.
    */
   public final synchronized void setShuffleOrder(ShuffleOrder shuffleOrder) {
-    setShuffleOrder(shuffleOrder, /* actionOnCompletion= */ null);
+    setPublicShuffleOrder(shuffleOrder, /* handler= */ null, /* actionOnCompletion= */ null);
   }
 
   /**
    * Sets a new shuffle order to use when shuffling the child media sources.
    *
    * @param shuffleOrder A {@link ShuffleOrder}.
+   * @param handler The {@link Handler} to run {@code actionOnCompletion}.
    * @param actionOnCompletion A {@link Runnable} which is executed immediately after the shuffle
    *     order has been changed.
    */
   public final synchronized void setShuffleOrder(
-      ShuffleOrder shuffleOrder, @Nullable Runnable actionOnCompletion) {
-    Handler playbackThreadHandler = this.playbackThreadHandler;
-    if (playbackThreadHandler != null) {
-      int size = getSize();
-      if (shuffleOrder.getLength() != size) {
-        shuffleOrder =
-            shuffleOrder
-                .cloneAndClear()
-                .cloneAndInsert(/* insertionIndex= */ 0, /* insertionCount= */ size);
-      }
-      playbackThreadHandler
-          .obtainMessage(
-              MSG_SET_SHUFFLE_ORDER,
-              new MessageData<>(/* index= */ 0, shuffleOrder, actionOnCompletion))
-          .sendToTarget();
-    } else {
-      this.shuffleOrder =
-          shuffleOrder.getLength() > 0 ? shuffleOrder.cloneAndClear() : shuffleOrder;
-      if (actionOnCompletion != null) {
-        actionOnCompletion.run();
-      }
-    }
+      ShuffleOrder shuffleOrder, Handler handler, Runnable actionOnCompletion) {
+    setPublicShuffleOrder(shuffleOrder, handler, actionOnCompletion);
   }
 
+  // CompositeMediaSource implementation.
+
   @Override
   @Nullable
   public Object getTag() {
@@ -458,13 +424,12 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
       @Nullable TransferListener mediaTransferListener) {
     super.prepareSourceInternal(player, isTopLevelSource, mediaTransferListener);
     playbackThreadHandler = new Handler(/* callback= */ this::handleMessage);
-    applicationThreadHandler = new Handler(player.getApplicationLooper());
     if (mediaSourcesPublic.isEmpty()) {
       notifyListener();
     } else {
       shuffleOrder = shuffleOrder.cloneAndInsert(0, mediaSourcesPublic.size());
       addMediaSourcesInternal(0, mediaSourcesPublic);
-      scheduleListenerNotification(/* actionOnCompletion= */ null);
+      scheduleListenerNotification();
     }
   }
 
@@ -507,12 +472,11 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
   }
 
   @Override
-  public final void releaseSourceInternal() {
+  public final synchronized void releaseSourceInternal() {
     super.releaseSourceInternal();
     mediaSourceHolders.clear();
     mediaSourceByUid.clear();
     playbackThreadHandler = null;
-    applicationThreadHandler = null;
     shuffleOrder = shuffleOrder.cloneAndClear();
     windowCount = 0;
     periodCount = 0;
@@ -548,6 +512,98 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
     return windowIndex + mediaSourceHolder.firstWindowIndexInChild;
   }
 
+  // Internal methods. Called from any thread.
+
+  @GuardedBy("this")
+  private void addPublicMediaSources(
+      int index,
+      Collection<MediaSource> mediaSources,
+      @Nullable Handler handler,
+      @Nullable Runnable actionOnCompletion) {
+    Assertions.checkArgument((handler == null) == (actionOnCompletion == null));
+    for (MediaSource mediaSource : mediaSources) {
+      Assertions.checkNotNull(mediaSource);
+    }
+    List<MediaSourceHolder> mediaSourceHolders = new ArrayList<>(mediaSources.size());
+    for (MediaSource mediaSource : mediaSources) {
+      mediaSourceHolders.add(new MediaSourceHolder(mediaSource));
+    }
+    mediaSourcesPublic.addAll(index, mediaSourceHolders);
+    if (playbackThreadHandler != null && !mediaSources.isEmpty()) {
+      playbackThreadHandler
+          .obtainMessage(
+              MSG_ADD, new MessageData<>(index, mediaSourceHolders, handler, actionOnCompletion))
+          .sendToTarget();
+    } else if (actionOnCompletion != null && handler != null) {
+      handler.post(actionOnCompletion);
+    }
+  }
+
+  @GuardedBy("this")
+  private void removePublicMediaSources(
+      int fromIndex,
+      int toIndex,
+      @Nullable Handler handler,
+      @Nullable Runnable actionOnCompletion) {
+    Assertions.checkArgument((handler == null) == (actionOnCompletion == null));
+    Util.removeRange(mediaSourcesPublic, fromIndex, toIndex);
+    if (playbackThreadHandler != null) {
+      playbackThreadHandler
+          .obtainMessage(
+              MSG_REMOVE, new MessageData<>(fromIndex, toIndex, handler, actionOnCompletion))
+          .sendToTarget();
+    } else if (actionOnCompletion != null && handler != null) {
+      handler.post(actionOnCompletion);
+    }
+  }
+
+  @GuardedBy("this")
+  private void movePublicMediaSource(
+      int currentIndex,
+      int newIndex,
+      @Nullable Handler handler,
+      @Nullable Runnable actionOnCompletion) {
+    Assertions.checkArgument((handler == null) == (actionOnCompletion == null));
+    mediaSourcesPublic.add(newIndex, mediaSourcesPublic.remove(currentIndex));
+    if (playbackThreadHandler != null) {
+      playbackThreadHandler
+          .obtainMessage(
+              MSG_MOVE, new MessageData<>(currentIndex, newIndex, handler, actionOnCompletion))
+          .sendToTarget();
+    } else if (actionOnCompletion != null && handler != null) {
+      handler.post(actionOnCompletion);
+    }
+  }
+
+  @GuardedBy("this")
+  private void setPublicShuffleOrder(
+      ShuffleOrder shuffleOrder, @Nullable Handler handler, @Nullable Runnable actionOnCompletion) {
+    Assertions.checkArgument((handler == null) == (actionOnCompletion == null));
+    Handler playbackThreadHandler = this.playbackThreadHandler;
+    if (playbackThreadHandler != null) {
+      int size = getSize();
+      if (shuffleOrder.getLength() != size) {
+        shuffleOrder =
+            shuffleOrder
+                .cloneAndClear()
+                .cloneAndInsert(/* insertionIndex= */ 0, /* insertionCount= */ size);
+      }
+      playbackThreadHandler
+          .obtainMessage(
+              MSG_SET_SHUFFLE_ORDER,
+              new MessageData<>(/* index= */ 0, shuffleOrder, handler, actionOnCompletion))
+          .sendToTarget();
+    } else {
+      this.shuffleOrder =
+          shuffleOrder.getLength() > 0 ? shuffleOrder.cloneAndClear() : shuffleOrder;
+      if (actionOnCompletion != null && handler != null) {
+        handler.post(actionOnCompletion);
+      }
+    }
+  }
+
+  // Internal methods. Called on the playback thread.
+
   @SuppressWarnings("unchecked")
   private boolean handleMessage(Message msg) {
     if (playbackThreadHandler == null) {
@@ -560,7 +616,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
             (MessageData<Collection<MediaSourceHolder>>) Util.castNonNull(msg.obj);
         shuffleOrder = shuffleOrder.cloneAndInsert(addMessage.index, addMessage.customData.size());
         addMediaSourcesInternal(addMessage.index, addMessage.customData);
-        scheduleListenerNotification(addMessage.actionOnCompletion);
+        scheduleListenerNotification(addMessage.handler, addMessage.actionOnCompletion);
         break;
       case MSG_REMOVE:
         MessageData<Integer> removeMessage = (MessageData<Integer>) Util.castNonNull(msg.obj);
@@ -574,30 +630,29 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
         for (int index = toIndex - 1; index >= fromIndex; index--) {
           removeMediaSourceInternal(index);
         }
-        scheduleListenerNotification(removeMessage.actionOnCompletion);
+        scheduleListenerNotification(removeMessage.handler, removeMessage.actionOnCompletion);
         break;
       case MSG_MOVE:
         MessageData<Integer> moveMessage = (MessageData<Integer>) Util.castNonNull(msg.obj);
         shuffleOrder = shuffleOrder.cloneAndRemove(moveMessage.index, moveMessage.index + 1);
         shuffleOrder = shuffleOrder.cloneAndInsert(moveMessage.customData, 1);
         moveMediaSourceInternal(moveMessage.index, moveMessage.customData);
-        scheduleListenerNotification(moveMessage.actionOnCompletion);
+        scheduleListenerNotification(moveMessage.handler, moveMessage.actionOnCompletion);
         break;
       case MSG_SET_SHUFFLE_ORDER:
         MessageData<ShuffleOrder> shuffleOrderMessage =
             (MessageData<ShuffleOrder>) Util.castNonNull(msg.obj);
         shuffleOrder = shuffleOrderMessage.customData;
-        scheduleListenerNotification(shuffleOrderMessage.actionOnCompletion);
+        scheduleListenerNotification(
+            shuffleOrderMessage.handler, shuffleOrderMessage.actionOnCompletion);
         break;
       case MSG_NOTIFY_LISTENER:
         notifyListener();
         break;
       case MSG_ON_COMPLETION:
-        List<Runnable> actionsOnCompletion = (List<Runnable>) Util.castNonNull(msg.obj);
-        Handler handler = Assertions.checkNotNull(applicationThreadHandler);
-        for (int i = 0; i < actionsOnCompletion.size(); i++) {
-          handler.post(actionsOnCompletion.get(i));
-        }
+        EventDispatcher<Runnable> actionsOnCompletion =
+            (EventDispatcher<Runnable>) Util.castNonNull(msg.obj);
+        actionsOnCompletion.dispatch(Runnable::run);
         break;
       default:
         throw new IllegalStateException();
@@ -605,34 +660,34 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
     return true;
   }
 
-  private void scheduleListenerNotification(@Nullable Runnable actionOnCompletion) {
+  private void scheduleListenerNotification() {
+    scheduleListenerNotification(/* handler= */ null, /* actionOnCompletion= */ null);
+  }
+
+  private void scheduleListenerNotification(
+      @Nullable Handler handler, @Nullable Runnable actionOnCompletion) {
     if (!listenerNotificationScheduled) {
       Assertions.checkNotNull(playbackThreadHandler)
           .obtainMessage(MSG_NOTIFY_LISTENER)
           .sendToTarget();
       listenerNotificationScheduled = true;
     }
-    if (actionOnCompletion != null) {
-      pendingOnCompletionActions.add(actionOnCompletion);
+    if (actionOnCompletion != null && handler != null) {
+      pendingOnCompletionActions.addListener(handler, actionOnCompletion);
     }
   }
 
   private void notifyListener() {
     listenerNotificationScheduled = false;
-    List<Runnable> actionsOnCompletion =
-        pendingOnCompletionActions.isEmpty()
-            ? Collections.emptyList()
-            : new ArrayList<>(pendingOnCompletionActions);
-    pendingOnCompletionActions.clear();
+    EventDispatcher<Runnable> actionsOnCompletion = pendingOnCompletionActions;
+    pendingOnCompletionActions = new EventDispatcher<>();
     refreshSourceInfo(
         new ConcatenatedTimeline(
             mediaSourceHolders, windowCount, periodCount, shuffleOrder, isAtomic),
         /* manifest= */ null);
-    if (!actionsOnCompletion.isEmpty()) {
-      Assertions.checkNotNull(playbackThreadHandler)
-          .obtainMessage(MSG_ON_COMPLETION, actionsOnCompletion)
-          .sendToTarget();
-    }
+    Assertions.checkNotNull(playbackThreadHandler)
+        .obtainMessage(MSG_ON_COMPLETION, actionsOnCompletion)
+        .sendToTarget();
   }
 
   private void addMediaSourcesInternal(
@@ -730,7 +785,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
       }
     }
     mediaSourceHolder.isPrepared = true;
-    scheduleListenerNotification(/* actionOnCompletion= */ null);
+    scheduleListenerNotification();
   }
 
   private void removeMediaSourceInternal(int index) {
@@ -843,12 +898,15 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
 
     public final int index;
     public final T customData;
-    public final @Nullable Runnable actionOnCompletion;
+    @Nullable public final Handler handler;
+    @Nullable public final Runnable actionOnCompletion;
 
-    public MessageData(int index, T customData, @Nullable Runnable actionOnCompletion) {
+    public MessageData(
+        int index, T customData, @Nullable Handler handler, @Nullable Runnable actionOnCompletion) {
       this.index = index;
-      this.actionOnCompletion = actionOnCompletion;
       this.customData = customData;
+      this.handler = handler;
+      this.actionOnCompletion = actionOnCompletion;
     }
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
index dd1221f160..bb86c6186d 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.fail;
 import static org.mockito.Mockito.verify;
 
 import android.os.ConditionVariable;
+import android.os.Handler;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
@@ -417,7 +418,7 @@ public final class ConcatenatingMediaSourceTest {
   public void testCustomCallbackBeforePreparationAddSingle() {
     Runnable runnable = Mockito.mock(Runnable.class);
 
-    mediaSource.addMediaSource(createFakeMediaSource(), runnable);
+    mediaSource.addMediaSource(createFakeMediaSource(), new Handler(), runnable);
     verify(runnable).run();
   }
 
@@ -427,6 +428,7 @@ public final class ConcatenatingMediaSourceTest {
 
     mediaSource.addMediaSources(
         Arrays.asList(new MediaSource[] {createFakeMediaSource(), createFakeMediaSource()}),
+        new Handler(),
         runnable);
     verify(runnable).run();
   }
@@ -435,7 +437,7 @@ public final class ConcatenatingMediaSourceTest {
   public void testCustomCallbackBeforePreparationAddSingleWithIndex() {
     Runnable runnable = Mockito.mock(Runnable.class);
 
-    mediaSource.addMediaSource(/* index */ 0, createFakeMediaSource(), runnable);
+    mediaSource.addMediaSource(/* index */ 0, createFakeMediaSource(), new Handler(), runnable);
     verify(runnable).run();
   }
 
@@ -446,6 +448,7 @@ public final class ConcatenatingMediaSourceTest {
     mediaSource.addMediaSources(
         /* index */ 0,
         Arrays.asList(new MediaSource[] {createFakeMediaSource(), createFakeMediaSource()}),
+        new Handler(),
         runnable);
     verify(runnable).run();
   }
@@ -455,7 +458,7 @@ public final class ConcatenatingMediaSourceTest {
     Runnable runnable = Mockito.mock(Runnable.class);
 
     mediaSource.addMediaSource(createFakeMediaSource());
-    mediaSource.removeMediaSource(/* index */ 0, runnable);
+    mediaSource.removeMediaSource(/* index */ 0, new Handler(), runnable);
     verify(runnable).run();
   }
 
@@ -465,7 +468,7 @@ public final class ConcatenatingMediaSourceTest {
 
     mediaSource.addMediaSources(
         Arrays.asList(new MediaSource[] {createFakeMediaSource(), createFakeMediaSource()}));
-    mediaSource.moveMediaSource(/* fromIndex */ 1, /* toIndex */ 0, runnable);
+    mediaSource.moveMediaSource(/* fromIndex */ 1, /* toIndex */ 0, new Handler(), runnable);
     verify(runnable).run();
   }
 
@@ -476,7 +479,8 @@ public final class ConcatenatingMediaSourceTest {
       testRunner.prepareSource();
       final TimelineGrabber timelineGrabber = new TimelineGrabber(testRunner);
       dummyMainThread.runOnMainThread(
-          () -> mediaSource.addMediaSource(createFakeMediaSource(), timelineGrabber));
+          () ->
+              mediaSource.addMediaSource(createFakeMediaSource(), new Handler(), timelineGrabber));
       Timeline timeline = timelineGrabber.assertTimelineChangeBlocking();
       assertThat(timeline.getWindowCount()).isEqualTo(1);
     } finally {
@@ -495,6 +499,7 @@ public final class ConcatenatingMediaSourceTest {
               mediaSource.addMediaSources(
                   Arrays.asList(
                       new MediaSource[] {createFakeMediaSource(), createFakeMediaSource()}),
+                  new Handler(),
                   timelineGrabber));
       Timeline timeline = timelineGrabber.assertTimelineChangeBlocking();
       assertThat(timeline.getWindowCount()).isEqualTo(2);
@@ -511,7 +516,8 @@ public final class ConcatenatingMediaSourceTest {
       final TimelineGrabber timelineGrabber = new TimelineGrabber(testRunner);
       dummyMainThread.runOnMainThread(
           () ->
-              mediaSource.addMediaSource(/* index */ 0, createFakeMediaSource(), timelineGrabber));
+              mediaSource.addMediaSource(
+                  /* index */ 0, createFakeMediaSource(), new Handler(), timelineGrabber));
       Timeline timeline = timelineGrabber.assertTimelineChangeBlocking();
       assertThat(timeline.getWindowCount()).isEqualTo(1);
     } finally {
@@ -531,6 +537,7 @@ public final class ConcatenatingMediaSourceTest {
                   /* index */ 0,
                   Arrays.asList(
                       new MediaSource[] {createFakeMediaSource(), createFakeMediaSource()}),
+                  new Handler(),
                   timelineGrabber));
       Timeline timeline = timelineGrabber.assertTimelineChangeBlocking();
       assertThat(timeline.getWindowCount()).isEqualTo(2);
@@ -549,7 +556,7 @@ public final class ConcatenatingMediaSourceTest {
 
       final TimelineGrabber timelineGrabber = new TimelineGrabber(testRunner);
       dummyMainThread.runOnMainThread(
-          () -> mediaSource.removeMediaSource(/* index */ 0, timelineGrabber));
+          () -> mediaSource.removeMediaSource(/* index */ 0, new Handler(), timelineGrabber));
       Timeline timeline = timelineGrabber.assertTimelineChangeBlocking();
       assertThat(timeline.getWindowCount()).isEqualTo(0);
     } finally {
@@ -571,7 +578,9 @@ public final class ConcatenatingMediaSourceTest {
 
       final TimelineGrabber timelineGrabber = new TimelineGrabber(testRunner);
       dummyMainThread.runOnMainThread(
-          () -> mediaSource.moveMediaSource(/* fromIndex */ 1, /* toIndex */ 0, timelineGrabber));
+          () ->
+              mediaSource.moveMediaSource(
+                  /* fromIndex */ 1, /* toIndex */ 0, new Handler(), timelineGrabber));
       Timeline timeline = timelineGrabber.assertTimelineChangeBlocking();
       assertThat(timeline.getWindowCount()).isEqualTo(2);
     } finally {
@@ -819,7 +828,7 @@ public final class ConcatenatingMediaSourceTest {
     testRunner.prepareSource();
     final TimelineGrabber timelineGrabber = new TimelineGrabber(testRunner);
 
-    dummyMainThread.runOnMainThread(() -> mediaSource.clear(timelineGrabber));
+    dummyMainThread.runOnMainThread(() -> mediaSource.clear(new Handler(), timelineGrabber));
 
     Timeline timeline = timelineGrabber.assertTimelineChangeBlocking();
     assertThat(timeline.isEmpty()).isTrue();
@@ -965,7 +974,8 @@ public final class ConcatenatingMediaSourceTest {
   @Test
   public void testCustomCallbackBeforePreparationSetShuffleOrder() throws Exception {
     Runnable runnable = Mockito.mock(Runnable.class);
-    mediaSource.setShuffleOrder(new ShuffleOrder.UnshuffledShuffleOrder(/* length= */ 0), runnable);
+    mediaSource.setShuffleOrder(
+        new ShuffleOrder.UnshuffledShuffleOrder(/* length= */ 0), new Handler(), runnable);
 
     verify(runnable).run();
   }
@@ -981,7 +991,9 @@ public final class ConcatenatingMediaSourceTest {
       dummyMainThread.runOnMainThread(
           () ->
               mediaSource.setShuffleOrder(
-                  new ShuffleOrder.UnshuffledShuffleOrder(/* length= */ 3), timelineGrabber));
+                  new ShuffleOrder.UnshuffledShuffleOrder(/* length= */ 3),
+                  new Handler(),
+                  timelineGrabber));
       Timeline timeline = timelineGrabber.assertTimelineChangeBlocking();
       assertThat(timeline.getFirstWindowIndex(/* shuffleModeEnabled= */ true)).isEqualTo(0);
     } finally {

From e8a7cb25460aa91bf2471a8a839908ebdb984608 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 4 Jan 2019 17:56:10 +0000
Subject: [PATCH 361/832] Remove player and isTopLevelSource parameters from
 MediaSource.prepare.

They are not longer needed anywhere, are error-prone (because of threading
requirements), and complicate testing and using MediaSources without a player.

PiperOrigin-RevId: 227871157
---
 RELEASENOTES.md                               |  1 +
 .../exoplayer2/ext/ima/ImaAdsMediaSource.java | 12 ++---
 .../android/exoplayer2/ExoPlayerImpl.java     |  1 -
 .../exoplayer2/ExoPlayerImplInternal.java     |  9 +---
 .../exoplayer2/source/BaseMediaSource.java    | 30 +++++------
 .../source/ClippingMediaSource.java           |  8 +--
 .../source/CompositeMediaSource.java          | 15 +-----
 .../source/ConcatenatingMediaSource.java      | 10 +---
 .../source/ExtractorMediaSource.java          |  6 +--
 .../exoplayer2/source/LoopingMediaSource.java |  7 +--
 .../exoplayer2/source/MediaSource.java        | 21 +++-----
 .../exoplayer2/source/MergingMediaSource.java |  8 +--
 .../source/SingleSampleMediaSource.java       |  6 +--
 .../exoplayer2/source/ads/AdsMediaSource.java | 10 ++--
 .../android/exoplayer2/ExoPlayerTest.java     |  4 +-
 .../source/dash/DashMediaSource.java          |  6 +--
 .../exoplayer2/source/hls/HlsMediaSource.java |  6 +--
 .../source/smoothstreaming/SsMediaSource.java |  6 +--
 .../exoplayer2/testutil/FakeMediaSource.java  |  6 +--
 .../testutil/MediaSourceTestRunner.java       | 51 +------------------
 20 files changed, 46 insertions(+), 177 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 63941ebf81..1634b8de74 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -40,6 +40,7 @@
   ([#5240](https://github.com/google/ExoPlayer/issues/5240)).
 * Add `Handler` parameter to `ConcatenatingMediaSource` methods which take a
   callback `Runnable`.
+* Remove `player` and `isTopLevelSource` parameters from `MediaSource.prepare`.
 
 ### 2.9.3 ###
 
diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java
index 85042c4354..574bac5d35 100644
--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java
+++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java
@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.ext.ima;
 import android.os.Handler;
 import android.support.annotation.Nullable;
 import android.view.ViewGroup;
-import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.source.BaseMediaSource;
 import com.google.android.exoplayer2.source.MediaPeriod;
@@ -33,7 +32,8 @@ import java.io.IOException;
 /**
  * A {@link MediaSource} that inserts ads linearly with a provided content media source.
  *
- * @deprecated Use com.google.android.exoplayer2.source.ads.AdsMediaSource with ImaAdsLoader.
+ * @deprecated Use {@link com.google.android.exoplayer2.source.ads.AdsMediaSource} with
+ *     ImaAdsLoader.
  */
 @Deprecated
 public final class ImaAdsMediaSource extends BaseMediaSource implements SourceInfoRefreshListener {
@@ -83,12 +83,8 @@ public final class ImaAdsMediaSource extends BaseMediaSource implements SourceIn
   }
 
   @Override
-  public void prepareSourceInternal(
-      final ExoPlayer player,
-      boolean isTopLevelSource,
-      @Nullable TransferListener mediaTransferListener) {
-    adsMediaSource.prepareSource(
-        player, isTopLevelSource, /* listener= */ this, mediaTransferListener);
+  public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
+    adsMediaSource.prepareSource(/* listener= */ this, mediaTransferListener);
   }
 
   @Override
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index 05a80279a3..8736417362 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -139,7 +139,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
             repeatMode,
             shuffleModeEnabled,
             eventHandler,
-            this,
             clock);
     internalPlayerHandler = new Handler(internalPlayer.getPlaybackLooper());
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index 2a161b79bd..b4549362f3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -95,7 +95,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
   private final HandlerWrapper handler;
   private final HandlerThread internalPlaybackThread;
   private final Handler eventHandler;
-  private final ExoPlayer player;
   private final Timeline.Window window;
   private final Timeline.Period period;
   private final long backBufferDurationUs;
@@ -134,7 +133,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
       @Player.RepeatMode int repeatMode,
       boolean shuffleModeEnabled,
       Handler eventHandler,
-      ExoPlayer player,
       Clock clock) {
     this.renderers = renderers;
     this.trackSelector = trackSelector;
@@ -145,7 +143,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
     this.repeatMode = repeatMode;
     this.shuffleModeEnabled = shuffleModeEnabled;
     this.eventHandler = eventHandler;
-    this.player = player;
     this.clock = clock;
     this.queue = new MediaPeriodQueue();
 
@@ -441,11 +438,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
     loadControl.onPrepared();
     this.mediaSource = mediaSource;
     setState(Player.STATE_BUFFERING);
-    mediaSource.prepareSource(
-        player,
-        /* isTopLevelSource= */ true,
-        /* listener= */ this,
-        bandwidthMeter.getTransferListener());
+    mediaSource.prepareSource(/* listener= */ this, bandwidthMeter.getTransferListener());
     handler.sendEmptyMessage(MSG_DO_SOME_WORK);
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/BaseMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/BaseMediaSource.java
index 3d6e204c9c..189467b47e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/BaseMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/BaseMediaSource.java
@@ -16,8 +16,8 @@
 package com.google.android.exoplayer2.source;
 
 import android.os.Handler;
+import android.os.Looper;
 import android.support.annotation.Nullable;
-import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.upstream.TransferListener;
 import com.google.android.exoplayer2.util.Assertions;
@@ -35,9 +35,9 @@ public abstract class BaseMediaSource implements MediaSource {
   private final ArrayList<SourceInfoRefreshListener> sourceInfoListeners;
   private final MediaSourceEventListener.EventDispatcher eventDispatcher;
 
-  private @Nullable ExoPlayer player;
-  private @Nullable Timeline timeline;
-  private @Nullable Object manifest;
+  @Nullable private Looper looper;
+  @Nullable private Timeline timeline;
+  @Nullable private Object manifest;
 
   public BaseMediaSource() {
     sourceInfoListeners = new ArrayList<>(/* initialCapacity= */ 1);
@@ -48,21 +48,16 @@ public abstract class BaseMediaSource implements MediaSource {
    * Starts source preparation. This method is called at most once until the next call to {@link
    * #releaseSourceInternal()}.
    *
-   * @param player The player for which this source is being prepared.
-   * @param isTopLevelSource Whether this source has been passed directly to {@link
-   *     ExoPlayer#prepare(MediaSource)} or {@link ExoPlayer#prepare(MediaSource, boolean,
-   *     boolean)}.
    * @param mediaTransferListener The transfer listener which should be informed of any media data
    *     transfers. May be null if no listener is available. Note that this listener should usually
    *     be only informed of transfers related to the media loads and not of auxiliary loads for
    *     manifests and other data.
    */
-  protected abstract void prepareSourceInternal(
-      ExoPlayer player, boolean isTopLevelSource, @Nullable TransferListener mediaTransferListener);
+  protected abstract void prepareSourceInternal(@Nullable TransferListener mediaTransferListener);
 
   /**
    * Releases the source. This method is called exactly once after each call to {@link
-   * #prepareSourceInternal(ExoPlayer, boolean, TransferListener)}.
+   * #prepareSourceInternal(TransferListener)}.
    */
   protected abstract void releaseSourceInternal();
 
@@ -135,15 +130,14 @@ public abstract class BaseMediaSource implements MediaSource {
 
   @Override
   public final void prepareSource(
-      ExoPlayer player,
-      boolean isTopLevelSource,
       SourceInfoRefreshListener listener,
       @Nullable TransferListener mediaTransferListener) {
-    Assertions.checkArgument(this.player == null || this.player == player);
+    Looper looper = Looper.myLooper();
+    Assertions.checkArgument(this.looper == null || this.looper == looper);
     sourceInfoListeners.add(listener);
-    if (this.player == null) {
-      this.player = player;
-      prepareSourceInternal(player, isTopLevelSource, mediaTransferListener);
+    if (this.looper == null) {
+      this.looper = looper;
+      prepareSourceInternal(mediaTransferListener);
     } else if (timeline != null) {
       listener.onSourceInfoRefreshed(/* source= */ this, timeline, manifest);
     }
@@ -153,7 +147,7 @@ public abstract class BaseMediaSource implements MediaSource {
   public final void releaseSource(SourceInfoRefreshListener listener) {
     sourceInfoListeners.remove(listener);
     if (sourceInfoListeners.isEmpty()) {
-      player = null;
+      looper = null;
       timeline = null;
       manifest = null;
       releaseSourceInternal();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
index 1dbb41dfb0..0ab6eeae18 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.source;
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.upstream.TransferListener;
@@ -193,11 +192,8 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> {
   }
 
   @Override
-  public void prepareSourceInternal(
-      ExoPlayer player,
-      boolean isTopLevelSource,
-      @Nullable TransferListener mediaTransferListener) {
-    super.prepareSourceInternal(player, isTopLevelSource, mediaTransferListener);
+  public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
+    super.prepareSourceInternal(mediaTransferListener);
     prepareChildSource(/* id= */ null, mediaSource);
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/CompositeMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/CompositeMediaSource.java
index 69fa4b094b..dbf5812f98 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/CompositeMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/CompositeMediaSource.java
@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.source;
 import android.os.Handler;
 import android.support.annotation.CallSuper;
 import android.support.annotation.Nullable;
-import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.upstream.TransferListener;
 import com.google.android.exoplayer2.util.Assertions;
@@ -35,7 +34,6 @@ public abstract class CompositeMediaSource<T> extends BaseMediaSource {
 
   private final HashMap<T, MediaSourceAndListener> childSources;
 
-  private @Nullable ExoPlayer player;
   private @Nullable Handler eventHandler;
   private @Nullable TransferListener mediaTransferListener;
 
@@ -46,11 +44,7 @@ public abstract class CompositeMediaSource<T> extends BaseMediaSource {
 
   @Override
   @CallSuper
-  public void prepareSourceInternal(
-      ExoPlayer player,
-      boolean isTopLevelSource,
-      @Nullable TransferListener mediaTransferListener) {
-    this.player = player;
+  public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
     this.mediaTransferListener = mediaTransferListener;
     eventHandler = new Handler();
   }
@@ -71,7 +65,6 @@ public abstract class CompositeMediaSource<T> extends BaseMediaSource {
       childSource.mediaSource.removeEventListener(childSource.eventListener);
     }
     childSources.clear();
-    player = null;
   }
 
   /**
@@ -105,11 +98,7 @@ public abstract class CompositeMediaSource<T> extends BaseMediaSource {
     MediaSourceEventListener eventListener = new ForwardingEventListener(id);
     childSources.put(id, new MediaSourceAndListener(mediaSource, sourceListener, eventListener));
     mediaSource.addEventListener(Assertions.checkNotNull(eventHandler), eventListener);
-    mediaSource.prepareSource(
-        Assertions.checkNotNull(player),
-        /* isTopLevelSource= */ false,
-        sourceListener,
-        mediaTransferListener);
+    mediaSource.prepareSource(sourceListener, mediaTransferListener);
   }
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
index 16fbf67cd6..db52a87ef8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
@@ -22,7 +22,6 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.Pair;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.source.ConcatenatingMediaSource.MediaSourceHolder;
 import com.google.android.exoplayer2.source.ShuffleOrder.DefaultShuffleOrder;
@@ -419,10 +418,8 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
 
   @Override
   public final synchronized void prepareSourceInternal(
-      ExoPlayer player,
-      boolean isTopLevelSource,
       @Nullable TransferListener mediaTransferListener) {
-    super.prepareSourceInternal(player, isTopLevelSource, mediaTransferListener);
+    super.prepareSourceInternal(mediaTransferListener);
     playbackThreadHandler = new Handler(/* callback= */ this::handleMessage);
     if (mediaSourcesPublic.isEmpty()) {
       notifyListener();
@@ -1126,10 +1123,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
   private static final class DummyMediaSource extends BaseMediaSource {
 
     @Override
-    protected void prepareSourceInternal(
-        ExoPlayer player,
-        boolean isTopLevelSource,
-        @Nullable TransferListener mediaTransferListener) {
+    protected void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
       // Do nothing.
     }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
index 085b5dba71..86f00ff099 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
@@ -19,7 +19,6 @@ import android.net.Uri;
 import android.os.Handler;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
 import com.google.android.exoplayer2.extractor.Extractor;
@@ -365,10 +364,7 @@ public final class ExtractorMediaSource extends BaseMediaSource
   }
 
   @Override
-  public void prepareSourceInternal(
-      ExoPlayer player,
-      boolean isTopLevelSource,
-      @Nullable TransferListener mediaTransferListener) {
+  public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
     transferListener = mediaTransferListener;
     notifySourceInfoRefreshed(timelineDurationUs, /* isSeekable= */ false);
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java
index cac15d5ed9..3cd4ea1dab 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java
@@ -71,11 +71,8 @@ public final class LoopingMediaSource extends CompositeMediaSource<Void> {
   }
 
   @Override
-  public void prepareSourceInternal(
-      ExoPlayer player,
-      boolean isTopLevelSource,
-      @Nullable TransferListener mediaTransferListener) {
-    super.prepareSourceInternal(player, isTopLevelSource, mediaTransferListener);
+  public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
+    super.prepareSourceInternal(mediaTransferListener);
     prepareChildSource(/* id= */ null, childSource);
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
index 21f4f20922..2d80fb7f13 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
@@ -18,30 +18,30 @@ package com.google.android.exoplayer2.source;
 import android.os.Handler;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.upstream.TransferListener;
 import java.io.IOException;
 
 /**
- * Defines and provides media to be played by an {@link ExoPlayer}. A MediaSource has two main
- * responsibilities:
+ * Defines and provides media to be played by an {@link com.google.android.exoplayer2.ExoPlayer}. A
+ * MediaSource has two main responsibilities:
  *
  * <ul>
  *   <li>To provide the player with a {@link Timeline} defining the structure of its media, and to
  *       provide a new timeline whenever the structure of the media changes. The MediaSource
  *       provides these timelines by calling {@link SourceInfoRefreshListener#onSourceInfoRefreshed}
- *       on the {@link SourceInfoRefreshListener}s passed to {@link #prepareSource(ExoPlayer,
- *       boolean, SourceInfoRefreshListener, TransferListener)}.
+ *       on the {@link SourceInfoRefreshListener}s passed to {@link
+ *       #prepareSource(SourceInfoRefreshListener, TransferListener)}.
  *   <li>To provide {@link MediaPeriod} instances for the periods in its timeline. MediaPeriods are
  *       obtained by calling {@link #createPeriod(MediaPeriodId, Allocator)}, and provide a way for
  *       the player to load and read the media.
  * </ul>
  *
  * All methods are called on the player's internal playback thread, as described in the {@link
- * ExoPlayer} Javadoc. They should not be called directly from application code. Instances can be
- * re-used, but only for one {@link ExoPlayer} instance simultaneously.
+ * com.google.android.exoplayer2.ExoPlayer} Javadoc. They should not be called directly from
+ * application code. Instances can be re-used, but only for one {@link
+ * com.google.android.exoplayer2.ExoPlayer} instance simultaneously.
  */
 public interface MediaSource {
 
@@ -236,11 +236,6 @@ public interface MediaSource {
    * <p>For each call to this method, a call to {@link #releaseSource(SourceInfoRefreshListener)} is
    * needed to remove the listener and to release the source if no longer required.
    *
-   * @param player The player for which this source is being prepared.
-   * @param isTopLevelSource Whether this source has been passed directly to {@link
-   *     ExoPlayer#prepare(MediaSource)} or {@link ExoPlayer#prepare(MediaSource, boolean,
-   *     boolean)}. If {@code false}, this source is being prepared by another source (e.g. {@link
-   *     ConcatenatingMediaSource}) for composition.
    * @param listener The listener to be added.
    * @param mediaTransferListener The transfer listener which should be informed of any media data
    *     transfers. May be null if no listener is available. Note that this listener should be only
@@ -248,8 +243,6 @@ public interface MediaSource {
    *     and other data.
    */
   void prepareSource(
-      ExoPlayer player,
-      boolean isTopLevelSource,
       SourceInfoRefreshListener listener,
       @Nullable TransferListener mediaTransferListener);
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java
index 573e97cb13..fdeb2b6184 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java
@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.source;
 
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
-import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.upstream.TransferListener;
@@ -105,11 +104,8 @@ public final class MergingMediaSource extends CompositeMediaSource<Integer> {
   }
 
   @Override
-  public void prepareSourceInternal(
-      ExoPlayer player,
-      boolean isTopLevelSource,
-      @Nullable TransferListener mediaTransferListener) {
-    super.prepareSourceInternal(player, isTopLevelSource, mediaTransferListener);
+  public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
+    super.prepareSourceInternal(mediaTransferListener);
     for (int i = 0; i < mediaSources.length; i++) {
       prepareChildSource(i, mediaSources[i]);
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
index 966938262e..358875eb1e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.source;
 import android.net.Uri;
 import android.os.Handler;
 import android.support.annotation.Nullable;
-import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.upstream.Allocator;
@@ -303,10 +302,7 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
   }
 
   @Override
-  public void prepareSourceInternal(
-      ExoPlayer player,
-      boolean isTopLevelSource,
-      @Nullable TransferListener mediaTransferListener) {
+  public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
     transferListener = mediaTransferListener;
     refreshSourceInfo(timeline, /* manifest= */ null);
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
index 6061b014a7..663f9c64fc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
@@ -22,7 +22,6 @@ import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.source.CompositeMediaSource;
 import com.google.android.exoplayer2.source.DeferredMediaPeriod;
@@ -326,12 +325,9 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
   }
 
   @Override
-  public void prepareSourceInternal(
-      final ExoPlayer player,
-      boolean isTopLevelSource,
-      @Nullable TransferListener mediaTransferListener) {
-    super.prepareSourceInternal(player, isTopLevelSource, mediaTransferListener);
-    final ComponentListener componentListener = new ComponentListener();
+  public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
+    super.prepareSourceInternal(mediaTransferListener);
+    ComponentListener componentListener = new ComponentListener();
     this.componentListener = componentListener;
     prepareChildSource(DUMMY_CONTENT_MEDIA_PERIOD_ID, contentMediaSource);
     mainHandler.post(() -> adsLoader.start(componentListener, adUiViewGroup));
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
index 1502809f17..f957ac104c 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
@@ -267,10 +267,8 @@ public final class ExoPlayerTest {
         new FakeMediaSource(timeline, new Object(), Builder.VIDEO_FORMAT) {
           @Override
           public synchronized void prepareSourceInternal(
-              ExoPlayer player,
-              boolean isTopLevelSource,
               @Nullable TransferListener mediaTransferListener) {
-            super.prepareSourceInternal(player, isTopLevelSource, mediaTransferListener);
+            super.prepareSourceInternal(mediaTransferListener);
             // We've queued a source info refresh on the playback thread's event queue. Allow the
             // test thread to prepare the player with the third source, and block this thread (the
             // playback thread) until the test thread's call to prepare() has returned.
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
index c5ce70cfd3..b31b770b03 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
@@ -22,7 +22,6 @@ import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.SparseArray;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.Timeline;
@@ -637,10 +636,7 @@ public final class DashMediaSource extends BaseMediaSource {
   }
 
   @Override
-  public void prepareSourceInternal(
-      ExoPlayer player,
-      boolean isTopLevelSource,
-      @Nullable TransferListener mediaTransferListener) {
+  public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
     this.mediaTransferListener = mediaTransferListener;
     if (sideloadedManifest) {
       processManifest(false);
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
index 20374fad69..8058460b9f 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
@@ -19,7 +19,6 @@ import android.net.Uri;
 import android.os.Handler;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.offline.StreamKey;
@@ -417,10 +416,7 @@ public final class HlsMediaSource extends BaseMediaSource
   }
 
   @Override
-  public void prepareSourceInternal(
-      ExoPlayer player,
-      boolean isTopLevelSource,
-      @Nullable TransferListener mediaTransferListener) {
+  public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
     this.mediaTransferListener = mediaTransferListener;
     EventDispatcher eventDispatcher = createEventDispatcher(/* mediaPeriodId= */ null);
     playlistTracker.start(manifestUri, eventDispatcher, /* listener= */ this);
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
index 1923c4b08a..39f707b09c 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
@@ -20,7 +20,6 @@ import android.os.Handler;
 import android.os.SystemClock;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.Timeline;
@@ -533,10 +532,7 @@ public final class SsMediaSource extends BaseMediaSource
   }
 
   @Override
-  public void prepareSourceInternal(
-      ExoPlayer player,
-      boolean isTopLevelSource,
-      @Nullable TransferListener mediaTransferListener) {
+  public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
     this.mediaTransferListener = mediaTransferListener;
     if (sideloadedManifest) {
       manifestLoaderErrorThrower = new LoaderErrorThrower.Dummy();
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
index 1f0c0c1a40..8165eebaea 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
@@ -22,7 +22,6 @@ import android.os.Handler;
 import android.os.SystemClock;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.Timeline.Period;
@@ -96,10 +95,7 @@ public class FakeMediaSource extends BaseMediaSource {
   }
 
   @Override
-  public synchronized void prepareSourceInternal(
-      ExoPlayer player,
-      boolean isTopLevelSource,
-      @Nullable TransferListener mediaTransferListener) {
+  public synchronized void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
     assertThat(preparedSource).isFalse();
     transferListener = mediaTransferListener;
     preparedSource = true;
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaSourceTestRunner.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaSourceTestRunner.java
index 70e7669dfb..5de1ab87b6 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaSourceTestRunner.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaSourceTestRunner.java
@@ -17,17 +17,13 @@ package com.google.android.exoplayer2.testutil;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
-import static org.junit.Assert.fail;
 
 import android.os.ConditionVariable;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
-import android.os.Message;
 import android.support.annotation.Nullable;
 import android.util.Pair;
-import com.google.android.exoplayer2.ExoPlaybackException;
-import com.google.android.exoplayer2.PlayerMessage;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.source.MediaPeriod;
 import com.google.android.exoplayer2.source.MediaSource;
@@ -54,7 +50,6 @@ public class MediaSourceTestRunner {
 
   public static final int TIMEOUT_MS = 10000;
 
-  private final StubExoPlayer player;
   private final MediaSource mediaSource;
   private final MediaSourceListener mediaSourceListener;
   private final HandlerThread playbackThread;
@@ -79,7 +74,6 @@ public class MediaSourceTestRunner {
     playbackThread.start();
     Looper playbackLooper = playbackThread.getLooper();
     playbackHandler = new Handler(playbackLooper);
-    player = new EventHandlingExoPlayer(playbackLooper);
     mediaSourceListener = new MediaSourceListener();
     timelines = new LinkedBlockingDeque<>();
     completedLoads = new CopyOnWriteArrayList<>();
@@ -121,11 +115,7 @@ public class MediaSourceTestRunner {
     final IOException[] prepareError = new IOException[1];
     runOnPlaybackThread(
         () -> {
-          mediaSource.prepareSource(
-              player,
-              /* isTopLevelSource= */ true,
-              mediaSourceListener,
-              /* mediaTransferListener= */ null);
+          mediaSource.prepareSource(mediaSourceListener, /* mediaTransferListener= */ null);
           try {
             // TODO: This only catches errors that are set synchronously in prepareSource. To
             // capture async errors we'll need to poll maybeThrowSourceInfoRefreshError until the
@@ -417,43 +407,4 @@ public class MediaSourceTestRunner {
       Assertions.checkState(Looper.myLooper() == playbackThread.getLooper());
     }
   }
-
-  private static class EventHandlingExoPlayer extends StubExoPlayer
-      implements Handler.Callback, PlayerMessage.Sender {
-
-    private final Handler handler;
-
-    public EventHandlingExoPlayer(Looper looper) {
-      this.handler = new Handler(looper, this);
-    }
-
-    @Override
-    public Looper getApplicationLooper() {
-      return handler.getLooper();
-    }
-
-    @Override
-    public PlayerMessage createMessage(PlayerMessage.Target target) {
-      return new PlayerMessage(
-          /* sender= */ this, target, Timeline.EMPTY, /* defaultWindowIndex= */ 0, handler);
-    }
-
-    @Override
-    public void sendMessage(PlayerMessage message) {
-      handler.obtainMessage(0, message).sendToTarget();
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public boolean handleMessage(Message msg) {
-      PlayerMessage message = (PlayerMessage) msg.obj;
-      try {
-        message.getTarget().handleMessage(message.getType(), message.getPayload());
-        message.markAsProcessed(/* isDelivered= */ true);
-      } catch (ExoPlaybackException e) {
-        fail("Unexpected ExoPlaybackException.");
-      }
-      return true;
-    }
-  }
 }

From 147deafd01e18621cb5221132f0e39598ceeb186 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Mon, 7 Jan 2019 12:36:59 +0000
Subject: [PATCH 362/832] Increase search size in mp4 sniffing once moov has
 been found

Issue:#5320
PiperOrigin-RevId: 228142567
---
 .../exoplayer2/extractor/mp4/Sniffer.java     | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java
index 657a955ab4..a1c90bf1f2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java
@@ -27,9 +27,7 @@ import java.io.IOException;
  */
 /* package */ final class Sniffer {
 
-  /**
-   * The maximum number of bytes to peek when sniffing.
-   */
+  /** The maximum number of bytes to peek when sniffing. */
   private static final int SEARCH_LENGTH = 4 * 1024;
 
   private static final int[] COMPATIBLE_BRANDS = new int[] {
@@ -112,12 +110,16 @@ import java.io.IOException;
         atomSize = buffer.readLong();
       } else if (atomSize == Atom.EXTENDS_TO_END_SIZE) {
         // The atom extends to the end of the file.
-        long endPosition = input.getLength();
-        if (endPosition != C.LENGTH_UNSET) {
-          atomSize = endPosition - input.getPeekPosition() + headerSize;
+        long fileEndPosition = input.getLength();
+        if (fileEndPosition != C.LENGTH_UNSET) {
+          atomSize = fileEndPosition - input.getPeekPosition() + headerSize;
         }
       }
 
+      if (inputLength != C.LENGTH_UNSET && bytesSearched + atomSize > inputLength) {
+        // The file is invalid because the atom extends past the end of the file.
+        return false;
+      }
       if (atomSize < headerSize) {
         // The file is invalid because the atom size is too small for its header.
         return false;
@@ -125,6 +127,13 @@ import java.io.IOException;
       bytesSearched += headerSize;
 
       if (atomType == Atom.TYPE_moov) {
+        // We have seen the moov atom. We increase the search size to make sure we don't miss an
+        // mvex atom because the moov's size exceeds the search length.
+        bytesToSearch += (int) atomSize;
+        if (inputLength != C.LENGTH_UNSET && bytesToSearch > inputLength) {
+          // Make sure we don't exceed the file size.
+          bytesToSearch = (int) inputLength;
+        }
         // Check for an mvex atom inside the moov atom to identify whether the file is fragmented.
         continue;
       }

From be69d5b747ca1f12129ac061cbb259ec45470ef8 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Mon, 7 Jan 2019 14:34:31 +0000
Subject: [PATCH 363/832] Expand check for muxed audio media tags to include
 uris that match variants

Issue:#5313
PiperOrigin-RevId: 228155222
---
 .../hls/playlist/HlsPlaylistParser.java       | 16 +++++++++++++++-
 .../playlist/HlsMasterPlaylistParserTest.java | 19 +++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
index 65f4796187..242711431c 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
@@ -360,7 +360,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
                   /* initializationData= */ null,
                   selectionFlags,
                   language);
-          if (uri == null) {
+          if (isMediaTagMuxed(variants, uri)) {
             muxedAudioFormat = format;
           } else {
             audios.add(new HlsMasterPlaylist.HlsUrl(uri, format));
@@ -766,6 +766,20 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
     return Pattern.compile(attribute + "=(" + BOOLEAN_FALSE + "|" + BOOLEAN_TRUE + ")");
   }
 
+  private static boolean isMediaTagMuxed(
+      List<HlsMasterPlaylist.HlsUrl> variants, String mediaTagUri) {
+    if (mediaTagUri == null) {
+      return true;
+    }
+    // The URI attribute is defined, but it may match the uri of a variant.
+    for (int i = 0; i < variants.size(); i++) {
+      if (mediaTagUri.equals(variants.get(i).url)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   private static class LineIterator {
 
     private final BufferedReader reader;
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
index d03049efb3..9701171ce9 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
@@ -134,6 +134,17 @@ public class HlsMasterPlaylistParserTest {
           + "#EXT-X-STREAM-INF:BANDWIDTH=65000,CODECS=\"{$codecs}\"\n"
           + "http://example.com/{$tricky}\n";
 
+  private static final String PLAYLIST_WITH_MULTIPLE_MUXED_MEDIA_TAGS =
+      "#EXTM3U\n"
+          + "#EXT-X-VERSION:3\n"
+          + "#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"a\",NAME=\"audio_0\",DEFAULT=YES,URI=\"0/0.m3u8\"\n"
+          + "#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"b\",NAME=\"audio_0\",DEFAULT=YES,URI=\"1/1.m3u8\"\n"
+          + "#EXT-X-STREAM-INF:BANDWIDTH=140800,CODECS=\"mp4a.40.2\",AUDIO=\"a\"\n"
+          + "0/0.m3u8\n"
+          + "\n"
+          + "#EXT-X-STREAM-INF:BANDWIDTH=281600,CODECS=\"mp4a.40.2\",AUDIO=\"b\"\n"
+          + "1/1.m3u8\n";
+
   @Test
   public void testParseMasterPlaylist() throws IOException {
     HlsMasterPlaylist masterPlaylist = parseMasterPlaylist(PLAYLIST_URI, PLAYLIST_SIMPLE);
@@ -271,6 +282,14 @@ public class HlsMasterPlaylistParserTest {
     assertThat(variant.url).isEqualTo("http://example.com/This/{$nested}/reference/shouldnt/work");
   }
 
+  @Test
+  public void testMultipleMuxedMediaTags() throws IOException {
+    HlsMasterPlaylist playlistWithMultipleMuxedMediaTags =
+        parseMasterPlaylist(PLAYLIST_URI, PLAYLIST_WITH_MULTIPLE_MUXED_MEDIA_TAGS);
+    assertThat(playlistWithMultipleMuxedMediaTags.variants).hasSize(2);
+    assertThat(playlistWithMultipleMuxedMediaTags.audios).isEmpty();
+  }
+
   private static HlsMasterPlaylist parseMasterPlaylist(String uri, String playlistString)
       throws IOException {
     Uri playlistUri = Uri.parse(uri);

From 8c47b02083a13617f882d27d398d6b99a5aab12a Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 7 Jan 2019 17:30:11 +0000
Subject: [PATCH 364/832] Reduce number of calls to File.length()

Calls to File.length() can be O(N) where N is the number of files
in the containing folder. This is believed to be true for at least
FAT32. Repeated calls for the same file tend to be faster,
presumably due to caching in the file system, however are still
surprisingly expensive. Hence minimizing the number of calls is
preferable.

Issue: #4253
PiperOrigin-RevId: 228179921
---
 .../exoplayer2/upstream/cache/Cache.java      |  7 +++--
 .../upstream/cache/CacheDataSink.java         |  2 +-
 .../upstream/cache/SimpleCache.java           | 28 +++++++++----------
 .../upstream/cache/SimpleCacheSpan.java       | 17 +++++++----
 .../cache/CachedContentIndexTest.java         | 22 +++++++++++----
 .../cache/CachedRegionTrackerTest.java        |  2 +-
 .../upstream/cache/SimpleCacheSpanTest.java   | 20 +++++++------
 .../upstream/cache/SimpleCacheTest.java       |  2 +-
 8 files changed, 61 insertions(+), 39 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
index f65b9b64fe..6bbe1edd1d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
@@ -141,8 +141,8 @@ public interface Cache {
    * obtains the data from some other source. The returned {@link CacheSpan} serves as a lock.
    * Whilst the caller holds the lock it may write data into the hole. It may split data into
    * multiple files. When the caller has finished writing a file it should commit it to the cache by
-   * calling {@link #commitFile(File)}. When the caller has finished writing, it must release the
-   * lock by calling {@link #releaseHoleSpan}.
+   * calling {@link #commitFile(File, long)}. When the caller has finished writing, it must release
+   * the lock by calling {@link #releaseHoleSpan}.
    *
    * @param key The key of the data being requested.
    * @param position The position of the data being requested.
@@ -182,9 +182,10 @@ public interface Cache {
    * CacheSpan} obtained from {@link #startReadWrite(String, long)}
    *
    * @param file A newly written cache file.
+   * @param length The length of the newly written cache file in bytes.
    * @throws CacheException If an error is encountered.
    */
-  void commitFile(File file) throws CacheException;
+  void commitFile(File file, long length) throws CacheException;
 
   /**
    * Releases a {@link CacheSpan} obtained from {@link #startReadWrite(String, long)} which
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
index ccec73ab35..1da2c3f636 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
@@ -219,7 +219,7 @@ public final class CacheDataSink implements DataSink {
       File fileToCommit = file;
       file = null;
       if (success) {
-        cache.commitFile(fileToCommit);
+        cache.commitFile(fileToCommit, outputStreamBytesWritten);
       } else {
         fileToCommit.delete();
       }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index 80788b5786..c1538c8b90 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -275,26 +275,24 @@ public final class SimpleCache implements Cache {
   }
 
   @Override
-  public synchronized void commitFile(File file) throws CacheException {
+  public synchronized void commitFile(File file, long length) throws CacheException {
     Assertions.checkState(!released);
-    SimpleCacheSpan span = SimpleCacheSpan.createCacheEntry(file, index);
+    if (!file.exists()) {
+      return;
+    }
+    if (length == 0) {
+      file.delete();
+      return;
+    }
+    SimpleCacheSpan span = SimpleCacheSpan.createCacheEntry(file, length, index);
     Assertions.checkState(span != null);
     CachedContent cachedContent = index.get(span.key);
     Assertions.checkNotNull(cachedContent);
     Assertions.checkState(cachedContent.isLocked());
-    // If the file doesn't exist, don't add it to the in-memory representation.
-    if (!file.exists()) {
-      return;
-    }
-    // If the file has length 0, delete it and don't add it to the in-memory representation.
-    if (file.length() == 0) {
-      file.delete();
-      return;
-    }
     // Check if the span conflicts with the set content length
-    long length = ContentMetadata.getContentLength(cachedContent.getMetadata());
-    if (length != C.LENGTH_UNSET) {
-      Assertions.checkState((span.position + span.length) <= length);
+    long contentLength = ContentMetadata.getContentLength(cachedContent.getMetadata());
+    if (contentLength != C.LENGTH_UNSET) {
+      Assertions.checkState((span.position + span.length) <= contentLength);
     }
     addSpan(span);
     index.store();
@@ -394,7 +392,7 @@ public final class SimpleCache implements Cache {
         continue;
       }
       SimpleCacheSpan span =
-          file.length() > 0 ? SimpleCacheSpan.createCacheEntry(file, index) : null;
+          file.length() > 0 ? SimpleCacheSpan.createCacheEntry(file, file.length(), index) : null;
       if (span != null) {
         addSpan(span);
       } else {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
index 82e9f03f4f..dfa553ffe4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
@@ -82,16 +82,22 @@ import java.util.regex.Pattern;
     return new SimpleCacheSpan(key, position, length, C.TIME_UNSET, null);
   }
 
+  /*
+   * Note: {@code fileLength} is equivalent to {@code file.length()}, but passing it as an explicit
+   * argument can reduce the number of calls to this method if the calling code already knows the
+   * file length. This is preferable because calling {@code file.length()} can be expensive. See:
+   * https://github.com/google/ExoPlayer/issues/4253#issuecomment-451593889.
+   */
   /**
    * Creates a cache span from an underlying cache file. Upgrades the file if necessary.
    *
    * @param file The cache file.
-   * @param index Cached content index.
+   * @param length The length of the cache file in bytes.
    * @return The span, or null if the file name is not correctly formatted, or if the id is not
    *     present in the content index.
    */
   @Nullable
-  public static SimpleCacheSpan createCacheEntry(File file, CachedContentIndex index) {
+  public static SimpleCacheSpan createCacheEntry(File file, long length, CachedContentIndex index) {
     String name = file.getName();
     if (!name.endsWith(SUFFIX)) {
       file = upgradeFile(file, index);
@@ -105,11 +111,12 @@ import java.util.regex.Pattern;
     if (!matcher.matches()) {
       return null;
     }
-    long length = file.length();
     int id = Integer.parseInt(matcher.group(1));
     String key = index.getKeyForId(id);
-    return key == null ? null : new SimpleCacheSpan(key, Long.parseLong(matcher.group(2)), length,
-        Long.parseLong(matcher.group(3)), file);
+    return key == null
+        ? null
+        : new SimpleCacheSpan(
+            key, Long.parseLong(matcher.group(2)), length, Long.parseLong(matcher.group(3)), file);
   }
 
   /**
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
index 57913f3652..e7bdb0743e 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
@@ -100,9 +100,15 @@ public class CachedContentIndexTest {
     assertThat(cachedContent1.id != cachedContent2.id).isTrue();
 
     // add a span
+    int cacheFileLength = 20;
     File cacheSpanFile =
-        SimpleCacheSpanTest.createCacheSpanFile(cacheDir, cachedContent1.id, 10, 20, 30);
-    SimpleCacheSpan span = SimpleCacheSpan.createCacheEntry(cacheSpanFile, index);
+        SimpleCacheSpanTest.createCacheSpanFile(
+            cacheDir,
+            cachedContent1.id,
+            /* offset= */ 10,
+            cacheFileLength,
+            /* lastAccessTimestamp= */ 30);
+    SimpleCacheSpan span = SimpleCacheSpan.createCacheEntry(cacheSpanFile, cacheFileLength, index);
     assertThat(span).isNotNull();
     cachedContent1.addSpan(span);
 
@@ -274,9 +280,15 @@ public class CachedContentIndexTest {
   @Test
   public void testCantRemoveNotEmptyCachedContent() throws Exception {
     CachedContent cachedContent = index.getOrAdd("key1");
-    File cacheSpanFile =
-        SimpleCacheSpanTest.createCacheSpanFile(cacheDir, cachedContent.id, 10, 20, 30);
-    SimpleCacheSpan span = SimpleCacheSpan.createCacheEntry(cacheSpanFile, index);
+    long cacheFileLength = 20;
+    File cacheFile =
+        SimpleCacheSpanTest.createCacheSpanFile(
+            cacheDir,
+            cachedContent.id,
+            /* offset= */ 10,
+            cacheFileLength,
+            /* lastAccessTimestamp= */ 30);
+    SimpleCacheSpan span = SimpleCacheSpan.createCacheEntry(cacheFile, cacheFileLength, index);
     cachedContent.addSpan(span);
 
     index.maybeRemove(cachedContent.key);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java
index f8da2b1085..cb980206fe 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java
@@ -128,7 +128,7 @@ public final class CachedRegionTrackerTest {
   private CacheSpan newCacheSpan(int position, int length) throws IOException {
     int id = index.assignIdForKey(CACHE_KEY);
     File cacheFile = createCacheSpanFile(cacheDir, id, position, length, 0);
-    return SimpleCacheSpan.createCacheEntry(cacheFile, index);
+    return SimpleCacheSpan.createCacheEntry(cacheFile, length, index);
   }
 
   public static File createCacheSpanFile(
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java
index c5d740340f..41aeb56364 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java
@@ -36,8 +36,9 @@ import org.robolectric.RuntimeEnvironment;
 @RunWith(RobolectricTestRunner.class)
 public class SimpleCacheSpanTest {
 
-  public static File createCacheSpanFile(File cacheDir, int id, long offset, int length,
-      long lastAccessTimestamp) throws IOException {
+  public static File createCacheSpanFile(
+      File cacheDir, int id, long offset, long length, long lastAccessTimestamp)
+      throws IOException {
     File cacheFile = SimpleCacheSpan.getCacheFile(cacheDir, id, offset, lastAccessTimestamp);
     createTestFile(cacheFile, length);
     return cacheFile;
@@ -87,7 +88,7 @@ public class SimpleCacheSpanTest {
     File v1File = createTestFile("abc%def.5.6.v1.exo"); // V1 did not escape
 
     for (File file : cacheDir.listFiles()) {
-      SimpleCacheSpan cacheEntry = SimpleCacheSpan.createCacheEntry(file, index);
+      SimpleCacheSpan cacheEntry = SimpleCacheSpan.createCacheEntry(file, file.length(), index);
       if (file.equals(wrongEscapedV2file)) {
         assertThat(cacheEntry).isNull();
       } else {
@@ -112,7 +113,7 @@ public class SimpleCacheSpanTest {
 
     HashMap<Long, Long> cachedPositions = new HashMap<>();
     for (File file : files) {
-      SimpleCacheSpan cacheSpan = SimpleCacheSpan.createCacheEntry(file, index);
+      SimpleCacheSpan cacheSpan = SimpleCacheSpan.createCacheEntry(file, file.length(), index);
       if (cacheSpan != null) {
         assertThat(cacheSpan.key).isEqualTo(key);
         cachedPositions.put(cacheSpan.position, cacheSpan.lastAccessTimestamp);
@@ -124,7 +125,7 @@ public class SimpleCacheSpanTest {
     assertThat(cachedPositions.get((long) 5)).isEqualTo(6);
   }
 
-  private static void createTestFile(File file, int length) throws IOException {
+  private static void createTestFile(File file, long length) throws IOException {
     FileOutputStream output = new FileOutputStream(file);
     for (int i = 0; i < length; i++) {
       output.write(i);
@@ -141,8 +142,10 @@ public class SimpleCacheSpanTest {
   private void assertCacheSpan(String key, long offset, long lastAccessTimestamp)
       throws IOException {
     int id = index.assignIdForKey(key);
-    File cacheFile = createCacheSpanFile(cacheDir, id, offset, 1, lastAccessTimestamp);
-    SimpleCacheSpan cacheSpan = SimpleCacheSpan.createCacheEntry(cacheFile, index);
+    long cacheFileLength = 1;
+    File cacheFile =
+        createCacheSpanFile(cacheDir, id, offset, cacheFileLength, lastAccessTimestamp);
+    SimpleCacheSpan cacheSpan = SimpleCacheSpan.createCacheEntry(cacheFile, cacheFileLength, index);
     String message = cacheFile.toString();
     assertWithMessage(message).that(cacheSpan).isNotNull();
     assertWithMessage(message).that(cacheFile.getParentFile()).isEqualTo(cacheDir);
@@ -156,9 +159,10 @@ public class SimpleCacheSpanTest {
 
   private void assertNullCacheSpan(File parent, String key, long offset,
       long lastAccessTimestamp) {
+    long cacheFileLength = 0;
     File cacheFile = SimpleCacheSpan.getCacheFile(parent, index.assignIdForKey(key), offset,
         lastAccessTimestamp);
-    CacheSpan cacheSpan = SimpleCacheSpan.createCacheEntry(cacheFile, index);
+    CacheSpan cacheSpan = SimpleCacheSpan.createCacheEntry(cacheFile, cacheFileLength, index);
     assertWithMessage(cacheFile.toString()).that(cacheSpan).isNull();
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
index c2b7f481fa..bdb9d4f9d9 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
@@ -377,7 +377,7 @@ public class SimpleCacheTest {
     } finally {
       fos.close();
     }
-    simpleCache.commitFile(file);
+    simpleCache.commitFile(file, length);
   }
 
   private static void assertCachedDataReadCorrect(CacheSpan cacheSpan) throws IOException {

From 194caf23e5fc00bccf8b0ea03a6b75bdd2d96a39 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 8 Jan 2019 09:36:30 +0000
Subject: [PATCH 365/832] Doc fix.

PiperOrigin-RevId: 228296962
---
 .../google/android/exoplayer2/upstream/DataSource.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java
index c759499577..ab22e18358 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java
@@ -64,11 +64,11 @@ public interface DataSource {
   long open(DataSpec dataSpec) throws IOException;
 
   /**
-   * Reads up to {@code length} bytes of data and stores them into {@code buffer}, starting at
+   * Reads up to {@code readLength} bytes of data and stores them into {@code buffer}, starting at
    * index {@code offset}.
-   * <p>
-   * If {@code length} is zero then 0 is returned. Otherwise, if no data is available because the
-   * end of the opened range has been reached, then {@link C#RESULT_END_OF_INPUT} is returned.
+   *
+   * <p>If {@code readLength} is zero then 0 is returned. Otherwise, if no data is available because
+   * the end of the opened range has been reached, then {@link C#RESULT_END_OF_INPUT} is returned.
    * Otherwise, the call will block until at least one byte of data has been read and the number of
    * bytes read is returned.
    *

From 6e127d0152b3389faa257853dbd858a188c66004 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 8 Jan 2019 11:51:15 +0000
Subject: [PATCH 366/832] SimpleCache: Scan sub-directories during
 initialization

This is the initialization part of mitigating issue #4253. The
remaining work is on the writing side, and is simply a case of
having startFile return File instances that are sharded into
sub-directories. We still need to decide what scheme we want
to use for doing that.

Issue: #4253
PiperOrigin-RevId: 228306327
---
 .../upstream/cache/SimpleCache.java           | 52 ++++++++++++-------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index c1538c8b90..80eb779e39 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -382,25 +382,9 @@ public final class SimpleCache implements Cache {
     }
 
     index.load();
-
-    File[] files = cacheDir.listFiles();
-    if (files == null) {
-      return;
-    }
-    for (File file : files) {
-      if (file.getName().equals(CachedContentIndex.FILE_NAME)) {
-        continue;
-      }
-      SimpleCacheSpan span =
-          file.length() > 0 ? SimpleCacheSpan.createCacheEntry(file, file.length(), index) : null;
-      if (span != null) {
-        addSpan(span);
-      } else {
-        file.delete();
-      }
-    }
-
+    loadDirectory(cacheDir, /* isRootDirectory= */ true);
     index.removeEmpty();
+
     try {
       index.store();
     } catch (CacheException e) {
@@ -408,6 +392,38 @@ public final class SimpleCache implements Cache {
     }
   }
 
+  private void loadDirectory(File directory, boolean isRootDirectory) {
+    File[] files = directory.listFiles();
+    if (files == null) {
+      // Not a directory.
+      return;
+    }
+    if (!isRootDirectory && files.length == 0) {
+      // Empty non-root directory.
+      directory.delete();
+      return;
+    }
+    for (File file : files) {
+      String fileName = file.getName();
+      if (fileName.indexOf('.') == -1) {
+        loadDirectory(file, /* isRootDirectory= */ false);
+      } else {
+        if (isRootDirectory && CachedContentIndex.FILE_NAME.equals(fileName)) {
+          // Skip the (expected) index file in the root directory.
+          continue;
+        }
+        long fileLength = file.length();
+        SimpleCacheSpan span =
+            fileLength > 0 ? SimpleCacheSpan.createCacheEntry(file, fileLength, index) : null;
+        if (span != null) {
+          addSpan(span);
+        } else {
+          file.delete();
+        }
+      }
+    }
+  }
+
   /**
    * Adds a cached span to the in-memory representation.
    *

From 255a34d367fbe84d5ed9d5033a1701d6775f5d7e Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 8 Jan 2019 12:38:18 +0000
Subject: [PATCH 367/832] Noop cleanup of Cea608Decoder.CueBuilder

PiperOrigin-RevId: 228309236
---
 .../exoplayer2/text/cea/Cea608Decoder.java    | 180 ++++++++----------
 1 file changed, 83 insertions(+), 97 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
index 165b45451b..03e7f2a09c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
@@ -421,7 +421,7 @@ public final class Cea608Decoder extends CeaDecoder {
     } else if (isPreambleAddressCode(cc1, cc2)) {
       handlePreambleAddressCode(cc1, cc2);
     } else if (isTabCtrlCode(cc1, cc2)) {
-      currentCueBuilder.setTab(cc2 - 0x20);
+      currentCueBuilder.tabOffset = cc2 - 0x20;
     } else if (isMiscCode(cc1, cc2)) {
       handleMiscCode(cc2);
     }
@@ -456,12 +456,12 @@ public final class Cea608Decoder extends CeaDecoder {
       row++;
     }
 
-    if (row != currentCueBuilder.getRow()) {
+    if (row != currentCueBuilder.row) {
       if (captionMode != CC_MODE_ROLL_UP && !currentCueBuilder.isEmpty()) {
         currentCueBuilder = new CueBuilder(captionMode, captionRowCount);
         cueBuilders.add(currentCueBuilder);
       }
-      currentCueBuilder.setRow(row);
+      currentCueBuilder.row = row;
     }
 
     // cc2 - 0|1|N|0|STYLE|U
@@ -475,7 +475,7 @@ public final class Cea608Decoder extends CeaDecoder {
     currentCueBuilder.setStyle(isCursor ? STYLE_UNCHANGED : cursorOrStyle, underline);
 
     if (isCursor) {
-      currentCueBuilder.setIndent(COLUMN_INDICES[cursorOrStyle]);
+      currentCueBuilder.indent = COLUMN_INDICES[cursorOrStyle];
     }
   }
 
@@ -672,6 +672,12 @@ public final class Cea608Decoder extends CeaDecoder {
       tabOffset = 0;
     }
 
+    public boolean isEmpty() {
+      return cueStyles.isEmpty()
+          && rolledUpCaptions.isEmpty()
+          && captionStringBuilder.length() == 0;
+    }
+
     public void setCaptionMode(int captionMode) {
       this.captionMode = captionMode;
     }
@@ -680,10 +686,8 @@ public final class Cea608Decoder extends CeaDecoder {
       this.captionRowCount = captionRowCount;
     }
 
-    public boolean isEmpty() {
-      return cueStyles.isEmpty()
-          && rolledUpCaptions.isEmpty()
-          && captionStringBuilder.length() == 0;
+    public void setStyle(int style, boolean underline) {
+      cueStyles.add(new CueStyle(style, underline, captionStringBuilder.length()));
     }
 
     public void backspace() {
@@ -703,16 +707,12 @@ public final class Cea608Decoder extends CeaDecoder {
       }
     }
 
-    public int getRow() {
-      return row;
-    }
-
-    public void setRow(int row) {
-      this.row = row;
+    public void append(char text) {
+      captionStringBuilder.append(text);
     }
 
     public void rollUp() {
-      rolledUpCaptions.add(buildSpannableString());
+      rolledUpCaptions.add(buildCurrentLine());
       captionStringBuilder.setLength(0);
       cueStyles.clear();
       int numRows = Math.min(captionRowCount, row);
@@ -721,23 +721,76 @@ public final class Cea608Decoder extends CeaDecoder {
       }
     }
 
-    public void setIndent(int indent) {
-      this.indent = indent;
+    public Cue build() {
+      SpannableStringBuilder cueString = new SpannableStringBuilder();
+      // Add any rolled up captions, separated by new lines.
+      for (int i = 0; i < rolledUpCaptions.size(); i++) {
+        cueString.append(rolledUpCaptions.get(i));
+        cueString.append('\n');
+      }
+      // Add the current line.
+      cueString.append(buildCurrentLine());
+
+      if (cueString.length() == 0) {
+        // The cue is empty.
+        return null;
+      }
+
+      float position;
+      int positionAnchor;
+      // The number of empty columns before the start of the text, in the range [0-31].
+      int startPadding = indent + tabOffset;
+      // The number of empty columns after the end of the text, in the same range.
+      int endPadding = SCREEN_CHARWIDTH - startPadding - cueString.length();
+      int startEndPaddingDelta = startPadding - endPadding;
+      if (captionMode == CC_MODE_POP_ON && (Math.abs(startEndPaddingDelta) < 3 || endPadding < 0)) {
+        // Treat approximately centered pop-on captions as middle aligned. We also treat captions
+        // that are wider than they should be in this way. See
+        // https://github.com/google/ExoPlayer/issues/3534.
+        position = 0.5f;
+        positionAnchor = Cue.ANCHOR_TYPE_MIDDLE;
+      } else if (captionMode == CC_MODE_POP_ON && startEndPaddingDelta > 0) {
+        // Treat pop-on captions with less padding at the end than the start as end aligned.
+        position = (float) (SCREEN_CHARWIDTH - endPadding) / SCREEN_CHARWIDTH;
+        // Adjust the position to fit within the safe area.
+        position = position * 0.8f + 0.1f;
+        positionAnchor = Cue.ANCHOR_TYPE_END;
+      } else {
+        // For all other cases assume start aligned.
+        position = (float) startPadding / SCREEN_CHARWIDTH;
+        // Adjust the position to fit within the safe area.
+        position = position * 0.8f + 0.1f;
+        positionAnchor = Cue.ANCHOR_TYPE_START;
+      }
+
+      int lineAnchor;
+      int line;
+      // Note: Row indices are in the range [1-15].
+      if (captionMode == CC_MODE_ROLL_UP || row > (BASE_ROW / 2)) {
+        lineAnchor = Cue.ANCHOR_TYPE_END;
+        line = row - BASE_ROW;
+        // Two line adjustments. The first is because line indices from the bottom of the window
+        // start from -1 rather than 0. The second is a blank row to act as the safe area.
+        line -= 2;
+      } else {
+        lineAnchor = Cue.ANCHOR_TYPE_START;
+        // Line indices from the top of the window start from 0, but we want a blank row to act as
+        // the safe area. As a result no adjustment is necessary.
+        line = row;
+      }
+
+      return new Cue(
+          cueString,
+          Alignment.ALIGN_NORMAL,
+          line,
+          Cue.LINE_TYPE_NUMBER,
+          lineAnchor,
+          position,
+          positionAnchor,
+          Cue.DIMEN_UNSET);
     }
 
-    public void setTab(int tabs) {
-      tabOffset = tabs;
-    }
-
-    public void setStyle(int style, boolean underline) {
-      cueStyles.add(new CueStyle(style, underline, captionStringBuilder.length()));
-    }
-
-    public void append(char text) {
-      captionStringBuilder.append(text);
-    }
-
-    public SpannableString buildSpannableString() {
+    private SpannableString buildCurrentLine() {
       SpannableStringBuilder builder = new SpannableStringBuilder(captionStringBuilder);
       int length = builder.length();
 
@@ -803,73 +856,6 @@ public final class Cea608Decoder extends CeaDecoder {
       return new SpannableString(builder);
     }
 
-    public Cue build() {
-      SpannableStringBuilder cueString = new SpannableStringBuilder();
-      // Add any rolled up captions, separated by new lines.
-      for (int i = 0; i < rolledUpCaptions.size(); i++) {
-        cueString.append(rolledUpCaptions.get(i));
-        cueString.append('\n');
-      }
-      // Add the current line.
-      cueString.append(buildSpannableString());
-
-      if (cueString.length() == 0) {
-        // The cue is empty.
-        return null;
-      }
-
-      float position;
-      int positionAnchor;
-      // The number of empty columns before the start of the text, in the range [0-31].
-      int startPadding = indent + tabOffset;
-      // The number of empty columns after the end of the text, in the same range.
-      int endPadding = SCREEN_CHARWIDTH - startPadding - cueString.length();
-      int startEndPaddingDelta = startPadding - endPadding;
-      if (captionMode == CC_MODE_POP_ON && (Math.abs(startEndPaddingDelta) < 3 || endPadding < 0)) {
-        // Treat approximately centered pop-on captions as middle aligned. We also treat captions
-        // that are wider than they should be in this way. See
-        // https://github.com/google/ExoPlayer/issues/3534.
-        position = 0.5f;
-        positionAnchor = Cue.ANCHOR_TYPE_MIDDLE;
-      } else if (captionMode == CC_MODE_POP_ON && startEndPaddingDelta > 0) {
-        // Treat pop-on captions with less padding at the end than the start as end aligned.
-        position = (float) (SCREEN_CHARWIDTH - endPadding) / SCREEN_CHARWIDTH;
-        // Adjust the position to fit within the safe area.
-        position = position * 0.8f + 0.1f;
-        positionAnchor = Cue.ANCHOR_TYPE_END;
-      } else {
-        // For all other cases assume start aligned.
-        position = (float) startPadding / SCREEN_CHARWIDTH;
-        // Adjust the position to fit within the safe area.
-        position = position * 0.8f + 0.1f;
-        positionAnchor = Cue.ANCHOR_TYPE_START;
-      }
-
-      int lineAnchor;
-      int line;
-      // Note: Row indices are in the range [1-15].
-      if (captionMode == CC_MODE_ROLL_UP || row > (BASE_ROW / 2)) {
-        lineAnchor = Cue.ANCHOR_TYPE_END;
-        line = row - BASE_ROW;
-        // Two line adjustments. The first is because line indices from the bottom of the window
-        // start from -1 rather than 0. The second is a blank row to act as the safe area.
-        line -= 2;
-      } else {
-        lineAnchor = Cue.ANCHOR_TYPE_START;
-        // Line indices from the top of the window start from 0, but we want a blank row to act as
-        // the safe area. As a result no adjustment is necessary.
-        line = row;
-      }
-
-      return new Cue(cueString, Alignment.ALIGN_NORMAL, line, Cue.LINE_TYPE_NUMBER, lineAnchor,
-          position, positionAnchor, Cue.DIMEN_UNSET);
-    }
-
-    @Override
-    public String toString() {
-      return captionStringBuilder.toString();
-    }
-
     private static void setUnderlineSpan(SpannableStringBuilder builder, int start, int end) {
       builder.setSpan(new UnderlineSpan(), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
     }

From 0b56a03880d715cc4d4e20fccfbe015e8b6bad35 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Tue, 8 Jan 2019 15:14:04 +0000
Subject: [PATCH 368/832] Use stop flag to prevent download start when not
 initialization/released

PiperOrigin-RevId: 228324452
---
 .../exoplayer2/offline/DownloadManager.java   | 88 +++++++++----------
 .../exoplayer2/offline/DownloadState.java     | 11 ++-
 2 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 035d3a90b0..c8c02d4980 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -25,6 +25,7 @@ import static com.google.android.exoplayer2.offline.DownloadState.STATE_REMOVED;
 import static com.google.android.exoplayer2.offline.DownloadState.STATE_REMOVING;
 import static com.google.android.exoplayer2.offline.DownloadState.STATE_RESTARTING;
 import static com.google.android.exoplayer2.offline.DownloadState.STATE_STOPPED;
+import static com.google.android.exoplayer2.offline.DownloadState.STOP_FLAG_DOWNLOAD_MANAGER_NOT_READY;
 import static com.google.android.exoplayer2.offline.DownloadState.STOP_FLAG_STOPPED;
 
 import android.os.ConditionVariable;
@@ -127,7 +128,7 @@ public final class DownloadManager {
     this.downloaderFactory = downloaderFactory;
     this.maxActiveDownloads = maxSimultaneousDownloads;
     this.minRetryCount = minRetryCount;
-    this.stickyStopFlags = STOP_FLAG_STOPPED;
+    this.stickyStopFlags = STOP_FLAG_STOPPED | STOP_FLAG_DOWNLOAD_MANAGER_NOT_READY;
 
     downloads = new ArrayList<>();
     activeDownloads = new ArrayList<>();
@@ -169,25 +170,31 @@ public final class DownloadManager {
 
   /** Starts the downloads. */
   public void startDownloads() {
-    Assertions.checkState(!released);
-    if (stickyStopFlags != 0) {
-      stickyStopFlags = 0;
-      for (int i = 0; i < downloads.size(); i++) {
-        downloads.get(i).clearStopFlags(STOP_FLAG_STOPPED);
-      }
-      logd("Downloads are started");
-    }
+    clearStopFlags(STOP_FLAG_STOPPED);
   }
 
   /** Stops all of the downloads. Call {@link #startDownloads()} to restart downloads. */
   public void stopDownloads() {
+    setStopFlags(STOP_FLAG_STOPPED);
+  }
+
+  private void setStopFlags(int flags) {
+    updateStopFlags(flags, flags);
+  }
+
+  private void clearStopFlags(int flags) {
+    updateStopFlags(flags, 0);
+  }
+
+  private void updateStopFlags(int flags, int values) {
     Assertions.checkState(!released);
-    if (stickyStopFlags == 0) {
-      stickyStopFlags = STOP_FLAG_STOPPED;
+    int updatedStickyStopFlags = (values & flags) | (stickyStopFlags & ~flags);
+    if (stickyStopFlags != updatedStickyStopFlags) {
+      stickyStopFlags = updatedStickyStopFlags;
       for (int i = 0; i < downloads.size(); i++) {
-        downloads.get(i).setStopFlags(STOP_FLAG_STOPPED);
+        downloads.get(i).updateStopFlags(flags, values);
       }
-      logd("Downloads are stopping");
+      logdFlags("Sticky stop flags are updated", updatedStickyStopFlags);
     }
   }
 
@@ -269,10 +276,8 @@ public final class DownloadManager {
     if (released) {
       return;
     }
+    setStopFlags(STOP_FLAG_DOWNLOAD_MANAGER_NOT_READY);
     released = true;
-    for (int i = 0; i < downloads.size(); i++) {
-      downloads.get(i).queue();
-    }
     final ConditionVariable fileIOFinishedCondition = new ConditionVariable();
     fileIOHandler.post(fileIOFinishedCondition::open);
     fileIOFinishedCondition.block();
@@ -294,27 +299,14 @@ public final class DownloadManager {
     logd("Download is added", download);
   }
 
-  private void maybeStartDownloads() {
-    for (int i = 0; i < downloads.size(); i++) {
-      maybeStartDownload(downloads.get(i));
-    }
-  }
-
   private void maybeStartDownload(Download download) {
-    if (initialized && !released && activeDownloads.size() < maxActiveDownloads) {
+    if (activeDownloads.size() < maxActiveDownloads) {
       if (download.start()) {
         activeDownloads.add(download);
       }
     }
   }
 
-  private void maybeRestartDownload(Download download) {
-    Assertions.checkState(activeDownloads.contains(download));
-    if (initialized && !released) {
-      download.start();
-    }
-  }
-
   private void maybeNotifyListenersIdle() {
     if (!isIdle()) {
       return;
@@ -339,7 +331,9 @@ public final class DownloadManager {
       saveActions();
     }
     if (idle) {
-      maybeStartDownloads();
+      for (int i = 0; i < downloads.size(); i++) {
+        maybeStartDownload(downloads.get(i));
+      }
       maybeNotifyListenersIdle();
     }
   }
@@ -383,7 +377,7 @@ public final class DownloadManager {
                 for (Listener listener : listeners) {
                   listener.onInitialized(DownloadManager.this);
                 }
-                maybeStartDownloads();
+                clearStopFlags(STOP_FLAG_DOWNLOAD_MANAGER_NOT_READY);
               });
         });
   }
@@ -415,7 +409,15 @@ public final class DownloadManager {
   }
 
   private static void logd(String message, Download download) {
-    logd(message + ": " + download);
+    if (DEBUG) {
+      logd(message + ": " + download);
+    }
+  }
+
+  private static void logdFlags(String message, int flags) {
+    if (DEBUG) {
+      logd(message + ": " + Integer.toBinaryString(flags));
+    }
   }
 
   private static final class Download {
@@ -529,22 +531,16 @@ public final class DownloadManager {
       return true;
     }
 
-    public void setStopFlags(int stopFlags) {
-      updateStopFlags(stopFlags, stopFlags);
+    public void setStopFlags(int flags) {
+      updateStopFlags(flags, flags);
     }
 
-    public void clearStopFlags(int stopFlags) {
-      updateStopFlags(stopFlags, 0);
+    public void clearStopFlags(int flags) {
+      updateStopFlags(flags, 0);
     }
 
-    public void queue() {
-      if (state == STATE_DOWNLOADING) {
-        stopDownloadThread();
-      }
-    }
-
-    private void updateStopFlags(int mask, int flags) {
-      stopFlags = (flags & mask) | (stopFlags & ~mask);
+    public void updateStopFlags(int flags, int values) {
+      stopFlags = (values & flags) | (stopFlags & ~flags);
       if (stopFlags != 0) {
         if (state == STATE_DOWNLOADING) {
           stopDownloadThread();
@@ -574,7 +570,7 @@ public final class DownloadManager {
       // Set to queued state but don't notify listeners until we make sure we can't start now.
       state = STATE_QUEUED;
       if (restart) {
-        downloadManager.maybeRestartDownload(this);
+        start();
       } else {
         downloadManager.maybeStartDownload(this);
       }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
index 86ea0d51f6..eed32720a3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
@@ -73,15 +73,20 @@ public final class DownloadState {
   /** The download is failed because of unknown reason. */
   public static final int FAILURE_REASON_UNKNOWN = 1;
 
-  /** Download stop flags. Possible flag value is {@link #STOP_FLAG_STOPPED}. */
+  /**
+   * Download stop flags. Possible flag values are {@link #STOP_FLAG_DOWNLOAD_MANAGER_NOT_READY} and
+   * {@link #STOP_FLAG_STOPPED}.
+   */
   @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef(
       flag = true,
-      value = {STOP_FLAG_STOPPED})
+      value = {STOP_FLAG_DOWNLOAD_MANAGER_NOT_READY, STOP_FLAG_STOPPED})
   public @interface StopFlags {}
+  /** Download can't be started as the manager isn't ready. */
+  public static final int STOP_FLAG_DOWNLOAD_MANAGER_NOT_READY = 1;
   /** All downloads are stopped by the application. */
-  public static final int STOP_FLAG_STOPPED = 1;
+  public static final int STOP_FLAG_STOPPED = 1 << 1;
 
   /** Returns the state string for the given state value. */
   public static String getStateString(@State int state) {

From fff602358fed751a5cf906338b20a56df1433522 Mon Sep 17 00:00:00 2001
From: Zsolt Matyas <zmmatyas@amazon.com>
Date: Wed, 9 Jan 2019 12:18:02 -0800
Subject: [PATCH 369/832] CEA608: Limiting duplicated command checks to
 immediate frames

Reported in https://github.com/google/ExoPlayer/issues/3860
For failing examples see the github link above.

[Problem]
We drop matching control codes even if they are not received on
consecutive frames.

The specification says
"(4) If the first transmission of a control code pair passes parity,
it is acted upon within one video frame. If the NEXT frame contains
a perfect repeat of the same pair, the redundant code is ignored."

Keyword is the NEXT. The frames must arrive immediately after
each other.

See https://www.law.cornell.edu/cfr/text/47/79.101

[Solution]
Set an additional flag when any data is processed. Control code
duplication checks should be limited only for the first control
byte pairs processed after any control code.

[Test]
Sarnoff tests have equivalent CEA708 and CEA608 Streams.
---
 .../exoplayer2/text/cea/Cea608Decoder.java    | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
index 13cd01e926..e4333478e3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
@@ -292,7 +292,6 @@ public final class Cea608Decoder extends CeaDecoder {
   protected void decode(SubtitleInputBuffer inputBuffer) {
     ccData.reset(inputBuffer.data.array(), inputBuffer.data.limit());
     boolean captionDataProcessed = false;
-    boolean isRepeatableControl = false;
     while (ccData.bytesLeft() >= packetLength) {
       byte ccHeader = packetLength == 2 ? CC_IMPLICIT_DATA_HEADER
           : (byte) ccData.readUnsignedByte();
@@ -337,6 +336,9 @@ public final class Cea608Decoder extends CeaDecoder {
       // If we've reached this point then there is data to process; flag that work has been done.
       captionDataProcessed = true;
 
+      boolean repeatedControlPossible = repeatableControlSet;
+      repeatableControlSet = false;
+
       if (!ODD_PARITY_BYTE_TABLE[ccByte1] || !ODD_PARITY_BYTE_TABLE[ccByte2]) {
         // The data is invalid.
         resetCueBuilders();
@@ -372,7 +374,7 @@ public final class Cea608Decoder extends CeaDecoder {
       // Control character.
       // ccData1 - 0|0|0|X|X|X|X|X
       if ((ccData1 & 0xE0) == 0x00) {
-        isRepeatableControl = handleCtrl(ccData1, ccData2);
+        handleCtrl(ccData1, ccData2, repeatedControlPossible);
         continue;
       }
 
@@ -384,30 +386,26 @@ public final class Cea608Decoder extends CeaDecoder {
     }
 
     if (captionDataProcessed) {
-      if (!isRepeatableControl) {
-        repeatableControlSet = false;
-      }
       if (captionMode == CC_MODE_ROLL_UP || captionMode == CC_MODE_PAINT_ON) {
         cues = getDisplayCues();
       }
     }
   }
 
-  private boolean handleCtrl(byte cc1, byte cc2) {
+  private void handleCtrl(byte cc1, byte cc2, boolean repeatedControlPossible) {
     boolean isRepeatableControl = isRepeatable(cc1);
 
     // Most control commands are sent twice in succession to ensure they are received properly.
     // We don't want to process duplicate commands, so if we see the same repeatable command twice
     // in a row, ignore the second one.
     if (isRepeatableControl) {
-      if (repeatableControlSet
+      if (repeatedControlPossible
           && repeatableControlCc1 == cc1
           && repeatableControlCc2 == cc2) {
-        // This is a duplicate. Clear the repeatable control flag and return.
-        repeatableControlSet = false;
-        return true;
+        // This is a duplicate. Repeatable control flag should be already cleared, let's return.
+        return;
       } else {
-        // This is a repeatable command, but we haven't see it yet, so set the repeatable control
+        // This is a repeatable command, but we haven't seen it yet, so set the repeatable control
         // flag (to ensure we ignore the next one should it be a duplicate) and continue processing
         // the command.
         repeatableControlSet = true;
@@ -425,8 +423,6 @@ public final class Cea608Decoder extends CeaDecoder {
     } else if (isMiscCode(cc1, cc2)) {
       handleMiscCode(cc2);
     }
-
-    return isRepeatableControl;
   }
 
   private void handleMidrowCtrl(byte cc2) {

From 8792c20be53f2d69024104eca824f5ad1e6af486 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 9 Jan 2019 10:24:32 +0000
Subject: [PATCH 370/832] Update README and dev guide with Java 8 config for
 Kotlin.

Setting the target conpatibility only seems to work for Java. Added the
equivalent Kotlin config options to the docs.

Issue:#5276
PiperOrigin-RevId: 228482496
---
 README.md | 40 +++++++++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 37967dd527..03f16bd655 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,8 @@ repository and depend on the modules locally.
 
 ### From JCenter ###
 
+#### 1. Add repositories ####
+
 The easiest way to get started using ExoPlayer is to add it as a gradle
 dependency. You need to make sure you have the Google and JCenter repositories
 included in the `build.gradle` file in the root of your project:
@@ -38,6 +40,8 @@ repositories {
 }
 ```
 
+#### 2. Add ExoPlayer module dependencies ####
+
 Next add a dependency in the `build.gradle` file of your app module. The
 following will add a dependency to the full library:
 
@@ -45,15 +49,7 @@ following will add a dependency to the full library:
 implementation 'com.google.android.exoplayer:exoplayer:2.X.X'
 ```
 
-where `2.X.X` is your preferred version. If not enabled already, you also need
-to turn on Java 8 support in all `build.gradle` files depending on ExoPlayer, by
-adding the following to the `android` section:
-
-```gradle
-compileOptions {
-    targetCompatibility JavaVersion.VERSION_1_8
-}
-```
+where `2.X.X` is your preferred version.
 
 As an alternative to the full library, you can depend on only the library
 modules that you actually need. For example the following will add dependencies
@@ -87,6 +83,32 @@ JCenter can be found on [Bintray][].
 [extensions directory]: https://github.com/google/ExoPlayer/tree/release-v2/extensions/
 [Bintray]: https://bintray.com/google/exoplayer
 
+#### 3. Turn on Java 8 support ####
+
+If not enabled already, you also need to turn on Java 8 support in all
+`build.gradle` files depending on ExoPlayer, by adding the following to the
+`android` section:
+
+```gradle
+compileOptions {
+  targetCompatibility JavaVersion.VERSION_1_8
+}
+```
+
+Note that if you want to use Java 8 features in your own code, the following
+additional options need to be set:
+
+```gradle
+// For Java compilers:
+compileOptions {
+  sourceCompatibility JavaVersion.VERSION_1_8
+}
+// For Kotlin compilers:
+kotlinOptions {
+  jvmTarget = JavaVersion.VERSION_1_8
+}
+```
+
 ### Locally ###
 
 Cloning the repository and depending on the modules locally is required when

From 637b52ae0e7d5515f0e581da73df600a9cb56e51 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 9 Jan 2019 17:23:30 +0000
Subject: [PATCH 371/832] Add missing call to timeline.getWindow.

The window object is used without being filled with data. This used to work
well for most cases as the same live stream is sending regular updates and the
first update is almost never used if it's not the first item in a playlist.

It causes problems when the first timeline update of a live stream is actually
used for playback (e.g. when the live stream is lazily prepared in a playlist
and played first).

PiperOrigin-RevId: 228530232
---
 .../android/exoplayer2/source/ConcatenatingMediaSource.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
index db52a87ef8..7845694c45 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
@@ -761,6 +761,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
       //     unlikely to be a problem as a non-zero default position usually only occurs for live
       //     playbacks and seeking to zero in a live window would cause BehindLiveWindowExceptions
       //     anyway.
+      timeline.getWindow(/* windowIndex= */ 0, window);
       long windowStartPositionUs = window.getDefaultPositionUs();
       if (deferredMediaPeriod != null) {
         long periodPreparePositionUs = deferredMediaPeriod.getPreparePositionUs();

From 92bec21c03532b9e051c0843022eeb51198bda4f Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Thu, 10 Jan 2019 10:33:11 +0000
Subject: [PATCH 372/832] Add DownloadIndex and DefaultDownloadIndex

DownloadIndex will be used to store and query DownloadStates.

PiperOrigin-RevId: 228673766
---
 .../offline/DefaultDownloadIndex.java         | 528 ++++++++++++++++++
 .../exoplayer2/offline/DownloadAction.java    |   2 +-
 .../exoplayer2/offline/DownloadIndex.java     |  52 ++
 .../exoplayer2/offline/DownloadState.java     |   1 -
 .../offline/DownloadStateCursor.java          | 127 +++++
 .../offline/DefaultDownloadIndexTest.java     | 491 ++++++++++++++++
 6 files changed, 1199 insertions(+), 2 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadStateCursor.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
new file mode 100644
index 0000000000..8881a038f9
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -0,0 +1,528 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.offline;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.DatabaseUtils;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteException;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.net.Uri;
+import android.support.annotation.IntDef;
+import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
+import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.Util;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * A {@link DownloadIndex} which uses SQLite to persist {@link DownloadState}s.
+ *
+ * <p class="caution">Database access may take a long time, do not call methods of this class from
+ * the application main thread.
+ */
+public final class DefaultDownloadIndex implements DownloadIndex {
+
+  /** Provides {@link SQLiteDatabase} instances. */
+  public interface DatabaseProvider {
+    /** Closes any open database object. */
+    void close();
+
+    /**
+     * Creates and/or opens a database that will be used for reading and writing.
+     *
+     * <p>Once opened successfully, the database is cached, so you can call this method every time
+     * you need to write to the database. (Make sure to call {@link #close} when you no longer need
+     * the database.) Errors such as bad permissions or a full disk may cause this method to fail,
+     * but future attempts may succeed if the problem is fixed.
+     *
+     * @throws SQLiteException If the database cannot be opened for writing.
+     * @return A read/write database object valid until {@link #close} is called.
+     */
+    SQLiteDatabase getWritableDatabase();
+
+    /**
+     * Creates and/or opens a database. This will be the same object returned by {@link
+     * #getWritableDatabase} unless some problem, such as a full disk, requires the database to be
+     * opened read-only. In that case, a read-only database object will be returned. If the problem
+     * is fixed, a future call to {@link #getWritableDatabase} may succeed, in which case the
+     * read-only database object will be closed and the read/write object will be returned in the
+     * future.
+     *
+     * <p>Once opened successfully, the database should be cached. When the database is no longer
+     * needed, {@link #close} will be called.
+     *
+     * @throws SQLiteException If the database cannot be opened.
+     * @return A database object valid until {@link #getWritableDatabase} or {@link #close} is
+     *     called.
+     */
+    SQLiteDatabase getReadableDatabase();
+  }
+
+  private static final String DATABASE_NAME = "exoplayer_internal.db";
+
+  private final DatabaseProvider databaseProvider;
+  @Nullable private DownloadStateTable downloadStateTable;
+
+  /**
+   * Creates a DefaultDownloadIndex which stores the {@link DownloadState}s on a SQLite database.
+   *
+   * @param context A Context.
+   */
+  public DefaultDownloadIndex(Context context) {
+    this(new DefaultDatabaseProvider(context));
+  }
+
+  /**
+   * Creates a DefaultDownloadIndex which stores the {@link DownloadState}s on a SQLite database
+   * provided by {@code databaseProvider}.
+   *
+   * @param databaseProvider A DatabaseProvider which provides the database which will be used to
+   *     store DownloadStatus table.
+   */
+  public DefaultDownloadIndex(DatabaseProvider databaseProvider) {
+    this.databaseProvider = databaseProvider;
+  }
+
+  @Override
+  public void release() {
+    databaseProvider.close();
+  }
+
+  @Override
+  @Nullable
+  public DownloadState getDownloadState(String id) {
+    return getDownloadStateTable().get(id);
+  }
+
+  @Override
+  public DownloadStateCursor getDownloadStates(@DownloadState.State int... states) {
+    return getDownloadStateTable().get(states);
+  }
+
+  @Override
+  public void putDownloadState(DownloadState downloadState) {
+    getDownloadStateTable().replace(downloadState);
+  }
+
+  @Override
+  public void removeDownloadState(String id) {
+    getDownloadStateTable().delete(id);
+  }
+
+  private DownloadStateTable getDownloadStateTable() {
+    if (downloadStateTable == null) {
+      downloadStateTable = new DownloadStateTable(databaseProvider);
+    }
+    return downloadStateTable;
+  }
+
+  @VisibleForTesting
+  /* package */ static boolean doesTableExist(DatabaseProvider databaseProvider, String tableName) {
+    SQLiteDatabase readableDatabase = databaseProvider.getReadableDatabase();
+    long count =
+        DatabaseUtils.queryNumEntries(
+            readableDatabase, "sqlite_master", "tbl_name = ?", new String[] {tableName});
+    return count > 0;
+  }
+
+  private static final class DownloadStateCursorImpl implements DownloadStateCursor {
+
+    private final Cursor cursor;
+
+    private DownloadStateCursorImpl(Cursor cursor) {
+      this.cursor = cursor;
+    }
+
+    @Override
+    public DownloadState getDownloadState() {
+      return DownloadStateTable.getDownloadState(cursor);
+    }
+
+    @Override
+    public int getCount() {
+      return cursor.getCount();
+    }
+
+    @Override
+    public int getPosition() {
+      return cursor.getPosition();
+    }
+
+    @Override
+    public boolean moveToPosition(int position) {
+      return cursor.moveToPosition(position);
+    }
+
+    @Override
+    public void close() {
+      cursor.close();
+    }
+
+    @Override
+    public boolean isClosed() {
+      return cursor.isClosed();
+    }
+  }
+
+  @VisibleForTesting
+  /* package */ static final class DownloadStateTable {
+    @VisibleForTesting /* package */ static final String TABLE_NAME = "ExoPlayerDownloadStates";
+    @VisibleForTesting /* package */ static final int TABLE_VERSION = 1;
+
+    private static final String COLUMN_ID = "id";
+    private static final String COLUMN_TYPE = "title";
+    private static final String COLUMN_URI = "subtitle";
+    private static final String COLUMN_CACHE_KEY = "cache_key";
+    private static final String COLUMN_STATE = "state";
+    private static final String COLUMN_DOWNLOAD_PERCENTAGE = "download_percentage";
+    private static final String COLUMN_DOWNLOADED_BYTES = "downloaded_bytes";
+    private static final String COLUMN_TOTAL_BYTES = "total_bytes";
+    private static final String COLUMN_FAILURE_REASON = "failure_reason";
+    private static final String COLUMN_STOP_FLAGS = "stop_flags";
+    private static final String COLUMN_START_TIME_MS = "start_time_ms";
+    private static final String COLUMN_UPDATE_TIME_MS = "update_time_ms";
+    private static final String COLUMN_STREAM_KEYS = "stream_keys";
+    private static final String COLUMN_CUSTOM_METADATA = "custom_metadata";
+
+    private static final int COLUMN_INDEX_ID = 0;
+    private static final int COLUMN_INDEX_TYPE = 1;
+    private static final int COLUMN_INDEX_URI = 2;
+    private static final int COLUMN_INDEX_CACHE_KEY = 3;
+    private static final int COLUMN_INDEX_STATE = 4;
+    private static final int COLUMN_INDEX_DOWNLOAD_PERCENTAGE = 5;
+    private static final int COLUMN_INDEX_DOWNLOADED_BYTES = 6;
+    private static final int COLUMN_INDEX_TOTAL_BYTES = 7;
+    private static final int COLUMN_INDEX_FAILURE_REASON = 8;
+    private static final int COLUMN_INDEX_STOP_FLAGS = 9;
+    private static final int COLUMN_INDEX_START_TIME_MS = 10;
+    private static final int COLUMN_INDEX_UPDATE_TIME_MS = 11;
+    private static final int COLUMN_INDEX_STREAM_KEYS = 12;
+    private static final int COLUMN_INDEX_CUSTOM_METADATA = 13;
+
+    private static final String COLUMN_SELECTION_ID = COLUMN_ID + " = ?";
+
+    private static final String[] COLUMNS =
+        new String[] {
+          COLUMN_ID,
+          COLUMN_TYPE,
+          COLUMN_URI,
+          COLUMN_CACHE_KEY,
+          COLUMN_STATE,
+          COLUMN_DOWNLOAD_PERCENTAGE,
+          COLUMN_DOWNLOADED_BYTES,
+          COLUMN_TOTAL_BYTES,
+          COLUMN_FAILURE_REASON,
+          COLUMN_STOP_FLAGS,
+          COLUMN_START_TIME_MS,
+          COLUMN_UPDATE_TIME_MS,
+          COLUMN_STREAM_KEYS,
+          COLUMN_CUSTOM_METADATA
+        };
+
+    private static final String SQL_DROP_TABLE = "DROP TABLE IF EXISTS " + TABLE_NAME;
+    private static final String SQL_CREATE_TABLE =
+        "CREATE TABLE IF NOT EXISTS "
+            + TABLE_NAME
+            + " ("
+            + COLUMN_ID
+            + " TEXT PRIMARY KEY NOT NULL,"
+            + COLUMN_TYPE
+            + " TEXT NOT NULL,"
+            + COLUMN_URI
+            + " TEXT NOT NULL,"
+            + COLUMN_CACHE_KEY
+            + " TEXT,"
+            + COLUMN_STATE
+            + " INTEGER NOT NULL,"
+            + COLUMN_DOWNLOAD_PERCENTAGE
+            + " REAL NOT NULL,"
+            + COLUMN_DOWNLOADED_BYTES
+            + " INTEGER NOT NULL,"
+            + COLUMN_TOTAL_BYTES
+            + " INTEGER NOT NULL,"
+            + COLUMN_FAILURE_REASON
+            + " INTEGER NOT NULL,"
+            + COLUMN_STOP_FLAGS
+            + " INTEGER NOT NULL,"
+            + COLUMN_START_TIME_MS
+            + " INTEGER NOT NULL,"
+            + COLUMN_UPDATE_TIME_MS
+            + " INTEGER NOT NULL,"
+            + COLUMN_STREAM_KEYS
+            + " TEXT NOT NULL,"
+            + COLUMN_CUSTOM_METADATA
+            + " BLOB NOT NULL)";
+
+    private final DatabaseProvider databaseProvider;
+
+    public DownloadStateTable(DatabaseProvider databaseProvider) {
+      this.databaseProvider = databaseProvider;
+      VersionTable versionTable = new VersionTable(databaseProvider);
+      int version = versionTable.getVersion(VersionTable.FEATURE_OFFLINE);
+      if (!doesTableExist(databaseProvider, TABLE_NAME)
+          || version == 0
+          || version > TABLE_VERSION) {
+        SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+        writableDatabase.beginTransaction();
+        try {
+          writableDatabase.execSQL(SQL_DROP_TABLE);
+          writableDatabase.execSQL(SQL_CREATE_TABLE);
+          versionTable.setVersion(VersionTable.FEATURE_OFFLINE, TABLE_VERSION);
+          writableDatabase.setTransactionSuccessful();
+        } finally {
+          writableDatabase.endTransaction();
+        }
+      } else if (version < TABLE_VERSION) {
+        // There is no previous version currently.
+        throw new IllegalStateException();
+      }
+    }
+
+    public void replace(DownloadState downloadState) {
+      ContentValues values = new ContentValues();
+      values.put(COLUMN_ID, downloadState.id);
+      values.put(COLUMN_TYPE, downloadState.type);
+      values.put(COLUMN_URI, downloadState.uri.toString());
+      values.put(COLUMN_CACHE_KEY, downloadState.cacheKey);
+      values.put(COLUMN_STATE, downloadState.state);
+      values.put(COLUMN_DOWNLOAD_PERCENTAGE, downloadState.downloadPercentage);
+      values.put(COLUMN_DOWNLOADED_BYTES, downloadState.downloadedBytes);
+      values.put(COLUMN_TOTAL_BYTES, downloadState.totalBytes);
+      values.put(COLUMN_FAILURE_REASON, downloadState.failureReason);
+      values.put(COLUMN_STOP_FLAGS, downloadState.stopFlags);
+      values.put(COLUMN_START_TIME_MS, downloadState.startTimeMs);
+      values.put(COLUMN_UPDATE_TIME_MS, downloadState.updateTimeMs);
+      values.put(COLUMN_STREAM_KEYS, encodeStreamKeys(downloadState.streamKeys));
+      values.put(COLUMN_CUSTOM_METADATA, downloadState.customMetadata);
+      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+      writableDatabase.replace(TABLE_NAME, /* nullColumnHack= */ null, values);
+    }
+
+    @Nullable
+    public DownloadState get(String id) {
+      String[] selectionArgs = {id};
+      try (Cursor cursor = query(COLUMN_SELECTION_ID, selectionArgs)) {
+        if (cursor.getCount() == 0) {
+          return null;
+        }
+        cursor.moveToNext();
+        DownloadState downloadState = getDownloadState(cursor);
+        Assertions.checkState(id.equals(downloadState.id));
+        return downloadState;
+      }
+    }
+
+    public DownloadStateCursor get(@DownloadState.State int... states) {
+      String selection = null;
+      if (states.length > 0) {
+        StringBuilder selectionBuilder = new StringBuilder();
+        selectionBuilder.append(COLUMN_STATE).append(" IN (");
+        for (int i = 0; i < states.length; i++) {
+          if (i > 0) {
+            selectionBuilder.append(',');
+          }
+          selectionBuilder.append(states[i]);
+        }
+        selectionBuilder.append(')');
+        selection = selectionBuilder.toString();
+      }
+      Cursor cursor = query(selection, /* selectionArgs= */ null);
+      return new DownloadStateCursorImpl(cursor);
+    }
+
+    public void delete(String id) {
+      String[] selectionArgs = {id};
+      databaseProvider.getWritableDatabase().delete(TABLE_NAME, COLUMN_SELECTION_ID, selectionArgs);
+    }
+
+    private Cursor query(@Nullable String selection, @Nullable String[] selectionArgs) {
+      String sortOrder = COLUMN_START_TIME_MS + " ASC";
+      return databaseProvider
+          .getReadableDatabase()
+          .query(
+              TABLE_NAME,
+              COLUMNS,
+              selection,
+              selectionArgs,
+              /* groupBy= */ null,
+              /* having= */ null,
+              sortOrder);
+    }
+
+    private static DownloadState getDownloadState(Cursor cursor) {
+      return new DownloadState(
+          cursor.getString(COLUMN_INDEX_ID),
+          cursor.getString(COLUMN_INDEX_TYPE),
+          Uri.parse(cursor.getString(COLUMN_INDEX_URI)),
+          cursor.getString(COLUMN_INDEX_CACHE_KEY),
+          cursor.getInt(COLUMN_INDEX_STATE),
+          cursor.getFloat(COLUMN_INDEX_DOWNLOAD_PERCENTAGE),
+          cursor.getLong(COLUMN_INDEX_DOWNLOADED_BYTES),
+          cursor.getLong(COLUMN_INDEX_TOTAL_BYTES),
+          cursor.getInt(COLUMN_INDEX_FAILURE_REASON),
+          cursor.getInt(COLUMN_INDEX_STOP_FLAGS),
+          cursor.getLong(COLUMN_INDEX_START_TIME_MS),
+          cursor.getLong(COLUMN_INDEX_UPDATE_TIME_MS),
+          decodeStreamKeys(cursor.getString(COLUMN_INDEX_STREAM_KEYS)),
+          cursor.getBlob(COLUMN_INDEX_CUSTOM_METADATA));
+    }
+
+    private static String encodeStreamKeys(StreamKey[] streamKeys) {
+      StringBuilder stringBuilder = new StringBuilder();
+      for (StreamKey streamKey : streamKeys) {
+        stringBuilder
+            .append(streamKey.periodIndex)
+            .append('.')
+            .append(streamKey.groupIndex)
+            .append('.')
+            .append(streamKey.trackIndex)
+            .append(',');
+      }
+      if (stringBuilder.length() > 0) {
+        stringBuilder.setLength(stringBuilder.length() - 1);
+      }
+      return stringBuilder.toString();
+    }
+
+    private static StreamKey[] decodeStreamKeys(String encodedStreamKeys) {
+      if (encodedStreamKeys.isEmpty()) {
+        return new StreamKey[0];
+      }
+      String[] streamKeysStrings = Util.split(encodedStreamKeys, ",");
+      int streamKeysCount = streamKeysStrings.length;
+      StreamKey[] streamKeys = new StreamKey[streamKeysCount];
+      for (int i = 0; i < streamKeysCount; i++) {
+        String[] indices = Util.split(streamKeysStrings[i], "\\.");
+        Assertions.checkState(indices.length == 3);
+        streamKeys[i] =
+            new StreamKey(
+                Integer.parseInt(indices[0]),
+                Integer.parseInt(indices[1]),
+                Integer.parseInt(indices[2]));
+      }
+      return streamKeys;
+    }
+  }
+
+  @VisibleForTesting
+  /* package */ static final class VersionTable {
+    private static final String TABLE_NAME = "ExoPlayerVersions";
+
+    private static final String COLUMN_FEATURE = "feature";
+    private static final String COLUMN_VERSION = "version";
+
+    private static final String SQL_CREATE_TABLE =
+        "CREATE TABLE IF NOT EXISTS "
+            + TABLE_NAME
+            + " ("
+            + COLUMN_FEATURE
+            + " INTEGER PRIMARY KEY NOT NULL,"
+            + COLUMN_VERSION
+            + " INTEGER NOT NULL)";
+
+    @Documented
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({FEATURE_OFFLINE, FEATURE_CACHE})
+    private @interface Feature {}
+
+    public static final int FEATURE_OFFLINE = 0;
+    public static final int FEATURE_CACHE = 1;
+
+    private final DatabaseProvider databaseProvider;
+
+    public VersionTable(DatabaseProvider databaseProvider) {
+      this.databaseProvider = databaseProvider;
+      if (!doesTableExist(databaseProvider, TABLE_NAME)) {
+        databaseProvider.getWritableDatabase().execSQL(SQL_CREATE_TABLE);
+      }
+    }
+
+    public void setVersion(@Feature int feature, int version) {
+      ContentValues values = new ContentValues();
+      values.put(COLUMN_FEATURE, feature);
+      values.put(COLUMN_VERSION, version);
+      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+      writableDatabase.replace(TABLE_NAME, /* nullColumnHack= */ null, values);
+    }
+
+    public int getVersion(@Feature int feature) {
+      String selection = COLUMN_FEATURE + " = ?";
+      String[] selectionArgs = {Integer.toString(feature)};
+      try (Cursor cursor =
+          databaseProvider
+              .getReadableDatabase()
+              .query(
+                  TABLE_NAME,
+                  new String[] {COLUMN_VERSION},
+                  selection,
+                  selectionArgs,
+                  /* groupBy= */ null,
+                  /* having= */ null,
+                  /* orderBy= */ null)) {
+        if (cursor.getCount() == 0) {
+          return 0;
+        }
+        cursor.moveToNext();
+        return cursor.getInt(/* COLUMN_VERSION index */ 0);
+      }
+    }
+  }
+
+  private static final class DefaultDatabaseProvider extends SQLiteOpenHelper
+      implements DatabaseProvider {
+    public DefaultDatabaseProvider(Context context) {
+      super(context, DATABASE_NAME, /* factory= */ null, /* version= */ 1);
+    }
+
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+      // Table creation is done in DownloadStateTable constructor.
+    }
+
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+      // Upgrade is handled in DownloadStateTable constructor.
+    }
+
+    @Override
+    public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+      // TODO: Wipe the database.
+      super.onDowngrade(db, oldVersion, newVersion);
+    }
+
+    // DatabaseProvider implementation.
+
+    @Override
+    public synchronized void close() {
+      super.close();
+    }
+
+    @Override
+    public SQLiteDatabase getWritableDatabase() {
+      return super.getWritableDatabase();
+    }
+
+    @Override
+    public SQLiteDatabase getReadableDatabase() {
+      return super.getReadableDatabase();
+    }
+  }
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
index d809ab4754..40ea094b5e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
@@ -156,7 +156,7 @@ public final class DownloadAction {
       ArrayList<StreamKey> mutableKeys = new ArrayList<>(keys);
       Collections.sort(mutableKeys);
       this.keys = Collections.unmodifiableList(mutableKeys);
-      this.data = data != null ? data : Util.EMPTY_BYTE_ARRAY;
+      this.data = data != null ? Arrays.copyOf(data, data.length) : Util.EMPTY_BYTE_ARRAY;
     }
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java
new file mode 100644
index 0000000000..71726b64a9
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.offline;
+
+import android.support.annotation.Nullable;
+
+/** Persists {@link DownloadState}s. */
+interface DownloadIndex {
+  /** Releases the used resources. */
+  void release();
+
+  /**
+   * Returns the {@link DownloadState} with the given {@code id}, or null.
+   *
+   * @param id ID of a {@link DownloadState}.
+   * @return The {@link DownloadState} with the given {@code id}, or null if a download state with
+   *     this id doesn't exist.
+   */
+  @Nullable
+  DownloadState getDownloadState(String id);
+
+  /**
+   * Returns a {@link DownloadStateCursor} to {@link DownloadState}s with the given {@code states}.
+   *
+   * @param states Returns only the {@link DownloadState}s with this states. If empty, returns all.
+   * @return A cursor to {@link DownloadState}s with the given {@code states}.
+   */
+  DownloadStateCursor getDownloadStates(@DownloadState.State int... states);
+
+  /**
+   * Adds or replaces a {@link DownloadState}.
+   *
+   * @param downloadState The {@link DownloadState} to be added.
+   */
+  void putDownloadState(DownloadState downloadState);
+
+  /** Removes the {@link DownloadState} with the given {@code id}. */
+  void removeDownloadState(String id);
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
index eed32720a3..7bbd078822 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.google.android.exoplayer2.offline;
 
 import android.net.Uri;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadStateCursor.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadStateCursor.java
new file mode 100644
index 0000000000..680976c77b
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadStateCursor.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.offline;
+
+/** Provides random read-write access to the result set returned by a database query. */
+interface DownloadStateCursor {
+
+  /** Returns the DownloadState at the current position. */
+  DownloadState getDownloadState();
+
+  /** Returns the numbers of DownloadStates in the cursor. */
+  int getCount();
+
+  /**
+   * Returns the current position of the cursor in the DownloadState set. The value is zero-based.
+   * When the DownloadState set is first returned the cursor will be at positon -1, which is before
+   * the first DownloadState. After the last DownloadState is returned another call to next() will
+   * leave the cursor past the last entry, at a position of count().
+   *
+   * @return the current cursor position.
+   */
+  int getPosition();
+
+  /**
+   * Move the cursor to an absolute position. The valid range of values is -1 &lt;= position &lt;=
+   * count.
+   *
+   * <p>This method will return true if the request destination was reachable, otherwise, it returns
+   * false.
+   *
+   * @param position the zero-based position to move to.
+   * @return whether the requested move fully succeeded.
+   */
+  boolean moveToPosition(int position);
+
+  /**
+   * Move the cursor to the first DownloadState.
+   *
+   * <p>This method will return false if the cursor is empty.
+   *
+   * @return whether the move succeeded.
+   */
+  default boolean moveToFirst() {
+    return moveToPosition(0);
+  }
+
+  /**
+   * Move the cursor to the last DownloadState.
+   *
+   * <p>This method will return false if the cursor is empty.
+   *
+   * @return whether the move succeeded.
+   */
+  default boolean moveToLast() {
+    return moveToPosition(getCount() - 1);
+  }
+
+  /**
+   * Move the cursor to the next DownloadState.
+   *
+   * <p>This method will return false if the cursor is already past the last entry in the result
+   * set.
+   *
+   * @return whether the move succeeded.
+   */
+  default boolean moveToNext() {
+    return moveToPosition(getPosition() + 1);
+  }
+
+  /**
+   * Move the cursor to the previous DownloadState.
+   *
+   * <p>This method will return false if the cursor is already before the first entry in the result
+   * set.
+   *
+   * @return whether the move succeeded.
+   */
+  default boolean moveToPrevious() {
+    return moveToPosition(getPosition() - 1);
+  }
+
+  /** Returns whether the cursor is pointing to the first DownloadState. */
+  default boolean isFirst() {
+    return getPosition() == 0 && getCount() != 0;
+  }
+
+  /** Returns whether the cursor is pointing to the last DownloadState. */
+  default boolean isLast() {
+    int count = getCount();
+    return getPosition() == (count - 1) && count != 0;
+  }
+
+  /** Returns whether the cursor is pointing to the position before the first DownloadState. */
+  default boolean isBeforeFirst() {
+    if (getCount() == 0) {
+      return true;
+    }
+    return getPosition() == -1;
+  }
+
+  /** Returns whether the cursor is pointing to the position after the last DownloadState. */
+  default boolean isAfterLast() {
+    if (getCount() == 0) {
+      return true;
+    }
+    return getPosition() == getCount();
+  }
+
+  /** Closes the Cursor, releasing all of its resources and making it completely invalid. */
+  void close();
+
+  /** Returns whether the cursor is closed */
+  boolean isClosed();
+}
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
new file mode 100644
index 0000000000..fe32415ffa
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
@@ -0,0 +1,491 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.offline;
+
+import static com.google.android.exoplayer2.offline.DefaultDownloadIndex.VersionTable.FEATURE_CACHE;
+import static com.google.android.exoplayer2.offline.DefaultDownloadIndex.VersionTable.FEATURE_OFFLINE;
+import static com.google.common.truth.Truth.assertThat;
+
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.net.Uri;
+import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.C;
+import java.util.Arrays;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+/** Unit tests for {@link DefaultDownloadIndex}. */
+@RunWith(RobolectricTestRunner.class)
+public class DefaultDownloadIndexTest {
+
+  private DefaultDownloadIndex downloadIndex;
+
+  @Before
+  public void setUp() {
+    downloadIndex = new DefaultDownloadIndex(RuntimeEnvironment.application);
+  }
+
+  @After
+  public void tearDown() {
+    downloadIndex.release();
+  }
+
+  @Test
+  public void getDownloadState_nonExistingId_returnsNull() {
+    assertThat(downloadIndex.getDownloadState("non existing id")).isNull();
+  }
+
+  @Test
+  public void addAndGetDownloadState_nonExistingId_returnsTheSameDownloadState() {
+    String id = "id";
+    DownloadState downloadState = new DownloadStateBuilder(id).build();
+
+    downloadIndex.putDownloadState(downloadState);
+    DownloadState readDownloadState = downloadIndex.getDownloadState(id);
+
+    assertEqual(readDownloadState, downloadState);
+  }
+
+  @Test
+  public void addAndGetDownloadState_existingId_returnsUpdatedDownloadState() {
+    String id = "id";
+    DownloadStateBuilder downloadStateBuilder = new DownloadStateBuilder(id);
+    downloadIndex.putDownloadState(downloadStateBuilder.build());
+
+    DownloadState downloadState =
+        downloadStateBuilder
+            .setType("different type")
+            .setUri("different uri")
+            .setCacheKey("different cacheKey")
+            .setState(DownloadState.STATE_FAILED)
+            .setDownloadPercentage(50)
+            .setDownloadedBytes(200)
+            .setTotalBytes(400)
+            .setFailureReason(DownloadState.FAILURE_REASON_UNKNOWN)
+            .setStopFlags(DownloadState.STOP_FLAG_STOPPED)
+            .setStartTimeMs(10)
+            .setUpdateTimeMs(20)
+            .setStreamKeys(
+                new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 1, /* trackIndex= */ 2),
+                new StreamKey(/* periodIndex= */ 3, /* groupIndex= */ 4, /* trackIndex= */ 5))
+            .setCustomMetadata(new byte[] {0, 1, 2, 3})
+            .build();
+    downloadIndex.putDownloadState(downloadState);
+    DownloadState readDownloadState = downloadIndex.getDownloadState(id);
+
+    assertThat(readDownloadState).isNotNull();
+    assertEqual(readDownloadState, downloadState);
+  }
+
+  @Test
+  public void releaseAndRecreateDownloadIndex_returnsTheSameDownloadState() {
+    String id = "id";
+    DownloadState downloadState = new DownloadStateBuilder(id).build();
+
+    downloadIndex.putDownloadState(downloadState);
+    downloadIndex.release();
+    downloadIndex = new DefaultDownloadIndex(RuntimeEnvironment.application);
+    DownloadState readDownloadState = downloadIndex.getDownloadState(id);
+
+    assertThat(readDownloadState).isNotNull();
+    assertEqual(readDownloadState, downloadState);
+  }
+
+  @Test
+  public void customDatabaseProvider_getDownloadStateReturnsNull() {
+    String id = "id";
+    DownloadState downloadState = new DownloadStateBuilder(id).build();
+
+    downloadIndex.putDownloadState(downloadState);
+    downloadIndex.release();
+    DatabaseProviderImpl databaseProvider = new DatabaseProviderImpl();
+    downloadIndex = new DefaultDownloadIndex(databaseProvider);
+    DownloadState readDownloadState = downloadIndex.getDownloadState(id);
+
+    assertThat(readDownloadState).isNull();
+    databaseProvider.close();
+  }
+
+  @Test
+  public void removeDownloadState_nonExistingId_doesNotFail() {
+    downloadIndex.removeDownloadState("non existing id");
+  }
+
+  @Test
+  public void removeDownloadState_existingId_getDownloadStateReturnsNull() {
+    String id = "id";
+    DownloadState downloadState = new DownloadStateBuilder(id).build();
+    downloadIndex.putDownloadState(downloadState);
+
+    downloadIndex.removeDownloadState(id);
+    DownloadState readDownloadState = downloadIndex.getDownloadState(id);
+
+    assertThat(readDownloadState).isNull();
+  }
+
+  @Test
+  public void getDownloadStates_emptyDownloadIndex_returnsEmptyArray() {
+    assertThat(downloadIndex.getDownloadStates().getCount()).isEqualTo(0);
+  }
+
+  @Test
+  public void getDownloadStates_noState_returnsAllDownloadStatusSortedByStartTime() {
+    DownloadState downloadState1 = new DownloadStateBuilder("id1").setStartTimeMs(1).build();
+    downloadIndex.putDownloadState(downloadState1);
+    DownloadState downloadState2 = new DownloadStateBuilder("id2").setStartTimeMs(0).build();
+    downloadIndex.putDownloadState(downloadState2);
+
+    DownloadStateCursor cursor = downloadIndex.getDownloadStates();
+
+    assertThat(cursor.getCount()).isEqualTo(2);
+    cursor.moveToNext();
+    assertEqual(cursor.getDownloadState(), downloadState2);
+    cursor.moveToNext();
+    assertEqual(cursor.getDownloadState(), downloadState1);
+  }
+
+  @Test
+  public void getDownloadStates_withStates_returnsAllDownloadStatusWithTheSameStates() {
+    DownloadState downloadState1 =
+        new DownloadStateBuilder("id1")
+            .setStartTimeMs(0)
+            .setState(DownloadState.STATE_REMOVED)
+            .build();
+    downloadIndex.putDownloadState(downloadState1);
+    DownloadState downloadState2 =
+        new DownloadStateBuilder("id2")
+            .setStartTimeMs(1)
+            .setState(DownloadState.STATE_STOPPED)
+            .build();
+    downloadIndex.putDownloadState(downloadState2);
+    DownloadState downloadState3 =
+        new DownloadStateBuilder("id3")
+            .setStartTimeMs(2)
+            .setState(DownloadState.STATE_COMPLETED)
+            .build();
+    downloadIndex.putDownloadState(downloadState3);
+
+    DownloadStateCursor cursor =
+        downloadIndex.getDownloadStates(DownloadState.STATE_REMOVED, DownloadState.STATE_COMPLETED);
+
+    assertThat(cursor.getCount()).isEqualTo(2);
+    cursor.moveToNext();
+    assertEqual(cursor.getDownloadState(), downloadState1);
+    cursor.moveToNext();
+    assertEqual(cursor.getDownloadState(), downloadState3);
+  }
+
+  @Test
+  public void doesTableExist_nonExistingTable_returnsFalse() {
+    DatabaseProviderImpl databaseProvider = new DatabaseProviderImpl();
+
+    assertThat(DefaultDownloadIndex.doesTableExist(databaseProvider, "NonExistingTable")).isFalse();
+
+    databaseProvider.close();
+  }
+
+  @Test
+  public void doesTableExist_existingTable_returnsTrue() {
+    DatabaseProviderImpl databaseProvider = new DatabaseProviderImpl();
+    String tableName = "ExistingTable";
+    databaseProvider.getWritableDatabase().execSQL("CREATE TABLE " + tableName + "(dummy)");
+
+    assertThat(DefaultDownloadIndex.doesTableExist(databaseProvider, tableName)).isTrue();
+
+    databaseProvider.close();
+  }
+
+  @Test
+  public void getVersion_nonExistingTable_returnsZero() {
+    DatabaseProviderImpl databaseProvider = new DatabaseProviderImpl();
+    DefaultDownloadIndex.VersionTable versionTable =
+        new DefaultDownloadIndex.VersionTable(databaseProvider);
+
+    int version = versionTable.getVersion(FEATURE_OFFLINE);
+
+    assertThat(version).isEqualTo(0);
+    databaseProvider.close();
+  }
+
+  @Test
+  public void getVersion_returnsSetVersion() {
+    DatabaseProviderImpl databaseProvider = new DatabaseProviderImpl();
+    DefaultDownloadIndex.VersionTable versionTable =
+        new DefaultDownloadIndex.VersionTable(databaseProvider);
+
+    versionTable.setVersion(FEATURE_OFFLINE, 1);
+    assertThat(versionTable.getVersion(FEATURE_OFFLINE)).isEqualTo(1);
+
+    versionTable.setVersion(FEATURE_OFFLINE, 10);
+    assertThat(versionTable.getVersion(FEATURE_OFFLINE)).isEqualTo(10);
+
+    versionTable.setVersion(FEATURE_CACHE, 5);
+    assertThat(versionTable.getVersion(FEATURE_CACHE)).isEqualTo(5);
+    assertThat(versionTable.getVersion(FEATURE_OFFLINE)).isEqualTo(10);
+
+    databaseProvider.close();
+  }
+
+  @Test
+  public void downloadStateTableConstructor_noTable_createsTable() {
+    DatabaseProviderImpl databaseProvider = new DatabaseProviderImpl();
+    assertThat(
+            DefaultDownloadIndex.doesTableExist(
+                databaseProvider, DefaultDownloadIndex.DownloadStateTable.TABLE_NAME))
+        .isFalse();
+
+    new DefaultDownloadIndex.DownloadStateTable(databaseProvider);
+
+    assertThat(
+            DefaultDownloadIndex.doesTableExist(
+                databaseProvider, DefaultDownloadIndex.DownloadStateTable.TABLE_NAME))
+        .isTrue();
+
+    databaseProvider.close();
+  }
+
+  @Test
+  public void downloadStateTableConstructor_versionZero_versionSet() {
+    DatabaseProviderImpl databaseProvider = new DatabaseProviderImpl();
+
+    new DefaultDownloadIndex.DownloadStateTable(databaseProvider);
+
+    DefaultDownloadIndex.VersionTable versionTable =
+        new DefaultDownloadIndex.VersionTable(databaseProvider);
+    assertThat(versionTable.getVersion(FEATURE_OFFLINE))
+        .isEqualTo(DefaultDownloadIndex.DownloadStateTable.TABLE_VERSION);
+    databaseProvider.close();
+  }
+
+  @Test
+  public void downloadStateTableConstructor_greaterVersion_tableRecreated() {
+    DatabaseProviderImpl databaseProvider = new DatabaseProviderImpl();
+    databaseProvider
+        .getWritableDatabase()
+        .execSQL("CREATE TABLE " + DefaultDownloadIndex.DownloadStateTable.TABLE_NAME + "(dummy)");
+    DefaultDownloadIndex.VersionTable versionTable =
+        new DefaultDownloadIndex.VersionTable(databaseProvider);
+    versionTable.setVersion(FEATURE_OFFLINE, Integer.MAX_VALUE);
+
+    DefaultDownloadIndex.DownloadStateTable downloadStateTable =
+        new DefaultDownloadIndex.DownloadStateTable(databaseProvider);
+    String id = "id";
+    DownloadState downloadState = new DownloadStateBuilder(id).build();
+    downloadStateTable.replace(downloadState);
+    DownloadState readDownloadState = downloadStateTable.get(id);
+    assertEqual(readDownloadState, downloadState);
+
+    assertThat(versionTable.getVersion(FEATURE_OFFLINE))
+        .isEqualTo(DefaultDownloadIndex.DownloadStateTable.TABLE_VERSION);
+    databaseProvider.close();
+  }
+
+  private static void assertEqual(DownloadState downloadState, DownloadState expected) {
+    assertThat(areEqual(downloadState, expected)).isTrue();
+  }
+
+  private static boolean areEqual(DownloadState downloadState, DownloadState that) {
+    if (downloadState.state != that.state) {
+      return false;
+    }
+    if (Float.compare(that.downloadPercentage, downloadState.downloadPercentage) != 0) {
+      return false;
+    }
+    if (downloadState.downloadedBytes != that.downloadedBytes) {
+      return false;
+    }
+    if (downloadState.totalBytes != that.totalBytes) {
+      return false;
+    }
+    if (downloadState.startTimeMs != that.startTimeMs) {
+      return false;
+    }
+    if (downloadState.updateTimeMs != that.updateTimeMs) {
+      return false;
+    }
+    if (downloadState.failureReason != that.failureReason) {
+      return false;
+    }
+    if (downloadState.stopFlags != that.stopFlags) {
+      return false;
+    }
+    if (!downloadState.id.equals(that.id)) {
+      return false;
+    }
+    if (!downloadState.type.equals(that.type)) {
+      return false;
+    }
+    if (!downloadState.uri.equals(that.uri)) {
+      return false;
+    }
+    if (downloadState.cacheKey != null
+        ? !downloadState.cacheKey.equals(that.cacheKey)
+        : that.cacheKey != null) {
+      return false;
+    }
+    if (!Arrays.equals(downloadState.streamKeys, that.streamKeys)) {
+      return false;
+    }
+    return Arrays.equals(downloadState.customMetadata, that.customMetadata);
+  }
+
+  private static class DownloadStateBuilder {
+    private String id;
+    private String type;
+    private String uri;
+    @Nullable private String cacheKey;
+    private int state;
+    private float downloadPercentage;
+    private long downloadedBytes;
+    private long totalBytes;
+    private int failureReason;
+    private int stopFlags;
+    private long startTimeMs;
+    private long updateTimeMs;
+    private StreamKey[] streamKeys;
+    private byte[] customMetadata;
+
+    private DownloadStateBuilder(String id) {
+      this.id = id;
+      this.type = "type";
+      this.uri = "uri";
+      this.cacheKey = null;
+      this.state = DownloadState.STATE_QUEUED;
+      this.downloadPercentage = (float) C.PERCENTAGE_UNSET;
+      this.downloadedBytes = (long) 0;
+      this.totalBytes = (long) C.LENGTH_UNSET;
+      this.failureReason = DownloadState.FAILURE_REASON_NONE;
+      this.stopFlags = 0;
+      this.startTimeMs = (long) 0;
+      this.updateTimeMs = (long) 0;
+      this.streamKeys = new StreamKey[0];
+      this.customMetadata = new byte[0];
+    }
+
+    public DownloadStateBuilder setId(String id) {
+      this.id = id;
+      return this;
+    }
+
+    public DownloadStateBuilder setType(String type) {
+      this.type = type;
+      return this;
+    }
+
+    public DownloadStateBuilder setUri(String uri) {
+      this.uri = uri;
+      return this;
+    }
+
+    public DownloadStateBuilder setCacheKey(@Nullable String cacheKey) {
+      this.cacheKey = cacheKey;
+      return this;
+    }
+
+    public DownloadStateBuilder setState(int state) {
+      this.state = state;
+      return this;
+    }
+
+    public DownloadStateBuilder setDownloadPercentage(float downloadPercentage) {
+      this.downloadPercentage = downloadPercentage;
+      return this;
+    }
+
+    public DownloadStateBuilder setDownloadedBytes(long downloadedBytes) {
+      this.downloadedBytes = downloadedBytes;
+      return this;
+    }
+
+    public DownloadStateBuilder setTotalBytes(long totalBytes) {
+      this.totalBytes = totalBytes;
+      return this;
+    }
+
+    public DownloadStateBuilder setFailureReason(int failureReason) {
+      this.failureReason = failureReason;
+      return this;
+    }
+
+    public DownloadStateBuilder setStopFlags(int stopFlags) {
+      this.stopFlags = stopFlags;
+      return this;
+    }
+
+    public DownloadStateBuilder setStartTimeMs(long startTimeMs) {
+      this.startTimeMs = startTimeMs;
+      return this;
+    }
+
+    public DownloadStateBuilder setUpdateTimeMs(long updateTimeMs) {
+      this.updateTimeMs = updateTimeMs;
+      return this;
+    }
+
+    public DownloadStateBuilder setStreamKeys(StreamKey... streamKeys) {
+      this.streamKeys = streamKeys;
+      return this;
+    }
+
+    public DownloadStateBuilder setCustomMetadata(byte[] customMetadata) {
+      this.customMetadata = customMetadata;
+      return this;
+    }
+
+    public DownloadState build() {
+      return new DownloadState(
+          id,
+          type,
+          Uri.parse(uri),
+          cacheKey,
+          state,
+          downloadPercentage,
+          downloadedBytes,
+          totalBytes,
+          failureReason,
+          stopFlags,
+          startTimeMs,
+          updateTimeMs,
+          streamKeys,
+          customMetadata);
+    }
+  }
+
+  private static final class DatabaseProviderImpl extends SQLiteOpenHelper
+      implements DefaultDownloadIndex.DatabaseProvider {
+    private static final int DATABASE_VERSION = 1;
+    private static final String DATABASE_NAME = "TestExoPlayerDownloadIndex.db";
+
+    public DatabaseProviderImpl() {
+      super(RuntimeEnvironment.application, DATABASE_NAME, null, DATABASE_VERSION);
+    }
+
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+      // Do nothing.
+    }
+
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+      // Do nothing.
+    }
+  }
+}

From 71d4f39400f20743e01c98f6e1f9a06a0200cfaa Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Thu, 10 Jan 2019 14:46:40 +0000
Subject: [PATCH 373/832] Call Listener methods on the thread started
 RequirementsWatcher

PiperOrigin-RevId: 228701917
---
 .../scheduler/RequirementsWatcher.java        | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
index 021c10439a..fded95614c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
@@ -68,6 +68,7 @@ public final class RequirementsWatcher {
 
   private int notMetRequirements;
   private CapabilityValidatedCallback networkCallback;
+  private Handler handler;
 
   /**
    * @param context Any context.
@@ -87,6 +88,7 @@ public final class RequirementsWatcher {
    */
   public void start() {
     Assertions.checkNotNull(Looper.myLooper());
+    handler = new Handler();
 
     notMetRequirements = requirements.getNotMetRequirements(context);
 
@@ -111,7 +113,7 @@ public final class RequirementsWatcher {
       }
     }
     receiver = new DeviceStatusChangeReceiver();
-    context.registerReceiver(receiver, filter, null, new Handler());
+    context.registerReceiver(receiver, filter, null, handler);
     logd(this + " started");
   }
 
@@ -195,16 +197,22 @@ public final class RequirementsWatcher {
   private final class CapabilityValidatedCallback extends ConnectivityManager.NetworkCallback {
     @Override
     public void onAvailable(Network network) {
-      super.onAvailable(network);
-      logd(RequirementsWatcher.this + " NetworkCallback.onAvailable");
-      checkRequirements();
+      onNetworkCallback();
     }
 
     @Override
     public void onLost(Network network) {
-      super.onLost(network);
-      logd(RequirementsWatcher.this + " NetworkCallback.onLost");
-      checkRequirements();
+      onNetworkCallback();
+    }
+
+    private void onNetworkCallback() {
+      handler.post(
+          () -> {
+            if (networkCallback != null) {
+              logd(RequirementsWatcher.this + " NetworkCallback");
+              checkRequirements();
+            }
+          });
     }
   }
 }

From 2d30d66746242018a3aff0f239048e93c34ecc0f Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 11 Jan 2019 18:39:27 +0000
Subject: [PATCH 374/832] Fix release of DRM sessions

There were some edge cases in which we'd forget to release DRM
sessions. For example if we read a format and acquired a
pendingDrmSession (in onInputFormatChanged), then immediately
read another format and overwrote pendingDrmSession, we'd
forget to release the one that's been overwritten.

This change hopefully makes release much clearer. We keep a list
of all drm sessions we're currently holding. Whenever we update
either drmSession or pendingDrmSession, we release any other
sessions that are in the list.

PiperOrigin-RevId: 228905465
---
 .../ext/vp9/LibvpxVideoRenderer.java          |  82 +++++++------
 .../audio/AudioRendererEventListener.java     |   1 +
 .../audio/MediaCodecAudioRenderer.java        |   1 -
 .../audio/SimpleDecoderAudioRenderer.java     |  81 +++++++------
 .../mediacodec/MediaCodecRenderer.java        | 111 +++++++++---------
 .../video/MediaCodecVideoRenderer.java        |   1 -
 .../video/VideoRendererEventListener.java     |   1 +
 7 files changed, 148 insertions(+), 130 deletions(-)

diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
index e3081cd2d2..e61030a2e1 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
@@ -127,8 +127,8 @@ public class LibvpxVideoRenderer extends BaseRenderer {
   private VpxDecoder decoder;
   private VpxInputBuffer inputBuffer;
   private VpxOutputBuffer outputBuffer;
-  private DrmSession<ExoMediaCrypto> drmSession;
-  private DrmSession<ExoMediaCrypto> pendingDrmSession;
+  @Nullable private DrmSession<ExoMediaCrypto> decoderDrmSession;
+  @Nullable private DrmSession<ExoMediaCrypto> sourceDrmSession;
 
   private @ReinitializationState int decoderReinitializationState;
   private boolean decoderReceivedBuffers;
@@ -364,24 +364,10 @@ public class LibvpxVideoRenderer extends BaseRenderer {
     clearReportedVideoSize();
     clearRenderedFirstFrame();
     try {
+      setSourceDrmSession(null);
       releaseDecoder();
     } finally {
-      try {
-        if (drmSession != null) {
-          drmSessionManager.releaseSession(drmSession);
-        }
-      } finally {
-        try {
-          if (pendingDrmSession != null && pendingDrmSession != drmSession) {
-            drmSessionManager.releaseSession(pendingDrmSession);
-          }
-        } finally {
-          drmSession = null;
-          pendingDrmSession = null;
-          decoderCounters.ensureUpdated();
-          eventDispatcher.disabled(decoderCounters);
-        }
-      }
+      eventDispatcher.disabled(decoderCounters);
     }
   }
 
@@ -433,18 +419,35 @@ public class LibvpxVideoRenderer extends BaseRenderer {
   /** Releases the decoder. */
   @CallSuper
   protected void releaseDecoder() {
-    if (decoder == null) {
-      return;
-    }
-
     inputBuffer = null;
     outputBuffer = null;
-    decoder.release();
-    decoder = null;
-    decoderCounters.decoderReleaseCount++;
     decoderReinitializationState = REINITIALIZATION_STATE_NONE;
     decoderReceivedBuffers = false;
     buffersInCodecCount = 0;
+    if (decoder != null) {
+      decoder.release();
+      decoder = null;
+      decoderCounters.decoderReleaseCount++;
+    }
+    setDecoderDrmSession(null);
+  }
+
+  private void setSourceDrmSession(@Nullable DrmSession<ExoMediaCrypto> session) {
+    DrmSession<ExoMediaCrypto> previous = sourceDrmSession;
+    sourceDrmSession = session;
+    releaseDrmSessionIfUnused(previous);
+  }
+
+  private void setDecoderDrmSession(@Nullable DrmSession<ExoMediaCrypto> session) {
+    DrmSession<ExoMediaCrypto> previous = decoderDrmSession;
+    decoderDrmSession = session;
+    releaseDrmSessionIfUnused(previous);
+  }
+
+  private void releaseDrmSessionIfUnused(@Nullable DrmSession<ExoMediaCrypto> session) {
+    if (session != null && session != decoderDrmSession && session != sourceDrmSession) {
+      drmSessionManager.releaseSession(session);
+    }
   }
 
   /**
@@ -467,16 +470,20 @@ public class LibvpxVideoRenderer extends BaseRenderer {
           throw ExoPlaybackException.createForRenderer(
               new IllegalStateException("Media requires a DrmSessionManager"), getIndex());
         }
-        pendingDrmSession = drmSessionManager.acquireSession(Looper.myLooper(), format.drmInitData);
-        if (pendingDrmSession == drmSession) {
-          drmSessionManager.releaseSession(pendingDrmSession);
+        DrmSession<ExoMediaCrypto> session =
+            drmSessionManager.acquireSession(Looper.myLooper(), newFormat.drmInitData);
+        if (session == decoderDrmSession || session == sourceDrmSession) {
+          // We already had this session. The manager must be reference counting, so release it once
+          // to get the count attributed to this renderer back down to 1.
+          drmSessionManager.releaseSession(session);
         }
+        setSourceDrmSession(session);
       } else {
-        pendingDrmSession = null;
+        setSourceDrmSession(null);
       }
     }
 
-    if (pendingDrmSession != drmSession) {
+    if (sourceDrmSession != decoderDrmSession) {
       if (decoderReceivedBuffers) {
         // Signal end of stream and wait for any final output buffers before re-initialization.
         decoderReinitializationState = REINITIALIZATION_STATE_SIGNAL_END_OF_STREAM;
@@ -704,12 +711,13 @@ public class LibvpxVideoRenderer extends BaseRenderer {
       return;
     }
 
-    drmSession = pendingDrmSession;
+    setDecoderDrmSession(sourceDrmSession);
+
     ExoMediaCrypto mediaCrypto = null;
-    if (drmSession != null) {
-      mediaCrypto = drmSession.getMediaCrypto();
+    if (decoderDrmSession != null) {
+      mediaCrypto = decoderDrmSession.getMediaCrypto();
       if (mediaCrypto == null) {
-        DrmSessionException drmError = drmSession.getError();
+        DrmSessionException drmError = decoderDrmSession.getError();
         if (drmError != null) {
           // Continue for now. We may be able to avoid failure if the session recovers, or if a new
           // input format causes the session to be replaced before it's used.
@@ -922,12 +930,12 @@ public class LibvpxVideoRenderer extends BaseRenderer {
   }
 
   private boolean shouldWaitForKeys(boolean bufferEncrypted) throws ExoPlaybackException {
-    if (drmSession == null || (!bufferEncrypted && playClearSamplesWithoutKeys)) {
+    if (decoderDrmSession == null || (!bufferEncrypted && playClearSamplesWithoutKeys)) {
       return false;
     }
-    @DrmSession.State int drmSessionState = drmSession.getState();
+    @DrmSession.State int drmSessionState = decoderDrmSession.getState();
     if (drmSessionState == DrmSession.STATE_ERROR) {
-      throw ExoPlaybackException.createForRenderer(drmSession.getError(), getIndex());
+      throw ExoPlaybackException.createForRenderer(decoderDrmSession.getError(), getIndex());
     }
     return drmSessionState != DrmSession.STATE_OPENED_WITH_KEYS;
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java
index eff7bc8de2..48fbea75b4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java
@@ -147,6 +147,7 @@ public interface AudioRendererEventListener {
      * Invokes {@link AudioRendererEventListener#onAudioDisabled(DecoderCounters)}.
      */
     public void disabled(final DecoderCounters counters) {
+      counters.ensureUpdated();
       if (listener != null) {
         handler.post(
             () -> {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
index 49c391c4cc..7fc6c16db8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
@@ -548,7 +548,6 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
       try {
         super.onDisabled();
       } finally {
-        decoderCounters.ensureUpdated();
         eventDispatcher.disabled(decoderCounters);
       }
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
index bfd7bbc165..f2e8a23811 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
@@ -106,8 +106,8 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
         ? extends AudioDecoderException> decoder;
   private DecoderInputBuffer inputBuffer;
   private SimpleOutputBuffer outputBuffer;
-  private DrmSession<ExoMediaCrypto> drmSession;
-  private DrmSession<ExoMediaCrypto> pendingDrmSession;
+  @Nullable private DrmSession<ExoMediaCrypto> decoderDrmSession;
+  @Nullable private DrmSession<ExoMediaCrypto> sourceDrmSession;
 
   @ReinitializationState private int decoderReinitializationState;
   private boolean decoderReceivedBuffers;
@@ -462,12 +462,12 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
   }
 
   private boolean shouldWaitForKeys(boolean bufferEncrypted) throws ExoPlaybackException {
-    if (drmSession == null || (!bufferEncrypted && playClearSamplesWithoutKeys)) {
+    if (decoderDrmSession == null || (!bufferEncrypted && playClearSamplesWithoutKeys)) {
       return false;
     }
-    @DrmSession.State int drmSessionState = drmSession.getState();
+    @DrmSession.State int drmSessionState = decoderDrmSession.getState();
     if (drmSessionState == DrmSession.STATE_ERROR) {
-      throw ExoPlaybackException.createForRenderer(drmSession.getError(), getIndex());
+      throw ExoPlaybackException.createForRenderer(decoderDrmSession.getError(), getIndex());
     }
     return drmSessionState != DrmSession.STATE_OPENED_WITH_KEYS;
   }
@@ -568,25 +568,11 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
     audioTrackNeedsConfigure = true;
     waitingForKeys = false;
     try {
+      setSourceDrmSession(null);
       releaseDecoder();
       audioSink.reset();
     } finally {
-      try {
-        if (drmSession != null) {
-          drmSessionManager.releaseSession(drmSession);
-        }
-      } finally {
-        try {
-          if (pendingDrmSession != null && pendingDrmSession != drmSession) {
-            drmSessionManager.releaseSession(pendingDrmSession);
-          }
-        } finally {
-          drmSession = null;
-          pendingDrmSession = null;
-          decoderCounters.ensureUpdated();
-          eventDispatcher.disabled(decoderCounters);
-        }
-      }
+      eventDispatcher.disabled(decoderCounters);
     }
   }
 
@@ -615,12 +601,13 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
       return;
     }
 
-    drmSession = pendingDrmSession;
+    setDecoderDrmSession(sourceDrmSession);
+
     ExoMediaCrypto mediaCrypto = null;
-    if (drmSession != null) {
-      mediaCrypto = drmSession.getMediaCrypto();
+    if (decoderDrmSession != null) {
+      mediaCrypto = decoderDrmSession.getMediaCrypto();
       if (mediaCrypto == null) {
-        DrmSessionException drmError = drmSession.getError();
+        DrmSessionException drmError = decoderDrmSession.getError();
         if (drmError != null) {
           // Continue for now. We may be able to avoid failure if the session recovers, or if a new
           // input format causes the session to be replaced before it's used.
@@ -646,17 +633,34 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
   }
 
   private void releaseDecoder() {
-    if (decoder == null) {
-      return;
-    }
-
     inputBuffer = null;
     outputBuffer = null;
-    decoder.release();
-    decoder = null;
-    decoderCounters.decoderReleaseCount++;
     decoderReinitializationState = REINITIALIZATION_STATE_NONE;
     decoderReceivedBuffers = false;
+    if (decoder != null) {
+      decoder.release();
+      decoder = null;
+      decoderCounters.decoderReleaseCount++;
+    }
+    setDecoderDrmSession(null);
+  }
+
+  private void setSourceDrmSession(@Nullable DrmSession<ExoMediaCrypto> session) {
+    DrmSession<ExoMediaCrypto> previous = sourceDrmSession;
+    sourceDrmSession = session;
+    releaseDrmSessionIfUnused(previous);
+  }
+
+  private void setDecoderDrmSession(@Nullable DrmSession<ExoMediaCrypto> session) {
+    DrmSession<ExoMediaCrypto> previous = decoderDrmSession;
+    decoderDrmSession = session;
+    releaseDrmSessionIfUnused(previous);
+  }
+
+  private void releaseDrmSessionIfUnused(@Nullable DrmSession<ExoMediaCrypto> session) {
+    if (session != null && session != decoderDrmSession && session != sourceDrmSession) {
+      drmSessionManager.releaseSession(session);
+    }
   }
 
   private void onInputFormatChanged(Format newFormat) throws ExoPlaybackException {
@@ -671,13 +675,16 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
           throw ExoPlaybackException.createForRenderer(
               new IllegalStateException("Media requires a DrmSessionManager"), getIndex());
         }
-        pendingDrmSession = drmSessionManager.acquireSession(Looper.myLooper(),
-            inputFormat.drmInitData);
-        if (pendingDrmSession == drmSession) {
-          drmSessionManager.releaseSession(pendingDrmSession);
+        DrmSession<ExoMediaCrypto> session =
+            drmSessionManager.acquireSession(Looper.myLooper(), newFormat.drmInitData);
+        if (session == decoderDrmSession || session == sourceDrmSession) {
+          // We already had this session. The manager must be reference counting, so release it once
+          // to get the count attributed to this renderer back down to 1.
+          drmSessionManager.releaseSession(session);
         }
+        setSourceDrmSession(session);
       } else {
-        pendingDrmSession = null;
+        setSourceDrmSession(null);
       }
     }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index b578467933..a538bca4b2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -287,13 +287,13 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   private final DecoderInputBuffer flagsOnlyBuffer;
   private final FormatHolder formatHolder;
   private final TimedValueQueue<Format> formatQueue;
-  private final List<Long> decodeOnlyPresentationTimestamps;
+  private final ArrayList<Long> decodeOnlyPresentationTimestamps;
   private final MediaCodec.BufferInfo outputBufferInfo;
 
   @Nullable private Format inputFormat;
   private Format outputFormat;
-  private DrmSession<FrameworkMediaCrypto> drmSession;
-  private DrmSession<FrameworkMediaCrypto> pendingDrmSession;
+  @Nullable private DrmSession<FrameworkMediaCrypto> codecDrmSession;
+  @Nullable private DrmSession<FrameworkMediaCrypto> sourceDrmSession;
   private long renderTimeLimitMs;
   private float rendererOperatingRate;
   @Nullable private MediaCodec codec;
@@ -457,14 +457,15 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
       return;
     }
 
-    drmSession = pendingDrmSession;
+    setCodecDrmSession(sourceDrmSession);
+
     String mimeType = inputFormat.sampleMimeType;
     MediaCrypto wrappedMediaCrypto = null;
     boolean drmSessionRequiresSecureDecoder = false;
-    if (drmSession != null) {
-      FrameworkMediaCrypto mediaCrypto = drmSession.getMediaCrypto();
+    if (codecDrmSession != null) {
+      FrameworkMediaCrypto mediaCrypto = codecDrmSession.getMediaCrypto();
       if (mediaCrypto == null) {
-        DrmSessionException drmError = drmSession.getError();
+        DrmSessionException drmError = codecDrmSession.getError();
         if (drmError != null) {
           // Continue for now. We may be able to avoid failure if the session recovers, or if a new
           // input format causes the session to be replaced before it's used.
@@ -477,9 +478,9 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
         drmSessionRequiresSecureDecoder = mediaCrypto.requiresSecureDecoderComponent(mimeType);
       }
       if (deviceNeedsDrmKeysToConfigureCodecWorkaround()) {
-        @DrmSession.State int drmSessionState = drmSession.getState();
+        @DrmSession.State int drmSessionState = codecDrmSession.getState();
         if (drmSessionState == DrmSession.STATE_ERROR) {
-          throw ExoPlaybackException.createForRenderer(drmSession.getError(), getIndex());
+          throw ExoPlaybackException.createForRenderer(codecDrmSession.getError(), getIndex());
         } else if (drmSessionState != DrmSession.STATE_OPENED_WITH_KEYS) {
           // Wait for keys.
           return;
@@ -552,7 +553,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   @Override
   protected void onDisabled() {
     inputFormat = null;
-    if (drmSession != null || pendingDrmSession != null) {
+    if (codecDrmSession != null || sourceDrmSession != null) {
       // TODO: Do something better with this case.
       onReset();
     } else {
@@ -565,51 +566,32 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     try {
       releaseCodec();
     } finally {
-      try {
-        if (drmSession != null) {
-          drmSessionManager.releaseSession(drmSession);
-        }
-      } finally {
-        try {
-          if (pendingDrmSession != null && pendingDrmSession != drmSession) {
-            drmSessionManager.releaseSession(pendingDrmSession);
-          }
-        } finally {
-          drmSession = null;
-          pendingDrmSession = null;
-        }
-      }
+      setSourceDrmSession(null);
     }
   }
 
   protected void releaseCodec() {
     availableCodecInfos = null;
-    if (codec != null) {
-      codecInfo = null;
-      codecFormat = null;
-      resetInputBuffer();
-      resetOutputBuffer();
-      resetCodecBuffers();
-      waitingForKeys = false;
-      codecHotswapDeadlineMs = C.TIME_UNSET;
-      decodeOnlyPresentationTimestamps.clear();
-      decoderCounters.decoderReleaseCount++;
-      try {
-        codec.stop();
-      } finally {
+    codecInfo = null;
+    codecFormat = null;
+    resetInputBuffer();
+    resetOutputBuffer();
+    resetCodecBuffers();
+    waitingForKeys = false;
+    codecHotswapDeadlineMs = C.TIME_UNSET;
+    decodeOnlyPresentationTimestamps.clear();
+    try {
+      if (codec != null) {
+        decoderCounters.decoderReleaseCount++;
         try {
-          codec.release();
+          codec.stop();
         } finally {
-          codec = null;
-          if (drmSession != null && pendingDrmSession != drmSession) {
-            try {
-              drmSessionManager.releaseSession(drmSession);
-            } finally {
-              drmSession = null;
-            }
-          }
+          codec.release();
         }
       }
+    } finally {
+      codec = null;
+      setCodecDrmSession(null);
     }
   }
 
@@ -928,6 +910,24 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     outputBuffer = null;
   }
 
+  private void setSourceDrmSession(@Nullable DrmSession<FrameworkMediaCrypto> session) {
+    DrmSession<FrameworkMediaCrypto> previous = sourceDrmSession;
+    sourceDrmSession = session;
+    releaseDrmSessionIfUnused(previous);
+  }
+
+  private void setCodecDrmSession(@Nullable DrmSession<FrameworkMediaCrypto> session) {
+    DrmSession<FrameworkMediaCrypto> previous = codecDrmSession;
+    codecDrmSession = session;
+    releaseDrmSessionIfUnused(previous);
+  }
+
+  private void releaseDrmSessionIfUnused(@Nullable DrmSession<FrameworkMediaCrypto> session) {
+    if (session != null && session != codecDrmSession && session != sourceDrmSession) {
+      drmSessionManager.releaseSession(session);
+    }
+  }
+
   /**
    * @return Whether it may be possible to feed more input data.
    * @throws ExoPlaybackException If an error occurs feeding the input buffer.
@@ -1082,12 +1082,12 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   }
 
   private boolean shouldWaitForKeys(boolean bufferEncrypted) throws ExoPlaybackException {
-    if (drmSession == null || (!bufferEncrypted && playClearSamplesWithoutKeys)) {
+    if (codecDrmSession == null || (!bufferEncrypted && playClearSamplesWithoutKeys)) {
       return false;
     }
-    @DrmSession.State int drmSessionState = drmSession.getState();
+    @DrmSession.State int drmSessionState = codecDrmSession.getState();
     if (drmSessionState == DrmSession.STATE_ERROR) {
-      throw ExoPlaybackException.createForRenderer(drmSession.getError(), getIndex());
+      throw ExoPlaybackException.createForRenderer(codecDrmSession.getError(), getIndex());
     }
     return drmSessionState != DrmSession.STATE_OPENED_WITH_KEYS;
   }
@@ -1126,13 +1126,16 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
           throw ExoPlaybackException.createForRenderer(
               new IllegalStateException("Media requires a DrmSessionManager"), getIndex());
         }
-        pendingDrmSession =
+        DrmSession<FrameworkMediaCrypto> session =
             drmSessionManager.acquireSession(Looper.myLooper(), newFormat.drmInitData);
-        if (pendingDrmSession == drmSession) {
-          drmSessionManager.releaseSession(pendingDrmSession);
+        if (session == codecDrmSession || session == sourceDrmSession) {
+          // We already had this session. The manager must be reference counting, so release it once
+          // to get the count attributed to this renderer back down to 1.
+          drmSessionManager.releaseSession(session);
         }
+        setSourceDrmSession(session);
       } else {
-        pendingDrmSession = null;
+        setSourceDrmSession(null);
       }
     }
 
@@ -1143,7 +1146,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
 
     // We have an existing codec that we may need to reconfigure or re-initialize. If the existing
     // codec instance is being kept then its operating rate may need to be updated.
-    if (pendingDrmSession != drmSession) {
+    if (sourceDrmSession != codecDrmSession) {
       drainAndReinitializeCodec();
     } else {
       switch (canKeepCodec(codec, codecInfo, codecFormat, newFormat)) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index 7c4287710d..b92dd44eb2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -375,7 +375,6 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
     try {
       super.onDisabled();
     } finally {
-      decoderCounters.ensureUpdated();
       eventDispatcher.disabled(decoderCounters);
     }
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java b/library/core/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java
index 7d78ba03c7..f2f451b3d0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java
@@ -179,6 +179,7 @@ public interface VideoRendererEventListener {
 
     /** Invokes {@link VideoRendererEventListener#onVideoDisabled(DecoderCounters)}. */
     public void disabled(DecoderCounters counters) {
+      counters.ensureUpdated();
       if (listener != null) {
         handler.post(
             () -> {

From 1f03093dc52c7e5ddd22ad9675d4037ea9a0aa92 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 11 Jan 2019 19:02:00 +0000
Subject: [PATCH 375/832] DRM: Pass sessionId rather than MediaCrypto

ExoMediaCrypto.requiresSecureDecoderComponent() is removed, and
FrameworkMediaCrypto.forceAllowInsecureDecoderComponents is made
public to allow determining whether a secure decoder is required
to be implemented in MediaCodecRenderer.

PiperOrigin-RevId: 228909771
---
 .../exoplayer2/drm/ExoMediaCrypto.java        | 13 +----
 .../android/exoplayer2/drm/ExoMediaDrm.java   |  6 +--
 .../exoplayer2/drm/FrameworkMediaCrypto.java  | 53 +++++++------------
 .../exoplayer2/drm/FrameworkMediaDrm.java     |  3 +-
 .../mediacodec/MediaCodecRenderer.java        | 50 +++++++++++------
 5 files changed, 58 insertions(+), 67 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaCrypto.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaCrypto.java
index d5a4f6add5..feba7eaaf4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaCrypto.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaCrypto.java
@@ -15,14 +15,5 @@
  */
 package com.google.android.exoplayer2.drm;
 
-/**
- * An opaque {@link android.media.MediaCrypto} equivalent.
- */
-public interface ExoMediaCrypto {
-
-  /**
-   * @see android.media.MediaCrypto#requiresSecureDecoderComponent(String)
-   */
-  boolean requiresSecureDecoderComponent(String mimeType);
-
-}
+/** An opaque {@link android.media.MediaCrypto} equivalent. */
+public interface ExoMediaCrypto {}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java
index 24c3ddbbd0..aca56139de 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java
@@ -265,11 +265,9 @@ public interface ExoMediaDrm<T extends ExoMediaCrypto> {
 
   /**
    * @see android.media.MediaCrypto#MediaCrypto(UUID, byte[])
-   *
-   * @param initData Opaque initialization data specific to the crypto scheme.
+   * @param sessionId The DRM session ID.
    * @return An object extends {@link ExoMediaCrypto}, using opaque crypto scheme specific data.
    * @throws MediaCryptoException If the instance can't be created.
    */
-  T createMediaCrypto(byte[] initData) throws MediaCryptoException;
-
+  T createMediaCrypto(byte[] sessionId) throws MediaCryptoException;
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaCrypto.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaCrypto.java
index 4e58ed6a31..156138ab9b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaCrypto.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaCrypto.java
@@ -17,48 +17,35 @@ package com.google.android.exoplayer2.drm;
 
 import android.annotation.TargetApi;
 import android.media.MediaCrypto;
-import com.google.android.exoplayer2.util.Assertions;
+import java.util.UUID;
 
 /**
- * An {@link ExoMediaCrypto} implementation that wraps the framework {@link MediaCrypto}.
+ * An {@link ExoMediaCrypto} implementation that contains the necessary information to build or
+ * update a framework {@link MediaCrypto}.
  */
 @TargetApi(16)
 public final class FrameworkMediaCrypto implements ExoMediaCrypto {
 
-  private final MediaCrypto mediaCrypto;
-  private final boolean forceAllowInsecureDecoderComponents;
+  /** The DRM scheme UUID. */
+  public final UUID uuid;
+  /** The DRM session id. */
+  public final byte[] sessionId;
+  /**
+   * Whether to allow use of insecure decoder components even if the underlying platform says
+   * otherwise.
+   */
+  public final boolean forceAllowInsecureDecoderComponents;
 
   /**
-   * @param mediaCrypto The {@link MediaCrypto} to wrap.
+   * @param uuid The DRM scheme UUID.
+   * @param sessionId The DRM session id.
+   * @param forceAllowInsecureDecoderComponents Whether to allow use of insecure decoder components
+   *     even if the underlying platform says otherwise.
    */
-  public FrameworkMediaCrypto(MediaCrypto mediaCrypto) {
-    this(mediaCrypto, false);
-  }
-
-  /**
-   * @param mediaCrypto The {@link MediaCrypto} to wrap.
-   * @param forceAllowInsecureDecoderComponents Whether to force
-   *     {@link #requiresSecureDecoderComponent(String)} to return {@code false}, rather than
-   *     {@link MediaCrypto#requiresSecureDecoderComponent(String)} of the wrapped
-   *     {@link MediaCrypto}.
-   */
-  public FrameworkMediaCrypto(MediaCrypto mediaCrypto,
-      boolean forceAllowInsecureDecoderComponents) {
-    this.mediaCrypto = Assertions.checkNotNull(mediaCrypto);
+  public FrameworkMediaCrypto(
+      UUID uuid, byte[] sessionId, boolean forceAllowInsecureDecoderComponents) {
+    this.uuid = uuid;
+    this.sessionId = sessionId;
     this.forceAllowInsecureDecoderComponents = forceAllowInsecureDecoderComponents;
   }
-
-  /**
-   * Returns the wrapped {@link MediaCrypto}.
-   */
-  public MediaCrypto getWrappedMediaCrypto() {
-    return mediaCrypto;
-  }
-
-  @Override
-  public boolean requiresSecureDecoderComponent(String mimeType) {
-    return !forceAllowInsecureDecoderComponents
-        && mediaCrypto.requiresSecureDecoderComponent(mimeType);
-  }
-
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
index fda85a759c..b139288f98 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.drm;
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.media.DeniedByServerException;
-import android.media.MediaCrypto;
 import android.media.MediaCryptoException;
 import android.media.MediaDrm;
 import android.media.MediaDrmException;
@@ -210,7 +209,7 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
     boolean forceAllowInsecureDecoderComponents = Util.SDK_INT < 21
         && C.WIDEVINE_UUID.equals(uuid) && "L3".equals(getPropertyString("securityLevel"));
     return new FrameworkMediaCrypto(
-        new MediaCrypto(adjustUuid(uuid), initData), forceAllowInsecureDecoderComponents);
+        adjustUuid(uuid), initData, forceAllowInsecureDecoderComponents);
   }
 
   private static SchemeData getSchemeData(UUID uuid, List<SchemeData> schemeDatas) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index a538bca4b2..4736811841 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -20,6 +20,7 @@ import android.media.MediaCodec;
 import android.media.MediaCodec.CodecException;
 import android.media.MediaCodec.CryptoException;
 import android.media.MediaCrypto;
+import android.media.MediaCryptoException;
 import android.media.MediaFormat;
 import android.os.Bundle;
 import android.os.Looper;
@@ -294,6 +295,8 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   private Format outputFormat;
   @Nullable private DrmSession<FrameworkMediaCrypto> codecDrmSession;
   @Nullable private DrmSession<FrameworkMediaCrypto> sourceDrmSession;
+  @Nullable private MediaCrypto mediaCrypto;
+  private boolean drmSessionRequiresSecureDecoder;
   private long renderTimeLimitMs;
   private float rendererOperatingRate;
   @Nullable private MediaCodec codec;
@@ -460,22 +463,28 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     setCodecDrmSession(sourceDrmSession);
 
     String mimeType = inputFormat.sampleMimeType;
-    MediaCrypto wrappedMediaCrypto = null;
-    boolean drmSessionRequiresSecureDecoder = false;
     if (codecDrmSession != null) {
-      FrameworkMediaCrypto mediaCrypto = codecDrmSession.getMediaCrypto();
       if (mediaCrypto == null) {
-        DrmSessionException drmError = codecDrmSession.getError();
-        if (drmError != null) {
-          // Continue for now. We may be able to avoid failure if the session recovers, or if a new
-          // input format causes the session to be replaced before it's used.
+        FrameworkMediaCrypto sessionMediaCrypto = codecDrmSession.getMediaCrypto();
+        if (sessionMediaCrypto == null) {
+          DrmSessionException drmError = codecDrmSession.getError();
+          if (drmError != null) {
+            // Continue for now. We may be able to avoid failure if the session recovers, or if a
+            // new input format causes the session to be replaced before it's used.
+          } else {
+            // The drm session isn't open yet.
+            return;
+          }
         } else {
-          // The drm session isn't open yet.
-          return;
+          try {
+            mediaCrypto = new MediaCrypto(sessionMediaCrypto.uuid, sessionMediaCrypto.sessionId);
+          } catch (MediaCryptoException e) {
+            throw ExoPlaybackException.createForRenderer(e, getIndex());
+          }
+          drmSessionRequiresSecureDecoder =
+              !sessionMediaCrypto.forceAllowInsecureDecoderComponents
+                  && mediaCrypto.requiresSecureDecoderComponent(mimeType);
         }
-      } else {
-        wrappedMediaCrypto = mediaCrypto.getWrappedMediaCrypto();
-        drmSessionRequiresSecureDecoder = mediaCrypto.requiresSecureDecoderComponent(mimeType);
       }
       if (deviceNeedsDrmKeysToConfigureCodecWorkaround()) {
         @DrmSession.State int drmSessionState = codecDrmSession.getState();
@@ -489,7 +498,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     }
 
     try {
-      maybeInitCodecWithFallback(wrappedMediaCrypto, drmSessionRequiresSecureDecoder);
+      maybeInitCodecWithFallback(mediaCrypto, drmSessionRequiresSecureDecoder);
     } catch (DecoderInitializationException e) {
       throw ExoPlaybackException.createForRenderer(e, getIndex());
     }
@@ -553,7 +562,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   @Override
   protected void onDisabled() {
     inputFormat = null;
-    if (codecDrmSession != null || sourceDrmSession != null) {
+    if (sourceDrmSession != null || codecDrmSession != null) {
       // TODO: Do something better with this case.
       onReset();
     } else {
@@ -591,7 +600,14 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
       }
     } finally {
       codec = null;
-      setCodecDrmSession(null);
+      try {
+        if (mediaCrypto != null) {
+          mediaCrypto.release();
+        }
+      } finally {
+        mediaCrypto = null;
+        setCodecDrmSession(null);
+      }
     }
   }
 
@@ -923,7 +939,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   }
 
   private void releaseDrmSessionIfUnused(@Nullable DrmSession<FrameworkMediaCrypto> session) {
-    if (session != null && session != codecDrmSession && session != sourceDrmSession) {
+    if (session != null && session != sourceDrmSession && session != codecDrmSession) {
       drmSessionManager.releaseSession(session);
     }
   }
@@ -1128,7 +1144,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
         }
         DrmSession<FrameworkMediaCrypto> session =
             drmSessionManager.acquireSession(Looper.myLooper(), newFormat.drmInitData);
-        if (session == codecDrmSession || session == sourceDrmSession) {
+        if (session == sourceDrmSession || session == codecDrmSession) {
           // We already had this session. The manager must be reference counting, so release it once
           // to get the count attributed to this renderer back down to 1.
           drmSessionManager.releaseSession(session);

From f44fc542bb6cd22fb430ec3ca269d36a1ffc819e Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 14 Jan 2019 10:05:17 +0000
Subject: [PATCH 376/832] =?UTF-8?q?=EF=BF=BCBlacklist=20OMX.SEC.mp3.dec=20?=
 =?UTF-8?q?for=20more=20devices?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Issue: #4519
PiperOrigin-RevId: 229145790
---
 .../google/android/exoplayer2/mediacodec/MediaCodecUtil.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
index 4d971d461e..9ae50179c3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
@@ -326,7 +326,9 @@ public final class MediaCodecUtil {
             || Util.MODEL.startsWith("SM-G350")
             || Util.MODEL.startsWith("SM-G386")
             || Util.MODEL.startsWith("SM-T231")
-            || Util.MODEL.startsWith("SM-T530"))) {
+            || Util.MODEL.startsWith("SM-T530")
+            || Util.MODEL.startsWith("SCH-I535")
+            || Util.MODEL.startsWith("SPH-L710"))) {
       return false;
     }
     if ("OMX.brcm.audio.mp3.decoder".equals(name)

From 86637facdd16f95a4ba2b444234dea722696daa5 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 14 Jan 2019 14:02:46 +0000
Subject: [PATCH 377/832] Don't forget isSeekable in ExtractorMediaSource.

We currently forget whether a source is seekable at re-preparation. This was
implemented intentionally this way under the assumption that we really can't seek
until we have loaded the seek map again. However, seek operations are only
allowed after a media period is prepared. So there is no harm in remembering
whether a source is seekable.

This problem currently prevents reusing ClippingMediaSources with
ExtractorMediaSource and a non-zero start clip position.

Issue: #5351
PiperOrigin-RevId: 229169441
---
 RELEASENOTES.md                                                | 3 +++
 .../google/android/exoplayer2/source/ExtractorMediaSource.java | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 1634b8de74..307b0534a1 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -41,6 +41,9 @@
 * Add `Handler` parameter to `ConcatenatingMediaSource` methods which take a
   callback `Runnable`.
 * Remove `player` and `isTopLevelSource` parameters from `MediaSource.prepare`.
+* Fix issue with reusing a `ClippingMediaSource` with an inner
+  `ExtractorMediaSource` and a non-zero start position
+  ([#5351](https://github.com/google/ExoPlayer/issues/5351)).
 
 ### 2.9.3 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
index 86f00ff099..91273626c9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
@@ -366,7 +366,7 @@ public final class ExtractorMediaSource extends BaseMediaSource
   @Override
   public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
     transferListener = mediaTransferListener;
-    notifySourceInfoRefreshed(timelineDurationUs, /* isSeekable= */ false);
+    notifySourceInfoRefreshed(timelineDurationUs, timelineIsSeekable);
   }
 
   @Override

From 1b62277a0b2bf72d68abd3afb6510647a7ff6643 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 14 Jan 2019 15:09:13 +0000
Subject: [PATCH 378/832] Disable cache fragmentation except for progressive

DataSpec.FLAG_ALLOW_CACHE_FRAGMENTATION is added to indicate to the
cache when fragmentation is allowed. This flag is set for progressive
requests only.

To avoid breaking changes, CacheDataSink defaults to ignoring the flag
(and enabling fragmentation) for now. Respecting the flag can be
enabled manually. DownloaderConstructorHelper enables respecting of
the flag.

Issue: #4253
PiperOrigin-RevId: 229176835
---
 RELEASENOTES.md                               |  2 +
 .../offline/DownloaderConstructorHelper.java  | 12 +--
 .../offline/ProgressiveDownloader.java        |  6 +-
 .../source/ExtractorMediaPeriod.java          |  4 +-
 .../android/exoplayer2/upstream/DataSpec.java | 20 +++--
 .../upstream/cache/CacheDataSink.java         | 81 +++++++++++--------
 .../upstream/cache/CacheDataSinkFactory.java  | 47 ++++++++---
 .../upstream/cache/CacheDataSource.java       |  2 +-
 .../cache/CacheDataSourceFactory.java         |  2 +-
 .../upstream/cache/CacheDataSourceTest.java   | 15 ++--
 .../upstream/cache/CacheUtilTest.java         |  6 +-
 11 files changed, 129 insertions(+), 68 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 307b0534a1..fb251646fb 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -44,6 +44,8 @@
 * Fix issue with reusing a `ClippingMediaSource` with an inner
   `ExtractorMediaSource` and a non-zero start position
   ([#5351](https://github.com/google/ExoPlayer/issues/5351)).
+* Downloading/Caching: Improve cache performance
+  ([#4253](https://github.com/google/ExoPlayer/issues/4253)).
 
 ### 2.9.3 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java
index 100e1a03fe..59a11934b1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java
@@ -109,16 +109,18 @@ public final class DownloaderConstructorHelper {
         cacheReadDataSourceFactory != null
             ? cacheReadDataSourceFactory
             : new FileDataSourceFactory();
-    DataSink.Factory writeDataSinkFactory =
-        cacheWriteDataSinkFactory != null
-            ? cacheWriteDataSinkFactory
-            : new CacheDataSinkFactory(cache, CacheDataSink.DEFAULT_MAX_CACHE_FILE_SIZE);
+    if (cacheWriteDataSinkFactory == null) {
+      CacheDataSinkFactory factory =
+          new CacheDataSinkFactory(cache, CacheDataSink.DEFAULT_FRAGMENT_SIZE);
+      factory.experimental_setRespectCacheFragmentationFlag(true);
+      cacheWriteDataSinkFactory = factory;
+    }
     onlineCacheDataSourceFactory =
         new CacheDataSourceFactory(
             cache,
             upstreamFactory,
             readDataSourceFactory,
-            writeDataSinkFactory,
+            cacheWriteDataSinkFactory,
             CacheDataSource.FLAG_BLOCK_ON_CACHE,
             /* eventListener= */ null,
             cacheKeyFactory);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
index 41f0944b75..25b4e07bcd 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
@@ -53,7 +53,11 @@ public final class ProgressiveDownloader implements Downloader {
       Uri uri, @Nullable String customCacheKey, DownloaderConstructorHelper constructorHelper) {
     this.dataSpec =
         new DataSpec(
-            uri, /* absoluteStreamPosition= */ 0, C.LENGTH_UNSET, customCacheKey, /* flags= */ 0);
+            uri,
+            /* absoluteStreamPosition= */ 0,
+            C.LENGTH_UNSET,
+            customCacheKey,
+            /* flags= */ DataSpec.FLAG_ALLOW_CACHE_FRAGMENTATION);
     this.cache = constructorHelper.getCache();
     this.dataSource = constructorHelper.createCacheDataSource();
     this.cacheKeyFactory = constructorHelper.getCacheKeyFactory();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java
index 21cb4aa226..40fac19178 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java
@@ -988,7 +988,9 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
           position,
           C.LENGTH_UNSET,
           customCacheKey,
-          DataSpec.FLAG_ALLOW_ICY_METADATA | DataSpec.FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN);
+          DataSpec.FLAG_ALLOW_ICY_METADATA
+              | DataSpec.FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN
+              | DataSpec.FLAG_ALLOW_CACHE_FRAGMENTATION);
     }
 
     private void setLoadPosition(long position, long timeUs) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java
index 75af3e96df..2996de4527 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java
@@ -32,14 +32,19 @@ public final class DataSpec {
 
   /**
    * The flags that apply to any request for data. Possible flag values are {@link
-   * #FLAG_ALLOW_GZIP}, {@link #FLAG_ALLOW_ICY_METADATA} and {@link
-   * #FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN}.
+   * #FLAG_ALLOW_GZIP}, {@link #FLAG_ALLOW_ICY_METADATA}, {@link #FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN}
+   * and {@link #FLAG_ALLOW_CACHE_FRAGMENTATION}.
    */
   @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef(
       flag = true,
-      value = {FLAG_ALLOW_GZIP, FLAG_ALLOW_ICY_METADATA, FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN})
+      value = {
+        FLAG_ALLOW_GZIP,
+        FLAG_ALLOW_ICY_METADATA,
+        FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN,
+        FLAG_ALLOW_CACHE_FRAGMENTATION
+      })
   public @interface Flags {}
   /**
    * Allows an underlying network stack to request that the server use gzip compression.
@@ -53,12 +58,17 @@ public final class DataSpec {
    * DataSource#read(byte[], int, int)} will be the decompressed data.
    */
   public static final int FLAG_ALLOW_GZIP = 1;
-
   /** Allows an underlying network stack to request that the stream contain ICY metadata. */
   public static final int FLAG_ALLOW_ICY_METADATA = 1 << 1; // 2
-
   /** Prevents caching if the length cannot be resolved when the {@link DataSource} is opened. */
   public static final int FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN = 1 << 2; // 4
+  /**
+   * Allows fragmentation of this request into multiple cache files, meaning a cache eviction policy
+   * will be able to evict individual fragments of the data. Depending on the cache implementation,
+   * setting this flag may also enable more concurrent access to the data (e.g. reading one fragment
+   * whilst writing another).
+   */
+  public static final int FLAG_ALLOW_CACHE_FRAGMENTATION = 1 << 4; // 8
 
   /**
    * The set of HTTP methods that are supported by ExoPlayer {@link HttpDataSource}s. One of {@link
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
index 1da2c3f636..d527805120 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
@@ -37,20 +37,22 @@ import java.io.OutputStream;
  */
 public final class CacheDataSink implements DataSink {
 
-  /** Default {@code maxCacheFileSize} recommended for caching use cases. */
-  public static final long DEFAULT_MAX_CACHE_FILE_SIZE = 5 * 1024 * 1024;
+  /** Default {@code fragmentSize} recommended for caching use cases. */
+  public static final long DEFAULT_FRAGMENT_SIZE = 5 * 1024 * 1024;
   /** Default buffer size in bytes. */
   public static final int DEFAULT_BUFFER_SIZE = 20 * 1024;
 
-  private static final long MIN_RECOMMENDED_MAX_CACHE_FILE_SIZE = 2 * 1024 * 1024;
+  private static final long MIN_RECOMMENDED_FRAGMENT_SIZE = 2 * 1024 * 1024;
   private static final String TAG = "CacheDataSink";
 
   private final Cache cache;
-  private final long maxCacheFileSize;
+  private final long fragmentSize;
   private final int bufferSize;
 
   private boolean syncFileDescriptor;
+  private boolean respectCacheFragmentationFlag;
   private DataSpec dataSpec;
+  private long dataSpecFragmentSize;
   private File file;
   private OutputStream outputStream;
   private FileOutputStream underlyingFileOutputStream;
@@ -73,42 +75,39 @@ public final class CacheDataSink implements DataSink {
    * Constructs an instance using {@link #DEFAULT_BUFFER_SIZE}.
    *
    * @param cache The cache into which data should be written.
-   * @param maxCacheFileSize The maximum size of a cache file, in bytes. If a request results in
-   *     data being written whose size exceeds this value, then the data will be fragmented into
-   *     multiple cache files. If set to {@link C#LENGTH_UNSET} then no fragmentation will occur.
-   *     Using a small value allows for finer-grained cache eviction policies, at the cost of
-   *     increased overhead both on the cache implementation and the file system. Values under
-   *     {@code (2 * 1024 * 1024)} are not recommended.
+   * @param fragmentSize For requests that should be fragmented into multiple cache files, this is
+   *     the maximum size of a cache file in bytes. If set to {@link C#LENGTH_UNSET} then no
+   *     fragmentation will occur. Using a small value allows for finer-grained cache eviction
+   *     policies, at the cost of increased overhead both on the cache implementation and the file
+   *     system. Values under {@code (2 * 1024 * 1024)} are not recommended.
    */
-  public CacheDataSink(Cache cache, long maxCacheFileSize) {
-    this(cache, maxCacheFileSize, DEFAULT_BUFFER_SIZE);
+  public CacheDataSink(Cache cache, long fragmentSize) {
+    this(cache, fragmentSize, DEFAULT_BUFFER_SIZE);
   }
 
   /**
    * @param cache The cache into which data should be written.
-   * @param maxCacheFileSize The maximum size of a cache file, in bytes. If a request results in
-   *     data being written whose size exceeds this value, then the data will be fragmented into
-   *     multiple cache files. If set to {@link C#LENGTH_UNSET} then no fragmentation will occur.
-   *     Using a small value allows for finer-grained cache eviction policies, at the cost of
-   *     increased overhead both on the cache implementation and the file system. Values under
-   *     {@code (2 * 1024 * 1024)} are not recommended.
+   * @param fragmentSize For requests that should be fragmented into multiple cache files, this is
+   *     the maximum size of a cache file in bytes. If set to {@link C#LENGTH_UNSET} then no
+   *     fragmentation will occur. Using a small value allows for finer-grained cache eviction
+   *     policies, at the cost of increased overhead both on the cache implementation and the file
+   *     system. Values under {@code (2 * 1024 * 1024)} are not recommended.
    * @param bufferSize The buffer size in bytes for writing to a cache file. A zero or negative
    *     value disables buffering.
    */
-  public CacheDataSink(Cache cache, long maxCacheFileSize, int bufferSize) {
+  public CacheDataSink(Cache cache, long fragmentSize, int bufferSize) {
     Assertions.checkState(
-        maxCacheFileSize > 0 || maxCacheFileSize == C.LENGTH_UNSET,
-        "maxCacheFileSize must be positive or C.LENGTH_UNSET.");
-    if (maxCacheFileSize != C.LENGTH_UNSET
-        && maxCacheFileSize < MIN_RECOMMENDED_MAX_CACHE_FILE_SIZE) {
+        fragmentSize > 0 || fragmentSize == C.LENGTH_UNSET,
+        "fragmentSize must be positive or C.LENGTH_UNSET.");
+    if (fragmentSize != C.LENGTH_UNSET && fragmentSize < MIN_RECOMMENDED_FRAGMENT_SIZE) {
       Log.w(
           TAG,
-          "maxCacheFileSize is below the minimum recommended value of "
-              + MIN_RECOMMENDED_MAX_CACHE_FILE_SIZE
+          "fragmentSize is below the minimum recommended value of "
+              + MIN_RECOMMENDED_FRAGMENT_SIZE
               + ". This may cause poor cache performance.");
     }
     this.cache = Assertions.checkNotNull(cache);
-    this.maxCacheFileSize = maxCacheFileSize == C.LENGTH_UNSET ? Long.MAX_VALUE : maxCacheFileSize;
+    this.fragmentSize = fragmentSize == C.LENGTH_UNSET ? Long.MAX_VALUE : fragmentSize;
     this.bufferSize = bufferSize;
     syncFileDescriptor = true;
   }
@@ -116,8 +115,7 @@ public final class CacheDataSink implements DataSink {
   /**
    * Sets whether file descriptors are synced when closing output streams.
    *
-   * <p>This method is experimental, and will be renamed or removed in a future release. It should
-   * only be called before the renderer is used.
+   * <p>This method is experimental, and will be renamed or removed in a future release.
    *
    * @param syncFileDescriptor Whether file descriptors are synced when closing output streams.
    */
@@ -125,6 +123,20 @@ public final class CacheDataSink implements DataSink {
     this.syncFileDescriptor = syncFileDescriptor;
   }
 
+  /**
+   * Sets whether this instance respects the {@link DataSpec#FLAG_ALLOW_CACHE_FRAGMENTATION} flag.
+   * If set to {@code false} requests will always be fragmented. If set to {@code true} requests
+   * will be fragmented only if the flag is set.
+   *
+   * <p>This method is experimental, and will be renamed or removed in a future release.
+   *
+   * @param respectCacheFragmentationFlag Whether to respect the {@link
+   *     DataSpec#FLAG_ALLOW_CACHE_FRAGMENTATION} flag.
+   */
+  public void experimental_setRespectCacheFragmentationFlag(boolean respectCacheFragmentationFlag) {
+    this.respectCacheFragmentationFlag = respectCacheFragmentationFlag;
+  }
+
   @Override
   public void open(DataSpec dataSpec) throws CacheDataSinkException {
     if (dataSpec.length == C.LENGTH_UNSET
@@ -133,6 +145,11 @@ public final class CacheDataSink implements DataSink {
       return;
     }
     this.dataSpec = dataSpec;
+    this.dataSpecFragmentSize =
+        !respectCacheFragmentationFlag
+                || dataSpec.isFlagSet(DataSpec.FLAG_ALLOW_CACHE_FRAGMENTATION)
+            ? fragmentSize
+            : Long.MAX_VALUE;
     dataSpecBytesWritten = 0;
     try {
       openNextOutputStream();
@@ -149,12 +166,12 @@ public final class CacheDataSink implements DataSink {
     try {
       int bytesWritten = 0;
       while (bytesWritten < length) {
-        if (outputStreamBytesWritten == maxCacheFileSize) {
+        if (outputStreamBytesWritten == dataSpecFragmentSize) {
           closeCurrentOutputStream();
           openNextOutputStream();
         }
-        int bytesToWrite = (int) Math.min(length - bytesWritten,
-            maxCacheFileSize - outputStreamBytesWritten);
+        int bytesToWrite =
+            (int) Math.min(length - bytesWritten, dataSpecFragmentSize - outputStreamBytesWritten);
         outputStream.write(buffer, offset + bytesWritten, bytesToWrite);
         bytesWritten += bytesToWrite;
         outputStreamBytesWritten += bytesToWrite;
@@ -181,7 +198,7 @@ public final class CacheDataSink implements DataSink {
     long length =
         dataSpec.length == C.LENGTH_UNSET
             ? C.LENGTH_UNSET
-            : Math.min(dataSpec.length - dataSpecBytesWritten, maxCacheFileSize);
+            : Math.min(dataSpec.length - dataSpecBytesWritten, dataSpecFragmentSize);
     file =
         cache.startFile(
             dataSpec.key, dataSpec.absoluteStreamPosition + dataSpecBytesWritten, length);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSinkFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSinkFactory.java
index 6dcb14f5fb..9540597c2e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSinkFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSinkFactory.java
@@ -23,27 +23,50 @@ import com.google.android.exoplayer2.upstream.DataSink;
 public final class CacheDataSinkFactory implements DataSink.Factory {
 
   private final Cache cache;
-  private final long maxCacheFileSize;
+  private final long fragmentSize;
   private final int bufferSize;
 
-  /**
-   * @see CacheDataSink#CacheDataSink(Cache, long)
-   */
-  public CacheDataSinkFactory(Cache cache, long maxCacheFileSize) {
-    this(cache, maxCacheFileSize, CacheDataSink.DEFAULT_BUFFER_SIZE);
+  private boolean syncFileDescriptor;
+  private boolean respectCacheFragmentationFlag;
+
+  /** @see CacheDataSink#CacheDataSink(Cache, long) */
+  public CacheDataSinkFactory(Cache cache, long fragmentSize) {
+    this(cache, fragmentSize, CacheDataSink.DEFAULT_BUFFER_SIZE);
+  }
+
+  /** @see CacheDataSink#CacheDataSink(Cache, long, int) */
+  public CacheDataSinkFactory(Cache cache, long fragmentSize, int bufferSize) {
+    this.cache = cache;
+    this.fragmentSize = fragmentSize;
+    this.bufferSize = bufferSize;
   }
 
   /**
-   * @see CacheDataSink#CacheDataSink(Cache, long, int)
+   * See {@link CacheDataSink#experimental_setSyncFileDescriptor(boolean)}.
+   *
+   * <p>This method is experimental, and will be renamed or removed in a future release.
    */
-  public CacheDataSinkFactory(Cache cache, long maxCacheFileSize, int bufferSize) {
-    this.cache = cache;
-    this.maxCacheFileSize = maxCacheFileSize;
-    this.bufferSize = bufferSize;
+  public CacheDataSinkFactory experimental_setSyncFileDescriptor(boolean syncFileDescriptor) {
+    this.syncFileDescriptor = syncFileDescriptor;
+    return this;
+  }
+
+  /**
+   * See {@link CacheDataSink#experimental_setRespectCacheFragmentationFlag(boolean)}.
+   *
+   * <p>This method is experimental, and will be renamed or removed in a future release.
+   */
+  public CacheDataSinkFactory experimental_setRespectCacheFragmentationFlag(
+      boolean respectCacheFragmentationFlag) {
+    this.respectCacheFragmentationFlag = respectCacheFragmentationFlag;
+    return this;
   }
 
   @Override
   public DataSink createDataSink() {
-    return new CacheDataSink(cache, maxCacheFileSize, bufferSize);
+    CacheDataSink dataSink = new CacheDataSink(cache, fragmentSize, bufferSize);
+    dataSink.experimental_setSyncFileDescriptor(syncFileDescriptor);
+    dataSink.experimental_setRespectCacheFragmentationFlag(respectCacheFragmentationFlag);
+    return dataSink;
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
index 579f5d05e9..909bd40023 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
@@ -172,7 +172,7 @@ public final class CacheDataSource implements DataSource {
         cache,
         upstream,
         new FileDataSource(),
-        new CacheDataSink(cache, CacheDataSink.DEFAULT_MAX_CACHE_FILE_SIZE),
+        new CacheDataSink(cache, CacheDataSink.DEFAULT_FRAGMENT_SIZE),
         flags,
         /* eventListener= */ null);
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceFactory.java
index e25c3d7a4a..9675aa1762 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceFactory.java
@@ -50,7 +50,7 @@ public final class CacheDataSourceFactory implements DataSource.Factory {
         cache,
         upstreamFactory,
         new FileDataSourceFactory(),
-        new CacheDataSinkFactory(cache, CacheDataSink.DEFAULT_MAX_CACHE_FILE_SIZE),
+        new CacheDataSinkFactory(cache, CacheDataSink.DEFAULT_FRAGMENT_SIZE),
         flags,
         /* eventListener= */ null);
   }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
index 666fa87e9e..f8c417499f 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
@@ -47,7 +47,7 @@ import org.robolectric.RuntimeEnvironment;
 public final class CacheDataSourceTest {
 
   private static final byte[] TEST_DATA = new byte[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-  private static final int MAX_CACHE_FILE_SIZE = 3;
+  private static final int CACHE_FRAGMENT_SIZE = 3;
   private static final String DATASPEC_KEY = "dataSpecKey";
 
   private Uri testDataUri;
@@ -81,13 +81,13 @@ public final class CacheDataSourceTest {
   }
 
   @Test
-  public void testMaxCacheFileSize() throws Exception {
+  public void testFragmentSize() throws Exception {
     CacheDataSource cacheDataSource = createCacheDataSource(false, false);
     assertReadDataContentLength(cacheDataSource, boundedDataSpec, false, false);
     for (String key : cache.getKeys()) {
       for (CacheSpan cacheSpan : cache.getCachedSpans(key)) {
-        assertThat(cacheSpan.length <= MAX_CACHE_FILE_SIZE).isTrue();
-        assertThat(cacheSpan.file.length() <= MAX_CACHE_FILE_SIZE).isTrue();
+        assertThat(cacheSpan.length <= CACHE_FRAGMENT_SIZE).isTrue();
+        assertThat(cacheSpan.file.length() <= CACHE_FRAGMENT_SIZE).isTrue();
       }
     }
   }
@@ -548,14 +548,14 @@ public final class CacheDataSourceTest {
         setReadException,
         unknownLength,
         CacheDataSource.FLAG_BLOCK_ON_CACHE,
-        new CacheDataSink(cache, MAX_CACHE_FILE_SIZE),
+        new CacheDataSink(cache, CACHE_FRAGMENT_SIZE),
         cacheKeyFactory);
   }
 
   private CacheDataSource createCacheDataSource(
       boolean setReadException, boolean unknownLength, @CacheDataSource.Flags int flags) {
     return createCacheDataSource(
-        setReadException, unknownLength, flags, new CacheDataSink(cache, MAX_CACHE_FILE_SIZE));
+        setReadException, unknownLength, flags, new CacheDataSink(cache, CACHE_FRAGMENT_SIZE));
   }
 
   private CacheDataSource createCacheDataSource(
@@ -602,6 +602,7 @@ public final class CacheDataSourceTest {
   }
 
   private DataSpec buildDataSpec(long position, long length, @Nullable String key) {
-    return new DataSpec(testDataUri, position, length, key);
+    return new DataSpec(
+        testDataUri, position, length, key, DataSpec.FLAG_ALLOW_CACHE_FRAGMENTATION);
   }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
index d1bf734a98..228567a4bc 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
@@ -336,17 +336,17 @@ public final class CacheUtilTest {
     FakeDataSource dataSource = new FakeDataSource(fakeDataSet);
 
     Uri uri = Uri.parse("test_data");
-    DataSpec dataSpec = new DataSpec(uri);
+    DataSpec dataSpec = new DataSpec(uri, DataSpec.FLAG_ALLOW_CACHE_FRAGMENTATION);
     CacheUtil.cache(
         dataSpec,
         cache,
         /* cacheKeyFactory= */ null,
-        // Set maxCacheFileSize to 10 to make sure there are multiple spans.
+        // Set fragmentSize to 10 to make sure there are multiple spans.
         new CacheDataSource(
             cache,
             dataSource,
             new FileDataSource(),
-            new CacheDataSink(cache, /* maxCacheFileSize= */ 10),
+            new CacheDataSink(cache, /* fragmentSize= */ 10),
             /* flags= */ 0,
             /* eventListener= */ null),
         new byte[CacheUtil.DEFAULT_BUFFER_SIZE_BYTES],

From 0bfbcea632c14c56e6c14d8a3d1760b6e251a26b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 14 Jan 2019 22:17:50 +0000
Subject: [PATCH 379/832] Reset requiresSecureDecoder boolean on codec release

PiperOrigin-RevId: 229253065
---
 .../mediacodec/MediaCodecRenderer.java        | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index 4736811841..77d3b31ab7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -296,7 +296,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   @Nullable private DrmSession<FrameworkMediaCrypto> codecDrmSession;
   @Nullable private DrmSession<FrameworkMediaCrypto> sourceDrmSession;
   @Nullable private MediaCrypto mediaCrypto;
-  private boolean drmSessionRequiresSecureDecoder;
+  private boolean mediaCryptoRequiresSecureDecoder;
   private long renderTimeLimitMs;
   private float rendererOperatingRate;
   @Nullable private MediaCodec codec;
@@ -481,7 +481,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
           } catch (MediaCryptoException e) {
             throw ExoPlaybackException.createForRenderer(e, getIndex());
           }
-          drmSessionRequiresSecureDecoder =
+          mediaCryptoRequiresSecureDecoder =
               !sessionMediaCrypto.forceAllowInsecureDecoderComponents
                   && mediaCrypto.requiresSecureDecoderComponent(mimeType);
         }
@@ -498,7 +498,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     }
 
     try {
-      maybeInitCodecWithFallback(mediaCrypto, drmSessionRequiresSecureDecoder);
+      maybeInitCodecWithFallback(mediaCrypto, mediaCryptoRequiresSecureDecoder);
     } catch (DecoderInitializationException e) {
       throw ExoPlaybackException.createForRenderer(e, getIndex());
     }
@@ -606,6 +606,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
         }
       } finally {
         mediaCrypto = null;
+        mediaCryptoRequiresSecureDecoder = false;
         setCodecDrmSession(null);
       }
     }
@@ -727,18 +728,18 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   }
 
   private void maybeInitCodecWithFallback(
-      MediaCrypto crypto, boolean drmSessionRequiresSecureDecoder)
+      MediaCrypto crypto, boolean mediaCryptoRequiresSecureDecoder)
       throws DecoderInitializationException {
     if (availableCodecInfos == null) {
       try {
         availableCodecInfos =
-            new ArrayDeque<>(getAvailableCodecInfos(drmSessionRequiresSecureDecoder));
+            new ArrayDeque<>(getAvailableCodecInfos(mediaCryptoRequiresSecureDecoder));
         preferredDecoderInitializationException = null;
       } catch (DecoderQueryException e) {
         throw new DecoderInitializationException(
             inputFormat,
             e,
-            drmSessionRequiresSecureDecoder,
+            mediaCryptoRequiresSecureDecoder,
             DecoderInitializationException.DECODER_QUERY_ERROR);
       }
     }
@@ -747,7 +748,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
       throw new DecoderInitializationException(
           inputFormat,
           /* cause= */ null,
-          drmSessionRequiresSecureDecoder,
+          mediaCryptoRequiresSecureDecoder,
           DecoderInitializationException.NO_SUITABLE_DECODER_ERROR);
     }
 
@@ -766,7 +767,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
         availableCodecInfos.removeFirst();
         DecoderInitializationException exception =
             new DecoderInitializationException(
-                inputFormat, e, drmSessionRequiresSecureDecoder, codecInfo.name);
+                inputFormat, e, mediaCryptoRequiresSecureDecoder, codecInfo.name);
         if (preferredDecoderInitializationException == null) {
           preferredDecoderInitializationException = exception;
         } else {
@@ -782,11 +783,11 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     availableCodecInfos = null;
   }
 
-  private List<MediaCodecInfo> getAvailableCodecInfos(boolean drmSessionRequiresSecureDecoder)
+  private List<MediaCodecInfo> getAvailableCodecInfos(boolean mediaCryptoRequiresSecureDecoder)
       throws DecoderQueryException {
     List<MediaCodecInfo> codecInfos =
-        getDecoderInfos(mediaCodecSelector, inputFormat, drmSessionRequiresSecureDecoder);
-    if (codecInfos.isEmpty() && drmSessionRequiresSecureDecoder) {
+        getDecoderInfos(mediaCodecSelector, inputFormat, mediaCryptoRequiresSecureDecoder);
+    if (codecInfos.isEmpty() && mediaCryptoRequiresSecureDecoder) {
       // The drm session indicates that a secure decoder is required, but the device does not
       // have one. Assuming that supportsFormat indicated support for the media being played, we
       // know that it does not require a secure output path. Most CDM implementations allow

From 9ab08bbe5df406e3812acbf9c1980fc52f0262e0 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 14 Jan 2019 23:02:03 +0000
Subject: [PATCH 380/832] Fix DRM protected SmoothStreaming with subtitles

Issue: #5378
PiperOrigin-RevId: 229261658
---
 RELEASENOTES.md                               |  2 +
 .../smoothstreaming/DefaultSsChunkSource.java | 11 +++--
 .../source/smoothstreaming/SsChunkSource.java |  3 --
 .../source/smoothstreaming/SsMediaPeriod.java | 41 +-----------------
 .../smoothstreaming/manifest/SsManifest.java  |  5 ++-
 .../manifest/SsManifestParser.java            | 43 ++++++++++++++++++-
 .../src/test/assets/sample_ismc_1             |  2 +-
 .../src/test/assets/sample_ismc_2             |  2 +-
 .../source/smoothstreaming/SsTestUtils.java   | 10 +----
 9 files changed, 57 insertions(+), 62 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index fb251646fb..b93fa95c40 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -27,6 +27,8 @@
   * Rename TaskState to DownloadState.
   * Add new states to DownloadState.
   * Replace DownloadState.action with DownloadAction fields.
+* SmoothStreaming: Fix support for subtitles in DRM protected streams
+  ([#5378](https://github.com/google/ExoPlayer/issues/5378)).
 * Add support for SHOUTcast ICY metadata
   ([#3735](https://github.com/google/ExoPlayer/issues/3735)).
 * IMA extension:
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java
index d50375d4c9..45521726c0 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java
@@ -61,14 +61,13 @@ public class DefaultSsChunkSource implements SsChunkSource {
         SsManifest manifest,
         int elementIndex,
         TrackSelection trackSelection,
-        TrackEncryptionBox[] trackEncryptionBoxes,
         @Nullable TransferListener transferListener) {
       DataSource dataSource = dataSourceFactory.createDataSource();
       if (transferListener != null) {
         dataSource.addTransferListener(transferListener);
       }
-      return new DefaultSsChunkSource(manifestLoaderErrorThrower, manifest, elementIndex,
-          trackSelection, dataSource, trackEncryptionBoxes);
+      return new DefaultSsChunkSource(
+          manifestLoaderErrorThrower, manifest, elementIndex, trackSelection, dataSource);
     }
 
   }
@@ -90,15 +89,13 @@ public class DefaultSsChunkSource implements SsChunkSource {
    * @param streamElementIndex The index of the stream element in the manifest.
    * @param trackSelection The track selection.
    * @param dataSource A {@link DataSource} suitable for loading the media data.
-   * @param trackEncryptionBoxes Track encryption boxes for the stream.
    */
   public DefaultSsChunkSource(
       LoaderErrorThrower manifestLoaderErrorThrower,
       SsManifest manifest,
       int streamElementIndex,
       TrackSelection trackSelection,
-      DataSource dataSource,
-      TrackEncryptionBox[] trackEncryptionBoxes) {
+      DataSource dataSource) {
     this.manifestLoaderErrorThrower = manifestLoaderErrorThrower;
     this.manifest = manifest;
     this.streamElementIndex = streamElementIndex;
@@ -110,6 +107,8 @@ public class DefaultSsChunkSource implements SsChunkSource {
     for (int i = 0; i < extractorWrappers.length; i++) {
       int manifestTrackIndex = trackSelection.getIndexInTrackGroup(i);
       Format format = streamElement.formats[manifestTrackIndex];
+      TrackEncryptionBox[] trackEncryptionBoxes =
+          format.drmInitData != null ? manifest.protectionElement.trackEncryptionBoxes : null;
       int nalUnitLengthFieldLength = streamElement.type == C.TRACK_TYPE_VIDEO ? 4 : 0;
       Track track = new Track(manifestTrackIndex, streamElement.type, streamElement.timescale,
           C.TIME_UNSET, manifest.durationUs, format, Track.TRANSFORMATION_NONE,
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsChunkSource.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsChunkSource.java
index f333a6f92c..4940f1592f 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsChunkSource.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsChunkSource.java
@@ -16,7 +16,6 @@
 package com.google.android.exoplayer2.source.smoothstreaming;
 
 import android.support.annotation.Nullable;
-import com.google.android.exoplayer2.extractor.mp4.TrackEncryptionBox;
 import com.google.android.exoplayer2.source.chunk.ChunkSource;
 import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
@@ -38,7 +37,6 @@ public interface SsChunkSource extends ChunkSource {
      * @param manifest The initial manifest.
      * @param streamElementIndex The index of the corresponding stream element in the manifest.
      * @param trackSelection The track selection.
-     * @param trackEncryptionBoxes Track encryption boxes for the stream.
      * @param transferListener The transfer listener which should be informed of any data transfers.
      *     May be null if no listener is available.
      * @return The created {@link SsChunkSource}.
@@ -48,7 +46,6 @@ public interface SsChunkSource extends ChunkSource {
         SsManifest manifest,
         int streamElementIndex,
         TrackSelection trackSelection,
-        TrackEncryptionBox[] trackEncryptionBoxes,
         @Nullable TransferListener transferListener);
   }
 
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java
index fc22c45c5a..8798ea09b2 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java
@@ -16,10 +16,8 @@
 package com.google.android.exoplayer2.source.smoothstreaming;
 
 import android.support.annotation.Nullable;
-import android.util.Base64;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.SeekParameters;
-import com.google.android.exoplayer2.extractor.mp4.TrackEncryptionBox;
 import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.source.CompositeSequenceableLoaderFactory;
 import com.google.android.exoplayer2.source.MediaPeriod;
@@ -30,7 +28,6 @@ import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.source.chunk.ChunkSampleStream;
 import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest;
-import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest.ProtectionElement;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.upstream.LoadErrorHandlingPolicy;
@@ -44,8 +41,6 @@ import java.util.List;
 /* package */ final class SsMediaPeriod
     implements MediaPeriod, SequenceableLoader.Callback<ChunkSampleStream<SsChunkSource>> {
 
-  private static final int INITIALIZATION_VECTOR_SIZE = 8;
-
   private final SsChunkSource.Factory chunkSourceFactory;
   private final @Nullable TransferListener transferListener;
   private final LoaderErrorThrower manifestLoaderErrorThrower;
@@ -53,7 +48,6 @@ import java.util.List;
   private final EventDispatcher eventDispatcher;
   private final Allocator allocator;
   private final TrackGroupArray trackGroups;
-  private final TrackEncryptionBox[] trackEncryptionBoxes;
   private final CompositeSequenceableLoaderFactory compositeSequenceableLoaderFactory;
 
   private @Nullable Callback callback;
@@ -71,6 +65,7 @@ import java.util.List;
       EventDispatcher eventDispatcher,
       LoaderErrorThrower manifestLoaderErrorThrower,
       Allocator allocator) {
+    this.manifest = manifest;
     this.chunkSourceFactory = chunkSourceFactory;
     this.transferListener = transferListener;
     this.manifestLoaderErrorThrower = manifestLoaderErrorThrower;
@@ -78,18 +73,7 @@ import java.util.List;
     this.eventDispatcher = eventDispatcher;
     this.allocator = allocator;
     this.compositeSequenceableLoaderFactory = compositeSequenceableLoaderFactory;
-
     trackGroups = buildTrackGroups(manifest);
-    ProtectionElement protectionElement = manifest.protectionElement;
-    if (protectionElement != null) {
-      byte[] keyId = getProtectionElementKeyId(protectionElement.data);
-      // We assume pattern encryption does not apply.
-      trackEncryptionBoxes = new TrackEncryptionBox[] {
-          new TrackEncryptionBox(true, null, INITIALIZATION_VECTOR_SIZE, keyId, 0, 0, null)};
-    } else {
-      trackEncryptionBoxes = null;
-    }
-    this.manifest = manifest;
     sampleStreams = newSampleStreamArray(0);
     compositeSequenceableLoader =
         compositeSequenceableLoaderFactory.createCompositeSequenceableLoader(sampleStreams);
@@ -241,7 +225,6 @@ import java.util.List;
             manifest,
             streamElementIndex,
             selection,
-            trackEncryptionBoxes,
             transferListener);
     return new ChunkSampleStream<>(
         manifest.streamElements[streamElementIndex].type,
@@ -267,26 +250,4 @@ import java.util.List;
   private static ChunkSampleStream<SsChunkSource>[] newSampleStreamArray(int length) {
     return new ChunkSampleStream[length];
   }
-
-  private static byte[] getProtectionElementKeyId(byte[] initData) {
-    StringBuilder initDataStringBuilder = new StringBuilder();
-    for (int i = 0; i < initData.length; i += 2) {
-      initDataStringBuilder.append((char) initData[i]);
-    }
-    String initDataString = initDataStringBuilder.toString();
-    String keyIdString = initDataString.substring(
-        initDataString.indexOf("<KID>") + 5, initDataString.indexOf("</KID>"));
-    byte[] keyId = Base64.decode(keyIdString, Base64.DEFAULT);
-    swap(keyId, 0, 3);
-    swap(keyId, 1, 2);
-    swap(keyId, 4, 5);
-    swap(keyId, 6, 7);
-    return keyId;
-  }
-
-  private static void swap(byte[] data, int firstPosition, int secondPosition) {
-    byte temp = data[firstPosition];
-    data[firstPosition] = data[secondPosition];
-    data[secondPosition] = temp;
-  }
 }
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifest.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifest.java
index 2c508f0fde..cfb772a86b 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifest.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifest.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.source.smoothstreaming.manifest;
 import android.net.Uri;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.extractor.mp4.TrackEncryptionBox;
 import com.google.android.exoplayer2.offline.FilterableManifest;
 import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.util.Assertions;
@@ -41,10 +42,12 @@ public class SsManifest implements FilterableManifest<SsManifest> {
 
     public final UUID uuid;
     public final byte[] data;
+    public final TrackEncryptionBox[] trackEncryptionBoxes;
 
-    public ProtectionElement(UUID uuid, byte[] data) {
+    public ProtectionElement(UUID uuid, byte[] data, TrackEncryptionBox[] trackEncryptionBoxes) {
       this.uuid = uuid;
       this.data = data;
+      this.trackEncryptionBoxes = trackEncryptionBoxes;
     }
   }
 
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java
index 3d5ade403a..4c1c6ee0cc 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java
@@ -25,6 +25,7 @@ import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil;
+import com.google.android.exoplayer2.extractor.mp4.TrackEncryptionBox;
 import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest.ProtectionElement;
 import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest.StreamElement;
 import com.google.android.exoplayer2.upstream.ParsingLoadable;
@@ -397,9 +398,10 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
 
     public static final String TAG = "Protection";
     public static final String TAG_PROTECTION_HEADER = "ProtectionHeader";
-
     public static final String KEY_SYSTEM_ID = "SystemID";
 
+    private static final int INITIALIZATION_VECTOR_SIZE = 8;
+
     private boolean inProtectionHeader;
     private UUID uuid;
     private byte[] initData;
@@ -439,7 +441,44 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
 
     @Override
     public Object build() {
-      return new ProtectionElement(uuid, PsshAtomUtil.buildPsshAtom(uuid, initData));
+      return new ProtectionElement(
+          uuid, PsshAtomUtil.buildPsshAtom(uuid, initData), buildTrackEncryptionBoxes(initData));
+    }
+
+    private static TrackEncryptionBox[] buildTrackEncryptionBoxes(byte[] initData) {
+      return new TrackEncryptionBox[] {
+        new TrackEncryptionBox(
+            /* isEncrypted= */ true,
+            /* schemeType= */ null,
+            INITIALIZATION_VECTOR_SIZE,
+            getProtectionElementKeyId(initData),
+            /* defaultEncryptedBlocks= */ 0,
+            /* defaultClearBlocks= */ 0,
+            /* defaultInitializationVector= */ null)
+      };
+    }
+
+    private static byte[] getProtectionElementKeyId(byte[] initData) {
+      StringBuilder initDataStringBuilder = new StringBuilder();
+      for (int i = 0; i < initData.length; i += 2) {
+        initDataStringBuilder.append((char) initData[i]);
+      }
+      String initDataString = initDataStringBuilder.toString();
+      String keyIdString =
+          initDataString.substring(
+              initDataString.indexOf("<KID>") + 5, initDataString.indexOf("</KID>"));
+      byte[] keyId = Base64.decode(keyIdString, Base64.DEFAULT);
+      swap(keyId, 0, 3);
+      swap(keyId, 1, 2);
+      swap(keyId, 4, 5);
+      swap(keyId, 6, 7);
+      return keyId;
+    }
+
+    private static void swap(byte[] data, int firstPosition, int secondPosition) {
+      byte temp = data[firstPosition];
+      data[firstPosition] = data[secondPosition];
+      data[secondPosition] = temp;
     }
 
     private static String stripCurlyBraces(String uuidString) {
diff --git a/library/smoothstreaming/src/test/assets/sample_ismc_1 b/library/smoothstreaming/src/test/assets/sample_ismc_1
index 25a37d65b4..1d279d0a67 100644
--- a/library/smoothstreaming/src/test/assets/sample_ismc_1
+++ b/library/smoothstreaming/src/test/assets/sample_ismc_1
@@ -3,7 +3,7 @@
     Duration="2300000000" TimeScale="10000000">
     <Protection>
         <ProtectionHeader SystemID="9A04F079-9840-4286-AB92-E65BE0885F95">
-            <!-- Base 64-Encoded data omitted for clarity -->
+            fgMAAAEAAQB0AzwAVwBSAE0ASABFAEEARABFAFIAIAB4AG0AbABuAHMAPQAiAGgAdAB0AHAAOgAvAC8AcwBjAGgAZQBtAGEAcwAuAG0AaQBjAHIAbwBzAG8AZgB0AC4AYwBvAG0ALwBEAFIATQAvADIAMAAwADcALwAwADMALwBQAGwAYQB5AFIAZQBhAGQAeQBIAGUAYQBkAGUAcgAiACAAdgBlAHIAcwBpAG8AbgA9ACIANAAuADAALgAwAC4AMAAiAD4APABEAEEAVABBAD4APABQAFIATwBUAEUAQwBUAEkATgBGAE8APgA8AEsARQBZAEwARQBOAD4AMQA2ADwALwBLAEUAWQBMAEUATgA+ADwAQQBMAEcASQBEAD4AQQBFAFMAQwBUAFIAPAAvAEEATABHAEkARAA+ADwALwBQAFIATwBUAEUAQwBUAEkATgBGAE8APgA8AEsASQBEAD4AQgBhAFUATQBPAEcAYwBzAGgAVQBDAEQAZAB3ADMANABZAGMAawBmAFoAQQA9AD0APAAvAEsASQBEAD4APABDAEgARQBDAEsAUwBVAE0APgBnADcATgBhAFIARABJAEkATwA5ADAAPQA8AC8AQwBIAEUAQwBLAFMAVQBNAD4APABMAEEAXwBVAFIATAA+AGgAdAB0AHAAcwA6AC8ALwBUAC0ATwBOAEwASQBOAEUALgBEAFUATQBNAFkALQBTAEUAUgBWAEUAUgAvAEEAcgB0AGUAbQBpAHMATABpAGMAZQBuAHMAZQBTAGUAcgB2AGUAcgAvAFAAbABhAHkAUgBlAGEAZAB5AE0AYQBuAGEAZwBlAHIALgBhAHMAbQB4ADwALwBMAEEAXwBVAFIATAA+ADwAQwBVAFMAVABPAE0AQQBUAFQAUgBJAEIAVQBUAEUAUwA+ADwAQwBJAEQAPgAxADcANQA4ADIANgA8AC8AQwBJAEQAPgA8AEkASQBTAF8ARABSAE0AXwBWAEUAUgBTAEkATwBOAD4ANwAuADEALgAxADUANgA1AC4ANAA8AC8ASQBJAFMAXwBEAFIATQBfAFYARQBSAFMASQBPAE4APgA8AC8AQwBVAFMAVABPAE0AQQBUAFQAUgBJAEIAVQBUAEUAUwA+ADwALwBEAEEAVABBAD4APAAvAFcAUgBNAEgARQBBAEQARQBSAD4A
         </ProtectionHeader>
     </Protection>
 
diff --git a/library/smoothstreaming/src/test/assets/sample_ismc_2 b/library/smoothstreaming/src/test/assets/sample_ismc_2
index 5875a18183..7f2a53036f 100644
--- a/library/smoothstreaming/src/test/assets/sample_ismc_2
+++ b/library/smoothstreaming/src/test/assets/sample_ismc_2
@@ -3,7 +3,7 @@
     Duration="2300000000" TimeScale="10000000">
     <Protection>
         <ProtectionHeader SystemID="{9A04F079-9840-4286-AB92-E65BE0885F95}">
-            <!-- Base 64-Encoded data omitted for clarity -->
+            fgMAAAEAAQB0AzwAVwBSAE0ASABFAEEARABFAFIAIAB4AG0AbABuAHMAPQAiAGgAdAB0AHAAOgAvAC8AcwBjAGgAZQBtAGEAcwAuAG0AaQBjAHIAbwBzAG8AZgB0AC4AYwBvAG0ALwBEAFIATQAvADIAMAAwADcALwAwADMALwBQAGwAYQB5AFIAZQBhAGQAeQBIAGUAYQBkAGUAcgAiACAAdgBlAHIAcwBpAG8AbgA9ACIANAAuADAALgAwAC4AMAAiAD4APABEAEEAVABBAD4APABQAFIATwBUAEUAQwBUAEkATgBGAE8APgA8AEsARQBZAEwARQBOAD4AMQA2ADwALwBLAEUAWQBMAEUATgA+ADwAQQBMAEcASQBEAD4AQQBFAFMAQwBUAFIAPAAvAEEATABHAEkARAA+ADwALwBQAFIATwBUAEUAQwBUAEkATgBGAE8APgA8AEsASQBEAD4AQgBhAFUATQBPAEcAYwBzAGgAVQBDAEQAZAB3ADMANABZAGMAawBmAFoAQQA9AD0APAAvAEsASQBEAD4APABDAEgARQBDAEsAUwBVAE0APgBnADcATgBhAFIARABJAEkATwA5ADAAPQA8AC8AQwBIAEUAQwBLAFMAVQBNAD4APABMAEEAXwBVAFIATAA+AGgAdAB0AHAAcwA6AC8ALwBUAC0ATwBOAEwASQBOAEUALgBEAFUATQBNAFkALQBTAEUAUgBWAEUAUgAvAEEAcgB0AGUAbQBpAHMATABpAGMAZQBuAHMAZQBTAGUAcgB2AGUAcgAvAFAAbABhAHkAUgBlAGEAZAB5AE0AYQBuAGEAZwBlAHIALgBhAHMAbQB4ADwALwBMAEEAXwBVAFIATAA+ADwAQwBVAFMAVABPAE0AQQBUAFQAUgBJAEIAVQBUAEUAUwA+ADwAQwBJAEQAPgAxADcANQA4ADIANgA8AC8AQwBJAEQAPgA8AEkASQBTAF8ARABSAE0AXwBWAEUAUgBTAEkATwBOAD4ANwAuADEALgAxADUANgA1AC4ANAA8AC8ASQBJAFMAXwBEAFIATQBfAFYARQBSAFMASQBPAE4APgA8AC8AQwBVAFMAVABPAE0AQQBUAFQAUgBJAEIAVQBUAEUAUwA+ADwALwBEAEEAVABBAD4APAAvAFcAUgBNAEgARQBBAEQARQBSAD4A
         </ProtectionHeader>
     </Protection>
 
diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsTestUtils.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsTestUtils.java
index 4a2b23edc4..1e770756bc 100644
--- a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsTestUtils.java
+++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsTestUtils.java
@@ -15,13 +15,12 @@
  */
 package com.google.android.exoplayer2.source.smoothstreaming;
 
-import android.util.Base64;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.extractor.mp4.TrackEncryptionBox;
 import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest;
 import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest.ProtectionElement;
 import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest.StreamElement;
-import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 
 /** Util methods for SmoothStreaming tests. */
@@ -41,12 +40,7 @@ public class SsTestUtils {
   private static final int TEST_MAX_HEIGHT = 768;
   private static final String TEST_LANGUAGE = "eng";
   private static final ProtectionElement TEST_PROTECTION_ELEMENT =
-      new ProtectionElement(
-          C.WIDEVINE_UUID,
-          ("<KID>"
-                  + Base64.encodeToString(new byte[] {0, 1, 2, 3, 4, 5, 6, 7}, Base64.DEFAULT)
-                  + "</KID>")
-              .getBytes(StandardCharsets.UTF_16LE));
+      new ProtectionElement(C.WIDEVINE_UUID, new byte[0], new TrackEncryptionBox[0]);
 
   private SsTestUtils() {}
 

From 1900e941449db022bbbb9c7ddadd8375bd786feb Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 15 Jan 2019 09:32:38 +0000
Subject: [PATCH 381/832] Do not select a track in AdaptiveTrackSelection
 constructor.

This is not necessary as the track selection needs to be updated with
updateSelectedTrack anyway. It's also error-prone as the selection code
calls into a protected method of a not fully initialized class.

PiperOrigin-RevId: 229331669
---
 .../AdaptiveTrackSelection.java               | 12 ++-
 .../AdaptiveTrackSelectionTest.java           | 90 ++++++++++++-------
 2 files changed, 64 insertions(+), 38 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
index b39a5d19f0..dd2d0001f8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
@@ -391,7 +391,7 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
     this.minTimeBetweenBufferReevaluationMs = minTimeBetweenBufferReevaluationMs;
     this.clock = clock;
     playbackSpeed = 1f;
-    reason = C.SELECTION_REASON_INITIAL;
+    reason = C.SELECTION_REASON_UNKNOWN;
     lastBufferEvaluationMs = C.TIME_UNSET;
     trackBitrateEstimator = TrackBitrateEstimator.DEFAULT;
     formats = new Format[length];
@@ -403,9 +403,6 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
       formats[i] = format;
       formatBitrates[i] = formats[i].bitrate;
     }
-    @SuppressWarnings("nullness:method.invocation.invalid")
-    int selectedIndex = determineIdealSelectedIndex(Long.MIN_VALUE, formatBitrates);
-    this.selectedIndex = selectedIndex;
   }
 
   /**
@@ -453,6 +450,13 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
     // Update the estimated track bitrates.
     trackBitrateEstimator.getBitrates(formats, queue, mediaChunkIterators, trackBitrates);
 
+    // Make initial selection
+    if (reason == C.SELECTION_REASON_UNKNOWN) {
+      reason = C.SELECTION_REASON_INITIAL;
+      selectedIndex = determineIdealSelectedIndex(nowMs, trackBitrates);
+      return;
+    }
+
     // Stash the current selection, then make a new one.
     int currentSelectedIndex = selectedIndex;
     selectedIndex = determineIdealSelectedIndex(nowMs, trackBitrates);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
index c3836e63f6..bf6b935161 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
@@ -244,7 +244,14 @@ public final class AdaptiveTrackSelectionTest {
 
     // But TrackBitrateEstimator returns 1500 for 3rd track so it should switch up.
     TrackBitrateEstimator estimator = mock(TrackBitrateEstimator.class);
-    when(estimator.getBitrates(any(), any(), any(), any())).thenReturn(new int[] {500, 1000, 1500});
+    when(estimator.getBitrates(any(), any(), any(), any()))
+        .then(
+            (invocation) -> {
+              int[] returnValue = new int[] {500, 1000, 1500};
+              int[] inputArray = (int[]) invocation.getArguments()[3];
+              System.arraycopy(returnValue, 0, inputArray, 0, returnValue.length);
+              return returnValue;
+            });
 
     adaptiveTrackSelection = adaptiveTrackSelection(trackGroup);
     adaptiveTrackSelection.experimental_setTrackBitrateEstimator(estimator);
@@ -385,49 +392,64 @@ public final class AdaptiveTrackSelectionTest {
 
   private AdaptiveTrackSelection adaptiveTrackSelectionWithMinDurationForQualityIncreaseMs(
       TrackGroup trackGroup, long minDurationForQualityIncreaseMs) {
-    return new AdaptiveTrackSelection(
-        trackGroup,
-        selectedAllTracksInGroup(trackGroup),
-        mockBandwidthMeter,
-        minDurationForQualityIncreaseMs,
-        AdaptiveTrackSelection.DEFAULT_MAX_DURATION_FOR_QUALITY_DECREASE_MS,
-        AdaptiveTrackSelection.DEFAULT_MIN_DURATION_TO_RETAIN_AFTER_DISCARD_MS,
-        /* bandwidthFraction= */ 1.0f,
-        AdaptiveTrackSelection.DEFAULT_BUFFERED_FRACTION_TO_LIVE_EDGE_FOR_QUALITY_INCREASE,
-        AdaptiveTrackSelection.DEFAULT_MIN_TIME_BETWEEN_BUFFER_REEVALUTATION_MS,
-        fakeClock);
+    return prepareTrackSelection(
+        new AdaptiveTrackSelection(
+            trackGroup,
+            selectedAllTracksInGroup(trackGroup),
+            mockBandwidthMeter,
+            minDurationForQualityIncreaseMs,
+            AdaptiveTrackSelection.DEFAULT_MAX_DURATION_FOR_QUALITY_DECREASE_MS,
+            AdaptiveTrackSelection.DEFAULT_MIN_DURATION_TO_RETAIN_AFTER_DISCARD_MS,
+            /* bandwidthFraction= */ 1.0f,
+            AdaptiveTrackSelection.DEFAULT_BUFFERED_FRACTION_TO_LIVE_EDGE_FOR_QUALITY_INCREASE,
+            AdaptiveTrackSelection.DEFAULT_MIN_TIME_BETWEEN_BUFFER_REEVALUTATION_MS,
+            fakeClock));
   }
 
   private AdaptiveTrackSelection adaptiveTrackSelectionWithMaxDurationForQualityDecreaseMs(
       TrackGroup trackGroup, long maxDurationForQualityDecreaseMs) {
-    return new AdaptiveTrackSelection(
-        trackGroup,
-        selectedAllTracksInGroup(trackGroup),
-        mockBandwidthMeter,
-        AdaptiveTrackSelection.DEFAULT_MIN_DURATION_FOR_QUALITY_INCREASE_MS,
-        maxDurationForQualityDecreaseMs,
-        AdaptiveTrackSelection.DEFAULT_MIN_DURATION_TO_RETAIN_AFTER_DISCARD_MS,
-        /* bandwidthFraction= */ 1.0f,
-        AdaptiveTrackSelection.DEFAULT_BUFFERED_FRACTION_TO_LIVE_EDGE_FOR_QUALITY_INCREASE,
-        AdaptiveTrackSelection.DEFAULT_MIN_TIME_BETWEEN_BUFFER_REEVALUTATION_MS,
-        fakeClock);
+    return prepareTrackSelection(
+        new AdaptiveTrackSelection(
+            trackGroup,
+            selectedAllTracksInGroup(trackGroup),
+            mockBandwidthMeter,
+            AdaptiveTrackSelection.DEFAULT_MIN_DURATION_FOR_QUALITY_INCREASE_MS,
+            maxDurationForQualityDecreaseMs,
+            AdaptiveTrackSelection.DEFAULT_MIN_DURATION_TO_RETAIN_AFTER_DISCARD_MS,
+            /* bandwidthFraction= */ 1.0f,
+            AdaptiveTrackSelection.DEFAULT_BUFFERED_FRACTION_TO_LIVE_EDGE_FOR_QUALITY_INCREASE,
+            AdaptiveTrackSelection.DEFAULT_MIN_TIME_BETWEEN_BUFFER_REEVALUTATION_MS,
+            fakeClock));
   }
 
   private AdaptiveTrackSelection adaptiveTrackSelectionWithMinTimeBetweenBufferReevaluationMs(
       TrackGroup trackGroup,
       long durationToRetainAfterDiscardMs,
       long minTimeBetweenBufferReevaluationMs) {
-    return new AdaptiveTrackSelection(
-        trackGroup,
-        selectedAllTracksInGroup(trackGroup),
-        mockBandwidthMeter,
-        AdaptiveTrackSelection.DEFAULT_MIN_DURATION_FOR_QUALITY_INCREASE_MS,
-        AdaptiveTrackSelection.DEFAULT_MAX_DURATION_FOR_QUALITY_DECREASE_MS,
-        durationToRetainAfterDiscardMs,
-        /* bandwidthFraction= */ 1.0f,
-        AdaptiveTrackSelection.DEFAULT_BUFFERED_FRACTION_TO_LIVE_EDGE_FOR_QUALITY_INCREASE,
-        minTimeBetweenBufferReevaluationMs,
-        fakeClock);
+    return prepareTrackSelection(
+        new AdaptiveTrackSelection(
+            trackGroup,
+            selectedAllTracksInGroup(trackGroup),
+            mockBandwidthMeter,
+            AdaptiveTrackSelection.DEFAULT_MIN_DURATION_FOR_QUALITY_INCREASE_MS,
+            AdaptiveTrackSelection.DEFAULT_MAX_DURATION_FOR_QUALITY_DECREASE_MS,
+            durationToRetainAfterDiscardMs,
+            /* bandwidthFraction= */ 1.0f,
+            AdaptiveTrackSelection.DEFAULT_BUFFERED_FRACTION_TO_LIVE_EDGE_FOR_QUALITY_INCREASE,
+            minTimeBetweenBufferReevaluationMs,
+            fakeClock));
+  }
+
+  private AdaptiveTrackSelection prepareTrackSelection(
+      AdaptiveTrackSelection adaptiveTrackSelection) {
+    adaptiveTrackSelection.enable();
+    adaptiveTrackSelection.updateSelectedTrack(
+        /* playbackPositionUs= */ 0,
+        /* bufferedDurationUs= */ 0,
+        /* availableDurationUs= */ C.TIME_UNSET,
+        /* queue= */ Collections.emptyList(),
+        /* mediaChunkIterators= */ THREE_EMPTY_MEDIA_CHUNK_ITERATORS);
+    return adaptiveTrackSelection;
   }
 
   private int[] selectedAllTracksInGroup(TrackGroup trackGroup) {

From fcda01eb5c383751557f8ea817202aa98a12647e Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 15 Jan 2019 11:07:05 +0000
Subject: [PATCH 382/832] Remove messages on release of
 ConcatenatingMediaSource.

That was previously handled by the player. But since we switched to Handler
messages instead of player messages, we should do that manually.

PiperOrigin-RevId: 229341747
---
 .../exoplayer2/source/ConcatenatingMediaSource.java      | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
index 7845694c45..e6d409c659 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
@@ -473,10 +473,13 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
     super.releaseSourceInternal();
     mediaSourceHolders.clear();
     mediaSourceByUid.clear();
-    playbackThreadHandler = null;
     shuffleOrder = shuffleOrder.cloneAndClear();
     windowCount = 0;
     periodCount = 0;
+    if (playbackThreadHandler != null) {
+      playbackThreadHandler.removeCallbacksAndMessages(null);
+      playbackThreadHandler = null;
+    }
   }
 
   @Override
@@ -603,10 +606,6 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
 
   @SuppressWarnings("unchecked")
   private boolean handleMessage(Message msg) {
-    if (playbackThreadHandler == null) {
-      // Stale event.
-      return false;
-    }
     switch (msg.what) {
       case MSG_ADD:
         MessageData<Collection<MediaSourceHolder>> addMessage =

From b97b35e2e0f1c1bf50c0c04de892592d3b2fe942 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 15 Jan 2019 14:18:29 +0000
Subject: [PATCH 383/832] Add buffer flag for last sample to improve buffered
 position calculation.

The buffered position is currently based on the mimimum queued timestamp of
all AV tracks. If the tracks have unequal lengths, one track continues loading
without bounds as the "buffered position" will always stay at the shorter
track's duration.

This change adds an optional buffer flag to mark the last sample of the
stream. This is set in the Mp4Extractor only so far. ExtractorMediaSource
uses this flag to ignore AV streams in the buffered duration calculation if
they already finished loading.

Issue:#3670
PiperOrigin-RevId: 229359899
---
 RELEASENOTES.md                               |  2 ++
 .../java/com/google/android/exoplayer2/C.java |  7 +++--
 .../extractor/mp4/TrackSampleTable.java       |  3 +++
 .../source/ExtractorMediaPeriod.java          |  7 ++---
 .../source/SampleMetadataQueue.java           | 26 ++++++++++++++-----
 .../exoplayer2/source/SampleQueue.java        |  9 +++++++
 .../src/test/assets/mp4/sample.mp4.0.dump     |  4 +--
 .../src/test/assets/mp4/sample.mp4.1.dump     |  4 +--
 .../src/test/assets/mp4/sample.mp4.2.dump     |  4 +--
 .../src/test/assets/mp4/sample.mp4.3.dump     |  4 +--
 10 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index b93fa95c40..dd3aab3e12 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -48,6 +48,8 @@
   ([#5351](https://github.com/google/ExoPlayer/issues/5351)).
 * Downloading/Caching: Improve cache performance
   ([#4253](https://github.com/google/ExoPlayer/issues/4253)).
+* Fix issue where uneven track durations in MP4 streams can cause OOM problems
+  ([#3670](https://github.com/google/ExoPlayer/issues/3670)).
 
 ### 2.9.3 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/C.java b/library/core/src/main/java/com/google/android/exoplayer2/C.java
index 77d39fe866..8810b51000 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/C.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/C.java
@@ -460,8 +460,8 @@ public final class C {
 
   /**
    * Flags which can apply to a buffer containing a media sample. Possible flag values are {@link
-   * #BUFFER_FLAG_KEY_FRAME}, {@link #BUFFER_FLAG_END_OF_STREAM}, {@link #BUFFER_FLAG_ENCRYPTED} and
-   * {@link #BUFFER_FLAG_DECODE_ONLY}.
+   * #BUFFER_FLAG_KEY_FRAME}, {@link #BUFFER_FLAG_END_OF_STREAM}, {@link #BUFFER_FLAG_LAST_SAMPLE},
+   * {@link #BUFFER_FLAG_ENCRYPTED} and {@link #BUFFER_FLAG_DECODE_ONLY}.
    */
   @Documented
   @Retention(RetentionPolicy.SOURCE)
@@ -470,6 +470,7 @@ public final class C {
       value = {
         BUFFER_FLAG_KEY_FRAME,
         BUFFER_FLAG_END_OF_STREAM,
+        BUFFER_FLAG_LAST_SAMPLE,
         BUFFER_FLAG_ENCRYPTED,
         BUFFER_FLAG_DECODE_ONLY
       })
@@ -482,6 +483,8 @@ public final class C {
    * Flag for empty buffers that signal that the end of the stream was reached.
    */
   public static final int BUFFER_FLAG_END_OF_STREAM = MediaCodec.BUFFER_FLAG_END_OF_STREAM;
+  /** Indicates that a buffer is known to contain the last media sample of the stream. */
+  public static final int BUFFER_FLAG_LAST_SAMPLE = 1 << 29; // 0x20000000
   /** Indicates that a buffer is (at least partially) encrypted. */
   public static final int BUFFER_FLAG_ENCRYPTED = 1 << 30; // 0x40000000
   /** Indicates that a buffer should be decoded but not rendered. */
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackSampleTable.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackSampleTable.java
index 56851fc1e0..59ea386335 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackSampleTable.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackSampleTable.java
@@ -64,6 +64,9 @@ import com.google.android.exoplayer2.util.Util;
     this.flags = flags;
     this.durationUs = durationUs;
     sampleCount = offsets.length;
+    if (flags.length > 0) {
+      flags[flags.length - 1] |= C.BUFFER_FLAG_LAST_SAMPLE;
+    }
   }
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java
index 40fac19178..e842d4f253 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java
@@ -356,18 +356,19 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     } else if (isPendingReset()) {
       return pendingResetPositionUs;
     }
-    long largestQueuedTimestampUs;
+    long largestQueuedTimestampUs = C.TIME_UNSET;
     if (haveAudioVideoTracks) {
       // Ignore non-AV tracks, which may be sparse or poorly interleaved.
       largestQueuedTimestampUs = Long.MAX_VALUE;
       int trackCount = sampleQueues.length;
       for (int i = 0; i < trackCount; i++) {
-        if (trackIsAudioVideoFlags[i]) {
+        if (trackIsAudioVideoFlags[i] && !sampleQueues[i].isLastSampleQueued()) {
           largestQueuedTimestampUs = Math.min(largestQueuedTimestampUs,
               sampleQueues[i].getLargestQueuedTimestampUs());
         }
       }
-    } else {
+    }
+    if (largestQueuedTimestampUs == C.TIME_UNSET) {
       largestQueuedTimestampUs = getLargestQueuedTimestampUs();
     }
     return largestQueuedTimestampUs == Long.MIN_VALUE ? lastSeekPositionUs
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleMetadataQueue.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SampleMetadataQueue.java
index e5b950cf2e..ab5c5e57d9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleMetadataQueue.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SampleMetadataQueue.java
@@ -57,6 +57,7 @@ import com.google.android.exoplayer2.util.Util;
 
   private long largestDiscardedTimestampUs;
   private long largestQueuedTimestampUs;
+  private boolean isLastSampleQueued;
   private boolean upstreamKeyframeRequired;
   private boolean upstreamFormatRequired;
   private Format upstreamFormat;
@@ -93,6 +94,7 @@ import com.google.android.exoplayer2.util.Util;
     upstreamKeyframeRequired = true;
     largestDiscardedTimestampUs = Long.MIN_VALUE;
     largestQueuedTimestampUs = Long.MIN_VALUE;
+    isLastSampleQueued = false;
     if (resetUpstreamFormat) {
       upstreamFormat = null;
       upstreamFormatRequired = true;
@@ -118,6 +120,7 @@ import com.google.android.exoplayer2.util.Util;
     Assertions.checkArgument(0 <= discardCount && discardCount <= (length - readPosition));
     length -= discardCount;
     largestQueuedTimestampUs = Math.max(largestDiscardedTimestampUs, getLargestTimestamp(length));
+    isLastSampleQueued = discardCount == 0 && isLastSampleQueued;
     if (length == 0) {
       return 0;
     } else {
@@ -186,6 +189,19 @@ import com.google.android.exoplayer2.util.Util;
     return largestQueuedTimestampUs;
   }
 
+  /**
+   * Returns whether the last sample of the stream has knowingly been queued. A return value of
+   * {@code false} means that the last sample had not been queued or that it's unknown whether the
+   * last sample has been queued.
+   *
+   * <p>Samples that were discarded by calling {@link #discardUpstreamSamples(int)} are not
+   * considered as having been queued. Samples that were dequeued from the front of the queue are
+   * considered as having been queued.
+   */
+  public synchronized boolean isLastSampleQueued() {
+    return isLastSampleQueued;
+  }
+
   /** Returns the timestamp of the first sample, or {@link Long#MIN_VALUE} if the queue is empty. */
   public synchronized long getFirstTimestampUs() {
     return length == 0 ? Long.MIN_VALUE : timesUs[relativeFirstIndex];
@@ -224,7 +240,7 @@ import com.google.android.exoplayer2.util.Util;
       boolean formatRequired, boolean loadingFinished, Format downstreamFormat,
       SampleExtrasHolder extrasHolder) {
     if (!hasNextSample()) {
-      if (loadingFinished) {
+      if (loadingFinished || isLastSampleQueued) {
         buffer.setFlags(C.BUFFER_FLAG_END_OF_STREAM);
         return C.RESULT_BUFFER_READ;
       } else if (upstreamFormat != null
@@ -388,7 +404,9 @@ import com.google.android.exoplayer2.util.Util;
       upstreamKeyframeRequired = false;
     }
     Assertions.checkState(!upstreamFormatRequired);
-    commitSampleTimestamp(timeUs);
+
+    isLastSampleQueued = (sampleFlags & C.BUFFER_FLAG_LAST_SAMPLE) != 0;
+    largestQueuedTimestampUs = Math.max(largestQueuedTimestampUs, timeUs);
 
     int relativeEndIndex = getRelativeIndex(length);
     timesUs[relativeEndIndex] = timeUs;
@@ -439,10 +457,6 @@ import com.google.android.exoplayer2.util.Util;
     }
   }
 
-  public synchronized void commitSampleTimestamp(long timeUs) {
-    largestQueuedTimestampUs = Math.max(largestQueuedTimestampUs, timeUs);
-  }
-
   /**
    * Attempts to discard samples from the end of the queue to allow samples starting from the
    * specified timestamp to be spliced in. Samples will not be discarded prior to the read position.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
index ecc720c656..0886e79d21 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
@@ -224,6 +224,15 @@ public class SampleQueue implements TrackOutput {
     return metadataQueue.getLargestQueuedTimestampUs();
   }
 
+  /**
+   * Returns whether the last sample of the stream has knowingly been queued. A return value of
+   * {@code false} means that the last sample had not been queued or that it's unknown whether the
+   * last sample has been queued.
+   */
+  public boolean isLastSampleQueued() {
+    return metadataQueue.isLastSampleQueued();
+  }
+
   /** Returns the timestamp of the first sample, or {@link Long#MIN_VALUE} if the queue is empty. */
   public long getFirstTimestampUs() {
     return metadataQueue.getFirstTimestampUs();
diff --git a/library/core/src/test/assets/mp4/sample.mp4.0.dump b/library/core/src/test/assets/mp4/sample.mp4.0.dump
index efc804d48b..b05d8250ab 100644
--- a/library/core/src/test/assets/mp4/sample.mp4.0.dump
+++ b/library/core/src/test/assets/mp4/sample.mp4.0.dump
@@ -147,7 +147,7 @@ track 0:
     data = length 530, hash C98BC6A8
   sample 29:
     time = 934266
-    flags = 0
+    flags = 536870912
     data = length 568, hash 4FE5C8EA
 track 1:
   format:
@@ -352,6 +352,6 @@ track 1:
     data = length 229, hash FFF98DF0
   sample 44:
     time = 1065678
-    flags = 1
+    flags = 536870913
     data = length 6, hash 31B22286
 tracksEnded = true
diff --git a/library/core/src/test/assets/mp4/sample.mp4.1.dump b/library/core/src/test/assets/mp4/sample.mp4.1.dump
index 10104b5e81..84d86f8ccf 100644
--- a/library/core/src/test/assets/mp4/sample.mp4.1.dump
+++ b/library/core/src/test/assets/mp4/sample.mp4.1.dump
@@ -147,7 +147,7 @@ track 0:
     data = length 530, hash C98BC6A8
   sample 29:
     time = 934266
-    flags = 0
+    flags = 536870912
     data = length 568, hash 4FE5C8EA
 track 1:
   format:
@@ -304,6 +304,6 @@ track 1:
     data = length 229, hash FFF98DF0
   sample 32:
     time = 1065678
-    flags = 1
+    flags = 536870913
     data = length 6, hash 31B22286
 tracksEnded = true
diff --git a/library/core/src/test/assets/mp4/sample.mp4.2.dump b/library/core/src/test/assets/mp4/sample.mp4.2.dump
index 8af96be673..9bbe8caa01 100644
--- a/library/core/src/test/assets/mp4/sample.mp4.2.dump
+++ b/library/core/src/test/assets/mp4/sample.mp4.2.dump
@@ -147,7 +147,7 @@ track 0:
     data = length 530, hash C98BC6A8
   sample 29:
     time = 934266
-    flags = 0
+    flags = 536870912
     data = length 568, hash 4FE5C8EA
 track 1:
   format:
@@ -244,6 +244,6 @@ track 1:
     data = length 229, hash FFF98DF0
   sample 17:
     time = 1065678
-    flags = 1
+    flags = 536870913
     data = length 6, hash 31B22286
 tracksEnded = true
diff --git a/library/core/src/test/assets/mp4/sample.mp4.3.dump b/library/core/src/test/assets/mp4/sample.mp4.3.dump
index f1259661ed..f210f277b3 100644
--- a/library/core/src/test/assets/mp4/sample.mp4.3.dump
+++ b/library/core/src/test/assets/mp4/sample.mp4.3.dump
@@ -147,7 +147,7 @@ track 0:
     data = length 530, hash C98BC6A8
   sample 29:
     time = 934266
-    flags = 0
+    flags = 536870912
     data = length 568, hash 4FE5C8EA
 track 1:
   format:
@@ -184,6 +184,6 @@ track 1:
     data = length 229, hash FFF98DF0
   sample 2:
     time = 1065678
-    flags = 1
+    flags = 536870913
     data = length 6, hash 31B22286
 tracksEnded = true

From 36883e6277fed2fbec5a83afddc8c93e1838b884 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 15 Jan 2019 15:02:38 +0000
Subject: [PATCH 384/832] Bump version for 2.9.4 release

PiperOrigin-RevId: 229364563
---
 RELEASENOTES.md                               | 26 ++++++++++---------
 constants.gradle                              |  4 +--
 .../exoplayer2/ExoPlayerLibraryInfo.java      |  6 ++---
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 4d03b06687..071f6e05ff 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -17,7 +17,8 @@
   * Add `setStreamKeys` method to factories of DASH, SmoothStreaming and HLS
     media sources to simplify filtering by downloaded streams.
 * Caching:
-  * Improve performance of `SimpleCache`.
+  * Improve performance of `SimpleCache`
+    ([#4253](https://github.com/google/ExoPlayer/issues/4253)).
   * Cache data with unknown length by default. The previous flag to opt in to
     this behavior (`DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH`) has been
     replaced with an opt out flag
@@ -27,29 +28,30 @@
   * Rename TaskState to DownloadState.
   * Add new states to DownloadState.
   * Replace DownloadState.action with DownloadAction fields.
-* SmoothStreaming: Fix support for subtitles in DRM protected streams
-  ([#5378](https://github.com/google/ExoPlayer/issues/5378)).
 * Add support for SHOUTcast ICY metadata
   ([#3735](https://github.com/google/ExoPlayer/issues/3735)).
 * CEA-608: Improved conformance to the specification
   ([#3860](https://github.com/google/ExoPlayer/issues/3860)).
-* IMA extension:
-  * Clear ads loader listeners on release
-    ([#4114](https://github.com/google/ExoPlayer/issues/4114)).
-  * Require setting the `Player` on `AdsLoader` instances before playback.
+* IMA extension: Require setting the `Player` on `AdsLoader` instances before
+  playback.
+* Add `Handler` parameter to `ConcatenatingMediaSource` methods which take a
+  callback `Runnable`.
+* Remove `player` and `isTopLevelSource` parameters from `MediaSource.prepare`.
+
+### 2.9.4 ###
+
+* IMA extension: Clear ads loader listeners on release
+  ([#4114](https://github.com/google/ExoPlayer/issues/4114)).
+* SmoothStreaming: Fix support for subtitles in DRM protected streams
+  ([#5378](https://github.com/google/ExoPlayer/issues/5378)).
 * FFmpeg extension: Treat invalid data errors as non-fatal to match the behavior
   of MediaCodec ([#5293](https://github.com/google/ExoPlayer/issues/5293)).
 * Fix issue where sending callbacks for playlist changes may cause problems
   because of parallel player access
   ([#5240](https://github.com/google/ExoPlayer/issues/5240)).
-* Add `Handler` parameter to `ConcatenatingMediaSource` methods which take a
-  callback `Runnable`.
-* Remove `player` and `isTopLevelSource` parameters from `MediaSource.prepare`.
 * Fix issue with reusing a `ClippingMediaSource` with an inner
   `ExtractorMediaSource` and a non-zero start position
   ([#5351](https://github.com/google/ExoPlayer/issues/5351)).
-* Downloading/Caching: Improve cache performance
-  ([#4253](https://github.com/google/ExoPlayer/issues/4253)).
 * Fix issue where uneven track durations in MP4 streams can cause OOM problems
   ([#3670](https://github.com/google/ExoPlayer/issues/3670)).
 
diff --git a/constants.gradle b/constants.gradle
index ac801d2d3b..716ddbadba 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -13,8 +13,8 @@
 // limitations under the License.
 project.ext {
     // ExoPlayer version and version code.
-    releaseVersion = '2.9.3'
-    releaseVersionCode = 2009003
+    releaseVersion = '2.9.4'
+    releaseVersionCode = 2009004
     // Important: ExoPlayer specifies a minSdkVersion of 14 because various
     // components provided by the library may be of use on older devices.
     // However, please note that the core media playback functionality provided
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
index 792f6cf651..36723c5d73 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
@@ -29,11 +29,11 @@ public final class ExoPlayerLibraryInfo {
 
   /** The version of the library expressed as a string, for example "1.2.3". */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION_INT) or vice versa.
-  public static final String VERSION = "2.9.3";
+  public static final String VERSION = "2.9.4";
 
   /** The version of the library expressed as {@code "ExoPlayerLib/" + VERSION}. */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
-  public static final String VERSION_SLASHY = "ExoPlayerLib/2.9.3";
+  public static final String VERSION_SLASHY = "ExoPlayerLib/2.9.4";
 
   /**
    * The version of the library expressed as an integer, for example 1002003.
@@ -43,7 +43,7 @@ public final class ExoPlayerLibraryInfo {
    * integer version 123045006 (123-045-006).
    */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
-  public static final int VERSION_INT = 2009003;
+  public static final int VERSION_INT = 2009004;
 
   /**
    * Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions}

From c6092bbb43a605d8fe9517fd90d0e3bec1806650 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 15 Jan 2019 15:07:47 +0000
Subject: [PATCH 385/832] Fix typo.

PiperOrigin-RevId: 229365333
---
 .../exoplayer2/source/dash/DefaultDashChunkSource.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
index 33890a6767..a02b2f1ee7 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
@@ -457,10 +457,10 @@ public class DefaultDashChunkSource implements DashChunkSource {
   }
 
   private ArrayList<Representation> getRepresentations() {
-    List<AdaptationSet> manifestAdapationSets = manifest.getPeriod(periodIndex).adaptationSets;
+    List<AdaptationSet> manifestAdaptationSets = manifest.getPeriod(periodIndex).adaptationSets;
     ArrayList<Representation> representations = new ArrayList<>();
     for (int adaptationSetIndex : adaptationSetIndices) {
-      representations.addAll(manifestAdapationSets.get(adaptationSetIndex).representations);
+      representations.addAll(manifestAdaptationSets.get(adaptationSetIndex).representations);
     }
     return representations;
   }

From ca7675ceae7fde67cfca292ed7c1745a050573f7 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 15 Jan 2019 15:08:12 +0000
Subject: [PATCH 386/832] Fix bug where missing switch adaptation set causes
 multiple identical track groups.

When the extra adaptation set of a switch group isn't defined in the manifest, we
currently assume it's the first adaptation group. This either leads to wrong grouping
or duplicate track groups.

Such a case may easily happen if the manifest is filtered such that only one of the
switch adaptation sets will be present in the manifest.

PiperOrigin-RevId: 229365379
---
 .../source/dash/DashMediaPeriod.java           | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java
index d0a12b9688..cba7a9941b 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java
@@ -46,6 +46,7 @@ import com.google.android.exoplayer2.upstream.LoadErrorHandlingPolicy;
 import com.google.android.exoplayer2.upstream.LoaderErrorThrower;
 import com.google.android.exoplayer2.upstream.TransferListener;
 import com.google.android.exoplayer2.util.MimeTypes;
+import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -452,13 +453,22 @@ import java.util.List;
       if (adaptationSetSwitchingProperty == null) {
         groupedAdaptationSetIndices[groupCount++] = new int[] {i};
       } else {
-        String[] extraAdaptationSetIds = adaptationSetSwitchingProperty.value.split(",");
+        String[] extraAdaptationSetIds = Util.split(adaptationSetSwitchingProperty.value, ",");
         int[] adaptationSetIndices = new int[1 + extraAdaptationSetIds.length];
         adaptationSetIndices[0] = i;
+        int outputIndex = 1;
         for (int j = 0; j < extraAdaptationSetIds.length; j++) {
-          int extraIndex = idToIndexMap.get(Integer.parseInt(extraAdaptationSetIds[j]));
-          adaptationSetUsedFlags[extraIndex] = true;
-          adaptationSetIndices[1 + j] = extraIndex;
+          int extraIndex =
+              idToIndexMap.get(
+                  Integer.parseInt(extraAdaptationSetIds[j]), /* valueIfKeyNotFound= */ -1);
+          if (extraIndex != -1) {
+            adaptationSetUsedFlags[extraIndex] = true;
+            adaptationSetIndices[outputIndex] = extraIndex;
+            outputIndex++;
+          }
+        }
+        if (outputIndex < adaptationSetIndices.length) {
+          adaptationSetIndices = Arrays.copyOf(adaptationSetIndices, outputIndex);
         }
         groupedAdaptationSetIndices[groupCount++] = adaptationSetIndices;
       }

From 2621d962e70efd1223b4e7f63e1c903c3b586fa3 Mon Sep 17 00:00:00 2001
From: Zsolt Matyas <zmmatyas@amazon.com>
Date: Tue, 15 Jan 2019 15:33:32 -0800
Subject: [PATCH 387/832] CEA608: handling channel bits properly

[Problem]
CC1 is shown even when CC2-3-4 is selected

[Solution]
 * use incoming channel and frame information
 * Misc Codes need to handle use Frame information
 * Add checks everywhere

[Test]
* Live channels and already existing test should not show any difference
in behavior when CC1 is selected.
* Live channels might have CC2-CC3-CC4
* Sarnoff test content has specific test cases for channel support
---
 .../exoplayer2/text/cea/Cea608Decoder.java    | 128 ++++++++++++------
 1 file changed, 85 insertions(+), 43 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
index e4333478e3..9f05b2e183 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
@@ -25,11 +25,11 @@ import android.text.style.ForegroundColorSpan;
 import android.text.style.StyleSpan;
 import android.text.style.UnderlineSpan;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.text.Cue;
 import com.google.android.exoplayer2.text.Subtitle;
 import com.google.android.exoplayer2.text.SubtitleDecoder;
 import com.google.android.exoplayer2.text.SubtitleInputBuffer;
+import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import java.util.ArrayList;
@@ -41,12 +41,16 @@ import java.util.List;
  */
 public final class Cea608Decoder extends CeaDecoder {
 
+  private static final String TAG = "Cea608Decoder";
+
   private static final int CC_VALID_FLAG = 0x04;
   private static final int CC_TYPE_FLAG = 0x02;
   private static final int CC_FIELD_FLAG = 0x01;
 
   private static final int NTSC_CC_FIELD_1 = 0x00;
   private static final int NTSC_CC_FIELD_2 = 0x01;
+  private static final int NTSC_CC_CHANNEL_1 = 0x00;
+  private static final int NTSC_CC_CHANNEL_2 = 0x01;
 
   private static final int CC_MODE_UNKNOWN = 0;
   private static final int CC_MODE_ROLL_UP = 1;
@@ -217,6 +221,7 @@ public final class Cea608Decoder extends CeaDecoder {
   private final ParsableByteArray ccData;
   private final int packetLength;
   private final int selectedField;
+  private final int selectedChannel;
   private final ArrayList<CueBuilder> cueBuilders;
 
   private CueBuilder currentCueBuilder;
@@ -231,23 +236,41 @@ public final class Cea608Decoder extends CeaDecoder {
   private byte repeatableControlCc1;
   private byte repeatableControlCc2;
 
+  private int incomingDataTargetChannel;
+
   public Cea608Decoder(String mimeType, int accessibilityChannel) {
     ccData = new ParsableByteArray();
     cueBuilders = new ArrayList<>();
     currentCueBuilder = new CueBuilder(CC_MODE_UNKNOWN, DEFAULT_CAPTIONS_ROW_COUNT);
     packetLength = MimeTypes.APPLICATION_MP4CEA608.equals(mimeType) ? 2 : 3;
+
+    // CEA608 has 2 fields and 2 channels on each field
     switch (accessibilityChannel) {
-      case 3:
-      case 4:
-        selectedField = 2;
-        break;
       case 1:
+        selectedChannel = NTSC_CC_CHANNEL_1;
+        selectedField = NTSC_CC_FIELD_1;
+        break;
       case 2:
-      case Format.NO_VALUE:
-      default:
-        selectedField = 1;
+        selectedChannel = NTSC_CC_CHANNEL_2;
+        selectedField   = NTSC_CC_FIELD_1;
+        break;
+       case 3:
+        selectedChannel = NTSC_CC_CHANNEL_1;
+        selectedField   = NTSC_CC_FIELD_2;
+        break;
+       case 4:
+         selectedChannel = NTSC_CC_CHANNEL_2;
+         selectedField = NTSC_CC_FIELD_2;
+         break;
+       default:
+        selectedChannel = NTSC_CC_CHANNEL_1;
+        selectedField = NTSC_CC_FIELD_1;
+        Log.w(TAG, "Subtitle channel was incorrectly set. Defaulting to CC1");
     }
 
+    Log.i(TAG, "Selected CEA608 channel is " + selectedChannel
+            + " on field " + selectedField );
+
     setCaptionMode(CC_MODE_UNKNOWN);
     resetCueBuilders();
   }
@@ -269,6 +292,7 @@ public final class Cea608Decoder extends CeaDecoder {
     repeatableControlSet = false;
     repeatableControlCc1 = 0;
     repeatableControlCc2 = 0;
+    incomingDataTargetChannel = NTSC_CC_CHANNEL_1;
   }
 
   @Override
@@ -307,8 +331,7 @@ public final class Cea608Decoder extends CeaDecoder {
         continue;
       }
 
-      if ((selectedField == 1 && (ccHeader & CC_FIELD_FLAG) != NTSC_CC_FIELD_1)
-          || (selectedField == 2 && (ccHeader & CC_FIELD_FLAG) != NTSC_CC_FIELD_2)) {
+      if ((ccHeader & CC_FIELD_FLAG) != selectedField) {
         // Do not process packets not within the selected field.
         continue;
       }
@@ -322,6 +345,9 @@ public final class Cea608Decoder extends CeaDecoder {
         continue;
       }
 
+      boolean repeatedControlPossible = repeatableControlSet;
+      repeatableControlSet = false;
+
       boolean previousCaptionValid = captionValid;
       captionValid = (ccHeader & CC_VALID_FLAG) == CC_VALID_FLAG;
       if (!captionValid) {
@@ -336,9 +362,6 @@ public final class Cea608Decoder extends CeaDecoder {
       // If we've reached this point then there is data to process; flag that work has been done.
       captionDataProcessed = true;
 
-      boolean repeatedControlPossible = repeatableControlSet;
-      repeatableControlSet = false;
-
       if (!ODD_PARITY_BYTE_TABLE[ccByte1] || !ODD_PARITY_BYTE_TABLE[ccByte2]) {
         // The data is invalid.
         resetCueBuilders();
@@ -349,8 +372,9 @@ public final class Cea608Decoder extends CeaDecoder {
       // ccData1 - 0|0|0|1|C|0|0|1
       // ccData2 - 0|0|1|1|X|X|X|X
       if (((ccData1 & 0xF7) == 0x11) && ((ccData2 & 0xF0) == 0x30)) {
-        // TODO: Make use of the channel toggle
-        currentCueBuilder.append(getSpecialChar(ccData2));
+        if (isBytePairForSelectedChannel(ccData1)) {
+          currentCueBuilder.append(getSpecialChar(ccData2));
+        }
         continue;
       }
 
@@ -358,15 +382,16 @@ public final class Cea608Decoder extends CeaDecoder {
       // ccData1 - 0|0|0|1|C|0|1|S
       // ccData2 - 0|0|1|X|X|X|X|X
       if (((ccData1 & 0xF6) == 0x12) && (ccData2 & 0xE0) == 0x20) {
-        // TODO: Make use of the channel toggle
-        // Remove standard equivalent of the special extended char before appending new one
-        currentCueBuilder.backspace();
-        if ((ccData1 & 0x01) == 0x00) {
-          // Extended Spanish/Miscellaneous and French character set (S = 0).
-          currentCueBuilder.append(getExtendedEsFrChar(ccData2));
-        } else {
-          // Extended Portuguese and German/Danish character set (S = 1).
-          currentCueBuilder.append(getExtendedPtDeChar(ccData2));
+        if (isBytePairForSelectedChannel(ccData1)) {
+          // Remove standard equivalent of the special extended char before appending new one
+          currentCueBuilder.backspace();
+          if ((ccData1 & 0x01) == 0x00) {
+            // Extended Spanish/Miscellaneous and French character set (S = 0).
+            currentCueBuilder.append(getExtendedEsFrChar(ccData2));
+          } else {
+            // Extended Portuguese and German/Danish character set (S = 1).
+            currentCueBuilder.append(getExtendedPtDeChar(ccData2));
+          }
         }
         continue;
       }
@@ -378,6 +403,10 @@ public final class Cea608Decoder extends CeaDecoder {
         continue;
       }
 
+      if (incomingDataTargetChannel != selectedChannel) {
+        continue;
+      }
+
       // Basic North American character set.
       currentCueBuilder.append(getChar(ccData1));
       if ((ccData2 & 0xE0) != 0x00) {
@@ -392,35 +421,46 @@ public final class Cea608Decoder extends CeaDecoder {
     }
   }
 
-  private void handleCtrl(byte cc1, byte cc2, boolean repeatedControlPossible) {
-    boolean isRepeatableControl = isRepeatable(cc1);
+  // Each byte pair has a single bit showing which channel the pair belongs to.
+  // 5th bit of ccData1 selects the channel:  x|x|x|x|C|x|x|x
+  private int getChannelBit(byte ccData1) {
+    return (ccData1 >> 3) & 0x1;
+  }
+  private boolean isBytePairForSelectedChannel(byte ccData1) {
+    return getChannelBit(ccData1) == selectedChannel;
+  }
 
-    // Most control commands are sent twice in succession to ensure they are received properly.
-    // We don't want to process duplicate commands, so if we see the same repeatable command twice
-    // in a row, ignore the second one.
-    if (isRepeatableControl) {
-      if (repeatedControlPossible
-          && repeatableControlCc1 == cc1
-          && repeatableControlCc2 == cc2) {
-        // This is a duplicate. Repeatable control flag should be already cleared, let's return.
+  private void handleCtrl(byte cc1, byte cc2, boolean repeatedControlPossible) {
+    incomingDataTargetChannel = getChannelBit(cc1);
+
+    // Most control commands are sent twice in succession to ensure they are received properly. We
+    // don't want to process duplicate commands, so if we see the same repeatable command twice in a
+    // row then we ignore the second one.
+    if (isRepeatable(cc1)) {
+      if (repeatedControlPossible && repeatableControlCc1 == cc1 && repeatableControlCc2 == cc2) {
+        // This is a repeated command, so we ignore it.
         return;
       } else {
-        // This is a repeatable command, but we haven't seen it yet, so set the repeatable control
-        // flag (to ensure we ignore the next one should it be a duplicate) and continue processing
-        // the command.
+        // This is the first occurrence of a repeatable command. Set the repeatable control
+        // variables so that we can recognize and ignore a duplicate (if there is one), and then
+        // continue to process the command below.
         repeatableControlSet = true;
         repeatableControlCc1 = cc1;
         repeatableControlCc2 = cc2;
       }
     }
 
+    if (!isBytePairForSelectedChannel(cc1)) {
+      return;
+    }
+
     if (isMidrowCtrlCode(cc1, cc2)) {
       handleMidrowCtrl(cc2);
     } else if (isPreambleAddressCode(cc1, cc2)) {
       handlePreambleAddressCode(cc1, cc2);
     } else if (isTabCtrlCode(cc1, cc2)) {
       currentCueBuilder.tabOffset = cc2 - 0x20;
-    } else if (isMiscCode(cc1, cc2)) {
+    } else if (isMiscCode(cc1, cc2, selectedField)) {
       handleMiscCode(cc2);
     }
   }
@@ -441,7 +481,6 @@ public final class Cea608Decoder extends CeaDecoder {
     // cc1 - 0|0|0|1|C|E|ROW
     // C is the channel toggle, E is the extended flag, and ROW is the encoded row
     int row = ROW_INDICES[cc1 & 0x07];
-    // TODO: Make use of the channel toggle
     // TODO: support the extended address and style
 
     // cc2 - 0|1|N|ATTRBTE|U
@@ -643,10 +682,13 @@ public final class Cea608Decoder extends CeaDecoder {
     return ((cc1 & 0xF7) == 0x17) && (cc2 >= 0x21 && cc2 <= 0x23);
   }
 
-  private static boolean isMiscCode(byte cc1, byte cc2) {
-    // cc1 - 0|0|0|1|C|1|0|0
-    // cc2 - 0|0|1|0|X|X|X|X
-    return ((cc1 & 0xF7) == 0x14) && ((cc2 & 0xF0) == 0x20);
+  private static boolean isMiscCode(byte cc1, byte cc2, int targetField) {
+    // bits of cc1: 0|0|0|1|C|1|0|F
+    // bits of cc2: 0|0|1|0|X|X|X|X
+    // Legends: F=field bit; C=channel bit; X=arbitrary value; 0/1=expected value
+    return ((cc1 & 0xF6) == 0x14)
+            && ((cc1 & 0x1) == targetField)
+            && ((cc2 & 0xF0) == 0x20);
   }
 
   private static boolean isRepeatable(byte cc1) {

From 8adc16a6232a523e46a86010b758d4c35ea645d9 Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Wed, 16 Jan 2019 11:05:44 +0000
Subject: [PATCH 388/832] allow developers to set the subText of the
 notifcation

Issue: #5344
PiperOrigin-RevId: 229527963
---
 RELEASENOTES.md                                     |  2 ++
 .../exoplayer2/ui/PlayerNotificationManager.java    | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 071f6e05ff..1150edcf8c 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -54,6 +54,8 @@
   ([#5351](https://github.com/google/ExoPlayer/issues/5351)).
 * Fix issue where uneven track durations in MP4 streams can cause OOM problems
   ([#3670](https://github.com/google/ExoPlayer/issues/3670)).
+* Add the sub text to the MediaDescriptionAdapter of the
+  PlayerNotificationManager.
 
 ### 2.9.3 ###
 
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
index 30c19d5f82..4d6b83ccae 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
@@ -126,6 +126,18 @@ public class PlayerNotificationManager {
     @Nullable
     String getCurrentContentText(Player player);
 
+    /**
+     * Gets the content sub text for the current media item.
+     *
+     * <p>See {@link NotificationCompat.Builder#setSubText(CharSequence)}.
+     *
+     * @param player The {@link Player} for which a notification is being built.
+     */
+    @Nullable
+    default String getCurrentSubText(Player player) {
+      return null;
+    }
+
     /**
      * Gets the large icon for the current media item.
      *
@@ -946,6 +958,7 @@ public class PlayerNotificationManager {
     // Set media specific notification properties from MediaDescriptionAdapter.
     builder.setContentTitle(mediaDescriptionAdapter.getCurrentContentTitle(player));
     builder.setContentText(mediaDescriptionAdapter.getCurrentContentText(player));
+    builder.setSubText(mediaDescriptionAdapter.getCurrentSubText(player));
     if (largeIcon == null) {
       largeIcon =
           mediaDescriptionAdapter.getCurrentLargeIcon(

From ec77f737eece3c07f001261249b539fcf341251b Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 16 Jan 2019 14:03:07 +0000
Subject: [PATCH 389/832] Make DownloadManager watch requirements directly

PiperOrigin-RevId: 229544734
---
 .../exoplayer2/demo/DemoApplication.java      |   4 +-
 .../exoplayer2/demo/DownloadTracker.java      |   9 +
 .../exoplayer2/offline/DownloadManager.java   |  98 +++++++-
 .../exoplayer2/offline/DownloadService.java   | 221 +++++++-----------
 .../exoplayer2/scheduler/Requirements.java    |  24 +-
 .../scheduler/RequirementsWatcher.java        |  17 +-
 .../offline/DownloadManagerTest.java          |   8 +-
 .../dash/offline/DownloadManagerDashTest.java |   5 +-
 .../dash/offline/DownloadServiceDashTest.java |   5 +-
 .../testutil/TestDownloadManagerListener.java |   7 +
 10 files changed, 249 insertions(+), 149 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
index 9b72df8d98..560a9be58a 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
@@ -101,10 +101,12 @@ public class DemoApplication extends Application {
           new DownloaderConstructorHelper(getDownloadCache(), buildHttpDataSourceFactory());
       downloadManager =
           new DownloadManager(
+              this,
               new File(getDownloadDirectory(), DOWNLOAD_ACTION_FILE),
               new DefaultDownloaderFactory(downloaderConstructorHelper),
               MAX_SIMULTANEOUS_DOWNLOADS,
-              DownloadManager.DEFAULT_MIN_RETRY_COUNT);
+              DownloadManager.DEFAULT_MIN_RETRY_COUNT,
+              DownloadManager.DEFAULT_REQUIREMENTS);
       downloadTracker =
           new DownloadTracker(
               /* context= */ this,
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index 08ecdf3be7..559bbcef0f 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -41,6 +41,7 @@ import com.google.android.exoplayer2.offline.DownloadService;
 import com.google.android.exoplayer2.offline.DownloadState;
 import com.google.android.exoplayer2.offline.ProgressiveDownloadHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
+import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.source.dash.offline.DashDownloadHelper;
 import com.google.android.exoplayer2.source.hls.offline.HlsDownloadHelper;
@@ -159,6 +160,14 @@ public class DownloadTracker implements DownloadManager.Listener {
     // Do nothing.
   }
 
+  @Override
+  public void onRequirementsStateChanged(
+      DownloadManager downloadManager,
+      Requirements requirements,
+      @Requirements.RequirementFlags int notMetRequirements) {
+    // Do nothing.
+  }
+
   // Internal methods
 
   private void loadTrackedActions() {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index c8c02d4980..8932140a34 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -28,12 +28,15 @@ import static com.google.android.exoplayer2.offline.DownloadState.STATE_STOPPED;
 import static com.google.android.exoplayer2.offline.DownloadState.STOP_FLAG_DOWNLOAD_MANAGER_NOT_READY;
 import static com.google.android.exoplayer2.offline.DownloadState.STOP_FLAG_STOPPED;
 
+import android.content.Context;
 import android.os.ConditionVariable;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.scheduler.Requirements;
+import com.google.android.exoplayer2.scheduler.RequirementsWatcher;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
 import java.io.File;
@@ -74,18 +77,35 @@ public final class DownloadManager {
      * @param downloadManager The reporting instance.
      */
     void onIdle(DownloadManager downloadManager);
+
+    /**
+     * Called when the download requirements state changed.
+     *
+     * @param downloadManager The reporting instance.
+     * @param requirements Requirements needed to be met to start downloads.
+     * @param notMetRequirements {@link Requirements.RequirementFlags RequirementFlags} that are not
+     *     met, or 0.
+     */
+    void onRequirementsStateChanged(
+        DownloadManager downloadManager,
+        Requirements requirements,
+        @Requirements.RequirementFlags int notMetRequirements);
   }
 
   /** The default maximum number of simultaneous downloads. */
   public static final int DEFAULT_MAX_SIMULTANEOUS_DOWNLOADS = 1;
   /** The default minimum number of times a download must be retried before failing. */
   public static final int DEFAULT_MIN_RETRY_COUNT = 5;
+  /** The default requirement is that the device has network connectivity. */
+  public static final Requirements DEFAULT_REQUIREMENTS =
+      new Requirements(Requirements.NETWORK_TYPE_ANY, false, false);
 
   private static final String TAG = "DownloadManager";
   private static final boolean DEBUG = false;
 
   private final int maxActiveDownloads;
   private final int minRetryCount;
+  private final Context context;
   private final ActionFile actionFile;
   private final DownloaderFactory downloaderFactory;
   private final ArrayList<Download> downloads;
@@ -99,31 +119,43 @@ public final class DownloadManager {
   private boolean initialized;
   private boolean released;
   @DownloadState.StopFlags private int stickyStopFlags;
+  private RequirementsWatcher requirementsWatcher;
 
   /**
    * Constructs a {@link DownloadManager}.
    *
+   * @param context Any context.
    * @param actionFile The file in which active actions are saved.
    * @param downloaderFactory A factory for creating {@link Downloader}s.
    */
-  public DownloadManager(File actionFile, DownloaderFactory downloaderFactory) {
+  public DownloadManager(Context context, File actionFile, DownloaderFactory downloaderFactory) {
     this(
-        actionFile, downloaderFactory, DEFAULT_MAX_SIMULTANEOUS_DOWNLOADS, DEFAULT_MIN_RETRY_COUNT);
+        context,
+        actionFile,
+        downloaderFactory,
+        DEFAULT_MAX_SIMULTANEOUS_DOWNLOADS,
+        DEFAULT_MIN_RETRY_COUNT,
+        DEFAULT_REQUIREMENTS);
   }
 
   /**
    * Constructs a {@link DownloadManager}.
    *
+   * @param context Any context.
    * @param actionFile The file in which active actions are saved.
    * @param downloaderFactory A factory for creating {@link Downloader}s.
    * @param maxSimultaneousDownloads The maximum number of simultaneous downloads.
    * @param minRetryCount The minimum number of times a download must be retried before failing.
+   * @param requirements The requirements needed to be met to start downloads.
    */
   public DownloadManager(
+      Context context,
       File actionFile,
       DownloaderFactory downloaderFactory,
       int maxSimultaneousDownloads,
-      int minRetryCount) {
+      int minRetryCount,
+      Requirements requirements) {
+    this.context = context.getApplicationContext();
     this.actionFile = new ActionFile(actionFile);
     this.downloaderFactory = downloaderFactory;
     this.maxActiveDownloads = maxSimultaneousDownloads;
@@ -146,10 +178,30 @@ public final class DownloadManager {
     listeners = new CopyOnWriteArraySet<>();
     actionQueue = new ArrayDeque<>();
 
+    watchRequirements(requirements);
     loadActions();
     logd("Created");
   }
 
+  /**
+   * Sets the requirements needed to be met to start downloads.
+   *
+   * @param requirements Need to be met to start downloads.
+   */
+  public void setRequirements(Requirements requirements) {
+    Assertions.checkState(!released);
+    if (requirements.equals(requirementsWatcher.getRequirements())) {
+      return;
+    }
+    requirementsWatcher.stop();
+    notifyListenersRequirementsStateChange(watchRequirements(requirements));
+  }
+
+  /** Returns the requirements needed to be met to start downloads. */
+  public Requirements getRequirements() {
+    return requirementsWatcher.getRequirements();
+  }
+
   /**
    * Adds a {@link Listener}.
    *
@@ -278,6 +330,9 @@ public final class DownloadManager {
     }
     setStopFlags(STOP_FLAG_DOWNLOAD_MANAGER_NOT_READY);
     released = true;
+    if (requirementsWatcher != null) {
+      requirementsWatcher.stop();
+    }
     final ConditionVariable fileIOFinishedCondition = new ConditionVariable();
     fileIOHandler.post(fileIOFinishedCondition::open);
     fileIOFinishedCondition.block();
@@ -346,6 +401,15 @@ public final class DownloadManager {
     }
   }
 
+  private void notifyListenersRequirementsStateChange(
+      @Requirements.RequirementFlags int notMetRequirements) {
+    logdFlags("Not met requirements are changed", notMetRequirements);
+    for (Listener listener : listeners) {
+      listener.onRequirementsStateChanged(
+          DownloadManager.this, requirementsWatcher.getRequirements(), notMetRequirements);
+    }
+  }
+
   private void loadActions() {
     fileIOHandler.post(
         () -> {
@@ -420,6 +484,18 @@ public final class DownloadManager {
     }
   }
 
+  @Requirements.RequirementFlags
+  private int watchRequirements(Requirements requirements) {
+    requirementsWatcher = new RequirementsWatcher(context, new RequirementListener(), requirements);
+    @Requirements.RequirementFlags int notMetRequirements = requirementsWatcher.start();
+    if (notMetRequirements == 0) {
+      startDownloads();
+    } else {
+      stopDownloads();
+    }
+    return notMetRequirements;
+  }
+
   private static final class Download {
 
     private final String id;
@@ -693,4 +769,20 @@ public final class DownloadManager {
       return Math.min((errorCount - 1) * 1000, 5000);
     }
   }
+
+  private class RequirementListener implements RequirementsWatcher.Listener {
+    @Override
+    public void requirementsMet(RequirementsWatcher requirementsWatcher) {
+      startDownloads();
+      notifyListenersRequirementsStateChange(0);
+    }
+
+    @Override
+    public void requirementsNotMet(
+        RequirementsWatcher requirementsWatcher,
+        @Requirements.RequirementFlags int notMetRequirements) {
+      stopDownloads();
+      notifyListenersRequirementsStateChange(notMetRequirements);
+    }
+  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index 3031a032db..d424ed5ef0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -25,8 +25,8 @@ import android.os.Looper;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import com.google.android.exoplayer2.scheduler.Requirements;
-import com.google.android.exoplayer2.scheduler.RequirementsWatcher;
 import com.google.android.exoplayer2.scheduler.Scheduler;
+import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.NotificationUtil;
 import com.google.android.exoplayer2.util.Util;
@@ -43,10 +43,6 @@ public abstract class DownloadService extends Service {
   /** Starts a download service, adding a new {@link DownloadAction} to be executed. */
   public static final String ACTION_ADD = "com.google.android.exoplayer.downloadService.action.ADD";
 
-  /** Reloads the download requirements. */
-  public static final String ACTION_RELOAD_REQUIREMENTS =
-      "com.google.android.exoplayer.downloadService.action.RELOAD_REQUIREMENTS";
-
   /** Like {@link #ACTION_INIT}, but with {@link #KEY_FOREGROUND} implicitly set to true. */
   private static final String ACTION_RESTART =
       "com.google.android.exoplayer.downloadService.action.RESTART";
@@ -70,20 +66,16 @@ public abstract class DownloadService extends Service {
   private static final String TAG = "DownloadService";
   private static final boolean DEBUG = false;
 
-  // Keep the requirements helper for each DownloadService as long as there are downloads (and the
-  // process is running). This allows downloads to resume when there's no scheduler. It may also
-  // allow downloads the resume more quickly than when relying on the scheduler alone.
-  private static final HashMap<Class<? extends DownloadService>, RequirementsHelper>
-      requirementsHelpers = new HashMap<>();
-  private static final Requirements DEFAULT_REQUIREMENTS =
-      new Requirements(Requirements.NETWORK_TYPE_ANY, false, false);
+  // Keep DownloadManagerListeners for each DownloadService as long as there are downloads (and the
+  // process is running). This allows DownloadService to restart when there's no scheduler.
+  private static final HashMap<Class<? extends DownloadService>, DownloadManagerHelper>
+      downloadManagerListeners = new HashMap<>();
 
   private final @Nullable ForegroundNotificationUpdater foregroundNotificationUpdater;
   private final @Nullable String channelId;
   private final @StringRes int channelName;
 
   private DownloadManager downloadManager;
-  private DownloadManagerListener downloadManagerListener;
   private int lastStartId;
   private boolean startedInForeground;
   private boolean taskRemoved;
@@ -227,9 +219,16 @@ public abstract class DownloadService extends Service {
       NotificationUtil.createNotificationChannel(
           this, channelId, channelName, NotificationUtil.IMPORTANCE_LOW);
     }
-    downloadManager = getDownloadManager();
-    downloadManagerListener = new DownloadManagerListener();
-    downloadManager.addListener(downloadManagerListener);
+    Class<? extends DownloadService> clazz = getClass();
+    DownloadManagerHelper downloadManagerHelper = downloadManagerListeners.get(clazz);
+    if (downloadManagerHelper == null) {
+      downloadManagerHelper =
+          new DownloadManagerHelper(
+              getApplicationContext(), getDownloadManager(), getScheduler(), clazz);
+      downloadManagerListeners.put(clazz, downloadManagerHelper);
+    }
+    downloadManager = downloadManagerHelper.downloadManager;
+    downloadManagerHelper.attachService(this);
   }
 
   @Override
@@ -264,22 +263,11 @@ public abstract class DownloadService extends Service {
           }
         }
         break;
-      case ACTION_RELOAD_REQUIREMENTS:
-        stopWatchingRequirements();
-        break;
       default:
         Log.e(TAG, "Ignoring unrecognized action: " + intentAction);
         break;
     }
 
-    Requirements requirements = getRequirements();
-    if (requirements.checkRequirements(this)) {
-      downloadManager.startDownloads();
-    } else {
-      downloadManager.stopDownloads();
-    }
-    maybeStartWatchingRequirements(requirements);
-
     if (downloadManager.isIdle()) {
       stop();
     }
@@ -295,11 +283,12 @@ public abstract class DownloadService extends Service {
   @Override
   public void onDestroy() {
     logd("onDestroy");
+    DownloadManagerHelper downloadManagerHelper = downloadManagerListeners.get(getClass());
+    boolean unschedule = downloadManager.getDownloadCount() <= 0;
+    downloadManagerHelper.detachService(this, unschedule);
     if (foregroundNotificationUpdater != null) {
       foregroundNotificationUpdater.stopPeriodicUpdates();
     }
-    downloadManager.removeListener(downloadManagerListener);
-    maybeStopWatchingRequirements();
   }
 
   /** DownloadService isn't designed to be bound. */
@@ -311,9 +300,7 @@ public abstract class DownloadService extends Service {
 
   /**
    * Returns a {@link DownloadManager} to be used to downloaded content. Called only once in the
-   * life cycle of the service. The service will call {@link DownloadManager#startDownloads()} and
-   * {@link DownloadManager#stopDownloads} as necessary when requirements returned by {@link
-   * #getRequirements()} are met or stop being met.
+   * life cycle of the process.
    */
   protected abstract DownloadManager getDownloadManager();
 
@@ -324,14 +311,6 @@ public abstract class DownloadService extends Service {
    */
   protected abstract @Nullable Scheduler getScheduler();
 
-  /**
-   * Returns requirements for downloads to take place. By default the only requirement is that the
-   * device has network connectivity.
-   */
-  protected Requirements getRequirements() {
-    return DEFAULT_REQUIREMENTS;
-  }
-
   /**
    * Should be overridden in the subclass if the service will be run in the foreground.
    *
@@ -363,32 +342,16 @@ public abstract class DownloadService extends Service {
     // Do nothing.
   }
 
-  private void maybeStartWatchingRequirements(Requirements requirements) {
-    if (downloadManager.getDownloadCount() == 0) {
-      return;
-    }
-    Class<? extends DownloadService> clazz = getClass();
-    RequirementsHelper requirementsHelper = requirementsHelpers.get(clazz);
-    if (requirementsHelper == null) {
-      requirementsHelper = new RequirementsHelper(this, requirements, getScheduler(), clazz);
-      requirementsHelpers.put(clazz, requirementsHelper);
-      requirementsHelper.start();
-      logd("started watching requirements");
-    }
-  }
-
-  private void maybeStopWatchingRequirements() {
-    if (downloadManager.getDownloadCount() > 0) {
-      return;
-    }
-    stopWatchingRequirements();
-  }
-
-  private void stopWatchingRequirements() {
-    RequirementsHelper requirementsHelper = requirementsHelpers.remove(getClass());
-    if (requirementsHelper != null) {
-      requirementsHelper.stop();
-      logd("stopped watching requirements");
+  private void notifyDownloadStateChange(DownloadState downloadState) {
+    onDownloadStateChanged(downloadState);
+    if (foregroundNotificationUpdater != null) {
+      if (downloadState.state == DownloadState.STATE_DOWNLOADING
+          || downloadState.state == DownloadState.STATE_REMOVING
+          || downloadState.state == DownloadState.STATE_RESTARTING) {
+        foregroundNotificationUpdater.startPeriodicUpdates();
+      } else {
+        foregroundNotificationUpdater.update();
+      }
     }
   }
 
@@ -420,33 +383,6 @@ public abstract class DownloadService extends Service {
     return new Intent(context, clazz).setAction(action);
   }
 
-  private final class DownloadManagerListener implements DownloadManager.Listener {
-    @Override
-    public void onInitialized(DownloadManager downloadManager) {
-      maybeStartWatchingRequirements(getRequirements());
-    }
-
-    @Override
-    public void onDownloadStateChanged(
-        DownloadManager downloadManager, DownloadState downloadState) {
-      DownloadService.this.onDownloadStateChanged(downloadState);
-      if (foregroundNotificationUpdater != null) {
-        if (downloadState.state == DownloadState.STATE_DOWNLOADING
-            || downloadState.state == DownloadState.STATE_REMOVING
-            || downloadState.state == DownloadState.STATE_RESTARTING) {
-          foregroundNotificationUpdater.startPeriodicUpdates();
-        } else {
-          foregroundNotificationUpdater.update();
-        }
-      }
-    }
-
-    @Override
-    public final void onIdle(DownloadManager downloadManager) {
-      stop();
-    }
-  }
-
   private final class ForegroundNotificationUpdater implements Runnable {
 
     private final int notificationId;
@@ -494,58 +430,87 @@ public abstract class DownloadService extends Service {
     }
   }
 
-  private static final class RequirementsHelper implements RequirementsWatcher.Listener {
+  private static final class DownloadManagerHelper implements DownloadManager.Listener {
 
     private final Context context;
-    private final Requirements requirements;
-    private final @Nullable Scheduler scheduler;
+    private final DownloadManager downloadManager;
+    @Nullable private final Scheduler scheduler;
     private final Class<? extends DownloadService> serviceClass;
-    private final RequirementsWatcher requirementsWatcher;
+    @Nullable private DownloadService downloadService;
 
-    private RequirementsHelper(
+    private DownloadManagerHelper(
         Context context,
-        Requirements requirements,
+        DownloadManager downloadManager,
         @Nullable Scheduler scheduler,
         Class<? extends DownloadService> serviceClass) {
       this.context = context;
-      this.requirements = requirements;
+      this.downloadManager = downloadManager;
       this.scheduler = scheduler;
       this.serviceClass = serviceClass;
-      requirementsWatcher = new RequirementsWatcher(context, this, requirements);
-    }
-
-    public void start() {
-      requirementsWatcher.start();
-    }
-
-    public void stop() {
-      requirementsWatcher.stop();
+      downloadManager.addListener(this);
       if (scheduler != null) {
+        Requirements requirements = downloadManager.getRequirements();
+        setSchedulerEnabled(/* enabled= */ !requirements.checkRequirements(context), requirements);
+      }
+    }
+
+    public void attachService(DownloadService downloadService) {
+      Assertions.checkState(this.downloadService == null);
+      this.downloadService = downloadService;
+    }
+
+    public void detachService(DownloadService downloadService, boolean unschedule) {
+      Assertions.checkState(this.downloadService == downloadService);
+      this.downloadService = null;
+      if (unschedule) {
         scheduler.cancel();
       }
     }
 
     @Override
-    public void requirementsMet(RequirementsWatcher requirementsWatcher) {
-      try {
-        notifyService();
-      } catch (Exception e) {
-        /* If we can't notify the service, don't stop the scheduler. */
-        return;
-      }
-      if (scheduler != null) {
-        scheduler.cancel();
+    public void onInitialized(DownloadManager downloadManager) {
+      // Do nothing.
+    }
+
+    @Override
+    public void onDownloadStateChanged(
+        DownloadManager downloadManager, DownloadState downloadState) {
+      if (downloadService != null) {
+        downloadService.notifyDownloadStateChange(downloadState);
       }
     }
 
     @Override
-    public void requirementsNotMet(RequirementsWatcher requirementsWatcher) {
-      try {
-        notifyService();
-      } catch (Exception e) {
-        /* Do nothing. The service isn't running anyway. */
+    public final void onIdle(DownloadManager downloadManager) {
+      if (downloadService != null) {
+        downloadService.stop();
+      }
+    }
+
+    @Override
+    public void onRequirementsStateChanged(
+        DownloadManager downloadManager,
+        Requirements requirements,
+        @Requirements.RequirementFlags int notMetRequirements) {
+      boolean requirementsMet = notMetRequirements == 0;
+      if (downloadService == null && requirementsMet) {
+        try {
+          Intent intent = getIntent(context, serviceClass, DownloadService.ACTION_INIT);
+          context.startService(intent);
+        } catch (IllegalStateException e) {
+          /* startService fails if the app is in the background then don't stop the scheduler. */
+          return;
+        }
       }
       if (scheduler != null) {
+        setSchedulerEnabled(/* enabled= */ !requirementsMet, requirements);
+      }
+    }
+
+    private void setSchedulerEnabled(boolean enabled, Requirements requirements) {
+      if (!enabled) {
+        scheduler.cancel();
+      } else {
         String servicePackage = context.getPackageName();
         boolean success = scheduler.schedule(requirements, servicePackage, ACTION_RESTART);
         if (!success) {
@@ -553,15 +518,5 @@ public abstract class DownloadService extends Service {
         }
       }
     }
-
-    private void notifyService() throws Exception {
-      Intent intent = getIntent(context, serviceClass, DownloadService.ACTION_INIT);
-      try {
-        context.startService(intent);
-      } catch (IllegalStateException e) {
-        /* startService will fail if the app is in the background and the service isn't running. */
-        throw new Exception(e);
-      }
-    }
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
index 4019d1ae70..77630a4543 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
@@ -155,16 +155,14 @@ public final class Requirements {
    * @return Whether the requirements are met.
    */
   public boolean checkRequirements(Context context) {
-    return checkNetworkRequirements(context)
-        && checkChargingRequirement(context)
-        && checkIdleRequirement(context);
+    return getNotMetRequirements(context) == 0;
   }
 
   /**
-   * Returns the requirement flags that are not met, or 0.
+   * Returns {@link RequirementFlags} that are not met, or 0.
    *
    * @param context Any context.
-   * @return The requirement flags that are not met, or 0.
+   * @return RequirementFlags that are not met, or 0.
    */
   @RequirementFlags
   public int getNotMetRequirements(Context context) {
@@ -285,4 +283,20 @@ public final class Requirements {
         + (isIdleRequired() ? ",idle" : "")
         + '}';
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    return requirements == ((Requirements) o).requirements;
+  }
+
+  @Override
+  public int hashCode() {
+    return requirements;
+  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
index fded95614c..686f19d161 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
@@ -55,8 +55,12 @@ public final class RequirementsWatcher {
      * requirements are not met.
      *
      * @param requirementsWatcher Calling instance.
+     * @param notMetRequirements {@link Requirements.RequirementFlags RequirementFlags} that are not
+     *     met, or 0.
      */
-    void requirementsNotMet(RequirementsWatcher requirementsWatcher);
+    void requirementsNotMet(
+        RequirementsWatcher requirementsWatcher,
+        @Requirements.RequirementFlags int notMetRequirements);
   }
 
   private static final String TAG = "RequirementsWatcher";
@@ -66,7 +70,7 @@ public final class RequirementsWatcher {
   private final Requirements requirements;
   private DeviceStatusChangeReceiver receiver;
 
-  private int notMetRequirements;
+  @Requirements.RequirementFlags private int notMetRequirements;
   private CapabilityValidatedCallback networkCallback;
   private Handler handler;
 
@@ -85,8 +89,11 @@ public final class RequirementsWatcher {
   /**
    * Starts watching for changes. Must be called from a thread that has an associated {@link
    * Looper}. Listener methods are called on the caller thread.
+   *
+   * @return Initial {@link Requirements.RequirementFlags RequirementFlags} that are not met, or 0.
    */
-  public void start() {
+  @Requirements.RequirementFlags
+  public int start() {
     Assertions.checkNotNull(Looper.myLooper());
     handler = new Handler();
 
@@ -115,6 +122,7 @@ public final class RequirementsWatcher {
     receiver = new DeviceStatusChangeReceiver();
     context.registerReceiver(receiver, filter, null, handler);
     logd(this + " started");
+    return notMetRequirements;
   }
 
   /** Stops watching for changes. */
@@ -162,6 +170,7 @@ public final class RequirementsWatcher {
   }
 
   private void checkRequirements() {
+    @Requirements.RequirementFlags
     int notMetRequirements = requirements.getNotMetRequirements(context);
     if (this.notMetRequirements == notMetRequirements) {
       logd("notMetRequirements hasn't changed: " + notMetRequirements);
@@ -173,7 +182,7 @@ public final class RequirementsWatcher {
       listener.requirementsMet(this);
     } else {
       logd("stop job");
-      listener.requirementsNotMet(this);
+      listener.requirementsNotMet(this, notMetRequirements);
     }
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index 5902ac894a..283d343e63 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.fail;
 import android.net.Uri;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.offline.DownloadState.State;
+import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.testutil.DummyMainThread;
 import com.google.android.exoplayer2.testutil.RobolectricUtil;
 import com.google.android.exoplayer2.testutil.TestDownloadManagerListener;
@@ -426,7 +427,12 @@ public class DownloadManagerTest {
           () -> {
             downloadManager =
                 new DownloadManager(
-                    actionFile, downloaderFactory, maxActiveDownloadTasks, MIN_RETRY_COUNT);
+                    RuntimeEnvironment.application,
+                    actionFile,
+                    downloaderFactory,
+                    maxActiveDownloadTasks,
+                    MIN_RETRY_COUNT,
+                    new Requirements(0));
             downloadManagerListener =
                 new TestDownloadManagerListener(downloadManager, dummyMainThread);
             downloadManager.startDownloads();
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
index ccccb20ccb..28040ec538 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
@@ -30,6 +30,7 @@ import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadManager;
 import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
+import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.testutil.DummyMainThread;
 import com.google.android.exoplayer2.testutil.FakeDataSet;
 import com.google.android.exoplayer2.testutil.FakeDataSource;
@@ -241,11 +242,13 @@ public class DownloadManagerDashTest {
           Factory fakeDataSourceFactory = new FakeDataSource.Factory().setFakeDataSet(fakeDataSet);
           downloadManager =
               new DownloadManager(
+                  RuntimeEnvironment.application,
                   actionFile,
                   new DefaultDownloaderFactory(
                       new DownloaderConstructorHelper(cache, fakeDataSourceFactory)),
                   /* maxSimultaneousDownloads= */ 1,
-                  /* minRetryCount= */ 3);
+                  /* minRetryCount= */ 3,
+                  new Requirements(0));
 
           downloadManagerListener =
               new TestDownloadManagerListener(downloadManager, dummyMainThread);
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
index adae0d7b04..bf32b65ba7 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
@@ -30,6 +30,7 @@ import com.google.android.exoplayer2.offline.DownloadManager;
 import com.google.android.exoplayer2.offline.DownloadService;
 import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
+import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.scheduler.Scheduler;
 import com.google.android.exoplayer2.testutil.DummyMainThread;
 import com.google.android.exoplayer2.testutil.FakeDataSet;
@@ -117,11 +118,13 @@ public class DownloadServiceDashTest {
           actionFile.delete();
           final DownloadManager dashDownloadManager =
               new DownloadManager(
+                  RuntimeEnvironment.application,
                   actionFile,
                   new DefaultDownloaderFactory(
                       new DownloaderConstructorHelper(cache, fakeDataSourceFactory)),
                   /* maxSimultaneousDownloads= */ 1,
-                  /* minRetryCount= */ 3);
+                  /* minRetryCount= */ 3,
+                  new Requirements(0));
           downloadManagerListener =
               new TestDownloadManagerListener(dashDownloadManager, dummyMainThread);
           dashDownloadManager.startDownloads();
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
index 8216b881f3..2109cceda8 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
@@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
 import android.os.ConditionVariable;
 import com.google.android.exoplayer2.offline.DownloadManager;
 import com.google.android.exoplayer2.offline.DownloadState;
+import com.google.android.exoplayer2.scheduler.Requirements;
 import java.util.HashMap;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.CountDownLatch;
@@ -82,6 +83,12 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
     }
   }
 
+  @Override
+  public void onRequirementsStateChanged(
+      DownloadManager downloadManager, Requirements requirements, int notMetRequirements) {
+    // Do nothing.
+  }
+
   /**
    * Blocks until all remove and download tasks are complete and throws an exception if there was an
    * error.

From 16a185de1d42b049608c128bc203ea968234864a Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Wed, 16 Jan 2019 20:18:42 +0000
Subject: [PATCH 390/832] make PlayerNotificationListener better suited for
 foreground services

Issue: #5301
Issue: #4988
Issue: #4813
Issue: #5344
Issue: #5117
PiperOrigin-RevId: 229603354
---
 RELEASENOTES.md                               |   2 +
 .../ui/PlayerNotificationManager.java         | 183 +++++++++++-------
 2 files changed, 111 insertions(+), 74 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 1150edcf8c..96d1fb1ff3 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -37,6 +37,8 @@
 * Add `Handler` parameter to `ConcatenatingMediaSource` methods which take a
   callback `Runnable`.
 * Remove `player` and `isTopLevelSource` parameters from `MediaSource.prepare`.
+* Change signature of `PlayerNotificationManager.NotificationListener` to better
+  fit service requirements. Remove ability to set a custom stop action.
 
 ### 2.9.4 ###
 
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
index 4d6b83ccae..103534d8ca 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
@@ -58,7 +58,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
  * player state.
  *
  * <p>The notification is cancelled when {@code null} is passed to {@link #setPlayer(Player)} or
- * when an intent with action {@link #ACTION_STOP} is received.
+ * when the notification is dismissed by the user.
  *
  * <p>If the player is released it must be removed from the manager by calling {@code
  * setPlayer(null)} which will cancel the notification.
@@ -72,11 +72,17 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
  *       are displayed.
  *       <ul>
  *         <li>Corresponding setter: {@link #setUseNavigationActions(boolean)}
+ *         <li>Default: {@code true}
  *       </ul>
- *   <li><b>{@code stopAction}</b> - Sets which stop action should be used. If set to null, the stop
- *       action is not displayed.
+ *   <li><b>{@code usePlayPauseActions}</b> - Sets whether the play and pause actions are displayed.
  *       <ul>
- *         <li>Corresponding setter: {@link #setStopAction(String)}}
+ *         <li>Corresponding setter: {@link #setUsePlayPauseActions(boolean)}
+ *         <li>Default: {@code true}
+ *       </ul>
+ *   <li><b>{@code useStopAction}</b> - Sets whether the stop action is displayed.
+ *       <ul>
+ *         <li>Corresponding setter: {@link #setUseStopAction(boolean)}
+ *         <li>Default: {@code false}
  *       </ul>
  *   <li><b>{@code rewindIncrementMs}</b> - Sets the rewind increment. If set to zero the rewind
  *       action is not displayed.
@@ -87,7 +93,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
  *   <li><b>{@code fastForwardIncrementMs}</b> - Sets the fast forward increment. If set to zero the
  *       fast forward action is not included in the notification.
  *       <ul>
- *         <li>Corresponding setter: {@link #setFastForwardIncrementMs(long)}}
+ *         <li>Corresponding setter: {@link #setFastForwardIncrementMs(long)}
  *         <li>Default: {@link #DEFAULT_FAST_FORWARD_MS} (5000)
  *       </ul>
  * </ul>
@@ -195,7 +201,7 @@ public class PlayerNotificationManager {
     void onCustomAction(Player player, String action, Intent intent);
   }
 
-  /** A listener for start and cancellation of the notification. */
+  /** A listener for changes to the notification. */
   public interface NotificationListener {
 
     /**
@@ -203,15 +209,41 @@ public class PlayerNotificationManager {
      *
      * @param notificationId The id with which the notification has been posted.
      * @param notification The {@link Notification}.
+     * @deprecated Use {@link #onNotificationPosted(int, Notification, boolean)} instead.
      */
-    void onNotificationStarted(int notificationId, Notification notification);
+    @Deprecated
+    default void onNotificationStarted(int notificationId, Notification notification) {}
 
     /**
      * Called after the notification has been cancelled.
      *
      * @param notificationId The id of the notification which has been cancelled.
+     * @deprecated Use {@link #onNotificationCancelled(int, boolean)}.
      */
-    void onNotificationCancelled(int notificationId);
+    @Deprecated
+    default void onNotificationCancelled(int notificationId) {}
+
+    /**
+     * Called after the notification has been cancelled.
+     *
+     * @param notificationId The id of the notification which has been cancelled.
+     * @param dismissedByUser {@code true} if the notification is cancelled because the user
+     *     dismissed the notification.
+     */
+    default void onNotificationCancelled(int notificationId, boolean dismissedByUser) {}
+
+    /**
+     * Called each time after the notification has been posted.
+     *
+     * <p>The {@code isPlayerActive} flag indicates whether a service in which the player may run
+     * needs to be in the foreground.
+     *
+     * @param notificationId The id of the notification which has been posted.
+     * @param notification The {@link Notification}.
+     * @param isPlayerActive {@code true} if the player is active.
+     */
+    default void onNotificationPosted(
+        int notificationId, Notification notification, boolean isPlayerActive) {}
   }
 
   /** Receives a {@link Bitmap}. */
@@ -235,7 +267,7 @@ public class PlayerNotificationManager {
               if (player != null
                   && notificationTag == currentNotificationTag
                   && isNotificationStarted) {
-                updateNotification(bitmap);
+                startOrUpdateNotification(bitmap);
               }
             });
       }
@@ -254,10 +286,15 @@ public class PlayerNotificationManager {
   public static final String ACTION_FAST_FORWARD = "com.google.android.exoplayer.ffwd";
   /** The action which rewinds. */
   public static final String ACTION_REWIND = "com.google.android.exoplayer.rewind";
-  /** The action which cancels the notification and stops playback. */
+  /** The action which stops playback. */
   public static final String ACTION_STOP = "com.google.android.exoplayer.stop";
   /** The extra key of the instance id of the player notification manager. */
   public static final String EXTRA_INSTANCE_ID = "INSTANCE_ID";
+  /**
+   * The action which is executed when the notification is dismissed. It cancels the notification
+   * and calls {@link NotificationListener#onNotificationCancelled(int, boolean)}.
+   */
+  private static final String ACTION_DISMISS = "com.google.android.exoplayer.dismiss";
 
   /**
    * Visibility of notification on the lock screen. One of {@link
@@ -311,6 +348,7 @@ public class PlayerNotificationManager {
   private final NotificationBroadcastReceiver notificationBroadcastReceiver;
   private final Map<String, NotificationCompat.Action> playbackActions;
   private final Map<String, NotificationCompat.Action> customActions;
+  private final PendingIntent dismissPendingIntent;
   private final int instanceId;
   private final Timeline.Window window;
 
@@ -323,8 +361,7 @@ public class PlayerNotificationManager {
   private @Nullable MediaSessionCompat.Token mediaSessionToken;
   private boolean useNavigationActions;
   private boolean usePlayPauseActions;
-  private @Nullable String stopAction;
-  private @Nullable PendingIntent stopPendingIntent;
+  private boolean useStopAction;
   private long fastForwardMs;
   private long rewindMs;
   private int badgeIconType;
@@ -519,7 +556,6 @@ public class PlayerNotificationManager {
     priority = NotificationCompat.PRIORITY_LOW;
     fastForwardMs = DEFAULT_FAST_FORWARD_MS;
     rewindMs = DEFAULT_REWIND_MS;
-    stopAction = ACTION_STOP;
     badgeIconType = NotificationCompat.BADGE_ICON_SMALL;
     visibility = NotificationCompat.VISIBILITY_PUBLIC;
 
@@ -535,7 +571,8 @@ public class PlayerNotificationManager {
     for (String action : customActions.keySet()) {
       intentFilter.addAction(action);
     }
-    stopPendingIntent = Assertions.checkNotNull(playbackActions.get(ACTION_STOP)).actionIntent;
+    dismissPendingIntent = createBroadcastIntent(ACTION_DISMISS, context, instanceId);
+    intentFilter.addAction(ACTION_DISMISS);
   }
 
   /**
@@ -562,7 +599,7 @@ public class PlayerNotificationManager {
     if (this.player != null) {
       this.player.removeListener(playerListener);
       if (player == null) {
-        stopNotification();
+        stopNotification(/* dismissedByUser= */ false);
       }
     }
     this.player = player;
@@ -570,9 +607,7 @@ public class PlayerNotificationManager {
       wasPlayWhenReady = player.getPlayWhenReady();
       lastPlaybackState = player.getPlaybackState();
       player.addListener(playerListener);
-      if (lastPlaybackState != Player.STATE_IDLE) {
-        startOrUpdateNotification();
-      }
+      startOrUpdateNotification();
     }
   }
 
@@ -664,24 +699,15 @@ public class PlayerNotificationManager {
   }
 
   /**
-   * Sets the name of the action to be used as stop action to cancel the notification. If {@code
-   * null} is passed the stop action is not displayed.
+   * Sets whether the stop action should be used.
    *
-   * @param stopAction The name of the stop action which must be {@link #ACTION_STOP} or an action
-   *     provided by the {@link CustomActionReceiver}. {@code null} to omit the stop action.
+   * @param useStopAction Whether to use the stop action.
    */
-  public final void setStopAction(@Nullable String stopAction) {
-    if (Util.areEqual(stopAction, this.stopAction)) {
+  public final void setUseStopAction(boolean useStopAction) {
+    if (this.useStopAction == useStopAction) {
       return;
     }
-    this.stopAction = stopAction;
-    if (ACTION_STOP.equals(stopAction)) {
-      stopPendingIntent = Assertions.checkNotNull(playbackActions.get(ACTION_STOP)).actionIntent;
-    } else if (stopAction != null) {
-      stopPendingIntent = Assertions.checkNotNull(customActions.get(stopAction)).actionIntent;
-    } else {
-      stopPendingIntent = null;
-    }
+    this.useStopAction = useStopAction;
     invalidate();
   }
 
@@ -864,36 +890,50 @@ public class PlayerNotificationManager {
   /** Forces an update of the notification if already started. */
   public void invalidate() {
     if (isNotificationStarted && player != null) {
-      updateNotification(null);
+      startOrUpdateNotification();
     }
   }
 
+  @Nullable
+  private Notification startOrUpdateNotification() {
+    return player != null ? startOrUpdateNotification(/* bitmap= */ null) : null;
+  }
+
   @RequiresNonNull("player")
-  private Notification updateNotification(@Nullable Bitmap bitmap) {
+  @Nullable
+  private Notification startOrUpdateNotification(@Nullable Bitmap bitmap) {
     Notification notification = createNotification(player, bitmap);
+    if (notification == null) {
+      stopNotification(/* dismissedByUser= */ false);
+      return null;
+    }
     notificationManager.notify(notificationId, notification);
+    if (!isNotificationStarted) {
+      isNotificationStarted = true;
+      context.registerReceiver(notificationBroadcastReceiver, intentFilter);
+      if (notificationListener != null) {
+        notificationListener.onNotificationStarted(notificationId, notification);
+      }
+    }
+    NotificationListener listener = notificationListener;
+    Player player = this.player;
+    if (listener != null && player != null) {
+      boolean isPlayerActive =
+          player.getPlayWhenReady() && player.getPlaybackState() != Player.STATE_IDLE;
+      listener.onNotificationPosted(notificationId, notification, isPlayerActive);
+    }
     return notification;
   }
 
-  private void startOrUpdateNotification() {
-    if (player != null) {
-      Notification notification = updateNotification(null);
-      if (!isNotificationStarted) {
-        isNotificationStarted = true;
-        context.registerReceiver(notificationBroadcastReceiver, intentFilter);
-        if (notificationListener != null) {
-          notificationListener.onNotificationStarted(notificationId, notification);
-        }
-      }
-    }
-  }
-
-  private void stopNotification() {
+  private void stopNotification(boolean dismissedByUser) {
     if (isNotificationStarted) {
-      notificationManager.cancel(notificationId);
+      if (!dismissedByUser) {
+        notificationManager.cancel(notificationId);
+      }
       isNotificationStarted = false;
       context.unregisterReceiver(notificationBroadcastReceiver);
       if (notificationListener != null) {
+        notificationListener.onNotificationCancelled(notificationId, dismissedByUser);
         notificationListener.onNotificationCancelled(notificationId);
       }
     }
@@ -904,9 +944,14 @@ public class PlayerNotificationManager {
    *
    * @param player The player for which state to build a notification.
    * @param largeIcon The large icon to be used.
-   * @return The {@link Notification} which has been built.
+   * @return The {@link Notification} which has been built, or {@code null} if no notification
+   *     should be displayed.
    */
+  @Nullable
   protected Notification createNotification(Player player, @Nullable Bitmap largeIcon) {
+    if (player.getPlaybackState() == Player.STATE_IDLE) {
+      return null;
+    }
     NotificationCompat.Builder builder = new NotificationCompat.Builder(context, channelId);
     List<String> actionNames = getActions(player);
     for (int i = 0; i < actionNames.size(); i++) {
@@ -925,14 +970,13 @@ public class PlayerNotificationManager {
       mediaStyle.setMediaSession(mediaSessionToken);
     }
     mediaStyle.setShowActionsInCompactView(getActionIndicesForCompactView(actionNames, player));
-    // Configure stop action (eg. when user dismisses the notification when !isOngoing).
-    boolean useStopAction = stopAction != null;
-    mediaStyle.setShowCancelButton(useStopAction);
-    if (useStopAction && stopPendingIntent != null) {
-      builder.setDeleteIntent(stopPendingIntent);
-      mediaStyle.setCancelButtonIntent(stopPendingIntent);
-    }
+    // Configure dismiss action prior to API 21 ('x' button).
+    mediaStyle.setShowCancelButton(true);
+    mediaStyle.setCancelButtonIntent(dismissPendingIntent);
+    // Set intent which is sent if the user selects 'clear all'
+    builder.setDeleteIntent(dismissPendingIntent);
     builder.setStyle(mediaStyle);
+
     // Set notification properties from getters.
     builder
         .setBadgeIconType(badgeIconType)
@@ -1030,8 +1074,8 @@ public class PlayerNotificationManager {
     if (customActionReceiver != null) {
       stringActions.addAll(customActionReceiver.getCustomActions(player));
     }
-    if (ACTION_STOP.equals(stopAction)) {
-      stringActions.add(stopAction);
+    if (useStopAction) {
+      stringActions.add(ACTION_STOP);
     }
     return stringActions;
   }
@@ -1176,27 +1220,20 @@ public class PlayerNotificationManager {
 
     @Override
     public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
-      if ((wasPlayWhenReady != playWhenReady && playbackState != Player.STATE_IDLE)
-          || lastPlaybackState != playbackState) {
+      if (wasPlayWhenReady != playWhenReady || lastPlaybackState != playbackState) {
         startOrUpdateNotification();
+        wasPlayWhenReady = playWhenReady;
+        lastPlaybackState = playbackState;
       }
-      wasPlayWhenReady = playWhenReady;
-      lastPlaybackState = playbackState;
     }
 
     @Override
     public void onTimelineChanged(Timeline timeline, @Nullable Object manifest, int reason) {
-      if (player == null || player.getPlaybackState() == Player.STATE_IDLE) {
-        return;
-      }
       startOrUpdateNotification();
     }
 
     @Override
     public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {
-      if (player == null || player.getPlaybackState() == Player.STATE_IDLE) {
-        return;
-      }
       startOrUpdateNotification();
     }
 
@@ -1207,9 +1244,6 @@ public class PlayerNotificationManager {
 
     @Override
     public void onRepeatModeChanged(int repeatMode) {
-      if (player == null || player.getPlaybackState() == Player.STATE_IDLE) {
-        return;
-      }
       startOrUpdateNotification();
     }
   }
@@ -1245,8 +1279,9 @@ public class PlayerNotificationManager {
       } else if (ACTION_NEXT.equals(action)) {
         next(player);
       } else if (ACTION_STOP.equals(action)) {
-        controlDispatcher.dispatchStop(player, true);
-        stopNotification();
+        controlDispatcher.dispatchStop(player, /* reset= */ true);
+      } else if (ACTION_DISMISS.equals(action)) {
+        stopNotification(/* dismissedByUser= */ true);
       } else if (customActionReceiver != null && customActions.containsKey(action)) {
         customActionReceiver.onCustomAction(player, action, intent);
       }

From f2139d1b7173b38b21111526b9f32bff8d6cdc8b Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Thu, 17 Jan 2019 15:36:25 +0000
Subject: [PATCH 391/832] Add DownloadIndexUtil

This class includes helper methods to upgrade ActionFiles
and custom download records to DownloadIndex.

PiperOrigin-RevId: 229744441
---
 .../exoplayer2/offline/DownloadIndexUtil.java | 144 +++++++++++++++++
 .../offline/DownloadIndexUtilTest.java        | 153 ++++++++++++++++++
 2 files changed, 297 insertions(+)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
new file mode 100644
index 0000000000..63602c7641
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.offline;
+
+import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.offline.DownloadState.State;
+import com.google.android.exoplayer2.util.Assertions;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashSet;
+
+/** {@link DownloadIndex} related utility methods. */
+public final class DownloadIndexUtil {
+
+  /** An interface to provide custom download ids during ActionFile upgrade. */
+  public interface DownloadIdProvider {
+
+    /**
+     * Returns a custom download id for given action.
+     *
+     * @param downloadAction The action which is an id requested for.
+     * @return A custom download id for given action.
+     */
+    String getId(DownloadAction downloadAction);
+  }
+
+  private DownloadIndexUtil() {}
+
+  /**
+   * Upgrades an {@link ActionFile} to {@link DownloadIndex}.
+   *
+   * <p>This method shouldn't be called while {@link DownloadIndex} is used by {@link
+   * DownloadManager}.
+   *
+   * @param actionFile The action file to upgrade.
+   * @param downloadIndex Actions are converted to {@link DownloadState}s and stored in this index.
+   * @param downloadIdProvider A nullable custom download id provider.
+   * @throws IOException If there is an error during loading actions.
+   */
+  public static void upgradeActionFile(
+      ActionFile actionFile,
+      DownloadIndex downloadIndex,
+      @Nullable DownloadIdProvider downloadIdProvider)
+      throws IOException {
+    if (downloadIdProvider == null) {
+      downloadIdProvider = downloadAction -> downloadAction.id;
+    }
+    for (DownloadAction action : actionFile.load()) {
+      addAction(downloadIndex, downloadIdProvider.getId(action), action);
+    }
+  }
+
+  /**
+   * Converts a {@link DownloadAction} to {@link DownloadState} and stored in the given {@link
+   * DownloadIndex}.
+   *
+   * <p>This method shouldn't be called while {@link DownloadIndex} is used by {@link
+   * DownloadManager}.
+   *
+   * @param downloadIndex The action is converted to {@link DownloadState} and stored in this index.
+   * @param id A nullable custom download id which overwrites {@link DownloadAction#id}.
+   * @param action The action to be stored in {@link DownloadIndex}.
+   */
+  public static void addAction(
+      DownloadIndex downloadIndex, @Nullable String id, DownloadAction action) {
+    DownloadState downloadState = downloadIndex.getDownloadState(id != null ? id : action.id);
+    if (downloadState != null) {
+      downloadState = merge(downloadState, action);
+    } else {
+      downloadState = convert(action);
+    }
+    downloadIndex.putDownloadState(downloadState);
+  }
+
+  private static DownloadState merge(DownloadState downloadState, DownloadAction action) {
+    Assertions.checkArgument(action.type.equals(downloadState.type));
+    @State int newState;
+    if (action.isRemoveAction) {
+      newState = DownloadState.STATE_REMOVING;
+    } else {
+      if (downloadState.state == DownloadState.STATE_REMOVING
+          || downloadState.state == DownloadState.STATE_RESTARTING) {
+        newState = DownloadState.STATE_RESTARTING;
+      } else if (downloadState.state == DownloadState.STATE_STOPPED) {
+        newState = DownloadState.STATE_STOPPED;
+      } else {
+        newState = DownloadState.STATE_QUEUED;
+      }
+    }
+    HashSet<StreamKey> keys = new HashSet<>(action.keys);
+    Collections.addAll(keys, downloadState.streamKeys);
+    StreamKey[] newKeys = keys.toArray(new StreamKey[0]);
+    return new DownloadState(
+        downloadState.id,
+        downloadState.type,
+        action.uri,
+        action.customCacheKey,
+        newState,
+        /* downloadPercentage= */ C.PERCENTAGE_UNSET,
+        downloadState.downloadedBytes,
+        /* totalBytes= */ C.LENGTH_UNSET,
+        downloadState.failureReason,
+        downloadState.stopFlags,
+        downloadState.startTimeMs,
+        downloadState.updateTimeMs,
+        newKeys,
+        action.data);
+  }
+
+  private static DownloadState convert(DownloadAction action) {
+    long currentTimeMs = System.currentTimeMillis();
+    return new DownloadState(
+        action.id,
+        action.type,
+        action.uri,
+        action.customCacheKey,
+        /* state= */ action.isRemoveAction
+            ? DownloadState.STATE_REMOVING
+            : DownloadState.STATE_QUEUED,
+        /* downloadPercentage= */ C.PERCENTAGE_UNSET,
+        /* downloadedBytes= */ 0,
+        /* totalBytes= */ C.LENGTH_UNSET,
+        DownloadState.FAILURE_REASON_NONE,
+        /* stopFlags= */ 0,
+        /* startTimeMs= */ currentTimeMs,
+        /* updateTimeMs= */ currentTimeMs,
+        action.keys.toArray(new StreamKey[0]),
+        action.data);
+  }
+}
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
new file mode 100644
index 0000000000..376c840296
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.offline;
+
+import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_DASH;
+import static com.google.common.truth.Truth.assertThat;
+
+import android.net.Uri;
+import com.google.android.exoplayer2.util.Util;
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+/** Unit tests for {@link DownloadIndexUtil}. */
+@RunWith(RobolectricTestRunner.class)
+public class DownloadIndexUtilTest {
+
+  private DefaultDownloadIndex downloadIndex;
+  private File tempFile;
+
+  @Before
+  public void setUp() throws Exception {
+    tempFile = Util.createTempFile(RuntimeEnvironment.application, "ExoPlayerTest");
+    downloadIndex = new DefaultDownloadIndex(RuntimeEnvironment.application);
+  }
+
+  @After
+  public void tearDown() {
+    downloadIndex.release();
+    tempFile.delete();
+  }
+
+  @Test
+  public void addAction_nonExistingDownloadState_createsNewDownloadState() {
+    byte[] data = new byte[] {1, 2, 3, 4};
+    DownloadAction action =
+        DownloadAction.createDownloadAction(
+            TYPE_DASH,
+            Uri.parse("https://www.test.com/download"),
+            asList(
+                new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 1, /* trackIndex= */ 2),
+                new StreamKey(/* periodIndex= */ 3, /* groupIndex= */ 4, /* trackIndex= */ 5)),
+            /* customCacheKey= */ "key123",
+            data);
+
+    DownloadIndexUtil.addAction(downloadIndex, action.id, action);
+
+    assertDownloadIndexContainsAction(action, DownloadState.STATE_QUEUED);
+  }
+
+  @Test
+  public void addAction_existingDownloadState_createsMergedDownloadState() {
+    StreamKey streamKey1 =
+        new StreamKey(/* periodIndex= */ 3, /* groupIndex= */ 4, /* trackIndex= */ 5);
+    StreamKey streamKey2 =
+        new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 1, /* trackIndex= */ 2);
+    DownloadAction action1 =
+        DownloadAction.createDownloadAction(
+            TYPE_DASH,
+            Uri.parse("https://www.test.com/download1"),
+            asList(streamKey1),
+            /* customCacheKey= */ "key123",
+            new byte[] {1, 2, 3, 4});
+    DownloadAction action2 =
+        DownloadAction.createDownloadAction(
+            TYPE_DASH,
+            Uri.parse("https://www.test.com/download2"),
+            asList(streamKey2),
+            /* customCacheKey= */ "key123",
+            new byte[] {5, 4, 3, 2, 1});
+    DownloadIndexUtil.addAction(downloadIndex, action1.id, action1);
+
+    DownloadIndexUtil.addAction(downloadIndex, action2.id, action2);
+
+    DownloadState downloadState = downloadIndex.getDownloadState(action2.id);
+    assertThat(downloadState).isNotNull();
+    assertThat(downloadState.type).isEqualTo(action2.type);
+    assertThat(downloadState.cacheKey).isEqualTo(action2.customCacheKey);
+    assertThat(downloadState.customMetadata).isEqualTo(action2.data);
+    assertThat(downloadState.uri).isEqualTo(action2.uri);
+    assertThat(downloadState.streamKeys).isEqualTo(new StreamKey[] {streamKey2, streamKey1});
+    assertThat(downloadState.state).isEqualTo(DownloadState.STATE_QUEUED);
+  }
+
+  @Test
+  public void upgradeActionFile_createsDownloadStates() throws Exception {
+    ActionFile actionFile = new ActionFile(tempFile);
+    StreamKey streamKey1 =
+        new StreamKey(/* periodIndex= */ 3, /* groupIndex= */ 4, /* trackIndex= */ 5);
+    StreamKey streamKey2 =
+        new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 1, /* trackIndex= */ 2);
+    DownloadAction action1 =
+        DownloadAction.createDownloadAction(
+            TYPE_DASH,
+            Uri.parse("https://www.test.com/download1"),
+            asList(streamKey1),
+            /* customCacheKey= */ "key123",
+            new byte[] {1, 2, 3, 4});
+    DownloadAction action2 =
+        DownloadAction.createDownloadAction(
+            TYPE_DASH,
+            Uri.parse("https://www.test.com/download2"),
+            asList(streamKey2),
+            /* customCacheKey= */ "key234",
+            new byte[] {5, 4, 3, 2, 1});
+    actionFile.store(action1, action2);
+    DownloadAction action3 =
+        DownloadAction.createRemoveAction(
+            TYPE_DASH, Uri.parse("https://www.test.com/download3"), /* customCacheKey= */ "key345");
+    actionFile.store(action1, action2, action3);
+
+    DownloadIndexUtil.upgradeActionFile(actionFile, downloadIndex, /* downloadIdProvider= */ null);
+
+    assertDownloadIndexContainsAction(action1, DownloadState.STATE_QUEUED);
+    assertDownloadIndexContainsAction(action2, DownloadState.STATE_QUEUED);
+    assertDownloadIndexContainsAction(action3, DownloadState.STATE_REMOVING);
+  }
+
+  private void assertDownloadIndexContainsAction(DownloadAction action, int state) {
+    DownloadState downloadState = downloadIndex.getDownloadState(action.id);
+    assertThat(downloadState).isNotNull();
+    assertThat(downloadState.type).isEqualTo(action.type);
+    assertThat(downloadState.cacheKey).isEqualTo(action.customCacheKey);
+    assertThat(downloadState.customMetadata).isEqualTo(action.data);
+    assertThat(downloadState.uri).isEqualTo(action.uri);
+    assertThat(downloadState.streamKeys).isEqualTo(action.keys.toArray(new StreamKey[0]));
+    assertThat(downloadState.state).isEqualTo(state);
+  }
+
+  @SuppressWarnings("unchecked")
+  private static List<StreamKey> asList(StreamKey... streamKeys) {
+    return Arrays.asList(streamKeys);
+  }
+}

From 76baa5724caad62c3bddd312181cf6362b579c5b Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Thu, 17 Jan 2019 16:53:00 +0000
Subject: [PATCH 392/832] solve nullness check warnings with asserts

PiperOrigin-RevId: 229755532
---
 .../android/exoplayer2/ui/PlayerNotificationManager.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
index 103534d8ca..c01aabc9f2 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
@@ -896,12 +896,14 @@ public class PlayerNotificationManager {
 
   @Nullable
   private Notification startOrUpdateNotification() {
-    return player != null ? startOrUpdateNotification(/* bitmap= */ null) : null;
+    Assertions.checkNotNull(this.player);
+    return startOrUpdateNotification(/* bitmap= */ null);
   }
 
   @RequiresNonNull("player")
   @Nullable
   private Notification startOrUpdateNotification(@Nullable Bitmap bitmap) {
+    Player player = this.player;
     Notification notification = createNotification(player, bitmap);
     if (notification == null) {
       stopNotification(/* dismissedByUser= */ false);
@@ -916,8 +918,7 @@ public class PlayerNotificationManager {
       }
     }
     NotificationListener listener = notificationListener;
-    Player player = this.player;
-    if (listener != null && player != null) {
+    if (listener != null) {
       boolean isPlayerActive =
           player.getPlayWhenReady() && player.getPlaybackState() != Player.STATE_IDLE;
       listener.onNotificationPosted(notificationId, notification, isPlayerActive);

From 22413b8037426ed0c40b479aa09680bca40e5df8 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 17 Jan 2019 17:00:11 +0000
Subject: [PATCH 393/832] Add start position to MediaSource.createPeriod.

That's the same position set in MediaPeriod.prepare (where it may be removed
in the future).

Having the position at an earlier point is necessary to fix an
issue with lazy preparation in ConcatenatingMediaSource where the prepare
position was assumed to be known but MediaPeriod.prepare hasn't been called
yet.

Issue:#5350
PiperOrigin-RevId: 229756637
---
 RELEASENOTES.md                               |  4 +++
 .../exoplayer2/ext/ima/ImaAdsMediaSource.java |  4 +--
 .../android/exoplayer2/MediaPeriodHolder.java |  6 ++--
 .../source/ClippingMediaSource.java           |  4 +--
 .../source/ConcatenatingMediaSource.java      |  8 +++--
 .../source/DeferredMediaPeriod.java           | 36 ++++++++++---------
 .../source/ExtractorMediaSource.java          |  2 +-
 .../exoplayer2/source/LoopingMediaSource.java |  7 ++--
 .../exoplayer2/source/MediaSource.java        |  7 ++--
 .../exoplayer2/source/MergingMediaSource.java |  4 +--
 .../source/SingleSampleMediaSource.java       |  2 +-
 .../exoplayer2/source/ads/AdsMediaSource.java |  8 +++--
 .../source/dash/DashMediaSource.java          |  3 +-
 .../exoplayer2/source/hls/HlsMediaSource.java |  2 +-
 .../source/smoothstreaming/SsMediaSource.java |  2 +-
 .../exoplayer2/testutil/FakeMediaSource.java  |  2 +-
 .../testutil/MediaSourceTestRunner.java       | 19 ++++++++--
 17 files changed, 74 insertions(+), 46 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 96d1fb1ff3..51264dcfe0 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -39,6 +39,10 @@
 * Remove `player` and `isTopLevelSource` parameters from `MediaSource.prepare`.
 * Change signature of `PlayerNotificationManager.NotificationListener` to better
   fit service requirements. Remove ability to set a custom stop action.
+* Add `startPositionUs` to `MediaSource.createPeriod`. This fixes an issue where
+  using lazy preparation in `ConcatenatingMediaSource` with an
+  `ExtractorMediaSource` overrides initial seek positions
+  ([#5350](https://github.com/google/ExoPlayer/issues/5350)).
 
 ### 2.9.4 ###
 
diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java
index 574bac5d35..bcccd6cec7 100644
--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java
+++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java
@@ -93,8 +93,8 @@ public final class ImaAdsMediaSource extends BaseMediaSource implements SourceIn
   }
 
   @Override
-  public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
-    return adsMediaSource.createPeriod(id, allocator);
+  public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator, long startPositionUs) {
+    return adsMediaSource.createPeriod(id, allocator, startPositionUs);
   }
 
   @Override
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
index 7becac7b55..19622c6801 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
@@ -89,7 +89,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     this.info = info;
     sampleStreams = new SampleStream[rendererCapabilities.length];
     mayRetainStreamFlags = new boolean[rendererCapabilities.length];
-    mediaPeriod = createMediaPeriod(info.id, mediaSource, allocator);
+    mediaPeriod = createMediaPeriod(info.id, mediaSource, allocator, info.startPositionUs);
   }
 
   /**
@@ -399,8 +399,8 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 
   /** Returns a media period corresponding to the given {@code id}. */
   private static MediaPeriod createMediaPeriod(
-      MediaPeriodId id, MediaSource mediaSource, Allocator allocator) {
-    MediaPeriod mediaPeriod = mediaSource.createPeriod(id, allocator);
+      MediaPeriodId id, MediaSource mediaSource, Allocator allocator, long startPositionUs) {
+    MediaPeriod mediaPeriod = mediaSource.createPeriod(id, allocator, startPositionUs);
     if (id.endPositionUs != C.TIME_UNSET && id.endPositionUs != C.TIME_END_OF_SOURCE) {
       mediaPeriod =
           new ClippingMediaPeriod(
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
index 0ab6eeae18..d3b8226822 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
@@ -206,10 +206,10 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> {
   }
 
   @Override
-  public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
+  public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator, long startPositionUs) {
     ClippingMediaPeriod mediaPeriod =
         new ClippingMediaPeriod(
-            mediaSource.createPeriod(id, allocator),
+            mediaSource.createPeriod(id, allocator, startPositionUs),
             enableInitialDiscontinuity,
             periodStartUs,
             periodEndUs);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
index e6d409c659..6dc7a0a327 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
@@ -438,7 +438,8 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
   }
 
   @Override
-  public final MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
+  public final MediaPeriod createPeriod(
+      MediaPeriodId id, Allocator allocator, long startPositionUs) {
     Object mediaSourceHolderUid = getMediaSourceHolderUid(id.periodUid);
     MediaSourceHolder holder = mediaSourceByUid.get(mediaSourceHolderUid);
     if (holder == null) {
@@ -446,7 +447,8 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
       holder = new MediaSourceHolder(new DummyMediaSource());
       holder.hasStartedPreparing = true;
     }
-    DeferredMediaPeriod mediaPeriod = new DeferredMediaPeriod(holder.mediaSource, id, allocator);
+    DeferredMediaPeriod mediaPeriod =
+        new DeferredMediaPeriod(holder.mediaSource, id, allocator, startPositionUs);
     mediaSourceByMediaPeriod.put(mediaPeriod, holder);
     holder.activeMediaPeriods.add(mediaPeriod);
     if (!holder.hasStartedPreparing) {
@@ -1144,7 +1146,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
     }
 
     @Override
-    public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
+    public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator, long startPositionUs) {
       throw new UnsupportedOperationException();
     }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/DeferredMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/DeferredMediaPeriod.java
index 26c25a749e..858769180d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/DeferredMediaPeriod.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/DeferredMediaPeriod.java
@@ -25,7 +25,7 @@ import java.io.IOException;
 
 /**
  * Media period that wraps a media source and defers calling its {@link
- * MediaSource#createPeriod(MediaPeriodId, Allocator)} method until {@link
+ * MediaSource#createPeriod(MediaPeriodId, Allocator, long)} method until {@link
  * #createPeriod(MediaPeriodId)} has been called. This is useful if you need to return a media
  * period immediately but the media source that should create it is not yet prepared.
  */
@@ -60,11 +60,14 @@ public final class DeferredMediaPeriod implements MediaPeriod, MediaPeriod.Callb
    * @param mediaSource The media source to wrap.
    * @param id The identifier used to create the deferred media period.
    * @param allocator The allocator used to create the media period.
+   * @param preparePositionUs The expected start position, in microseconds.
    */
-  public DeferredMediaPeriod(MediaSource mediaSource, MediaPeriodId id, Allocator allocator) {
+  public DeferredMediaPeriod(
+      MediaSource mediaSource, MediaPeriodId id, Allocator allocator, long preparePositionUs) {
     this.id = id;
     this.allocator = allocator;
     this.mediaSource = mediaSource;
+    this.preparePositionUs = preparePositionUs;
     preparePositionOverrideUs = C.TIME_UNSET;
   }
 
@@ -86,28 +89,25 @@ public final class DeferredMediaPeriod implements MediaPeriod, MediaPeriod.Callb
 
   /**
    * Overrides the default prepare position at which to prepare the media period. This value is only
-   * used if the call to {@link MediaPeriod#prepare(Callback, long)} is being deferred.
+   * used if called before {@link #createPeriod(MediaPeriodId)}.
    *
-   * @param defaultPreparePositionUs The default prepare position to use, in microseconds.
+   * @param preparePositionUs The default prepare position to use, in microseconds.
    */
-  public void overridePreparePositionUs(long defaultPreparePositionUs) {
-    preparePositionOverrideUs = defaultPreparePositionUs;
+  public void overridePreparePositionUs(long preparePositionUs) {
+    preparePositionOverrideUs = preparePositionUs;
   }
 
   /**
-   * Calls {@link MediaSource#createPeriod(MediaPeriodId, Allocator)} on the wrapped source then
-   * prepares it if {@link #prepare(Callback, long)} has been called. Call {@link #releasePeriod()}
-   * to release the period.
+   * Calls {@link MediaSource#createPeriod(MediaPeriodId, Allocator, long)} on the wrapped source
+   * then prepares it if {@link #prepare(Callback, long)} has been called. Call {@link
+   * #releasePeriod()} to release the period.
    *
    * @param id The identifier that should be used to create the media period from the media source.
    */
   public void createPeriod(MediaPeriodId id) {
-    mediaPeriod = mediaSource.createPeriod(id, allocator);
+    long preparePositionUs = getPreparePositionWithOverride(this.preparePositionUs);
+    mediaPeriod = mediaSource.createPeriod(id, allocator, preparePositionUs);
     if (callback != null) {
-      long preparePositionUs =
-          preparePositionOverrideUs != C.TIME_UNSET
-              ? preparePositionOverrideUs
-              : this.preparePositionUs;
       mediaPeriod.prepare(this, preparePositionUs);
     }
   }
@@ -124,9 +124,8 @@ public final class DeferredMediaPeriod implements MediaPeriod, MediaPeriod.Callb
   @Override
   public void prepare(Callback callback, long preparePositionUs) {
     this.callback = callback;
-    this.preparePositionUs = preparePositionUs;
     if (mediaPeriod != null) {
-      mediaPeriod.prepare(this, preparePositionUs);
+      mediaPeriod.prepare(this, getPreparePositionWithOverride(this.preparePositionUs));
     }
   }
 
@@ -217,4 +216,9 @@ public final class DeferredMediaPeriod implements MediaPeriod, MediaPeriod.Callb
     callback.onPrepared(this);
   }
 
+  private long getPreparePositionWithOverride(long preparePositionUs) {
+    return preparePositionOverrideUs != C.TIME_UNSET
+        ? preparePositionOverrideUs
+        : preparePositionUs;
+  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
index 91273626c9..5403f9f33b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
@@ -375,7 +375,7 @@ public final class ExtractorMediaSource extends BaseMediaSource
   }
 
   @Override
-  public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
+  public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator, long startPositionUs) {
     DataSource dataSource = dataSourceFactory.createDataSource();
     if (transferListener != null) {
       dataSource.addTransferListener(transferListener);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java
index 3cd4ea1dab..0cd87561e7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java
@@ -77,14 +77,15 @@ public final class LoopingMediaSource extends CompositeMediaSource<Void> {
   }
 
   @Override
-  public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
+  public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator, long startPositionUs) {
     if (loopCount == Integer.MAX_VALUE) {
-      return childSource.createPeriod(id, allocator);
+      return childSource.createPeriod(id, allocator, startPositionUs);
     }
     Object childPeriodUid = LoopingTimeline.getChildPeriodUidFromConcatenatedUid(id.periodUid);
     MediaPeriodId childMediaPeriodId = id.copyWithPeriodUid(childPeriodUid);
     childMediaPeriodIdToMediaPeriodId.put(childMediaPeriodId, id);
-    MediaPeriod mediaPeriod = childSource.createPeriod(childMediaPeriodId, allocator);
+    MediaPeriod mediaPeriod =
+        childSource.createPeriod(childMediaPeriodId, allocator, startPositionUs);
     mediaPeriodToChildMediaPeriodId.put(mediaPeriod, childMediaPeriodId);
     return mediaPeriod;
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
index 2d80fb7f13..1419f9a98f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
@@ -34,8 +34,8 @@ import java.io.IOException;
  *       on the {@link SourceInfoRefreshListener}s passed to {@link
  *       #prepareSource(SourceInfoRefreshListener, TransferListener)}.
  *   <li>To provide {@link MediaPeriod} instances for the periods in its timeline. MediaPeriods are
- *       obtained by calling {@link #createPeriod(MediaPeriodId, Allocator)}, and provide a way for
- *       the player to load and read the media.
+ *       obtained by calling {@link #createPeriod(MediaPeriodId, Allocator, long)}, and provide a
+ *       way for the player to load and read the media.
  * </ul>
  *
  * All methods are called on the player's internal playback thread, as described in the {@link
@@ -261,9 +261,10 @@ public interface MediaSource {
    *
    * @param id The identifier of the period.
    * @param allocator An {@link Allocator} from which to obtain media buffer allocations.
+   * @param startPositionUs The expected start position, in microseconds.
    * @return A new {@link MediaPeriod}.
    */
-  MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator);
+  MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator, long startPositionUs);
 
   /**
    * Releases the period.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java
index fdeb2b6184..1ea3404e81 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java
@@ -120,13 +120,13 @@ public final class MergingMediaSource extends CompositeMediaSource<Integer> {
   }
 
   @Override
-  public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
+  public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator, long startPositionUs) {
     MediaPeriod[] periods = new MediaPeriod[mediaSources.length];
     int periodIndex = timelines[0].getIndexOfPeriod(id.periodUid);
     for (int i = 0; i < periods.length; i++) {
       MediaPeriodId childMediaPeriodId =
           id.copyWithPeriodUid(timelines[i].getUidOfPeriod(periodIndex));
-      periods[i] = mediaSources[i].createPeriod(childMediaPeriodId, allocator);
+      periods[i] = mediaSources[i].createPeriod(childMediaPeriodId, allocator, startPositionUs);
     }
     return new MergingMediaPeriod(compositeSequenceableLoaderFactory, periods);
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
index 358875eb1e..d13fa06434 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
@@ -313,7 +313,7 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
   }
 
   @Override
-  public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
+  public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator, long startPositionUs) {
     return new SingleSampleMediaPeriod(
         dataSpec,
         dataSourceFactory,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
index 663f9c64fc..4754466235 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
@@ -334,7 +334,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
   }
 
   @Override
-  public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
+  public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator, long startPositionUs) {
     if (adPlaybackState.adGroupCount > 0 && id.isAd()) {
       int adGroupIndex = id.adGroupIndex;
       int adIndexInAdGroup = id.adIndexInAdGroup;
@@ -353,7 +353,8 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
         prepareChildSource(id, adMediaSource);
       }
       MediaSource mediaSource = adGroupMediaSources[adGroupIndex][adIndexInAdGroup];
-      DeferredMediaPeriod deferredMediaPeriod = new DeferredMediaPeriod(mediaSource, id, allocator);
+      DeferredMediaPeriod deferredMediaPeriod =
+          new DeferredMediaPeriod(mediaSource, id, allocator, startPositionUs);
       deferredMediaPeriod.setPrepareErrorListener(
           new AdPrepareErrorListener(adUri, adGroupIndex, adIndexInAdGroup));
       List<DeferredMediaPeriod> mediaPeriods = deferredMediaPeriodByAdMediaSource.get(mediaSource);
@@ -369,7 +370,8 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
       }
       return deferredMediaPeriod;
     } else {
-      DeferredMediaPeriod mediaPeriod = new DeferredMediaPeriod(contentMediaSource, id, allocator);
+      DeferredMediaPeriod mediaPeriod =
+          new DeferredMediaPeriod(contentMediaSource, id, allocator, startPositionUs);
       mediaPeriod.createPeriod(id);
       return mediaPeriod;
     }
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
index b31b770b03..cfdbdac1ea 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
@@ -654,7 +654,8 @@ public final class DashMediaSource extends BaseMediaSource {
   }
 
   @Override
-  public MediaPeriod createPeriod(MediaPeriodId periodId, Allocator allocator) {
+  public MediaPeriod createPeriod(
+      MediaPeriodId periodId, Allocator allocator, long startPositionUs) {
     int periodIndex = (Integer) periodId.periodUid - firstPeriodId;
     EventDispatcher periodEventDispatcher =
         createEventDispatcher(periodId, manifest.getPeriod(periodIndex).startMs);
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
index 8058460b9f..f2b76dddc4 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
@@ -428,7 +428,7 @@ public final class HlsMediaSource extends BaseMediaSource
   }
 
   @Override
-  public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
+  public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator, long startPositionUs) {
     EventDispatcher eventDispatcher = createEventDispatcher(id);
     return new HlsMediaPeriod(
         extractorFactory,
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
index 39f707b09c..0f5544a993 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
@@ -552,7 +552,7 @@ public final class SsMediaSource extends BaseMediaSource
   }
 
   @Override
-  public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
+  public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator, long startPositionUs) {
     EventDispatcher eventDispatcher = createEventDispatcher(id);
     SsMediaPeriod period =
         new SsMediaPeriod(
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
index 8165eebaea..de4be82b38 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
@@ -112,7 +112,7 @@ public class FakeMediaSource extends BaseMediaSource {
   }
 
   @Override
-  public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
+  public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator, long startPositionUs) {
     assertThat(preparedSource).isTrue();
     assertThat(releasedSource).isFalse();
     int periodIndex = timeline.getIndexOfPeriod(id.periodUid);
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaSourceTestRunner.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaSourceTestRunner.java
index 5de1ab87b6..9514768416 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaSourceTestRunner.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaSourceTestRunner.java
@@ -132,15 +132,28 @@ public class MediaSourceTestRunner {
   }
 
   /**
-   * Calls {@link MediaSource#createPeriod(MediaSource.MediaPeriodId, Allocator)} on the playback
-   * thread, asserting that a non-null {@link MediaPeriod} is returned.
+   * Calls {@link MediaSource#createPeriod(MediaSource.MediaPeriodId, Allocator, long)} with a zero
+   * start position on the playback thread, asserting that a non-null {@link MediaPeriod} is
+   * returned.
    *
    * @param periodId The id of the period to create.
    * @return The created {@link MediaPeriod}.
    */
   public MediaPeriod createPeriod(final MediaPeriodId periodId) {
+    return createPeriod(periodId, /* startPositionUs= */ 0);
+  }
+
+  /**
+   * Calls {@link MediaSource#createPeriod(MediaSource.MediaPeriodId, Allocator, long)} on the
+   * playback thread, asserting that a non-null {@link MediaPeriod} is returned.
+   *
+   * @param periodId The id of the period to create.
+   * @return The created {@link MediaPeriod}.
+   */
+  public MediaPeriod createPeriod(final MediaPeriodId periodId, long startPositionUs) {
     final MediaPeriod[] holder = new MediaPeriod[1];
-    runOnPlaybackThread(() -> holder[0] = mediaSource.createPeriod(periodId, allocator));
+    runOnPlaybackThread(
+        () -> holder[0] = mediaSource.createPeriod(periodId, allocator, startPositionUs));
     assertThat(holder[0]).isNotNull();
     return holder[0];
   }

From ac86d3b5f6bb44b68d673c7a06e4a34bf0202f3c Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 17 Jan 2019 17:08:52 +0000
Subject: [PATCH 394/832] Add missing @Nullable to SimpleExoPlayer fields and
 methods.

Issue:#5402
PiperOrigin-RevId: 229758525
---
 .../android/exoplayer2/SimpleExoPlayer.java   | 43 +++++++++----------
 .../exoplayer2/ui/DebugTextViewHelper.java    | 31 ++++++++++---
 2 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index b44259f50b..e498038fde 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -94,25 +94,25 @@ public class SimpleExoPlayer extends BasePlayer
 
   private final AudioFocusManager audioFocusManager;
 
-  private Format videoFormat;
-  private Format audioFormat;
+  @Nullable private Format videoFormat;
+  @Nullable private Format audioFormat;
 
-  private Surface surface;
+  @Nullable private Surface surface;
   private boolean ownsSurface;
   private @C.VideoScalingMode int videoScalingMode;
-  private SurfaceHolder surfaceHolder;
-  private TextureView textureView;
+  @Nullable private SurfaceHolder surfaceHolder;
+  @Nullable private TextureView textureView;
   private int surfaceWidth;
   private int surfaceHeight;
-  private DecoderCounters videoDecoderCounters;
-  private DecoderCounters audioDecoderCounters;
+  @Nullable private DecoderCounters videoDecoderCounters;
+  @Nullable private DecoderCounters audioDecoderCounters;
   private int audioSessionId;
   private AudioAttributes audioAttributes;
   private float audioVolume;
-  private MediaSource mediaSource;
+  @Nullable private MediaSource mediaSource;
   private List<Cue> currentCues;
-  private VideoFrameMetadataListener videoFrameMetadataListener;
-  private CameraMotionListener cameraMotionListener;
+  @Nullable private VideoFrameMetadataListener videoFrameMetadataListener;
+  @Nullable private CameraMotionListener cameraMotionListener;
   private boolean hasNotifiedFullWrongThreadWarning;
 
   /**
@@ -558,30 +558,26 @@ public class SimpleExoPlayer extends BasePlayer
     setPlaybackParameters(playbackParameters);
   }
 
-  /**
-   * Returns the video format currently being played, or null if no video is being played.
-   */
+  /** Returns the video format currently being played, or null if no video is being played. */
+  @Nullable
   public Format getVideoFormat() {
     return videoFormat;
   }
 
-  /**
-   * Returns the audio format currently being played, or null if no audio is being played.
-   */
+  /** Returns the audio format currently being played, or null if no audio is being played. */
+  @Nullable
   public Format getAudioFormat() {
     return audioFormat;
   }
 
-  /**
-   * Returns {@link DecoderCounters} for video, or null if no video is being played.
-   */
+  /** Returns {@link DecoderCounters} for video, or null if no video is being played. */
+  @Nullable
   public DecoderCounters getVideoDecoderCounters() {
     return videoDecoderCounters;
   }
 
-  /**
-   * Returns {@link DecoderCounters} for audio, or null if no audio is being played.
-   */
+  /** Returns {@link DecoderCounters} for audio, or null if no audio is being played. */
+  @Nullable
   public DecoderCounters getAudioDecoderCounters() {
     return audioDecoderCounters;
   }
@@ -1053,7 +1049,8 @@ public class SimpleExoPlayer extends BasePlayer
   }
 
   @Override
-  public @Nullable Object getCurrentManifest() {
+  @Nullable
+  public Object getCurrentManifest() {
     verifyApplicationThread();
     return player.getCurrentManifest();
   }
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DebugTextViewHelper.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DebugTextViewHelper.java
index 8c7c507f92..da2081db31 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DebugTextViewHelper.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DebugTextViewHelper.java
@@ -137,23 +137,40 @@ public class DebugTextViewHelper implements Player.EventListener, Runnable {
   /** Returns a string containing video debugging information. */
   protected String getVideoString() {
     Format format = player.getVideoFormat();
-    if (format == null) {
+    DecoderCounters decoderCounters = player.getVideoDecoderCounters();
+    if (format == null || decoderCounters == null) {
       return "";
     }
-    return "\n" + format.sampleMimeType + "(id:" + format.id + " r:" + format.width + "x"
-        + format.height + getPixelAspectRatioString(format.pixelWidthHeightRatio)
-        + getDecoderCountersBufferCountString(player.getVideoDecoderCounters()) + ")";
+    return "\n"
+        + format.sampleMimeType
+        + "(id:"
+        + format.id
+        + " r:"
+        + format.width
+        + "x"
+        + format.height
+        + getPixelAspectRatioString(format.pixelWidthHeightRatio)
+        + getDecoderCountersBufferCountString(decoderCounters)
+        + ")";
   }
 
   /** Returns a string containing audio debugging information. */
   protected String getAudioString() {
     Format format = player.getAudioFormat();
-    if (format == null) {
+    DecoderCounters decoderCounters = player.getAudioDecoderCounters();
+    if (format == null || decoderCounters == null) {
       return "";
     }
-    return "\n" + format.sampleMimeType + "(id:" + format.id + " hz:" + format.sampleRate + " ch:"
+    return "\n"
+        + format.sampleMimeType
+        + "(id:"
+        + format.id
+        + " hz:"
+        + format.sampleRate
+        + " ch:"
         + format.channelCount
-        + getDecoderCountersBufferCountString(player.getAudioDecoderCounters()) + ")";
+        + getDecoderCountersBufferCountString(decoderCounters)
+        + ")";
   }
 
   private static String getDecoderCountersBufferCountString(DecoderCounters counters) {

From ef24125d20b3092c270299e092bdd2f7994bc7e8 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 18 Jan 2019 00:44:17 +0000
Subject: [PATCH 395/832] Fix release notes for 2.9.4

PiperOrigin-RevId: 229841782
---
 RELEASENOTES.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 51264dcfe0..061a095183 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -39,10 +39,6 @@
 * Remove `player` and `isTopLevelSource` parameters from `MediaSource.prepare`.
 * Change signature of `PlayerNotificationManager.NotificationListener` to better
   fit service requirements. Remove ability to set a custom stop action.
-* Add `startPositionUs` to `MediaSource.createPeriod`. This fixes an issue where
-  using lazy preparation in `ConcatenatingMediaSource` with an
-  `ExtractorMediaSource` overrides initial seek positions
-  ([#5350](https://github.com/google/ExoPlayer/issues/5350)).
 
 ### 2.9.4 ###
 
@@ -60,8 +56,12 @@
   ([#5351](https://github.com/google/ExoPlayer/issues/5351)).
 * Fix issue where uneven track durations in MP4 streams can cause OOM problems
   ([#3670](https://github.com/google/ExoPlayer/issues/3670)).
-* Add the sub text to the MediaDescriptionAdapter of the
-  PlayerNotificationManager.
+* Add `startPositionUs` to `MediaSource.createPeriod`. This fixes an issue where
+  using lazy preparation in `ConcatenatingMediaSource` with an
+  `ExtractorMediaSource` overrides initial seek positions
+  ([#5350](https://github.com/google/ExoPlayer/issues/5350)).
+* Add subtext to the `MediaDescriptionAdapter` of the
+  `PlayerNotificationManager`.
 
 ### 2.9.3 ###
 

From 23c07e5c4d1077e67087fa80d8b27d571cf5a60b Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 18 Jan 2019 14:57:10 +0000
Subject: [PATCH 396/832] Update buffer-based ABR to not select track in
 constructor.

This mimicks a similar change in the default AdaptiveTrackSelection.
Also adds an option to cap initial format height.

PiperOrigin-RevId: 229923149
---
 .../BufferSizeAdaptationBuilder.java          | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java
index 5c8350cb1d..ee1d1c62da 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java
@@ -43,7 +43,7 @@ public final class BufferSizeAdaptationBuilder {
   public interface DynamicFormatFilter {
 
     /** Filter which allows all formats. */
-    DynamicFormatFilter NO_FILTER = (format, trackBitrate) -> true;
+    DynamicFormatFilter NO_FILTER = (format, trackBitrate, isInitialSelection) -> true;
 
     /**
      * Called when updating the selected track to determine whether a candidate track is allowed. If
@@ -52,8 +52,9 @@ public final class BufferSizeAdaptationBuilder {
      * @param format The {@link Format} of the candidate track.
      * @param trackBitrate The estimated bitrate of the track. May differ from {@link
      *     Format#bitrate} if a more accurate estimate of the current track bitrate is available.
+     * @param isInitialSelection Whether this is for the initial track selection.
      */
-    boolean isFormatAllowed(Format format, int trackBitrate);
+    boolean isFormatAllowed(Format format, int trackBitrate, boolean isInitialSelection);
   }
 
   /**
@@ -344,7 +345,7 @@ public final class BufferSizeAdaptationBuilder {
       formatBitrates = new int[length];
       maxBitrate = getFormat(/* index= */ 0).bitrate;
       minBitrate = getFormat(/* index= */ length - 1).bitrate;
-      selectionReason = C.SELECTION_REASON_INITIAL;
+      selectionReason = C.SELECTION_REASON_UNKNOWN;
       playbackSpeed = 1.0f;
 
       // We use a log-linear function to map from bitrate to buffer size:
@@ -354,9 +355,6 @@ public final class BufferSizeAdaptationBuilder {
           (maxBufferUs - hysteresisBufferUs - minBufferUs) / Math.log(maxBitrate / minBitrate);
       bitrateToBufferFunctionIntercept =
           minBufferUs - bitrateToBufferFunctionSlope * Math.log(minBitrate);
-
-      updateFormatBitrates(/* nowMs= */ Long.MIN_VALUE);
-      selectedIndex = selectIdealIndexUsingBandwidth();
     }
 
     @Override
@@ -393,6 +391,14 @@ public final class BufferSizeAdaptationBuilder {
         List<? extends MediaChunk> queue,
         MediaChunkIterator[] mediaChunkIterators) {
       updateFormatBitrates(/* nowMs= */ clock.elapsedRealtime());
+
+      // Make initial selection
+      if (selectionReason == C.SELECTION_REASON_UNKNOWN) {
+        selectionReason = C.SELECTION_REASON_INITIAL;
+        selectedIndex = selectIdealIndexUsingBandwidth(/* isInitialSelection= */ true);
+        return;
+      }
+
       long bufferUs = getCurrentPeriodBufferedDurationUs(playbackPositionUs, bufferedDurationUs);
       int oldSelectedIndex = selectedIndex;
       if (isInSteadyState) {
@@ -428,7 +434,8 @@ public final class BufferSizeAdaptationBuilder {
       for (int i = 0; i < formatBitrates.length; i++) {
         if (formatBitrates[i] != BITRATE_BLACKLISTED) {
           if (getTargetBufferForBitrateUs(formatBitrates[i]) < bufferUs
-              && dynamicFormatFilter.isFormatAllowed(getFormat(i), formatBitrates[i])) {
+              && dynamicFormatFilter.isFormatAllowed(
+                  getFormat(i), formatBitrates[i], /* isInitialSelection= */ false)) {
             return i;
           }
           lowestBitrateNonBlacklistedIndex = i;
@@ -440,7 +447,7 @@ public final class BufferSizeAdaptationBuilder {
     // Startup.
 
     private void selectIndexStartUpPhase(long bufferUs) {
-      int startUpSelectedIndex = selectIdealIndexUsingBandwidth();
+      int startUpSelectedIndex = selectIdealIndexUsingBandwidth(/* isInitialSelection= */ false);
       int steadyStateSelectedIndex = selectIdealIndexUsingBufferSize(bufferUs);
       if (steadyStateSelectedIndex <= selectedIndex) {
         // Switch to steady state if we have enough buffer to maintain current selection.
@@ -457,14 +464,15 @@ public final class BufferSizeAdaptationBuilder {
       }
     }
 
-    private int selectIdealIndexUsingBandwidth() {
+    private int selectIdealIndexUsingBandwidth(boolean isInitialSelection) {
       long effectiveBitrate =
           (long) (bandwidthMeter.getBitrateEstimate() * startUpBandwidthFraction);
       int lowestBitrateNonBlacklistedIndex = 0;
       for (int i = 0; i < formatBitrates.length; i++) {
         if (formatBitrates[i] != BITRATE_BLACKLISTED) {
           if (Math.round(formatBitrates[i] * playbackSpeed) <= effectiveBitrate
-              && dynamicFormatFilter.isFormatAllowed(getFormat(i), formatBitrates[i])) {
+              && dynamicFormatFilter.isFormatAllowed(
+                  getFormat(i), formatBitrates[i], isInitialSelection)) {
             return i;
           }
           lowestBitrateNonBlacklistedIndex = i;

From 310925ca129449b67f79167f0e9d2875f01438ff Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 18 Jan 2019 16:21:57 +0000
Subject: [PATCH 397/832] Upgrade to GVR SDK 1.190.0

Change the dependency to the new monolithic GVR SDK target.

PiperOrigin-RevId: 229931549
---
 RELEASENOTES.md             | 1 +
 extensions/gvr/build.gradle | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 061a095183..f45bd03dec 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -48,6 +48,7 @@
   ([#5378](https://github.com/google/ExoPlayer/issues/5378)).
 * FFmpeg extension: Treat invalid data errors as non-fatal to match the behavior
   of MediaCodec ([#5293](https://github.com/google/ExoPlayer/issues/5293)).
+* GVR extension: upgrade GVR SDK dependency to 1.190.0.
 * Fix issue where sending callbacks for playlist changes may cause problems
   because of parallel player access
   ([#5240](https://github.com/google/ExoPlayer/issues/5240)).
diff --git a/extensions/gvr/build.gradle b/extensions/gvr/build.gradle
index c845cb3423..ba6bc8afda 100644
--- a/extensions/gvr/build.gradle
+++ b/extensions/gvr/build.gradle
@@ -33,8 +33,7 @@ dependencies {
     implementation project(modulePrefix + 'library-core')
     implementation project(modulePrefix + 'library-ui')
     implementation 'com.android.support:support-annotations:' + supportLibraryVersion
-    implementation 'com.google.vr:sdk-audio:1.80.0'
-    implementation 'com.google.vr:sdk-controller:1.80.0'
+    implementation 'com.google.vr:sdk-base:1.190.0'
     api 'com.google.vr:sdk-base:1.80.0'
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
 }

From 6a55fda66d5c51b75497bd940f138e3a82b674e0 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 18 Jan 2019 16:27:53 +0000
Subject: [PATCH 398/832] Add DRM protected content to the Cast demo APP

Allows testing DRM-protected content in the receiver app.

Includes the DRM-related data to the media items, but does not
add support for DRM content in the local player yet.

PiperOrigin-RevId: 229932329
---
 .../android/exoplayer2/castdemo/DemoUtil.java | 35 ++++++++++++++++---
 .../exoplayer2/castdemo/MainActivity.java     | 20 +++++++----
 2 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
index 776ed1a3bd..e45ceb7c83 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
@@ -15,10 +15,14 @@
  */
 package com.google.android.exoplayer2.castdemo;
 
+import android.net.Uri;
+import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.MimeTypes;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.UUID;
 
 /** Utility methods and constants for the Cast demo application. */
 /* package */ final class DemoUtil {
@@ -32,6 +36,16 @@ import java.util.List;
     public final String name;
     /** The mime type of the sample media content. */
     public final String mimeType;
+    /**
+     * The {@link UUID} of the DRM scheme that protects the content, or null if the content is not
+     * DRM-protected.
+     */
+    @Nullable public final UUID drmSchemeUuid;
+    /**
+     * The url from which players should obtain DRM licenses, or null if the content is not
+     * DRM-protected.
+     */
+    @Nullable public final Uri licenseServerUri;
 
     /**
      * @param uri See {@link #uri}.
@@ -39,9 +53,21 @@ import java.util.List;
      * @param mimeType See {@link #mimeType}.
      */
     public Sample(String uri, String name, String mimeType) {
+      this(uri, name, mimeType, /* drmSchemeUuid= */ null, /* licenseServerUriString= */ null);
+    }
+
+    public Sample(
+        String uri,
+        String name,
+        String mimeType,
+        @Nullable UUID drmSchemeUuid,
+        @Nullable String licenseServerUriString) {
       this.uri = uri;
       this.name = name;
       this.mimeType = mimeType;
+      this.drmSchemeUuid = drmSchemeUuid;
+      this.licenseServerUri =
+          licenseServerUriString != null ? Uri.parse(licenseServerUriString) : null;
     }
 
     @Override
@@ -65,22 +91,23 @@ import java.util.List;
     samples.add(
         new Sample(
             "https://storage.googleapis.com/wvmedia/clear/h264/tears/tears.mpd",
-            "DASH (clear,MP4,H264)",
+            "Clear DASH: Tears",
             MIME_TYPE_DASH));
     samples.add(
         new Sample(
             "https://commondatastorage.googleapis.com/gtv-videos-bucket/CastVideos/"
                 + "hls/TearsOfSteel.m3u8",
-            "Tears of Steel (HLS)",
+            "Clear HLS: Tears of Steel",
             MIME_TYPE_HLS));
     samples.add(
         new Sample(
             "https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_4x3"
                 + "/bipbop_4x3_variant.m3u8",
-            "HLS Basic (TS)",
+            "Clear HLS: Basic 4x3",
             MIME_TYPE_HLS));
     samples.add(
-        new Sample("https://html5demos.com/assets/dizzy.mp4", "Dizzy (MP4)", MIME_TYPE_VIDEO_MP4));
+        new Sample(
+            "https://html5demos.com/assets/dizzy.mp4", "Clear MP4: Dizzy", MIME_TYPE_VIDEO_MP4));
     SAMPLES = Collections.unmodifiableList(samples);
   }
 
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
index 9d4c3ec87f..058adf7c9c 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
@@ -42,6 +42,7 @@ import com.google.android.gms.cast.CastMediaControlIntent;
 import com.google.android.gms.cast.framework.CastButtonFactory;
 import com.google.android.gms.cast.framework.CastContext;
 import com.google.android.gms.dynamite.DynamiteModule;
+import java.util.Collections;
 
 /**
  * An activity that plays video using {@link SimpleExoPlayer} and supports casting using ExoPlayer's
@@ -182,13 +183,18 @@ public class MainActivity extends AppCompatActivity
     sampleList.setOnItemClickListener(
         (parent, view, position, id) -> {
           DemoUtil.Sample sample = DemoUtil.SAMPLES.get(position);
-          playerManager.addItem(
-              mediaItemBuilder
-                  .clear()
-                  .setMedia(sample.uri)
-                  .setTitle(sample.name)
-                  .setMimeType(sample.mimeType)
-                  .build());
+          mediaItemBuilder
+              .clear()
+              .setMedia(sample.uri)
+              .setTitle(sample.name)
+              .setMimeType(sample.mimeType);
+          if (sample.drmSchemeUuid != null) {
+            mediaItemBuilder.setDrmSchemes(
+                Collections.singletonList(
+                    new MediaItem.DrmScheme(
+                        sample.drmSchemeUuid, new MediaItem.UriBundle(sample.licenseServerUri))));
+          }
+          playerManager.addItem(mediaItemBuilder.build());
           mediaQueueListAdapter.notifyItemInserted(playerManager.getMediaQueueSize() - 1);
         });
     return dialogList;

From 14eb561e3818579ab77ff727b612f0f9b55dcecc Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 18 Jan 2019 16:39:44 +0000
Subject: [PATCH 399/832] Use MediaCrypto.setMediaDrmSession to avoid black
 flicker

Issue: #3561
PiperOrigin-RevId: 229934093
---
 RELEASENOTES.md                               |   2 +
 .../mediacodec/MediaCodecRenderer.java        | 165 +++++++++++++-----
 .../video/MediaCodecVideoRenderer.java        |   2 +-
 3 files changed, 128 insertions(+), 41 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index f45bd03dec..cfded4c9d6 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -28,6 +28,8 @@
   * Rename TaskState to DownloadState.
   * Add new states to DownloadState.
   * Replace DownloadState.action with DownloadAction fields.
+* DRM: Fix black flicker when keys rotate in DRM protected content
+  ([#3561](https://github.com/google/ExoPlayer/issues/3561)).
 * Add support for SHOUTcast ICY metadata
   ([#3735](https://github.com/google/ExoPlayer/issues/3735)).
 * CEA-608: Improved conformance to the specification
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index 77d3b31ab7..35f5c14f3f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -240,14 +240,21 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
 
   @Documented
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({DRAIN_ACTION_NONE, DRAIN_ACTION_FLUSH, DRAIN_ACTION_REINITIALIZE})
+  @IntDef({
+    DRAIN_ACTION_NONE,
+    DRAIN_ACTION_FLUSH,
+    DRAIN_ACTION_UPDATE_DRM_SESSION,
+    DRAIN_ACTION_REINITIALIZE
+  })
   private @interface DrainAction {}
   /** No special action should be taken. */
   private static final int DRAIN_ACTION_NONE = 0;
   /** The codec should be flushed. */
   private static final int DRAIN_ACTION_FLUSH = 1;
-  /** The codec should be re-initialized. */
-  private static final int DRAIN_ACTION_REINITIALIZE = 2;
+  /** The codec should be flushed and updated to use the pending DRM session. */
+  private static final int DRAIN_ACTION_UPDATE_DRM_SESSION = 2;
+  /** The codec should be reinitialized. */
+  private static final int DRAIN_ACTION_REINITIALIZE = 3;
 
   @Documented
   @Retention(RetentionPolicy.SOURCE)
@@ -547,7 +554,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   protected void onPositionReset(long positionUs, boolean joining) throws ExoPlaybackException {
     inputStreamEnded = false;
     outputStreamEnded = false;
-    flushOrReinitCodec();
+    flushOrReinitializeCodec();
     formatQueue.clear();
   }
 
@@ -679,12 +686,15 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
    * <p>The implementation of this method calls {@link #flushOrReleaseCodec()}, and {@link
    * #maybeInitCodec()} if the codec needs to be re-instantiated.
    *
+   * @return Whether the codec was released and reinitialized, rather than being flushed.
    * @throws ExoPlaybackException If an error occurs re-instantiating the codec.
    */
-  protected final void flushOrReinitCodec() throws ExoPlaybackException {
-    if (flushOrReleaseCodec()) {
+  protected final boolean flushOrReinitializeCodec() throws ExoPlaybackException {
+    boolean released = flushOrReleaseCodec();
+    if (released) {
       maybeInitCodec();
     }
+    return released;
   }
 
   /**
@@ -1163,40 +1173,58 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
 
     // We have an existing codec that we may need to reconfigure or re-initialize. If the existing
     // codec instance is being kept then its operating rate may need to be updated.
-    if (sourceDrmSession != codecDrmSession) {
+
+    if ((sourceDrmSession == null && codecDrmSession != null)
+        || (sourceDrmSession != null && codecDrmSession == null)
+        || (sourceDrmSession != null && !codecInfo.secure)
+        || (Util.SDK_INT < 23 && sourceDrmSession != codecDrmSession)) {
+      // We might need to switch between the clear and protected output paths, or we're using DRM
+      // prior to API level 23 where the codec needs to be re-initialized to switch to the new DRM
+      // session.
       drainAndReinitializeCodec();
-    } else {
-      switch (canKeepCodec(codec, codecInfo, codecFormat, newFormat)) {
-        case KEEP_CODEC_RESULT_NO:
-          drainAndReinitializeCodec();
-          break;
-        case KEEP_CODEC_RESULT_YES_WITH_FLUSH:
+      return;
+    }
+
+    switch (canKeepCodec(codec, codecInfo, codecFormat, newFormat)) {
+      case KEEP_CODEC_RESULT_NO:
+        drainAndReinitializeCodec();
+        break;
+      case KEEP_CODEC_RESULT_YES_WITH_FLUSH:
+        codecFormat = newFormat;
+        updateCodecOperatingRate();
+        if (sourceDrmSession != codecDrmSession) {
+          drainAndUpdateCodecDrmSession();
+        } else {
           drainAndFlushCodec();
+        }
+        break;
+      case KEEP_CODEC_RESULT_YES_WITH_RECONFIGURATION:
+        if (codecNeedsReconfigureWorkaround) {
+          drainAndReinitializeCodec();
+        } else {
+          codecReconfigured = true;
+          codecReconfigurationState = RECONFIGURATION_STATE_WRITE_PENDING;
+          codecNeedsAdaptationWorkaroundBuffer =
+              codecAdaptationWorkaroundMode == ADAPTATION_WORKAROUND_MODE_ALWAYS
+                  || (codecAdaptationWorkaroundMode == ADAPTATION_WORKAROUND_MODE_SAME_RESOLUTION
+                      && newFormat.width == codecFormat.width
+                      && newFormat.height == codecFormat.height);
           codecFormat = newFormat;
           updateCodecOperatingRate();
-          break;
-        case KEEP_CODEC_RESULT_YES_WITH_RECONFIGURATION:
-          if (codecNeedsReconfigureWorkaround) {
-            drainAndReinitializeCodec();
-          } else {
-            codecReconfigured = true;
-            codecReconfigurationState = RECONFIGURATION_STATE_WRITE_PENDING;
-            codecNeedsAdaptationWorkaroundBuffer =
-                codecAdaptationWorkaroundMode == ADAPTATION_WORKAROUND_MODE_ALWAYS
-                    || (codecAdaptationWorkaroundMode == ADAPTATION_WORKAROUND_MODE_SAME_RESOLUTION
-                        && newFormat.width == codecFormat.width
-                        && newFormat.height == codecFormat.height);
-            codecFormat = newFormat;
-            updateCodecOperatingRate();
+          if (sourceDrmSession != codecDrmSession) {
+            drainAndUpdateCodecDrmSession();
           }
-          break;
-        case KEEP_CODEC_RESULT_YES_WITHOUT_RECONFIGURATION:
-          codecFormat = newFormat;
-          updateCodecOperatingRate();
-          break;
-        default:
-          throw new IllegalStateException(); // Never happens.
-      }
+        }
+        break;
+      case KEEP_CODEC_RESULT_YES_WITHOUT_RECONFIGURATION:
+        codecFormat = newFormat;
+        updateCodecOperatingRate();
+        if (sourceDrmSession != codecDrmSession) {
+          drainAndUpdateCodecDrmSession();
+        }
+        break;
+      default:
+        throw new IllegalStateException(); // Never happens.
     }
   }
 
@@ -1331,6 +1359,27 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     }
   }
 
+  /**
+   * Starts draining the codec to update its DRM session. The update may occur immediately if no
+   * buffers have been queued to the codec.
+   *
+   * @throws ExoPlaybackException If an error occurs updating the codec's DRM session.
+   */
+  private void drainAndUpdateCodecDrmSession() throws ExoPlaybackException {
+    if (Util.SDK_INT < 23) {
+      // The codec needs to be re-initialized to switch to the source DRM session.
+      drainAndReinitializeCodec();
+      return;
+    }
+    if (codecReceivedBuffers) {
+      codecDrainState = DRAIN_STATE_SIGNAL_END_OF_STREAM;
+      codecDrainAction = DRAIN_ACTION_UPDATE_DRM_SESSION;
+    } else {
+      // Nothing has been queued to the decoder, so we can do the update immediately.
+      updateDrmSessionOrReinitializeCodecV23();
+    }
+  }
+
   /**
    * Starts draining the codec for re-initialization. Re-initialization may occur immediately if no
    * buffers have been queued to the codec.
@@ -1343,8 +1392,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
       codecDrainAction = DRAIN_ACTION_REINITIALIZE;
     } else {
       // Nothing has been queued to the decoder, so we can re-initialize immediately.
-      releaseCodec();
-      maybeInitCodec();
+      reinitializeCodec();
     }
   }
 
@@ -1548,11 +1596,13 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   private void processEndOfStream() throws ExoPlaybackException {
     switch (codecDrainAction) {
       case DRAIN_ACTION_REINITIALIZE:
-        releaseCodec();
-        maybeInitCodec();
+        reinitializeCodec();
+        break;
+      case DRAIN_ACTION_UPDATE_DRM_SESSION:
+        updateDrmSessionOrReinitializeCodecV23();
         break;
       case DRAIN_ACTION_FLUSH:
-        flushOrReinitCodec();
+        flushOrReinitializeCodec();
         break;
       case DRAIN_ACTION_NONE:
       default:
@@ -1562,6 +1612,41 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     }
   }
 
+  private void reinitializeCodec() throws ExoPlaybackException {
+    releaseCodec();
+    maybeInitCodec();
+  }
+
+  @TargetApi(23)
+  private void updateDrmSessionOrReinitializeCodecV23() throws ExoPlaybackException {
+    FrameworkMediaCrypto sessionMediaCrypto = sourceDrmSession.getMediaCrypto();
+    if (sessionMediaCrypto == null) {
+      // We'd only expect this to happen if the CDM from which the pending session is obtained needs
+      // provisioning. This is unlikely to happen (it probably requires a switch from one DRM scheme
+      // to another, where the new CDM hasn't been used before and needs provisioning). It would be
+      // possible to handle this case more efficiently (i.e. with a new renderer state that waits
+      // for provisioning to finish and then calls mediaCrypto.setMediaDrmSession), but the extra
+      // complexity is not warranted given how unlikely the case is to occur.
+      reinitializeCodec();
+      return;
+    }
+
+    if (flushOrReinitializeCodec()) {
+      // The codec was reinitialized. The new codec will be using the new DRM session, so there's
+      // nothing more to do.
+      return;
+    }
+
+    try {
+      mediaCrypto.setMediaDrmSession(sessionMediaCrypto.sessionId);
+    } catch (MediaCryptoException e) {
+      throw ExoPlaybackException.createForRenderer(e, getIndex());
+    }
+    setCodecDrmSession(sourceDrmSession);
+    codecDrainState = DRAIN_STATE_NONE;
+    codecDrainAction = DRAIN_ACTION_NONE;
+  }
+
   private boolean shouldSkipOutputBuffer(long presentationTimeUs) {
     // We avoid using decodeOnlyPresentationTimestamps.remove(presentationTimeUs) because it would
     // box presentationTimeUs, creating a Long object that would need to be garbage collected.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index b92dd44eb2..9084547d0f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -867,7 +867,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
     // We dropped some buffers to catch up, so update the decoder counters and flush the codec,
     // which releases all pending buffers buffers including the current output buffer.
     updateDroppedBufferCounters(buffersInCodecCount + droppedSourceBufferCount);
-    flushOrReinitCodec();
+    flushOrReinitializeCodec();
     return true;
   }
 

From 57ed00873ff948370d38901b5b0fd73992abfc7e Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Fri, 18 Jan 2019 16:41:06 +0000
Subject: [PATCH 400/832] bazel build and workspace to build cast receiver

PiperOrigin-RevId: 229934333
---
 .gitignore |  9 +++++++++
 .hgignore  | 10 ++++++++++
 2 files changed, 19 insertions(+)

diff --git a/.gitignore b/.gitignore
index db5a8c4305..4731d5ba99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,12 @@ local.properties
 proguard.cfg
 proguard-project.txt
 
+# Bazel
+bazel-bin
+bazel-genfiles
+bazel-out
+bazel-testlogs
+
 # Other
 .DS_Store
 cmake-build-debug
@@ -66,3 +72,6 @@ extensions/cronet/jniLibs/*
 extensions/cronet/libs/*
 !extensions/cronet/libs/README.md
 
+# Cast receiver
+cast_receiver_app/external-js
+cast_receiver_app/bazel-cast_receiver_app
diff --git a/.hgignore b/.hgignore
index f7c3656f65..36d3268005 100644
--- a/.hgignore
+++ b/.hgignore
@@ -44,6 +44,12 @@ local.properties
 proguard.cfg
 proguard-project.txt
 
+# Bazel
+bazel-bin
+bazel-genfiles
+bazel-out
+bazel-testlogs
+
 # Other
 .DS_Store
 cmake-build-debug
@@ -69,3 +75,7 @@ extensions/cronet/jniLibs/*
 !extensions/cronet/jniLibs/README.md
 extensions/cronet/libs/*
 !extensions/cronet/libs/README.md
+
+# Cast receiver
+cast_receiver_app/external-js
+cast_receiver_app/bazel-cast_receiver_app

From 02dc937c78370240ffa763e9b5c89fa002a36cbd Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 18 Jan 2019 16:44:29 +0000
Subject: [PATCH 401/832] Fix flaky DownloadIndexUtilTest.

PiperOrigin-RevId: 229934901
---
 .../android/exoplayer2/offline/DownloadIndexUtilTest.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
index 376c840296..bc93b40265 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
@@ -97,7 +97,7 @@ public class DownloadIndexUtilTest {
     assertThat(downloadState.cacheKey).isEqualTo(action2.customCacheKey);
     assertThat(downloadState.customMetadata).isEqualTo(action2.data);
     assertThat(downloadState.uri).isEqualTo(action2.uri);
-    assertThat(downloadState.streamKeys).isEqualTo(new StreamKey[] {streamKey2, streamKey1});
+    assertThat(Arrays.asList(downloadState.streamKeys)).containsExactly(streamKey1, streamKey2);
     assertThat(downloadState.state).isEqualTo(DownloadState.STATE_QUEUED);
   }
 
@@ -142,7 +142,7 @@ public class DownloadIndexUtilTest {
     assertThat(downloadState.cacheKey).isEqualTo(action.customCacheKey);
     assertThat(downloadState.customMetadata).isEqualTo(action.data);
     assertThat(downloadState.uri).isEqualTo(action.uri);
-    assertThat(downloadState.streamKeys).isEqualTo(action.keys.toArray(new StreamKey[0]));
+    assertThat(Arrays.asList(downloadState.streamKeys)).containsExactlyElementsIn(action.keys);
     assertThat(downloadState.state).isEqualTo(state);
   }
 

From 82da627c1a2273021fc1df027e879db71907b630 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 18 Jan 2019 18:03:15 +0000
Subject: [PATCH 402/832] Split out shared database components for reuse in
 caching

PiperOrigin-RevId: 229946997
---
 .../exoplayer2/database/DatabaseProvider.java |  56 +++++
 .../database/DefaultDatabaseProvider.java     |  42 ++++
 .../database/ExoDatabaseProvider.java         |  55 +++++
 .../exoplayer2/database/VersionTable.java     | 116 ++++++++++
 .../offline/DefaultDownloadIndex.java         | 213 ++----------------
 .../exoplayer2/offline/DownloadIndex.java     |   2 -
 .../exoplayer2/database/VersionTableTest.java |  78 +++++++
 .../offline/DefaultDownloadIndexTest.java     | 173 +++-----------
 .../offline/DownloadIndexUtilTest.java        |   9 +-
 9 files changed, 406 insertions(+), 338 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseProvider.java
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/database/DefaultDatabaseProvider.java
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseProvider.java b/library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseProvider.java
new file mode 100644
index 0000000000..2bb5f260ba
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseProvider.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.database;
+
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteException;
+
+/**
+ * Provides {@link SQLiteDatabase} instances to ExoPlayer components, which may read and write
+ * tables prefixed with {@link #TABLE_PREFIX}.
+ */
+public interface DatabaseProvider {
+
+  /** Prefix for tables that can be read and written by ExoPlayer components. */
+  String TABLE_PREFIX = "ExoPlayer";
+
+  /**
+   * Creates and/or opens a database that will be used for reading and writing.
+   *
+   * <p>Once opened successfully, the database is cached, so you can call this method every time you
+   * need to write to the database. Errors such as bad permissions or a full disk may cause this
+   * method to fail, but future attempts may succeed if the problem is fixed.
+   *
+   * @throws SQLiteException If the database cannot be opened for writing.
+   * @return A read/write database object.
+   */
+  SQLiteDatabase getWritableDatabase();
+
+  /**
+   * Creates and/or opens a database. This will be the same object returned by {@link
+   * #getWritableDatabase()} unless some problem, such as a full disk, requires the database to be
+   * opened read-only. In that case, a read-only database object will be returned. If the problem is
+   * fixed, a future call to {@link #getWritableDatabase()} may succeed, in which case the read-only
+   * database object will be closed and the read/write object will be returned in the future.
+   *
+   * <p>Once opened successfully, the database is cached, so you can call this method every time you
+   * need to read from the database.
+   *
+   * @throws SQLiteException If the database cannot be opened.
+   * @return A database object valid until {@link #getWritableDatabase()} is called.
+   */
+  SQLiteDatabase getReadableDatabase();
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/DefaultDatabaseProvider.java b/library/core/src/main/java/com/google/android/exoplayer2/database/DefaultDatabaseProvider.java
new file mode 100644
index 0000000000..c04683b434
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/database/DefaultDatabaseProvider.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.database;
+
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+
+/** A {@link DatabaseProvider} that provides instances obtained from a {@link SQLiteOpenHelper}. */
+public final class DefaultDatabaseProvider implements DatabaseProvider {
+
+  private final SQLiteOpenHelper sqliteOpenHelper;
+
+  /**
+   * @param sqliteOpenHelper An {@link SQLiteOpenHelper} from which to obtain database instances.
+   */
+  public DefaultDatabaseProvider(SQLiteOpenHelper sqliteOpenHelper) {
+    this.sqliteOpenHelper = sqliteOpenHelper;
+  }
+
+  @Override
+  public SQLiteDatabase getWritableDatabase() {
+    return sqliteOpenHelper.getWritableDatabase();
+  }
+
+  @Override
+  public SQLiteDatabase getReadableDatabase() {
+    return sqliteOpenHelper.getReadableDatabase();
+  }
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java b/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
new file mode 100644
index 0000000000..b64bad2ad6
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.database;
+
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+
+/**
+ * An {@link SQLiteOpenHelper} that provides instances of a standalone ExoPlayer database.
+ *
+ * <p>Suitable for use by applications that do not already have their own database, or which would
+ * prefer to keep ExoPlayer tables isolated in their own database. Other applications should prefer
+ * to use {@link DefaultDatabaseProvider} with their own {@link SQLiteOpenHelper}.
+ */
+public final class ExoDatabaseProvider extends SQLiteOpenHelper implements DatabaseProvider {
+
+  /** The file name used for the standalone ExoPlayer database. */
+  public static final String DATABASE_NAME = "exoplayer_internal.db";
+
+  private static final int VERSION = 1;
+
+  public ExoDatabaseProvider(Context context) {
+    super(context.getApplicationContext(), DATABASE_NAME, /* factory= */ null, VERSION);
+  }
+
+  @Override
+  public void onCreate(SQLiteDatabase db) {
+    // Features create their own tables.
+  }
+
+  @Override
+  public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+    // Features handle their own upgrades.
+  }
+
+  @Override
+  public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+    // TODO: Wipe the database.
+    super.onDowngrade(db, oldVersion, newVersion);
+  }
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java b/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
new file mode 100644
index 0000000000..0b6ef3d816
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.database;
+
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.database.DatabaseUtils;
+import android.database.sqlite.SQLiteDatabase;
+import android.support.annotation.IntDef;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * A table that holds version information about other ExoPlayer tables. This allows ExoPlayer tables
+ * to be versioned independently to the version of the containing database.
+ */
+public final class VersionTable {
+
+  /** Returned by {@link #getVersion(int)} if the version is unset. */
+  public static final int VERSION_UNSET = -1;
+  /** Version of tables used for offline functionality. */
+  public static final int FEATURE_OFFLINE = 0;
+  /** Version of tables used for cache functionality. */
+  public static final int FEATURE_CACHE = 1;
+
+  private static final String TABLE_NAME = DatabaseProvider.TABLE_PREFIX + "Versions";
+
+  private static final String COLUMN_FEATURE = "feature";
+  private static final String COLUMN_VERSION = "version";
+
+  private static final String SQL_CREATE_TABLE_IF_NOT_EXISTS =
+      "CREATE TABLE IF NOT EXISTS "
+          + TABLE_NAME
+          + " ("
+          + COLUMN_FEATURE
+          + " INTEGER PRIMARY KEY NOT NULL,"
+          + COLUMN_VERSION
+          + " INTEGER NOT NULL)";
+
+  @Documented
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({FEATURE_OFFLINE, FEATURE_CACHE})
+  private @interface Feature {}
+
+  private final DatabaseProvider databaseProvider;
+
+  public VersionTable(DatabaseProvider databaseProvider) {
+    this.databaseProvider = databaseProvider;
+    // Check whether the table exists to avoid getting a writable database if we don't need one.
+    if (!doesTableExist(databaseProvider, TABLE_NAME)) {
+      databaseProvider.getWritableDatabase().execSQL(SQL_CREATE_TABLE_IF_NOT_EXISTS);
+    }
+  }
+
+  /**
+   * Sets the version of tables belonging to the specified feature.
+   *
+   * @param feature The feature.
+   * @param version The version.
+   */
+  public void setVersion(@Feature int feature, int version) {
+    ContentValues values = new ContentValues();
+    values.put(COLUMN_FEATURE, feature);
+    values.put(COLUMN_VERSION, version);
+    SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+    writableDatabase.replace(TABLE_NAME, /* nullColumnHack= */ null, values);
+  }
+
+  /**
+   * Returns the version of tables belonging to the specified feature, or {@link #VERSION_UNSET} if
+   * no version information is available.
+   */
+  public int getVersion(@Feature int feature) {
+    String selection = COLUMN_FEATURE + " = ?";
+    String[] selectionArgs = {Integer.toString(feature)};
+    try (Cursor cursor =
+        databaseProvider
+            .getReadableDatabase()
+            .query(
+                TABLE_NAME,
+                new String[] {COLUMN_VERSION},
+                selection,
+                selectionArgs,
+                /* groupBy= */ null,
+                /* having= */ null,
+                /* orderBy= */ null)) {
+      if (cursor.getCount() == 0) {
+        return VERSION_UNSET;
+      }
+      cursor.moveToNext();
+      return cursor.getInt(/* COLUMN_VERSION index */ 0);
+    }
+  }
+
+  /* package */ static boolean doesTableExist(DatabaseProvider databaseProvider, String tableName) {
+    SQLiteDatabase readableDatabase = databaseProvider.getReadableDatabase();
+    long count =
+        DatabaseUtils.queryNumEntries(
+            readableDatabase, "sqlite_master", "tbl_name = ?", new String[] {tableName});
+    return count > 0;
+  }
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
index 8881a038f9..28a5abafb9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -16,21 +16,15 @@
 package com.google.android.exoplayer2.offline;
 
 import android.content.ContentValues;
-import android.content.Context;
 import android.database.Cursor;
-import android.database.DatabaseUtils;
 import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteException;
-import android.database.sqlite.SQLiteOpenHelper;
 import android.net.Uri;
-import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
+import com.google.android.exoplayer2.database.DatabaseProvider;
+import com.google.android.exoplayer2.database.VersionTable;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 
 /**
  * A {@link DownloadIndex} which uses SQLite to persist {@link DownloadState}s.
@@ -40,55 +34,13 @@ import java.lang.annotation.RetentionPolicy;
  */
 public final class DefaultDownloadIndex implements DownloadIndex {
 
-  /** Provides {@link SQLiteDatabase} instances. */
-  public interface DatabaseProvider {
-    /** Closes any open database object. */
-    void close();
+  @VisibleForTesting
+  /* package */ static final String TABLE_NAME = DatabaseProvider.TABLE_PREFIX + "Downloads";
 
-    /**
-     * Creates and/or opens a database that will be used for reading and writing.
-     *
-     * <p>Once opened successfully, the database is cached, so you can call this method every time
-     * you need to write to the database. (Make sure to call {@link #close} when you no longer need
-     * the database.) Errors such as bad permissions or a full disk may cause this method to fail,
-     * but future attempts may succeed if the problem is fixed.
-     *
-     * @throws SQLiteException If the database cannot be opened for writing.
-     * @return A read/write database object valid until {@link #close} is called.
-     */
-    SQLiteDatabase getWritableDatabase();
-
-    /**
-     * Creates and/or opens a database. This will be the same object returned by {@link
-     * #getWritableDatabase} unless some problem, such as a full disk, requires the database to be
-     * opened read-only. In that case, a read-only database object will be returned. If the problem
-     * is fixed, a future call to {@link #getWritableDatabase} may succeed, in which case the
-     * read-only database object will be closed and the read/write object will be returned in the
-     * future.
-     *
-     * <p>Once opened successfully, the database should be cached. When the database is no longer
-     * needed, {@link #close} will be called.
-     *
-     * @throws SQLiteException If the database cannot be opened.
-     * @return A database object valid until {@link #getWritableDatabase} or {@link #close} is
-     *     called.
-     */
-    SQLiteDatabase getReadableDatabase();
-  }
-
-  private static final String DATABASE_NAME = "exoplayer_internal.db";
+  @VisibleForTesting /* package */ static final int TABLE_VERSION = 1;
 
   private final DatabaseProvider databaseProvider;
-  @Nullable private DownloadStateTable downloadStateTable;
-
-  /**
-   * Creates a DefaultDownloadIndex which stores the {@link DownloadState}s on a SQLite database.
-   *
-   * @param context A Context.
-   */
-  public DefaultDownloadIndex(Context context) {
-    this(new DefaultDatabaseProvider(context));
-  }
+  @Nullable private DownloadsTable downloadTable;
 
   /**
    * Creates a DefaultDownloadIndex which stores the {@link DownloadState}s on a SQLite database
@@ -101,46 +53,32 @@ public final class DefaultDownloadIndex implements DownloadIndex {
     this.databaseProvider = databaseProvider;
   }
 
-  @Override
-  public void release() {
-    databaseProvider.close();
-  }
-
   @Override
   @Nullable
   public DownloadState getDownloadState(String id) {
-    return getDownloadStateTable().get(id);
+    return getDownloadTable().get(id);
   }
 
   @Override
   public DownloadStateCursor getDownloadStates(@DownloadState.State int... states) {
-    return getDownloadStateTable().get(states);
+    return getDownloadTable().get(states);
   }
 
   @Override
   public void putDownloadState(DownloadState downloadState) {
-    getDownloadStateTable().replace(downloadState);
+    getDownloadTable().replace(downloadState);
   }
 
   @Override
   public void removeDownloadState(String id) {
-    getDownloadStateTable().delete(id);
+    getDownloadTable().delete(id);
   }
 
-  private DownloadStateTable getDownloadStateTable() {
-    if (downloadStateTable == null) {
-      downloadStateTable = new DownloadStateTable(databaseProvider);
+  private DownloadsTable getDownloadTable() {
+    if (downloadTable == null) {
+      downloadTable = new DownloadsTable(databaseProvider);
     }
-    return downloadStateTable;
-  }
-
-  @VisibleForTesting
-  /* package */ static boolean doesTableExist(DatabaseProvider databaseProvider, String tableName) {
-    SQLiteDatabase readableDatabase = databaseProvider.getReadableDatabase();
-    long count =
-        DatabaseUtils.queryNumEntries(
-            readableDatabase, "sqlite_master", "tbl_name = ?", new String[] {tableName});
-    return count > 0;
+    return downloadTable;
   }
 
   private static final class DownloadStateCursorImpl implements DownloadStateCursor {
@@ -153,7 +91,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
 
     @Override
     public DownloadState getDownloadState() {
-      return DownloadStateTable.getDownloadState(cursor);
+      return DownloadsTable.getDownloadState(cursor);
     }
 
     @Override
@@ -182,10 +120,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
     }
   }
 
-  @VisibleForTesting
-  /* package */ static final class DownloadStateTable {
-    @VisibleForTesting /* package */ static final String TABLE_NAME = "ExoPlayerDownloadStates";
-    @VisibleForTesting /* package */ static final int TABLE_VERSION = 1;
+  private static final class DownloadsTable {
 
     private static final String COLUMN_ID = "id";
     private static final String COLUMN_TYPE = "title";
@@ -237,9 +172,9 @@ public final class DefaultDownloadIndex implements DownloadIndex {
           COLUMN_CUSTOM_METADATA
         };
 
-    private static final String SQL_DROP_TABLE = "DROP TABLE IF EXISTS " + TABLE_NAME;
+    private static final String SQL_DROP_TABLE_IF_EXISTS = "DROP TABLE IF EXISTS " + TABLE_NAME;
     private static final String SQL_CREATE_TABLE =
-        "CREATE TABLE IF NOT EXISTS "
+        "CREATE TABLE "
             + TABLE_NAME
             + " ("
             + COLUMN_ID
@@ -273,17 +208,15 @@ public final class DefaultDownloadIndex implements DownloadIndex {
 
     private final DatabaseProvider databaseProvider;
 
-    public DownloadStateTable(DatabaseProvider databaseProvider) {
+    public DownloadsTable(DatabaseProvider databaseProvider) {
       this.databaseProvider = databaseProvider;
       VersionTable versionTable = new VersionTable(databaseProvider);
       int version = versionTable.getVersion(VersionTable.FEATURE_OFFLINE);
-      if (!doesTableExist(databaseProvider, TABLE_NAME)
-          || version == 0
-          || version > TABLE_VERSION) {
+      if (version == VersionTable.VERSION_UNSET || version > TABLE_VERSION) {
         SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
         writableDatabase.beginTransaction();
         try {
-          writableDatabase.execSQL(SQL_DROP_TABLE);
+          writableDatabase.execSQL(SQL_DROP_TABLE_IF_EXISTS);
           writableDatabase.execSQL(SQL_CREATE_TABLE);
           versionTable.setVersion(VersionTable.FEATURE_OFFLINE, TABLE_VERSION);
           writableDatabase.setTransactionSuccessful();
@@ -421,108 +354,4 @@ public final class DefaultDownloadIndex implements DownloadIndex {
       return streamKeys;
     }
   }
-
-  @VisibleForTesting
-  /* package */ static final class VersionTable {
-    private static final String TABLE_NAME = "ExoPlayerVersions";
-
-    private static final String COLUMN_FEATURE = "feature";
-    private static final String COLUMN_VERSION = "version";
-
-    private static final String SQL_CREATE_TABLE =
-        "CREATE TABLE IF NOT EXISTS "
-            + TABLE_NAME
-            + " ("
-            + COLUMN_FEATURE
-            + " INTEGER PRIMARY KEY NOT NULL,"
-            + COLUMN_VERSION
-            + " INTEGER NOT NULL)";
-
-    @Documented
-    @Retention(RetentionPolicy.SOURCE)
-    @IntDef({FEATURE_OFFLINE, FEATURE_CACHE})
-    private @interface Feature {}
-
-    public static final int FEATURE_OFFLINE = 0;
-    public static final int FEATURE_CACHE = 1;
-
-    private final DatabaseProvider databaseProvider;
-
-    public VersionTable(DatabaseProvider databaseProvider) {
-      this.databaseProvider = databaseProvider;
-      if (!doesTableExist(databaseProvider, TABLE_NAME)) {
-        databaseProvider.getWritableDatabase().execSQL(SQL_CREATE_TABLE);
-      }
-    }
-
-    public void setVersion(@Feature int feature, int version) {
-      ContentValues values = new ContentValues();
-      values.put(COLUMN_FEATURE, feature);
-      values.put(COLUMN_VERSION, version);
-      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
-      writableDatabase.replace(TABLE_NAME, /* nullColumnHack= */ null, values);
-    }
-
-    public int getVersion(@Feature int feature) {
-      String selection = COLUMN_FEATURE + " = ?";
-      String[] selectionArgs = {Integer.toString(feature)};
-      try (Cursor cursor =
-          databaseProvider
-              .getReadableDatabase()
-              .query(
-                  TABLE_NAME,
-                  new String[] {COLUMN_VERSION},
-                  selection,
-                  selectionArgs,
-                  /* groupBy= */ null,
-                  /* having= */ null,
-                  /* orderBy= */ null)) {
-        if (cursor.getCount() == 0) {
-          return 0;
-        }
-        cursor.moveToNext();
-        return cursor.getInt(/* COLUMN_VERSION index */ 0);
-      }
-    }
-  }
-
-  private static final class DefaultDatabaseProvider extends SQLiteOpenHelper
-      implements DatabaseProvider {
-    public DefaultDatabaseProvider(Context context) {
-      super(context, DATABASE_NAME, /* factory= */ null, /* version= */ 1);
-    }
-
-    @Override
-    public void onCreate(SQLiteDatabase db) {
-      // Table creation is done in DownloadStateTable constructor.
-    }
-
-    @Override
-    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-      // Upgrade is handled in DownloadStateTable constructor.
-    }
-
-    @Override
-    public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-      // TODO: Wipe the database.
-      super.onDowngrade(db, oldVersion, newVersion);
-    }
-
-    // DatabaseProvider implementation.
-
-    @Override
-    public synchronized void close() {
-      super.close();
-    }
-
-    @Override
-    public SQLiteDatabase getWritableDatabase() {
-      return super.getWritableDatabase();
-    }
-
-    @Override
-    public SQLiteDatabase getReadableDatabase() {
-      return super.getReadableDatabase();
-    }
-  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java
index 71726b64a9..7b903d3321 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java
@@ -19,8 +19,6 @@ import android.support.annotation.Nullable;
 
 /** Persists {@link DownloadState}s. */
 interface DownloadIndex {
-  /** Releases the used resources. */
-  void release();
 
   /**
    * Returns the {@link DownloadState} with the given {@code id}, or null.
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java b/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java
new file mode 100644
index 0000000000..dd9184ccdd
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.database;
+
+import static com.google.android.exoplayer2.database.VersionTable.FEATURE_CACHE;
+import static com.google.android.exoplayer2.database.VersionTable.FEATURE_OFFLINE;
+import static com.google.common.truth.Truth.assertThat;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+/** Unit tests for {@link VersionTable}. */
+@RunWith(RobolectricTestRunner.class)
+public class VersionTableTest {
+
+  private ExoDatabaseProvider databaseProvider;
+
+  @Before
+  public void setUp() {
+    databaseProvider = new ExoDatabaseProvider(RuntimeEnvironment.application);
+  }
+
+  @After
+  public void tearDown() {
+    databaseProvider.close();
+  }
+
+  @Test
+  public void getVersion_nonExistingTable_returnsVersionUnset() {
+    VersionTable versionTable = new VersionTable(databaseProvider);
+    int version = versionTable.getVersion(FEATURE_OFFLINE);
+    assertThat(version).isEqualTo(VersionTable.VERSION_UNSET);
+  }
+
+  @Test
+  public void getVersion_returnsSetVersion() {
+    VersionTable versionTable = new VersionTable(databaseProvider);
+
+    versionTable.setVersion(FEATURE_OFFLINE, 1);
+    assertThat(versionTable.getVersion(FEATURE_OFFLINE)).isEqualTo(1);
+
+    versionTable.setVersion(FEATURE_OFFLINE, 10);
+    assertThat(versionTable.getVersion(FEATURE_OFFLINE)).isEqualTo(10);
+
+    versionTable.setVersion(FEATURE_CACHE, 5);
+    assertThat(versionTable.getVersion(FEATURE_CACHE)).isEqualTo(5);
+    assertThat(versionTable.getVersion(FEATURE_OFFLINE)).isEqualTo(10);
+  }
+
+  @Test
+  public void doesTableExist_nonExistingTable_returnsFalse() {
+    assertThat(VersionTable.doesTableExist(databaseProvider, "NonExistingTable")).isFalse();
+  }
+
+  @Test
+  public void doesTableExist_existingTable_returnsTrue() {
+    String table = "TestTable";
+    databaseProvider.getWritableDatabase().execSQL("CREATE TABLE " + table + " (dummy INTEGER)");
+    assertThat(VersionTable.doesTableExist(databaseProvider, table)).isTrue();
+  }
+}
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
index fe32415ffa..6f6786c068 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
@@ -15,15 +15,13 @@
  */
 package com.google.android.exoplayer2.offline;
 
-import static com.google.android.exoplayer2.offline.DefaultDownloadIndex.VersionTable.FEATURE_CACHE;
-import static com.google.android.exoplayer2.offline.DefaultDownloadIndex.VersionTable.FEATURE_OFFLINE;
 import static com.google.common.truth.Truth.assertThat;
 
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
 import android.net.Uri;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.database.ExoDatabaseProvider;
+import com.google.android.exoplayer2.database.VersionTable;
 import java.util.Arrays;
 import org.junit.After;
 import org.junit.Before;
@@ -36,16 +34,18 @@ import org.robolectric.RuntimeEnvironment;
 @RunWith(RobolectricTestRunner.class)
 public class DefaultDownloadIndexTest {
 
+  private ExoDatabaseProvider databaseProvider;
   private DefaultDownloadIndex downloadIndex;
 
   @Before
   public void setUp() {
-    downloadIndex = new DefaultDownloadIndex(RuntimeEnvironment.application);
+    databaseProvider = new ExoDatabaseProvider(RuntimeEnvironment.application);
+    downloadIndex = new DefaultDownloadIndex(databaseProvider);
   }
 
   @After
   public void tearDown() {
-    downloadIndex.release();
+    databaseProvider.close();
   }
 
   @Test
@@ -99,29 +99,12 @@ public class DefaultDownloadIndexTest {
   public void releaseAndRecreateDownloadIndex_returnsTheSameDownloadState() {
     String id = "id";
     DownloadState downloadState = new DownloadStateBuilder(id).build();
-
     downloadIndex.putDownloadState(downloadState);
-    downloadIndex.release();
-    downloadIndex = new DefaultDownloadIndex(RuntimeEnvironment.application);
-    DownloadState readDownloadState = downloadIndex.getDownloadState(id);
 
-    assertThat(readDownloadState).isNotNull();
-    assertEqual(readDownloadState, downloadState);
-  }
-
-  @Test
-  public void customDatabaseProvider_getDownloadStateReturnsNull() {
-    String id = "id";
-    DownloadState downloadState = new DownloadStateBuilder(id).build();
-
-    downloadIndex.putDownloadState(downloadState);
-    downloadIndex.release();
-    DatabaseProviderImpl databaseProvider = new DatabaseProviderImpl();
     downloadIndex = new DefaultDownloadIndex(databaseProvider);
     DownloadState readDownloadState = downloadIndex.getDownloadState(id);
-
-    assertThat(readDownloadState).isNull();
-    databaseProvider.close();
+    assertThat(readDownloadState).isNotNull();
+    assertEqual(readDownloadState, downloadState);
   }
 
   @Test
@@ -134,10 +117,9 @@ public class DefaultDownloadIndexTest {
     String id = "id";
     DownloadState downloadState = new DownloadStateBuilder(id).build();
     downloadIndex.putDownloadState(downloadState);
-
     downloadIndex.removeDownloadState(id);
-    DownloadState readDownloadState = downloadIndex.getDownloadState(id);
 
+    DownloadState readDownloadState = downloadIndex.getDownloadState(id);
     assertThat(readDownloadState).isNull();
   }
 
@@ -160,6 +142,7 @@ public class DefaultDownloadIndexTest {
     assertEqual(cursor.getDownloadState(), downloadState2);
     cursor.moveToNext();
     assertEqual(cursor.getDownloadState(), downloadState1);
+    cursor.close();
   }
 
   @Test
@@ -191,111 +174,39 @@ public class DefaultDownloadIndexTest {
     assertEqual(cursor.getDownloadState(), downloadState1);
     cursor.moveToNext();
     assertEqual(cursor.getDownloadState(), downloadState3);
+    cursor.close();
   }
 
   @Test
-  public void doesTableExist_nonExistingTable_returnsFalse() {
-    DatabaseProviderImpl databaseProvider = new DatabaseProviderImpl();
+  public void putDownloadState_setsVersion() {
+    VersionTable versionTable = new VersionTable(databaseProvider);
+    assertThat(versionTable.getVersion(VersionTable.FEATURE_OFFLINE))
+        .isEqualTo(VersionTable.VERSION_UNSET);
 
-    assertThat(DefaultDownloadIndex.doesTableExist(databaseProvider, "NonExistingTable")).isFalse();
+    downloadIndex.putDownloadState(new DownloadStateBuilder("id1").build());
 
-    databaseProvider.close();
+    assertThat(versionTable.getVersion(VersionTable.FEATURE_OFFLINE))
+        .isEqualTo(DefaultDownloadIndex.TABLE_VERSION);
   }
 
   @Test
-  public void doesTableExist_existingTable_returnsTrue() {
-    DatabaseProviderImpl databaseProvider = new DatabaseProviderImpl();
-    String tableName = "ExistingTable";
-    databaseProvider.getWritableDatabase().execSQL("CREATE TABLE " + tableName + "(dummy)");
+  public void downloadIndex_versionDowngradeWipesData() {
+    DownloadState downloadState1 = new DownloadStateBuilder("id1").build();
+    downloadIndex.putDownloadState(downloadState1);
+    DownloadStateCursor cursor = downloadIndex.getDownloadStates();
+    assertThat(cursor.getCount()).isEqualTo(1);
+    cursor.close();
 
-    assertThat(DefaultDownloadIndex.doesTableExist(databaseProvider, tableName)).isTrue();
+    VersionTable versionTable = new VersionTable(databaseProvider);
+    versionTable.setVersion(VersionTable.FEATURE_OFFLINE, Integer.MAX_VALUE);
 
-    databaseProvider.close();
-  }
+    downloadIndex = new DefaultDownloadIndex(databaseProvider);
 
-  @Test
-  public void getVersion_nonExistingTable_returnsZero() {
-    DatabaseProviderImpl databaseProvider = new DatabaseProviderImpl();
-    DefaultDownloadIndex.VersionTable versionTable =
-        new DefaultDownloadIndex.VersionTable(databaseProvider);
-
-    int version = versionTable.getVersion(FEATURE_OFFLINE);
-
-    assertThat(version).isEqualTo(0);
-    databaseProvider.close();
-  }
-
-  @Test
-  public void getVersion_returnsSetVersion() {
-    DatabaseProviderImpl databaseProvider = new DatabaseProviderImpl();
-    DefaultDownloadIndex.VersionTable versionTable =
-        new DefaultDownloadIndex.VersionTable(databaseProvider);
-
-    versionTable.setVersion(FEATURE_OFFLINE, 1);
-    assertThat(versionTable.getVersion(FEATURE_OFFLINE)).isEqualTo(1);
-
-    versionTable.setVersion(FEATURE_OFFLINE, 10);
-    assertThat(versionTable.getVersion(FEATURE_OFFLINE)).isEqualTo(10);
-
-    versionTable.setVersion(FEATURE_CACHE, 5);
-    assertThat(versionTable.getVersion(FEATURE_CACHE)).isEqualTo(5);
-    assertThat(versionTable.getVersion(FEATURE_OFFLINE)).isEqualTo(10);
-
-    databaseProvider.close();
-  }
-
-  @Test
-  public void downloadStateTableConstructor_noTable_createsTable() {
-    DatabaseProviderImpl databaseProvider = new DatabaseProviderImpl();
-    assertThat(
-            DefaultDownloadIndex.doesTableExist(
-                databaseProvider, DefaultDownloadIndex.DownloadStateTable.TABLE_NAME))
-        .isFalse();
-
-    new DefaultDownloadIndex.DownloadStateTable(databaseProvider);
-
-    assertThat(
-            DefaultDownloadIndex.doesTableExist(
-                databaseProvider, DefaultDownloadIndex.DownloadStateTable.TABLE_NAME))
-        .isTrue();
-
-    databaseProvider.close();
-  }
-
-  @Test
-  public void downloadStateTableConstructor_versionZero_versionSet() {
-    DatabaseProviderImpl databaseProvider = new DatabaseProviderImpl();
-
-    new DefaultDownloadIndex.DownloadStateTable(databaseProvider);
-
-    DefaultDownloadIndex.VersionTable versionTable =
-        new DefaultDownloadIndex.VersionTable(databaseProvider);
-    assertThat(versionTable.getVersion(FEATURE_OFFLINE))
-        .isEqualTo(DefaultDownloadIndex.DownloadStateTable.TABLE_VERSION);
-    databaseProvider.close();
-  }
-
-  @Test
-  public void downloadStateTableConstructor_greaterVersion_tableRecreated() {
-    DatabaseProviderImpl databaseProvider = new DatabaseProviderImpl();
-    databaseProvider
-        .getWritableDatabase()
-        .execSQL("CREATE TABLE " + DefaultDownloadIndex.DownloadStateTable.TABLE_NAME + "(dummy)");
-    DefaultDownloadIndex.VersionTable versionTable =
-        new DefaultDownloadIndex.VersionTable(databaseProvider);
-    versionTable.setVersion(FEATURE_OFFLINE, Integer.MAX_VALUE);
-
-    DefaultDownloadIndex.DownloadStateTable downloadStateTable =
-        new DefaultDownloadIndex.DownloadStateTable(databaseProvider);
-    String id = "id";
-    DownloadState downloadState = new DownloadStateBuilder(id).build();
-    downloadStateTable.replace(downloadState);
-    DownloadState readDownloadState = downloadStateTable.get(id);
-    assertEqual(readDownloadState, downloadState);
-
-    assertThat(versionTable.getVersion(FEATURE_OFFLINE))
-        .isEqualTo(DefaultDownloadIndex.DownloadStateTable.TABLE_VERSION);
-    databaseProvider.close();
+    cursor = downloadIndex.getDownloadStates();
+    assertThat(cursor.getCount()).isEqualTo(0);
+    cursor.close();
+    assertThat(versionTable.getVersion(VersionTable.FEATURE_OFFLINE))
+        .isEqualTo(DefaultDownloadIndex.TABLE_VERSION);
   }
 
   private static void assertEqual(DownloadState downloadState, DownloadState expected) {
@@ -468,24 +379,4 @@ public class DefaultDownloadIndexTest {
           customMetadata);
     }
   }
-
-  private static final class DatabaseProviderImpl extends SQLiteOpenHelper
-      implements DefaultDownloadIndex.DatabaseProvider {
-    private static final int DATABASE_VERSION = 1;
-    private static final String DATABASE_NAME = "TestExoPlayerDownloadIndex.db";
-
-    public DatabaseProviderImpl() {
-      super(RuntimeEnvironment.application, DATABASE_NAME, null, DATABASE_VERSION);
-    }
-
-    @Override
-    public void onCreate(SQLiteDatabase db) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-      // Do nothing.
-    }
-  }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
index bc93b40265..a2b560cecd 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
@@ -19,6 +19,7 @@ import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_DASH;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
+import com.google.android.exoplayer2.database.ExoDatabaseProvider;
 import com.google.android.exoplayer2.util.Util;
 import java.io.File;
 import java.util.Arrays;
@@ -34,18 +35,20 @@ import org.robolectric.RuntimeEnvironment;
 @RunWith(RobolectricTestRunner.class)
 public class DownloadIndexUtilTest {
 
-  private DefaultDownloadIndex downloadIndex;
   private File tempFile;
+  private ExoDatabaseProvider databaseProvider;
+  private DefaultDownloadIndex downloadIndex;
 
   @Before
   public void setUp() throws Exception {
     tempFile = Util.createTempFile(RuntimeEnvironment.application, "ExoPlayerTest");
-    downloadIndex = new DefaultDownloadIndex(RuntimeEnvironment.application);
+    databaseProvider = new ExoDatabaseProvider(RuntimeEnvironment.application);
+    downloadIndex = new DefaultDownloadIndex(databaseProvider);
   }
 
   @After
   public void tearDown() {
-    downloadIndex.release();
+    databaseProvider.close();
     tempFile.delete();
   }
 

From 93e24561bbc642fa1abf62f4c1ecdacff403edfe Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Mon, 21 Jan 2019 10:18:01 +0000
Subject: [PATCH 403/832] Add DefaultTsPayloadReaderFactory flag to ignore HDMV
 DTS streams

Prevents collisions with SCTE-35 subtitles.

Issue:#5330
PiperOrigin-RevId: 230195494
---
 .../ts/DefaultTsPayloadReaderFactory.java         | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java
index a5506e2cfb..88805d9362 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java
@@ -50,7 +50,8 @@ public final class DefaultTsPayloadReaderFactory implements TsPayloadReader.Fact
         FLAG_IGNORE_H264_STREAM,
         FLAG_DETECT_ACCESS_UNITS,
         FLAG_IGNORE_SPLICE_INFO_STREAM,
-        FLAG_OVERRIDE_CAPTION_DESCRIPTORS
+        FLAG_OVERRIDE_CAPTION_DESCRIPTORS,
+        FLAG_IGNORE_HDMV_DTS_STREAM
       })
   public @interface Flags {}
 
@@ -86,6 +87,12 @@ public final class DefaultTsPayloadReaderFactory implements TsPayloadReader.Fact
    * closedCaptionFormats} will be ignored if the PMT contains closed captions service descriptors.
    */
   public static final int FLAG_OVERRIDE_CAPTION_DESCRIPTORS = 1 << 5;
+  /**
+   * Prevents the creation of {@link DtsReader} instances when receiving {@link
+   * TsExtractor#TS_STREAM_TYPE_HDMV_DTS} as stream type. Enabling this flag prevents a stream type
+   * collision between HDMV DTS audio and SCTE-35 subtitles.
+   */
+  public static final int FLAG_IGNORE_HDMV_DTS_STREAM = 1 << 6;
 
   private static final int DESCRIPTOR_TAG_CAPTION_SERVICE = 0x86;
 
@@ -142,8 +149,12 @@ public final class DefaultTsPayloadReaderFactory implements TsPayloadReader.Fact
       case TsExtractor.TS_STREAM_TYPE_AC3:
       case TsExtractor.TS_STREAM_TYPE_E_AC3:
         return new PesReader(new Ac3Reader(esInfo.language));
-      case TsExtractor.TS_STREAM_TYPE_DTS:
       case TsExtractor.TS_STREAM_TYPE_HDMV_DTS:
+        if (isSet(FLAG_IGNORE_HDMV_DTS_STREAM)) {
+          return null;
+        }
+        // Fall through.
+      case TsExtractor.TS_STREAM_TYPE_DTS:
         return new PesReader(new DtsReader(esInfo.language));
       case TsExtractor.TS_STREAM_TYPE_H262:
         return new PesReader(new H262Reader(buildUserDataReader(esInfo)));

From fb6154a905cdc7c111c7343a7a6a331dfc5527d1 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 21 Jan 2019 11:42:47 +0000
Subject: [PATCH 404/832] Wipe database on downgrade

PiperOrigin-RevId: 230203593
---
 .../database/ExoDatabaseProvider.java         | 38 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java b/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
index b64bad2ad6..e5bdfbb499 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
@@ -16,8 +16,11 @@
 package com.google.android.exoplayer2.database;
 
 import android.content.Context;
+import android.database.Cursor;
+import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
+import com.google.android.exoplayer2.util.Log;
 
 /**
  * An {@link SQLiteOpenHelper} that provides instances of a standalone ExoPlayer database.
@@ -32,6 +35,7 @@ public final class ExoDatabaseProvider extends SQLiteOpenHelper implements Datab
   public static final String DATABASE_NAME = "exoplayer_internal.db";
 
   private static final int VERSION = 1;
+  private static final String TAG = "ExoDatabaseProvider";
 
   public ExoDatabaseProvider(Context context) {
     super(context.getApplicationContext(), DATABASE_NAME, /* factory= */ null, VERSION);
@@ -49,7 +53,37 @@ public final class ExoDatabaseProvider extends SQLiteOpenHelper implements Datab
 
   @Override
   public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-    // TODO: Wipe the database.
-    super.onDowngrade(db, oldVersion, newVersion);
+    wipeDatabase(db);
+  }
+
+  /**
+   * Makes a best effort to wipe the existing database. The wipe may be incomplete if the database
+   * contains foreign key constraints.
+   */
+  private static void wipeDatabase(SQLiteDatabase db) {
+    String[] columns = {"type", "name"};
+    try (Cursor cursor =
+        db.query(
+            "sqlite_master",
+            columns,
+            /* selection= */ null,
+            /* selectionArgs= */ null,
+            /* groupBy= */ null,
+            /* having= */ null,
+            /* orderBy= */ null)) {
+      while (cursor.moveToNext()) {
+        String type = cursor.getString(0);
+        String name = cursor.getString(1);
+        if (!"sqlite_sequence".equals(name)) {
+          // If it's not an SQL-controlled entity, drop it
+          String sql = "DROP " + type + " IF EXISTS " + name;
+          try {
+            db.execSQL(sql);
+          } catch (SQLException e) {
+            Log.e(TAG, "Error executing " + sql, e);
+          }
+        }
+      }
+    }
   }
 }

From e4eaaedad32945aa25e9148c7c495f764ca66d0b Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 21 Jan 2019 12:15:30 +0000
Subject: [PATCH 405/832] Add max video size workaround for Amlogic decoder.

The Amlogic awesome decoder reduces the video size of interlaced videos by half
if the internal configuration isn't force reset with new maximum input size
values. The product of these new values must exceed 1920x1088 to force the
reset.

Issue:#5003
PiperOrigin-RevId: 230206675
---
 RELEASENOTES.md                                  |  2 ++
 .../video/MediaCodecVideoRenderer.java           | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index cfded4c9d6..bfb84d2504 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -41,6 +41,8 @@
 * Remove `player` and `isTopLevelSource` parameters from `MediaSource.prepare`.
 * Change signature of `PlayerNotificationManager.NotificationListener` to better
   fit service requirements. Remove ability to set a custom stop action.
+* Add workaround for video quality problems with Amlogic decoders
+  ([#5003](https://github.com/google/ExoPlayer/issues/5003)).
 
 ### 2.9.4 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index 9084547d0f..6943fea7b6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -1095,6 +1095,10 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
       throws DecoderQueryException {
     int maxWidth = format.width;
     int maxHeight = format.height;
+    if (codecNeedsMaxVideoSizeResetWorkaround(codecInfo.name)) {
+      maxWidth = Math.max(maxWidth, 1920);
+      maxHeight = Math.max(maxHeight, 1089);
+    }
     int maxInputSize = getMaxInputSize(codecInfo, format);
     if (streamFormats.length == 1) {
       // The single entry in streamFormats must correspond to the format for which the codec is
@@ -1282,6 +1286,18 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
     return "NVIDIA".equals(Util.MANUFACTURER);
   }
 
+  /**
+   * Returns whether the codec is known to have problems with the configuration for interlaced
+   * content and needs minimum values for the maximum video size to force reset the configuration.
+   *
+   * <p>See https://github.com/google/ExoPlayer/issues/5003.
+   *
+   * @param name The name of the codec.
+   */
+  private static boolean codecNeedsMaxVideoSizeResetWorkaround(String name) {
+    return "OMX.amlogic.avc.decoder.awesome".equals(name) && Util.SDK_INT <= 25;
+  }
+
   /*
    * TODO:
    *

From c2f6dd6b0aab6c35424ea6a47974c99bc60b9fc3 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 21 Jan 2019 12:44:07 +0000
Subject: [PATCH 406/832] Only allow one layer of sub-directories in the cache
 for now

PiperOrigin-RevId: 230209898
---
 .../google/android/exoplayer2/upstream/cache/SimpleCache.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index 80eb779e39..7f9bdde5c1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -405,7 +405,7 @@ public final class SimpleCache implements Cache {
     }
     for (File file : files) {
       String fileName = file.getName();
-      if (fileName.indexOf('.') == -1) {
+      if (isRootDirectory && fileName.indexOf('.') == -1) {
         loadDirectory(file, /* isRootDirectory= */ false);
       } else {
         if (isRootDirectory && CachedContentIndex.FILE_NAME.equals(fileName)) {

From e671dac9a2c31d2670470f7a6d9c0cd7ada5030b Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 21 Jan 2019 13:23:52 +0000
Subject: [PATCH 407/832] Fix GVR dependency

PiperOrigin-RevId: 230213842
---
 extensions/gvr/build.gradle | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/extensions/gvr/build.gradle b/extensions/gvr/build.gradle
index ba6bc8afda..6c0ec05bfb 100644
--- a/extensions/gvr/build.gradle
+++ b/extensions/gvr/build.gradle
@@ -33,8 +33,7 @@ dependencies {
     implementation project(modulePrefix + 'library-core')
     implementation project(modulePrefix + 'library-ui')
     implementation 'com.android.support:support-annotations:' + supportLibraryVersion
-    implementation 'com.google.vr:sdk-base:1.190.0'
-    api 'com.google.vr:sdk-base:1.80.0'
+    api 'com.google.vr:sdk-base:1.190.0'
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
 }
 

From 923aa420dfe6eb19eb05647d90d7c5aff62198fb Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 21 Jan 2019 13:52:14 +0000
Subject: [PATCH 408/832] Use loading period event time for fatal load errors.

ExoPlaybackExceptions of type SOURCE are always associated with the loading
period and thus we can use the event time for the loading period in
onPlayerError. Renderer and unexpected exceptions are still associated with the
currently playing period.

Issue:#5407
PiperOrigin-RevId: 230216253
---
 RELEASENOTES.md                                              | 3 +++
 .../android/exoplayer2/analytics/AnalyticsCollector.java     | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index bfb84d2504..053198de57 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -43,6 +43,9 @@
   fit service requirements. Remove ability to set a custom stop action.
 * Add workaround for video quality problems with Amlogic decoders
   ([#5003](https://github.com/google/ExoPlayer/issues/5003)).
+* Associate fatal player errors of type SOURCE with the loading source in
+  `AnalyticsListener.EventTime`
+  ([#5407](https://github.com/google/ExoPlayer/issues/5407)).
 
 ### 2.9.4 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java
index 113add612a..55031e2d12 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java
@@ -488,7 +488,10 @@ public class AnalyticsCollector
 
   @Override
   public final void onPlayerError(ExoPlaybackException error) {
-    EventTime eventTime = generatePlayingMediaPeriodEventTime();
+    EventTime eventTime =
+        error.type == ExoPlaybackException.TYPE_SOURCE
+            ? generateLoadingMediaPeriodEventTime()
+            : generatePlayingMediaPeriodEventTime();
     for (AnalyticsListener listener : listeners) {
       listener.onPlayerError(eventTime, error);
     }

From 460f57614230837eab74b1f6bcd200bb3e3da15f Mon Sep 17 00:00:00 2001
From: ybai001 <ybai@dolby.com>
Date: Mon, 24 Dec 2018 09:38:52 +0800
Subject: [PATCH 409/832] Add AC-4 format support

 * Add AC-4 MIME type definition
 * Add AC-4 format support in Mp4Extractor and TsExtractor
 * Add AC-4 Extractor
 * Add AC-4 playback support in MPEG-4, MPEG-DASH, TS and HLS
---
 .../extractor/DefaultExtractorsFactory.java   |   1 +
 .../extractor/mp4/FragmentedMp4Extractor.java |  16 ++-
 .../extractor/mp4/Mp4Extractor.java           |  16 ++-
 .../exoplayer2/extractor/ts/Ac4Reader.java    |   4 +-
 library/core/src/test/assets/ts/sample.ac4    | Bin 0 -> 7594 bytes
 .../core/src/test/assets/ts/sample.ac4.0.dump | 106 ++++++++++++++++++
 .../DefaultExtractorsFactoryTest.java         |   4 +-
 .../extractor/ts/Ac4ExtractorTest.java        |  32 ++++++
 8 files changed, 167 insertions(+), 12 deletions(-)
 create mode 100644 library/core/src/test/assets/ts/sample.ac4
 create mode 100644 library/core/src/test/assets/ts/sample.ac4.0.dump
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac4ExtractorTest.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java
index 14db0b2ae1..e2f8887b5c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java
@@ -49,6 +49,7 @@ import java.lang.reflect.Constructor;
  *   <li>WAV ({@link WavExtractor})
  *   <li>AC3 ({@link Ac3Extractor})
  *   <li>AMR ({@link AmrExtractor})
+ *   <li>AC4 ({@link Ac4Extractor})
  *   <li>FLAC (only available if the FLAC extension is built and included)
  * </ul>
  */
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
index 1d45854647..b1b598d6ef 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
@@ -161,6 +161,8 @@ public class FragmentedMp4Extractor implements Extractor {
   private int sampleBytesWritten;
   private int sampleCurrentNalBytesRemaining;
   private boolean processSeiNalUnitPayload;
+  private boolean isAc4HeaderAdded;
+  private int ac4SampleHeaderSize;
 
   // Extractor output.
   private ExtractorOutput extractorOutput;
@@ -262,6 +264,8 @@ public class FragmentedMp4Extractor implements Extractor {
     durationUs = C.TIME_UNSET;
     pendingSeekTimeUs = C.TIME_UNSET;
     segmentIndexEarliestPresentationTimeUs = C.TIME_UNSET;
+    isAc4HeaderAdded = false;
+    ac4SampleHeaderSize = 0;
     enterReadingAtomHeaderState();
   }
 
@@ -1217,6 +1221,7 @@ public class FragmentedMp4Extractor implements Extractor {
       sampleSize += sampleBytesWritten;
       parserState = STATE_READING_SAMPLE_CONTINUE;
       sampleCurrentNalBytesRemaining = 0;
+      isAc4HeaderAdded = false;
     }
 
     TrackFragment fragment = currentTrackBundle.fragment;
@@ -1277,17 +1282,20 @@ public class FragmentedMp4Extractor implements Extractor {
         }
       }
     } else {
-      int sampleHeaderSize = 0;
-      if (MimeTypes.AUDIO_AC4.equals(track.format.sampleMimeType)) {
+      if (MimeTypes.AUDIO_AC4.equals(track.format.sampleMimeType) && !isAc4HeaderAdded) {
         ParsableByteArray ac4SampleHeaderData = Ac4Util.getAc4SampleHeader(sampleSize);
         output.sampleData(ac4SampleHeaderData, ac4SampleHeaderData.capacity());
-        sampleHeaderSize = ac4SampleHeaderData.capacity();
+        ac4SampleHeaderSize = ac4SampleHeaderData.capacity();
+        isAc4HeaderAdded = true;
       }
       while (sampleBytesWritten < sampleSize) {
         int writtenBytes = output.sampleData(input, sampleSize - sampleBytesWritten, false);
         sampleBytesWritten += writtenBytes;
       }
-      sampleSize += sampleHeaderSize;
+      if (MimeTypes.AUDIO_AC4.equals(track.format.sampleMimeType)) {
+        sampleSize += ac4SampleHeaderSize;
+        isAc4HeaderAdded = false;
+      }
     }
 
     @C.BufferFlags int sampleFlags = fragment.sampleIsSyncFrameTable[sampleIndex]
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
index 7c9fe2a187..49f5fac7a4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
@@ -118,6 +118,8 @@ public final class Mp4Extractor implements Extractor, SeekMap {
   private int firstVideoTrackIndex;
   private long durationUs;
   private boolean isQuickTime;
+  private boolean isAc4HeaderAdded;
+  private int ac4SampleHeaderSize;
 
   /**
    * Creates a new extractor for unfragmented MP4 streams.
@@ -139,6 +141,8 @@ public final class Mp4Extractor implements Extractor, SeekMap {
     nalStartCode = new ParsableByteArray(NalUnitUtil.NAL_START_CODE);
     nalLength = new ParsableByteArray(4);
     sampleTrackIndex = C.INDEX_UNSET;
+    isAc4HeaderAdded = false;
+    ac4SampleHeaderSize = 0;
   }
 
   @Override
@@ -489,6 +493,7 @@ public final class Mp4Extractor implements Extractor, SeekMap {
       if (sampleTrackIndex == C.INDEX_UNSET) {
         return RESULT_END_OF_INPUT;
       }
+      isAc4HeaderAdded = false;
     }
     Mp4Track track = tracks[sampleTrackIndex];
     TrackOutput trackOutput = track.trackOutput;
@@ -538,18 +543,21 @@ public final class Mp4Extractor implements Extractor, SeekMap {
         }
       }
     } else {
-      int sampleHeaderSize = 0;
-      if (MimeTypes.AUDIO_AC4.equals(track.track.format.sampleMimeType)) {
+      if (MimeTypes.AUDIO_AC4.equals(track.track.format.sampleMimeType) && !isAc4HeaderAdded) {
         ParsableByteArray ac4SampleHeaderData = Ac4Util.getAc4SampleHeader(sampleSize);
         trackOutput.sampleData(ac4SampleHeaderData, ac4SampleHeaderData.capacity());
-        sampleHeaderSize = ac4SampleHeaderData.capacity();
+        ac4SampleHeaderSize = ac4SampleHeaderData.capacity();
+        isAc4HeaderAdded = true;
       }
       while (sampleBytesWritten < sampleSize) {
         int writtenBytes = trackOutput.sampleData(input, sampleSize - sampleBytesWritten, false);
         sampleBytesWritten += writtenBytes;
         sampleCurrentNalBytesRemaining -= writtenBytes;
       }
-      sampleSize += sampleHeaderSize;
+      if (MimeTypes.AUDIO_AC4.equals(track.track.format.sampleMimeType)) {
+        sampleSize += ac4SampleHeaderSize;
+        isAc4HeaderAdded = false;
+      }
     }
     trackOutput.sampleMetadata(track.sampleTable.timestampsUs[sampleIndex],
         track.sampleTable.flags[sampleIndex], sampleSize, 0, null);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java
index f5d50cde92..2486ab5400 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java
@@ -115,9 +115,7 @@ public final class Ac4Reader implements ElementaryStreamReader {
           if (skipToNextSync(data)) {
             state = STATE_READING_HEADER;
             headerScratchBytes.data[0] = (byte)0xAC;
-            headerScratchBytes.data[1] = 0x40;
-            if (hasCRC)
-              headerScratchBytes.data[1] = 0x41;
+            headerScratchBytes.data[1] = headerScratchBytes.data[1] = (byte)(hasCRC ? 0x41 : 0x40);
             bytesRead = 2;
           }
           break;
diff --git a/library/core/src/test/assets/ts/sample.ac4 b/library/core/src/test/assets/ts/sample.ac4
new file mode 100644
index 0000000000000000000000000000000000000000..721f53cdd7f844f2459a014047a6e3d1d87c892a
GIT binary patch
literal 7594
zcmeI1cTf}S{>B#w3PL=DdPESF5_*xqp@?(@L_{DIK|%*Z??^Wy0@9=@N)u5aH0dfO
zC}0qj5{d{SpwbLgKoUy!67SWSd+ywsGvn|6^E<x(?Ci|$ySty~+2{N2cgxgiTyZ_q
z*+*$bfm@SRkgjnWBaAg>gaqW2aX++T>`W=JfMu+UUQh!Bymk-LsO7T&z$pL-18CkY
z0r{g0x{j<yw(_IcQZ#l5iS(#LnhhbbSnL=YTaGP7B9Zk&NGqfn7F!Jb?Z*VEY>#%-
zkxzTHwWGKuW%g(T(nqWz0Kk44$Ty;yq#{B<qNtl+<0lE+2>wP}l1f_*_)c5rPqcwE
zN8@Pez<(c<pS<+n@O1a#Z?sPd?9tZw;ccEj)7JePqWK>@a+vcs+J=t5y!}6*`{yYG
za=y{Fq0;{4?LX7`zuxbT|3=%Bn%n$8a@&xaBs|nA3FHGLfM$hy*<acH)9`zJztN8P
zmD@j!@-Iv<sql?<(y!e93$T9rkn<tmXy^XQ?Vm>Z7baNt_(r>en%jauR)7`%TmjO4
z|GL@B?EAD(wiqUXdV|AeY-8<evaE|FyF-H2w)LG`1EX{OMu;iQ%L6Y7)wJ9OX?Wn`
z>{PU4=F126ulclmAll1)yzU!uDEr?9|H3W(KRyJzv`2d`s)d@{p5JN9KHQ^Cmy2?;
zyIN!$a9kX9_K=!3e*#Z~0$%?2Sr@<Rth}klcPUHH&~ApGb@M>bHw5g(3brX}KE?Tl
zT~|=>1Hs+QHG6h7)e5#Q)LK?qd@y5kZ}u{C58u^HB0oKd#XfS3?4082w37~FU08_-
z4t{sFtqm&t_|VOBEGq<Qx3*RTNZa#BZ(Vj*n1b$<4{(>9s>9&4?*vUp(X^^@P5Gg1
zt%<FjD&9}e+T=dG`d#5xIHuuqT>M4K&O&fK@ez;0z;EQ3`%OtKs?MC^X*!|HJA)?)
zsf4UzMBq{h4rM6qBgACZ7Ogct>(EgN5?@lPSX3)ASFP^t{?^};tj3XYgPkQs9FFkJ
zubO^P>}A805^3WKVWjwW;C9~!akcHA0B^Q#m2L`Hv1RsfaM&MNd#Rpw^0-S3Yi(GH
z1RGH^;NG;2sZ2%;tM4O=1|qEG{ady`<zRPmqhX+Ow2p^<m*4`~P;s(y=~)9m39@02
zl(3A+!SBGdSqX2tg2Hwv`9pGe_{wu`>p|42L(<8*9t~C1q_vdva9TjRNBsE2=WgEd
z_e^|ZQV75L$oEf`1cE+-MdK&b06H*o?vELeFp-Gcq$J|tl>6(wTakT$F7OFmrcO%}
z)k94($scNuP}Pn`IXM<)q)01e93QkmOK>m)hiIbsquN<$967ESiP9QHb1<|!(#o(T
zghk0)hduGdXJ38+yCf7YYayl`zW=)aIkIqGmwcxcYi2X=;=TMc0~#jgS_J!Q)+$Wh
zTFgY>cF3FIL@}s7h^||B&G=B^DY2?d(e9RH>3n||muNGbT-&SHXmGS7-vydh=gyoa
z1~Z@?^PIMfyz4aQ;Ov|J(X?oF>9IM<BLqqqCC+=+j>-@DTe^6jEJ;+f*3X~D8kLI5
zht8;=1CUaegX)(IkWOAb-V!R6Vt%2_ug|?({QXIpS(d<<YwV*)!dAjL3b+X6KC165
z!egqXCVeHeaT>j(udR^a?W`o&MW220cIK1QU6UjYCL^N@$5K6)7-F4ZGR%)Jx_!dT
zypze}vaL+egv!Ns2~6T;f{c|VOmsHqJPKCTgH&dXV;QC^?^>Ppf32B|u5b+JB0UkE
zi3)t#`j!SMLsXDAxY#Vz1i=Y!I;%)zn^a2|E`R!6irWQV{MFa2H~zW5Li@2aKQx?n
z>w(3t`%RPLA(CZbrw{MpGTB6Uggw0NkM!_}q&%=>L-jVmiK)A#o|T1NQlqY8Z(^XT
z8*g^{V5%S)yhbmq3Q}ryYxk*w))d#iSbS@|hAt}r=nn4Lz$j{*Y6F|^Hb4aK*#P2c
z?FSisNt_}11R^D$(I2z0&^kcJXvZXz=;<)80Zb2mIM}-yN~XK8-^d?paLYuws3fl3
z_`tz}Bl!a|Lq|tTc)Ks@$BMrqC>XLl;$68@^M&7XHS+HL;R}I>WvetxqrF*}V~VXy
zO^)?e0Mh&Jo^f9><>Xv!Ic2^SPU>F>o@C>~8lpQ6TZy_FMsq=gPFxfK-9IF$<THjj
zV0CjF*YJh)!M-p(PV)Ya36&klx+FHF`cXvga508&2bAq$YQr*G!}xO*nl?XkYVxb?
z+#+ra)LptT+*LX@-Zq1<Fs>`lbTnTPi@piD7L8~vGc{A!uoe->VoS!0(%f9*IhX@a
z?0nPwQE=nMLV0_YneJ&-a!%8ze79q9s`@*qt&^C!O@Lw^Sv~o&sTX@jmEOa!r+ud7
zx9_;TI&|D2L)t#>(@l-K1BIKuhD~_u1NwcYPe`{>21NEd&Z57~XVkD6JiixKVBU1z
z-PD~=<7(1Pehg-(g9WLCKy$Di5}#L_Lkd{;X7e!6ShhCAt1AH<YEkJ&rEDZeoR<X;
zTyH%BXXBn7o$k0iv#}4f)QRxk`p{oh#>LKRduPCuAlV!}wU5r68=AXxFFD_C4vNbZ
z_wGHfxT`pI^Y*LEiars@usO1u{3J1vW>R4PBRS5F$rO7ug6`;*7~w1S2VgK>6`lFd
z(hL9{bYTa~Ym5XbYn!2)vJK&s!{9~oM&R~a+}dtr<p|DYA*6gFGIL_Paf1}S=P6(z
zcdwL`M=eqd_kr)Ol9k?b740y}$sWVMk3opTx*(|wa;=Th{dwcH{Fr-&6_H336KTpA
z4)9<wH+StV{1~|3nWoL@+6|#gvGv;B?mWUO%d=2!Mj6eGuXHidY4$OcS(KN?GOWlk
zLiMDxPJ@tf@=)`^yRXN`%H6J72uCt$z;;3YxX&Lu1<ewRq&n}C)|uif4CQ-vWc@Dq
z!gZ2FK4t4)@DUS-KNS!*#r4Fx7F^1SS&~_!&r{rq3wf5(u6=z&$ewKz%oCiQlNz`6
zRqKydH)ff8d@c+cUFlQ<@6GX;>(bJQ^5BOI>PCgv8H-+>n-KBP3$8?7n~EblcC(&!
zdDxN%7jZo`{77H_d?eP5EIr}S@;qnRYeV6Uqen*2ag~^K@h>S=7RU(Zc{MA$^t6KB
zyhy!$UzF36dffI~2T%2HYr-vuc;AP{*}lp+(>kta*_(<ub7jU!<nA0qS2OP9HE!2!
zN*=gr%C~S|<Tk)j{}#EgY%GDA0%^3sfAq~uJ+Rn%Y&jBXHn!JZM_#~U^8w(k&Yom0
zQM=UYuL%6Bw|SzFDp@wl$(H6pqOcCVjoL>3cIu2V#mU3Kjypr62_~ZXHOL9kFw?<~
z#jShmJoQoXJG=<Lm)>9>a!;a=^8tIE#Nej<#I8hOMekevZU5SJ>!OM-Cq%8kNKO3&
z3VO>$MnZHjKpnAK5+~?Ff@K|XY1C|)*R3!77$>2SkWV|NbbznFrsI0EZqrMR*4v{x
z*?DZrACTUBQXFh@J?owh?WzG%l;nYz+S<FeXX8`c^bTY5`yCZu+4YOvk?=|NK<K{^
zqZe-=IRrO+-Pn@59`p6VK~nbaCdZJLkDRIVQbMs{G*Tfyl@P<JXJlB>h})I{39B5v
z?VQ^PBfM3HU!~uOaJ*cTv5;(BJ-1fk$gKyrWbhv}Keu<}ElTaOP!#ZT3_&Op80L&~
z!JD|)k7tStlNawLBO@>8q1QtqNsn+*0I;2O4(A+Re-5`xeLp6<_h4hLK&h!K^8Nid
zF-nD9jB;3}wvN97+|sTX+o2E476(|f7sA@I?gSF=8f8vN6435rv6>B04tl}dwYN^m
zcWVy%##*Nfc{tez3K@-a69W=UJi)vVyjxOZ6|09?vL5DV%#|0|oIh(>Cy6&mT}=qp
zHGpnAe|@%uV7GFTL<yC6;n^Sh?%R6d9b`VkwV9<-bSM`iRo9+0fFLj{7a7H;a~JIH
z|7iU@Y|uL*EH+}9@(1{8vT$9gHCc$UuT)nWOPh5%-QSVl&mc9LkZ8Nb`8F#1HCAmQ
zY@7cY=TKH(oiJ>StR!1}TlLI`<ac8n^xf4Nf|cG~FmPAt?M7?MR2AQiycY!HZP)Op
zZqQZZ!4`1`#Kkx09fjriP_y3j5bpXD{qJ$wm*3@v@e`CnE%ZW@>%N%uSr#$4%bv*g
zo+m*MlH-(Gq4e+HR}2Hn+p8$>DRTgc9pJkZN5KErwvOz}JsrHR@KSYv{LrD6szVvd
zVe_9l96PI~#hPLy&izyaVjJao>2wk5%O{E7+D~tkEV^v*2(rYDmG@j}80H@HQeF?u
z&@q@*S|KW#nBe0%jT(JJDYbaZEs;9iuZf<Copvaf@ml;&`}F8rzWP=HrhuJ#OKwfH
zP02}UN?*T6PeO~|sp$>N#A>vUY+A#1s^5#nj~g8L%k7#&!|Hh+_nNN>r-Pa20(Vw%
zAQA{y1=k`tPZe1J1_JrT7|aFZ1V0GFu#mpz7uTH}ubaD_r!Oi?PraJ^q<rTRUv{dT
zXn~@4t%PWoRS7Fkx*5#?i+||;y8>}FOFkTR9e<>agCIQ4^F#Mik=1+?ah=b#-Pz+r
zmvPPPFueYPft=q-IRwXp=Rq2`SNI&8_gg6Az-qcjLs$la&X$LH!_izfHm>TlGGB6V
z&^?gYnI}<dta)fRlAI)3*_sdR@XH5}P|eTI`OW+i)Z%dV2lRiL-^o#rDaC-h!603P
z^#pN{Z|3+!G=)y}Y;R=Tv?s6ZKy}#lm1c|xn7lHfmw3{D+D!7IdJZHi|Avp-!<a87
zR+O~oOjQV6DjH|DbX}BKSHn4y7+ap8T{wzXeDdsAy~Dx)V@~4(Voj*#MPb!1x(->N
zfVah+LM7l4hlJ|$5l&eucNUr!LT<}uoQKPs!5=TDLp4o!J4(X_QyP>W9<=uK=OTmP
zfTBiU1QCF7>d3S7iMea5*|G6I{JOER_=on5)z=ka4Cs||UoG+zAsbS2vd^=qEhsBS
zYhuBTFoxCSvuZcGny%s{F%mxpme<U{&}Rf6w^?^$s>r9050fmf=Ap($U|F5XsH61N
zhJ7PwOpTIQD+<wO5+59`G8`O0Nn^~;Q^wbdo@$>@3ykN1Yd?N2_sp%;i&;u$mN1-z
a8_0ekcO;V@pg-E8wD*(rzw|VFT>b$mUG&rd

literal 0
HcmV?d00001

diff --git a/library/core/src/test/assets/ts/sample.ac4.0.dump b/library/core/src/test/assets/ts/sample.ac4.0.dump
new file mode 100644
index 0000000000..03ae07707a
--- /dev/null
+++ b/library/core/src/test/assets/ts/sample.ac4.0.dump
@@ -0,0 +1,106 @@
+seekMap:
+  isSeekable = false
+  duration = UNSET TIME
+  getPosition(0) = [[timeUs=0, position=0]]
+numberOfTracks = 1
+track 0:
+  format:
+    bitrate = -1
+    id = 0
+    containerMimeType = null
+    sampleMimeType = audio/ac4
+    maxInputSize = -1
+    width = -1
+    height = -1
+    frameRate = -1.0
+    rotationDegrees = 0
+    pixelWidthHeightRatio = 1.0
+    channelCount = 2
+    sampleRate = 48000
+    pcmEncoding = -1
+    encoderDelay = 0
+    encoderPadding = 0
+    subsampleOffsetUs = 9223372036854775807
+    selectionFlags = 0
+    language = null
+    drmInitData = -
+    initializationData:
+  total output bytes = 7594
+  sample count = 19
+  sample 0:
+    time = 0
+    flags = 1
+    data = length 366, hash B4277F9E
+  sample 1:
+    time = 40000
+    flags = 1
+    data = length 366, hash E8E0A142
+  sample 2:
+    time = 80000
+    flags = 1
+    data = length 366, hash 2E5073D0
+  sample 3:
+    time = 120000
+    flags = 1
+    data = length 366, hash 850E71D8
+  sample 4:
+    time = 160000
+    flags = 1
+    data = length 366, hash 69CD444E
+  sample 5:
+    time = 200000
+    flags = 1
+    data = length 366, hash BD24F36D
+  sample 6:
+    time = 240000
+    flags = 1
+    data = length 366, hash E24F2490
+  sample 7:
+    time = 280000
+    flags = 1
+    data = length 366, hash EE6F1F06
+  sample 8:
+    time = 320000
+    flags = 1
+    data = length 366, hash 2DAB000F
+  sample 9:
+    time = 360000
+    flags = 1
+    data = length 366, hash 8102B7EC
+  sample 10:
+    time = 400000
+    flags = 1
+    data = length 366, hash 55BF59AC
+  sample 11:
+    time = 440000
+    flags = 1
+    data = length 494, hash CBC2E09F
+  sample 12:
+    time = 480000
+    flags = 1
+    data = length 519, hash 9DAF56E9
+  sample 13:
+    time = 520000
+    flags = 1
+    data = length 598, hash 8169EE2
+  sample 14:
+    time = 560000
+    flags = 1
+    data = length 435, hash 28C21246
+  sample 15:
+    time = 600000
+    flags = 1
+    data = length 365, hash FF14716D
+  sample 16:
+    time = 640000
+    flags = 1
+    data = length 392, hash 4CC96B29
+  sample 17:
+    time = 680000
+    flags = 1
+    data = length 373, hash D7AC6D4E
+  sample 18:
+    time = 720000
+    flags = 1
+    data = length 392, hash 99F2511F
+tracksEnded = true
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactoryTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactoryTest.java
index 148e04ca77..bbe7985568 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactoryTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactoryTest.java
@@ -25,6 +25,7 @@ import com.google.android.exoplayer2.extractor.mp4.FragmentedMp4Extractor;
 import com.google.android.exoplayer2.extractor.mp4.Mp4Extractor;
 import com.google.android.exoplayer2.extractor.ogg.OggExtractor;
 import com.google.android.exoplayer2.extractor.ts.Ac3Extractor;
+import com.google.android.exoplayer2.extractor.ts.Ac4Extractor;
 import com.google.android.exoplayer2.extractor.ts.AdtsExtractor;
 import com.google.android.exoplayer2.extractor.ts.PsExtractor;
 import com.google.android.exoplayer2.extractor.ts.TsExtractor;
@@ -62,7 +63,8 @@ public final class DefaultExtractorsFactoryTest {
           OggExtractor.class,
           PsExtractor.class,
           WavExtractor.class,
-          AmrExtractor.class
+          AmrExtractor.class,
+          Ac4Extractor.class
         };
 
     assertThat(listCreatedExtractorClasses).containsNoDuplicates();
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac4ExtractorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac4ExtractorTest.java
new file mode 100644
index 0000000000..782956dee7
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac4ExtractorTest.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.extractor.ts;
+
+import com.google.android.exoplayer2.testutil.ExtractorAsserts;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Unit test for {@link Ac4Extractor}. */
+@RunWith(RobolectricTestRunner.class)
+public final class Ac4ExtractorTest {
+
+  @Test
+  public void testAc4Sample() throws Exception {
+    ExtractorAsserts.assertBehavior(Ac4Extractor::new, "ts/sample.ac4");
+  }
+}
+

From e462c6aab7dc5cab47c3daae5298626612d352be Mon Sep 17 00:00:00 2001
From: ybai001 <ybai@dolby.com>
Date: Mon, 24 Dec 2018 09:38:52 +0800
Subject: [PATCH 410/832] Add AC-4 format support

 * Add AC-4 MIME type definition
 * Add AC-4 format support in Mp4Extractor and TsExtractor
 * Add AC-4 Extractor
 * Add AC-4 playback support in MPEG-4, MPEG-DASH, TS and HLS
---
 .../extractor/DefaultExtractorsFactory.java   |   1 +
 .../extractor/mp4/FragmentedMp4Extractor.java |  16 ++-
 .../extractor/mp4/Mp4Extractor.java           |  16 ++-
 .../exoplayer2/extractor/ts/Ac4Reader.java    |   4 +-
 library/core/src/test/assets/ts/sample.ac4    | Bin 0 -> 7594 bytes
 .../core/src/test/assets/ts/sample.ac4.0.dump | 106 ++++++++++++++++++
 .../DefaultExtractorsFactoryTest.java         |   4 +-
 .../extractor/ts/Ac4ExtractorTest.java        |  32 ++++++
 8 files changed, 167 insertions(+), 12 deletions(-)
 create mode 100644 library/core/src/test/assets/ts/sample.ac4
 create mode 100644 library/core/src/test/assets/ts/sample.ac4.0.dump
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac4ExtractorTest.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java
index 14db0b2ae1..e2f8887b5c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java
@@ -49,6 +49,7 @@ import java.lang.reflect.Constructor;
  *   <li>WAV ({@link WavExtractor})
  *   <li>AC3 ({@link Ac3Extractor})
  *   <li>AMR ({@link AmrExtractor})
+ *   <li>AC4 ({@link Ac4Extractor})
  *   <li>FLAC (only available if the FLAC extension is built and included)
  * </ul>
  */
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
index 1d45854647..b1b598d6ef 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
@@ -161,6 +161,8 @@ public class FragmentedMp4Extractor implements Extractor {
   private int sampleBytesWritten;
   private int sampleCurrentNalBytesRemaining;
   private boolean processSeiNalUnitPayload;
+  private boolean isAc4HeaderAdded;
+  private int ac4SampleHeaderSize;
 
   // Extractor output.
   private ExtractorOutput extractorOutput;
@@ -262,6 +264,8 @@ public class FragmentedMp4Extractor implements Extractor {
     durationUs = C.TIME_UNSET;
     pendingSeekTimeUs = C.TIME_UNSET;
     segmentIndexEarliestPresentationTimeUs = C.TIME_UNSET;
+    isAc4HeaderAdded = false;
+    ac4SampleHeaderSize = 0;
     enterReadingAtomHeaderState();
   }
 
@@ -1217,6 +1221,7 @@ public class FragmentedMp4Extractor implements Extractor {
       sampleSize += sampleBytesWritten;
       parserState = STATE_READING_SAMPLE_CONTINUE;
       sampleCurrentNalBytesRemaining = 0;
+      isAc4HeaderAdded = false;
     }
 
     TrackFragment fragment = currentTrackBundle.fragment;
@@ -1277,17 +1282,20 @@ public class FragmentedMp4Extractor implements Extractor {
         }
       }
     } else {
-      int sampleHeaderSize = 0;
-      if (MimeTypes.AUDIO_AC4.equals(track.format.sampleMimeType)) {
+      if (MimeTypes.AUDIO_AC4.equals(track.format.sampleMimeType) && !isAc4HeaderAdded) {
         ParsableByteArray ac4SampleHeaderData = Ac4Util.getAc4SampleHeader(sampleSize);
         output.sampleData(ac4SampleHeaderData, ac4SampleHeaderData.capacity());
-        sampleHeaderSize = ac4SampleHeaderData.capacity();
+        ac4SampleHeaderSize = ac4SampleHeaderData.capacity();
+        isAc4HeaderAdded = true;
       }
       while (sampleBytesWritten < sampleSize) {
         int writtenBytes = output.sampleData(input, sampleSize - sampleBytesWritten, false);
         sampleBytesWritten += writtenBytes;
       }
-      sampleSize += sampleHeaderSize;
+      if (MimeTypes.AUDIO_AC4.equals(track.format.sampleMimeType)) {
+        sampleSize += ac4SampleHeaderSize;
+        isAc4HeaderAdded = false;
+      }
     }
 
     @C.BufferFlags int sampleFlags = fragment.sampleIsSyncFrameTable[sampleIndex]
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
index 7c9fe2a187..49f5fac7a4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
@@ -118,6 +118,8 @@ public final class Mp4Extractor implements Extractor, SeekMap {
   private int firstVideoTrackIndex;
   private long durationUs;
   private boolean isQuickTime;
+  private boolean isAc4HeaderAdded;
+  private int ac4SampleHeaderSize;
 
   /**
    * Creates a new extractor for unfragmented MP4 streams.
@@ -139,6 +141,8 @@ public final class Mp4Extractor implements Extractor, SeekMap {
     nalStartCode = new ParsableByteArray(NalUnitUtil.NAL_START_CODE);
     nalLength = new ParsableByteArray(4);
     sampleTrackIndex = C.INDEX_UNSET;
+    isAc4HeaderAdded = false;
+    ac4SampleHeaderSize = 0;
   }
 
   @Override
@@ -489,6 +493,7 @@ public final class Mp4Extractor implements Extractor, SeekMap {
       if (sampleTrackIndex == C.INDEX_UNSET) {
         return RESULT_END_OF_INPUT;
       }
+      isAc4HeaderAdded = false;
     }
     Mp4Track track = tracks[sampleTrackIndex];
     TrackOutput trackOutput = track.trackOutput;
@@ -538,18 +543,21 @@ public final class Mp4Extractor implements Extractor, SeekMap {
         }
       }
     } else {
-      int sampleHeaderSize = 0;
-      if (MimeTypes.AUDIO_AC4.equals(track.track.format.sampleMimeType)) {
+      if (MimeTypes.AUDIO_AC4.equals(track.track.format.sampleMimeType) && !isAc4HeaderAdded) {
         ParsableByteArray ac4SampleHeaderData = Ac4Util.getAc4SampleHeader(sampleSize);
         trackOutput.sampleData(ac4SampleHeaderData, ac4SampleHeaderData.capacity());
-        sampleHeaderSize = ac4SampleHeaderData.capacity();
+        ac4SampleHeaderSize = ac4SampleHeaderData.capacity();
+        isAc4HeaderAdded = true;
       }
       while (sampleBytesWritten < sampleSize) {
         int writtenBytes = trackOutput.sampleData(input, sampleSize - sampleBytesWritten, false);
         sampleBytesWritten += writtenBytes;
         sampleCurrentNalBytesRemaining -= writtenBytes;
       }
-      sampleSize += sampleHeaderSize;
+      if (MimeTypes.AUDIO_AC4.equals(track.track.format.sampleMimeType)) {
+        sampleSize += ac4SampleHeaderSize;
+        isAc4HeaderAdded = false;
+      }
     }
     trackOutput.sampleMetadata(track.sampleTable.timestampsUs[sampleIndex],
         track.sampleTable.flags[sampleIndex], sampleSize, 0, null);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java
index f5d50cde92..a1e5e51e9d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java
@@ -115,9 +115,7 @@ public final class Ac4Reader implements ElementaryStreamReader {
           if (skipToNextSync(data)) {
             state = STATE_READING_HEADER;
             headerScratchBytes.data[0] = (byte)0xAC;
-            headerScratchBytes.data[1] = 0x40;
-            if (hasCRC)
-              headerScratchBytes.data[1] = 0x41;
+            headerScratchBytes.data[1] = (byte)(hasCRC ? 0x41 : 0x40);
             bytesRead = 2;
           }
           break;
diff --git a/library/core/src/test/assets/ts/sample.ac4 b/library/core/src/test/assets/ts/sample.ac4
new file mode 100644
index 0000000000000000000000000000000000000000..721f53cdd7f844f2459a014047a6e3d1d87c892a
GIT binary patch
literal 7594
zcmeI1cTf}S{>B#w3PL=DdPESF5_*xqp@?(@L_{DIK|%*Z??^Wy0@9=@N)u5aH0dfO
zC}0qj5{d{SpwbLgKoUy!67SWSd+ywsGvn|6^E<x(?Ci|$ySty~+2{N2cgxgiTyZ_q
z*+*$bfm@SRkgjnWBaAg>gaqW2aX++T>`W=JfMu+UUQh!Bymk-LsO7T&z$pL-18CkY
z0r{g0x{j<yw(_IcQZ#l5iS(#LnhhbbSnL=YTaGP7B9Zk&NGqfn7F!Jb?Z*VEY>#%-
zkxzTHwWGKuW%g(T(nqWz0Kk44$Ty;yq#{B<qNtl+<0lE+2>wP}l1f_*_)c5rPqcwE
zN8@Pez<(c<pS<+n@O1a#Z?sPd?9tZw;ccEj)7JePqWK>@a+vcs+J=t5y!}6*`{yYG
za=y{Fq0;{4?LX7`zuxbT|3=%Bn%n$8a@&xaBs|nA3FHGLfM$hy*<acH)9`zJztN8P
zmD@j!@-Iv<sql?<(y!e93$T9rkn<tmXy^XQ?Vm>Z7baNt_(r>en%jauR)7`%TmjO4
z|GL@B?EAD(wiqUXdV|AeY-8<evaE|FyF-H2w)LG`1EX{OMu;iQ%L6Y7)wJ9OX?Wn`
z>{PU4=F126ulclmAll1)yzU!uDEr?9|H3W(KRyJzv`2d`s)d@{p5JN9KHQ^Cmy2?;
zyIN!$a9kX9_K=!3e*#Z~0$%?2Sr@<Rth}klcPUHH&~ApGb@M>bHw5g(3brX}KE?Tl
zT~|=>1Hs+QHG6h7)e5#Q)LK?qd@y5kZ}u{C58u^HB0oKd#XfS3?4082w37~FU08_-
z4t{sFtqm&t_|VOBEGq<Qx3*RTNZa#BZ(Vj*n1b$<4{(>9s>9&4?*vUp(X^^@P5Gg1
zt%<FjD&9}e+T=dG`d#5xIHuuqT>M4K&O&fK@ez;0z;EQ3`%OtKs?MC^X*!|HJA)?)
zsf4UzMBq{h4rM6qBgACZ7Ogct>(EgN5?@lPSX3)ASFP^t{?^};tj3XYgPkQs9FFkJ
zubO^P>}A805^3WKVWjwW;C9~!akcHA0B^Q#m2L`Hv1RsfaM&MNd#Rpw^0-S3Yi(GH
z1RGH^;NG;2sZ2%;tM4O=1|qEG{ady`<zRPmqhX+Ow2p^<m*4`~P;s(y=~)9m39@02
zl(3A+!SBGdSqX2tg2Hwv`9pGe_{wu`>p|42L(<8*9t~C1q_vdva9TjRNBsE2=WgEd
z_e^|ZQV75L$oEf`1cE+-MdK&b06H*o?vELeFp-Gcq$J|tl>6(wTakT$F7OFmrcO%}
z)k94($scNuP}Pn`IXM<)q)01e93QkmOK>m)hiIbsquN<$967ESiP9QHb1<|!(#o(T
zghk0)hduGdXJ38+yCf7YYayl`zW=)aIkIqGmwcxcYi2X=;=TMc0~#jgS_J!Q)+$Wh
zTFgY>cF3FIL@}s7h^||B&G=B^DY2?d(e9RH>3n||muNGbT-&SHXmGS7-vydh=gyoa
z1~Z@?^PIMfyz4aQ;Ov|J(X?oF>9IM<BLqqqCC+=+j>-@DTe^6jEJ;+f*3X~D8kLI5
zht8;=1CUaegX)(IkWOAb-V!R6Vt%2_ug|?({QXIpS(d<<YwV*)!dAjL3b+X6KC165
z!egqXCVeHeaT>j(udR^a?W`o&MW220cIK1QU6UjYCL^N@$5K6)7-F4ZGR%)Jx_!dT
zypze}vaL+egv!Ns2~6T;f{c|VOmsHqJPKCTgH&dXV;QC^?^>Ppf32B|u5b+JB0UkE
zi3)t#`j!SMLsXDAxY#Vz1i=Y!I;%)zn^a2|E`R!6irWQV{MFa2H~zW5Li@2aKQx?n
z>w(3t`%RPLA(CZbrw{MpGTB6Uggw0NkM!_}q&%=>L-jVmiK)A#o|T1NQlqY8Z(^XT
z8*g^{V5%S)yhbmq3Q}ryYxk*w))d#iSbS@|hAt}r=nn4Lz$j{*Y6F|^Hb4aK*#P2c
z?FSisNt_}11R^D$(I2z0&^kcJXvZXz=;<)80Zb2mIM}-yN~XK8-^d?paLYuws3fl3
z_`tz}Bl!a|Lq|tTc)Ks@$BMrqC>XLl;$68@^M&7XHS+HL;R}I>WvetxqrF*}V~VXy
zO^)?e0Mh&Jo^f9><>Xv!Ic2^SPU>F>o@C>~8lpQ6TZy_FMsq=gPFxfK-9IF$<THjj
zV0CjF*YJh)!M-p(PV)Ya36&klx+FHF`cXvga508&2bAq$YQr*G!}xO*nl?XkYVxb?
z+#+ra)LptT+*LX@-Zq1<Fs>`lbTnTPi@piD7L8~vGc{A!uoe->VoS!0(%f9*IhX@a
z?0nPwQE=nMLV0_YneJ&-a!%8ze79q9s`@*qt&^C!O@Lw^Sv~o&sTX@jmEOa!r+ud7
zx9_;TI&|D2L)t#>(@l-K1BIKuhD~_u1NwcYPe`{>21NEd&Z57~XVkD6JiixKVBU1z
z-PD~=<7(1Pehg-(g9WLCKy$Di5}#L_Lkd{;X7e!6ShhCAt1AH<YEkJ&rEDZeoR<X;
zTyH%BXXBn7o$k0iv#}4f)QRxk`p{oh#>LKRduPCuAlV!}wU5r68=AXxFFD_C4vNbZ
z_wGHfxT`pI^Y*LEiars@usO1u{3J1vW>R4PBRS5F$rO7ug6`;*7~w1S2VgK>6`lFd
z(hL9{bYTa~Ym5XbYn!2)vJK&s!{9~oM&R~a+}dtr<p|DYA*6gFGIL_Paf1}S=P6(z
zcdwL`M=eqd_kr)Ol9k?b740y}$sWVMk3opTx*(|wa;=Th{dwcH{Fr-&6_H336KTpA
z4)9<wH+StV{1~|3nWoL@+6|#gvGv;B?mWUO%d=2!Mj6eGuXHidY4$OcS(KN?GOWlk
zLiMDxPJ@tf@=)`^yRXN`%H6J72uCt$z;;3YxX&Lu1<ewRq&n}C)|uif4CQ-vWc@Dq
z!gZ2FK4t4)@DUS-KNS!*#r4Fx7F^1SS&~_!&r{rq3wf5(u6=z&$ewKz%oCiQlNz`6
zRqKydH)ff8d@c+cUFlQ<@6GX;>(bJQ^5BOI>PCgv8H-+>n-KBP3$8?7n~EblcC(&!
zdDxN%7jZo`{77H_d?eP5EIr}S@;qnRYeV6Uqen*2ag~^K@h>S=7RU(Zc{MA$^t6KB
zyhy!$UzF36dffI~2T%2HYr-vuc;AP{*}lp+(>kta*_(<ub7jU!<nA0qS2OP9HE!2!
zN*=gr%C~S|<Tk)j{}#EgY%GDA0%^3sfAq~uJ+Rn%Y&jBXHn!JZM_#~U^8w(k&Yom0
zQM=UYuL%6Bw|SzFDp@wl$(H6pqOcCVjoL>3cIu2V#mU3Kjypr62_~ZXHOL9kFw?<~
z#jShmJoQoXJG=<Lm)>9>a!;a=^8tIE#Nej<#I8hOMekevZU5SJ>!OM-Cq%8kNKO3&
z3VO>$MnZHjKpnAK5+~?Ff@K|XY1C|)*R3!77$>2SkWV|NbbznFrsI0EZqrMR*4v{x
z*?DZrACTUBQXFh@J?owh?WzG%l;nYz+S<FeXX8`c^bTY5`yCZu+4YOvk?=|NK<K{^
zqZe-=IRrO+-Pn@59`p6VK~nbaCdZJLkDRIVQbMs{G*Tfyl@P<JXJlB>h})I{39B5v
z?VQ^PBfM3HU!~uOaJ*cTv5;(BJ-1fk$gKyrWbhv}Keu<}ElTaOP!#ZT3_&Op80L&~
z!JD|)k7tStlNawLBO@>8q1QtqNsn+*0I;2O4(A+Re-5`xeLp6<_h4hLK&h!K^8Nid
zF-nD9jB;3}wvN97+|sTX+o2E476(|f7sA@I?gSF=8f8vN6435rv6>B04tl}dwYN^m
zcWVy%##*Nfc{tez3K@-a69W=UJi)vVyjxOZ6|09?vL5DV%#|0|oIh(>Cy6&mT}=qp
zHGpnAe|@%uV7GFTL<yC6;n^Sh?%R6d9b`VkwV9<-bSM`iRo9+0fFLj{7a7H;a~JIH
z|7iU@Y|uL*EH+}9@(1{8vT$9gHCc$UuT)nWOPh5%-QSVl&mc9LkZ8Nb`8F#1HCAmQ
zY@7cY=TKH(oiJ>StR!1}TlLI`<ac8n^xf4Nf|cG~FmPAt?M7?MR2AQiycY!HZP)Op
zZqQZZ!4`1`#Kkx09fjriP_y3j5bpXD{qJ$wm*3@v@e`CnE%ZW@>%N%uSr#$4%bv*g
zo+m*MlH-(Gq4e+HR}2Hn+p8$>DRTgc9pJkZN5KErwvOz}JsrHR@KSYv{LrD6szVvd
zVe_9l96PI~#hPLy&izyaVjJao>2wk5%O{E7+D~tkEV^v*2(rYDmG@j}80H@HQeF?u
z&@q@*S|KW#nBe0%jT(JJDYbaZEs;9iuZf<Copvaf@ml;&`}F8rzWP=HrhuJ#OKwfH
zP02}UN?*T6PeO~|sp$>N#A>vUY+A#1s^5#nj~g8L%k7#&!|Hh+_nNN>r-Pa20(Vw%
zAQA{y1=k`tPZe1J1_JrT7|aFZ1V0GFu#mpz7uTH}ubaD_r!Oi?PraJ^q<rTRUv{dT
zXn~@4t%PWoRS7Fkx*5#?i+||;y8>}FOFkTR9e<>agCIQ4^F#Mik=1+?ah=b#-Pz+r
zmvPPPFueYPft=q-IRwXp=Rq2`SNI&8_gg6Az-qcjLs$la&X$LH!_izfHm>TlGGB6V
z&^?gYnI}<dta)fRlAI)3*_sdR@XH5}P|eTI`OW+i)Z%dV2lRiL-^o#rDaC-h!603P
z^#pN{Z|3+!G=)y}Y;R=Tv?s6ZKy}#lm1c|xn7lHfmw3{D+D!7IdJZHi|Avp-!<a87
zR+O~oOjQV6DjH|DbX}BKSHn4y7+ap8T{wzXeDdsAy~Dx)V@~4(Voj*#MPb!1x(->N
zfVah+LM7l4hlJ|$5l&eucNUr!LT<}uoQKPs!5=TDLp4o!J4(X_QyP>W9<=uK=OTmP
zfTBiU1QCF7>d3S7iMea5*|G6I{JOER_=on5)z=ka4Cs||UoG+zAsbS2vd^=qEhsBS
zYhuBTFoxCSvuZcGny%s{F%mxpme<U{&}Rf6w^?^$s>r9050fmf=Ap($U|F5XsH61N
zhJ7PwOpTIQD+<wO5+59`G8`O0Nn^~;Q^wbdo@$>@3ykN1Yd?N2_sp%;i&;u$mN1-z
a8_0ekcO;V@pg-E8wD*(rzw|VFT>b$mUG&rd

literal 0
HcmV?d00001

diff --git a/library/core/src/test/assets/ts/sample.ac4.0.dump b/library/core/src/test/assets/ts/sample.ac4.0.dump
new file mode 100644
index 0000000000..03ae07707a
--- /dev/null
+++ b/library/core/src/test/assets/ts/sample.ac4.0.dump
@@ -0,0 +1,106 @@
+seekMap:
+  isSeekable = false
+  duration = UNSET TIME
+  getPosition(0) = [[timeUs=0, position=0]]
+numberOfTracks = 1
+track 0:
+  format:
+    bitrate = -1
+    id = 0
+    containerMimeType = null
+    sampleMimeType = audio/ac4
+    maxInputSize = -1
+    width = -1
+    height = -1
+    frameRate = -1.0
+    rotationDegrees = 0
+    pixelWidthHeightRatio = 1.0
+    channelCount = 2
+    sampleRate = 48000
+    pcmEncoding = -1
+    encoderDelay = 0
+    encoderPadding = 0
+    subsampleOffsetUs = 9223372036854775807
+    selectionFlags = 0
+    language = null
+    drmInitData = -
+    initializationData:
+  total output bytes = 7594
+  sample count = 19
+  sample 0:
+    time = 0
+    flags = 1
+    data = length 366, hash B4277F9E
+  sample 1:
+    time = 40000
+    flags = 1
+    data = length 366, hash E8E0A142
+  sample 2:
+    time = 80000
+    flags = 1
+    data = length 366, hash 2E5073D0
+  sample 3:
+    time = 120000
+    flags = 1
+    data = length 366, hash 850E71D8
+  sample 4:
+    time = 160000
+    flags = 1
+    data = length 366, hash 69CD444E
+  sample 5:
+    time = 200000
+    flags = 1
+    data = length 366, hash BD24F36D
+  sample 6:
+    time = 240000
+    flags = 1
+    data = length 366, hash E24F2490
+  sample 7:
+    time = 280000
+    flags = 1
+    data = length 366, hash EE6F1F06
+  sample 8:
+    time = 320000
+    flags = 1
+    data = length 366, hash 2DAB000F
+  sample 9:
+    time = 360000
+    flags = 1
+    data = length 366, hash 8102B7EC
+  sample 10:
+    time = 400000
+    flags = 1
+    data = length 366, hash 55BF59AC
+  sample 11:
+    time = 440000
+    flags = 1
+    data = length 494, hash CBC2E09F
+  sample 12:
+    time = 480000
+    flags = 1
+    data = length 519, hash 9DAF56E9
+  sample 13:
+    time = 520000
+    flags = 1
+    data = length 598, hash 8169EE2
+  sample 14:
+    time = 560000
+    flags = 1
+    data = length 435, hash 28C21246
+  sample 15:
+    time = 600000
+    flags = 1
+    data = length 365, hash FF14716D
+  sample 16:
+    time = 640000
+    flags = 1
+    data = length 392, hash 4CC96B29
+  sample 17:
+    time = 680000
+    flags = 1
+    data = length 373, hash D7AC6D4E
+  sample 18:
+    time = 720000
+    flags = 1
+    data = length 392, hash 99F2511F
+tracksEnded = true
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactoryTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactoryTest.java
index 148e04ca77..bbe7985568 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactoryTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactoryTest.java
@@ -25,6 +25,7 @@ import com.google.android.exoplayer2.extractor.mp4.FragmentedMp4Extractor;
 import com.google.android.exoplayer2.extractor.mp4.Mp4Extractor;
 import com.google.android.exoplayer2.extractor.ogg.OggExtractor;
 import com.google.android.exoplayer2.extractor.ts.Ac3Extractor;
+import com.google.android.exoplayer2.extractor.ts.Ac4Extractor;
 import com.google.android.exoplayer2.extractor.ts.AdtsExtractor;
 import com.google.android.exoplayer2.extractor.ts.PsExtractor;
 import com.google.android.exoplayer2.extractor.ts.TsExtractor;
@@ -62,7 +63,8 @@ public final class DefaultExtractorsFactoryTest {
           OggExtractor.class,
           PsExtractor.class,
           WavExtractor.class,
-          AmrExtractor.class
+          AmrExtractor.class,
+          Ac4Extractor.class
         };
 
     assertThat(listCreatedExtractorClasses).containsNoDuplicates();
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac4ExtractorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac4ExtractorTest.java
new file mode 100644
index 0000000000..782956dee7
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac4ExtractorTest.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.extractor.ts;
+
+import com.google.android.exoplayer2.testutil.ExtractorAsserts;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Unit test for {@link Ac4Extractor}. */
+@RunWith(RobolectricTestRunner.class)
+public final class Ac4ExtractorTest {
+
+  @Test
+  public void testAc4Sample() throws Exception {
+    ExtractorAsserts.assertBehavior(Ac4Extractor::new, "ts/sample.ac4");
+  }
+}
+

From 51632f027d09a1c1d456c184cf3b2ea79fc1330f Mon Sep 17 00:00:00 2001
From: BAI Yanning <30304609+ybai001@users.noreply.github.com>
Date: Fri, 25 Jan 2019 16:49:43 +0800
Subject: [PATCH 411/832] Update Ac4Reader.java

---
 .../com/google/android/exoplayer2/extractor/ts/Ac4Reader.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java
index 2486ab5400..a1e5e51e9d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java
@@ -115,7 +115,7 @@ public final class Ac4Reader implements ElementaryStreamReader {
           if (skipToNextSync(data)) {
             state = STATE_READING_HEADER;
             headerScratchBytes.data[0] = (byte)0xAC;
-            headerScratchBytes.data[1] = headerScratchBytes.data[1] = (byte)(hasCRC ? 0x41 : 0x40);
+            headerScratchBytes.data[1] = (byte)(hasCRC ? 0x41 : 0x40);
             bytesRead = 2;
           }
           break;

From 9fec49f326d62c7ea8137635101a4f6dceed9d82 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 21 Jan 2019 14:38:00 +0000
Subject: [PATCH 412/832] Update 2.9.4 release notes

PiperOrigin-RevId: 230220448
---
 RELEASENOTES.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 053198de57..5894e991d0 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -41,11 +41,6 @@
 * Remove `player` and `isTopLevelSource` parameters from `MediaSource.prepare`.
 * Change signature of `PlayerNotificationManager.NotificationListener` to better
   fit service requirements. Remove ability to set a custom stop action.
-* Add workaround for video quality problems with Amlogic decoders
-  ([#5003](https://github.com/google/ExoPlayer/issues/5003)).
-* Associate fatal player errors of type SOURCE with the loading source in
-  `AnalyticsListener.EventTime`
-  ([#5407](https://github.com/google/ExoPlayer/issues/5407)).
 
 ### 2.9.4 ###
 
@@ -56,6 +51,17 @@
 * FFmpeg extension: Treat invalid data errors as non-fatal to match the behavior
   of MediaCodec ([#5293](https://github.com/google/ExoPlayer/issues/5293)).
 * GVR extension: upgrade GVR SDK dependency to 1.190.0.
+* Associate fatal player errors of type SOURCE with the loading source in
+  `AnalyticsListener.EventTime`
+  ([#5407](https://github.com/google/ExoPlayer/issues/5407)).
+* Add `startPositionUs` to `MediaSource.createPeriod`. This fixes an issue where
+  using lazy preparation in `ConcatenatingMediaSource` with an
+  `ExtractorMediaSource` overrides initial seek positions
+  ([#5350](https://github.com/google/ExoPlayer/issues/5350)).
+* Add subtext to the `MediaDescriptionAdapter` of the
+  `PlayerNotificationManager`.
+* Add workaround for video quality problems with Amlogic decoders
+  ([#5003](https://github.com/google/ExoPlayer/issues/5003)).
 * Fix issue where sending callbacks for playlist changes may cause problems
   because of parallel player access
   ([#5240](https://github.com/google/ExoPlayer/issues/5240)).
@@ -64,12 +70,6 @@
   ([#5351](https://github.com/google/ExoPlayer/issues/5351)).
 * Fix issue where uneven track durations in MP4 streams can cause OOM problems
   ([#3670](https://github.com/google/ExoPlayer/issues/3670)).
-* Add `startPositionUs` to `MediaSource.createPeriod`. This fixes an issue where
-  using lazy preparation in `ConcatenatingMediaSource` with an
-  `ExtractorMediaSource` overrides initial seek positions
-  ([#5350](https://github.com/google/ExoPlayer/issues/5350)).
-* Add subtext to the `MediaDescriptionAdapter` of the
-  `PlayerNotificationManager`.
 
 ### 2.9.3 ###
 

From 29711b922d2b14cf89819af06a0a4dc2561bec7d Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 21 Jan 2019 21:06:03 +0000
Subject: [PATCH 413/832] Cancel notification on dismiss

This doesn't happen automatically after all on older devices

PiperOrigin-RevId: 230251258
---
 .../android/exoplayer2/ui/PlayerNotificationManager.java      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
index c01aabc9f2..97e36a17b3 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
@@ -928,10 +928,8 @@ public class PlayerNotificationManager {
 
   private void stopNotification(boolean dismissedByUser) {
     if (isNotificationStarted) {
-      if (!dismissedByUser) {
-        notificationManager.cancel(notificationId);
-      }
       isNotificationStarted = false;
+      notificationManager.cancel(notificationId);
       context.unregisterReceiver(notificationBroadcastReceiver);
       if (notificationListener != null) {
         notificationListener.onNotificationCancelled(notificationId, dismissedByUser);

From de3a749b970b22258b2ab50c707fa6dbdb09dc1a Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 21 Jan 2019 23:52:18 +0000
Subject: [PATCH 414/832] Fix scheduler NPE in DownloadService

PiperOrigin-RevId: 230260266
---
 .../com/google/android/exoplayer2/demo/DemoDownloadService.java | 2 +-
 .../com/google/android/exoplayer2/offline/DownloadService.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
index 70cbe43dd8..dcccd884ec 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
@@ -65,7 +65,7 @@ public class DemoDownloadService extends DownloadService {
 
   @Override
   protected void onDownloadStateChanged(DownloadState downloadState) {
-    Notification notification = null;
+    Notification notification;
     if (downloadState.state == DownloadState.STATE_COMPLETED) {
       notification =
           DownloadNotificationUtil.buildDownloadCompletedNotification(
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index d424ed5ef0..305620d5f3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -462,7 +462,7 @@ public abstract class DownloadService extends Service {
     public void detachService(DownloadService downloadService, boolean unschedule) {
       Assertions.checkState(this.downloadService == downloadService);
       this.downloadService = null;
-      if (unschedule) {
+      if (scheduler != null && unschedule) {
         scheduler.cancel();
       }
     }

From 4182f37b6e28869debe19c004cddc6681c3c18dd Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 22 Jan 2019 17:43:55 +0000
Subject: [PATCH 415/832] Make notification dismissible iff player is active

Seems like more useful default behaviour

PiperOrigin-RevId: 230356813
---
 .../ui/PlayerNotificationManager.java         | 49 +++++++------------
 1 file changed, 19 insertions(+), 30 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
index 97e36a17b3..597f0dbd40 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
@@ -235,15 +235,15 @@ public class PlayerNotificationManager {
     /**
      * Called each time after the notification has been posted.
      *
-     * <p>The {@code isPlayerActive} flag indicates whether a service in which the player may run
-     * needs to be in the foreground.
+     * <p>For a service, the {@code ongoing} flag can be used as an indicator as to whether it
+     * should be in the foreground.
      *
      * @param notificationId The id of the notification which has been posted.
      * @param notification The {@link Notification}.
-     * @param isPlayerActive {@code true} if the player is active.
+     * @param ongoing Whether the notification is ongoing.
      */
     default void onNotificationPosted(
-        int notificationId, Notification notification, boolean isPlayerActive) {}
+        int notificationId, Notification notification, boolean ongoing) {}
   }
 
   /** Receives a {@link Bitmap}. */
@@ -371,7 +371,6 @@ public class PlayerNotificationManager {
   private @DrawableRes int smallIconResourceId;
   private int visibility;
   private @Priority int priority;
-  private boolean ongoing;
   private boolean useChronometer;
   private boolean wasPlayWhenReady;
   private int lastPlaybackState;
@@ -547,7 +546,6 @@ public class PlayerNotificationManager {
     intentFilter = new IntentFilter();
     useNavigationActions = true;
     usePlayPauseActions = true;
-    ongoing = true;
     colorized = true;
     useChronometer = true;
     color = Color.TRANSPARENT;
@@ -789,22 +787,6 @@ public class PlayerNotificationManager {
     }
   }
 
-  /**
-   * Sets whether the notification should be ongoing. If {@code false} the user can dismiss the
-   * notification by swiping. If in addition the stop action is enabled dismissing the notification
-   * triggers the stop action.
-   *
-   * <p>See {@link NotificationCompat.Builder#setOngoing(boolean)}.
-   *
-   * @param ongoing Whether {@code true} the notification is ongoing and not dismissible.
-   */
-  public final void setOngoing(boolean ongoing) {
-    if (this.ongoing != ongoing) {
-      this.ongoing = ongoing;
-      invalidate();
-    }
-  }
-
   /**
    * Sets the priority of the notification required for API 25 and lower.
    *
@@ -904,7 +886,8 @@ public class PlayerNotificationManager {
   @Nullable
   private Notification startOrUpdateNotification(@Nullable Bitmap bitmap) {
     Player player = this.player;
-    Notification notification = createNotification(player, bitmap);
+    boolean ongoing = getOngoing(player);
+    Notification notification = createNotification(player, ongoing, bitmap);
     if (notification == null) {
       stopNotification(/* dismissedByUser= */ false);
       return null;
@@ -919,9 +902,7 @@ public class PlayerNotificationManager {
     }
     NotificationListener listener = notificationListener;
     if (listener != null) {
-      boolean isPlayerActive =
-          player.getPlayWhenReady() && player.getPlaybackState() != Player.STATE_IDLE;
-      listener.onNotificationPosted(notificationId, notification, isPlayerActive);
+      listener.onNotificationPosted(notificationId, notification, ongoing);
     }
     return notification;
   }
@@ -942,12 +923,14 @@ public class PlayerNotificationManager {
    * Creates the notification given the current player state.
    *
    * @param player The player for which state to build a notification.
+   * @param ongoing Whether the notification should be ongoing.
    * @param largeIcon The large icon to be used.
    * @return The {@link Notification} which has been built, or {@code null} if no notification
    *     should be displayed.
    */
   @Nullable
-  protected Notification createNotification(Player player, @Nullable Bitmap largeIcon) {
+  protected Notification createNotification(
+      Player player, boolean ongoing, @Nullable Bitmap largeIcon) {
     if (player.getPlaybackState() == Player.STATE_IDLE) {
       return null;
     }
@@ -970,12 +953,11 @@ public class PlayerNotificationManager {
     }
     mediaStyle.setShowActionsInCompactView(getActionIndicesForCompactView(actionNames, player));
     // Configure dismiss action prior to API 21 ('x' button).
-    mediaStyle.setShowCancelButton(true);
+    mediaStyle.setShowCancelButton(!ongoing);
     mediaStyle.setCancelButtonIntent(dismissPendingIntent);
     // Set intent which is sent if the user selects 'clear all'
     builder.setDeleteIntent(dismissPendingIntent);
     builder.setStyle(mediaStyle);
-
     // Set notification properties from getters.
     builder
         .setBadgeIconType(badgeIconType)
@@ -1086,7 +1068,7 @@ public class PlayerNotificationManager {
    * first parameter.
    *
    * @param actionNames The names of the actions included in the notification.
-   * @param player The player for which state to build a notification.
+   * @param player The player for which a notification is being built.
    */
   @SuppressWarnings("unused")
   protected int[] getActionIndicesForCompactView(List<String> actionNames, Player player) {
@@ -1097,6 +1079,13 @@ public class PlayerNotificationManager {
         : (playActionIndex != -1 ? new int[] {playActionIndex} : new int[0]);
   }
 
+  /** Returns whether the generated notification should be ongoing. */
+  protected boolean getOngoing(Player player) {
+    int playbackState = player.getPlaybackState();
+    return (playbackState == Player.STATE_BUFFERING || playbackState == Player.STATE_READY)
+        && player.getPlayWhenReady();
+  }
+
   private static Map<String, NotificationCompat.Action> createPlaybackActions(
       Context context, int instanceId) {
     Map<String, NotificationCompat.Action> actions = new HashMap<>();

From 52f25f6ea800e98063b5cabdcdc6d9467ccf065b Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 23 Jan 2019 10:40:56 +0000
Subject: [PATCH 416/832] Add HLS stream and remove non-working content from
 Cast demo app

PiperOrigin-RevId: 230496581
---
 .../android/exoplayer2/castdemo/DemoUtil.java       | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
index e45ceb7c83..735084495f 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
@@ -88,23 +88,12 @@ import java.util.UUID;
     // App samples.
     ArrayList<Sample> samples = new ArrayList<>();
 
+    // Clear content.
     samples.add(
         new Sample(
             "https://storage.googleapis.com/wvmedia/clear/h264/tears/tears.mpd",
             "Clear DASH: Tears",
             MIME_TYPE_DASH));
-    samples.add(
-        new Sample(
-            "https://commondatastorage.googleapis.com/gtv-videos-bucket/CastVideos/"
-                + "hls/TearsOfSteel.m3u8",
-            "Clear HLS: Tears of Steel",
-            MIME_TYPE_HLS));
-    samples.add(
-        new Sample(
-            "https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_4x3"
-                + "/bipbop_4x3_variant.m3u8",
-            "Clear HLS: Basic 4x3",
-            MIME_TYPE_HLS));
     samples.add(
         new Sample(
             "https://html5demos.com/assets/dizzy.mp4", "Clear MP4: Dizzy", MIME_TYPE_VIDEO_MP4));

From 3a54d744b94f38e626af696d7083d71b679d3494 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 23 Jan 2019 10:51:02 +0000
Subject: [PATCH 417/832] Default to respecting the DataSpec cache
 fragmentation flag

Issue: #4253
PiperOrigin-RevId: 230497544
---
 .../offline/DownloaderConstructorHelper.java  |  4 +---
 .../upstream/cache/CacheDataSink.java         | 20 +------------------
 .../upstream/cache/CacheDataSinkFactory.java  | 13 ------------
 3 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java
index 59a11934b1..48e70e37fc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java
@@ -110,10 +110,8 @@ public final class DownloaderConstructorHelper {
             ? cacheReadDataSourceFactory
             : new FileDataSourceFactory();
     if (cacheWriteDataSinkFactory == null) {
-      CacheDataSinkFactory factory =
+      cacheWriteDataSinkFactory =
           new CacheDataSinkFactory(cache, CacheDataSink.DEFAULT_FRAGMENT_SIZE);
-      factory.experimental_setRespectCacheFragmentationFlag(true);
-      cacheWriteDataSinkFactory = factory;
     }
     onlineCacheDataSourceFactory =
         new CacheDataSourceFactory(
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
index d527805120..2caf4c92f8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
@@ -50,7 +50,6 @@ public final class CacheDataSink implements DataSink {
   private final int bufferSize;
 
   private boolean syncFileDescriptor;
-  private boolean respectCacheFragmentationFlag;
   private DataSpec dataSpec;
   private long dataSpecFragmentSize;
   private File file;
@@ -123,20 +122,6 @@ public final class CacheDataSink implements DataSink {
     this.syncFileDescriptor = syncFileDescriptor;
   }
 
-  /**
-   * Sets whether this instance respects the {@link DataSpec#FLAG_ALLOW_CACHE_FRAGMENTATION} flag.
-   * If set to {@code false} requests will always be fragmented. If set to {@code true} requests
-   * will be fragmented only if the flag is set.
-   *
-   * <p>This method is experimental, and will be renamed or removed in a future release.
-   *
-   * @param respectCacheFragmentationFlag Whether to respect the {@link
-   *     DataSpec#FLAG_ALLOW_CACHE_FRAGMENTATION} flag.
-   */
-  public void experimental_setRespectCacheFragmentationFlag(boolean respectCacheFragmentationFlag) {
-    this.respectCacheFragmentationFlag = respectCacheFragmentationFlag;
-  }
-
   @Override
   public void open(DataSpec dataSpec) throws CacheDataSinkException {
     if (dataSpec.length == C.LENGTH_UNSET
@@ -146,10 +131,7 @@ public final class CacheDataSink implements DataSink {
     }
     this.dataSpec = dataSpec;
     this.dataSpecFragmentSize =
-        !respectCacheFragmentationFlag
-                || dataSpec.isFlagSet(DataSpec.FLAG_ALLOW_CACHE_FRAGMENTATION)
-            ? fragmentSize
-            : Long.MAX_VALUE;
+        dataSpec.isFlagSet(DataSpec.FLAG_ALLOW_CACHE_FRAGMENTATION) ? fragmentSize : Long.MAX_VALUE;
     dataSpecBytesWritten = 0;
     try {
       openNextOutputStream();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSinkFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSinkFactory.java
index 9540597c2e..856e9db168 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSinkFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSinkFactory.java
@@ -27,7 +27,6 @@ public final class CacheDataSinkFactory implements DataSink.Factory {
   private final int bufferSize;
 
   private boolean syncFileDescriptor;
-  private boolean respectCacheFragmentationFlag;
 
   /** @see CacheDataSink#CacheDataSink(Cache, long) */
   public CacheDataSinkFactory(Cache cache, long fragmentSize) {
@@ -51,22 +50,10 @@ public final class CacheDataSinkFactory implements DataSink.Factory {
     return this;
   }
 
-  /**
-   * See {@link CacheDataSink#experimental_setRespectCacheFragmentationFlag(boolean)}.
-   *
-   * <p>This method is experimental, and will be renamed or removed in a future release.
-   */
-  public CacheDataSinkFactory experimental_setRespectCacheFragmentationFlag(
-      boolean respectCacheFragmentationFlag) {
-    this.respectCacheFragmentationFlag = respectCacheFragmentationFlag;
-    return this;
-  }
-
   @Override
   public DataSink createDataSink() {
     CacheDataSink dataSink = new CacheDataSink(cache, fragmentSize, bufferSize);
     dataSink.experimental_setSyncFileDescriptor(syncFileDescriptor);
-    dataSink.experimental_setRespectCacheFragmentationFlag(respectCacheFragmentationFlag);
     return dataSink;
   }
 }

From d7b382017506382531c492e5a27218d7317c7366 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 23 Jan 2019 14:30:01 +0000
Subject: [PATCH 418/832] Make updateQueuedPeriods more readable and fix bug.

1. The method kept track of the current period index to check if the next
period is still in the correct period. This is unneccessary since we no longer
use the period index but the actual uid in MediaPeriodId and mismatches are
already detected by canKeepMediaPeriodHolder.
2. We updated the MediaPeriodIndfo twice: once in getFollowingMediaPeriodInfo
and once in getUpdatedMediaPeriodInfo. That's confusing and difficult to
follow. The only difference is that getUpdatedMediaPeriodInfo keeps the
content position while getFollowingMediaPeriodInfo resets it. This is made more
explicit for readability.
3. The durations compatibility check for all following periods was broken as
it compared the same durations (partly due to the confusion caused by 2.)

PiperOrigin-RevId: 230519295
---
 .../exoplayer2/ExoPlayerImplInternal.java     |  2 +-
 .../android/exoplayer2/MediaPeriodInfo.java   | 27 ++++---
 .../android/exoplayer2/MediaPeriodQueue.java  | 71 ++++++++-----------
 .../android/exoplayer2/ExoPlayerTest.java     | 20 +++---
 4 files changed, 59 insertions(+), 61 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index b4549362f3..bebc6224ec 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -1376,7 +1376,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
       }
     }
 
-    if (!queue.updateQueuedPeriods(playingPeriodId, rendererPositionUs)) {
+    if (!queue.updateQueuedPeriods(rendererPositionUs)) {
       seekToCurrentPosition(/* sendDiscontinuity= */ false);
     }
     handleLoadingMediaPeriodChanged(/* loadingTrackSelectionChanged= */ false);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfo.java
index e57100931e..01de53c4fb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfo.java
@@ -64,15 +64,26 @@ import com.google.android.exoplayer2.util.Util;
     this.isFinal = isFinal;
   }
 
-  /** Returns a copy of this instance with the start position set to the specified value. */
+  /**
+   * Returns a copy of this instance with the start position set to the specified value. May return
+   * the same instance if nothing changed.
+   */
   public MediaPeriodInfo copyWithStartPositionUs(long startPositionUs) {
-    return new MediaPeriodInfo(
-        id,
-        startPositionUs,
-        contentPositionUs,
-        durationUs,
-        isLastInTimelinePeriod,
-        isFinal);
+    return startPositionUs == this.startPositionUs
+        ? this
+        : new MediaPeriodInfo(
+            id, startPositionUs, contentPositionUs, durationUs, isLastInTimelinePeriod, isFinal);
+  }
+
+  /**
+   * Returns a copy of this instance with the content position set to the specified value. May
+   * return the same instance if nothing changed.
+   */
+  public MediaPeriodInfo copyWithContentPositionUs(long contentPositionUs) {
+    return contentPositionUs == this.contentPositionUs
+        ? this
+        : new MediaPeriodInfo(
+            id, startPositionUs, contentPositionUs, durationUs, isLastInTimelinePeriod, isFinal);
   }
 
   @Override
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
index 7fa2abe149..4585b97529 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
@@ -61,8 +61,8 @@ import com.google.android.exoplayer2.util.Assertions;
   }
 
   /**
-   * Sets the {@link Timeline}. Call {@link #updateQueuedPeriods(MediaPeriodId, long)} to update the
-   * queued media periods to take into account the new timeline.
+   * Sets the {@link Timeline}. Call {@link #updateQueuedPeriods(long)} to update the queued media
+   * periods to take into account the new timeline.
    */
   public void setTimeline(Timeline timeline) {
     this.timeline = timeline;
@@ -292,54 +292,43 @@ import com.google.android.exoplayer2.util.Assertions;
    * current playback position. The method assumes that the first media period in the queue is still
    * consistent with the new timeline.
    *
-   * @param playingPeriodId The current playing media period identifier.
    * @param rendererPositionUs The current renderer position in microseconds.
    * @return Whether the timeline change has been handled completely.
    */
-  public boolean updateQueuedPeriods(MediaPeriodId playingPeriodId, long rendererPositionUs) {
+  public boolean updateQueuedPeriods(long rendererPositionUs) {
     // TODO: Merge this into setTimeline so that the queue gets updated as soon as the new timeline
     // is set, once all cases handled by ExoPlayerImplInternal.handleSourceInfoRefreshed can be
     // handled here.
-    int periodIndex = timeline.getIndexOfPeriod(playingPeriodId.periodUid);
-    // The front period is either playing now, or is being loaded and will become the playing
-    // period.
     MediaPeriodHolder previousPeriodHolder = null;
     MediaPeriodHolder periodHolder = getFrontPeriod();
     while (periodHolder != null) {
+      MediaPeriodInfo oldPeriodInfo = periodHolder.info;
+
+      // Get period info based on new timeline.
+      MediaPeriodInfo newPeriodInfo;
       if (previousPeriodHolder == null) {
-        long previousDurationUs = periodHolder.info.durationUs;
-        periodHolder.info = getUpdatedMediaPeriodInfo(periodHolder.info);
-        if (!canKeepAfterMediaPeriodHolder(periodHolder, previousDurationUs)) {
-          return !removeAfter(periodHolder);
-        }
+        // The id and start position of the first period have already been verified by
+        // ExoPlayerImplInternal.handleSourceInfoRefreshed. Just update duration, isLastInTimeline
+        // and isLastInPeriod flags.
+        newPeriodInfo = getUpdatedMediaPeriodInfo(oldPeriodInfo);
       } else {
-        // Check this period holder still follows the previous one, based on the new timeline.
-        if (periodIndex == C.INDEX_UNSET
-            || !periodHolder.uid.equals(timeline.getUidOfPeriod(periodIndex))) {
-          // The holder uid is inconsistent with the new timeline.
-          return !removeAfter(previousPeriodHolder);
-        }
-        MediaPeriodInfo periodInfo =
-            getFollowingMediaPeriodInfo(previousPeriodHolder, rendererPositionUs);
-        if (periodInfo == null) {
+        newPeriodInfo = getFollowingMediaPeriodInfo(previousPeriodHolder, rendererPositionUs);
+        if (newPeriodInfo == null) {
           // We've loaded a next media period that is not in the new timeline.
           return !removeAfter(previousPeriodHolder);
         }
-        // Update the period holder.
-        periodHolder.info = getUpdatedMediaPeriodInfo(periodHolder.info);
-        // Check the media period information matches the new timeline.
-        if (!canKeepMediaPeriodHolder(periodHolder, periodInfo)) {
+        if (!canKeepMediaPeriodHolder(oldPeriodInfo, newPeriodInfo)) {
+          // The new media period has a different id or start position.
           return !removeAfter(previousPeriodHolder);
-        } else if (!canKeepAfterMediaPeriodHolder(periodHolder, periodInfo.durationUs)) {
-          return !removeAfter(periodHolder);
         }
       }
 
-      if (periodHolder.info.isLastInTimelinePeriod) {
-        // Move on to the next timeline period index, if there is one.
-        periodIndex =
-            timeline.getNextPeriodIndex(
-                periodIndex, period, window, repeatMode, shuffleModeEnabled);
+      // Use new period info, but keep old content position.
+      periodHolder.info = newPeriodInfo.copyWithContentPositionUs(oldPeriodInfo.contentPositionUs);
+
+      if (!areDurationsCompatible(oldPeriodInfo.durationUs, newPeriodInfo.durationUs)) {
+        // The period duration changed. Remove all subsequent periods.
+        return !removeAfter(periodHolder);
       }
 
       previousPeriodHolder = periodHolder;
@@ -465,22 +454,18 @@ import com.google.android.exoplayer2.util.Assertions;
   }
 
   /**
-   * Returns whether {@code periodHolder} can be kept for playing the media period described by
-   * {@code info}.
+   * Returns whether a period described by {@code oldInfo} can be kept for playing the media period
+   * described by {@code newInfo}.
    */
-  private boolean canKeepMediaPeriodHolder(MediaPeriodHolder periodHolder, MediaPeriodInfo info) {
-    MediaPeriodInfo periodHolderInfo = periodHolder.info;
-    return periodHolderInfo.startPositionUs == info.startPositionUs
-        && periodHolderInfo.id.equals(info.id);
+  private boolean canKeepMediaPeriodHolder(MediaPeriodInfo oldInfo, MediaPeriodInfo newInfo) {
+    return oldInfo.startPositionUs == newInfo.startPositionUs && oldInfo.id.equals(newInfo.id);
   }
 
   /**
-   * Returns whether periods after {@code periodHolder} can be kept for playing given its previous
-   * duration.
+   * Returns whether a duration change of a period is compatible with keeping the following periods.
    */
-  private boolean canKeepAfterMediaPeriodHolder(
-      MediaPeriodHolder periodHolder, long previousDurationUs) {
-    return previousDurationUs == C.TIME_UNSET || previousDurationUs == periodHolder.info.durationUs;
+  private boolean areDurationsCompatible(long previousDurationUs, long newDurationUs) {
+    return previousDurationUs == C.TIME_UNSET || previousDurationUs == newDurationUs;
   }
 
   /**
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
index f957ac104c..7f01c02b49 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
@@ -2028,15 +2028,17 @@ public final class ExoPlayerTest {
             .blockUntilEnded(TIMEOUT_MS);
     testRunner.assertPlayedPeriodIndices(0, 1);
     // Assert that the second period was re-created from the new timeline.
-    assertThat(mediaSource.getCreatedMediaPeriods())
-        .containsExactly(
-            new MediaPeriodId(
-                timeline1.getUidOfPeriod(/* periodIndex= */ 0), /* windowSequenceNumber= */ 0),
-            new MediaPeriodId(
-                timeline1.getUidOfPeriod(/* periodIndex= */ 1), /* windowSequenceNumber= */ 1),
-            new MediaPeriodId(
-                timeline2.getUidOfPeriod(/* periodIndex= */ 1), /* windowSequenceNumber= */ 2))
-        .inOrder();
+    assertThat(mediaSource.getCreatedMediaPeriods()).hasSize(3);
+    assertThat(mediaSource.getCreatedMediaPeriods().get(0).periodUid)
+        .isEqualTo(timeline1.getUidOfPeriod(/* periodIndex= */ 0));
+    assertThat(mediaSource.getCreatedMediaPeriods().get(1).periodUid)
+        .isEqualTo(timeline1.getUidOfPeriod(/* periodIndex= */ 1));
+    assertThat(mediaSource.getCreatedMediaPeriods().get(2).periodUid)
+        .isEqualTo(timeline2.getUidOfPeriod(/* periodIndex= */ 1));
+    assertThat(mediaSource.getCreatedMediaPeriods().get(1).windowSequenceNumber)
+        .isGreaterThan(mediaSource.getCreatedMediaPeriods().get(0).windowSequenceNumber);
+    assertThat(mediaSource.getCreatedMediaPeriods().get(2).windowSequenceNumber)
+        .isGreaterThan(mediaSource.getCreatedMediaPeriods().get(1).windowSequenceNumber);
   }
 
   @Test

From fd081d49c7f29baaea8e51eb5eb8721a96c4941b Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 23 Jan 2019 17:46:44 +0000
Subject: [PATCH 419/832] Make the Cast demo app absorb remote queue changes

Necessary in two scenarios:
+ When the demo app starts casting to a receiver app that already
  had a queue.
+ When two demo apps are connected to the same receiver app and
  both make modifications.

PiperOrigin-RevId: 230546851
---
 .../DefaultReceiverPlayerManager.java         | 33 ++++++-------------
 .../exoplayer2/castdemo/MainActivity.java     | 13 +++++---
 .../exoplayer2/castdemo/PlayerManager.java    | 10 +++---
 3 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java
index f4678fc541..563efea11f 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java
@@ -63,7 +63,7 @@ import java.util.ArrayList;
   private final SimpleExoPlayer exoPlayer;
   private final CastPlayer castPlayer;
   private final ArrayList<MediaItem> mediaQueue;
-  private final QueuePositionListener queuePositionListener;
+  private final QueueChangesListener queueChangesListener;
   private final ConcatenatingMediaSource concatenatingMediaSource;
 
   private boolean castMediaQueueCreationPending;
@@ -71,32 +71,21 @@ import java.util.ArrayList;
   private Player currentPlayer;
 
   /**
-   * @param queuePositionListener A {@link QueuePositionListener} for queue position changes.
+   * Creates a new manager for {@link SimpleExoPlayer} and {@link CastPlayer}.
+   *
+   * @param queueChangesListener A {@link QueueChangesListener} for queue position changes.
    * @param localPlayerView The {@link PlayerView} for local playback.
    * @param castControlView The {@link PlayerControlView} to control remote playback.
    * @param context A {@link Context}.
    * @param castContext The {@link CastContext}.
    */
-  public static DefaultReceiverPlayerManager createPlayerManager(
-      QueuePositionListener queuePositionListener,
+  public DefaultReceiverPlayerManager(
+      QueueChangesListener queueChangesListener,
       PlayerView localPlayerView,
       PlayerControlView castControlView,
       Context context,
       CastContext castContext) {
-    DefaultReceiverPlayerManager defaultReceiverPlayerManager =
-        new DefaultReceiverPlayerManager(
-            queuePositionListener, localPlayerView, castControlView, context, castContext);
-    defaultReceiverPlayerManager.init();
-    return defaultReceiverPlayerManager;
-  }
-
-  private DefaultReceiverPlayerManager(
-      QueuePositionListener queuePositionListener,
-      PlayerView localPlayerView,
-      PlayerControlView castControlView,
-      Context context,
-      CastContext castContext) {
-    this.queuePositionListener = queuePositionListener;
+    this.queueChangesListener = queueChangesListener;
     this.localPlayerView = localPlayerView;
     this.castControlView = castControlView;
     mediaQueue = new ArrayList<>();
@@ -113,6 +102,8 @@ import java.util.ArrayList;
     castPlayer.addListener(this);
     castPlayer.setSessionAvailabilityListener(this);
     castControlView.setPlayer(castPlayer);
+
+    setCurrentPlayer(castPlayer.isCastSessionAvailable() ? castPlayer : exoPlayer);
   }
 
   // Queue manipulation methods.
@@ -287,10 +278,6 @@ import java.util.ArrayList;
 
   // Internal methods.
 
-  private void init() {
-    setCurrentPlayer(castPlayer.isCastSessionAvailable() ? castPlayer : exoPlayer);
-  }
-
   private void updateCurrentItemIndex() {
     int playbackState = currentPlayer.getPlaybackState();
     maybeSetCurrentItemAndNotify(
@@ -372,7 +359,7 @@ import java.util.ArrayList;
     if (this.currentItemIndex != currentItemIndex) {
       int oldIndex = this.currentItemIndex;
       this.currentItemIndex = currentItemIndex;
-      queuePositionListener.onQueuePositionChanged(oldIndex, currentItemIndex);
+      queueChangesListener.onQueuePositionChanged(oldIndex, currentItemIndex);
     }
   }
 
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
index 058adf7c9c..46e8273947 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
@@ -49,7 +49,7 @@ import java.util.Collections;
  * Cast extension.
  */
 public class MainActivity extends AppCompatActivity
-    implements OnClickListener, PlayerManager.QueuePositionListener {
+    implements OnClickListener, PlayerManager.QueueChangesListener {
 
   private final MediaItem.Builder mediaItemBuilder;
 
@@ -121,8 +121,8 @@ public class MainActivity extends AppCompatActivity
     switch (applicationId) {
       case CastMediaControlIntent.DEFAULT_MEDIA_RECEIVER_APPLICATION_ID:
         playerManager =
-            DefaultReceiverPlayerManager.createPlayerManager(
-                /* queuePositionListener= */ this,
+            new DefaultReceiverPlayerManager(
+                /* queueChangesListener= */ this,
                 localPlayerView,
                 castControlView,
                 /* context= */ this,
@@ -162,7 +162,7 @@ public class MainActivity extends AppCompatActivity
         .show();
   }
 
-  // PlayerManager.QueuePositionListener implementation.
+  // PlayerManager.QueueChangesListener implementation.
 
   @Override
   public void onQueuePositionChanged(int previousIndex, int newIndex) {
@@ -174,6 +174,11 @@ public class MainActivity extends AppCompatActivity
     }
   }
 
+  @Override
+  public void onQueueContentsExternallyChanged() {
+    mediaQueueListAdapter.notifyDataSetChanged();
+  }
+
   // Internal methods.
 
   private View buildSampleListView() {
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
index c56f0eb855..184dfe29b3 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
@@ -22,14 +22,14 @@ import com.google.android.exoplayer2.ext.cast.MediaItem;
 /** Manages the players in the Cast demo app. */
 interface PlayerManager {
 
-  /** Listener for changes in the media queue playback position. */
-  interface QueuePositionListener {
+  /** Listener for changes in the media queue. */
+  interface QueueChangesListener {
 
-    /**
-     * Called when the currently played item of the media queue changes.
-     */
+    /** Called when the currently played item of the media queue changes. */
     void onQueuePositionChanged(int previousIndex, int newIndex);
 
+    /** Called when the media queue changes due to modifications not caused by this manager. */
+    void onQueueContentsExternallyChanged();
   }
 
   /** Redirects the given {@code keyEvent} to the active player. */

From 49b9775d0822c2310fb633a8e3cd779d11b9e029 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 24 Jan 2019 11:02:39 +0000
Subject: [PATCH 420/832] Add getReadingPositionUs to Renderer.

This method is a generalization of the existing hasReadStreamToEnd. It is
useful to determine whether a renderer already read beyond a new duration of
a period.

PiperOrigin-RevId: 230689165
---
 .../android/exoplayer2/BaseRenderer.java      | 20 ++++++++++++-------
 .../android/exoplayer2/NoSampleRenderer.java  |  5 +++++
 .../google/android/exoplayer2/Renderer.java   | 10 ++++++++++
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/BaseRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/BaseRenderer.java
index 73602d85aa..79192ade15 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/BaseRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/BaseRenderer.java
@@ -37,7 +37,7 @@ public abstract class BaseRenderer implements Renderer, RendererCapabilities {
   private SampleStream stream;
   private Format[] streamFormats;
   private long streamOffsetUs;
-  private boolean readEndOfStream;
+  private long readingPositionUs;
   private boolean streamIsFinal;
 
   /**
@@ -46,7 +46,7 @@ public abstract class BaseRenderer implements Renderer, RendererCapabilities {
    */
   public BaseRenderer(int trackType) {
     this.trackType = trackType;
-    readEndOfStream = true;
+    readingPositionUs = C.TIME_END_OF_SOURCE;
   }
 
   @Override
@@ -98,7 +98,7 @@ public abstract class BaseRenderer implements Renderer, RendererCapabilities {
       throws ExoPlaybackException {
     Assertions.checkState(!streamIsFinal);
     this.stream = stream;
-    readEndOfStream = false;
+    readingPositionUs = offsetUs;
     streamFormats = formats;
     streamOffsetUs = offsetUs;
     onStreamChanged(formats, offsetUs);
@@ -111,7 +111,12 @@ public abstract class BaseRenderer implements Renderer, RendererCapabilities {
 
   @Override
   public final boolean hasReadStreamToEnd() {
-    return readEndOfStream;
+    return readingPositionUs == C.TIME_END_OF_SOURCE;
+  }
+
+  @Override
+  public final long getReadingPositionUs() {
+    return readingPositionUs;
   }
 
   @Override
@@ -132,7 +137,7 @@ public abstract class BaseRenderer implements Renderer, RendererCapabilities {
   @Override
   public final void resetPosition(long positionUs) throws ExoPlaybackException {
     streamIsFinal = false;
-    readEndOfStream = false;
+    readingPositionUs = positionUs;
     onPositionReset(positionUs, false);
   }
 
@@ -303,10 +308,11 @@ public abstract class BaseRenderer implements Renderer, RendererCapabilities {
     int result = stream.readData(formatHolder, buffer, formatRequired);
     if (result == C.RESULT_BUFFER_READ) {
       if (buffer.isEndOfStream()) {
-        readEndOfStream = true;
+        readingPositionUs = C.TIME_END_OF_SOURCE;
         return streamIsFinal ? C.RESULT_BUFFER_READ : C.RESULT_NOTHING_READ;
       }
       buffer.timeUs += streamOffsetUs;
+      readingPositionUs = Math.max(readingPositionUs, buffer.timeUs);
     } else if (result == C.RESULT_FORMAT_READ) {
       Format format = formatHolder.format;
       if (format.subsampleOffsetUs != Format.OFFSET_SAMPLE_RELATIVE) {
@@ -332,7 +338,7 @@ public abstract class BaseRenderer implements Renderer, RendererCapabilities {
    * Returns whether the upstream source is ready.
    */
   protected final boolean isSourceReady() {
-    return readEndOfStream ? streamIsFinal : stream.isReady();
+    return hasReadStreamToEnd() ? streamIsFinal : stream.isReady();
   }
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/NoSampleRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/NoSampleRenderer.java
index 6645850d3b..e6223dfe16 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/NoSampleRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/NoSampleRenderer.java
@@ -122,6 +122,11 @@ public abstract class NoSampleRenderer implements Renderer, RendererCapabilities
     return true;
   }
 
+  @Override
+  public long getReadingPositionUs() {
+    return C.TIME_END_OF_SOURCE;
+  }
+
   @Override
   public final void setCurrentStreamFinal() {
     streamIsFinal = true;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java b/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java
index 1d4d587aeb..3434cc7603 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java
@@ -160,6 +160,16 @@ public interface Renderer extends PlayerMessage.Target {
    */
   boolean hasReadStreamToEnd();
 
+  /**
+   * Returns the playback position up to which the renderer has read samples from the current {@link
+   * SampleStream}, in microseconds, or {@link C#TIME_END_OF_SOURCE} if the renderer has read the
+   * current {@link SampleStream} to the end.
+   *
+   * <p>This method may be called when the renderer is in the following states: {@link
+   * #STATE_ENABLED}, {@link #STATE_STARTED}.
+   */
+  long getReadingPositionUs();
+
   /**
    * Signals to the renderer that the current {@link SampleStream} will be the final one supplied
    * before it is next disabled or reset.

From f182c0c1169cba7c22280058368127c24609054f Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 24 Jan 2019 11:33:44 +0000
Subject: [PATCH 421/832] Centralize serialization in CachedContentIndex

We need to support serialization to/from an SQLite table. The
model of passing something around for each class to write into
doesn't work well for SQL, and it would be messy to have two
different structural designs for serialization. This change
centralizes the logic in CachedContentIndex, where a centralized
SQL based version can more easily sit alongside it.

PiperOrigin-RevId: 230692291
---
 .../upstream/cache/CachedContent.java         |  70 ++-------
 .../upstream/cache/CachedContentIndex.java    | 134 ++++++++++++++++--
 .../cache/DefaultContentMetadata.java         |  61 +-------
 .../cache/DefaultContentMetadataTest.java     |  22 ---
 4 files changed, 137 insertions(+), 150 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java
index 5494454d54..64ef33e3c9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java
@@ -18,17 +18,11 @@ package com.google.android.exoplayer2.upstream.cache;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.upstream.cache.Cache.CacheException;
 import com.google.android.exoplayer2.util.Assertions;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.TreeSet;
 
 /** Defines the cached content for a single stream. */
 /* package */ final class CachedContent {
 
-  private static final int VERSION_METADATA_INTRODUCED = 2;
-  private static final int VERSION_MAX = Integer.MAX_VALUE;
-
   /** The cache file id that uniquely identifies the original stream. */
   public final int id;
   /** The cache key that uniquely identifies the original stream. */
@@ -40,29 +34,6 @@ import java.util.TreeSet;
   /** Whether the content is locked. */
   private boolean locked;
 
-  /**
-   * Reads an instance from a {@link DataInputStream}.
-   *
-   * @param version Version of the encoded data.
-   * @param input Input stream containing values needed to initialize CachedContent instance.
-   * @throws IOException If an error occurs during reading values.
-   */
-  public static CachedContent readFromStream(int version, DataInputStream input)
-      throws IOException {
-    int id = input.readInt();
-    String key = input.readUTF();
-    CachedContent cachedContent = new CachedContent(id, key);
-    if (version < VERSION_METADATA_INTRODUCED) {
-      long length = input.readLong();
-      ContentMetadataMutations mutations = new ContentMetadataMutations();
-      ContentMetadataMutations.setContentLength(mutations, length);
-      cachedContent.applyMetadataMutations(mutations);
-    } else {
-      cachedContent.metadata = DefaultContentMetadata.readFromStream(input);
-    }
-    return cachedContent;
-  }
-
   /**
    * Creates a CachedContent.
    *
@@ -70,26 +41,18 @@ import java.util.TreeSet;
    * @param key The cache stream key.
    */
   public CachedContent(int id, String key) {
+    this(id, key, DefaultContentMetadata.EMPTY);
+  }
+
+  public CachedContent(int id, String key, DefaultContentMetadata metadata) {
     this.id = id;
     this.key = key;
-    this.metadata = DefaultContentMetadata.EMPTY;
+    this.metadata = metadata;
     this.cachedSpans = new TreeSet<>();
   }
 
-  /**
-   * Writes the instance to a {@link DataOutputStream}.
-   *
-   * @param output Output stream to store the values.
-   * @throws IOException If an error occurs during writing values to output.
-   */
-  public void writeToStream(DataOutputStream output) throws IOException {
-    output.writeInt(id);
-    output.writeUTF(key);
-    metadata.writeToStream(output);
-  }
-
   /** Returns the metadata. */
-  public ContentMetadata getMetadata() {
+  public DefaultContentMetadata getMetadata() {
     return metadata;
   }
 
@@ -208,26 +171,11 @@ import java.util.TreeSet;
     return false;
   }
 
-  /**
-   * Calculates a hash code for the header of this {@code CachedContent} which is compatible with
-   * the index file with {@code version}.
-   */
-  public int headerHashCode(int version) {
-    int result = id;
-    result = 31 * result + key.hashCode();
-    if (version < VERSION_METADATA_INTRODUCED) {
-      long length = ContentMetadata.getContentLength(metadata);
-      result = 31 * result + (int) (length ^ (length >>> 32));
-    } else {
-      result = 31 * result + metadata.hashCode();
-    }
-    return result;
-  }
-
   @Override
   public int hashCode() {
-    int result = headerHashCode(VERSION_MAX);
-    result = 31 * result + cachedSpans.hashCode();
+    int result = id;
+    result = 31 * result + key.hashCode();
+    result = 31 * result + metadata.hashCode();
     return result;
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
index a744917230..f2def1c110 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
@@ -33,8 +33,10 @@ import java.io.OutputStream;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.Random;
 import java.util.Set;
 import javax.crypto.Cipher;
@@ -51,6 +53,8 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   public static final String FILE_NAME = "cached_content_index.exi";
 
   private static final int VERSION = 2;
+  private static final int VERSION_METADATA_INTRODUCED = 2;
+  private static final int INCREMENTAL_METADATA_READ_LENGTH = 10 * 1024 * 1024;
 
   private static final int FLAG_ENCRYPTED_INDEX = 1;
 
@@ -245,6 +249,19 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     return cachedContent != null ? cachedContent.getMetadata() : DefaultContentMetadata.EMPTY;
   }
 
+  private CachedContent addNew(String key) {
+    int id = getNewId(idToKey);
+    CachedContent cachedContent = new CachedContent(id, key);
+    add(cachedContent);
+    changed = true;
+    return cachedContent;
+  }
+
+  private void add(CachedContent cachedContent) {
+    keyToContent.put(cachedContent.key, cachedContent);
+    idToKey.put(cachedContent.id, cachedContent.key);
+  }
+
   private boolean readFile() {
     DataInputStream input = null;
     try {
@@ -276,9 +293,9 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
       int count = input.readInt();
       int hashCode = 0;
       for (int i = 0; i < count; i++) {
-        CachedContent cachedContent = CachedContent.readFromStream(version, input);
+        CachedContent cachedContent = readCachedContent(version, input);
         add(cachedContent);
-        hashCode += cachedContent.headerHashCode(version);
+        hashCode += hashCachedContent(cachedContent, version);
       }
       int fileHashCode = input.readInt();
       boolean isEOF = input.read() == -1;
@@ -327,8 +344,8 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
       output.writeInt(keyToContent.size());
       int hashCode = 0;
       for (CachedContent cachedContent : keyToContent.values()) {
-        cachedContent.writeToStream(output);
-        hashCode += cachedContent.headerHashCode(VERSION);
+        writeCachedContent(cachedContent, output);
+        hashCode += hashCachedContent(cachedContent, VERSION);
       }
       output.writeInt(hashCode);
       atomicFile.endWrite(output);
@@ -342,17 +359,108 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     }
   }
 
-  private CachedContent addNew(String key) {
-    int id = getNewId(idToKey);
-    CachedContent cachedContent = new CachedContent(id, key);
-    add(cachedContent);
-    changed = true;
-    return cachedContent;
+  /**
+   * Calculates a hash code for a {@link CachedContent} which is compatible with a particular index
+   * version.
+   */
+  private int hashCachedContent(CachedContent cachedContent, int version) {
+    int result = cachedContent.id;
+    result = 31 * result + cachedContent.key.hashCode();
+    if (version < VERSION_METADATA_INTRODUCED) {
+      long length = ContentMetadata.getContentLength(cachedContent.getMetadata());
+      result = 31 * result + (int) (length ^ (length >>> 32));
+    } else {
+      result = 31 * result + cachedContent.getMetadata().hashCode();
+    }
+    return result;
   }
 
-  private void add(CachedContent cachedContent) {
-    keyToContent.put(cachedContent.key, cachedContent);
-    idToKey.put(cachedContent.id, cachedContent.key);
+  /**
+   * Reads a {@link CachedContent} from a {@link DataInputStream}.
+   *
+   * @param version Version of the encoded data.
+   * @param input Input stream containing values needed to initialize CachedContent instance.
+   * @throws IOException If an error occurs during reading values.
+   */
+  private static CachedContent readCachedContent(int version, DataInputStream input)
+      throws IOException {
+    int id = input.readInt();
+    String key = input.readUTF();
+    DefaultContentMetadata metadata;
+    if (version < VERSION_METADATA_INTRODUCED) {
+      long length = input.readLong();
+      ContentMetadataMutations mutations = new ContentMetadataMutations();
+      ContentMetadataMutations.setContentLength(mutations, length);
+      metadata = DefaultContentMetadata.EMPTY.copyWithMutationsApplied(mutations);
+    } else {
+      metadata = readContentMetadata(input);
+    }
+    return new CachedContent(id, key, metadata);
+  }
+
+  /**
+   * Writes a {@link CachedContent} to a {@link DataOutputStream}.
+   *
+   * @param output Output stream to store the values.
+   * @throws IOException If an error occurs during writing values to output.
+   */
+  private static void writeCachedContent(CachedContent cachedContent, DataOutputStream output)
+      throws IOException {
+    output.writeInt(cachedContent.id);
+    output.writeUTF(cachedContent.key);
+    writeContentMetadata(cachedContent.getMetadata(), output);
+  }
+
+  /**
+   * Deserializes a {@link DefaultContentMetadata} from the given input stream.
+   *
+   * @param input Input stream to read from.
+   * @return a {@link DefaultContentMetadata} instance.
+   * @throws IOException If an error occurs during reading from input.
+   */
+  private static DefaultContentMetadata readContentMetadata(DataInputStream input)
+      throws IOException {
+    int size = input.readInt();
+    HashMap<String, byte[]> metadata = new HashMap<>();
+    for (int i = 0; i < size; i++) {
+      String name = input.readUTF();
+      int valueSize = input.readInt();
+      if (valueSize < 0) {
+        throw new IOException("Invalid value size: " + valueSize);
+      }
+      // Grow the array incrementally to avoid OutOfMemoryError in the case that a corrupt (and very
+      // large) valueSize was read. In such cases the implementation below is expected to throw
+      // IOException from one of the readFully calls, due to the end of the input being reached.
+      int bytesRead = 0;
+      int nextBytesToRead = Math.min(valueSize, INCREMENTAL_METADATA_READ_LENGTH);
+      byte[] value = Util.EMPTY_BYTE_ARRAY;
+      while (bytesRead != valueSize) {
+        value = Arrays.copyOf(value, bytesRead + nextBytesToRead);
+        input.readFully(value, bytesRead, nextBytesToRead);
+        bytesRead += nextBytesToRead;
+        nextBytesToRead = Math.min(valueSize - bytesRead, INCREMENTAL_METADATA_READ_LENGTH);
+      }
+      metadata.put(name, value);
+    }
+    return new DefaultContentMetadata(metadata);
+  }
+
+  /**
+   * Serializes itself to a {@link DataOutputStream}.
+   *
+   * @param output Output stream to store the values.
+   * @throws IOException If an error occurs during writing values to output.
+   */
+  private static void writeContentMetadata(DefaultContentMetadata metadata, DataOutputStream output)
+      throws IOException {
+    Set<Map.Entry<String, byte[]>> entrySet = metadata.entrySet();
+    output.writeInt(entrySet.size());
+    for (Map.Entry<String, byte[]> entry : entrySet) {
+      output.writeUTF(entry.getKey());
+      byte[] value = entry.getValue();
+      output.writeInt(value.length);
+      output.write(value);
+    }
   }
 
   private static Cipher getCipher() throws NoSuchPaddingException, NoSuchAlgorithmException {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadata.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadata.java
index 843dd19444..9e878ebfbd 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadata.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadata.java
@@ -17,9 +17,6 @@ package com.google.android.exoplayer2.upstream.cache;
 
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.Arrays;
@@ -28,6 +25,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 
 /** Default implementation of {@link ContentMetadata}. Values are stored as byte arrays. */
 public final class DefaultContentMetadata implements ContentMetadata {
@@ -36,39 +34,16 @@ public final class DefaultContentMetadata implements ContentMetadata {
   public static final DefaultContentMetadata EMPTY =
       new DefaultContentMetadata(Collections.emptyMap());
 
-  private static final int MAX_VALUE_LENGTH = 10 * 1024 * 1024;
   private int hashCode;
 
-  /**
-   * Deserializes a {@link DefaultContentMetadata} from the given input stream.
-   *
-   * @param input Input stream to read from.
-   * @return a {@link DefaultContentMetadata} instance.
-   * @throws IOException If an error occurs during reading from input.
-   */
-  public static DefaultContentMetadata readFromStream(DataInputStream input) throws IOException {
-    int size = input.readInt();
-    HashMap<String, byte[]> metadata = new HashMap<>();
-    for (int i = 0; i < size; i++) {
-      String name = input.readUTF();
-      int valueSize = input.readInt();
-      if (valueSize < 0 || valueSize > MAX_VALUE_LENGTH) {
-        throw new IOException("Invalid value size: " + valueSize);
-      }
-      byte[] value = new byte[valueSize];
-      input.readFully(value);
-      metadata.put(name, value);
-    }
-    return new DefaultContentMetadata(metadata);
-  }
-
   private final Map<String, byte[]> metadata;
 
   public DefaultContentMetadata() {
     this(Collections.emptyMap());
   }
 
-  private DefaultContentMetadata(Map<String, byte[]> metadata) {
+  /** @param metadata The metadata entries in their raw byte array form. */
+  public DefaultContentMetadata(Map<String, byte[]> metadata) {
     this.metadata = Collections.unmodifiableMap(metadata);
   }
 
@@ -84,20 +59,9 @@ public final class DefaultContentMetadata implements ContentMetadata {
     return new DefaultContentMetadata(mutatedMetadata);
   }
 
-  /**
-   * Serializes itself to a {@link DataOutputStream}.
-   *
-   * @param output Output stream to store the values.
-   * @throws IOException If an error occurs during writing values to output.
-   */
-  public void writeToStream(DataOutputStream output) throws IOException {
-    output.writeInt(metadata.size());
-    for (Entry<String, byte[]> entry : metadata.entrySet()) {
-      output.writeUTF(entry.getKey());
-      byte[] value = entry.getValue();
-      output.writeInt(value.length);
-      output.write(value);
-    }
+  /** Returns the set of metadata entries in their raw byte array form. */
+  public Set<Entry<String, byte[]>> entrySet() {
+    return metadata.entrySet();
   }
 
   @Override
@@ -190,18 +154,7 @@ public final class DefaultContentMetadata implements ContentMetadata {
 
   private static void addValues(HashMap<String, byte[]> metadata, Map<String, Object> values) {
     for (String name : values.keySet()) {
-      Object value = values.get(name);
-      byte[] bytes = getBytes(value);
-      if (bytes.length > MAX_VALUE_LENGTH) {
-        throw new IllegalArgumentException(
-            "The size of "
-                + name
-                + " ("
-                + bytes.length
-                + ") is greater than maximum allowed: "
-                + MAX_VALUE_LENGTH);
-      }
-      metadata.put(name, bytes);
+      metadata.put(name, getBytes(values.get(name)));
     }
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadataTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadataTest.java
index e1dc68eac6..e4ec278c22 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadataTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadataTest.java
@@ -17,10 +17,6 @@ package com.google.android.exoplayer2.upstream.cache;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -133,24 +129,6 @@ public class DefaultContentMetadataTest {
     assertThat(contentMetadata.get("metadata name", "default value")).isEqualTo("value");
   }
 
-  @Test
-  public void testSerializeDeserialize() throws Exception {
-    byte[] metadata3 = {1, 2, 3};
-    contentMetadata =
-        createContentMetadata(
-            "metadata1 name", "value", "metadata2 name", 12345, "metadata3 name", metadata3);
-
-    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-    contentMetadata.writeToStream(new DataOutputStream(outputStream));
-    ByteArrayInputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
-    DefaultContentMetadata contentMetadata2 =
-        DefaultContentMetadata.readFromStream(new DataInputStream(inputStream));
-
-    assertThat(contentMetadata2.get("metadata1 name", "default value")).isEqualTo("value");
-    assertThat(contentMetadata2.get("metadata2 name", 0)).isEqualTo(12345);
-    assertThat(contentMetadata2.get("metadata3 name", new byte[] {})).isEqualTo(metadata3);
-  }
-
   @Test
   public void testEqualsStringValues() throws Exception {
     DefaultContentMetadata metadata1 = createContentMetadata("metadata1", "value");

From 2c54b8346466128b81edcac879d728d6196e5eda Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 24 Jan 2019 11:50:58 +0000
Subject: [PATCH 422/832] Move CachedContentIndex storage behind an interface

This interface will get an SQLite implementation in a subsequent CL

PiperOrigin-RevId: 230693881
---
 .../upstream/cache/CachedContentIndex.java    | 461 ++++++++++--------
 1 file changed, 268 insertions(+), 193 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
index f2def1c110..e11b5b922c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
+import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import android.util.SparseArray;
 import android.util.SparseBooleanArray;
@@ -83,12 +84,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
    */
   private final SparseBooleanArray removedIds;
 
-  private final AtomicFile atomicFile;
-  private final Cipher cipher;
-  private final SecretKeySpec secretKeySpec;
-  private final boolean encrypt;
-  private boolean changed;
-  private ReusableBufferedOutputStream bufferedOutputStream;
+  private final Storage storage;
 
   /**
    * Creates a CachedContentIndex which works on the index file in the given cacheDir.
@@ -118,7 +114,8 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
    *     secretKey} is null.
    */
   public CachedContentIndex(File cacheDir, byte[] secretKey, boolean encrypt) {
-    this.encrypt = encrypt;
+    Cipher cipher = null;
+    SecretKeySpec secretKeySpec = null;
     if (secretKey != null) {
       Assertions.checkArgument(secretKey.length == 16);
       try {
@@ -129,20 +126,16 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
       }
     } else {
       Assertions.checkState(!encrypt);
-      cipher = null;
-      secretKeySpec = null;
     }
     keyToContent = new HashMap<>();
     idToKey = new SparseArray<>();
     removedIds = new SparseBooleanArray();
-    atomicFile = new AtomicFile(new File(cacheDir, FILE_NAME));
+    storage = new AtomicFileStorage(new File(cacheDir, FILE_NAME), encrypt, cipher, secretKeySpec);
   }
 
   /** Loads the index file. */
   public void load() {
-    Assertions.checkState(!changed);
-    if (!readFile()) {
-      atomicFile.delete();
+    if (!storage.load(keyToContent, idToKey)) {
       keyToContent.clear();
       idToKey.clear();
     }
@@ -150,11 +143,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 
   /** Stores the index data to index file if there is a change. */
   public void store() throws CacheException {
-    if (!changed) {
-      return;
-    }
-    writeFile();
-    changed = false;
+    storage.store(keyToContent);
     // Make ids that were removed since the index was last stored eligible for re-use.
     int removedIdCount = removedIds.size();
     for (int i = 0; i < removedIdCount; i++) {
@@ -205,7 +194,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     CachedContent cachedContent = keyToContent.get(key);
     if (cachedContent != null && cachedContent.isEmpty() && !cachedContent.isLocked()) {
       keyToContent.remove(key);
-      changed = true;
+      storage.onRemove(cachedContent);
       // Keep an entry in idToKey to stop the id from being reused until the index is next stored.
       idToKey.put(cachedContent.id, /* value= */ null);
       // Track that the entry should be removed from idToKey when the index is next stored.
@@ -239,7 +228,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   public void applyContentMetadataMutations(String key, ContentMetadataMutations mutations) {
     CachedContent cachedContent = getOrAdd(key);
     if (cachedContent.applyMetadataMutations(mutations)) {
-      changed = true;
+      storage.onUpdate(cachedContent);
     }
   }
 
@@ -252,163 +241,42 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   private CachedContent addNew(String key) {
     int id = getNewId(idToKey);
     CachedContent cachedContent = new CachedContent(id, key);
-    add(cachedContent);
-    changed = true;
+    keyToContent.put(cachedContent.key, cachedContent);
+    idToKey.put(cachedContent.id, cachedContent.key);
+    storage.onUpdate(cachedContent);
     return cachedContent;
   }
 
-  private void add(CachedContent cachedContent) {
-    keyToContent.put(cachedContent.key, cachedContent);
-    idToKey.put(cachedContent.id, cachedContent.key);
-  }
-
-  private boolean readFile() {
-    DataInputStream input = null;
-    try {
-      InputStream inputStream = new BufferedInputStream(atomicFile.openRead());
-      input = new DataInputStream(inputStream);
-      int version = input.readInt();
-      if (version < 0 || version > VERSION) {
-        return false;
-      }
-
-      int flags = input.readInt();
-      if ((flags & FLAG_ENCRYPTED_INDEX) != 0) {
-        if (cipher == null) {
-          return false;
-        }
-        byte[] initializationVector = new byte[16];
-        input.readFully(initializationVector);
-        IvParameterSpec ivParameterSpec = new IvParameterSpec(initializationVector);
-        try {
-          cipher.init(Cipher.DECRYPT_MODE, secretKeySpec, ivParameterSpec);
-        } catch (InvalidKeyException | InvalidAlgorithmParameterException e) {
-          throw new IllegalStateException(e);
-        }
-        input = new DataInputStream(new CipherInputStream(inputStream, cipher));
-      } else if (encrypt) {
-        changed = true; // Force index to be rewritten encrypted after read.
-      }
-
-      int count = input.readInt();
-      int hashCode = 0;
-      for (int i = 0; i < count; i++) {
-        CachedContent cachedContent = readCachedContent(version, input);
-        add(cachedContent);
-        hashCode += hashCachedContent(cachedContent, version);
-      }
-      int fileHashCode = input.readInt();
-      boolean isEOF = input.read() == -1;
-      if (fileHashCode != hashCode || !isEOF) {
-        return false;
-      }
-    } catch (IOException e) {
-      return false;
-    } finally {
-      if (input != null) {
-        Util.closeQuietly(input);
+  private static Cipher getCipher() throws NoSuchPaddingException, NoSuchAlgorithmException {
+    // Workaround for https://issuetracker.google.com/issues/36976726
+    if (Util.SDK_INT == 18) {
+      try {
+        return Cipher.getInstance("AES/CBC/PKCS5PADDING", "BC");
+      } catch (Throwable ignored) {
+        // ignored
       }
     }
-    return true;
-  }
-
-  private void writeFile() throws CacheException {
-    DataOutputStream output = null;
-    try {
-      OutputStream outputStream = atomicFile.startWrite();
-      if (bufferedOutputStream == null) {
-        bufferedOutputStream = new ReusableBufferedOutputStream(outputStream);
-      } else {
-        bufferedOutputStream.reset(outputStream);
-      }
-      output = new DataOutputStream(bufferedOutputStream);
-      output.writeInt(VERSION);
-
-      int flags = encrypt ? FLAG_ENCRYPTED_INDEX : 0;
-      output.writeInt(flags);
-
-      if (encrypt) {
-        byte[] initializationVector = new byte[16];
-        new Random().nextBytes(initializationVector);
-        output.write(initializationVector);
-        IvParameterSpec ivParameterSpec = new IvParameterSpec(initializationVector);
-        try {
-          cipher.init(Cipher.ENCRYPT_MODE, secretKeySpec, ivParameterSpec);
-        } catch (InvalidKeyException | InvalidAlgorithmParameterException e) {
-          throw new IllegalStateException(e); // Should never happen.
-        }
-        output.flush();
-        output = new DataOutputStream(new CipherOutputStream(bufferedOutputStream, cipher));
-      }
-
-      output.writeInt(keyToContent.size());
-      int hashCode = 0;
-      for (CachedContent cachedContent : keyToContent.values()) {
-        writeCachedContent(cachedContent, output);
-        hashCode += hashCachedContent(cachedContent, VERSION);
-      }
-      output.writeInt(hashCode);
-      atomicFile.endWrite(output);
-      // Avoid calling close twice. Duplicate CipherOutputStream.close calls did
-      // not used to be no-ops: https://android-review.googlesource.com/#/c/272799/
-      output = null;
-    } catch (IOException e) {
-      throw new CacheException(e);
-    } finally {
-      Util.closeQuietly(output);
-    }
+    return Cipher.getInstance("AES/CBC/PKCS5PADDING");
   }
 
   /**
-   * Calculates a hash code for a {@link CachedContent} which is compatible with a particular index
-   * version.
+   * Returns an id which isn't used in the given array. If the maximum id in the array is smaller
+   * than {@link java.lang.Integer#MAX_VALUE} it just returns the next bigger integer. Otherwise it
+   * returns the smallest unused non-negative integer.
    */
-  private int hashCachedContent(CachedContent cachedContent, int version) {
-    int result = cachedContent.id;
-    result = 31 * result + cachedContent.key.hashCode();
-    if (version < VERSION_METADATA_INTRODUCED) {
-      long length = ContentMetadata.getContentLength(cachedContent.getMetadata());
-      result = 31 * result + (int) (length ^ (length >>> 32));
-    } else {
-      result = 31 * result + cachedContent.getMetadata().hashCode();
+  @VisibleForTesting
+  /* package */ static int getNewId(SparseArray<String> idToKey) {
+    int size = idToKey.size();
+    int id = size == 0 ? 0 : (idToKey.keyAt(size - 1) + 1);
+    if (id < 0) { // In case if we pass max int value.
+      // TODO optimization: defragmentation or binary search?
+      for (id = 0; id < size; id++) {
+        if (id != idToKey.keyAt(id)) {
+          break;
+        }
+      }
     }
-    return result;
-  }
-
-  /**
-   * Reads a {@link CachedContent} from a {@link DataInputStream}.
-   *
-   * @param version Version of the encoded data.
-   * @param input Input stream containing values needed to initialize CachedContent instance.
-   * @throws IOException If an error occurs during reading values.
-   */
-  private static CachedContent readCachedContent(int version, DataInputStream input)
-      throws IOException {
-    int id = input.readInt();
-    String key = input.readUTF();
-    DefaultContentMetadata metadata;
-    if (version < VERSION_METADATA_INTRODUCED) {
-      long length = input.readLong();
-      ContentMetadataMutations mutations = new ContentMetadataMutations();
-      ContentMetadataMutations.setContentLength(mutations, length);
-      metadata = DefaultContentMetadata.EMPTY.copyWithMutationsApplied(mutations);
-    } else {
-      metadata = readContentMetadata(input);
-    }
-    return new CachedContent(id, key, metadata);
-  }
-
-  /**
-   * Writes a {@link CachedContent} to a {@link DataOutputStream}.
-   *
-   * @param output Output stream to store the values.
-   * @throws IOException If an error occurs during writing values to output.
-   */
-  private static void writeCachedContent(CachedContent cachedContent, DataOutputStream output)
-      throws IOException {
-    output.writeInt(cachedContent.id);
-    output.writeUTF(cachedContent.key);
-    writeContentMetadata(cachedContent.getMetadata(), output);
+    return id;
   }
 
   /**
@@ -463,36 +331,243 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     }
   }
 
-  private static Cipher getCipher() throws NoSuchPaddingException, NoSuchAlgorithmException {
-    // Workaround for https://issuetracker.google.com/issues/36976726
-    if (Util.SDK_INT == 18) {
-      try {
-        return Cipher.getInstance("AES/CBC/PKCS5PADDING", "BC");
-      } catch (Throwable ignored) {
-        // ignored
-      }
-    }
-    return Cipher.getInstance("AES/CBC/PKCS5PADDING");
+  /** Interface for the persistent index. */
+  private interface Storage {
+
+    /**
+     * Loads the persisted index into {@code content} and {@code idToKey}.
+     *
+     * @param content The key to content map to populate with persisted data.
+     * @param idToKey The id to key map to populate with persisted data.
+     * @return Whether the load was successful.
+     */
+    boolean load(HashMap<String, CachedContent> content, SparseArray<@NullableType String> idToKey);
+
+    /**
+     * Ensures all changes in the in-memory table are persisted.
+     *
+     * @param content The key to content map to persist.
+     * @throws CacheException If an error occurs persisting the index.
+     */
+    void store(HashMap<String, CachedContent> content) throws CacheException;
+
+    /**
+     * Called when a {@link CachedContent} is added or updated in the in-memory index.
+     *
+     * @param cachedContent The updated {@link CachedContent}.
+     */
+    void onUpdate(CachedContent cachedContent);
+
+    /**
+     * Called when a {@link CachedContent} is removed from the in-memory index.
+     *
+     * @param cachedContent The removed {@link CachedContent}.
+     */
+    void onRemove(CachedContent cachedContent);
   }
 
-  /**
-   * Returns an id which isn't used in the given array. If the maximum id in the array is smaller
-   * than {@link java.lang.Integer#MAX_VALUE} it just returns the next bigger integer. Otherwise it
-   * returns the smallest unused non-negative integer.
-   */
-  @VisibleForTesting
-  public static int getNewId(SparseArray<String> idToKey) {
-    int size = idToKey.size();
-    int id = size == 0 ? 0 : (idToKey.keyAt(size - 1) + 1);
-    if (id < 0) { // In case if we pass max int value.
-      // TODO optimization: defragmentation or binary search?
-      for (id = 0; id < size; id++) {
-        if (id != idToKey.keyAt(id)) {
-          break;
+  /** {@link Storage} implementation that uses an {@link AtomicFile}. */
+  private static class AtomicFileStorage implements Storage {
+
+    private final boolean encrypt;
+    @Nullable private final Cipher cipher;
+    @Nullable private final SecretKeySpec secretKeySpec;
+    private final AtomicFile atomicFile;
+    private final Random random;
+
+    private boolean changed;
+    @Nullable private ReusableBufferedOutputStream bufferedOutputStream;
+
+    public AtomicFileStorage(
+        File fileName,
+        boolean encrypt,
+        @Nullable Cipher cipher,
+        @Nullable SecretKeySpec secretKeySpec) {
+      this.encrypt = encrypt;
+      this.cipher = cipher;
+      this.secretKeySpec = secretKeySpec;
+      atomicFile = new AtomicFile(fileName);
+      random = new Random();
+    }
+
+    @Override
+    public boolean load(
+        HashMap<String, CachedContent> content, SparseArray<@NullableType String> idToKey) {
+      Assertions.checkState(!changed);
+      if (!readFile(content, idToKey)) {
+        atomicFile.delete();
+        return false;
+      }
+      return true;
+    }
+
+    @Override
+    public void store(HashMap<String, CachedContent> content) throws CacheException {
+      if (!changed) {
+        return;
+      }
+      writeFile(content);
+      changed = false;
+    }
+
+    @Override
+    public void onUpdate(CachedContent cachedContent) {
+      changed = true;
+    }
+
+    @Override
+    public void onRemove(CachedContent cachedContent) {
+      changed = true;
+    }
+
+    private boolean readFile(
+        HashMap<String, CachedContent> content, SparseArray<@NullableType String> idToKey) {
+      DataInputStream input = null;
+      try {
+        InputStream inputStream = new BufferedInputStream(atomicFile.openRead());
+        input = new DataInputStream(inputStream);
+        int version = input.readInt();
+        if (version < 0 || version > VERSION) {
+          return false;
+        }
+
+        int flags = input.readInt();
+        if ((flags & FLAG_ENCRYPTED_INDEX) != 0) {
+          if (cipher == null) {
+            return false;
+          }
+          byte[] initializationVector = new byte[16];
+          input.readFully(initializationVector);
+          IvParameterSpec ivParameterSpec = new IvParameterSpec(initializationVector);
+          try {
+            cipher.init(Cipher.DECRYPT_MODE, secretKeySpec, ivParameterSpec);
+          } catch (InvalidKeyException | InvalidAlgorithmParameterException e) {
+            throw new IllegalStateException(e);
+          }
+          input = new DataInputStream(new CipherInputStream(inputStream, cipher));
+        } else if (encrypt) {
+          changed = true; // Force index to be rewritten encrypted after read.
+        }
+
+        int count = input.readInt();
+        int hashCode = 0;
+        for (int i = 0; i < count; i++) {
+          CachedContent cachedContent = readCachedContent(version, input);
+          content.put(cachedContent.key, cachedContent);
+          idToKey.put(cachedContent.id, cachedContent.key);
+          hashCode += hashCachedContent(cachedContent, version);
+        }
+        int fileHashCode = input.readInt();
+        boolean isEOF = input.read() == -1;
+        if (fileHashCode != hashCode || !isEOF) {
+          return false;
+        }
+      } catch (IOException e) {
+        return false;
+      } finally {
+        if (input != null) {
+          Util.closeQuietly(input);
         }
       }
+      return true;
     }
-    return id;
-  }
 
+    private void writeFile(HashMap<String, CachedContent> content) throws CacheException {
+      DataOutputStream output = null;
+      try {
+        OutputStream outputStream = atomicFile.startWrite();
+        if (bufferedOutputStream == null) {
+          bufferedOutputStream = new ReusableBufferedOutputStream(outputStream);
+        } else {
+          bufferedOutputStream.reset(outputStream);
+        }
+        output = new DataOutputStream(bufferedOutputStream);
+        output.writeInt(VERSION);
+
+        int flags = encrypt ? FLAG_ENCRYPTED_INDEX : 0;
+        output.writeInt(flags);
+
+        if (encrypt) {
+          byte[] initializationVector = new byte[16];
+          random.nextBytes(initializationVector);
+          output.write(initializationVector);
+          IvParameterSpec ivParameterSpec = new IvParameterSpec(initializationVector);
+          try {
+            cipher.init(Cipher.ENCRYPT_MODE, secretKeySpec, ivParameterSpec);
+          } catch (InvalidKeyException | InvalidAlgorithmParameterException e) {
+            throw new IllegalStateException(e); // Should never happen.
+          }
+          output.flush();
+          output = new DataOutputStream(new CipherOutputStream(bufferedOutputStream, cipher));
+        }
+
+        output.writeInt(content.size());
+        int hashCode = 0;
+        for (CachedContent cachedContent : content.values()) {
+          writeCachedContent(cachedContent, output);
+          hashCode += hashCachedContent(cachedContent, VERSION);
+        }
+        output.writeInt(hashCode);
+        atomicFile.endWrite(output);
+        // Avoid calling close twice. Duplicate CipherOutputStream.close calls did
+        // not used to be no-ops: https://android-review.googlesource.com/#/c/272799/
+        output = null;
+      } catch (IOException e) {
+        throw new CacheException(e);
+      } finally {
+        Util.closeQuietly(output);
+      }
+    }
+
+    /**
+     * Calculates a hash code for a {@link CachedContent} which is compatible with a particular
+     * index version.
+     */
+    private int hashCachedContent(CachedContent cachedContent, int version) {
+      int result = cachedContent.id;
+      result = 31 * result + cachedContent.key.hashCode();
+      if (version < VERSION_METADATA_INTRODUCED) {
+        long length = ContentMetadata.getContentLength(cachedContent.getMetadata());
+        result = 31 * result + (int) (length ^ (length >>> 32));
+      } else {
+        result = 31 * result + cachedContent.getMetadata().hashCode();
+      }
+      return result;
+    }
+
+    /**
+     * Reads a {@link CachedContent} from a {@link DataInputStream}.
+     *
+     * @param version Version of the encoded data.
+     * @param input Input stream containing values needed to initialize CachedContent instance.
+     * @throws IOException If an error occurs during reading values.
+     */
+    private CachedContent readCachedContent(int version, DataInputStream input) throws IOException {
+      int id = input.readInt();
+      String key = input.readUTF();
+      DefaultContentMetadata metadata;
+      if (version < VERSION_METADATA_INTRODUCED) {
+        long length = input.readLong();
+        ContentMetadataMutations mutations = new ContentMetadataMutations();
+        ContentMetadataMutations.setContentLength(mutations, length);
+        metadata = DefaultContentMetadata.EMPTY.copyWithMutationsApplied(mutations);
+      } else {
+        metadata = readContentMetadata(input);
+      }
+      return new CachedContent(id, key, metadata);
+    }
+
+    /**
+     * Writes a {@link CachedContent} to a {@link DataOutputStream}.
+     *
+     * @param output Output stream to store the values.
+     * @throws IOException If an error occurs during writing values to output.
+     */
+    private void writeCachedContent(CachedContent cachedContent, DataOutputStream output)
+        throws IOException {
+      output.writeInt(cachedContent.id);
+      output.writeUTF(cachedContent.key);
+      writeContentMetadata(cachedContent.getMetadata(), output);
+    }
+  }
 }

From 355b3d6334f48e185d4d471a4d154147d551b471 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 24 Jan 2019 13:01:36 +0000
Subject: [PATCH 423/832] Increase minSdkVersion to 16

The combination of pre-16 API levels accounting for ~0.5% of the device
population, and that the most important components in ExoPlayer (e.g.
the MediaCodec renderers) have always required API level 16, mean it's
very unlikely this will negatively impact on anyone.

PiperOrigin-RevId: 230701808
---
 RELEASENOTES.md                               |  1 +
 constants.gradle                              |  6 +--
 demos/cast/build.gradle                       |  2 +-
 demos/ima/build.gradle                        |  2 +-
 demos/main/build.gradle                       |  2 +-
 extensions/cast/build.gradle                  |  2 +-
 extensions/cronet/build.gradle                |  2 +-
 extensions/rtmp/build.gradle                  |  2 +-
 .../android/exoplayer2/SimpleExoPlayer.java   |  1 -
 .../audio/MediaCodecAudioRenderer.java        |  2 -
 .../exoplayer2/decoder/CryptoInfo.java        | 51 ++++++++-----------
 .../android/exoplayer2/drm/DrmSession.java    |  2 -
 .../exoplayer2/drm/DrmSessionManager.java     |  2 -
 .../exoplayer2/drm/FrameworkMediaCrypto.java  |  2 -
 .../exoplayer2/mediacodec/MediaCodecInfo.java |  1 -
 .../mediacodec/MediaCodecRenderer.java        |  4 +-
 .../exoplayer2/mediacodec/MediaCodecUtil.java |  1 -
 .../mediacodec/MediaFormatUtil.java           |  2 -
 .../exoplayer2/scheduler/Requirements.java    | 13 +----
 .../android/exoplayer2/util/GlUtil.java       |  2 -
 .../google/android/exoplayer2/util/Util.java  | 11 +---
 .../video/MediaCodecVideoRenderer.java        |  1 -
 .../video/VideoFrameReleaseTimeHelper.java    |  1 -
 .../extractor/mp4/Mp4ExtractorTest.java       |  2 -
 .../extractor/rawcc/RawCcExtractorTest.java   |  2 -
 .../android/exoplayer2/ui/DefaultTimeBar.java | 14 ++---
 .../exoplayer2/ui/SimpleExoPlayerView.java    |  2 -
 .../ui/spherical/CanvasRenderer.java          |  2 -
 .../ui/spherical/ProjectionRenderer.java      |  2 -
 .../ui/spherical/SphericalSurfaceView.java    |  2 -
 .../playbacktests/gts/DashDownloadTest.java   |  4 --
 .../playbacktests/gts/DashStreamingTest.java  | 14 ++---
 .../playbacktests/gts/DashTestRunner.java     |  1 -
 .../testutil/DebugRenderersFactory.java       |  1 -
 34 files changed, 39 insertions(+), 122 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 5894e991d0..6afe9bda35 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,6 +2,7 @@
 
 ### dev-v2 (not yet released) ###
 
+* Increase `minSdkVersion` to 16 (Jellybean).
 * Support for playing spherical videos on Daydream.
 * Improve decoder re-use between playbacks. TODO: Write and link a blog post
   here ([#2826](https://github.com/google/ExoPlayer/issues/2826)).
diff --git a/constants.gradle b/constants.gradle
index 716ddbadba..062438fa30 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -15,11 +15,7 @@ project.ext {
     // ExoPlayer version and version code.
     releaseVersion = '2.9.4'
     releaseVersionCode = 2009004
-    // Important: ExoPlayer specifies a minSdkVersion of 14 because various
-    // components provided by the library may be of use on older devices.
-    // However, please note that the core media playback functionality provided
-    // by the library requires API level 16 or greater.
-    minSdkVersion = 14
+    minSdkVersion = 16
     targetSdkVersion = 28
     compileSdkVersion = 28
     buildToolsVersion = '28.0.2'
diff --git a/demos/cast/build.gradle b/demos/cast/build.gradle
index 8af52a787e..e056530d45 100644
--- a/demos/cast/build.gradle
+++ b/demos/cast/build.gradle
@@ -26,7 +26,7 @@ android {
     defaultConfig {
         versionName project.ext.releaseVersion
         versionCode project.ext.releaseVersionCode
-        minSdkVersion 16
+        minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
     }
 
diff --git a/demos/ima/build.gradle b/demos/ima/build.gradle
index 33cca6ef46..0530c42eb7 100644
--- a/demos/ima/build.gradle
+++ b/demos/ima/build.gradle
@@ -26,7 +26,7 @@ android {
     defaultConfig {
         versionName project.ext.releaseVersion
         versionCode project.ext.releaseVersionCode
-        minSdkVersion 16
+        minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
     }
 
diff --git a/demos/main/build.gradle b/demos/main/build.gradle
index c516ba297f..e3e382f6d0 100644
--- a/demos/main/build.gradle
+++ b/demos/main/build.gradle
@@ -26,7 +26,7 @@ android {
     defaultConfig {
         versionName project.ext.releaseVersion
         versionCode project.ext.releaseVersionCode
-        minSdkVersion 16
+        minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
     }
 
diff --git a/extensions/cast/build.gradle b/extensions/cast/build.gradle
index 0baa074d4a..fea8363960 100644
--- a/extensions/cast/build.gradle
+++ b/extensions/cast/build.gradle
@@ -24,7 +24,7 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 14
+        minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
         consumerProguardFiles 'proguard-rules.txt'
     }
diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle
index 7d8c217b58..f77e84c816 100644
--- a/extensions/cronet/build.gradle
+++ b/extensions/cronet/build.gradle
@@ -19,7 +19,7 @@ android {
     buildToolsVersion project.ext.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
     }
 
diff --git a/extensions/rtmp/build.gradle b/extensions/rtmp/build.gradle
index af02ee2eaa..4869df7a1a 100644
--- a/extensions/rtmp/build.gradle
+++ b/extensions/rtmp/build.gradle
@@ -24,7 +24,7 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 15
+        minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
     }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index e498038fde..35924a01fb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -63,7 +63,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
  * An {@link ExoPlayer} implementation that uses default {@link Renderer} components. Instances can
  * be obtained from {@link ExoPlayerFactory}.
  */
-@TargetApi(16)
 public class SimpleExoPlayer extends BasePlayer
     implements ExoPlayer,
         Player.AudioComponent,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
index 7fc6c16db8..04c6b2ec9c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
@@ -16,7 +16,6 @@
 package com.google.android.exoplayer2.audio;
 
 import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.media.MediaCodec;
 import android.media.MediaCrypto;
@@ -66,7 +65,6 @@ import java.util.List;
  *       underlying audio track.
  * </ul>
  */
-@TargetApi(16)
 public class MediaCodecAudioRenderer extends MediaCodecRenderer implements MediaClock {
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/decoder/CryptoInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/decoder/CryptoInfo.java
index ec17de8d74..379ca971b5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/decoder/CryptoInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/decoder/CryptoInfo.java
@@ -62,7 +62,7 @@ public final class CryptoInfo {
   private final PatternHolderV24 patternHolder;
 
   public CryptoInfo() {
-    frameworkCryptoInfo = Util.SDK_INT >= 16 ? newFrameworkCryptoInfoV16() : null;
+    frameworkCryptoInfo = new android.media.MediaCodec.CryptoInfo();
     patternHolder = Util.SDK_INT >= 24 ? new PatternHolderV24(frameworkCryptoInfo) : null;
   }
 
@@ -79,34 +79,8 @@ public final class CryptoInfo {
     this.mode = mode;
     this.encryptedBlocks = encryptedBlocks;
     this.clearBlocks = clearBlocks;
-    if (Util.SDK_INT >= 16) {
-      updateFrameworkCryptoInfoV16();
-    }
-  }
-
-  /**
-   * Returns an equivalent {@link android.media.MediaCodec.CryptoInfo} instance.
-   * <p>
-   * Successive calls to this method on a single {@link CryptoInfo} will return the same instance.
-   * Changes to the {@link CryptoInfo} will be reflected in the returned object. The return object
-   * should not be modified directly.
-   *
-   * @return The equivalent {@link android.media.MediaCodec.CryptoInfo} instance.
-   */
-  @TargetApi(16)
-  public android.media.MediaCodec.CryptoInfo getFrameworkCryptoInfoV16() {
-    return frameworkCryptoInfo;
-  }
-
-  @TargetApi(16)
-  private android.media.MediaCodec.CryptoInfo newFrameworkCryptoInfoV16() {
-    return new android.media.MediaCodec.CryptoInfo();
-  }
-
-  @TargetApi(16)
-  private void updateFrameworkCryptoInfoV16() {
-    // Update fields directly because the framework's CryptoInfo.set performs an unnecessary object
-    // allocation on Android N.
+    // Update frameworkCryptoInfo fields directly because CryptoInfo.set performs an unnecessary
+    // object allocation on Android N.
     frameworkCryptoInfo.numSubSamples = numSubSamples;
     frameworkCryptoInfo.numBytesOfClearData = numBytesOfClearData;
     frameworkCryptoInfo.numBytesOfEncryptedData = numBytesOfEncryptedData;
@@ -118,6 +92,25 @@ public final class CryptoInfo {
     }
   }
 
+  /**
+   * Returns an equivalent {@link android.media.MediaCodec.CryptoInfo} instance.
+   *
+   * <p>Successive calls to this method on a single {@link CryptoInfo} will return the same
+   * instance. Changes to the {@link CryptoInfo} will be reflected in the returned object. The
+   * return object should not be modified directly.
+   *
+   * @return The equivalent {@link android.media.MediaCodec.CryptoInfo} instance.
+   */
+  public android.media.MediaCodec.CryptoInfo getFrameworkCryptoInfo() {
+    return frameworkCryptoInfo;
+  }
+
+  /** @deprecated Use {@link #getFrameworkCryptoInfo()}. */
+  @Deprecated
+  public android.media.MediaCodec.CryptoInfo getFrameworkCryptoInfoV16() {
+    return getFrameworkCryptoInfo();
+  }
+
   @TargetApi(24)
   private static final class PatternHolderV24 {
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java
index a68415287e..a23f26f067 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java
@@ -15,7 +15,6 @@
  */
 package com.google.android.exoplayer2.drm;
 
-import android.annotation.TargetApi;
 import android.media.MediaDrm;
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
@@ -27,7 +26,6 @@ import java.util.Map;
 /**
  * A DRM session.
  */
-@TargetApi(16)
 public interface DrmSession<T extends ExoMediaCrypto> {
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java
index cf3d97d0b2..d8093507a4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java
@@ -15,14 +15,12 @@
  */
 package com.google.android.exoplayer2.drm;
 
-import android.annotation.TargetApi;
 import android.os.Looper;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 
 /**
  * Manages a DRM session.
  */
-@TargetApi(16)
 public interface DrmSessionManager<T extends ExoMediaCrypto> {
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaCrypto.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaCrypto.java
index 156138ab9b..7211b5fcde 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaCrypto.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaCrypto.java
@@ -15,7 +15,6 @@
  */
 package com.google.android.exoplayer2.drm;
 
-import android.annotation.TargetApi;
 import android.media.MediaCrypto;
 import java.util.UUID;
 
@@ -23,7 +22,6 @@ import java.util.UUID;
  * An {@link ExoMediaCrypto} implementation that contains the necessary information to build or
  * update a framework {@link MediaCrypto}.
  */
-@TargetApi(16)
 public final class FrameworkMediaCrypto implements ExoMediaCrypto {
 
   /** The DRM scheme UUID. */
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java
index 107ab9efd8..c9493e1208 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java
@@ -31,7 +31,6 @@ import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.Util;
 
 /** Information about a {@link MediaCodec} for a given mime type. */
-@TargetApi(16)
 @SuppressWarnings("InlinedApi")
 public final class MediaCodecInfo {
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index 35f5c14f3f..e3fcf9397b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -58,7 +58,6 @@ import java.util.List;
 /**
  * An abstract renderer that uses {@link MediaCodec} to decode samples for rendering.
  */
-@TargetApi(16)
 public abstract class MediaCodecRenderer extends BaseRenderer {
 
   /**
@@ -366,7 +365,6 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
       boolean playClearSamplesWithoutKeys,
       float assumedMinimumCodecOperatingRate) {
     super(trackType);
-    Assertions.checkState(Util.SDK_INT >= 16);
     this.mediaCodecSelector = Assertions.checkNotNull(mediaCodecSelector);
     this.drmSessionManager = drmSessionManager;
     this.playClearSamplesWithoutKeys = playClearSamplesWithoutKeys;
@@ -1662,7 +1660,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
 
   private static MediaCodec.CryptoInfo getFrameworkCryptoInfo(
       DecoderInputBuffer buffer, int adaptiveReconfigurationBytes) {
-    MediaCodec.CryptoInfo cryptoInfo = buffer.cryptoInfo.getFrameworkCryptoInfoV16();
+    MediaCodec.CryptoInfo cryptoInfo = buffer.cryptoInfo.getFrameworkCryptoInfo();
     if (adaptiveReconfigurationBytes == 0) {
       return cryptoInfo;
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
index 9ae50179c3..ae3a9f123f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
@@ -39,7 +39,6 @@ import java.util.regex.Pattern;
 /**
  * A utility class for querying the available codecs.
  */
-@TargetApi(16)
 @SuppressLint("InlinedApi")
 public final class MediaCodecUtil {
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaFormatUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaFormatUtil.java
index 3cfefc0736..95cc5d4a37 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaFormatUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaFormatUtil.java
@@ -15,7 +15,6 @@
  */
 package com.google.android.exoplayer2.mediacodec;
 
-import android.annotation.TargetApi;
 import android.media.MediaFormat;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.Format;
@@ -24,7 +23,6 @@ import java.nio.ByteBuffer;
 import java.util.List;
 
 /** Helper class for configuring {@link MediaFormat} instances. */
-@TargetApi(16)
 public final class MediaFormatUtil {
 
   private MediaFormatUtil() {}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
index 77630a4543..508c3393c5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
@@ -200,7 +200,7 @@ public final class Requirements {
       logd("Roaming: " + roaming);
       return !roaming;
     }
-    boolean activeNetworkMetered = isActiveNetworkMetered(connectivityManager, networkInfo);
+    boolean activeNetworkMetered = connectivityManager.isActiveNetworkMetered();
     logd("Metered network: " + activeNetworkMetered);
     if (networkRequirement == NETWORK_TYPE_UNMETERED) {
       return !activeNetworkMetered;
@@ -255,17 +255,6 @@ public final class Requirements {
     return !validated;
   }
 
-  private static boolean isActiveNetworkMetered(
-      ConnectivityManager connectivityManager, NetworkInfo networkInfo) {
-    if (Util.SDK_INT >= 16) {
-      return connectivityManager.isActiveNetworkMetered();
-    }
-    int type = networkInfo.getType();
-    return type != ConnectivityManager.TYPE_WIFI
-        && type != ConnectivityManager.TYPE_BLUETOOTH
-        && type != ConnectivityManager.TYPE_ETHERNET;
-  }
-
   private static void logd(String message) {
     if (Scheduler.DEBUG) {
       Log.d(TAG, message);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/GlUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/util/GlUtil.java
index 9387392ec4..915e855d23 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/GlUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/GlUtil.java
@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.util;
 
 import static android.opengl.GLU.gluErrorString;
 
-import android.annotation.TargetApi;
 import android.opengl.GLES11Ext;
 import android.opengl.GLES20;
 import android.text.TextUtils;
@@ -114,7 +113,6 @@ public final class GlUtil {
    * Creates a GL_TEXTURE_EXTERNAL_OES with default configuration of GL_LINEAR filtering and
    * GL_CLAMP_TO_EDGE wrapping.
    */
-  @TargetApi(15)
   public static int createExternalTexture() {
     int[] texId = new int[1];
     GLES20.glGenTextures(1, IntBuffer.wrap(texId));
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
index 1e1153d367..34237dddf6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
@@ -1844,10 +1844,8 @@ public final class Util {
       getDisplaySizeV23(display, displaySize);
     } else if (Util.SDK_INT >= 17) {
       getDisplaySizeV17(display, displaySize);
-    } else if (Util.SDK_INT >= 16) {
-      getDisplaySizeV16(display, displaySize);
     } else {
-      getDisplaySizeV9(display, displaySize);
+      getDisplaySizeV16(display, displaySize);
     }
     return displaySize;
   }
@@ -1903,17 +1901,10 @@ public final class Util {
     display.getRealSize(outSize);
   }
 
-  @TargetApi(16)
   private static void getDisplaySizeV16(Display display, Point outSize) {
     display.getSize(outSize);
   }
 
-  @SuppressWarnings("deprecation")
-  private static void getDisplaySizeV9(Display display, Point outSize) {
-    outSize.x = display.getWidth();
-    outSize.y = display.getHeight();
-  }
-
   private static @C.NetworkType int getMobileNetworkType(NetworkInfo networkInfo) {
     switch (networkInfo.getSubtype()) {
       case TelephonyManager.NETWORK_TYPE_EDGE:
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index 6943fea7b6..d8ad2a840b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -68,7 +68,6 @@ import java.util.List;
  *       a {@link android.view.SurfaceView}.
  * </ul>
  */
-@TargetApi(16)
 public class MediaCodecVideoRenderer extends MediaCodecRenderer {
 
   private static final String TAG = "MediaCodecVideoRenderer";
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameReleaseTimeHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameReleaseTimeHelper.java
index 3c0fb92191..c7e34d00e9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameReleaseTimeHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameReleaseTimeHelper.java
@@ -32,7 +32,6 @@ import com.google.android.exoplayer2.util.Util;
 /**
  * Makes a best effort to adjust frame release timestamps for a smoother visual result.
  */
-@TargetApi(16)
 public final class VideoFrameReleaseTimeHelper {
 
   private static final long CHOREOGRAPHER_SAMPLE_DELAY_MILLIS = 500;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java
index 8850a755be..3c84214686 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java
@@ -15,14 +15,12 @@
  */
 package com.google.android.exoplayer2.extractor.mp4;
 
-import android.annotation.TargetApi;
 import com.google.android.exoplayer2.testutil.ExtractorAsserts;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 
 /** Tests for {@link Mp4Extractor}. */
-@TargetApi(16)
 @RunWith(RobolectricTestRunner.class)
 public final class Mp4ExtractorTest {
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java
index 62ad774fd3..9551c9df29 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java
@@ -15,7 +15,6 @@
  */
 package com.google.android.exoplayer2.extractor.rawcc;
 
-import android.annotation.TargetApi;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.testutil.ExtractorAsserts;
 import com.google.android.exoplayer2.util.MimeTypes;
@@ -24,7 +23,6 @@ import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 
 /** Tests for {@link RawCcExtractor}. */
-@TargetApi(16)
 @RunWith(RobolectricTestRunner.class)
 public final class RawCcExtractorTest {
 
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
index 75c4f71b64..0c3d39a13a 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
@@ -319,8 +319,8 @@ public class DefaultTimeBar extends View implements TimeBar {
     keyTimeIncrement = C.TIME_UNSET;
     keyCountIncrement = DEFAULT_INCREMENT_COUNT;
     setFocusable(true);
-    if (Util.SDK_INT >= 16) {
-      maybeSetImportantForAccessibilityV16();
+    if (getImportantForAccessibility() == View.IMPORTANT_FOR_ACCESSIBILITY_AUTO) {
+      setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);
     }
   }
 
@@ -611,13 +611,12 @@ public class DefaultTimeBar extends View implements TimeBar {
     if (Util.SDK_INT >= 21) {
       info.addAction(AccessibilityAction.ACTION_SCROLL_FORWARD);
       info.addAction(AccessibilityAction.ACTION_SCROLL_BACKWARD);
-    } else if (Util.SDK_INT >= 16) {
+    } else {
       info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD);
       info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD);
     }
   }
 
-  @TargetApi(16)
   @Override
   public boolean performAccessibilityAction(int action, @Nullable Bundle args) {
     if (super.performAccessibilityAction(action, args)) {
@@ -643,13 +642,6 @@ public class DefaultTimeBar extends View implements TimeBar {
 
   // Internal methods.
 
-  @TargetApi(16)
-  private void maybeSetImportantForAccessibilityV16() {
-    if (getImportantForAccessibility() == View.IMPORTANT_FOR_ACCESSIBILITY_AUTO) {
-      setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);
-    }
-  }
-
   private void startScrubbing() {
     scrubbing = true;
     setPressed(true);
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java
index 55745a7cb5..b01e7a308c 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java
@@ -15,7 +15,6 @@
  */
 package com.google.android.exoplayer2.ui;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -25,7 +24,6 @@ import com.google.android.exoplayer2.SimpleExoPlayer;
 
 /** @deprecated Use {@link PlayerView}. */
 @Deprecated
-@TargetApi(16)
 public final class SimpleExoPlayerView extends PlayerView {
 
   public SimpleExoPlayerView(Context context) {
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java
index 5538390d3b..955418acf7 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java
@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.ui.spherical;
 
 import static com.google.android.exoplayer2.util.GlUtil.checkGlError;
 
-import android.annotation.TargetApi;
 import android.graphics.Canvas;
 import android.graphics.PointF;
 import android.graphics.Rect;
@@ -39,7 +38,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
  * <p>A CanvasRenderer can be created on any thread, but {@link #init()} needs to be called on the
  * GL thread before it can be rendered.
  */
-@TargetApi(15)
 public final class CanvasRenderer {
 
   private static final float WIDTH_UNIT = 0.8f;
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/ProjectionRenderer.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/ProjectionRenderer.java
index 5e8a6d71d2..f24bcce3ce 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/ProjectionRenderer.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/ProjectionRenderer.java
@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.ui.spherical;
 
 import static com.google.android.exoplayer2.util.GlUtil.checkGlError;
 
-import android.annotation.TargetApi;
 import android.opengl.GLES11Ext;
 import android.opengl.GLES20;
 import com.google.android.exoplayer2.C;
@@ -30,7 +29,6 @@ import org.checkerframework.checker.nullness.qual.Nullable;
  * Utility class to render spherical meshes for video or images. Call {@link #init()} on the GL
  * thread when ready.
  */
-@TargetApi(15)
 /* package */ final class ProjectionRenderer {
 
   /**
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java
index 36589c5e34..adbeb7773d 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java
@@ -15,7 +15,6 @@
  */
 package com.google.android.exoplayer2.ui.spherical;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.PointF;
 import android.graphics.SurfaceTexture;
@@ -52,7 +51,6 @@ import javax.microedition.khronos.opengles.GL10;
  * apply the touch and sensor rotations in the correct order or the user's touch manipulations won't
  * match what they expect.
  */
-@TargetApi(15)
 public final class SphericalSurfaceView extends GLSurfaceView {
 
   /**
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashDownloadTest.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashDownloadTest.java
index 0dd05e7fd3..7d000de4b0 100644
--- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashDownloadTest.java
+++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashDownloadTest.java
@@ -89,10 +89,6 @@ public final class DashDownloadTest {
 
   @Test
   public void testDownload() throws Exception {
-    if (Util.SDK_INT < 16) {
-      return; // Pass.
-    }
-
     DashDownloader dashDownloader = downloadContent();
     dashDownloader.download();
 
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java
index 9a54ffd07c..56806183cc 100644
--- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java
+++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java
@@ -103,10 +103,6 @@ public final class DashStreamingTest {
 
   @Test
   public void testH264Fixed() {
-    if (Util.SDK_INT < 16) {
-      // Pass.
-      return;
-    }
     testRunner
         .setStreamName("test_h264_fixed")
         .setManifestUrl(DashTestData.H264_MANIFEST)
@@ -118,7 +114,7 @@ public final class DashStreamingTest {
 
   @Test
   public void testH264Adaptive() throws DecoderQueryException {
-    if (Util.SDK_INT < 16 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) {
+    if (shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) {
       // Pass.
       return;
     }
@@ -134,7 +130,7 @@ public final class DashStreamingTest {
 
   @Test
   public void testH264AdaptiveWithSeeking() throws DecoderQueryException {
-    if (Util.SDK_INT < 16 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) {
+    if (shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) {
       // Pass.
       return;
     }
@@ -152,7 +148,7 @@ public final class DashStreamingTest {
 
   @Test
   public void testH264AdaptiveWithRendererDisabling() throws DecoderQueryException {
-    if (Util.SDK_INT < 16 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) {
+    if (shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) {
       // Pass.
       return;
     }
@@ -633,10 +629,6 @@ public final class DashStreamingTest {
 
   @Test
   public void testDecoderInfoH264() throws DecoderQueryException {
-    if (Util.SDK_INT < 16) {
-      // Pass.
-      return;
-    }
     MediaCodecInfo decoderInfo = MediaCodecUtil.getDecoderInfo(MimeTypes.VIDEO_H264, false);
     assertThat(decoderInfo).isNotNull();
     assertThat(Util.SDK_INT < 21 || decoderInfo.adaptive).isTrue();
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
index eb69cc88da..2446094136 100644
--- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
+++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
@@ -205,7 +205,6 @@ public final class DashTestRunner {
   /**
    * A {@link HostedTest} for DASH playback tests.
    */
-  @TargetApi(16)
   private static final class DashHostedTest extends ExoHostedTest {
 
     private final String streamName;
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/DebugRenderersFactory.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/DebugRenderersFactory.java
index 39194d48fe..d480d50b98 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/DebugRenderersFactory.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/DebugRenderersFactory.java
@@ -39,7 +39,6 @@ import java.util.ArrayList;
  * A debug extension of {@link DefaultRenderersFactory}. Provides a video renderer that performs
  * video buffer timestamp assertions.
  */
-@TargetApi(16)
 public class DebugRenderersFactory extends DefaultRenderersFactory {
 
   public DebugRenderersFactory(Context context) {

From 642a0275d84b060f11e19122dca69498a1792a25 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 24 Jan 2019 15:26:59 +0000
Subject: [PATCH 424/832] Propagate ExoCast errors receiver from the receiver
 app

PiperOrigin-RevId: 230717561
---
 .../exoplayer2/ExoPlaybackException.java      | 34 ++++++++++++++++---
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
index 6b84245141..d5ceb3db30 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2;
 
 import android.support.annotation.IntDef;
+import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
@@ -34,7 +35,7 @@ public final class ExoPlaybackException extends Exception {
    */
   @Documented
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({TYPE_SOURCE, TYPE_RENDERER, TYPE_UNEXPECTED})
+  @IntDef({TYPE_SOURCE, TYPE_RENDERER, TYPE_UNEXPECTED, TYPE_REMOTE})
   public @interface Type {}
   /**
    * The error occurred loading data from a {@link MediaSource}.
@@ -54,6 +55,12 @@ public final class ExoPlaybackException extends Exception {
    * Call {@link #getUnexpectedException()} to retrieve the underlying cause.
    */
   public static final int TYPE_UNEXPECTED = 2;
+  /**
+   * The error occurred in a remote component.
+   *
+   * <p>Call {@link #getMessage()} to retrieve the message associated with the error.
+   */
+  public static final int TYPE_REMOTE = 3;
 
   /**
    * The type of the playback failure. One of {@link #TYPE_SOURCE}, {@link #TYPE_RENDERER} and
@@ -66,7 +73,7 @@ public final class ExoPlaybackException extends Exception {
    */
   public final int rendererIndex;
 
-  private final Throwable cause;
+  @Nullable private final Throwable cause;
 
   /**
    * Creates an instance of type {@link #TYPE_SOURCE}.
@@ -99,6 +106,16 @@ public final class ExoPlaybackException extends Exception {
     return new ExoPlaybackException(TYPE_UNEXPECTED, cause, C.INDEX_UNSET);
   }
 
+  /**
+   * Creates an instance of type {@link #TYPE_REMOTE}.
+   *
+   * @param message The message associated with the error.
+   * @return The created instance.
+   */
+  public static ExoPlaybackException createForRemote(String message) {
+    return new ExoPlaybackException(TYPE_REMOTE, message);
+  }
+
   private ExoPlaybackException(@Type int type, Throwable cause, int rendererIndex) {
     super(cause);
     this.type = type;
@@ -106,6 +123,13 @@ public final class ExoPlaybackException extends Exception {
     this.rendererIndex = rendererIndex;
   }
 
+  private ExoPlaybackException(@Type int type, String message) {
+    super(message);
+    this.type = type;
+    rendererIndex = C.INDEX_UNSET;
+    cause = null;
+  }
+
   /**
    * Retrieves the underlying error when {@link #type} is {@link #TYPE_SOURCE}.
    *
@@ -113,7 +137,7 @@ public final class ExoPlaybackException extends Exception {
    */
   public IOException getSourceException() {
     Assertions.checkState(type == TYPE_SOURCE);
-    return (IOException) cause;
+    return (IOException) Assertions.checkNotNull(cause);
   }
 
   /**
@@ -123,7 +147,7 @@ public final class ExoPlaybackException extends Exception {
    */
   public Exception getRendererException() {
     Assertions.checkState(type == TYPE_RENDERER);
-    return (Exception) cause;
+    return (Exception) Assertions.checkNotNull(cause);
   }
 
   /**
@@ -133,7 +157,7 @@ public final class ExoPlaybackException extends Exception {
    */
   public RuntimeException getUnexpectedException() {
     Assertions.checkState(type == TYPE_UNEXPECTED);
-    return (RuntimeException) cause;
+    return (RuntimeException) Assertions.checkNotNull(cause);
   }
 
 }

From 9d19a7a4b67e8ad3e3b3cec0ebc883367e45a261 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 24 Jan 2019 17:19:51 +0000
Subject: [PATCH 425/832] Move parseSelectionFlags with the rest of the
 parse{attribute} methods

PiperOrigin-RevId: 230734189
---
 .../hls/playlist/HlsPlaylistParser.java       | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
index 242711431c..7dba626e70 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
@@ -426,21 +426,6 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
         variableDefinitions);
   }
 
-  @C.SelectionFlags
-  private static int parseSelectionFlags(String line) {
-    int flags = 0;
-    if (parseOptionalBooleanAttribute(line, REGEX_DEFAULT, false)) {
-      flags |= C.SELECTION_FLAG_DEFAULT;
-    }
-    if (parseOptionalBooleanAttribute(line, REGEX_FORCED, false)) {
-      flags |= C.SELECTION_FLAG_FORCED;
-    }
-    if (parseOptionalBooleanAttribute(line, REGEX_AUTOSELECT, false)) {
-      flags |= C.SELECTION_FLAG_AUTOSELECT;
-    }
-    return flags;
-  }
-
   private static HlsMediaPlaylist parseMediaPlaylist(
       HlsMasterPlaylist masterPlaylist, LineIterator iterator, String baseUri) throws IOException {
     @HlsMediaPlaylist.PlaylistType int playlistType = HlsMediaPlaylist.PLAYLIST_TYPE_UNKNOWN;
@@ -661,6 +646,21 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
         segments);
   }
 
+  @C.SelectionFlags
+  private static int parseSelectionFlags(String line) {
+    int flags = 0;
+    if (parseOptionalBooleanAttribute(line, REGEX_DEFAULT, false)) {
+      flags |= C.SELECTION_FLAG_DEFAULT;
+    }
+    if (parseOptionalBooleanAttribute(line, REGEX_FORCED, false)) {
+      flags |= C.SELECTION_FLAG_FORCED;
+    }
+    if (parseOptionalBooleanAttribute(line, REGEX_AUTOSELECT, false)) {
+      flags |= C.SELECTION_FLAG_AUTOSELECT;
+    }
+    return flags;
+  }
+
   private static @Nullable SchemeData parsePlayReadySchemeData(
       String line, Map<String, String> variableDefinitions) throws ParserException {
     String keyFormatVersions =

From 6dde1e67d3a3462cf6a40d290a76bcf32147652e Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 24 Jan 2019 18:12:27 +0000
Subject: [PATCH 426/832] Parse CHANNELS attribute from EXT-X-MEDIA

PiperOrigin-RevId: 230743198
---
 RELEASENOTES.md                               |  3 ++-
 .../hls/playlist/HlsPlaylistParser.java       | 11 ++++++++-
 .../playlist/HlsMasterPlaylistParserTest.java | 23 +++++++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 6afe9bda35..91e3c1127b 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,7 +2,8 @@
 
 ### dev-v2 (not yet released) ###
 
-* Increase `minSdkVersion` to 16 (Jellybean).
+* HLS:
+  * Parse CHANNELS attribute from EXT-X-MEDIA.
 * Support for playing spherical videos on Daydream.
 * Improve decoder re-use between playbacks. TODO: Write and link a blog post
   here ([#2826](https://github.com/google/ExoPlayer/issues/2826)).
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
index 7dba626e70..9e13d6fa0f 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
@@ -101,6 +101,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
       Pattern.compile("AVERAGE-BANDWIDTH=(\\d+)\\b");
   private static final Pattern REGEX_AUDIO = Pattern.compile("AUDIO=\"(.+?)\"");
   private static final Pattern REGEX_BANDWIDTH = Pattern.compile("[^-]BANDWIDTH=(\\d+)\\b");
+  private static final Pattern REGEX_CHANNELS = Pattern.compile("CHANNELS=\"(.+?)\"");
   private static final Pattern REGEX_CODECS = Pattern.compile("CODECS=\"(.+?)\"");
   private static final Pattern REGEX_RESOLUTION = Pattern.compile("RESOLUTION=(\\d+x\\d+)");
   private static final Pattern REGEX_FRAME_RATE = Pattern.compile("FRAME-RATE=([\\d\\.]+)\\b");
@@ -346,6 +347,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
       switch (parseStringAttr(line, REGEX_TYPE, variableDefinitions)) {
         case TYPE_AUDIO:
           String codecs = audioGroupIdToCodecs.get(groupId);
+          int channelCount = parseChannelsAttribute(line, variableDefinitions);
           String sampleMimeType = codecs != null ? MimeTypes.getMediaMimeType(codecs) : null;
           format =
               Format.createAudioContainerFormat(
@@ -355,7 +357,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
                   sampleMimeType,
                   codecs,
                   /* bitrate= */ Format.NO_VALUE,
-                  /* channelCount= */ Format.NO_VALUE,
+                  channelCount,
                   /* sampleRate= */ Format.NO_VALUE,
                   /* initializationData= */ null,
                   selectionFlags,
@@ -661,6 +663,13 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
     return flags;
   }
 
+  private static int parseChannelsAttribute(String line, Map<String, String> variableDefinitions) {
+    String channelsString = parseOptionalStringAttr(line, REGEX_CHANNELS, variableDefinitions);
+    return channelsString != null
+        ? Integer.parseInt(Util.splitAtFirst(channelsString, "/")[0])
+        : Format.NO_VALUE;
+  }
+
   private static @Nullable SchemeData parsePlayReadySchemeData(
       String line, Map<String, String> variableDefinitions) throws ParserException {
     String keyFormatVersions =
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
index 9701171ce9..8b69ba0db2 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
@@ -81,6 +81,18 @@ public class HlsMasterPlaylistParserTest {
           + "CODECS=\"mp4a.40.2,avc1.66.30\",RESOLUTION=304x128\n"
           + "http://example.com/low.m3u8\n";
 
+  private static final String PLAYLIST_WITH_CHANNELS_ATTRIBUTE =
+      " #EXTM3U \n"
+          + "#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"audio\",CHANNELS=\"6\",NAME=\"Eng6\","
+          + "URI=\"something.m3u8\"\n"
+          + "#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"audio\",CHANNELS=\"2/6\",NAME=\"Eng26\","
+          + "URI=\"something2.m3u8\"\n"
+          + "#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"audio\",NAME=\"Eng\","
+          + "URI=\"something3.m3u8\"\n"
+          + "#EXT-X-STREAM-INF:BANDWIDTH=1280000,"
+          + "CODECS=\"mp4a.40.2,avc1.66.30\",AUDIO=\"audio\",RESOLUTION=304x128\n"
+          + "http://example.com/low.m3u8\n";
+
   private static final String PLAYLIST_WITHOUT_CC =
       " #EXTM3U \n"
           + "#EXT-X-MEDIA:TYPE=CLOSED-CAPTIONS,"
@@ -216,6 +228,17 @@ public class HlsMasterPlaylistParserTest {
     assertThat(closedCaptionFormat.language).isEqualTo("es");
   }
 
+  @Test
+  public void testPlaylistWithChannelsAttribute() throws IOException {
+    HlsMasterPlaylist playlist =
+        parseMasterPlaylist(PLAYLIST_URI, PLAYLIST_WITH_CHANNELS_ATTRIBUTE);
+    List<HlsMasterPlaylist.HlsUrl> audios = playlist.audios;
+    assertThat(audios).hasSize(3);
+    assertThat(audios.get(0).format.channelCount).isEqualTo(6);
+    assertThat(audios.get(1).format.channelCount).isEqualTo(2);
+    assertThat(audios.get(2).format.channelCount).isEqualTo(Format.NO_VALUE);
+  }
+
   @Test
   public void testPlaylistWithoutClosedCaptions() throws IOException {
     HlsMasterPlaylist playlist = parseMasterPlaylist(PLAYLIST_URI, PLAYLIST_WITHOUT_CC);

From 582adb748ae1c1beff071b962f5a3ef08d6f01b7 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 25 Jan 2019 11:42:22 +0000
Subject: [PATCH 427/832] Decouple end position from MediaPeriodId again.

If are allowing changing durations of periods, we shouldn't use the end position
of clipped content as part of the id as it may change. This change moves the end
position back to MediaPeriodInfo and adds the next ad group index to the id
instead to ensure we still have unique ids for all content parts.

PiperOrigin-RevId: 230878389
---
 .../android/exoplayer2/MediaPeriodHolder.java | 23 +++++----
 .../android/exoplayer2/MediaPeriodInfo.java   | 29 ++++++++++--
 .../android/exoplayer2/MediaPeriodQueue.java  | 23 +++++----
 .../exoplayer2/source/MediaSource.java        | 47 ++++++++++++-------
 .../exoplayer2/MediaPeriodQueueTest.java      | 40 +++++++++++-----
 5 files changed, 108 insertions(+), 54 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
index 19622c6801..be3fde0fca 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
@@ -89,7 +89,9 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     this.info = info;
     sampleStreams = new SampleStream[rendererCapabilities.length];
     mayRetainStreamFlags = new boolean[rendererCapabilities.length];
-    mediaPeriod = createMediaPeriod(info.id, mediaSource, allocator, info.startPositionUs);
+    mediaPeriod =
+        createMediaPeriod(
+            info.id, mediaSource, allocator, info.startPositionUs, info.endPositionUs);
   }
 
   /**
@@ -294,7 +296,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   public void release() {
     disableTrackSelectionsInResult();
     trackSelectorResult = null;
-    releaseMediaPeriod(info.id, mediaSource, mediaPeriod);
+    releaseMediaPeriod(info.endPositionUs, mediaSource, mediaPeriod);
   }
 
   /**
@@ -399,24 +401,25 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 
   /** Returns a media period corresponding to the given {@code id}. */
   private static MediaPeriod createMediaPeriod(
-      MediaPeriodId id, MediaSource mediaSource, Allocator allocator, long startPositionUs) {
+      MediaPeriodId id,
+      MediaSource mediaSource,
+      Allocator allocator,
+      long startPositionUs,
+      long endPositionUs) {
     MediaPeriod mediaPeriod = mediaSource.createPeriod(id, allocator, startPositionUs);
-    if (id.endPositionUs != C.TIME_UNSET && id.endPositionUs != C.TIME_END_OF_SOURCE) {
+    if (endPositionUs != C.TIME_UNSET && endPositionUs != C.TIME_END_OF_SOURCE) {
       mediaPeriod =
           new ClippingMediaPeriod(
-              mediaPeriod,
-              /* enableInitialDiscontinuity= */ true,
-              /* startUs= */ 0,
-              id.endPositionUs);
+              mediaPeriod, /* enableInitialDiscontinuity= */ true, /* startUs= */ 0, endPositionUs);
     }
     return mediaPeriod;
   }
 
   /** Releases the given {@code mediaPeriod}, logging and suppressing any errors. */
   private static void releaseMediaPeriod(
-      MediaPeriodId id, MediaSource mediaSource, MediaPeriod mediaPeriod) {
+      long endPositionUs, MediaSource mediaSource, MediaPeriod mediaPeriod) {
     try {
-      if (id.endPositionUs != C.TIME_UNSET && id.endPositionUs != C.TIME_END_OF_SOURCE) {
+      if (endPositionUs != C.TIME_UNSET && endPositionUs != C.TIME_END_OF_SOURCE) {
         mediaSource.releasePeriod(((ClippingMediaPeriod) mediaPeriod).mediaPeriod);
       } else {
         mediaSource.releasePeriod(mediaPeriod);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfo.java
index 01de53c4fb..cd4e74b2ef 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfo.java
@@ -33,7 +33,14 @@ import com.google.android.exoplayer2.util.Util;
    */
   public final long contentPositionUs;
   /**
-   * The duration of the media period, like {@link MediaPeriodId#endPositionUs} but with {@link
+   * The end position to which the media period's content is clipped in order to play a following ad
+   * group, in microseconds, or {@link C#TIME_UNSET} if there is no following ad group or if this
+   * media period is an ad. The value {@link C#TIME_END_OF_SOURCE} indicates that a postroll ad
+   * follows at the end of this content media period.
+   */
+  public final long endPositionUs;
+  /**
+   * The duration of the media period, like {@link #endPositionUs} but with {@link
    * C#TIME_END_OF_SOURCE} and {@link C#TIME_UNSET} resolved to the timeline period duration if
    * known.
    */
@@ -53,12 +60,14 @@ import com.google.android.exoplayer2.util.Util;
       MediaPeriodId id,
       long startPositionUs,
       long contentPositionUs,
+      long endPositionUs,
       long durationUs,
       boolean isLastInTimelinePeriod,
       boolean isFinal) {
     this.id = id;
     this.startPositionUs = startPositionUs;
     this.contentPositionUs = contentPositionUs;
+    this.endPositionUs = endPositionUs;
     this.durationUs = durationUs;
     this.isLastInTimelinePeriod = isLastInTimelinePeriod;
     this.isFinal = isFinal;
@@ -72,7 +81,13 @@ import com.google.android.exoplayer2.util.Util;
     return startPositionUs == this.startPositionUs
         ? this
         : new MediaPeriodInfo(
-            id, startPositionUs, contentPositionUs, durationUs, isLastInTimelinePeriod, isFinal);
+            id,
+            startPositionUs,
+            contentPositionUs,
+            endPositionUs,
+            durationUs,
+            isLastInTimelinePeriod,
+            isFinal);
   }
 
   /**
@@ -83,7 +98,13 @@ import com.google.android.exoplayer2.util.Util;
     return contentPositionUs == this.contentPositionUs
         ? this
         : new MediaPeriodInfo(
-            id, startPositionUs, contentPositionUs, durationUs, isLastInTimelinePeriod, isFinal);
+            id,
+            startPositionUs,
+            contentPositionUs,
+            endPositionUs,
+            durationUs,
+            isLastInTimelinePeriod,
+            isFinal);
   }
 
   @Override
@@ -97,6 +118,7 @@ import com.google.android.exoplayer2.util.Util;
     MediaPeriodInfo that = (MediaPeriodInfo) o;
     return startPositionUs == that.startPositionUs
         && contentPositionUs == that.contentPositionUs
+        && endPositionUs == that.endPositionUs
         && durationUs == that.durationUs
         && isLastInTimelinePeriod == that.isLastInTimelinePeriod
         && isFinal == that.isFinal
@@ -109,6 +131,7 @@ import com.google.android.exoplayer2.util.Util;
     result = 31 * result + id.hashCode();
     result = 31 * result + (int) startPositionUs;
     result = 31 * result + (int) contentPositionUs;
+    result = 31 * result + (int) endPositionUs;
     result = 31 * result + (int) durationUs;
     result = 31 * result + (isLastInTimelinePeriod ? 1 : 0);
     result = 31 * result + (isFinal ? 1 : 0);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
index 4585b97529..d6ff320295 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
@@ -353,13 +353,14 @@ import com.google.android.exoplayer2.util.Assertions;
     long durationUs =
         id.isAd()
             ? period.getAdDurationUs(id.adGroupIndex, id.adIndexInAdGroup)
-            : (id.endPositionUs == C.TIME_UNSET || id.endPositionUs == C.TIME_END_OF_SOURCE
+            : (info.endPositionUs == C.TIME_UNSET || info.endPositionUs == C.TIME_END_OF_SOURCE
                 ? period.getDurationUs()
-                : id.endPositionUs);
+                : info.endPositionUs);
     return new MediaPeriodInfo(
         id,
         info.startPositionUs,
         info.contentPositionUs,
+        info.endPositionUs,
         durationUs,
         isLastInPeriod,
         isLastInTimeline);
@@ -398,11 +399,7 @@ import com.google.android.exoplayer2.util.Assertions;
     int adGroupIndex = period.getAdGroupIndexForPositionUs(positionUs);
     if (adGroupIndex == C.INDEX_UNSET) {
       int nextAdGroupIndex = period.getAdGroupIndexAfterPositionUs(positionUs);
-      long endPositionUs =
-          nextAdGroupIndex == C.INDEX_UNSET
-              ? C.TIME_UNSET
-              : period.getAdGroupTimeUs(nextAdGroupIndex);
-      return new MediaPeriodId(periodUid, windowSequenceNumber, endPositionUs);
+      return new MediaPeriodId(periodUid, windowSequenceNumber, nextAdGroupIndex);
     } else {
       int adIndexInAdGroup = period.getFirstAdIndexToPlay(adGroupIndex);
       return new MediaPeriodId(periodUid, adGroupIndex, adIndexInAdGroup, windowSequenceNumber);
@@ -630,7 +627,7 @@ import com.google.android.exoplayer2.util.Assertions;
       }
     } else {
       // Play the next ad group if it's available.
-      int nextAdGroupIndex = period.getAdGroupIndexForPositionUs(mediaPeriodInfo.id.endPositionUs);
+      int nextAdGroupIndex = period.getAdGroupIndexForPositionUs(mediaPeriodInfo.endPositionUs);
       if (nextAdGroupIndex == C.INDEX_UNSET) {
         // The next ad group can't be played. Play content from the previous end position instead.
         return getMediaPeriodInfoForContent(
@@ -688,6 +685,7 @@ import com.google.android.exoplayer2.util.Assertions;
         id,
         startPositionUs,
         contentPositionUs,
+        /* endPositionUs= */ C.TIME_UNSET,
         durationUs,
         /* isLastInTimelinePeriod= */ false,
         /* isFinal= */ false);
@@ -696,13 +694,13 @@ import com.google.android.exoplayer2.util.Assertions;
   private MediaPeriodInfo getMediaPeriodInfoForContent(
       Object periodUid, long startPositionUs, long windowSequenceNumber) {
     int nextAdGroupIndex = period.getAdGroupIndexAfterPositionUs(startPositionUs);
+    MediaPeriodId id = new MediaPeriodId(periodUid, windowSequenceNumber, nextAdGroupIndex);
+    boolean isLastInPeriod = isLastInPeriod(id);
+    boolean isLastInTimeline = isLastInTimeline(id, isLastInPeriod);
     long endPositionUs =
         nextAdGroupIndex != C.INDEX_UNSET
             ? period.getAdGroupTimeUs(nextAdGroupIndex)
             : C.TIME_UNSET;
-    MediaPeriodId id = new MediaPeriodId(periodUid, windowSequenceNumber, endPositionUs);
-    boolean isLastInPeriod = isLastInPeriod(id);
-    boolean isLastInTimeline = isLastInTimeline(id, isLastInPeriod);
     long durationUs =
         endPositionUs == C.TIME_UNSET || endPositionUs == C.TIME_END_OF_SOURCE
             ? period.durationUs
@@ -711,13 +709,14 @@ import com.google.android.exoplayer2.util.Assertions;
         id,
         startPositionUs,
         /* contentPositionUs= */ C.TIME_UNSET,
+        endPositionUs,
         durationUs,
         isLastInPeriod,
         isLastInTimeline);
   }
 
   private boolean isLastInPeriod(MediaPeriodId id) {
-    return !id.isAd() && id.endPositionUs == C.TIME_UNSET;
+    return !id.isAd() && id.nextAdGroupIndex == C.INDEX_UNSET;
   }
 
   private boolean isLastInTimeline(MediaPeriodId id, boolean isLastMediaPeriodInPeriod) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
index 1419f9a98f..20346b781f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
@@ -89,12 +89,10 @@ public interface MediaSource {
     public final long windowSequenceNumber;
 
     /**
-     * The end position to which the media period's content is clipped in order to play a following
-     * ad group, in microseconds, or {@link C#TIME_UNSET} if there is no following ad group or if
-     * this media period is an ad. The value {@link C#TIME_END_OF_SOURCE} indicates that a postroll
-     * ad follows at the end of this content media period.
+     * The index of the next ad group to which the media period's content is clipped, or {@link
+     * C#INDEX_UNSET} if there is no following ad group or if this media period is an ad.
      */
-    public final long endPositionUs;
+    public final int nextAdGroupIndex;
 
     /**
      * Creates a media period identifier for a dummy period which is not part of a buffered sequence
@@ -103,7 +101,7 @@ public interface MediaSource {
      * @param periodUid The unique id of the timeline period.
      */
     public MediaPeriodId(Object periodUid) {
-      this(periodUid, C.INDEX_UNSET);
+      this(periodUid, /* windowSequenceNumber= */ C.INDEX_UNSET);
     }
 
     /**
@@ -114,7 +112,12 @@ public interface MediaSource {
      *     windows this media period is part of.
      */
     public MediaPeriodId(Object periodUid, long windowSequenceNumber) {
-      this(periodUid, C.INDEX_UNSET, C.INDEX_UNSET, windowSequenceNumber, C.TIME_UNSET);
+      this(
+          periodUid,
+          /* adGroupIndex= */ C.INDEX_UNSET,
+          /* adIndexInAdGroup= */ C.INDEX_UNSET,
+          windowSequenceNumber,
+          /* nextAdGroupIndex= */ C.INDEX_UNSET);
     }
 
     /**
@@ -123,11 +126,16 @@ public interface MediaSource {
      * @param periodUid The unique id of the timeline period.
      * @param windowSequenceNumber The sequence number of the window in the buffered sequence of
      *     windows this media period is part of.
-     * @param endPositionUs The end position of the media period within the timeline period, in
-     *     microseconds.
+     * @param nextAdGroupIndex The index of the next ad group to which the media period's content is
+     *     clipped.
      */
-    public MediaPeriodId(Object periodUid, long windowSequenceNumber, long endPositionUs) {
-      this(periodUid, C.INDEX_UNSET, C.INDEX_UNSET, windowSequenceNumber, endPositionUs);
+    public MediaPeriodId(Object periodUid, long windowSequenceNumber, int nextAdGroupIndex) {
+      this(
+          periodUid,
+          /* adGroupIndex= */ C.INDEX_UNSET,
+          /* adIndexInAdGroup= */ C.INDEX_UNSET,
+          windowSequenceNumber,
+          nextAdGroupIndex);
     }
 
     /**
@@ -142,7 +150,12 @@ public interface MediaSource {
      */
     public MediaPeriodId(
         Object periodUid, int adGroupIndex, int adIndexInAdGroup, long windowSequenceNumber) {
-      this(periodUid, adGroupIndex, adIndexInAdGroup, windowSequenceNumber, C.TIME_UNSET);
+      this(
+          periodUid,
+          adGroupIndex,
+          adIndexInAdGroup,
+          windowSequenceNumber,
+          /* nextAdGroupIndex= */ C.INDEX_UNSET);
     }
 
     private MediaPeriodId(
@@ -150,12 +163,12 @@ public interface MediaSource {
         int adGroupIndex,
         int adIndexInAdGroup,
         long windowSequenceNumber,
-        long endPositionUs) {
+        int nextAdGroupIndex) {
       this.periodUid = periodUid;
       this.adGroupIndex = adGroupIndex;
       this.adIndexInAdGroup = adIndexInAdGroup;
       this.windowSequenceNumber = windowSequenceNumber;
-      this.endPositionUs = endPositionUs;
+      this.nextAdGroupIndex = nextAdGroupIndex;
     }
 
     /** Returns a copy of this period identifier but with {@code newPeriodUid} as its period uid. */
@@ -163,7 +176,7 @@ public interface MediaSource {
       return periodUid.equals(newPeriodUid)
           ? this
           : new MediaPeriodId(
-              newPeriodUid, adGroupIndex, adIndexInAdGroup, windowSequenceNumber, endPositionUs);
+              newPeriodUid, adGroupIndex, adIndexInAdGroup, windowSequenceNumber, nextAdGroupIndex);
     }
 
     /**
@@ -187,7 +200,7 @@ public interface MediaSource {
           && adGroupIndex == periodId.adGroupIndex
           && adIndexInAdGroup == periodId.adIndexInAdGroup
           && windowSequenceNumber == periodId.windowSequenceNumber
-          && endPositionUs == periodId.endPositionUs;
+          && nextAdGroupIndex == periodId.nextAdGroupIndex;
     }
 
     @Override
@@ -197,7 +210,7 @@ public interface MediaSource {
       result = 31 * result + adGroupIndex;
       result = 31 * result + adIndexInAdGroup;
       result = 31 * result + (int) windowSequenceNumber;
-      result = 31 * result + (int) endPositionUs;
+      result = 31 * result + nextAdGroupIndex;
       return result;
     }
   }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java b/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java
index e8f43e3fe6..6016ec1db7 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java
@@ -71,7 +71,8 @@ public final class MediaPeriodQueueTest {
         /* startPositionUs= */ 0,
         /* endPositionUs= */ C.TIME_UNSET,
         /* durationUs= */ CONTENT_DURATION_US,
-        /* isLast= */ true);
+        /* isLast= */ true,
+        /* nextAdGroupIndex= */ C.INDEX_UNSET);
   }
 
   @Test
@@ -84,7 +85,8 @@ public final class MediaPeriodQueueTest {
         /* startPositionUs= */ 0,
         /* endPositionUs= */ C.TIME_UNSET,
         /* durationUs= */ CONTENT_DURATION_US,
-        /* isLast= */ true);
+        /* isLast= */ true,
+        /* nextAdGroupIndex= */ C.INDEX_UNSET);
   }
 
   @Test
@@ -97,7 +99,8 @@ public final class MediaPeriodQueueTest {
         /* startPositionUs= */ 0,
         /* endPositionUs= */ FIRST_AD_START_TIME_US,
         /* durationUs= */ FIRST_AD_START_TIME_US,
-        /* isLast= */ false);
+        /* isLast= */ false,
+        /* nextAdGroupIndex= */ 0);
     // The next media period info should be null as we haven't loaded the ad yet.
     advance();
     assertNull(getNextMediaPeriodInfo());
@@ -109,7 +112,8 @@ public final class MediaPeriodQueueTest {
         /* startPositionUs= */ FIRST_AD_START_TIME_US,
         /* endPositionUs= */ SECOND_AD_START_TIME_US,
         /* durationUs= */ SECOND_AD_START_TIME_US,
-        /* isLast= */ false);
+        /* isLast= */ false,
+        /* nextAdGroupIndex= */ 1);
     advance();
     setAdGroupLoaded(/* adGroupIndex= */ 1);
     assertNextMediaPeriodInfoIsAd(
@@ -119,7 +123,8 @@ public final class MediaPeriodQueueTest {
         /* startPositionUs= */ SECOND_AD_START_TIME_US,
         /* endPositionUs= */ C.TIME_UNSET,
         /* durationUs= */ CONTENT_DURATION_US,
-        /* isLast= */ true);
+        /* isLast= */ true,
+        /* nextAdGroupIndex= */ C.INDEX_UNSET);
   }
 
   @Test
@@ -132,7 +137,8 @@ public final class MediaPeriodQueueTest {
         /* startPositionUs= */ 0,
         /* endPositionUs= */ FIRST_AD_START_TIME_US,
         /* durationUs= */ FIRST_AD_START_TIME_US,
-        /* isLast= */ false);
+        /* isLast= */ false,
+        /* nextAdGroupIndex= */ 0);
     advance();
     setAdGroupLoaded(/* adGroupIndex= */ 0);
     assertNextMediaPeriodInfoIsAd(
@@ -142,7 +148,8 @@ public final class MediaPeriodQueueTest {
         /* startPositionUs= */ FIRST_AD_START_TIME_US,
         /* endPositionUs= */ C.TIME_END_OF_SOURCE,
         /* durationUs= */ CONTENT_DURATION_US,
-        /* isLast= */ false);
+        /* isLast= */ false,
+        /* nextAdGroupIndex= */ 1);
     advance();
     setAdGroupLoaded(/* adGroupIndex= */ 1);
     assertNextMediaPeriodInfoIsAd(
@@ -152,7 +159,8 @@ public final class MediaPeriodQueueTest {
         /* startPositionUs= */ CONTENT_DURATION_US,
         /* endPositionUs= */ C.TIME_UNSET,
         /* durationUs= */ CONTENT_DURATION_US,
-        /* isLast= */ true);
+        /* isLast= */ true,
+        /* nextAdGroupIndex= */ C.INDEX_UNSET);
   }
 
   @Test
@@ -162,14 +170,16 @@ public final class MediaPeriodQueueTest {
         /* startPositionUs= */ 0,
         /* endPositionUs= */ C.TIME_END_OF_SOURCE,
         /* durationUs= */ CONTENT_DURATION_US,
-        /* isLast= */ false);
+        /* isLast= */ false,
+        /* nextAdGroupIndex= */ 0);
     advance();
     setAdGroupFailedToLoad(/* adGroupIndex= */ 0);
     assertGetNextMediaPeriodInfoReturnsContentMediaPeriod(
         /* startPositionUs= */ CONTENT_DURATION_US,
         /* endPositionUs= */ C.TIME_UNSET,
         /* durationUs= */ CONTENT_DURATION_US,
-        /* isLast= */ true);
+        /* isLast= */ true,
+        /* nextAdGroupIndex= */ C.INDEX_UNSET);
   }
 
   private void setupInitialTimeline(long initialPositionUs, long... adGroupTimesUs) {
@@ -227,13 +237,18 @@ public final class MediaPeriodQueueTest {
   }
 
   private void assertGetNextMediaPeriodInfoReturnsContentMediaPeriod(
-      long startPositionUs, long endPositionUs, long durationUs, boolean isLast) {
+      long startPositionUs,
+      long endPositionUs,
+      long durationUs,
+      boolean isLast,
+      int nextAdGroupIndex) {
     assertThat(getNextMediaPeriodInfo())
         .isEqualTo(
             new MediaPeriodInfo(
-                new MediaPeriodId(periodUid, /* windowSequenceNumber= */ 0, endPositionUs),
+                new MediaPeriodId(periodUid, /* windowSequenceNumber= */ 0, nextAdGroupIndex),
                 startPositionUs,
                 /* contentPositionUs= */ C.TIME_UNSET,
+                endPositionUs,
                 durationUs,
                 /* isLastInTimelinePeriod= */ isLast,
                 /* isFinal= */ isLast));
@@ -250,6 +265,7 @@ public final class MediaPeriodQueueTest {
                     /* windowSequenceNumber= */ 0),
                 /* startPositionUs= */ 0,
                 contentPositionUs,
+                /* endPositionUs= */ C.TIME_UNSET,
                 /* durationUs= */ C.TIME_UNSET,
                 /* isLastInTimelinePeriod= */ false,
                 /* isFinal= */ false));

From 0cf43fc64ea80ff34ed4dc650260286c5535fd1f Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 25 Jan 2019 12:07:37 +0000
Subject: [PATCH 428/832] Update IMA to 3.10.6

This brings in a memory leak fix.

Issue: #4114
PiperOrigin-RevId: 230880521
---
 extensions/ima/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle
index 22196ff3ab..4d6302c898 100644
--- a/extensions/ima/build.gradle
+++ b/extensions/ima/build.gradle
@@ -31,13 +31,13 @@ android {
 }
 
 dependencies {
-    api 'com.google.ads.interactivemedia.v3:interactivemedia:3.10.2'
+    api 'com.google.ads.interactivemedia.v3:interactivemedia:3.10.6'
     implementation project(modulePrefix + 'library-core')
-    implementation 'com.google.android.gms:play-services-ads:17.1.1'
+    implementation 'com.google.android.gms:play-services-ads:17.1.2'
     // These dependencies are necessary to force the supportLibraryVersion of
     // com.android.support:support-v4 and com.android.support:customtabs to be
     // used. Else older versions are used, for example via:
-    // com.google.android.gms:play-services-ads:17.1.1
+    // com.google.android.gms:play-services-ads:17.1.2
     // |-- com.android.support:customtabs:26.1.0
     implementation 'com.android.support:support-v4:' + supportLibraryVersion
     implementation 'com.android.support:customtabs:' + supportLibraryVersion

From a1c13ca6f5033f713b499e841d407c6e45e161a1 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 25 Jan 2019 12:57:32 +0000
Subject: [PATCH 429/832] Hack to instantiate ExoDatabaseProvider without a
 context

This will allow CachedContentIndex to start using database
storage without us having to change the SimpleCache and
CachedContentIndex constructors to require a Context or a
DatabaseProvider.

PiperOrigin-RevId: 230884501
---
 .../database/ExoDatabaseProvider.java         | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java b/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
index e5bdfbb499..cded324de1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
@@ -16,11 +16,13 @@
 package com.google.android.exoplayer2.database;
 
 import android.content.Context;
+import android.content.ContextWrapper;
 import android.database.Cursor;
 import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import com.google.android.exoplayer2.util.Log;
+import java.io.File;
 
 /**
  * An {@link SQLiteOpenHelper} that provides instances of a standalone ExoPlayer database.
@@ -37,10 +39,25 @@ public final class ExoDatabaseProvider extends SQLiteOpenHelper implements Datab
   private static final int VERSION = 1;
   private static final String TAG = "ExoDatabaseProvider";
 
+  /**
+   * Provides instances of the database located by passing {@link #DATABASE_NAME} to {@link
+   * Context#getDatabasePath(String)}.
+   *
+   * @param context Any context.
+   */
   public ExoDatabaseProvider(Context context) {
     super(context.getApplicationContext(), DATABASE_NAME, /* factory= */ null, VERSION);
   }
 
+  /**
+   * Provides instances of the database located at the specified file.
+   *
+   * @param file The database file.
+   */
+  public ExoDatabaseProvider(File file) {
+    super(new DatabaseFileProvidingContext(file), file.getName(), /* factory= */ null, VERSION);
+  }
+
   @Override
   public void onCreate(SQLiteDatabase db) {
     // Features create their own tables.
@@ -86,4 +103,26 @@ public final class ExoDatabaseProvider extends SQLiteOpenHelper implements Datab
       }
     }
   }
+
+  // TODO: This is fragile. Stop using it if/when SQLiteOpenHelper can be instantiated without a
+  // context [Internal ref: b/123351819], or by injecting a Context into all components that need
+  // to instantiate an ExoDatabaseProvider.
+  /**
+   * A {@link Context} that only implements {@link #getDatabasePath(String)}. This is the only
+   * method used by {@link SQLiteOpenHelper}.
+   */
+  private static class DatabaseFileProvidingContext extends ContextWrapper {
+
+    private final File file;
+
+    public DatabaseFileProvidingContext(File file) {
+      super(/* base= */ null);
+      this.file = file;
+    }
+
+    @Override
+    public File getDatabasePath(String name) {
+      return file;
+    }
+  }
 }

From 3c6b72ee29f5cebc1079648a73c461a26e035fa8 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 25 Jan 2019 13:54:57 +0000
Subject: [PATCH 430/832] Fix nullness test

PiperOrigin-RevId: 230889470
---
 .../google/android/exoplayer2/database/ExoDatabaseProvider.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java b/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
index cded324de1..49c16ebbbf 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
@@ -115,6 +115,7 @@ public final class ExoDatabaseProvider extends SQLiteOpenHelper implements Datab
 
     private final File file;
 
+    @SuppressWarnings("nullness:argument.type.incompatible")
     public DatabaseFileProvidingContext(File file) {
       super(/* base= */ null);
       this.file = file;

From 6b068c6ffbd0cd418cfe865ba6c4329f361ba8e4 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 28 Jan 2019 08:52:42 +0000
Subject: [PATCH 431/832] Clarify LoopingMediaSource documentation

PiperOrigin-RevId: 231171425
---
 .../google/android/exoplayer2/source/LoopingMediaSource.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java
index 0cd87561e7..e19a02b7b3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java
@@ -31,7 +31,7 @@ import java.util.Map;
  * Loops a {@link MediaSource} a specified number of times.
  *
  * <p>Note: To loop a {@link MediaSource} indefinitely, it is usually better to use {@link
- * ExoPlayer#setRepeatMode(int)}.
+ * ExoPlayer#setRepeatMode(int)} instead of this class.
  */
 public final class LoopingMediaSource extends CompositeMediaSource<Void> {
 

From 866835ea03d1ee908a4a8d4fd3b8c69357679285 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 28 Jan 2019 09:02:05 +0000
Subject: [PATCH 432/832] Fix float output capability check

Float output is only possible from API 21, but the high-res int
to float conversion path was checking for 32-bit PCM not float
output capability.

PiperOrigin-RevId: 231172495
---
 .../com/google/android/exoplayer2/audio/DefaultAudioSink.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
index fc515dbdb3..6f3ee63d3d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
@@ -418,7 +418,7 @@ public final class DefaultAudioSink implements AudioSink {
     isInputPcm = Util.isEncodingLinearPcm(inputEncoding);
     shouldConvertHighResIntPcmToFloat =
         enableConvertHighResIntPcmToFloat
-            && supportsOutput(channelCount, C.ENCODING_PCM_32BIT)
+            && supportsOutput(channelCount, C.ENCODING_PCM_FLOAT)
             && Util.isEncodingHighResolutionIntegerPcm(inputEncoding);
     if (isInputPcm) {
       pcmFrameSize = Util.getPcmFrameSize(inputEncoding, channelCount);

From 19144c4c7361d47ee99799fa2b53a134160f3e4f Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 28 Jan 2019 12:51:48 +0000
Subject: [PATCH 433/832] Allow to disable libyuv dependency on LIBVPX

Goal: reduce binary size.
PiperOrigin-RevId: 231198579
---
 RELEASENOTES.md                               |  3 +
 extensions/vp9/README.md                      | 24 -------
 .../exoplayer2/ext/vp9/VpxPlaybackTest.java   |  2 +-
 .../ext/vp9/LibvpxVideoRenderer.java          | 60 ++++-------------
 .../exoplayer2/ext/vp9/VpxDecoder.java        | 13 ++--
 .../exoplayer2/ext/vp9/VpxOutputBuffer.java   | 24 ++-----
 extensions/vp9/src/main/jni/Android.mk        |  8 +--
 extensions/vp9/src/main/jni/vpx_jni.cc        | 64 ++++++-------------
 library/core/proguard-rules.txt               |  2 +-
 .../exoplayer2/DefaultRenderersFactory.java   |  2 -
 10 files changed, 47 insertions(+), 155 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 91e3c1127b..6c72dae654 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -41,6 +41,9 @@
 * Add `Handler` parameter to `ConcatenatingMediaSource` methods which take a
   callback `Runnable`.
 * Remove `player` and `isTopLevelSource` parameters from `MediaSource.prepare`.
+* VP9 extension: Remove RGB output mode and libyuv dependency, and switch to
+  surface YUV output as the default. Remove constructor parameters `scaleToFit`
+  and `useSurfaceYuvOutput`.
 * Change signature of `PlayerNotificationManager.NotificationListener` to better
   fit service requirements. Remove ability to set a custom stop action.
 
diff --git a/extensions/vp9/README.md b/extensions/vp9/README.md
index 306f04d0e2..6f46a4e6ad 100644
--- a/extensions/vp9/README.md
+++ b/extensions/vp9/README.md
@@ -34,26 +34,6 @@ VP9_EXT_PATH="${EXOPLAYER_ROOT}/extensions/vp9/src/main"
 NDK_PATH="<path to Android NDK>"
 ```
 
-* Fetch libvpx and libyuv:
-
-```
-cd "${VP9_EXT_PATH}/jni" && \
-git clone https://chromium.googlesource.com/webm/libvpx libvpx && \
-git clone https://chromium.googlesource.com/libyuv/libyuv libyuv
-```
-
-* Checkout the appropriate branches of libvpx and libyuv (the scripts and
-  makefiles bundled in this repo are known to work only at these versions of the
-  libraries - we will update this periodically as newer versions of
-  libvpx/libyuv are released):
-
-```
-cd "${VP9_EXT_PATH}/jni/libvpx" && \
-git checkout tags/v1.7.0 -b v1.7.0 && \
-cd "${VP9_EXT_PATH}/jni/libyuv" && \
-git checkout 996a2bbd
-```
-
 * Run a script that generates necessary configuration files for libvpx:
 
 ```
@@ -78,10 +58,6 @@ ${NDK_PATH}/ndk-build APP_ABI=all -j4
   * Android config scripts should be re-generated by running
     `generate_libvpx_android_configs.sh`
   * Clean and re-build the project.
-* If you want to use your own version of libvpx or libyuv, place it in
-  `${VP9_EXT_PATH}/jni/libvpx` or `${VP9_EXT_PATH}/jni/libyuv` respectively. But
-  please note that `generate_libvpx_android_configs.sh` and the makefiles need
-  to be modified to work with arbitrary versions of libvpx and libyuv.
 
 ## Using the extension ##
 
diff --git a/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java b/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
index c6d1e667e0..1de461e374 100644
--- a/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
+++ b/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
@@ -114,7 +114,7 @@ public class VpxPlaybackTest {
     @Override
     public void run() {
       Looper.prepare();
-      LibvpxVideoRenderer videoRenderer = new LibvpxVideoRenderer(true, 0);
+      LibvpxVideoRenderer videoRenderer = new LibvpxVideoRenderer(0);
       DefaultTrackSelector trackSelector = new DefaultTrackSelector();
       player = ExoPlayerFactory.newInstance(context, new Renderer[] {videoRenderer}, trackSelector);
       player.addListener(this);
diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
index e61030a2e1..54ccbb40ad 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
@@ -15,8 +15,6 @@
  */
 package com.google.android.exoplayer2.ext.vp9;
 
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.SystemClock;
@@ -109,7 +107,6 @@ public class LibvpxVideoRenderer extends BaseRenderer {
   /** The default input buffer size. */
   private static final int DEFAULT_INPUT_BUFFER_SIZE = 768 * 1024; // Value based on cs/SoftVpx.cpp.
 
-  private final boolean scaleToFit;
   private final boolean disableLoopFilter;
   private final long allowedJoiningTimeMs;
   private final int maxDroppedFramesToNotify;
@@ -119,7 +116,6 @@ public class LibvpxVideoRenderer extends BaseRenderer {
   private final TimedValueQueue<Format> formatQueue;
   private final DecoderInputBuffer flagsOnlyBuffer;
   private final DrmSessionManager<ExoMediaCrypto> drmSessionManager;
-  private final boolean useSurfaceYuvOutput;
 
   private Format format;
   private Format pendingFormat;
@@ -133,7 +129,6 @@ public class LibvpxVideoRenderer extends BaseRenderer {
   private @ReinitializationState int decoderReinitializationState;
   private boolean decoderReceivedBuffers;
 
-  private Bitmap bitmap;
   private boolean renderedFirstFrame;
   private long initialPositionUs;
   private long joiningDeadlineMs;
@@ -158,16 +153,14 @@ public class LibvpxVideoRenderer extends BaseRenderer {
   protected DecoderCounters decoderCounters;
 
   /**
-   * @param scaleToFit Whether video frames should be scaled to fit when rendering.
    * @param allowedJoiningTimeMs The maximum duration in milliseconds for which this video renderer
    *     can attempt to seamlessly join an ongoing playback.
    */
-  public LibvpxVideoRenderer(boolean scaleToFit, long allowedJoiningTimeMs) {
-    this(scaleToFit, allowedJoiningTimeMs, null, null, 0);
+  public LibvpxVideoRenderer(long allowedJoiningTimeMs) {
+    this(allowedJoiningTimeMs, null, null, 0);
   }
 
   /**
-   * @param scaleToFit Whether video frames should be scaled to fit when rendering.
    * @param allowedJoiningTimeMs The maximum duration in milliseconds for which this video renderer
    *     can attempt to seamlessly join an ongoing playback.
    * @param eventHandler A handler to use when delivering events to {@code eventListener}. May be
@@ -176,23 +169,22 @@ public class LibvpxVideoRenderer extends BaseRenderer {
    * @param maxDroppedFramesToNotify The maximum number of frames that can be dropped between
    *     invocations of {@link VideoRendererEventListener#onDroppedFrames(int, long)}.
    */
-  public LibvpxVideoRenderer(boolean scaleToFit, long allowedJoiningTimeMs,
-      Handler eventHandler, VideoRendererEventListener eventListener,
+  public LibvpxVideoRenderer(
+      long allowedJoiningTimeMs,
+      Handler eventHandler,
+      VideoRendererEventListener eventListener,
       int maxDroppedFramesToNotify) {
     this(
-        scaleToFit,
         allowedJoiningTimeMs,
         eventHandler,
         eventListener,
         maxDroppedFramesToNotify,
         /* drmSessionManager= */ null,
         /* playClearSamplesWithoutKeys= */ false,
-        /* disableLoopFilter= */ false,
-        /* useSurfaceYuvOutput= */ false);
+        /* disableLoopFilter= */ false);
   }
 
   /**
-   * @param scaleToFit Whether video frames should be scaled to fit when rendering.
    * @param allowedJoiningTimeMs The maximum duration in milliseconds for which this video renderer
    *     can attempt to seamlessly join an ongoing playback.
    * @param eventHandler A handler to use when delivering events to {@code eventListener}. May be
@@ -208,26 +200,21 @@ public class LibvpxVideoRenderer extends BaseRenderer {
    *     permitted to play clear regions of encrypted media files before {@code drmSessionManager}
    *     has obtained the keys necessary to decrypt encrypted regions of the media.
    * @param disableLoopFilter Disable the libvpx in-loop smoothing filter.
-   * @param useSurfaceYuvOutput Directly output YUV to the Surface via ANativeWindow.
    */
   public LibvpxVideoRenderer(
-      boolean scaleToFit,
       long allowedJoiningTimeMs,
       Handler eventHandler,
       VideoRendererEventListener eventListener,
       int maxDroppedFramesToNotify,
       DrmSessionManager<ExoMediaCrypto> drmSessionManager,
       boolean playClearSamplesWithoutKeys,
-      boolean disableLoopFilter,
-      boolean useSurfaceYuvOutput) {
+      boolean disableLoopFilter) {
     super(C.TRACK_TYPE_VIDEO);
-    this.scaleToFit = scaleToFit;
     this.disableLoopFilter = disableLoopFilter;
     this.allowedJoiningTimeMs = allowedJoiningTimeMs;
     this.maxDroppedFramesToNotify = maxDroppedFramesToNotify;
     this.drmSessionManager = drmSessionManager;
     this.playClearSamplesWithoutKeys = playClearSamplesWithoutKeys;
-    this.useSurfaceYuvOutput = useSurfaceYuvOutput;
     joiningDeadlineMs = C.TIME_UNSET;
     clearReportedVideoSize();
     formatHolder = new FormatHolder();
@@ -586,18 +573,14 @@ public class LibvpxVideoRenderer extends BaseRenderer {
    */
   protected void renderOutputBuffer(VpxOutputBuffer outputBuffer) throws VpxDecoderException {
     int bufferMode = outputBuffer.mode;
-    boolean renderRgb = bufferMode == VpxDecoder.OUTPUT_MODE_RGB && surface != null;
     boolean renderSurface = bufferMode == VpxDecoder.OUTPUT_MODE_SURFACE_YUV && surface != null;
     boolean renderYuv = bufferMode == VpxDecoder.OUTPUT_MODE_YUV && outputBufferRenderer != null;
     lastRenderTimeUs = SystemClock.elapsedRealtime() * 1000;
-    if (!renderRgb && !renderYuv && !renderSurface) {
+    if (!renderYuv && !renderSurface) {
       dropOutputBuffer(outputBuffer);
     } else {
       maybeNotifyVideoSizeChanged(outputBuffer.width, outputBuffer.height);
-      if (renderRgb) {
-        renderRgbFrame(outputBuffer, scaleToFit);
-        outputBuffer.release();
-      } else if (renderYuv) {
+      if (renderYuv) {
         outputBufferRenderer.setOutputBuffer(outputBuffer);
         // The renderer will release the buffer.
       } else { // renderSurface
@@ -675,8 +658,7 @@ public class LibvpxVideoRenderer extends BaseRenderer {
       this.surface = surface;
       this.outputBufferRenderer = outputBufferRenderer;
       if (surface != null) {
-        outputMode =
-            useSurfaceYuvOutput ? VpxDecoder.OUTPUT_MODE_SURFACE_YUV : VpxDecoder.OUTPUT_MODE_RGB;
+        outputMode = VpxDecoder.OUTPUT_MODE_SURFACE_YUV;
       } else {
         outputMode =
             outputBufferRenderer != null ? VpxDecoder.OUTPUT_MODE_YUV : VpxDecoder.OUTPUT_MODE_NONE;
@@ -739,8 +721,7 @@ public class LibvpxVideoRenderer extends BaseRenderer {
               NUM_OUTPUT_BUFFERS,
               initialInputBufferSize,
               mediaCrypto,
-              disableLoopFilter,
-              useSurfaceYuvOutput);
+              disableLoopFilter);
       decoder.setOutputMode(outputMode);
       TraceUtil.endSection();
       long decoderInitializedTimestamp = SystemClock.elapsedRealtime();
@@ -940,23 +921,6 @@ public class LibvpxVideoRenderer extends BaseRenderer {
     return drmSessionState != DrmSession.STATE_OPENED_WITH_KEYS;
   }
 
-  private void renderRgbFrame(VpxOutputBuffer outputBuffer, boolean scale) {
-    if (bitmap == null
-        || bitmap.getWidth() != outputBuffer.width
-        || bitmap.getHeight() != outputBuffer.height) {
-      bitmap = Bitmap.createBitmap(outputBuffer.width, outputBuffer.height, Bitmap.Config.RGB_565);
-    }
-    bitmap.copyPixelsFromBuffer(outputBuffer.data);
-    Canvas canvas = surface.lockCanvas(null);
-    if (scale) {
-      canvas.scale(
-          ((float) canvas.getWidth()) / outputBuffer.width,
-          ((float) canvas.getHeight()) / outputBuffer.height);
-    }
-    canvas.drawBitmap(bitmap, 0, 0, null);
-    surface.unlockCanvasAndPost(canvas);
-  }
-
   private void setJoiningDeadlineMs() {
     joiningDeadlineMs = allowedJoiningTimeMs > 0
         ? (SystemClock.elapsedRealtime() + allowedJoiningTimeMs) : C.TIME_UNSET;
diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java
index 51ef8e9bcf..f1de63df01 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java
@@ -31,8 +31,7 @@ import java.nio.ByteBuffer;
 
   public static final int OUTPUT_MODE_NONE = -1;
   public static final int OUTPUT_MODE_YUV = 0;
-  public static final int OUTPUT_MODE_RGB = 1;
-  public static final int OUTPUT_MODE_SURFACE_YUV = 2;
+  public static final int OUTPUT_MODE_SURFACE_YUV = 1;
 
   private static final int NO_ERROR = 0;
   private static final int DECODE_ERROR = 1;
@@ -52,7 +51,6 @@ import java.nio.ByteBuffer;
    * @param exoMediaCrypto The {@link ExoMediaCrypto} object required for decoding encrypted
    *     content. Maybe null and can be ignored if decoder does not handle encrypted content.
    * @param disableLoopFilter Disable the libvpx in-loop smoothing filter.
-   * @param enableSurfaceYuvOutputMode Whether OUTPUT_MODE_SURFACE_YUV is allowed.
    * @throws VpxDecoderException Thrown if an exception occurs when initializing the decoder.
    */
   public VpxDecoder(
@@ -60,8 +58,7 @@ import java.nio.ByteBuffer;
       int numOutputBuffers,
       int initialInputBufferSize,
       ExoMediaCrypto exoMediaCrypto,
-      boolean disableLoopFilter,
-      boolean enableSurfaceYuvOutputMode)
+      boolean disableLoopFilter)
       throws VpxDecoderException {
     super(new VpxInputBuffer[numInputBuffers], new VpxOutputBuffer[numOutputBuffers]);
     if (!VpxLibrary.isAvailable()) {
@@ -71,7 +68,7 @@ import java.nio.ByteBuffer;
     if (exoMediaCrypto != null && !VpxLibrary.vpxIsSecureDecodeSupported()) {
       throw new VpxDecoderException("Vpx decoder does not support secure decode.");
     }
-    vpxDecContext = vpxInit(disableLoopFilter, enableSurfaceYuvOutputMode);
+    vpxDecContext = vpxInit(disableLoopFilter, true);
     if (vpxDecContext == 0) {
       throw new VpxDecoderException("Failed to initialize decoder");
     }
@@ -86,8 +83,8 @@ import java.nio.ByteBuffer;
   /**
    * Sets the output mode for frames rendered by the decoder.
    *
-   * @param outputMode The output mode. One of {@link #OUTPUT_MODE_NONE}, {@link #OUTPUT_MODE_RGB}
-   *     and {@link #OUTPUT_MODE_YUV}.
+   * @param outputMode The output mode. One of {@link #OUTPUT_MODE_NONE} and {@link
+   *     #OUTPUT_MODE_YUV}.
    */
   public void setOutputMode(int outputMode) {
     this.outputMode = outputMode;
diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java
index 725d94819b..22330e0a05 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java
@@ -60,36 +60,20 @@ public final class VpxOutputBuffer extends OutputBuffer {
    * Initializes the buffer.
    *
    * @param timeUs The presentation timestamp for the buffer, in microseconds.
-   * @param mode The output mode. One of {@link VpxDecoder#OUTPUT_MODE_NONE},
-   *     {@link VpxDecoder#OUTPUT_MODE_RGB} and {@link VpxDecoder#OUTPUT_MODE_YUV}.
+   * @param mode The output mode. One of {@link VpxDecoder#OUTPUT_MODE_NONE} and {@link
+   *     VpxDecoder#OUTPUT_MODE_YUV}.
    */
   public void init(long timeUs, int mode) {
     this.timeUs = timeUs;
     this.mode = mode;
   }
 
-  /**
-   * Resizes the buffer based on the given dimensions. Called via JNI after decoding completes.
-   * @return Whether the buffer was resized successfully.
-   */
-  public boolean initForRgbFrame(int width, int height) {
-    this.width = width;
-    this.height = height;
-    this.yuvPlanes = null;
-    if (!isSafeToMultiply(width, height) || !isSafeToMultiply(width * height, 2)) {
-      return false;
-    }
-    int minimumRgbSize = width * height * 2;
-    initData(minimumRgbSize);
-    return true;
-  }
-
   /**
    * Resizes the buffer based on the given stride. Called via JNI after decoding completes.
+   *
    * @return Whether the buffer was resized successfully.
    */
-  public boolean initForYuvFrame(int width, int height, int yStride, int uvStride,
-      int colorspace) {
+  public boolean initForYuvFrame(int width, int height, int yStride, int uvStride, int colorspace) {
     this.width = width;
     this.height = height;
     this.colorspace = colorspace;
diff --git a/extensions/vp9/src/main/jni/Android.mk b/extensions/vp9/src/main/jni/Android.mk
index fdcdc57b41..cb7571a1b0 100644
--- a/extensions/vp9/src/main/jni/Android.mk
+++ b/extensions/vp9/src/main/jni/Android.mk
@@ -17,12 +17,6 @@
 WORKING_DIR := $(call my-dir)
 include $(CLEAR_VARS)
 LIBVPX_ROOT := $(WORKING_DIR)/libvpx
-LIBYUV_ROOT := $(WORKING_DIR)/libyuv
-
-# build libyuv_static.a
-LOCAL_PATH := $(WORKING_DIR)
-LIBYUV_DISABLE_JPEG := "yes"
-include $(LIBYUV_ROOT)/Android.mk
 
 # build libvpx.so
 LOCAL_PATH := $(WORKING_DIR)
@@ -37,7 +31,7 @@ LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := vpx_jni.cc
 LOCAL_LDLIBS := -llog -lz -lm -landroid
 LOCAL_SHARED_LIBRARIES := libvpx
-LOCAL_STATIC_LIBRARIES := libyuv_static cpufeatures
+LOCAL_STATIC_LIBRARIES := cpufeatures
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,android/cpufeatures)
diff --git a/extensions/vp9/src/main/jni/vpx_jni.cc b/extensions/vp9/src/main/jni/vpx_jni.cc
index 875e46d40f..275687261e 100644
--- a/extensions/vp9/src/main/jni/vpx_jni.cc
+++ b/extensions/vp9/src/main/jni/vpx_jni.cc
@@ -30,8 +30,6 @@
 #include <cstring>
 #include <new>
 
-#include "libyuv.h"  // NOLINT
-
 #define VPX_CODEC_DISABLE_COMPAT 1
 #include "vpx/vpx_decoder.h"
 #include "vpx/vp8dx.h"
@@ -61,7 +59,6 @@
       (JNIEnv* env, jobject thiz, ##__VA_ARGS__)\
 
 // JNI references for VpxOutputBuffer class.
-static jmethodID initForRgbFrame;
 static jmethodID initForYuvFrame;
 static jfieldID dataField;
 static jfieldID outputModeField;
@@ -393,11 +390,7 @@ class JniBufferManager {
 };
 
 struct JniCtx {
-  JniCtx(bool enableBufferManager) {
-    if (enableBufferManager) {
-      buffer_manager = new JniBufferManager();
-    }
-  }
+  JniCtx() { buffer_manager = new JniBufferManager(); }
 
   ~JniCtx() {
     if (native_window) {
@@ -440,9 +433,8 @@ int vpx_release_frame_buffer(void* priv, vpx_codec_frame_buffer_t* fb) {
   return buffer_manager->release(*(int*)fb->priv);
 }
 
-DECODER_FUNC(jlong, vpxInit, jboolean disableLoopFilter,
-             jboolean enableBufferManager) {
-  JniCtx* context = new JniCtx(enableBufferManager);
+jlong vpxInit(JNIEnv* env, jboolean disableLoopFilter) {
+  JniCtx* context = new JniCtx();
   context->decoder = new vpx_codec_ctx_t();
   vpx_codec_dec_cfg_t cfg = {0, 0, 0};
   cfg.threads = android_getCpuCount();
@@ -469,14 +461,12 @@ DECODER_FUNC(jlong, vpxInit, jboolean disableLoopFilter,
     }
 #endif
   }
-  if (enableBufferManager) {
-    err = vpx_codec_set_frame_buffer_functions(
-        context->decoder, vpx_get_frame_buffer, vpx_release_frame_buffer,
-        context->buffer_manager);
-    if (err) {
-      LOGE("ERROR: Failed to set libvpx frame buffer functions, error = %d.",
-           err);
-    }
+  err = vpx_codec_set_frame_buffer_functions(
+      context->decoder, vpx_get_frame_buffer, vpx_release_frame_buffer,
+      context->buffer_manager);
+  if (err) {
+    LOGE("ERROR: Failed to set libvpx frame buffer functions, error = %d.",
+         err);
   }
 
   // Populate JNI References.
@@ -484,8 +474,6 @@ DECODER_FUNC(jlong, vpxInit, jboolean disableLoopFilter,
       "com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer");
   initForYuvFrame = env->GetMethodID(outputBufferClass, "initForYuvFrame",
                                      "(IIIII)Z");
-  initForRgbFrame = env->GetMethodID(outputBufferClass, "initForRgbFrame",
-                                     "(II)Z");
   dataField = env->GetFieldID(outputBufferClass, "data",
                               "Ljava/nio/ByteBuffer;");
   outputModeField = env->GetFieldID(outputBufferClass, "mode", "I");
@@ -494,6 +482,15 @@ DECODER_FUNC(jlong, vpxInit, jboolean disableLoopFilter,
   return reinterpret_cast<intptr_t>(context);
 }
 
+DECODER_FUNC(jlong, vpxInit, jboolean disableLoopFilter,
+             jboolean enableBufferManager) {
+  return vpxInit(env, disableLoopFilter);
+}
+
+DECODER_FUNC(jlong, vpxInitilization, jboolean disableLoopFilter) {
+  return vpxInit(env, disableLoopFilter);
+}
+
 DECODER_FUNC(jlong, vpxDecode, jlong jContext, jobject encoded, jint len) {
   JniCtx* const context = reinterpret_cast<JniCtx*>(jContext);
   const uint8_t* const buffer =
@@ -537,28 +534,10 @@ DECODER_FUNC(jint, vpxGetFrame, jlong jContext, jobject jOutputBuffer) {
   }
 
   const int kOutputModeYuv = 0;
-  const int kOutputModeRgb = 1;
-  const int kOutputModeSurfaceYuv = 2;
+  const int kOutputModeSurfaceYuv = 1;
 
   int outputMode = env->GetIntField(jOutputBuffer, outputModeField);
-  if (outputMode == kOutputModeRgb) {
-    // resize buffer if required.
-    jboolean initResult = env->CallBooleanMethod(jOutputBuffer, initForRgbFrame,
-                                                 img->d_w, img->d_h);
-    if (env->ExceptionCheck() || !initResult) {
-      return -1;
-    }
-
-    // get pointer to the data buffer.
-    const jobject dataObject = env->GetObjectField(jOutputBuffer, dataField);
-    uint8_t* const dst =
-        reinterpret_cast<uint8_t*>(env->GetDirectBufferAddress(dataObject));
-
-    libyuv::I420ToRGB565(img->planes[VPX_PLANE_Y], img->stride[VPX_PLANE_Y],
-                         img->planes[VPX_PLANE_U], img->stride[VPX_PLANE_U],
-                         img->planes[VPX_PLANE_V], img->stride[VPX_PLANE_V],
-                         dst, img->d_w * 2, img->d_w, img->d_h);
-  } else if (outputMode == kOutputModeYuv) {
+  if (outputMode == kOutputModeYuv) {
     const int kColorspaceUnknown = 0;
     const int kColorspaceBT601 = 1;
     const int kColorspaceBT709 = 2;
@@ -616,9 +595,6 @@ DECODER_FUNC(jint, vpxGetFrame, jlong jContext, jobject jOutputBuffer) {
     }
   } else if (outputMode == kOutputModeSurfaceYuv &&
              img->fmt != VPX_IMG_FMT_I42016) {
-    if (!context->buffer_manager) {
-      return -1;  // enableBufferManager was not set in vpxInit.
-    }
     int id = *(int*)img->fb_priv;
     context->buffer_manager->add_ref(id);
     JniFrameBuffer* jfb = context->buffer_manager->get_buffer(id);
diff --git a/library/core/proguard-rules.txt b/library/core/proguard-rules.txt
index 5aec86ba8c..4fe182d34a 100644
--- a/library/core/proguard-rules.txt
+++ b/library/core/proguard-rules.txt
@@ -3,7 +3,7 @@
 # Constructors accessed via reflection in DefaultRenderersFactory
 -dontnote com.google.android.exoplayer2.ext.vp9.LibvpxVideoRenderer
 -keepclassmembers class com.google.android.exoplayer2.ext.vp9.LibvpxVideoRenderer {
-  <init>(boolean, long, android.os.Handler, com.google.android.exoplayer2.video.VideoRendererEventListener, int);
+  <init>(long, android.os.Handler, com.google.android.exoplayer2.video.VideoRendererEventListener, int);
 }
 -dontnote com.google.android.exoplayer2.ext.opus.LibopusAudioRenderer
 -keepclassmembers class com.google.android.exoplayer2.ext.opus.LibopusAudioRenderer {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
index 6ccda2b8e9..bb73353b94 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
@@ -233,7 +233,6 @@ public class DefaultRenderersFactory implements RenderersFactory {
       Class<?> clazz = Class.forName("com.google.android.exoplayer2.ext.vp9.LibvpxVideoRenderer");
       Constructor<?> constructor =
           clazz.getConstructor(
-              boolean.class,
               long.class,
               android.os.Handler.class,
               com.google.android.exoplayer2.video.VideoRendererEventListener.class,
@@ -242,7 +241,6 @@ public class DefaultRenderersFactory implements RenderersFactory {
       Renderer renderer =
           (Renderer)
               constructor.newInstance(
-                  true,
                   allowedVideoJoiningTimeMs,
                   eventHandler,
                   eventListener,

From bac8dfea12d307c45cb59dcca55f725f043b258e Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Mon, 28 Jan 2019 16:24:47 +0000
Subject: [PATCH 434/832] Add DownloadState not met requirement stop flags

PiperOrigin-RevId: 231223201
---
 .../offline/DefaultDownloadIndex.java         | 15 ++++--
 .../exoplayer2/offline/DownloadIndexUtil.java |  2 +
 .../exoplayer2/offline/DownloadManager.java   | 49 +++++++++++--------
 .../exoplayer2/offline/DownloadState.java     | 27 +++++++---
 .../scheduler/RequirementsWatcher.java        | 28 +++--------
 .../offline/DefaultDownloadIndexTest.java     | 15 +++++-
 6 files changed, 81 insertions(+), 55 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
index 28a5abafb9..71ee76d0f7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -132,6 +132,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
     private static final String COLUMN_TOTAL_BYTES = "total_bytes";
     private static final String COLUMN_FAILURE_REASON = "failure_reason";
     private static final String COLUMN_STOP_FLAGS = "stop_flags";
+    private static final String COLUMN_NOT_MET_REQUIREMENTS = "not_met_requirements";
     private static final String COLUMN_START_TIME_MS = "start_time_ms";
     private static final String COLUMN_UPDATE_TIME_MS = "update_time_ms";
     private static final String COLUMN_STREAM_KEYS = "stream_keys";
@@ -147,10 +148,11 @@ public final class DefaultDownloadIndex implements DownloadIndex {
     private static final int COLUMN_INDEX_TOTAL_BYTES = 7;
     private static final int COLUMN_INDEX_FAILURE_REASON = 8;
     private static final int COLUMN_INDEX_STOP_FLAGS = 9;
-    private static final int COLUMN_INDEX_START_TIME_MS = 10;
-    private static final int COLUMN_INDEX_UPDATE_TIME_MS = 11;
-    private static final int COLUMN_INDEX_STREAM_KEYS = 12;
-    private static final int COLUMN_INDEX_CUSTOM_METADATA = 13;
+    private static final int COLUMN_INDEX_NOT_MET_REQUIREMENTS = 10;
+    private static final int COLUMN_INDEX_START_TIME_MS = 11;
+    private static final int COLUMN_INDEX_UPDATE_TIME_MS = 12;
+    private static final int COLUMN_INDEX_STREAM_KEYS = 13;
+    private static final int COLUMN_INDEX_CUSTOM_METADATA = 14;
 
     private static final String COLUMN_SELECTION_ID = COLUMN_ID + " = ?";
 
@@ -166,6 +168,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
           COLUMN_TOTAL_BYTES,
           COLUMN_FAILURE_REASON,
           COLUMN_STOP_FLAGS,
+          COLUMN_NOT_MET_REQUIREMENTS,
           COLUMN_START_TIME_MS,
           COLUMN_UPDATE_TIME_MS,
           COLUMN_STREAM_KEYS,
@@ -197,6 +200,8 @@ public final class DefaultDownloadIndex implements DownloadIndex {
             + " INTEGER NOT NULL,"
             + COLUMN_STOP_FLAGS
             + " INTEGER NOT NULL,"
+            + COLUMN_NOT_MET_REQUIREMENTS
+            + " INTEGER NOT NULL,"
             + COLUMN_START_TIME_MS
             + " INTEGER NOT NULL,"
             + COLUMN_UPDATE_TIME_MS
@@ -241,6 +246,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
       values.put(COLUMN_TOTAL_BYTES, downloadState.totalBytes);
       values.put(COLUMN_FAILURE_REASON, downloadState.failureReason);
       values.put(COLUMN_STOP_FLAGS, downloadState.stopFlags);
+      values.put(COLUMN_NOT_MET_REQUIREMENTS, downloadState.notMetRequirements);
       values.put(COLUMN_START_TIME_MS, downloadState.startTimeMs);
       values.put(COLUMN_UPDATE_TIME_MS, downloadState.updateTimeMs);
       values.put(COLUMN_STREAM_KEYS, encodeStreamKeys(downloadState.streamKeys));
@@ -312,6 +318,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
           cursor.getLong(COLUMN_INDEX_TOTAL_BYTES),
           cursor.getInt(COLUMN_INDEX_FAILURE_REASON),
           cursor.getInt(COLUMN_INDEX_STOP_FLAGS),
+          cursor.getInt(COLUMN_INDEX_NOT_MET_REQUIREMENTS),
           cursor.getLong(COLUMN_INDEX_START_TIME_MS),
           cursor.getLong(COLUMN_INDEX_UPDATE_TIME_MS),
           decodeStreamKeys(cursor.getString(COLUMN_INDEX_STREAM_KEYS)),
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
index 63602c7641..e0c914408b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
@@ -115,6 +115,7 @@ public final class DownloadIndexUtil {
         /* totalBytes= */ C.LENGTH_UNSET,
         downloadState.failureReason,
         downloadState.stopFlags,
+        downloadState.notMetRequirements,
         downloadState.startTimeMs,
         downloadState.updateTimeMs,
         newKeys,
@@ -136,6 +137,7 @@ public final class DownloadIndexUtil {
         /* totalBytes= */ C.LENGTH_UNSET,
         DownloadState.FAILURE_REASON_NONE,
         /* stopFlags= */ 0,
+        /* notMetRequirements= */ 0,
         /* startTimeMs= */ currentTimeMs,
         /* updateTimeMs= */ currentTimeMs,
         action.keys.toArray(new StreamKey[0]),
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 8932140a34..f1c90e67c1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -26,6 +26,7 @@ import static com.google.android.exoplayer2.offline.DownloadState.STATE_REMOVING
 import static com.google.android.exoplayer2.offline.DownloadState.STATE_RESTARTING;
 import static com.google.android.exoplayer2.offline.DownloadState.STATE_STOPPED;
 import static com.google.android.exoplayer2.offline.DownloadState.STOP_FLAG_DOWNLOAD_MANAGER_NOT_READY;
+import static com.google.android.exoplayer2.offline.DownloadState.STOP_FLAG_REQUIREMENTS_NOT_MET;
 import static com.google.android.exoplayer2.offline.DownloadState.STOP_FLAG_STOPPED;
 
 import android.content.Context;
@@ -119,6 +120,7 @@ public final class DownloadManager {
   private boolean initialized;
   private boolean released;
   @DownloadState.StopFlags private int stickyStopFlags;
+  @Requirements.RequirementFlags private int notMetRequirements;
   private RequirementsWatcher requirementsWatcher;
 
   /**
@@ -194,7 +196,7 @@ public final class DownloadManager {
       return;
     }
     requirementsWatcher.stop();
-    notifyListenersRequirementsStateChange(watchRequirements(requirements));
+    onRequirementsStateChanged(watchRequirements(requirements));
   }
 
   /** Returns the requirements needed to be met to start downloads. */
@@ -349,7 +351,8 @@ public final class DownloadManager {
       }
     }
     Download download =
-        new Download(this, downloaderFactory, action, minRetryCount, stickyStopFlags);
+        new Download(
+            this, downloaderFactory, action, minRetryCount, stickyStopFlags, notMetRequirements);
     downloads.add(download);
     logd("Download is added", download);
   }
@@ -401,13 +404,16 @@ public final class DownloadManager {
     }
   }
 
-  private void notifyListenersRequirementsStateChange(
-      @Requirements.RequirementFlags int notMetRequirements) {
+  private void onRequirementsStateChanged(@Requirements.RequirementFlags int notMetRequirements) {
+    this.notMetRequirements = notMetRequirements;
     logdFlags("Not met requirements are changed", notMetRequirements);
     for (Listener listener : listeners) {
       listener.onRequirementsStateChanged(
           DownloadManager.this, requirementsWatcher.getRequirements(), notMetRequirements);
     }
+    for (int i = 0; i < downloads.size(); i++) {
+      downloads.get(i).setNotMetRequirements(notMetRequirements);
+    }
   }
 
   private void loadActions() {
@@ -486,7 +492,9 @@ public final class DownloadManager {
 
   @Requirements.RequirementFlags
   private int watchRequirements(Requirements requirements) {
-    requirementsWatcher = new RequirementsWatcher(context, new RequirementListener(), requirements);
+    RequirementsWatcher.Listener listener =
+        (requirementsWatcher, notMetRequirements) -> onRequirementsStateChanged(notMetRequirements);
+    requirementsWatcher = new RequirementsWatcher(context, listener, requirements);
     @Requirements.RequirementFlags int notMetRequirements = requirementsWatcher.start();
     if (notMetRequirements == 0) {
       startDownloads();
@@ -511,17 +519,23 @@ public final class DownloadManager {
     @MonotonicNonNull private DownloadThread downloadThread;
     @MonotonicNonNull @DownloadState.FailureReason private int failureReason;
     @DownloadState.StopFlags private int stopFlags;
+    @Requirements.RequirementFlags private int notMetRequirements;
 
     private Download(
         DownloadManager downloadManager,
         DownloaderFactory downloaderFactory,
         DownloadAction action,
         int minRetryCount,
-        int stopFlags) {
+        @DownloadState.StopFlags int stopFlags,
+        @Requirements.RequirementFlags int notMetRequirements) {
       this.id = action.id;
       this.downloadManager = downloadManager;
       this.downloaderFactory = downloaderFactory;
       this.minRetryCount = minRetryCount;
+      this.notMetRequirements = notMetRequirements;
+      if (notMetRequirements != 0) {
+        stopFlags |= STOP_FLAG_REQUIREMENTS_NOT_MET;
+      }
       this.stopFlags = stopFlags;
       this.startTimeMs = System.currentTimeMillis();
       actionQueue = new ArrayDeque<>();
@@ -579,6 +593,7 @@ public final class DownloadManager {
           totalBytes,
           failureReason,
           stopFlags,
+          notMetRequirements,
           startTimeMs,
           /* updateTimeMs= */ System.currentTimeMillis(),
           action.keys.toArray(new StreamKey[0]),
@@ -628,6 +643,13 @@ public final class DownloadManager {
       }
     }
 
+    public void setNotMetRequirements(@Requirements.RequirementFlags int notMetRequirements) {
+      this.notMetRequirements = notMetRequirements;
+      updateStopFlags(
+          STOP_FLAG_REQUIREMENTS_NOT_MET,
+          notMetRequirements != 0 ? STOP_FLAG_REQUIREMENTS_NOT_MET : 0);
+    }
+
     private void initialize(boolean restart) {
       DownloadAction action = actionQueue.peek();
       if (action.isRemoveAction) {
@@ -770,19 +792,4 @@ public final class DownloadManager {
     }
   }
 
-  private class RequirementListener implements RequirementsWatcher.Listener {
-    @Override
-    public void requirementsMet(RequirementsWatcher requirementsWatcher) {
-      startDownloads();
-      notifyListenersRequirementsStateChange(0);
-    }
-
-    @Override
-    public void requirementsNotMet(
-        RequirementsWatcher requirementsWatcher,
-        @Requirements.RequirementFlags int notMetRequirements) {
-      stopDownloads();
-      notifyListenersRequirementsStateChange(notMetRequirements);
-    }
-  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
index 7bbd078822..dd55d6ea31 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
@@ -19,6 +19,7 @@ import android.net.Uri;
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.util.Assertions;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -80,12 +81,18 @@ public final class DownloadState {
   @Retention(RetentionPolicy.SOURCE)
   @IntDef(
       flag = true,
-      value = {STOP_FLAG_DOWNLOAD_MANAGER_NOT_READY, STOP_FLAG_STOPPED})
+      value = {
+        STOP_FLAG_DOWNLOAD_MANAGER_NOT_READY,
+        STOP_FLAG_STOPPED,
+        STOP_FLAG_REQUIREMENTS_NOT_MET
+      })
   public @interface StopFlags {}
   /** Download can't be started as the manager isn't ready. */
   public static final int STOP_FLAG_DOWNLOAD_MANAGER_NOT_READY = 1;
-  /** All downloads are stopped by the application. */
+  /** Download is stopped by the application. */
   public static final int STOP_FLAG_STOPPED = 1 << 1;
+  /** Download is stopped as the requirements are not met. */
+  public static final int STOP_FLAG_REQUIREMENTS_NOT_MET = 1 << 2;
 
   /** Returns the state string for the given state value. */
   public static String getStateString(@State int state) {
@@ -153,7 +160,9 @@ public final class DownloadState {
    */
   @FailureReason public final int failureReason;
   /** Download stop flags. These flags stop downloading any content. */
-  public final int stopFlags;
+  @StopFlags public final int stopFlags;
+  /** Not met requirements to download. */
+  @Requirements.RequirementFlags public final int notMetRequirements;
 
   /* package */ DownloadState(
       String id,
@@ -166,13 +175,17 @@ public final class DownloadState {
       long totalBytes,
       @FailureReason int failureReason,
       @StopFlags int stopFlags,
+      @Requirements.RequirementFlags int notMetRequirements,
       long startTimeMs,
       long updateTimeMs,
       StreamKey[] streamKeys,
       byte[] customMetadata) {
-    this.stopFlags = stopFlags;
     Assertions.checkState(
         failureReason == FAILURE_REASON_NONE ? state != STATE_FAILED : state == STATE_FAILED);
+    Assertions.checkState(
+        (stopFlags & STOP_FLAG_REQUIREMENTS_NOT_MET) == 0
+            ? notMetRequirements == 0
+            : notMetRequirements != 0);
     // TODO enable this when we start changing state immediately
     // Assertions.checkState(stopFlags == 0 || (state != STATE_DOWNLOADING && state !=
     // STATE_QUEUED));
@@ -180,14 +193,16 @@ public final class DownloadState {
     this.type = type;
     this.uri = uri;
     this.cacheKey = cacheKey;
-    this.streamKeys = streamKeys;
-    this.customMetadata = customMetadata;
     this.state = state;
     this.downloadPercentage = downloadPercentage;
     this.downloadedBytes = downloadedBytes;
     this.totalBytes = totalBytes;
     this.failureReason = failureReason;
+    this.stopFlags = stopFlags;
+    this.notMetRequirements = notMetRequirements;
     this.startTimeMs = startTimeMs;
     this.updateTimeMs = updateTimeMs;
+    this.streamKeys = streamKeys;
+    this.customMetadata = customMetadata;
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
index 686f19d161..dfced7c0ab 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
@@ -42,23 +42,14 @@ public final class RequirementsWatcher {
    * Requirements} are met.
    */
   public interface Listener {
-
     /**
-     * Called when all of the requirements are met.
-     *
-     * @param requirementsWatcher Calling instance.
-     */
-    void requirementsMet(RequirementsWatcher requirementsWatcher);
-
-    /**
-     * Called when there is at least one not met requirement and there is a change on which of the
-     * requirements are not met.
+     * Called when there is a change on the met requirements.
      *
      * @param requirementsWatcher Calling instance.
      * @param notMetRequirements {@link Requirements.RequirementFlags RequirementFlags} that are not
      *     met, or 0.
      */
-    void requirementsNotMet(
+    void onRequirementsStateChanged(
         RequirementsWatcher requirementsWatcher,
         @Requirements.RequirementFlags int notMetRequirements);
   }
@@ -172,17 +163,10 @@ public final class RequirementsWatcher {
   private void checkRequirements() {
     @Requirements.RequirementFlags
     int notMetRequirements = requirements.getNotMetRequirements(context);
-    if (this.notMetRequirements == notMetRequirements) {
-      logd("notMetRequirements hasn't changed: " + notMetRequirements);
-      return;
-    }
-    this.notMetRequirements = notMetRequirements;
-    if (notMetRequirements == 0) {
-      logd("start job");
-      listener.requirementsMet(this);
-    } else {
-      logd("stop job");
-      listener.requirementsNotMet(this, notMetRequirements);
+    if (this.notMetRequirements != notMetRequirements) {
+      this.notMetRequirements = notMetRequirements;
+      logd("notMetRequirements has changed: " + notMetRequirements);
+      listener.onRequirementsStateChanged(this, notMetRequirements);
     }
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
index 6f6786c068..df68f7ad34 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
@@ -80,13 +80,14 @@ public class DefaultDownloadIndexTest {
             .setDownloadedBytes(200)
             .setTotalBytes(400)
             .setFailureReason(DownloadState.FAILURE_REASON_UNKNOWN)
-            .setStopFlags(DownloadState.STOP_FLAG_STOPPED)
+            .setStopFlags(DownloadState.STOP_FLAG_REQUIREMENTS_NOT_MET)
+            .setNotMetRequirements(0x87654321)
             .setStartTimeMs(10)
             .setUpdateTimeMs(20)
             .setStreamKeys(
                 new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 1, /* trackIndex= */ 2),
                 new StreamKey(/* periodIndex= */ 3, /* groupIndex= */ 4, /* trackIndex= */ 5))
-            .setCustomMetadata(new byte[] {0, 1, 2, 3})
+            .setCustomMetadata(new byte[] {0, 1, 2, 3, 7, 8, 9, 10})
             .build();
     downloadIndex.putDownloadState(downloadState);
     DownloadState readDownloadState = downloadIndex.getDownloadState(id);
@@ -238,6 +239,9 @@ public class DefaultDownloadIndexTest {
     if (downloadState.stopFlags != that.stopFlags) {
       return false;
     }
+    if (downloadState.notMetRequirements != that.notMetRequirements) {
+      return false;
+    }
     if (!downloadState.id.equals(that.id)) {
       return false;
     }
@@ -269,6 +273,7 @@ public class DefaultDownloadIndexTest {
     private long totalBytes;
     private int failureReason;
     private int stopFlags;
+    private int notMetRequirements;
     private long startTimeMs;
     private long updateTimeMs;
     private StreamKey[] streamKeys;
@@ -341,6 +346,11 @@ public class DefaultDownloadIndexTest {
       return this;
     }
 
+    public DownloadStateBuilder setNotMetRequirements(int notMetRequirements) {
+      this.notMetRequirements = notMetRequirements;
+      return this;
+    }
+
     public DownloadStateBuilder setStartTimeMs(long startTimeMs) {
       this.startTimeMs = startTimeMs;
       return this;
@@ -373,6 +383,7 @@ public class DefaultDownloadIndexTest {
           totalBytes,
           failureReason,
           stopFlags,
+          notMetRequirements,
           startTimeMs,
           updateTimeMs,
           streamKeys,

From 39505452deda442d0b59d8a4224d0132e77995f1 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 29 Jan 2019 11:01:26 +0000
Subject: [PATCH 435/832] Make VersionTable static

The way it is currently, it's very unclear that an operation on the
version table will correctly belong to a transaction in code such as
this, taken from DefaultDownloadIndex:

writableDatabase.beginTransaction();
try {
  writableDatabase.execSQL(...);
  versionTable.setVersion(...);
  writableDatabase.setTransactionSuccessful();
} finally {
  writableDatabase.endTransaction();
}

This change explicitly passes the database, to make it obvious that
the operation will really go into the same transaction:

writableDatabase.beginTransaction();
try {
  writableDatabase.execSQL(....);
  VersionTable.setVersion(writableDatabase, ...);
  writableDatabase.setTransactionSuccessful();
} finally {
  writableDatabase.endTransaction();
}

PiperOrigin-RevId: 231374933
---
 .../exoplayer2/database/VersionTable.java     | 53 +++++++++----------
 .../offline/DefaultDownloadIndex.java         |  7 +--
 .../exoplayer2/database/VersionTableTest.java | 28 +++++-----
 .../offline/DefaultDownloadIndexTest.java     | 13 ++---
 4 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java b/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
index 0b6ef3d816..5193d1836f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
@@ -20,17 +20,18 @@ import android.database.Cursor;
 import android.database.DatabaseUtils;
 import android.database.sqlite.SQLiteDatabase;
 import android.support.annotation.IntDef;
+import android.support.annotation.VisibleForTesting;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
 /**
- * A table that holds version information about other ExoPlayer tables. This allows ExoPlayer tables
- * to be versioned independently to the version of the containing database.
+ * Utility methods for accessing versions of ExoPlayer database components. This allows them to be
+ * versioned independently to the version of the containing database.
  */
 public final class VersionTable {
 
-  /** Returned by {@link #getVersion(int)} if the version is unset. */
+  /** Returned by {@link #getVersion(SQLiteDatabase, int)} if the version is unset. */
   public static final int VERSION_UNSET = -1;
   /** Version of tables used for offline functionality. */
   public static final int FEATURE_OFFLINE = 0;
@@ -56,48 +57,46 @@ public final class VersionTable {
   @IntDef({FEATURE_OFFLINE, FEATURE_CACHE})
   private @interface Feature {}
 
-  private final DatabaseProvider databaseProvider;
-
-  public VersionTable(DatabaseProvider databaseProvider) {
-    this.databaseProvider = databaseProvider;
-    // Check whether the table exists to avoid getting a writable database if we don't need one.
-    if (!doesTableExist(databaseProvider, TABLE_NAME)) {
-      databaseProvider.getWritableDatabase().execSQL(SQL_CREATE_TABLE_IF_NOT_EXISTS);
-    }
-  }
+  private VersionTable() {}
 
   /**
    * Sets the version of tables belonging to the specified feature.
    *
+   * @param writableDatabase The database to update.
    * @param feature The feature.
    * @param version The version.
    */
-  public void setVersion(@Feature int feature, int version) {
+  public static void setVersion(
+      SQLiteDatabase writableDatabase, @Feature int feature, int version) {
+    writableDatabase.execSQL(SQL_CREATE_TABLE_IF_NOT_EXISTS);
     ContentValues values = new ContentValues();
     values.put(COLUMN_FEATURE, feature);
     values.put(COLUMN_VERSION, version);
-    SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
     writableDatabase.replace(TABLE_NAME, /* nullColumnHack= */ null, values);
   }
 
   /**
    * Returns the version of tables belonging to the specified feature, or {@link #VERSION_UNSET} if
    * no version information is available.
+   *
+   * @param database The database to query.
+   * @param feature The feature.
    */
-  public int getVersion(@Feature int feature) {
+  public static int getVersion(SQLiteDatabase database, @Feature int feature) {
+    if (!tableExists(database, TABLE_NAME)) {
+      return VERSION_UNSET;
+    }
     String selection = COLUMN_FEATURE + " = ?";
     String[] selectionArgs = {Integer.toString(feature)};
     try (Cursor cursor =
-        databaseProvider
-            .getReadableDatabase()
-            .query(
-                TABLE_NAME,
-                new String[] {COLUMN_VERSION},
-                selection,
-                selectionArgs,
-                /* groupBy= */ null,
-                /* having= */ null,
-                /* orderBy= */ null)) {
+        database.query(
+            TABLE_NAME,
+            new String[] {COLUMN_VERSION},
+            selection,
+            selectionArgs,
+            /* groupBy= */ null,
+            /* having= */ null,
+            /* orderBy= */ null)) {
       if (cursor.getCount() == 0) {
         return VERSION_UNSET;
       }
@@ -106,8 +105,8 @@ public final class VersionTable {
     }
   }
 
-  /* package */ static boolean doesTableExist(DatabaseProvider databaseProvider, String tableName) {
-    SQLiteDatabase readableDatabase = databaseProvider.getReadableDatabase();
+  @VisibleForTesting
+  /* package */ static boolean tableExists(SQLiteDatabase readableDatabase, String tableName) {
     long count =
         DatabaseUtils.queryNumEntries(
             readableDatabase, "sqlite_master", "tbl_name = ?", new String[] {tableName});
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
index 71ee76d0f7..b9fae6e2db 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -215,15 +215,16 @@ public final class DefaultDownloadIndex implements DownloadIndex {
 
     public DownloadsTable(DatabaseProvider databaseProvider) {
       this.databaseProvider = databaseProvider;
-      VersionTable versionTable = new VersionTable(databaseProvider);
-      int version = versionTable.getVersion(VersionTable.FEATURE_OFFLINE);
+      int version =
+          VersionTable.getVersion(
+              databaseProvider.getReadableDatabase(), VersionTable.FEATURE_OFFLINE);
       if (version == VersionTable.VERSION_UNSET || version > TABLE_VERSION) {
         SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
         writableDatabase.beginTransaction();
         try {
+          VersionTable.setVersion(writableDatabase, VersionTable.FEATURE_OFFLINE, TABLE_VERSION);
           writableDatabase.execSQL(SQL_DROP_TABLE_IF_EXISTS);
           writableDatabase.execSQL(SQL_CREATE_TABLE);
-          versionTable.setVersion(VersionTable.FEATURE_OFFLINE, TABLE_VERSION);
           writableDatabase.setTransactionSuccessful();
         } finally {
           writableDatabase.endTransaction();
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java b/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java
index dd9184ccdd..a607cc01db 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java
@@ -19,6 +19,7 @@ import static com.google.android.exoplayer2.database.VersionTable.FEATURE_CACHE;
 import static com.google.android.exoplayer2.database.VersionTable.FEATURE_OFFLINE;
 import static com.google.common.truth.Truth.assertThat;
 
+import android.database.sqlite.SQLiteDatabase;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -31,10 +32,14 @@ import org.robolectric.RuntimeEnvironment;
 public class VersionTableTest {
 
   private ExoDatabaseProvider databaseProvider;
+  private SQLiteDatabase readableDatabase;
+  private SQLiteDatabase writableDatabase;
 
   @Before
   public void setUp() {
     databaseProvider = new ExoDatabaseProvider(RuntimeEnvironment.application);
+    readableDatabase = databaseProvider.getReadableDatabase();
+    writableDatabase = databaseProvider.getWritableDatabase();
   }
 
   @After
@@ -44,35 +49,32 @@ public class VersionTableTest {
 
   @Test
   public void getVersion_nonExistingTable_returnsVersionUnset() {
-    VersionTable versionTable = new VersionTable(databaseProvider);
-    int version = versionTable.getVersion(FEATURE_OFFLINE);
+    int version = VersionTable.getVersion(readableDatabase, FEATURE_OFFLINE);
     assertThat(version).isEqualTo(VersionTable.VERSION_UNSET);
   }
 
   @Test
   public void getVersion_returnsSetVersion() {
-    VersionTable versionTable = new VersionTable(databaseProvider);
+    VersionTable.setVersion(writableDatabase, FEATURE_OFFLINE, 1);
+    assertThat(VersionTable.getVersion(readableDatabase, FEATURE_OFFLINE)).isEqualTo(1);
 
-    versionTable.setVersion(FEATURE_OFFLINE, 1);
-    assertThat(versionTable.getVersion(FEATURE_OFFLINE)).isEqualTo(1);
+    VersionTable.setVersion(writableDatabase, FEATURE_OFFLINE, 10);
+    assertThat(VersionTable.getVersion(readableDatabase, FEATURE_OFFLINE)).isEqualTo(10);
 
-    versionTable.setVersion(FEATURE_OFFLINE, 10);
-    assertThat(versionTable.getVersion(FEATURE_OFFLINE)).isEqualTo(10);
-
-    versionTable.setVersion(FEATURE_CACHE, 5);
-    assertThat(versionTable.getVersion(FEATURE_CACHE)).isEqualTo(5);
-    assertThat(versionTable.getVersion(FEATURE_OFFLINE)).isEqualTo(10);
+    VersionTable.setVersion(writableDatabase, FEATURE_CACHE, 5);
+    assertThat(VersionTable.getVersion(readableDatabase, FEATURE_CACHE)).isEqualTo(5);
+    assertThat(VersionTable.getVersion(readableDatabase, FEATURE_OFFLINE)).isEqualTo(10);
   }
 
   @Test
   public void doesTableExist_nonExistingTable_returnsFalse() {
-    assertThat(VersionTable.doesTableExist(databaseProvider, "NonExistingTable")).isFalse();
+    assertThat(VersionTable.tableExists(readableDatabase, "NonExistingTable")).isFalse();
   }
 
   @Test
   public void doesTableExist_existingTable_returnsTrue() {
     String table = "TestTable";
     databaseProvider.getWritableDatabase().execSQL("CREATE TABLE " + table + " (dummy INTEGER)");
-    assertThat(VersionTable.doesTableExist(databaseProvider, table)).isTrue();
+    assertThat(VersionTable.tableExists(readableDatabase, table)).isTrue();
   }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
index df68f7ad34..badbb58eff 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.offline;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
@@ -180,13 +181,13 @@ public class DefaultDownloadIndexTest {
 
   @Test
   public void putDownloadState_setsVersion() {
-    VersionTable versionTable = new VersionTable(databaseProvider);
-    assertThat(versionTable.getVersion(VersionTable.FEATURE_OFFLINE))
+    SQLiteDatabase readableDatabase = databaseProvider.getReadableDatabase();
+    assertThat(VersionTable.getVersion(readableDatabase, VersionTable.FEATURE_OFFLINE))
         .isEqualTo(VersionTable.VERSION_UNSET);
 
     downloadIndex.putDownloadState(new DownloadStateBuilder("id1").build());
 
-    assertThat(versionTable.getVersion(VersionTable.FEATURE_OFFLINE))
+    assertThat(VersionTable.getVersion(readableDatabase, VersionTable.FEATURE_OFFLINE))
         .isEqualTo(DefaultDownloadIndex.TABLE_VERSION);
   }
 
@@ -198,15 +199,15 @@ public class DefaultDownloadIndexTest {
     assertThat(cursor.getCount()).isEqualTo(1);
     cursor.close();
 
-    VersionTable versionTable = new VersionTable(databaseProvider);
-    versionTable.setVersion(VersionTable.FEATURE_OFFLINE, Integer.MAX_VALUE);
+    SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+    VersionTable.setVersion(writableDatabase, VersionTable.FEATURE_OFFLINE, Integer.MAX_VALUE);
 
     downloadIndex = new DefaultDownloadIndex(databaseProvider);
 
     cursor = downloadIndex.getDownloadStates();
     assertThat(cursor.getCount()).isEqualTo(0);
     cursor.close();
-    assertThat(versionTable.getVersion(VersionTable.FEATURE_OFFLINE))
+    assertThat(VersionTable.getVersion(writableDatabase, VersionTable.FEATURE_OFFLINE))
         .isEqualTo(DefaultDownloadIndex.TABLE_VERSION);
   }
 

From f74e0eb992900c8198d384168fca745b33c6db59 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 29 Jan 2019 12:01:33 +0000
Subject: [PATCH 436/832] Add back deprecated MediaSource.prepareSource for
 ExoPlayerSampleExtractor.

This should be removed after releasing.

PiperOrigin-RevId: 231380393
---
 .../com/google/android/exoplayer2/source/MediaSource.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
index 20346b781f..759208c67b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.source;
 import android.os.Handler;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.upstream.TransferListener;
@@ -237,7 +238,6 @@ public interface MediaSource {
   default Object getTag() {
     return null;
   }
-
   /**
    * Starts source preparation if not yet started, and adds a listener for timeline and/or manifest
    * updates.
@@ -256,8 +256,7 @@ public interface MediaSource {
    *     and other data.
    */
   void prepareSource(
-      SourceInfoRefreshListener listener,
-      @Nullable TransferListener mediaTransferListener);
+      SourceInfoRefreshListener listener, @Nullable TransferListener mediaTransferListener);
 
   /**
    * Throws any pending error encountered while loading or refreshing source information.

From 92bf8e918cc183cfaf2c6c93ff4533583c51c107 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 29 Jan 2019 12:57:22 +0000
Subject: [PATCH 437/832] Change getStreamKeys to take a list of
 TrackSelections.

Converting a single track selection to stream keys is only possible if the output
is independent from other track selections being made.

This is not the case for DASH and HLS embedded track groups which should select the
already selected primary track if possible (and thus needs to know  whether a primary
track group is selected).

Also, update the test method to take a period index.

PiperOrigin-RevId: 231385490
---
 .../exoplayer2/source/MediaPeriod.java        | 12 ++--
 .../source/smoothstreaming/SsMediaPeriod.java | 13 ++--
 .../smoothstreaming/SsMediaPeriodTest.java    |  4 +-
 .../testutil/MediaPeriodAsserts.java          | 72 +++++++++++++------
 4 files changed, 67 insertions(+), 34 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java
index 532131ba7d..b40bbb35d1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java
@@ -87,18 +87,18 @@ public interface MediaPeriod extends SequenceableLoader {
   TrackGroupArray getTrackGroups();
 
   /**
-   * Returns a list of {@link StreamKey stream keys} which allow to filter the media in this period
-   * to load only the parts needed to play the provided {@link TrackSelection}.
+   * Returns a list of {@link StreamKey StreamKeys} which allow to filter the media in this period
+   * to load only the parts needed to play the provided {@link TrackSelection TrackSelections}.
    *
    * <p>This method is only called after the period has been prepared.
    *
-   * @param trackSelection The {@link TrackSelection} describing the tracks for which stream keys
-   *     are requested.
-   * @return The corresponding {@link StreamKey stream keys} for the selected tracks, or an empty
+   * @param trackSelections The {@link TrackSelection TrackSelections} describing the tracks for
+   *     which stream keys are requested.
+   * @return The corresponding {@link StreamKey StreamKeys} for the selected tracks, or an empty
    *     list if filtering is not possible and the entire media needs to be loaded to play the
    *     selected tracks.
    */
-  default List<StreamKey> getStreamKeys(TrackSelection trackSelection) {
+  default List<StreamKey> getStreamKeys(List<TrackSelection> trackSelections) {
     return Collections.emptyList();
   }
 
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java
index 8798ea09b2..ae6b60183c 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java
@@ -144,11 +144,14 @@ import java.util.List;
   }
 
   @Override
-  public List<StreamKey> getStreamKeys(TrackSelection trackSelection) {
-    List<StreamKey> streamKeys = new ArrayList<>(trackSelection.length());
-    int streamElementIndex = trackGroups.indexOf(trackSelection.getTrackGroup());
-    for (int i = 0; i < trackSelection.length(); i++) {
-      streamKeys.add(new StreamKey(streamElementIndex, trackSelection.getIndexInTrackGroup(i)));
+  public List<StreamKey> getStreamKeys(List<TrackSelection> trackSelections) {
+    List<StreamKey> streamKeys = new ArrayList<>();
+    for (int selectionIndex = 0; selectionIndex < trackSelections.size(); selectionIndex++) {
+      TrackSelection trackSelection = trackSelections.get(selectionIndex);
+      int streamElementIndex = trackGroups.indexOf(trackSelection.getTrackGroup());
+      for (int i = 0; i < trackSelection.length(); i++) {
+        streamKeys.add(new StreamKey(streamElementIndex, trackSelection.getIndexInTrackGroup(i)));
+      }
     }
     return streamKeys;
   }
diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriodTest.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriodTest.java
index f4feef3949..54de4badbd 100644
--- a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriodTest.java
+++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriodTest.java
@@ -61,7 +61,7 @@ public class SsMediaPeriodTest {
             createStreamElement(
                 /* name= */ "text", C.TRACK_TYPE_TEXT, createTextFormat(/* language= */ "eng")));
     FilterableManifestMediaPeriodFactory<SsManifest> mediaPeriodFactory =
-        manifest ->
+        (manifest, periodIndex) ->
             new SsMediaPeriod(
                 manifest,
                 mock(SsChunkSource.Factory.class),
@@ -77,7 +77,7 @@ public class SsMediaPeriodTest {
                 mock(Allocator.class));
 
     MediaPeriodAsserts.assertGetStreamKeysAndManifestFilterIntegration(
-        mediaPeriodFactory, testManifest);
+        mediaPeriodFactory, testManifest, /* periodIndex= */ 0);
   }
 
   private static Format createVideoFormat(int bitrate) {
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaPeriodAsserts.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaPeriodAsserts.java
index 48b9128caf..5235163684 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaPeriodAsserts.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaPeriodAsserts.java
@@ -30,6 +30,8 @@ import com.google.android.exoplayer2.trackselection.BaseTrackSelection;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.util.ConditionVariable;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
@@ -45,53 +47,81 @@ public final class MediaPeriodAsserts {
   public interface FilterableManifestMediaPeriodFactory<T extends FilterableManifest<T>> {
 
     /** Returns media period based on the provided filterable manifest. */
-    MediaPeriod createMediaPeriod(T manifest);
+    MediaPeriod createMediaPeriod(T manifest, int periodIndex);
   }
 
   private MediaPeriodAsserts() {}
 
   /**
-   * Asserts that the values returns by {@link MediaPeriod#getStreamKeys(TrackSelection)} are
-   * compatible with a {@link FilterableManifest} using these stream keys.
+   * Asserts that the values returns by {@link MediaPeriod#getStreamKeys(List)} are compatible with
+   * a {@link FilterableManifest} using these stream keys.
    *
    * @param mediaPeriodFactory A factory to create a {@link MediaPeriod} based on a manifest.
    * @param manifest The manifest which is to be tested.
+   * @param periodIndex The index of period in the manifest.
    */
   public static <T extends FilterableManifest<T>>
       void assertGetStreamKeysAndManifestFilterIntegration(
-          FilterableManifestMediaPeriodFactory<T> mediaPeriodFactory, T manifest) {
-    MediaPeriod mediaPeriod = mediaPeriodFactory.createMediaPeriod(manifest);
+          FilterableManifestMediaPeriodFactory<T> mediaPeriodFactory, T manifest, int periodIndex) {
+    MediaPeriod mediaPeriod = mediaPeriodFactory.createMediaPeriod(manifest, periodIndex);
     TrackGroupArray trackGroupArray = getTrackGroups(mediaPeriod);
 
+    // Create test vector of query test selections:
+    //  - One selection with one track per group, two tracks or all tracks.
+    //  - Two selections with tracks from multiple groups, or tracks from a single group.
+    //  - Multiple selections with tracks from all groups.
+    List<List<TrackSelection>> testSelections = new ArrayList<>();
     for (int i = 0; i < trackGroupArray.length; i++) {
       TrackGroup trackGroup = trackGroupArray.get(i);
-
-      // For each track group, create various test selections.
-      List<TrackSelection> testSelections = new ArrayList<>();
       for (int j = 0; j < trackGroup.length; j++) {
-        testSelections.add(new TestTrackSelection(trackGroup, j));
+        testSelections.add(Collections.singletonList(new TestTrackSelection(trackGroup, j)));
       }
       if (trackGroup.length > 1) {
-        testSelections.add(new TestTrackSelection(trackGroup, 0, 1));
+        testSelections.add(Collections.singletonList(new TestTrackSelection(trackGroup, 0, 1)));
+        testSelections.add(
+            Arrays.asList(
+                new TrackSelection[] {
+                  new TestTrackSelection(trackGroup, 0), new TestTrackSelection(trackGroup, 1)
+                }));
       }
       if (trackGroup.length > 2) {
         int[] allTracks = new int[trackGroup.length];
         for (int j = 0; j < trackGroup.length; j++) {
           allTracks[j] = j;
         }
-        testSelections.add(new TestTrackSelection(trackGroup, allTracks));
+        testSelections.add(
+            Collections.singletonList(new TestTrackSelection(trackGroup, allTracks)));
       }
+    }
+    if (trackGroupArray.length > 1) {
+      testSelections.add(
+          Arrays.asList(
+              new TrackSelection[] {
+                new TestTrackSelection(trackGroupArray.get(0), 0),
+                new TestTrackSelection(trackGroupArray.get(1), 0)
+              }));
+    }
+    if (trackGroupArray.length > 2) {
+      List<TrackSelection> selectionsFromAllGroups = new ArrayList<>();
+      for (int i = 0; i < trackGroupArray.length; i++) {
+        selectionsFromAllGroups.add(new TestTrackSelection(trackGroupArray.get(i), 0));
+      }
+      testSelections.add(selectionsFromAllGroups);
+    }
 
-      // Get stream keys for each selection and check that the resulting filtered manifest includes
-      // at least the same subset of tracks.
-      for (TrackSelection testSelection : testSelections) {
-        List<StreamKey> streamKeys = mediaPeriod.getStreamKeys(testSelection);
-        T filteredManifest = manifest.copy(streamKeys);
-        MediaPeriod filteredMediaPeriod = mediaPeriodFactory.createMediaPeriod(filteredManifest);
-        TrackGroupArray filteredTrackGroupArray = getTrackGroups(filteredMediaPeriod);
-        Format[] expectedFormats = new Format[testSelection.length()];
-        for (int k = 0; k < testSelection.length(); k++) {
-          expectedFormats[k] = testSelection.getFormat(k);
+    // Verify for each case that stream keys can be used to create filtered tracks which still
+    // contain at least all requested formats.
+    for (List<TrackSelection> testSelection : testSelections) {
+      List<StreamKey> streamKeys = mediaPeriod.getStreamKeys(testSelection);
+      T filteredManifest = manifest.copy(streamKeys);
+      // The filtered manifest should only have one period left.
+      MediaPeriod filteredMediaPeriod =
+          mediaPeriodFactory.createMediaPeriod(filteredManifest, /* periodIndex= */ 0);
+      TrackGroupArray filteredTrackGroupArray = getTrackGroups(filteredMediaPeriod);
+      for (TrackSelection trackSelection : testSelection) {
+        Format[] expectedFormats = new Format[trackSelection.length()];
+        for (int k = 0; k < trackSelection.length(); k++) {
+          expectedFormats[k] = trackSelection.getFormat(k);
         }
         assertOneTrackGroupContainsFormats(filteredTrackGroupArray, expectedFormats);
       }

From 9779f2c358913a947e02bd19aa7c423d677e5c28 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 29 Jan 2019 12:57:37 +0000
Subject: [PATCH 438/832] Add DashMediaPeriod getStreamKeys implementation and
 test.

PiperOrigin-RevId: 231385518
---
 .../source/dash/DashMediaPeriod.java          |  48 +++-
 .../source/dash/DashMediaPeriodTest.java      | 247 ++++++++++++++++++
 .../smoothstreaming/SsMediaPeriodTest.java    |   2 +-
 .../testutil/MediaPeriodAsserts.java          |  47 +++-
 4 files changed, 333 insertions(+), 11 deletions(-)
 create mode 100644 library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java

diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java
index cba7a9941b..fd0453e79e 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java
@@ -22,6 +22,7 @@ import android.util.SparseIntArray;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.SeekParameters;
+import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.source.CompositeSequenceableLoaderFactory;
 import com.google.android.exoplayer2.source.EmptySampleStream;
 import com.google.android.exoplayer2.source.MediaPeriod;
@@ -192,6 +193,49 @@ import java.util.List;
     return trackGroups;
   }
 
+  @Override
+  public List<StreamKey> getStreamKeys(List<TrackSelection> trackSelections) {
+    List<AdaptationSet> manifestAdaptationSets = manifest.getPeriod(periodIndex).adaptationSets;
+    List<StreamKey> streamKeys = new ArrayList<>();
+    for (TrackSelection trackSelection : trackSelections) {
+      int trackGroupIndex = trackGroups.indexOf(trackSelection.getTrackGroup());
+      TrackGroupInfo trackGroupInfo = trackGroupInfos[trackGroupIndex];
+      if (trackGroupInfo.trackGroupCategory != TrackGroupInfo.CATEGORY_PRIMARY) {
+        // Ignore non-primary tracks.
+        continue;
+      }
+      int[] adaptationSetIndices = trackGroupInfo.adaptationSetIndices;
+      int[] trackIndices = new int[trackSelection.length()];
+      for (int i = 0; i < trackSelection.length(); i++) {
+        trackIndices[i] = trackSelection.getIndexInTrackGroup(i);
+      }
+      Arrays.sort(trackIndices);
+
+      int currentAdaptationSetIndex = 0;
+      int totalTracksInPreviousAdaptationSets = 0;
+      int tracksInCurrentAdaptationSet =
+          manifestAdaptationSets.get(adaptationSetIndices[0]).representations.size();
+      for (int i = 0; i < trackIndices.length; i++) {
+        while (trackIndices[i]
+            >= totalTracksInPreviousAdaptationSets + tracksInCurrentAdaptationSet) {
+          currentAdaptationSetIndex++;
+          totalTracksInPreviousAdaptationSets += tracksInCurrentAdaptationSet;
+          tracksInCurrentAdaptationSet =
+              manifestAdaptationSets
+                  .get(adaptationSetIndices[currentAdaptationSetIndex])
+                  .representations
+                  .size();
+        }
+        streamKeys.add(
+            new StreamKey(
+                periodIndex,
+                adaptationSetIndices[currentAdaptationSetIndex],
+                trackIndices[i] - totalTracksInPreviousAdaptationSets));
+      }
+    }
+    return streamKeys;
+  }
+
   @Override
   public long selectTracks(TrackSelection[] selections, boolean[] mayRetainStreamFlags,
       SampleStream[] streams, boolean[] streamResetFlags, long positionUs) {
@@ -697,7 +741,7 @@ import java.util.List;
 
     public final int[] adaptationSetIndices;
     public final int trackType;
-    public @TrackGroupCategory final int trackGroupCategory;
+    @TrackGroupCategory public final int trackGroupCategory;
 
     public final int eventStreamGroupIndex;
     public final int primaryTrackGroupIndex;
@@ -748,7 +792,7 @@ import java.util.List;
       return new TrackGroupInfo(
           C.TRACK_TYPE_METADATA,
           CATEGORY_MANIFEST_EVENTS,
-          null,
+          new int[0],
           -1,
           C.INDEX_UNSET,
           C.INDEX_UNSET,
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java
new file mode 100644
index 0000000000..0d9fee282c
--- /dev/null
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java
@@ -0,0 +1,247 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.source.dash;
+
+import static org.mockito.Mockito.mock;
+
+import android.net.Uri;
+import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.source.CompositeSequenceableLoaderFactory;
+import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
+import com.google.android.exoplayer2.source.MediaSourceEventListener.EventDispatcher;
+import com.google.android.exoplayer2.source.dash.PlayerEmsgHandler.PlayerEmsgCallback;
+import com.google.android.exoplayer2.source.dash.manifest.AdaptationSet;
+import com.google.android.exoplayer2.source.dash.manifest.DashManifest;
+import com.google.android.exoplayer2.source.dash.manifest.Descriptor;
+import com.google.android.exoplayer2.source.dash.manifest.Period;
+import com.google.android.exoplayer2.source.dash.manifest.Representation;
+import com.google.android.exoplayer2.source.dash.manifest.SegmentBase.SingleSegmentBase;
+import com.google.android.exoplayer2.source.dash.manifest.UtcTimingElement;
+import com.google.android.exoplayer2.testutil.MediaPeriodAsserts;
+import com.google.android.exoplayer2.testutil.MediaPeriodAsserts.FilterableManifestMediaPeriodFactory;
+import com.google.android.exoplayer2.testutil.RobolectricUtil;
+import com.google.android.exoplayer2.upstream.Allocator;
+import com.google.android.exoplayer2.upstream.LoadErrorHandlingPolicy;
+import com.google.android.exoplayer2.upstream.LoaderErrorThrower;
+import com.google.android.exoplayer2.upstream.TransferListener;
+import com.google.android.exoplayer2.util.MimeTypes;
+import java.util.Arrays;
+import java.util.Collections;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/** Unit tests for {@link DashMediaPeriod}. */
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {RobolectricUtil.CustomLooper.class, RobolectricUtil.CustomMessageQueue.class})
+public final class DashMediaPeriodTest {
+
+  @Test
+  public void getSteamKeys_isCompatibleWithDashManifestFilter() {
+    // Test manifest which covers various edge cases:
+    //  - Multiple periods.
+    //  - Single and multiple representations per adaptation set.
+    //  - Switch descriptors combining multiple adaptations sets.
+    //  - Embedded track groups.
+    // All cases are deliberately combined in one test to catch potential indexing problems which
+    // only occur in combination.
+    DashManifest testManifest =
+        createDashManifest(
+            createPeriod(
+                createAdaptationSet(
+                    /* id= */ 0,
+                    /* trackType= */ C.TRACK_TYPE_VIDEO,
+                    /* descriptor= */ null,
+                    createVideoRepresentation(/* bitrate= */ 1000000))),
+            createPeriod(
+                createAdaptationSet(
+                    /* id= */ 100,
+                    /* trackType= */ C.TRACK_TYPE_VIDEO,
+                    /* descriptor= */ createSwitchDescriptor(/* ids= */ 103, 104),
+                    createVideoRepresentationWithInbandEventStream(/* bitrate= */ 200000),
+                    createVideoRepresentationWithInbandEventStream(/* bitrate= */ 400000),
+                    createVideoRepresentationWithInbandEventStream(/* bitrate= */ 600000)),
+                createAdaptationSet(
+                    /* id= */ 101,
+                    /* trackType= */ C.TRACK_TYPE_AUDIO,
+                    /* descriptor= */ createSwitchDescriptor(/* ids= */ 102),
+                    createAudioRepresentation(/* bitrate= */ 48000),
+                    createAudioRepresentation(/* bitrate= */ 96000)),
+                createAdaptationSet(
+                    /* id= */ 102,
+                    /* trackType= */ C.TRACK_TYPE_AUDIO,
+                    /* descriptor= */ createSwitchDescriptor(/* ids= */ 101),
+                    createAudioRepresentation(/* bitrate= */ 256000)),
+                createAdaptationSet(
+                    /* id= */ 103,
+                    /* trackType= */ C.TRACK_TYPE_VIDEO,
+                    /* descriptor= */ createSwitchDescriptor(/* ids= */ 100, 104),
+                    createVideoRepresentationWithInbandEventStream(/* bitrate= */ 800000),
+                    createVideoRepresentationWithInbandEventStream(/* bitrate= */ 1000000)),
+                createAdaptationSet(
+                    /* id= */ 104,
+                    /* trackType= */ C.TRACK_TYPE_VIDEO,
+                    /* descriptor= */ createSwitchDescriptor(/* ids= */ 100, 103),
+                    createVideoRepresentationWithInbandEventStream(/* bitrate= */ 2000000)),
+                createAdaptationSet(
+                    /* id= */ 105,
+                    /* trackType= */ C.TRACK_TYPE_TEXT,
+                    /* descriptor= */ null,
+                    createTextRepresentation(/* language= */ "eng")),
+                createAdaptationSet(
+                    /* id= */ 105,
+                    /* trackType= */ C.TRACK_TYPE_TEXT,
+                    /* descriptor= */ null,
+                    createTextRepresentation(/* language= */ "ger"))));
+    FilterableManifestMediaPeriodFactory<DashManifest> mediaPeriodFactory =
+        (manifest, periodIndex) ->
+            new DashMediaPeriod(
+                /* id= */ periodIndex,
+                manifest,
+                periodIndex,
+                mock(DashChunkSource.Factory.class),
+                mock(TransferListener.class),
+                mock(LoadErrorHandlingPolicy.class),
+                new EventDispatcher()
+                    .withParameters(
+                        /* windowIndex= */ 0,
+                        /* mediaPeriodId= */ new MediaPeriodId(/* periodUid= */ new Object()),
+                        /* mediaTimeOffsetMs= */ 0),
+                /* elapsedRealtimeOffsetMs= */ 0,
+                mock(LoaderErrorThrower.class),
+                mock(Allocator.class),
+                mock(CompositeSequenceableLoaderFactory.class),
+                mock(PlayerEmsgCallback.class));
+
+    // Ignore embedded metadata as we don't want to select primary group just to get embedded track.
+    MediaPeriodAsserts.assertGetStreamKeysAndManifestFilterIntegration(
+        mediaPeriodFactory,
+        testManifest,
+        /* periodIndex= */ 1,
+        /* ignoredMimeType= */ "application/x-emsg");
+  }
+
+  private static DashManifest createDashManifest(Period... periods) {
+    return new DashManifest(
+        /* availabilityStartTimeMs= */ 0,
+        /* durationMs= */ 5000,
+        /* minBufferTimeMs= */ 1,
+        /* dynamic= */ false,
+        /* minUpdatePeriodMs= */ 2,
+        /* timeShiftBufferDepthMs= */ 3,
+        /* suggestedPresentationDelayMs= */ 4,
+        /* publishTimeMs= */ 12345,
+        /* programInformation= */ null,
+        new UtcTimingElement("", ""),
+        Uri.EMPTY,
+        Arrays.asList(periods));
+  }
+
+  private static Period createPeriod(AdaptationSet... adaptationSets) {
+    return new Period(/* id= */ null, /* startMs= */ 0, Arrays.asList(adaptationSets));
+  }
+
+  private static AdaptationSet createAdaptationSet(
+      int id, int trackType, @Nullable Descriptor descriptor, Representation... representations) {
+    return new AdaptationSet(
+        id,
+        trackType,
+        Arrays.asList(representations),
+        /* accessibilityDescriptors= */ Collections.emptyList(),
+        descriptor == null ? Collections.emptyList() : Collections.singletonList(descriptor));
+  }
+
+  private static Representation createVideoRepresentation(int bitrate) {
+    return Representation.newInstance(
+        /* revisionId= */ 0,
+        createVideoFormat(bitrate),
+        /* baseUrl= */ "",
+        new SingleSegmentBase());
+  }
+
+  private static Representation createVideoRepresentationWithInbandEventStream(int bitrate) {
+    return Representation.newInstance(
+        /* revisionId= */ 0,
+        createVideoFormat(bitrate),
+        /* baseUrl= */ "",
+        new SingleSegmentBase(),
+        Collections.singletonList(getInbandEventDescriptor()));
+  }
+
+  private static Format createVideoFormat(int bitrate) {
+    return Format.createContainerFormat(
+        /* id= */ null,
+        /* label= */ null,
+        MimeTypes.VIDEO_MP4,
+        MimeTypes.VIDEO_H264,
+        /* codecs= */ null,
+        bitrate,
+        /* selectionFlags= */ 0,
+        /* language= */ null);
+  }
+
+  private static Representation createAudioRepresentation(int bitrate) {
+    return Representation.newInstance(
+        /* revisionId= */ 0,
+        Format.createContainerFormat(
+            /* id= */ null,
+            /* label= */ null,
+            MimeTypes.AUDIO_MP4,
+            MimeTypes.AUDIO_AAC,
+            /* codecs= */ null,
+            bitrate,
+            /* selectionFlags= */ 0,
+            /* language= */ null),
+        /* baseUrl= */ "",
+        new SingleSegmentBase());
+  }
+
+  private static Representation createTextRepresentation(String language) {
+    return Representation.newInstance(
+        /* revisionId= */ 0,
+        Format.createContainerFormat(
+            /* id= */ null,
+            /* label= */ null,
+            MimeTypes.APPLICATION_MP4,
+            MimeTypes.TEXT_VTT,
+            /* codecs= */ null,
+            /* bitrate= */ Format.NO_VALUE,
+            /* selectionFlags= */ 0,
+            language),
+        /* baseUrl= */ "",
+        new SingleSegmentBase());
+  }
+
+  private static Descriptor createSwitchDescriptor(int... ids) {
+    StringBuilder idString = new StringBuilder();
+    idString.append(ids[0]);
+    for (int i = 1; i < ids.length; i++) {
+      idString.append(",").append(ids[i]);
+    }
+    return new Descriptor(
+        /* schemeIdUri= */ "urn:mpeg:dash:adaptation-set-switching:2016",
+        /* value= */ idString.toString(),
+        /* id= */ null);
+  }
+
+  private static Descriptor getInbandEventDescriptor() {
+    return new Descriptor(
+        /* schemeIdUri= */ "inBandSchemeIdUri", /* value= */ "inBandValue", /* id= */ "inBandId");
+  }
+}
diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriodTest.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriodTest.java
index 54de4badbd..bceaf8cdf2 100644
--- a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriodTest.java
+++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriodTest.java
@@ -77,7 +77,7 @@ public class SsMediaPeriodTest {
                 mock(Allocator.class));
 
     MediaPeriodAsserts.assertGetStreamKeysAndManifestFilterIntegration(
-        mediaPeriodFactory, testManifest, /* periodIndex= */ 0);
+        mediaPeriodFactory, testManifest);
   }
 
   private static Format createVideoFormat(int bitrate) {
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaPeriodAsserts.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaPeriodAsserts.java
index 5235163684..b4137a41de 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaPeriodAsserts.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaPeriodAsserts.java
@@ -58,11 +58,30 @@ public final class MediaPeriodAsserts {
    *
    * @param mediaPeriodFactory A factory to create a {@link MediaPeriod} based on a manifest.
    * @param manifest The manifest which is to be tested.
-   * @param periodIndex The index of period in the manifest.
    */
   public static <T extends FilterableManifest<T>>
       void assertGetStreamKeysAndManifestFilterIntegration(
-          FilterableManifestMediaPeriodFactory<T> mediaPeriodFactory, T manifest, int periodIndex) {
+          FilterableManifestMediaPeriodFactory<T> mediaPeriodFactory, T manifest) {
+    assertGetStreamKeysAndManifestFilterIntegration(
+        mediaPeriodFactory, manifest, /* periodIndex= */ 0, /* ignoredMimeType= */ null);
+  }
+
+  /**
+   * Asserts that the values returns by {@link MediaPeriod#getStreamKeys(List)} are compatible with
+   * a {@link FilterableManifest} using these stream keys.
+   *
+   * @param mediaPeriodFactory A factory to create a {@link MediaPeriod} based on a manifest.
+   * @param manifest The manifest which is to be tested.
+   * @param periodIndex The index of period in the manifest.
+   * @param ignoredMimeType Optional mime type whose existence in the filtered track groups is not
+   *     asserted.
+   */
+  public static <T extends FilterableManifest<T>>
+      void assertGetStreamKeysAndManifestFilterIntegration(
+          FilterableManifestMediaPeriodFactory<T> mediaPeriodFactory,
+          T manifest,
+          int periodIndex,
+          @Nullable String ignoredMimeType) {
     MediaPeriod mediaPeriod = mediaPeriodFactory.createMediaPeriod(manifest, periodIndex);
     TrackGroupArray trackGroupArray = getTrackGroups(mediaPeriod);
 
@@ -94,12 +113,16 @@ public final class MediaPeriodAsserts {
       }
     }
     if (trackGroupArray.length > 1) {
-      testSelections.add(
-          Arrays.asList(
-              new TrackSelection[] {
-                new TestTrackSelection(trackGroupArray.get(0), 0),
-                new TestTrackSelection(trackGroupArray.get(1), 0)
-              }));
+      for (int i = 0; i < trackGroupArray.length - 1; i++) {
+        for (int j = i + 1; j < trackGroupArray.length; j++) {
+          testSelections.add(
+              Arrays.asList(
+                  new TrackSelection[] {
+                    new TestTrackSelection(trackGroupArray.get(i), 0),
+                    new TestTrackSelection(trackGroupArray.get(j), 0)
+                  }));
+        }
+      }
     }
     if (trackGroupArray.length > 2) {
       List<TrackSelection> selectionsFromAllGroups = new ArrayList<>();
@@ -113,12 +136,20 @@ public final class MediaPeriodAsserts {
     // contain at least all requested formats.
     for (List<TrackSelection> testSelection : testSelections) {
       List<StreamKey> streamKeys = mediaPeriod.getStreamKeys(testSelection);
+      if (streamKeys.isEmpty()) {
+        // Manifests won't be filtered if stream key is empty.
+        continue;
+      }
       T filteredManifest = manifest.copy(streamKeys);
       // The filtered manifest should only have one period left.
       MediaPeriod filteredMediaPeriod =
           mediaPeriodFactory.createMediaPeriod(filteredManifest, /* periodIndex= */ 0);
       TrackGroupArray filteredTrackGroupArray = getTrackGroups(filteredMediaPeriod);
       for (TrackSelection trackSelection : testSelection) {
+        if (ignoredMimeType != null
+            && ignoredMimeType.equals(trackSelection.getFormat(0).sampleMimeType)) {
+          continue;
+        }
         Format[] expectedFormats = new Format[trackSelection.length()];
         for (int k = 0; k < trackSelection.length(); k++) {
           expectedFormats[k] = trackSelection.getFormat(k);

From 6a52cd7445f3008e5d36fdce8bb02196052b5523 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 29 Jan 2019 12:57:53 +0000
Subject: [PATCH 439/832] Ensure HlsMediaPeriod works with playlists without
 variants.

Currently, we remove all variants if none of the stream keys contains any
variants. This causes HlsMediaPeriod to throw exceptions as it expects at least
one variant.

Change it to support master playlists without variants.

PiperOrigin-RevId: 231385547
---
 .../exoplayer2/source/hls/HlsMediaPeriod.java | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
index da50d7cc93..5a384efcdf 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
@@ -343,15 +343,19 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
 
   private void buildAndPrepareSampleStreamWrappers(long positionUs) {
     HlsMasterPlaylist masterPlaylist = playlistTracker.getMasterPlaylist();
+    boolean hasVariants = !masterPlaylist.variants.isEmpty();
     List<HlsUrl> audioRenditions = masterPlaylist.audios;
     List<HlsUrl> subtitleRenditions = masterPlaylist.subtitles;
 
-    int wrapperCount = 1 /* variants */ + audioRenditions.size() + subtitleRenditions.size();
+    int wrapperCount = (hasVariants ? 1 : 0) + audioRenditions.size() + subtitleRenditions.size();
     sampleStreamWrappers = new HlsSampleStreamWrapper[wrapperCount];
     pendingPrepareCount = wrapperCount;
 
-    buildAndPrepareMainSampleStreamWrapper(masterPlaylist, positionUs);
-    int currentWrapperIndex = 1;
+    int currentWrapperIndex = 0;
+    if (hasVariants) {
+      buildAndPrepareMainSampleStreamWrapper(masterPlaylist, positionUs);
+      currentWrapperIndex++;
+    }
 
     // TODO: Build video stream wrappers here.
 
@@ -370,8 +374,6 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
       if (allowChunklessPreparation && renditionFormat.codecs != null) {
         sampleStreamWrapper.prepareWithMasterPlaylistInfo(
             new TrackGroupArray(new TrackGroup(audioRendition.format)), 0, TrackGroupArray.EMPTY);
-      } else {
-        sampleStreamWrapper.continuePreparing();
       }
     }
 
@@ -386,6 +388,12 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
           new TrackGroupArray(new TrackGroup(url.format)), 0, TrackGroupArray.EMPTY);
     }
 
+    // Set timestamp master and trigger preparation (if not already prepared)
+    sampleStreamWrappers[0].setIsTimestampMaster(true);
+    for (HlsSampleStreamWrapper sampleStreamWrapper : sampleStreamWrappers) {
+      sampleStreamWrapper.continuePreparing();
+    }
+
     // All wrappers are enabled during preparation.
     enabledSampleStreamWrappers = sampleStreamWrappers;
   }
@@ -503,9 +511,6 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
           new TrackGroupArray(muxedTrackGroups.toArray(new TrackGroup[0])),
           0,
           new TrackGroupArray(id3TrackGroup));
-    } else {
-      sampleStreamWrapper.setIsTimestampMaster(true);
-      sampleStreamWrapper.continuePreparing();
     }
   }
 
@@ -566,7 +571,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
       if (isPrimaryTrackInVariant) {
         channelCount = variantFormat.channelCount;
         selectionFlags = variantFormat.selectionFlags;
-        language = variantFormat.label;
+        language = variantFormat.language;
         label = variantFormat.label;
       }
     }

From 32b40502fcc50a7287581003e3dd6e80d87bf21c Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 29 Jan 2019 12:58:10 +0000
Subject: [PATCH 440/832] Add HlsMediaPeriod getStreamKeys implementation and
 tests.

PiperOrigin-RevId: 231385563
---
 .../exoplayer2/source/hls/HlsMediaPeriod.java | 140 ++++++++++---
 .../source/hls/HlsSampleStreamWrapper.java    |   4 +
 .../source/hls/HlsMediaPeriodTest.java        | 184 ++++++++++++++++++
 3 files changed, 305 insertions(+), 23 deletions(-)
 create mode 100644 library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
index 5a384efcdf..73a46b68ba 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
@@ -20,6 +20,7 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.SeekParameters;
 import com.google.android.exoplayer2.extractor.Extractor;
+import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.source.CompositeSequenceableLoaderFactory;
 import com.google.android.exoplayer2.source.MediaPeriod;
 import com.google.android.exoplayer2.source.MediaSourceEventListener.EventDispatcher;
@@ -68,6 +69,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
   private TrackGroupArray trackGroups;
   private HlsSampleStreamWrapper[] sampleStreamWrappers;
   private HlsSampleStreamWrapper[] enabledSampleStreamWrappers;
+  private int[] selectedVariantIndices;
   private SequenceableLoader compositeSequenceableLoader;
   private boolean notifiedReadingStarted;
 
@@ -112,6 +114,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
     timestampAdjusterProvider = new TimestampAdjusterProvider();
     sampleStreamWrappers = new HlsSampleStreamWrapper[0];
     enabledSampleStreamWrappers = new HlsSampleStreamWrapper[0];
+    selectedVariantIndices = new int[0];
     eventDispatcher.mediaPeriodCreated();
   }
 
@@ -143,6 +146,77 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
     return trackGroups;
   }
 
+  @Override
+  public List<StreamKey> getStreamKeys(List<TrackSelection> trackSelections) {
+    // See HlsMasterPlaylist.copy for interpretation of StreamKeys.
+    HlsMasterPlaylist masterPlaylist = Assertions.checkNotNull(playlistTracker.getMasterPlaylist());
+    boolean hasVariants = !masterPlaylist.variants.isEmpty();
+    int audioWrapperOffset = hasVariants ? 1 : 0;
+    int subtitleWrapperOffset = audioWrapperOffset + masterPlaylist.audios.size();
+
+    TrackGroupArray mainWrapperTrackGroups;
+    int mainWrapperPrimaryGroupIndex;
+    if (hasVariants) {
+      HlsSampleStreamWrapper mainWrapper = sampleStreamWrappers[0];
+      mainWrapperTrackGroups = mainWrapper.getTrackGroups();
+      mainWrapperPrimaryGroupIndex = mainWrapper.getPrimaryTrackGroupIndex();
+    } else {
+      mainWrapperTrackGroups = TrackGroupArray.EMPTY;
+      mainWrapperPrimaryGroupIndex = 0;
+    }
+
+    List<StreamKey> streamKeys = new ArrayList<>();
+    boolean needsPrimaryTrackGroupSelection = false;
+    boolean hasPrimaryTrackGroupSelection = false;
+    for (TrackSelection trackSelection : trackSelections) {
+      TrackGroup trackSelectionGroup = trackSelection.getTrackGroup();
+      int mainWrapperTrackGroupIndex = mainWrapperTrackGroups.indexOf(trackSelectionGroup);
+      if (mainWrapperTrackGroupIndex != C.INDEX_UNSET) {
+        if (mainWrapperTrackGroupIndex == mainWrapperPrimaryGroupIndex) {
+          // Primary group in main wrapper.
+          hasPrimaryTrackGroupSelection = true;
+          for (int i = 0; i < trackSelection.length(); i++) {
+            int variantIndex = selectedVariantIndices[trackSelection.getIndexInTrackGroup(i)];
+            streamKeys.add(new StreamKey(HlsMasterPlaylist.GROUP_INDEX_VARIANT, variantIndex));
+          }
+        } else {
+          // Embedded group in main wrapper.
+          needsPrimaryTrackGroupSelection = true;
+        }
+      } else {
+        // Audio or subtitle group.
+        for (int i = audioWrapperOffset; i < sampleStreamWrappers.length; i++) {
+          TrackGroupArray wrapperTrackGroups = sampleStreamWrappers[i].getTrackGroups();
+          if (wrapperTrackGroups.indexOf(trackSelectionGroup) != C.INDEX_UNSET) {
+            if (i < subtitleWrapperOffset) {
+              streamKeys.add(
+                  new StreamKey(HlsMasterPlaylist.GROUP_INDEX_AUDIO, i - audioWrapperOffset));
+            } else {
+              streamKeys.add(
+                  new StreamKey(HlsMasterPlaylist.GROUP_INDEX_SUBTITLE, i - subtitleWrapperOffset));
+            }
+            break;
+          }
+        }
+      }
+    }
+    if (needsPrimaryTrackGroupSelection && !hasPrimaryTrackGroupSelection) {
+      // A track selection includes a variant-embedded track, but no variant is added yet. We use
+      // the valid variant with the lowest bitrate to reduce overhead.
+      int lowestBitrateIndex = selectedVariantIndices[0];
+      int lowestBitrate = masterPlaylist.variants.get(selectedVariantIndices[0]).format.bitrate;
+      for (int i = 1; i < selectedVariantIndices.length; i++) {
+        int variantBitrate = masterPlaylist.variants.get(selectedVariantIndices[i]).format.bitrate;
+        if (variantBitrate < lowestBitrate) {
+          lowestBitrate = variantBitrate;
+          lowestBitrateIndex = selectedVariantIndices[i];
+        }
+      }
+      streamKeys.add(new StreamKey(HlsMasterPlaylist.GROUP_INDEX_VARIANT, lowestBitrateIndex));
+    }
+    return streamKeys;
+  }
+
   @Override
   public long selectTracks(TrackSelection[] selections, boolean[] mayRetainStreamFlags,
       SampleStream[] streams, boolean[] streamResetFlags, long positionUs) {
@@ -424,44 +498,64 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
    */
   private void buildAndPrepareMainSampleStreamWrapper(
       HlsMasterPlaylist masterPlaylist, long positionUs) {
-    List<HlsUrl> selectedVariants = new ArrayList<>(masterPlaylist.variants);
-    ArrayList<HlsUrl> definiteVideoVariants = new ArrayList<>();
-    ArrayList<HlsUrl> definiteAudioOnlyVariants = new ArrayList<>();
-    for (int i = 0; i < selectedVariants.size(); i++) {
-      HlsUrl variant = selectedVariants.get(i);
+    int[] variantTypes = new int[masterPlaylist.variants.size()];
+    int videoVariantCount = 0;
+    int audioVariantCount = 0;
+    for (int i = 0; i < masterPlaylist.variants.size(); i++) {
+      HlsUrl variant = masterPlaylist.variants.get(i);
       Format format = variant.format;
       if (format.height > 0 || Util.getCodecsOfType(format.codecs, C.TRACK_TYPE_VIDEO) != null) {
-        definiteVideoVariants.add(variant);
+        variantTypes[i] = C.TRACK_TYPE_VIDEO;
+        videoVariantCount++;
       } else if (Util.getCodecsOfType(format.codecs, C.TRACK_TYPE_AUDIO) != null) {
-        definiteAudioOnlyVariants.add(variant);
+        variantTypes[i] = C.TRACK_TYPE_AUDIO;
+        audioVariantCount++;
+      } else {
+        variantTypes[i] = C.TRACK_TYPE_UNKNOWN;
       }
     }
-    if (!definiteVideoVariants.isEmpty()) {
+    boolean useVideoVariantsOnly = false;
+    boolean useNonAudioVariantsOnly = false;
+    int selectedVariantsCount = variantTypes.length;
+    if (videoVariantCount > 0) {
       // We've identified some variants as definitely containing video. Assume variants within the
       // master playlist are marked consistently, and hence that we have the full set. Filter out
       // any other variants, which are likely to be audio only.
-      selectedVariants = definiteVideoVariants;
-    } else if (definiteAudioOnlyVariants.size() < selectedVariants.size()) {
+      useVideoVariantsOnly = true;
+      selectedVariantsCount = videoVariantCount;
+    } else if (audioVariantCount < variantTypes.length) {
       // We've identified some variants, but not all, as being audio only. Filter them out to leave
       // the remaining variants, which are likely to contain video.
-      selectedVariants.removeAll(definiteAudioOnlyVariants);
-    } else {
-      // Leave the enabled variants unchanged. They're likely either all video or all audio.
+      useNonAudioVariantsOnly = true;
+      selectedVariantsCount = variantTypes.length - audioVariantCount;
     }
-    Assertions.checkArgument(!selectedVariants.isEmpty());
-    HlsUrl[] variants = selectedVariants.toArray(new HlsUrl[0]);
-    String codecs = variants[0].format.codecs;
-    HlsSampleStreamWrapper sampleStreamWrapper = buildSampleStreamWrapper(C.TRACK_TYPE_DEFAULT,
-        variants, masterPlaylist.muxedAudioFormat, masterPlaylist.muxedCaptionFormats, positionUs);
+    HlsUrl[] selectedVariants = new HlsUrl[selectedVariantsCount];
+    selectedVariantIndices = new int[selectedVariantsCount];
+    int outIndex = 0;
+    for (int i = 0; i < masterPlaylist.variants.size(); i++) {
+      if ((!useVideoVariantsOnly || variantTypes[i] == C.TRACK_TYPE_VIDEO)
+          && (!useNonAudioVariantsOnly || variantTypes[i] != C.TRACK_TYPE_AUDIO)) {
+        selectedVariants[outIndex] = masterPlaylist.variants.get(i);
+        selectedVariantIndices[outIndex++] = i;
+      }
+    }
+    String codecs = selectedVariants[0].format.codecs;
+    HlsSampleStreamWrapper sampleStreamWrapper =
+        buildSampleStreamWrapper(
+            C.TRACK_TYPE_DEFAULT,
+            selectedVariants,
+            masterPlaylist.muxedAudioFormat,
+            masterPlaylist.muxedCaptionFormats,
+            positionUs);
     sampleStreamWrappers[0] = sampleStreamWrapper;
     if (allowChunklessPreparation && codecs != null) {
       boolean variantsContainVideoCodecs = Util.getCodecsOfType(codecs, C.TRACK_TYPE_VIDEO) != null;
       boolean variantsContainAudioCodecs = Util.getCodecsOfType(codecs, C.TRACK_TYPE_AUDIO) != null;
       List<TrackGroup> muxedTrackGroups = new ArrayList<>();
       if (variantsContainVideoCodecs) {
-        Format[] videoFormats = new Format[selectedVariants.size()];
+        Format[] videoFormats = new Format[selectedVariantsCount];
         for (int i = 0; i < videoFormats.length; i++) {
-          videoFormats[i] = deriveVideoFormat(variants[i].format);
+          videoFormats[i] = deriveVideoFormat(selectedVariants[i].format);
         }
         muxedTrackGroups.add(new TrackGroup(videoFormats));
 
@@ -470,7 +564,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
           muxedTrackGroups.add(
               new TrackGroup(
                   deriveAudioFormat(
-                      variants[0].format,
+                      selectedVariants[0].format,
                       masterPlaylist.muxedAudioFormat,
                       /* isPrimaryTrackInVariant= */ false)));
         }
@@ -482,9 +576,9 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
         }
       } else if (variantsContainAudioCodecs) {
         // Variants only contain audio.
-        Format[] audioFormats = new Format[selectedVariants.size()];
+        Format[] audioFormats = new Format[selectedVariantsCount];
         for (int i = 0; i < audioFormats.length; i++) {
-          Format variantFormat = variants[i].format;
+          Format variantFormat = selectedVariants[i].format;
           audioFormats[i] =
               deriveAudioFormat(
                   variantFormat,
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
index 39598c4cd8..4fd27ba2a0 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
@@ -214,6 +214,10 @@ import java.util.List;
     return trackGroups;
   }
 
+  public int getPrimaryTrackGroupIndex() {
+    return primaryTrackGroupIndex;
+  }
+
   public int bindSampleQueueToSampleStream(int trackGroupIndex) {
     int sampleQueueIndex = trackGroupToSampleQueueIndex[trackGroupIndex];
     if (sampleQueueIndex == C.INDEX_UNSET) {
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
new file mode 100644
index 0000000000..599e099b8c
--- /dev/null
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.source.hls;
+
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.source.CompositeSequenceableLoaderFactory;
+import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
+import com.google.android.exoplayer2.source.MediaSourceEventListener.EventDispatcher;
+import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist;
+import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.HlsUrl;
+import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylist;
+import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylistTracker;
+import com.google.android.exoplayer2.testutil.MediaPeriodAsserts;
+import com.google.android.exoplayer2.testutil.MediaPeriodAsserts.FilterableManifestMediaPeriodFactory;
+import com.google.android.exoplayer2.testutil.RobolectricUtil;
+import com.google.android.exoplayer2.upstream.Allocator;
+import com.google.android.exoplayer2.upstream.DataSource;
+import com.google.android.exoplayer2.upstream.LoadErrorHandlingPolicy;
+import com.google.android.exoplayer2.upstream.TransferListener;
+import com.google.android.exoplayer2.util.MimeTypes;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/** Unit test for {@link HlsMediaPeriod}. */
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {RobolectricUtil.CustomLooper.class, RobolectricUtil.CustomMessageQueue.class})
+public final class HlsMediaPeriodTest {
+
+  @Test
+  public void getSteamKeys_isCompatibleWithhHlsMasterPlaylistFilter() {
+    HlsMasterPlaylist testMasterPlaylist =
+        createMasterPlaylist(
+            /* variants= */ Arrays.asList(
+                createAudioOnlyVariantHlsUrl(/* bitrate= */ 10000),
+                createMuxedVideoAudioVariantHlsUrl(/* bitrate= */ 200000),
+                createAudioOnlyVariantHlsUrl(/* bitrate= */ 300000),
+                createMuxedVideoAudioVariantHlsUrl(/* bitrate= */ 400000),
+                createMuxedVideoAudioVariantHlsUrl(/* bitrate= */ 600000)),
+            /* audios= */ Arrays.asList(
+                createAudioHlsUrl(/* language= */ "spa"),
+                createAudioHlsUrl(/* language= */ "ger"),
+                createAudioHlsUrl(/* language= */ "tur")),
+            /* subtitles= */ Arrays.asList(
+                createSubtitleHlsUrl(/* language= */ "spa"),
+                createSubtitleHlsUrl(/* language= */ "ger"),
+                createSubtitleHlsUrl(/* language= */ "tur")),
+            /* muxedAudioFormat= */ createAudioFormat("eng"),
+            /* muxedCaptionFormats= */ Arrays.asList(
+                createSubtitleFormat("eng"), createSubtitleFormat("gsw")));
+    FilterableManifestMediaPeriodFactory<HlsPlaylist> mediaPeriodFactory =
+        (playlist, periodIndex) -> {
+          HlsDataSourceFactory mockDataSourceFactory = mock(HlsDataSourceFactory.class);
+          when(mockDataSourceFactory.createDataSource(anyInt())).thenReturn(mock(DataSource.class));
+          HlsPlaylistTracker mockPlaylistTracker = mock(HlsPlaylistTracker.class);
+          when(mockPlaylistTracker.getMasterPlaylist()).thenReturn((HlsMasterPlaylist) playlist);
+          return new HlsMediaPeriod(
+              mock(HlsExtractorFactory.class),
+              mockPlaylistTracker,
+              mockDataSourceFactory,
+              mock(TransferListener.class),
+              mock(LoadErrorHandlingPolicy.class),
+              new EventDispatcher()
+                  .withParameters(
+                      /* windowIndex= */ 0,
+                      /* mediaPeriodId= */ new MediaPeriodId(/* periodUid= */ new Object()),
+                      /* mediaTimeOffsetMs= */ 0),
+              mock(Allocator.class),
+              mock(CompositeSequenceableLoaderFactory.class),
+              /* allowChunklessPreparation =*/ true);
+        };
+
+    MediaPeriodAsserts.assertGetStreamKeysAndManifestFilterIntegration(
+        mediaPeriodFactory, testMasterPlaylist);
+  }
+
+  private static HlsMasterPlaylist createMasterPlaylist(
+      List<HlsUrl> variants,
+      List<HlsUrl> audios,
+      List<HlsUrl> subtitles,
+      Format muxedAudioFormat,
+      List<Format> muxedCaptionFormats) {
+    return new HlsMasterPlaylist(
+        "http://baseUri",
+        /* tags= */ Collections.emptyList(),
+        variants,
+        audios,
+        subtitles,
+        muxedAudioFormat,
+        muxedCaptionFormats,
+        /* hasIndependentSegments= */ true,
+        /* variableDefinitions= */ Collections.emptyMap());
+  }
+
+  private static HlsUrl createMuxedVideoAudioVariantHlsUrl(int bitrate) {
+    return new HlsUrl(
+        "http://url",
+        Format.createVideoContainerFormat(
+            /* id= */ null,
+            /* label= */ null,
+            /* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
+            /* sampleMimeType= */ null,
+            /* codecs= */ "avc1.100.41,mp4a.40.2",
+            bitrate,
+            /* width= */ Format.NO_VALUE,
+            /* height= */ Format.NO_VALUE,
+            /* frameRate= */ Format.NO_VALUE,
+            /* initializationData= */ null,
+            /* selectionFlags= */ 0));
+  }
+
+  private static HlsUrl createAudioOnlyVariantHlsUrl(int bitrate) {
+    return new HlsUrl(
+        "http://url",
+        Format.createVideoContainerFormat(
+            /* id= */ null,
+            /* label= */ null,
+            /* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
+            /* sampleMimeType= */ null,
+            /* codecs= */ "mp4a.40.2",
+            bitrate,
+            /* width= */ Format.NO_VALUE,
+            /* height= */ Format.NO_VALUE,
+            /* frameRate= */ Format.NO_VALUE,
+            /* initializationData= */ null,
+            /* selectionFlags= */ 0));
+  }
+
+  private static HlsUrl createAudioHlsUrl(String language) {
+    return new HlsUrl("http://url", createAudioFormat(language));
+  }
+
+  private static HlsUrl createSubtitleHlsUrl(String language) {
+    return new HlsUrl("http://url", createSubtitleFormat(language));
+  }
+
+  private static Format createAudioFormat(String language) {
+    return Format.createAudioContainerFormat(
+        /* id= */ null,
+        /* label= */ null,
+        /* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
+        MimeTypes.getMediaMimeType("mp4a.40.2"),
+        /* codecs= */ "mp4a.40.2",
+        /* bitrate= */ Format.NO_VALUE,
+        /* channelCount= */ Format.NO_VALUE,
+        /* sampleRate= */ Format.NO_VALUE,
+        /* initializationData= */ null,
+        /* selectionFlags= */ 0,
+        language);
+  }
+
+  private static Format createSubtitleFormat(String language) {
+    return Format.createTextContainerFormat(
+        /* id= */ null,
+        /* label= */ null,
+        /* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
+        /* sampleMimeType= */ MimeTypes.TEXT_VTT,
+        /* codecs= */ null,
+        /* bitrate= */ Format.NO_VALUE,
+        /* selectionFlags= */ 0,
+        language);
+  }
+}

From 0a8ae74217f04e981786ea6b74192a0488e6ddb4 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 29 Jan 2019 12:58:28 +0000
Subject: [PATCH 441/832] Update DownloadHelper to use MediaSource and
 MediaPeriod directly.

This requires to prepare the media source and the periods in a small helper similar
to the metadata retriever. It also gets rid of the need to have abstract protected
methods to load the manifest, to extract the track groups and to convert to stream keys,
as this can now be handled by the media period.

PiperOrigin-RevId: 231385590
---
 .../exoplayer2/demo/DownloadTracker.java      |  31 +-
 .../exoplayer2/offline/DownloadHelper.java    | 335 +++++++++++++-----
 .../offline/ProgressiveDownloadHelper.java    |  25 +-
 .../offline/DownloadHelperTest.java           |  64 +++-
 .../dash/offline/DashDownloadHelper.java      |  52 +--
 .../source/hls/offline/HlsDownloadHelper.java |  72 +---
 .../offline/SsDownloadHelper.java             |  39 +-
 7 files changed, 322 insertions(+), 296 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index 559bbcef0f..b0e56b9f92 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -210,7 +210,7 @@ public class DownloadTracker implements DownloadManager.Listener {
     DownloadService.startWithAction(context, DemoDownloadService.class, action, false);
   }
 
-  private DownloadHelper<?> getDownloadHelper(
+  private DownloadHelper getDownloadHelper(
       Uri uri, String extension, RenderersFactory renderersFactory) {
     int type = Util.inferContentType(uri, extension);
     switch (type) {
@@ -231,10 +231,11 @@ public class DownloadTracker implements DownloadManager.Listener {
   private final class StartDownloadDialogHelper
       implements DownloadHelper.Callback,
           DialogInterface.OnClickListener,
+          DialogInterface.OnDismissListener,
           View.OnClickListener,
           TrackSelectionView.DialogCallback {
 
-    private final DownloadHelper<?> downloadHelper;
+    private final DownloadHelper downloadHelper;
     private final String name;
     private final LayoutInflater dialogInflater;
     private final AlertDialog dialog;
@@ -244,20 +245,21 @@ public class DownloadTracker implements DownloadManager.Listener {
     private DefaultTrackSelector.Parameters parameters;
 
     private StartDownloadDialogHelper(
-        Activity activity, DownloadHelper<?> downloadHelper, String name) {
+        Activity activity, DownloadHelper downloadHelper, String name) {
       this.downloadHelper = downloadHelper;
       this.name = name;
       AlertDialog.Builder builder =
           new AlertDialog.Builder(activity)
               .setTitle(R.string.download_preparing)
-              .setPositiveButton(android.R.string.ok, this)
-              .setNegativeButton(android.R.string.cancel, null);
+              .setPositiveButton(android.R.string.ok, /* listener= */ this)
+              .setNegativeButton(android.R.string.cancel, /* listener= */ null);
 
       // Inflate with the builder's context to ensure the correct style is used.
       dialogInflater = LayoutInflater.from(builder.getContext());
       selectionList = (LinearLayout) dialogInflater.inflate(R.layout.start_download_dialog, null);
       builder.setView(selectionList);
       dialog = builder.create();
+      dialog.setOnDismissListener(/* listener= */ this);
       dialog.show();
       dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
 
@@ -268,19 +270,17 @@ public class DownloadTracker implements DownloadManager.Listener {
     // DownloadHelper.Callback implementation.
 
     @Override
-    public void onPrepared(DownloadHelper<?> helper) {
-      if (helper.getPeriodCount() < 1) {
-        onPrepareError(downloadHelper, new IOException("Content is empty."));
-        return;
+    public void onPrepared(DownloadHelper helper) {
+      if (helper.getPeriodCount() > 0) {
+        mappedTrackInfo = downloadHelper.getMappedTrackInfo(/* periodIndex= */ 0);
+        updateSelectionList();
       }
-      mappedTrackInfo = downloadHelper.getMappedTrackInfo(/* periodIndex= */ 0);
-      updateSelectionList();
       dialog.setTitle(R.string.exo_download_description);
       dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true);
     }
 
     @Override
-    public void onPrepareError(DownloadHelper<?> helper, IOException e) {
+    public void onPrepareError(DownloadHelper helper, IOException e) {
       Toast.makeText(
               context.getApplicationContext(), R.string.download_start_error, Toast.LENGTH_LONG)
           .show();
@@ -326,6 +326,13 @@ public class DownloadTracker implements DownloadManager.Listener {
       startDownload(downloadAction);
     }
 
+    // DialogInterface.OnDismissListener implementation.
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+      downloadHelper.release();
+    }
+
     // Internal methods.
 
     private void updateSelectionList() {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index e799aff4b2..0cd8081708 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -17,7 +17,9 @@ package com.google.android.exoplayer2.offline;
 
 import android.net.Uri;
 import android.os.Handler;
+import android.os.HandlerThread;
 import android.os.Looper;
+import android.os.Message;
 import android.support.annotation.Nullable;
 import android.util.SparseIntArray;
 import com.google.android.exoplayer2.C;
@@ -27,6 +29,8 @@ import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.drm.DrmSessionManager;
 import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
+import com.google.android.exoplayer2.source.MediaPeriod;
+import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
@@ -36,7 +40,9 @@ import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.Paramet
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
+import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.upstream.BandwidthMeter;
+import com.google.android.exoplayer2.upstream.DefaultAllocator;
 import com.google.android.exoplayer2.upstream.TransferListener;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
@@ -58,19 +64,19 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
  * <p>A typical usage of DownloadHelper follows these steps:
  *
  * <ol>
- *   <li>Construct the download helper with information about the {@link RenderersFactory renderers}
- *       and {@link DefaultTrackSelector.Parameters parameters} for track selection.
+ *   <li>Construct the download helper with the {@link MediaSource}, information about the {@link
+ *       RenderersFactory renderers} and {@link DefaultTrackSelector.Parameters parameters} for
+ *       track selection.
  *   <li>Prepare the helper using {@link #prepare(Callback)} and wait for the callback.
  *   <li>Optional: Inspect the selected tracks using {@link #getMappedTrackInfo(int)} and {@link
  *       #getTrackSelections(int, int)}, and make adjustments using {@link
  *       #clearTrackSelections(int)}, {@link #replaceTrackSelections(int, Parameters)} and {@link
  *       #addTrackSelection(int, Parameters)}.
- *   <li>Create download actions for the selected track using {@link #getDownloadAction(byte[])}.
+ *   <li>Create a download action for the selected track using {@link #getDownloadAction(byte[])}.
+ *   <li>Release the helper using {@link #release()}.
  * </ol>
- *
- * @param <T> The manifest type.
  */
-public abstract class DownloadHelper<T> {
+public abstract class DownloadHelper {
 
   /**
    * The default parameters used for track selection for downloading. This default selects the
@@ -87,7 +93,7 @@ public abstract class DownloadHelper<T> {
      *
      * @param helper The reporting {@link DownloadHelper}.
      */
-    void onPrepared(DownloadHelper<?> helper);
+    void onPrepared(DownloadHelper helper);
 
     /**
      * Called when preparation fails.
@@ -95,18 +101,21 @@ public abstract class DownloadHelper<T> {
      * @param helper The reporting {@link DownloadHelper}.
      * @param e The error.
      */
-    void onPrepareError(DownloadHelper<?> helper, IOException e);
+    void onPrepareError(DownloadHelper helper, IOException e);
   }
 
   private final String downloadType;
   private final Uri uri;
   @Nullable private final String cacheKey;
+  @Nullable private final MediaSource mediaSource;
   private final DefaultTrackSelector trackSelector;
   private final RendererCapabilities[] rendererCapabilities;
   private final SparseIntArray scratchSet;
 
-  private int currentTrackSelectionPeriodIndex;
-  @Nullable private T manifest;
+  private boolean isPreparedWithMedia;
+  private @MonotonicNonNull Callback callback;
+  private @MonotonicNonNull Handler callbackHandler;
+  private @MonotonicNonNull MediaPreparer mediaPreparer;
   private TrackGroupArray @MonotonicNonNull [] trackGroupArrays;
   private MappedTrackInfo @MonotonicNonNull [] mappedTrackInfos;
   private List<TrackSelection> @MonotonicNonNull [][] trackSelectionsByPeriodAndRenderer;
@@ -118,10 +127,12 @@ public abstract class DownloadHelper<T> {
    * @param downloadType A download type. This value will be used as {@link DownloadAction#type}.
    * @param uri A {@link Uri}.
    * @param cacheKey An optional cache key.
+   * @param mediaSource A {@link MediaSource} for which tracks are selected, or null if no track
+   *     selection needs to be made.
    * @param trackSelectorParameters {@link DefaultTrackSelector.Parameters} for selecting tracks for
    *     downloading.
    * @param renderersFactory The {@link RenderersFactory} creating the renderers for which tracks
-   *     are selected.
+   *     are selected, or null if no track selection needs to be made.
    * @param drmSessionManager An optional {@link DrmSessionManager} used by the renderers created by
    *     {@code renderersFactory}.
    */
@@ -129,14 +140,19 @@ public abstract class DownloadHelper<T> {
       String downloadType,
       Uri uri,
       @Nullable String cacheKey,
+      @Nullable MediaSource mediaSource,
       DefaultTrackSelector.Parameters trackSelectorParameters,
-      RenderersFactory renderersFactory,
+      @Nullable RenderersFactory renderersFactory,
       @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager) {
     this.downloadType = downloadType;
     this.uri = uri;
     this.cacheKey = cacheKey;
+    this.mediaSource = mediaSource;
     this.trackSelector = new DefaultTrackSelector(new DownloadTrackSelection.Factory());
-    this.rendererCapabilities = Util.getRendererCapabilities(renderersFactory, drmSessionManager);
+    this.rendererCapabilities =
+        renderersFactory == null
+            ? new RendererCapabilities[0]
+            : Util.getRendererCapabilities(renderersFactory, drmSessionManager);
     this.scratchSet = new SparseIntArray();
     trackSelector.setParameters(trackSelectorParameters);
     trackSelector.init(/* listener= */ () -> {}, new DummyBandwidthMeter());
@@ -148,35 +164,38 @@ public abstract class DownloadHelper<T> {
    * @param callback A callback to be notified when preparation completes or fails. The callback
    *     will be invoked on the calling thread unless that thread does not have an associated {@link
    *     Looper}, in which case it will be called on the application's main thread.
+   * @throws IllegalStateException If the download helper has already been prepared.
    */
   public final void prepare(Callback callback) {
-    Handler handler =
+    Assertions.checkState(this.callback == null);
+    this.callback = callback;
+    callbackHandler =
         new Handler(Looper.myLooper() != null ? Looper.myLooper() : Looper.getMainLooper());
-    new Thread(
-            () -> {
-              try {
-                manifest = loadManifest(uri);
-                trackGroupArrays = getTrackGroupArrays(manifest);
-                initializeTrackSelectionLists(trackGroupArrays.length, rendererCapabilities.length);
-                mappedTrackInfos = new MappedTrackInfo[trackGroupArrays.length];
-                for (int i = 0; i < trackGroupArrays.length; i++) {
-                  TrackSelectorResult trackSelectorResult = runTrackSelection(/* periodIndex= */ i);
-                  trackSelector.onSelectionActivated(trackSelectorResult.info);
-                  mappedTrackInfos[i] =
-                      Assertions.checkNotNull(trackSelector.getCurrentMappedTrackInfo());
-                }
-                handler.post(() -> callback.onPrepared(DownloadHelper.this));
-              } catch (final IOException e) {
-                handler.post(() -> callback.onPrepareError(DownloadHelper.this, e));
-              }
-            })
-        .start();
+    if (mediaSource != null) {
+      mediaPreparer = new MediaPreparer(mediaSource, /* downloadHelper= */ this);
+    } else {
+      callbackHandler.post(() -> callback.onPrepared(this));
+    }
   }
 
-  /** Returns the manifest. Must not be called until after preparation completes. */
-  public final T getManifest() {
-    Assertions.checkNotNull(manifest);
-    return manifest;
+  /** Releases the helper and all resources it is holding. */
+  public final void release() {
+    if (mediaPreparer != null) {
+      mediaPreparer.release();
+    }
+  }
+
+  /**
+   * Returns the manifest, or null if no manifest is loaded. Must not be called until after
+   * preparation completes.
+   */
+  @Nullable
+  public final Object getManifest() {
+    if (mediaSource == null) {
+      return null;
+    }
+    assertPreparedWithMedia();
+    return mediaPreparer.manifest;
   }
 
   /**
@@ -184,7 +203,10 @@ public abstract class DownloadHelper<T> {
    * preparation completes.
    */
   public final int getPeriodCount() {
-    Assertions.checkNotNull(trackGroupArrays);
+    if (mediaSource == null) {
+      return 0;
+    }
+    assertPreparedWithMedia();
     return trackGroupArrays.length;
   }
 
@@ -199,7 +221,7 @@ public abstract class DownloadHelper<T> {
    *     content.
    */
   public final TrackGroupArray getTrackGroups(int periodIndex) {
-    Assertions.checkNotNull(trackGroupArrays);
+    assertPreparedWithMedia();
     return trackGroupArrays[periodIndex];
   }
 
@@ -211,7 +233,7 @@ public abstract class DownloadHelper<T> {
    * @return The {@link MappedTrackInfo} for the period.
    */
   public final MappedTrackInfo getMappedTrackInfo(int periodIndex) {
-    Assertions.checkNotNull(mappedTrackInfos);
+    assertPreparedWithMedia();
     return mappedTrackInfos[periodIndex];
   }
 
@@ -224,7 +246,7 @@ public abstract class DownloadHelper<T> {
    * @return A list of selected {@link TrackSelection track selections}.
    */
   public final List<TrackSelection> getTrackSelections(int periodIndex, int rendererIndex) {
-    Assertions.checkNotNull(immutableTrackSelectionsByPeriodAndRenderer);
+    assertPreparedWithMedia();
     return immutableTrackSelectionsByPeriodAndRenderer[periodIndex][rendererIndex];
   }
 
@@ -235,7 +257,7 @@ public abstract class DownloadHelper<T> {
    * @param periodIndex The period index for which track selections are cleared.
    */
   public final void clearTrackSelections(int periodIndex) {
-    Assertions.checkNotNull(trackSelectionsByPeriodAndRenderer);
+    assertPreparedWithMedia();
     for (int i = 0; i < rendererCapabilities.length; i++) {
       trackSelectionsByPeriodAndRenderer[periodIndex][i].clear();
     }
@@ -265,8 +287,7 @@ public abstract class DownloadHelper<T> {
    */
   public final void addTrackSelection(
       int periodIndex, DefaultTrackSelector.Parameters trackSelectorParameters) {
-    Assertions.checkNotNull(trackGroupArrays);
-    Assertions.checkNotNull(trackSelectionsByPeriodAndRenderer);
+    assertPreparedWithMedia();
     trackSelector.setParameters(trackSelectorParameters);
     runTrackSelection(periodIndex);
   }
@@ -279,26 +300,21 @@ public abstract class DownloadHelper<T> {
    * @return The built {@link DownloadAction}.
    */
   public final DownloadAction getDownloadAction(@Nullable byte[] data) {
-    Assertions.checkNotNull(trackSelectionsByPeriodAndRenderer);
-    Assertions.checkNotNull(trackGroupArrays);
+    if (mediaSource == null) {
+      return DownloadAction.createDownloadAction(
+          downloadType, uri, /* keys= */ Collections.emptyList(), cacheKey, data);
+    }
+    assertPreparedWithMedia();
     List<StreamKey> streamKeys = new ArrayList<>();
+    List<TrackSelection> allSelections = new ArrayList<>();
     int periodCount = trackSelectionsByPeriodAndRenderer.length;
     for (int periodIndex = 0; periodIndex < periodCount; periodIndex++) {
+      allSelections.clear();
       int rendererCount = trackSelectionsByPeriodAndRenderer[periodIndex].length;
       for (int rendererIndex = 0; rendererIndex < rendererCount; rendererIndex++) {
-        List<TrackSelection> trackSelectionList =
-            trackSelectionsByPeriodAndRenderer[periodIndex][rendererIndex];
-        for (int selectionIndex = 0; selectionIndex < trackSelectionList.size(); selectionIndex++) {
-          TrackSelection trackSelection = trackSelectionList.get(selectionIndex);
-          int trackGroupIndex =
-              trackGroupArrays[periodIndex].indexOf(trackSelection.getTrackGroup());
-          int trackCount = trackSelection.length();
-          for (int trackListIndex = 0; trackListIndex < trackCount; trackListIndex++) {
-            int trackIndex = trackSelection.getIndexInTrackGroup(trackListIndex);
-            streamKeys.add(toStreamKey(periodIndex, trackGroupIndex, trackIndex));
-          }
-        }
+        allSelections.addAll(trackSelectionsByPeriodAndRenderer[periodIndex][rendererIndex]);
       }
+      streamKeys.addAll(mediaPreparer.mediaPeriods[periodIndex].getStreamKeys(allSelections));
     }
     return DownloadAction.createDownloadAction(downloadType, uri, streamKeys, cacheKey, data);
   }
@@ -312,36 +328,14 @@ public abstract class DownloadHelper<T> {
     return DownloadAction.createRemoveAction(downloadType, uri, cacheKey);
   }
 
-  /**
-   * Loads the manifest. This method is called on a background thread.
-   *
-   * @param uri The manifest uri.
-   * @throws IOException If loading fails.
-   */
-  protected abstract T loadManifest(Uri uri) throws IOException;
-
-  /**
-   * Returns the track group arrays for each period in the manifest.
-   *
-   * @param manifest The manifest.
-   * @return An array of {@link TrackGroupArray}s. One for each period in the manifest.
-   */
-  protected abstract TrackGroupArray[] getTrackGroupArrays(T manifest);
-
-  /**
-   * Converts a track of a track group of a period to the corresponding {@link StreamKey}.
-   *
-   * @param periodIndex The index of the containing period.
-   * @param trackGroupIndex The index of the containing track group within the period.
-   * @param trackIndexInTrackGroup The index of the track within the track group.
-   * @return The corresponding {@link StreamKey}.
-   */
-  protected abstract StreamKey toStreamKey(
-      int periodIndex, int trackGroupIndex, int trackIndexInTrackGroup);
-
+  // Initialization of array of Lists.
   @SuppressWarnings("unchecked")
-  @EnsuresNonNull("trackSelectionsByPeriodAndRenderer")
-  private void initializeTrackSelectionLists(int periodCount, int rendererCount) {
+  private void onMediaPrepared() {
+    Assertions.checkNotNull(mediaPreparer);
+    Assertions.checkNotNull(mediaPreparer.mediaPeriods);
+    Assertions.checkNotNull(mediaPreparer.timeline);
+    int periodCount = mediaPreparer.mediaPeriods.length;
+    int rendererCount = rendererCapabilities.length;
     trackSelectionsByPeriodAndRenderer =
         (List<TrackSelection>[][]) new List<?>[periodCount][rendererCount];
     immutableTrackSelectionsByPeriodAndRenderer =
@@ -353,6 +347,49 @@ public abstract class DownloadHelper<T> {
             Collections.unmodifiableList(trackSelectionsByPeriodAndRenderer[i][j]);
       }
     }
+    trackGroupArrays = new TrackGroupArray[periodCount];
+    mappedTrackInfos = new MappedTrackInfo[periodCount];
+    for (int i = 0; i < periodCount; i++) {
+      trackGroupArrays[i] = mediaPreparer.mediaPeriods[i].getTrackGroups();
+      TrackSelectorResult trackSelectorResult = runTrackSelection(/* periodIndex= */ i);
+      trackSelector.onSelectionActivated(trackSelectorResult.info);
+      mappedTrackInfos[i] = Assertions.checkNotNull(trackSelector.getCurrentMappedTrackInfo());
+    }
+    setPreparedWithMedia();
+    Assertions.checkNotNull(callbackHandler)
+        .post(() -> Assertions.checkNotNull(callback).onPrepared(this));
+  }
+
+  private void onMediaPreparationFailed(IOException error) {
+    Assertions.checkNotNull(callbackHandler)
+        .post(() -> Assertions.checkNotNull(callback).onPrepareError(this, error));
+  }
+
+  @RequiresNonNull({
+    "trackGroupArrays",
+    "mappedTrackInfos",
+    "trackSelectionsByPeriodAndRenderer",
+    "immutableTrackSelectionsByPeriodAndRenderer",
+    "mediaPreparer",
+    "mediaPreparer.timeline",
+    "mediaPreparer.mediaPeriods"
+  })
+  private void setPreparedWithMedia() {
+    isPreparedWithMedia = true;
+  }
+
+  @EnsuresNonNull({
+    "trackGroupArrays",
+    "mappedTrackInfos",
+    "trackSelectionsByPeriodAndRenderer",
+    "immutableTrackSelectionsByPeriodAndRenderer",
+    "mediaPreparer",
+    "mediaPreparer.timeline",
+    "mediaPreparer.mediaPeriods"
+  })
+  @SuppressWarnings("nullness:contracts.postcondition.not.satisfied")
+  private void assertPreparedWithMedia() {
+    Assertions.checkState(isPreparedWithMedia);
   }
 
   /**
@@ -361,26 +398,27 @@ public abstract class DownloadHelper<T> {
    */
   // Intentional reference comparison of track group instances.
   @SuppressWarnings("ReferenceEquality")
-  @RequiresNonNull({"trackGroupArrays", "trackSelectionsByPeriodAndRenderer"})
+  @RequiresNonNull({
+    "trackGroupArrays",
+    "trackSelectionsByPeriodAndRenderer",
+    "mediaPreparer",
+    "mediaPreparer.timeline"
+  })
   private TrackSelectorResult runTrackSelection(int periodIndex) {
-    // TODO: Use actual timeline and media period id.
-    MediaPeriodId dummyMediaPeriodId = new MediaPeriodId(new Object());
-    Timeline dummyTimeline = Timeline.EMPTY;
-    currentTrackSelectionPeriodIndex = periodIndex;
     try {
       TrackSelectorResult trackSelectorResult =
           trackSelector.selectTracks(
               rendererCapabilities,
               trackGroupArrays[periodIndex],
-              dummyMediaPeriodId,
-              dummyTimeline);
+              new MediaPeriodId(mediaPreparer.timeline.getUidOfPeriod(periodIndex)),
+              mediaPreparer.timeline);
       for (int i = 0; i < trackSelectorResult.length; i++) {
         TrackSelection newSelection = trackSelectorResult.selections.get(i);
         if (newSelection == null) {
           continue;
         }
         List<TrackSelection> existingSelectionList =
-            trackSelectionsByPeriodAndRenderer[currentTrackSelectionPeriodIndex][i];
+            trackSelectionsByPeriodAndRenderer[periodIndex][i];
         boolean mergedWithExistingSelection = false;
         for (int j = 0; j < existingSelectionList.size(); j++) {
           TrackSelection existingSelection = existingSelectionList.get(j);
@@ -414,6 +452,113 @@ public abstract class DownloadHelper<T> {
     }
   }
 
+  private static final class MediaPreparer
+      implements MediaSource.SourceInfoRefreshListener, MediaPeriod.Callback, Handler.Callback {
+
+    private static final int MESSAGE_PREPARE_SOURCE = 0;
+    private static final int MESSAGE_CHECK_FOR_FAILURE = 1;
+
+    private final MediaSource mediaSource;
+    private final DownloadHelper downloadHelper;
+    private final Allocator allocator;
+    private final HandlerThread mediaSourceThread;
+    private final Handler mediaSourceHandler;
+
+    @Nullable public Object manifest;
+    public @MonotonicNonNull Timeline timeline;
+    public MediaPeriod @MonotonicNonNull [] mediaPeriods;
+
+    private int pendingPreparations;
+
+    public MediaPreparer(MediaSource mediaSource, DownloadHelper downloadHelper) {
+      this.mediaSource = mediaSource;
+      this.downloadHelper = downloadHelper;
+      allocator = new DefaultAllocator(true, C.DEFAULT_BUFFER_SEGMENT_SIZE);
+      mediaSourceThread = new HandlerThread("DownloadHelper");
+      mediaSourceThread.start();
+      mediaSourceHandler = Util.createHandler(mediaSourceThread.getLooper(), /* callback= */ this);
+      mediaSourceHandler.sendEmptyMessage(MESSAGE_PREPARE_SOURCE);
+    }
+
+    public void release() {
+      if (mediaPeriods != null) {
+        for (MediaPeriod mediaPeriod : mediaPeriods) {
+          mediaSource.releasePeriod(mediaPeriod);
+        }
+      }
+      mediaSource.releaseSource(this);
+      mediaSourceThread.quit();
+    }
+
+    // Handler.Callback
+
+    @Override
+    public boolean handleMessage(Message msg) {
+      switch (msg.what) {
+        case MESSAGE_PREPARE_SOURCE:
+          mediaSource.prepareSource(/* listener= */ this, /* mediaTransferListener= */ null);
+          mediaSourceHandler.sendEmptyMessage(MESSAGE_CHECK_FOR_FAILURE);
+          return true;
+        case MESSAGE_CHECK_FOR_FAILURE:
+          try {
+            if (mediaPeriods == null) {
+              mediaSource.maybeThrowSourceInfoRefreshError();
+            } else {
+              for (MediaPeriod mediaPeriod : mediaPeriods) {
+                mediaPeriod.maybeThrowPrepareError();
+              }
+            }
+            mediaSourceHandler.sendEmptyMessageDelayed(
+                MESSAGE_CHECK_FOR_FAILURE, /* delayMillis= */ 100);
+          } catch (IOException e) {
+            downloadHelper.onMediaPreparationFailed(e);
+          }
+          return true;
+        default:
+          return false;
+      }
+    }
+
+    // MediaSource.SourceInfoRefreshListener implementation.
+
+    @Override
+    public void onSourceInfoRefreshed(
+        MediaSource source, Timeline timeline, @Nullable Object manifest) {
+      if (this.timeline != null) {
+        // Ignore dynamic updates.
+        return;
+      }
+      this.timeline = timeline;
+      this.manifest = manifest;
+      mediaPeriods = new MediaPeriod[timeline.getPeriodCount()];
+      pendingPreparations = mediaPeriods.length;
+      for (int i = 0; i < mediaPeriods.length; i++) {
+        mediaPeriods[i] =
+            mediaSource.createPeriod(
+                new MediaPeriodId(timeline.getUidOfPeriod(/* periodIndex= */ i)),
+                allocator,
+                /* startPositionUs= */ 0);
+        mediaPeriods[i].prepare(/* callback= */ this, /* positionUs= */ 0);
+      }
+    }
+
+    // MediaPeriod.Callback implementation.
+
+    @Override
+    public void onPrepared(MediaPeriod mediaPeriod) {
+      pendingPreparations--;
+      if (pendingPreparations == 0) {
+        mediaSourceHandler.removeMessages(MESSAGE_CHECK_FOR_FAILURE);
+        downloadHelper.onMediaPrepared();
+      }
+    }
+
+    @Override
+    public void onContinueLoadingRequested(MediaPeriod source) {
+      // Ignore.
+    }
+  }
+
   private static final class DownloadTrackSelection extends BaseTrackSelection {
 
     private static final class Factory implements TrackSelection.Factory {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java
index 2ec14368ca..1850eaebf2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java
@@ -17,11 +17,9 @@ package com.google.android.exoplayer2.offline;
 
 import android.net.Uri;
 import android.support.annotation.Nullable;
-import com.google.android.exoplayer2.Renderer;
-import com.google.android.exoplayer2.source.TrackGroupArray;
 
 /** A {@link DownloadHelper} for progressive streams. */
-public final class ProgressiveDownloadHelper extends DownloadHelper<Void> {
+public final class ProgressiveDownloadHelper extends DownloadHelper {
 
   /**
    * Creates download helper for progressive streams.
@@ -43,24 +41,9 @@ public final class ProgressiveDownloadHelper extends DownloadHelper<Void> {
         DownloadAction.TYPE_PROGRESSIVE,
         uri,
         cacheKey,
-        DownloadHelper.DEFAULT_TRACK_SELECTOR_PARAMETERS,
-        (handler, videoListener, audioListener, metadata, text, drm) -> new Renderer[0],
+        /* mediaSource= */ null,
+        /* trackSelectorParameters= */ DownloadHelper.DEFAULT_TRACK_SELECTOR_PARAMETERS,
+        /* renderersFactory= */ null,
         /* drmSessionManager= */ null);
   }
-
-  @Override
-  protected Void loadManifest(Uri uri) {
-    return null;
-  }
-
-  @Override
-  protected TrackGroupArray[] getTrackGroupArrays(Void manifest) {
-    return new TrackGroupArray[] {TrackGroupArray.EMPTY};
-  }
-
-  @Override
-  protected StreamKey toStreamKey(
-      int periodIndex, int trackGroupIndex, int trackIndexInTrackGroup) {
-    return new StreamKey(periodIndex, trackGroupIndex, trackIndexInTrackGroup);
-  }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
index 5f287d8685..e6cca02140 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
@@ -22,17 +22,28 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.Renderer;
 import com.google.android.exoplayer2.RenderersFactory;
+import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.offline.DownloadHelper.Callback;
+import com.google.android.exoplayer2.source.MediaPeriod;
+import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
+import com.google.android.exoplayer2.source.MediaSourceEventListener.EventDispatcher;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.testutil.FakeMediaPeriod;
+import com.google.android.exoplayer2.testutil.FakeMediaSource;
 import com.google.android.exoplayer2.testutil.FakeRenderer;
+import com.google.android.exoplayer2.testutil.FakeTimeline;
+import com.google.android.exoplayer2.testutil.FakeTimeline.TimelineWindowDefinition;
+import com.google.android.exoplayer2.testutil.RobolectricUtil;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.ParametersBuilder;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
+import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.util.ConditionVariable;
 import com.google.android.exoplayer2.util.MimeTypes;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
@@ -40,15 +51,19 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLooper;
 
 /** Unit tests for {@link DownloadHelper}. */
 @RunWith(RobolectricTestRunner.class)
+@Config(shadows = {RobolectricUtil.CustomLooper.class, RobolectricUtil.CustomMessageQueue.class})
 public class DownloadHelperTest {
 
   private static final String TEST_DOWNLOAD_TYPE = "downloadType";
   private static final String TEST_CACHE_KEY = "cacheKey";
-  private static final ManifestType TEST_MANIFEST = new ManifestType();
+  private static final Timeline TEST_TIMELINE =
+      new FakeTimeline(new TimelineWindowDefinition(/* periodCount= */ 2, /* id= */ new Object()));
+  private static final Object TEST_MANIFEST = new Object();
 
   private static final Format VIDEO_FORMAT_LOW = createVideoFormat(/* bitrate= */ 200_000);
   private static final Format VIDEO_FORMAT_HIGH = createVideoFormat(/* bitrate= */ 800_000);
@@ -98,7 +113,7 @@ public class DownloadHelperTest {
   public void getManifest_returnsManifest() throws Exception {
     prepareDownloadHelper(downloadHelper);
 
-    ManifestType manifest = downloadHelper.getManifest();
+    Object manifest = downloadHelper.getManifest();
 
     assertThat(manifest).isEqualTo(TEST_MANIFEST);
   }
@@ -337,12 +352,12 @@ public class DownloadHelperTest {
     downloadHelper.prepare(
         new Callback() {
           @Override
-          public void onPrepared(DownloadHelper<?> helper) {
+          public void onPrepared(DownloadHelper helper) {
             preparedCondition.open();
           }
 
           @Override
-          public void onPrepareError(DownloadHelper<?> helper, IOException e) {
+          public void onPrepareError(DownloadHelper helper, IOException e) {
             prepareException.set(e);
             preparedCondition.open();
           }
@@ -411,35 +426,52 @@ public class DownloadHelperTest {
     assertThat(selectedTracksInGroup).isEqualTo(tracks);
   }
 
-  private static final class ManifestType {}
-
-  private static final class FakeDownloadHelper extends DownloadHelper<ManifestType> {
+  private static final class FakeDownloadHelper extends DownloadHelper {
 
     public FakeDownloadHelper(Uri testUri, RenderersFactory renderersFactory) {
       super(
           TEST_DOWNLOAD_TYPE,
           testUri,
           TEST_CACHE_KEY,
+          new TestMediaSource(),
           DownloadHelper.DEFAULT_TRACK_SELECTOR_PARAMETERS,
           renderersFactory,
           /* drmSessionManager= */ null);
     }
+  }
 
-    @Override
-    protected ManifestType loadManifest(Uri uri) throws IOException {
-      return TEST_MANIFEST;
+  private static final class TestMediaSource extends FakeMediaSource {
+
+    public TestMediaSource() {
+      super(TEST_TIMELINE, TEST_MANIFEST);
     }
 
     @Override
-    protected TrackGroupArray[] getTrackGroupArrays(ManifestType manifest) {
-      assertThat(manifest).isEqualTo(TEST_MANIFEST);
-      return TRACK_GROUP_ARRAYS;
+    public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator, long startPositionUs) {
+      int periodIndex = TEST_TIMELINE.getIndexOfPeriod(id.periodUid);
+      return new FakeMediaPeriod(
+          TRACK_GROUP_ARRAYS[periodIndex],
+          new EventDispatcher()
+              .withParameters(/* windowIndex= */ 0, id, /* mediaTimeOffsetMs= */ 0)) {
+        @Override
+        public List<StreamKey> getStreamKeys(List<TrackSelection> trackSelections) {
+          List<StreamKey> result = new ArrayList<>();
+          for (TrackSelection trackSelection : trackSelections) {
+            int groupIndex =
+                TRACK_GROUP_ARRAYS[periodIndex].indexOf(trackSelection.getTrackGroup());
+            for (int i = 0; i < trackSelection.length(); i++) {
+              result.add(
+                  new StreamKey(periodIndex, groupIndex, trackSelection.getIndexInTrackGroup(i)));
+            }
+          }
+          return result;
+        }
+      };
     }
 
     @Override
-    protected StreamKey toStreamKey(
-        int periodIndex, int trackGroupIndex, int trackIndexInTrackGroup) {
-      return new StreamKey(periodIndex, trackGroupIndex, trackIndexInTrackGroup);
+    public void releasePeriod(MediaPeriod mediaPeriod) {
+      // Do nothing.
     }
   }
 }
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java
index f86e47ed3d..b611cf0d5f 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java
@@ -17,30 +17,17 @@ package com.google.android.exoplayer2.source.dash.offline;
 
 import android.net.Uri;
 import android.support.annotation.Nullable;
-import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.drm.DrmSessionManager;
 import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadHelper;
-import com.google.android.exoplayer2.offline.StreamKey;
-import com.google.android.exoplayer2.source.TrackGroup;
-import com.google.android.exoplayer2.source.TrackGroupArray;
-import com.google.android.exoplayer2.source.dash.manifest.AdaptationSet;
-import com.google.android.exoplayer2.source.dash.manifest.DashManifest;
-import com.google.android.exoplayer2.source.dash.manifest.DashManifestParser;
-import com.google.android.exoplayer2.source.dash.manifest.Representation;
+import com.google.android.exoplayer2.source.dash.DashMediaSource;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.upstream.ParsingLoadable;
-import java.io.IOException;
-import java.util.List;
 
 /** A {@link DownloadHelper} for DASH streams. */
-public final class DashDownloadHelper extends DownloadHelper<DashManifest> {
-
-  private final DataSource.Factory manifestDataSourceFactory;
+public final class DashDownloadHelper extends DownloadHelper {
 
   /**
    * Creates a DASH download helper.
@@ -85,42 +72,9 @@ public final class DashDownloadHelper extends DownloadHelper<DashManifest> {
         DownloadAction.TYPE_DASH,
         uri,
         /* cacheKey= */ null,
+        new DashMediaSource.Factory(manifestDataSourceFactory).createMediaSource(uri),
         trackSelectorParameters,
         renderersFactory,
         drmSessionManager);
-    this.manifestDataSourceFactory = manifestDataSourceFactory;
-  }
-
-  @Override
-  protected DashManifest loadManifest(Uri uri) throws IOException {
-    DataSource dataSource = manifestDataSourceFactory.createDataSource();
-    return ParsingLoadable.load(dataSource, new DashManifestParser(), uri, C.DATA_TYPE_MANIFEST);
-  }
-
-  @Override
-  public TrackGroupArray[] getTrackGroupArrays(DashManifest manifest) {
-    int periodCount = manifest.getPeriodCount();
-    TrackGroupArray[] trackGroupArrays = new TrackGroupArray[periodCount];
-    for (int periodIndex = 0; periodIndex < periodCount; periodIndex++) {
-      List<AdaptationSet> adaptationSets = manifest.getPeriod(periodIndex).adaptationSets;
-      TrackGroup[] trackGroups = new TrackGroup[adaptationSets.size()];
-      for (int i = 0; i < trackGroups.length; i++) {
-        List<Representation> representations = adaptationSets.get(i).representations;
-        Format[] formats = new Format[representations.size()];
-        int representationsCount = representations.size();
-        for (int j = 0; j < representationsCount; j++) {
-          formats[j] = representations.get(j).format;
-        }
-        trackGroups[i] = new TrackGroup(formats);
-      }
-      trackGroupArrays[periodIndex] = new TrackGroupArray(trackGroups);
-    }
-    return trackGroupArrays;
-  }
-
-  @Override
-  protected StreamKey toStreamKey(
-      int periodIndex, int trackGroupIndex, int trackIndexInTrackGroup) {
-    return new StreamKey(periodIndex, trackGroupIndex, trackIndexInTrackGroup);
   }
 }
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java
index e0f55aa738..ee6bbe333a 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java
@@ -17,34 +17,17 @@ package com.google.android.exoplayer2.source.hls.offline;
 
 import android.net.Uri;
 import android.support.annotation.Nullable;
-import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.drm.DrmSessionManager;
 import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadHelper;
-import com.google.android.exoplayer2.offline.StreamKey;
-import com.google.android.exoplayer2.source.TrackGroup;
-import com.google.android.exoplayer2.source.TrackGroupArray;
-import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist;
-import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist;
-import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylist;
-import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylistParser;
+import com.google.android.exoplayer2.source.hls.HlsMediaSource;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.upstream.ParsingLoadable;
-import com.google.android.exoplayer2.util.Assertions;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
 
 /** A {@link DownloadHelper} for HLS streams. */
-public final class HlsDownloadHelper extends DownloadHelper<HlsPlaylist> {
-
-  private final DataSource.Factory manifestDataSourceFactory;
-
-  private int[] renditionGroups;
+public final class HlsDownloadHelper extends DownloadHelper {
 
   /**
    * Creates a HLS download helper.
@@ -89,56 +72,11 @@ public final class HlsDownloadHelper extends DownloadHelper<HlsPlaylist> {
         DownloadAction.TYPE_HLS,
         uri,
         /* cacheKey= */ null,
+        new HlsMediaSource.Factory(manifestDataSourceFactory)
+            .setAllowChunklessPreparation(true)
+            .createMediaSource(uri),
         trackSelectorParameters,
         renderersFactory,
         drmSessionManager);
-    this.manifestDataSourceFactory = manifestDataSourceFactory;
-  }
-
-  @Override
-  protected HlsPlaylist loadManifest(Uri uri) throws IOException {
-    DataSource dataSource = manifestDataSourceFactory.createDataSource();
-    return ParsingLoadable.load(dataSource, new HlsPlaylistParser(), uri, C.DATA_TYPE_MANIFEST);
-  }
-
-  @Override
-  protected TrackGroupArray[] getTrackGroupArrays(HlsPlaylist playlist) {
-    Assertions.checkNotNull(playlist);
-    if (playlist instanceof HlsMediaPlaylist) {
-      renditionGroups = new int[0];
-      return new TrackGroupArray[] {TrackGroupArray.EMPTY};
-    }
-    // TODO: Generate track groups as in playback. Reverse the mapping in toStreamKey.
-    HlsMasterPlaylist masterPlaylist = (HlsMasterPlaylist) playlist;
-    TrackGroup[] trackGroups = new TrackGroup[3];
-    renditionGroups = new int[3];
-    int trackGroupIndex = 0;
-    if (!masterPlaylist.variants.isEmpty()) {
-      renditionGroups[trackGroupIndex] = HlsMasterPlaylist.GROUP_INDEX_VARIANT;
-      trackGroups[trackGroupIndex++] = new TrackGroup(toFormats(masterPlaylist.variants));
-    }
-    if (!masterPlaylist.audios.isEmpty()) {
-      renditionGroups[trackGroupIndex] = HlsMasterPlaylist.GROUP_INDEX_AUDIO;
-      trackGroups[trackGroupIndex++] = new TrackGroup(toFormats(masterPlaylist.audios));
-    }
-    if (!masterPlaylist.subtitles.isEmpty()) {
-      renditionGroups[trackGroupIndex] = HlsMasterPlaylist.GROUP_INDEX_SUBTITLE;
-      trackGroups[trackGroupIndex++] = new TrackGroup(toFormats(masterPlaylist.subtitles));
-    }
-    return new TrackGroupArray[] {new TrackGroupArray(Arrays.copyOf(trackGroups, trackGroupIndex))};
-  }
-
-  @Override
-  protected StreamKey toStreamKey(
-      int periodIndex, int trackGroupIndex, int trackIndexInTrackGroup) {
-    return new StreamKey(renditionGroups[trackGroupIndex], trackIndexInTrackGroup);
-  }
-
-  private static Format[] toFormats(List<HlsMasterPlaylist.HlsUrl> hlsUrls) {
-    Format[] formats = new Format[hlsUrls.size()];
-    for (int i = 0; i < hlsUrls.size(); i++) {
-      formats[i] = hlsUrls.get(i).format;
-    }
-    return formats;
   }
 }
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java
index b17768f202..f76fb4ee90 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java
@@ -17,27 +17,17 @@ package com.google.android.exoplayer2.source.smoothstreaming.offline;
 
 import android.net.Uri;
 import android.support.annotation.Nullable;
-import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.drm.DrmSessionManager;
 import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadHelper;
-import com.google.android.exoplayer2.offline.StreamKey;
-import com.google.android.exoplayer2.source.TrackGroup;
-import com.google.android.exoplayer2.source.TrackGroupArray;
-import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest;
-import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifestParser;
-import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsUtil;
+import com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.upstream.ParsingLoadable;
-import java.io.IOException;
 
 /** A {@link DownloadHelper} for SmoothStreaming streams. */
-public final class SsDownloadHelper extends DownloadHelper<SsManifest> {
-
-  private final DataSource.Factory manifestDataSourceFactory;
+public final class SsDownloadHelper extends DownloadHelper {
 
   /**
    * Creates a SmoothStreaming download helper.
@@ -82,32 +72,9 @@ public final class SsDownloadHelper extends DownloadHelper<SsManifest> {
         DownloadAction.TYPE_SS,
         uri,
         /* cacheKey= */ null,
+        new SsMediaSource.Factory(manifestDataSourceFactory).createMediaSource(uri),
         trackSelectorParameters,
         renderersFactory,
         drmSessionManager);
-    this.manifestDataSourceFactory = manifestDataSourceFactory;
-  }
-
-  @Override
-  protected SsManifest loadManifest(Uri uri) throws IOException {
-    DataSource dataSource = manifestDataSourceFactory.createDataSource();
-    Uri fixedUri = SsUtil.fixManifestUri(uri);
-    return ParsingLoadable.load(dataSource, new SsManifestParser(), fixedUri, C.DATA_TYPE_MANIFEST);
-  }
-
-  @Override
-  protected TrackGroupArray[] getTrackGroupArrays(SsManifest manifest) {
-    SsManifest.StreamElement[] streamElements = manifest.streamElements;
-    TrackGroup[] trackGroups = new TrackGroup[streamElements.length];
-    for (int i = 0; i < streamElements.length; i++) {
-      trackGroups[i] = new TrackGroup(streamElements[i].formats);
-    }
-    return new TrackGroupArray[] {new TrackGroupArray(trackGroups)};
-  }
-
-  @Override
-  protected StreamKey toStreamKey(
-      int periodIndex, int trackGroupIndex, int trackIndexInTrackGroup) {
-    return new StreamKey(trackGroupIndex, trackIndexInTrackGroup);
   }
 }

From 71d77d7fa07521ee37436423d8fd28004e995bbf Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 29 Jan 2019 12:58:45 +0000
Subject: [PATCH 442/832] Remove DownloadHelper subclasses and use static
 methods instead.

The subclasses only call specific constructor combinations and can easily
replaced by static methods.

PiperOrigin-RevId: 231385606
---
 .../exoplayer2/demo/DownloadTracker.java      |  12 +-
 library/core/proguard-rules.txt               |  17 ++
 .../exoplayer2/offline/DownloadHelper.java    | 281 ++++++++++++++++--
 .../offline/ProgressiveDownloadHelper.java    |  49 ---
 .../offline/DownloadHelperTest.java           |  28 +-
 .../dash/offline/DashDownloadHelper.java      |  80 -----
 .../dash/offline/DownloadHelperTest.java      |  43 +++
 .../source/hls/offline/HlsDownloadHelper.java |  82 -----
 .../hls/offline/DownloadHelperTest.java       |  43 +++
 .../offline/SsDownloadHelper.java             |  80 -----
 .../offline/DownloadHelperTest.java           |  43 +++
 11 files changed, 416 insertions(+), 342 deletions(-)
 delete mode 100644 library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java
 delete mode 100644 library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java
 create mode 100644 library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadHelperTest.java
 delete mode 100644 library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java
 create mode 100644 library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/DownloadHelperTest.java
 delete mode 100644 library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java
 create mode 100644 library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/DownloadHelperTest.java

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index b0e56b9f92..83c8a76812 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -39,13 +39,9 @@ import com.google.android.exoplayer2.offline.DownloadHelper;
 import com.google.android.exoplayer2.offline.DownloadManager;
 import com.google.android.exoplayer2.offline.DownloadService;
 import com.google.android.exoplayer2.offline.DownloadState;
-import com.google.android.exoplayer2.offline.ProgressiveDownloadHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.source.TrackGroupArray;
-import com.google.android.exoplayer2.source.dash.offline.DashDownloadHelper;
-import com.google.android.exoplayer2.source.hls.offline.HlsDownloadHelper;
-import com.google.android.exoplayer2.source.smoothstreaming.offline.SsDownloadHelper;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
@@ -215,13 +211,13 @@ public class DownloadTracker implements DownloadManager.Listener {
     int type = Util.inferContentType(uri, extension);
     switch (type) {
       case C.TYPE_DASH:
-        return new DashDownloadHelper(uri, dataSourceFactory, renderersFactory);
+        return DownloadHelper.forDash(uri, dataSourceFactory, renderersFactory);
       case C.TYPE_SS:
-        return new SsDownloadHelper(uri, dataSourceFactory, renderersFactory);
+        return DownloadHelper.forSmoothStreaming(uri, dataSourceFactory, renderersFactory);
       case C.TYPE_HLS:
-        return new HlsDownloadHelper(uri, dataSourceFactory, renderersFactory);
+        return DownloadHelper.forHls(uri, dataSourceFactory, renderersFactory);
       case C.TYPE_OTHER:
-        return new ProgressiveDownloadHelper(uri);
+        return DownloadHelper.forProgressive(uri);
       default:
         throw new IllegalStateException("Unsupported type: " + type);
     }
diff --git a/library/core/proguard-rules.txt b/library/core/proguard-rules.txt
index 4fe182d34a..d18c34b86d 100644
--- a/library/core/proguard-rules.txt
+++ b/library/core/proguard-rules.txt
@@ -44,5 +44,22 @@
   <init>(android.net.Uri, java.util.List, com.google.android.exoplayer2.offlineDownloaderConstructorHelper);
 }
 
+# Constructors accessed via reflection in DownloadHelper
+-dontnote com.google.android.exoplayer2.source.dash.DashMediaSource$Factory
+-keepclassmembers class com.google.android.exoplayer2.source.dash.DashMediaSource$Factory {
+  <init>(com.google.android.exoplayer2.upstream.DataSource$Factory);
+  DashMediaSource createMediaSource(android.net.Uri);
+}
+-dontnote com.google.android.exoplayer2.source.hls.HlsMediaSource$Factory
+-keepclassmembers class com.google.android.exoplayer2.source.hls.HlsMediaSource$Factory {
+  <init>(com.google.android.exoplayer2.upstream.DataSource$Factory);
+  HlsMediaSource createMediaSource(android.net.Uri);
+}
+-dontnote com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource$Factory
+-keepclassmembers class com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource$Factory {
+  <init>(com.google.android.exoplayer2.upstream.DataSource$Factory);
+  SsMediaSource createMediaSource(android.net.Uri);
+}
+
 # Don't warn about checkerframework
 -dontwarn org.checkerframework.**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index 0cd8081708..a3c2278b32 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -21,6 +21,7 @@ import android.os.HandlerThread;
 import android.os.Looper;
 import android.os.Message;
 import android.support.annotation.Nullable;
+import android.util.Pair;
 import android.util.SparseIntArray;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
@@ -42,11 +43,14 @@ import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.upstream.BandwidthMeter;
+import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DefaultAllocator;
 import com.google.android.exoplayer2.upstream.TransferListener;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -64,9 +68,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
  * <p>A typical usage of DownloadHelper follows these steps:
  *
  * <ol>
- *   <li>Construct the download helper with the {@link MediaSource}, information about the {@link
- *       RenderersFactory renderers} and {@link DefaultTrackSelector.Parameters parameters} for
- *       track selection.
+ *   <li>Build the helper using one of the {@code forXXX} methods.
  *   <li>Prepare the helper using {@link #prepare(Callback)} and wait for the callback.
  *   <li>Optional: Inspect the selected tracks using {@link #getMappedTrackInfo(int)} and {@link
  *       #getTrackSelections(int, int)}, and make adjustments using {@link
@@ -76,7 +78,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
  *   <li>Release the helper using {@link #release()}.
  * </ol>
  */
-public abstract class DownloadHelper {
+public final class DownloadHelper {
 
   /**
    * The default parameters used for track selection for downloading. This default selects the
@@ -104,6 +106,207 @@ public abstract class DownloadHelper {
     void onPrepareError(DownloadHelper helper, IOException e);
   }
 
+  @Nullable private static final Constructor<?> DASH_FACTORY_CONSTRUCTOR;
+  @Nullable private static final Constructor<?> HLS_FACTORY_CONSTRUCTOR;
+  @Nullable private static final Constructor<?> SS_FACTORY_CONSTRUCTOR;
+  @Nullable private static final Method DASH_FACTORY_CREATE_METHOD;
+  @Nullable private static final Method HLS_FACTORY_CREATE_METHOD;
+  @Nullable private static final Method SS_FACTORY_CREATE_METHOD;
+
+  static {
+    Pair<@NullableType Constructor<?>, @NullableType Method> dashFactoryMethods =
+        getMediaSourceFactoryMethods(
+            "com.google.android.exoplayer2.source.dash.DashMediaSource$Factory");
+    DASH_FACTORY_CONSTRUCTOR = dashFactoryMethods.first;
+    DASH_FACTORY_CREATE_METHOD = dashFactoryMethods.second;
+    Pair<@NullableType Constructor<?>, @NullableType Method> hlsFactoryMethods =
+        getMediaSourceFactoryMethods(
+            "com.google.android.exoplayer2.source.hls.HlsMediaSource$Factory");
+    HLS_FACTORY_CONSTRUCTOR = hlsFactoryMethods.first;
+    HLS_FACTORY_CREATE_METHOD = hlsFactoryMethods.second;
+    Pair<@NullableType Constructor<?>, @NullableType Method> ssFactoryMethods =
+        getMediaSourceFactoryMethods(
+            "com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource$Factory");
+    SS_FACTORY_CONSTRUCTOR = ssFactoryMethods.first;
+    SS_FACTORY_CREATE_METHOD = ssFactoryMethods.second;
+  }
+
+  /**
+   * Creates a {@link DownloadHelper} for progressive streams.
+   *
+   * @param uri A stream {@link Uri}.
+   * @return A {@link DownloadHelper} for progressive streams.
+   */
+  public static DownloadHelper forProgressive(Uri uri) {
+    return forProgressive(uri, /* cacheKey= */ null);
+  }
+
+  /**
+   * Creates a {@link DownloadHelper} for progressive streams.
+   *
+   * @param uri A stream {@link Uri}.
+   * @param cacheKey An optional cache key.
+   * @return A {@link DownloadHelper} for progressive streams.
+   */
+  public static DownloadHelper forProgressive(Uri uri, @Nullable String cacheKey) {
+    return new DownloadHelper(
+        DownloadAction.TYPE_PROGRESSIVE,
+        uri,
+        cacheKey,
+        /* mediaSource= */ null,
+        DEFAULT_TRACK_SELECTOR_PARAMETERS,
+        /* rendererCapabilities= */ new RendererCapabilities[0]);
+  }
+
+  /**
+   * Creates a {@link DownloadHelper} for DASH streams.
+   *
+   * @param uri A manifest {@link Uri}.
+   * @param dataSourceFactory A {@link DataSource.Factory} used to load the manifest.
+   * @param renderersFactory A {@link RenderersFactory} creating the renderers for which tracks are
+   *     selected.
+   * @return A {@link DownloadHelper} for DASH streams.
+   * @throws IllegalStateException If the DASH module is missing.
+   */
+  public static DownloadHelper forDash(
+      Uri uri, DataSource.Factory dataSourceFactory, RenderersFactory renderersFactory) {
+    return forDash(
+        uri,
+        dataSourceFactory,
+        renderersFactory,
+        /* drmSessionManager= */ null,
+        DEFAULT_TRACK_SELECTOR_PARAMETERS);
+  }
+
+  /**
+   * Creates a {@link DownloadHelper} for DASH streams.
+   *
+   * @param uri A manifest {@link Uri}.
+   * @param dataSourceFactory A {@link DataSource.Factory} used to load the manifest.
+   * @param renderersFactory A {@link RenderersFactory} creating the renderers for which tracks are
+   *     selected.
+   * @param drmSessionManager An optional {@link DrmSessionManager} used by the renderers created by
+   *     {@code renderersFactory}.
+   * @param trackSelectorParameters {@link DefaultTrackSelector.Parameters} for selecting tracks for
+   *     downloading.
+   * @return A {@link DownloadHelper} for DASH streams.
+   * @throws IllegalStateException If the DASH module is missing.
+   */
+  public static DownloadHelper forDash(
+      Uri uri,
+      DataSource.Factory dataSourceFactory,
+      RenderersFactory renderersFactory,
+      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
+      DefaultTrackSelector.Parameters trackSelectorParameters) {
+    return new DownloadHelper(
+        DownloadAction.TYPE_DASH,
+        uri,
+        /* cacheKey= */ null,
+        createMediaSource(
+            uri, dataSourceFactory, DASH_FACTORY_CONSTRUCTOR, DASH_FACTORY_CREATE_METHOD),
+        trackSelectorParameters,
+        Util.getRendererCapabilities(renderersFactory, drmSessionManager));
+  }
+
+  /**
+   * Creates a {@link DownloadHelper} for HLS streams.
+   *
+   * @param uri A playlist {@link Uri}.
+   * @param dataSourceFactory A {@link DataSource.Factory} used to load the playlist.
+   * @param renderersFactory A {@link RenderersFactory} creating the renderers for which tracks are
+   *     selected.
+   * @return A {@link DownloadHelper} for HLS streams.
+   * @throws IllegalStateException If the HLS module is missing.
+   */
+  public static DownloadHelper forHls(
+      Uri uri, DataSource.Factory dataSourceFactory, RenderersFactory renderersFactory) {
+    return forHls(
+        uri,
+        dataSourceFactory,
+        renderersFactory,
+        /* drmSessionManager= */ null,
+        DEFAULT_TRACK_SELECTOR_PARAMETERS);
+  }
+
+  /**
+   * Creates a {@link DownloadHelper} for HLS streams.
+   *
+   * @param uri A playlist {@link Uri}.
+   * @param dataSourceFactory A {@link DataSource.Factory} used to load the playlist.
+   * @param renderersFactory A {@link RenderersFactory} creating the renderers for which tracks are
+   *     selected.
+   * @param drmSessionManager An optional {@link DrmSessionManager} used by the renderers created by
+   *     {@code renderersFactory}.
+   * @param trackSelectorParameters {@link DefaultTrackSelector.Parameters} for selecting tracks for
+   *     downloading.
+   * @return A {@link DownloadHelper} for HLS streams.
+   * @throws IllegalStateException If the HLS module is missing.
+   */
+  public static DownloadHelper forHls(
+      Uri uri,
+      DataSource.Factory dataSourceFactory,
+      RenderersFactory renderersFactory,
+      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
+      DefaultTrackSelector.Parameters trackSelectorParameters) {
+    return new DownloadHelper(
+        DownloadAction.TYPE_HLS,
+        uri,
+        /* cacheKey= */ null,
+        createMediaSource(
+            uri, dataSourceFactory, HLS_FACTORY_CONSTRUCTOR, HLS_FACTORY_CREATE_METHOD),
+        trackSelectorParameters,
+        Util.getRendererCapabilities(renderersFactory, drmSessionManager));
+  }
+
+  /**
+   * Creates a {@link DownloadHelper} for SmoothStreaming streams.
+   *
+   * @param uri A manifest {@link Uri}.
+   * @param dataSourceFactory A {@link DataSource.Factory} used to load the manifest.
+   * @param renderersFactory A {@link RenderersFactory} creating the renderers for which tracks are
+   *     selected.
+   * @return A {@link DownloadHelper} for SmoothStreaming streams.
+   * @throws IllegalStateException If the SmoothStreaming module is missing.
+   */
+  public static DownloadHelper forSmoothStreaming(
+      Uri uri, DataSource.Factory dataSourceFactory, RenderersFactory renderersFactory) {
+    return forSmoothStreaming(
+        uri,
+        dataSourceFactory,
+        renderersFactory,
+        /* drmSessionManager= */ null,
+        DEFAULT_TRACK_SELECTOR_PARAMETERS);
+  }
+
+  /**
+   * Creates a {@link DownloadHelper} for SmoothStreaming streams.
+   *
+   * @param uri A manifest {@link Uri}.
+   * @param dataSourceFactory A {@link DataSource.Factory} used to load the manifest.
+   * @param renderersFactory A {@link RenderersFactory} creating the renderers for which tracks are
+   *     selected.
+   * @param drmSessionManager An optional {@link DrmSessionManager} used by the renderers created by
+   *     {@code renderersFactory}.
+   * @param trackSelectorParameters {@link DefaultTrackSelector.Parameters} for selecting tracks for
+   *     downloading.
+   * @return A {@link DownloadHelper} for SmoothStreaming streams.
+   * @throws IllegalStateException If the SmoothStreaming module is missing.
+   */
+  public static DownloadHelper forSmoothStreaming(
+      Uri uri,
+      DataSource.Factory dataSourceFactory,
+      RenderersFactory renderersFactory,
+      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
+      DefaultTrackSelector.Parameters trackSelectorParameters) {
+    return new DownloadHelper(
+        DownloadAction.TYPE_SS,
+        uri,
+        /* cacheKey= */ null,
+        createMediaSource(uri, dataSourceFactory, SS_FACTORY_CONSTRUCTOR, SS_FACTORY_CREATE_METHOD),
+        trackSelectorParameters,
+        Util.getRendererCapabilities(renderersFactory, drmSessionManager));
+  }
+
   private final String downloadType;
   private final Uri uri;
   @Nullable private final String cacheKey;
@@ -131,10 +334,8 @@ public abstract class DownloadHelper {
    *     selection needs to be made.
    * @param trackSelectorParameters {@link DefaultTrackSelector.Parameters} for selecting tracks for
    *     downloading.
-   * @param renderersFactory The {@link RenderersFactory} creating the renderers for which tracks
-   *     are selected, or null if no track selection needs to be made.
-   * @param drmSessionManager An optional {@link DrmSessionManager} used by the renderers created by
-   *     {@code renderersFactory}.
+   * @param rendererCapabilities The {@link RendererCapabilities} of the renderers for which tracks
+   *     are selected.
    */
   public DownloadHelper(
       String downloadType,
@@ -142,17 +343,13 @@ public abstract class DownloadHelper {
       @Nullable String cacheKey,
       @Nullable MediaSource mediaSource,
       DefaultTrackSelector.Parameters trackSelectorParameters,
-      @Nullable RenderersFactory renderersFactory,
-      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager) {
+      RendererCapabilities[] rendererCapabilities) {
     this.downloadType = downloadType;
     this.uri = uri;
     this.cacheKey = cacheKey;
     this.mediaSource = mediaSource;
     this.trackSelector = new DefaultTrackSelector(new DownloadTrackSelection.Factory());
-    this.rendererCapabilities =
-        renderersFactory == null
-            ? new RendererCapabilities[0]
-            : Util.getRendererCapabilities(renderersFactory, drmSessionManager);
+    this.rendererCapabilities = rendererCapabilities;
     this.scratchSet = new SparseIntArray();
     trackSelector.setParameters(trackSelectorParameters);
     trackSelector.init(/* listener= */ () -> {}, new DummyBandwidthMeter());
@@ -166,7 +363,7 @@ public abstract class DownloadHelper {
    *     Looper}, in which case it will be called on the application's main thread.
    * @throws IllegalStateException If the download helper has already been prepared.
    */
-  public final void prepare(Callback callback) {
+  public void prepare(Callback callback) {
     Assertions.checkState(this.callback == null);
     this.callback = callback;
     callbackHandler =
@@ -179,7 +376,7 @@ public abstract class DownloadHelper {
   }
 
   /** Releases the helper and all resources it is holding. */
-  public final void release() {
+  public void release() {
     if (mediaPreparer != null) {
       mediaPreparer.release();
     }
@@ -190,7 +387,7 @@ public abstract class DownloadHelper {
    * preparation completes.
    */
   @Nullable
-  public final Object getManifest() {
+  public Object getManifest() {
     if (mediaSource == null) {
       return null;
     }
@@ -202,7 +399,7 @@ public abstract class DownloadHelper {
    * Returns the number of periods for which media is available. Must not be called until after
    * preparation completes.
    */
-  public final int getPeriodCount() {
+  public int getPeriodCount() {
     if (mediaSource == null) {
       return 0;
     }
@@ -220,7 +417,7 @@ public abstract class DownloadHelper {
    * @return The track groups for the period. May be {@link TrackGroupArray#EMPTY} for single stream
    *     content.
    */
-  public final TrackGroupArray getTrackGroups(int periodIndex) {
+  public TrackGroupArray getTrackGroups(int periodIndex) {
     assertPreparedWithMedia();
     return trackGroupArrays[periodIndex];
   }
@@ -232,7 +429,7 @@ public abstract class DownloadHelper {
    * @param periodIndex The period index.
    * @return The {@link MappedTrackInfo} for the period.
    */
-  public final MappedTrackInfo getMappedTrackInfo(int periodIndex) {
+  public MappedTrackInfo getMappedTrackInfo(int periodIndex) {
     assertPreparedWithMedia();
     return mappedTrackInfos[periodIndex];
   }
@@ -245,7 +442,7 @@ public abstract class DownloadHelper {
    * @param rendererIndex The renderer index.
    * @return A list of selected {@link TrackSelection track selections}.
    */
-  public final List<TrackSelection> getTrackSelections(int periodIndex, int rendererIndex) {
+  public List<TrackSelection> getTrackSelections(int periodIndex, int rendererIndex) {
     assertPreparedWithMedia();
     return immutableTrackSelectionsByPeriodAndRenderer[periodIndex][rendererIndex];
   }
@@ -256,7 +453,7 @@ public abstract class DownloadHelper {
    *
    * @param periodIndex The period index for which track selections are cleared.
    */
-  public final void clearTrackSelections(int periodIndex) {
+  public void clearTrackSelections(int periodIndex) {
     assertPreparedWithMedia();
     for (int i = 0; i < rendererCapabilities.length; i++) {
       trackSelectionsByPeriodAndRenderer[periodIndex][i].clear();
@@ -271,7 +468,7 @@ public abstract class DownloadHelper {
    * @param trackSelectorParameters The {@link DefaultTrackSelector.Parameters} to obtain the new
    *     selection of tracks.
    */
-  public final void replaceTrackSelections(
+  public void replaceTrackSelections(
       int periodIndex, DefaultTrackSelector.Parameters trackSelectorParameters) {
     clearTrackSelections(periodIndex);
     addTrackSelection(periodIndex, trackSelectorParameters);
@@ -285,7 +482,7 @@ public abstract class DownloadHelper {
    * @param trackSelectorParameters The {@link DefaultTrackSelector.Parameters} to obtain the new
    *     selection of tracks.
    */
-  public final void addTrackSelection(
+  public void addTrackSelection(
       int periodIndex, DefaultTrackSelector.Parameters trackSelectorParameters) {
     assertPreparedWithMedia();
     trackSelector.setParameters(trackSelectorParameters);
@@ -299,7 +496,7 @@ public abstract class DownloadHelper {
    * @param data Application provided data to store in {@link DownloadAction#data}.
    * @return The built {@link DownloadAction}.
    */
-  public final DownloadAction getDownloadAction(@Nullable byte[] data) {
+  public DownloadAction getDownloadAction(@Nullable byte[] data) {
     if (mediaSource == null) {
       return DownloadAction.createDownloadAction(
           downloadType, uri, /* keys= */ Collections.emptyList(), cacheKey, data);
@@ -324,7 +521,7 @@ public abstract class DownloadHelper {
    *
    * @return The built {@link DownloadAction}.
    */
-  public final DownloadAction getRemoveAction() {
+  public DownloadAction getRemoveAction() {
     return DownloadAction.createRemoveAction(downloadType, uri, cacheKey);
   }
 
@@ -452,6 +649,38 @@ public abstract class DownloadHelper {
     }
   }
 
+  private static Pair<@NullableType Constructor<?>, @NullableType Method>
+      getMediaSourceFactoryMethods(String className) {
+    Constructor<?> constructor = null;
+    Method createMethod = null;
+    try {
+      // LINT.IfChange
+      Class<?> factoryClazz = Class.forName(className);
+      constructor = factoryClazz.getConstructor(DataSource.Factory.class);
+      createMethod = factoryClazz.getMethod("createMediaSource", Uri.class);
+      // LINT.ThenChange(../../../../../../../../proguard-rules.txt)
+    } catch (Exception e) {
+      // Expected if the app was built without the respective module.
+    }
+    return Pair.create(constructor, createMethod);
+  }
+
+  private static MediaSource createMediaSource(
+      Uri uri,
+      DataSource.Factory dataSourceFactory,
+      @Nullable Constructor<?> factoryConstructor,
+      @Nullable Method createMediaSourceMethod) {
+    if (factoryConstructor == null || createMediaSourceMethod == null) {
+      throw new IllegalStateException("Module missing to create media source.");
+    }
+    try {
+      Object factory = factoryConstructor.newInstance(dataSourceFactory);
+      return (MediaSource) Assertions.checkNotNull(createMediaSourceMethod.invoke(factory, uri));
+    } catch (Exception e) {
+      throw new IllegalStateException("Failed to instantiate media source.", e);
+    }
+  }
+
   private static final class MediaPreparer
       implements MediaSource.SourceInfoRefreshListener, MediaPeriod.Callback, Handler.Callback {
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java
deleted file mode 100644
index 1850eaebf2..0000000000
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadHelper.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.offline;
-
-import android.net.Uri;
-import android.support.annotation.Nullable;
-
-/** A {@link DownloadHelper} for progressive streams. */
-public final class ProgressiveDownloadHelper extends DownloadHelper {
-
-  /**
-   * Creates download helper for progressive streams.
-   *
-   * @param uri The stream {@link Uri}.
-   */
-  public ProgressiveDownloadHelper(Uri uri) {
-    this(uri, /* cacheKey= */ null);
-  }
-
-  /**
-   * Creates download helper for progressive streams.
-   *
-   * @param uri The stream {@link Uri}.
-   * @param cacheKey An optional cache key.
-   */
-  public ProgressiveDownloadHelper(Uri uri, @Nullable String cacheKey) {
-    super(
-        DownloadAction.TYPE_PROGRESSIVE,
-        uri,
-        cacheKey,
-        /* mediaSource= */ null,
-        /* trackSelectorParameters= */ DownloadHelper.DEFAULT_TRACK_SELECTOR_PARAMETERS,
-        /* renderersFactory= */ null,
-        /* drmSessionManager= */ null);
-  }
-}
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
index e6cca02140..eb0303178e 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
@@ -42,6 +42,7 @@ import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.util.ConditionVariable;
 import com.google.android.exoplayer2.util.MimeTypes;
+import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -93,7 +94,7 @@ public class DownloadHelperTest {
 
   private Uri testUri;
 
-  private FakeDownloadHelper downloadHelper;
+  private DownloadHelper downloadHelper;
 
   @Before
   public void setUp() {
@@ -106,7 +107,14 @@ public class DownloadHelperTest {
         (handler, videoListener, audioListener, metadata, text, drm) ->
             new Renderer[] {textRenderer, audioRenderer, videoRenderer};
 
-    downloadHelper = new FakeDownloadHelper(testUri, renderersFactory);
+    downloadHelper =
+        new DownloadHelper(
+            TEST_DOWNLOAD_TYPE,
+            testUri,
+            TEST_CACHE_KEY,
+            new TestMediaSource(),
+            DownloadHelper.DEFAULT_TRACK_SELECTOR_PARAMETERS,
+            Util.getRendererCapabilities(renderersFactory, /* drmSessionManager= */ null));
   }
 
   @Test
@@ -346,7 +354,7 @@ public class DownloadHelperTest {
     assertThat(removeAction.isRemoveAction).isTrue();
   }
 
-  private static void prepareDownloadHelper(FakeDownloadHelper downloadHelper) throws Exception {
+  private static void prepareDownloadHelper(DownloadHelper downloadHelper) throws Exception {
     AtomicReference<Exception> prepareException = new AtomicReference<>(null);
     ConditionVariable preparedCondition = new ConditionVariable();
     downloadHelper.prepare(
@@ -426,20 +434,6 @@ public class DownloadHelperTest {
     assertThat(selectedTracksInGroup).isEqualTo(tracks);
   }
 
-  private static final class FakeDownloadHelper extends DownloadHelper {
-
-    public FakeDownloadHelper(Uri testUri, RenderersFactory renderersFactory) {
-      super(
-          TEST_DOWNLOAD_TYPE,
-          testUri,
-          TEST_CACHE_KEY,
-          new TestMediaSource(),
-          DownloadHelper.DEFAULT_TRACK_SELECTOR_PARAMETERS,
-          renderersFactory,
-          /* drmSessionManager= */ null);
-    }
-  }
-
   private static final class TestMediaSource extends FakeMediaSource {
 
     public TestMediaSource() {
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java
deleted file mode 100644
index b611cf0d5f..0000000000
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadHelper.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.source.dash.offline;
-
-import android.net.Uri;
-import android.support.annotation.Nullable;
-import com.google.android.exoplayer2.RenderersFactory;
-import com.google.android.exoplayer2.drm.DrmSessionManager;
-import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
-import com.google.android.exoplayer2.offline.DownloadAction;
-import com.google.android.exoplayer2.offline.DownloadHelper;
-import com.google.android.exoplayer2.source.dash.DashMediaSource;
-import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
-import com.google.android.exoplayer2.upstream.DataSource;
-
-/** A {@link DownloadHelper} for DASH streams. */
-public final class DashDownloadHelper extends DownloadHelper {
-
-  /**
-   * Creates a DASH download helper.
-   *
-   * <p>The helper uses {@link DownloadHelper#DEFAULT_TRACK_SELECTOR_PARAMETERS} for track selection
-   * and does not support drm protected content.
-   *
-   * @param uri A manifest {@link Uri}.
-   * @param manifestDataSourceFactory A {@link DataSource.Factory} used to load the manifest.
-   * @param renderersFactory The {@link RenderersFactory} creating the renderers for which tracks
-   *     are selected.
-   */
-  public DashDownloadHelper(
-      Uri uri, DataSource.Factory manifestDataSourceFactory, RenderersFactory renderersFactory) {
-    this(
-        uri,
-        manifestDataSourceFactory,
-        DownloadHelper.DEFAULT_TRACK_SELECTOR_PARAMETERS,
-        renderersFactory,
-        /* drmSessionManager= */ null);
-  }
-
-  /**
-   * Creates a DASH download helper.
-   *
-   * @param uri A manifest {@link Uri}.
-   * @param manifestDataSourceFactory A {@link DataSource.Factory} used to load the manifest.
-   * @param trackSelectorParameters {@link DefaultTrackSelector.Parameters} for selecting tracks for
-   *     downloading.
-   * @param renderersFactory The {@link RenderersFactory} creating the renderers for which tracks
-   *     are selected.
-   * @param drmSessionManager An optional {@link DrmSessionManager} used by the renderers created by
-   *     {@code renderersFactory}.
-   */
-  public DashDownloadHelper(
-      Uri uri,
-      DataSource.Factory manifestDataSourceFactory,
-      DefaultTrackSelector.Parameters trackSelectorParameters,
-      RenderersFactory renderersFactory,
-      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager) {
-    super(
-        DownloadAction.TYPE_DASH,
-        uri,
-        /* cacheKey= */ null,
-        new DashMediaSource.Factory(manifestDataSourceFactory).createMediaSource(uri),
-        trackSelectorParameters,
-        renderersFactory,
-        drmSessionManager);
-  }
-}
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadHelperTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadHelperTest.java
new file mode 100644
index 0000000000..eb4af58675
--- /dev/null
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadHelperTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.source.dash.offline;
+
+import android.net.Uri;
+import com.google.android.exoplayer2.Renderer;
+import com.google.android.exoplayer2.offline.DownloadHelper;
+import com.google.android.exoplayer2.testutil.FakeDataSource;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Unit test to verify creation of a DASH {@link DownloadHelper}. */
+@RunWith(RobolectricTestRunner.class)
+public final class DownloadHelperTest {
+
+  @Test
+  public void staticDownloadHelperForDash_doesNotThrow() {
+    DownloadHelper.forDash(
+        Uri.parse("http://uri"),
+        new FakeDataSource.Factory(),
+        (handler, videoListener, audioListener, text, metadata, drm) -> new Renderer[0]);
+    DownloadHelper.forDash(
+        Uri.parse("http://uri"),
+        new FakeDataSource.Factory(),
+        (handler, videoListener, audioListener, text, metadata, drm) -> new Renderer[0],
+        /* drmSessionManager= */ null,
+        DownloadHelper.DEFAULT_TRACK_SELECTOR_PARAMETERS);
+  }
+}
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java
deleted file mode 100644
index ee6bbe333a..0000000000
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadHelper.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.source.hls.offline;
-
-import android.net.Uri;
-import android.support.annotation.Nullable;
-import com.google.android.exoplayer2.RenderersFactory;
-import com.google.android.exoplayer2.drm.DrmSessionManager;
-import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
-import com.google.android.exoplayer2.offline.DownloadAction;
-import com.google.android.exoplayer2.offline.DownloadHelper;
-import com.google.android.exoplayer2.source.hls.HlsMediaSource;
-import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
-import com.google.android.exoplayer2.upstream.DataSource;
-
-/** A {@link DownloadHelper} for HLS streams. */
-public final class HlsDownloadHelper extends DownloadHelper {
-
-  /**
-   * Creates a HLS download helper.
-   *
-   * <p>The helper uses {@link DownloadHelper#DEFAULT_TRACK_SELECTOR_PARAMETERS} for track selection
-   * and does not support drm protected content.
-   *
-   * @param uri A manifest {@link Uri}.
-   * @param manifestDataSourceFactory A {@link DataSource.Factory} used to load the manifest.
-   * @param renderersFactory The {@link RenderersFactory} creating the renderers for which tracks
-   *     are selected.
-   */
-  public HlsDownloadHelper(
-      Uri uri, DataSource.Factory manifestDataSourceFactory, RenderersFactory renderersFactory) {
-    this(
-        uri,
-        manifestDataSourceFactory,
-        DownloadHelper.DEFAULT_TRACK_SELECTOR_PARAMETERS,
-        renderersFactory,
-        /* drmSessionManager= */ null);
-  }
-
-  /**
-   * Creates a HLS download helper.
-   *
-   * @param uri A manifest {@link Uri}.
-   * @param manifestDataSourceFactory A {@link DataSource.Factory} used to load the manifest.
-   * @param trackSelectorParameters {@link DefaultTrackSelector.Parameters} for selecting tracks for
-   *     downloading.
-   * @param renderersFactory The {@link RenderersFactory} creating the renderers for which tracks
-   *     are selected.
-   * @param drmSessionManager An optional {@link DrmSessionManager} used by the renderers created by
-   *     {@code renderersFactory}.
-   */
-  public HlsDownloadHelper(
-      Uri uri,
-      DataSource.Factory manifestDataSourceFactory,
-      DefaultTrackSelector.Parameters trackSelectorParameters,
-      RenderersFactory renderersFactory,
-      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager) {
-    super(
-        DownloadAction.TYPE_HLS,
-        uri,
-        /* cacheKey= */ null,
-        new HlsMediaSource.Factory(manifestDataSourceFactory)
-            .setAllowChunklessPreparation(true)
-            .createMediaSource(uri),
-        trackSelectorParameters,
-        renderersFactory,
-        drmSessionManager);
-  }
-}
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/DownloadHelperTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/DownloadHelperTest.java
new file mode 100644
index 0000000000..dca8f9c3e8
--- /dev/null
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/DownloadHelperTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.source.hls.offline;
+
+import android.net.Uri;
+import com.google.android.exoplayer2.Renderer;
+import com.google.android.exoplayer2.offline.DownloadHelper;
+import com.google.android.exoplayer2.testutil.FakeDataSource;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Unit test to verify creation of a HLS {@link DownloadHelper}. */
+@RunWith(RobolectricTestRunner.class)
+public final class DownloadHelperTest {
+
+  @Test
+  public void staticDownloadHelperForHls_doesNotThrow() {
+    DownloadHelper.forHls(
+        Uri.parse("http://uri"),
+        new FakeDataSource.Factory(),
+        (handler, videoListener, audioListener, text, metadata, drm) -> new Renderer[0]);
+    DownloadHelper.forHls(
+        Uri.parse("http://uri"),
+        new FakeDataSource.Factory(),
+        (handler, videoListener, audioListener, text, metadata, drm) -> new Renderer[0],
+        /* drmSessionManager= */ null,
+        DownloadHelper.DEFAULT_TRACK_SELECTOR_PARAMETERS);
+  }
+}
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java
deleted file mode 100644
index f76fb4ee90..0000000000
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadHelper.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.source.smoothstreaming.offline;
-
-import android.net.Uri;
-import android.support.annotation.Nullable;
-import com.google.android.exoplayer2.RenderersFactory;
-import com.google.android.exoplayer2.drm.DrmSessionManager;
-import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
-import com.google.android.exoplayer2.offline.DownloadAction;
-import com.google.android.exoplayer2.offline.DownloadHelper;
-import com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource;
-import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
-import com.google.android.exoplayer2.upstream.DataSource;
-
-/** A {@link DownloadHelper} for SmoothStreaming streams. */
-public final class SsDownloadHelper extends DownloadHelper {
-
-  /**
-   * Creates a SmoothStreaming download helper.
-   *
-   * <p>The helper uses {@link DownloadHelper#DEFAULT_TRACK_SELECTOR_PARAMETERS} for track selection
-   * and does not support drm protected content.
-   *
-   * @param uri A manifest {@link Uri}.
-   * @param manifestDataSourceFactory A {@link DataSource.Factory} used to load the manifest.
-   * @param renderersFactory The {@link RenderersFactory} creating the renderers for which tracks
-   *     are selected.
-   */
-  public SsDownloadHelper(
-      Uri uri, DataSource.Factory manifestDataSourceFactory, RenderersFactory renderersFactory) {
-    this(
-        uri,
-        manifestDataSourceFactory,
-        DownloadHelper.DEFAULT_TRACK_SELECTOR_PARAMETERS,
-        renderersFactory,
-        /* drmSessionManager= */ null);
-  }
-
-  /**
-   * Creates a SmoothStreaming download helper.
-   *
-   * @param uri A manifest {@link Uri}.
-   * @param manifestDataSourceFactory A {@link DataSource.Factory} used to load the manifest.
-   * @param trackSelectorParameters {@link DefaultTrackSelector.Parameters} for selecting tracks for
-   *     downloading.
-   * @param renderersFactory The {@link RenderersFactory} creating the renderers for which tracks
-   *     are selected.
-   * @param drmSessionManager An optional {@link DrmSessionManager} used by the renderers created by
-   *     {@code renderersFactory}.
-   */
-  public SsDownloadHelper(
-      Uri uri,
-      DataSource.Factory manifestDataSourceFactory,
-      DefaultTrackSelector.Parameters trackSelectorParameters,
-      RenderersFactory renderersFactory,
-      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager) {
-    super(
-        DownloadAction.TYPE_SS,
-        uri,
-        /* cacheKey= */ null,
-        new SsMediaSource.Factory(manifestDataSourceFactory).createMediaSource(uri),
-        trackSelectorParameters,
-        renderersFactory,
-        drmSessionManager);
-  }
-}
diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/DownloadHelperTest.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/DownloadHelperTest.java
new file mode 100644
index 0000000000..071fc46313
--- /dev/null
+++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/DownloadHelperTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.source.smoothstreaming.offline;
+
+import android.net.Uri;
+import com.google.android.exoplayer2.Renderer;
+import com.google.android.exoplayer2.offline.DownloadHelper;
+import com.google.android.exoplayer2.testutil.FakeDataSource;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Unit test to verify creation of a SmoothStreaming {@link DownloadHelper}. */
+@RunWith(RobolectricTestRunner.class)
+public final class DownloadHelperTest {
+
+  @Test
+  public void staticDownloadHelperForSmoothStreaming_doesNotThrow() {
+    DownloadHelper.forSmoothStreaming(
+        Uri.parse("http://uri"),
+        new FakeDataSource.Factory(),
+        (handler, videoListener, audioListener, text, metadata, drm) -> new Renderer[0]);
+    DownloadHelper.forSmoothStreaming(
+        Uri.parse("http://uri"),
+        new FakeDataSource.Factory(),
+        (handler, videoListener, audioListener, text, metadata, drm) -> new Renderer[0],
+        /* drmSessionManager= */ null,
+        DownloadHelper.DEFAULT_TRACK_SELECTOR_PARAMETERS);
+  }
+}

From 6983f92ffd4b287be53dcac2e9289ba86aa429e2 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 29 Jan 2019 12:59:04 +0000
Subject: [PATCH 443/832] Add convenience methods to select multiple audio or
 text tracks for downloading.

These methods take a list of languages to be downloaded and add selections for
each of the languages.

PiperOrigin-RevId: 231385632
---
 .../exoplayer2/offline/DownloadHelper.java    | 58 ++++++++++++++++
 .../offline/DownloadHelperTest.java           | 67 +++++++++++++++++++
 2 files changed, 125 insertions(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index a3c2278b32..21e1858bdd 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -489,6 +489,64 @@ public final class DownloadHelper {
     runTrackSelection(periodIndex);
   }
 
+  /**
+   * Convenience method to add selections of tracks for all specified audio languages. If an audio
+   * track in one of the specified languages is not available, the default fallback audio track is
+   * used instead. Must not be called until after preparation completes.
+   *
+   * @param languages A list of audio languages for which tracks should be added to the download
+   *     selection, as ISO 639-2/T tags.
+   */
+  public void addAudioLanguagesToSelection(String... languages) {
+    assertPreparedWithMedia();
+    for (int periodIndex = 0; periodIndex < mappedTrackInfos.length; periodIndex++) {
+      DefaultTrackSelector.ParametersBuilder parametersBuilder =
+          DEFAULT_TRACK_SELECTOR_PARAMETERS.buildUpon();
+      MappedTrackInfo mappedTrackInfo = mappedTrackInfos[periodIndex];
+      int rendererCount = mappedTrackInfo.getRendererCount();
+      for (int rendererIndex = 0; rendererIndex < rendererCount; rendererIndex++) {
+        if (mappedTrackInfo.getRendererType(rendererIndex) != C.TRACK_TYPE_AUDIO) {
+          parametersBuilder.setRendererDisabled(rendererIndex, /* disabled= */ true);
+        }
+      }
+      for (String language : languages) {
+        parametersBuilder.setPreferredAudioLanguage(language);
+        addTrackSelection(periodIndex, parametersBuilder.build());
+      }
+    }
+  }
+
+  /**
+   * Convenience method to add selections of tracks for all specified text languages. Must not be
+   * called until after preparation completes.
+   *
+   * @param selectUndeterminedTextLanguage Whether a text track with undetermined language should be
+   *     selected for downloading if no track with one of the specified {@code languages} is
+   *     available.
+   * @param languages A list of text languages for which tracks should be added to the download
+   *     selection, as ISO 639-2/T tags.
+   */
+  public void addTextLanguagesToSelection(
+      boolean selectUndeterminedTextLanguage, String... languages) {
+    assertPreparedWithMedia();
+    for (int periodIndex = 0; periodIndex < mappedTrackInfos.length; periodIndex++) {
+      DefaultTrackSelector.ParametersBuilder parametersBuilder =
+          DEFAULT_TRACK_SELECTOR_PARAMETERS.buildUpon();
+      MappedTrackInfo mappedTrackInfo = mappedTrackInfos[periodIndex];
+      int rendererCount = mappedTrackInfo.getRendererCount();
+      for (int rendererIndex = 0; rendererIndex < rendererCount; rendererIndex++) {
+        if (mappedTrackInfo.getRendererType(rendererIndex) != C.TRACK_TYPE_TEXT) {
+          parametersBuilder.setRendererDisabled(rendererIndex, /* disabled= */ true);
+        }
+      }
+      parametersBuilder.setSelectUndeterminedTextLanguage(selectUndeterminedTextLanguage);
+      for (String language : languages) {
+        parametersBuilder.setPreferredTextLanguage(language);
+        addTrackSelection(periodIndex, parametersBuilder.build());
+      }
+    }
+  }
+
   /**
    * Builds a {@link DownloadAction} for downloading the selected tracks. Must not be called until
    * after preparation completes.
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
index eb0303178e..6f41e10046 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
@@ -312,6 +312,73 @@ public class DownloadHelperTest {
     assertSingleTrackSelectionEquals(selectedVideo1, TRACK_GROUP_VIDEO_SINGLE, 0);
   }
 
+  @Test
+  public void getTrackSelections_afterAddAudioLanguagesToSelection_returnsCombinedSelections()
+      throws Exception {
+    prepareDownloadHelper(downloadHelper);
+    downloadHelper.clearTrackSelections(/* periodIndex= */ 0);
+    downloadHelper.clearTrackSelections(/* periodIndex= */ 1);
+
+    // Add a non-default language, and a non-existing language (which will select the default).
+    downloadHelper.addAudioLanguagesToSelection("ZH", "Klingonese");
+    List<TrackSelection> selectedText0 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 0, /* rendererIndex= */ 0);
+    List<TrackSelection> selectedAudio0 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 0, /* rendererIndex= */ 1);
+    List<TrackSelection> selectedVideo0 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 0, /* rendererIndex= */ 2);
+    List<TrackSelection> selectedText1 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 1, /* rendererIndex= */ 0);
+    List<TrackSelection> selectedAudio1 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 1, /* rendererIndex= */ 1);
+    List<TrackSelection> selectedVideo1 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 1, /* rendererIndex= */ 2);
+
+    assertThat(selectedVideo0).isEmpty();
+    assertThat(selectedText0).isEmpty();
+    assertThat(selectedAudio0).hasSize(2);
+    assertTrackSelectionEquals(selectedAudio0.get(0), TRACK_GROUP_AUDIO_ZH, 0);
+    assertTrackSelectionEquals(selectedAudio0.get(1), TRACK_GROUP_AUDIO_US, 0);
+
+    assertThat(selectedVideo1).isEmpty();
+    assertThat(selectedText1).isEmpty();
+    assertSingleTrackSelectionEquals(selectedAudio1, TRACK_GROUP_AUDIO_US, 0);
+  }
+
+  @Test
+  public void getTrackSelections_afterAddTextLanguagesToSelection_returnsCombinedSelections()
+      throws Exception {
+    prepareDownloadHelper(downloadHelper);
+    downloadHelper.clearTrackSelections(/* periodIndex= */ 0);
+    downloadHelper.clearTrackSelections(/* periodIndex= */ 1);
+
+    // Add a non-default language, and a non-existing language (which will select the default).
+    downloadHelper.addTextLanguagesToSelection(
+        /* selectUndeterminedTextLanguage= */ true, "ZH", "Klingonese");
+    List<TrackSelection> selectedText0 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 0, /* rendererIndex= */ 0);
+    List<TrackSelection> selectedAudio0 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 0, /* rendererIndex= */ 1);
+    List<TrackSelection> selectedVideo0 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 0, /* rendererIndex= */ 2);
+    List<TrackSelection> selectedText1 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 1, /* rendererIndex= */ 0);
+    List<TrackSelection> selectedAudio1 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 1, /* rendererIndex= */ 1);
+    List<TrackSelection> selectedVideo1 =
+        downloadHelper.getTrackSelections(/* periodIndex= */ 1, /* rendererIndex= */ 2);
+
+    assertThat(selectedVideo0).isEmpty();
+    assertThat(selectedAudio0).isEmpty();
+    assertThat(selectedText0).hasSize(2);
+    assertTrackSelectionEquals(selectedText0.get(0), TRACK_GROUP_TEXT_ZH, 0);
+    assertTrackSelectionEquals(selectedText0.get(1), TRACK_GROUP_TEXT_US, 0);
+
+    assertThat(selectedVideo1).isEmpty();
+    assertThat(selectedAudio1).isEmpty();
+    assertThat(selectedText1).isEmpty();
+  }
+
   @Test
   public void getDownloadAction_createsDownloadAction_withAllSelectedTracks() throws Exception {
     prepareDownloadHelper(downloadHelper);

From ef8335fc506f846527807a51e73ef74dc9428158 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 29 Jan 2019 12:59:29 +0000
Subject: [PATCH 444/832] Ensure normalized language code is used everywhere
 and update documentation.

Issue:#2867
PiperOrigin-RevId: 231385677
---
 .../src/main/java/com/google/android/exoplayer2/C.java     | 4 +---
 .../main/java/com/google/android/exoplayer2/Format.java    | 4 ++--
 .../android/exoplayer2/extractor/ts/TsPayloadReader.java   | 2 +-
 .../google/android/exoplayer2/offline/DownloadHelper.java  | 4 ++--
 .../exoplayer2/trackselection/DefaultTrackSelector.java    | 7 +++++--
 .../main/java/com/google/android/exoplayer2/util/Util.java | 5 +++--
 .../source/hls/playlist/HlsMasterPlaylistParserTest.java   | 2 +-
 7 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/C.java b/library/core/src/main/java/com/google/android/exoplayer2/C.java
index 8810b51000..d163fabd60 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/C.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/C.java
@@ -536,9 +536,7 @@ public final class C {
    */
   public static final int SELECTION_FLAG_AUTOSELECT = 1 << 2; // 4
 
-  /**
-   * Represents an undetermined language as an ISO 639 alpha-3 language code.
-   */
+  /** Represents an undetermined language as an ISO 639-2 language code. */
   public static final String LANGUAGE_UNDETERMINED = "und";
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Format.java b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
index 6c54c07cde..c3028e153c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Format.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
@@ -159,7 +159,7 @@ public final class Format implements Parcelable {
   @C.SelectionFlags
   public final int selectionFlags;
 
-  /** The language, or null if unknown or not applicable. */
+  /** The language as ISO 639-2/T three-letter code, or null if unknown or not applicable. */
   public final @Nullable String language;
 
   /**
@@ -932,7 +932,7 @@ public final class Format implements Parcelable {
     this.encoderDelay = encoderDelay == Format.NO_VALUE ? 0 : encoderDelay;
     this.encoderPadding = encoderPadding == Format.NO_VALUE ? 0 : encoderPadding;
     this.selectionFlags = selectionFlags;
-    this.language = language;
+    this.language = Util.normalizeLanguageCode(language);
     this.accessibilityChannel = accessibilityChannel;
     this.subsampleOffsetUs = subsampleOffsetUs;
     this.initializationData =
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsPayloadReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsPayloadReader.java
index a034b05696..9289ba4d2e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsPayloadReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsPayloadReader.java
@@ -100,7 +100,7 @@ public interface TsPayloadReader {
     public final byte[] initializationData;
 
     /**
-     * @param language The ISO 639-2 three character language.
+     * @param language The ISO 639-2 three-letter language code.
      * @param type The subtitling type.
      * @param initializationData The composition and ancillary page ids.
      */
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index 21e1858bdd..25c4eca5eb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -495,7 +495,7 @@ public final class DownloadHelper {
    * used instead. Must not be called until after preparation completes.
    *
    * @param languages A list of audio languages for which tracks should be added to the download
-   *     selection, as ISO 639-2/T tags.
+   *     selection, as ISO 639-1 two-letter or ISO 639-2 three-letter codes.
    */
   public void addAudioLanguagesToSelection(String... languages) {
     assertPreparedWithMedia();
@@ -524,7 +524,7 @@ public final class DownloadHelper {
    *     selected for downloading if no track with one of the specified {@code languages} is
    *     available.
    * @param languages A list of text languages for which tracks should be added to the download
-   *     selection, as ISO 639-2/T tags.
+   *     selection, as ISO 639-1 two-letter or ISO 639-2 three-letter codes.
    */
   public void addTextLanguagesToSelection(
       boolean selectUndeterminedTextLanguage, String... languages) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
index 06b11b3d67..28242167ad 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -365,6 +365,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     /**
      * See {@link Parameters#preferredAudioLanguage}.
      *
+     * @param preferredAudioLanguage Preferred audio language as an ISO 639-1 two-letter or ISO
+     *     639-2 three-letter code.
      * @return This builder.
      */
     public ParametersBuilder setPreferredAudioLanguage(String preferredAudioLanguage) {
@@ -430,6 +432,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     /**
      * See {@link Parameters#preferredTextLanguage}.
      *
+     * @param preferredTextLanguage Preferred text language as an ISO 639-1 two-letter or ISO 639-2
+     *     three-letter code.
      * @return This builder.
      */
     public ParametersBuilder setPreferredTextLanguage(String preferredTextLanguage) {
@@ -2313,8 +2317,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
    *     null.
    */
   protected static boolean formatHasLanguage(Format format, @Nullable String language) {
-    return language != null
-        && TextUtils.equals(language, Util.normalizeLanguageCode(format.language));
+    return language != null && TextUtils.equals(language, format.language);
   }
 
   private static List<Integer> getViewportFilteredTrackIndices(TrackGroup group, int viewportWidth,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
index 34237dddf6..b9d78f8af2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
@@ -418,9 +418,10 @@ public final class Util {
   }
 
   /**
-   * Returns a normalized RFC 639-2/T code for {@code language}.
+   * Returns a normalized ISO 639-2/T code for {@code language}.
    *
-   * @param language A case-insensitive ISO 639 alpha-2 or alpha-3 language code.
+   * @param language A case-insensitive ISO 639-1 two-letter or ISO 639-2 three-letter language
+   *     code.
    * @return The all-lowercase normalized code, or null if the input was null, or {@code
    *     language.toLowerCase()} if the language could not be normalized.
    */
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
index 8b69ba0db2..80a9bd3eab 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
@@ -225,7 +225,7 @@ public class HlsMasterPlaylistParserTest {
     Format closedCaptionFormat = playlist.muxedCaptionFormats.get(0);
     assertThat(closedCaptionFormat.sampleMimeType).isEqualTo(MimeTypes.APPLICATION_CEA708);
     assertThat(closedCaptionFormat.accessibilityChannel).isEqualTo(4);
-    assertThat(closedCaptionFormat.language).isEqualTo("es");
+    assertThat(closedCaptionFormat.language).isEqualTo("spa");
   }
 
   @Test

From 45433869e5069019fc48c69589c14331d889bd60 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 29 Jan 2019 13:14:39 +0000
Subject: [PATCH 445/832] Rename ExtractorMediaSource to ProgressiveMediaSource

It better describes what the class does. More importantly, we've had
inconsistent class names since we added offline support, for which we
added ProgressiveDownloader ("ExtractorDownloader" doesn't make any
sense). We could really do with aligning the names for clarity.

(Sorry)

PiperOrigin-RevId: 231387268
---
 RELEASENOTES.md                               |   1 +
 .../DefaultReceiverPlayerManager.java         |   4 +-
 .../exoplayer2/imademo/PlayerManager.java     |   4 +-
 .../exoplayer2/demo/PlayerActivity.java       |   4 +-
 .../exoplayer2/ext/flac/FlacPlaybackTest.java |   4 +-
 .../exoplayer2/ext/opus/OpusPlaybackTest.java |   4 +-
 .../exoplayer2/ext/vp9/VpxPlaybackTest.java   |   4 +-
 .../google/android/exoplayer2/ExoPlayer.java  |   4 +-
 .../source/ExtractorMediaSource.java          | 123 ++------
 ...eriod.java => ProgressiveMediaPeriod.java} |  28 +-
 .../source/ProgressiveMediaSource.java        | 281 ++++++++++++++++++
 .../source/SingleSampleMediaSource.java       |   4 +-
 .../exoplayer2/source/ads/AdsMediaSource.java |  10 +-
 13 files changed, 349 insertions(+), 126 deletions(-)
 rename library/core/src/main/java/com/google/android/exoplayer2/source/{ExtractorMediaPeriod.java => ProgressiveMediaPeriod.java} (98%)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 6c72dae654..65d4e9696e 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,6 +2,7 @@
 
 ### dev-v2 (not yet released) ###
 
+* `ExtractorMediaSource` renamed to `ProgressiveMediaSource`.
 * HLS:
   * Parse CHANNELS attribute from EXT-X-MEDIA.
 * Support for playing spherical videos on Daydream.
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java
index 563efea11f..1db68ca08d 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java
@@ -35,8 +35,8 @@ import com.google.android.exoplayer2.ext.cast.CastPlayer;
 import com.google.android.exoplayer2.ext.cast.MediaItem;
 import com.google.android.exoplayer2.ext.cast.SessionAvailabilityListener;
 import com.google.android.exoplayer2.source.ConcatenatingMediaSource;
-import com.google.android.exoplayer2.source.ExtractorMediaSource;
 import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.ProgressiveMediaSource;
 import com.google.android.exoplayer2.source.dash.DashMediaSource;
 import com.google.android.exoplayer2.source.hls.HlsMediaSource;
 import com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource;
@@ -373,7 +373,7 @@ import java.util.ArrayList;
       case DemoUtil.MIME_TYPE_HLS:
         return new HlsMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
       case DemoUtil.MIME_TYPE_VIDEO_MP4:
-        return new ExtractorMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
+        return new ProgressiveMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
       default: {
           throw new IllegalStateException("Unsupported type: " + item.mimeType);
       }
diff --git a/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/PlayerManager.java b/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/PlayerManager.java
index d67c4549d8..740c1a0af6 100644
--- a/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/PlayerManager.java
+++ b/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/PlayerManager.java
@@ -23,8 +23,8 @@ import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ExoPlayerFactory;
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.ext.ima.ImaAdsLoader;
-import com.google.android.exoplayer2.source.ExtractorMediaSource;
 import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.ProgressiveMediaSource;
 import com.google.android.exoplayer2.source.ads.AdsMediaSource;
 import com.google.android.exoplayer2.source.dash.DashMediaSource;
 import com.google.android.exoplayer2.source.hls.HlsMediaSource;
@@ -125,7 +125,7 @@ import com.google.android.exoplayer2.util.Util;
       case C.TYPE_HLS:
         return new HlsMediaSource.Factory(dataSourceFactory).createMediaSource(uri);
       case C.TYPE_OTHER:
-        return new ExtractorMediaSource.Factory(dataSourceFactory).createMediaSource(uri);
+        return new ProgressiveMediaSource.Factory(dataSourceFactory).createMediaSource(uri);
       default:
         throw new IllegalStateException("Unsupported type: " + type);
     }
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 582638b460..2d4efd7f3d 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
@@ -51,8 +51,8 @@ import com.google.android.exoplayer2.mediacodec.MediaCodecUtil.DecoderQueryExcep
 import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.source.BehindLiveWindowException;
 import com.google.android.exoplayer2.source.ConcatenatingMediaSource;
-import com.google.android.exoplayer2.source.ExtractorMediaSource;
 import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.ProgressiveMediaSource;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.source.ads.AdsLoader;
 import com.google.android.exoplayer2.source.ads.AdsMediaSource;
@@ -483,7 +483,7 @@ public class PlayerActivity extends Activity
             .setStreamKeys(offlineStreamKeys)
             .createMediaSource(uri);
       case C.TYPE_OTHER:
-        return new ExtractorMediaSource.Factory(dataSourceFactory).createMediaSource(uri);
+        return new ProgressiveMediaSource.Factory(dataSourceFactory).createMediaSource(uri);
       default: {
         throw new IllegalStateException("Unsupported type: " + type);
       }
diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java
index 2efdde4e58..5448919626 100644
--- a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java
+++ b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java
@@ -28,8 +28,8 @@ import com.google.android.exoplayer2.ExoPlayerFactory;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Renderer;
 import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor;
-import com.google.android.exoplayer2.source.ExtractorMediaSource;
 import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.ProgressiveMediaSource;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
 import org.junit.Before;
@@ -86,7 +86,7 @@ public class FlacPlaybackTest {
       player = ExoPlayerFactory.newInstance(context, new Renderer[] {audioRenderer}, trackSelector);
       player.addListener(this);
       MediaSource mediaSource =
-          new ExtractorMediaSource.Factory(
+          new ProgressiveMediaSource.Factory(
                   new DefaultDataSourceFactory(context, "ExoPlayerExtFlacTest"))
               .setExtractorsFactory(MatroskaExtractor.FACTORY)
               .createMediaSource(uri);
diff --git a/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java b/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java
index 5ad864c597..6a254c8230 100644
--- a/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java
+++ b/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java
@@ -28,8 +28,8 @@ import com.google.android.exoplayer2.ExoPlayerFactory;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Renderer;
 import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor;
-import com.google.android.exoplayer2.source.ExtractorMediaSource;
 import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.ProgressiveMediaSource;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
 import org.junit.Before;
@@ -86,7 +86,7 @@ public class OpusPlaybackTest {
       player = ExoPlayerFactory.newInstance(context, new Renderer[] {audioRenderer}, trackSelector);
       player.addListener(this);
       MediaSource mediaSource =
-          new ExtractorMediaSource.Factory(
+          new ProgressiveMediaSource.Factory(
                   new DefaultDataSourceFactory(context, "ExoPlayerExtOpusTest"))
               .setExtractorsFactory(MatroskaExtractor.FACTORY)
               .createMediaSource(uri);
diff --git a/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java b/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
index 1de461e374..a36b578588 100644
--- a/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
+++ b/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
@@ -29,8 +29,8 @@ import com.google.android.exoplayer2.ExoPlayerFactory;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Renderer;
 import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor;
-import com.google.android.exoplayer2.source.ExtractorMediaSource;
 import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.ProgressiveMediaSource;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
 import com.google.android.exoplayer2.util.Log;
@@ -119,7 +119,7 @@ public class VpxPlaybackTest {
       player = ExoPlayerFactory.newInstance(context, new Renderer[] {videoRenderer}, trackSelector);
       player.addListener(this);
       MediaSource mediaSource =
-          new ExtractorMediaSource.Factory(
+          new ProgressiveMediaSource.Factory(
                   new DefaultDataSourceFactory(context, "ExoPlayerExtVp9Test"))
               .setExtractorsFactory(MatroskaExtractor.FACTORY)
               .createMediaSource(uri);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
index 5ba2394c3f..db168d9c29 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
@@ -21,10 +21,10 @@ import com.google.android.exoplayer2.audio.MediaCodecAudioRenderer;
 import com.google.android.exoplayer2.metadata.MetadataRenderer;
 import com.google.android.exoplayer2.source.ClippingMediaSource;
 import com.google.android.exoplayer2.source.ConcatenatingMediaSource;
-import com.google.android.exoplayer2.source.ExtractorMediaSource;
 import com.google.android.exoplayer2.source.LoopingMediaSource;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.MergingMediaSource;
+import com.google.android.exoplayer2.source.ProgressiveMediaSource;
 import com.google.android.exoplayer2.source.SingleSampleMediaSource;
 import com.google.android.exoplayer2.text.TextRenderer;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
@@ -48,7 +48,7 @@ import com.google.android.exoplayer2.video.MediaCodecVideoRenderer;
  *   <li>A <b>{@link MediaSource}</b> that defines the media to be played, loads the media, and from
  *       which the loaded media can be read. A MediaSource is injected via {@link
  *       #prepare(MediaSource)} at the start of playback. The library modules provide default
- *       implementations for regular media files ({@link ExtractorMediaSource}), DASH
+ *       implementations for progressive media files ({@link ProgressiveMediaSource}), DASH
  *       (DashMediaSource), SmoothStreaming (SsMediaSource) and HLS (HlsMediaSource), an
  *       implementation for loading single media samples ({@link SingleSampleMediaSource}) that's
  *       most often used for side-loaded subtitle files, and implementations for building more
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
index 5403f9f33b..5e0960aaf0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
@@ -20,6 +20,7 @@ import android.os.Handler;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Player;
+import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.extractor.ExtractorsFactory;
@@ -32,25 +33,13 @@ import com.google.android.exoplayer2.upstream.TransferListener;
 import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
 
-/**
- * Provides one period that loads data from a {@link Uri} and extracted using an {@link Extractor}.
- *
- * <p>If the possible input stream container formats are known, pass a factory that instantiates
- * extractors for them to the constructor. Otherwise, pass a {@link DefaultExtractorsFactory} to use
- * the default extractors. When reading a new stream, the first {@link Extractor} in the array of
- * extractors created by the factory that returns {@code true} from {@link Extractor#sniff} will be
- * used to extract samples from the input stream.
- *
- * <p>Note that the built-in extractors for AAC, MPEG PS/TS and FLV streams do not support seeking.
- */
+/** @deprecated Use {@link ProgressiveMediaSource} instead. */
+@Deprecated
+@SuppressWarnings("deprecation")
 public final class ExtractorMediaSource extends BaseMediaSource
-    implements ExtractorMediaPeriod.Listener {
+    implements MediaSource.SourceInfoRefreshListener {
 
-  /**
-   * Listener of {@link ExtractorMediaSource} events.
-   *
-   * @deprecated Use {@link MediaSourceEventListener}.
-   */
+  /** @deprecated Use {@link MediaSourceEventListener} instead. */
   @Deprecated
   public interface EventListener {
 
@@ -70,7 +59,8 @@ public final class ExtractorMediaSource extends BaseMediaSource
 
   }
 
-  /** Factory for {@link ExtractorMediaSource}s. */
+  /** Use {@link ProgressiveMediaSource.Factory} instead. */
+  @Deprecated
   public static final class Factory implements AdsMediaSource.MediaSourceFactory {
 
     private final DataSource.Factory dataSourceFactory;
@@ -232,23 +222,11 @@ public final class ExtractorMediaSource extends BaseMediaSource
     }
   }
 
-  /**
-   * The default number of bytes that should be loaded between each each invocation of {@link
-   * MediaPeriod.Callback#onContinueLoadingRequested(SequenceableLoader)}.
-   */
-  public static final int DEFAULT_LOADING_CHECK_INTERVAL_BYTES = 1024 * 1024;
+  @Deprecated
+  public static final int DEFAULT_LOADING_CHECK_INTERVAL_BYTES =
+      ProgressiveMediaSource.DEFAULT_LOADING_CHECK_INTERVAL_BYTES;
 
-  private final Uri uri;
-  private final DataSource.Factory dataSourceFactory;
-  private final ExtractorsFactory extractorsFactory;
-  private final LoadErrorHandlingPolicy loadableLoadErrorHandlingPolicy;
-  private final String customCacheKey;
-  private final int continueLoadingCheckIntervalBytes;
-  private final @Nullable Object tag;
-
-  private long timelineDurationUs;
-  private boolean timelineIsSeekable;
-  private @Nullable TransferListener transferListener;
+  private final ProgressiveMediaSource progressiveMediaSource;
 
   /**
    * @param uri The {@link Uri} of the media stream.
@@ -261,7 +239,6 @@ public final class ExtractorMediaSource extends BaseMediaSource
    * @deprecated Use {@link Factory} instead.
    */
   @Deprecated
-  @SuppressWarnings("deprecation")
   public ExtractorMediaSource(
       Uri uri,
       DataSource.Factory dataSourceFactory,
@@ -284,7 +261,6 @@ public final class ExtractorMediaSource extends BaseMediaSource
    * @deprecated Use {@link Factory} instead.
    */
   @Deprecated
-  @SuppressWarnings("deprecation")
   public ExtractorMediaSource(
       Uri uri,
       DataSource.Factory dataSourceFactory,
@@ -317,7 +293,6 @@ public final class ExtractorMediaSource extends BaseMediaSource
    * @deprecated Use {@link Factory} instead.
    */
   @Deprecated
-  @SuppressWarnings("deprecation")
   public ExtractorMediaSource(
       Uri uri,
       DataSource.Factory dataSourceFactory,
@@ -347,93 +322,57 @@ public final class ExtractorMediaSource extends BaseMediaSource
       @Nullable String customCacheKey,
       int continueLoadingCheckIntervalBytes,
       @Nullable Object tag) {
-    this.uri = uri;
-    this.dataSourceFactory = dataSourceFactory;
-    this.extractorsFactory = extractorsFactory;
-    this.loadableLoadErrorHandlingPolicy = loadableLoadErrorHandlingPolicy;
-    this.customCacheKey = customCacheKey;
-    this.continueLoadingCheckIntervalBytes = continueLoadingCheckIntervalBytes;
-    this.timelineDurationUs = C.TIME_UNSET;
-    this.tag = tag;
+    progressiveMediaSource =
+        new ProgressiveMediaSource(
+            uri,
+            dataSourceFactory,
+            extractorsFactory,
+            loadableLoadErrorHandlingPolicy,
+            customCacheKey,
+            continueLoadingCheckIntervalBytes,
+            tag);
   }
 
   @Override
   @Nullable
   public Object getTag() {
-    return tag;
+    return progressiveMediaSource.getTag();
   }
 
   @Override
   public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
-    transferListener = mediaTransferListener;
-    notifySourceInfoRefreshed(timelineDurationUs, timelineIsSeekable);
+    progressiveMediaSource.prepareSource(/* listener= */ this, mediaTransferListener);
   }
 
   @Override
   public void maybeThrowSourceInfoRefreshError() throws IOException {
-    // Do nothing.
+    progressiveMediaSource.maybeThrowSourceInfoRefreshError();
   }
 
   @Override
   public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator, long startPositionUs) {
-    DataSource dataSource = dataSourceFactory.createDataSource();
-    if (transferListener != null) {
-      dataSource.addTransferListener(transferListener);
-    }
-    return new ExtractorMediaPeriod(
-        uri,
-        dataSource,
-        extractorsFactory.createExtractors(),
-        loadableLoadErrorHandlingPolicy,
-        createEventDispatcher(id),
-        this,
-        allocator,
-        customCacheKey,
-        continueLoadingCheckIntervalBytes);
+    return progressiveMediaSource.createPeriod(id, allocator, startPositionUs);
   }
 
   @Override
   public void releasePeriod(MediaPeriod mediaPeriod) {
-    ((ExtractorMediaPeriod) mediaPeriod).release();
+    progressiveMediaSource.releasePeriod(mediaPeriod);
   }
 
   @Override
   public void releaseSourceInternal() {
-    // Do nothing.
+    progressiveMediaSource.releaseSource(/* listener= */ this);
   }
 
-  // ExtractorMediaPeriod.Listener implementation.
-
   @Override
-  public void onSourceInfoRefreshed(long durationUs, boolean isSeekable) {
-    // If we already have the duration from a previous source info refresh, use it.
-    durationUs = durationUs == C.TIME_UNSET ? timelineDurationUs : durationUs;
-    if (timelineDurationUs == durationUs && timelineIsSeekable == isSeekable) {
-      // Suppress no-op source info changes.
-      return;
-    }
-    notifySourceInfoRefreshed(durationUs, isSeekable);
+  public void onSourceInfoRefreshed(
+      MediaSource source, Timeline timeline, @Nullable Object manifest) {
+    refreshSourceInfo(timeline, manifest);
   }
 
-  // Internal methods.
-
-  private void notifySourceInfoRefreshed(long durationUs, boolean isSeekable) {
-    timelineDurationUs = durationUs;
-    timelineIsSeekable = isSeekable;
-    // TODO: Make timeline dynamic until its duration is known. This is non-trivial. See b/69703223.
-    refreshSourceInfo(
-        new SinglePeriodTimeline(
-            timelineDurationUs, timelineIsSeekable, /* isDynamic= */ false, tag),
-        /* manifest= */ null);
-  }
-
-  /**
-   * Wraps a deprecated {@link EventListener}, invoking its callback from the equivalent callback in
-   * {@link MediaSourceEventListener}.
-   */
   @Deprecated
-  @SuppressWarnings("deprecation")
   private static final class EventListenerWrapper extends DefaultMediaSourceEventListener {
+
     private final EventListener eventListener;
 
     public EventListenerWrapper(EventListener eventListener) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
similarity index 98%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java
rename to library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
index e842d4f253..41f6e986c6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
@@ -54,12 +54,13 @@ import java.io.IOException;
 import java.util.Arrays;
 import org.checkerframework.checker.nullness.compatqual.NullableType;
 
-/**
- * A {@link MediaPeriod} that extracts data using an {@link Extractor}.
- */
-/* package */ final class ExtractorMediaPeriod implements MediaPeriod, ExtractorOutput,
-    Loader.Callback<ExtractorMediaPeriod.ExtractingLoadable>, Loader.ReleaseCallback,
-    UpstreamFormatChangedListener {
+/** A {@link MediaPeriod} that extracts data using an {@link Extractor}. */
+/* package */ final class ProgressiveMediaPeriod
+    implements MediaPeriod,
+        ExtractorOutput,
+        Loader.Callback<ProgressiveMediaPeriod.ExtractingLoadable>,
+        Loader.ReleaseCallback,
+        UpstreamFormatChangedListener {
 
   /**
    * Listener for information about the period.
@@ -145,7 +146,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     "nullness:argument.type.incompatible",
     "nullness:methodref.receiver.bound.invalid"
   })
-  public ExtractorMediaPeriod(
+  public ProgressiveMediaPeriod(
       Uri uri,
       DataSource dataSource,
       Extractor[] extractors,
@@ -163,14 +164,15 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     this.allocator = allocator;
     this.customCacheKey = customCacheKey;
     this.continueLoadingCheckIntervalBytes = continueLoadingCheckIntervalBytes;
-    loader = new Loader("Loader:ExtractorMediaPeriod");
+    loader = new Loader("Loader:ProgressiveMediaPeriod");
     extractorHolder = new ExtractorHolder(extractors);
     loadCondition = new ConditionVariable();
     maybeFinishPrepareRunnable = this::maybeFinishPrepare;
     onContinueLoadingRequestedRunnable =
         () -> {
           if (!released) {
-            Assertions.checkNotNull(callback).onContinueLoadingRequested(ExtractorMediaPeriod.this);
+            Assertions.checkNotNull(callback)
+                .onContinueLoadingRequested(ProgressiveMediaPeriod.this);
           }
         };
     handler = new Handler();
@@ -852,23 +854,23 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 
     @Override
     public boolean isReady() {
-      return ExtractorMediaPeriod.this.isReady(track);
+      return ProgressiveMediaPeriod.this.isReady(track);
     }
 
     @Override
     public void maybeThrowError() throws IOException {
-      ExtractorMediaPeriod.this.maybeThrowError();
+      ProgressiveMediaPeriod.this.maybeThrowError();
     }
 
     @Override
     public int readData(FormatHolder formatHolder, DecoderInputBuffer buffer,
         boolean formatRequired) {
-      return ExtractorMediaPeriod.this.readData(track, formatHolder, buffer, formatRequired);
+      return ProgressiveMediaPeriod.this.readData(track, formatHolder, buffer, formatRequired);
     }
 
     @Override
     public int skipData(long positionUs) {
-      return ExtractorMediaPeriod.this.skipData(track, positionUs);
+      return ProgressiveMediaPeriod.this.skipData(track, positionUs);
     }
 
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
new file mode 100644
index 0000000000..a44e99b9c4
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
@@ -0,0 +1,281 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.source;
+
+import android.net.Uri;
+import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
+import com.google.android.exoplayer2.extractor.Extractor;
+import com.google.android.exoplayer2.extractor.ExtractorsFactory;
+import com.google.android.exoplayer2.source.ads.AdsMediaSource;
+import com.google.android.exoplayer2.upstream.Allocator;
+import com.google.android.exoplayer2.upstream.DataSource;
+import com.google.android.exoplayer2.upstream.DefaultLoadErrorHandlingPolicy;
+import com.google.android.exoplayer2.upstream.LoadErrorHandlingPolicy;
+import com.google.android.exoplayer2.upstream.TransferListener;
+import com.google.android.exoplayer2.util.Assertions;
+import java.io.IOException;
+
+/**
+ * Provides one period that loads data from a {@link Uri} and extracted using an {@link Extractor}.
+ *
+ * <p>If the possible input stream container formats are known, pass a factory that instantiates
+ * extractors for them to the constructor. Otherwise, pass a {@link DefaultExtractorsFactory} to use
+ * the default extractors. When reading a new stream, the first {@link Extractor} in the array of
+ * extractors created by the factory that returns {@code true} from {@link Extractor#sniff} will be
+ * used to extract samples from the input stream.
+ *
+ * <p>Note that the built-in extractors for AAC, MPEG PS/TS and FLV streams do not support seeking.
+ */
+public final class ProgressiveMediaSource extends BaseMediaSource
+    implements ProgressiveMediaPeriod.Listener {
+
+  /** Factory for {@link ProgressiveMediaSource}s. */
+  public static final class Factory implements AdsMediaSource.MediaSourceFactory {
+
+    private final DataSource.Factory dataSourceFactory;
+
+    @Nullable private ExtractorsFactory extractorsFactory;
+    @Nullable private String customCacheKey;
+    @Nullable private Object tag;
+    private LoadErrorHandlingPolicy loadErrorHandlingPolicy;
+    private int continueLoadingCheckIntervalBytes;
+    private boolean isCreateCalled;
+
+    /**
+     * Creates a new factory for {@link ProgressiveMediaSource}s.
+     *
+     * @param dataSourceFactory A factory for {@link DataSource}s to read the media.
+     */
+    public Factory(DataSource.Factory dataSourceFactory) {
+      this.dataSourceFactory = dataSourceFactory;
+      loadErrorHandlingPolicy = new DefaultLoadErrorHandlingPolicy();
+      continueLoadingCheckIntervalBytes = DEFAULT_LOADING_CHECK_INTERVAL_BYTES;
+    }
+
+    /**
+     * Sets the factory for {@link Extractor}s to process the media stream. The default value is an
+     * instance of {@link DefaultExtractorsFactory}.
+     *
+     * @param extractorsFactory A factory for {@link Extractor}s to process the media stream. If the
+     *     possible formats are known, pass a factory that instantiates extractors for those
+     *     formats.
+     * @return This factory, for convenience.
+     * @throws IllegalStateException If one of the {@code create} methods has already been called.
+     */
+    public Factory setExtractorsFactory(ExtractorsFactory extractorsFactory) {
+      Assertions.checkState(!isCreateCalled);
+      this.extractorsFactory = extractorsFactory;
+      return this;
+    }
+
+    /**
+     * Sets the custom key that uniquely identifies the original stream. Used for cache indexing.
+     * The default value is {@code null}.
+     *
+     * @param customCacheKey A custom key that uniquely identifies the original stream. Used for
+     *     cache indexing.
+     * @return This factory, for convenience.
+     * @throws IllegalStateException If one of the {@code create} methods has already been called.
+     */
+    public Factory setCustomCacheKey(String customCacheKey) {
+      Assertions.checkState(!isCreateCalled);
+      this.customCacheKey = customCacheKey;
+      return this;
+    }
+
+    /**
+     * Sets a tag for the media source which will be published in the {@link
+     * com.google.android.exoplayer2.Timeline} of the source as {@link
+     * com.google.android.exoplayer2.Timeline.Window#tag}.
+     *
+     * @param tag A tag for the media source.
+     * @return This factory, for convenience.
+     * @throws IllegalStateException If one of the {@code create} methods has already been called.
+     */
+    public Factory setTag(Object tag) {
+      Assertions.checkState(!isCreateCalled);
+      this.tag = tag;
+      return this;
+    }
+
+    /**
+     * Sets the {@link LoadErrorHandlingPolicy}. The default value is created by calling {@link
+     * DefaultLoadErrorHandlingPolicy#DefaultLoadErrorHandlingPolicy()}.
+     *
+     * @param loadErrorHandlingPolicy A {@link LoadErrorHandlingPolicy}.
+     * @return This factory, for convenience.
+     * @throws IllegalStateException If one of the {@code create} methods has already been called.
+     */
+    public Factory setLoadErrorHandlingPolicy(LoadErrorHandlingPolicy loadErrorHandlingPolicy) {
+      Assertions.checkState(!isCreateCalled);
+      this.loadErrorHandlingPolicy = loadErrorHandlingPolicy;
+      return this;
+    }
+
+    /**
+     * Sets the number of bytes that should be loaded between each invocation of {@link
+     * MediaPeriod.Callback#onContinueLoadingRequested(SequenceableLoader)}. The default value is
+     * {@link #DEFAULT_LOADING_CHECK_INTERVAL_BYTES}.
+     *
+     * @param continueLoadingCheckIntervalBytes The number of bytes that should be loaded between
+     *     each invocation of {@link
+     *     MediaPeriod.Callback#onContinueLoadingRequested(SequenceableLoader)}.
+     * @return This factory, for convenience.
+     * @throws IllegalStateException If one of the {@code create} methods has already been called.
+     */
+    public Factory setContinueLoadingCheckIntervalBytes(int continueLoadingCheckIntervalBytes) {
+      Assertions.checkState(!isCreateCalled);
+      this.continueLoadingCheckIntervalBytes = continueLoadingCheckIntervalBytes;
+      return this;
+    }
+
+    /**
+     * Returns a new {@link ProgressiveMediaSource} using the current parameters.
+     *
+     * @param uri The {@link Uri}.
+     * @return The new {@link ProgressiveMediaSource}.
+     */
+    @Override
+    public ProgressiveMediaSource createMediaSource(Uri uri) {
+      isCreateCalled = true;
+      if (extractorsFactory == null) {
+        extractorsFactory = new DefaultExtractorsFactory();
+      }
+      return new ProgressiveMediaSource(
+          uri,
+          dataSourceFactory,
+          extractorsFactory,
+          loadErrorHandlingPolicy,
+          customCacheKey,
+          continueLoadingCheckIntervalBytes,
+          tag);
+    }
+
+    @Override
+    public int[] getSupportedTypes() {
+      return new int[] {C.TYPE_OTHER};
+    }
+  }
+
+  /**
+   * The default number of bytes that should be loaded between each each invocation of {@link
+   * MediaPeriod.Callback#onContinueLoadingRequested(SequenceableLoader)}.
+   */
+  public static final int DEFAULT_LOADING_CHECK_INTERVAL_BYTES = 1024 * 1024;
+
+  private final Uri uri;
+  private final DataSource.Factory dataSourceFactory;
+  private final ExtractorsFactory extractorsFactory;
+  private final LoadErrorHandlingPolicy loadableLoadErrorHandlingPolicy;
+  @Nullable private final String customCacheKey;
+  private final int continueLoadingCheckIntervalBytes;
+  @Nullable private final Object tag;
+
+  private long timelineDurationUs;
+  private boolean timelineIsSeekable;
+  @Nullable private TransferListener transferListener;
+
+  // TODO: Make private when ExtractorMediaSource is deleted.
+  /* package */ ProgressiveMediaSource(
+      Uri uri,
+      DataSource.Factory dataSourceFactory,
+      ExtractorsFactory extractorsFactory,
+      LoadErrorHandlingPolicy loadableLoadErrorHandlingPolicy,
+      @Nullable String customCacheKey,
+      int continueLoadingCheckIntervalBytes,
+      @Nullable Object tag) {
+    this.uri = uri;
+    this.dataSourceFactory = dataSourceFactory;
+    this.extractorsFactory = extractorsFactory;
+    this.loadableLoadErrorHandlingPolicy = loadableLoadErrorHandlingPolicy;
+    this.customCacheKey = customCacheKey;
+    this.continueLoadingCheckIntervalBytes = continueLoadingCheckIntervalBytes;
+    this.timelineDurationUs = C.TIME_UNSET;
+    this.tag = tag;
+  }
+
+  @Override
+  @Nullable
+  public Object getTag() {
+    return tag;
+  }
+
+  @Override
+  public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
+    transferListener = mediaTransferListener;
+    notifySourceInfoRefreshed(timelineDurationUs, timelineIsSeekable);
+  }
+
+  @Override
+  public void maybeThrowSourceInfoRefreshError() throws IOException {
+    // Do nothing.
+  }
+
+  @Override
+  public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator, long startPositionUs) {
+    DataSource dataSource = dataSourceFactory.createDataSource();
+    if (transferListener != null) {
+      dataSource.addTransferListener(transferListener);
+    }
+    return new ProgressiveMediaPeriod(
+        uri,
+        dataSource,
+        extractorsFactory.createExtractors(),
+        loadableLoadErrorHandlingPolicy,
+        createEventDispatcher(id),
+        this,
+        allocator,
+        customCacheKey,
+        continueLoadingCheckIntervalBytes);
+  }
+
+  @Override
+  public void releasePeriod(MediaPeriod mediaPeriod) {
+    ((ProgressiveMediaPeriod) mediaPeriod).release();
+  }
+
+  @Override
+  public void releaseSourceInternal() {
+    // Do nothing.
+  }
+
+  // ProgressiveMediaPeriod.Listener implementation.
+
+  @Override
+  public void onSourceInfoRefreshed(long durationUs, boolean isSeekable) {
+    // If we already have the duration from a previous source info refresh, use it.
+    durationUs = durationUs == C.TIME_UNSET ? timelineDurationUs : durationUs;
+    if (timelineDurationUs == durationUs && timelineIsSeekable == isSeekable) {
+      // Suppress no-op source info changes.
+      return;
+    }
+    notifySourceInfoRefreshed(durationUs, isSeekable);
+  }
+
+  // Internal methods.
+
+  private void notifySourceInfoRefreshed(long durationUs, boolean isSeekable) {
+    timelineDurationUs = durationUs;
+    timelineIsSeekable = isSeekable;
+    // TODO: Make timeline dynamic until its duration is known. This is non-trivial. See b/69703223.
+    refreshSourceInfo(
+        new SinglePeriodTimeline(
+            timelineDurationUs, timelineIsSeekable, /* isDynamic= */ false, tag),
+        /* manifest= */ null);
+  }
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
index d13fa06434..7611d76260 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
@@ -138,12 +138,12 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
     }
 
     /**
-     * Returns a new {@link ExtractorMediaSource} using the current parameters.
+     * Returns a new {@link SingleSampleMediaSource} using the current parameters.
      *
      * @param uri The {@link Uri}.
      * @param format The {@link Format} of the media stream.
      * @param durationUs The duration of the media stream in microseconds.
-     * @return The new {@link ExtractorMediaSource}.
+     * @return The new {@link SingleSampleMediaSource}.
      */
     public SingleSampleMediaSource createMediaSource(Uri uri, Format format, long durationUs) {
       isCreateCalled = true;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
index 4754466235..e80c797eb9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
@@ -25,13 +25,13 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.source.CompositeMediaSource;
 import com.google.android.exoplayer2.source.DeferredMediaPeriod;
-import com.google.android.exoplayer2.source.ExtractorMediaSource;
 import com.google.android.exoplayer2.source.MediaPeriod;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 import com.google.android.exoplayer2.source.MediaSourceEventListener;
 import com.google.android.exoplayer2.source.MediaSourceEventListener.LoadEventInfo;
 import com.google.android.exoplayer2.source.MediaSourceEventListener.MediaLoadData;
+import com.google.android.exoplayer2.source.ProgressiveMediaSource;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DataSpec;
@@ -203,7 +203,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
 
   /**
    * Constructs a new source that inserts ads linearly with the content specified by {@code
-   * contentMediaSource}. Ad media is loaded using {@link ExtractorMediaSource}.
+   * contentMediaSource}. Ad media is loaded using {@link ProgressiveMediaSource}.
    *
    * @param contentMediaSource The {@link MediaSource} providing the content to play.
    * @param dataSourceFactory Factory for data sources used to load ad media.
@@ -217,7 +217,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
       ViewGroup adUiViewGroup) {
     this(
         contentMediaSource,
-        new ExtractorMediaSource.Factory(dataSourceFactory),
+        new ProgressiveMediaSource.Factory(dataSourceFactory),
         adsLoader,
         adUiViewGroup,
         /* eventHandler= */ null,
@@ -249,7 +249,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
 
   /**
    * Constructs a new source that inserts ads linearly with the content specified by {@code
-   * contentMediaSource}. Ad media is loaded using {@link ExtractorMediaSource}.
+   * contentMediaSource}. Ad media is loaded using {@link ProgressiveMediaSource}.
    *
    * @param contentMediaSource The {@link MediaSource} providing the content to play.
    * @param dataSourceFactory Factory for data sources used to load ad media.
@@ -273,7 +273,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
       @Nullable EventListener eventListener) {
     this(
         contentMediaSource,
-        new ExtractorMediaSource.Factory(dataSourceFactory),
+        new ProgressiveMediaSource.Factory(dataSourceFactory),
         adsLoader,
         adUiViewGroup,
         eventHandler,

From e0711c64b84cd86a75f00ff659af19ea52d41f7f Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 29 Jan 2019 13:18:25 +0000
Subject: [PATCH 446/832] DatabaseFileProvidingContext: Support older API
 levels

On older API levels it's also necessary to implement
openOrCreateDatabase, to be called by SQLiteOpenHelper.

PiperOrigin-RevId: 231387559
---
 .../database/ExoDatabaseProvider.java         | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java b/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
index 49c16ebbbf..9306b22353 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.database;
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.database.Cursor;
+import android.database.DatabaseErrorHandler;
 import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
@@ -107,10 +108,7 @@ public final class ExoDatabaseProvider extends SQLiteOpenHelper implements Datab
   // TODO: This is fragile. Stop using it if/when SQLiteOpenHelper can be instantiated without a
   // context [Internal ref: b/123351819], or by injecting a Context into all components that need
   // to instantiate an ExoDatabaseProvider.
-  /**
-   * A {@link Context} that only implements {@link #getDatabasePath(String)}. This is the only
-   * method used by {@link SQLiteOpenHelper}.
-   */
+  /** A {@link Context} that implements methods called by {@link SQLiteOpenHelper}. */
   private static class DatabaseFileProvidingContext extends ContextWrapper {
 
     private final File file;
@@ -125,5 +123,28 @@ public final class ExoDatabaseProvider extends SQLiteOpenHelper implements Datab
     public File getDatabasePath(String name) {
       return file;
     }
+
+    @Override
+    public SQLiteDatabase openOrCreateDatabase(
+        String name, int mode, SQLiteDatabase.CursorFactory factory) {
+      return openOrCreateDatabase(name, mode, factory, /* errorHandler= */ null);
+    }
+
+    @Override
+    public SQLiteDatabase openOrCreateDatabase(
+        String name,
+        int mode,
+        SQLiteDatabase.CursorFactory factory,
+        DatabaseErrorHandler errorHandler) {
+      File databasePath = getDatabasePath(name);
+      int flags = SQLiteDatabase.CREATE_IF_NECESSARY;
+      if ((mode & MODE_ENABLE_WRITE_AHEAD_LOGGING) != 0) {
+        flags |= SQLiteDatabase.ENABLE_WRITE_AHEAD_LOGGING;
+      }
+      if ((mode & MODE_NO_LOCALIZED_COLLATORS) != 0) {
+        flags |= SQLiteDatabase.NO_LOCALIZED_COLLATORS;
+      }
+      return SQLiteDatabase.openDatabase(databasePath.getPath(), factory, flags, errorHandler);
+    }
   }
 }

From d49e7ebae2c09cde5a0ed5af488555e4fdd62fd1 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 29 Jan 2019 14:47:13 +0000
Subject: [PATCH 447/832] Fix nullness checks (pending stub to fix it properly)

PiperOrigin-RevId: 231396213
---
 .../android/exoplayer2/database/ExoDatabaseProvider.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java b/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
index 9306b22353..ece8e57ae7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
@@ -22,6 +22,7 @@ import android.database.DatabaseErrorHandler;
 import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
+import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.util.Log;
 import java.io.File;
 
@@ -131,11 +132,12 @@ public final class ExoDatabaseProvider extends SQLiteOpenHelper implements Datab
     }
 
     @Override
+    @SuppressWarnings("nullness:argument.type.incompatible")
     public SQLiteDatabase openOrCreateDatabase(
         String name,
         int mode,
         SQLiteDatabase.CursorFactory factory,
-        DatabaseErrorHandler errorHandler) {
+        @Nullable DatabaseErrorHandler errorHandler) {
       File databasePath = getDatabasePath(name);
       int flags = SQLiteDatabase.CREATE_IF_NECESSARY;
       if ((mode & MODE_ENABLE_WRITE_AHEAD_LOGGING) != 0) {

From f4e7af3fd0b22f211da06c9c5d63eac753cf000e Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 29 Jan 2019 16:13:55 +0000
Subject: [PATCH 448/832] Handle duration change in updateQueuedPeriods.

We can keep the reading media period and continue playing if we haven't read
beyond the new duration. Otherwise, we can keep the period, but need to reset
the renderers as we already read too far.

PiperOrigin-RevId: 231406252
---
 .../exoplayer2/ExoPlayerImplInternal.java     |  24 +-
 .../android/exoplayer2/MediaPeriodQueue.java  |  23 +-
 .../exoplayer2/MediaPeriodQueueTest.java      | 218 ++++++++++++++++--
 3 files changed, 245 insertions(+), 20 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index bebc6224ec..670353c4f9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -1376,12 +1376,34 @@ import java.util.concurrent.atomic.AtomicBoolean;
       }
     }
 
-    if (!queue.updateQueuedPeriods(rendererPositionUs)) {
+    if (!queue.updateQueuedPeriods(rendererPositionUs, getMaxRendererReadPositionUs())) {
       seekToCurrentPosition(/* sendDiscontinuity= */ false);
     }
     handleLoadingMediaPeriodChanged(/* loadingTrackSelectionChanged= */ false);
   }
 
+  private long getMaxRendererReadPositionUs() {
+    MediaPeriodHolder readingHolder = queue.getReadingPeriod();
+    if (readingHolder == null) {
+      return 0;
+    }
+    long maxReadPositionUs = readingHolder.getRendererOffset();
+    for (int i = 0; i < renderers.length; i++) {
+      if (renderers[i].getState() == Renderer.STATE_DISABLED
+          || renderers[i].getStream() != readingHolder.sampleStreams[i]) {
+        // Ignore disabled renderers and renderers with sample streams from previous periods.
+        continue;
+      }
+      long readingPositionUs = renderers[i].getReadingPositionUs();
+      if (readingPositionUs == C.TIME_END_OF_SOURCE) {
+        return C.TIME_END_OF_SOURCE;
+      } else {
+        maxReadPositionUs = Math.max(readingPositionUs, maxReadPositionUs);
+      }
+    }
+    return maxReadPositionUs;
+  }
+
   private void handleSourceInfoRefreshEndedPlayback() {
     setState(Player.STATE_ENDED);
     // Reset, but retain the source so that it can still be used should a seek occur.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
index d6ff320295..64719a0ab4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
@@ -61,8 +61,8 @@ import com.google.android.exoplayer2.util.Assertions;
   }
 
   /**
-   * Sets the {@link Timeline}. Call {@link #updateQueuedPeriods(long)} to update the queued media
-   * periods to take into account the new timeline.
+   * Sets the {@link Timeline}. Call {@link #updateQueuedPeriods(long, long)} to update the queued
+   * media periods to take into account the new timeline.
    */
   public void setTimeline(Timeline timeline) {
     this.timeline = timeline;
@@ -293,9 +293,12 @@ import com.google.android.exoplayer2.util.Assertions;
    * consistent with the new timeline.
    *
    * @param rendererPositionUs The current renderer position in microseconds.
+   * @param maxRendererReadPositionUs The maximum renderer position up to which renderers have read
+   *     the current reading media period in microseconds, or {@link C#TIME_END_OF_SOURCE} if they
+   *     have read to the end.
    * @return Whether the timeline change has been handled completely.
    */
-  public boolean updateQueuedPeriods(long rendererPositionUs) {
+  public boolean updateQueuedPeriods(long rendererPositionUs, long maxRendererReadPositionUs) {
     // TODO: Merge this into setTimeline so that the queue gets updated as soon as the new timeline
     // is set, once all cases handled by ExoPlayerImplInternal.handleSourceInfoRefreshed can be
     // handled here.
@@ -327,8 +330,18 @@ import com.google.android.exoplayer2.util.Assertions;
       periodHolder.info = newPeriodInfo.copyWithContentPositionUs(oldPeriodInfo.contentPositionUs);
 
       if (!areDurationsCompatible(oldPeriodInfo.durationUs, newPeriodInfo.durationUs)) {
-        // The period duration changed. Remove all subsequent periods.
-        return !removeAfter(periodHolder);
+        // The period duration changed. Remove all subsequent periods and check whether we read
+        // beyond the new duration.
+        long newDurationInRendererTime =
+            newPeriodInfo.durationUs == C.TIME_UNSET
+                ? Long.MAX_VALUE
+                : periodHolder.toRendererTime(newPeriodInfo.durationUs);
+        boolean isReadingAndReadBeyondNewDuration =
+            periodHolder == reading
+                && (maxRendererReadPositionUs == C.TIME_END_OF_SOURCE
+                    || maxRendererReadPositionUs >= newDurationInRendererTime);
+        boolean readingPeriodRemoved = removeAfter(periodHolder);
+        return !readingPeriodRemoved && !isReadingAndReadBeyondNewDuration;
       }
 
       previousPeriodHolder = periodHolder;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java b/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java
index 6016ec1db7..37f8a05790 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java
@@ -37,6 +37,7 @@ import org.robolectric.RobolectricTestRunner;
 public final class MediaPeriodQueueTest {
 
   private static final long CONTENT_DURATION_US = 30 * C.MICROS_PER_SECOND;
+  private static final long AD_DURATION_US = 10 * C.MICROS_PER_SECOND;
   private static final long FIRST_AD_START_TIME_US = 10 * C.MICROS_PER_SECOND;
   private static final long SECOND_AD_START_TIME_US = 20 * C.MICROS_PER_SECOND;
 
@@ -65,8 +66,8 @@ public final class MediaPeriodQueueTest {
   }
 
   @Test
-  public void testGetNextMediaPeriodInfo_withoutAds_returnsLastMediaPeriodInfo() {
-    setupInitialTimeline(/* initialPositionUs= */ 0);
+  public void getNextMediaPeriodInfo_withoutAds_returnsLastMediaPeriodInfo() {
+    setupTimeline(/* initialPositionUs= */ 0);
     assertGetNextMediaPeriodInfoReturnsContentMediaPeriod(
         /* startPositionUs= */ 0,
         /* endPositionUs= */ C.TIME_UNSET,
@@ -76,8 +77,8 @@ public final class MediaPeriodQueueTest {
   }
 
   @Test
-  public void testGetNextMediaPeriodInfo_withPrerollAd_returnsCorrectMediaPeriodInfos() {
-    setupInitialTimeline(/* initialPositionUs= */ 0, /* adGroupTimesUs= */ 0);
+  public void getNextMediaPeriodInfo_withPrerollAd_returnsCorrectMediaPeriodInfos() {
+    setupTimeline(/* initialPositionUs= */ 0, /* adGroupTimesUs= */ 0);
     setAdGroupLoaded(/* adGroupIndex= */ 0);
     assertNextMediaPeriodInfoIsAd(/* adGroupIndex= */ 0, /* contentPositionUs= */ 0);
     advance();
@@ -90,8 +91,8 @@ public final class MediaPeriodQueueTest {
   }
 
   @Test
-  public void testGetNextMediaPeriodInfo_withMidrollAds_returnsCorrectMediaPeriodInfos() {
-    setupInitialTimeline(
+  public void getNextMediaPeriodInfo_withMidrollAds_returnsCorrectMediaPeriodInfos() {
+    setupTimeline(
         /* initialPositionUs= */ 0,
         /* adGroupTimesUs= */ FIRST_AD_START_TIME_US,
         SECOND_AD_START_TIME_US);
@@ -128,8 +129,8 @@ public final class MediaPeriodQueueTest {
   }
 
   @Test
-  public void testGetNextMediaPeriodInfo_withMidrollAndPostroll_returnsCorrectMediaPeriodInfos() {
-    setupInitialTimeline(
+  public void getNextMediaPeriodInfo_withMidrollAndPostroll_returnsCorrectMediaPeriodInfos() {
+    setupTimeline(
         /* initialPositionUs= */ 0,
         /* adGroupTimesUs= */ FIRST_AD_START_TIME_US,
         C.TIME_END_OF_SOURCE);
@@ -164,8 +165,8 @@ public final class MediaPeriodQueueTest {
   }
 
   @Test
-  public void testGetNextMediaPeriodInfo_withPostrollLoadError_returnsEmptyFinalMediaPeriodInfo() {
-    setupInitialTimeline(/* initialPositionUs= */ 0, /* adGroupTimesUs= */ C.TIME_END_OF_SOURCE);
+  public void getNextMediaPeriodInfo_withPostrollLoadError_returnsEmptyFinalMediaPeriodInfo() {
+    setupTimeline(/* initialPositionUs= */ 0, /* adGroupTimesUs= */ C.TIME_END_OF_SOURCE);
     assertGetNextMediaPeriodInfoReturnsContentMediaPeriod(
         /* startPositionUs= */ 0,
         /* endPositionUs= */ C.TIME_END_OF_SOURCE,
@@ -182,7 +183,168 @@ public final class MediaPeriodQueueTest {
         /* nextAdGroupIndex= */ C.INDEX_UNSET);
   }
 
-  private void setupInitialTimeline(long initialPositionUs, long... adGroupTimesUs) {
+  @Test
+  public void
+      updateQueuedPeriods_withDurationChangeAfterReadingPeriod_handlesChangeAndRemovesPeriodsAfterChangedPeriod() {
+    setupTimeline(
+        /* initialPositionUs= */ 0,
+        /* adGroupTimesUs= */ FIRST_AD_START_TIME_US,
+        SECOND_AD_START_TIME_US);
+    setAdGroupLoaded(/* adGroupIndex= */ 0);
+    setAdGroupLoaded(/* adGroupIndex= */ 1);
+    enqueueNext(); // Content before first ad.
+    advancePlaying();
+    enqueueNext(); // First ad.
+    enqueueNext(); // Content between ads.
+    enqueueNext(); // Second ad.
+
+    // Change position of second ad (= change duration of content between ads).
+    setupTimeline(
+        /* initialPositionUs= */ 0,
+        /* adGroupTimesUs= */ FIRST_AD_START_TIME_US,
+        SECOND_AD_START_TIME_US + 1);
+    setAdGroupLoaded(/* adGroupIndex= */ 0);
+    setAdGroupLoaded(/* adGroupIndex= */ 1);
+    boolean changeHandled =
+        mediaPeriodQueue.updateQueuedPeriods(
+            /* rendererPositionUs= */ 0, /* maxRendererReadPositionUs= */ 0);
+
+    assertThat(changeHandled).isTrue();
+    assertThat(getQueueLength()).isEqualTo(3);
+  }
+
+  @Test
+  public void
+      updateQueuedPeriods_withDurationChangeBeforeReadingPeriod_doesntHandleChangeAndRemovesPeriodsAfterChangedPeriod() {
+    setupTimeline(
+        /* initialPositionUs= */ 0,
+        /* adGroupTimesUs= */ FIRST_AD_START_TIME_US,
+        SECOND_AD_START_TIME_US);
+    setAdGroupLoaded(/* adGroupIndex= */ 0);
+    setAdGroupLoaded(/* adGroupIndex= */ 1);
+    enqueueNext(); // Content before first ad.
+    advancePlaying();
+    enqueueNext(); // First ad.
+    enqueueNext(); // Content between ads.
+    enqueueNext(); // Second ad.
+    advanceReading(); // Reading first ad.
+
+    // Change position of first ad (= change duration of content before first ad).
+    setupTimeline(
+        /* initialPositionUs= */ 0,
+        /* adGroupTimesUs= */ FIRST_AD_START_TIME_US + 1,
+        SECOND_AD_START_TIME_US);
+    setAdGroupLoaded(/* adGroupIndex= */ 0);
+    setAdGroupLoaded(/* adGroupIndex= */ 1);
+    boolean changeHandled =
+        mediaPeriodQueue.updateQueuedPeriods(
+            /* rendererPositionUs= */ 0, /* maxRendererReadPositionUs= */ FIRST_AD_START_TIME_US);
+
+    assertThat(changeHandled).isFalse();
+    assertThat(getQueueLength()).isEqualTo(1);
+  }
+
+  @Test
+  public void
+      updateQueuedPeriods_withDurationChangeInReadingPeriodAfterReadingPosition_handlesChangeAndRemovesPeriodsAfterChangedPeriod() {
+    setupTimeline(
+        /* initialPositionUs= */ 0,
+        /* adGroupTimesUs= */ FIRST_AD_START_TIME_US,
+        SECOND_AD_START_TIME_US);
+    setAdGroupLoaded(/* adGroupIndex= */ 0);
+    setAdGroupLoaded(/* adGroupIndex= */ 1);
+    enqueueNext(); // Content before first ad.
+    advancePlaying();
+    enqueueNext(); // First ad.
+    enqueueNext(); // Content between ads.
+    enqueueNext(); // Second ad.
+    advanceReading(); // Reading first ad.
+    advanceReading(); // Reading content between ads.
+
+    // Change position of second ad (= change duration of content between ads).
+    setupTimeline(
+        /* initialPositionUs= */ 0,
+        /* adGroupTimesUs= */ FIRST_AD_START_TIME_US,
+        SECOND_AD_START_TIME_US - 1000);
+    setAdGroupLoaded(/* adGroupIndex= */ 0);
+    setAdGroupLoaded(/* adGroupIndex= */ 1);
+    long readingPositionAtStartOfContentBetweenAds = FIRST_AD_START_TIME_US + AD_DURATION_US;
+    boolean changeHandled =
+        mediaPeriodQueue.updateQueuedPeriods(
+            /* rendererPositionUs= */ 0,
+            /* maxRendererReadPositionUs= */ readingPositionAtStartOfContentBetweenAds);
+
+    assertThat(changeHandled).isTrue();
+    assertThat(getQueueLength()).isEqualTo(3);
+  }
+
+  @Test
+  public void
+      updateQueuedPeriods_withDurationChangeInReadingPeriodBeforeReadingPosition_doesntHandleChangeAndRemovesPeriodsAfterChangedPeriod() {
+    setupTimeline(
+        /* initialPositionUs= */ 0,
+        /* adGroupTimesUs= */ FIRST_AD_START_TIME_US,
+        SECOND_AD_START_TIME_US);
+    setAdGroupLoaded(/* adGroupIndex= */ 0);
+    setAdGroupLoaded(/* adGroupIndex= */ 1);
+    enqueueNext(); // Content before first ad.
+    advancePlaying();
+    enqueueNext(); // First ad.
+    enqueueNext(); // Content between ads.
+    enqueueNext(); // Second ad.
+    advanceReading(); // Reading first ad.
+    advanceReading(); // Reading content between ads.
+
+    // Change position of second ad (= change duration of content between ads).
+    setupTimeline(
+        /* initialPositionUs= */ 0,
+        /* adGroupTimesUs= */ FIRST_AD_START_TIME_US,
+        SECOND_AD_START_TIME_US - 1000);
+    setAdGroupLoaded(/* adGroupIndex= */ 0);
+    setAdGroupLoaded(/* adGroupIndex= */ 1);
+    long readingPositionAtEndOfContentBetweenAds = SECOND_AD_START_TIME_US + AD_DURATION_US;
+    boolean changeHandled =
+        mediaPeriodQueue.updateQueuedPeriods(
+            /* rendererPositionUs= */ 0,
+            /* maxRendererReadPositionUs= */ readingPositionAtEndOfContentBetweenAds);
+
+    assertThat(changeHandled).isFalse();
+    assertThat(getQueueLength()).isEqualTo(3);
+  }
+
+  @Test
+  public void
+      updateQueuedPeriods_withDurationChangeInReadingPeriodReadToEnd_doesntHandleChangeAndRemovesPeriodsAfterChangedPeriod() {
+    setupTimeline(
+        /* initialPositionUs= */ 0,
+        /* adGroupTimesUs= */ FIRST_AD_START_TIME_US,
+        SECOND_AD_START_TIME_US);
+    setAdGroupLoaded(/* adGroupIndex= */ 0);
+    setAdGroupLoaded(/* adGroupIndex= */ 1);
+    enqueueNext(); // Content before first ad.
+    advancePlaying();
+    enqueueNext(); // First ad.
+    enqueueNext(); // Content between ads.
+    enqueueNext(); // Second ad.
+    advanceReading(); // Reading first ad.
+    advanceReading(); // Reading content between ads.
+
+    // Change position of second ad (= change duration of content between ads).
+    setupTimeline(
+        /* initialPositionUs= */ 0,
+        /* adGroupTimesUs= */ FIRST_AD_START_TIME_US,
+        SECOND_AD_START_TIME_US - 1000);
+    setAdGroupLoaded(/* adGroupIndex= */ 0);
+    setAdGroupLoaded(/* adGroupIndex= */ 1);
+    boolean changeHandled =
+        mediaPeriodQueue.updateQueuedPeriods(
+            /* rendererPositionUs= */ 0, /* maxRendererReadPositionUs= */ C.TIME_END_OF_SOURCE);
+
+    assertThat(changeHandled).isFalse();
+    assertThat(getQueueLength()).isEqualTo(3);
+  }
+
+  private void setupTimeline(long initialPositionUs, long... adGroupTimesUs) {
     adPlaybackState =
         new AdPlaybackState(adGroupTimesUs).withContentDurationUs(CONTENT_DURATION_US);
     timeline = new SinglePeriodAdTimeline(CONTENT_TIMELINE, adPlaybackState);
@@ -206,9 +368,21 @@ public final class MediaPeriodQueueTest {
   }
 
   private void advance() {
+    enqueueNext();
+    advancePlaying();
+  }
+
+  private void advancePlaying() {
+    mediaPeriodQueue.advancePlayingPeriod();
+  }
+
+  private void advanceReading() {
+    mediaPeriodQueue.advanceReadingPeriod();
+  }
+
+  private void enqueueNext() {
     mediaPeriodQueue.enqueueNextMediaPeriod(
         rendererCapabilities, trackSelector, allocator, mediaSource, getNextMediaPeriodInfo());
-    mediaPeriodQueue.advancePlayingPeriod();
   }
 
   private MediaPeriodInfo getNextMediaPeriodInfo() {
@@ -216,10 +390,16 @@ public final class MediaPeriodQueueTest {
   }
 
   private void setAdGroupLoaded(int adGroupIndex) {
+    long[][] newDurations = new long[adPlaybackState.adGroupCount][];
+    for (int i = 0; i < adPlaybackState.adGroupCount; i++) {
+      newDurations[i] =
+          i == adGroupIndex ? new long[] {AD_DURATION_US} : adPlaybackState.adGroups[i].durationsUs;
+    }
     adPlaybackState =
         adPlaybackState
             .withAdCount(adGroupIndex, /* adCount= */ 1)
-            .withAdUri(adGroupIndex, /* adIndexInAdGroup= */ 0, AD_URI);
+            .withAdUri(adGroupIndex, /* adIndexInAdGroup= */ 0, AD_URI)
+            .withAdDurationsUs(newDurations);
     updateTimeline();
   }
 
@@ -266,8 +446,18 @@ public final class MediaPeriodQueueTest {
                 /* startPositionUs= */ 0,
                 contentPositionUs,
                 /* endPositionUs= */ C.TIME_UNSET,
-                /* durationUs= */ C.TIME_UNSET,
+                /* durationUs= */ AD_DURATION_US,
                 /* isLastInTimelinePeriod= */ false,
                 /* isFinal= */ false));
   }
+
+  private int getQueueLength() {
+    int length = 0;
+    MediaPeriodHolder periodHolder = mediaPeriodQueue.getFrontPeriod();
+    while (periodHolder != null) {
+      length++;
+      periodHolder = periodHolder.getNext();
+    }
+    return length;
+  }
 }

From 52ff1820dfbb1933794c1f46c95c9bf1fdd8c7f5 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 29 Jan 2019 16:19:39 +0000
Subject: [PATCH 449/832] Fix buffered position when loading has not completed

If there is data after the last samples in the container, we may request
continue loading after the last samples have been read but before the load has
completed. In this situation the buffered position is returned as
Long.MAX_VALUE, which prevents continuing loading, yet the media period is not
treated as fully buffered because its buffered position is not
C.TIME_END_OF_SOURCE.

PiperOrigin-RevId: 231406964
---
 .../android/exoplayer2/source/ProgressiveMediaPeriod.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
index 41f6e986c6..ab14554a21 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
@@ -358,10 +358,9 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     } else if (isPendingReset()) {
       return pendingResetPositionUs;
     }
-    long largestQueuedTimestampUs = C.TIME_UNSET;
+    long largestQueuedTimestampUs = Long.MAX_VALUE;
     if (haveAudioVideoTracks) {
       // Ignore non-AV tracks, which may be sparse or poorly interleaved.
-      largestQueuedTimestampUs = Long.MAX_VALUE;
       int trackCount = sampleQueues.length;
       for (int i = 0; i < trackCount; i++) {
         if (trackIsAudioVideoFlags[i] && !sampleQueues[i].isLastSampleQueued()) {
@@ -370,7 +369,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
         }
       }
     }
-    if (largestQueuedTimestampUs == C.TIME_UNSET) {
+    if (largestQueuedTimestampUs == Long.MAX_VALUE) {
       largestQueuedTimestampUs = getLargestQueuedTimestampUs();
     }
     return largestQueuedTimestampUs == Long.MIN_VALUE ? lastSeekPositionUs

From 0dd305461d12da68667afe2155f19b143ad25ce5 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 29 Jan 2019 18:16:25 +0000
Subject: [PATCH 450/832] Clarity improvement: Use named variables

PiperOrigin-RevId: 231425073
---
 .../exoplayer2/upstream/cache/SimpleCacheSpan.java   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
index dfa553ffe4..c35e3974f6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
@@ -111,12 +111,16 @@ import java.util.regex.Pattern;
     if (!matcher.matches()) {
       return null;
     }
+
     int id = Integer.parseInt(matcher.group(1));
     String key = index.getKeyForId(id);
-    return key == null
-        ? null
-        : new SimpleCacheSpan(
-            key, Long.parseLong(matcher.group(2)), length, Long.parseLong(matcher.group(3)), file);
+    if (key == null) {
+      return null;
+    }
+
+    long position = Long.parseLong(matcher.group(2));
+    long lastAccessTime = Long.parseLong(matcher.group(3));
+    return new SimpleCacheSpan(key, position, length, lastAccessTime, file);
   }
 
   /**

From dc7bc4785ebce95a80db53d143d75d74fdcd8e8f Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 30 Jan 2019 11:42:53 +0000
Subject: [PATCH 451/832] Update ProgressiveMediaSource note

PiperOrigin-RevId: 231567138
---
 .../android/exoplayer2/source/ProgressiveMediaSource.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
index a44e99b9c4..dac340cede 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
@@ -39,7 +39,7 @@ import java.io.IOException;
  * extractors created by the factory that returns {@code true} from {@link Extractor#sniff} will be
  * used to extract samples from the input stream.
  *
- * <p>Note that the built-in extractors for AAC, MPEG PS/TS and FLV streams do not support seeking.
+ * <p>Note that the built-in extractor for FLV streams does not support seeking.
  */
 public final class ProgressiveMediaSource extends BaseMediaSource
     implements ProgressiveMediaPeriod.Listener {

From 55b5814842091af13d5ddc0d540f431c9d31142d Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Wed, 30 Jan 2019 13:48:30 +0000
Subject: [PATCH 452/832] Remove unused vpxInit methods

PiperOrigin-RevId: 231578828
---
 .../google/android/exoplayer2/ext/vp9/VpxDecoder.java |  4 ++--
 .../android/exoplayer2/ext/vp9/VpxOutputBuffer.java   |  1 -
 extensions/vp9/src/main/jni/vpx_jni.cc                | 11 +----------
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java
index f1de63df01..b157981487 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java
@@ -68,7 +68,7 @@ import java.nio.ByteBuffer;
     if (exoMediaCrypto != null && !VpxLibrary.vpxIsSecureDecodeSupported()) {
       throw new VpxDecoderException("Vpx decoder does not support secure decode.");
     }
-    vpxDecContext = vpxInit(disableLoopFilter, true);
+    vpxDecContext = vpxInit(disableLoopFilter);
     if (vpxDecContext == 0) {
       throw new VpxDecoderException("Failed to initialize decoder");
     }
@@ -165,7 +165,7 @@ import java.nio.ByteBuffer;
     }
   }
 
-  private native long vpxInit(boolean disableLoopFilter, boolean enableSurfaceYuvOutputMode);
+  private native long vpxInit(boolean disableLoopFilter);
 
   private native long vpxClose(long context);
   private native long vpxDecode(long context, ByteBuffer encoded, int length);
diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java
index 22330e0a05..f5cdb6e11a 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java
@@ -67,7 +67,6 @@ public final class VpxOutputBuffer extends OutputBuffer {
     this.timeUs = timeUs;
     this.mode = mode;
   }
-
   /**
    * Resizes the buffer based on the given stride. Called via JNI after decoding completes.
    *
diff --git a/extensions/vp9/src/main/jni/vpx_jni.cc b/extensions/vp9/src/main/jni/vpx_jni.cc
index 275687261e..c37545190c 100644
--- a/extensions/vp9/src/main/jni/vpx_jni.cc
+++ b/extensions/vp9/src/main/jni/vpx_jni.cc
@@ -433,7 +433,7 @@ int vpx_release_frame_buffer(void* priv, vpx_codec_frame_buffer_t* fb) {
   return buffer_manager->release(*(int*)fb->priv);
 }
 
-jlong vpxInit(JNIEnv* env, jboolean disableLoopFilter) {
+DECODER_FUNC(jlong, vpxInit, jboolean disableLoopFilter) {
   JniCtx* context = new JniCtx();
   context->decoder = new vpx_codec_ctx_t();
   vpx_codec_dec_cfg_t cfg = {0, 0, 0};
@@ -482,15 +482,6 @@ jlong vpxInit(JNIEnv* env, jboolean disableLoopFilter) {
   return reinterpret_cast<intptr_t>(context);
 }
 
-DECODER_FUNC(jlong, vpxInit, jboolean disableLoopFilter,
-             jboolean enableBufferManager) {
-  return vpxInit(env, disableLoopFilter);
-}
-
-DECODER_FUNC(jlong, vpxInitilization, jboolean disableLoopFilter) {
-  return vpxInit(env, disableLoopFilter);
-}
-
 DECODER_FUNC(jlong, vpxDecode, jlong jContext, jobject encoded, jint len) {
   JniCtx* const context = reinterpret_cast<JniCtx*>(jContext);
   const uint8_t* const buffer =

From c9b848e5006ebcdadc218b4e3ec7d481db3ee839 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 30 Jan 2019 14:51:56 +0000
Subject: [PATCH 453/832] Synchronously change to next state from downloading
 state

PiperOrigin-RevId: 231586206
---
 .../exoplayer2/offline/DownloadManager.java   | 95 +++++++++++--------
 .../exoplayer2/offline/DownloadState.java     |  4 +-
 .../dash/offline/DownloadManagerDashTest.java |  2 +
 3 files changed, 59 insertions(+), 42 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index f1c90e67c1..d4ea9fc3ff 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -310,9 +310,10 @@ public final class DownloadManager {
   /** Returns whether there are no active downloads. */
   public boolean isIdle() {
     Assertions.checkState(!released);
-    if (!initialized) {
+    if (!initialized || !activeDownloads.isEmpty()) {
       return false;
     }
+    // Still need to check all downloads as there might be remove tasks going on.
     for (int i = 0; i < downloads.size(); i++) {
       if (!downloads.get(i).isIdle()) {
         return false;
@@ -365,6 +366,14 @@ public final class DownloadManager {
     }
   }
 
+  private void maybeRestartDownload(Download download) {
+    if (activeDownloads.contains(download)) {
+      download.start();
+    } else {
+      maybeStartDownload(download);
+    }
+  }
+
   private void maybeNotifyListenersIdle() {
     if (!isIdle()) {
       return;
@@ -540,7 +549,7 @@ public final class DownloadManager {
       this.startTimeMs = System.currentTimeMillis();
       actionQueue = new ArrayDeque<>();
       actionQueue.add(action);
-      initialize(/* restart= */ false);
+      initialize();
     }
 
     public boolean addAction(DownloadAction newAction) {
@@ -562,12 +571,12 @@ public final class DownloadManager {
           setState(STATE_REMOVING);
         }
       } else if (!action.equals(updatedAction)) {
+        Assertions.checkState(
+            state == STATE_DOWNLOADING || state == STATE_QUEUED || state == STATE_STOPPED);
         if (state == STATE_DOWNLOADING) {
           stopDownloadThread();
-        } else {
-          Assertions.checkState(state == STATE_QUEUED || state == STATE_STOPPED);
-          initialize(/* restart= */ false);
         }
+        initialize();
       }
       return true;
     }
@@ -633,13 +642,14 @@ public final class DownloadManager {
     public void updateStopFlags(int flags, int values) {
       stopFlags = (values & flags) | (stopFlags & ~flags);
       if (stopFlags != 0) {
-        if (state == STATE_DOWNLOADING) {
-          stopDownloadThread();
-        } else if (state == STATE_QUEUED) {
+        if (state == STATE_DOWNLOADING || state == STATE_QUEUED) {
+          if (state == STATE_DOWNLOADING) {
+            stopDownloadThread();
+          }
           setState(STATE_STOPPED);
         }
       } else if (state == STATE_STOPPED) {
-        startOrQueue(/* restart= */ false);
+        startOrQueue();
       }
     }
 
@@ -650,7 +660,7 @@ public final class DownloadManager {
           notMetRequirements != 0 ? STOP_FLAG_REQUIREMENTS_NOT_MET : 0);
     }
 
-    private void initialize(boolean restart) {
+    private void initialize() {
       DownloadAction action = actionQueue.peek();
       if (action.isRemoveAction) {
         if (!downloadManager.released) {
@@ -660,18 +670,14 @@ public final class DownloadManager {
       } else if (stopFlags != 0) {
         setState(STATE_STOPPED);
       } else {
-        startOrQueue(restart);
+        startOrQueue();
       }
     }
 
-    private void startOrQueue(boolean restart) {
+    private void startOrQueue() {
       // Set to queued state but don't notify listeners until we make sure we can't start now.
       state = STATE_QUEUED;
-      if (restart) {
-        start();
-      } else {
-        downloadManager.maybeStartDownload(this);
-      }
+      downloadManager.maybeRestartDownload(this);
       if (state == STATE_QUEUED) {
         downloadManager.onDownloadStateChange(this);
       }
@@ -683,6 +689,9 @@ public final class DownloadManager {
     }
 
     private void startDownloadThread(DownloadAction action) {
+      if (downloadThread != null) {
+        return;
+      }
       downloader = downloaderFactory.createDownloader(action);
       downloadThread =
           new DownloadThread(
@@ -690,29 +699,37 @@ public final class DownloadManager {
     }
 
     private void stopDownloadThread() {
-      Assertions.checkNotNull(downloadThread).cancel();
+      if (!downloadThread.isRemoveThread) {
+        Assertions.checkNotNull(downloadThread).cancel();
+      }
     }
 
-    private void onDownloadThreadStopped(@Nullable Throwable finalError) {
+    private void onDownloadThreadStopped(@Nullable Throwable error) {
       failureReason = FAILURE_REASON_NONE;
-      if (!downloadThread.isCanceled) {
-        if (finalError != null && state != STATE_REMOVING && state != STATE_RESTARTING) {
-          failureReason = FAILURE_REASON_UNKNOWN;
-          setState(STATE_FAILED);
-          return;
+      boolean isCanceled = downloadThread.isCanceled;
+      downloadThread = null;
+      if (isCanceled) {
+        if (!isIdle()) {
+          startDownloadThread(actionQueue.peek());
         }
-        if (actionQueue.size() == 1) {
-          if (state == STATE_REMOVING) {
-            setState(STATE_REMOVED);
-          } else {
-            Assertions.checkState(state == STATE_DOWNLOADING);
-            setState(STATE_COMPLETED);
-          }
-          return;
-        }
-        actionQueue.remove();
+        return;
       }
-      initialize(/* restart= */ state == STATE_DOWNLOADING);
+      if (error != null && state == STATE_DOWNLOADING) {
+        failureReason = FAILURE_REASON_UNKNOWN;
+        setState(STATE_FAILED);
+        return;
+      }
+      if (actionQueue.size() == 1) {
+        if (state == STATE_REMOVING) {
+          setState(STATE_REMOVED);
+        } else {
+          Assertions.checkState(state == STATE_DOWNLOADING);
+          setState(STATE_COMPLETED);
+        }
+        return;
+      }
+      actionQueue.remove();
+      initialize();
     }
   }
 
@@ -720,7 +737,7 @@ public final class DownloadManager {
 
     private final Download download;
     private final Downloader downloader;
-    private final boolean remove;
+    private final boolean isRemoveThread;
     private final int minRetryCount;
     private final Handler callbackHandler;
     private final Thread thread;
@@ -729,12 +746,12 @@ public final class DownloadManager {
     private DownloadThread(
         Download download,
         Downloader downloader,
-        boolean remove,
+        boolean isRemoveThread,
         int minRetryCount,
         Handler callbackHandler) {
       this.download = download;
       this.downloader = downloader;
-      this.remove = remove;
+      this.isRemoveThread = isRemoveThread;
       this.minRetryCount = minRetryCount;
       this.callbackHandler = callbackHandler;
       thread = new Thread(this);
@@ -754,7 +771,7 @@ public final class DownloadManager {
       logd("Download is started", download);
       Throwable error = null;
       try {
-        if (remove) {
+        if (isRemoveThread) {
           downloader.remove();
         } else {
           int errorCount = 0;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
index dd55d6ea31..f5b3287b32 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
@@ -182,13 +182,11 @@ public final class DownloadState {
       byte[] customMetadata) {
     Assertions.checkState(
         failureReason == FAILURE_REASON_NONE ? state != STATE_FAILED : state == STATE_FAILED);
+    Assertions.checkState(stopFlags == 0 || (state != STATE_DOWNLOADING && state != STATE_QUEUED));
     Assertions.checkState(
         (stopFlags & STOP_FLAG_REQUIREMENTS_NOT_MET) == 0
             ? notMetRequirements == 0
             : notMetRequirements != 0);
-    // TODO enable this when we start changing state immediately
-    // Assertions.checkState(stopFlags == 0 || (state != STATE_DOWNLOADING && state !=
-    // STATE_QUEUED));
     this.id = id;
     this.type = type;
     this.uri = uri;
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
index 28040ec538..8d36ea68a4 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
@@ -53,6 +53,7 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowLog;
 
 /** Tests {@link DownloadManager}. */
 @RunWith(RobolectricTestRunner.class)
@@ -73,6 +74,7 @@ public class DownloadManagerDashTest {
 
   @Before
   public void setUp() throws Exception {
+    ShadowLog.stream = System.out;
     dummyMainThread = new DummyMainThread();
     Context context = RuntimeEnvironment.application;
     tempFolder = Util.createTempDirectory(context, "ExoPlayerTest");

From ab67ab1aeab47fe3d68ebe354a8f9f6cf6a381e1 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 30 Jan 2019 16:34:23 +0000
Subject: [PATCH 454/832] Implement database CachedContentIndex.Storage

PiperOrigin-RevId: 231600104
---
 .../upstream/cache/CachedContentIndex.java    | 249 +++++++++++++++++-
 .../upstream/cache/SimpleCache.java           |   4 +-
 .../cache/CachedContentIndexTest.java         |   8 +-
 3 files changed, 250 insertions(+), 11 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
index e11b5b922c..e31c60e752 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
@@ -15,16 +15,25 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteException;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import android.util.SparseArray;
 import android.util.SparseBooleanArray;
+import com.google.android.exoplayer2.database.DatabaseProvider;
+import com.google.android.exoplayer2.database.ExoDatabaseProvider;
+import com.google.android.exoplayer2.database.VersionTable;
 import com.google.android.exoplayer2.upstream.cache.Cache.CacheException;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.AtomicFile;
 import com.google.android.exoplayer2.util.ReusableBufferedOutputStream;
 import com.google.android.exoplayer2.util.Util;
 import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.File;
@@ -51,7 +60,8 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 /** Maintains the index of cached content. */
 /* package */ class CachedContentIndex {
 
-  public static final String FILE_NAME = "cached_content_index.exi";
+  /* package */ static final String FILE_NAME_ATOMIC = "cached_content_index.exi";
+  private static final String FILE_NAME_DATABASE = "cached_content_index.db";
 
   private static final int VERSION = 2;
   private static final int VERSION_METADATA_INTRODUCED = 2;
@@ -86,6 +96,15 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 
   private final Storage storage;
 
+  /**
+   * Returns whether the file is an index file, or an auxiliary file associated with an index file
+   * (e.g. an atomic file backup or auxiliary database file).
+   */
+  public static final boolean isIndexFile(String fileName) {
+    // Atomic file backups and auxiliary database files add additional suffixes to the file name.
+    return fileName.startsWith(FILE_NAME_ATOMIC) || fileName.startsWith(FILE_NAME_DATABASE);
+  }
+
   /**
    * Creates a CachedContentIndex which works on the index file in the given cacheDir.
    *
@@ -130,7 +149,17 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     keyToContent = new HashMap<>();
     idToKey = new SparseArray<>();
     removedIds = new SparseBooleanArray();
-    storage = new AtomicFileStorage(new File(cacheDir, FILE_NAME), encrypt, cipher, secretKeySpec);
+    Random random = new Random();
+    storage =
+        new AtomicFileStorage(
+            new File(cacheDir, FILE_NAME_ATOMIC), random, encrypt, cipher, secretKeySpec);
+    // storage =
+    //     new SQLiteStorage(
+    //         new File(cacheDir, FILE_NAME_DATABASE),
+    //         random,
+    //         encrypt,
+    //         cipher,
+    //         secretKeySpec);
   }
 
   /** Loads the index file. */
@@ -369,25 +398,26 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   /** {@link Storage} implementation that uses an {@link AtomicFile}. */
   private static class AtomicFileStorage implements Storage {
 
+    private final Random random;
     private final boolean encrypt;
     @Nullable private final Cipher cipher;
     @Nullable private final SecretKeySpec secretKeySpec;
     private final AtomicFile atomicFile;
-    private final Random random;
 
     private boolean changed;
     @Nullable private ReusableBufferedOutputStream bufferedOutputStream;
 
     public AtomicFileStorage(
-        File fileName,
+        File file,
+        Random random,
         boolean encrypt,
         @Nullable Cipher cipher,
         @Nullable SecretKeySpec secretKeySpec) {
+      this.random = random;
       this.encrypt = encrypt;
       this.cipher = cipher;
       this.secretKeySpec = secretKeySpec;
-      atomicFile = new AtomicFile(fileName);
-      random = new Random();
+      atomicFile = new AtomicFile(file);
     }
 
     @Override
@@ -570,4 +600,211 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
       writeContentMetadata(cachedContent.getMetadata(), output);
     }
   }
+
+  /** {@link Storage} implementation that uses an SQL database. */
+  // TODO:
+  // 1. Implement upgrade/downgrade paths from/to AtomicFileStorage.
+  // 2. If encryption is enabled having previously written data, decide whether we need to rewrite
+  //    the entire table. Currently this implementation only encrypts new and updated entries.
+  private static final class SQLiteStorage implements Storage {
+
+    private static final String TABLE_NAME = DatabaseProvider.TABLE_PREFIX + "Cache";
+    private static final int TABLE_VERSION = 1;
+
+    private static final String COLUMN_ID = "id";
+    private static final String COLUMN_FLAGS = "flags";
+    private static final String COLUMN_DATA = "data";
+
+    private static final int COLUMN_INDEX_ID = 0;
+    private static final int COLUMN_INDEX_FLAGS = 1;
+    private static final int COLUMN_INDEX_DATA = 2;
+
+    private static final String COLUMN_SELECTION_ID = COLUMN_ID + " = ?";
+
+    private static final String[] COLUMNS = new String[] {COLUMN_ID, COLUMN_FLAGS, COLUMN_DATA};
+
+    private static final String SQL_DROP_TABLE_IF_EXISTS = "DROP TABLE IF EXISTS " + TABLE_NAME;
+    private static final String SQL_CREATE_TABLE =
+        "CREATE TABLE "
+            + TABLE_NAME
+            + " ("
+            + COLUMN_ID
+            + " INTEGER PRIMARY KEY NOT NULL,"
+            + COLUMN_FLAGS
+            + " INTEGER NOT NULL,"
+            + COLUMN_DATA
+            + " BLOB NOT NULL)";
+
+    private static final int FLAG_ENCRYPTED = 1;
+
+    private final Random random;
+    private final boolean encrypt;
+    @Nullable private final Cipher cipher;
+    @Nullable private final SecretKeySpec secretKeySpec;
+    private final DatabaseProvider databaseProvider;
+    private final SparseArray<CachedContent> pendingUpdates;
+
+    @Nullable private ReusableBufferedOutputStream bufferedOutputStream;
+
+    public SQLiteStorage(
+        File file,
+        Random random,
+        boolean encrypt,
+        @Nullable Cipher cipher,
+        @Nullable SecretKeySpec secretKeySpec) {
+      this.random = random;
+      this.encrypt = encrypt;
+      this.cipher = cipher;
+      this.secretKeySpec = secretKeySpec;
+      databaseProvider = new ExoDatabaseProvider(file);
+      pendingUpdates = new SparseArray<>();
+    }
+
+    @Override
+    public boolean load(
+        HashMap<String, CachedContent> content, SparseArray<@NullableType String> idToKey) {
+      try {
+        int version =
+            VersionTable.getVersion(
+                databaseProvider.getReadableDatabase(), VersionTable.FEATURE_CACHE);
+        if (version == VersionTable.VERSION_UNSET || version > TABLE_VERSION) {
+          SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+          writableDatabase.beginTransaction();
+          try {
+            writableDatabase.execSQL(SQL_DROP_TABLE_IF_EXISTS);
+            writableDatabase.execSQL(SQL_CREATE_TABLE);
+            VersionTable.setVersion(writableDatabase, VersionTable.FEATURE_CACHE, TABLE_VERSION);
+            writableDatabase.setTransactionSuccessful();
+          } finally {
+            writableDatabase.endTransaction();
+          }
+        } else if (version < TABLE_VERSION) {
+          // There is no previous version currently.
+          throw new IllegalStateException();
+        }
+
+        try (Cursor cursor = getCursor()) {
+          while (cursor.moveToNext()) {
+            int id = cursor.getInt(COLUMN_INDEX_ID);
+            boolean encrypted = (cursor.getInt(COLUMN_INDEX_FLAGS) & FLAG_ENCRYPTED) != 0;
+            byte[] data = cursor.getBlob(COLUMN_INDEX_DATA);
+
+            ByteArrayInputStream inputStream = new ByteArrayInputStream(data);
+            DataInputStream input = new DataInputStream(inputStream);
+            if (encrypted) {
+              byte[] initializationVector = new byte[16];
+              input.readFully(initializationVector);
+              IvParameterSpec ivParameterSpec = new IvParameterSpec(initializationVector);
+              try {
+                cipher.init(Cipher.DECRYPT_MODE, secretKeySpec, ivParameterSpec);
+              } catch (InvalidKeyException | InvalidAlgorithmParameterException e) {
+                throw new IllegalStateException(e);
+              }
+              input = new DataInputStream(new CipherInputStream(inputStream, cipher));
+            }
+            String key = input.readUTF();
+            DefaultContentMetadata metadata = readContentMetadata(input);
+
+            CachedContent cachedContent = new CachedContent(id, key, metadata);
+            content.put(cachedContent.key, cachedContent);
+            idToKey.put(cachedContent.id, cachedContent.key);
+          }
+        }
+        return true;
+      } catch (IOException | SQLiteException e) {
+        return false;
+      }
+    }
+
+    @Override
+    public void store(HashMap<String, CachedContent> content) throws CacheException {
+      if (pendingUpdates.size() == 0) {
+        return;
+      }
+      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+      writableDatabase.beginTransaction();
+      try {
+        for (int i = 0; i < pendingUpdates.size(); i++) {
+          CachedContent cachedContent = pendingUpdates.valueAt(i);
+          if (cachedContent == null) {
+            deleteRow(writableDatabase, pendingUpdates.keyAt(i));
+          } else {
+            addOrUpdateRow(writableDatabase, cachedContent);
+          }
+        }
+        writableDatabase.setTransactionSuccessful();
+        pendingUpdates.clear();
+      } catch (IOException | SQLiteException e) {
+        throw new CacheException(e);
+      } finally {
+        writableDatabase.endTransaction();
+      }
+    }
+
+    @Override
+    public void onUpdate(CachedContent cachedContent) {
+      pendingUpdates.put(cachedContent.id, cachedContent);
+    }
+
+    @Override
+    public void onRemove(CachedContent cachedContent) {
+      pendingUpdates.put(cachedContent.id, null);
+    }
+
+    private Cursor getCursor() {
+      return databaseProvider
+          .getReadableDatabase()
+          .query(
+              TABLE_NAME,
+              COLUMNS,
+              /* selection= */ null,
+              /* selectionArgs= */ null,
+              /* groupBy= */ null,
+              /* having= */ null,
+              /* orderBy= */ null);
+    }
+
+    private void deleteRow(SQLiteDatabase writableDatabase, int key) {
+      String[] selectionArgs = {Integer.toString(key)};
+      writableDatabase.delete(TABLE_NAME, COLUMN_SELECTION_ID, selectionArgs);
+    }
+
+    private void addOrUpdateRow(SQLiteDatabase writableDatabase, CachedContent cachedContent)
+        throws IOException {
+      ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+      if (bufferedOutputStream == null) {
+        bufferedOutputStream = new ReusableBufferedOutputStream(outputStream);
+      } else {
+        bufferedOutputStream.reset(outputStream);
+      }
+      DataOutputStream output = new DataOutputStream(bufferedOutputStream);
+      try {
+        if (encrypt) {
+          byte[] initializationVector = new byte[16];
+          random.nextBytes(initializationVector);
+          output.write(initializationVector);
+          IvParameterSpec ivParameterSpec = new IvParameterSpec(initializationVector);
+          try {
+            cipher.init(Cipher.ENCRYPT_MODE, secretKeySpec, ivParameterSpec);
+          } catch (InvalidKeyException | InvalidAlgorithmParameterException e) {
+            throw new IllegalStateException(e); // Should never happen.
+          }
+          output.flush();
+          output = new DataOutputStream(new CipherOutputStream(bufferedOutputStream, cipher));
+        }
+        output.writeUTF(cachedContent.key);
+        writeContentMetadata(cachedContent.getMetadata(), output);
+      } finally {
+        // Necessary to finalize the cipher.
+        Util.closeQuietly(output);
+      }
+      byte[] data = outputStream.toByteArray();
+
+      ContentValues values = new ContentValues();
+      values.put(COLUMN_ID, cachedContent.id);
+      values.put(COLUMN_FLAGS, encrypt ? FLAG_ENCRYPTED : 0);
+      values.put(COLUMN_DATA, data);
+      writableDatabase.replace(TABLE_NAME, /* nullColumnHack= */ null, values);
+    }
+  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index 7f9bdde5c1..75236ad9c7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -408,8 +408,8 @@ public final class SimpleCache implements Cache {
       if (isRootDirectory && fileName.indexOf('.') == -1) {
         loadDirectory(file, /* isRootDirectory= */ false);
       } else {
-        if (isRootDirectory && CachedContentIndex.FILE_NAME.equals(fileName)) {
-          // Skip the (expected) index file in the root directory.
+        if (isRootDirectory && CachedContentIndex.isIndexFile(fileName)) {
+          // Skip the (expected) index files in the root directory.
           continue;
         }
         long fileLength = file.length();
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
index e7bdb0743e..d86e76d147 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
@@ -151,7 +151,8 @@ public class CachedContentIndexTest {
 
   @Test
   public void testLoadV1() throws Exception {
-    FileOutputStream fos = new FileOutputStream(new File(cacheDir, CachedContentIndex.FILE_NAME));
+    FileOutputStream fos =
+        new FileOutputStream(new File(cacheDir, CachedContentIndex.FILE_NAME_ATOMIC));
     fos.write(testIndexV1File);
     fos.close();
 
@@ -169,7 +170,8 @@ public class CachedContentIndexTest {
 
   @Test
   public void testLoadV2() throws Exception {
-    FileOutputStream fos = new FileOutputStream(new File(cacheDir, CachedContentIndex.FILE_NAME));
+    FileOutputStream fos =
+        new FileOutputStream(new File(cacheDir, CachedContentIndex.FILE_NAME_ATOMIC));
     fos.write(testIndexV2File);
     fos.close();
 
@@ -220,7 +222,7 @@ public class CachedContentIndexTest {
         new CachedContentIndex(cacheDir, key), new CachedContentIndex(cacheDir, key));
 
     // Rename the index file from the test above
-    File file1 = new File(cacheDir, CachedContentIndex.FILE_NAME);
+    File file1 = new File(cacheDir, CachedContentIndex.FILE_NAME_ATOMIC);
     File file2 = new File(cacheDir, "file2compare");
     assertThat(file1.renameTo(file2)).isTrue();
 

From 2bd12c2270c6d5e335e01cd25f0391fecdc3228e Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 30 Jan 2019 17:32:03 +0000
Subject: [PATCH 455/832] Move DefaultTrackSelector.Parameters out of
 DefaultTrackSelector

Including ParametersBuilder and TrackSelectionOverride.

PiperOrigin-RevId: 231609249
---
 .../trackselection/DefaultTrackSelector.java  | 169 ++++--------
 .../TrackSelectionParameters.java             | 240 ++++++++++++++++++
 2 files changed, 287 insertions(+), 122 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
index 28242167ad..afb2175972 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -159,10 +159,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
    * A builder for {@link Parameters}. See the {@link Parameters} documentation for explanations of
    * the parameters that can be configured using this builder.
    */
-  public static final class ParametersBuilder {
-
-    private final SparseArray<Map<TrackGroupArray, SelectionOverride>> selectionOverrides;
-    private final SparseBooleanArray rendererDisabledFlags;
+  public static final class ParametersBuilder extends TrackSelectionParameters.Builder {
 
     // Video
     private int maxVideoWidth;
@@ -176,22 +173,20 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     private int viewportHeight;
     private boolean viewportOrientationMayChange;
     // Audio
-    @Nullable private String preferredAudioLanguage;
     private int maxAudioChannelCount;
     private int maxAudioBitrate;
     private boolean exceedAudioConstraintsIfNecessary;
     private boolean allowAudioMixedMimeTypeAdaptiveness;
     private boolean allowAudioMixedSampleRateAdaptiveness;
-    // Text
-    @Nullable private String preferredTextLanguage;
-    private boolean selectUndeterminedTextLanguage;
-    private int disabledTextTrackSelectionFlags;
     // General
     private boolean forceLowestBitrate;
     private boolean forceHighestSupportedBitrate;
     private boolean exceedRendererCapabilitiesIfNecessary;
     private int tunnelingAudioSessionId;
 
+    private final SparseArray<Map<TrackGroupArray, SelectionOverride>> selectionOverrides;
+    private final SparseBooleanArray rendererDisabledFlags;
+
     /** Creates a builder with default initial values. */
     public ParametersBuilder() {
       this(Parameters.DEFAULT);
@@ -202,6 +197,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
      *     obtained.
      */
     private ParametersBuilder(Parameters initialValues) {
+      super(initialValues);
       // Video
       maxVideoWidth = initialValues.maxVideoWidth;
       maxVideoHeight = initialValues.maxVideoHeight;
@@ -214,16 +210,11 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       viewportHeight = initialValues.viewportHeight;
       viewportOrientationMayChange = initialValues.viewportOrientationMayChange;
       // Audio
-      preferredAudioLanguage = initialValues.preferredAudioLanguage;
       maxAudioChannelCount = initialValues.maxAudioChannelCount;
       maxAudioBitrate = initialValues.maxAudioBitrate;
       exceedAudioConstraintsIfNecessary = initialValues.exceedAudioConstraintsIfNecessary;
       allowAudioMixedMimeTypeAdaptiveness = initialValues.allowAudioMixedMimeTypeAdaptiveness;
       allowAudioMixedSampleRateAdaptiveness = initialValues.allowAudioMixedSampleRateAdaptiveness;
-      // Text
-      preferredTextLanguage = initialValues.preferredTextLanguage;
-      selectUndeterminedTextLanguage = initialValues.selectUndeterminedTextLanguage;
-      disabledTextTrackSelectionFlags = initialValues.disabledTextTrackSelectionFlags;
       // General
       forceLowestBitrate = initialValues.forceLowestBitrate;
       forceHighestSupportedBitrate = initialValues.forceHighestSupportedBitrate;
@@ -362,15 +353,9 @@ public class DefaultTrackSelector extends MappingTrackSelector {
 
     // Audio
 
-    /**
-     * See {@link Parameters#preferredAudioLanguage}.
-     *
-     * @param preferredAudioLanguage Preferred audio language as an ISO 639-1 two-letter or ISO
-     *     639-2 three-letter code.
-     * @return This builder.
-     */
+    @Override
     public ParametersBuilder setPreferredAudioLanguage(String preferredAudioLanguage) {
-      this.preferredAudioLanguage = preferredAudioLanguage;
+      super.setPreferredAudioLanguage(preferredAudioLanguage);
       return this;
     }
 
@@ -429,40 +414,25 @@ public class DefaultTrackSelector extends MappingTrackSelector {
 
     // Text
 
-    /**
-     * See {@link Parameters#preferredTextLanguage}.
-     *
-     * @param preferredTextLanguage Preferred text language as an ISO 639-1 two-letter or ISO 639-2
-     *     three-letter code.
-     * @return This builder.
-     */
+    @Override
     public ParametersBuilder setPreferredTextLanguage(String preferredTextLanguage) {
-      this.preferredTextLanguage = preferredTextLanguage;
+      super.setPreferredTextLanguage(preferredTextLanguage);
       return this;
     }
 
-    /**
-     * See {@link Parameters#selectUndeterminedTextLanguage}.
-     *
-     * @return This builder.
-     */
+    @Override
     public ParametersBuilder setSelectUndeterminedTextLanguage(
         boolean selectUndeterminedTextLanguage) {
-      this.selectUndeterminedTextLanguage = selectUndeterminedTextLanguage;
+      super.setSelectUndeterminedTextLanguage(selectUndeterminedTextLanguage);
       return this;
     }
 
-    /**
-     * See {@link Parameters#disabledTextTrackSelectionFlags}.
-     *
-     * @return This builder.
-     */
+    @Override
     public ParametersBuilder setDisabledTextTrackSelectionFlags(
-        int disabledTextTrackSelectionFlags) {
-      this.disabledTextTrackSelectionFlags = disabledTextTrackSelectionFlags;
+        @C.SelectionFlags int disabledTextTrackSelectionFlags) {
+      super.setDisabledTextTrackSelectionFlags(disabledTextTrackSelectionFlags);
       return this;
     }
-
     // General
 
     /**
@@ -526,10 +496,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
      *     C#AUDIO_SESSION_ID_UNSET} to disable tunneling.
      */
     public ParametersBuilder setTunnelingAudioSessionId(int tunnelingAudioSessionId) {
-      if (this.tunnelingAudioSessionId != tunnelingAudioSessionId) {
-        this.tunnelingAudioSessionId = tunnelingAudioSessionId;
-        return this;
-      }
+      this.tunnelingAudioSessionId = tunnelingAudioSessionId;
       return this;
     }
 
@@ -670,7 +637,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           forceHighestSupportedBitrate,
           exceedRendererCapabilitiesIfNecessary,
           tunnelingAudioSessionId,
-          // Overrides
           selectionOverrides,
           rendererDisabledFlags);
     }
@@ -685,16 +651,15 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     }
   }
 
-  /** Constraint parameters for {@link DefaultTrackSelector}. */
-  public static final class Parameters implements Parcelable {
+  /**
+   * Extends {@link TrackSelectionParameters} by adding fields that are specific to {@link
+   * DefaultTrackSelector}.
+   */
+  public static final class Parameters extends TrackSelectionParameters {
 
     /** An instance with default values. */
     public static final Parameters DEFAULT = new Parameters();
 
-    // Overrides
-    private final SparseArray<Map<TrackGroupArray, SelectionOverride>> selectionOverrides;
-    private final SparseBooleanArray rendererDisabledFlags;
-
     // Video
     /**
      * Maximum allowed video width. The default value is {@link Integer#MAX_VALUE} (i.e. no
@@ -759,14 +724,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
      * The default value is {@code true}.
      */
     public final boolean viewportOrientationMayChange;
-
     // Audio
-    /**
-     * The preferred language for audio and forced text tracks, as an ISO 639-2/T tag. {@code null}
-     * selects the default track, or the first track if there's no default. The default value is
-     * {@code null}.
-     */
-    @Nullable public final String preferredAudioLanguage;
     /**
      * Maximum allowed audio channel count. The default value is {@link Integer#MAX_VALUE} (i.e. no
      * constraint).
@@ -792,24 +750,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
      */
     public final boolean allowAudioMixedSampleRateAdaptiveness;
 
-    // Text
-    /**
-     * The preferred language for text tracks as an ISO 639-2/T tag. {@code null} selects the
-     * default track if there is one, or no track otherwise. The default value is {@code null}.
-     */
-    @Nullable public final String preferredTextLanguage;
-    /**
-     * Whether a text track with undetermined language should be selected if no track with {@link
-     * #preferredTextLanguage} is available, or if {@link #preferredTextLanguage} is unset. The
-     * default value is {@code false}.
-     */
-    public final boolean selectUndeterminedTextLanguage;
-    /**
-     * Bitmask of selection flags that are disabled for text track selections. See {@link
-     * C.SelectionFlags}. The default value is {@code 0} (i.e. no flags).
-     */
-    public final int disabledTextTrackSelectionFlags;
-
     // General
     /**
      * Whether to force selection of the single lowest bitrate audio and video tracks that comply
@@ -845,6 +785,10 @@ public class DefaultTrackSelector extends MappingTrackSelector {
      */
     public final int tunnelingAudioSessionId;
 
+    // Overrides
+    private final SparseArray<Map<TrackGroupArray, SelectionOverride>> selectionOverrides;
+    private final SparseBooleanArray rendererDisabledFlags;
+
     private Parameters() {
       this(
           // Video
@@ -859,24 +803,23 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           /* viewportHeight= */ Integer.MAX_VALUE,
           /* viewportOrientationMayChange= */ true,
           // Audio
-          /* preferredAudioLanguage= */ null,
+          TrackSelectionParameters.DEFAULT.preferredAudioLanguage,
           /* maxAudioChannelCount= */ Integer.MAX_VALUE,
           /* maxAudioBitrate= */ Integer.MAX_VALUE,
           /* exceedAudioConstraintsIfNecessary= */ true,
           /* allowAudioMixedMimeTypeAdaptiveness= */ false,
           /* allowAudioMixedSampleRateAdaptiveness= */ false,
           // Text
-          /* preferredTextLanguage= */ null,
-          /* selectUndeterminedTextLanguage= */ false,
-          /* disabledTextTrackSelectionFlags= */ 0,
+          TrackSelectionParameters.DEFAULT.preferredTextLanguage,
+          TrackSelectionParameters.DEFAULT.selectUndeterminedTextLanguage,
+          TrackSelectionParameters.DEFAULT.disabledTextTrackSelectionFlags,
           // General
           /* forceLowestBitrate= */ false,
           /* forceHighestSupportedBitrate= */ false,
           /* exceedRendererCapabilitiesIfNecessary= */ true,
           /* tunnelingAudioSessionId= */ C.AUDIO_SESSION_ID_UNSET,
-          // Overrides
-          /* selectionOverrides= */ new SparseArray<>(),
-          /* rendererDisabledFlags= */ new SparseBooleanArray());
+          new SparseArray<>(),
+          new SparseBooleanArray());
     }
 
     /* package */ Parameters(
@@ -901,7 +844,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
         // Text
         @Nullable String preferredTextLanguage,
         boolean selectUndeterminedTextLanguage,
-        int disabledTextTrackSelectionFlags,
+        @C.SelectionFlags int disabledTextTrackSelectionFlags,
         // General
         boolean forceLowestBitrate,
         boolean forceHighestSupportedBitrate,
@@ -910,6 +853,11 @@ public class DefaultTrackSelector extends MappingTrackSelector {
         // Overrides
         SparseArray<Map<TrackGroupArray, SelectionOverride>> selectionOverrides,
         SparseBooleanArray rendererDisabledFlags) {
+      super(
+          preferredAudioLanguage,
+          preferredTextLanguage,
+          selectUndeterminedTextLanguage,
+          disabledTextTrackSelectionFlags);
       // Video
       this.maxVideoWidth = maxVideoWidth;
       this.maxVideoHeight = maxVideoHeight;
@@ -922,30 +870,26 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       this.viewportHeight = viewportHeight;
       this.viewportOrientationMayChange = viewportOrientationMayChange;
       // Audio
-      this.preferredAudioLanguage = Util.normalizeLanguageCode(preferredAudioLanguage);
       this.maxAudioChannelCount = maxAudioChannelCount;
       this.maxAudioBitrate = maxAudioBitrate;
       this.exceedAudioConstraintsIfNecessary = exceedAudioConstraintsIfNecessary;
       this.allowAudioMixedMimeTypeAdaptiveness = allowAudioMixedMimeTypeAdaptiveness;
       this.allowAudioMixedSampleRateAdaptiveness = allowAudioMixedSampleRateAdaptiveness;
-      // Text
-      this.preferredTextLanguage = Util.normalizeLanguageCode(preferredTextLanguage);
-      this.selectUndeterminedTextLanguage = selectUndeterminedTextLanguage;
-      this.disabledTextTrackSelectionFlags = disabledTextTrackSelectionFlags;
       // General
       this.forceLowestBitrate = forceLowestBitrate;
       this.forceHighestSupportedBitrate = forceHighestSupportedBitrate;
       this.exceedRendererCapabilitiesIfNecessary = exceedRendererCapabilitiesIfNecessary;
       this.tunnelingAudioSessionId = tunnelingAudioSessionId;
-      // Overrides
-      this.selectionOverrides = selectionOverrides;
-      this.rendererDisabledFlags = rendererDisabledFlags;
       // Deprecated fields.
       this.allowMixedMimeAdaptiveness = allowVideoMixedMimeTypeAdaptiveness;
       this.allowNonSeamlessAdaptiveness = allowVideoNonSeamlessAdaptiveness;
+      // Overrides
+      this.selectionOverrides = selectionOverrides;
+      this.rendererDisabledFlags = rendererDisabledFlags;
     }
 
     /* package */ Parameters(Parcel in) {
+      super(in);
       // Video
       this.maxVideoWidth = in.readInt();
       this.maxVideoHeight = in.readInt();
@@ -958,16 +902,11 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       this.viewportHeight = in.readInt();
       this.viewportOrientationMayChange = Util.readBoolean(in);
       // Audio
-      this.preferredAudioLanguage = in.readString();
       this.maxAudioChannelCount = in.readInt();
       this.maxAudioBitrate = in.readInt();
       this.exceedAudioConstraintsIfNecessary = Util.readBoolean(in);
       this.allowAudioMixedMimeTypeAdaptiveness = Util.readBoolean(in);
       this.allowAudioMixedSampleRateAdaptiveness = Util.readBoolean(in);
-      // Text
-      this.preferredTextLanguage = in.readString();
-      this.selectUndeterminedTextLanguage = Util.readBoolean(in);
-      this.disabledTextTrackSelectionFlags = in.readInt();
       // General
       this.forceLowestBitrate = Util.readBoolean(in);
       this.forceHighestSupportedBitrate = Util.readBoolean(in);
@@ -1016,9 +955,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       return overrides != null ? overrides.get(groups) : null;
     }
 
-    /**
-     * Creates a new {@link ParametersBuilder}, copying the initial values from this instance.
-     */
+    /** Creates a new {@link ParametersBuilder}, copying the initial values from this instance. */
+    @Override
     public ParametersBuilder buildUpon() {
       return new ParametersBuilder(this);
     }
@@ -1032,7 +970,9 @@ public class DefaultTrackSelector extends MappingTrackSelector {
         return false;
       }
       Parameters other = (Parameters) obj;
-      return maxVideoWidth == other.maxVideoWidth
+      return super.equals(obj)
+          // Video
+          && maxVideoWidth == other.maxVideoWidth
           && maxVideoHeight == other.maxVideoHeight
           && maxVideoFrameRate == other.maxVideoFrameRate
           && maxVideoBitrate == other.maxVideoBitrate
@@ -1043,16 +983,11 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           && viewportWidth == other.viewportWidth
           && viewportHeight == other.viewportHeight
           // Audio
-          && TextUtils.equals(preferredAudioLanguage, other.preferredAudioLanguage)
           && maxAudioChannelCount == other.maxAudioChannelCount
           && maxAudioBitrate == other.maxAudioBitrate
           && exceedAudioConstraintsIfNecessary == other.exceedAudioConstraintsIfNecessary
           && allowAudioMixedMimeTypeAdaptiveness == other.allowAudioMixedMimeTypeAdaptiveness
           && allowAudioMixedSampleRateAdaptiveness == other.allowAudioMixedSampleRateAdaptiveness
-          // Text
-          && TextUtils.equals(preferredTextLanguage, other.preferredTextLanguage)
-          && selectUndeterminedTextLanguage == other.selectUndeterminedTextLanguage
-          && disabledTextTrackSelectionFlags == other.disabledTextTrackSelectionFlags
           // General
           && forceLowestBitrate == other.forceLowestBitrate
           && forceHighestSupportedBitrate == other.forceHighestSupportedBitrate
@@ -1065,7 +1000,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
 
     @Override
     public int hashCode() {
-      int result = 1;
+      int result = super.hashCode();
       // Video
       result = 31 * result + maxVideoWidth;
       result = 31 * result + maxVideoHeight;
@@ -1078,17 +1013,11 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       result = 31 * result + viewportWidth;
       result = 31 * result + viewportHeight;
       // Audio
-      result =
-          31 * result + (preferredAudioLanguage == null ? 0 : preferredAudioLanguage.hashCode());
       result = 31 * result + maxAudioChannelCount;
       result = 31 * result + maxAudioBitrate;
       result = 31 * result + (exceedAudioConstraintsIfNecessary ? 1 : 0);
       result = 31 * result + (allowAudioMixedMimeTypeAdaptiveness ? 1 : 0);
       result = 31 * result + (allowAudioMixedSampleRateAdaptiveness ? 1 : 0);
-      // Text
-      result = 31 * result + (preferredTextLanguage == null ? 0 : preferredTextLanguage.hashCode());
-      result = 31 * result + (selectUndeterminedTextLanguage ? 1 : 0);
-      result = 31 * result + disabledTextTrackSelectionFlags;
       // General
       result = 31 * result + (forceLowestBitrate ? 1 : 0);
       result = 31 * result + (forceHighestSupportedBitrate ? 1 : 0);
@@ -1107,6 +1036,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
 
     @Override
     public void writeToParcel(Parcel dest, int flags) {
+      super.writeToParcel(dest, flags);
       // Video
       dest.writeInt(maxVideoWidth);
       dest.writeInt(maxVideoHeight);
@@ -1119,16 +1049,11 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       dest.writeInt(viewportHeight);
       Util.writeBoolean(dest, viewportOrientationMayChange);
       // Audio
-      dest.writeString(preferredAudioLanguage);
       dest.writeInt(maxAudioChannelCount);
       dest.writeInt(maxAudioBitrate);
       Util.writeBoolean(dest, exceedAudioConstraintsIfNecessary);
       Util.writeBoolean(dest, allowAudioMixedMimeTypeAdaptiveness);
       Util.writeBoolean(dest, allowAudioMixedSampleRateAdaptiveness);
-      // Text
-      dest.writeString(preferredTextLanguage);
-      Util.writeBoolean(dest, selectUndeterminedTextLanguage);
-      dest.writeInt(disabledTextTrackSelectionFlags);
       // General
       Util.writeBoolean(dest, forceLowestBitrate);
       Util.writeBoolean(dest, forceHighestSupportedBitrate);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java
new file mode 100644
index 0000000000..2bbd81854c
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java
@@ -0,0 +1,240 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.trackselection;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.util.Util;
+
+/** Constraint parameters for track selection. */
+public class TrackSelectionParameters implements Parcelable {
+
+  /**
+   * A builder for {@link TrackSelectionParameters}. See the {@link TrackSelectionParameters}
+   * documentation for explanations of the parameters that can be configured using this builder.
+   */
+  public static class Builder {
+
+    // Audio
+    @Nullable /* package */ String preferredAudioLanguage;
+    // Text
+    @Nullable /* package */ String preferredTextLanguage;
+    /* package */ boolean selectUndeterminedTextLanguage;
+    @C.SelectionFlags /* package */ int disabledTextTrackSelectionFlags;
+
+    /** Creates a builder with default initial values. */
+    public Builder() {
+      this(DEFAULT);
+    }
+
+    /**
+     * @param initialValues The {@link TrackSelectionParameters} from which the initial values of
+     *     the builder are obtained.
+     */
+    /* package */ Builder(TrackSelectionParameters initialValues) {
+      // Audio
+      preferredAudioLanguage = initialValues.preferredAudioLanguage;
+      // Text
+      preferredTextLanguage = initialValues.preferredTextLanguage;
+      selectUndeterminedTextLanguage = initialValues.selectUndeterminedTextLanguage;
+      disabledTextTrackSelectionFlags = initialValues.disabledTextTrackSelectionFlags;
+    }
+
+    /**
+     * See {@link TrackSelectionParameters#preferredAudioLanguage}.
+     *
+     * @param preferredAudioLanguage Preferred audio language as an ISO 639-1 two-letter or ISO
+     *     639-2 three-letter code.
+     * @return This builder.
+     */
+    public Builder setPreferredAudioLanguage(String preferredAudioLanguage) {
+      this.preferredAudioLanguage = preferredAudioLanguage;
+      return this;
+    }
+
+    // Text
+
+    /**
+     * See {@link TrackSelectionParameters#preferredTextLanguage}.
+     *
+     * @param preferredTextLanguage Preferred text language as an ISO 639-1 two-letter or ISO 639-2
+     *     three-letter code.
+     * @return This builder.
+     */
+    public Builder setPreferredTextLanguage(String preferredTextLanguage) {
+      this.preferredTextLanguage = preferredTextLanguage;
+      return this;
+    }
+
+    /**
+     * See {@link TrackSelectionParameters#selectUndeterminedTextLanguage}.
+     *
+     * @return This builder.
+     */
+    public Builder setSelectUndeterminedTextLanguage(boolean selectUndeterminedTextLanguage) {
+      this.selectUndeterminedTextLanguage = selectUndeterminedTextLanguage;
+      return this;
+    }
+
+    /**
+     * See {@link TrackSelectionParameters#disabledTextTrackSelectionFlags}.
+     *
+     * @return This builder.
+     */
+    public Builder setDisabledTextTrackSelectionFlags(
+        @C.SelectionFlags int disabledTextTrackSelectionFlags) {
+      this.disabledTextTrackSelectionFlags = disabledTextTrackSelectionFlags;
+      return this;
+    }
+
+    /** Builds a {@link TrackSelectionParameters} instance with the selected values. */
+    public TrackSelectionParameters build() {
+      return new TrackSelectionParameters(
+          // Audio
+          preferredAudioLanguage,
+          // Text
+          preferredTextLanguage,
+          selectUndeterminedTextLanguage,
+          disabledTextTrackSelectionFlags);
+    }
+  }
+
+  /** An instance with default values. */
+  public static final TrackSelectionParameters DEFAULT = new TrackSelectionParameters();
+
+  /**
+   * The preferred language for audio and forced text tracks, as an ISO 639-2/T tag. {@code null}
+   * selects the default track, or the first track if there's no default. The default value is
+   * {@code null}.
+   */
+  @Nullable public final String preferredAudioLanguage;
+  // Text
+  /**
+   * The preferred language for text tracks as an ISO 639-2/T tag. {@code null} selects the default
+   * track if there is one, or no track otherwise. The default value is {@code null}.
+   */
+  @Nullable public final String preferredTextLanguage;
+  /**
+   * Whether a text track with undetermined language should be selected if no track with {@link
+   * #preferredTextLanguage} is available, or if {@link #preferredTextLanguage} is unset. The
+   * default value is {@code false}.
+   */
+  public final boolean selectUndeterminedTextLanguage;
+  /**
+   * Bitmask of selection flags that are disabled for text track selections. See {@link
+   * C.SelectionFlags}. The default value is {@code 0} (i.e. no flags).
+   */
+  @C.SelectionFlags public final int disabledTextTrackSelectionFlags;
+
+  /* package */ TrackSelectionParameters() {
+    this(
+        /* preferredAudioLanguage= */ null,
+        // Text
+        /* preferredTextLanguage= */ null,
+        /* selectUndeterminedTextLanguage= */ false,
+        /* disabledTextTrackSelectionFlags= */ 0);
+  }
+
+  /* package */ TrackSelectionParameters(
+      @Nullable String preferredAudioLanguage,
+      @Nullable String preferredTextLanguage,
+      boolean selectUndeterminedTextLanguage,
+      @C.SelectionFlags int disabledTextTrackSelectionFlags) {
+    // Audio
+    this.preferredAudioLanguage = Util.normalizeLanguageCode(preferredAudioLanguage);
+    // Text
+    this.preferredTextLanguage = Util.normalizeLanguageCode(preferredTextLanguage);
+    this.selectUndeterminedTextLanguage = selectUndeterminedTextLanguage;
+    this.disabledTextTrackSelectionFlags = disabledTextTrackSelectionFlags;
+  }
+
+  /* package */ TrackSelectionParameters(Parcel in) {
+    // Audio
+    this.preferredAudioLanguage = in.readString();
+    // Text
+    this.preferredTextLanguage = in.readString();
+    this.selectUndeterminedTextLanguage = Util.readBoolean(in);
+    this.disabledTextTrackSelectionFlags = in.readInt();
+  }
+
+  /** Creates a new {@link Builder}, copying the initial values from this instance. */
+  public Builder buildUpon() {
+    return new Builder(this);
+  }
+
+  @Override
+  @SuppressWarnings("EqualsGetClass")
+  public boolean equals(@Nullable Object obj) {
+    if (this == obj) {
+      return true;
+    }
+    if (obj == null || getClass() != obj.getClass()) {
+      return false;
+    }
+    TrackSelectionParameters other = (TrackSelectionParameters) obj;
+    return TextUtils.equals(preferredAudioLanguage, other.preferredAudioLanguage)
+        // Text
+        && TextUtils.equals(preferredTextLanguage, other.preferredTextLanguage)
+        && selectUndeterminedTextLanguage == other.selectUndeterminedTextLanguage
+        && disabledTextTrackSelectionFlags == other.disabledTextTrackSelectionFlags;
+  }
+
+  @Override
+  public int hashCode() {
+    int result = 1;
+    // Audio
+    result = 31 * result + (preferredAudioLanguage == null ? 0 : preferredAudioLanguage.hashCode());
+    // Text
+    result = 31 * result + (preferredTextLanguage == null ? 0 : preferredTextLanguage.hashCode());
+    result = 31 * result + (selectUndeterminedTextLanguage ? 1 : 0);
+    result = 31 * result + disabledTextTrackSelectionFlags;
+    return result;
+  }
+
+  // Parcelable implementation.
+
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  @Override
+  public void writeToParcel(Parcel dest, int flags) {
+    // Audio
+    dest.writeString(preferredAudioLanguage);
+    // Text
+    dest.writeString(preferredTextLanguage);
+    Util.writeBoolean(dest, selectUndeterminedTextLanguage);
+    dest.writeInt(disabledTextTrackSelectionFlags);
+  }
+
+  public static final Creator<TrackSelectionParameters> CREATOR =
+      new Creator<TrackSelectionParameters>() {
+
+        @Override
+        public TrackSelectionParameters createFromParcel(Parcel in) {
+          return new TrackSelectionParameters(in);
+        }
+
+        @Override
+        public TrackSelectionParameters[] newArray(int size) {
+          return new TrackSelectionParameters[size];
+        }
+      };
+}

From 2ab91bf08a1fee65cb3164fc92619daa513123c5 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 30 Jan 2019 20:22:33 +0000
Subject: [PATCH 456/832] Update OkHttp and Cronet dependencies

PiperOrigin-RevId: 231644908
---
 extensions/cronet/build.gradle | 2 +-
 extensions/okhttp/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle
index f77e84c816..1c1c099e7b 100644
--- a/extensions/cronet/build.gradle
+++ b/extensions/cronet/build.gradle
@@ -30,7 +30,7 @@ android {
 }
 
 dependencies {
-    api 'org.chromium.net:cronet-embedded:66.3359.158'
+    api 'org.chromium.net:cronet-embedded:71.3578.98'
     implementation project(modulePrefix + 'library-core')
     implementation 'com.android.support:support-annotations:' + supportLibraryVersion
     testImplementation project(modulePrefix + 'library')
diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle
index 4e6b11c495..78825a6277 100644
--- a/extensions/okhttp/build.gradle
+++ b/extensions/okhttp/build.gradle
@@ -34,7 +34,7 @@ dependencies {
     implementation project(modulePrefix + 'library-core')
     implementation 'com.android.support:support-annotations:' + supportLibraryVersion
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
-    api 'com.squareup.okhttp3:okhttp:3.11.0'
+    api 'com.squareup.okhttp3:okhttp:3.12.1'
 }
 
 ext {

From 8f32c29cc6691536255d6d93bfd6537f1e245a5f Mon Sep 17 00:00:00 2001
From: ybai001 <ybai@dolby.com>
Date: Thu, 31 Jan 2019 11:31:19 +0800
Subject: [PATCH 457/832] Update code based on code review result

 * remove field mimeType in Ac4Util.java
 * change constant CHANNEL_COUNT_2 to private in Ac4Util.java
---
 .../com/google/android/exoplayer2/audio/Ac4Util.java  | 11 ++---------
 .../android/exoplayer2/extractor/ts/Ac4Reader.java    |  5 +++--
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java
index 9b845a14d4..fc4c8efb85 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java
@@ -33,10 +33,6 @@ public final class Ac4Util {
    */
   public static final class SyncFrameInfo {
 
-    /**
-     * The sample mime type of the bitstream is {@link MimeTypes#AUDIO_AC4}.
-     */
-    public final String mimeType;
     /**
      * The bitstream version.
      */
@@ -59,13 +55,11 @@ public final class Ac4Util {
     public final int sampleCount;
 
     private SyncFrameInfo(
-        String mimeType,
         int bitstreamVersion,
         int channelCount,
         int sampleRate,
         int frameSize,
         int sampleCount) {
-      this.mimeType = mimeType;
       this.bitstreamVersion = bitstreamVersion;
       this.channelCount = channelCount;
       this.sampleRate = sampleRate;
@@ -78,7 +72,7 @@ public final class Ac4Util {
    * The channel count of AC-4 stream.
    */
   // TODO: Parse AC-4 stream channel count.
-  public static final int CHANNEL_COUNT_2 = 2;
+  private static final int CHANNEL_COUNT_2 = 2;
   /**
    * The header size for AC-4 parser. Only needs to be as big as we need to read, not the full
    * header size.
@@ -207,8 +201,7 @@ public final class Ac4Util {
           break;
       }
     }
-    return new SyncFrameInfo(
-        MimeTypes.AUDIO_AC4, bitstreamVersion, CHANNEL_COUNT_2, sampleRate, frameSize, sampleCount);
+    return new SyncFrameInfo(bitstreamVersion, CHANNEL_COUNT_2, sampleRate, frameSize, sampleCount);
   }
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java
index a1e5e51e9d..fd1a2bae44 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java
@@ -23,6 +23,7 @@ import com.google.android.exoplayer2.audio.Ac4Util.SyncFrameInfo;
 import com.google.android.exoplayer2.extractor.ExtractorOutput;
 import com.google.android.exoplayer2.extractor.TrackOutput;
 import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.TrackIdGenerator;
+import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.ParsableBitArray;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import java.lang.annotation.Documented;
@@ -198,8 +199,8 @@ public final class Ac4Reader implements ElementaryStreamReader {
     SyncFrameInfo frameInfo = Ac4Util.parseAc4SyncframeInfo(headerScratchBits);
     if (format == null || frameInfo.channelCount != format.channelCount
         || frameInfo.sampleRate != format.sampleRate
-        || frameInfo.mimeType != format.sampleMimeType) {
-      format = Format.createAudioSampleFormat(trackFormatId, frameInfo.mimeType, null,
+        || !MimeTypes.AUDIO_AC4.equals(format.sampleMimeType)) {
+      format = Format.createAudioSampleFormat(trackFormatId, MimeTypes.AUDIO_AC4, null,
           Format.NO_VALUE, Format.NO_VALUE, frameInfo.channelCount, frameInfo.sampleRate, null,
           null, 0, language);
       output.format(format);

From ef6725bf4827148526f016467f26398fd20d0013 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 31 Jan 2019 09:13:11 +0000
Subject: [PATCH 458/832] Bump version for 2.9.5 release

PiperOrigin-RevId: 231744540
---
 RELEASENOTES.md                                     | 13 +++++++++++--
 constants.gradle                                    |  4 ++--
 .../android/exoplayer2/ExoPlayerLibraryInfo.java    |  6 +++---
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 65d4e9696e..43952f29f4 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -3,8 +3,6 @@
 ### dev-v2 (not yet released) ###
 
 * `ExtractorMediaSource` renamed to `ProgressiveMediaSource`.
-* HLS:
-  * Parse CHANNELS attribute from EXT-X-MEDIA.
 * Support for playing spherical videos on Daydream.
 * Improve decoder re-use between playbacks. TODO: Write and link a blog post
   here ([#2826](https://github.com/google/ExoPlayer/issues/2826)).
@@ -48,6 +46,17 @@
 * Change signature of `PlayerNotificationManager.NotificationListener` to better
   fit service requirements. Remove ability to set a custom stop action.
 
+### 2.9.5 ###
+
+* HLS: Parse `CHANNELS` attribute from `EXT-X-MEDIA` tag.
+* ExtractorMediaSource: Fix issue that could cause the player to get stuck
+  buffering at the end of the media.
+* PlayerView: Fix issue preventing `OnClickListener` from receiving events
+  ([#5433](https://github.com/google/ExoPlayer/issues/5433)).
+* IMA extension: Upgrade IMA dependency to 3.10.6.
+* Cronet extension: Upgrade Cronet dependency to 71.3578.98.
+* OkHttp extension: Upgrade OkHttp dependency to 3.12.1.
+
 ### 2.9.4 ###
 
 * IMA extension: Clear ads loader listeners on release
diff --git a/constants.gradle b/constants.gradle
index 062438fa30..a932ef218f 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -13,8 +13,8 @@
 // limitations under the License.
 project.ext {
     // ExoPlayer version and version code.
-    releaseVersion = '2.9.4'
-    releaseVersionCode = 2009004
+    releaseVersion = '2.9.5'
+    releaseVersionCode = 2009005
     minSdkVersion = 16
     targetSdkVersion = 28
     compileSdkVersion = 28
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
index 36723c5d73..e3a2e1cd27 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
@@ -29,11 +29,11 @@ public final class ExoPlayerLibraryInfo {
 
   /** The version of the library expressed as a string, for example "1.2.3". */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION_INT) or vice versa.
-  public static final String VERSION = "2.9.4";
+  public static final String VERSION = "2.9.5";
 
   /** The version of the library expressed as {@code "ExoPlayerLib/" + VERSION}. */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
-  public static final String VERSION_SLASHY = "ExoPlayerLib/2.9.4";
+  public static final String VERSION_SLASHY = "ExoPlayerLib/2.9.5";
 
   /**
    * The version of the library expressed as an integer, for example 1002003.
@@ -43,7 +43,7 @@ public final class ExoPlayerLibraryInfo {
    * integer version 123045006 (123-045-006).
    */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
-  public static final int VERSION_INT = 2009004;
+  public static final int VERSION_INT = 2009005;
 
   /**
    * Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions}

From d0b3d1cf635d1150793a535b443263633a8ea601 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 31 Jan 2019 11:45:08 +0000
Subject: [PATCH 459/832] Add additional device to output surface workaround

Issue: #4468
PiperOrigin-RevId: 231759438
---
 .../android/exoplayer2/video/MediaCodecVideoRenderer.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index d8ad2a840b..68e98633d6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -1326,8 +1326,9 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
     }
     synchronized (MediaCodecVideoRenderer.class) {
       if (!evaluatedDeviceNeedsSetOutputSurfaceWorkaround) {
-        if (Util.SDK_INT <= 27 && "dangal".equals(Util.DEVICE)) {
-          // Dangal is affected on API level 27: https://github.com/google/ExoPlayer/issues/5169.
+        if (Util.SDK_INT <= 27 && ("dangal".equals(Util.DEVICE) || "HWEML".equals(Util.DEVICE))) {
+          // A small number of devices are affected on API level 27:
+          // https://github.com/google/ExoPlayer/issues/5169.
           deviceNeedsSetOutputSurfaceWorkaround = true;
         } else if (Util.SDK_INT >= 27) {
           // In general, devices running API level 27 or later should be unaffected. Do nothing.

From 503c17d2ed9003562f0dd73716b7aace8970e0a5 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 31 Jan 2019 12:39:14 +0000
Subject: [PATCH 460/832] Add constraint based track selection for ExoCast

PiperOrigin-RevId: 231764284
---
 .../exoplayer2/trackselection/DefaultTrackSelector.java       | 4 ++--
 .../exoplayer2/trackselection/TrackSelectionParameters.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
index afb2175972..43157c5866 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -354,7 +354,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     // Audio
 
     @Override
-    public ParametersBuilder setPreferredAudioLanguage(String preferredAudioLanguage) {
+    public ParametersBuilder setPreferredAudioLanguage(@Nullable String preferredAudioLanguage) {
       super.setPreferredAudioLanguage(preferredAudioLanguage);
       return this;
     }
@@ -415,7 +415,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     // Text
 
     @Override
-    public ParametersBuilder setPreferredTextLanguage(String preferredTextLanguage) {
+    public ParametersBuilder setPreferredTextLanguage(@Nullable String preferredTextLanguage) {
       super.setPreferredTextLanguage(preferredTextLanguage);
       return this;
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java
index 2bbd81854c..f411d431e2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java
@@ -63,7 +63,7 @@ public class TrackSelectionParameters implements Parcelable {
      *     639-2 three-letter code.
      * @return This builder.
      */
-    public Builder setPreferredAudioLanguage(String preferredAudioLanguage) {
+    public Builder setPreferredAudioLanguage(@Nullable String preferredAudioLanguage) {
       this.preferredAudioLanguage = preferredAudioLanguage;
       return this;
     }
@@ -77,7 +77,7 @@ public class TrackSelectionParameters implements Parcelable {
      *     three-letter code.
      * @return This builder.
      */
-    public Builder setPreferredTextLanguage(String preferredTextLanguage) {
+    public Builder setPreferredTextLanguage(@Nullable String preferredTextLanguage) {
       this.preferredTextLanguage = preferredTextLanguage;
       return this;
     }

From a73819162751116acd3863cf5473b0ff78fac805 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 31 Jan 2019 14:03:11 +0000
Subject: [PATCH 461/832] Remove remainder of skip button focus hack

PiperOrigin-RevId: 231772920
---
 .../java/com/google/android/exoplayer2/ui/PlayerView.java     | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
index f7f509dfa7..9742d0005a 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
@@ -758,10 +758,6 @@ public class PlayerView extends FrameLayout {
   @Override
   public boolean dispatchKeyEvent(KeyEvent event) {
     if (player != null && player.isPlayingAd()) {
-      // Focus any overlay UI now, in case it's provided by a WebView whose contents may update
-      // dynamically. This is needed to make the "Skip ad" button focused on Android TV when using
-      // IMA [Internal: b/62371030].
-      overlayFrameLayout.requestFocus();
       return super.dispatchKeyEvent(event);
     }
     boolean isDpadWhenControlHidden =

From 55ed5cfac665a563f6369056b387453223e7b223 Mon Sep 17 00:00:00 2001
From: ybai001 <ybai@dolby.com>
Date: Fri, 1 Feb 2019 09:03:40 +0800
Subject: [PATCH 462/832] Set ac4-is sync only if SDK_INT <= 28

---
 .../android/exoplayer2/audio/MediaCodecAudioRenderer.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
index f9749450c3..381a2ad682 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
@@ -787,7 +787,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
         mediaFormat.setFloat(MediaFormat.KEY_OPERATING_RATE, codecOperatingRate);
       }
     }
-    if (MimeTypes.AUDIO_AC4.equals(format.sampleMimeType)) {
+    if (Util.SDK_INT <= 28 && MimeTypes.AUDIO_AC4.equals(format.sampleMimeType)) {
       // Some devices handle AC-4 raw frame by default.
       // Need to notify the codec to handle AC-4 sync frame.
       mediaFormat.setInteger("ac4-is-sync", 1);

From c61c0bd1ac429429f4264f061a5aebb96b172208 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 31 Jan 2019 17:38:48 +0000
Subject: [PATCH 463/832] Cast demo: Fix a few miscellaneous bugs

PiperOrigin-RevId: 231801562
---
 .../com/google/android/exoplayer2/castdemo/MainActivity.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
index 46e8273947..48934abd2c 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
@@ -279,6 +279,8 @@ public class MainActivity extends AppCompatActivity
       int position = viewHolder.getAdapterPosition();
       if (playerManager.removeItem(position)) {
         mediaQueueListAdapter.notifyItemRemoved(position);
+        // Update whichever item took its place, in case it became the new selected item.
+        mediaQueueListAdapter.notifyItemChanged(position);
       }
     }
 

From 5e311fc82ac6996f2bb634f3f466f1bb4dd2f96f Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Mon, 4 Feb 2019 13:06:09 +0000
Subject: [PATCH 464/832] Refactor DownloadManage to simplify DownloadThread
 management

Now DownloadManager is responsible for starting and stopping DownloadThreads.

PiperOrigin-RevId: 232278072
---
 .../exoplayer2/offline/DownloadManager.java   | 224 ++++++++++--------
 1 file changed, 119 insertions(+), 105 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index d4ea9fc3ff..9e6aec0a86 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -34,6 +34,7 @@ import android.os.ConditionVariable;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
+import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.scheduler.Requirements;
@@ -42,8 +43,11 @@ import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
 import java.io.File;
 import java.io.IOException;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
@@ -101,16 +105,30 @@ public final class DownloadManager {
   public static final Requirements DEFAULT_REQUIREMENTS =
       new Requirements(Requirements.NETWORK_TYPE_ANY, false, false);
 
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({
+    START_THREAD_SUCCEEDED,
+    START_THREAD_WAIT_REMOVAL_TO_FINISH,
+    START_THREAD_WAIT_DOWNLOAD_CANCELATION,
+    START_THREAD_TOO_MANY_DOWNLOADS
+  })
+  private @interface StartThreadResults {}
+
+  private static final int START_THREAD_SUCCEEDED = 0;
+  private static final int START_THREAD_WAIT_REMOVAL_TO_FINISH = 1;
+  private static final int START_THREAD_WAIT_DOWNLOAD_CANCELATION = 2;
+  private static final int START_THREAD_TOO_MANY_DOWNLOADS = 3;
+
   private static final String TAG = "DownloadManager";
   private static final boolean DEBUG = false;
 
-  private final int maxActiveDownloads;
+  private final int maxSimultaneousDownloads;
   private final int minRetryCount;
   private final Context context;
   private final ActionFile actionFile;
   private final DownloaderFactory downloaderFactory;
   private final ArrayList<Download> downloads;
-  private final ArrayList<Download> activeDownloads;
+  private final HashMap<Download, DownloadThread> activeDownloads;
   private final Handler handler;
   private final HandlerThread fileIOThread;
   private final Handler fileIOHandler;
@@ -122,6 +140,7 @@ public final class DownloadManager {
   @DownloadState.StopFlags private int stickyStopFlags;
   @Requirements.RequirementFlags private int notMetRequirements;
   private RequirementsWatcher requirementsWatcher;
+  private int simultaneousDownloads;
 
   /**
    * Constructs a {@link DownloadManager}.
@@ -160,12 +179,12 @@ public final class DownloadManager {
     this.context = context.getApplicationContext();
     this.actionFile = new ActionFile(actionFile);
     this.downloaderFactory = downloaderFactory;
-    this.maxActiveDownloads = maxSimultaneousDownloads;
+    this.maxSimultaneousDownloads = maxSimultaneousDownloads;
     this.minRetryCount = minRetryCount;
     this.stickyStopFlags = STOP_FLAG_STOPPED | STOP_FLAG_DOWNLOAD_MANAGER_NOT_READY;
 
     downloads = new ArrayList<>();
-    activeDownloads = new ArrayList<>();
+    activeDownloads = new HashMap<>();
 
     Looper looper = Looper.myLooper();
     if (looper == null) {
@@ -310,16 +329,7 @@ public final class DownloadManager {
   /** Returns whether there are no active downloads. */
   public boolean isIdle() {
     Assertions.checkState(!released);
-    if (!initialized || !activeDownloads.isEmpty()) {
-      return false;
-    }
-    // Still need to check all downloads as there might be remove tasks going on.
-    for (int i = 0; i < downloads.size(); i++) {
-      if (!downloads.get(i).isIdle()) {
-        return false;
-      }
-    }
-    return true;
+    return initialized && activeDownloads.isEmpty();
   }
 
   /**
@@ -351,29 +361,11 @@ public final class DownloadManager {
         return;
       }
     }
-    Download download =
-        new Download(
-            this, downloaderFactory, action, minRetryCount, stickyStopFlags, notMetRequirements);
+    Download download = new Download(this, action, stickyStopFlags, notMetRequirements);
     downloads.add(download);
     logd("Download is added", download);
   }
 
-  private void maybeStartDownload(Download download) {
-    if (activeDownloads.size() < maxActiveDownloads) {
-      if (download.start()) {
-        activeDownloads.add(download);
-      }
-    }
-  }
-
-  private void maybeRestartDownload(Download download) {
-    if (activeDownloads.contains(download)) {
-      download.start();
-    } else {
-      maybeStartDownload(download);
-    }
-  }
-
   private void maybeNotifyListenersIdle() {
     if (!isIdle()) {
       return;
@@ -388,21 +380,11 @@ public final class DownloadManager {
     if (released) {
       return;
     }
-    boolean idle = download.isIdle();
-    if (idle) {
-      activeDownloads.remove(download);
-    }
     notifyListenersDownloadStateChange(download);
     if (download.isFinished()) {
       downloads.remove(download);
       saveActions();
     }
-    if (idle) {
-      for (int i = 0; i < downloads.size(); i++) {
-        maybeStartDownload(downloads.get(i));
-      }
-      maybeNotifyListenersIdle();
-    }
   }
 
   private void notifyListenersDownloadStateChange(Download download) {
@@ -513,34 +495,86 @@ public final class DownloadManager {
     return notMetRequirements;
   }
 
+  @StartThreadResults
+  private int startDownloadThread(Download download, DownloadAction action) {
+    if (activeDownloads.containsKey(download)) {
+      if (stopDownloadThread(download)) {
+        return START_THREAD_WAIT_DOWNLOAD_CANCELATION;
+      }
+      return START_THREAD_WAIT_REMOVAL_TO_FINISH;
+    }
+    if (!action.isRemoveAction) {
+      if (simultaneousDownloads == maxSimultaneousDownloads) {
+        return START_THREAD_TOO_MANY_DOWNLOADS;
+      }
+      simultaneousDownloads++;
+    }
+    Downloader downloader = downloaderFactory.createDownloader(action);
+    DownloadThread downloadThread = new DownloadThread(download, downloader, action.isRemoveAction);
+    activeDownloads.put(download, downloadThread);
+    logd("Download is started", download);
+    return START_THREAD_SUCCEEDED;
+  }
+
+  private boolean stopDownloadThread(Download download) {
+    DownloadThread downloadThread = activeDownloads.get(download);
+    if (downloadThread != null && !downloadThread.isRemoveThread) {
+      downloadThread.cancel();
+      logd("Download is cancelled", download);
+      return true;
+    }
+    return false;
+  }
+
+  private void onDownloadThreadStopped(DownloadThread downloadThread, Throwable finalError) {
+    Download download = downloadThread.download;
+    logd("Download is stopped", download);
+    activeDownloads.remove(download);
+    boolean tryToStartDownloads = false;
+    if (!downloadThread.isRemoveThread) {
+      // If maxSimultaneousDownloads was hit, there might be a download waiting for a slot.
+      tryToStartDownloads = simultaneousDownloads == maxSimultaneousDownloads;
+      simultaneousDownloads--;
+    }
+    download.onDownloadThreadStopped(downloadThread.isCanceled, finalError);
+    if (tryToStartDownloads) {
+      for (int i = 0;
+          simultaneousDownloads < maxSimultaneousDownloads && i < downloads.size();
+          i++) {
+        downloads.get(i).start();
+      }
+    }
+    maybeNotifyListenersIdle();
+  }
+
+  @Nullable
+  private Downloader getDownloader(Download download) {
+    DownloadThread downloadThread = activeDownloads.get(download);
+    if (downloadThread != null) {
+      return downloadThread.downloader;
+    }
+    return null;
+  }
+
   private static final class Download {
 
     private final String id;
     private final DownloadManager downloadManager;
-    private final DownloaderFactory downloaderFactory;
-    private final int minRetryCount;
     private final long startTimeMs;
     private final ArrayDeque<DownloadAction> actionQueue;
-    /** The current state of the download. */
-    @DownloadState.State private int state;
 
-    @MonotonicNonNull private Downloader downloader;
-    @MonotonicNonNull private DownloadThread downloadThread;
+    @DownloadState.State private int state;
     @MonotonicNonNull @DownloadState.FailureReason private int failureReason;
     @DownloadState.StopFlags private int stopFlags;
     @Requirements.RequirementFlags private int notMetRequirements;
 
     private Download(
         DownloadManager downloadManager,
-        DownloaderFactory downloaderFactory,
         DownloadAction action,
-        int minRetryCount,
         @DownloadState.StopFlags int stopFlags,
         @Requirements.RequirementFlags int notMetRequirements) {
       this.id = action.id;
       this.downloadManager = downloadManager;
-      this.downloaderFactory = downloaderFactory;
-      this.minRetryCount = minRetryCount;
       this.notMetRequirements = notMetRequirements;
       if (notMetRequirements != 0) {
         stopFlags |= STOP_FLAG_REQUIREMENTS_NOT_MET;
@@ -549,7 +583,14 @@ public final class DownloadManager {
       this.startTimeMs = System.currentTimeMillis();
       actionQueue = new ArrayDeque<>();
       actionQueue.add(action);
+
+      // Set to queued state but don't notify listeners until we make sure we don't switch to
+      // another state immediately.
+      state = STATE_QUEUED;
       initialize();
+      if (state == STATE_QUEUED) {
+        downloadManager.onDownloadStateChange(this);
+      }
     }
 
     public boolean addAction(DownloadAction newAction) {
@@ -573,9 +614,6 @@ public final class DownloadManager {
       } else if (!action.equals(updatedAction)) {
         Assertions.checkState(
             state == STATE_DOWNLOADING || state == STATE_QUEUED || state == STATE_STOPPED);
-        if (state == STATE_DOWNLOADING) {
-          stopDownloadThread();
-        }
         initialize();
       }
       return true;
@@ -585,6 +623,7 @@ public final class DownloadManager {
       float downloadPercentage = C.PERCENTAGE_UNSET;
       long downloadedBytes = 0;
       long totalBytes = C.LENGTH_UNSET;
+      Downloader downloader = downloadManager.getDownloader(this);
       if (downloader != null) {
         downloadPercentage = downloader.getDownloadPercentage();
         downloadedBytes = downloader.getDownloadedBytes();
@@ -622,13 +661,10 @@ public final class DownloadManager {
       return id + ' ' + DownloadState.getStateString(state);
     }
 
-    public boolean start() {
-      if (state != STATE_QUEUED) {
-        return false;
+    public void start() {
+      if (state == STATE_QUEUED) {
+        startOrQueue();
       }
-      startDownloadThread(actionQueue.peek());
-      setState(STATE_DOWNLOADING);
-      return true;
     }
 
     public void setStopFlags(int flags) {
@@ -643,9 +679,7 @@ public final class DownloadManager {
       stopFlags = (values & flags) | (stopFlags & ~flags);
       if (stopFlags != 0) {
         if (state == STATE_DOWNLOADING || state == STATE_QUEUED) {
-          if (state == STATE_DOWNLOADING) {
-            stopDownloadThread();
-          }
+          downloadManager.stopDownloadThread(this);
           setState(STATE_STOPPED);
         }
       } else if (state == STATE_STOPPED) {
@@ -664,7 +698,9 @@ public final class DownloadManager {
       DownloadAction action = actionQueue.peek();
       if (action.isRemoveAction) {
         if (!downloadManager.released) {
-          startDownloadThread(action);
+          int result = downloadManager.startDownloadThread(this, action);
+          Assertions.checkState(
+              result == START_THREAD_SUCCEEDED || result == START_THREAD_WAIT_DOWNLOAD_CANCELATION);
         }
         setState(actionQueue.size() == 1 ? STATE_REMOVING : STATE_RESTARTING);
       } else if (stopFlags != 0) {
@@ -675,42 +711,29 @@ public final class DownloadManager {
     }
 
     private void startOrQueue() {
-      // Set to queued state but don't notify listeners until we make sure we can't start now.
-      state = STATE_QUEUED;
-      downloadManager.maybeRestartDownload(this);
-      if (state == STATE_QUEUED) {
-        downloadManager.onDownloadStateChange(this);
+      DownloadAction action = Assertions.checkNotNull(actionQueue.peek());
+      Assertions.checkState(!action.isRemoveAction);
+      @StartThreadResults int result = downloadManager.startDownloadThread(this, action);
+      Assertions.checkState(result != START_THREAD_WAIT_REMOVAL_TO_FINISH);
+      if (result == START_THREAD_TOO_MANY_DOWNLOADS) {
+        setState(STATE_QUEUED);
+      } else {
+        setState(STATE_DOWNLOADING);
       }
     }
 
     private void setState(@DownloadState.State int newState) {
-      state = newState;
-      downloadManager.onDownloadStateChange(this);
-    }
-
-    private void startDownloadThread(DownloadAction action) {
-      if (downloadThread != null) {
-        return;
-      }
-      downloader = downloaderFactory.createDownloader(action);
-      downloadThread =
-          new DownloadThread(
-              this, downloader, action.isRemoveAction, minRetryCount, downloadManager.handler);
-    }
-
-    private void stopDownloadThread() {
-      if (!downloadThread.isRemoveThread) {
-        Assertions.checkNotNull(downloadThread).cancel();
+      if (state != newState) {
+        state = newState;
+        downloadManager.onDownloadStateChange(this);
       }
     }
 
-    private void onDownloadThreadStopped(@Nullable Throwable error) {
+    private void onDownloadThreadStopped(boolean isCanceled, @Nullable Throwable error) {
       failureReason = FAILURE_REASON_NONE;
-      boolean isCanceled = downloadThread.isCanceled;
-      downloadThread = null;
       if (isCanceled) {
         if (!isIdle()) {
-          startDownloadThread(actionQueue.peek());
+          downloadManager.startDownloadThread(this, actionQueue.peek());
         }
         return;
       }
@@ -733,27 +756,18 @@ public final class DownloadManager {
     }
   }
 
-  private static class DownloadThread implements Runnable {
+  private class DownloadThread implements Runnable {
 
     private final Download download;
     private final Downloader downloader;
     private final boolean isRemoveThread;
-    private final int minRetryCount;
-    private final Handler callbackHandler;
     private final Thread thread;
     private volatile boolean isCanceled;
 
-    private DownloadThread(
-        Download download,
-        Downloader downloader,
-        boolean isRemoveThread,
-        int minRetryCount,
-        Handler callbackHandler) {
+    private DownloadThread(Download download, Downloader downloader, boolean isRemoveThread) {
       this.download = download;
       this.downloader = downloader;
       this.isRemoveThread = isRemoveThread;
-      this.minRetryCount = minRetryCount;
-      this.callbackHandler = callbackHandler;
       thread = new Thread(this);
       thread.start();
     }
@@ -768,7 +782,7 @@ public final class DownloadManager {
 
     @Override
     public void run() {
-      logd("Download is started", download);
+      logd("Download started", download);
       Throwable error = null;
       try {
         if (isRemoveThread) {
@@ -801,7 +815,7 @@ public final class DownloadManager {
         error = e;
       }
       final Throwable finalError = error;
-      callbackHandler.post(() -> download.onDownloadThreadStopped(isCanceled ? null : finalError));
+      handler.post(() -> onDownloadThreadStopped(this, finalError));
     }
 
     private int getRetryDelayMillis(int errorCount) {

From f1ded9c3c2192c0f72678df0ea0cf32f6cc1465e Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 4 Feb 2019 16:11:26 +0000
Subject: [PATCH 465/832] Wider fix for OMX.SEC.mp3.dec issue

Issue: #4519
PiperOrigin-RevId: 232299233
---
 RELEASENOTES.md                               |  2 +
 .../exoplayer2/mediacodec/MediaCodecUtil.java | 53 +++++++++----------
 2 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 43952f29f4..98f8e85857 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -56,6 +56,8 @@
 * IMA extension: Upgrade IMA dependency to 3.10.6.
 * Cronet extension: Upgrade Cronet dependency to 71.3578.98.
 * OkHttp extension: Upgrade OkHttp dependency to 3.12.1.
+* MP3: Wider fix for issue where streams would play twice on some Samsung
+  devices ([#4519](https://github.com/google/ExoPlayer/issues/4519)).
 
 ### 2.9.4 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
index ae3a9f123f..55459692c9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
@@ -58,8 +58,6 @@ public final class MediaCodecUtil {
 
   private static final String TAG = "MediaCodecUtil";
   private static final Pattern PROFILE_PATTERN = Pattern.compile("^\\D?(\\d+)$");
-  private static final RawAudioCodecComparator RAW_AUDIO_CODEC_COMPARATOR =
-      new RawAudioCodecComparator();
 
   private static final HashMap<CodecKey, List<MediaCodecInfo>> decoderInfosCache = new HashMap<>();
 
@@ -311,32 +309,6 @@ public final class MediaCodecUtil {
       return false;
     }
 
-    // Work around https://github.com/google/ExoPlayer/issues/398.
-    if (Util.SDK_INT < 18 && "OMX.SEC.MP3.Decoder".equals(name)) {
-      return false;
-    }
-
-    // Work around https://github.com/google/ExoPlayer/issues/4519.
-    if ("OMX.SEC.mp3.dec".equals(name)
-        && (Util.MODEL.startsWith("GT-I9152")
-            || Util.MODEL.startsWith("GT-I9515")
-            || Util.MODEL.startsWith("GT-P5220")
-            || Util.MODEL.startsWith("GT-S7580")
-            || Util.MODEL.startsWith("SM-G350")
-            || Util.MODEL.startsWith("SM-G386")
-            || Util.MODEL.startsWith("SM-T231")
-            || Util.MODEL.startsWith("SM-T530")
-            || Util.MODEL.startsWith("SCH-I535")
-            || Util.MODEL.startsWith("SPH-L710"))) {
-      return false;
-    }
-    if ("OMX.brcm.audio.mp3.decoder".equals(name)
-        && (Util.MODEL.startsWith("GT-I9152")
-            || Util.MODEL.startsWith("GT-S7580")
-            || Util.MODEL.startsWith("SM-G350"))) {
-      return false;
-    }
-
     // Work around https://github.com/google/ExoPlayer/issues/1528 and
     // https://github.com/google/ExoPlayer/issues/3171.
     if (Util.SDK_INT < 18 && "OMX.MTK.AUDIO.DECODER.AAC".equals(name)
@@ -423,7 +395,18 @@ public final class MediaCodecUtil {
    */
   private static void applyWorkarounds(String mimeType, List<MediaCodecInfo> decoderInfos) {
     if (MimeTypes.AUDIO_RAW.equals(mimeType)) {
-      Collections.sort(decoderInfos, RAW_AUDIO_CODEC_COMPARATOR);
+      Collections.sort(decoderInfos, new RawAudioCodecComparator());
+    } else if (Util.SDK_INT < 21 && decoderInfos.size() > 1) {
+      String firstCodecName = decoderInfos.get(0).name;
+      if ("OMX.SEC.mp3.dec".equals(firstCodecName)
+          || "OMX.SEC.MP3.Decoder".equals(firstCodecName)
+          || "OMX.brcm.audio.mp3.decoder".equals(firstCodecName)) {
+        // Prefer OMX.google codecs over OMX.SEC.mp3.dec, OMX.SEC.MP3.Decoder and
+        // OMX.brcm.audio.mp3.decoder on older devices. See:
+        // https://github.com/google/ExoPlayer/issues/398 and
+        // https://github.com/google/ExoPlayer/issues/4519.
+        Collections.sort(decoderInfos, new PreferOmxGoogleCodecComparator());
+      }
     }
   }
 
@@ -729,6 +712,18 @@ public final class MediaCodecUtil {
     }
   }
 
+  /** Comparator for preferring OMX.google media codecs. */
+  private static final class PreferOmxGoogleCodecComparator implements Comparator<MediaCodecInfo> {
+    @Override
+    public int compare(MediaCodecInfo a, MediaCodecInfo b) {
+      return scoreMediaCodecInfo(a) - scoreMediaCodecInfo(b);
+    }
+
+    private static int scoreMediaCodecInfo(MediaCodecInfo mediaCodecInfo) {
+      return mediaCodecInfo.name.startsWith("OMX.google") ? -1 : 0;
+    }
+  }
+
   static {
     AVC_PROFILE_NUMBER_TO_CONST = new SparseIntArray();
     AVC_PROFILE_NUMBER_TO_CONST.put(66, CodecProfileLevel.AVCProfileBaseline);

From fb99c26426b2f5b82b8528f52f6890c7ed2ef23b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 4 Feb 2019 16:48:34 +0000
Subject: [PATCH 466/832] Implement CacheContentIndex storage switching

This change enables transitioning to/from different Storage
implementations, to allow experimentally enabling (and if
necessary, disabling) SQLiteStorage. All that's left to do
is the final wiring to turn it on

PiperOrigin-RevId: 232304458
---
 .../upstream/cache/CachedContentIndex.java    | 161 +++++++++++++++---
 .../upstream/cache/SimpleCache.java           |   1 +
 .../android/exoplayer2/util/AtomicFile.java   |   5 +
 3 files changed, 142 insertions(+), 25 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
index e31c60e752..0888290e1b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
@@ -94,7 +94,8 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
    */
   private final SparseBooleanArray removedIds;
 
-  private final Storage storage;
+  private Storage storage;
+  @Nullable private Storage previousStorage;
 
   /**
    * Returns whether the file is an index file, or an auxiliary file associated with an index file
@@ -150,29 +151,42 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     idToKey = new SparseArray<>();
     removedIds = new SparseBooleanArray();
     Random random = new Random();
-    storage =
+    Storage atomicFileStorage =
         new AtomicFileStorage(
             new File(cacheDir, FILE_NAME_ATOMIC), random, encrypt, cipher, secretKeySpec);
-    // storage =
+    // Storage sqliteStorage =
     //     new SQLiteStorage(
-    //         new File(cacheDir, FILE_NAME_DATABASE),
-    //         random,
-    //         encrypt,
-    //         cipher,
-    //         secretKeySpec);
+    //         new File(cacheDir, FILE_NAME_DATABASE), random, encrypt, cipher, secretKeySpec);
+    storage = atomicFileStorage;
+    previousStorage = null;
   }
 
   /** Loads the index file. */
   public void load() {
-    if (!storage.load(keyToContent, idToKey)) {
-      keyToContent.clear();
-      idToKey.clear();
+    if (!storage.exists() && previousStorage != null && previousStorage.exists()) {
+      // Copy from previous storage into current storage.
+      loadFrom(previousStorage);
+      try {
+        storage.storeFully(keyToContent);
+      } catch (CacheException e) {
+        // We failed to copy into current storage, so keep using previous storage.
+        storage.release();
+        storage = previousStorage;
+        previousStorage = null;
+      }
+    } else {
+      // Load from the current storage.
+      loadFrom(storage);
+    }
+    if (previousStorage != null) {
+      previousStorage.release(/* delete= */ true);
+      previousStorage = null;
     }
   }
 
   /** Stores the index data to index file if there is a change. */
   public void store() throws CacheException {
-    storage.store(keyToContent);
+    storage.storeIncremental(keyToContent);
     // Make ids that were removed since the index was last stored eligible for re-use.
     int removedIdCount = removedIds.size();
     for (int i = 0; i < removedIdCount; i++) {
@@ -181,6 +195,14 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     removedIds.clear();
   }
 
+  /** Releases any underlying resources. */
+  public void release() {
+    storage.release();
+    if (previousStorage != null) {
+      previousStorage.release();
+    }
+  }
+
   /**
    * Adds the given key to the index if it isn't there already.
    *
@@ -267,6 +289,14 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     return cachedContent != null ? cachedContent.getMetadata() : DefaultContentMetadata.EMPTY;
   }
 
+  /** Loads the index from the specified storage. */
+  private void loadFrom(Storage storage) {
+    if (!storage.load(keyToContent, idToKey)) {
+      keyToContent.clear();
+      idToKey.clear();
+    }
+  }
+
   private CachedContent addNew(String key) {
     int id = getNewId(idToKey);
     CachedContent cachedContent = new CachedContent(id, key);
@@ -363,8 +393,20 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   /** Interface for the persistent index. */
   private interface Storage {
 
+    /** Returns whether the persisted index exists. */
+    boolean exists();
+
+    /** Releases any held resources. */
+    default void release() {
+      release(/* delete= */ false);
+    }
+
+    /** Releases and held resources and optionally deletes the persisted index. */
+    void release(boolean delete);
+
     /**
-     * Loads the persisted index into {@code content} and {@code idToKey}.
+     * Loads the persisted index into {@code content} and {@code idToKey}, creating it if it doesn't
+     * already exist.
      *
      * @param content The key to content map to populate with persisted data.
      * @param idToKey The id to key map to populate with persisted data.
@@ -373,22 +415,33 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     boolean load(HashMap<String, CachedContent> content, SparseArray<@NullableType String> idToKey);
 
     /**
-     * Ensures all changes in the in-memory table are persisted.
+     * Writes the persisted index, creating it if it doesn't already exist and replacing any
+     * existing content if it does.
      *
      * @param content The key to content map to persist.
      * @throws CacheException If an error occurs persisting the index.
      */
-    void store(HashMap<String, CachedContent> content) throws CacheException;
+    void storeFully(HashMap<String, CachedContent> content) throws CacheException;
 
     /**
-     * Called when a {@link CachedContent} is added or updated in the in-memory index.
+     * Ensures incremental changes to the index since the last {@link #load()} or {@link
+     * #storeFully(HashMap)} are persisted. The storage will have been notified of all such changes
+     * via {@link #onUpdate(CachedContent)} and {@link #onRemove(CachedContent)}.
+     *
+     * @param content The key to content map to persist.
+     * @throws CacheException If an error occurs persisting the index.
+     */
+    void storeIncremental(HashMap<String, CachedContent> content) throws CacheException;
+
+    /**
+     * Called when a {@link CachedContent} is added or updated.
      *
      * @param cachedContent The updated {@link CachedContent}.
      */
     void onUpdate(CachedContent cachedContent);
 
     /**
-     * Called when a {@link CachedContent} is removed from the in-memory index.
+     * Called when a {@link CachedContent} is removed.
      *
      * @param cachedContent The removed {@link CachedContent}.
      */
@@ -420,6 +473,18 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
       atomicFile = new AtomicFile(file);
     }
 
+    @Override
+    public boolean exists() {
+      return atomicFile.exists();
+    }
+
+    @Override
+    public void release(boolean delete) {
+      if (delete) {
+        atomicFile.delete();
+      }
+    }
+
     @Override
     public boolean load(
         HashMap<String, CachedContent> content, SparseArray<@NullableType String> idToKey) {
@@ -432,12 +497,17 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     }
 
     @Override
-    public void store(HashMap<String, CachedContent> content) throws CacheException {
+    public void storeFully(HashMap<String, CachedContent> content) throws CacheException {
+      writeFile(content);
+      changed = false;
+    }
+
+    @Override
+    public void storeIncremental(HashMap<String, CachedContent> content) throws CacheException {
       if (!changed) {
         return;
       }
-      writeFile(content);
-      changed = false;
+      storeFully(content);
     }
 
     @Override
@@ -637,11 +707,12 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 
     private static final int FLAG_ENCRYPTED = 1;
 
+    private final File file;
     private final Random random;
     private final boolean encrypt;
     @Nullable private final Cipher cipher;
     @Nullable private final SecretKeySpec secretKeySpec;
-    private final DatabaseProvider databaseProvider;
+    private final ExoDatabaseProvider databaseProvider;
     private final SparseArray<CachedContent> pendingUpdates;
 
     @Nullable private ReusableBufferedOutputStream bufferedOutputStream;
@@ -652,6 +723,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
         boolean encrypt,
         @Nullable Cipher cipher,
         @Nullable SecretKeySpec secretKeySpec) {
+      this.file = file;
       this.random = random;
       this.encrypt = encrypt;
       this.cipher = cipher;
@@ -660,9 +732,26 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
       pendingUpdates = new SparseArray<>();
     }
 
+    @Override
+    public boolean exists() {
+      return file.exists()
+          && VersionTable.getVersion(
+                  databaseProvider.getReadableDatabase(), VersionTable.FEATURE_CACHE)
+              != VersionTable.VERSION_UNSET;
+    }
+
+    @Override
+    public void release(boolean delete) {
+      release();
+      if (delete) {
+        SQLiteDatabase.deleteDatabase(file);
+      }
+    }
+
     @Override
     public boolean load(
         HashMap<String, CachedContent> content, SparseArray<@NullableType String> idToKey) {
+      Assertions.checkState(pendingUpdates.size() == 0);
       try {
         int version =
             VersionTable.getVersion(
@@ -671,9 +760,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
           SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
           writableDatabase.beginTransaction();
           try {
-            writableDatabase.execSQL(SQL_DROP_TABLE_IF_EXISTS);
-            writableDatabase.execSQL(SQL_CREATE_TABLE);
-            VersionTable.setVersion(writableDatabase, VersionTable.FEATURE_CACHE, TABLE_VERSION);
+            initializeTable(writableDatabase);
             writableDatabase.setTransactionSuccessful();
           } finally {
             writableDatabase.endTransaction();
@@ -717,7 +804,25 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     }
 
     @Override
-    public void store(HashMap<String, CachedContent> content) throws CacheException {
+    public void storeFully(HashMap<String, CachedContent> content) throws CacheException {
+      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+      writableDatabase.beginTransaction();
+      try {
+        initializeTable(writableDatabase);
+        for (CachedContent cachedContent : content.values()) {
+          addOrUpdateRow(writableDatabase, cachedContent);
+        }
+        writableDatabase.setTransactionSuccessful();
+        pendingUpdates.clear();
+      } catch (IOException | SQLiteException e) {
+        throw new CacheException(e);
+      } finally {
+        writableDatabase.endTransaction();
+      }
+    }
+
+    @Override
+    public void storeIncremental(HashMap<String, CachedContent> content) throws CacheException {
       if (pendingUpdates.size() == 0) {
         return;
       }
@@ -764,6 +869,12 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
               /* orderBy= */ null);
     }
 
+    private void initializeTable(SQLiteDatabase writableDatabase) {
+      VersionTable.setVersion(writableDatabase, VersionTable.FEATURE_CACHE, TABLE_VERSION);
+      writableDatabase.execSQL(SQL_DROP_TABLE_IF_EXISTS);
+      writableDatabase.execSQL(SQL_CREATE_TABLE);
+    }
+
     private void deleteRow(SQLiteDatabase writableDatabase, int key) {
       String[] selectionArgs = {Integer.toString(key)};
       writableDatabase.delete(TABLE_NAME, COLUMN_SELECTION_ID, selectionArgs);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index 75236ad9c7..d2091c362a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -157,6 +157,7 @@ public final class SimpleCache implements Cache {
     } catch (CacheException e) {
       Log.e(TAG, "Storing index file failed", e);
     } finally {
+      index.release();
       unlockFolder(cacheDir);
       released = true;
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java b/library/core/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java
index 2466d5a049..b7b6c05d82 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java
@@ -52,6 +52,11 @@ public final class AtomicFile {
     backupName = new File(baseName.getPath() + ".bak");
   }
 
+  /** Whether the file or its backup exists. */
+  public boolean exists() {
+    return baseName.exists() || backupName.exists();
+  }
+
   /** Delete the atomic file. This deletes both the base and backup files. */
   public void delete() {
     baseName.delete();

From a5d64463c781092f60664d9b86d9e0867dec0561 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Mon, 4 Feb 2019 17:03:12 +0000
Subject: [PATCH 467/832] Make DownloadTracker use DownloadIndex

DownloadTracker will stop updating DownloadIndex when DownloadManager
starts using the same DownloadIndex.

PiperOrigin-RevId: 232306803
---
 .../exoplayer2/demo/DemoApplication.java      | 22 ++++++--
 .../exoplayer2/demo/DownloadTracker.java      | 51 ++++++++++---------
 .../exoplayer2/offline/DownloadIndexUtil.java | 24 +--------
 .../exoplayer2/offline/DownloadState.java     | 28 ++++++++++
 .../offline/DownloadStateCursor.java          |  2 +-
 5 files changed, 74 insertions(+), 53 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
index 560a9be58a..27033bb03e 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
@@ -18,7 +18,11 @@ package com.google.android.exoplayer2.demo;
 import android.app.Application;
 import com.google.android.exoplayer2.DefaultRenderersFactory;
 import com.google.android.exoplayer2.RenderersFactory;
+import com.google.android.exoplayer2.database.ExoDatabaseProvider;
+import com.google.android.exoplayer2.offline.ActionFile;
+import com.google.android.exoplayer2.offline.DefaultDownloadIndex;
 import com.google.android.exoplayer2.offline.DefaultDownloaderFactory;
+import com.google.android.exoplayer2.offline.DownloadIndexUtil;
 import com.google.android.exoplayer2.offline.DownloadManager;
 import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
 import com.google.android.exoplayer2.upstream.DataSource;
@@ -31,14 +35,17 @@ import com.google.android.exoplayer2.upstream.cache.CacheDataSource;
 import com.google.android.exoplayer2.upstream.cache.CacheDataSourceFactory;
 import com.google.android.exoplayer2.upstream.cache.NoOpCacheEvictor;
 import com.google.android.exoplayer2.upstream.cache.SimpleCache;
+import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
 import java.io.File;
+import java.io.IOException;
 
 /**
  * Placeholder application to facilitate overriding Application methods for debugging and testing.
  */
 public class DemoApplication extends Application {
 
+  private static final String TAG = "DemoApplication";
   private static final String DOWNLOAD_ACTION_FILE = "actions";
   private static final String DOWNLOAD_TRACKER_ACTION_FILE = "tracked_actions";
   private static final String DOWNLOAD_CONTENT_DIRECTORY = "downloads";
@@ -97,6 +104,16 @@ public class DemoApplication extends Application {
 
   private synchronized void initDownloadManager() {
     if (downloadManager == null) {
+      DefaultDownloadIndex downloadIndex = new DefaultDownloadIndex(new ExoDatabaseProvider(this));
+      File actionFile = new File(getDownloadDirectory(), DOWNLOAD_TRACKER_ACTION_FILE);
+      if (actionFile.exists()) {
+        try {
+          DownloadIndexUtil.upgradeActionFile(new ActionFile(actionFile), downloadIndex, null);
+        } catch (IOException e) {
+          Log.e(TAG, "Upgrading action file failed", e);
+        }
+        actionFile.delete();
+      }
       DownloaderConstructorHelper downloaderConstructorHelper =
           new DownloaderConstructorHelper(getDownloadCache(), buildHttpDataSourceFactory());
       downloadManager =
@@ -108,10 +125,7 @@ public class DemoApplication extends Application {
               DownloadManager.DEFAULT_MIN_RETRY_COUNT,
               DownloadManager.DEFAULT_REQUIREMENTS);
       downloadTracker =
-          new DownloadTracker(
-              /* context= */ this,
-              buildDataSourceFactory(),
-              new File(getDownloadDirectory(), DOWNLOAD_TRACKER_ACTION_FILE));
+          new DownloadTracker(/* context= */ this, buildDataSourceFactory(), downloadIndex);
       downloadManager.addListener(downloadTracker);
     }
   }
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index 83c8a76812..689e7241f7 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -34,11 +34,13 @@ import android.widget.Toast;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.offline.ActionFile;
+import com.google.android.exoplayer2.offline.DefaultDownloadIndex;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadHelper;
 import com.google.android.exoplayer2.offline.DownloadManager;
 import com.google.android.exoplayer2.offline.DownloadService;
 import com.google.android.exoplayer2.offline.DownloadState;
+import com.google.android.exoplayer2.offline.DownloadStateCursor;
 import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.source.TrackGroupArray;
@@ -51,8 +53,8 @@ import com.google.android.exoplayer2.ui.TrackSelectionView;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
-import java.io.File;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -80,20 +82,21 @@ public class DownloadTracker implements DownloadManager.Listener {
   private final DataSource.Factory dataSourceFactory;
   private final TrackNameProvider trackNameProvider;
   private final CopyOnWriteArraySet<Listener> listeners;
-  private final HashMap<Uri, DownloadAction> trackedDownloadStates;
-  private final ActionFile actionFile;
-  private final Handler actionFileWriteHandler;
+  private final HashMap<Uri, DownloadState> trackedDownloadStates;
+  private final DefaultDownloadIndex downloadIndex;
+  private final Handler actionFileIOHandler;
 
-  public DownloadTracker(Context context, DataSource.Factory dataSourceFactory, File actionFile) {
+  public DownloadTracker(
+      Context context, DataSource.Factory dataSourceFactory, DefaultDownloadIndex downloadIndex) {
     this.context = context.getApplicationContext();
     this.dataSourceFactory = dataSourceFactory;
-    this.actionFile = new ActionFile(actionFile);
+    this.downloadIndex = downloadIndex;
     trackNameProvider = new DefaultTrackNameProvider(context.getResources());
     listeners = new CopyOnWriteArraySet<>();
     trackedDownloadStates = new HashMap<>();
     HandlerThread actionFileWriteThread = new HandlerThread("DownloadTracker");
     actionFileWriteThread.start();
-    actionFileWriteHandler = new Handler(actionFileWriteThread.getLooper());
+    actionFileIOHandler = new Handler(actionFileWriteThread.getLooper());
     loadTrackedActions();
   }
 
@@ -114,7 +117,7 @@ public class DownloadTracker implements DownloadManager.Listener {
     if (!trackedDownloadStates.containsKey(uri)) {
       return Collections.emptyList();
     }
-    return trackedDownloadStates.get(uri).getKeys();
+    return Arrays.asList(trackedDownloadStates.get(uri).streamKeys);
   }
 
   public void toggleDownload(
@@ -146,7 +149,7 @@ public class DownloadTracker implements DownloadManager.Listener {
         || downloadState.state == DownloadState.STATE_FAILED) {
       // A download has been removed, or has failed. Stop tracking it.
       if (trackedDownloadStates.remove(downloadState.uri) != null) {
-        handleTrackedDownloadStatesChanged();
+        handleTrackedDownloadStateChanged(downloadState);
       }
     }
   }
@@ -167,27 +170,24 @@ public class DownloadTracker implements DownloadManager.Listener {
   // Internal methods
 
   private void loadTrackedActions() {
-    try {
-      DownloadAction[] allActions = actionFile.load();
-      for (DownloadAction action : allActions) {
-        trackedDownloadStates.put(action.uri, action);
-      }
-    } catch (IOException e) {
-      Log.e(TAG, "Failed to load tracked actions", e);
+    DownloadStateCursor downloadStates = downloadIndex.getDownloadStates();
+    while (downloadStates.moveToNext()) {
+      DownloadState downloadState = downloadStates.getDownloadState();
+      trackedDownloadStates.put(downloadState.uri, downloadState);
     }
+    downloadStates.close();
   }
 
-  private void handleTrackedDownloadStatesChanged() {
+  private void handleTrackedDownloadStateChanged(DownloadState downloadState) {
     for (Listener listener : listeners) {
       listener.onDownloadsChanged();
     }
-    final DownloadAction[] actions = trackedDownloadStates.values().toArray(new DownloadAction[0]);
-    actionFileWriteHandler.post(
+    actionFileIOHandler.post(
         () -> {
-          try {
-            actionFile.store(actions);
-          } catch (IOException e) {
-            Log.e(TAG, "Failed to store tracked actions", e);
+          if (downloadState.state == DownloadState.STATE_REMOVED) {
+            downloadIndex.removeDownloadState(downloadState.id);
+          } else {
+            downloadIndex.putDownloadState(downloadState);
           }
         });
   }
@@ -197,8 +197,9 @@ public class DownloadTracker implements DownloadManager.Listener {
       // This content is already being downloaded. Do nothing.
       return;
     }
-    trackedDownloadStates.put(action.uri, action);
-    handleTrackedDownloadStatesChanged();
+    DownloadState downloadState = new DownloadState(action);
+    trackedDownloadStates.put(downloadState.uri, downloadState);
+    handleTrackedDownloadStateChanged(downloadState);
     startServiceWithAction(action);
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
index e0c914408b..0d6d2a36b5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
@@ -81,7 +81,7 @@ public final class DownloadIndexUtil {
     if (downloadState != null) {
       downloadState = merge(downloadState, action);
     } else {
-      downloadState = convert(action);
+      downloadState = new DownloadState(action);
     }
     downloadIndex.putDownloadState(downloadState);
   }
@@ -121,26 +121,4 @@ public final class DownloadIndexUtil {
         newKeys,
         action.data);
   }
-
-  private static DownloadState convert(DownloadAction action) {
-    long currentTimeMs = System.currentTimeMillis();
-    return new DownloadState(
-        action.id,
-        action.type,
-        action.uri,
-        action.customCacheKey,
-        /* state= */ action.isRemoveAction
-            ? DownloadState.STATE_REMOVING
-            : DownloadState.STATE_QUEUED,
-        /* downloadPercentage= */ C.PERCENTAGE_UNSET,
-        /* downloadedBytes= */ 0,
-        /* totalBytes= */ C.LENGTH_UNSET,
-        DownloadState.FAILURE_REASON_NONE,
-        /* stopFlags= */ 0,
-        /* notMetRequirements= */ 0,
-        /* startTimeMs= */ currentTimeMs,
-        /* updateTimeMs= */ currentTimeMs,
-        action.keys.toArray(new StreamKey[0]),
-        action.data);
-  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
index f5b3287b32..c59b7b87b6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
@@ -164,6 +164,34 @@ public final class DownloadState {
   /** Not met requirements to download. */
   @Requirements.RequirementFlags public final int notMetRequirements;
 
+  /**
+   * Creates a {@link DownloadState} using a {@link DownloadAction}.
+   *
+   * @param action The {@link DownloadAction}.
+   */
+  public DownloadState(DownloadAction action) {
+    this(action, System.currentTimeMillis());
+  }
+
+  private DownloadState(DownloadAction action, long currentTimeMs) {
+    this(
+        action.id,
+        action.type,
+        action.uri,
+        action.customCacheKey,
+        /* state= */ action.isRemoveAction ? STATE_REMOVING : STATE_QUEUED,
+        /* downloadPercentage= */ C.PERCENTAGE_UNSET,
+        /* downloadedBytes= */ 0,
+        /* totalBytes= */ C.LENGTH_UNSET,
+        FAILURE_REASON_NONE,
+        /* stopFlags= */ 0,
+        /* notMetRequirements= */ 0,
+        /* startTimeMs= */ currentTimeMs,
+        /* updateTimeMs= */ currentTimeMs,
+        action.keys.toArray(new StreamKey[0]),
+        action.data);
+  }
+
   /* package */ DownloadState(
       String id,
       String type,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadStateCursor.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadStateCursor.java
index 680976c77b..06511c8930 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadStateCursor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadStateCursor.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.offline;
 
 /** Provides random read-write access to the result set returned by a database query. */
-interface DownloadStateCursor {
+public interface DownloadStateCursor {
 
   /** Returns the DownloadState at the current position. */
   DownloadState getDownloadState();

From cd536a73b19f41d25846ae6cbc57443547043a71 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 4 Feb 2019 17:39:35 +0000
Subject: [PATCH 468/832] Add missing removeCallbacksAndMessages to
 RobolectricUtil.

The Util class already handles removeMessages calls but so far ignored calls
to removeCallbacksAndMessages.

PiperOrigin-RevId: 232312458
---
 .../exoplayer2/testutil/RobolectricUtil.java        | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/RobolectricUtil.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/RobolectricUtil.java
index dc7781fd90..1e7f09bacf 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/RobolectricUtil.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/RobolectricUtil.java
@@ -37,6 +37,7 @@ import org.robolectric.shadows.ShadowMessageQueue;
 public final class RobolectricUtil {
 
   private static final AtomicLong sequenceNumberGenerator = new AtomicLong(0);
+  private static final int ANY_MESSAGE = Integer.MIN_VALUE;
 
   private RobolectricUtil() {}
 
@@ -110,7 +111,8 @@ public final class RobolectricUtil {
             boolean isRemoved = false;
             for (RemovedMessage removedMessage : removedMessages) {
               if (removedMessage.handler == target
-                  && removedMessage.what == pendingMessage.message.what
+                  && (removedMessage.what == ANY_MESSAGE
+                      || removedMessage.what == pendingMessage.message.what)
                   && (removedMessage.object == null
                       || removedMessage.object == pendingMessage.message.obj)
                   && pendingMessage.sequenceNumber < removedMessage.sequenceNumber) {
@@ -179,6 +181,15 @@ public final class RobolectricUtil {
         ((CustomLooper) shadowOf(looper)).removeMessages(handler, what, object);
       }
     }
+
+    @Implementation
+    public void removeCallbacksAndMessages(Handler handler, Object object) {
+      Looper looper = ShadowLooper.getLooperForThread(looperThread);
+      if (shadowOf(looper) instanceof CustomLooper
+          && shadowOf(looper) != ShadowLooper.getShadowMainLooper()) {
+        ((CustomLooper) shadowOf(looper)).removeMessages(handler, ANY_MESSAGE, object);
+      }
+    }
   }
 
   private static final class PendingMessage implements Comparable<PendingMessage> {

From 7a4cf96f4a91a51c42a83e0ba70eed6a2d5d9199 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 4 Feb 2019 17:40:01 +0000
Subject: [PATCH 469/832] Improve housekeeping of ConcatenatingMediaSource
 callbacks.

When calling releaseSource(), all pending messages will be removed. That means
that all action-on-completion callbacks which are somewhere in flight are
just dropped without being called. This change adds code to keep track of the
current state of each callback to allow all of them being called when the
source is released.

Issue:#5464
PiperOrigin-RevId: 232312528
---
 RELEASENOTES.md                               |   2 +
 .../source/ConcatenatingMediaSource.java      | 266 +++++++++++-------
 .../source/ConcatenatingMediaSourceTest.java  |  40 ++-
 3 files changed, 192 insertions(+), 116 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 98f8e85857..9ec6015240 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -58,6 +58,8 @@
 * OkHttp extension: Upgrade OkHttp dependency to 3.12.1.
 * MP3: Wider fix for issue where streams would play twice on some Samsung
   devices ([#4519](https://github.com/google/ExoPlayer/issues/4519)).
+* Fix issue with dropped messages when releasing a `ConcatenatingMediaSource`
+  ([#5464](https://github.com/google/ExoPlayer/issues/5464)).
 
 ### 2.9.4 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
index 6dc7a0a327..d223f653e1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
@@ -28,7 +28,6 @@ import com.google.android.exoplayer2.source.ShuffleOrder.DefaultShuffleOrder;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.upstream.TransferListener;
 import com.google.android.exoplayer2.util.Assertions;
-import com.google.android.exoplayer2.util.EventDispatcher;
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -36,9 +35,11 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * Concatenates multiple {@link MediaSource}s. The list of {@link MediaSource}s can be modified
@@ -51,12 +52,19 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
   private static final int MSG_REMOVE = 1;
   private static final int MSG_MOVE = 2;
   private static final int MSG_SET_SHUFFLE_ORDER = 3;
-  private static final int MSG_NOTIFY_LISTENER = 4;
+  private static final int MSG_UPDATE_TIMELINE = 4;
   private static final int MSG_ON_COMPLETION = 5;
 
   // Accessed on any thread.
+  @GuardedBy("this")
   private final List<MediaSourceHolder> mediaSourcesPublic;
-  @Nullable private Handler playbackThreadHandler;
+
+  @GuardedBy("this")
+  private final Set<HandlerAndRunnable> pendingOnCompletionActions;
+
+  @GuardedBy("this")
+  @Nullable
+  private Handler playbackThreadHandler;
 
   // Accessed on the playback thread only.
   private final List<MediaSourceHolder> mediaSourceHolders;
@@ -67,8 +75,8 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
   private final Timeline.Window window;
   private final Timeline.Period period;
 
-  private boolean listenerNotificationScheduled;
-  private EventDispatcher<Runnable> pendingOnCompletionActions;
+  private boolean timelineUpdateScheduled;
+  private Set<HandlerAndRunnable> nextTimelineUpdateOnCompletionActions;
   private ShuffleOrder shuffleOrder;
   private int windowCount;
   private int periodCount;
@@ -127,7 +135,8 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
     this.mediaSourceByUid = new HashMap<>();
     this.mediaSourcesPublic = new ArrayList<>();
     this.mediaSourceHolders = new ArrayList<>();
-    this.pendingOnCompletionActions = new EventDispatcher<>();
+    this.nextTimelineUpdateOnCompletionActions = new HashSet<>();
+    this.pendingOnCompletionActions = new HashSet<>();
     this.isAtomic = isAtomic;
     this.useLazyPreparation = useLazyPreparation;
     window = new Timeline.Window();
@@ -148,13 +157,13 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
    * Appends a {@link MediaSource} to the playlist and executes a custom action on completion.
    *
    * @param mediaSource The {@link MediaSource} to be added to the list.
-   * @param handler The {@link Handler} to run {@code actionOnCompletion}.
-   * @param actionOnCompletion A {@link Runnable} which is executed immediately after the media
+   * @param handler The {@link Handler} to run {@code onCompletionAction}.
+   * @param onCompletionAction A {@link Runnable} which is executed immediately after the media
    *     source has been added to the playlist.
    */
   public final synchronized void addMediaSource(
-      MediaSource mediaSource, Handler handler, Runnable actionOnCompletion) {
-    addMediaSource(mediaSourcesPublic.size(), mediaSource, handler, actionOnCompletion);
+      MediaSource mediaSource, Handler handler, Runnable onCompletionAction) {
+    addMediaSource(mediaSourcesPublic.size(), mediaSource, handler, onCompletionAction);
   }
 
   /**
@@ -169,7 +178,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
         index,
         Collections.singletonList(mediaSource),
         /* handler= */ null,
-        /* actionOnCompletion= */ null);
+        /* onCompletionAction= */ null);
   }
 
   /**
@@ -178,14 +187,14 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
    * @param index The index at which the new {@link MediaSource} will be inserted. This index must
    *     be in the range of 0 &lt;= index &lt;= {@link #getSize()}.
    * @param mediaSource The {@link MediaSource} to be added to the list.
-   * @param handler The {@link Handler} to run {@code actionOnCompletion}.
-   * @param actionOnCompletion A {@link Runnable} which is executed immediately after the media
+   * @param handler The {@link Handler} to run {@code onCompletionAction}.
+   * @param onCompletionAction A {@link Runnable} which is executed immediately after the media
    *     source has been added to the playlist.
    */
   public final synchronized void addMediaSource(
-      int index, MediaSource mediaSource, Handler handler, Runnable actionOnCompletion) {
+      int index, MediaSource mediaSource, Handler handler, Runnable onCompletionAction) {
     addPublicMediaSources(
-        index, Collections.singletonList(mediaSource), handler, actionOnCompletion);
+        index, Collections.singletonList(mediaSource), handler, onCompletionAction);
   }
 
   /**
@@ -199,7 +208,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
         mediaSourcesPublic.size(),
         mediaSources,
         /* handler= */ null,
-        /* actionOnCompletion= */ null);
+        /* onCompletionAction= */ null);
   }
 
   /**
@@ -208,13 +217,13 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
    *
    * @param mediaSources A collection of {@link MediaSource}s to be added to the list. The media
    *     sources are added in the order in which they appear in this collection.
-   * @param handler The {@link Handler} to run {@code actionOnCompletion}.
-   * @param actionOnCompletion A {@link Runnable} which is executed immediately after the media
+   * @param handler The {@link Handler} to run {@code onCompletionAction}.
+   * @param onCompletionAction A {@link Runnable} which is executed immediately after the media
    *     sources have been added to the playlist.
    */
   public final synchronized void addMediaSources(
-      Collection<MediaSource> mediaSources, Handler handler, Runnable actionOnCompletion) {
-    addPublicMediaSources(mediaSourcesPublic.size(), mediaSources, handler, actionOnCompletion);
+      Collection<MediaSource> mediaSources, Handler handler, Runnable onCompletionAction) {
+    addPublicMediaSources(mediaSourcesPublic.size(), mediaSources, handler, onCompletionAction);
   }
 
   /**
@@ -226,7 +235,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
    *     sources are added in the order in which they appear in this collection.
    */
   public final synchronized void addMediaSources(int index, Collection<MediaSource> mediaSources) {
-    addPublicMediaSources(index, mediaSources, /* handler= */ null, /* actionOnCompletion= */ null);
+    addPublicMediaSources(index, mediaSources, /* handler= */ null, /* onCompletionAction= */ null);
   }
 
   /**
@@ -236,16 +245,16 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
    *     be in the range of 0 &lt;= index &lt;= {@link #getSize()}.
    * @param mediaSources A collection of {@link MediaSource}s to be added to the list. The media
    *     sources are added in the order in which they appear in this collection.
-   * @param handler The {@link Handler} to run {@code actionOnCompletion}.
-   * @param actionOnCompletion A {@link Runnable} which is executed immediately after the media
+   * @param handler The {@link Handler} to run {@code onCompletionAction}.
+   * @param onCompletionAction A {@link Runnable} which is executed immediately after the media
    *     sources have been added to the playlist.
    */
   public final synchronized void addMediaSources(
       int index,
       Collection<MediaSource> mediaSources,
       Handler handler,
-      Runnable actionOnCompletion) {
-    addPublicMediaSources(index, mediaSources, handler, actionOnCompletion);
+      Runnable onCompletionAction) {
+    addPublicMediaSources(index, mediaSources, handler, onCompletionAction);
   }
 
   /**
@@ -261,7 +270,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
    *     range of 0 &lt;= index &lt; {@link #getSize()}.
    */
   public final synchronized void removeMediaSource(int index) {
-    removePublicMediaSources(index, index + 1, /* handler= */ null, /* actionOnCompletion= */ null);
+    removePublicMediaSources(index, index + 1, /* handler= */ null, /* onCompletionAction= */ null);
   }
 
   /**
@@ -275,13 +284,13 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
    *
    * @param index The index at which the media source will be removed. This index must be in the
    *     range of 0 &lt;= index &lt; {@link #getSize()}.
-   * @param handler The {@link Handler} to run {@code actionOnCompletion}.
-   * @param actionOnCompletion A {@link Runnable} which is executed immediately after the media
+   * @param handler The {@link Handler} to run {@code onCompletionAction}.
+   * @param onCompletionAction A {@link Runnable} which is executed immediately after the media
    *     source has been removed from the playlist.
    */
   public final synchronized void removeMediaSource(
-      int index, Handler handler, Runnable actionOnCompletion) {
-    removePublicMediaSources(index, index + 1, handler, actionOnCompletion);
+      int index, Handler handler, Runnable onCompletionAction) {
+    removePublicMediaSources(index, index + 1, handler, onCompletionAction);
   }
 
   /**
@@ -300,7 +309,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
    */
   public final synchronized void removeMediaSourceRange(int fromIndex, int toIndex) {
     removePublicMediaSources(
-        fromIndex, toIndex, /* handler= */ null, /* actionOnCompletion= */ null);
+        fromIndex, toIndex, /* handler= */ null, /* onCompletionAction= */ null);
   }
 
   /**
@@ -314,15 +323,15 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
    *     removed. This index must be in the range of 0 &lt;= index &lt;= {@link #getSize()}.
    * @param toIndex The final range index, pointing to the first media source that will be left
    *     untouched. This index must be in the range of 0 &lt;= index &lt;= {@link #getSize()}.
-   * @param handler The {@link Handler} to run {@code actionOnCompletion}.
-   * @param actionOnCompletion A {@link Runnable} which is executed immediately after the media
+   * @param handler The {@link Handler} to run {@code onCompletionAction}.
+   * @param onCompletionAction A {@link Runnable} which is executed immediately after the media
    *     source range has been removed from the playlist.
    * @throws IllegalArgumentException When the range is malformed, i.e. {@code fromIndex} &lt; 0,
    *     {@code toIndex} &gt; {@link #getSize()}, {@code fromIndex} &gt; {@code toIndex}
    */
   public final synchronized void removeMediaSourceRange(
-      int fromIndex, int toIndex, Handler handler, Runnable actionOnCompletion) {
-    removePublicMediaSources(fromIndex, toIndex, handler, actionOnCompletion);
+      int fromIndex, int toIndex, Handler handler, Runnable onCompletionAction) {
+    removePublicMediaSources(fromIndex, toIndex, handler, onCompletionAction);
   }
 
   /**
@@ -335,7 +344,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
    */
   public final synchronized void moveMediaSource(int currentIndex, int newIndex) {
     movePublicMediaSource(
-        currentIndex, newIndex, /* handler= */ null, /* actionOnCompletion= */ null);
+        currentIndex, newIndex, /* handler= */ null, /* onCompletionAction= */ null);
   }
 
   /**
@@ -346,13 +355,13 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
    *     in the range of 0 &lt;= index &lt; {@link #getSize()}.
    * @param newIndex The target index of the media source in the playlist. This index must be in the
    *     range of 0 &lt;= index &lt; {@link #getSize()}.
-   * @param handler The {@link Handler} to run {@code actionOnCompletion}.
-   * @param actionOnCompletion A {@link Runnable} which is executed immediately after the media
+   * @param handler The {@link Handler} to run {@code onCompletionAction}.
+   * @param onCompletionAction A {@link Runnable} which is executed immediately after the media
    *     source has been moved.
    */
   public final synchronized void moveMediaSource(
-      int currentIndex, int newIndex, Handler handler, Runnable actionOnCompletion) {
-    movePublicMediaSource(currentIndex, newIndex, handler, actionOnCompletion);
+      int currentIndex, int newIndex, Handler handler, Runnable onCompletionAction) {
+    movePublicMediaSource(currentIndex, newIndex, handler, onCompletionAction);
   }
 
   /** Clears the playlist. */
@@ -363,12 +372,12 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
   /**
    * Clears the playlist and executes a custom action on completion.
    *
-   * @param handler The {@link Handler} to run {@code actionOnCompletion}.
-   * @param actionOnCompletion A {@link Runnable} which is executed immediately after the playlist
+   * @param handler The {@link Handler} to run {@code onCompletionAction}.
+   * @param onCompletionAction A {@link Runnable} which is executed immediately after the playlist
    *     has been cleared.
    */
-  public final synchronized void clear(Handler handler, Runnable actionOnCompletion) {
-    removeMediaSourceRange(0, getSize(), handler, actionOnCompletion);
+  public final synchronized void clear(Handler handler, Runnable onCompletionAction) {
+    removeMediaSourceRange(0, getSize(), handler, onCompletionAction);
   }
 
   /** Returns the number of media sources in the playlist. */
@@ -392,20 +401,20 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
    * @param shuffleOrder A {@link ShuffleOrder}.
    */
   public final synchronized void setShuffleOrder(ShuffleOrder shuffleOrder) {
-    setPublicShuffleOrder(shuffleOrder, /* handler= */ null, /* actionOnCompletion= */ null);
+    setPublicShuffleOrder(shuffleOrder, /* handler= */ null, /* onCompletionAction= */ null);
   }
 
   /**
    * Sets a new shuffle order to use when shuffling the child media sources.
    *
    * @param shuffleOrder A {@link ShuffleOrder}.
-   * @param handler The {@link Handler} to run {@code actionOnCompletion}.
-   * @param actionOnCompletion A {@link Runnable} which is executed immediately after the shuffle
+   * @param handler The {@link Handler} to run {@code onCompletionAction}.
+   * @param onCompletionAction A {@link Runnable} which is executed immediately after the shuffle
    *     order has been changed.
    */
   public final synchronized void setShuffleOrder(
-      ShuffleOrder shuffleOrder, Handler handler, Runnable actionOnCompletion) {
-    setPublicShuffleOrder(shuffleOrder, handler, actionOnCompletion);
+      ShuffleOrder shuffleOrder, Handler handler, Runnable onCompletionAction) {
+    setPublicShuffleOrder(shuffleOrder, handler, onCompletionAction);
   }
 
   // CompositeMediaSource implementation.
@@ -422,11 +431,11 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
     super.prepareSourceInternal(mediaTransferListener);
     playbackThreadHandler = new Handler(/* callback= */ this::handleMessage);
     if (mediaSourcesPublic.isEmpty()) {
-      notifyListener();
+      updateTimelineAndScheduleOnCompletionActions();
     } else {
       shuffleOrder = shuffleOrder.cloneAndInsert(0, mediaSourcesPublic.size());
       addMediaSourcesInternal(0, mediaSourcesPublic);
-      scheduleListenerNotification();
+      scheduleTimelineUpdate();
     }
   }
 
@@ -482,6 +491,9 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
       playbackThreadHandler.removeCallbacksAndMessages(null);
       playbackThreadHandler = null;
     }
+    timelineUpdateScheduled = false;
+    nextTimelineUpdateOnCompletionActions.clear();
+    dispatchOnCompletionActions(pendingOnCompletionActions);
   }
 
   @Override
@@ -521,8 +533,9 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
       int index,
       Collection<MediaSource> mediaSources,
       @Nullable Handler handler,
-      @Nullable Runnable actionOnCompletion) {
-    Assertions.checkArgument((handler == null) == (actionOnCompletion == null));
+      @Nullable Runnable onCompletionAction) {
+    Assertions.checkArgument((handler == null) == (onCompletionAction == null));
+    Handler playbackThreadHandler = this.playbackThreadHandler;
     for (MediaSource mediaSource : mediaSources) {
       Assertions.checkNotNull(mediaSource);
     }
@@ -532,12 +545,12 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
     }
     mediaSourcesPublic.addAll(index, mediaSourceHolders);
     if (playbackThreadHandler != null && !mediaSources.isEmpty()) {
+      HandlerAndRunnable callbackAction = createOnCompletionAction(handler, onCompletionAction);
       playbackThreadHandler
-          .obtainMessage(
-              MSG_ADD, new MessageData<>(index, mediaSourceHolders, handler, actionOnCompletion))
+          .obtainMessage(MSG_ADD, new MessageData<>(index, mediaSourceHolders, callbackAction))
           .sendToTarget();
-    } else if (actionOnCompletion != null && handler != null) {
-      handler.post(actionOnCompletion);
+    } else if (onCompletionAction != null && handler != null) {
+      handler.post(onCompletionAction);
     }
   }
 
@@ -546,16 +559,17 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
       int fromIndex,
       int toIndex,
       @Nullable Handler handler,
-      @Nullable Runnable actionOnCompletion) {
-    Assertions.checkArgument((handler == null) == (actionOnCompletion == null));
+      @Nullable Runnable onCompletionAction) {
+    Assertions.checkArgument((handler == null) == (onCompletionAction == null));
+    Handler playbackThreadHandler = this.playbackThreadHandler;
     Util.removeRange(mediaSourcesPublic, fromIndex, toIndex);
     if (playbackThreadHandler != null) {
+      HandlerAndRunnable callbackAction = createOnCompletionAction(handler, onCompletionAction);
       playbackThreadHandler
-          .obtainMessage(
-              MSG_REMOVE, new MessageData<>(fromIndex, toIndex, handler, actionOnCompletion))
+          .obtainMessage(MSG_REMOVE, new MessageData<>(fromIndex, toIndex, callbackAction))
           .sendToTarget();
-    } else if (actionOnCompletion != null && handler != null) {
-      handler.post(actionOnCompletion);
+    } else if (onCompletionAction != null && handler != null) {
+      handler.post(onCompletionAction);
     }
   }
 
@@ -564,23 +578,24 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
       int currentIndex,
       int newIndex,
       @Nullable Handler handler,
-      @Nullable Runnable actionOnCompletion) {
-    Assertions.checkArgument((handler == null) == (actionOnCompletion == null));
+      @Nullable Runnable onCompletionAction) {
+    Assertions.checkArgument((handler == null) == (onCompletionAction == null));
+    Handler playbackThreadHandler = this.playbackThreadHandler;
     mediaSourcesPublic.add(newIndex, mediaSourcesPublic.remove(currentIndex));
     if (playbackThreadHandler != null) {
+      HandlerAndRunnable callbackAction = createOnCompletionAction(handler, onCompletionAction);
       playbackThreadHandler
-          .obtainMessage(
-              MSG_MOVE, new MessageData<>(currentIndex, newIndex, handler, actionOnCompletion))
+          .obtainMessage(MSG_MOVE, new MessageData<>(currentIndex, newIndex, callbackAction))
           .sendToTarget();
-    } else if (actionOnCompletion != null && handler != null) {
-      handler.post(actionOnCompletion);
+    } else if (onCompletionAction != null && handler != null) {
+      handler.post(onCompletionAction);
     }
   }
 
   @GuardedBy("this")
   private void setPublicShuffleOrder(
-      ShuffleOrder shuffleOrder, @Nullable Handler handler, @Nullable Runnable actionOnCompletion) {
-    Assertions.checkArgument((handler == null) == (actionOnCompletion == null));
+      ShuffleOrder shuffleOrder, @Nullable Handler handler, @Nullable Runnable onCompletionAction) {
+    Assertions.checkArgument((handler == null) == (onCompletionAction == null));
     Handler playbackThreadHandler = this.playbackThreadHandler;
     if (playbackThreadHandler != null) {
       int size = getSize();
@@ -590,20 +605,33 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
                 .cloneAndClear()
                 .cloneAndInsert(/* insertionIndex= */ 0, /* insertionCount= */ size);
       }
+      HandlerAndRunnable callbackAction = createOnCompletionAction(handler, onCompletionAction);
       playbackThreadHandler
           .obtainMessage(
               MSG_SET_SHUFFLE_ORDER,
-              new MessageData<>(/* index= */ 0, shuffleOrder, handler, actionOnCompletion))
+              new MessageData<>(/* index= */ 0, shuffleOrder, callbackAction))
           .sendToTarget();
     } else {
       this.shuffleOrder =
           shuffleOrder.getLength() > 0 ? shuffleOrder.cloneAndClear() : shuffleOrder;
-      if (actionOnCompletion != null && handler != null) {
-        handler.post(actionOnCompletion);
+      if (onCompletionAction != null && handler != null) {
+        handler.post(onCompletionAction);
       }
     }
   }
 
+  @GuardedBy("this")
+  @Nullable
+  private HandlerAndRunnable createOnCompletionAction(
+      @Nullable Handler handler, @Nullable Runnable runnable) {
+    if (handler == null || runnable == null) {
+      return null;
+    }
+    HandlerAndRunnable handlerAndRunnable = new HandlerAndRunnable(handler, runnable);
+    pendingOnCompletionActions.add(handlerAndRunnable);
+    return handlerAndRunnable;
+  }
+
   // Internal methods. Called on the playback thread.
 
   @SuppressWarnings("unchecked")
@@ -614,7 +642,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
             (MessageData<Collection<MediaSourceHolder>>) Util.castNonNull(msg.obj);
         shuffleOrder = shuffleOrder.cloneAndInsert(addMessage.index, addMessage.customData.size());
         addMediaSourcesInternal(addMessage.index, addMessage.customData);
-        scheduleListenerNotification(addMessage.handler, addMessage.actionOnCompletion);
+        scheduleTimelineUpdate(addMessage.onCompletionAction);
         break;
       case MSG_REMOVE:
         MessageData<Integer> removeMessage = (MessageData<Integer>) Util.castNonNull(msg.obj);
@@ -628,29 +656,27 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
         for (int index = toIndex - 1; index >= fromIndex; index--) {
           removeMediaSourceInternal(index);
         }
-        scheduleListenerNotification(removeMessage.handler, removeMessage.actionOnCompletion);
+        scheduleTimelineUpdate(removeMessage.onCompletionAction);
         break;
       case MSG_MOVE:
         MessageData<Integer> moveMessage = (MessageData<Integer>) Util.castNonNull(msg.obj);
         shuffleOrder = shuffleOrder.cloneAndRemove(moveMessage.index, moveMessage.index + 1);
         shuffleOrder = shuffleOrder.cloneAndInsert(moveMessage.customData, 1);
         moveMediaSourceInternal(moveMessage.index, moveMessage.customData);
-        scheduleListenerNotification(moveMessage.handler, moveMessage.actionOnCompletion);
+        scheduleTimelineUpdate(moveMessage.onCompletionAction);
         break;
       case MSG_SET_SHUFFLE_ORDER:
         MessageData<ShuffleOrder> shuffleOrderMessage =
             (MessageData<ShuffleOrder>) Util.castNonNull(msg.obj);
         shuffleOrder = shuffleOrderMessage.customData;
-        scheduleListenerNotification(
-            shuffleOrderMessage.handler, shuffleOrderMessage.actionOnCompletion);
+        scheduleTimelineUpdate(shuffleOrderMessage.onCompletionAction);
         break;
-      case MSG_NOTIFY_LISTENER:
-        notifyListener();
+      case MSG_UPDATE_TIMELINE:
+        updateTimelineAndScheduleOnCompletionActions();
         break;
       case MSG_ON_COMPLETION:
-        EventDispatcher<Runnable> actionsOnCompletion =
-            (EventDispatcher<Runnable>) Util.castNonNull(msg.obj);
-        actionsOnCompletion.dispatch(Runnable::run);
+        Set<HandlerAndRunnable> actions = (Set<HandlerAndRunnable>) Util.castNonNull(msg.obj);
+        dispatchOnCompletionActions(actions);
         break;
       default:
         throw new IllegalStateException();
@@ -658,36 +684,48 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
     return true;
   }
 
-  private void scheduleListenerNotification() {
-    scheduleListenerNotification(/* handler= */ null, /* actionOnCompletion= */ null);
+  private void scheduleTimelineUpdate() {
+    scheduleTimelineUpdate(/* onCompletionAction= */ null);
   }
 
-  private void scheduleListenerNotification(
-      @Nullable Handler handler, @Nullable Runnable actionOnCompletion) {
-    if (!listenerNotificationScheduled) {
-      Assertions.checkNotNull(playbackThreadHandler)
-          .obtainMessage(MSG_NOTIFY_LISTENER)
-          .sendToTarget();
-      listenerNotificationScheduled = true;
+  private void scheduleTimelineUpdate(@Nullable HandlerAndRunnable onCompletionAction) {
+    if (!timelineUpdateScheduled) {
+      getPlaybackThreadHandlerOnPlaybackThread().obtainMessage(MSG_UPDATE_TIMELINE).sendToTarget();
+      timelineUpdateScheduled = true;
     }
-    if (actionOnCompletion != null && handler != null) {
-      pendingOnCompletionActions.addListener(handler, actionOnCompletion);
+    if (onCompletionAction != null) {
+      nextTimelineUpdateOnCompletionActions.add(onCompletionAction);
     }
   }
 
-  private void notifyListener() {
-    listenerNotificationScheduled = false;
-    EventDispatcher<Runnable> actionsOnCompletion = pendingOnCompletionActions;
-    pendingOnCompletionActions = new EventDispatcher<>();
+  private void updateTimelineAndScheduleOnCompletionActions() {
+    timelineUpdateScheduled = false;
+    Set<HandlerAndRunnable> onCompletionActions = nextTimelineUpdateOnCompletionActions;
+    nextTimelineUpdateOnCompletionActions = new HashSet<>();
     refreshSourceInfo(
         new ConcatenatedTimeline(
             mediaSourceHolders, windowCount, periodCount, shuffleOrder, isAtomic),
         /* manifest= */ null);
-    Assertions.checkNotNull(playbackThreadHandler)
-        .obtainMessage(MSG_ON_COMPLETION, actionsOnCompletion)
+    getPlaybackThreadHandlerOnPlaybackThread()
+        .obtainMessage(MSG_ON_COMPLETION, onCompletionActions)
         .sendToTarget();
   }
 
+  @SuppressWarnings("GuardedBy")
+  private Handler getPlaybackThreadHandlerOnPlaybackThread() {
+    // Write access to this value happens on the playback thread only, so playback thread reads
+    // don't need to be synchronized.
+    return Assertions.checkNotNull(playbackThreadHandler);
+  }
+
+  private synchronized void dispatchOnCompletionActions(
+      Set<HandlerAndRunnable> onCompletionActions) {
+    for (HandlerAndRunnable pendingAction : onCompletionActions) {
+      pendingAction.dispatch();
+    }
+    pendingOnCompletionActions.removeAll(onCompletionActions);
+  }
+
   private void addMediaSourcesInternal(
       int index, Collection<MediaSourceHolder> mediaSourceHolders) {
     for (MediaSourceHolder mediaSourceHolder : mediaSourceHolders) {
@@ -784,7 +822,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
       }
     }
     mediaSourceHolder.isPrepared = true;
-    scheduleListenerNotification();
+    scheduleTimelineUpdate();
   }
 
   private void removeMediaSourceInternal(int index) {
@@ -897,15 +935,12 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
 
     public final int index;
     public final T customData;
-    @Nullable public final Handler handler;
-    @Nullable public final Runnable actionOnCompletion;
+    @Nullable public final HandlerAndRunnable onCompletionAction;
 
-    public MessageData(
-        int index, T customData, @Nullable Handler handler, @Nullable Runnable actionOnCompletion) {
+    public MessageData(int index, T customData, @Nullable HandlerAndRunnable onCompletionAction) {
       this.index = index;
       this.customData = customData;
-      this.handler = handler;
-      this.actionOnCompletion = actionOnCompletion;
+      this.onCompletionAction = onCompletionAction;
     }
   }
 
@@ -1155,5 +1190,20 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
       // Do nothing.
     }
   }
+
+  private static final class HandlerAndRunnable {
+
+    private final Handler handler;
+    private final Runnable runnable;
+
+    public HandlerAndRunnable(Handler handler, Runnable runnable) {
+      this.handler = handler;
+      this.runnable = runnable;
+    }
+
+    public void dispatch() {
+      handler.post(runnable);
+    }
+  }
 }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
index bb86c6186d..2665b61f8a 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.source;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
 import android.os.ConditionVariable;
@@ -25,6 +26,7 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
+import com.google.android.exoplayer2.source.MediaSource.SourceInfoRefreshListener;
 import com.google.android.exoplayer2.source.ShuffleOrder.DefaultShuffleOrder;
 import com.google.android.exoplayer2.testutil.DummyMainThread;
 import com.google.android.exoplayer2.testutil.FakeMediaSource;
@@ -42,7 +44,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mockito;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
@@ -416,7 +417,7 @@ public final class ConcatenatingMediaSourceTest {
 
   @Test
   public void testCustomCallbackBeforePreparationAddSingle() {
-    Runnable runnable = Mockito.mock(Runnable.class);
+    Runnable runnable = mock(Runnable.class);
 
     mediaSource.addMediaSource(createFakeMediaSource(), new Handler(), runnable);
     verify(runnable).run();
@@ -424,7 +425,7 @@ public final class ConcatenatingMediaSourceTest {
 
   @Test
   public void testCustomCallbackBeforePreparationAddMultiple() {
-    Runnable runnable = Mockito.mock(Runnable.class);
+    Runnable runnable = mock(Runnable.class);
 
     mediaSource.addMediaSources(
         Arrays.asList(new MediaSource[] {createFakeMediaSource(), createFakeMediaSource()}),
@@ -435,7 +436,7 @@ public final class ConcatenatingMediaSourceTest {
 
   @Test
   public void testCustomCallbackBeforePreparationAddSingleWithIndex() {
-    Runnable runnable = Mockito.mock(Runnable.class);
+    Runnable runnable = mock(Runnable.class);
 
     mediaSource.addMediaSource(/* index */ 0, createFakeMediaSource(), new Handler(), runnable);
     verify(runnable).run();
@@ -443,7 +444,7 @@ public final class ConcatenatingMediaSourceTest {
 
   @Test
   public void testCustomCallbackBeforePreparationAddMultipleWithIndex() {
-    Runnable runnable = Mockito.mock(Runnable.class);
+    Runnable runnable = mock(Runnable.class);
 
     mediaSource.addMediaSources(
         /* index */ 0,
@@ -455,7 +456,7 @@ public final class ConcatenatingMediaSourceTest {
 
   @Test
   public void testCustomCallbackBeforePreparationRemove() {
-    Runnable runnable = Mockito.mock(Runnable.class);
+    Runnable runnable = mock(Runnable.class);
 
     mediaSource.addMediaSource(createFakeMediaSource());
     mediaSource.removeMediaSource(/* index */ 0, new Handler(), runnable);
@@ -464,7 +465,7 @@ public final class ConcatenatingMediaSourceTest {
 
   @Test
   public void testCustomCallbackBeforePreparationMove() {
-    Runnable runnable = Mockito.mock(Runnable.class);
+    Runnable runnable = mock(Runnable.class);
 
     mediaSource.addMediaSources(
         Arrays.asList(new MediaSource[] {createFakeMediaSource(), createFakeMediaSource()}));
@@ -588,6 +589,29 @@ public final class ConcatenatingMediaSourceTest {
     }
   }
 
+  @Test
+  public void testCustomCallbackIsCalledAfterRelease() throws IOException {
+    DummyMainThread dummyMainThread = new DummyMainThread();
+    ConditionVariable callbackCalledCondition = new ConditionVariable();
+    try {
+      dummyMainThread.runOnMainThread(
+          () -> {
+            SourceInfoRefreshListener listener = mock(SourceInfoRefreshListener.class);
+            mediaSource.addMediaSources(Arrays.asList(createMediaSources(2)));
+            mediaSource.prepareSource(listener, /* mediaTransferListener= */ null);
+            mediaSource.moveMediaSource(
+                /* currentIndex= */ 0,
+                /* newIndex= */ 1,
+                new Handler(),
+                callbackCalledCondition::open);
+            mediaSource.releaseSource(listener);
+          });
+      assertThat(callbackCalledCondition.block(MediaSourceTestRunner.TIMEOUT_MS)).isTrue();
+    } finally {
+      dummyMainThread.release();
+    }
+  }
+
   @Test
   public void testPeriodCreationWithAds() throws IOException, InterruptedException {
     // Create concatenated media source with ad child source.
@@ -973,7 +997,7 @@ public final class ConcatenatingMediaSourceTest {
 
   @Test
   public void testCustomCallbackBeforePreparationSetShuffleOrder() throws Exception {
-    Runnable runnable = Mockito.mock(Runnable.class);
+    Runnable runnable = mock(Runnable.class);
     mediaSource.setShuffleOrder(
         new ShuffleOrder.UnshuffledShuffleOrder(/* length= */ 0), new Handler(), runnable);
 

From 3818d7329d19cdcd2d87bce812794a4ca77c9d30 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 4 Feb 2019 18:26:40 +0000
Subject: [PATCH 470/832] Use ExoPlayer's AnalyticsListener and
 AnalyticsCollector.

This combines all the different listeners in ExoVideosPlayerV2 into one and
moves the PlaybackLogger class towards ExoPlayer's AnalyticsCollector with
the same purpose.

In the future this allows two things:
 1. Gradually move LogginClient implementations to AnalyticsListener to
    prevent custom event forwarding.
 2. Using ExoPlayer's QoE extension (which is also an AnalyticsListener).

PiperOrigin-RevId: 232321182
---
 .../android/exoplayer2/analytics/AnalyticsCollector.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java
index 55031e2d12..154cc11dca 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java
@@ -129,12 +129,13 @@ public class AnalyticsCollector
 
   /**
    * Sets the player for which data will be collected. Must only be called if no player has been set
-   * yet.
+   * yet or the current player is idle.
    *
    * @param player The {@link Player} for which data will be collected.
    */
   public void setPlayer(Player player) {
-    Assertions.checkState(this.player == null);
+    Assertions.checkState(
+        this.player == null || mediaPeriodQueueTracker.mediaPeriodInfoQueue.isEmpty());
     this.player = Assertions.checkNotNull(player);
   }
 

From 67be9e77834c0dc9d2b5d462c01c2f39718c8817 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 4 Feb 2019 19:35:06 +0000
Subject: [PATCH 471/832] Merge #5462: Making easier to set the
 playClearSampleWithoutKeys to renderers

Imported from GitHub PR https://github.com/google/ExoPlayer/pull/5462

Pull request for the following issue: #5421
Merge d9d88b079c4ca0533a836b2715a65b924babbb89 into a73819162751116acd3863cf5473b0ff78fac805

PiperOrigin-RevId: 232335113
---
 .../exoplayer2/DefaultRenderersFactory.java   | 197 +++++++++++++-----
 .../android/exoplayer2/ExoPlayerFactory.java  |   7 +-
 .../testutil/DebugRenderersFactory.java       |  56 +++--
 3 files changed, 195 insertions(+), 65 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
index bb73353b94..ef0a008849 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2;
 
 import android.content.Context;
+import android.media.MediaCodec;
 import android.os.Handler;
 import android.os.Looper;
 import android.support.annotation.IntDef;
@@ -85,15 +86,18 @@ public class DefaultRenderersFactory implements RenderersFactory {
   protected static final int MAX_DROPPED_VIDEO_FRAME_COUNT_TO_NOTIFY = 50;
 
   private final Context context;
-  private final @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager;
-  private final @ExtensionRendererMode int extensionRendererMode;
-  private final long allowedVideoJoiningTimeMs;
+  @Nullable private DrmSessionManager<FrameworkMediaCrypto> drmSessionManager;
+  @ExtensionRendererMode private int extensionRendererMode;
+  private long allowedVideoJoiningTimeMs;
+  private boolean playClearSamplesWithoutKeys;
+  private MediaCodecSelector mediaCodecSelector;
 
-  /**
-   * @param context A {@link Context}.
-   */
+  /** @param context A {@link Context}. */
   public DefaultRenderersFactory(Context context) {
-    this(context, EXTENSION_RENDERER_MODE_OFF);
+    this.context = context;
+    extensionRendererMode = EXTENSION_RENDERER_MODE_OFF;
+    allowedVideoJoiningTimeMs = DEFAULT_ALLOWED_VIDEO_JOINING_TIME_MS;
+    mediaCodecSelector = MediaCodecSelector.DEFAULT;
   }
 
   /**
@@ -108,19 +112,20 @@ public class DefaultRenderersFactory implements RenderersFactory {
   }
 
   /**
-   * @param context A {@link Context}.
-   * @param extensionRendererMode The extension renderer mode, which determines if and how available
-   *     extension renderers are used. Note that extensions must be included in the application
-   *     build for them to be considered available.
+   * @deprecated Use {@link #DefaultRenderersFactory(Context)} and {@link
+   *     #setExtensionRendererMode(int)}.
    */
+  @Deprecated
+  @SuppressWarnings("deprecation")
   public DefaultRenderersFactory(
       Context context, @ExtensionRendererMode int extensionRendererMode) {
     this(context, extensionRendererMode, DEFAULT_ALLOWED_VIDEO_JOINING_TIME_MS);
   }
 
   /**
-   * @deprecated Use {@link #DefaultRenderersFactory(Context, int)} and pass {@link
-   *     DrmSessionManager} directly to {@link SimpleExoPlayer} or {@link ExoPlayerFactory}.
+   * @deprecated Use {@link #DefaultRenderersFactory(Context)} and {@link
+   *     #setExtensionRendererMode(int)}, and pass {@link DrmSessionManager} directly to {@link
+   *     SimpleExoPlayer} or {@link ExoPlayerFactory}.
    */
   @Deprecated
   @SuppressWarnings("deprecation")
@@ -132,26 +137,22 @@ public class DefaultRenderersFactory implements RenderersFactory {
   }
 
   /**
-   * @param context A {@link Context}.
-   * @param extensionRendererMode The extension renderer mode, which determines if and how available
-   *     extension renderers are used. Note that extensions must be included in the application
-   *     build for them to be considered available.
-   * @param allowedVideoJoiningTimeMs The maximum duration for which video renderers can attempt to
-   *     seamlessly join an ongoing playback.
+   * @deprecated Use {@link #DefaultRenderersFactory(Context)}, {@link
+   *     #setExtensionRendererMode(int)} and {@link #setAllowedVideoJoiningTimeMs(long)}.
    */
+  @Deprecated
+  @SuppressWarnings("deprecation")
   public DefaultRenderersFactory(
       Context context,
       @ExtensionRendererMode int extensionRendererMode,
       long allowedVideoJoiningTimeMs) {
-    this.context = context;
-    this.extensionRendererMode = extensionRendererMode;
-    this.allowedVideoJoiningTimeMs = allowedVideoJoiningTimeMs;
-    this.drmSessionManager = null;
+    this(context, null, extensionRendererMode, allowedVideoJoiningTimeMs);
   }
 
   /**
-   * @deprecated Use {@link #DefaultRenderersFactory(Context, int, long)} and pass {@link
-   *     DrmSessionManager} directly to {@link SimpleExoPlayer} or {@link ExoPlayerFactory}.
+   * @deprecated Use {@link #DefaultRenderersFactory(Context)}, {@link
+   *     #setExtensionRendererMode(int)} and {@link #setAllowedVideoJoiningTimeMs(long)}, and pass
+   *     {@link DrmSessionManager} directly to {@link SimpleExoPlayer} or {@link ExoPlayerFactory}.
    */
   @Deprecated
   public DefaultRenderersFactory(
@@ -163,6 +164,70 @@ public class DefaultRenderersFactory implements RenderersFactory {
     this.extensionRendererMode = extensionRendererMode;
     this.allowedVideoJoiningTimeMs = allowedVideoJoiningTimeMs;
     this.drmSessionManager = drmSessionManager;
+    mediaCodecSelector = MediaCodecSelector.DEFAULT;
+  }
+
+  /**
+   * Sets the extension renderer mode, which determines if and how available extension renderers are
+   * used. Note that extensions must be included in the application build for them to be considered
+   * available.
+   *
+   * <p>The default value is {@link #EXTENSION_RENDERER_MODE_OFF}.
+   *
+   * @param extensionRendererMode The extension renderer mode.
+   * @return This factory, for convenience.
+   */
+  public DefaultRenderersFactory setExtensionRendererMode(
+      @ExtensionRendererMode int extensionRendererMode) {
+    this.extensionRendererMode = extensionRendererMode;
+    return this;
+  }
+
+  /**
+   * Sets whether renderers are permitted to play clear regions of encrypted media prior to having
+   * obtained the keys necessary to decrypt encrypted regions of the media. For encrypted media that
+   * starts with a short clear region, this allows playback to begin in parallel with key
+   * acquisition, which can reduce startup latency.
+   *
+   * <p>The default value is {@code false}.
+   *
+   * @param playClearSamplesWithoutKeys Whether renderers are permitted to play clear regions of
+   *     encrypted media prior to having obtained the keys necessary to decrypt encrypted regions of
+   *     the media.
+   * @return This factory, for convenience.
+   */
+  public DefaultRenderersFactory setPlayClearSamplesWithoutKeys(
+      boolean playClearSamplesWithoutKeys) {
+    this.playClearSamplesWithoutKeys = playClearSamplesWithoutKeys;
+    return this;
+  }
+
+  /**
+   * Sets a {@link MediaCodecSelector} for use by {@link MediaCodec} based renderers.
+   *
+   * <p>The default value is {@link MediaCodecSelector#DEFAULT}.
+   *
+   * @param mediaCodecSelector The {@link MediaCodecSelector}.
+   * @return This factory, for convenience.
+   */
+  public DefaultRenderersFactory setMediaCodecSelector(MediaCodecSelector mediaCodecSelector) {
+    this.mediaCodecSelector = mediaCodecSelector;
+    return this;
+  }
+
+  /**
+   * Sets the maximum duration for which video renderers can attempt to seamlessly join an ongoing
+   * playback.
+   *
+   * <p>The default value is {@link #DEFAULT_ALLOWED_VIDEO_JOINING_TIME_MS}.
+   *
+   * @param allowedVideoJoiningTimeMs The maximum duration for which video renderers can attempt to
+   *     seamlessly join an ongoing playback, in milliseconds.
+   * @return This factory, for convenience.
+   */
+  public DefaultRenderersFactory setAllowedVideoJoiningTimeMs(long allowedVideoJoiningTimeMs) {
+    this.allowedVideoJoiningTimeMs = allowedVideoJoiningTimeMs;
+    return this;
   }
 
   @Override
@@ -177,10 +242,26 @@ public class DefaultRenderersFactory implements RenderersFactory {
       drmSessionManager = this.drmSessionManager;
     }
     ArrayList<Renderer> renderersList = new ArrayList<>();
-    buildVideoRenderers(context, drmSessionManager, allowedVideoJoiningTimeMs,
-        eventHandler, videoRendererEventListener, extensionRendererMode, renderersList);
-    buildAudioRenderers(context, drmSessionManager, buildAudioProcessors(),
-        eventHandler, audioRendererEventListener, extensionRendererMode, renderersList);
+    buildVideoRenderers(
+        context,
+        extensionRendererMode,
+        mediaCodecSelector,
+        drmSessionManager,
+        playClearSamplesWithoutKeys,
+        eventHandler,
+        videoRendererEventListener,
+        allowedVideoJoiningTimeMs,
+        renderersList);
+    buildAudioRenderers(
+        context,
+        extensionRendererMode,
+        mediaCodecSelector,
+        drmSessionManager,
+        playClearSamplesWithoutKeys,
+        buildAudioProcessors(),
+        eventHandler,
+        audioRendererEventListener,
+        renderersList);
     buildTextRenderers(context, textRendererOutput, eventHandler.getLooper(),
         extensionRendererMode, renderersList);
     buildMetadataRenderers(context, metadataRendererOutput, eventHandler.getLooper(),
@@ -194,27 +275,36 @@ public class DefaultRenderersFactory implements RenderersFactory {
    * Builds video renderers for use by the player.
    *
    * @param context The {@link Context} associated with the player.
-   * @param drmSessionManager An optional {@link DrmSessionManager}. May be null if the player
-   *     will not be used for DRM protected playbacks.
-   * @param allowedVideoJoiningTimeMs The maximum duration in milliseconds for which video
-   *     renderers can attempt to seamlessly join an ongoing playback.
+   * @param extensionRendererMode The extension renderer mode.
+   * @param mediaCodecSelector A decoder selector.
+   * @param drmSessionManager An optional {@link DrmSessionManager}. May be null if the player will
+   *     not be used for DRM protected playbacks.
+   * @param playClearSamplesWithoutKeys Whether renderers are permitted to play clear regions of
+   *     encrypted media prior to having obtained the keys necessary to decrypt encrypted regions of
+   *     the media.
    * @param eventHandler A handler associated with the main thread's looper.
    * @param eventListener An event listener.
-   * @param extensionRendererMode The extension renderer mode.
+   * @param allowedVideoJoiningTimeMs The maximum duration for which video renderers can attempt to
+   *     seamlessly join an ongoing playback, in milliseconds.
    * @param out An array to which the built renderers should be appended.
    */
-  protected void buildVideoRenderers(Context context,
+  protected void buildVideoRenderers(
+      Context context,
+      @ExtensionRendererMode int extensionRendererMode,
+      MediaCodecSelector mediaCodecSelector,
       @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
-      long allowedVideoJoiningTimeMs, Handler eventHandler,
-      VideoRendererEventListener eventListener, @ExtensionRendererMode int extensionRendererMode,
+      boolean playClearSamplesWithoutKeys,
+      Handler eventHandler,
+      VideoRendererEventListener eventListener,
+      long allowedVideoJoiningTimeMs,
       ArrayList<Renderer> out) {
     out.add(
         new MediaCodecVideoRenderer(
             context,
-            MediaCodecSelector.DEFAULT,
+            mediaCodecSelector,
             allowedVideoJoiningTimeMs,
             drmSessionManager,
-            /* playClearSamplesWithoutKeys= */ false,
+            playClearSamplesWithoutKeys,
             eventHandler,
             eventListener,
             MAX_DROPPED_VIDEO_FRAME_COUNT_TO_NOTIFY));
@@ -259,26 +349,35 @@ public class DefaultRenderersFactory implements RenderersFactory {
    * Builds audio renderers for use by the player.
    *
    * @param context The {@link Context} associated with the player.
-   * @param drmSessionManager An optional {@link DrmSessionManager}. May be null if the player
-   *     will not be used for DRM protected playbacks.
-   * @param audioProcessors An array of {@link AudioProcessor}s that will process PCM audio
-   *     buffers before output. May be empty.
+   * @param extensionRendererMode The extension renderer mode.
+   * @param mediaCodecSelector A decoder selector.
+   * @param drmSessionManager An optional {@link DrmSessionManager}. May be null if the player will
+   *     not be used for DRM protected playbacks.
+   * @param playClearSamplesWithoutKeys Whether renderers are permitted to play clear regions of
+   *     encrypted media prior to having obtained the keys necessary to decrypt encrypted regions of
+   *     the media.
+   * @param audioProcessors An array of {@link AudioProcessor}s that will process PCM audio buffers
+   *     before output. May be empty.
    * @param eventHandler A handler to use when invoking event listeners and outputs.
    * @param eventListener An event listener.
-   * @param extensionRendererMode The extension renderer mode.
    * @param out An array to which the built renderers should be appended.
    */
-  protected void buildAudioRenderers(Context context,
+  protected void buildAudioRenderers(
+      Context context,
+      @ExtensionRendererMode int extensionRendererMode,
+      MediaCodecSelector mediaCodecSelector,
       @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
-      AudioProcessor[] audioProcessors, Handler eventHandler,
-      AudioRendererEventListener eventListener, @ExtensionRendererMode int extensionRendererMode,
+      boolean playClearSamplesWithoutKeys,
+      AudioProcessor[] audioProcessors,
+      Handler eventHandler,
+      AudioRendererEventListener eventListener,
       ArrayList<Renderer> out) {
     out.add(
         new MediaCodecAudioRenderer(
             context,
-            MediaCodecSelector.DEFAULT,
+            mediaCodecSelector,
             drmSessionManager,
-            /* playClearSamplesWithoutKeys= */ false,
+            playClearSamplesWithoutKeys,
             eventHandler,
             eventListener,
             AudioCapabilities.getCapabilities(context),
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java
index c63dbc04d0..551895ad93 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java
@@ -58,7 +58,8 @@ public final class ExoPlayerFactory {
       LoadControl loadControl,
       @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
       @DefaultRenderersFactory.ExtensionRendererMode int extensionRendererMode) {
-    RenderersFactory renderersFactory = new DefaultRenderersFactory(context, extensionRendererMode);
+    RenderersFactory renderersFactory =
+        new DefaultRenderersFactory(context).setExtensionRendererMode(extensionRendererMode);
     return newSimpleInstance(
         context, renderersFactory, trackSelector, loadControl, drmSessionManager);
   }
@@ -88,7 +89,9 @@ public final class ExoPlayerFactory {
       @DefaultRenderersFactory.ExtensionRendererMode int extensionRendererMode,
       long allowedVideoJoiningTimeMs) {
     RenderersFactory renderersFactory =
-        new DefaultRenderersFactory(context, extensionRendererMode, allowedVideoJoiningTimeMs);
+        new DefaultRenderersFactory(context)
+            .setExtensionRendererMode(extensionRendererMode)
+            .setAllowedVideoJoiningTimeMs(allowedVideoJoiningTimeMs);
     return newSimpleInstance(
         context, renderersFactory, trackSelector, loadControl, drmSessionManager);
   }
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/DebugRenderersFactory.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/DebugRenderersFactory.java
index d480d50b98..54e6088168 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/DebugRenderersFactory.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/DebugRenderersFactory.java
@@ -20,6 +20,7 @@ import android.content.Context;
 import android.media.MediaCodec;
 import android.media.MediaCrypto;
 import android.os.Handler;
+import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.DefaultRenderersFactory;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.Format;
@@ -37,22 +38,37 @@ import java.util.ArrayList;
 
 /**
  * A debug extension of {@link DefaultRenderersFactory}. Provides a video renderer that performs
- * video buffer timestamp assertions.
+ * video buffer timestamp assertions, and modifies the default value for {@link
+ * #setAllowedVideoJoiningTimeMs(long)} to be {@code 0}.
  */
 public class DebugRenderersFactory extends DefaultRenderersFactory {
 
   public DebugRenderersFactory(Context context) {
-    super(context, DefaultRenderersFactory.EXTENSION_RENDERER_MODE_OFF, 0);
+    super(context);
+    setAllowedVideoJoiningTimeMs(0);
   }
 
   @Override
-  protected void buildVideoRenderers(Context context,
-      DrmSessionManager<FrameworkMediaCrypto> drmSessionManager, long allowedVideoJoiningTimeMs,
-      Handler eventHandler, VideoRendererEventListener eventListener,
-      @ExtensionRendererMode int extensionRendererMode, ArrayList<Renderer> out) {
-    out.add(new DebugMediaCodecVideoRenderer(context, MediaCodecSelector.DEFAULT,
-        allowedVideoJoiningTimeMs, drmSessionManager, eventHandler, eventListener,
-        MAX_DROPPED_VIDEO_FRAME_COUNT_TO_NOTIFY));
+  protected void buildVideoRenderers(
+      Context context,
+      @ExtensionRendererMode int extensionRendererMode,
+      MediaCodecSelector mediaCodecSelector,
+      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
+      boolean playClearSamplesWithoutKeys,
+      Handler eventHandler,
+      VideoRendererEventListener eventListener,
+      long allowedVideoJoiningTimeMs,
+      ArrayList<Renderer> out) {
+    out.add(
+        new DebugMediaCodecVideoRenderer(
+            context,
+            mediaCodecSelector,
+            allowedVideoJoiningTimeMs,
+            drmSessionManager,
+            playClearSamplesWithoutKeys,
+            eventHandler,
+            eventListener,
+            MAX_DROPPED_VIDEO_FRAME_COUNT_TO_NOTIFY));
   }
 
   /**
@@ -71,12 +87,24 @@ public class DebugRenderersFactory extends DefaultRenderersFactory {
     private int minimumInsertIndex;
     private boolean skipToPositionBeforeRenderingFirstFrame;
 
-    public DebugMediaCodecVideoRenderer(Context context, MediaCodecSelector mediaCodecSelector,
-        long allowedJoiningTimeMs, DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
-        Handler eventHandler, VideoRendererEventListener eventListener,
+    public DebugMediaCodecVideoRenderer(
+        Context context,
+        MediaCodecSelector mediaCodecSelector,
+        long allowedJoiningTimeMs,
+        DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
+        boolean playClearSamplesWithoutKeys,
+        Handler eventHandler,
+        VideoRendererEventListener eventListener,
         int maxDroppedFrameCountToNotify) {
-      super(context, mediaCodecSelector, allowedJoiningTimeMs, drmSessionManager, false,
-          eventHandler, eventListener, maxDroppedFrameCountToNotify);
+      super(
+          context,
+          mediaCodecSelector,
+          allowedJoiningTimeMs,
+          drmSessionManager,
+          playClearSamplesWithoutKeys,
+          eventHandler,
+          eventListener,
+          maxDroppedFrameCountToNotify);
     }
 
     @Override

From c0e6cd1b179ba4b5c705c59ffa7c79649398d1e0 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Tue, 5 Feb 2019 10:09:00 +0000
Subject: [PATCH 472/832] Add DownloadState.mergeAction method

This method is needed by DownloadManager.

PiperOrigin-RevId: 232447145
---
 .../exoplayer2/offline/DownloadIndexUtil.java |  43 +--
 .../exoplayer2/offline/DownloadState.java     |  60 +++
 .../offline/DefaultDownloadIndexTest.java     | 198 +---------
 .../offline/DownloadStateBuilder.java         | 181 +++++++++
 .../exoplayer2/offline/DownloadStateTest.java | 344 ++++++++++++++++++
 5 files changed, 593 insertions(+), 233 deletions(-)
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
index 0d6d2a36b5..f9a33f3e7b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
@@ -16,12 +16,7 @@
 package com.google.android.exoplayer2.offline;
 
 import android.support.annotation.Nullable;
-import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.offline.DownloadState.State;
-import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
-import java.util.Collections;
-import java.util.HashSet;
 
 /** {@link DownloadIndex} related utility methods. */
 public final class DownloadIndexUtil {
@@ -79,46 +74,10 @@ public final class DownloadIndexUtil {
       DownloadIndex downloadIndex, @Nullable String id, DownloadAction action) {
     DownloadState downloadState = downloadIndex.getDownloadState(id != null ? id : action.id);
     if (downloadState != null) {
-      downloadState = merge(downloadState, action);
+      downloadState = downloadState.mergeAction(action);
     } else {
       downloadState = new DownloadState(action);
     }
     downloadIndex.putDownloadState(downloadState);
   }
-
-  private static DownloadState merge(DownloadState downloadState, DownloadAction action) {
-    Assertions.checkArgument(action.type.equals(downloadState.type));
-    @State int newState;
-    if (action.isRemoveAction) {
-      newState = DownloadState.STATE_REMOVING;
-    } else {
-      if (downloadState.state == DownloadState.STATE_REMOVING
-          || downloadState.state == DownloadState.STATE_RESTARTING) {
-        newState = DownloadState.STATE_RESTARTING;
-      } else if (downloadState.state == DownloadState.STATE_STOPPED) {
-        newState = DownloadState.STATE_STOPPED;
-      } else {
-        newState = DownloadState.STATE_QUEUED;
-      }
-    }
-    HashSet<StreamKey> keys = new HashSet<>(action.keys);
-    Collections.addAll(keys, downloadState.streamKeys);
-    StreamKey[] newKeys = keys.toArray(new StreamKey[0]);
-    return new DownloadState(
-        downloadState.id,
-        downloadState.type,
-        action.uri,
-        action.customCacheKey,
-        newState,
-        /* downloadPercentage= */ C.PERCENTAGE_UNSET,
-        downloadState.downloadedBytes,
-        /* totalBytes= */ C.LENGTH_UNSET,
-        downloadState.failureReason,
-        downloadState.stopFlags,
-        downloadState.notMetRequirements,
-        downloadState.startTimeMs,
-        downloadState.updateTimeMs,
-        newKeys,
-        action.data);
-  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
index c59b7b87b6..35518af38d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
@@ -24,6 +24,8 @@ import com.google.android.exoplayer2.util.Assertions;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.util.Collections;
+import java.util.HashSet;
 
 /** Represents state of a download. */
 public final class DownloadState {
@@ -231,4 +233,62 @@ public final class DownloadState {
     this.streamKeys = streamKeys;
     this.customMetadata = customMetadata;
   }
+
+  /**
+   * Merges the given {@link DownloadAction} and creates a new {@link DownloadState}. The action
+   * must have the same id and type.
+   *
+   * @param action The {@link DownloadAction} to be merged.
+   * @return A new {@link DownloadState}.
+   */
+  public DownloadState mergeAction(DownloadAction action) {
+    Assertions.checkArgument(action.id.equals(id));
+    Assertions.checkArgument(action.type.equals(type));
+    return new DownloadState(
+        id,
+        type,
+        action.uri,
+        action.customCacheKey,
+        getNextState(action, state),
+        /* downloadPercentage= */ C.PERCENTAGE_UNSET,
+        downloadedBytes,
+        /* totalBytes= */ C.LENGTH_UNSET,
+        FAILURE_REASON_NONE,
+        stopFlags,
+        notMetRequirements,
+        startTimeMs,
+        updateTimeMs,
+        mergeStreamKeys(this, action),
+        action.data);
+  }
+
+  private static int getNextState(DownloadAction action, int currentState) {
+    int newState;
+    if (action.isRemoveAction) {
+      newState = STATE_REMOVING;
+    } else {
+      if (currentState == STATE_REMOVING || currentState == STATE_RESTARTING) {
+        newState = STATE_RESTARTING;
+      } else if (currentState == STATE_STOPPED) {
+        newState = STATE_STOPPED;
+      } else {
+        newState = STATE_QUEUED;
+      }
+    }
+    return newState;
+  }
+
+  private static StreamKey[] mergeStreamKeys(DownloadState downloadState, DownloadAction action) {
+    StreamKey[] streamKeys = downloadState.streamKeys;
+    if (!action.isRemoveAction && streamKeys.length > 0) {
+      if (action.keys.isEmpty()) {
+        streamKeys = new StreamKey[0];
+      } else {
+        HashSet<StreamKey> keys = new HashSet<>(action.keys);
+        Collections.addAll(keys, downloadState.streamKeys);
+        streamKeys = keys.toArray(new StreamKey[0]);
+      }
+    }
+    return streamKeys;
+  }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
index badbb58eff..8789a7ef78 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
@@ -18,12 +18,8 @@ package com.google.android.exoplayer2.offline;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.database.sqlite.SQLiteDatabase;
-import android.net.Uri;
-import android.support.annotation.Nullable;
-import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.database.ExoDatabaseProvider;
 import com.google.android.exoplayer2.database.VersionTable;
-import java.util.Arrays;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -62,7 +58,7 @@ public class DefaultDownloadIndexTest {
     downloadIndex.putDownloadState(downloadState);
     DownloadState readDownloadState = downloadIndex.getDownloadState(id);
 
-    assertEqual(readDownloadState, downloadState);
+    DownloadStateTest.assertEqual(readDownloadState, downloadState);
   }
 
   @Test
@@ -94,7 +90,7 @@ public class DefaultDownloadIndexTest {
     DownloadState readDownloadState = downloadIndex.getDownloadState(id);
 
     assertThat(readDownloadState).isNotNull();
-    assertEqual(readDownloadState, downloadState);
+    DownloadStateTest.assertEqual(readDownloadState, downloadState);
   }
 
   @Test
@@ -106,7 +102,7 @@ public class DefaultDownloadIndexTest {
     downloadIndex = new DefaultDownloadIndex(databaseProvider);
     DownloadState readDownloadState = downloadIndex.getDownloadState(id);
     assertThat(readDownloadState).isNotNull();
-    assertEqual(readDownloadState, downloadState);
+    DownloadStateTest.assertEqual(readDownloadState, downloadState);
   }
 
   @Test
@@ -141,9 +137,9 @@ public class DefaultDownloadIndexTest {
 
     assertThat(cursor.getCount()).isEqualTo(2);
     cursor.moveToNext();
-    assertEqual(cursor.getDownloadState(), downloadState2);
+    DownloadStateTest.assertEqual(cursor.getDownloadState(), downloadState2);
     cursor.moveToNext();
-    assertEqual(cursor.getDownloadState(), downloadState1);
+    DownloadStateTest.assertEqual(cursor.getDownloadState(), downloadState1);
     cursor.close();
   }
 
@@ -173,9 +169,9 @@ public class DefaultDownloadIndexTest {
 
     assertThat(cursor.getCount()).isEqualTo(2);
     cursor.moveToNext();
-    assertEqual(cursor.getDownloadState(), downloadState1);
+    DownloadStateTest.assertEqual(cursor.getDownloadState(), downloadState1);
     cursor.moveToNext();
-    assertEqual(cursor.getDownloadState(), downloadState3);
+    DownloadStateTest.assertEqual(cursor.getDownloadState(), downloadState3);
     cursor.close();
   }
 
@@ -211,184 +207,4 @@ public class DefaultDownloadIndexTest {
         .isEqualTo(DefaultDownloadIndex.TABLE_VERSION);
   }
 
-  private static void assertEqual(DownloadState downloadState, DownloadState expected) {
-    assertThat(areEqual(downloadState, expected)).isTrue();
-  }
-
-  private static boolean areEqual(DownloadState downloadState, DownloadState that) {
-    if (downloadState.state != that.state) {
-      return false;
-    }
-    if (Float.compare(that.downloadPercentage, downloadState.downloadPercentage) != 0) {
-      return false;
-    }
-    if (downloadState.downloadedBytes != that.downloadedBytes) {
-      return false;
-    }
-    if (downloadState.totalBytes != that.totalBytes) {
-      return false;
-    }
-    if (downloadState.startTimeMs != that.startTimeMs) {
-      return false;
-    }
-    if (downloadState.updateTimeMs != that.updateTimeMs) {
-      return false;
-    }
-    if (downloadState.failureReason != that.failureReason) {
-      return false;
-    }
-    if (downloadState.stopFlags != that.stopFlags) {
-      return false;
-    }
-    if (downloadState.notMetRequirements != that.notMetRequirements) {
-      return false;
-    }
-    if (!downloadState.id.equals(that.id)) {
-      return false;
-    }
-    if (!downloadState.type.equals(that.type)) {
-      return false;
-    }
-    if (!downloadState.uri.equals(that.uri)) {
-      return false;
-    }
-    if (downloadState.cacheKey != null
-        ? !downloadState.cacheKey.equals(that.cacheKey)
-        : that.cacheKey != null) {
-      return false;
-    }
-    if (!Arrays.equals(downloadState.streamKeys, that.streamKeys)) {
-      return false;
-    }
-    return Arrays.equals(downloadState.customMetadata, that.customMetadata);
-  }
-
-  private static class DownloadStateBuilder {
-    private String id;
-    private String type;
-    private String uri;
-    @Nullable private String cacheKey;
-    private int state;
-    private float downloadPercentage;
-    private long downloadedBytes;
-    private long totalBytes;
-    private int failureReason;
-    private int stopFlags;
-    private int notMetRequirements;
-    private long startTimeMs;
-    private long updateTimeMs;
-    private StreamKey[] streamKeys;
-    private byte[] customMetadata;
-
-    private DownloadStateBuilder(String id) {
-      this.id = id;
-      this.type = "type";
-      this.uri = "uri";
-      this.cacheKey = null;
-      this.state = DownloadState.STATE_QUEUED;
-      this.downloadPercentage = (float) C.PERCENTAGE_UNSET;
-      this.downloadedBytes = (long) 0;
-      this.totalBytes = (long) C.LENGTH_UNSET;
-      this.failureReason = DownloadState.FAILURE_REASON_NONE;
-      this.stopFlags = 0;
-      this.startTimeMs = (long) 0;
-      this.updateTimeMs = (long) 0;
-      this.streamKeys = new StreamKey[0];
-      this.customMetadata = new byte[0];
-    }
-
-    public DownloadStateBuilder setId(String id) {
-      this.id = id;
-      return this;
-    }
-
-    public DownloadStateBuilder setType(String type) {
-      this.type = type;
-      return this;
-    }
-
-    public DownloadStateBuilder setUri(String uri) {
-      this.uri = uri;
-      return this;
-    }
-
-    public DownloadStateBuilder setCacheKey(@Nullable String cacheKey) {
-      this.cacheKey = cacheKey;
-      return this;
-    }
-
-    public DownloadStateBuilder setState(int state) {
-      this.state = state;
-      return this;
-    }
-
-    public DownloadStateBuilder setDownloadPercentage(float downloadPercentage) {
-      this.downloadPercentage = downloadPercentage;
-      return this;
-    }
-
-    public DownloadStateBuilder setDownloadedBytes(long downloadedBytes) {
-      this.downloadedBytes = downloadedBytes;
-      return this;
-    }
-
-    public DownloadStateBuilder setTotalBytes(long totalBytes) {
-      this.totalBytes = totalBytes;
-      return this;
-    }
-
-    public DownloadStateBuilder setFailureReason(int failureReason) {
-      this.failureReason = failureReason;
-      return this;
-    }
-
-    public DownloadStateBuilder setStopFlags(int stopFlags) {
-      this.stopFlags = stopFlags;
-      return this;
-    }
-
-    public DownloadStateBuilder setNotMetRequirements(int notMetRequirements) {
-      this.notMetRequirements = notMetRequirements;
-      return this;
-    }
-
-    public DownloadStateBuilder setStartTimeMs(long startTimeMs) {
-      this.startTimeMs = startTimeMs;
-      return this;
-    }
-
-    public DownloadStateBuilder setUpdateTimeMs(long updateTimeMs) {
-      this.updateTimeMs = updateTimeMs;
-      return this;
-    }
-
-    public DownloadStateBuilder setStreamKeys(StreamKey... streamKeys) {
-      this.streamKeys = streamKeys;
-      return this;
-    }
-
-    public DownloadStateBuilder setCustomMetadata(byte[] customMetadata) {
-      this.customMetadata = customMetadata;
-      return this;
-    }
-
-    public DownloadState build() {
-      return new DownloadState(
-          id,
-          type,
-          Uri.parse(uri),
-          cacheKey,
-          state,
-          downloadPercentage,
-          downloadedBytes,
-          totalBytes,
-          failureReason,
-          stopFlags,
-          notMetRequirements,
-          startTimeMs,
-          updateTimeMs,
-          streamKeys,
-          customMetadata);
-    }
-  }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
new file mode 100644
index 0000000000..84b51c5572
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.offline;
+
+import android.net.Uri;
+import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.C;
+
+/**
+ * Builder for DownloadState.
+ *
+ * <p>Defines default values for each field (except {@code id}) to facilitate DownloadState creation
+ * for tests. Tests must avoid depending on the default values but explicitly set tested parameters
+ * during test initialization.
+ */
+class DownloadStateBuilder {
+  private String id;
+  private String type;
+  private Uri uri;
+  @Nullable private String cacheKey;
+  private int state;
+  private float downloadPercentage;
+  private long downloadedBytes;
+  private long totalBytes;
+  private int failureReason;
+  private int stopFlags;
+  private int notMetRequirements;
+  private long startTimeMs;
+  private long updateTimeMs;
+  private StreamKey[] streamKeys;
+  private byte[] customMetadata;
+
+  DownloadStateBuilder(String id) {
+    this(id, "type", Uri.parse("uri"), /* cacheKey= */ null, new byte[0], new StreamKey[0]);
+  }
+
+  DownloadStateBuilder(DownloadAction action) {
+    this(
+        action.id,
+        action.type,
+        action.uri,
+        action.customCacheKey,
+        action.data,
+        action.keys.toArray(new StreamKey[0]));
+  }
+
+  DownloadStateBuilder(
+      String id,
+      String type,
+      Uri uri,
+      String cacheKey,
+      byte[] customMetadata,
+      StreamKey[] streamKeys) {
+    this.id = id;
+    this.type = type;
+    this.uri = uri;
+    this.cacheKey = cacheKey;
+    this.state = DownloadState.STATE_QUEUED;
+    this.downloadPercentage = (float) C.PERCENTAGE_UNSET;
+    this.downloadedBytes = (long) 0;
+    this.totalBytes = (long) C.LENGTH_UNSET;
+    this.failureReason = DownloadState.FAILURE_REASON_NONE;
+    this.stopFlags = 0;
+    this.startTimeMs = (long) 0;
+    this.updateTimeMs = (long) 0;
+    this.streamKeys = streamKeys;
+    this.customMetadata = customMetadata;
+  }
+
+  public DownloadStateBuilder setId(String id) {
+    this.id = id;
+    return this;
+  }
+
+  public DownloadStateBuilder setType(String type) {
+    this.type = type;
+    return this;
+  }
+
+  public DownloadStateBuilder setUri(String uri) {
+    this.uri = Uri.parse(uri);
+    return this;
+  }
+
+  public DownloadStateBuilder setUri(Uri uri) {
+    this.uri = uri;
+    return this;
+  }
+
+  public DownloadStateBuilder setCacheKey(@Nullable String cacheKey) {
+    this.cacheKey = cacheKey;
+    return this;
+  }
+
+  public DownloadStateBuilder setState(int state) {
+    this.state = state;
+    return this;
+  }
+
+  public DownloadStateBuilder setDownloadPercentage(float downloadPercentage) {
+    this.downloadPercentage = downloadPercentage;
+    return this;
+  }
+
+  public DownloadStateBuilder setDownloadedBytes(long downloadedBytes) {
+    this.downloadedBytes = downloadedBytes;
+    return this;
+  }
+
+  public DownloadStateBuilder setTotalBytes(long totalBytes) {
+    this.totalBytes = totalBytes;
+    return this;
+  }
+
+  public DownloadStateBuilder setFailureReason(int failureReason) {
+    this.failureReason = failureReason;
+    return this;
+  }
+
+  public DownloadStateBuilder setStopFlags(int stopFlags) {
+    this.stopFlags = stopFlags;
+    return this;
+  }
+
+  public DownloadStateBuilder setNotMetRequirements(int notMetRequirements) {
+    this.notMetRequirements = notMetRequirements;
+    return this;
+  }
+
+  public DownloadStateBuilder setStartTimeMs(long startTimeMs) {
+    this.startTimeMs = startTimeMs;
+    return this;
+  }
+
+  public DownloadStateBuilder setUpdateTimeMs(long updateTimeMs) {
+    this.updateTimeMs = updateTimeMs;
+    return this;
+  }
+
+  public DownloadStateBuilder setStreamKeys(StreamKey... streamKeys) {
+    this.streamKeys = streamKeys;
+    return this;
+  }
+
+  public DownloadStateBuilder setCustomMetadata(byte[] customMetadata) {
+    this.customMetadata = customMetadata;
+    return this;
+  }
+
+  public DownloadState build() {
+    return new DownloadState(
+        id,
+        type,
+        uri,
+        cacheKey,
+        state,
+        downloadPercentage,
+        downloadedBytes,
+        totalBytes,
+        failureReason,
+        stopFlags,
+        notMetRequirements,
+        startTimeMs,
+        updateTimeMs,
+        streamKeys,
+        customMetadata);
+  }
+}
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
new file mode 100644
index 0000000000..f6d008a0e3
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
@@ -0,0 +1,344 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.offline;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
+
+import android.net.Uri;
+import java.util.Arrays;
+import java.util.Collections;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Unit tests for {@link DownloadState}. */
+@RunWith(RobolectricTestRunner.class)
+public class DownloadStateTest {
+
+  private Uri testUri;
+
+  @Before
+  public void setUp() throws Exception {
+    testUri = Uri.parse("https://www.test.com/download1");
+  }
+
+  @Test
+  public void mergeAction_actionHaveDifferentType_throwsException() {
+    DownloadAction downloadAction = createDownloadAction();
+    DownloadState downloadState =
+        new DownloadStateBuilder(downloadAction)
+            .setType(downloadAction.type + "_different")
+            .setState(DownloadState.STATE_QUEUED)
+            .build();
+
+    try {
+      downloadState.mergeAction(downloadAction);
+      fail();
+    } catch (Exception e) {
+      // Expected.
+    }
+  }
+
+  @Test
+  public void mergeAction_actionHaveDifferentId_throwsException() {
+    DownloadAction downloadAction = createDownloadAction();
+    DownloadState downloadState =
+        new DownloadStateBuilder(downloadAction)
+            .setId(downloadAction.id + "_different")
+            .setState(DownloadState.STATE_QUEUED)
+            .build();
+
+    try {
+      downloadState.mergeAction(downloadAction);
+      fail();
+    } catch (Exception e) {
+      // Expected.
+    }
+  }
+
+  @Test
+  public void mergeAction_actionsWithSameIdAndType_doesNotFail() {
+    DownloadAction downloadAction = createDownloadAction();
+    DownloadStateBuilder downloadStateBuilder =
+        new DownloadStateBuilder(downloadAction).setState(DownloadState.STATE_QUEUED);
+    DownloadState downloadState = downloadStateBuilder.build();
+
+    downloadState.mergeAction(downloadAction);
+  }
+
+  @Test
+  public void mergeAction_actionHaveDifferentUri_downloadStateUriIsUpdated() {
+    DownloadAction downloadAction = createDownloadAction();
+    DownloadStateBuilder downloadStateBuilder =
+        new DownloadStateBuilder(downloadAction)
+            .setUri(downloadAction.uri + "_different")
+            .setState(DownloadState.STATE_QUEUED);
+    DownloadState downloadState = downloadStateBuilder.build();
+
+    DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);
+
+    DownloadState expectedDownloadState = downloadStateBuilder.setUri(downloadAction.uri).build();
+    assertEqual(mergedDownloadState, expectedDownloadState);
+  }
+
+  @Test
+  public void mergeAction_actionHaveDifferentData_downloadStateDataIsUpdated() {
+    DownloadAction downloadAction =
+        DownloadAction.createDownloadAction(
+            DownloadAction.TYPE_DASH,
+            testUri,
+            Collections.emptyList(),
+            /* customCacheKey= */ null,
+            /* data= */ new byte[] {1, 2, 3, 4});
+    DownloadStateBuilder downloadStateBuilder =
+        new DownloadStateBuilder(downloadAction)
+            .setState(DownloadState.STATE_QUEUED)
+            .setCustomMetadata(new byte[0]);
+    DownloadState downloadState = downloadStateBuilder.build();
+
+    DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);
+
+    DownloadState expectedDownloadState =
+        downloadStateBuilder.setCustomMetadata(downloadAction.data).build();
+    assertEqual(mergedDownloadState, expectedDownloadState);
+  }
+
+  @Test
+  public void mergeAction_queuedDownloadRemoveAction_stateBecomesRemoving() {
+    DownloadAction downloadAction = createRemoveAction();
+    DownloadStateBuilder downloadStateBuilder =
+        new DownloadStateBuilder(downloadAction).setState(DownloadState.STATE_QUEUED);
+    DownloadState downloadState = downloadStateBuilder.build();
+
+    DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);
+
+    DownloadState expectedDownloadState =
+        downloadStateBuilder.setState(DownloadState.STATE_REMOVING).build();
+    assertEqual(mergedDownloadState, expectedDownloadState);
+  }
+
+  @Test
+  public void mergeAction_removingDownloadDownloadAction_stateBecomesRestarting() {
+    DownloadAction downloadAction = createDownloadAction();
+    DownloadStateBuilder downloadStateBuilder =
+        new DownloadStateBuilder(downloadAction).setState(DownloadState.STATE_REMOVING);
+    DownloadState downloadState = downloadStateBuilder.build();
+
+    DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);
+
+    DownloadState expectedDownloadState =
+        downloadStateBuilder.setState(DownloadState.STATE_RESTARTING).build();
+    assertEqual(mergedDownloadState, expectedDownloadState);
+  }
+
+  @Test
+  public void mergeAction_failedDownloadDownloadAction_stateBecomesQueued() {
+    DownloadAction downloadAction = createDownloadAction();
+    DownloadStateBuilder downloadStateBuilder =
+        new DownloadStateBuilder(downloadAction)
+            .setState(DownloadState.STATE_FAILED)
+            .setFailureReason(DownloadState.FAILURE_REASON_UNKNOWN);
+    DownloadState downloadState = downloadStateBuilder.build();
+
+    DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);
+
+    DownloadState expectedDownloadState =
+        downloadStateBuilder
+            .setState(DownloadState.STATE_QUEUED)
+            .setFailureReason(DownloadState.FAILURE_REASON_NONE)
+            .build();
+    assertEqual(mergedDownloadState, expectedDownloadState);
+  }
+
+  @Test
+  public void mergeAction_stoppedDownloadDownloadAction_stateStaysStopped() {
+    DownloadAction downloadAction = createDownloadAction();
+    DownloadStateBuilder downloadStateBuilder =
+        new DownloadStateBuilder(downloadAction)
+            .setState(DownloadState.STATE_STOPPED)
+            .setStopFlags(DownloadState.STOP_FLAG_STOPPED);
+    DownloadState downloadState = downloadStateBuilder.build();
+
+    DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);
+
+    assertEqual(mergedDownloadState, downloadState);
+  }
+
+  @Test
+  public void mergeAction_stoppedDownloadRemoveAction_stateBecomesRemoving() {
+    DownloadAction downloadAction = createRemoveAction();
+    DownloadStateBuilder downloadStateBuilder =
+        new DownloadStateBuilder(downloadAction)
+            .setState(DownloadState.STATE_STOPPED)
+            .setStopFlags(DownloadState.STOP_FLAG_STOPPED);
+    DownloadState downloadState = downloadStateBuilder.build();
+
+    DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);
+
+    DownloadState expectedDownloadState =
+        downloadStateBuilder.setState(DownloadState.STATE_REMOVING).build();
+    assertEqual(mergedDownloadState, expectedDownloadState);
+  }
+
+  @Test
+  public void mergeAction_restartingDownloadRemoveAction_stateBecomesRemoving() {
+    DownloadAction downloadAction = createRemoveAction();
+    DownloadStateBuilder downloadStateBuilder =
+        new DownloadStateBuilder(downloadAction).setState(DownloadState.STATE_RESTARTING);
+    DownloadState downloadState = downloadStateBuilder.build();
+
+    DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);
+
+    DownloadState expectedDownloadState =
+        downloadStateBuilder.setState(DownloadState.STATE_REMOVING).build();
+    assertEqual(mergedDownloadState, expectedDownloadState);
+  }
+
+  @Test
+  public void mergeAction_returnsMergedKeys() {
+    StreamKey streamKey1 = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
+    StreamKey streamKey2 = new StreamKey(/* groupIndex= */ 1, /* trackIndex= */ 1);
+    StreamKey[] keys1 = new StreamKey[] {streamKey1};
+    StreamKey[] keys2 = new StreamKey[] {streamKey2};
+    StreamKey[] expectedKeys = new StreamKey[] {streamKey1, streamKey2};
+
+    doTestMergeActionReturnsMergedKeys(keys1, keys2, expectedKeys);
+  }
+
+  @Test
+  public void mergeAction_returnsUniqueKeys() {
+    StreamKey streamKey1 = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
+    StreamKey streamKey1Copy = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
+    StreamKey streamKey2 = new StreamKey(/* groupIndex= */ 1, /* trackIndex= */ 1);
+    StreamKey[] keys1 = new StreamKey[] {streamKey1};
+    StreamKey[] keys2 = new StreamKey[] {streamKey2, streamKey1Copy};
+    StreamKey[] expectedKeys = new StreamKey[] {streamKey1, streamKey2};
+
+    doTestMergeActionReturnsMergedKeys(keys1, keys2, expectedKeys);
+  }
+
+  @Test
+  public void mergeAction_ifFirstActionKeysEmpty_returnsEmptyKeys() {
+    StreamKey streamKey1 = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
+    StreamKey streamKey2 = new StreamKey(/* groupIndex= */ 1, /* trackIndex= */ 1);
+    StreamKey[] keys1 = new StreamKey[] {};
+    StreamKey[] keys2 = new StreamKey[] {streamKey2, streamKey1};
+    StreamKey[] expectedKeys = new StreamKey[] {};
+
+    doTestMergeActionReturnsMergedKeys(keys1, keys2, expectedKeys);
+  }
+
+  @Test
+  public void mergeAction_ifNotFirstActionKeysEmpty_returnsEmptyKeys() {
+    StreamKey streamKey1 = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
+    StreamKey streamKey2 = new StreamKey(/* groupIndex= */ 1, /* trackIndex= */ 1);
+    StreamKey[] keys1 = new StreamKey[] {streamKey2, streamKey1};
+    StreamKey[] keys2 = new StreamKey[] {};
+    StreamKey[] expectedKeys = new StreamKey[] {};
+
+    doTestMergeActionReturnsMergedKeys(keys1, keys2, expectedKeys);
+  }
+
+  private void doTestMergeActionReturnsMergedKeys(
+      StreamKey[] keys1, StreamKey[] keys2, StreamKey[] expectedKeys) {
+    DownloadAction downloadAction =
+        DownloadAction.createDownloadAction(
+            DownloadAction.TYPE_DASH,
+            testUri,
+            Arrays.asList(keys2),
+            /* customCacheKey= */ null,
+            /* data= */ null);
+    DownloadStateBuilder downloadStateBuilder =
+        new DownloadStateBuilder(downloadAction)
+            .setState(DownloadState.STATE_QUEUED)
+            .setStreamKeys(keys1);
+    DownloadState downloadState = downloadStateBuilder.build();
+
+    DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);
+
+    DownloadState expectedDownloadState = downloadStateBuilder.setStreamKeys(expectedKeys).build();
+    assertEqual(mergedDownloadState, expectedDownloadState);
+  }
+
+  static void assertEqual(DownloadState downloadState, DownloadState expected) {
+    assertThat(areEqual(downloadState, expected)).isTrue();
+  }
+
+  private static boolean areEqual(DownloadState downloadState, DownloadState that) {
+    if (downloadState.state != that.state) {
+      return false;
+    }
+    if (Float.compare(that.downloadPercentage, downloadState.downloadPercentage) != 0) {
+      return false;
+    }
+    if (downloadState.downloadedBytes != that.downloadedBytes) {
+      return false;
+    }
+    if (downloadState.totalBytes != that.totalBytes) {
+      return false;
+    }
+    if (downloadState.startTimeMs != that.startTimeMs) {
+      return false;
+    }
+    if (downloadState.updateTimeMs != that.updateTimeMs) {
+      return false;
+    }
+    if (downloadState.failureReason != that.failureReason) {
+      return false;
+    }
+    if (downloadState.stopFlags != that.stopFlags) {
+      return false;
+    }
+    if (downloadState.notMetRequirements != that.notMetRequirements) {
+      return false;
+    }
+    if (!downloadState.id.equals(that.id)) {
+      return false;
+    }
+    if (!downloadState.type.equals(that.type)) {
+      return false;
+    }
+    if (!downloadState.uri.equals(that.uri)) {
+      return false;
+    }
+    if (downloadState.cacheKey != null
+        ? !downloadState.cacheKey.equals(that.cacheKey)
+        : that.cacheKey != null) {
+      return false;
+    }
+    if (downloadState.streamKeys.length != that.streamKeys.length
+        || !Arrays.asList(downloadState.streamKeys).containsAll(Arrays.asList(that.streamKeys))) {
+      return false;
+    }
+    return Arrays.equals(downloadState.customMetadata, that.customMetadata);
+  }
+
+  private DownloadAction createDownloadAction() {
+    return DownloadAction.createDownloadAction(
+        DownloadAction.TYPE_DASH,
+        testUri,
+        Collections.emptyList(),
+        /* customCacheKey= */ null,
+        /* data= */ null);
+  }
+
+  private DownloadAction createRemoveAction() {
+    return DownloadAction.createRemoveAction(
+        DownloadAction.TYPE_DASH, testUri, /* customCacheKey= */ null);
+  }
+}

From 784906b87209328e1f208cf833ff6cc426c77040 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 5 Feb 2019 15:25:01 +0000
Subject: [PATCH 473/832] Update release notes

PiperOrigin-RevId: 232481580
---
 RELEASENOTES.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 9ec6015240..817f9f2645 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -37,8 +37,6 @@
   ([#3860](https://github.com/google/ExoPlayer/issues/3860)).
 * IMA extension: Require setting the `Player` on `AdsLoader` instances before
   playback.
-* Add `Handler` parameter to `ConcatenatingMediaSource` methods which take a
-  callback `Runnable`.
 * Remove `player` and `isTopLevelSource` parameters from `MediaSource.prepare`.
 * VP9 extension: Remove RGB output mode and libyuv dependency, and switch to
   surface YUV output as the default. Remove constructor parameters `scaleToFit`
@@ -49,6 +47,10 @@
 ### 2.9.5 ###
 
 * HLS: Parse `CHANNELS` attribute from `EXT-X-MEDIA` tag.
+* ConcatenatingMediaSource:
+  * Add `Handler` parameter to methods that take a callback `Runnable`.
+  * Fix issue with dropped messages when releasing the source
+    ([#5464](https://github.com/google/ExoPlayer/issues/5464)).
 * ExtractorMediaSource: Fix issue that could cause the player to get stuck
   buffering at the end of the media.
 * PlayerView: Fix issue preventing `OnClickListener` from receiving events
@@ -58,8 +60,6 @@
 * OkHttp extension: Upgrade OkHttp dependency to 3.12.1.
 * MP3: Wider fix for issue where streams would play twice on some Samsung
   devices ([#4519](https://github.com/google/ExoPlayer/issues/4519)).
-* Fix issue with dropped messages when releasing a `ConcatenatingMediaSource`
-  ([#5464](https://github.com/google/ExoPlayer/issues/5464)).
 
 ### 2.9.4 ###
 

From 391f2bb6c2433895d48e3c79ac3d00d38633b9f6 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 5 Feb 2019 15:30:13 +0000
Subject: [PATCH 474/832] Remove indirection in DefaultDownloadIndex

DefaultDownloadIndex is currently just forwarding all calls to its
inner class. getDownloadTable() handles initialization, but this
doesn't really seem different to having an initialization method. It
doesn't guarantee initialization happens, since a bad method
implementation could try and access downloadTable directly, just as
a bad method implementation could forget to call the initialization
method. Hence this change removes the indirection.

PiperOrigin-RevId: 232482228
---
 .../offline/DefaultDownloadIndex.java         | 484 +++++++++---------
 1 file changed, 231 insertions(+), 253 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
index b9fae6e2db..2ff85c041b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -39,8 +39,98 @@ public final class DefaultDownloadIndex implements DownloadIndex {
 
   @VisibleForTesting /* package */ static final int TABLE_VERSION = 1;
 
+  private static final String COLUMN_ID = "id";
+  private static final String COLUMN_TYPE = "title";
+  private static final String COLUMN_URI = "subtitle";
+  private static final String COLUMN_CACHE_KEY = "cache_key";
+  private static final String COLUMN_STATE = "state";
+  private static final String COLUMN_DOWNLOAD_PERCENTAGE = "download_percentage";
+  private static final String COLUMN_DOWNLOADED_BYTES = "downloaded_bytes";
+  private static final String COLUMN_TOTAL_BYTES = "total_bytes";
+  private static final String COLUMN_FAILURE_REASON = "failure_reason";
+  private static final String COLUMN_STOP_FLAGS = "stop_flags";
+  private static final String COLUMN_NOT_MET_REQUIREMENTS = "not_met_requirements";
+  private static final String COLUMN_START_TIME_MS = "start_time_ms";
+  private static final String COLUMN_UPDATE_TIME_MS = "update_time_ms";
+  private static final String COLUMN_STREAM_KEYS = "stream_keys";
+  private static final String COLUMN_CUSTOM_METADATA = "custom_metadata";
+
+  private static final int COLUMN_INDEX_ID = 0;
+  private static final int COLUMN_INDEX_TYPE = 1;
+  private static final int COLUMN_INDEX_URI = 2;
+  private static final int COLUMN_INDEX_CACHE_KEY = 3;
+  private static final int COLUMN_INDEX_STATE = 4;
+  private static final int COLUMN_INDEX_DOWNLOAD_PERCENTAGE = 5;
+  private static final int COLUMN_INDEX_DOWNLOADED_BYTES = 6;
+  private static final int COLUMN_INDEX_TOTAL_BYTES = 7;
+  private static final int COLUMN_INDEX_FAILURE_REASON = 8;
+  private static final int COLUMN_INDEX_STOP_FLAGS = 9;
+  private static final int COLUMN_INDEX_NOT_MET_REQUIREMENTS = 10;
+  private static final int COLUMN_INDEX_START_TIME_MS = 11;
+  private static final int COLUMN_INDEX_UPDATE_TIME_MS = 12;
+  private static final int COLUMN_INDEX_STREAM_KEYS = 13;
+  private static final int COLUMN_INDEX_CUSTOM_METADATA = 14;
+
+  private static final String COLUMN_SELECTION_ID = COLUMN_ID + " = ?";
+
+  private static final String[] COLUMNS =
+      new String[] {
+        COLUMN_ID,
+        COLUMN_TYPE,
+        COLUMN_URI,
+        COLUMN_CACHE_KEY,
+        COLUMN_STATE,
+        COLUMN_DOWNLOAD_PERCENTAGE,
+        COLUMN_DOWNLOADED_BYTES,
+        COLUMN_TOTAL_BYTES,
+        COLUMN_FAILURE_REASON,
+        COLUMN_STOP_FLAGS,
+        COLUMN_NOT_MET_REQUIREMENTS,
+        COLUMN_START_TIME_MS,
+        COLUMN_UPDATE_TIME_MS,
+        COLUMN_STREAM_KEYS,
+        COLUMN_CUSTOM_METADATA
+      };
+
+  private static final String SQL_DROP_TABLE_IF_EXISTS = "DROP TABLE IF EXISTS " + TABLE_NAME;
+  private static final String SQL_CREATE_TABLE =
+      "CREATE TABLE "
+          + TABLE_NAME
+          + " ("
+          + COLUMN_ID
+          + " TEXT PRIMARY KEY NOT NULL,"
+          + COLUMN_TYPE
+          + " TEXT NOT NULL,"
+          + COLUMN_URI
+          + " TEXT NOT NULL,"
+          + COLUMN_CACHE_KEY
+          + " TEXT,"
+          + COLUMN_STATE
+          + " INTEGER NOT NULL,"
+          + COLUMN_DOWNLOAD_PERCENTAGE
+          + " REAL NOT NULL,"
+          + COLUMN_DOWNLOADED_BYTES
+          + " INTEGER NOT NULL,"
+          + COLUMN_TOTAL_BYTES
+          + " INTEGER NOT NULL,"
+          + COLUMN_FAILURE_REASON
+          + " INTEGER NOT NULL,"
+          + COLUMN_STOP_FLAGS
+          + " INTEGER NOT NULL,"
+          + COLUMN_NOT_MET_REQUIREMENTS
+          + " INTEGER NOT NULL,"
+          + COLUMN_START_TIME_MS
+          + " INTEGER NOT NULL,"
+          + COLUMN_UPDATE_TIME_MS
+          + " INTEGER NOT NULL,"
+          + COLUMN_STREAM_KEYS
+          + " TEXT NOT NULL,"
+          + COLUMN_CUSTOM_METADATA
+          + " BLOB NOT NULL)";
+
   private final DatabaseProvider databaseProvider;
-  @Nullable private DownloadsTable downloadTable;
+
+  private boolean initialized;
 
   /**
    * Creates a DefaultDownloadIndex which stores the {@link DownloadState}s on a SQLite database
@@ -56,29 +146,160 @@ public final class DefaultDownloadIndex implements DownloadIndex {
   @Override
   @Nullable
   public DownloadState getDownloadState(String id) {
-    return getDownloadTable().get(id);
+    ensureInitialized();
+    try (Cursor cursor = getCursor(COLUMN_SELECTION_ID, new String[] {id})) {
+      if (cursor.getCount() == 0) {
+        return null;
+      }
+      cursor.moveToNext();
+      DownloadState downloadState = getDownloadStateForCurrentRow(cursor);
+      Assertions.checkState(id.equals(downloadState.id));
+      return downloadState;
+    }
   }
 
   @Override
   public DownloadStateCursor getDownloadStates(@DownloadState.State int... states) {
-    return getDownloadTable().get(states);
+    ensureInitialized();
+    String selection = null;
+    if (states.length > 0) {
+      StringBuilder selectionBuilder = new StringBuilder();
+      selectionBuilder.append(COLUMN_STATE).append(" IN (");
+      for (int i = 0; i < states.length; i++) {
+        if (i > 0) {
+          selectionBuilder.append(',');
+        }
+        selectionBuilder.append(states[i]);
+      }
+      selectionBuilder.append(')');
+      selection = selectionBuilder.toString();
+    }
+    Cursor cursor = getCursor(selection, /* selectionArgs= */ null);
+    return new DownloadStateCursorImpl(cursor);
   }
 
   @Override
   public void putDownloadState(DownloadState downloadState) {
-    getDownloadTable().replace(downloadState);
+    ensureInitialized();
+    SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+    ContentValues values = new ContentValues();
+    values.put(COLUMN_ID, downloadState.id);
+    values.put(COLUMN_TYPE, downloadState.type);
+    values.put(COLUMN_URI, downloadState.uri.toString());
+    values.put(COLUMN_CACHE_KEY, downloadState.cacheKey);
+    values.put(COLUMN_STATE, downloadState.state);
+    values.put(COLUMN_DOWNLOAD_PERCENTAGE, downloadState.downloadPercentage);
+    values.put(COLUMN_DOWNLOADED_BYTES, downloadState.downloadedBytes);
+    values.put(COLUMN_TOTAL_BYTES, downloadState.totalBytes);
+    values.put(COLUMN_FAILURE_REASON, downloadState.failureReason);
+    values.put(COLUMN_STOP_FLAGS, downloadState.stopFlags);
+    values.put(COLUMN_NOT_MET_REQUIREMENTS, downloadState.notMetRequirements);
+    values.put(COLUMN_START_TIME_MS, downloadState.startTimeMs);
+    values.put(COLUMN_UPDATE_TIME_MS, downloadState.updateTimeMs);
+    values.put(COLUMN_STREAM_KEYS, encodeStreamKeys(downloadState.streamKeys));
+    values.put(COLUMN_CUSTOM_METADATA, downloadState.customMetadata);
+    writableDatabase.replace(TABLE_NAME, /* nullColumnHack= */ null, values);
   }
 
   @Override
   public void removeDownloadState(String id) {
-    getDownloadTable().delete(id);
+    ensureInitialized();
+    databaseProvider
+        .getWritableDatabase()
+        .delete(TABLE_NAME, COLUMN_SELECTION_ID, new String[] {id});
   }
 
-  private DownloadsTable getDownloadTable() {
-    if (downloadTable == null) {
-      downloadTable = new DownloadsTable(databaseProvider);
+  private void ensureInitialized() {
+    if (initialized) {
+      return;
     }
-    return downloadTable;
+    SQLiteDatabase readableDatabase = databaseProvider.getReadableDatabase();
+    int version = VersionTable.getVersion(readableDatabase, VersionTable.FEATURE_OFFLINE);
+    if (version == VersionTable.VERSION_UNSET || version > TABLE_VERSION) {
+      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+      writableDatabase.beginTransaction();
+      try {
+        VersionTable.setVersion(writableDatabase, VersionTable.FEATURE_OFFLINE, TABLE_VERSION);
+        writableDatabase.execSQL(SQL_DROP_TABLE_IF_EXISTS);
+        writableDatabase.execSQL(SQL_CREATE_TABLE);
+        writableDatabase.setTransactionSuccessful();
+      } finally {
+        writableDatabase.endTransaction();
+      }
+    } else if (version < TABLE_VERSION) {
+      // There is no previous version currently.
+      throw new IllegalStateException();
+    }
+    initialized = true;
+  }
+
+  private Cursor getCursor(@Nullable String selection, @Nullable String[] selectionArgs) {
+    String sortOrder = COLUMN_START_TIME_MS + " ASC";
+    return databaseProvider
+        .getReadableDatabase()
+        .query(
+            TABLE_NAME,
+            COLUMNS,
+            selection,
+            selectionArgs,
+            /* groupBy= */ null,
+            /* having= */ null,
+            sortOrder);
+  }
+
+  private static DownloadState getDownloadStateForCurrentRow(Cursor cursor) {
+    return new DownloadState(
+        cursor.getString(COLUMN_INDEX_ID),
+        cursor.getString(COLUMN_INDEX_TYPE),
+        Uri.parse(cursor.getString(COLUMN_INDEX_URI)),
+        cursor.getString(COLUMN_INDEX_CACHE_KEY),
+        cursor.getInt(COLUMN_INDEX_STATE),
+        cursor.getFloat(COLUMN_INDEX_DOWNLOAD_PERCENTAGE),
+        cursor.getLong(COLUMN_INDEX_DOWNLOADED_BYTES),
+        cursor.getLong(COLUMN_INDEX_TOTAL_BYTES),
+        cursor.getInt(COLUMN_INDEX_FAILURE_REASON),
+        cursor.getInt(COLUMN_INDEX_STOP_FLAGS),
+        cursor.getInt(COLUMN_INDEX_NOT_MET_REQUIREMENTS),
+        cursor.getLong(COLUMN_INDEX_START_TIME_MS),
+        cursor.getLong(COLUMN_INDEX_UPDATE_TIME_MS),
+        decodeStreamKeys(cursor.getString(COLUMN_INDEX_STREAM_KEYS)),
+        cursor.getBlob(COLUMN_INDEX_CUSTOM_METADATA));
+  }
+
+  private static String encodeStreamKeys(StreamKey[] streamKeys) {
+    StringBuilder stringBuilder = new StringBuilder();
+    for (StreamKey streamKey : streamKeys) {
+      stringBuilder
+          .append(streamKey.periodIndex)
+          .append('.')
+          .append(streamKey.groupIndex)
+          .append('.')
+          .append(streamKey.trackIndex)
+          .append(',');
+    }
+    if (stringBuilder.length() > 0) {
+      stringBuilder.setLength(stringBuilder.length() - 1);
+    }
+    return stringBuilder.toString();
+  }
+
+  private static StreamKey[] decodeStreamKeys(String encodedStreamKeys) {
+    if (encodedStreamKeys.isEmpty()) {
+      return new StreamKey[0];
+    }
+    String[] streamKeysStrings = Util.split(encodedStreamKeys, ",");
+    int streamKeysCount = streamKeysStrings.length;
+    StreamKey[] streamKeys = new StreamKey[streamKeysCount];
+    for (int i = 0; i < streamKeysCount; i++) {
+      String[] indices = Util.split(streamKeysStrings[i], "\\.");
+      Assertions.checkState(indices.length == 3);
+      streamKeys[i] =
+          new StreamKey(
+              Integer.parseInt(indices[0]),
+              Integer.parseInt(indices[1]),
+              Integer.parseInt(indices[2]));
+    }
+    return streamKeys;
   }
 
   private static final class DownloadStateCursorImpl implements DownloadStateCursor {
@@ -91,7 +312,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
 
     @Override
     public DownloadState getDownloadState() {
-      return DownloadsTable.getDownloadState(cursor);
+      return getDownloadStateForCurrentRow(cursor);
     }
 
     @Override
@@ -119,247 +340,4 @@ public final class DefaultDownloadIndex implements DownloadIndex {
       return cursor.isClosed();
     }
   }
-
-  private static final class DownloadsTable {
-
-    private static final String COLUMN_ID = "id";
-    private static final String COLUMN_TYPE = "title";
-    private static final String COLUMN_URI = "subtitle";
-    private static final String COLUMN_CACHE_KEY = "cache_key";
-    private static final String COLUMN_STATE = "state";
-    private static final String COLUMN_DOWNLOAD_PERCENTAGE = "download_percentage";
-    private static final String COLUMN_DOWNLOADED_BYTES = "downloaded_bytes";
-    private static final String COLUMN_TOTAL_BYTES = "total_bytes";
-    private static final String COLUMN_FAILURE_REASON = "failure_reason";
-    private static final String COLUMN_STOP_FLAGS = "stop_flags";
-    private static final String COLUMN_NOT_MET_REQUIREMENTS = "not_met_requirements";
-    private static final String COLUMN_START_TIME_MS = "start_time_ms";
-    private static final String COLUMN_UPDATE_TIME_MS = "update_time_ms";
-    private static final String COLUMN_STREAM_KEYS = "stream_keys";
-    private static final String COLUMN_CUSTOM_METADATA = "custom_metadata";
-
-    private static final int COLUMN_INDEX_ID = 0;
-    private static final int COLUMN_INDEX_TYPE = 1;
-    private static final int COLUMN_INDEX_URI = 2;
-    private static final int COLUMN_INDEX_CACHE_KEY = 3;
-    private static final int COLUMN_INDEX_STATE = 4;
-    private static final int COLUMN_INDEX_DOWNLOAD_PERCENTAGE = 5;
-    private static final int COLUMN_INDEX_DOWNLOADED_BYTES = 6;
-    private static final int COLUMN_INDEX_TOTAL_BYTES = 7;
-    private static final int COLUMN_INDEX_FAILURE_REASON = 8;
-    private static final int COLUMN_INDEX_STOP_FLAGS = 9;
-    private static final int COLUMN_INDEX_NOT_MET_REQUIREMENTS = 10;
-    private static final int COLUMN_INDEX_START_TIME_MS = 11;
-    private static final int COLUMN_INDEX_UPDATE_TIME_MS = 12;
-    private static final int COLUMN_INDEX_STREAM_KEYS = 13;
-    private static final int COLUMN_INDEX_CUSTOM_METADATA = 14;
-
-    private static final String COLUMN_SELECTION_ID = COLUMN_ID + " = ?";
-
-    private static final String[] COLUMNS =
-        new String[] {
-          COLUMN_ID,
-          COLUMN_TYPE,
-          COLUMN_URI,
-          COLUMN_CACHE_KEY,
-          COLUMN_STATE,
-          COLUMN_DOWNLOAD_PERCENTAGE,
-          COLUMN_DOWNLOADED_BYTES,
-          COLUMN_TOTAL_BYTES,
-          COLUMN_FAILURE_REASON,
-          COLUMN_STOP_FLAGS,
-          COLUMN_NOT_MET_REQUIREMENTS,
-          COLUMN_START_TIME_MS,
-          COLUMN_UPDATE_TIME_MS,
-          COLUMN_STREAM_KEYS,
-          COLUMN_CUSTOM_METADATA
-        };
-
-    private static final String SQL_DROP_TABLE_IF_EXISTS = "DROP TABLE IF EXISTS " + TABLE_NAME;
-    private static final String SQL_CREATE_TABLE =
-        "CREATE TABLE "
-            + TABLE_NAME
-            + " ("
-            + COLUMN_ID
-            + " TEXT PRIMARY KEY NOT NULL,"
-            + COLUMN_TYPE
-            + " TEXT NOT NULL,"
-            + COLUMN_URI
-            + " TEXT NOT NULL,"
-            + COLUMN_CACHE_KEY
-            + " TEXT,"
-            + COLUMN_STATE
-            + " INTEGER NOT NULL,"
-            + COLUMN_DOWNLOAD_PERCENTAGE
-            + " REAL NOT NULL,"
-            + COLUMN_DOWNLOADED_BYTES
-            + " INTEGER NOT NULL,"
-            + COLUMN_TOTAL_BYTES
-            + " INTEGER NOT NULL,"
-            + COLUMN_FAILURE_REASON
-            + " INTEGER NOT NULL,"
-            + COLUMN_STOP_FLAGS
-            + " INTEGER NOT NULL,"
-            + COLUMN_NOT_MET_REQUIREMENTS
-            + " INTEGER NOT NULL,"
-            + COLUMN_START_TIME_MS
-            + " INTEGER NOT NULL,"
-            + COLUMN_UPDATE_TIME_MS
-            + " INTEGER NOT NULL,"
-            + COLUMN_STREAM_KEYS
-            + " TEXT NOT NULL,"
-            + COLUMN_CUSTOM_METADATA
-            + " BLOB NOT NULL)";
-
-    private final DatabaseProvider databaseProvider;
-
-    public DownloadsTable(DatabaseProvider databaseProvider) {
-      this.databaseProvider = databaseProvider;
-      int version =
-          VersionTable.getVersion(
-              databaseProvider.getReadableDatabase(), VersionTable.FEATURE_OFFLINE);
-      if (version == VersionTable.VERSION_UNSET || version > TABLE_VERSION) {
-        SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
-        writableDatabase.beginTransaction();
-        try {
-          VersionTable.setVersion(writableDatabase, VersionTable.FEATURE_OFFLINE, TABLE_VERSION);
-          writableDatabase.execSQL(SQL_DROP_TABLE_IF_EXISTS);
-          writableDatabase.execSQL(SQL_CREATE_TABLE);
-          writableDatabase.setTransactionSuccessful();
-        } finally {
-          writableDatabase.endTransaction();
-        }
-      } else if (version < TABLE_VERSION) {
-        // There is no previous version currently.
-        throw new IllegalStateException();
-      }
-    }
-
-    public void replace(DownloadState downloadState) {
-      ContentValues values = new ContentValues();
-      values.put(COLUMN_ID, downloadState.id);
-      values.put(COLUMN_TYPE, downloadState.type);
-      values.put(COLUMN_URI, downloadState.uri.toString());
-      values.put(COLUMN_CACHE_KEY, downloadState.cacheKey);
-      values.put(COLUMN_STATE, downloadState.state);
-      values.put(COLUMN_DOWNLOAD_PERCENTAGE, downloadState.downloadPercentage);
-      values.put(COLUMN_DOWNLOADED_BYTES, downloadState.downloadedBytes);
-      values.put(COLUMN_TOTAL_BYTES, downloadState.totalBytes);
-      values.put(COLUMN_FAILURE_REASON, downloadState.failureReason);
-      values.put(COLUMN_STOP_FLAGS, downloadState.stopFlags);
-      values.put(COLUMN_NOT_MET_REQUIREMENTS, downloadState.notMetRequirements);
-      values.put(COLUMN_START_TIME_MS, downloadState.startTimeMs);
-      values.put(COLUMN_UPDATE_TIME_MS, downloadState.updateTimeMs);
-      values.put(COLUMN_STREAM_KEYS, encodeStreamKeys(downloadState.streamKeys));
-      values.put(COLUMN_CUSTOM_METADATA, downloadState.customMetadata);
-      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
-      writableDatabase.replace(TABLE_NAME, /* nullColumnHack= */ null, values);
-    }
-
-    @Nullable
-    public DownloadState get(String id) {
-      String[] selectionArgs = {id};
-      try (Cursor cursor = query(COLUMN_SELECTION_ID, selectionArgs)) {
-        if (cursor.getCount() == 0) {
-          return null;
-        }
-        cursor.moveToNext();
-        DownloadState downloadState = getDownloadState(cursor);
-        Assertions.checkState(id.equals(downloadState.id));
-        return downloadState;
-      }
-    }
-
-    public DownloadStateCursor get(@DownloadState.State int... states) {
-      String selection = null;
-      if (states.length > 0) {
-        StringBuilder selectionBuilder = new StringBuilder();
-        selectionBuilder.append(COLUMN_STATE).append(" IN (");
-        for (int i = 0; i < states.length; i++) {
-          if (i > 0) {
-            selectionBuilder.append(',');
-          }
-          selectionBuilder.append(states[i]);
-        }
-        selectionBuilder.append(')');
-        selection = selectionBuilder.toString();
-      }
-      Cursor cursor = query(selection, /* selectionArgs= */ null);
-      return new DownloadStateCursorImpl(cursor);
-    }
-
-    public void delete(String id) {
-      String[] selectionArgs = {id};
-      databaseProvider.getWritableDatabase().delete(TABLE_NAME, COLUMN_SELECTION_ID, selectionArgs);
-    }
-
-    private Cursor query(@Nullable String selection, @Nullable String[] selectionArgs) {
-      String sortOrder = COLUMN_START_TIME_MS + " ASC";
-      return databaseProvider
-          .getReadableDatabase()
-          .query(
-              TABLE_NAME,
-              COLUMNS,
-              selection,
-              selectionArgs,
-              /* groupBy= */ null,
-              /* having= */ null,
-              sortOrder);
-    }
-
-    private static DownloadState getDownloadState(Cursor cursor) {
-      return new DownloadState(
-          cursor.getString(COLUMN_INDEX_ID),
-          cursor.getString(COLUMN_INDEX_TYPE),
-          Uri.parse(cursor.getString(COLUMN_INDEX_URI)),
-          cursor.getString(COLUMN_INDEX_CACHE_KEY),
-          cursor.getInt(COLUMN_INDEX_STATE),
-          cursor.getFloat(COLUMN_INDEX_DOWNLOAD_PERCENTAGE),
-          cursor.getLong(COLUMN_INDEX_DOWNLOADED_BYTES),
-          cursor.getLong(COLUMN_INDEX_TOTAL_BYTES),
-          cursor.getInt(COLUMN_INDEX_FAILURE_REASON),
-          cursor.getInt(COLUMN_INDEX_STOP_FLAGS),
-          cursor.getInt(COLUMN_INDEX_NOT_MET_REQUIREMENTS),
-          cursor.getLong(COLUMN_INDEX_START_TIME_MS),
-          cursor.getLong(COLUMN_INDEX_UPDATE_TIME_MS),
-          decodeStreamKeys(cursor.getString(COLUMN_INDEX_STREAM_KEYS)),
-          cursor.getBlob(COLUMN_INDEX_CUSTOM_METADATA));
-    }
-
-    private static String encodeStreamKeys(StreamKey[] streamKeys) {
-      StringBuilder stringBuilder = new StringBuilder();
-      for (StreamKey streamKey : streamKeys) {
-        stringBuilder
-            .append(streamKey.periodIndex)
-            .append('.')
-            .append(streamKey.groupIndex)
-            .append('.')
-            .append(streamKey.trackIndex)
-            .append(',');
-      }
-      if (stringBuilder.length() > 0) {
-        stringBuilder.setLength(stringBuilder.length() - 1);
-      }
-      return stringBuilder.toString();
-    }
-
-    private static StreamKey[] decodeStreamKeys(String encodedStreamKeys) {
-      if (encodedStreamKeys.isEmpty()) {
-        return new StreamKey[0];
-      }
-      String[] streamKeysStrings = Util.split(encodedStreamKeys, ",");
-      int streamKeysCount = streamKeysStrings.length;
-      StreamKey[] streamKeys = new StreamKey[streamKeysCount];
-      for (int i = 0; i < streamKeysCount; i++) {
-        String[] indices = Util.split(streamKeysStrings[i], "\\.");
-        Assertions.checkState(indices.length == 3);
-        streamKeys[i] =
-            new StreamKey(
-                Integer.parseInt(indices[0]),
-                Integer.parseInt(indices[1]),
-                Integer.parseInt(indices[2]));
-      }
-      return streamKeys;
-    }
-  }
 }

From e3981ec48404ee440dd4ac2cd53ee90e0785300a Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 5 Feb 2019 17:45:39 +0000
Subject: [PATCH 475/832] Fix notifications to avoid flicker on KitKat

On KitKat you need to reuse the same notification builder when
generating a notification that's intended to replace a previous
one. See:

https://stackoverflow.com/questions/6406730/updating-an-ongoing-notification-quietly

PiperOrigin-RevId: 232503682
---
 RELEASENOTES.md                               |   4 +
 .../exoplayer2/demo/DemoDownloadService.java  |  27 ++-
 .../ui/DownloadNotificationHelper.java        | 171 ++++++++++++++++++
 .../ui/DownloadNotificationUtil.java          | 100 ++--------
 .../ui/PlayerNotificationManager.java         | 143 ++++++++-------
 5 files changed, 284 insertions(+), 161 deletions(-)
 create mode 100644 library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 817f9f2645..1278d36600 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -43,6 +43,10 @@
   and `useSurfaceYuvOutput`.
 * Change signature of `PlayerNotificationManager.NotificationListener` to better
   fit service requirements. Remove ability to set a custom stop action.
+* Fix issues with flickering notifications on KitKat.
+  `PlayerNotificationManager` has been fixed. Apps using
+  `DownloadNotificationUtil` should switch to using
+  `DownloadNotificationHelper`.
 
 ### 2.9.5 ###
 
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
index dcccd884ec..91e2aa5bcc 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
@@ -20,7 +20,7 @@ import com.google.android.exoplayer2.offline.DownloadManager;
 import com.google.android.exoplayer2.offline.DownloadService;
 import com.google.android.exoplayer2.offline.DownloadState;
 import com.google.android.exoplayer2.scheduler.PlatformScheduler;
-import com.google.android.exoplayer2.ui.DownloadNotificationUtil;
+import com.google.android.exoplayer2.ui.DownloadNotificationHelper;
 import com.google.android.exoplayer2.util.NotificationUtil;
 import com.google.android.exoplayer2.util.Util;
 
@@ -33,6 +33,8 @@ public class DemoDownloadService extends DownloadService {
 
   private static int nextNotificationId = FOREGROUND_NOTIFICATION_ID + 1;
 
+  private DownloadNotificationHelper notificationHelper;
+
   public DemoDownloadService() {
     super(
         FOREGROUND_NOTIFICATION_ID,
@@ -42,6 +44,12 @@ public class DemoDownloadService extends DownloadService {
     nextNotificationId = FOREGROUND_NOTIFICATION_ID + 1;
   }
 
+  @Override
+  public void onCreate() {
+    super.onCreate();
+    notificationHelper = new DownloadNotificationHelper(this, CHANNEL_ID);
+  }
+
   @Override
   protected DownloadManager getDownloadManager() {
     return ((DemoApplication) getApplication()).getDownloadManager();
@@ -54,13 +62,8 @@ public class DemoDownloadService extends DownloadService {
 
   @Override
   protected Notification getForegroundNotification(DownloadState[] downloadStates) {
-    return DownloadNotificationUtil.buildProgressNotification(
-        /* context= */ this,
-        R.drawable.ic_download,
-        CHANNEL_ID,
-        /* contentIntent= */ null,
-        /* message= */ null,
-        downloadStates);
+    return notificationHelper.buildProgressNotification(
+        R.drawable.ic_download, /* contentIntent= */ null, /* message= */ null, downloadStates);
   }
 
   @Override
@@ -68,18 +71,14 @@ public class DemoDownloadService extends DownloadService {
     Notification notification;
     if (downloadState.state == DownloadState.STATE_COMPLETED) {
       notification =
-          DownloadNotificationUtil.buildDownloadCompletedNotification(
-              /* context= */ this,
+          notificationHelper.buildDownloadCompletedNotification(
               R.drawable.ic_download_done,
-              CHANNEL_ID,
               /* contentIntent= */ null,
               Util.fromUtf8Bytes(downloadState.customMetadata));
     } else if (downloadState.state == DownloadState.STATE_FAILED) {
       notification =
-          DownloadNotificationUtil.buildDownloadFailedNotification(
-              /* context= */ this,
+          notificationHelper.buildDownloadFailedNotification(
               R.drawable.ic_download_done,
-              CHANNEL_ID,
               /* contentIntent= */ null,
               Util.fromUtf8Bytes(downloadState.customMetadata));
     } else {
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
new file mode 100644
index 0000000000..b65c4fca40
--- /dev/null
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.ui;
+
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
+import android.support.v4.app.NotificationCompat;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.offline.DownloadState;
+
+/** Helper for creating download notifications. */
+public final class DownloadNotificationHelper {
+
+  private static final @StringRes int NULL_STRING_ID = 0;
+
+  private final Context context;
+  private final NotificationCompat.Builder notificationBuilder;
+
+  /**
+   * @param context A context.
+   * @param channelId The id of the notification channel to use.
+   */
+  public DownloadNotificationHelper(Context context, String channelId) {
+    context = context.getApplicationContext();
+    this.context = context;
+    this.notificationBuilder = new NotificationCompat.Builder(context, channelId);
+  }
+
+  /**
+   * Returns a progress notification for the given download states.
+   *
+   * @param smallIcon A small icon for the notification.
+   * @param contentIntent An optional content intent to send when the notification is clicked.
+   * @param message An optional message to display on the notification.
+   * @param downloadStates The download states.
+   * @return The notification.
+   */
+  public Notification buildProgressNotification(
+      @DrawableRes int smallIcon,
+      @Nullable PendingIntent contentIntent,
+      @Nullable String message,
+      DownloadState[] downloadStates) {
+    float totalPercentage = 0;
+    int downloadTaskCount = 0;
+    boolean allDownloadPercentagesUnknown = true;
+    boolean haveDownloadedBytes = false;
+    boolean haveDownloadTasks = false;
+    boolean haveRemoveTasks = false;
+    for (DownloadState downloadState : downloadStates) {
+      if (downloadState.state == DownloadState.STATE_REMOVING
+          || downloadState.state == DownloadState.STATE_RESTARTING
+          || downloadState.state == DownloadState.STATE_REMOVED) {
+        haveRemoveTasks = true;
+        continue;
+      }
+      if (downloadState.state != DownloadState.STATE_DOWNLOADING
+          && downloadState.state != DownloadState.STATE_COMPLETED) {
+        continue;
+      }
+      haveDownloadTasks = true;
+      if (downloadState.downloadPercentage != C.PERCENTAGE_UNSET) {
+        allDownloadPercentagesUnknown = false;
+        totalPercentage += downloadState.downloadPercentage;
+      }
+      haveDownloadedBytes |= downloadState.downloadedBytes > 0;
+      downloadTaskCount++;
+    }
+
+    int titleStringId =
+        haveDownloadTasks
+            ? R.string.exo_download_downloading
+            : (haveRemoveTasks ? R.string.exo_download_removing : NULL_STRING_ID);
+    int progress = 0;
+    boolean indeterminate = true;
+    if (haveDownloadTasks) {
+      progress = (int) (totalPercentage / downloadTaskCount);
+      indeterminate = allDownloadPercentagesUnknown && haveDownloadedBytes;
+    }
+    return buildNotification(
+        smallIcon,
+        contentIntent,
+        message,
+        titleStringId,
+        progress,
+        indeterminate,
+        /* ongoing= */ true,
+        /* showWhen= */ false);
+  }
+
+  /**
+   * Returns a notification for a completed download.
+   *
+   * @param smallIcon A small icon for the notifications.
+   * @param contentIntent An optional content intent to send when the notification is clicked.
+   * @param message An optional message to display on the notification.
+   * @return The notification.
+   */
+  public Notification buildDownloadCompletedNotification(
+      @DrawableRes int smallIcon, @Nullable PendingIntent contentIntent, @Nullable String message) {
+    int titleStringId = R.string.exo_download_completed;
+    return buildEndStateNotification(smallIcon, contentIntent, message, titleStringId);
+  }
+
+  /**
+   * Returns a notification for a failed download.
+   *
+   * @param smallIcon A small icon for the notifications.
+   * @param contentIntent An optional content intent to send when the notification is clicked.
+   * @param message An optional message to display on the notification.
+   * @return The notification.
+   */
+  public Notification buildDownloadFailedNotification(
+      @DrawableRes int smallIcon, @Nullable PendingIntent contentIntent, @Nullable String message) {
+    @StringRes int titleStringId = R.string.exo_download_failed;
+    return buildEndStateNotification(smallIcon, contentIntent, message, titleStringId);
+  }
+
+  private Notification buildEndStateNotification(
+      @DrawableRes int smallIcon,
+      @Nullable PendingIntent contentIntent,
+      @Nullable String message,
+      @StringRes int titleStringId) {
+    return buildNotification(
+        smallIcon,
+        contentIntent,
+        message,
+        titleStringId,
+        /* progress= */ 0,
+        /* indeterminateProgress= */ false,
+        /* ongoing= */ false,
+        /* showWhen= */ true);
+  }
+
+  private Notification buildNotification(
+      @DrawableRes int smallIcon,
+      @Nullable PendingIntent contentIntent,
+      @Nullable String message,
+      @StringRes int titleStringId,
+      int progress,
+      boolean indeterminateProgress,
+      boolean ongoing,
+      boolean showWhen) {
+    notificationBuilder.setSmallIcon(smallIcon);
+    notificationBuilder.setContentTitle(
+        titleStringId == NULL_STRING_ID ? null : context.getResources().getString(titleStringId));
+    notificationBuilder.setContentIntent(contentIntent);
+    notificationBuilder.setStyle(
+        message == null ? null : new NotificationCompat.BigTextStyle().bigText(message));
+    notificationBuilder.setProgress(/* max= */ 100, progress, indeterminateProgress);
+    notificationBuilder.setOngoing(ongoing);
+    notificationBuilder.setShowWhen(showWhen);
+    return notificationBuilder.build();
+  }
+}
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java
index 2d1656af57..b9e952e62f 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java
@@ -20,16 +20,16 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.app.NotificationCompat;
-import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.offline.DownloadState;
+import com.google.android.exoplayer2.util.Util;
 
-/** Helper for creating download notifications. */
+/**
+ * @deprecated Using this class can cause notifications to flicker on devices with {@link
+ *     Util#SDK_INT} &lt; 21. Use {@link DownloadNotificationHelper} instead.
+ */
+@Deprecated
 public final class DownloadNotificationUtil {
 
-  private static final @StringRes int NULL_STRING_ID = 0;
-
   private DownloadNotificationUtil() {}
 
   /**
@@ -37,8 +37,7 @@ public final class DownloadNotificationUtil {
    *
    * @param context A context for accessing resources.
    * @param smallIcon A small icon for the notification.
-   * @param channelId The id of the notification channel to use. Only required for API level 26 and
-   *     above.
+   * @param channelId The id of the notification channel to use.
    * @param contentIntent An optional content intent to send when the notification is clicked.
    * @param message An optional message to display on the notification.
    * @param downloadStates The download states.
@@ -51,50 +50,8 @@ public final class DownloadNotificationUtil {
       @Nullable PendingIntent contentIntent,
       @Nullable String message,
       DownloadState[] downloadStates) {
-    float totalPercentage = 0;
-    int downloadTaskCount = 0;
-    boolean allDownloadPercentagesUnknown = true;
-    boolean haveDownloadedBytes = false;
-    boolean haveDownloadTasks = false;
-    boolean haveRemoveTasks = false;
-    for (DownloadState downloadState : downloadStates) {
-      if (downloadState.state == DownloadState.STATE_REMOVING
-          || downloadState.state == DownloadState.STATE_RESTARTING
-          || downloadState.state == DownloadState.STATE_REMOVED) {
-        haveRemoveTasks = true;
-        continue;
-      }
-      if (downloadState.state != DownloadState.STATE_DOWNLOADING
-          && downloadState.state != DownloadState.STATE_COMPLETED) {
-        continue;
-      }
-      haveDownloadTasks = true;
-      if (downloadState.downloadPercentage != C.PERCENTAGE_UNSET) {
-        allDownloadPercentagesUnknown = false;
-        totalPercentage += downloadState.downloadPercentage;
-      }
-      haveDownloadedBytes |= downloadState.downloadedBytes > 0;
-      downloadTaskCount++;
-    }
-
-    int titleStringId =
-        haveDownloadTasks
-            ? R.string.exo_download_downloading
-            : (haveRemoveTasks ? R.string.exo_download_removing : NULL_STRING_ID);
-    NotificationCompat.Builder notificationBuilder =
-        newNotificationBuilder(
-            context, smallIcon, channelId, contentIntent, message, titleStringId);
-
-    int progress = 0;
-    boolean indeterminate = true;
-    if (haveDownloadTasks) {
-      progress = (int) (totalPercentage / downloadTaskCount);
-      indeterminate = allDownloadPercentagesUnknown && haveDownloadedBytes;
-    }
-    notificationBuilder.setProgress(/* max= */ 100, progress, indeterminate);
-    notificationBuilder.setOngoing(true);
-    notificationBuilder.setShowWhen(false);
-    return notificationBuilder.build();
+    return new DownloadNotificationHelper(context, channelId)
+        .buildProgressNotification(smallIcon, contentIntent, message, downloadStates);
   }
 
   /**
@@ -102,8 +59,7 @@ public final class DownloadNotificationUtil {
    *
    * @param context A context for accessing resources.
    * @param smallIcon A small icon for the notifications.
-   * @param channelId The id of the notification channel to use. Only required for API level 26 and
-   *     above.
+   * @param channelId The id of the notification channel to use.
    * @param contentIntent An optional content intent to send when the notification is clicked.
    * @param message An optional message to display on the notification.
    * @return The notification.
@@ -114,10 +70,8 @@ public final class DownloadNotificationUtil {
       String channelId,
       @Nullable PendingIntent contentIntent,
       @Nullable String message) {
-    int titleStringId = R.string.exo_download_completed;
-    return newNotificationBuilder(
-            context, smallIcon, channelId, contentIntent, message, titleStringId)
-        .build();
+    return new DownloadNotificationHelper(context, channelId)
+        .buildDownloadCompletedNotification(smallIcon, contentIntent, message);
   }
 
   /**
@@ -125,8 +79,7 @@ public final class DownloadNotificationUtil {
    *
    * @param context A context for accessing resources.
    * @param smallIcon A small icon for the notifications.
-   * @param channelId The id of the notification channel to use. Only required for API level 26 and
-   *     above.
+   * @param channelId The id of the notification channel to use.
    * @param contentIntent An optional content intent to send when the notification is clicked.
    * @param message An optional message to display on the notification.
    * @return The notification.
@@ -137,30 +90,7 @@ public final class DownloadNotificationUtil {
       String channelId,
       @Nullable PendingIntent contentIntent,
       @Nullable String message) {
-    @StringRes int titleStringId = R.string.exo_download_failed;
-    return newNotificationBuilder(
-            context, smallIcon, channelId, contentIntent, message, titleStringId)
-        .build();
-  }
-
-  private static NotificationCompat.Builder newNotificationBuilder(
-      Context context,
-      @DrawableRes int smallIcon,
-      String channelId,
-      @Nullable PendingIntent contentIntent,
-      @Nullable String message,
-      @StringRes int titleStringId) {
-    NotificationCompat.Builder notificationBuilder =
-        new NotificationCompat.Builder(context, channelId).setSmallIcon(smallIcon);
-    if (titleStringId != NULL_STRING_ID) {
-      notificationBuilder.setContentTitle(context.getResources().getString(titleStringId));
-    }
-    if (contentIntent != null) {
-      notificationBuilder.setContentIntent(contentIntent);
-    }
-    if (message != null) {
-      notificationBuilder.setStyle(new NotificationCompat.BigTextStyle().bigText(message));
-    }
-    return notificationBuilder;
+    return new DownloadNotificationHelper(context, channelId)
+        .buildDownloadFailedNotification(smallIcon, contentIntent, message);
   }
 }
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
index 597f0dbd40..6634fdf820 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
@@ -338,6 +338,7 @@ public class PlayerNotificationManager {
 
   private final Context context;
   private final String channelId;
+  private final NotificationCompat.Builder builder;
   private final int notificationId;
   private final MediaDescriptionAdapter mediaDescriptionAdapter;
   private final @Nullable CustomActionReceiver customActionReceiver;
@@ -530,12 +531,14 @@ public class PlayerNotificationManager {
       MediaDescriptionAdapter mediaDescriptionAdapter,
       @Nullable NotificationListener notificationListener,
       @Nullable CustomActionReceiver customActionReceiver) {
-    this.context = context.getApplicationContext();
+    context = context.getApplicationContext();
+    this.context = context;
     this.channelId = channelId;
     this.notificationId = notificationId;
     this.mediaDescriptionAdapter = mediaDescriptionAdapter;
     this.notificationListener = notificationListener;
     this.customActionReceiver = customActionReceiver;
+    builder = new NotificationCompat.Builder(context, channelId);
     controlDispatcher = new DefaultControlDispatcher();
     window = new Timeline.Window();
     instanceId = instanceIdCounter++;
@@ -887,7 +890,7 @@ public class PlayerNotificationManager {
   private Notification startOrUpdateNotification(@Nullable Bitmap bitmap) {
     Player player = this.player;
     boolean ongoing = getOngoing(player);
-    Notification notification = createNotification(player, ongoing, bitmap);
+    Notification notification = createNotification(player, builder, ongoing, bitmap);
     if (notification == null) {
       stopNotification(/* dismissedByUser= */ false);
       return null;
@@ -923,6 +926,11 @@ public class PlayerNotificationManager {
    * Creates the notification given the current player state.
    *
    * @param player The player for which state to build a notification.
+   * @param builder A builder that can optionally be used for creating the notification. The same
+   *     builder is passed each time this method is called, since reusing the same builder can
+   *     prevent notification flicker when {@code Util#SDK_INT} &lt; 21. This means implementations
+   *     must take care to ensure anything set on the builder during a previous call is cleared, if
+   *     no longer required.
    * @param ongoing Whether the notification should be ongoing.
    * @param largeIcon The large icon to be used.
    * @return The {@link Notification} which has been built, or {@code null} if no notification
@@ -930,11 +938,15 @@ public class PlayerNotificationManager {
    */
   @Nullable
   protected Notification createNotification(
-      Player player, boolean ongoing, @Nullable Bitmap largeIcon) {
+      Player player,
+      NotificationCompat.Builder builder,
+      boolean ongoing,
+      @Nullable Bitmap largeIcon) {
     if (player.getPlaybackState() == Player.STATE_IDLE) {
       return null;
     }
-    NotificationCompat.Builder builder = new NotificationCompat.Builder(context, channelId);
+
+    builder.mActions.clear();
     List<String> actionNames = getActions(player);
     for (int i = 0; i < actionNames.size(); i++) {
       String actionName = actionNames.get(i);
@@ -946,7 +958,7 @@ public class PlayerNotificationManager {
         builder.addAction(action);
       }
     }
-    // Create a media style notification.
+
     MediaStyle mediaStyle = new MediaStyle();
     if (mediaSessionToken != null) {
       mediaStyle.setMediaSession(mediaSessionToken);
@@ -955,9 +967,11 @@ public class PlayerNotificationManager {
     // Configure dismiss action prior to API 21 ('x' button).
     mediaStyle.setShowCancelButton(!ongoing);
     mediaStyle.setCancelButtonIntent(dismissPendingIntent);
+    builder.setStyle(mediaStyle);
+
     // Set intent which is sent if the user selects 'clear all'
     builder.setDeleteIntent(dismissPendingIntent);
-    builder.setStyle(mediaStyle);
+
     // Set notification properties from getters.
     builder
         .setBadgeIconType(badgeIconType)
@@ -968,7 +982,10 @@ public class PlayerNotificationManager {
         .setVisibility(visibility)
         .setPriority(priority)
         .setDefaults(defaults);
-    if (useChronometer
+
+    // Changing "showWhen" causes notification flicker if SDK_INT < 21.
+    if (Util.SDK_INT >= 21
+        && useChronometer
         && !player.isPlayingAd()
         && !player.isCurrentWindowDynamic()
         && player.getPlayWhenReady()
@@ -980,6 +997,7 @@ public class PlayerNotificationManager {
     } else {
       builder.setShowWhen(false).setUsesChronometer(false);
     }
+
     // Set media specific notification properties from MediaDescriptionAdapter.
     builder.setContentTitle(mediaDescriptionAdapter.getCurrentContentTitle(player));
     builder.setContentText(mediaDescriptionAdapter.getCurrentContentText(player));
@@ -989,13 +1007,9 @@ public class PlayerNotificationManager {
           mediaDescriptionAdapter.getCurrentLargeIcon(
               player, new BitmapCallback(++currentNotificationTag));
     }
-    if (largeIcon != null) {
-      builder.setLargeIcon(largeIcon);
-    }
-    PendingIntent contentIntent = mediaDescriptionAdapter.createCurrentContentIntent(player);
-    if (contentIntent != null) {
-      builder.setContentIntent(contentIntent);
-    }
+    setLargeIcon(builder, largeIcon);
+    builder.setContentIntent(mediaDescriptionAdapter.createCurrentContentIntent(player));
+
     return builder.build();
   }
 
@@ -1086,54 +1100,6 @@ public class PlayerNotificationManager {
         && player.getPlayWhenReady();
   }
 
-  private static Map<String, NotificationCompat.Action> createPlaybackActions(
-      Context context, int instanceId) {
-    Map<String, NotificationCompat.Action> actions = new HashMap<>();
-    actions.put(
-        ACTION_PLAY,
-        new NotificationCompat.Action(
-            R.drawable.exo_notification_play,
-            context.getString(R.string.exo_controls_play_description),
-            createBroadcastIntent(ACTION_PLAY, context, instanceId)));
-    actions.put(
-        ACTION_PAUSE,
-        new NotificationCompat.Action(
-            R.drawable.exo_notification_pause,
-            context.getString(R.string.exo_controls_pause_description),
-            createBroadcastIntent(ACTION_PAUSE, context, instanceId)));
-    actions.put(
-        ACTION_STOP,
-        new NotificationCompat.Action(
-            R.drawable.exo_notification_stop,
-            context.getString(R.string.exo_controls_stop_description),
-            createBroadcastIntent(ACTION_STOP, context, instanceId)));
-    actions.put(
-        ACTION_REWIND,
-        new NotificationCompat.Action(
-            R.drawable.exo_notification_rewind,
-            context.getString(R.string.exo_controls_rewind_description),
-            createBroadcastIntent(ACTION_REWIND, context, instanceId)));
-    actions.put(
-        ACTION_FAST_FORWARD,
-        new NotificationCompat.Action(
-            R.drawable.exo_notification_fastforward,
-            context.getString(R.string.exo_controls_fastforward_description),
-            createBroadcastIntent(ACTION_FAST_FORWARD, context, instanceId)));
-    actions.put(
-        ACTION_PREVIOUS,
-        new NotificationCompat.Action(
-            R.drawable.exo_notification_previous,
-            context.getString(R.string.exo_controls_previous_description),
-            createBroadcastIntent(ACTION_PREVIOUS, context, instanceId)));
-    actions.put(
-        ACTION_NEXT,
-        new NotificationCompat.Action(
-            R.drawable.exo_notification_next,
-            context.getString(R.string.exo_controls_next_description),
-            createBroadcastIntent(ACTION_NEXT, context, instanceId)));
-    return actions;
-  }
-
   private void previous(Player player) {
     Timeline timeline = player.getCurrentTimeline();
     if (timeline.isEmpty() || player.isPlayingAd()) {
@@ -1196,6 +1162,54 @@ public class PlayerNotificationManager {
         && player.getPlayWhenReady();
   }
 
+  private static Map<String, NotificationCompat.Action> createPlaybackActions(
+      Context context, int instanceId) {
+    Map<String, NotificationCompat.Action> actions = new HashMap<>();
+    actions.put(
+        ACTION_PLAY,
+        new NotificationCompat.Action(
+            R.drawable.exo_notification_play,
+            context.getString(R.string.exo_controls_play_description),
+            createBroadcastIntent(ACTION_PLAY, context, instanceId)));
+    actions.put(
+        ACTION_PAUSE,
+        new NotificationCompat.Action(
+            R.drawable.exo_notification_pause,
+            context.getString(R.string.exo_controls_pause_description),
+            createBroadcastIntent(ACTION_PAUSE, context, instanceId)));
+    actions.put(
+        ACTION_STOP,
+        new NotificationCompat.Action(
+            R.drawable.exo_notification_stop,
+            context.getString(R.string.exo_controls_stop_description),
+            createBroadcastIntent(ACTION_STOP, context, instanceId)));
+    actions.put(
+        ACTION_REWIND,
+        new NotificationCompat.Action(
+            R.drawable.exo_notification_rewind,
+            context.getString(R.string.exo_controls_rewind_description),
+            createBroadcastIntent(ACTION_REWIND, context, instanceId)));
+    actions.put(
+        ACTION_FAST_FORWARD,
+        new NotificationCompat.Action(
+            R.drawable.exo_notification_fastforward,
+            context.getString(R.string.exo_controls_fastforward_description),
+            createBroadcastIntent(ACTION_FAST_FORWARD, context, instanceId)));
+    actions.put(
+        ACTION_PREVIOUS,
+        new NotificationCompat.Action(
+            R.drawable.exo_notification_previous,
+            context.getString(R.string.exo_controls_previous_description),
+            createBroadcastIntent(ACTION_PREVIOUS, context, instanceId)));
+    actions.put(
+        ACTION_NEXT,
+        new NotificationCompat.Action(
+            R.drawable.exo_notification_next,
+            context.getString(R.string.exo_controls_next_description),
+            createBroadcastIntent(ACTION_NEXT, context, instanceId)));
+    return actions;
+  }
+
   private static PendingIntent createBroadcastIntent(
       String action, Context context, int instanceId) {
     Intent intent = new Intent(action).setPackage(context.getPackageName());
@@ -1204,6 +1218,11 @@ public class PlayerNotificationManager {
         context, instanceId, intent, PendingIntent.FLAG_CANCEL_CURRENT);
   }
 
+  @SuppressWarnings("nullness:argument.type.incompatible")
+  private static void setLargeIcon(NotificationCompat.Builder builder, @Nullable Bitmap largeIcon) {
+    builder.setLargeIcon(largeIcon);
+  }
+
   private class PlayerListener implements Player.EventListener {
 
     @Override

From 589af35c65b98cbb2ef921dd0d2120b1b04d251e Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 5 Feb 2019 17:46:03 +0000
Subject: [PATCH 476/832] Set player on ads loader in IMA demo

Issue: #5476
PiperOrigin-RevId: 232503736
---
 .../android/exoplayer2/imademo/PlayerManager.java  | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/PlayerManager.java b/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/PlayerManager.java
index 740c1a0af6..97c3299a4a 100644
--- a/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/PlayerManager.java
+++ b/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/PlayerManager.java
@@ -29,10 +29,6 @@ import com.google.android.exoplayer2.source.ads.AdsMediaSource;
 import com.google.android.exoplayer2.source.dash.DashMediaSource;
 import com.google.android.exoplayer2.source.hls.HlsMediaSource;
 import com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource;
-import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;
-import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
-import com.google.android.exoplayer2.trackselection.TrackSelection;
-import com.google.android.exoplayer2.trackselection.TrackSelector;
 import com.google.android.exoplayer2.ui.PlayerView;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
@@ -56,14 +52,9 @@ import com.google.android.exoplayer2.util.Util;
   }
 
   public void init(Context context, PlayerView playerView) {
-    // Create a default track selector.
-    TrackSelection.Factory videoTrackSelectionFactory = new AdaptiveTrackSelection.Factory();
-    TrackSelector trackSelector = new DefaultTrackSelector(videoTrackSelectionFactory);
-
     // Create a player instance.
-    player = ExoPlayerFactory.newSimpleInstance(context, trackSelector);
-
-    // Bind the player to the view.
+    player = ExoPlayerFactory.newSimpleInstance(context);
+    adsLoader.setPlayer(player);
     playerView.setPlayer(player);
 
     // This is the MediaSource representing the content media (i.e. not the ad).
@@ -89,6 +80,7 @@ import com.google.android.exoplayer2.util.Util;
       contentPosition = player.getContentPosition();
       player.release();
       player = null;
+      adsLoader.setPlayer(null);
     }
   }
 

From 6b81d9e7a4f6c8cfdc309c4c61af362fe03051c3 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 5 Feb 2019 18:04:25 +0000
Subject: [PATCH 477/832] Fix DownloadHelper for some HLS streams

onContinueLoadingRequested can occur during preparation, so
MediaPreparer needs to handle it.

PiperOrigin-RevId: 232507267
---
 .../exoplayer2/offline/DownloadHelper.java    | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index 25c4eca5eb..d12013673f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -744,6 +744,7 @@ public final class DownloadHelper {
 
     private static final int MESSAGE_PREPARE_SOURCE = 0;
     private static final int MESSAGE_CHECK_FOR_FAILURE = 1;
+    private static final int MESSAGE_CONTINUE_LOADING = 2;
 
     private final MediaSource mediaSource;
     private final DownloadHelper downloadHelper;
@@ -755,7 +756,7 @@ public final class DownloadHelper {
     public @MonotonicNonNull Timeline timeline;
     public MediaPeriod @MonotonicNonNull [] mediaPeriods;
 
-    private int pendingPreparations;
+    private final ArrayList<MediaPeriod> pendingMediaPeriods;
 
     public MediaPreparer(MediaSource mediaSource, DownloadHelper downloadHelper) {
       this.mediaSource = mediaSource;
@@ -765,6 +766,7 @@ public final class DownloadHelper {
       mediaSourceThread.start();
       mediaSourceHandler = Util.createHandler(mediaSourceThread.getLooper(), /* callback= */ this);
       mediaSourceHandler.sendEmptyMessage(MESSAGE_PREPARE_SOURCE);
+      pendingMediaPeriods = new ArrayList<>();
     }
 
     public void release() {
@@ -791,8 +793,8 @@ public final class DownloadHelper {
             if (mediaPeriods == null) {
               mediaSource.maybeThrowSourceInfoRefreshError();
             } else {
-              for (MediaPeriod mediaPeriod : mediaPeriods) {
-                mediaPeriod.maybeThrowPrepareError();
+              for (int i = 0; i < pendingMediaPeriods.size(); i++) {
+                pendingMediaPeriods.get(i).maybeThrowPrepareError();
               }
             }
             mediaSourceHandler.sendEmptyMessageDelayed(
@@ -801,6 +803,12 @@ public final class DownloadHelper {
             downloadHelper.onMediaPreparationFailed(e);
           }
           return true;
+        case MESSAGE_CONTINUE_LOADING:
+          MediaPeriod mediaPeriod = (MediaPeriod) msg.obj;
+          if (pendingMediaPeriods.contains(mediaPeriod)) {
+            mediaPeriod.continueLoading(/* positionUs= */ 0);
+          }
+          return true;
         default:
           return false;
       }
@@ -818,14 +826,15 @@ public final class DownloadHelper {
       this.timeline = timeline;
       this.manifest = manifest;
       mediaPeriods = new MediaPeriod[timeline.getPeriodCount()];
-      pendingPreparations = mediaPeriods.length;
       for (int i = 0; i < mediaPeriods.length; i++) {
-        mediaPeriods[i] =
+        MediaPeriod mediaPeriod =
             mediaSource.createPeriod(
                 new MediaPeriodId(timeline.getUidOfPeriod(/* periodIndex= */ i)),
                 allocator,
                 /* startPositionUs= */ 0);
-        mediaPeriods[i].prepare(/* callback= */ this, /* positionUs= */ 0);
+        mediaPeriods[i] = mediaPeriod;
+        pendingMediaPeriods.add(mediaPeriod);
+        mediaPeriod.prepare(/* callback= */ this, /* positionUs= */ 0);
       }
     }
 
@@ -833,16 +842,18 @@ public final class DownloadHelper {
 
     @Override
     public void onPrepared(MediaPeriod mediaPeriod) {
-      pendingPreparations--;
-      if (pendingPreparations == 0) {
+      pendingMediaPeriods.remove(mediaPeriod);
+      if (pendingMediaPeriods.isEmpty()) {
         mediaSourceHandler.removeMessages(MESSAGE_CHECK_FOR_FAILURE);
         downloadHelper.onMediaPrepared();
       }
     }
 
     @Override
-    public void onContinueLoadingRequested(MediaPeriod source) {
-      // Ignore.
+    public void onContinueLoadingRequested(MediaPeriod mediaPeriod) {
+      if (pendingMediaPeriods.contains(mediaPeriod)) {
+        mediaSourceHandler.obtainMessage(MESSAGE_CONTINUE_LOADING, mediaPeriod).sendToTarget();
+      }
     }
   }
 

From fc2a99a68881d0381d81e1dbcded1b0d808355c1 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Tue, 5 Feb 2019 18:04:30 +0000
Subject: [PATCH 478/832] Generalize selectedVariantIndices in preparation for
 non-main adaptation

After this change, multiple HlsSampleStreamWrappers may contain an apdaptive
track group.

PiperOrigin-RevId: 232507292
---
 .../exoplayer2/source/hls/HlsMediaPeriod.java | 40 +++++++++++--------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
index 73a46b68ba..0c4ebcb508 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
@@ -69,7 +69,8 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
   private TrackGroupArray trackGroups;
   private HlsSampleStreamWrapper[] sampleStreamWrappers;
   private HlsSampleStreamWrapper[] enabledSampleStreamWrappers;
-  private int[] selectedVariantIndices;
+  // Maps sample stream wrappers to variant/rendition index by matching array positions.
+  private int[][] manifestUrlsIndicesPerWrapper;
   private SequenceableLoader compositeSequenceableLoader;
   private boolean notifiedReadingStarted;
 
@@ -114,7 +115,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
     timestampAdjusterProvider = new TimestampAdjusterProvider();
     sampleStreamWrappers = new HlsSampleStreamWrapper[0];
     enabledSampleStreamWrappers = new HlsSampleStreamWrapper[0];
-    selectedVariantIndices = new int[0];
+    manifestUrlsIndicesPerWrapper = new int[0][];
     eventDispatcher.mediaPeriodCreated();
   }
 
@@ -156,11 +157,14 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
 
     TrackGroupArray mainWrapperTrackGroups;
     int mainWrapperPrimaryGroupIndex;
+    int[] mainWrapperVariantIndices;
     if (hasVariants) {
       HlsSampleStreamWrapper mainWrapper = sampleStreamWrappers[0];
+      mainWrapperVariantIndices = manifestUrlsIndicesPerWrapper[0];
       mainWrapperTrackGroups = mainWrapper.getTrackGroups();
       mainWrapperPrimaryGroupIndex = mainWrapper.getPrimaryTrackGroupIndex();
     } else {
+      mainWrapperVariantIndices = new int[0];
       mainWrapperTrackGroups = TrackGroupArray.EMPTY;
       mainWrapperPrimaryGroupIndex = 0;
     }
@@ -176,7 +180,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
           // Primary group in main wrapper.
           hasPrimaryTrackGroupSelection = true;
           for (int i = 0; i < trackSelection.length(); i++) {
-            int variantIndex = selectedVariantIndices[trackSelection.getIndexInTrackGroup(i)];
+            int variantIndex = mainWrapperVariantIndices[trackSelection.getIndexInTrackGroup(i)];
             streamKeys.add(new StreamKey(HlsMasterPlaylist.GROUP_INDEX_VARIANT, variantIndex));
           }
         } else {
@@ -188,13 +192,11 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
         for (int i = audioWrapperOffset; i < sampleStreamWrappers.length; i++) {
           TrackGroupArray wrapperTrackGroups = sampleStreamWrappers[i].getTrackGroups();
           if (wrapperTrackGroups.indexOf(trackSelectionGroup) != C.INDEX_UNSET) {
-            if (i < subtitleWrapperOffset) {
-              streamKeys.add(
-                  new StreamKey(HlsMasterPlaylist.GROUP_INDEX_AUDIO, i - audioWrapperOffset));
-            } else {
-              streamKeys.add(
-                  new StreamKey(HlsMasterPlaylist.GROUP_INDEX_SUBTITLE, i - subtitleWrapperOffset));
-            }
+            int groupIndexType =
+                i < subtitleWrapperOffset
+                    ? HlsMasterPlaylist.GROUP_INDEX_AUDIO
+                    : HlsMasterPlaylist.GROUP_INDEX_SUBTITLE;
+            streamKeys.add(new StreamKey(groupIndexType, manifestUrlsIndicesPerWrapper[i][0]));
             break;
           }
         }
@@ -203,13 +205,14 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
     if (needsPrimaryTrackGroupSelection && !hasPrimaryTrackGroupSelection) {
       // A track selection includes a variant-embedded track, but no variant is added yet. We use
       // the valid variant with the lowest bitrate to reduce overhead.
-      int lowestBitrateIndex = selectedVariantIndices[0];
-      int lowestBitrate = masterPlaylist.variants.get(selectedVariantIndices[0]).format.bitrate;
-      for (int i = 1; i < selectedVariantIndices.length; i++) {
-        int variantBitrate = masterPlaylist.variants.get(selectedVariantIndices[i]).format.bitrate;
+      int lowestBitrateIndex = mainWrapperVariantIndices[0];
+      int lowestBitrate = masterPlaylist.variants.get(mainWrapperVariantIndices[0]).format.bitrate;
+      for (int i = 1; i < mainWrapperVariantIndices.length; i++) {
+        int variantBitrate =
+            masterPlaylist.variants.get(mainWrapperVariantIndices[i]).format.bitrate;
         if (variantBitrate < lowestBitrate) {
           lowestBitrate = variantBitrate;
-          lowestBitrateIndex = selectedVariantIndices[i];
+          lowestBitrateIndex = mainWrapperVariantIndices[i];
         }
       }
       streamKeys.add(new StreamKey(HlsMasterPlaylist.GROUP_INDEX_VARIANT, lowestBitrateIndex));
@@ -423,6 +426,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
 
     int wrapperCount = (hasVariants ? 1 : 0) + audioRenditions.size() + subtitleRenditions.size();
     sampleStreamWrappers = new HlsSampleStreamWrapper[wrapperCount];
+    manifestUrlsIndicesPerWrapper = new int[wrapperCount][];
     pendingPrepareCount = wrapperCount;
 
     int currentWrapperIndex = 0;
@@ -443,6 +447,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
               null,
               Collections.emptyList(),
               positionUs);
+      manifestUrlsIndicesPerWrapper[currentWrapperIndex] = new int[] {i};
       sampleStreamWrappers[currentWrapperIndex++] = sampleStreamWrapper;
       Format renditionFormat = audioRendition.format;
       if (allowChunklessPreparation && renditionFormat.codecs != null) {
@@ -457,6 +462,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
       HlsSampleStreamWrapper sampleStreamWrapper =
           buildSampleStreamWrapper(
               C.TRACK_TYPE_TEXT, new HlsUrl[] {url}, null, Collections.emptyList(), positionUs);
+      manifestUrlsIndicesPerWrapper[currentWrapperIndex] = new int[] {i};
       sampleStreamWrappers[currentWrapperIndex++] = sampleStreamWrapper;
       sampleStreamWrapper.prepareWithMasterPlaylistInfo(
           new TrackGroupArray(new TrackGroup(url.format)), 0, TrackGroupArray.EMPTY);
@@ -530,13 +536,13 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
       selectedVariantsCount = variantTypes.length - audioVariantCount;
     }
     HlsUrl[] selectedVariants = new HlsUrl[selectedVariantsCount];
-    selectedVariantIndices = new int[selectedVariantsCount];
+    manifestUrlsIndicesPerWrapper[0] = new int[selectedVariantsCount];
     int outIndex = 0;
     for (int i = 0; i < masterPlaylist.variants.size(); i++) {
       if ((!useVideoVariantsOnly || variantTypes[i] == C.TRACK_TYPE_VIDEO)
           && (!useNonAudioVariantsOnly || variantTypes[i] != C.TRACK_TYPE_AUDIO)) {
         selectedVariants[outIndex] = masterPlaylist.variants.get(i);
-        selectedVariantIndices[outIndex++] = i;
+        manifestUrlsIndicesPerWrapper[0][outIndex++] = i;
       }
     }
     String codecs = selectedVariants[0].format.codecs;

From 0bf9ebf91e30e2699f4e9eef723c65f457070dd7 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 5 Feb 2019 18:05:09 +0000
Subject: [PATCH 479/832] Switch to non-deprecated way of setting
 AdDisplayContainer

PiperOrigin-RevId: 232507469
---
 .../android/exoplayer2/ext/ima/ImaAdsLoader.java     | 12 ++++++------
 .../exoplayer2/ext/ima/SingletonImaFactory.java      |  5 +++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
index 311752c7ab..4bdec23804 100644
--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
+++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
@@ -466,11 +466,11 @@ public final class ImaAdsLoader
     }
     imaSdkSettings.setPlayerType(IMA_SDK_SETTINGS_PLAYER_TYPE);
     imaSdkSettings.setPlayerVersion(IMA_SDK_SETTINGS_PLAYER_VERSION);
-    adsLoader = imaFactory.createAdsLoader(context, imaSdkSettings);
     period = new Timeline.Period();
     adCallbacks = new ArrayList<>(/* initialCapacity= */ 1);
     adDisplayContainer = imaFactory.createAdDisplayContainer();
     adDisplayContainer.setPlayer(/* videoAdPlayer= */ this);
+    adsLoader = imaFactory.createAdsLoader(context, imaSdkSettings, adDisplayContainer);
     adsLoader.addAdErrorListener(/* adErrorListener= */ this);
     adsLoader.addAdsLoadedListener(/* adsLoadedListener= */ this);
     fakeContentProgressElapsedRealtimeMs = C.TIME_UNSET;
@@ -524,7 +524,6 @@ public final class ImaAdsLoader
     if (vastLoadTimeoutMs != TIMEOUT_UNSET) {
       request.setVastLoadTimeout(vastLoadTimeoutMs);
     }
-    request.setAdDisplayContainer(adDisplayContainer);
     request.setContentProgressProvider(this);
     request.setUserRequestContext(pendingAdRequestContext);
     adsLoader.requestAds(request);
@@ -1374,9 +1373,9 @@ public final class ImaAdsLoader
     AdDisplayContainer createAdDisplayContainer();
     /** @see com.google.ads.interactivemedia.v3.api.ImaSdkFactory#createAdsRequest() */
     AdsRequest createAdsRequest();
-    /** @see ImaSdkFactory#createAdsLoader(Context, ImaSdkSettings) */
+    /** @see ImaSdkFactory#createAdsLoader(Context, ImaSdkSettings, AdDisplayContainer) */
     com.google.ads.interactivemedia.v3.api.AdsLoader createAdsLoader(
-        Context context, ImaSdkSettings imaSdkSettings);
+        Context context, ImaSdkSettings imaSdkSettings, AdDisplayContainer adDisplayContainer);
   }
 
   /** Default {@link ImaFactory} for non-test usage, which delegates to {@link ImaSdkFactory}. */
@@ -1403,8 +1402,9 @@ public final class ImaAdsLoader
 
     @Override
     public com.google.ads.interactivemedia.v3.api.AdsLoader createAdsLoader(
-        Context context, ImaSdkSettings imaSdkSettings) {
-      return ImaSdkFactory.getInstance().createAdsLoader(context, imaSdkSettings);
+        Context context, ImaSdkSettings imaSdkSettings, AdDisplayContainer adDisplayContainer) {
+      return ImaSdkFactory.getInstance()
+          .createAdsLoader(context, imaSdkSettings, adDisplayContainer);
     }
   }
 }
diff --git a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/SingletonImaFactory.java b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/SingletonImaFactory.java
index dd46d8a68b..4efd8cf38c 100644
--- a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/SingletonImaFactory.java
+++ b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/SingletonImaFactory.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.ext.ima;
 
 import android.content.Context;
 import com.google.ads.interactivemedia.v3.api.AdDisplayContainer;
+import com.google.ads.interactivemedia.v3.api.AdsLoader;
 import com.google.ads.interactivemedia.v3.api.AdsRenderingSettings;
 import com.google.ads.interactivemedia.v3.api.AdsRequest;
 import com.google.ads.interactivemedia.v3.api.ImaSdkSettings;
@@ -64,8 +65,8 @@ final class SingletonImaFactory implements ImaAdsLoader.ImaFactory {
   }
 
   @Override
-  public com.google.ads.interactivemedia.v3.api.AdsLoader createAdsLoader(
-      Context context, ImaSdkSettings imaSdkSettings) {
+  public AdsLoader createAdsLoader(
+      Context context, ImaSdkSettings imaSdkSettings, AdDisplayContainer adDisplayContainer) {
     return adsLoader;
   }
 }

From ebfbb4f915d5dce884e31c4f7685fb9bbf25c552 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 5 Feb 2019 19:05:59 +0000
Subject: [PATCH 480/832] Hide progress bar for end state download
 notifications

Now we're reusing the builder, it's necessary to set maxProgress
back to 0 to avoid the progress bar appearing for end state
notifications.

PiperOrigin-RevId: 232520007
---
 .../exoplayer2/ui/DownloadNotificationHelper.java        | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
index b65c4fca40..94bd0b81c5 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
@@ -98,6 +98,7 @@ public final class DownloadNotificationHelper {
         contentIntent,
         message,
         titleStringId,
+        /* maxProgress= */ 100,
         progress,
         indeterminate,
         /* ongoing= */ true,
@@ -142,7 +143,8 @@ public final class DownloadNotificationHelper {
         contentIntent,
         message,
         titleStringId,
-        /* progress= */ 0,
+        /* maxProgress= */ 0,
+        /* currentProgress= */ 0,
         /* indeterminateProgress= */ false,
         /* ongoing= */ false,
         /* showWhen= */ true);
@@ -153,7 +155,8 @@ public final class DownloadNotificationHelper {
       @Nullable PendingIntent contentIntent,
       @Nullable String message,
       @StringRes int titleStringId,
-      int progress,
+      int maxProgress,
+      int currentProgress,
       boolean indeterminateProgress,
       boolean ongoing,
       boolean showWhen) {
@@ -163,7 +166,7 @@ public final class DownloadNotificationHelper {
     notificationBuilder.setContentIntent(contentIntent);
     notificationBuilder.setStyle(
         message == null ? null : new NotificationCompat.BigTextStyle().bigText(message));
-    notificationBuilder.setProgress(/* max= */ 100, progress, indeterminateProgress);
+    notificationBuilder.setProgress(maxProgress, currentProgress, indeterminateProgress);
     notificationBuilder.setOngoing(ongoing);
     notificationBuilder.setShowWhen(showWhen);
     return notificationBuilder.build();

From 2169b9417faf249dc154acf969d749f6e1abf4b9 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Wed, 6 Feb 2019 12:23:57 +0000
Subject: [PATCH 481/832] Fix HEVC level error logging

PiperOrigin-RevId: 232651944
---
 .../google/android/exoplayer2/mediacodec/MediaCodecUtil.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
index 55459692c9..95cf82ff6c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
@@ -445,9 +445,10 @@ public final class MediaCodecUtil {
       Log.w(TAG, "Unknown HEVC profile string: " + profileString);
       return null;
     }
-    Integer level = HEVC_CODEC_STRING_TO_PROFILE_LEVEL.get(parts[3]);
+    String levelString = parts[3];
+    Integer level = HEVC_CODEC_STRING_TO_PROFILE_LEVEL.get(levelString);
     if (level == null) {
-      Log.w(TAG, "Unknown HEVC level string: " + matcher.group(1));
+      Log.w(TAG, "Unknown HEVC level string: " + levelString);
       return null;
     }
     return new Pair<>(profile, level);

From 3845304e5812717d82e2f28b3e100370069eab8a Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 6 Feb 2019 13:45:55 +0000
Subject: [PATCH 482/832] Shard SimpleCache files into 10 sub-directories

Issue: #4253
PiperOrigin-RevId: 232659869
---
 .../upstream/cache/SimpleCache.java           | 22 ++++++++++++++++---
 .../upstream/cache/SimpleCacheSpan.java       |  4 +++-
 .../upstream/cache/SimpleCacheTest.java       | 20 ++++++++++++++---
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index d2091c362a..72b39e24d1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -26,6 +26,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.NavigableSet;
+import java.util.Random;
 import java.util.Set;
 import java.util.TreeSet;
 
@@ -36,6 +37,14 @@ import java.util.TreeSet;
 public final class SimpleCache implements Cache {
 
   private static final String TAG = "SimpleCache";
+  /**
+   * Cache files are distributed between a number of subdirectories. This helps to avoid poor
+   * performance in cases where the performance of the underlying file system (e.g. FAT32) scales
+   * badly with the number of files per directory. See
+   * https://github.com/google/ExoPlayer/issues/4253.
+   */
+  private static final int SUBDIRECTORY_COUNT = 10;
+
   private static final HashSet<File> lockedCacheDirs = new HashSet<>();
 
   private static boolean cacheFolderLockingDisabled;
@@ -44,6 +53,7 @@ public final class SimpleCache implements Cache {
   private final CacheEvictor evictor;
   private final CachedContentIndex index;
   private final HashMap<String, ArrayList<Listener>> listeners;
+  private final Random random;
 
   private long totalSpace;
   private boolean released;
@@ -128,7 +138,8 @@ public final class SimpleCache implements Cache {
     this.cacheDir = cacheDir;
     this.evictor = evictor;
     this.index = index;
-    this.listeners = new HashMap<>();
+    listeners = new HashMap<>();
+    random = new Random();
 
     // Start cache initialization.
     final ConditionVariable conditionVariable = new ConditionVariable();
@@ -271,8 +282,13 @@ public final class SimpleCache implements Cache {
       removeStaleSpans();
     }
     evictor.onStartFile(this, key, position, length);
-    return SimpleCacheSpan.getCacheFile(
-        cacheDir, cachedContent.id, position, System.currentTimeMillis());
+    // Randomly distribute files into subdirectories with a uniform distribution.
+    File fileDir = new File(cacheDir, Integer.toString(random.nextInt(SUBDIRECTORY_COUNT)));
+    if (!fileDir.exists()) {
+      fileDir.mkdir();
+    }
+    long lastAccessTimestamp = System.currentTimeMillis();
+    return SimpleCacheSpan.getCacheFile(fileDir, cachedContent.id, position, lastAccessTimestamp);
   }
 
   @Override
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
index c35e3974f6..decbe80c84 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
@@ -26,7 +26,9 @@ import java.util.regex.Pattern;
 /** This class stores span metadata in filename. */
 /* package */ final class SimpleCacheSpan extends CacheSpan {
 
-  private static final String SUFFIX = ".v3.exo";
+  /* package */ static final String COMMON_SUFFIX = ".exo";
+
+  private static final String SUFFIX = ".v3" + COMMON_SUFFIX;
   private static final Pattern CACHE_FILE_PATTERN_V1 = Pattern.compile(
       "^(.+)\\.(\\d+)\\.(\\d+)\\.v1\\.exo$", Pattern.DOTALL);
   private static final Pattern CACHE_FILE_PATTERN_V2 = Pattern.compile(
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
index bdb9d4f9d9..6140d0ac82 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
@@ -75,7 +75,7 @@ public class SimpleCacheTest {
     NavigableSet<CacheSpan> cachedSpans = simpleCache.getCachedSpans(KEY_1);
     assertThat(cachedSpans.isEmpty()).isTrue();
     assertThat(simpleCache.getCacheSpace()).isEqualTo(0);
-    assertThat(cacheDir.listFiles()).hasLength(0);
+    assertNoCacheFiles(cacheDir);
 
     addCache(simpleCache, KEY_1, 0, 15);
 
@@ -233,7 +233,7 @@ public class SimpleCacheTest {
 
     // Cache should be cleared
     assertThat(simpleCache.getKeys()).isEmpty();
-    assertThat(cacheDir.listFiles()).hasLength(0);
+    assertNoCacheFiles(cacheDir);
   }
 
   @Test
@@ -252,7 +252,7 @@ public class SimpleCacheTest {
 
     // Cache should be cleared
     assertThat(simpleCache.getKeys()).isEmpty();
-    assertThat(cacheDir.listFiles()).hasLength(0);
+    assertNoCacheFiles(cacheDir);
   }
 
   @Test
@@ -391,6 +391,20 @@ public class SimpleCacheTest {
     }
   }
 
+  private static void assertNoCacheFiles(File dir) {
+    File[] files = dir.listFiles();
+    if (files == null) {
+      return;
+    }
+    for (File file : files) {
+      if (file.isDirectory()) {
+        assertNoCacheFiles(file);
+      } else {
+        assertThat(file.getName().endsWith(SimpleCacheSpan.COMMON_SUFFIX)).isFalse();
+      }
+    }
+  }
+
   private static byte[] generateData(String key, int position, int length) {
     byte[] bytes = new byte[length];
     new Random((long) (key.hashCode() ^ position)).nextBytes(bytes);

From bdc87a4fc7fc07ca4446c790a644f5d60e42109d Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 6 Feb 2019 14:26:02 +0000
Subject: [PATCH 483/832] API and plumbing for indexing file metadata (length +
 timestamp)

When SimpleCache uses a CacheFileMetadataIndex, it will be able to avoid
querying file.length() and renaming files, both of which are expensive
operations on some file systems.

PiperOrigin-RevId: 232664255
---
 .../upstream/cache/CacheFileMetadata.java     |  28 ++++
 .../cache/CacheFileMetadataIndex.java         |  63 ++++++++
 .../upstream/cache/CachedContent.java         |  36 +++--
 .../upstream/cache/SimpleCache.java           | 137 ++++++++++++------
 .../upstream/cache/SimpleCacheSpan.java       |  65 ++++++---
 5 files changed, 247 insertions(+), 82 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadata.java
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadata.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadata.java
new file mode 100644
index 0000000000..492b98a0de
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadata.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.upstream.cache;
+
+/** Metadata associated with a cache file. */
+/* package */ final class CacheFileMetadata {
+
+  public final long length;
+  public final long lastAccessTimestamp;
+
+  public CacheFileMetadata(long length, long lastAccessTimestamp) {
+    this.length = length;
+    this.lastAccessTimestamp = lastAccessTimestamp;
+  }
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
new file mode 100644
index 0000000000..b25eb91810
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.upstream.cache;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+/** Maintains an index of cache file metadata. */
+/* package */ class CacheFileMetadataIndex {
+
+  /**
+   * Returns all file metadata keyed by file name. The returned map is mutable and may be modified
+   * by the caller.
+   */
+  public Map<String, CacheFileMetadata> getAll() {
+    return Collections.emptyMap();
+  }
+
+  /**
+   * Sets metadata for a given file.
+   *
+   * @param name The name of the file.
+   * @param length The file length.
+   * @param lastAccessTimestamp The file last access timestamp.
+   * @return Whether the index was updated successfully.
+   */
+  public boolean set(String name, long length, long lastAccessTimestamp) {
+    // TODO.
+    return false;
+  }
+
+  /**
+   * Removes metadata.
+   *
+   * @param name The name of the file whose metadata is to be removed.
+   */
+  public void remove(String name) {
+    // TODO.
+  }
+
+  /**
+   * Removes metadata.
+   *
+   * @param names The names of the files whose metadata is to be removed.
+   */
+  public void removeAll(Set<String> names) {
+    // TODO.
+  }
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java
index 64ef33e3c9..80b50d862a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java
@@ -16,13 +16,16 @@
 package com.google.android.exoplayer2.upstream.cache;
 
 import android.support.annotation.Nullable;
-import com.google.android.exoplayer2.upstream.cache.Cache.CacheException;
 import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.Log;
+import java.io.File;
 import java.util.TreeSet;
 
 /** Defines the cached content for a single stream. */
 /* package */ final class CachedContent {
 
+  private static final String TAG = "CachedContent";
+
   /** The cache file id that uniquely identifies the original stream. */
   public final int id;
   /** The cache key that uniquely identifies the original stream. */
@@ -138,21 +141,30 @@ import java.util.TreeSet;
   }
 
   /**
-   * Copies the given span with an updated last access time. Passed span becomes invalid after this
-   * call.
+   * Sets the given span's last access timestamp. The passed span becomes invalid after this call.
    *
    * @param cacheSpan Span to be copied and updated.
-   * @return a span with the updated last access time.
-   * @throws CacheException If renaming of the underlying span file failed.
+   * @param lastAccessTimestamp The new last access timestamp.
+   * @param updateFile Whether the span file should be renamed to have its timestamp match the new
+   *     last access time.
+   * @return A span with the updated last access timestamp.
    */
-  public SimpleCacheSpan touch(SimpleCacheSpan cacheSpan) throws CacheException {
-    SimpleCacheSpan newCacheSpan = cacheSpan.copyWithUpdatedLastAccessTime(id);
-    if (!cacheSpan.file.renameTo(newCacheSpan.file)) {
-      throw new CacheException("Renaming of " + cacheSpan.file + " to " + newCacheSpan.file
-          + " failed.");
-    }
-    // Replace the in-memory representation of the span.
+  public SimpleCacheSpan setLastAccessTimestamp(
+      SimpleCacheSpan cacheSpan, long lastAccessTimestamp, boolean updateFile) {
     Assertions.checkState(cachedSpans.remove(cacheSpan));
+    File file = cacheSpan.file;
+    if (updateFile) {
+      File directory = file.getParentFile();
+      long position = cacheSpan.position;
+      File newFile = SimpleCacheSpan.getCacheFile(directory, id, position, lastAccessTimestamp);
+      if (file.renameTo(newFile)) {
+        file = newFile;
+      } else {
+        Log.w(TAG, "Failed to rename " + file + " to " + newFile + ".");
+      }
+    }
+    SimpleCacheSpan newCacheSpan =
+        cacheSpan.copyWithFileAndLastAccessTimestamp(file, lastAccessTimestamp);
     cachedSpans.add(newCacheSpan);
     return newCacheSpan;
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index 72b39e24d1..dcdedfc32d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -25,6 +25,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.NavigableSet;
 import java.util.Random;
 import java.util.Set;
@@ -51,7 +52,8 @@ public final class SimpleCache implements Cache {
 
   private final File cacheDir;
   private final CacheEvictor evictor;
-  private final CachedContentIndex index;
+  private final CachedContentIndex contentIndex;
+  @Nullable private final CacheFileMetadataIndex fileIndex;
   private final HashMap<String, ArrayList<Listener>> listeners;
   private final Random random;
 
@@ -128,16 +130,17 @@ public final class SimpleCache implements Cache {
    *
    * @param cacheDir A dedicated cache directory.
    * @param evictor The evictor to be used.
-   * @param index The CachedContentIndex to be used.
+   * @param contentIndex The content index to be used.
    */
-  /* package */ SimpleCache(File cacheDir, CacheEvictor evictor, CachedContentIndex index) {
+  /* package */ SimpleCache(File cacheDir, CacheEvictor evictor, CachedContentIndex contentIndex) {
     if (!lockFolder(cacheDir)) {
       throw new IllegalStateException("Another SimpleCache instance uses the folder: " + cacheDir);
     }
 
     this.cacheDir = cacheDir;
     this.evictor = evictor;
-    this.index = index;
+    this.contentIndex = contentIndex;
+    this.fileIndex = null;
     listeners = new HashMap<>();
     random = new Random();
 
@@ -164,11 +167,11 @@ public final class SimpleCache implements Cache {
     listeners.clear();
     removeStaleSpans();
     try {
-      index.store();
+      contentIndex.store();
     } catch (CacheException e) {
       Log.e(TAG, "Storing index file failed", e);
     } finally {
-      index.release();
+      contentIndex.release();
       unlockFolder(cacheDir);
       released = true;
     }
@@ -204,7 +207,7 @@ public final class SimpleCache implements Cache {
   @Override
   public synchronized NavigableSet<CacheSpan> getCachedSpans(String key) {
     Assertions.checkState(!released);
-    CachedContent cachedContent = index.get(key);
+    CachedContent cachedContent = contentIndex.get(key);
     return cachedContent == null || cachedContent.isEmpty()
         ? new TreeSet<>()
         : new TreeSet<CacheSpan>(cachedContent.getSpans());
@@ -213,7 +216,7 @@ public final class SimpleCache implements Cache {
   @Override
   public synchronized Set<String> getKeys() {
     Assertions.checkState(!released);
-    return new HashSet<>(index.getKeys());
+    return new HashSet<>(contentIndex.getKeys());
   }
 
   @Override
@@ -243,27 +246,33 @@ public final class SimpleCache implements Cache {
   public synchronized @Nullable SimpleCacheSpan startReadWriteNonBlocking(String key, long position)
       throws CacheException {
     Assertions.checkState(!released);
-    SimpleCacheSpan cacheSpan = getSpan(key, position);
+    SimpleCacheSpan span = getSpan(key, position);
 
     // Read case.
-    if (cacheSpan.isCached) {
-      try {
-        // Obtain a new span with updated last access timestamp.
-        SimpleCacheSpan newCacheSpan = index.get(key).touch(cacheSpan);
-        notifySpanTouched(cacheSpan, newCacheSpan);
-        return newCacheSpan;
-      } catch (CacheException e) {
-        // Ignore. In worst case the cache span is evicted early.
-        // This happens very rarely [Internal: b/38351639]
-        return cacheSpan;
+    if (span.isCached) {
+      String fileName = span.file.getName();
+      long length = span.length;
+      long lastAccessTimestamp = System.currentTimeMillis();
+      // Updating the file itself to incorporate the new last access timestamp is much slower than
+      // updating the file index. Hence we only update the file if we don't have a file index, or if
+      // updating the file index failed.
+      boolean updateFile;
+      if (fileIndex != null) {
+        updateFile = !fileIndex.set(fileName, length, lastAccessTimestamp);
+      } else {
+        updateFile = true;
       }
+      SimpleCacheSpan newSpan =
+          contentIndex.get(key).setLastAccessTimestamp(span, lastAccessTimestamp, updateFile);
+      notifySpanTouched(span, newSpan);
+      return newSpan;
     }
 
-    CachedContent cachedContent = index.getOrAdd(key);
+    CachedContent cachedContent = contentIndex.getOrAdd(key);
     if (!cachedContent.isLocked()) {
       // Write case, lock available.
       cachedContent.setLocked(true);
-      return cacheSpan;
+      return span;
     }
 
     // Write case, lock not available.
@@ -273,7 +282,7 @@ public final class SimpleCache implements Cache {
   @Override
   public synchronized File startFile(String key, long position, long length) throws CacheException {
     Assertions.checkState(!released);
-    CachedContent cachedContent = index.get(key);
+    CachedContent cachedContent = contentIndex.get(key);
     Assertions.checkNotNull(cachedContent);
     Assertions.checkState(cachedContent.isLocked());
     if (!cacheDir.exists()) {
@@ -301,29 +310,35 @@ public final class SimpleCache implements Cache {
       file.delete();
       return;
     }
-    SimpleCacheSpan span = SimpleCacheSpan.createCacheEntry(file, length, index);
+
+    SimpleCacheSpan span = SimpleCacheSpan.createCacheEntry(file, length, contentIndex);
     Assertions.checkState(span != null);
-    CachedContent cachedContent = index.get(span.key);
+    CachedContent cachedContent = contentIndex.get(span.key);
     Assertions.checkNotNull(cachedContent);
     Assertions.checkState(cachedContent.isLocked());
+
     // Check if the span conflicts with the set content length
     long contentLength = ContentMetadata.getContentLength(cachedContent.getMetadata());
     if (contentLength != C.LENGTH_UNSET) {
       Assertions.checkState((span.position + span.length) <= contentLength);
     }
+
+    if (fileIndex != null) {
+      fileIndex.set(file.getName(), span.length, span.lastAccessTimestamp);
+    }
     addSpan(span);
-    index.store();
+    contentIndex.store();
     notifyAll();
   }
 
   @Override
   public synchronized void releaseHoleSpan(CacheSpan holeSpan) {
     Assertions.checkState(!released);
-    CachedContent cachedContent = index.get(holeSpan.key);
+    CachedContent cachedContent = contentIndex.get(holeSpan.key);
     Assertions.checkNotNull(cachedContent);
     Assertions.checkState(cachedContent.isLocked());
     cachedContent.setLocked(false);
-    index.maybeRemove(cachedContent.key);
+    contentIndex.maybeRemove(cachedContent.key);
     notifyAll();
   }
 
@@ -336,14 +351,14 @@ public final class SimpleCache implements Cache {
   @Override
   public synchronized boolean isCached(String key, long position, long length) {
     Assertions.checkState(!released);
-    CachedContent cachedContent = index.get(key);
+    CachedContent cachedContent = contentIndex.get(key);
     return cachedContent != null && cachedContent.getCachedBytesLength(position, length) >= length;
   }
 
   @Override
   public synchronized long getCachedLength(String key, long position, long length) {
     Assertions.checkState(!released);
-    CachedContent cachedContent = index.get(key);
+    CachedContent cachedContent = contentIndex.get(key);
     return cachedContent != null ? cachedContent.getCachedBytesLength(position, length) : -length;
   }
 
@@ -351,14 +366,14 @@ public final class SimpleCache implements Cache {
   public synchronized void applyContentMetadataMutations(
       String key, ContentMetadataMutations mutations) throws CacheException {
     Assertions.checkState(!released);
-    index.applyContentMetadataMutations(key, mutations);
-    index.store();
+    contentIndex.applyContentMetadataMutations(key, mutations);
+    contentIndex.store();
   }
 
   @Override
   public synchronized ContentMetadata getContentMetadata(String key) {
     Assertions.checkState(!released);
-    return index.getContentMetadata(key);
+    return contentIndex.getContentMetadata(key);
   }
 
   /**
@@ -375,7 +390,7 @@ public final class SimpleCache implements Cache {
    * @return The corresponding cache {@link SimpleCacheSpan}.
    */
   private SimpleCacheSpan getSpan(String key, long position) throws CacheException {
-    CachedContent cachedContent = index.get(key);
+    CachedContent cachedContent = contentIndex.get(key);
     if (cachedContent == null) {
       return SimpleCacheSpan.createOpenHole(key, position);
     }
@@ -398,40 +413,63 @@ public final class SimpleCache implements Cache {
       return;
     }
 
-    index.load();
-    loadDirectory(cacheDir, /* isRootDirectory= */ true);
-    index.removeEmpty();
+    contentIndex.load();
+    if (fileIndex != null) {
+      Map<String, CacheFileMetadata> fileMetadata = fileIndex.getAll();
+      loadDirectory(cacheDir, /* isRoot= */ true, fileMetadata);
+      fileIndex.removeAll(fileMetadata.keySet());
+    } else {
+      loadDirectory(cacheDir, /* isRoot= */ true, /* fileMetadata= */ null);
+    }
+    contentIndex.removeEmpty();
 
     try {
-      index.store();
+      contentIndex.store();
     } catch (CacheException e) {
       Log.e(TAG, "Storing index file failed", e);
     }
   }
 
-  private void loadDirectory(File directory, boolean isRootDirectory) {
+  /**
+   * Loads a cache directory. If the root directory is passed, also loads any subdirectories.
+   *
+   * @param directory The directory to load.
+   * @param isRoot Whether the directory is the root directory.
+   * @param fileMetadata A mutable map containing cache file metadata, keyed by file name. The map
+   *     is modified by removing entries for all loaded files. When the method call returns, the map
+   *     will contain only metadata that was unused. May be null if no file metadata is available.
+   */
+  private void loadDirectory(
+      File directory, boolean isRoot, @Nullable Map<String, CacheFileMetadata> fileMetadata) {
     File[] files = directory.listFiles();
     if (files == null) {
       // Not a directory.
       return;
     }
-    if (!isRootDirectory && files.length == 0) {
+    if (!isRoot && files.length == 0) {
       // Empty non-root directory.
       directory.delete();
       return;
     }
     for (File file : files) {
       String fileName = file.getName();
-      if (isRootDirectory && fileName.indexOf('.') == -1) {
-        loadDirectory(file, /* isRootDirectory= */ false);
+      if (isRoot && fileName.indexOf('.') == -1) {
+        loadDirectory(file, /* isRoot= */ false, fileMetadata);
       } else {
-        if (isRootDirectory && CachedContentIndex.isIndexFile(fileName)) {
+        if (isRoot && CachedContentIndex.isIndexFile(fileName)) {
           // Skip the (expected) index files in the root directory.
           continue;
         }
-        long fileLength = file.length();
+        CacheFileMetadata metadata =
+            fileMetadata != null ? fileMetadata.remove(file.getName()) : null;
+        long length = C.LENGTH_UNSET;
+        long lastAccessTimestamp = C.TIME_UNSET;
+        if (metadata != null) {
+          length = metadata.length;
+          lastAccessTimestamp = metadata.lastAccessTimestamp;
+        }
         SimpleCacheSpan span =
-            fileLength > 0 ? SimpleCacheSpan.createCacheEntry(file, fileLength, index) : null;
+            SimpleCacheSpan.createCacheEntry(file, length, lastAccessTimestamp, contentIndex);
         if (span != null) {
           addSpan(span);
         } else {
@@ -447,18 +485,21 @@ public final class SimpleCache implements Cache {
    * @param span The span to be added.
    */
   private void addSpan(SimpleCacheSpan span) {
-    index.getOrAdd(span.key).addSpan(span);
+    contentIndex.getOrAdd(span.key).addSpan(span);
     totalSpace += span.length;
     notifySpanAdded(span);
   }
 
   private void removeSpanInternal(CacheSpan span) {
-    CachedContent cachedContent = index.get(span.key);
+    CachedContent cachedContent = contentIndex.get(span.key);
     if (cachedContent == null || !cachedContent.removeSpan(span)) {
       return;
     }
     totalSpace -= span.length;
-    index.maybeRemove(cachedContent.key);
+    if (fileIndex != null) {
+      fileIndex.remove(span.file.getName());
+    }
+    contentIndex.maybeRemove(cachedContent.key);
     notifySpanRemoved(span);
   }
 
@@ -468,7 +509,7 @@ public final class SimpleCache implements Cache {
    */
   private void removeStaleSpans() {
     ArrayList<CacheSpan> spansToBeRemoved = new ArrayList<>();
-    for (CachedContent cachedContent : index.getAll()) {
+    for (CachedContent cachedContent : contentIndex.getAll()) {
       for (CacheSpan span : cachedContent.getSpans()) {
         if (!span.file.exists()) {
           spansToBeRemoved.add(span);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
index decbe80c84..82563af01c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
@@ -38,16 +38,16 @@ import java.util.regex.Pattern;
 
   /**
    * Returns a new {@link File} instance from {@code cacheDir}, {@code id}, {@code position}, {@code
-   * lastAccessTimestamp}.
+   * timestamp}.
    *
    * @param cacheDir The parent abstract pathname.
    * @param id The cache file id.
    * @param position The position of the stored data in the original stream.
-   * @param lastAccessTimestamp The last access timestamp.
+   * @param timestamp The file timestamp.
    * @return The cache file.
    */
-  public static File getCacheFile(File cacheDir, int id, long position, long lastAccessTimestamp) {
-    return new File(cacheDir, id + "." + position + "." + lastAccessTimestamp + SUFFIX);
+  public static File getCacheFile(File cacheDir, int id, long position, long timestamp) {
+    return new File(cacheDir, id + "." + position + "." + timestamp + SUFFIX);
   }
 
   /**
@@ -84,22 +84,36 @@ import java.util.regex.Pattern;
     return new SimpleCacheSpan(key, position, length, C.TIME_UNSET, null);
   }
 
-  /*
-   * Note: {@code fileLength} is equivalent to {@code file.length()}, but passing it as an explicit
-   * argument can reduce the number of calls to this method if the calling code already knows the
-   * file length. This is preferable because calling {@code file.length()} can be expensive. See:
-   * https://github.com/google/ExoPlayer/issues/4253#issuecomment-451593889.
-   */
   /**
    * Creates a cache span from an underlying cache file. Upgrades the file if necessary.
    *
    * @param file The cache file.
-   * @param length The length of the cache file in bytes.
+   * @param length The length of the cache file in bytes, or {@link C#LENGTH_UNSET} to query the
+   *     underlying file system. Querying the underlying file system can be expensive, so callers
+   *     that already know the length of the file should pass it explicitly.
    * @return The span, or null if the file name is not correctly formatted, or if the id is not
-   *     present in the content index.
+   *     present in the content index, or if the length is 0.
    */
   @Nullable
   public static SimpleCacheSpan createCacheEntry(File file, long length, CachedContentIndex index) {
+    return createCacheEntry(file, length, /* lastAccessTimestamp= */ C.TIME_UNSET, index);
+  }
+
+  /**
+   * Creates a cache span from an underlying cache file. Upgrades the file if necessary.
+   *
+   * @param file The cache file.
+   * @param length The length of the cache file in bytes, or {@link C#LENGTH_UNSET} to query the
+   *     underlying file system. Querying the underlying file system can be expensive, so callers
+   *     that already know the length of the file should pass it explicitly.
+   * @param lastAccessTimestamp The last access timestamp, or {@link C#TIME_UNSET} to use the file
+   *     timestamp.
+   * @return The span, or null if the file name is not correctly formatted, or if the id is not
+   *     present in the content index, or if the length is 0.
+   */
+  @Nullable
+  public static SimpleCacheSpan createCacheEntry(
+      File file, long length, long lastAccessTimestamp, CachedContentIndex index) {
     String name = file.getName();
     if (!name.endsWith(SUFFIX)) {
       file = upgradeFile(file, index);
@@ -120,9 +134,18 @@ import java.util.regex.Pattern;
       return null;
     }
 
+    if (length == C.LENGTH_UNSET) {
+      length = file.length();
+    }
+    if (length == 0) {
+      return null;
+    }
+
     long position = Long.parseLong(matcher.group(2));
-    long lastAccessTime = Long.parseLong(matcher.group(3));
-    return new SimpleCacheSpan(key, position, length, lastAccessTime, file);
+    if (lastAccessTimestamp == C.TIME_UNSET) {
+      lastAccessTimestamp = Long.parseLong(matcher.group(3));
+    }
+    return new SimpleCacheSpan(key, position, length, lastAccessTimestamp, file);
   }
 
   /**
@@ -174,18 +197,16 @@ import java.util.regex.Pattern;
   }
 
   /**
-   * Returns a copy of this CacheSpan whose last access time stamp is set to current time. This
-   * doesn't copy or change the underlying cache file.
+   * Returns a copy of this CacheSpan with a new file and last access timestamp.
    *
-   * @param id The cache file id.
-   * @return A {@link SimpleCacheSpan} with updated last access time stamp.
+   * @param file The new file.
+   * @param lastAccessTimestamp The new last access time.
+   * @return A copy with the new file and last access timestamp.
    * @throws IllegalStateException If called on a non-cached span (i.e. {@link #isCached} is false).
    */
-  public SimpleCacheSpan copyWithUpdatedLastAccessTime(int id) {
+  public SimpleCacheSpan copyWithFileAndLastAccessTimestamp(File file, long lastAccessTimestamp) {
     Assertions.checkState(isCached);
-    long now = System.currentTimeMillis();
-    File newCacheFile = getCacheFile(file.getParentFile(), id, position, now);
-    return new SimpleCacheSpan(key, position, length, now, newCacheFile);
+    return new SimpleCacheSpan(key, position, length, lastAccessTimestamp, file);
   }
 
 }

From 7eed60c9e31492e0ba18ce634b03482ddb340801 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 6 Feb 2019 15:11:33 +0000
Subject: [PATCH 484/832] Add DownloadManager.stopDownloads(int
 manualStopReason)

Also removed STOP_FLAG_DOWNLOAD_MANAGER_NOT_READY.

PiperOrigin-RevId: 232669463
---
 .../offline/DefaultDownloadIndex.java         |  15 +-
 .../exoplayer2/offline/DownloadManager.java   | 155 +++++++++++-------
 .../exoplayer2/offline/DownloadState.java     |  33 ++--
 .../offline/DefaultDownloadIndexTest.java     |   5 +-
 .../offline/DownloadStateBuilder.java         |   7 +
 .../exoplayer2/offline/DownloadStateTest.java |   4 +-
 6 files changed, 132 insertions(+), 87 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
index 2ff85c041b..c30260b11b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -50,6 +50,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
   private static final String COLUMN_FAILURE_REASON = "failure_reason";
   private static final String COLUMN_STOP_FLAGS = "stop_flags";
   private static final String COLUMN_NOT_MET_REQUIREMENTS = "not_met_requirements";
+  private static final String COLUMN_MANUAL_STOP_REASON = "manual_stop_reason";
   private static final String COLUMN_START_TIME_MS = "start_time_ms";
   private static final String COLUMN_UPDATE_TIME_MS = "update_time_ms";
   private static final String COLUMN_STREAM_KEYS = "stream_keys";
@@ -66,10 +67,11 @@ public final class DefaultDownloadIndex implements DownloadIndex {
   private static final int COLUMN_INDEX_FAILURE_REASON = 8;
   private static final int COLUMN_INDEX_STOP_FLAGS = 9;
   private static final int COLUMN_INDEX_NOT_MET_REQUIREMENTS = 10;
-  private static final int COLUMN_INDEX_START_TIME_MS = 11;
-  private static final int COLUMN_INDEX_UPDATE_TIME_MS = 12;
-  private static final int COLUMN_INDEX_STREAM_KEYS = 13;
-  private static final int COLUMN_INDEX_CUSTOM_METADATA = 14;
+  private static final int COLUMN_INDEX_MANUAL_STOP_REASON = 11;
+  private static final int COLUMN_INDEX_START_TIME_MS = 12;
+  private static final int COLUMN_INDEX_UPDATE_TIME_MS = 13;
+  private static final int COLUMN_INDEX_STREAM_KEYS = 14;
+  private static final int COLUMN_INDEX_CUSTOM_METADATA = 15;
 
   private static final String COLUMN_SELECTION_ID = COLUMN_ID + " = ?";
 
@@ -86,6 +88,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
         COLUMN_FAILURE_REASON,
         COLUMN_STOP_FLAGS,
         COLUMN_NOT_MET_REQUIREMENTS,
+        COLUMN_MANUAL_STOP_REASON,
         COLUMN_START_TIME_MS,
         COLUMN_UPDATE_TIME_MS,
         COLUMN_STREAM_KEYS,
@@ -119,6 +122,8 @@ public final class DefaultDownloadIndex implements DownloadIndex {
           + " INTEGER NOT NULL,"
           + COLUMN_NOT_MET_REQUIREMENTS
           + " INTEGER NOT NULL,"
+          + COLUMN_MANUAL_STOP_REASON
+          + " INTEGER NOT NULL,"
           + COLUMN_START_TIME_MS
           + " INTEGER NOT NULL,"
           + COLUMN_UPDATE_TIME_MS
@@ -194,6 +199,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
     values.put(COLUMN_FAILURE_REASON, downloadState.failureReason);
     values.put(COLUMN_STOP_FLAGS, downloadState.stopFlags);
     values.put(COLUMN_NOT_MET_REQUIREMENTS, downloadState.notMetRequirements);
+    values.put(COLUMN_MANUAL_STOP_REASON, downloadState.manualStopReason);
     values.put(COLUMN_START_TIME_MS, downloadState.startTimeMs);
     values.put(COLUMN_UPDATE_TIME_MS, downloadState.updateTimeMs);
     values.put(COLUMN_STREAM_KEYS, encodeStreamKeys(downloadState.streamKeys));
@@ -260,6 +266,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
         cursor.getInt(COLUMN_INDEX_FAILURE_REASON),
         cursor.getInt(COLUMN_INDEX_STOP_FLAGS),
         cursor.getInt(COLUMN_INDEX_NOT_MET_REQUIREMENTS),
+        cursor.getInt(COLUMN_INDEX_MANUAL_STOP_REASON),
         cursor.getLong(COLUMN_INDEX_START_TIME_MS),
         cursor.getLong(COLUMN_INDEX_UPDATE_TIME_MS),
         decodeStreamKeys(cursor.getString(COLUMN_INDEX_STREAM_KEYS)),
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 9e6aec0a86..731f7fc43e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -25,9 +25,8 @@ import static com.google.android.exoplayer2.offline.DownloadState.STATE_REMOVED;
 import static com.google.android.exoplayer2.offline.DownloadState.STATE_REMOVING;
 import static com.google.android.exoplayer2.offline.DownloadState.STATE_RESTARTING;
 import static com.google.android.exoplayer2.offline.DownloadState.STATE_STOPPED;
-import static com.google.android.exoplayer2.offline.DownloadState.STOP_FLAG_DOWNLOAD_MANAGER_NOT_READY;
+import static com.google.android.exoplayer2.offline.DownloadState.STOP_FLAG_MANUAL;
 import static com.google.android.exoplayer2.offline.DownloadState.STOP_FLAG_REQUIREMENTS_NOT_MET;
-import static com.google.android.exoplayer2.offline.DownloadState.STOP_FLAG_STOPPED;
 
 import android.content.Context;
 import android.os.ConditionVariable;
@@ -109,15 +108,17 @@ public final class DownloadManager {
   @IntDef({
     START_THREAD_SUCCEEDED,
     START_THREAD_WAIT_REMOVAL_TO_FINISH,
-    START_THREAD_WAIT_DOWNLOAD_CANCELATION,
-    START_THREAD_TOO_MANY_DOWNLOADS
+    START_THREAD_WAIT_DOWNLOAD_CANCELLATION,
+    START_THREAD_TOO_MANY_DOWNLOADS,
+    START_THREAD_NOT_ALLOWED
   })
   private @interface StartThreadResults {}
 
   private static final int START_THREAD_SUCCEEDED = 0;
   private static final int START_THREAD_WAIT_REMOVAL_TO_FINISH = 1;
-  private static final int START_THREAD_WAIT_DOWNLOAD_CANCELATION = 2;
+  private static final int START_THREAD_WAIT_DOWNLOAD_CANCELLATION = 2;
   private static final int START_THREAD_TOO_MANY_DOWNLOADS = 3;
+  private static final int START_THREAD_NOT_ALLOWED = 4;
 
   private static final String TAG = "DownloadManager";
   private static final boolean DEBUG = false;
@@ -137,8 +138,9 @@ public final class DownloadManager {
 
   private boolean initialized;
   private boolean released;
-  @DownloadState.StopFlags private int stickyStopFlags;
+  @DownloadState.StopFlags private int stopFlags;
   @Requirements.RequirementFlags private int notMetRequirements;
+  private int manualStopReason;
   private RequirementsWatcher requirementsWatcher;
   private int simultaneousDownloads;
 
@@ -181,8 +183,8 @@ public final class DownloadManager {
     this.downloaderFactory = downloaderFactory;
     this.maxSimultaneousDownloads = maxSimultaneousDownloads;
     this.minRetryCount = minRetryCount;
-    this.stickyStopFlags = STOP_FLAG_STOPPED | STOP_FLAG_DOWNLOAD_MANAGER_NOT_READY;
 
+    stopFlags = STOP_FLAG_MANUAL;
     downloads = new ArrayList<>();
     activeDownloads = new HashMap<>();
 
@@ -199,7 +201,7 @@ public final class DownloadManager {
     listeners = new CopyOnWriteArraySet<>();
     actionQueue = new ArrayDeque<>();
 
-    watchRequirements(requirements);
+    setNotMetRequirements(watchRequirements(requirements));
     loadActions();
     logd("Created");
   }
@@ -241,33 +243,35 @@ public final class DownloadManager {
     listeners.remove(listener);
   }
 
-  /** Starts the downloads. */
+  /**
+   * Clears {@link DownloadState#STOP_FLAG_MANUAL} flag of all downloads. Downloads are started if
+   * the requirements are met.
+   */
   public void startDownloads() {
-    clearStopFlags(STOP_FLAG_STOPPED);
+    logd("manual stopped is cancelled");
+    manualStopReason = 0;
+    stopFlags &= ~STOP_FLAG_MANUAL;
+    for (int i = 0; i < downloads.size(); i++) {
+      downloads.get(i).clearManualStopReason();
+    }
   }
 
-  /** Stops all of the downloads. Call {@link #startDownloads()} to restart downloads. */
+  /** Signals all downloads to stop. Call {@link #startDownloads()} to let them to be started. */
   public void stopDownloads() {
-    setStopFlags(STOP_FLAG_STOPPED);
+    stopDownloads(0);
   }
 
-  private void setStopFlags(int flags) {
-    updateStopFlags(flags, flags);
-  }
-
-  private void clearStopFlags(int flags) {
-    updateStopFlags(flags, 0);
-  }
-
-  private void updateStopFlags(int flags, int values) {
-    Assertions.checkState(!released);
-    int updatedStickyStopFlags = (values & flags) | (stickyStopFlags & ~flags);
-    if (stickyStopFlags != updatedStickyStopFlags) {
-      stickyStopFlags = updatedStickyStopFlags;
-      for (int i = 0; i < downloads.size(); i++) {
-        downloads.get(i).updateStopFlags(flags, values);
-      }
-      logdFlags("Sticky stop flags are updated", updatedStickyStopFlags);
+  /**
+   * Signals all downloads to stop. Call {@link #startDownloads()} to let them to be started.
+   *
+   * @param manualStopReason An application defined stop reason.
+   */
+  public void stopDownloads(int manualStopReason) {
+    logd("downloads are stopped manually");
+    this.manualStopReason = manualStopReason;
+    stopFlags |= STOP_FLAG_MANUAL;
+    for (int i = 0; i < downloads.size(); i++) {
+      downloads.get(i).setManualStopReason(this.manualStopReason);
     }
   }
 
@@ -341,8 +345,8 @@ public final class DownloadManager {
     if (released) {
       return;
     }
-    setStopFlags(STOP_FLAG_DOWNLOAD_MANAGER_NOT_READY);
     released = true;
+    stopAllDownloadThreads();
     if (requirementsWatcher != null) {
       requirementsWatcher.stop();
     }
@@ -361,7 +365,7 @@ public final class DownloadManager {
         return;
       }
     }
-    Download download = new Download(this, action, stickyStopFlags, notMetRequirements);
+    Download download = new Download(this, action, stopFlags, notMetRequirements, manualStopReason);
     downloads.add(download);
     logd("Download is added", download);
   }
@@ -396,17 +400,26 @@ public final class DownloadManager {
   }
 
   private void onRequirementsStateChanged(@Requirements.RequirementFlags int notMetRequirements) {
-    this.notMetRequirements = notMetRequirements;
+    setNotMetRequirements(notMetRequirements);
     logdFlags("Not met requirements are changed", notMetRequirements);
+    Requirements requirements = requirementsWatcher.getRequirements();
     for (Listener listener : listeners) {
-      listener.onRequirementsStateChanged(
-          DownloadManager.this, requirementsWatcher.getRequirements(), notMetRequirements);
+      listener.onRequirementsStateChanged(DownloadManager.this, requirements, notMetRequirements);
     }
     for (int i = 0; i < downloads.size(); i++) {
       downloads.get(i).setNotMetRequirements(notMetRequirements);
     }
   }
 
+  private void setNotMetRequirements(@Requirements.RequirementFlags int notMetRequirements) {
+    this.notMetRequirements = notMetRequirements;
+    if (notMetRequirements == 0) {
+      stopFlags &= ~STOP_FLAG_REQUIREMENTS_NOT_MET;
+    } else {
+      stopFlags |= STOP_FLAG_REQUIREMENTS_NOT_MET;
+    }
+  }
+
   private void loadActions() {
     fileIOHandler.post(
         () -> {
@@ -438,7 +451,9 @@ public final class DownloadManager {
                 for (Listener listener : listeners) {
                   listener.onInitialized(DownloadManager.this);
                 }
-                clearStopFlags(STOP_FLAG_DOWNLOAD_MANAGER_NOT_READY);
+                for (int i = 0; i < downloads.size(); i++) {
+                  downloads.get(i).start();
+                }
               });
         });
   }
@@ -497,9 +512,12 @@ public final class DownloadManager {
 
   @StartThreadResults
   private int startDownloadThread(Download download, DownloadAction action) {
+    if (!initialized || released) {
+      return START_THREAD_NOT_ALLOWED;
+    }
     if (activeDownloads.containsKey(download)) {
       if (stopDownloadThread(download)) {
-        return START_THREAD_WAIT_DOWNLOAD_CANCELATION;
+        return START_THREAD_WAIT_DOWNLOAD_CANCELLATION;
       }
       return START_THREAD_WAIT_REMOVAL_TO_FINISH;
     }
@@ -526,6 +544,12 @@ public final class DownloadManager {
     return false;
   }
 
+  private void stopAllDownloadThreads() {
+    for (Download download : activeDownloads.keySet()) {
+      stopDownloadThread(download);
+    }
+  }
+
   private void onDownloadThreadStopped(DownloadThread downloadThread, Throwable finalError) {
     Download download = downloadThread.download;
     logd("Download is stopped", download);
@@ -567,18 +591,18 @@ public final class DownloadManager {
     @MonotonicNonNull @DownloadState.FailureReason private int failureReason;
     @DownloadState.StopFlags private int stopFlags;
     @Requirements.RequirementFlags private int notMetRequirements;
+    private int manualStopReason;
 
     private Download(
         DownloadManager downloadManager,
         DownloadAction action,
         @DownloadState.StopFlags int stopFlags,
-        @Requirements.RequirementFlags int notMetRequirements) {
+        @Requirements.RequirementFlags int notMetRequirements,
+        int manualStopReason) {
       this.id = action.id;
       this.downloadManager = downloadManager;
       this.notMetRequirements = notMetRequirements;
-      if (notMetRequirements != 0) {
-        stopFlags |= STOP_FLAG_REQUIREMENTS_NOT_MET;
-      }
+      this.manualStopReason = manualStopReason;
       this.stopFlags = stopFlags;
       this.startTimeMs = System.currentTimeMillis();
       actionQueue = new ArrayDeque<>();
@@ -642,6 +666,7 @@ public final class DownloadManager {
           failureReason,
           stopFlags,
           notMetRequirements,
+          manualStopReason,
           startTimeMs,
           /* updateTimeMs= */ System.currentTimeMillis(),
           action.keys.toArray(new StreamKey[0]),
@@ -662,21 +687,34 @@ public final class DownloadManager {
     }
 
     public void start() {
-      if (state == STATE_QUEUED) {
+      if (state == STATE_QUEUED || state == STATE_DOWNLOADING) {
         startOrQueue();
+      } else if (state == STATE_REMOVING || state == STATE_RESTARTING) {
+        downloadManager.startDownloadThread(this, actionQueue.peek());
       }
     }
 
-    public void setStopFlags(int flags) {
-      updateStopFlags(flags, flags);
+    public void setNotMetRequirements(@Requirements.RequirementFlags int notMetRequirements) {
+      this.notMetRequirements = notMetRequirements;
+      updateStopFlags(STOP_FLAG_REQUIREMENTS_NOT_MET, /* setFlags= */ notMetRequirements != 0);
     }
 
-    public void clearStopFlags(int flags) {
-      updateStopFlags(flags, 0);
+    public void setManualStopReason(int manualStopReason) {
+      this.manualStopReason = manualStopReason;
+      updateStopFlags(STOP_FLAG_MANUAL, /* setFlags= */ true);
     }
 
-    public void updateStopFlags(int flags, int values) {
-      stopFlags = (values & flags) | (stopFlags & ~flags);
+    public void clearManualStopReason() {
+      this.manualStopReason = 0;
+      updateStopFlags(STOP_FLAG_MANUAL, /* setFlags= */ false);
+    }
+
+    private void updateStopFlags(int flags, boolean setFlags) {
+      if (setFlags) {
+        stopFlags |= flags;
+      } else {
+        stopFlags &= ~flags;
+      }
       if (stopFlags != 0) {
         if (state == STATE_DOWNLOADING || state == STATE_QUEUED) {
           downloadManager.stopDownloadThread(this);
@@ -687,21 +725,14 @@ public final class DownloadManager {
       }
     }
 
-    public void setNotMetRequirements(@Requirements.RequirementFlags int notMetRequirements) {
-      this.notMetRequirements = notMetRequirements;
-      updateStopFlags(
-          STOP_FLAG_REQUIREMENTS_NOT_MET,
-          notMetRequirements != 0 ? STOP_FLAG_REQUIREMENTS_NOT_MET : 0);
-    }
-
     private void initialize() {
       DownloadAction action = actionQueue.peek();
       if (action.isRemoveAction) {
-        if (!downloadManager.released) {
-          int result = downloadManager.startDownloadThread(this, action);
-          Assertions.checkState(
-              result == START_THREAD_SUCCEEDED || result == START_THREAD_WAIT_DOWNLOAD_CANCELATION);
-        }
+        int result = downloadManager.startDownloadThread(this, action);
+        Assertions.checkState(
+            result == START_THREAD_SUCCEEDED
+                || result == START_THREAD_WAIT_DOWNLOAD_CANCELLATION
+                || result == START_THREAD_NOT_ALLOWED);
         setState(actionQueue.size() == 1 ? STATE_REMOVING : STATE_RESTARTING);
       } else if (stopFlags != 0) {
         setState(STATE_STOPPED);
@@ -715,10 +746,10 @@ public final class DownloadManager {
       Assertions.checkState(!action.isRemoveAction);
       @StartThreadResults int result = downloadManager.startDownloadThread(this, action);
       Assertions.checkState(result != START_THREAD_WAIT_REMOVAL_TO_FINISH);
-      if (result == START_THREAD_TOO_MANY_DOWNLOADS) {
-        setState(STATE_QUEUED);
-      } else {
+      if (result == START_THREAD_SUCCEEDED || result == START_THREAD_WAIT_DOWNLOAD_CANCELLATION) {
         setState(STATE_DOWNLOADING);
+      } else {
+        setState(STATE_QUEUED);
       }
     }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
index 35518af38d..b32288fa3f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
@@ -20,6 +20,7 @@ import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.scheduler.Requirements;
+import com.google.android.exoplayer2.scheduler.Requirements.RequirementFlags;
 import com.google.android.exoplayer2.util.Assertions;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -76,25 +77,19 @@ public final class DownloadState {
   public static final int FAILURE_REASON_UNKNOWN = 1;
 
   /**
-   * Download stop flags. Possible flag values are {@link #STOP_FLAG_DOWNLOAD_MANAGER_NOT_READY} and
-   * {@link #STOP_FLAG_STOPPED}.
+   * Download stop flags. Possible flag values are {@link #STOP_FLAG_MANUAL} and {@link
+   * #STOP_FLAG_REQUIREMENTS_NOT_MET}.
    */
   @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef(
       flag = true,
-      value = {
-        STOP_FLAG_DOWNLOAD_MANAGER_NOT_READY,
-        STOP_FLAG_STOPPED,
-        STOP_FLAG_REQUIREMENTS_NOT_MET
-      })
+      value = {STOP_FLAG_MANUAL, STOP_FLAG_REQUIREMENTS_NOT_MET})
   public @interface StopFlags {}
-  /** Download can't be started as the manager isn't ready. */
-  public static final int STOP_FLAG_DOWNLOAD_MANAGER_NOT_READY = 1;
   /** Download is stopped by the application. */
-  public static final int STOP_FLAG_STOPPED = 1 << 1;
+  public static final int STOP_FLAG_MANUAL = 1;
   /** Download is stopped as the requirements are not met. */
-  public static final int STOP_FLAG_REQUIREMENTS_NOT_MET = 1 << 2;
+  public static final int STOP_FLAG_REQUIREMENTS_NOT_MET = 1 << 1;
 
   /** Returns the state string for the given state value. */
   public static String getStateString(@State int state) {
@@ -165,6 +160,8 @@ public final class DownloadState {
   @StopFlags public final int stopFlags;
   /** Not met requirements to download. */
   @Requirements.RequirementFlags public final int notMetRequirements;
+  /** If {@link #STOP_FLAG_MANUAL} is set then this field holds the manual stop reason. */
+  public final int manualStopReason;
 
   /**
    * Creates a {@link DownloadState} using a {@link DownloadAction}.
@@ -188,6 +185,7 @@ public final class DownloadState {
         FAILURE_REASON_NONE,
         /* stopFlags= */ 0,
         /* notMetRequirements= */ 0,
+        /* manualStopReason= */ 0,
         /* startTimeMs= */ currentTimeMs,
         /* updateTimeMs= */ currentTimeMs,
         action.keys.toArray(new StreamKey[0]),
@@ -205,18 +203,17 @@ public final class DownloadState {
       long totalBytes,
       @FailureReason int failureReason,
       @StopFlags int stopFlags,
-      @Requirements.RequirementFlags int notMetRequirements,
+      @RequirementFlags int notMetRequirements,
+      int manualStopReason,
       long startTimeMs,
       long updateTimeMs,
       StreamKey[] streamKeys,
       byte[] customMetadata) {
-    Assertions.checkState(
-        failureReason == FAILURE_REASON_NONE ? state != STATE_FAILED : state == STATE_FAILED);
+    Assertions.checkState((failureReason == FAILURE_REASON_NONE) == (state != STATE_FAILED));
     Assertions.checkState(stopFlags == 0 || (state != STATE_DOWNLOADING && state != STATE_QUEUED));
     Assertions.checkState(
-        (stopFlags & STOP_FLAG_REQUIREMENTS_NOT_MET) == 0
-            ? notMetRequirements == 0
-            : notMetRequirements != 0);
+        ((stopFlags & STOP_FLAG_REQUIREMENTS_NOT_MET) == 0) == (notMetRequirements == 0));
+    Assertions.checkState(((stopFlags & STOP_FLAG_MANUAL) != 0) || (manualStopReason == 0));
     this.id = id;
     this.type = type;
     this.uri = uri;
@@ -228,6 +225,7 @@ public final class DownloadState {
     this.failureReason = failureReason;
     this.stopFlags = stopFlags;
     this.notMetRequirements = notMetRequirements;
+    this.manualStopReason = manualStopReason;
     this.startTimeMs = startTimeMs;
     this.updateTimeMs = updateTimeMs;
     this.streamKeys = streamKeys;
@@ -256,6 +254,7 @@ public final class DownloadState {
         FAILURE_REASON_NONE,
         stopFlags,
         notMetRequirements,
+        manualStopReason,
         startTimeMs,
         updateTimeMs,
         mergeStreamKeys(this, action),
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
index 8789a7ef78..07254ef7f9 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
@@ -77,8 +77,10 @@ public class DefaultDownloadIndexTest {
             .setDownloadedBytes(200)
             .setTotalBytes(400)
             .setFailureReason(DownloadState.FAILURE_REASON_UNKNOWN)
-            .setStopFlags(DownloadState.STOP_FLAG_REQUIREMENTS_NOT_MET)
+            .setStopFlags(
+                DownloadState.STOP_FLAG_REQUIREMENTS_NOT_MET | DownloadState.STOP_FLAG_MANUAL)
             .setNotMetRequirements(0x87654321)
+            .setManualStopReason(0x12345678)
             .setStartTimeMs(10)
             .setUpdateTimeMs(20)
             .setStreamKeys(
@@ -206,5 +208,4 @@ public class DefaultDownloadIndexTest {
     assertThat(VersionTable.getVersion(writableDatabase, VersionTable.FEATURE_OFFLINE))
         .isEqualTo(DefaultDownloadIndex.TABLE_VERSION);
   }
-
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
index 84b51c5572..501042e69c 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
@@ -38,6 +38,7 @@ class DownloadStateBuilder {
   private int failureReason;
   private int stopFlags;
   private int notMetRequirements;
+  private int manualStopReason;
   private long startTimeMs;
   private long updateTimeMs;
   private StreamKey[] streamKeys;
@@ -140,6 +141,11 @@ class DownloadStateBuilder {
     return this;
   }
 
+  public DownloadStateBuilder setManualStopReason(int manualStopReason) {
+    this.manualStopReason = manualStopReason;
+    return this;
+  }
+
   public DownloadStateBuilder setStartTimeMs(long startTimeMs) {
     this.startTimeMs = startTimeMs;
     return this;
@@ -173,6 +179,7 @@ class DownloadStateBuilder {
         failureReason,
         stopFlags,
         notMetRequirements,
+        manualStopReason,
         startTimeMs,
         updateTimeMs,
         streamKeys,
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
index f6d008a0e3..982a6e8ef9 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
@@ -171,7 +171,7 @@ public class DownloadStateTest {
     DownloadStateBuilder downloadStateBuilder =
         new DownloadStateBuilder(downloadAction)
             .setState(DownloadState.STATE_STOPPED)
-            .setStopFlags(DownloadState.STOP_FLAG_STOPPED);
+            .setStopFlags(DownloadState.STOP_FLAG_MANUAL);
     DownloadState downloadState = downloadStateBuilder.build();
 
     DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);
@@ -185,7 +185,7 @@ public class DownloadStateTest {
     DownloadStateBuilder downloadStateBuilder =
         new DownloadStateBuilder(downloadAction)
             .setState(DownloadState.STATE_STOPPED)
-            .setStopFlags(DownloadState.STOP_FLAG_STOPPED);
+            .setStopFlags(DownloadState.STOP_FLAG_MANUAL);
     DownloadState downloadState = downloadStateBuilder.build();
 
     DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);

From a6c1dbe1563fc77cdc3b389ce3f1cca1cefa0aba Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 6 Feb 2019 15:17:00 +0000
Subject: [PATCH 485/832] Implement CacheFileMetadataIndex using SQLite

PiperOrigin-RevId: 232670039
---
 .../exoplayer2/database/VersionTable.java     |   8 +-
 .../cache/CacheFileMetadataIndex.java         | 126 ++++++++++++++++--
 .../upstream/cache/CachedContentIndex.java    |  11 +-
 .../upstream/cache/SimpleCache.java           |   9 +-
 .../exoplayer2/database/VersionTableTest.java |   7 +-
 5 files changed, 137 insertions(+), 24 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java b/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
index 5193d1836f..cdcca7a350 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
@@ -35,8 +35,10 @@ public final class VersionTable {
   public static final int VERSION_UNSET = -1;
   /** Version of tables used for offline functionality. */
   public static final int FEATURE_OFFLINE = 0;
-  /** Version of tables used for cache functionality. */
-  public static final int FEATURE_CACHE = 1;
+  /** Version of tables used for cache content metadata. */
+  public static final int FEATURE_CACHE_CONTENT_METADATA = 1;
+  /** Version of tables used for cache file metadata. */
+  public static final int FEATURE_CACHE_FILE_METADATA = 2;
 
   private static final String TABLE_NAME = DatabaseProvider.TABLE_PREFIX + "Versions";
 
@@ -54,7 +56,7 @@ public final class VersionTable {
 
   @Documented
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({FEATURE_OFFLINE, FEATURE_CACHE})
+  @IntDef({FEATURE_OFFLINE, FEATURE_CACHE_CONTENT_METADATA, FEATURE_CACHE_FILE_METADATA})
   private @interface Feature {}
 
   private VersionTable() {}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
index b25eb91810..96213b4bbc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
@@ -15,19 +15,72 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
-import java.util.Collections;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import com.google.android.exoplayer2.database.DatabaseProvider;
+import com.google.android.exoplayer2.database.VersionTable;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
 /** Maintains an index of cache file metadata. */
-/* package */ class CacheFileMetadataIndex {
+/* package */ final class CacheFileMetadataIndex {
+
+  private static final String TABLE_NAME = DatabaseProvider.TABLE_PREFIX + "CacheFileMetadata";
+  private static final int TABLE_VERSION = 1;
+
+  private static final String COLUMN_NAME = "name";
+  private static final String COLUMN_LENGTH = "length";
+  private static final String COLUMN_LAST_ACCESS_TIMESTAMP = "last_access_timestamp";
+
+  private static final int COLUMN_INDEX_NAME = 0;
+  private static final int COLUMN_INDEX_LENGTH = 1;
+  private static final int COLUMN_INDEX_LAST_ACCESS_TIMESTAMP = 2;
+
+  private static final String WHERE_NAME_EQUALS = COLUMN_INDEX_NAME + " = ?";
+
+  private static final String[] COLUMNS =
+      new String[] {
+        COLUMN_NAME, COLUMN_LENGTH, COLUMN_LAST_ACCESS_TIMESTAMP,
+      };
+
+  private static final String SQL_DROP_TABLE_IF_EXISTS = "DROP TABLE IF EXISTS " + TABLE_NAME;
+  private static final String SQL_CREATE_TABLE =
+      "CREATE TABLE "
+          + TABLE_NAME
+          + " ("
+          + COLUMN_NAME
+          + " TEXT PRIMARY KEY NOT NULL,"
+          + COLUMN_LENGTH
+          + " INTEGER NOT NULL,"
+          + COLUMN_LAST_ACCESS_TIMESTAMP
+          + " INTEGER NOT NULL)";
+
+  private final DatabaseProvider databaseProvider;
+
+  private boolean initialized;
+
+  public CacheFileMetadataIndex(DatabaseProvider databaseProvider) {
+    this.databaseProvider = databaseProvider;
+  }
 
   /**
    * Returns all file metadata keyed by file name. The returned map is mutable and may be modified
    * by the caller.
    */
   public Map<String, CacheFileMetadata> getAll() {
-    return Collections.emptyMap();
+    ensureInitialized();
+    try (Cursor cursor = getCursor()) {
+      Map<String, CacheFileMetadata> fileMetadata = new HashMap<>(cursor.getCount());
+      while (cursor.moveToNext()) {
+        String name = cursor.getString(COLUMN_INDEX_NAME);
+        long length = cursor.getLong(COLUMN_INDEX_LENGTH);
+        long lastAccessTimestamp = cursor.getLong(COLUMN_INDEX_LAST_ACCESS_TIMESTAMP);
+        fileMetadata.put(name, new CacheFileMetadata(length, lastAccessTimestamp));
+      }
+      return fileMetadata;
+    }
   }
 
   /**
@@ -36,11 +89,15 @@ import java.util.Set;
    * @param name The name of the file.
    * @param length The file length.
    * @param lastAccessTimestamp The file last access timestamp.
-   * @return Whether the index was updated successfully.
    */
-  public boolean set(String name, long length, long lastAccessTimestamp) {
-    // TODO.
-    return false;
+  public void set(String name, long length, long lastAccessTimestamp) {
+    ensureInitialized();
+    SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+    ContentValues values = new ContentValues();
+    values.put(COLUMN_NAME, name);
+    values.put(COLUMN_LENGTH, length);
+    values.put(COLUMN_LAST_ACCESS_TIMESTAMP, lastAccessTimestamp);
+    writableDatabase.replace(TABLE_NAME, /* nullColumnHack= */ null, values);
   }
 
   /**
@@ -49,7 +106,9 @@ import java.util.Set;
    * @param name The name of the file whose metadata is to be removed.
    */
   public void remove(String name) {
-    // TODO.
+    ensureInitialized();
+    SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+    writableDatabase.delete(TABLE_NAME, WHERE_NAME_EQUALS, new String[] {name});
   }
 
   /**
@@ -58,6 +117,55 @@ import java.util.Set;
    * @param names The names of the files whose metadata is to be removed.
    */
   public void removeAll(Set<String> names) {
-    // TODO.
+    ensureInitialized();
+    SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+    writableDatabase.beginTransaction();
+    try {
+      for (String name : names) {
+        writableDatabase.delete(TABLE_NAME, WHERE_NAME_EQUALS, new String[] {name});
+      }
+      writableDatabase.setTransactionSuccessful();
+    } finally {
+      writableDatabase.endTransaction();
+    }
+  }
+
+  private void ensureInitialized() {
+    if (initialized) {
+      return;
+    }
+    SQLiteDatabase readableDatabase = databaseProvider.getReadableDatabase();
+    int version =
+        VersionTable.getVersion(readableDatabase, VersionTable.FEATURE_CACHE_FILE_METADATA);
+    if (version == VersionTable.VERSION_UNSET || version > TABLE_VERSION) {
+      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+      writableDatabase.beginTransaction();
+      try {
+        VersionTable.setVersion(
+            writableDatabase, VersionTable.FEATURE_CACHE_FILE_METADATA, TABLE_VERSION);
+        writableDatabase.execSQL(SQL_DROP_TABLE_IF_EXISTS);
+        writableDatabase.execSQL(SQL_CREATE_TABLE);
+        writableDatabase.setTransactionSuccessful();
+      } finally {
+        writableDatabase.endTransaction();
+      }
+    } else if (version < TABLE_VERSION) {
+      // There is no previous version currently.
+      throw new IllegalStateException();
+    }
+    initialized = true;
+  }
+
+  private Cursor getCursor() {
+    return databaseProvider
+        .getReadableDatabase()
+        .query(
+            TABLE_NAME,
+            COLUMNS,
+            /* selection */ null,
+            /* selectionArgs= */ null,
+            /* groupBy= */ null,
+            /* having= */ null,
+            /* orderBy= */ null);
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
index 0888290e1b..b22645c9d2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
@@ -678,7 +678,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   //    the entire table. Currently this implementation only encrypts new and updated entries.
   private static final class SQLiteStorage implements Storage {
 
-    private static final String TABLE_NAME = DatabaseProvider.TABLE_PREFIX + "Cache";
+    private static final String TABLE_NAME = DatabaseProvider.TABLE_PREFIX + "CacheContentMetadata";
     private static final int TABLE_VERSION = 1;
 
     private static final String COLUMN_ID = "id";
@@ -736,7 +736,8 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     public boolean exists() {
       return file.exists()
           && VersionTable.getVersion(
-                  databaseProvider.getReadableDatabase(), VersionTable.FEATURE_CACHE)
+                  databaseProvider.getReadableDatabase(),
+                  VersionTable.FEATURE_CACHE_CONTENT_METADATA)
               != VersionTable.VERSION_UNSET;
     }
 
@@ -755,7 +756,8 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
       try {
         int version =
             VersionTable.getVersion(
-                databaseProvider.getReadableDatabase(), VersionTable.FEATURE_CACHE);
+                databaseProvider.getReadableDatabase(),
+                VersionTable.FEATURE_CACHE_CONTENT_METADATA);
         if (version == VersionTable.VERSION_UNSET || version > TABLE_VERSION) {
           SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
           writableDatabase.beginTransaction();
@@ -870,7 +872,8 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     }
 
     private void initializeTable(SQLiteDatabase writableDatabase) {
-      VersionTable.setVersion(writableDatabase, VersionTable.FEATURE_CACHE, TABLE_VERSION);
+      VersionTable.setVersion(
+          writableDatabase, VersionTable.FEATURE_CACHE_CONTENT_METADATA, TABLE_VERSION);
       writableDatabase.execSQL(SQL_DROP_TABLE_IF_EXISTS);
       writableDatabase.execSQL(SQL_CREATE_TABLE);
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index dcdedfc32d..f66471ba1f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -253,13 +253,12 @@ public final class SimpleCache implements Cache {
       String fileName = span.file.getName();
       long length = span.length;
       long lastAccessTimestamp = System.currentTimeMillis();
-      // Updating the file itself to incorporate the new last access timestamp is much slower than
-      // updating the file index. Hence we only update the file if we don't have a file index, or if
-      // updating the file index failed.
-      boolean updateFile;
+      boolean updateFile = false;
       if (fileIndex != null) {
-        updateFile = !fileIndex.set(fileName, length, lastAccessTimestamp);
+        fileIndex.set(fileName, length, lastAccessTimestamp);
       } else {
+        // Updating the file itself to incorporate the new last access timestamp is much slower than
+        // updating the file index. Hence we only update the file if we don't have a file index.
         updateFile = true;
       }
       SimpleCacheSpan newSpan =
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java b/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java
index a607cc01db..44961e8681 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.database;
 
-import static com.google.android.exoplayer2.database.VersionTable.FEATURE_CACHE;
+import static com.google.android.exoplayer2.database.VersionTable.FEATURE_CACHE_CONTENT_METADATA;
 import static com.google.android.exoplayer2.database.VersionTable.FEATURE_OFFLINE;
 import static com.google.common.truth.Truth.assertThat;
 
@@ -61,8 +61,9 @@ public class VersionTableTest {
     VersionTable.setVersion(writableDatabase, FEATURE_OFFLINE, 10);
     assertThat(VersionTable.getVersion(readableDatabase, FEATURE_OFFLINE)).isEqualTo(10);
 
-    VersionTable.setVersion(writableDatabase, FEATURE_CACHE, 5);
-    assertThat(VersionTable.getVersion(readableDatabase, FEATURE_CACHE)).isEqualTo(5);
+    VersionTable.setVersion(writableDatabase, FEATURE_CACHE_CONTENT_METADATA, 5);
+    assertThat(VersionTable.getVersion(readableDatabase, FEATURE_CACHE_CONTENT_METADATA))
+        .isEqualTo(5);
     assertThat(VersionTable.getVersion(readableDatabase, FEATURE_OFFLINE)).isEqualTo(10);
   }
 

From c905891d108d34ee0c914c298de08c89141af053 Mon Sep 17 00:00:00 2001
From: Arnold Szabo <szaboaarnold@gmail.com>
Date: Sun, 10 Feb 2019 21:43:34 +0200
Subject: [PATCH 486/832] Taking into consideration the media's duration when
 updating the time bar

---
 .../android/exoplayer2/ui/DefaultTimeBar.java   | 12 ++++++++++++
 .../exoplayer2/ui/PlayerControlView.java        | 17 ++++++++++++++---
 .../google/android/exoplayer2/ui/TimeBar.java   |  7 +++++++
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
index 0c3d39a13a..d203bd2c39 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
@@ -219,6 +219,8 @@ public class DefaultTimeBar extends View implements TimeBar {
   private @Nullable long[] adGroupTimesMs;
   private @Nullable boolean[] playedAdGroups;
 
+  private int densityDpi;
+
   /** Creates a new time bar. */
   // Suppress warnings due to usage of View methods in the constructor.
   @SuppressWarnings("nullness:method.invocation.invalid")
@@ -242,6 +244,7 @@ public class DefaultTimeBar extends View implements TimeBar {
     // Calculate the dimensions and paints for drawn elements.
     Resources res = context.getResources();
     DisplayMetrics displayMetrics = res.getDisplayMetrics();
+    densityDpi = displayMetrics.densityDpi;
     fineScrubYThreshold = dpToPx(displayMetrics, FINE_SCRUB_Y_THRESHOLD_DP);
     int defaultBarHeight = dpToPx(displayMetrics, DEFAULT_BAR_HEIGHT_DP);
     int defaultTouchTargetHeight = dpToPx(displayMetrics, DEFAULT_TOUCH_TARGET_HEIGHT_DP);
@@ -447,6 +450,11 @@ public class DefaultTimeBar extends View implements TimeBar {
     update();
   }
 
+  @Override
+  public int getTimeBarWidth() {
+    return pxToDp(densityDpi, getWidth());
+  }
+
   // View methods.
 
   @Override
@@ -835,4 +843,8 @@ public class DefaultTimeBar extends View implements TimeBar {
   private static int dpToPx(DisplayMetrics displayMetrics, int dps) {
     return (int) (dps * displayMetrics.density + 0.5f);
   }
+
+  private static int pxToDp(int densityDpi, int px) {
+    return (int) (px / ((float) densityDpi / DisplayMetrics.DENSITY_DEFAULT));
+  }
 }
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
index 7ac813211a..63ea8c1a0a 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
@@ -196,6 +196,9 @@ public class PlayerControlView extends FrameLayout {
   public static final int MAX_WINDOWS_FOR_MULTI_WINDOW_TIME_BAR = 100;
 
   private static final long MAX_POSITION_FOR_SEEK_TO_PREVIOUS = 3000;
+  private static final int DEFAULT_UPDATE_DP = 5;
+  private static final long MIN_UPDATE_FREQUENCY_MS = 50;
+  private static final long MAX_UPDATE_FREQUENCY_MS = 1000;
 
   private final ComponentListener componentListener;
   private final View previousButton;
@@ -835,13 +838,21 @@ public class PlayerControlView extends FrameLayout {
         if (playbackSpeed <= 0.1f) {
           delayMs = 1000;
         } else if (playbackSpeed <= 5f) {
-          long mediaTimeUpdatePeriodMs = 1000 / Math.max(1, Math.round(1 / playbackSpeed));
+          /*long mediaTimeUpdatePeriodMs = 1000 / Math.max(1, Math.round(1 / playbackSpeed));
           long mediaTimeDelayMs = mediaTimeUpdatePeriodMs - (position % mediaTimeUpdatePeriodMs);
           if (mediaTimeDelayMs < (mediaTimeUpdatePeriodMs / 5)) {
             mediaTimeDelayMs += mediaTimeUpdatePeriodMs;
+          }*/
+          int timeBarWidth = timeBar.getTimeBarWidth();
+          int numberOfUpdates = timeBarWidth / DEFAULT_UPDATE_DP;
+          long mediaTimeDelayMs = duration / numberOfUpdates;
+
+          if (mediaTimeDelayMs < MIN_UPDATE_FREQUENCY_MS) {
+            mediaTimeDelayMs = MIN_UPDATE_FREQUENCY_MS;
+          } else if (mediaTimeDelayMs >= MAX_UPDATE_FREQUENCY_MS) {
+            mediaTimeDelayMs = MAX_UPDATE_FREQUENCY_MS;
           }
-          delayMs =
-              playbackSpeed == 1 ? mediaTimeDelayMs : (long) (mediaTimeDelayMs / playbackSpeed);
+          delayMs = playbackSpeed == 1 ? mediaTimeDelayMs : (long) (mediaTimeDelayMs / playbackSpeed);
         } else {
           delayMs = 200;
         }
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TimeBar.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TimeBar.java
index 866921c2f9..d63a8e3054 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TimeBar.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TimeBar.java
@@ -97,6 +97,13 @@ public interface TimeBar {
   void setAdGroupTimesMs(@Nullable long[] adGroupTimesMs, @Nullable boolean[] playedAdGroups,
       int adGroupCount);
 
+    /**
+     * Get width of time bar in dps
+     *
+     * @return Width of time bar in dps
+     */
+    int getTimeBarWidth();
+
   /**
    * Listener for scrubbing events.
    */

From 62e6455dce87c92754ba939010d6c1b40a95218f Mon Sep 17 00:00:00 2001
From: Arnold Szabo <szaboaarnold@gmail.com>
Date: Tue, 12 Feb 2019 23:02:34 +0200
Subject: [PATCH 487/832] Taking consideration the current position before
 calculating the delay before the next update

---
 .../exoplayer2/ui/PlayerControlView.java      | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
index 63ea8c1a0a..7182871083 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
@@ -24,6 +24,7 @@ import android.os.Looper;
 import android.os.SystemClock;
 import android.support.annotation.Nullable;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -838,20 +839,32 @@ public class PlayerControlView extends FrameLayout {
         if (playbackSpeed <= 0.1f) {
           delayMs = 1000;
         } else if (playbackSpeed <= 5f) {
-          /*long mediaTimeUpdatePeriodMs = 1000 / Math.max(1, Math.round(1 / playbackSpeed));
+
+          int timeBarWidth = timeBar.getTimeBarWidth();
+          // Calculate how many updates needs to be done with DEFAULT_UPDATE_DP
+          // to fill up the time bar
+          int numberOfUpdates = timeBarWidth / DEFAULT_UPDATE_DP;
+
+          // Calculate the designated update interval, taking duration into consideration as well
+          long mediaTimeUpdatePeriodMs = duration / numberOfUpdates;
+
+          // Limit the designated update interval, to avoid too frequent / infrequent updates
+          if (mediaTimeUpdatePeriodMs < MIN_UPDATE_FREQUENCY_MS) {
+            mediaTimeUpdatePeriodMs = MIN_UPDATE_FREQUENCY_MS;
+          } else if (mediaTimeUpdatePeriodMs >= MAX_UPDATE_FREQUENCY_MS) {
+            mediaTimeUpdatePeriodMs = MAX_UPDATE_FREQUENCY_MS;
+          }
+
+          // Calculate the delay needed from the current position until the next update is due
           long mediaTimeDelayMs = mediaTimeUpdatePeriodMs - (position % mediaTimeUpdatePeriodMs);
+
+          // If the delay would be too small, then skip the next update
           if (mediaTimeDelayMs < (mediaTimeUpdatePeriodMs / 5)) {
             mediaTimeDelayMs += mediaTimeUpdatePeriodMs;
-          }*/
-          int timeBarWidth = timeBar.getTimeBarWidth();
-          int numberOfUpdates = timeBarWidth / DEFAULT_UPDATE_DP;
-          long mediaTimeDelayMs = duration / numberOfUpdates;
-
-          if (mediaTimeDelayMs < MIN_UPDATE_FREQUENCY_MS) {
-            mediaTimeDelayMs = MIN_UPDATE_FREQUENCY_MS;
-          } else if (mediaTimeDelayMs >= MAX_UPDATE_FREQUENCY_MS) {
-            mediaTimeDelayMs = MAX_UPDATE_FREQUENCY_MS;
           }
+
+          // Calculate the delay until the next update (in real time), taking
+          // playbackSpeed into consideration
           delayMs = playbackSpeed == 1 ? mediaTimeDelayMs : (long) (mediaTimeDelayMs / playbackSpeed);
         } else {
           delayMs = 200;

From ecfce46296978b5c9f9daba718f773d597568e5a Mon Sep 17 00:00:00 2001
From: Arnold Szabo <szaboaarnold@gmail.com>
Date: Wed, 13 Feb 2019 19:31:11 +0200
Subject: [PATCH 488/832] Changes according to the code review

---
 .../android/exoplayer2/ui/DefaultTimeBar.java | 13 +++++-----
 .../exoplayer2/ui/PlayerControlView.java      | 26 +++++++++----------
 .../google/android/exoplayer2/ui/TimeBar.java |  2 +-
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
index d203bd2c39..b103b5b7f2 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
@@ -205,6 +205,7 @@ public class DefaultTimeBar extends View implements TimeBar {
   private final CopyOnWriteArraySet<OnScrubListener> listeners;
   private final int[] locationOnScreen;
   private final Point touchPosition;
+  private final float density;
 
   private int keyCountIncrement;
   private long keyTimeIncrement;
@@ -219,8 +220,6 @@ public class DefaultTimeBar extends View implements TimeBar {
   private @Nullable long[] adGroupTimesMs;
   private @Nullable boolean[] playedAdGroups;
 
-  private int densityDpi;
-
   /** Creates a new time bar. */
   // Suppress warnings due to usage of View methods in the constructor.
   @SuppressWarnings("nullness:method.invocation.invalid")
@@ -244,7 +243,7 @@ public class DefaultTimeBar extends View implements TimeBar {
     // Calculate the dimensions and paints for drawn elements.
     Resources res = context.getResources();
     DisplayMetrics displayMetrics = res.getDisplayMetrics();
-    densityDpi = displayMetrics.densityDpi;
+    density = displayMetrics.density;
     fineScrubYThreshold = dpToPx(displayMetrics, FINE_SCRUB_Y_THRESHOLD_DP);
     int defaultBarHeight = dpToPx(displayMetrics, DEFAULT_BAR_HEIGHT_DP);
     int defaultTouchTargetHeight = dpToPx(displayMetrics, DEFAULT_TOUCH_TARGET_HEIGHT_DP);
@@ -451,8 +450,8 @@ public class DefaultTimeBar extends View implements TimeBar {
   }
 
   @Override
-  public int getTimeBarWidth() {
-    return pxToDp(densityDpi, getWidth());
+  public int getTimeBarWidthDp() {
+    return pxToDp(density, getWidth());
   }
 
   // View methods.
@@ -844,7 +843,7 @@ public class DefaultTimeBar extends View implements TimeBar {
     return (int) (dps * displayMetrics.density + 0.5f);
   }
 
-  private static int pxToDp(int densityDpi, int px) {
-    return (int) (px / ((float) densityDpi / DisplayMetrics.DENSITY_DEFAULT));
+  private static int pxToDp(float density, int px) {
+    return (int) (px / density);
   }
 }
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
index 7182871083..d00cc46de4 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
@@ -836,11 +836,11 @@ public class PlayerControlView extends FrameLayout {
       long delayMs;
       if (player.getPlayWhenReady() && playbackState == Player.STATE_READY) {
         float playbackSpeed = player.getPlaybackParameters().speed;
-        if (playbackSpeed <= 0.1f) {
-          delayMs = 1000;
-        } else if (playbackSpeed <= 5f) {
+        int timeBarWidth = timeBar.getTimeBarWidthDp();
 
-          int timeBarWidth = timeBar.getTimeBarWidth();
+        if (timeBarWidth == 0 || duration == 0) {
+          delayMs = MAX_UPDATE_FREQUENCY_MS;
+        } else {
           // Calculate how many updates needs to be done with DEFAULT_UPDATE_DP
           // to fill up the time bar
           int numberOfUpdates = timeBarWidth / DEFAULT_UPDATE_DP;
@@ -848,13 +848,6 @@ public class PlayerControlView extends FrameLayout {
           // Calculate the designated update interval, taking duration into consideration as well
           long mediaTimeUpdatePeriodMs = duration / numberOfUpdates;
 
-          // Limit the designated update interval, to avoid too frequent / infrequent updates
-          if (mediaTimeUpdatePeriodMs < MIN_UPDATE_FREQUENCY_MS) {
-            mediaTimeUpdatePeriodMs = MIN_UPDATE_FREQUENCY_MS;
-          } else if (mediaTimeUpdatePeriodMs >= MAX_UPDATE_FREQUENCY_MS) {
-            mediaTimeUpdatePeriodMs = MAX_UPDATE_FREQUENCY_MS;
-          }
-
           // Calculate the delay needed from the current position until the next update is due
           long mediaTimeDelayMs = mediaTimeUpdatePeriodMs - (position % mediaTimeUpdatePeriodMs);
 
@@ -866,11 +859,16 @@ public class PlayerControlView extends FrameLayout {
           // Calculate the delay until the next update (in real time), taking
           // playbackSpeed into consideration
           delayMs = playbackSpeed == 1 ? mediaTimeDelayMs : (long) (mediaTimeDelayMs / playbackSpeed);
-        } else {
-          delayMs = 200;
+
+          // Limit the delay if needed, to avoid too frequent / infrequent updates
+          if (delayMs < MIN_UPDATE_FREQUENCY_MS) {
+            delayMs = MIN_UPDATE_FREQUENCY_MS;
+          } else if (delayMs >= MAX_UPDATE_FREQUENCY_MS) {
+            delayMs = MAX_UPDATE_FREQUENCY_MS;
+          }
         }
       } else {
-        delayMs = 1000;
+        delayMs = MAX_UPDATE_FREQUENCY_MS;
       }
       postDelayed(updateProgressAction, delayMs);
     }
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TimeBar.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TimeBar.java
index d63a8e3054..d1af5cb1aa 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TimeBar.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TimeBar.java
@@ -102,7 +102,7 @@ public interface TimeBar {
      *
      * @return Width of time bar in dps
      */
-    int getTimeBarWidth();
+    int getTimeBarWidthDp();
 
   /**
    * Listener for scrubbing events.

From eaf0d40886db5cb15f0ce29882f63619cc7f5475 Mon Sep 17 00:00:00 2001
From: Arnold Szabo <szaboaarnold@gmail.com>
Date: Sat, 16 Feb 2019 12:17:09 +0200
Subject: [PATCH 489/832] Extract time bar delay calculations to a static
 method

---
 .../exoplayer2/ui/PlayerControlView.java      | 83 ++++++++++++-------
 1 file changed, 53 insertions(+), 30 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
index d00cc46de4..945b5ed30a 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
@@ -837,36 +837,7 @@ public class PlayerControlView extends FrameLayout {
       if (player.getPlayWhenReady() && playbackState == Player.STATE_READY) {
         float playbackSpeed = player.getPlaybackParameters().speed;
         int timeBarWidth = timeBar.getTimeBarWidthDp();
-
-        if (timeBarWidth == 0 || duration == 0) {
-          delayMs = MAX_UPDATE_FREQUENCY_MS;
-        } else {
-          // Calculate how many updates needs to be done with DEFAULT_UPDATE_DP
-          // to fill up the time bar
-          int numberOfUpdates = timeBarWidth / DEFAULT_UPDATE_DP;
-
-          // Calculate the designated update interval, taking duration into consideration as well
-          long mediaTimeUpdatePeriodMs = duration / numberOfUpdates;
-
-          // Calculate the delay needed from the current position until the next update is due
-          long mediaTimeDelayMs = mediaTimeUpdatePeriodMs - (position % mediaTimeUpdatePeriodMs);
-
-          // If the delay would be too small, then skip the next update
-          if (mediaTimeDelayMs < (mediaTimeUpdatePeriodMs / 5)) {
-            mediaTimeDelayMs += mediaTimeUpdatePeriodMs;
-          }
-
-          // Calculate the delay until the next update (in real time), taking
-          // playbackSpeed into consideration
-          delayMs = playbackSpeed == 1 ? mediaTimeDelayMs : (long) (mediaTimeDelayMs / playbackSpeed);
-
-          // Limit the delay if needed, to avoid too frequent / infrequent updates
-          if (delayMs < MIN_UPDATE_FREQUENCY_MS) {
-            delayMs = MIN_UPDATE_FREQUENCY_MS;
-          } else if (delayMs >= MAX_UPDATE_FREQUENCY_MS) {
-            delayMs = MAX_UPDATE_FREQUENCY_MS;
-          }
-        }
+        delayMs = getTimeBarUpdateDelayMs(timeBarWidth, position, duration, playbackSpeed);
       } else {
         delayMs = MAX_UPDATE_FREQUENCY_MS;
       }
@@ -1097,6 +1068,58 @@ public class PlayerControlView extends FrameLayout {
     return true;
   }
 
+  /**
+   * Calculates the update delay of time bar in millis
+   *
+   * @param timeBarWidth  The width of time bar in dp
+   * @param position      The current position in millis
+   * @param duration      The duration of media in millis
+   * @param playbackSpeed The playback speed
+   * @return Update delay of time bar in millis
+   */
+  private static long getTimeBarUpdateDelayMs(int timeBarWidth, long position,
+                                              long duration, float playbackSpeed) {
+    if (timeBarWidth == 0 || duration == 0 || playbackSpeed == 0) {
+      return MAX_UPDATE_FREQUENCY_MS;
+    }
+
+    // Calculate how many updates needs to be done with DEFAULT_UPDATE_DP
+    // to fill up the time bar
+    int numberOfUpdates = timeBarWidth / DEFAULT_UPDATE_DP;
+
+    if (numberOfUpdates <= 0) {
+      return MAX_UPDATE_FREQUENCY_MS;
+    }
+
+    // Calculate the designated update interval, taking duration into consideration as well
+    long mediaTimeUpdatePeriodMs = duration / numberOfUpdates;
+
+    if (mediaTimeUpdatePeriodMs <= 0) {
+      return MAX_UPDATE_FREQUENCY_MS;
+    }
+
+    // Calculate the delay needed from the current position until the next update is due
+    long mediaTimeDelayMs = mediaTimeUpdatePeriodMs - (position % mediaTimeUpdatePeriodMs);
+
+    // If the delay would be too small, then skip the next update
+    if (mediaTimeDelayMs < (mediaTimeUpdatePeriodMs / 5)) {
+      mediaTimeDelayMs += mediaTimeUpdatePeriodMs;
+    }
+
+    // Calculate the delay until the next update (in real time), taking
+    // playbackSpeed into consideration
+    long delayMs = playbackSpeed == 1 ? mediaTimeDelayMs : (long) (mediaTimeDelayMs / playbackSpeed);
+
+    // Limit the delay if needed, to avoid too frequent / infrequent updates
+    if (delayMs < MIN_UPDATE_FREQUENCY_MS) {
+      delayMs = MIN_UPDATE_FREQUENCY_MS;
+    } else if (delayMs >= MAX_UPDATE_FREQUENCY_MS) {
+      delayMs = MAX_UPDATE_FREQUENCY_MS;
+    }
+
+    return delayMs;
+  }
+
   private final class ComponentListener
       implements Player.EventListener, TimeBar.OnScrubListener, OnClickListener {
 

From f898bddbfc90276fbf4d4d0ff0459b7e76501e69 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 6 Feb 2019 15:59:33 +0000
Subject: [PATCH 490/832] Do not prepare MediaPeriods in a loop.

They may prepare immediately and let pendingMediaPeriods become empty before
all other periods are even created.

PiperOrigin-RevId: 232675283
---
 .../com/google/android/exoplayer2/offline/DownloadHelper.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index d12013673f..f88371f36d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -834,6 +834,8 @@ public final class DownloadHelper {
                 /* startPositionUs= */ 0);
         mediaPeriods[i] = mediaPeriod;
         pendingMediaPeriods.add(mediaPeriod);
+      }
+      for (MediaPeriod mediaPeriod : mediaPeriods) {
         mediaPeriod.prepare(/* callback= */ this, /* positionUs= */ 0);
       }
     }

From 858415e3b1bd0b9d533b78009cc7d07c3d6df6c3 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Wed, 6 Feb 2019 16:04:58 +0000
Subject: [PATCH 491/832] Update test names for attach -> start renaming

PiperOrigin-RevId: 232676346
---
 .../android/exoplayer2/ext/ima/ImaAdsLoaderTest.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java
index 0b097f26f0..0253e7db13 100644
--- a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java
+++ b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java
@@ -109,7 +109,7 @@ public class ImaAdsLoaderTest {
   }
 
   @Test
-  public void testAttachPlayer_setsAdUiViewGroup() {
+  public void testStart_setsAdUiViewGroup() {
     setupPlayback(CONTENT_TIMELINE, PREROLL_ADS_DURATIONS_US, PREROLL_CUE_POINTS_SECONDS);
     imaAdsLoader.start(adsLoaderListener, adUiViewGroup);
 
@@ -117,7 +117,7 @@ public class ImaAdsLoaderTest {
   }
 
   @Test
-  public void testAttachPlayer_updatesAdPlaybackState() {
+  public void testStart_updatesAdPlaybackState() {
     setupPlayback(CONTENT_TIMELINE, PREROLL_ADS_DURATIONS_US, PREROLL_CUE_POINTS_SECONDS);
     imaAdsLoader.start(adsLoaderListener, adUiViewGroup);
 
@@ -128,14 +128,14 @@ public class ImaAdsLoaderTest {
   }
 
   @Test
-  public void testAttachAfterRelease() {
+  public void testStartAfterRelease() {
     setupPlayback(CONTENT_TIMELINE, PREROLL_ADS_DURATIONS_US, PREROLL_CUE_POINTS_SECONDS);
     imaAdsLoader.release();
     imaAdsLoader.start(adsLoaderListener, adUiViewGroup);
   }
 
   @Test
-  public void testAttachAndCallbacksAfterRelease() {
+  public void testStartAndCallbacksAfterRelease() {
     setupPlayback(CONTENT_TIMELINE, PREROLL_ADS_DURATIONS_US, PREROLL_CUE_POINTS_SECONDS);
     imaAdsLoader.release();
     imaAdsLoader.start(adsLoaderListener, adUiViewGroup);

From a7324061b3db3fd9b2c6e3a10fdc2f8106d6109d Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 7 Feb 2019 10:21:13 +0000
Subject: [PATCH 492/832] Fix proguard configuration

PiperOrigin-RevId: 232835218
---
 library/core/proguard-rules.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/library/core/proguard-rules.txt b/library/core/proguard-rules.txt
index d18c34b86d..07ba438182 100644
--- a/library/core/proguard-rules.txt
+++ b/library/core/proguard-rules.txt
@@ -33,32 +33,32 @@
 # Constructors accessed via reflection in DefaultDownloaderFactory
 -dontnote com.google.android.exoplayer2.source.dash.offline.DashDownloader
 -keepclassmembers class com.google.android.exoplayer2.source.dash.offline.DashDownloader {
-  <init>(android.net.Uri, java.util.List, com.google.android.exoplayer2.offlineDownloaderConstructorHelper);
+  <init>(android.net.Uri, java.util.List, com.google.android.exoplayer2.offline.DownloaderConstructorHelper);
 }
 -dontnote com.google.android.exoplayer2.source.hls.offline.HlsDownloader
 -keepclassmembers class com.google.android.exoplayer2.source.hls.offline.HlsDownloader {
-  <init>(android.net.Uri, java.util.List, com.google.android.exoplayer2.offlineDownloaderConstructorHelper);
+  <init>(android.net.Uri, java.util.List, com.google.android.exoplayer2.offline.DownloaderConstructorHelper);
 }
 -dontnote com.google.android.exoplayer2.source.smoothstreaming.offline.SsDownloader
 -keepclassmembers class com.google.android.exoplayer2.source.smoothstreaming.offline.SsDownloader {
-  <init>(android.net.Uri, java.util.List, com.google.android.exoplayer2.offlineDownloaderConstructorHelper);
+  <init>(android.net.Uri, java.util.List, com.google.android.exoplayer2.offline.DownloaderConstructorHelper);
 }
 
 # Constructors accessed via reflection in DownloadHelper
 -dontnote com.google.android.exoplayer2.source.dash.DashMediaSource$Factory
 -keepclassmembers class com.google.android.exoplayer2.source.dash.DashMediaSource$Factory {
   <init>(com.google.android.exoplayer2.upstream.DataSource$Factory);
-  DashMediaSource createMediaSource(android.net.Uri);
+  com.google.android.exoplayer2.source.dash.DashMediaSource createMediaSource(android.net.Uri);
 }
 -dontnote com.google.android.exoplayer2.source.hls.HlsMediaSource$Factory
 -keepclassmembers class com.google.android.exoplayer2.source.hls.HlsMediaSource$Factory {
   <init>(com.google.android.exoplayer2.upstream.DataSource$Factory);
-  HlsMediaSource createMediaSource(android.net.Uri);
+  com.google.android.exoplayer2.source.hls.HlsMediaSource createMediaSource(android.net.Uri);
 }
 -dontnote com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource$Factory
 -keepclassmembers class com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource$Factory {
   <init>(com.google.android.exoplayer2.upstream.DataSource$Factory);
-  SsMediaSource createMediaSource(android.net.Uri);
+  com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource createMediaSource(android.net.Uri);
 }
 
 # Don't warn about checkerframework

From dd99fdcb8256c1bcdfee5611f2e9a128f89ffd1f Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 7 Feb 2019 14:38:49 +0000
Subject: [PATCH 493/832] Changes for SQLite databases on internal storage

- Remove ability to encrypt content index for SQLite storage
- Remove hack for specifying arbitrary database location

PiperOrigin-RevId: 232863763
---
 .../database/ExoDatabaseProvider.java         |  59 +------
 .../exoplayer2/database/VersionTable.java     |  31 +++-
 .../offline/DefaultDownloadIndex.java         |   8 +-
 .../upstream/cache/CachedContentIndex.java    | 151 +++++-------------
 .../upstream/cache/SimpleCache.java           |   1 -
 .../exoplayer2/database/VersionTableTest.java |  10 ++
 6 files changed, 75 insertions(+), 185 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java b/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
index ece8e57ae7..32dda5965c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
@@ -16,20 +16,16 @@
 package com.google.android.exoplayer2.database;
 
 import android.content.Context;
-import android.content.ContextWrapper;
 import android.database.Cursor;
-import android.database.DatabaseErrorHandler;
 import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
-import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.util.Log;
-import java.io.File;
 
 /**
  * An {@link SQLiteOpenHelper} that provides instances of a standalone ExoPlayer database.
  *
- * <p>Suitable for use by applications that do not already have their own database, or which would
+ * <p>Suitable for use by applications that do not already have their own database, or that would
  * prefer to keep ExoPlayer tables isolated in their own database. Other applications should prefer
  * to use {@link DefaultDatabaseProvider} with their own {@link SQLiteOpenHelper}.
  */
@@ -51,15 +47,6 @@ public final class ExoDatabaseProvider extends SQLiteOpenHelper implements Datab
     super(context.getApplicationContext(), DATABASE_NAME, /* factory= */ null, VERSION);
   }
 
-  /**
-   * Provides instances of the database located at the specified file.
-   *
-   * @param file The database file.
-   */
-  public ExoDatabaseProvider(File file) {
-    super(new DatabaseFileProvidingContext(file), file.getName(), /* factory= */ null, VERSION);
-  }
-
   @Override
   public void onCreate(SQLiteDatabase db) {
     // Features create their own tables.
@@ -105,48 +92,4 @@ public final class ExoDatabaseProvider extends SQLiteOpenHelper implements Datab
       }
     }
   }
-
-  // TODO: This is fragile. Stop using it if/when SQLiteOpenHelper can be instantiated without a
-  // context [Internal ref: b/123351819], or by injecting a Context into all components that need
-  // to instantiate an ExoDatabaseProvider.
-  /** A {@link Context} that implements methods called by {@link SQLiteOpenHelper}. */
-  private static class DatabaseFileProvidingContext extends ContextWrapper {
-
-    private final File file;
-
-    @SuppressWarnings("nullness:argument.type.incompatible")
-    public DatabaseFileProvidingContext(File file) {
-      super(/* base= */ null);
-      this.file = file;
-    }
-
-    @Override
-    public File getDatabasePath(String name) {
-      return file;
-    }
-
-    @Override
-    public SQLiteDatabase openOrCreateDatabase(
-        String name, int mode, SQLiteDatabase.CursorFactory factory) {
-      return openOrCreateDatabase(name, mode, factory, /* errorHandler= */ null);
-    }
-
-    @Override
-    @SuppressWarnings("nullness:argument.type.incompatible")
-    public SQLiteDatabase openOrCreateDatabase(
-        String name,
-        int mode,
-        SQLiteDatabase.CursorFactory factory,
-        @Nullable DatabaseErrorHandler errorHandler) {
-      File databasePath = getDatabasePath(name);
-      int flags = SQLiteDatabase.CREATE_IF_NECESSARY;
-      if ((mode & MODE_ENABLE_WRITE_AHEAD_LOGGING) != 0) {
-        flags |= SQLiteDatabase.ENABLE_WRITE_AHEAD_LOGGING;
-      }
-      if ((mode & MODE_NO_LOCALIZED_COLLATORS) != 0) {
-        flags |= SQLiteDatabase.NO_LOCALIZED_COLLATORS;
-      }
-      return SQLiteDatabase.openDatabase(databasePath.getPath(), factory, flags, errorHandler);
-    }
-  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java b/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
index cdcca7a350..471b7706ca 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
@@ -45,6 +45,8 @@ public final class VersionTable {
   private static final String COLUMN_FEATURE = "feature";
   private static final String COLUMN_VERSION = "version";
 
+  private static final String WHERE_FEATURE_EQUALS = COLUMN_FEATURE + " = ?";
+
   private static final String SQL_CREATE_TABLE_IF_NOT_EXISTS =
       "CREATE TABLE IF NOT EXISTS "
           + TABLE_NAME
@@ -62,7 +64,7 @@ public final class VersionTable {
   private VersionTable() {}
 
   /**
-   * Sets the version of tables belonging to the specified feature.
+   * Sets the version of the specified feature.
    *
    * @param writableDatabase The database to update.
    * @param feature The feature.
@@ -78,8 +80,21 @@ public final class VersionTable {
   }
 
   /**
-   * Returns the version of tables belonging to the specified feature, or {@link #VERSION_UNSET} if
-   * no version information is available.
+   * Removes the version of the specified feature.
+   *
+   * @param writableDatabase The database to update.
+   * @param feature The feature.
+   */
+  public static void removeVersion(SQLiteDatabase writableDatabase, @Feature int feature) {
+    if (!tableExists(writableDatabase, TABLE_NAME)) {
+      return;
+    }
+    writableDatabase.delete(TABLE_NAME, WHERE_FEATURE_EQUALS, featureArgument(feature));
+  }
+
+  /**
+   * Returns the version of the specified feature, or {@link #VERSION_UNSET} if no version
+   * information is available.
    *
    * @param database The database to query.
    * @param feature The feature.
@@ -88,14 +103,12 @@ public final class VersionTable {
     if (!tableExists(database, TABLE_NAME)) {
       return VERSION_UNSET;
     }
-    String selection = COLUMN_FEATURE + " = ?";
-    String[] selectionArgs = {Integer.toString(feature)};
     try (Cursor cursor =
         database.query(
             TABLE_NAME,
             new String[] {COLUMN_VERSION},
-            selection,
-            selectionArgs,
+            WHERE_FEATURE_EQUALS,
+            featureArgument(feature),
             /* groupBy= */ null,
             /* having= */ null,
             /* orderBy= */ null)) {
@@ -114,4 +127,8 @@ public final class VersionTable {
             readableDatabase, "sqlite_master", "tbl_name = ?", new String[] {tableName});
     return count > 0;
   }
+
+  private static String[] featureArgument(int feature) {
+    return new String[] {Integer.toString(feature)};
+  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
index c30260b11b..37b0f43f8b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -73,7 +73,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
   private static final int COLUMN_INDEX_STREAM_KEYS = 14;
   private static final int COLUMN_INDEX_CUSTOM_METADATA = 15;
 
-  private static final String COLUMN_SELECTION_ID = COLUMN_ID + " = ?";
+  private static final String WHERE_ID_EQUALS = COLUMN_ID + " = ?";
 
   private static final String[] COLUMNS =
       new String[] {
@@ -152,7 +152,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
   @Nullable
   public DownloadState getDownloadState(String id) {
     ensureInitialized();
-    try (Cursor cursor = getCursor(COLUMN_SELECTION_ID, new String[] {id})) {
+    try (Cursor cursor = getCursor(WHERE_ID_EQUALS, new String[] {id})) {
       if (cursor.getCount() == 0) {
         return null;
       }
@@ -210,9 +210,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
   @Override
   public void removeDownloadState(String id) {
     ensureInitialized();
-    databaseProvider
-        .getWritableDatabase()
-        .delete(TABLE_NAME, COLUMN_SELECTION_ID, new String[] {id});
+    databaseProvider.getWritableDatabase().delete(TABLE_NAME, WHERE_ID_EQUALS, new String[] {id});
   }
 
   private void ensureInitialized() {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
index b22645c9d2..e7289bf29e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
@@ -24,7 +24,6 @@ import android.support.annotation.VisibleForTesting;
 import android.util.SparseArray;
 import android.util.SparseBooleanArray;
 import com.google.android.exoplayer2.database.DatabaseProvider;
-import com.google.android.exoplayer2.database.ExoDatabaseProvider;
 import com.google.android.exoplayer2.database.VersionTable;
 import com.google.android.exoplayer2.upstream.cache.Cache.CacheException;
 import com.google.android.exoplayer2.util.Assertions;
@@ -154,9 +153,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     Storage atomicFileStorage =
         new AtomicFileStorage(
             new File(cacheDir, FILE_NAME_ATOMIC), random, encrypt, cipher, secretKeySpec);
-    // Storage sqliteStorage =
-    //     new SQLiteStorage(
-    //         new File(cacheDir, FILE_NAME_DATABASE), random, encrypt, cipher, secretKeySpec);
+    // Storage sqliteStorage = new SQLiteStorage(databaseProvider);
     storage = atomicFileStorage;
     previousStorage = null;
   }
@@ -170,7 +167,6 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
         storage.storeFully(keyToContent);
       } catch (CacheException e) {
         // We failed to copy into current storage, so keep using previous storage.
-        storage.release();
         storage = previousStorage;
         previousStorage = null;
       }
@@ -179,7 +175,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
       loadFrom(storage);
     }
     if (previousStorage != null) {
-      previousStorage.release(/* delete= */ true);
+      previousStorage.delete();
       previousStorage = null;
     }
   }
@@ -195,14 +191,6 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     removedIds.clear();
   }
 
-  /** Releases any underlying resources. */
-  public void release() {
-    storage.release();
-    if (previousStorage != null) {
-      previousStorage.release();
-    }
-  }
-
   /**
    * Adds the given key to the index if it isn't there already.
    *
@@ -396,13 +384,8 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     /** Returns whether the persisted index exists. */
     boolean exists();
 
-    /** Releases any held resources. */
-    default void release() {
-      release(/* delete= */ false);
-    }
-
-    /** Releases and held resources and optionally deletes the persisted index. */
-    void release(boolean delete);
+    /** Deletes the persisted index. */
+    void delete();
 
     /**
      * Loads the persisted index into {@code content} and {@code idToKey}, creating it if it doesn't
@@ -479,10 +462,8 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     }
 
     @Override
-    public void release(boolean delete) {
-      if (delete) {
-        atomicFile.delete();
-      }
+    public void delete() {
+      atomicFile.delete();
     }
 
     @Override
@@ -672,26 +653,22 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   }
 
   /** {@link Storage} implementation that uses an SQL database. */
-  // TODO:
-  // 1. Implement upgrade/downgrade paths from/to AtomicFileStorage.
-  // 2. If encryption is enabled having previously written data, decide whether we need to rewrite
-  //    the entire table. Currently this implementation only encrypts new and updated entries.
   private static final class SQLiteStorage implements Storage {
 
     private static final String TABLE_NAME = DatabaseProvider.TABLE_PREFIX + "CacheContentMetadata";
     private static final int TABLE_VERSION = 1;
 
     private static final String COLUMN_ID = "id";
-    private static final String COLUMN_FLAGS = "flags";
-    private static final String COLUMN_DATA = "data";
+    private static final String COLUMN_KEY = "key";
+    private static final String COLUMN_METADATA = "metadata";
 
     private static final int COLUMN_INDEX_ID = 0;
-    private static final int COLUMN_INDEX_FLAGS = 1;
-    private static final int COLUMN_INDEX_DATA = 2;
+    private static final int COLUMN_INDEX_KEY = 1;
+    private static final int COLUMN_INDEX_METADATA = 2;
 
-    private static final String COLUMN_SELECTION_ID = COLUMN_ID + " = ?";
+    private static final String WHERE_ID_EQUALS = COLUMN_ID + " = ?";
 
-    private static final String[] COLUMNS = new String[] {COLUMN_ID, COLUMN_FLAGS, COLUMN_DATA};
+    private static final String[] COLUMNS = new String[] {COLUMN_ID, COLUMN_KEY, COLUMN_METADATA};
 
     private static final String SQL_DROP_TABLE_IF_EXISTS = "DROP TABLE IF EXISTS " + TABLE_NAME;
     private static final String SQL_CREATE_TABLE =
@@ -700,52 +677,36 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
             + " ("
             + COLUMN_ID
             + " INTEGER PRIMARY KEY NOT NULL,"
-            + COLUMN_FLAGS
-            + " INTEGER NOT NULL,"
-            + COLUMN_DATA
+            + COLUMN_KEY
+            + " TEXT NOT NULL,"
+            + COLUMN_METADATA
             + " BLOB NOT NULL)";
 
-    private static final int FLAG_ENCRYPTED = 1;
-
-    private final File file;
-    private final Random random;
-    private final boolean encrypt;
-    @Nullable private final Cipher cipher;
-    @Nullable private final SecretKeySpec secretKeySpec;
-    private final ExoDatabaseProvider databaseProvider;
+    private final DatabaseProvider databaseProvider;
     private final SparseArray<CachedContent> pendingUpdates;
 
-    @Nullable private ReusableBufferedOutputStream bufferedOutputStream;
-
-    public SQLiteStorage(
-        File file,
-        Random random,
-        boolean encrypt,
-        @Nullable Cipher cipher,
-        @Nullable SecretKeySpec secretKeySpec) {
-      this.file = file;
-      this.random = random;
-      this.encrypt = encrypt;
-      this.cipher = cipher;
-      this.secretKeySpec = secretKeySpec;
-      databaseProvider = new ExoDatabaseProvider(file);
+    public SQLiteStorage(DatabaseProvider databaseProvider) {
+      this.databaseProvider = databaseProvider;
       pendingUpdates = new SparseArray<>();
     }
 
     @Override
     public boolean exists() {
-      return file.exists()
-          && VersionTable.getVersion(
-                  databaseProvider.getReadableDatabase(),
-                  VersionTable.FEATURE_CACHE_CONTENT_METADATA)
-              != VersionTable.VERSION_UNSET;
+      return VersionTable.getVersion(
+              databaseProvider.getReadableDatabase(), VersionTable.FEATURE_CACHE_CONTENT_METADATA)
+          != VersionTable.VERSION_UNSET;
     }
 
     @Override
-    public void release(boolean delete) {
-      release();
-      if (delete) {
-        SQLiteDatabase.deleteDatabase(file);
+    public void delete() {
+      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+      writableDatabase.beginTransaction();
+      try {
+        VersionTable.removeVersion(writableDatabase, VersionTable.FEATURE_CACHE_CONTENT_METADATA);
+        writableDatabase.execSQL(SQL_DROP_TABLE_IF_EXISTS);
+        writableDatabase.setTransactionSuccessful();
+      } finally {
+        writableDatabase.endTransaction();
       }
     }
 
@@ -775,23 +736,11 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
         try (Cursor cursor = getCursor()) {
           while (cursor.moveToNext()) {
             int id = cursor.getInt(COLUMN_INDEX_ID);
-            boolean encrypted = (cursor.getInt(COLUMN_INDEX_FLAGS) & FLAG_ENCRYPTED) != 0;
-            byte[] data = cursor.getBlob(COLUMN_INDEX_DATA);
+            String key = cursor.getString(COLUMN_INDEX_KEY);
+            byte[] metadataBytes = cursor.getBlob(COLUMN_INDEX_METADATA);
 
-            ByteArrayInputStream inputStream = new ByteArrayInputStream(data);
+            ByteArrayInputStream inputStream = new ByteArrayInputStream(metadataBytes);
             DataInputStream input = new DataInputStream(inputStream);
-            if (encrypted) {
-              byte[] initializationVector = new byte[16];
-              input.readFully(initializationVector);
-              IvParameterSpec ivParameterSpec = new IvParameterSpec(initializationVector);
-              try {
-                cipher.init(Cipher.DECRYPT_MODE, secretKeySpec, ivParameterSpec);
-              } catch (InvalidKeyException | InvalidAlgorithmParameterException e) {
-                throw new IllegalStateException(e);
-              }
-              input = new DataInputStream(new CipherInputStream(inputStream, cipher));
-            }
-            String key = input.readUTF();
             DefaultContentMetadata metadata = readContentMetadata(input);
 
             CachedContent cachedContent = new CachedContent(id, key, metadata);
@@ -879,45 +828,19 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     }
 
     private void deleteRow(SQLiteDatabase writableDatabase, int key) {
-      String[] selectionArgs = {Integer.toString(key)};
-      writableDatabase.delete(TABLE_NAME, COLUMN_SELECTION_ID, selectionArgs);
+      writableDatabase.delete(TABLE_NAME, WHERE_ID_EQUALS, new String[] {Integer.toString(key)});
     }
 
     private void addOrUpdateRow(SQLiteDatabase writableDatabase, CachedContent cachedContent)
         throws IOException {
       ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-      if (bufferedOutputStream == null) {
-        bufferedOutputStream = new ReusableBufferedOutputStream(outputStream);
-      } else {
-        bufferedOutputStream.reset(outputStream);
-      }
-      DataOutputStream output = new DataOutputStream(bufferedOutputStream);
-      try {
-        if (encrypt) {
-          byte[] initializationVector = new byte[16];
-          random.nextBytes(initializationVector);
-          output.write(initializationVector);
-          IvParameterSpec ivParameterSpec = new IvParameterSpec(initializationVector);
-          try {
-            cipher.init(Cipher.ENCRYPT_MODE, secretKeySpec, ivParameterSpec);
-          } catch (InvalidKeyException | InvalidAlgorithmParameterException e) {
-            throw new IllegalStateException(e); // Should never happen.
-          }
-          output.flush();
-          output = new DataOutputStream(new CipherOutputStream(bufferedOutputStream, cipher));
-        }
-        output.writeUTF(cachedContent.key);
-        writeContentMetadata(cachedContent.getMetadata(), output);
-      } finally {
-        // Necessary to finalize the cipher.
-        Util.closeQuietly(output);
-      }
+      writeContentMetadata(cachedContent.getMetadata(), new DataOutputStream(outputStream));
       byte[] data = outputStream.toByteArray();
 
       ContentValues values = new ContentValues();
       values.put(COLUMN_ID, cachedContent.id);
-      values.put(COLUMN_FLAGS, encrypt ? FLAG_ENCRYPTED : 0);
-      values.put(COLUMN_DATA, data);
+      values.put(COLUMN_KEY, cachedContent.key);
+      values.put(COLUMN_METADATA, data);
       writableDatabase.replace(TABLE_NAME, /* nullColumnHack= */ null, values);
     }
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index f66471ba1f..253108bd93 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -171,7 +171,6 @@ public final class SimpleCache implements Cache {
     } catch (CacheException e) {
       Log.e(TAG, "Storing index file failed", e);
     } finally {
-      contentIndex.release();
       unlockFolder(cacheDir);
       released = true;
     }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java b/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java
index 44961e8681..2e17b25a45 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java
@@ -67,6 +67,16 @@ public class VersionTableTest {
     assertThat(VersionTable.getVersion(readableDatabase, FEATURE_OFFLINE)).isEqualTo(10);
   }
 
+  @Test
+  public void removeVersion_removesSetVersion() {
+    VersionTable.setVersion(writableDatabase, FEATURE_OFFLINE, 1);
+    assertThat(VersionTable.getVersion(readableDatabase, FEATURE_OFFLINE)).isEqualTo(1);
+
+    VersionTable.removeVersion(writableDatabase, FEATURE_OFFLINE);
+    assertThat(VersionTable.getVersion(readableDatabase, FEATURE_OFFLINE))
+        .isEqualTo(VersionTable.VERSION_UNSET);
+  }
+
   @Test
   public void doesTableExist_nonExistingTable_returnsFalse() {
     assertThat(VersionTable.tableExists(readableDatabase, "NonExistingTable")).isFalse();

From 1a5bf28669a34583eb77e524560305a80382e4c2 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 7 Feb 2019 20:28:59 +0000
Subject: [PATCH 494/832] Cleanup for database on internal storage

PiperOrigin-RevId: 232923385
---
 .../exoplayer2/upstream/cache/CachedContentIndex.java  | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
index e7289bf29e..ca9fb2e016 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
@@ -60,7 +60,6 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 /* package */ class CachedContentIndex {
 
   /* package */ static final String FILE_NAME_ATOMIC = "cached_content_index.exi";
-  private static final String FILE_NAME_DATABASE = "cached_content_index.db";
 
   private static final int VERSION = 2;
   private static final int VERSION_METADATA_INTRODUCED = 2;
@@ -96,13 +95,10 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   private Storage storage;
   @Nullable private Storage previousStorage;
 
-  /**
-   * Returns whether the file is an index file, or an auxiliary file associated with an index file
-   * (e.g. an atomic file backup or auxiliary database file).
-   */
+  /** Returns whether the file is an index file. */
   public static final boolean isIndexFile(String fileName) {
-    // Atomic file backups and auxiliary database files add additional suffixes to the file name.
-    return fileName.startsWith(FILE_NAME_ATOMIC) || fileName.startsWith(FILE_NAME_DATABASE);
+    // Atomic file backups add additional suffixes to the file name.
+    return fileName.startsWith(FILE_NAME_ATOMIC);
   }
 
   /**

From dec00997e3f6b023527208888004d56a0da54317 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 8 Feb 2019 09:04:56 +0000
Subject: [PATCH 495/832] Remove deprecated ImaAdsMediaSource and constructors

Given the change to require setPlayer on AdsLoaders, it seems like a good
opportunity to clean up deprecated ads-related symbols.

PiperOrigin-RevId: 233020171
---
 RELEASENOTES.md                               |  10 +-
 .../exoplayer2/ext/ima/ImaAdsMediaSource.java | 115 -------------
 .../exoplayer2/source/ads/AdsLoader.java      |  23 +--
 .../exoplayer2/source/ads/AdsMediaSource.java | 156 +-----------------
 4 files changed, 17 insertions(+), 287 deletions(-)
 delete mode 100644 extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 1278d36600..1f7e6b74ce 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -35,8 +35,14 @@
   ([#3735](https://github.com/google/ExoPlayer/issues/3735)).
 * CEA-608: Improved conformance to the specification
   ([#3860](https://github.com/google/ExoPlayer/issues/3860)).
-* IMA extension: Require setting the `Player` on `AdsLoader` instances before
-  playback.
+* IMA extension:
+  * Require setting the `Player` on `AdsLoader` instances before
+    playback.
+  * Remove deprecated `ImaAdsMediaSource`. Create `AdsMediaSource` with an
+    `ImaAdsLoader` instead.
+  * Remove deprecated `AdsMediaSource` constructors. Listen for media source
+    events using `AdsMediaSource.addEventListener`, and ad interaction events by
+    adding a listener when building `ImaAdsLoader`.
 * Remove `player` and `isTopLevelSource` parameters from `MediaSource.prepare`.
 * VP9 extension: Remove RGB output mode and libyuv dependency, and switch to
   surface YUV output as the default. Remove constructor parameters `scaleToFit`
diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java
deleted file mode 100644
index bcccd6cec7..0000000000
--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.ext.ima;
-
-import android.os.Handler;
-import android.support.annotation.Nullable;
-import android.view.ViewGroup;
-import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.source.BaseMediaSource;
-import com.google.android.exoplayer2.source.MediaPeriod;
-import com.google.android.exoplayer2.source.MediaSource;
-import com.google.android.exoplayer2.source.MediaSource.SourceInfoRefreshListener;
-import com.google.android.exoplayer2.source.ads.AdsMediaSource;
-import com.google.android.exoplayer2.upstream.Allocator;
-import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.upstream.TransferListener;
-import java.io.IOException;
-
-/**
- * A {@link MediaSource} that inserts ads linearly with a provided content media source.
- *
- * @deprecated Use {@link com.google.android.exoplayer2.source.ads.AdsMediaSource} with
- *     ImaAdsLoader.
- */
-@Deprecated
-public final class ImaAdsMediaSource extends BaseMediaSource implements SourceInfoRefreshListener {
-
-  private final AdsMediaSource adsMediaSource;
-
-  /**
-   * Constructs a new source that inserts ads linearly with the content specified by
-   * {@code contentMediaSource}.
-   *
-   * @param contentMediaSource The {@link MediaSource} providing the content to play.
-   * @param dataSourceFactory Factory for data sources used to load ad media.
-   * @param imaAdsLoader The loader for ads.
-   * @param adUiViewGroup A {@link ViewGroup} on top of the player that will show any ad UI.
-   */
-  public ImaAdsMediaSource(MediaSource contentMediaSource, DataSource.Factory dataSourceFactory,
-      ImaAdsLoader imaAdsLoader, ViewGroup adUiViewGroup) {
-    this(contentMediaSource, dataSourceFactory, imaAdsLoader, adUiViewGroup, null, null);
-  }
-
-  /**
-   * Constructs a new source that inserts ads linearly with the content specified by {@code
-   * contentMediaSource}.
-   *
-   * @param contentMediaSource The {@link MediaSource} providing the content to play.
-   * @param dataSourceFactory Factory for data sources used to load ad media.
-   * @param imaAdsLoader The loader for ads.
-   * @param adUiViewGroup A {@link ViewGroup} on top of the player that will show any ad UI.
-   * @param eventHandler A handler for events. May be null if delivery of events is not required.
-   * @param eventListener A listener of events. May be null if delivery of events is not required.
-   */
-  public ImaAdsMediaSource(
-      MediaSource contentMediaSource,
-      DataSource.Factory dataSourceFactory,
-      ImaAdsLoader imaAdsLoader,
-      ViewGroup adUiViewGroup,
-      @Nullable Handler eventHandler,
-      @Nullable AdsMediaSource.EventListener eventListener) {
-    adsMediaSource = new AdsMediaSource(contentMediaSource, dataSourceFactory, imaAdsLoader,
-        adUiViewGroup, eventHandler, eventListener);
-  }
-
-  @Override
-  @Nullable
-  public Object getTag() {
-    return adsMediaSource.getTag();
-  }
-
-  @Override
-  public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
-    adsMediaSource.prepareSource(/* listener= */ this, mediaTransferListener);
-  }
-
-  @Override
-  public void maybeThrowSourceInfoRefreshError() throws IOException {
-    adsMediaSource.maybeThrowSourceInfoRefreshError();
-  }
-
-  @Override
-  public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator, long startPositionUs) {
-    return adsMediaSource.createPeriod(id, allocator, startPositionUs);
-  }
-
-  @Override
-  public void releasePeriod(MediaPeriod mediaPeriod) {
-    adsMediaSource.releasePeriod(mediaPeriod);
-  }
-
-  @Override
-  public void releaseSourceInternal() {
-    adsMediaSource.releaseSource(/* listener= */ this);
-  }
-
-  @Override
-  public void onSourceInfoRefreshed(
-      MediaSource source, Timeline timeline, @Nullable Object manifest) {
-    refreshSourceInfo(timeline, manifest);
-  }
-}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsLoader.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsLoader.java
index 51de225414..48ac79f227 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsLoader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsLoader.java
@@ -26,7 +26,7 @@ import java.io.IOException;
 /**
  * Interface for loaders of ads, which can be used with {@link AdsMediaSource}.
  *
- * <p>Ad loaders notify the {@link AdsMediaSource} about events via {@link EventListener}. In
+ * <p>Ads loaders notify the {@link AdsMediaSource} about events via {@link EventListener}. In
  * particular, implementations must call {@link EventListener#onAdPlaybackState(AdPlaybackState)}
  * with a new copy of the current {@link AdPlaybackState} whenever further information about ads
  * becomes known (for example, when an ad media URI is available, or an ad has played to the end).
@@ -44,9 +44,7 @@ import java.io.IOException;
  */
 public interface AdsLoader {
 
-  /**
-   * Listener for ad loader events. All methods are called on the main thread.
-   */
+  /** Listener for ads loader events. All methods are called on the main thread. */
   interface EventListener {
 
     /**
@@ -54,7 +52,7 @@ public interface AdsLoader {
      *
      * @param adPlaybackState The new ad playback state.
      */
-    void onAdPlaybackState(AdPlaybackState adPlaybackState);
+    default void onAdPlaybackState(AdPlaybackState adPlaybackState) {}
 
     /**
      * Called when there was an error loading ads.
@@ -62,18 +60,13 @@ public interface AdsLoader {
      * @param error The error.
      * @param dataSpec The data spec associated with the load error.
      */
-    void onAdLoadError(AdLoadException error, DataSpec dataSpec);
+    default void onAdLoadError(AdLoadException error, DataSpec dataSpec) {}
 
-    /**
-     * Called when the user clicks through an ad (for example, following a 'learn more' link).
-     */
-    void onAdClicked();
-
-    /**
-     * Called when the user taps a non-clickthrough part of an ad.
-     */
-    void onAdTapped();
+    /** Called when the user clicks through an ad (for example, following a 'learn more' link). */
+    default void onAdClicked() {}
 
+    /** Called when the user taps a non-clickthrough part of an ad. */
+    default void onAdTapped() {}
   }
 
   // Methods called by the application.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
index e80c797eb9..75c9c789cf 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
@@ -139,46 +139,6 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
     }
   }
 
-  /**
-   * Listener for ads media source events.
-   *
-   * @deprecated To listen for ad load error events, add a listener via {@link
-   *     #addEventListener(Handler, MediaSourceEventListener)} and check for {@link
-   *     AdLoadException}s in {@link MediaSourceEventListener#onLoadError(int, MediaPeriodId,
-   *     LoadEventInfo, MediaLoadData, IOException, boolean)}. Individual ads loader implementations
-   *     should expose ad interaction events, if applicable.
-   */
-  @Deprecated
-  public interface EventListener {
-
-    /**
-     * Called if there was an error loading one or more ads. The loader will skip the problematic
-     * ad(s).
-     *
-     * @param error The error.
-     */
-    void onAdLoadError(IOException error);
-
-    /**
-     * Called when an unexpected internal error is encountered while loading ads. The loader will
-     * skip all remaining ads, as the error is not recoverable.
-     *
-     * @param error The error.
-     */
-    void onInternalAdLoadError(RuntimeException error);
-
-    /**
-     * Called when the user clicks through an ad (for example, following a 'learn more' link).
-     */
-    void onAdClicked();
-
-    /**
-     * Called when the user taps a non-clickthrough part of an ad.
-     */
-    void onAdTapped();
-
-  }
-
   // Used to identify the content "child" source for CompositeMediaSource.
   private static final MediaPeriodId DUMMY_CONTENT_MEDIA_PERIOD_ID =
       new MediaPeriodId(/* periodUid= */ new Object());
@@ -187,8 +147,6 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
   private final MediaSourceFactory adMediaSourceFactory;
   private final AdsLoader adsLoader;
   private final ViewGroup adUiViewGroup;
-  @Nullable private final Handler eventHandler;
-  @Nullable private final EventListener eventListener;
   private final Handler mainHandler;
   private final Map<MediaSource, List<DeferredMediaPeriod>> deferredMediaPeriodByAdMediaSource;
   private final Timeline.Period period;
@@ -219,9 +177,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
         contentMediaSource,
         new ProgressiveMediaSource.Factory(dataSourceFactory),
         adsLoader,
-        adUiViewGroup,
-        /* eventHandler= */ null,
-        /* eventListener= */ null);
+        adUiViewGroup);
   }
 
   /**
@@ -238,78 +194,10 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
       MediaSourceFactory adMediaSourceFactory,
       AdsLoader adsLoader,
       ViewGroup adUiViewGroup) {
-    this(
-        contentMediaSource,
-        adMediaSourceFactory,
-        adsLoader,
-        adUiViewGroup,
-        /* eventHandler= */ null,
-        /* eventListener= */ null);
-  }
-
-  /**
-   * Constructs a new source that inserts ads linearly with the content specified by {@code
-   * contentMediaSource}. Ad media is loaded using {@link ProgressiveMediaSource}.
-   *
-   * @param contentMediaSource The {@link MediaSource} providing the content to play.
-   * @param dataSourceFactory Factory for data sources used to load ad media.
-   * @param adsLoader The loader for ads.
-   * @param adUiViewGroup A {@link ViewGroup} on top of the player that will show any ad UI.
-   * @param eventHandler A handler for events. May be null if delivery of events is not required.
-   * @param eventListener A listener of events. May be null if delivery of events is not required.
-   * @deprecated To listen for ad load error events, add a listener via {@link
-   *     #addEventListener(Handler, MediaSourceEventListener)} and check for {@link
-   *     AdLoadException}s in {@link MediaSourceEventListener#onLoadError(int, MediaPeriodId,
-   *     LoadEventInfo, MediaLoadData, IOException, boolean)}. Individual ads loader implementations
-   *     should expose ad interaction events, if applicable.
-   */
-  @Deprecated
-  public AdsMediaSource(
-      MediaSource contentMediaSource,
-      DataSource.Factory dataSourceFactory,
-      AdsLoader adsLoader,
-      ViewGroup adUiViewGroup,
-      @Nullable Handler eventHandler,
-      @Nullable EventListener eventListener) {
-    this(
-        contentMediaSource,
-        new ProgressiveMediaSource.Factory(dataSourceFactory),
-        adsLoader,
-        adUiViewGroup,
-        eventHandler,
-        eventListener);
-  }
-
-  /**
-   * Constructs a new source that inserts ads linearly with the content specified by {@code
-   * contentMediaSource}.
-   *
-   * @param contentMediaSource The {@link MediaSource} providing the content to play.
-   * @param adMediaSourceFactory Factory for media sources used to load ad media.
-   * @param adsLoader The loader for ads.
-   * @param adUiViewGroup A {@link ViewGroup} on top of the player that will show any ad UI.
-   * @param eventHandler A handler for events. May be null if delivery of events is not required.
-   * @param eventListener A listener of events. May be null if delivery of events is not required.
-   * @deprecated To listen for ad load error events, add a listener via {@link
-   *     #addEventListener(Handler, MediaSourceEventListener)} and check for {@link
-   *     AdLoadException}s in {@link MediaSourceEventListener#onLoadError(int, MediaPeriodId,
-   *     LoadEventInfo, MediaLoadData, IOException, boolean)}. Individual ads loader implementations
-   *     should expose ad interaction events, if applicable.
-   */
-  @Deprecated
-  public AdsMediaSource(
-      MediaSource contentMediaSource,
-      MediaSourceFactory adMediaSourceFactory,
-      AdsLoader adsLoader,
-      ViewGroup adUiViewGroup,
-      @Nullable Handler eventHandler,
-      @Nullable EventListener eventListener) {
     this.contentMediaSource = contentMediaSource;
     this.adMediaSourceFactory = adMediaSourceFactory;
     this.adsLoader = adsLoader;
     this.adUiViewGroup = adUiViewGroup;
-    this.eventHandler = eventHandler;
-    this.eventListener = eventListener;
     mainHandler = new Handler(Looper.getMainLooper());
     deferredMediaPeriodByAdMediaSource = new HashMap<>();
     period = new Timeline.Period();
@@ -522,36 +410,6 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
           });
     }
 
-    @Override
-    public void onAdClicked() {
-      if (released) {
-        return;
-      }
-      if (eventHandler != null && eventListener != null) {
-        eventHandler.post(
-            () -> {
-              if (!released) {
-                eventListener.onAdClicked();
-              }
-            });
-      }
-    }
-
-    @Override
-    public void onAdTapped() {
-      if (released) {
-        return;
-      }
-      if (eventHandler != null && eventListener != null) {
-        eventHandler.post(
-            () -> {
-              if (!released) {
-                eventListener.onAdTapped();
-              }
-            });
-      }
-    }
-
     @Override
     public void onAdLoadError(final AdLoadException error, DataSpec dataSpec) {
       if (released) {
@@ -568,18 +426,6 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
               /* bytesLoaded= */ 0,
               error,
               /* wasCanceled= */ true);
-      if (eventHandler != null && eventListener != null) {
-        eventHandler.post(
-            () -> {
-              if (!released) {
-                if (error.type == AdLoadException.TYPE_UNEXPECTED) {
-                  eventListener.onInternalAdLoadError(error.getRuntimeExceptionForUnexpected());
-                } else {
-                  eventListener.onAdLoadError(error);
-                }
-              }
-            });
-      }
     }
   }
 

From 42e691519a9af7f475971b8e67e5a7d5959df73f Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 8 Feb 2019 10:53:39 +0000
Subject: [PATCH 496/832] Generate per-cache unique identifier.

PiperOrigin-RevId: 233030337
---
 .../upstream/cache/SimpleCache.java           | 95 +++++++++++++++----
 1 file changed, 77 insertions(+), 18 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index 253108bd93..8943a594cb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -22,6 +22,8 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
 import java.io.File;
+import java.io.IOException;
+import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -46,6 +48,8 @@ public final class SimpleCache implements Cache {
    */
   private static final int SUBDIRECTORY_COUNT = 10;
 
+  private static final String UID_FILE_SUFFIX = ".uid";
+
   private static final HashSet<File> lockedCacheDirs = new HashSet<>();
 
   private static boolean cacheFolderLockingDisabled;
@@ -411,16 +415,25 @@ public final class SimpleCache implements Cache {
       return;
     }
 
+    File[] files = cacheDir.listFiles();
+
+    long uid = 0;
+    try {
+      uid = loadUid(cacheDir, files);
+    } catch (IOException e) {
+      // TODO: Decide how to handle this.
+    }
+
+    // TODO: Pass the UID to the index, and use it.
     contentIndex.load();
     if (fileIndex != null) {
       Map<String, CacheFileMetadata> fileMetadata = fileIndex.getAll();
-      loadDirectory(cacheDir, /* isRoot= */ true, fileMetadata);
+      loadDirectory(cacheDir, /* isRoot= */ true, files, fileMetadata);
       fileIndex.removeAll(fileMetadata.keySet());
     } else {
-      loadDirectory(cacheDir, /* isRoot= */ true, /* fileMetadata= */ null);
+      loadDirectory(cacheDir, /* isRoot= */ true, files, /* fileMetadata= */ null);
     }
     contentIndex.removeEmpty();
-
     try {
       contentIndex.store();
     } catch (CacheException e) {
@@ -431,37 +444,40 @@ public final class SimpleCache implements Cache {
   /**
    * Loads a cache directory. If the root directory is passed, also loads any subdirectories.
    *
-   * @param directory The directory to load.
+   * @param directory The directory.
    * @param isRoot Whether the directory is the root directory.
+   * @param files The files belonging to the directory.
    * @param fileMetadata A mutable map containing cache file metadata, keyed by file name. The map
    *     is modified by removing entries for all loaded files. When the method call returns, the map
    *     will contain only metadata that was unused. May be null if no file metadata is available.
    */
   private void loadDirectory(
-      File directory, boolean isRoot, @Nullable Map<String, CacheFileMetadata> fileMetadata) {
-    File[] files = directory.listFiles();
-    if (files == null) {
-      // Not a directory.
-      return;
-    }
-    if (!isRoot && files.length == 0) {
-      // Empty non-root directory.
-      directory.delete();
+      File directory,
+      boolean isRoot,
+      File[] files,
+      @Nullable Map<String, CacheFileMetadata> fileMetadata) {
+    if (files == null || files.length == 0) {
+      // Either (a) directory isn't really a directory (b) it's empty, or (c) listing files failed.
+      if (!isRoot) {
+        // For (a) and (b) deletion is the desired result. For (c) it will be a no-op if the
+        // directory is non-empty, so there's no harm in trying.
+        directory.delete();
+      }
       return;
     }
     for (File file : files) {
       String fileName = file.getName();
       if (isRoot && fileName.indexOf('.') == -1) {
-        loadDirectory(file, /* isRoot= */ false, fileMetadata);
+        loadDirectory(file, /* isRoot= */ false, file.listFiles(), fileMetadata);
       } else {
-        if (isRoot && CachedContentIndex.isIndexFile(fileName)) {
-          // Skip the (expected) index files in the root directory.
+        if (isRoot
+            && (CachedContentIndex.isIndexFile(fileName) || fileName.endsWith(UID_FILE_SUFFIX))) {
+          // Skip expected UID and index files in the root directory.
           continue;
         }
-        CacheFileMetadata metadata =
-            fileMetadata != null ? fileMetadata.remove(file.getName()) : null;
         long length = C.LENGTH_UNSET;
         long lastAccessTimestamp = C.TIME_UNSET;
+        CacheFileMetadata metadata = fileMetadata != null ? fileMetadata.remove(fileName) : null;
         if (metadata != null) {
           length = metadata.length;
           lastAccessTimestamp = metadata.lastAccessTimestamp;
@@ -549,6 +565,49 @@ public final class SimpleCache implements Cache {
     evictor.onSpanTouched(this, oldSpan, newSpan);
   }
 
+  /**
+   * Loads the cache UID from the files belonging to the root directory, generating one if needed.
+   *
+   * @param directory The root directory.
+   * @param files The files belonging to the rood directory.
+   * @return The cache loaded UID.
+   * @throws IOException If there is an error loading or generating the UID.
+   */
+  private static long loadUid(File directory, File[] files) throws IOException {
+    for (File file : files) {
+      String fileName = file.getName();
+      if (fileName.endsWith(UID_FILE_SUFFIX)) {
+        try {
+          return parseUid(fileName);
+        } catch (NumberFormatException e) {
+          // This should never happen, but if it does delete the malformed UID file and continue.
+          Log.e(TAG, "Malformed UID file: " + file);
+          file.delete();
+        }
+      }
+    }
+    return createUid(directory);
+  }
+
+  private static long createUid(File directory) throws IOException {
+    SecureRandom random = new SecureRandom();
+    // Generate a non-negative UID.
+    long uid = random.nextLong();
+    uid = uid == Long.MIN_VALUE ? 0 : Math.abs(uid);
+    // Persist it as a file.
+    String hexUid = Long.toString(uid, /* radix= */ 16);
+    File hexUidFile = new File(directory, hexUid + UID_FILE_SUFFIX);
+    if (!hexUidFile.createNewFile()) {
+      // False means that the file already exists, so this should never happen.
+      throw new IOException("Failed to create UID file: " + hexUidFile);
+    }
+    return uid;
+  }
+
+  private static long parseUid(String fileName) {
+    return Long.parseLong(fileName.substring(0, fileName.indexOf('.')), /* radix= */ 16);
+  }
+
   private static synchronized boolean lockFolder(File cacheDir) {
     if (cacheFolderLockingDisabled) {
       return true;

From fd979790f24511701c233fad2013000a8ede8cd1 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 8 Feb 2019 13:25:11 +0000
Subject: [PATCH 497/832] Some no-op CacheContentIndex cleanup

Push Cipher and SecretKeySpec instantiation into AtomicFileStorage,
since SQLiteStorage no longer needs them.

PiperOrigin-RevId: 233043754
---
 .../upstream/cache/CachedContentIndex.java    | 45 ++++++++-----------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
index ca9fb2e016..d0712ac685 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
@@ -116,7 +116,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
    * @param cacheDir Directory where the index file is kept.
    * @param secretKey 16 byte AES key for reading and writing the cache index.
    */
-  public CachedContentIndex(File cacheDir, byte[] secretKey) {
+  public CachedContentIndex(File cacheDir, @Nullable byte[] secretKey) {
     this(cacheDir, secretKey, secretKey != null);
   }
 
@@ -128,27 +128,12 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
    * @param encrypt Whether the index will be encrypted when written. Must be false if {@code
    *     secretKey} is null.
    */
-  public CachedContentIndex(File cacheDir, byte[] secretKey, boolean encrypt) {
-    Cipher cipher = null;
-    SecretKeySpec secretKeySpec = null;
-    if (secretKey != null) {
-      Assertions.checkArgument(secretKey.length == 16);
-      try {
-        cipher = getCipher();
-        secretKeySpec = new SecretKeySpec(secretKey, "AES");
-      } catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
-        throw new IllegalStateException(e); // Should never happen.
-      }
-    } else {
-      Assertions.checkState(!encrypt);
-    }
+  public CachedContentIndex(File cacheDir, @Nullable byte[] secretKey, boolean encrypt) {
     keyToContent = new HashMap<>();
     idToKey = new SparseArray<>();
     removedIds = new SparseBooleanArray();
-    Random random = new Random();
     Storage atomicFileStorage =
-        new AtomicFileStorage(
-            new File(cacheDir, FILE_NAME_ATOMIC), random, encrypt, cipher, secretKeySpec);
+        new AtomicFileStorage(new File(cacheDir, FILE_NAME_ATOMIC), secretKey, encrypt);
     // Storage sqliteStorage = new SQLiteStorage(databaseProvider);
     storage = atomicFileStorage;
     previousStorage = null;
@@ -430,25 +415,33 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   /** {@link Storage} implementation that uses an {@link AtomicFile}. */
   private static class AtomicFileStorage implements Storage {
 
-    private final Random random;
     private final boolean encrypt;
     @Nullable private final Cipher cipher;
     @Nullable private final SecretKeySpec secretKeySpec;
+    @Nullable private final Random random;
     private final AtomicFile atomicFile;
 
     private boolean changed;
     @Nullable private ReusableBufferedOutputStream bufferedOutputStream;
 
-    public AtomicFileStorage(
-        File file,
-        Random random,
-        boolean encrypt,
-        @Nullable Cipher cipher,
-        @Nullable SecretKeySpec secretKeySpec) {
-      this.random = random;
+    public AtomicFileStorage(File file, @Nullable byte[] secretKey, boolean encrypt) {
+      Cipher cipher = null;
+      SecretKeySpec secretKeySpec = null;
+      if (secretKey != null) {
+        Assertions.checkArgument(secretKey.length == 16);
+        try {
+          cipher = getCipher();
+          secretKeySpec = new SecretKeySpec(secretKey, "AES");
+        } catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
+          throw new IllegalStateException(e); // Should never happen.
+        }
+      } else {
+        Assertions.checkArgument(!encrypt);
+      }
       this.encrypt = encrypt;
       this.cipher = cipher;
       this.secretKeySpec = secretKeySpec;
+      random = encrypt ? new Random() : null;
       atomicFile = new AtomicFile(file);
     }
 

From 891ec2230ef2f20e1cb9a725ce1c107277f2ddaf Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 8 Feb 2019 14:33:42 +0000
Subject: [PATCH 498/832] Rearrange condition blocking to ensure Handler thread
 loops

Without this change, any prepare() operation that requires posting to
the DummyMainThread's handler cannot complete preparation.

PiperOrigin-RevId: 233050367
---
 .../exoplayer2/testutil/DummyMainThread.java       |  2 +-
 .../exoplayer2/testutil/MediaPeriodAsserts.java    | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/DummyMainThread.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/DummyMainThread.java
index 982fcdf558..c10cadbb04 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/DummyMainThread.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/DummyMainThread.java
@@ -53,7 +53,7 @@ public final class DummyMainThread {
    * Runs the provided {@link Runnable} on the main thread, blocking until execution completes or
    * until timeout milliseconds have passed.
    *
-   * @param timeoutMs the maximum time to wait in milliseconds.
+   * @param timeoutMs The maximum time to wait in milliseconds.
    * @param runnable The {@link Runnable} to run.
    */
   public void runOnMainThread(int timeoutMs, final Runnable runnable) {
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaPeriodAsserts.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaPeriodAsserts.java
index b4137a41de..e99e2f45bb 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaPeriodAsserts.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaPeriodAsserts.java
@@ -187,13 +187,14 @@ public final class MediaPeriodAsserts {
   private static TrackGroupArray getTrackGroups(MediaPeriod mediaPeriod) {
     AtomicReference<TrackGroupArray> trackGroupArray = new AtomicReference<>(null);
     DummyMainThread dummyMainThread = new DummyMainThread();
+    ConditionVariable preparedCondition = new ConditionVariable();
     dummyMainThread.runOnMainThread(
         () -> {
-          ConditionVariable preparedCondition = new ConditionVariable();
           mediaPeriod.prepare(
               new Callback() {
                 @Override
                 public void onPrepared(MediaPeriod mediaPeriod) {
+                  trackGroupArray.set(mediaPeriod.getTrackGroups());
                   preparedCondition.open();
                 }
 
@@ -203,13 +204,12 @@ public final class MediaPeriodAsserts {
                 }
               },
               /* positionUs= */ 0);
-          try {
-            preparedCondition.block();
-          } catch (InterruptedException e) {
-            // Ignore.
-          }
-          trackGroupArray.set(mediaPeriod.getTrackGroups());
         });
+    try {
+      preparedCondition.block();
+    } catch (InterruptedException e) {
+      // Ignore.
+    }
     dummyMainThread.release();
     return trackGroupArray.get();
   }

From 36da5fb5115cc81ac9a66b46af8e5a96e14a8457 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 8 Feb 2019 14:50:26 +0000
Subject: [PATCH 499/832] Group audio renditions by name

Allows the player to adapt between audio renditions with different
names.

PiperOrigin-RevId: 233052105
---
 RELEASENOTES.md                               |   2 +
 .../exoplayer2/source/hls/HlsMediaPeriod.java | 134 ++++++++++++------
 .../source/hls/HlsSampleStreamWrapper.java    |   5 +-
 .../hls/playlist/HlsMasterPlaylist.java       |  11 +-
 .../hls/playlist/HlsPlaylistParser.java       |   6 +-
 .../source/hls/HlsMediaPeriodTest.java        |  12 +-
 6 files changed, 118 insertions(+), 52 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 1f7e6b74ce..90eddb7c08 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,6 +2,8 @@
 
 ### dev-v2 (not yet released) ###
 
+* HLS:
+  * Form an adaptive track group out of audio renditions with matching name.
 * `ExtractorMediaSource` renamed to `ProgressiveMediaSource`.
 * Support for playing spherical videos on Daydream.
 * Improve decoder re-use between playbacks. TODO: Write and link a blog post
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
index 0c4ebcb508..a31f040a32 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
@@ -43,6 +43,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.IdentityHashMap;
 import java.util.List;
 
@@ -70,7 +71,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
   private HlsSampleStreamWrapper[] sampleStreamWrappers;
   private HlsSampleStreamWrapper[] enabledSampleStreamWrappers;
   // Maps sample stream wrappers to variant/rendition index by matching array positions.
-  private int[][] manifestUrlsIndicesPerWrapper;
+  private int[][] manifestUrlIndicesPerWrapper;
   private SequenceableLoader compositeSequenceableLoader;
   private boolean notifiedReadingStarted;
 
@@ -115,7 +116,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
     timestampAdjusterProvider = new TimestampAdjusterProvider();
     sampleStreamWrappers = new HlsSampleStreamWrapper[0];
     enabledSampleStreamWrappers = new HlsSampleStreamWrapper[0];
-    manifestUrlsIndicesPerWrapper = new int[0][];
+    manifestUrlIndicesPerWrapper = new int[0][];
     eventDispatcher.mediaPeriodCreated();
   }
 
@@ -153,14 +154,15 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
     HlsMasterPlaylist masterPlaylist = Assertions.checkNotNull(playlistTracker.getMasterPlaylist());
     boolean hasVariants = !masterPlaylist.variants.isEmpty();
     int audioWrapperOffset = hasVariants ? 1 : 0;
-    int subtitleWrapperOffset = audioWrapperOffset + masterPlaylist.audios.size();
+    // Subtitle sample stream wrappers are held last.
+    int subtitleWrapperOffset = sampleStreamWrappers.length - masterPlaylist.subtitles.size();
 
     TrackGroupArray mainWrapperTrackGroups;
     int mainWrapperPrimaryGroupIndex;
     int[] mainWrapperVariantIndices;
     if (hasVariants) {
       HlsSampleStreamWrapper mainWrapper = sampleStreamWrappers[0];
-      mainWrapperVariantIndices = manifestUrlsIndicesPerWrapper[0];
+      mainWrapperVariantIndices = manifestUrlIndicesPerWrapper[0];
       mainWrapperTrackGroups = mainWrapper.getTrackGroups();
       mainWrapperPrimaryGroupIndex = mainWrapper.getPrimaryTrackGroupIndex();
     } else {
@@ -191,12 +193,18 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
         // Audio or subtitle group.
         for (int i = audioWrapperOffset; i < sampleStreamWrappers.length; i++) {
           TrackGroupArray wrapperTrackGroups = sampleStreamWrappers[i].getTrackGroups();
-          if (wrapperTrackGroups.indexOf(trackSelectionGroup) != C.INDEX_UNSET) {
+          int selectedTrackGroupIndex = wrapperTrackGroups.indexOf(trackSelectionGroup);
+          if (selectedTrackGroupIndex != C.INDEX_UNSET) {
             int groupIndexType =
                 i < subtitleWrapperOffset
                     ? HlsMasterPlaylist.GROUP_INDEX_AUDIO
                     : HlsMasterPlaylist.GROUP_INDEX_SUBTITLE;
-            streamKeys.add(new StreamKey(groupIndexType, manifestUrlsIndicesPerWrapper[i][0]));
+            int[] selectedWrapperUrlIndices = manifestUrlIndicesPerWrapper[i];
+            for (int trackIndex = 0; trackIndex < trackSelection.length(); trackIndex++) {
+              int renditionIndex =
+                  selectedWrapperUrlIndices[trackSelection.getIndexInTrackGroup(trackIndex)];
+              streamKeys.add(new StreamKey(groupIndexType, renditionIndex));
+            }
             break;
           }
         }
@@ -424,37 +432,19 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
     List<HlsUrl> audioRenditions = masterPlaylist.audios;
     List<HlsUrl> subtitleRenditions = masterPlaylist.subtitles;
 
-    int wrapperCount = (hasVariants ? 1 : 0) + audioRenditions.size() + subtitleRenditions.size();
-    sampleStreamWrappers = new HlsSampleStreamWrapper[wrapperCount];
-    manifestUrlsIndicesPerWrapper = new int[wrapperCount][];
-    pendingPrepareCount = wrapperCount;
+    pendingPrepareCount = 0;
+    ArrayList<HlsSampleStreamWrapper> sampleStreamWrappers = new ArrayList<>();
+    ArrayList<int[]> manifestUrlIndicesPerWrapper = new ArrayList<>();
 
-    int currentWrapperIndex = 0;
     if (hasVariants) {
-      buildAndPrepareMainSampleStreamWrapper(masterPlaylist, positionUs);
-      currentWrapperIndex++;
+      buildAndPrepareMainSampleStreamWrapper(
+          masterPlaylist, positionUs, sampleStreamWrappers, manifestUrlIndicesPerWrapper);
     }
 
     // TODO: Build video stream wrappers here.
 
-    // Audio sample stream wrappers.
-    for (int i = 0; i < audioRenditions.size(); i++) {
-      HlsUrl audioRendition = audioRenditions.get(i);
-      HlsSampleStreamWrapper sampleStreamWrapper =
-          buildSampleStreamWrapper(
-              C.TRACK_TYPE_AUDIO,
-              new HlsUrl[] {audioRendition},
-              null,
-              Collections.emptyList(),
-              positionUs);
-      manifestUrlsIndicesPerWrapper[currentWrapperIndex] = new int[] {i};
-      sampleStreamWrappers[currentWrapperIndex++] = sampleStreamWrapper;
-      Format renditionFormat = audioRendition.format;
-      if (allowChunklessPreparation && renditionFormat.codecs != null) {
-        sampleStreamWrapper.prepareWithMasterPlaylistInfo(
-            new TrackGroupArray(new TrackGroup(audioRendition.format)), 0, TrackGroupArray.EMPTY);
-      }
-    }
+    buildAndPrepareAudioSampleStreamWrappers(
+        positionUs, audioRenditions, sampleStreamWrappers, manifestUrlIndicesPerWrapper);
 
     // Subtitle stream wrappers. We can always use master playlist information to prepare these.
     for (int i = 0; i < subtitleRenditions.size(); i++) {
@@ -462,20 +452,22 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
       HlsSampleStreamWrapper sampleStreamWrapper =
           buildSampleStreamWrapper(
               C.TRACK_TYPE_TEXT, new HlsUrl[] {url}, null, Collections.emptyList(), positionUs);
-      manifestUrlsIndicesPerWrapper[currentWrapperIndex] = new int[] {i};
-      sampleStreamWrappers[currentWrapperIndex++] = sampleStreamWrapper;
+      manifestUrlIndicesPerWrapper.add(new int[] {i});
+      sampleStreamWrappers.add(sampleStreamWrapper);
       sampleStreamWrapper.prepareWithMasterPlaylistInfo(
           new TrackGroupArray(new TrackGroup(url.format)), 0, TrackGroupArray.EMPTY);
     }
 
+    this.sampleStreamWrappers = sampleStreamWrappers.toArray(new HlsSampleStreamWrapper[0]);
+    this.manifestUrlIndicesPerWrapper = manifestUrlIndicesPerWrapper.toArray(new int[0][]);
+    pendingPrepareCount = this.sampleStreamWrappers.length;
     // Set timestamp master and trigger preparation (if not already prepared)
-    sampleStreamWrappers[0].setIsTimestampMaster(true);
-    for (HlsSampleStreamWrapper sampleStreamWrapper : sampleStreamWrappers) {
+    this.sampleStreamWrappers[0].setIsTimestampMaster(true);
+    for (HlsSampleStreamWrapper sampleStreamWrapper : this.sampleStreamWrappers) {
       sampleStreamWrapper.continuePreparing();
     }
-
     // All wrappers are enabled during preparation.
-    enabledSampleStreamWrappers = sampleStreamWrappers;
+    enabledSampleStreamWrappers = this.sampleStreamWrappers;
   }
 
   /**
@@ -501,9 +493,14 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
    * @param masterPlaylist The HLS master playlist.
    * @param positionUs If preparation requires any chunk downloads, the position in microseconds at
    *     which downloading should start. Ignored otherwise.
+   * @param sampleStreamWrappers List to which the built main sample stream wrapper should be added.
+   * @param manifestUrlIndicesPerWrapper List to which the selected variant indices should be added.
    */
   private void buildAndPrepareMainSampleStreamWrapper(
-      HlsMasterPlaylist masterPlaylist, long positionUs) {
+      HlsMasterPlaylist masterPlaylist,
+      long positionUs,
+      List<HlsSampleStreamWrapper> sampleStreamWrappers,
+      List<int[]> manifestUrlIndicesPerWrapper) {
     int[] variantTypes = new int[masterPlaylist.variants.size()];
     int videoVariantCount = 0;
     int audioVariantCount = 0;
@@ -536,13 +533,13 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
       selectedVariantsCount = variantTypes.length - audioVariantCount;
     }
     HlsUrl[] selectedVariants = new HlsUrl[selectedVariantsCount];
-    manifestUrlsIndicesPerWrapper[0] = new int[selectedVariantsCount];
+    int[] selectedVariantIndices = new int[selectedVariantsCount];
     int outIndex = 0;
     for (int i = 0; i < masterPlaylist.variants.size(); i++) {
       if ((!useVideoVariantsOnly || variantTypes[i] == C.TRACK_TYPE_VIDEO)
           && (!useNonAudioVariantsOnly || variantTypes[i] != C.TRACK_TYPE_AUDIO)) {
         selectedVariants[outIndex] = masterPlaylist.variants.get(i);
-        manifestUrlsIndicesPerWrapper[0][outIndex++] = i;
+        selectedVariantIndices[outIndex++] = i;
       }
     }
     String codecs = selectedVariants[0].format.codecs;
@@ -553,7 +550,8 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
             masterPlaylist.muxedAudioFormat,
             masterPlaylist.muxedCaptionFormats,
             positionUs);
-    sampleStreamWrappers[0] = sampleStreamWrapper;
+    sampleStreamWrappers.add(sampleStreamWrapper);
+    manifestUrlIndicesPerWrapper.add(selectedVariantIndices);
     if (allowChunklessPreparation && codecs != null) {
       boolean variantsContainVideoCodecs = Util.getCodecsOfType(codecs, C.TRACK_TYPE_VIDEO) != null;
       boolean variantsContainAudioCodecs = Util.getCodecsOfType(codecs, C.TRACK_TYPE_AUDIO) != null;
@@ -614,6 +612,60 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
     }
   }
 
+  private void buildAndPrepareAudioSampleStreamWrappers(
+      long positionUs,
+      List<HlsUrl> audioRenditions,
+      List<HlsSampleStreamWrapper> sampleStreamWrappers,
+      List<int[]> manifestUrlsIndicesPerWrapper) {
+
+    ArrayList<HlsUrl> scratchRenditionList =
+        new ArrayList<>(/* initialCapacity= */ audioRenditions.size());
+    ArrayList<Integer> scratchIndicesList =
+        new ArrayList<>(/* initialCapacity= */ audioRenditions.size());
+    HashSet<String> alreadyGroupedNames = new HashSet<>();
+    for (int renditionByNameIndex = 0;
+        renditionByNameIndex < audioRenditions.size();
+        renditionByNameIndex++) {
+      String name = audioRenditions.get(renditionByNameIndex).name;
+      if (!alreadyGroupedNames.add(name)) {
+        // This name already has a corresponding group.
+        continue;
+      }
+
+      boolean renditionsHaveCodecs = true;
+      scratchRenditionList.clear();
+      scratchIndicesList.clear();
+      // Group all renditions with matching name.
+      for (int renditionIndex = 0; renditionIndex < audioRenditions.size(); renditionIndex++) {
+        if (Util.areEqual(name, audioRenditions.get(renditionIndex).name)) {
+          HlsUrl rendition = audioRenditions.get(renditionIndex);
+          scratchIndicesList.add(renditionIndex);
+          scratchRenditionList.add(rendition);
+          renditionsHaveCodecs &= rendition.format.codecs != null;
+        }
+      }
+
+      HlsSampleStreamWrapper sampleStreamWrapper =
+          buildSampleStreamWrapper(
+              C.TRACK_TYPE_AUDIO,
+              scratchRenditionList.toArray(new HlsUrl[0]),
+              /* muxedAudioFormat= */ null,
+              /* muxedCaptionFormats= */ Collections.emptyList(),
+              positionUs);
+      manifestUrlsIndicesPerWrapper.add(Util.toArray(scratchIndicesList));
+      sampleStreamWrappers.add(sampleStreamWrapper);
+
+      if (allowChunklessPreparation && renditionsHaveCodecs) {
+        Format[] renditionFormats = new Format[scratchRenditionList.size()];
+        for (int i = 0; i < renditionFormats.length; i++) {
+          renditionFormats[i] = scratchRenditionList.get(i).format;
+        }
+        sampleStreamWrapper.prepareWithMasterPlaylistInfo(
+            new TrackGroupArray(new TrackGroup(renditionFormats)), 0, TrackGroupArray.EMPTY);
+      }
+    }
+  }
+
   private HlsSampleStreamWrapper buildSampleStreamWrapper(int trackType, HlsUrl[] variants,
       Format muxedAudioFormat, List<Format> muxedCaptionFormats, long positionUs) {
     HlsChunkSource defaultChunkSource =
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
index 4fd27ba2a0..df32b4ed84 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
@@ -67,6 +67,9 @@ import java.util.List;
 
     /**
      * Called when the wrapper has been prepared.
+     *
+     * <p>Note: This method will be called on a later handler loop than the one on which either
+     * {@link #prepareWithMasterPlaylistInfo} or {@link #continuePreparing} are invoked.
      */
     void onPrepared();
 
@@ -203,7 +206,7 @@ import java.util.List;
     this.trackGroups = trackGroups;
     this.optionalTrackGroups = optionalTrackGroups;
     this.primaryTrackGroupIndex = primaryTrackGroupIndex;
-    callback.onPrepared();
+    handler.post(callback::onPrepared);
   }
 
   public void maybeThrowPrepareError() throws IOException {
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
index bb01ade28d..ac14ea6de5 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
@@ -56,6 +56,11 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
      * Format information associated with the HLS url.
      */
     public final Format format;
+    /**
+     * Value of the NAME attribute as defined by the #EXT-X-MEDIA tag, or empty if the HLS url is
+     * not associated with any name.
+     */
+    public final String name;
 
     /**
      * Creates an HLS url from a given http url.
@@ -74,16 +79,18 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
               /* bitrate= */ Format.NO_VALUE,
               /* selectionFlags= */ 0,
               /* language= */ null);
-      return new HlsUrl(url, format);
+      return new HlsUrl(url, format, /* name= */ "");
     }
 
     /**
      * @param url See {@link #url}.
      * @param format See {@link #format}.
+     * @param name See {@link #name}.
      */
-    public HlsUrl(String url, Format format) {
+    public HlsUrl(String url, Format format, String name) {
       this.url = url;
       this.format = format;
+      this.name = name;
     }
 
   }
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
index 9e13d6fa0f..26e1e1a9a7 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
@@ -330,7 +330,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
                   frameRate,
                   /* initializationData= */ null,
                   /* selectionFlags= */ 0);
-          variants.add(new HlsMasterPlaylist.HlsUrl(line, format));
+          variants.add(new HlsMasterPlaylist.HlsUrl(line, format, /* name= */ ""));
         }
       }
     }
@@ -365,7 +365,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
           if (isMediaTagMuxed(variants, uri)) {
             muxedAudioFormat = format;
           } else {
-            audios.add(new HlsMasterPlaylist.HlsUrl(uri, format));
+            audios.add(new HlsMasterPlaylist.HlsUrl(uri, format, name));
           }
           break;
         case TYPE_SUBTITLES:
@@ -379,7 +379,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
                   /* bitrate= */ Format.NO_VALUE,
                   selectionFlags,
                   language);
-          subtitles.add(new HlsMasterPlaylist.HlsUrl(uri, format));
+          subtitles.add(new HlsMasterPlaylist.HlsUrl(uri, format, name));
           break;
         case TYPE_CLOSED_CAPTIONS:
           String instreamId = parseStringAttr(line, REGEX_INSTREAM_ID, variableDefinitions);
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
index 599e099b8c..2793f31af4 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
@@ -49,7 +49,7 @@ import org.robolectric.annotation.Config;
 public final class HlsMediaPeriodTest {
 
   @Test
-  public void getSteamKeys_isCompatibleWithhHlsMasterPlaylistFilter() {
+  public void getSteamKeys_isCompatibleWithHlsMasterPlaylistFilter() {
     HlsMasterPlaylist testMasterPlaylist =
         createMasterPlaylist(
             /* variants= */ Arrays.asList(
@@ -127,7 +127,8 @@ public final class HlsMediaPeriodTest {
             /* height= */ Format.NO_VALUE,
             /* frameRate= */ Format.NO_VALUE,
             /* initializationData= */ null,
-            /* selectionFlags= */ 0));
+            /* selectionFlags= */ 0),
+        /* name= */ "");
   }
 
   private static HlsUrl createAudioOnlyVariantHlsUrl(int bitrate) {
@@ -144,15 +145,16 @@ public final class HlsMediaPeriodTest {
             /* height= */ Format.NO_VALUE,
             /* frameRate= */ Format.NO_VALUE,
             /* initializationData= */ null,
-            /* selectionFlags= */ 0));
+            /* selectionFlags= */ 0),
+        /* name= */ "");
   }
 
   private static HlsUrl createAudioHlsUrl(String language) {
-    return new HlsUrl("http://url", createAudioFormat(language));
+    return new HlsUrl("http://url", createAudioFormat(language), /* name= */ "");
   }
 
   private static HlsUrl createSubtitleHlsUrl(String language) {
-    return new HlsUrl("http://url", createSubtitleFormat(language));
+    return new HlsUrl("http://url", createSubtitleFormat(language), /* name= */ "");
   }
 
   private static Format createAudioFormat(String language) {

From 9c3ac92ae833575a9e2ef06eec797b207dd13b97 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 8 Feb 2019 15:32:31 +0000
Subject: [PATCH 500/832] Allow extension of MatroskaExtractor

Subclasses can handle arbitrary elements.

PiperOrigin-RevId: 233057241
---
 .../extractor/mkv/DefaultEbmlReader.java      |  38 +--
 ...mlReaderOutput.java => EbmlProcessor.java} |  43 +--
 .../exoplayer2/extractor/mkv/EbmlReader.java  |  16 +-
 .../extractor/mkv/MatroskaExtractor.java      | 283 +++++++++++-------
 .../extractor/mkv/DefaultEbmlReaderTest.java  |  79 ++---
 5 files changed, 261 insertions(+), 198 deletions(-)
 rename library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/{EbmlReaderOutput.java => EbmlProcessor.java} (79%)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java
index 0987bc473f..40908b9680 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java
@@ -52,7 +52,7 @@ import java.util.ArrayDeque;
   private final ArrayDeque<MasterElement> masterElementsStack;
   private final VarintReader varintReader;
 
-  private EbmlReaderOutput output;
+  private EbmlProcessor processor;
   private @ElementState int elementState;
   private int elementId;
   private long elementContentSize;
@@ -64,8 +64,8 @@ import java.util.ArrayDeque;
   }
 
   @Override
-  public void init(EbmlReaderOutput eventHandler) {
-    this.output = eventHandler;
+  public void init(EbmlProcessor processor) {
+    this.processor = processor;
   }
 
   @Override
@@ -77,11 +77,11 @@ import java.util.ArrayDeque;
 
   @Override
   public boolean read(ExtractorInput input) throws IOException, InterruptedException {
-    Assertions.checkState(output != null);
+    Assertions.checkNotNull(processor);
     while (true) {
       if (!masterElementsStack.isEmpty()
           && input.getPosition() >= masterElementsStack.peek().elementEndPosition) {
-        output.endMasterElement(masterElementsStack.pop().elementId);
+        processor.endMasterElement(masterElementsStack.pop().elementId);
         return true;
       }
 
@@ -103,42 +103,42 @@ import java.util.ArrayDeque;
         elementState = ELEMENT_STATE_READ_CONTENT;
       }
 
-      @EbmlReaderOutput.ElementType int type = output.getElementType(elementId);
+      @EbmlProcessor.ElementType int type = processor.getElementType(elementId);
       switch (type) {
-        case EbmlReaderOutput.TYPE_MASTER:
+        case EbmlProcessor.ELEMENT_TYPE_MASTER:
           long elementContentPosition = input.getPosition();
           long elementEndPosition = elementContentPosition + elementContentSize;
           masterElementsStack.push(new MasterElement(elementId, elementEndPosition));
-          output.startMasterElement(elementId, elementContentPosition, elementContentSize);
+          processor.startMasterElement(elementId, elementContentPosition, elementContentSize);
           elementState = ELEMENT_STATE_READ_ID;
           return true;
-        case EbmlReaderOutput.TYPE_UNSIGNED_INT:
+        case EbmlProcessor.ELEMENT_TYPE_UNSIGNED_INT:
           if (elementContentSize > MAX_INTEGER_ELEMENT_SIZE_BYTES) {
             throw new ParserException("Invalid integer size: " + elementContentSize);
           }
-          output.integerElement(elementId, readInteger(input, (int) elementContentSize));
+          processor.integerElement(elementId, readInteger(input, (int) elementContentSize));
           elementState = ELEMENT_STATE_READ_ID;
           return true;
-        case EbmlReaderOutput.TYPE_FLOAT:
+        case EbmlProcessor.ELEMENT_TYPE_FLOAT:
           if (elementContentSize != VALID_FLOAT32_ELEMENT_SIZE_BYTES
               && elementContentSize != VALID_FLOAT64_ELEMENT_SIZE_BYTES) {
             throw new ParserException("Invalid float size: " + elementContentSize);
           }
-          output.floatElement(elementId, readFloat(input, (int) elementContentSize));
+          processor.floatElement(elementId, readFloat(input, (int) elementContentSize));
           elementState = ELEMENT_STATE_READ_ID;
           return true;
-        case EbmlReaderOutput.TYPE_STRING:
+        case EbmlProcessor.ELEMENT_TYPE_STRING:
           if (elementContentSize > Integer.MAX_VALUE) {
             throw new ParserException("String element size: " + elementContentSize);
           }
-          output.stringElement(elementId, readString(input, (int) elementContentSize));
+          processor.stringElement(elementId, readString(input, (int) elementContentSize));
           elementState = ELEMENT_STATE_READ_ID;
           return true;
-        case EbmlReaderOutput.TYPE_BINARY:
-          output.binaryElement(elementId, (int) elementContentSize, input);
+        case EbmlProcessor.ELEMENT_TYPE_BINARY:
+          processor.binaryElement(elementId, (int) elementContentSize, input);
           elementState = ELEMENT_STATE_READ_ID;
           return true;
-        case EbmlReaderOutput.TYPE_UNKNOWN:
+        case EbmlProcessor.ELEMENT_TYPE_UNKNOWN:
           input.skipFully((int) elementContentSize);
           elementState = ELEMENT_STATE_READ_ID;
           break;
@@ -167,7 +167,7 @@ import java.util.ArrayDeque;
       int varintLength = VarintReader.parseUnsignedVarintLength(scratch[0]);
       if (varintLength != C.LENGTH_UNSET && varintLength <= MAX_ID_BYTES) {
         int potentialId = (int) VarintReader.assembleVarint(scratch, varintLength, false);
-        if (output.isLevel1Element(potentialId)) {
+        if (processor.isLevel1Element(potentialId)) {
           input.skipFully(varintLength);
           return potentialId;
         }
@@ -243,7 +243,7 @@ import java.util.ArrayDeque;
 
   /**
    * Used in {@link #masterElementsStack} to track when the current master element ends, so that
-   * {@link EbmlReaderOutput#endMasterElement(int)} can be called.
+   * {@link EbmlProcessor#endMasterElement(int)} can be called.
    */
   private static final class MasterElement {
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReaderOutput.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlProcessor.java
similarity index 79%
rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReaderOutput.java
rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlProcessor.java
index cc17af5632..43e911e7f3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReaderOutput.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2019 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,41 +23,48 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-/**
- * Defines EBML element IDs/types and reacts to events.
- */
-/* package */ interface EbmlReaderOutput {
+/** Defines EBML element IDs/types and processes events. */
+public interface EbmlProcessor {
 
   /**
-   * EBML element types. One of {@link #TYPE_UNKNOWN}, {@link #TYPE_MASTER}, {@link
-   * #TYPE_UNSIGNED_INT}, {@link #TYPE_STRING}, {@link #TYPE_BINARY} or {@link #TYPE_FLOAT}.
+   * EBML element types. One of {@link #ELEMENT_TYPE_UNKNOWN}, {@link #ELEMENT_TYPE_MASTER}, {@link
+   * #ELEMENT_TYPE_UNSIGNED_INT}, {@link #ELEMENT_TYPE_STRING}, {@link #ELEMENT_TYPE_BINARY} or
+   * {@link #ELEMENT_TYPE_FLOAT}.
    */
   @Documented
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({TYPE_UNKNOWN, TYPE_MASTER, TYPE_UNSIGNED_INT, TYPE_STRING, TYPE_BINARY, TYPE_FLOAT})
+  @IntDef({
+    ELEMENT_TYPE_UNKNOWN,
+    ELEMENT_TYPE_MASTER,
+    ELEMENT_TYPE_UNSIGNED_INT,
+    ELEMENT_TYPE_STRING,
+    ELEMENT_TYPE_BINARY,
+    ELEMENT_TYPE_FLOAT
+  })
   @interface ElementType {}
   /** Type for unknown elements. */
-  int TYPE_UNKNOWN = 0;
+  int ELEMENT_TYPE_UNKNOWN = 0;
   /** Type for elements that contain child elements. */
-  int TYPE_MASTER = 1;
+  int ELEMENT_TYPE_MASTER = 1;
   /** Type for integer value elements of up to 8 bytes. */
-  int TYPE_UNSIGNED_INT = 2;
+  int ELEMENT_TYPE_UNSIGNED_INT = 2;
   /** Type for string elements. */
-  int TYPE_STRING = 3;
+  int ELEMENT_TYPE_STRING = 3;
   /** Type for binary elements. */
-  int TYPE_BINARY = 4;
+  int ELEMENT_TYPE_BINARY = 4;
   /** Type for IEEE floating point value elements of either 4 or 8 bytes. */
-  int TYPE_FLOAT = 5;
+  int ELEMENT_TYPE_FLOAT = 5;
 
   /**
    * Maps an element ID to a corresponding type.
    *
-   * <p>If {@link #TYPE_UNKNOWN} is returned then the element is skipped. Note that all children of
-   * a skipped element are also skipped.
+   * <p>If {@link #ELEMENT_TYPE_UNKNOWN} is returned then the element is skipped. Note that all
+   * children of a skipped element are also skipped.
    *
    * @param id The element ID to map.
-   * @return One of {@link #TYPE_UNKNOWN}, {@link #TYPE_MASTER}, {@link #TYPE_UNSIGNED_INT}, {@link
-   *     #TYPE_STRING}, {@link #TYPE_BINARY} and {@link #TYPE_FLOAT}.
+   * @return One of {@link #ELEMENT_TYPE_UNKNOWN}, {@link #ELEMENT_TYPE_MASTER}, {@link
+   *     #ELEMENT_TYPE_UNSIGNED_INT}, {@link #ELEMENT_TYPE_STRING}, {@link #ELEMENT_TYPE_BINARY} and
+   *     {@link #ELEMENT_TYPE_FLOAT}.
    */
   @ElementType
   int getElementType(int id);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReader.java
index 9987b3c8e6..c3f00a222f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReader.java
@@ -20,20 +20,20 @@ import com.google.android.exoplayer2.extractor.ExtractorInput;
 import java.io.IOException;
 
 /**
- * Event-driven EBML reader that delivers events to an {@link EbmlReaderOutput}.
- * <p>
- * EBML can be summarized as a binary XML format somewhat similar to Protocol Buffers. It was
- * originally designed for the Matroska container format. More information about EBML and
- * Matroska is available <a href="http://www.matroska.org/technical/specs/index.html">here</a>.
+ * Event-driven EBML reader that delivers events to an {@link EbmlProcessor}.
+ *
+ * <p>EBML can be summarized as a binary XML format somewhat similar to Protocol Buffers. It was
+ * originally designed for the Matroska container format. More information about EBML and Matroska
+ * is available <a href="http://www.matroska.org/technical/specs/index.html">here</a>.
  */
 /* package */ interface EbmlReader {
 
   /**
-   * Initializes the extractor with an {@link EbmlReaderOutput}.
+   * Initializes the extractor with an {@link EbmlProcessor}.
    *
-   * @param output An {@link EbmlReaderOutput} to receive events.
+   * @param processor An {@link EbmlProcessor} to process events.
    */
-  void init(EbmlReaderOutput output);
+  void init(EbmlProcessor processor);
 
   /**
    * Resets the state of the reader.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
index 187b9ae443..e7ca6de910 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor.mkv;
 
+import android.support.annotation.CallSuper;
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.util.Pair;
@@ -57,10 +58,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.UUID;
 
-/**
- * Extracts data from the Matroska and WebM container formats.
- */
-public final class MatroskaExtractor implements Extractor {
+/** Extracts data from the Matroska and WebM container formats. */
+public class MatroskaExtractor implements Extractor {
 
   /** Factory for {@link MatroskaExtractor} instances. */
   public static final ExtractorsFactory FACTORY = () -> new Extractor[] {new MatroskaExtractor()};
@@ -387,7 +386,7 @@ public final class MatroskaExtractor implements Extractor {
 
   /* package */ MatroskaExtractor(EbmlReader reader, @Flags int flags) {
     this.reader = reader;
-    this.reader.init(new InnerEbmlReaderOutput());
+    this.reader.init(new InnerEbmlProcessor());
     seekForCuesEnabled = (flags & FLAG_DISABLE_SEEK_FOR_CUES) == 0;
     varintReader = new VarintReader();
     tracks = new SparseArray<>();
@@ -403,17 +402,17 @@ public final class MatroskaExtractor implements Extractor {
   }
 
   @Override
-  public boolean sniff(ExtractorInput input) throws IOException, InterruptedException {
+  public final boolean sniff(ExtractorInput input) throws IOException, InterruptedException {
     return new Sniffer().sniff(input);
   }
 
   @Override
-  public void init(ExtractorOutput output) {
+  public final void init(ExtractorOutput output) {
     extractorOutput = output;
   }
 
   @Override
-  public void seek(long position, long timeUs) {
+  public final void seek(long position, long timeUs) {
     clusterTimecodeUs = C.TIME_UNSET;
     blockState = BLOCK_STATE_START;
     reader.reset();
@@ -425,13 +424,13 @@ public final class MatroskaExtractor implements Extractor {
   }
 
   @Override
-  public void release() {
+  public final void release() {
     // Do nothing
   }
 
   @Override
-  public int read(ExtractorInput input, PositionHolder seekPosition) throws IOException,
-      InterruptedException {
+  public final int read(ExtractorInput input, PositionHolder seekPosition)
+      throws IOException, InterruptedException {
     sampleRead = false;
     boolean continueReading = true;
     while (continueReading && !sampleRead) {
@@ -449,7 +448,125 @@ public final class MatroskaExtractor implements Extractor {
     return Extractor.RESULT_CONTINUE;
   }
 
-  /* package */ void startMasterElement(int id, long contentPosition, long contentSize)
+  /**
+   * Maps an element ID to a corresponding type.
+   *
+   * @see EbmlProcessor#getElementType(int)
+   */
+  @CallSuper
+  @EbmlProcessor.ElementType
+  protected int getElementType(int id) {
+    switch (id) {
+      case ID_EBML:
+      case ID_SEGMENT:
+      case ID_SEEK_HEAD:
+      case ID_SEEK:
+      case ID_INFO:
+      case ID_CLUSTER:
+      case ID_TRACKS:
+      case ID_TRACK_ENTRY:
+      case ID_AUDIO:
+      case ID_VIDEO:
+      case ID_CONTENT_ENCODINGS:
+      case ID_CONTENT_ENCODING:
+      case ID_CONTENT_COMPRESSION:
+      case ID_CONTENT_ENCRYPTION:
+      case ID_CONTENT_ENCRYPTION_AES_SETTINGS:
+      case ID_CUES:
+      case ID_CUE_POINT:
+      case ID_CUE_TRACK_POSITIONS:
+      case ID_BLOCK_GROUP:
+      case ID_PROJECTION:
+      case ID_COLOUR:
+      case ID_MASTERING_METADATA:
+        return EbmlProcessor.ELEMENT_TYPE_MASTER;
+      case ID_EBML_READ_VERSION:
+      case ID_DOC_TYPE_READ_VERSION:
+      case ID_SEEK_POSITION:
+      case ID_TIMECODE_SCALE:
+      case ID_TIME_CODE:
+      case ID_BLOCK_DURATION:
+      case ID_PIXEL_WIDTH:
+      case ID_PIXEL_HEIGHT:
+      case ID_DISPLAY_WIDTH:
+      case ID_DISPLAY_HEIGHT:
+      case ID_DISPLAY_UNIT:
+      case ID_TRACK_NUMBER:
+      case ID_TRACK_TYPE:
+      case ID_FLAG_DEFAULT:
+      case ID_FLAG_FORCED:
+      case ID_DEFAULT_DURATION:
+      case ID_CODEC_DELAY:
+      case ID_SEEK_PRE_ROLL:
+      case ID_CHANNELS:
+      case ID_AUDIO_BIT_DEPTH:
+      case ID_CONTENT_ENCODING_ORDER:
+      case ID_CONTENT_ENCODING_SCOPE:
+      case ID_CONTENT_COMPRESSION_ALGORITHM:
+      case ID_CONTENT_ENCRYPTION_ALGORITHM:
+      case ID_CONTENT_ENCRYPTION_AES_SETTINGS_CIPHER_MODE:
+      case ID_CUE_TIME:
+      case ID_CUE_CLUSTER_POSITION:
+      case ID_REFERENCE_BLOCK:
+      case ID_STEREO_MODE:
+      case ID_COLOUR_RANGE:
+      case ID_COLOUR_TRANSFER:
+      case ID_COLOUR_PRIMARIES:
+      case ID_MAX_CLL:
+      case ID_MAX_FALL:
+      case ID_PROJECTION_TYPE:
+        return EbmlProcessor.ELEMENT_TYPE_UNSIGNED_INT;
+      case ID_DOC_TYPE:
+      case ID_NAME:
+      case ID_CODEC_ID:
+      case ID_LANGUAGE:
+        return EbmlProcessor.ELEMENT_TYPE_STRING;
+      case ID_SEEK_ID:
+      case ID_CONTENT_COMPRESSION_SETTINGS:
+      case ID_CONTENT_ENCRYPTION_KEY_ID:
+      case ID_SIMPLE_BLOCK:
+      case ID_BLOCK:
+      case ID_CODEC_PRIVATE:
+      case ID_PROJECTION_PRIVATE:
+        return EbmlProcessor.ELEMENT_TYPE_BINARY;
+      case ID_DURATION:
+      case ID_SAMPLING_FREQUENCY:
+      case ID_PRIMARY_R_CHROMATICITY_X:
+      case ID_PRIMARY_R_CHROMATICITY_Y:
+      case ID_PRIMARY_G_CHROMATICITY_X:
+      case ID_PRIMARY_G_CHROMATICITY_Y:
+      case ID_PRIMARY_B_CHROMATICITY_X:
+      case ID_PRIMARY_B_CHROMATICITY_Y:
+      case ID_WHITE_POINT_CHROMATICITY_X:
+      case ID_WHITE_POINT_CHROMATICITY_Y:
+      case ID_LUMNINANCE_MAX:
+      case ID_LUMNINANCE_MIN:
+      case ID_PROJECTION_POSE_YAW:
+      case ID_PROJECTION_POSE_PITCH:
+      case ID_PROJECTION_POSE_ROLL:
+        return EbmlProcessor.ELEMENT_TYPE_FLOAT;
+      default:
+        return EbmlProcessor.ELEMENT_TYPE_UNKNOWN;
+    }
+  }
+
+  /**
+   * Checks if the given id is that of a level 1 element.
+   *
+   * @see EbmlProcessor#isLevel1Element(int)
+   */
+  @CallSuper
+  protected boolean isLevel1Element(int id) {
+    return id == ID_SEGMENT_INFO || id == ID_CLUSTER || id == ID_CUES || id == ID_TRACKS;
+  }
+
+  /**
+   * Called when the start of a master element is encountered.
+   *
+   * @see EbmlProcessor#startMasterElement(int, long, long)
+   */
+  @CallSuper
+  protected void startMasterElement(int id, long contentPosition, long contentSize)
       throws ParserException {
     switch (id) {
       case ID_SEGMENT:
@@ -505,7 +622,13 @@ public final class MatroskaExtractor implements Extractor {
     }
   }
 
-  /* package */ void endMasterElement(int id) throws ParserException {
+  /**
+   * Called when the end of a master element is encountered.
+   *
+   * @see EbmlProcessor#endMasterElement(int)
+   */
+  @CallSuper
+  protected void endMasterElement(int id) throws ParserException {
     switch (id) {
       case ID_SEGMENT_INFO:
         if (timecodeScale == C.TIME_UNSET) {
@@ -576,7 +699,13 @@ public final class MatroskaExtractor implements Extractor {
     }
   }
 
-  /* package */ void integerElement(int id, long value) throws ParserException {
+  /**
+   * Called when an integer element is encountered.
+   *
+   * @see EbmlProcessor#integerElement(int, long)
+   */
+  @CallSuper
+  protected void integerElement(int id, long value) throws ParserException {
     switch (id) {
       case ID_EBML_READ_VERSION:
         // Validate that EBMLReadVersion is supported. This extractor only supports v1.
@@ -787,7 +916,13 @@ public final class MatroskaExtractor implements Extractor {
     }
   }
 
-  /* package */ void floatElement(int id, double value) {
+  /**
+   * Called when a float element is encountered.
+   *
+   * @see EbmlProcessor#floatElement(int, double)
+   */
+  @CallSuper
+  protected void floatElement(int id, double value) throws ParserException {
     switch (id) {
       case ID_DURATION:
         durationTimecode = (long) value;
@@ -839,7 +974,13 @@ public final class MatroskaExtractor implements Extractor {
     }
   }
 
-  /* package */ void stringElement(int id, String value) throws ParserException {
+  /**
+   * Called when a string element is encountered.
+   *
+   * @see EbmlProcessor#stringElement(int, String)
+   */
+  @CallSuper
+  protected void stringElement(int id, String value) throws ParserException {
     switch (id) {
       case ID_DOC_TYPE:
         // Validate that DocType is supported.
@@ -861,7 +1002,13 @@ public final class MatroskaExtractor implements Extractor {
     }
   }
 
-  /* package */ void binaryElement(int id, int contentSize, ExtractorInput input)
+  /**
+   * Called when a binary element is encountered.
+   *
+   * @see EbmlProcessor#binaryElement(int, int, ExtractorInput)
+   */
+  @CallSuper
+  protected void binaryElement(int id, int contentSize, ExtractorInput input)
       throws IOException, InterruptedException {
     switch (id) {
       case ID_SEEK_ID:
@@ -1431,110 +1578,18 @@ public final class MatroskaExtractor implements Extractor {
     }
   }
 
-  /**
-   * Passes events through to the outer {@link MatroskaExtractor}.
-   */
-  private final class InnerEbmlReaderOutput implements EbmlReaderOutput {
+  /** Passes events through to the outer {@link MatroskaExtractor}. */
+  private final class InnerEbmlProcessor implements EbmlProcessor {
 
     @Override
+    @ElementType
     public int getElementType(int id) {
-      switch (id) {
-        case ID_EBML:
-        case ID_SEGMENT:
-        case ID_SEEK_HEAD:
-        case ID_SEEK:
-        case ID_INFO:
-        case ID_CLUSTER:
-        case ID_TRACKS:
-        case ID_TRACK_ENTRY:
-        case ID_AUDIO:
-        case ID_VIDEO:
-        case ID_CONTENT_ENCODINGS:
-        case ID_CONTENT_ENCODING:
-        case ID_CONTENT_COMPRESSION:
-        case ID_CONTENT_ENCRYPTION:
-        case ID_CONTENT_ENCRYPTION_AES_SETTINGS:
-        case ID_CUES:
-        case ID_CUE_POINT:
-        case ID_CUE_TRACK_POSITIONS:
-        case ID_BLOCK_GROUP:
-        case ID_PROJECTION:
-        case ID_COLOUR:
-        case ID_MASTERING_METADATA:
-          return TYPE_MASTER;
-        case ID_EBML_READ_VERSION:
-        case ID_DOC_TYPE_READ_VERSION:
-        case ID_SEEK_POSITION:
-        case ID_TIMECODE_SCALE:
-        case ID_TIME_CODE:
-        case ID_BLOCK_DURATION:
-        case ID_PIXEL_WIDTH:
-        case ID_PIXEL_HEIGHT:
-        case ID_DISPLAY_WIDTH:
-        case ID_DISPLAY_HEIGHT:
-        case ID_DISPLAY_UNIT:
-        case ID_TRACK_NUMBER:
-        case ID_TRACK_TYPE:
-        case ID_FLAG_DEFAULT:
-        case ID_FLAG_FORCED:
-        case ID_DEFAULT_DURATION:
-        case ID_CODEC_DELAY:
-        case ID_SEEK_PRE_ROLL:
-        case ID_CHANNELS:
-        case ID_AUDIO_BIT_DEPTH:
-        case ID_CONTENT_ENCODING_ORDER:
-        case ID_CONTENT_ENCODING_SCOPE:
-        case ID_CONTENT_COMPRESSION_ALGORITHM:
-        case ID_CONTENT_ENCRYPTION_ALGORITHM:
-        case ID_CONTENT_ENCRYPTION_AES_SETTINGS_CIPHER_MODE:
-        case ID_CUE_TIME:
-        case ID_CUE_CLUSTER_POSITION:
-        case ID_REFERENCE_BLOCK:
-        case ID_STEREO_MODE:
-        case ID_COLOUR_RANGE:
-        case ID_COLOUR_TRANSFER:
-        case ID_COLOUR_PRIMARIES:
-        case ID_MAX_CLL:
-        case ID_MAX_FALL:
-        case ID_PROJECTION_TYPE:
-          return TYPE_UNSIGNED_INT;
-        case ID_DOC_TYPE:
-        case ID_NAME:
-        case ID_CODEC_ID:
-        case ID_LANGUAGE:
-          return TYPE_STRING;
-        case ID_SEEK_ID:
-        case ID_CONTENT_COMPRESSION_SETTINGS:
-        case ID_CONTENT_ENCRYPTION_KEY_ID:
-        case ID_SIMPLE_BLOCK:
-        case ID_BLOCK:
-        case ID_CODEC_PRIVATE:
-        case ID_PROJECTION_PRIVATE:
-          return TYPE_BINARY;
-        case ID_DURATION:
-        case ID_SAMPLING_FREQUENCY:
-        case ID_PRIMARY_R_CHROMATICITY_X:
-        case ID_PRIMARY_R_CHROMATICITY_Y:
-        case ID_PRIMARY_G_CHROMATICITY_X:
-        case ID_PRIMARY_G_CHROMATICITY_Y:
-        case ID_PRIMARY_B_CHROMATICITY_X:
-        case ID_PRIMARY_B_CHROMATICITY_Y:
-        case ID_WHITE_POINT_CHROMATICITY_X:
-        case ID_WHITE_POINT_CHROMATICITY_Y:
-        case ID_LUMNINANCE_MAX:
-        case ID_LUMNINANCE_MIN:
-        case ID_PROJECTION_POSE_YAW:
-        case ID_PROJECTION_POSE_PITCH:
-        case ID_PROJECTION_POSE_ROLL:
-          return TYPE_FLOAT;
-        default:
-          return TYPE_UNKNOWN;
-      }
+      return MatroskaExtractor.this.getElementType(id);
     }
 
     @Override
     public boolean isLevel1Element(int id) {
-      return id == ID_SEGMENT_INFO || id == ID_CLUSTER || id == ID_CUES || id == ID_TRACKS;
+      return MatroskaExtractor.this.isLevel1Element(id);
     }
 
     @Override
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java
index 7383f8a538..b1c5171746 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java
@@ -37,19 +37,19 @@ public class DefaultEbmlReaderTest {
   @Test
   public void testMasterElement() throws IOException, InterruptedException {
     ExtractorInput input = createTestInput(0x1A, 0x45, 0xDF, 0xA3, 0x84, 0x42, 0x85, 0x81, 0x01);
-    TestOutput expected = new TestOutput();
-    expected.startMasterElement(TestOutput.ID_EBML, 5, 4);
-    expected.integerElement(TestOutput.ID_DOC_TYPE_READ_VERSION, 1);
-    expected.endMasterElement(TestOutput.ID_EBML);
+    TestProcessor expected = new TestProcessor();
+    expected.startMasterElement(TestProcessor.ID_EBML, 5, 4);
+    expected.integerElement(TestProcessor.ID_DOC_TYPE_READ_VERSION, 1);
+    expected.endMasterElement(TestProcessor.ID_EBML);
     assertEvents(input, expected.events);
   }
 
   @Test
   public void testMasterElementEmpty() throws IOException, InterruptedException {
     ExtractorInput input = createTestInput(0x18, 0x53, 0x80, 0x67, 0x80);
-    TestOutput expected = new TestOutput();
-    expected.startMasterElement(TestOutput.ID_SEGMENT, 5, 0);
-    expected.endMasterElement(TestOutput.ID_SEGMENT);
+    TestProcessor expected = new TestProcessor();
+    expected.startMasterElement(TestProcessor.ID_SEGMENT, 5, 0);
+    expected.endMasterElement(TestProcessor.ID_SEGMENT);
     assertEvents(input, expected.events);
   }
 
@@ -57,8 +57,8 @@ public class DefaultEbmlReaderTest {
   public void testUnsignedIntegerElement() throws IOException, InterruptedException {
     // 0xFE is chosen because for signed integers it should be interpreted as -2
     ExtractorInput input = createTestInput(0x42, 0xF7, 0x81, 0xFE);
-    TestOutput expected = new TestOutput();
-    expected.integerElement(TestOutput.ID_EBML_READ_VERSION, 254);
+    TestProcessor expected = new TestProcessor();
+    expected.integerElement(TestProcessor.ID_EBML_READ_VERSION, 254);
     assertEvents(input, expected.events);
   }
 
@@ -66,8 +66,8 @@ public class DefaultEbmlReaderTest {
   public void testUnsignedIntegerElementLarge() throws IOException, InterruptedException {
     ExtractorInput input =
         createTestInput(0x42, 0xF7, 0x88, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF);
-    TestOutput expected = new TestOutput();
-    expected.integerElement(TestOutput.ID_EBML_READ_VERSION, Long.MAX_VALUE);
+    TestProcessor expected = new TestProcessor();
+    expected.integerElement(TestProcessor.ID_EBML_READ_VERSION, Long.MAX_VALUE);
     assertEvents(input, expected.events);
   }
 
@@ -76,32 +76,32 @@ public class DefaultEbmlReaderTest {
       throws IOException, InterruptedException {
     ExtractorInput input =
         createTestInput(0x42, 0xF7, 0x88, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF);
-    TestOutput expected = new TestOutput();
-    expected.integerElement(TestOutput.ID_EBML_READ_VERSION, -1);
+    TestProcessor expected = new TestProcessor();
+    expected.integerElement(TestProcessor.ID_EBML_READ_VERSION, -1);
     assertEvents(input, expected.events);
   }
 
   @Test
   public void testStringElement() throws IOException, InterruptedException {
     ExtractorInput input = createTestInput(0x42, 0x82, 0x86, 0x41, 0x62, 0x63, 0x31, 0x32, 0x33);
-    TestOutput expected = new TestOutput();
-    expected.stringElement(TestOutput.ID_DOC_TYPE, "Abc123");
+    TestProcessor expected = new TestProcessor();
+    expected.stringElement(TestProcessor.ID_DOC_TYPE, "Abc123");
     assertEvents(input, expected.events);
   }
 
   @Test
   public void testStringElementWithZeroPadding() throws IOException, InterruptedException {
     ExtractorInput input = createTestInput(0x42, 0x82, 0x86, 0x41, 0x62, 0x63, 0x00, 0x00, 0x00);
-    TestOutput expected = new TestOutput();
-    expected.stringElement(TestOutput.ID_DOC_TYPE, "Abc");
+    TestProcessor expected = new TestProcessor();
+    expected.stringElement(TestProcessor.ID_DOC_TYPE, "Abc");
     assertEvents(input, expected.events);
   }
 
   @Test
   public void testStringElementEmpty() throws IOException, InterruptedException {
     ExtractorInput input = createTestInput(0x42, 0x82, 0x80);
-    TestOutput expected = new TestOutput();
-    expected.stringElement(TestOutput.ID_DOC_TYPE, "");
+    TestProcessor expected = new TestProcessor();
+    expected.stringElement(TestProcessor.ID_DOC_TYPE, "");
     assertEvents(input, expected.events);
   }
 
@@ -109,8 +109,8 @@ public class DefaultEbmlReaderTest {
   public void testFloatElementFourBytes() throws IOException, InterruptedException {
     ExtractorInput input =
         createTestInput(0x44, 0x89, 0x84, 0x3F, 0x80, 0x00, 0x00);
-    TestOutput expected = new TestOutput();
-    expected.floatElement(TestOutput.ID_DURATION, 1.0);
+    TestProcessor expected = new TestProcessor();
+    expected.floatElement(TestProcessor.ID_DURATION, 1.0);
     assertEvents(input, expected.events);
   }
 
@@ -118,8 +118,8 @@ public class DefaultEbmlReaderTest {
   public void testFloatElementEightBytes() throws IOException, InterruptedException {
     ExtractorInput input =
         createTestInput(0x44, 0x89, 0x88, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);
-    TestOutput expected = new TestOutput();
-    expected.floatElement(TestOutput.ID_DURATION, -2.0);
+    TestProcessor expected = new TestProcessor();
+    expected.floatElement(TestProcessor.ID_DURATION, -2.0);
     assertEvents(input, expected.events);
   }
 
@@ -127,8 +127,10 @@ public class DefaultEbmlReaderTest {
   public void testBinaryElement() throws IOException, InterruptedException {
     ExtractorInput input =
         createTestInput(0xA3, 0x88, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08);
-    TestOutput expected = new TestOutput();
-    expected.binaryElement(TestOutput.ID_SIMPLE_BLOCK, 8,
+    TestProcessor expected = new TestProcessor();
+    expected.binaryElement(
+        TestProcessor.ID_SIMPLE_BLOCK,
+        8,
         createTestInput(0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08));
     assertEvents(input, expected.events);
   }
@@ -136,7 +138,7 @@ public class DefaultEbmlReaderTest {
   private static void assertEvents(ExtractorInput input, List<String> expectedEvents)
       throws IOException, InterruptedException {
     DefaultEbmlReader reader = new DefaultEbmlReader();
-    TestOutput output = new TestOutput();
+    TestProcessor output = new TestProcessor();
     reader.init(output);
 
     // We expect the number of successful reads to equal the number of expected events.
@@ -164,10 +166,8 @@ public class DefaultEbmlReaderTest {
         .build();
   }
 
-  /**
-   * An {@link EbmlReaderOutput} that records each event callback.
-   */
-  private static final class TestOutput implements EbmlReaderOutput {
+  /** An {@link EbmlProcessor} that records each event callback. */
+  private static final class TestProcessor implements EbmlProcessor {
 
     // Element IDs
     private static final int ID_EBML = 0x1A45DFA3;
@@ -182,22 +182,23 @@ public class DefaultEbmlReaderTest {
     private final List<String> events = new ArrayList<>();
 
     @Override
-    public @ElementType int getElementType(int id) {
+    @EbmlProcessor.ElementType
+    public int getElementType(int id) {
       switch (id) {
         case ID_EBML:
         case ID_SEGMENT:
-          return TYPE_MASTER;
+          return EbmlProcessor.ELEMENT_TYPE_MASTER;
         case ID_EBML_READ_VERSION:
         case ID_DOC_TYPE_READ_VERSION:
-          return TYPE_UNSIGNED_INT;
+          return EbmlProcessor.ELEMENT_TYPE_UNSIGNED_INT;
         case ID_DOC_TYPE:
-          return TYPE_STRING;
+          return EbmlProcessor.ELEMENT_TYPE_STRING;
         case ID_SIMPLE_BLOCK:
-          return TYPE_BINARY;
+          return EbmlProcessor.ELEMENT_TYPE_BINARY;
         case ID_DURATION:
-          return TYPE_FLOAT;
+          return EbmlProcessor.ELEMENT_TYPE_FLOAT;
         default:
-          return TYPE_UNKNOWN;
+          return EbmlProcessor.ELEMENT_TYPE_UNKNOWN;
       }
     }
 
@@ -219,12 +220,12 @@ public class DefaultEbmlReaderTest {
 
     @Override
     public void integerElement(int id, long value) {
-      events.add(formatEvent(id, "integer=" + String.valueOf(value)));
+      events.add(formatEvent(id, "integer=" + value));
     }
 
     @Override
     public void floatElement(int id, double value) {
-      events.add(formatEvent(id, "float=" + String.valueOf(value)));
+      events.add(formatEvent(id, "float=" + value));
     }
 
     @Override

From 434b5a30293cb7701ea35c25b1c7302fe3b8ce89 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 8 Feb 2019 16:27:47 +0000
Subject: [PATCH 501/832] Enable use of database storage in CachedContentIndex

It's not yet enabled in the SimpleCache layer, however, so
this is a no-op change.

PiperOrigin-RevId: 233064490
---
 .../upstream/cache/CachedContentIndex.java    | 79 ++++++++++++-------
 .../upstream/cache/SimpleCache.java           | 10 ++-
 .../cache/CachedContentIndexTest.java         | 61 +++++++++-----
 .../cache/CachedRegionTrackerTest.java        |  3 +-
 .../upstream/cache/SimpleCacheSpanTest.java   |  3 +-
 .../upstream/cache/SimpleCacheTest.java       |  4 +-
 .../android/exoplayer2/testutil/TestUtil.java | 21 +++++
 7 files changed, 128 insertions(+), 53 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
index d0712ac685..85e753322a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
@@ -102,41 +102,60 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   }
 
   /**
-   * Creates a CachedContentIndex which works on the index file in the given cacheDir.
+   * Creates an instance supporting database storage only.
    *
-   * @param cacheDir Directory where the index file is kept.
+   * @param databaseProvider Provides the database in which the index is stored.
    */
-  public CachedContentIndex(File cacheDir) {
-    this(cacheDir, null);
+  public CachedContentIndex(DatabaseProvider databaseProvider) {
+    this(
+        databaseProvider,
+        /* legacyStorageDir= */ null,
+        /* legacyStorageSecretKey= */ null,
+        /* legacyStorageEncrypt= */ false,
+        /* preferLegacyStorage= */ false);
   }
 
   /**
-   * Creates a CachedContentIndex which works on the index file in the given cacheDir.
+   * Creates an instance supporting either or both of database and legacy storage.
    *
-   * @param cacheDir Directory where the index file is kept.
-   * @param secretKey 16 byte AES key for reading and writing the cache index.
+   * @param databaseProvider Provides the database in which the index is stored, or {@code null} to
+   *     use only legacy storage.
+   * @param legacyStorageDir The directory in which any legacy storage is stored, or {@code null} to
+   *     use only database storage.
+   * @param legacyStorageSecretKey A 16 byte AES key for reading, and optionally writing, legacy
+   *     storage.
+   * @param legacyStorageEncrypt Whether to encrypt when writing to legacy storage. Must be false if
+   *     {@code secretKey} is null.
+   * @param preferLegacyStorage Whether to use prefer legacy storage if both storage types are
+   *     enabled. This option is only useful for downgrading from database storage back to legacy
+   *     storage.
    */
-  public CachedContentIndex(File cacheDir, @Nullable byte[] secretKey) {
-    this(cacheDir, secretKey, secretKey != null);
-  }
-
-  /**
-   * Creates a CachedContentIndex which works on the index file in the given cacheDir.
-   *
-   * @param cacheDir Directory where the index file is kept.
-   * @param secretKey 16 byte AES key for reading, and optionally writing, the cache index.
-   * @param encrypt Whether the index will be encrypted when written. Must be false if {@code
-   *     secretKey} is null.
-   */
-  public CachedContentIndex(File cacheDir, @Nullable byte[] secretKey, boolean encrypt) {
+  public CachedContentIndex(
+      @Nullable DatabaseProvider databaseProvider,
+      @Nullable File legacyStorageDir,
+      @Nullable byte[] legacyStorageSecretKey,
+      boolean legacyStorageEncrypt,
+      boolean preferLegacyStorage) {
+    Assertions.checkState(databaseProvider != null || legacyStorageDir != null);
     keyToContent = new HashMap<>();
     idToKey = new SparseArray<>();
     removedIds = new SparseBooleanArray();
-    Storage atomicFileStorage =
-        new AtomicFileStorage(new File(cacheDir, FILE_NAME_ATOMIC), secretKey, encrypt);
-    // Storage sqliteStorage = new SQLiteStorage(databaseProvider);
-    storage = atomicFileStorage;
-    previousStorage = null;
+    Storage databaseStorage =
+        databaseProvider != null ? new DatabaseStorage(databaseProvider) : null;
+    Storage legacyStorage =
+        legacyStorageDir != null
+            ? new LegacyStorage(
+                new File(legacyStorageDir, FILE_NAME_ATOMIC),
+                legacyStorageSecretKey,
+                legacyStorageEncrypt)
+            : null;
+    if (databaseStorage == null || (legacyStorage != null && preferLegacyStorage)) {
+      storage = legacyStorage;
+      previousStorage = databaseStorage;
+    } else {
+      storage = databaseStorage;
+      previousStorage = legacyStorage;
+    }
   }
 
   /** Loads the index file. */
@@ -413,7 +432,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   }
 
   /** {@link Storage} implementation that uses an {@link AtomicFile}. */
-  private static class AtomicFileStorage implements Storage {
+  private static class LegacyStorage implements Storage {
 
     private final boolean encrypt;
     @Nullable private final Cipher cipher;
@@ -424,7 +443,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     private boolean changed;
     @Nullable private ReusableBufferedOutputStream bufferedOutputStream;
 
-    public AtomicFileStorage(File file, @Nullable byte[] secretKey, boolean encrypt) {
+    public LegacyStorage(File file, @Nullable byte[] secretKey, boolean encrypt) {
       Cipher cipher = null;
       SecretKeySpec secretKeySpec = null;
       if (secretKey != null) {
@@ -436,7 +455,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
           throw new IllegalStateException(e); // Should never happen.
         }
       } else {
-        Assertions.checkArgument(!encrypt);
+        Assertions.checkState(!encrypt);
       }
       this.encrypt = encrypt;
       this.cipher = cipher;
@@ -642,7 +661,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   }
 
   /** {@link Storage} implementation that uses an SQL database. */
-  private static final class SQLiteStorage implements Storage {
+  private static final class DatabaseStorage implements Storage {
 
     private static final String TABLE_NAME = DatabaseProvider.TABLE_PREFIX + "CacheContentMetadata";
     private static final int TABLE_VERSION = 1;
@@ -674,7 +693,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     private final DatabaseProvider databaseProvider;
     private final SparseArray<CachedContent> pendingUpdates;
 
-    public SQLiteStorage(DatabaseProvider databaseProvider) {
+    public DatabaseStorage(DatabaseProvider databaseProvider) {
       this.databaseProvider = databaseProvider;
       pendingUpdates = new SparseArray<>();
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index 8943a594cb..89007b00dd 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -125,7 +125,15 @@ public final class SimpleCache implements Cache {
    *     secretKey} is null.
    */
   public SimpleCache(File cacheDir, CacheEvictor evictor, byte[] secretKey, boolean encrypt) {
-    this(cacheDir, evictor, new CachedContentIndex(cacheDir, secretKey, encrypt));
+    this(
+        cacheDir,
+        evictor,
+        new CachedContentIndex(
+            /* databaseProvider= */ null,
+            cacheDir,
+            secretKey,
+            encrypt,
+            /* preferLegacyStorage= */ true));
   }
 
   /**
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
index d86e76d147..d25aa6784e 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
@@ -19,8 +19,10 @@ import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
 import android.net.Uri;
+import android.support.annotation.Nullable;
 import android.util.SparseArray;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.util.Util;
 import java.io.File;
 import java.io.FileInputStream;
@@ -73,14 +75,12 @@ public class CachedContentIndexTest {
       0, 0, 0, 0, 0, 0, 10, 0, // original_content_length
       0x12, 0x15, 0x66, (byte) 0x8A // hashcode_of_CachedContent_array
   };
-  private CachedContentIndex index;
   private File cacheDir;
 
   @Before
   public void setUp() throws Exception {
     cacheDir =
         Util.createTempDirectory(RuntimeEnvironment.application, "ExoPlayerTest");
-    index = new CachedContentIndex(cacheDir);
   }
 
   @After
@@ -94,6 +94,8 @@ public class CachedContentIndexTest {
     final String key2 = "key2";
     final String key3 = "key3";
 
+    CachedContentIndex index = newInstance();
+
     // Add two CachedContents with add methods
     CachedContent cachedContent1 = index.getOrAdd(key1);
     CachedContent cachedContent2 = index.getOrAdd(key2);
@@ -145,12 +147,14 @@ public class CachedContentIndexTest {
   }
 
   @Test
-  public void testStoreAndLoad() throws Exception {
-    assertStoredAndLoadedEqual(index, new CachedContentIndex(cacheDir));
+  public void testLegacyStoreAndLoad() throws Exception {
+    assertStoredAndLoadedEqual(newLegacyInstance(), newLegacyInstance());
   }
 
   @Test
-  public void testLoadV1() throws Exception {
+  public void testLegacyLoadV1() throws Exception {
+    CachedContentIndex index = newLegacyInstance();
+
     FileOutputStream fos =
         new FileOutputStream(new File(cacheDir, CachedContentIndex.FILE_NAME_ATOMIC));
     fos.write(testIndexV1File);
@@ -169,7 +173,9 @@ public class CachedContentIndexTest {
   }
 
   @Test
-  public void testLoadV2() throws Exception {
+  public void testLegacyLoadV2() throws Exception {
+    CachedContentIndex index = newLegacyInstance();
+
     FileOutputStream fos =
         new FileOutputStream(new File(cacheDir, CachedContentIndex.FILE_NAME_ATOMIC));
     fos.write(testIndexV2File);
@@ -190,6 +196,7 @@ public class CachedContentIndexTest {
 
   @Test
   public void testAssignIdForKeyAndGetKeyForId() {
+    CachedContentIndex index = newInstance();
     final String key1 = "key1";
     final String key2 = "key2";
     int id1 = index.assignIdForKey(key1);
@@ -214,12 +221,11 @@ public class CachedContentIndexTest {
   }
 
   @Test
-  public void testEncryption() throws Exception {
+  public void testLegacyEncryption() throws Exception {
     byte[] key = "Bar12345Bar12345".getBytes(C.UTF8_NAME); // 128 bit key
     byte[] key2 = "Foo12345Foo12345".getBytes(C.UTF8_NAME); // 128 bit key
 
-    assertStoredAndLoadedEqual(
-        new CachedContentIndex(cacheDir, key), new CachedContentIndex(cacheDir, key));
+    assertStoredAndLoadedEqual(newLegacyInstance(key), newLegacyInstance(key));
 
     // Rename the index file from the test above
     File file1 = new File(cacheDir, CachedContentIndex.FILE_NAME_ATOMIC);
@@ -227,8 +233,7 @@ public class CachedContentIndexTest {
     assertThat(file1.renameTo(file2)).isTrue();
 
     // Write a new index file
-    assertStoredAndLoadedEqual(
-        new CachedContentIndex(cacheDir, key), new CachedContentIndex(cacheDir, key));
+    assertStoredAndLoadedEqual(newLegacyInstance(key), newLegacyInstance(key));
 
     assertThat(file1.length()).isEqualTo(file2.length());
     // Assert file content is different
@@ -240,8 +245,7 @@ public class CachedContentIndexTest {
 
     boolean threw = false;
     try {
-      assertStoredAndLoadedEqual(
-          new CachedContentIndex(cacheDir, key), new CachedContentIndex(cacheDir, key2));
+      assertStoredAndLoadedEqual(newLegacyInstance(key), newLegacyInstance(key2));
     } catch (AssertionError e) {
       threw = true;
     }
@@ -250,8 +254,7 @@ public class CachedContentIndexTest {
         .isTrue();
 
     try {
-      assertStoredAndLoadedEqual(
-          new CachedContentIndex(cacheDir, key), new CachedContentIndex(cacheDir));
+      assertStoredAndLoadedEqual(newLegacyInstance(key), newLegacyInstance());
     } catch (AssertionError e) {
       threw = true;
     }
@@ -260,18 +263,18 @@ public class CachedContentIndexTest {
         .isTrue();
 
     // Non encrypted index file can be read even when encryption key provided.
-    assertStoredAndLoadedEqual(
-        new CachedContentIndex(cacheDir), new CachedContentIndex(cacheDir, key));
+    assertStoredAndLoadedEqual(newLegacyInstance(), newLegacyInstance(key));
 
     // Test multiple store() calls
-    CachedContentIndex index = new CachedContentIndex(cacheDir, key);
+    CachedContentIndex index = newLegacyInstance(key);
     index.getOrAdd("key3");
     index.store();
-    assertStoredAndLoadedEqual(index, new CachedContentIndex(cacheDir, key));
+    assertStoredAndLoadedEqual(index, newLegacyInstance(key));
   }
 
   @Test
   public void testRemoveEmptyNotLockedCachedContent() {
+    CachedContentIndex index = newInstance();
     CachedContent cachedContent = index.getOrAdd("key1");
 
     index.maybeRemove(cachedContent.key);
@@ -281,6 +284,8 @@ public class CachedContentIndexTest {
 
   @Test
   public void testCantRemoveNotEmptyCachedContent() throws Exception {
+    CachedContentIndex index = newInstance();
+
     CachedContent cachedContent = index.getOrAdd("key1");
     long cacheFileLength = 20;
     File cacheFile =
@@ -300,6 +305,7 @@ public class CachedContentIndexTest {
 
   @Test
   public void testCantRemoveLockedCachedContent() {
+    CachedContentIndex index = newInstance();
     CachedContent cachedContent = index.getOrAdd("key1");
     cachedContent.setLocked(true);
 
@@ -327,4 +333,21 @@ public class CachedContentIndexTest {
       assertThat(index2.get(key)).isEqualTo(index.get(key));
     }
   }
+
+  private CachedContentIndex newInstance() {
+    return new CachedContentIndex(TestUtil.getTestDatabaseProvider());
+  }
+
+  private CachedContentIndex newLegacyInstance() {
+    return newLegacyInstance(null);
+  }
+
+  private CachedContentIndex newLegacyInstance(@Nullable byte[] key) {
+    return new CachedContentIndex(
+        /* databaseProvider= */ null,
+        cacheDir,
+        /* legacyStorageSecretKey= */ key,
+        /* legacyStorageEncrypt= */ key != null,
+        /* preferLegacyStorage= */ true);
+  }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java
index cb980206fe..231ab3fb2b 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java
@@ -21,6 +21,7 @@ import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.when;
 
 import com.google.android.exoplayer2.extractor.ChunkIndex;
+import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.util.Util;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -64,7 +65,7 @@ public final class CachedRegionTrackerTest {
     when(cache.addListener(anyString(), any(Cache.Listener.class))).thenReturn(new TreeSet<>());
     tracker = new CachedRegionTracker(cache, CACHE_KEY, CHUNK_INDEX);
     cacheDir = Util.createTempDirectory(RuntimeEnvironment.application, "ExoPlayerTest");
-    index = new CachedContentIndex(cacheDir);
+    index = new CachedContentIndex(TestUtil.getTestDatabaseProvider());
   }
 
   @After
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java
index 41aeb56364..10c96917ae 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.upstream.cache;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
+import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.util.Util;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -51,7 +52,7 @@ public class SimpleCacheSpanTest {
   public void setUp() throws Exception {
     cacheDir =
         Util.createTempDirectory(RuntimeEnvironment.application, "ExoPlayerTest");
-    index = new CachedContentIndex(cacheDir);
+    index = new CachedContentIndex(TestUtil.getTestDatabaseProvider());
   }
 
   @After
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
index 6140d0ac82..cf76feca49 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
@@ -22,6 +22,7 @@ import static com.google.common.truth.Truth.assertWithMessage;
 import static org.mockito.Mockito.doAnswer;
 
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.upstream.cache.Cache.CacheException;
 import com.google.android.exoplayer2.util.Util;
 import java.io.File;
@@ -293,7 +294,8 @@ public class SimpleCacheTest {
   /* Tests https://github.com/google/ExoPlayer/issues/3260 case. */
   @Test
   public void testExceptionDuringEvictionByLeastRecentlyUsedCacheEvictorNotHang() throws Exception {
-    CachedContentIndex index = Mockito.spy(new CachedContentIndex(cacheDir));
+    CachedContentIndex index =
+        Mockito.spy(new CachedContentIndex(TestUtil.getTestDatabaseProvider()));
     SimpleCache simpleCache =
         new SimpleCache(cacheDir, new LeastRecentlyUsedCacheEvictor(20), index);
 
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/TestUtil.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/TestUtil.java
index 3351e2db8d..facfa0d7e4 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/TestUtil.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/TestUtil.java
@@ -19,11 +19,15 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.net.Uri;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.database.DatabaseProvider;
+import com.google.android.exoplayer2.database.DefaultDatabaseProvider;
 import com.google.android.exoplayer2.extractor.DefaultExtractorInput;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
@@ -155,6 +159,23 @@ public class TestUtil {
     return BitmapFactory.decodeStream(getInputStream(context, fileName));
   }
 
+  public static DatabaseProvider getTestDatabaseProvider() {
+    // Provides an in-memory database.
+    return new DefaultDatabaseProvider(
+        new SQLiteOpenHelper(
+            /* context= */ null, /* name= */ null, /* factory= */ null, /* version= */ 1) {
+          @Override
+          public void onCreate(SQLiteDatabase db) {
+            // Do nothing.
+          }
+
+          @Override
+          public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+            // Do nothing.
+          }
+        });
+  }
+
   /**
    * Asserts that data read from a {@link DataSource} matches {@code expected}.
    *

From 9b6caf9edaa873d2b2b77a8b449e36325273124c Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 8 Feb 2019 16:45:00 +0000
Subject: [PATCH 502/832] Merge #5438: Dolby Vision

Imported from GitHub PR https://github.com/google/ExoPlayer/pull/5438

Plus the following changes:
- Only support profile 5 (handling other profiles requires
  backward-compatibility changes in the renderer which are left for a later
  change.)
- Only add KEY_PROFILE to the codec configuration MediaFormat for Dolby Vision.
- In MediaCodecUtil support all DV profiles that Android has constants for. This
  includes ones that are "not supported for new applications". Since we don't
  extract these profiles, this is currently only for the benefit of custom
  extractors.
- Misc code style fixes and reordering for consistency.

Merge 37878b975c2bc082b0568e21cbe62bfcef97c10d into 67be9e77834c0dc9d2b5d462c01c2f39718c8817

PiperOrigin-RevId: 233066799
---
 RELEASENOTES.md                               |  1 +
 .../exoplayer2/extractor/mp4/Atom.java        | 10 ++-
 .../exoplayer2/extractor/mp4/AtomParsers.java | 47 +++++++++++---
 .../exoplayer2/mediacodec/MediaCodecUtil.java | 59 +++++++++++++++++
 .../android/exoplayer2/util/MimeTypes.java    |  6 ++
 .../exoplayer2/video/DolbyVisionConfig.java   | 64 +++++++++++++++++++
 .../video/MediaCodecVideoRenderer.java        | 11 ++++
 7 files changed, 188 insertions(+), 10 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/video/DolbyVisionConfig.java

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 90eddb7c08..16b42dcf9f 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -14,6 +14,7 @@
   * Update `TrackSelection.Factory` interface to support creating all track
     selections together.
 * Do not retry failed loads whose error is `FileNotFoundException`.
+* Support Dolby Vision extraction in MP4 and fMP4.
 * Offline:
   * Speed up removal of segmented downloads
     ([#5136](https://github.com/google/ExoPlayer/issues/5136)).
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
index 8d78337617..d5fcf46025 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
@@ -53,8 +53,16 @@ import java.util.List;
   public static final int TYPE_ftyp = Util.getIntegerCodeForString("ftyp");
   public static final int TYPE_avc1 = Util.getIntegerCodeForString("avc1");
   public static final int TYPE_avc3 = Util.getIntegerCodeForString("avc3");
+  public static final int TYPE_avcC = Util.getIntegerCodeForString("avcC");
   public static final int TYPE_hvc1 = Util.getIntegerCodeForString("hvc1");
   public static final int TYPE_hev1 = Util.getIntegerCodeForString("hev1");
+  public static final int TYPE_hvcC = Util.getIntegerCodeForString("hvcC");
+  public static final int TYPE_dvav = Util.getIntegerCodeForString("dvav");
+  public static final int TYPE_dva1 = Util.getIntegerCodeForString("dva1");
+  public static final int TYPE_dvhe = Util.getIntegerCodeForString("dvhe");
+  public static final int TYPE_dvh1 = Util.getIntegerCodeForString("dvh1");
+  public static final int TYPE_dvcC = Util.getIntegerCodeForString("dvcC");
+  public static final int TYPE_dvvC = Util.getIntegerCodeForString("dvvC");
   public static final int TYPE_s263 = Util.getIntegerCodeForString("s263");
   public static final int TYPE_d263 = Util.getIntegerCodeForString("d263");
   public static final int TYPE_mdat = Util.getIntegerCodeForString("mdat");
@@ -83,8 +91,6 @@ import java.util.List;
   public static final int TYPE_mdia = Util.getIntegerCodeForString("mdia");
   public static final int TYPE_minf = Util.getIntegerCodeForString("minf");
   public static final int TYPE_stbl = Util.getIntegerCodeForString("stbl");
-  public static final int TYPE_avcC = Util.getIntegerCodeForString("avcC");
-  public static final int TYPE_hvcC = Util.getIntegerCodeForString("hvcC");
   public static final int TYPE_esds = Util.getIntegerCodeForString("esds");
   public static final int TYPE_moof = Util.getIntegerCodeForString("moof");
   public static final int TYPE_traf = Util.getIntegerCodeForString("traf");
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
index 008a155d1f..3b4a5c0c5b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
@@ -33,6 +33,7 @@ import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.video.AvcConfig;
+import com.google.android.exoplayer2.video.DolbyVisionConfig;
 import com.google.android.exoplayer2.video.HevcConfig;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -735,11 +736,19 @@ import java.util.List;
       int childAtomSize = stsd.readInt();
       Assertions.checkArgument(childAtomSize > 0, "childAtomSize should be positive");
       int childAtomType = stsd.readInt();
-      if (childAtomType == Atom.TYPE_avc1 || childAtomType == Atom.TYPE_avc3
-          || childAtomType == Atom.TYPE_encv || childAtomType == Atom.TYPE_mp4v
-          || childAtomType == Atom.TYPE_hvc1 || childAtomType == Atom.TYPE_hev1
-          || childAtomType == Atom.TYPE_s263 || childAtomType == Atom.TYPE_vp08
-          || childAtomType == Atom.TYPE_vp09) {
+      if (childAtomType == Atom.TYPE_avc1
+          || childAtomType == Atom.TYPE_avc3
+          || childAtomType == Atom.TYPE_encv
+          || childAtomType == Atom.TYPE_mp4v
+          || childAtomType == Atom.TYPE_hvc1
+          || childAtomType == Atom.TYPE_hev1
+          || childAtomType == Atom.TYPE_s263
+          || childAtomType == Atom.TYPE_vp08
+          || childAtomType == Atom.TYPE_vp09
+          || childAtomType == Atom.TYPE_dvav
+          || childAtomType == Atom.TYPE_dva1
+          || childAtomType == Atom.TYPE_dvhe
+          || childAtomType == Atom.TYPE_dvh1) {
         parseVideoSampleEntry(stsd, childAtomType, childStartPosition, childAtomSize, trackId,
             rotationDegrees, drmInitData, out, i);
       } else if (childAtomType == Atom.TYPE_mp4a
@@ -852,6 +861,7 @@ import java.util.List;
 
     List<byte[]> initializationData = null;
     String mimeType = null;
+    String codecs = null;
     byte[] projectionData = null;
     @C.StereoMode
     int stereoMode = Format.NO_VALUE;
@@ -882,6 +892,13 @@ import java.util.List;
         HevcConfig hevcConfig = HevcConfig.parse(parent);
         initializationData = hevcConfig.initializationData;
         out.nalUnitLengthFieldLength = hevcConfig.nalUnitLengthFieldLength;
+      } else if (childAtomType == Atom.TYPE_dvcC || childAtomType == Atom.TYPE_dvvC) {
+        DolbyVisionConfig dolbyVisionConfig = DolbyVisionConfig.parse(parent);
+        // TODO: Support profiles 4, 8 and 9 once we have a way to fall back to AVC/HEVC decoding.
+        if (dolbyVisionConfig != null && dolbyVisionConfig.profile == 5) {
+          codecs = dolbyVisionConfig.codecs;
+          mimeType = MimeTypes.VIDEO_DOLBY_VISION;
+        }
       } else if (childAtomType == Atom.TYPE_vpcC) {
         Assertions.checkState(mimeType == null);
         mimeType = (atomType == Atom.TYPE_vp08) ? MimeTypes.VIDEO_VP8 : MimeTypes.VIDEO_VP9;
@@ -930,9 +947,23 @@ import java.util.List;
       return;
     }
 
-    out.format = Format.createVideoSampleFormat(Integer.toString(trackId), mimeType, null,
-        Format.NO_VALUE, Format.NO_VALUE, width, height, Format.NO_VALUE, initializationData,
-        rotationDegrees, pixelWidthHeightRatio, projectionData, stereoMode, null, drmInitData);
+    out.format =
+        Format.createVideoSampleFormat(
+            Integer.toString(trackId),
+            mimeType,
+            codecs,
+            /* bitrate= */ Format.NO_VALUE,
+            /* maxInputSize= */ Format.NO_VALUE,
+            width,
+            height,
+            /* frameRate= */ Format.NO_VALUE,
+            initializationData,
+            rotationDegrees,
+            pixelWidthHeightRatio,
+            projectionData,
+            stereoMode,
+            /* colorInfo= */ null,
+            drmInitData);
   }
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
index 95cf82ff6c..0530057973 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
@@ -71,6 +71,11 @@ public final class MediaCodecUtil {
   private static final Map<String, Integer> HEVC_CODEC_STRING_TO_PROFILE_LEVEL;
   private static final String CODEC_ID_HEV1 = "hev1";
   private static final String CODEC_ID_HVC1 = "hvc1";
+  // Dolby Vision.
+  private static final Map<String, Integer> DOLBY_VISION_STRING_TO_PROFILE;
+  private static final Map<String, Integer> DOLBY_VISION_STRING_TO_LEVEL;
+  private static final String CODEC_ID_DVHE = "dvhe";
+  private static final String CODEC_ID_DVH1 = "dvh1";
   // MP4A AAC.
   private static final SparseIntArray MP4A_AUDIO_OBJECT_TYPE_TO_PROFILE;
   private static final String CODEC_ID_MP4A = "mp4a";
@@ -208,6 +213,9 @@ public final class MediaCodecUtil {
       case CODEC_ID_HEV1:
       case CODEC_ID_HVC1:
         return getHevcProfileAndLevel(codec, parts);
+      case CODEC_ID_DVHE:
+      case CODEC_ID_DVH1:
+        return getDolbyVisionProfileAndLevel(codec, parts);
       case CODEC_ID_AVC1:
       case CODEC_ID_AVC2:
         return getAvcProfileAndLevel(codec, parts);
@@ -423,6 +431,34 @@ public final class MediaCodecUtil {
         && ("OMX.Exynos.AVC.Decoder".equals(name) || "OMX.Exynos.AVC.Decoder.secure".equals(name));
   }
 
+  private static Pair<Integer, Integer> getDolbyVisionProfileAndLevel(
+      String codec, String[] parts) {
+    if (parts.length < 3) {
+      // The codec has fewer parts than required by the Dolby Vision codec string format.
+      Log.w(TAG, "Ignoring malformed Dolby Vision codec string: " + codec);
+      return null;
+    }
+    // The profile_space gets ignored.
+    Matcher matcher = PROFILE_PATTERN.matcher(parts[1]);
+    if (!matcher.matches()) {
+      Log.w(TAG, "Ignoring malformed Dolby Vision codec string: " + codec);
+      return null;
+    }
+    String profileString = matcher.group(1);
+    Integer profile = DOLBY_VISION_STRING_TO_PROFILE.get(profileString);
+    if (profile == null) {
+      Log.w(TAG, "Unknown Dolby Vision profile string: " + profileString);
+      return null;
+    }
+    String levelString = parts[2];
+    Integer level = DOLBY_VISION_STRING_TO_LEVEL.get(levelString);
+    if (level == null) {
+      Log.w(TAG, "Unknown Dolby Vision level string: " + levelString);
+      return null;
+    }
+    return new Pair<>(profile, level);
+  }
+
   private static Pair<Integer, Integer> getHevcProfileAndLevel(String codec, String[] parts) {
     if (parts.length < 4) {
       // The codec has fewer parts than required by the HEVC codec string format.
@@ -783,6 +819,29 @@ public final class MediaCodecUtil {
     HEVC_CODEC_STRING_TO_PROFILE_LEVEL.put("H183", CodecProfileLevel.HEVCHighTierLevel61);
     HEVC_CODEC_STRING_TO_PROFILE_LEVEL.put("H186", CodecProfileLevel.HEVCHighTierLevel62);
 
+    DOLBY_VISION_STRING_TO_PROFILE = new HashMap<>();
+    DOLBY_VISION_STRING_TO_PROFILE.put("00", CodecProfileLevel.DolbyVisionProfileDvavPer);
+    DOLBY_VISION_STRING_TO_PROFILE.put("01", CodecProfileLevel.DolbyVisionProfileDvavPen);
+    DOLBY_VISION_STRING_TO_PROFILE.put("02", CodecProfileLevel.DolbyVisionProfileDvheDer);
+    DOLBY_VISION_STRING_TO_PROFILE.put("03", CodecProfileLevel.DolbyVisionProfileDvheDen);
+    DOLBY_VISION_STRING_TO_PROFILE.put("04", CodecProfileLevel.DolbyVisionProfileDvheDtr);
+    DOLBY_VISION_STRING_TO_PROFILE.put("05", CodecProfileLevel.DolbyVisionProfileDvheStn);
+    DOLBY_VISION_STRING_TO_PROFILE.put("06", CodecProfileLevel.DolbyVisionProfileDvheDth);
+    DOLBY_VISION_STRING_TO_PROFILE.put("07", CodecProfileLevel.DolbyVisionProfileDvheDtb);
+    DOLBY_VISION_STRING_TO_PROFILE.put("08", CodecProfileLevel.DolbyVisionProfileDvheSt);
+    DOLBY_VISION_STRING_TO_PROFILE.put("09", CodecProfileLevel.DolbyVisionProfileDvavSe);
+
+    DOLBY_VISION_STRING_TO_LEVEL = new HashMap<>();
+    DOLBY_VISION_STRING_TO_LEVEL.put("01", CodecProfileLevel.DolbyVisionLevelHd24);
+    DOLBY_VISION_STRING_TO_LEVEL.put("02", CodecProfileLevel.DolbyVisionLevelHd30);
+    DOLBY_VISION_STRING_TO_LEVEL.put("03", CodecProfileLevel.DolbyVisionLevelFhd24);
+    DOLBY_VISION_STRING_TO_LEVEL.put("04", CodecProfileLevel.DolbyVisionLevelFhd30);
+    DOLBY_VISION_STRING_TO_LEVEL.put("05", CodecProfileLevel.DolbyVisionLevelFhd60);
+    DOLBY_VISION_STRING_TO_LEVEL.put("06", CodecProfileLevel.DolbyVisionLevelUhd24);
+    DOLBY_VISION_STRING_TO_LEVEL.put("07", CodecProfileLevel.DolbyVisionLevelUhd30);
+    DOLBY_VISION_STRING_TO_LEVEL.put("08", CodecProfileLevel.DolbyVisionLevelUhd48);
+    DOLBY_VISION_STRING_TO_LEVEL.put("09", CodecProfileLevel.DolbyVisionLevelUhd60);
+
     MP4A_AUDIO_OBJECT_TYPE_TO_PROFILE = new SparseIntArray();
     MP4A_AUDIO_OBJECT_TYPE_TO_PROFILE.put(1, CodecProfileLevel.AACObjectMain);
     MP4A_AUDIO_OBJECT_TYPE_TO_PROFILE.put(2, CodecProfileLevel.AACObjectLC);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java b/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
index c5ce93a239..003496a014 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
@@ -41,6 +41,7 @@ public final class MimeTypes {
   public static final String VIDEO_MPEG = BASE_TYPE_VIDEO + "/mpeg";
   public static final String VIDEO_MPEG2 = BASE_TYPE_VIDEO + "/mpeg2";
   public static final String VIDEO_VC1 = BASE_TYPE_VIDEO + "/wvc1";
+  public static final String VIDEO_DOLBY_VISION = BASE_TYPE_VIDEO + "/dolby-vision";
   public static final String VIDEO_UNKNOWN = BASE_TYPE_VIDEO + "/x-unknown";
 
   public static final String AUDIO_MP4 = BASE_TYPE_AUDIO + "/mp4";
@@ -213,6 +214,11 @@ public final class MimeTypes {
       return MimeTypes.VIDEO_H264;
     } else if (codec.startsWith("hev1") || codec.startsWith("hvc1")) {
       return MimeTypes.VIDEO_H265;
+    } else if (codec.startsWith("dvav")
+        || codec.startsWith("dva1")
+        || codec.startsWith("dvhe")
+        || codec.startsWith("dvh1")) {
+      return MimeTypes.VIDEO_DOLBY_VISION;
     } else if (codec.startsWith("vp9") || codec.startsWith("vp09")) {
       return MimeTypes.VIDEO_VP9;
     } else if (codec.startsWith("vp8") || codec.startsWith("vp08")) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/DolbyVisionConfig.java b/library/core/src/main/java/com/google/android/exoplayer2/video/DolbyVisionConfig.java
new file mode 100644
index 0000000000..3a7c12dd14
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/DolbyVisionConfig.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.video;
+
+import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.util.ParsableByteArray;
+
+/** Dolby Vision configuration data. */
+public final class DolbyVisionConfig {
+
+  /**
+   * Parses Dolby Vision configuration data.
+   *
+   * @param data A {@link ParsableByteArray}, whose position is set to the start of the Dolby Vision
+   *     configuration data to parse.
+   * @return The {@link DolbyVisionConfig} corresponding to the configuration, or {@code null} if
+   *     the configuration isn't supported.
+   */
+  @Nullable
+  public static DolbyVisionConfig parse(ParsableByteArray data) {
+    data.skipBytes(2); // dv_version_major, dv_version_minor
+    int profileData = data.readUnsignedByte();
+    int dvProfile = (profileData >> 1);
+    int dvLevel = ((profileData & 0x1) << 5) | ((data.readUnsignedByte() >> 3) & 0x1F);
+    String codecsPrefix;
+    if (dvProfile == 4 || dvProfile == 5) {
+      codecsPrefix = "dvhe";
+    } else if (dvProfile == 8) {
+      codecsPrefix = "hev1";
+    } else if (dvProfile == 9) {
+      codecsPrefix = "avc3";
+    } else {
+      return null;
+    }
+    String codecs = codecsPrefix + ".0" + dvProfile + ".0" + dvLevel;
+    return new DolbyVisionConfig(dvProfile, dvLevel, codecs);
+  }
+
+  /** The profile number. */
+  public final int profile;
+  /** The level number. */
+  public final int level;
+  /** The RFC 6381 codecs string. */
+  public final String codecs;
+
+  private DolbyVisionConfig(int profile, int level, String codecs) {
+    this.profile = profile;
+    this.level = level;
+    this.codecs = codecs;
+  }
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index 68e98633d6..a4f67b1eda 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -28,6 +28,7 @@ import android.os.SystemClock;
 import android.support.annotation.CallSuper;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.util.Pair;
 import android.view.Surface;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
@@ -1057,6 +1058,16 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
     MediaFormatUtil.maybeSetFloat(mediaFormat, MediaFormat.KEY_FRAME_RATE, format.frameRate);
     MediaFormatUtil.maybeSetInteger(mediaFormat, MediaFormat.KEY_ROTATION, format.rotationDegrees);
     MediaFormatUtil.maybeSetColorInfo(mediaFormat, format.colorInfo);
+    if (MimeTypes.VIDEO_DOLBY_VISION.equals(format.sampleMimeType)) {
+      // Some phones require the profile to be set on the codec.
+      // See https://github.com/google/ExoPlayer/pull/5438.
+      Pair<Integer, Integer> codecProfileAndLevel =
+          MediaCodecUtil.getCodecProfileAndLevel(format.codecs);
+      if (codecProfileAndLevel != null) {
+        MediaFormatUtil.maybeSetInteger(
+            mediaFormat, MediaFormat.KEY_PROFILE, codecProfileAndLevel.first);
+      }
+    }
     // Set codec max values.
     mediaFormat.setInteger(MediaFormat.KEY_MAX_WIDTH, codecMaxValues.width);
     mediaFormat.setInteger(MediaFormat.KEY_MAX_HEIGHT, codecMaxValues.height);

From 6f1daff3f1edce4ac474a77486f364755dcf8c03 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 8 Feb 2019 17:23:29 +0000
Subject: [PATCH 503/832] Remove copybara scrubbing of ExoCast components

PiperOrigin-RevId: 233072247
---
 RELEASENOTES.md                                          | 4 ++++
 demos/cast/build.gradle                                  | 5 +++++
 .../google/android/exoplayer2/castdemo/MainActivity.java | 9 +++++++++
 3 files changed, 18 insertions(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 16b42dcf9f..35b2d41a65 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,6 +2,10 @@
 
 ### dev-v2 (not yet released) ###
 
+* Add `ExoCastPlayer` to cast to custom receiver apps using ExoPlayer's custom
+  communication protocol
+  ([#5486](https://github.com/google/ExoPlayer/issues/5486)). Also update the
+  Cast demo app to work with `ExoCastPlayer`.
 * HLS:
   * Form an adaptive track group out of audio renditions with matching name.
 * `ExtractorMediaSource` renamed to `ProgressiveMediaSource`.
diff --git a/demos/cast/build.gradle b/demos/cast/build.gradle
index e056530d45..c898557cab 100644
--- a/demos/cast/build.gradle
+++ b/demos/cast/build.gradle
@@ -52,6 +52,11 @@ android {
     flavorDimensions "receiver"
 
     productFlavors {
+        exoCast {
+            dimension "receiver"
+            manifestPlaceholders =
+                    [castOptionsProvider: "com.google.android.exoplayer2.ext.cast.ExoCastOptionsProvider"]
+        }
         defaultCast {
             dimension "receiver"
             manifestPlaceholders =
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
index 48934abd2c..7b525b04be 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
@@ -128,6 +128,15 @@ public class MainActivity extends AppCompatActivity
                 /* context= */ this,
                 castContext);
         break;
+      case ExoCastOptionsProvider.RECEIVER_ID:
+        playerManager =
+            new ExoCastPlayerManager(
+                /* queueChangesListener= */ this,
+                localPlayerView,
+                castControlView,
+                /* context= */ this,
+                castContext);
+        break;
       default:
         throw new IllegalStateException("Illegal receiver app id: " + applicationId);
     }

From a263fb16311da11b4d00529e102d2f0d047d380f Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 8 Feb 2019 17:29:18 +0000
Subject: [PATCH 504/832] Remove default-receiver-related classes from Cast
 demo app

PiperOrigin-RevId: 233073011
---
 demos/cast/build.gradle                       |  16 -
 demos/cast/src/main/AndroidManifest.xml       |   2 +-
 .../DefaultReceiverPlayerManager.java         | 395 ------------------
 .../exoplayer2/castdemo/MainActivity.java     |  35 +-
 .../exoplayer2/castdemo/PlayerManager.java    |  64 ---
 5 files changed, 10 insertions(+), 502 deletions(-)
 delete mode 100644 demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java
 delete mode 100644 demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java

diff --git a/demos/cast/build.gradle b/demos/cast/build.gradle
index c898557cab..cad97358e9 100644
--- a/demos/cast/build.gradle
+++ b/demos/cast/build.gradle
@@ -48,22 +48,6 @@ android {
         // The demo app does not have translations.
         disable 'MissingTranslation'
     }
-
-    flavorDimensions "receiver"
-
-    productFlavors {
-        exoCast {
-            dimension "receiver"
-            manifestPlaceholders =
-                    [castOptionsProvider: "com.google.android.exoplayer2.ext.cast.ExoCastOptionsProvider"]
-        }
-        defaultCast {
-            dimension "receiver"
-            manifestPlaceholders =
-                    [castOptionsProvider: "com.google.android.exoplayer2.ext.cast.DefaultCastOptionsProvider"]
-        }
-    }
-
 }
 
 dependencies {
diff --git a/demos/cast/src/main/AndroidManifest.xml b/demos/cast/src/main/AndroidManifest.xml
index c556721863..40dfe22167 100644
--- a/demos/cast/src/main/AndroidManifest.xml
+++ b/demos/cast/src/main/AndroidManifest.xml
@@ -23,7 +23,7 @@
       android:largeHeap="true" android:allowBackup="false">
 
     <meta-data android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
-        android:value="${castOptionsProvider}" />
+        android:value="com.google.android.exoplayer2.ext.cast.ExoCastOptionsProvider" />
 
     <activity android:name="com.google.android.exoplayer2.castdemo.MainActivity"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java
deleted file mode 100644
index 1db68ca08d..0000000000
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java
+++ /dev/null
@@ -1,395 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.castdemo;
-
-import android.content.Context;
-import android.net.Uri;
-import android.support.annotation.Nullable;
-import android.view.KeyEvent;
-import android.view.View;
-import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.DefaultRenderersFactory;
-import com.google.android.exoplayer2.ExoPlayerFactory;
-import com.google.android.exoplayer2.Player;
-import com.google.android.exoplayer2.Player.DiscontinuityReason;
-import com.google.android.exoplayer2.Player.EventListener;
-import com.google.android.exoplayer2.Player.TimelineChangeReason;
-import com.google.android.exoplayer2.RenderersFactory;
-import com.google.android.exoplayer2.SimpleExoPlayer;
-import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.Timeline.Period;
-import com.google.android.exoplayer2.ext.cast.CastPlayer;
-import com.google.android.exoplayer2.ext.cast.MediaItem;
-import com.google.android.exoplayer2.ext.cast.SessionAvailabilityListener;
-import com.google.android.exoplayer2.source.ConcatenatingMediaSource;
-import com.google.android.exoplayer2.source.MediaSource;
-import com.google.android.exoplayer2.source.ProgressiveMediaSource;
-import com.google.android.exoplayer2.source.dash.DashMediaSource;
-import com.google.android.exoplayer2.source.hls.HlsMediaSource;
-import com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource;
-import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
-import com.google.android.exoplayer2.ui.PlayerControlView;
-import com.google.android.exoplayer2.ui.PlayerView;
-import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
-import com.google.android.gms.cast.MediaInfo;
-import com.google.android.gms.cast.MediaMetadata;
-import com.google.android.gms.cast.MediaQueueItem;
-import com.google.android.gms.cast.framework.CastContext;
-import java.util.ArrayList;
-
-/** Manages players and an internal media queue for the ExoPlayer/Cast demo app. */
-/* package */ class DefaultReceiverPlayerManager
-    implements EventListener, SessionAvailabilityListener, PlayerManager {
-
-  private static final String USER_AGENT = "ExoCastDemoPlayer";
-  private static final DefaultHttpDataSourceFactory DATA_SOURCE_FACTORY =
-      new DefaultHttpDataSourceFactory(USER_AGENT);
-
-  private final PlayerView localPlayerView;
-  private final PlayerControlView castControlView;
-  private final SimpleExoPlayer exoPlayer;
-  private final CastPlayer castPlayer;
-  private final ArrayList<MediaItem> mediaQueue;
-  private final QueueChangesListener queueChangesListener;
-  private final ConcatenatingMediaSource concatenatingMediaSource;
-
-  private boolean castMediaQueueCreationPending;
-  private int currentItemIndex;
-  private Player currentPlayer;
-
-  /**
-   * Creates a new manager for {@link SimpleExoPlayer} and {@link CastPlayer}.
-   *
-   * @param queueChangesListener A {@link QueueChangesListener} for queue position changes.
-   * @param localPlayerView The {@link PlayerView} for local playback.
-   * @param castControlView The {@link PlayerControlView} to control remote playback.
-   * @param context A {@link Context}.
-   * @param castContext The {@link CastContext}.
-   */
-  public DefaultReceiverPlayerManager(
-      QueueChangesListener queueChangesListener,
-      PlayerView localPlayerView,
-      PlayerControlView castControlView,
-      Context context,
-      CastContext castContext) {
-    this.queueChangesListener = queueChangesListener;
-    this.localPlayerView = localPlayerView;
-    this.castControlView = castControlView;
-    mediaQueue = new ArrayList<>();
-    currentItemIndex = C.INDEX_UNSET;
-    concatenatingMediaSource = new ConcatenatingMediaSource();
-
-    DefaultTrackSelector trackSelector = new DefaultTrackSelector();
-    RenderersFactory renderersFactory = new DefaultRenderersFactory(context);
-    exoPlayer = ExoPlayerFactory.newSimpleInstance(context, renderersFactory, trackSelector);
-    exoPlayer.addListener(this);
-    localPlayerView.setPlayer(exoPlayer);
-
-    castPlayer = new CastPlayer(castContext);
-    castPlayer.addListener(this);
-    castPlayer.setSessionAvailabilityListener(this);
-    castControlView.setPlayer(castPlayer);
-
-    setCurrentPlayer(castPlayer.isCastSessionAvailable() ? castPlayer : exoPlayer);
-  }
-
-  // Queue manipulation methods.
-
-  /**
-   * Plays a specified queue item in the current player.
-   *
-   * @param itemIndex The index of the item to play.
-   */
-  public void selectQueueItem(int itemIndex) {
-    setCurrentItem(itemIndex, C.TIME_UNSET, true);
-  }
-
-  /**
-   * Returns the index of the currently played item.
-   */
-  public int getCurrentItemIndex() {
-    return currentItemIndex;
-  }
-
-  /**
-   * Appends {@code item} to the media queue.
-   *
-   * @param item The {@link MediaItem} to append.
-   */
-  public void addItem(MediaItem item) {
-    mediaQueue.add(item);
-    concatenatingMediaSource.addMediaSource(buildMediaSource(item));
-    if (currentPlayer == castPlayer) {
-      castPlayer.addItems(buildMediaQueueItem(item));
-    }
-  }
-
-  /**
-   * Returns the size of the media queue.
-   */
-  public int getMediaQueueSize() {
-    return mediaQueue.size();
-  }
-
-  /**
-   * Returns the item at the given index in the media queue.
-   *
-   * @param position The index of the item.
-   * @return The item at the given index in the media queue.
-   */
-  public MediaItem getItem(int position) {
-    return mediaQueue.get(position);
-  }
-
-  /**
-   * Removes the item at the given index from the media queue.
-   *
-   * @param itemIndex The index of the item to remove.
-   * @return Whether the removal was successful.
-   */
-  public boolean removeItem(int itemIndex) {
-    concatenatingMediaSource.removeMediaSource(itemIndex);
-    if (currentPlayer == castPlayer) {
-      if (castPlayer.getPlaybackState() != Player.STATE_IDLE) {
-        Timeline castTimeline = castPlayer.getCurrentTimeline();
-        if (castTimeline.getPeriodCount() <= itemIndex) {
-          return false;
-        }
-        castPlayer.removeItem((int) castTimeline.getPeriod(itemIndex, new Period()).id);
-      }
-    }
-    mediaQueue.remove(itemIndex);
-    if (itemIndex == currentItemIndex && itemIndex == mediaQueue.size()) {
-      maybeSetCurrentItemAndNotify(C.INDEX_UNSET);
-    } else if (itemIndex < currentItemIndex) {
-      maybeSetCurrentItemAndNotify(currentItemIndex - 1);
-    }
-    return true;
-  }
-
-  /**
-   * Moves an item within the queue.
-   *
-   * @param fromIndex The index of the item to move.
-   * @param toIndex The target index of the item in the queue.
-   * @return Whether the item move was successful.
-   */
-  public boolean moveItem(int fromIndex, int toIndex) {
-    // Player update.
-    concatenatingMediaSource.moveMediaSource(fromIndex, toIndex);
-    if (currentPlayer == castPlayer && castPlayer.getPlaybackState() != Player.STATE_IDLE) {
-      Timeline castTimeline = castPlayer.getCurrentTimeline();
-      int periodCount = castTimeline.getPeriodCount();
-      if (periodCount <= fromIndex || periodCount <= toIndex) {
-        return false;
-      }
-      int elementId = (int) castTimeline.getPeriod(fromIndex, new Period()).id;
-      castPlayer.moveItem(elementId, toIndex);
-    }
-
-    mediaQueue.add(toIndex, mediaQueue.remove(fromIndex));
-
-    // Index update.
-    if (fromIndex == currentItemIndex) {
-      maybeSetCurrentItemAndNotify(toIndex);
-    } else if (fromIndex < currentItemIndex && toIndex >= currentItemIndex) {
-      maybeSetCurrentItemAndNotify(currentItemIndex - 1);
-    } else if (fromIndex > currentItemIndex && toIndex <= currentItemIndex) {
-      maybeSetCurrentItemAndNotify(currentItemIndex + 1);
-    }
-
-    return true;
-  }
-
-  // Miscellaneous methods.
-
-  /**
-   * Dispatches a given {@link KeyEvent} to the corresponding view of the current player.
-   *
-   * @param event The {@link KeyEvent}.
-   * @return Whether the event was handled by the target view.
-   */
-  public boolean dispatchKeyEvent(KeyEvent event) {
-    if (currentPlayer == exoPlayer) {
-      return localPlayerView.dispatchKeyEvent(event);
-    } else /* currentPlayer == castPlayer */ {
-      return castControlView.dispatchKeyEvent(event);
-    }
-  }
-
-  /**
-   * Releases the manager and the players that it holds.
-   */
-  public void release() {
-    currentItemIndex = C.INDEX_UNSET;
-    mediaQueue.clear();
-    concatenatingMediaSource.clear();
-    castPlayer.setSessionAvailabilityListener(null);
-    castPlayer.release();
-    localPlayerView.setPlayer(null);
-    exoPlayer.release();
-  }
-
-  // Player.EventListener implementation.
-
-  @Override
-  public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
-    updateCurrentItemIndex();
-  }
-
-  @Override
-  public void onPositionDiscontinuity(@DiscontinuityReason int reason) {
-    updateCurrentItemIndex();
-  }
-
-  @Override
-  public void onTimelineChanged(
-      Timeline timeline, @Nullable Object manifest, @TimelineChangeReason int reason) {
-    updateCurrentItemIndex();
-    if (currentPlayer == castPlayer && timeline.isEmpty()) {
-      castMediaQueueCreationPending = true;
-    }
-  }
-
-  // CastPlayer.SessionAvailabilityListener implementation.
-
-  @Override
-  public void onCastSessionAvailable() {
-    setCurrentPlayer(castPlayer);
-  }
-
-  @Override
-  public void onCastSessionUnavailable() {
-    setCurrentPlayer(exoPlayer);
-  }
-
-  // Internal methods.
-
-  private void updateCurrentItemIndex() {
-    int playbackState = currentPlayer.getPlaybackState();
-    maybeSetCurrentItemAndNotify(
-        playbackState != Player.STATE_IDLE && playbackState != Player.STATE_ENDED
-        ? currentPlayer.getCurrentWindowIndex() : C.INDEX_UNSET);
-  }
-
-  private void setCurrentPlayer(Player currentPlayer) {
-    if (this.currentPlayer == currentPlayer) {
-      return;
-    }
-
-    // View management.
-    if (currentPlayer == exoPlayer) {
-      localPlayerView.setVisibility(View.VISIBLE);
-      castControlView.hide();
-    } else /* currentPlayer == castPlayer */ {
-      localPlayerView.setVisibility(View.GONE);
-      castControlView.show();
-    }
-
-    // Player state management.
-    long playbackPositionMs = C.TIME_UNSET;
-    int windowIndex = C.INDEX_UNSET;
-    boolean playWhenReady = false;
-    if (this.currentPlayer != null) {
-      int playbackState = this.currentPlayer.getPlaybackState();
-      if (playbackState != Player.STATE_ENDED) {
-        playbackPositionMs = this.currentPlayer.getCurrentPosition();
-        playWhenReady = this.currentPlayer.getPlayWhenReady();
-        windowIndex = this.currentPlayer.getCurrentWindowIndex();
-        if (windowIndex != currentItemIndex) {
-          playbackPositionMs = C.TIME_UNSET;
-          windowIndex = currentItemIndex;
-        }
-      }
-      this.currentPlayer.stop(true);
-    } else {
-      // This is the initial setup. No need to save any state.
-    }
-
-    this.currentPlayer = currentPlayer;
-
-    // Media queue management.
-    castMediaQueueCreationPending = currentPlayer == castPlayer;
-    if (currentPlayer == exoPlayer) {
-      exoPlayer.prepare(concatenatingMediaSource);
-    }
-
-    // Playback transition.
-    if (windowIndex != C.INDEX_UNSET) {
-      setCurrentItem(windowIndex, playbackPositionMs, playWhenReady);
-    }
-  }
-
-  /**
-   * Starts playback of the item at the given position.
-   *
-   * @param itemIndex The index of the item to play.
-   * @param positionMs The position at which playback should start.
-   * @param playWhenReady Whether the player should proceed when ready to do so.
-   */
-  private void setCurrentItem(int itemIndex, long positionMs, boolean playWhenReady) {
-    maybeSetCurrentItemAndNotify(itemIndex);
-    if (castMediaQueueCreationPending) {
-      MediaQueueItem[] items = new MediaQueueItem[mediaQueue.size()];
-      for (int i = 0; i < items.length; i++) {
-        items[i] = buildMediaQueueItem(mediaQueue.get(i));
-      }
-      castMediaQueueCreationPending = false;
-      castPlayer.loadItems(items, itemIndex, positionMs, Player.REPEAT_MODE_OFF);
-    } else {
-      currentPlayer.seekTo(itemIndex, positionMs);
-      currentPlayer.setPlayWhenReady(playWhenReady);
-    }
-  }
-
-  private void maybeSetCurrentItemAndNotify(int currentItemIndex) {
-    if (this.currentItemIndex != currentItemIndex) {
-      int oldIndex = this.currentItemIndex;
-      this.currentItemIndex = currentItemIndex;
-      queueChangesListener.onQueuePositionChanged(oldIndex, currentItemIndex);
-    }
-  }
-
-  private static MediaSource buildMediaSource(MediaItem item) {
-    Uri uri = item.media.uri;
-    switch (item.mimeType) {
-      case DemoUtil.MIME_TYPE_SS:
-        return new SsMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
-      case DemoUtil.MIME_TYPE_DASH:
-        return new DashMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
-      case DemoUtil.MIME_TYPE_HLS:
-        return new HlsMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
-      case DemoUtil.MIME_TYPE_VIDEO_MP4:
-        return new ProgressiveMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
-      default: {
-          throw new IllegalStateException("Unsupported type: " + item.mimeType);
-      }
-    }
-  }
-
-  private static MediaQueueItem buildMediaQueueItem(MediaItem item) {
-    MediaMetadata movieMetadata = new MediaMetadata(MediaMetadata.MEDIA_TYPE_MOVIE);
-    movieMetadata.putString(MediaMetadata.KEY_TITLE, item.title);
-    MediaInfo mediaInfo =
-        new MediaInfo.Builder(item.media.uri.toString())
-            .setStreamType(MediaInfo.STREAM_TYPE_BUFFERED)
-            .setContentType(item.mimeType)
-            .setMetadata(movieMetadata)
-            .build();
-    return new MediaQueueItem.Builder(mediaInfo).build();
-  }
-
-}
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
index 7b525b04be..5b04502edb 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
@@ -38,7 +38,6 @@ import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.ext.cast.MediaItem;
 import com.google.android.exoplayer2.ui.PlayerControlView;
 import com.google.android.exoplayer2.ui.PlayerView;
-import com.google.android.gms.cast.CastMediaControlIntent;
 import com.google.android.gms.cast.framework.CastButtonFactory;
 import com.google.android.gms.cast.framework.CastContext;
 import com.google.android.gms.dynamite.DynamiteModule;
@@ -49,13 +48,13 @@ import java.util.Collections;
  * Cast extension.
  */
 public class MainActivity extends AppCompatActivity
-    implements OnClickListener, PlayerManager.QueueChangesListener {
+    implements OnClickListener, ExoCastPlayerManager.QueueChangesListener {
 
   private final MediaItem.Builder mediaItemBuilder;
 
   private PlayerView localPlayerView;
   private PlayerControlView castControlView;
-  private PlayerManager playerManager;
+  private ExoCastPlayerManager playerManager;
   private RecyclerView mediaQueueList;
   private MediaQueueListAdapter mediaQueueListAdapter;
   private CastContext castContext;
@@ -117,29 +116,13 @@ public class MainActivity extends AppCompatActivity
       // There is no Cast context to work with. Do nothing.
       return;
     }
-    String applicationId = castContext.getCastOptions().getReceiverApplicationId();
-    switch (applicationId) {
-      case CastMediaControlIntent.DEFAULT_MEDIA_RECEIVER_APPLICATION_ID:
-        playerManager =
-            new DefaultReceiverPlayerManager(
-                /* queueChangesListener= */ this,
-                localPlayerView,
-                castControlView,
-                /* context= */ this,
-                castContext);
-        break;
-      case ExoCastOptionsProvider.RECEIVER_ID:
-        playerManager =
-            new ExoCastPlayerManager(
-                /* queueChangesListener= */ this,
-                localPlayerView,
-                castControlView,
-                /* context= */ this,
-                castContext);
-        break;
-      default:
-        throw new IllegalStateException("Illegal receiver app id: " + applicationId);
-    }
+    playerManager =
+        new ExoCastPlayerManager(
+            /* queueChangesListener= */ this,
+            localPlayerView,
+            castControlView,
+            /* context= */ this,
+            castContext);
     mediaQueueList.setAdapter(mediaQueueListAdapter);
   }
 
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
deleted file mode 100644
index 184dfe29b3..0000000000
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.castdemo;
-
-import android.view.KeyEvent;
-import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.ext.cast.MediaItem;
-
-/** Manages the players in the Cast demo app. */
-interface PlayerManager {
-
-  /** Listener for changes in the media queue. */
-  interface QueueChangesListener {
-
-    /** Called when the currently played item of the media queue changes. */
-    void onQueuePositionChanged(int previousIndex, int newIndex);
-
-    /** Called when the media queue changes due to modifications not caused by this manager. */
-    void onQueueContentsExternallyChanged();
-  }
-
-  /** Redirects the given {@code keyEvent} to the active player. */
-  boolean dispatchKeyEvent(KeyEvent keyEvent);
-
-  /** Appends the given {@link MediaItem} to the media queue. */
-  void addItem(MediaItem mediaItem);
-
-  /** Returns the number of items in the media queue. */
-  int getMediaQueueSize();
-
-  /** Selects the item at the given position for playback. */
-  void selectQueueItem(int position);
-
-  /**
-   * Returns the position of the item currently being played, or {@link C#INDEX_UNSET} if no item is
-   * being played.
-   */
-  int getCurrentItemIndex();
-
-  /** Returns the {@link MediaItem} at the given {@code position}. */
-  MediaItem getItem(int position);
-
-  /** Moves the item at position {@code from} to position {@code to}. */
-  boolean moveItem(int from, int to);
-
-  /** Removes the item at position {@code index}. */
-  boolean removeItem(int index);
-
-  /** Releases any acquired resources. */
-  void release();
-}

From ef139b2e31c921b7111000a171054594256c19dc Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 8 Feb 2019 17:54:27 +0000
Subject: [PATCH 505/832] Add an overlay FrameLayout for ad UI

This will be used instead of the current overlay FrameLayout (which apps can
interact with directly).

PiperOrigin-RevId: 233077175
---
 .../google/android/exoplayer2/ui/PlayerView.java    | 13 ++++++++++++-
 .../src/main/res/layout/exo_simple_player_view.xml  |  4 ++++
 library/ui/src/main/res/values/ids.xml              |  1 +
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
index 9742d0005a..8871767f49 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
@@ -221,6 +221,11 @@ import java.util.List;
  *       <ul>
  *         <li>Type: {@link PlayerControlView}
  *       </ul>
+ *   <li><b>{@code exo_ad_overlay}</b> - A {@link FrameLayout} positioned on top of the player which
+ *       is used to show ad UI (if applicable).
+ *       <ul>
+ *         <li>Type: {@link FrameLayout}
+ *       </ul>
  *   <li><b>{@code exo_overlay}</b> - A {@link FrameLayout} positioned on top of the player which
  *       the app can access via {@link #getOverlayFrameLayout()}, provided for convenience.
  *       <ul>
@@ -280,7 +285,8 @@ public class PlayerView extends FrameLayout {
   @Nullable private final TextView errorMessageView;
   private final PlayerControlView controller;
   private final ComponentListener componentListener;
-  private final FrameLayout overlayFrameLayout;
+  @Nullable private final FrameLayout adOverlayFrameLayout;
+  @Nullable private final FrameLayout overlayFrameLayout;
 
   private Player player;
   private boolean useController;
@@ -317,6 +323,7 @@ public class PlayerView extends FrameLayout {
       errorMessageView = null;
       controller = null;
       componentListener = null;
+      adOverlayFrameLayout = null;
       overlayFrameLayout = null;
       ImageView logo = new ImageView(context);
       if (Util.SDK_INT >= 23) {
@@ -411,6 +418,9 @@ public class PlayerView extends FrameLayout {
       surfaceView = null;
     }
 
+    // Ad overlay frame layout.
+    adOverlayFrameLayout = findViewById(R.id.exo_ad_overlay);
+
     // Overlay frame layout.
     overlayFrameLayout = findViewById(R.id.exo_overlay);
 
@@ -1012,6 +1022,7 @@ public class PlayerView extends FrameLayout {
    * @return The overlay {@link FrameLayout}, or {@code null} if the layout has been customized and
    *     the overlay is not present.
    */
+  @Nullable
   public FrameLayout getOverlayFrameLayout() {
     return overlayFrameLayout;
   }
diff --git a/library/ui/src/main/res/layout/exo_simple_player_view.xml b/library/ui/src/main/res/layout/exo_simple_player_view.xml
index 167ac96222..65dea9271e 100644
--- a/library/ui/src/main/res/layout/exo_simple_player_view.xml
+++ b/library/ui/src/main/res/layout/exo_simple_player_view.xml
@@ -52,6 +52,10 @@
 
   </com.google.android.exoplayer2.ui.AspectRatioFrameLayout>
 
+  <FrameLayout android:id="@id/exo_ad_overlay"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"/>
+
   <FrameLayout android:id="@id/exo_overlay"
       android:layout_width="match_parent"
       android:layout_height="match_parent"/>
diff --git a/library/ui/src/main/res/values/ids.xml b/library/ui/src/main/res/values/ids.xml
index 575a2b9c77..e57301f946 100644
--- a/library/ui/src/main/res/values/ids.xml
+++ b/library/ui/src/main/res/values/ids.xml
@@ -21,6 +21,7 @@
   <item name="exo_artwork" type="id"/>
   <item name="exo_controller_placeholder" type="id"/>
   <item name="exo_controller" type="id"/>
+  <item name="exo_ad_overlay" type="id"/>
   <item name="exo_overlay" type="id"/>
   <item name="exo_play" type="id"/>
   <item name="exo_pause" type="id"/>

From 3d822bd2282321feeb19480aabbf3754ed401f47 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 8 Feb 2019 18:59:20 +0000
Subject: [PATCH 506/832] Rename ExoCastPlayerManager to PlayerManager

PiperOrigin-RevId: 233089799
---
 .../exoplayer2/castdemo/MainActivity.java     |   6 +-
 .../exoplayer2/castdemo/PlayerManager.java    | 390 ++++++++++++++++++
 2 files changed, 393 insertions(+), 3 deletions(-)
 create mode 100644 demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java

diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
index 5b04502edb..d62e81be7f 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
@@ -48,13 +48,13 @@ import java.util.Collections;
  * Cast extension.
  */
 public class MainActivity extends AppCompatActivity
-    implements OnClickListener, ExoCastPlayerManager.QueueChangesListener {
+    implements OnClickListener, PlayerManager.QueueChangesListener {
 
   private final MediaItem.Builder mediaItemBuilder;
 
   private PlayerView localPlayerView;
   private PlayerControlView castControlView;
-  private ExoCastPlayerManager playerManager;
+  private PlayerManager playerManager;
   private RecyclerView mediaQueueList;
   private MediaQueueListAdapter mediaQueueListAdapter;
   private CastContext castContext;
@@ -117,7 +117,7 @@ public class MainActivity extends AppCompatActivity
       return;
     }
     playerManager =
-        new ExoCastPlayerManager(
+        new PlayerManager(
             /* queueChangesListener= */ this,
             localPlayerView,
             castControlView,
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
new file mode 100644
index 0000000000..0a99d21d37
--- /dev/null
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
@@ -0,0 +1,390 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.castdemo;
+
+import android.content.Context;
+import android.net.Uri;
+import android.support.annotation.Nullable;
+import android.view.KeyEvent;
+import android.view.View;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.DefaultRenderersFactory;
+import com.google.android.exoplayer2.ExoPlayerFactory;
+import com.google.android.exoplayer2.Player;
+import com.google.android.exoplayer2.Player.DiscontinuityReason;
+import com.google.android.exoplayer2.Player.EventListener;
+import com.google.android.exoplayer2.Player.TimelineChangeReason;
+import com.google.android.exoplayer2.RenderersFactory;
+import com.google.android.exoplayer2.SimpleExoPlayer;
+import com.google.android.exoplayer2.Timeline;
+import com.google.android.exoplayer2.ext.cast.DefaultCastSessionManager;
+import com.google.android.exoplayer2.ext.cast.ExoCastPlayer;
+import com.google.android.exoplayer2.ext.cast.MediaItem;
+import com.google.android.exoplayer2.ext.cast.SessionAvailabilityListener;
+import com.google.android.exoplayer2.source.ConcatenatingMediaSource;
+import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.ProgressiveMediaSource;
+import com.google.android.exoplayer2.source.dash.DashMediaSource;
+import com.google.android.exoplayer2.source.hls.HlsMediaSource;
+import com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
+import com.google.android.exoplayer2.ui.PlayerControlView;
+import com.google.android.exoplayer2.ui.PlayerView;
+import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
+import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.gms.cast.framework.CastContext;
+import java.util.ArrayList;
+
+/** Manages players and an internal media queue for the Cast demo app. */
+/* package */ class PlayerManager implements EventListener, SessionAvailabilityListener {
+
+  /** Listener for changes in the media queue. */
+  public interface QueueChangesListener {
+
+    /** Called when the currently played item of the media queue changes. */
+    void onQueuePositionChanged(int previousIndex, int newIndex);
+
+    /** Called when the media queue changes due to modifications not caused by this manager. */
+    void onQueueContentsExternallyChanged();
+  }
+
+  private static final String USER_AGENT = "ExoCastDemoPlayer";
+  private static final DefaultHttpDataSourceFactory DATA_SOURCE_FACTORY =
+      new DefaultHttpDataSourceFactory(USER_AGENT);
+
+  private final PlayerView localPlayerView;
+  private final PlayerControlView castControlView;
+  private final SimpleExoPlayer exoPlayer;
+  private final ExoCastPlayer exoCastPlayer;
+  private final ArrayList<MediaItem> mediaQueue;
+  private final QueueChangesListener queueChangesListener;
+  private final ConcatenatingMediaSource concatenatingMediaSource;
+
+  private int currentItemIndex;
+  private Player currentPlayer;
+
+  /**
+   * Creates a new manager for {@link SimpleExoPlayer} and {@link ExoCastPlayer}.
+   *
+   * @param queueChangesListener A {@link QueueChangesListener}.
+   * @param localPlayerView The {@link PlayerView} for local playback.
+   * @param castControlView The {@link PlayerControlView} to control remote playback.
+   * @param context A {@link Context}.
+   * @param castContext The {@link CastContext}.
+   */
+  public PlayerManager(
+      QueueChangesListener queueChangesListener,
+      PlayerView localPlayerView,
+      PlayerControlView castControlView,
+      Context context,
+      CastContext castContext) {
+    this.queueChangesListener = queueChangesListener;
+    this.localPlayerView = localPlayerView;
+    this.castControlView = castControlView;
+    mediaQueue = new ArrayList<>();
+    currentItemIndex = C.INDEX_UNSET;
+    concatenatingMediaSource = new ConcatenatingMediaSource();
+
+    DefaultTrackSelector trackSelector = new DefaultTrackSelector();
+    RenderersFactory renderersFactory = new DefaultRenderersFactory(context);
+    exoPlayer = ExoPlayerFactory.newSimpleInstance(context, renderersFactory, trackSelector);
+    exoPlayer.addListener(this);
+    localPlayerView.setPlayer(exoPlayer);
+
+    exoCastPlayer =
+        new ExoCastPlayer(listener -> new DefaultCastSessionManager(castContext, listener));
+    exoCastPlayer.addListener(this);
+    exoCastPlayer.setSessionAvailabilityListener(this);
+    castControlView.setPlayer(exoCastPlayer);
+
+    setCurrentPlayer(exoCastPlayer.isCastSessionAvailable() ? exoCastPlayer : exoPlayer);
+  }
+
+  // Queue manipulation methods.
+
+  /**
+   * Plays a specified queue item in the current player.
+   *
+   * @param itemIndex The index of the item to play.
+   */
+  public void selectQueueItem(int itemIndex) {
+    setCurrentItem(itemIndex, C.TIME_UNSET, true);
+  }
+
+  /** Returns the index of the currently played item. */
+  public int getCurrentItemIndex() {
+    return currentItemIndex;
+  }
+
+  /**
+   * Appends {@code item} to the media queue.
+   *
+   * @param item The {@link MediaItem} to append.
+   */
+  public void addItem(MediaItem item) {
+    mediaQueue.add(item);
+    concatenatingMediaSource.addMediaSource(buildMediaSource(item));
+    if (currentPlayer == exoCastPlayer) {
+      exoCastPlayer.addItemsToQueue(item);
+    }
+  }
+
+  /** Returns the size of the media queue. */
+  public int getMediaQueueSize() {
+    return mediaQueue.size();
+  }
+
+  /**
+   * Returns the item at the given index in the media queue.
+   *
+   * @param position The index of the item.
+   * @return The item at the given index in the media queue.
+   */
+  public MediaItem getItem(int position) {
+    return mediaQueue.get(position);
+  }
+
+  /**
+   * Removes the item at the given index from the media queue.
+   *
+   * @param itemIndex The index of the item to remove.
+   * @return Whether the removal was successful.
+   */
+  public boolean removeItem(int itemIndex) {
+    concatenatingMediaSource.removeMediaSource(itemIndex);
+    mediaQueue.remove(itemIndex);
+    if (currentPlayer == exoCastPlayer) {
+      exoCastPlayer.removeItemFromQueue(itemIndex);
+    }
+    if (itemIndex == currentItemIndex && itemIndex == mediaQueue.size()) {
+      maybeSetCurrentItemAndNotify(C.INDEX_UNSET);
+    } else if (itemIndex < currentItemIndex) {
+      maybeSetCurrentItemAndNotify(currentItemIndex - 1);
+    }
+    return true;
+  }
+
+  /**
+   * Moves an item within the queue.
+   *
+   * @param fromIndex The index of the item to move.
+   * @param toIndex The target index of the item in the queue.
+   * @return Whether the item move was successful.
+   */
+  public boolean moveItem(int fromIndex, int toIndex) {
+    mediaQueue.add(toIndex, mediaQueue.remove(fromIndex));
+    concatenatingMediaSource.moveMediaSource(fromIndex, toIndex);
+    if (currentPlayer == exoCastPlayer) {
+      exoCastPlayer.moveItemInQueue(fromIndex, toIndex);
+    }
+
+    // Index update.
+    maybeSetCurrentItemAndNotify(currentPlayer.getCurrentWindowIndex());
+    return true;
+  }
+
+  // Miscellaneous methods.
+
+  public boolean dispatchKeyEvent(KeyEvent event) {
+    if (currentPlayer == exoPlayer) {
+      return localPlayerView.dispatchKeyEvent(event);
+    } else /* currentPlayer == exoCastPlayer */ {
+      return castControlView.dispatchKeyEvent(event);
+    }
+  }
+
+  /** Releases the manager and the players that it holds. */
+  public void release() {
+    currentItemIndex = C.INDEX_UNSET;
+    mediaQueue.clear();
+    concatenatingMediaSource.clear();
+    exoCastPlayer.setSessionAvailabilityListener(null);
+    exoCastPlayer.release();
+    localPlayerView.setPlayer(null);
+    exoPlayer.release();
+  }
+
+  // Player.EventListener implementation.
+
+  @Override
+  public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
+    updateCurrentItemIndex();
+  }
+
+  @Override
+  public void onPositionDiscontinuity(@DiscontinuityReason int reason) {
+    updateCurrentItemIndex();
+  }
+
+  @Override
+  public void onTimelineChanged(
+      Timeline timeline, @Nullable Object manifest, @TimelineChangeReason int reason) {
+    if (currentPlayer == exoCastPlayer && reason != Player.TIMELINE_CHANGE_REASON_RESET) {
+      maybeUpdateLocalQueueWithRemoteQueueAndNotify();
+    }
+    updateCurrentItemIndex();
+  }
+
+  // CastPlayer.SessionAvailabilityListener implementation.
+
+  @Override
+  public void onCastSessionAvailable() {
+    setCurrentPlayer(exoCastPlayer);
+  }
+
+  @Override
+  public void onCastSessionUnavailable() {
+    setCurrentPlayer(exoPlayer);
+  }
+
+  // Internal methods.
+
+  private void maybeUpdateLocalQueueWithRemoteQueueAndNotify() {
+    Assertions.checkState(currentPlayer == exoCastPlayer);
+    boolean mediaQueuesMatch = mediaQueue.size() == exoCastPlayer.getQueueSize();
+    for (int i = 0; mediaQueuesMatch && i < mediaQueue.size(); i++) {
+      mediaQueuesMatch = mediaQueue.get(i).uuid.equals(exoCastPlayer.getQueueItem(i).uuid);
+    }
+    if (mediaQueuesMatch) {
+      // The media queues match. Do nothing.
+      return;
+    }
+    mediaQueue.clear();
+    concatenatingMediaSource.clear();
+    for (int i = 0; i < exoCastPlayer.getQueueSize(); i++) {
+      MediaItem item = exoCastPlayer.getQueueItem(i);
+      mediaQueue.add(item);
+      concatenatingMediaSource.addMediaSource(buildMediaSource(item));
+    }
+    queueChangesListener.onQueueContentsExternallyChanged();
+  }
+
+  private void updateCurrentItemIndex() {
+    int playbackState = currentPlayer.getPlaybackState();
+    maybeSetCurrentItemAndNotify(
+        playbackState != Player.STATE_IDLE && playbackState != Player.STATE_ENDED
+            ? currentPlayer.getCurrentWindowIndex()
+            : C.INDEX_UNSET);
+  }
+
+  private void setCurrentPlayer(Player currentPlayer) {
+    if (this.currentPlayer == currentPlayer) {
+      return;
+    }
+
+    // View management.
+    if (currentPlayer == exoPlayer) {
+      localPlayerView.setVisibility(View.VISIBLE);
+      castControlView.hide();
+    } else /* currentPlayer == exoCastPlayer */ {
+      localPlayerView.setVisibility(View.GONE);
+      castControlView.show();
+    }
+
+    // Player state management.
+    long playbackPositionMs = C.TIME_UNSET;
+    int windowIndex = C.INDEX_UNSET;
+    boolean playWhenReady = false;
+    if (this.currentPlayer != null) {
+      int playbackState = this.currentPlayer.getPlaybackState();
+      if (playbackState != Player.STATE_ENDED) {
+        playbackPositionMs = this.currentPlayer.getCurrentPosition();
+        playWhenReady = this.currentPlayer.getPlayWhenReady();
+        windowIndex = this.currentPlayer.getCurrentWindowIndex();
+        if (windowIndex != currentItemIndex) {
+          playbackPositionMs = C.TIME_UNSET;
+          windowIndex = currentItemIndex;
+        }
+      }
+      this.currentPlayer.stop(true);
+    } else {
+      // This is the initial setup. No need to save any state.
+    }
+
+    this.currentPlayer = currentPlayer;
+
+    // Media queue management.
+    boolean shouldSeekInNewCurrentPlayer;
+    if (currentPlayer == exoPlayer) {
+      exoPlayer.prepare(concatenatingMediaSource);
+      shouldSeekInNewCurrentPlayer = true;
+    } else /* currentPlayer == exoCastPlayer */ {
+      if (exoCastPlayer.getPlaybackState() == Player.STATE_IDLE) {
+        exoCastPlayer.prepare();
+      }
+      if (mediaQueue.isEmpty()) {
+        // Casting started with no local queue. We take the receiver app's queue as our own.
+        maybeUpdateLocalQueueWithRemoteQueueAndNotify();
+        shouldSeekInNewCurrentPlayer = false;
+      } else {
+        // Casting started when the sender app had no queue. We just load our items into the
+        // receiver app's queue. If the receiver had no items in its queue, we also seek to wherever
+        // the sender app was playing.
+        int currentExoCastPlayerState = exoCastPlayer.getPlaybackState();
+        shouldSeekInNewCurrentPlayer =
+            currentExoCastPlayerState == Player.STATE_IDLE
+                || currentExoCastPlayerState == Player.STATE_ENDED;
+        exoCastPlayer.addItemsToQueue(mediaQueue.toArray(new MediaItem[0]));
+      }
+    }
+
+    // Playback transition.
+    if (shouldSeekInNewCurrentPlayer && windowIndex != C.INDEX_UNSET) {
+      setCurrentItem(windowIndex, playbackPositionMs, playWhenReady);
+    } else if (getMediaQueueSize() > 0) {
+      maybeSetCurrentItemAndNotify(currentPlayer.getCurrentWindowIndex());
+    }
+  }
+
+  /**
+   * Starts playback of the item at the given position.
+   *
+   * @param itemIndex The index of the item to play.
+   * @param positionMs The position at which playback should start.
+   * @param playWhenReady Whether the player should proceed when ready to do so.
+   */
+  private void setCurrentItem(int itemIndex, long positionMs, boolean playWhenReady) {
+    maybeSetCurrentItemAndNotify(itemIndex);
+    currentPlayer.seekTo(itemIndex, positionMs);
+    currentPlayer.setPlayWhenReady(playWhenReady);
+  }
+
+  private void maybeSetCurrentItemAndNotify(int currentItemIndex) {
+    if (this.currentItemIndex != currentItemIndex) {
+      int oldIndex = this.currentItemIndex;
+      this.currentItemIndex = currentItemIndex;
+      queueChangesListener.onQueuePositionChanged(oldIndex, currentItemIndex);
+    }
+  }
+
+  private static MediaSource buildMediaSource(MediaItem item) {
+    Uri uri = item.media.uri;
+    switch (item.mimeType) {
+      case DemoUtil.MIME_TYPE_SS:
+        return new SsMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
+      case DemoUtil.MIME_TYPE_DASH:
+        return new DashMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
+      case DemoUtil.MIME_TYPE_HLS:
+        return new HlsMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
+      case DemoUtil.MIME_TYPE_VIDEO_MP4:
+        return new ProgressiveMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
+      default:
+        {
+          throw new IllegalStateException("Unsupported type: " + item.mimeType);
+        }
+    }
+  }
+}

From fc2710498ae8c894a8e986723a2cea890ee8097d Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 8 Feb 2019 19:03:24 +0000
Subject: [PATCH 507/832] Handle player errors more gracefully in the Cast demo
 app

PiperOrigin-RevId: 233090773
---
 .../exoplayer2/castdemo/MainActivity.java     | 12 ++++--
 .../exoplayer2/castdemo/PlayerManager.java    | 39 ++++++++++++++-----
 demos/cast/src/main/res/values/strings.xml    |  2 +
 3 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
index d62e81be7f..6e36427c5a 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
@@ -33,6 +33,7 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
+import android.widget.Toast;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.ext.cast.MediaItem;
@@ -48,7 +49,7 @@ import java.util.Collections;
  * Cast extension.
  */
 public class MainActivity extends AppCompatActivity
-    implements OnClickListener, PlayerManager.QueueChangesListener {
+    implements OnClickListener, PlayerManager.Listener {
 
   private final MediaItem.Builder mediaItemBuilder;
 
@@ -118,7 +119,7 @@ public class MainActivity extends AppCompatActivity
     }
     playerManager =
         new PlayerManager(
-            /* queueChangesListener= */ this,
+            /* listener= */ this,
             localPlayerView,
             castControlView,
             /* context= */ this,
@@ -154,7 +155,7 @@ public class MainActivity extends AppCompatActivity
         .show();
   }
 
-  // PlayerManager.QueueChangesListener implementation.
+  // PlayerManager.Listener implementation.
 
   @Override
   public void onQueuePositionChanged(int previousIndex, int newIndex) {
@@ -171,6 +172,11 @@ public class MainActivity extends AppCompatActivity
     mediaQueueListAdapter.notifyDataSetChanged();
   }
 
+  @Override
+  public void onPlayerError() {
+    Toast.makeText(getApplicationContext(), R.string.player_error_msg, Toast.LENGTH_LONG).show();
+  }
+
   // Internal methods.
 
   private View buildSampleListView() {
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
index 0a99d21d37..6b25934227 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
@@ -22,6 +22,7 @@ import android.view.KeyEvent;
 import android.view.View;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.DefaultRenderersFactory;
+import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayerFactory;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Player.DiscontinuityReason;
@@ -45,22 +46,27 @@ import com.google.android.exoplayer2.ui.PlayerControlView;
 import com.google.android.exoplayer2.ui.PlayerView;
 import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
 import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.Log;
 import com.google.android.gms.cast.framework.CastContext;
 import java.util.ArrayList;
 
 /** Manages players and an internal media queue for the Cast demo app. */
 /* package */ class PlayerManager implements EventListener, SessionAvailabilityListener {
 
-  /** Listener for changes in the media queue. */
-  public interface QueueChangesListener {
+  /** Listener for events. */
+  public interface Listener {
 
     /** Called when the currently played item of the media queue changes. */
     void onQueuePositionChanged(int previousIndex, int newIndex);
 
     /** Called when the media queue changes due to modifications not caused by this manager. */
     void onQueueContentsExternallyChanged();
+
+    /** Called when an error occurs in the current player. */
+    void onPlayerError();
   }
 
+  private static final String TAG = "PlayerManager";
   private static final String USER_AGENT = "ExoCastDemoPlayer";
   private static final DefaultHttpDataSourceFactory DATA_SOURCE_FACTORY =
       new DefaultHttpDataSourceFactory(USER_AGENT);
@@ -70,7 +76,7 @@ import java.util.ArrayList;
   private final SimpleExoPlayer exoPlayer;
   private final ExoCastPlayer exoCastPlayer;
   private final ArrayList<MediaItem> mediaQueue;
-  private final QueueChangesListener queueChangesListener;
+  private final Listener listener;
   private final ConcatenatingMediaSource concatenatingMediaSource;
 
   private int currentItemIndex;
@@ -79,19 +85,19 @@ import java.util.ArrayList;
   /**
    * Creates a new manager for {@link SimpleExoPlayer} and {@link ExoCastPlayer}.
    *
-   * @param queueChangesListener A {@link QueueChangesListener}.
+   * @param listener A {@link Listener}.
    * @param localPlayerView The {@link PlayerView} for local playback.
    * @param castControlView The {@link PlayerControlView} to control remote playback.
    * @param context A {@link Context}.
    * @param castContext The {@link CastContext}.
    */
   public PlayerManager(
-      QueueChangesListener queueChangesListener,
+      Listener listener,
       PlayerView localPlayerView,
       PlayerControlView castControlView,
       Context context,
       CastContext castContext) {
-    this.queueChangesListener = queueChangesListener;
+    this.listener = listener;
     this.localPlayerView = localPlayerView;
     this.castControlView = castControlView;
     mediaQueue = new ArrayList<>();
@@ -105,7 +111,9 @@ import java.util.ArrayList;
     localPlayerView.setPlayer(exoPlayer);
 
     exoCastPlayer =
-        new ExoCastPlayer(listener -> new DefaultCastSessionManager(castContext, listener));
+        new ExoCastPlayer(
+            sessionManagerListener ->
+                new DefaultCastSessionManager(castContext, sessionManagerListener));
     exoCastPlayer.addListener(this);
     exoCastPlayer.setSessionAvailabilityListener(this);
     castControlView.setPlayer(exoCastPlayer);
@@ -238,6 +246,12 @@ import java.util.ArrayList;
     updateCurrentItemIndex();
   }
 
+  @Override
+  public void onPlayerError(ExoPlaybackException error) {
+    Log.e(TAG, "The player encountered an error.", error);
+    listener.onPlayerError();
+  }
+
   // CastPlayer.SessionAvailabilityListener implementation.
 
   @Override
@@ -269,7 +283,7 @@ import java.util.ArrayList;
       mediaQueue.add(item);
       concatenatingMediaSource.addMediaSource(buildMediaSource(item));
     }
-    queueChangesListener.onQueueContentsExternallyChanged();
+    listener.onQueueContentsExternallyChanged();
   }
 
   private void updateCurrentItemIndex() {
@@ -359,6 +373,13 @@ import java.util.ArrayList;
   private void setCurrentItem(int itemIndex, long positionMs, boolean playWhenReady) {
     maybeSetCurrentItemAndNotify(itemIndex);
     currentPlayer.seekTo(itemIndex, positionMs);
+    if (currentPlayer.getPlaybackState() == Player.STATE_IDLE) {
+      if (currentPlayer == exoCastPlayer) {
+        exoCastPlayer.prepare();
+      } else {
+        exoPlayer.prepare(concatenatingMediaSource);
+      }
+    }
     currentPlayer.setPlayWhenReady(playWhenReady);
   }
 
@@ -366,7 +387,7 @@ import java.util.ArrayList;
     if (this.currentItemIndex != currentItemIndex) {
       int oldIndex = this.currentItemIndex;
       this.currentItemIndex = currentItemIndex;
-      queueChangesListener.onQueuePositionChanged(oldIndex, currentItemIndex);
+      listener.onQueuePositionChanged(oldIndex, currentItemIndex);
     }
   }
 
diff --git a/demos/cast/src/main/res/values/strings.xml b/demos/cast/src/main/res/values/strings.xml
index 58f5233412..13e4bb6928 100644
--- a/demos/cast/src/main/res/values/strings.xml
+++ b/demos/cast/src/main/res/values/strings.xml
@@ -24,4 +24,6 @@
 
   <string name="cast_context_error">Failed to get Cast context. Try updating Google Play Services and restart the app.</string>
 
+  <string name="player_error_msg">Player error encountered. Select a queue item to reprepare. Check the logcat and receiver app\'s console for more info.</string>
+
 </resources>

From abb53d7ce707476e5ab22fa990070bc8d7b2179f Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 11 Feb 2019 10:01:34 +0000
Subject: [PATCH 508/832] Support multiple overrides in TrackSelectionView and
 factor out Builder.

Supporting multiple overrides allows to select tracks from multiple groups, if
enabled. As more options are added, the creation of the dialog is moved to a
separate builder class.

PiperOrigin-RevId: 233366282
---
 RELEASENOTES.md                               |   2 +
 .../exoplayer2/demo/DownloadTracker.java      |  49 ++--
 .../exoplayer2/demo/PlayerActivity.java       |  13 +-
 .../trackselection/TrackSelectionUtil.java    |  30 +++
 .../ui/TrackSelectionDialogBuilder.java       | 234 ++++++++++++++++++
 .../exoplayer2/ui/TrackSelectionView.java     | 197 +++++++--------
 6 files changed, 389 insertions(+), 136 deletions(-)
 create mode 100644 library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 35b2d41a65..df0978fa75 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -60,6 +60,8 @@
   `PlayerNotificationManager` has been fixed. Apps using
   `DownloadNotificationUtil` should switch to using
   `DownloadNotificationHelper`.
+* Move creation of dialogs for `TrackSelectionView`s to
+  `TrackSelectionDialogBuilder` and add option to select multiple overrides.
 
 ### 2.9.5 ###
 
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index 689e7241f7..50ec5048ce 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -24,7 +24,6 @@ import android.net.Uri;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.support.annotation.Nullable;
-import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageButton;
@@ -45,11 +44,13 @@ import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.SelectionOverride;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
+import com.google.android.exoplayer2.trackselection.TrackSelectionUtil;
 import com.google.android.exoplayer2.ui.DefaultTrackNameProvider;
 import com.google.android.exoplayer2.ui.TrackNameProvider;
-import com.google.android.exoplayer2.ui.TrackSelectionView;
+import com.google.android.exoplayer2.ui.TrackSelectionDialogBuilder;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
@@ -229,8 +230,7 @@ public class DownloadTracker implements DownloadManager.Listener {
       implements DownloadHelper.Callback,
           DialogInterface.OnClickListener,
           DialogInterface.OnDismissListener,
-          View.OnClickListener,
-          TrackSelectionView.DialogCallback {
+          View.OnClickListener {
 
     private final DownloadHelper downloadHelper;
     private final String name;
@@ -290,29 +290,19 @@ public class DownloadTracker implements DownloadManager.Listener {
     @Override
     public void onClick(View v) {
       Integer rendererIndex = (Integer) v.getTag();
+      TrackGroupArray trackGroupArray = mappedTrackInfo.getTrackGroups(rendererIndex);
       String dialogTitle = getTrackTypeString(mappedTrackInfo.getRendererType(rendererIndex));
-      Pair<AlertDialog, TrackSelectionView> dialogPair =
-          TrackSelectionView.getDialog(
+      new TrackSelectionDialogBuilder(
               dialog.getContext(),
               dialogTitle,
               mappedTrackInfo,
               rendererIndex,
-              parameters,
-              /* callback= */ this);
-      dialogPair.second.setShowDisableOption(true);
-      dialogPair.second.setAllowAdaptiveSelections(false);
-      dialogPair.first.show();
-    }
-
-    // TrackSelectionView.DialogCallback implementation.
-
-    @Override
-    public void onTracksSelected(DefaultTrackSelector.Parameters parameters) {
-      for (int i = 0; i < downloadHelper.getPeriodCount(); i++) {
-        downloadHelper.replaceTrackSelections(/* periodIndex= */ i, parameters);
-      }
-      this.parameters = parameters;
-      updateSelectionList();
+              (isDisabled, overrides) -> updateTracks(rendererIndex, isDisabled, overrides))
+          .setShowDisableOption(true)
+          .setIsDisabled(parameters.getRendererDisabled(rendererIndex))
+          .setOverride(parameters.getSelectionOverride(rendererIndex, trackGroupArray))
+          .build()
+          .show();
     }
 
     // DialogInterface.OnClickListener implementation.
@@ -332,6 +322,21 @@ public class DownloadTracker implements DownloadManager.Listener {
 
     // Internal methods.
 
+    private void updateTracks(
+        int rendererIndex, boolean isDisabled, List<SelectionOverride> overrides) {
+      parameters =
+          TrackSelectionUtil.updateParametersWithOverride(
+              parameters,
+              rendererIndex,
+              mappedTrackInfo.getTrackGroups(rendererIndex),
+              isDisabled,
+              overrides.isEmpty() ? null : overrides.get(0));
+      for (int i = 0; i < downloadHelper.getPeriodCount(); i++) {
+        downloadHelper.replaceTrackSelections(/* periodIndex= */ i, parameters);
+      }
+      updateSelectionList();
+    }
+
     private void updateSelectionList() {
       selectionList.removeAllViews();
       for (int i = 0; i < mappedTrackInfo.getRendererCount(); i++) {
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 2d4efd7f3d..5284183a90 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
@@ -16,7 +16,6 @@
 package com.google.android.exoplayer2.demo;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
@@ -68,7 +67,7 @@ import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 import com.google.android.exoplayer2.ui.DebugTextViewHelper;
 import com.google.android.exoplayer2.ui.PlayerControlView;
 import com.google.android.exoplayer2.ui.PlayerView;
-import com.google.android.exoplayer2.ui.TrackSelectionView;
+import com.google.android.exoplayer2.ui.TrackSelectionDialogBuilder;
 import com.google.android.exoplayer2.ui.spherical.SphericalSurfaceView;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.HttpDataSource;
@@ -307,11 +306,11 @@ public class PlayerActivity extends Activity
                 || (rendererType == C.TRACK_TYPE_AUDIO
                     && mappedTrackInfo.getTypeSupport(C.TRACK_TYPE_VIDEO)
                         == MappedTrackInfo.RENDERER_SUPPORT_NO_TRACKS);
-        Pair<AlertDialog, TrackSelectionView> dialogPair =
-            TrackSelectionView.getDialog(this, title, trackSelector, rendererIndex);
-        dialogPair.second.setShowDisableOption(true);
-        dialogPair.second.setAllowAdaptiveSelections(allowAdaptiveSelections);
-        dialogPair.first.show();
+        new TrackSelectionDialogBuilder(/* context= */ this, title, trackSelector, rendererIndex)
+            .setShowDisableOption(true)
+            .setAllowAdaptiveSelections(allowAdaptiveSelections)
+            .build()
+            .show();
       }
     }
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
index 7800495a62..b94102a0b1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
@@ -19,9 +19,11 @@ import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.source.chunk.MediaChunk;
 import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
 import com.google.android.exoplayer2.source.chunk.MediaChunkListIterator;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.SelectionOverride;
 import com.google.android.exoplayer2.trackselection.TrackSelection.Definition;
 import com.google.android.exoplayer2.util.Assertions;
 import java.util.Arrays;
@@ -75,6 +77,34 @@ public final class TrackSelectionUtil {
     return selections;
   }
 
+  /**
+   * Updates {@link DefaultTrackSelector.Parameters} with an override.
+   *
+   * @param parameters The current {@link DefaultTrackSelector.Parameters} to build upon.
+   * @param rendererIndex The renderer index to update.
+   * @param trackGroupArray The {@link TrackGroupArray} of the renderer.
+   * @param isDisabled Whether the renderer should be set disabled.
+   * @param override An optional override for the renderer. If null, no override will be set and an
+   *     existing override for this renderer will be cleared.
+   * @return The updated {@link DefaultTrackSelector.Parameters}.
+   */
+  public static DefaultTrackSelector.Parameters updateParametersWithOverride(
+      DefaultTrackSelector.Parameters parameters,
+      int rendererIndex,
+      TrackGroupArray trackGroupArray,
+      boolean isDisabled,
+      @Nullable SelectionOverride override) {
+    DefaultTrackSelector.ParametersBuilder builder =
+        parameters
+            .buildUpon()
+            .clearSelectionOverrides(rendererIndex)
+            .setRendererDisabled(rendererIndex, isDisabled);
+    if (override != null) {
+      builder.setSelectionOverride(rendererIndex, trackGroupArray, override);
+    }
+    return builder.build();
+  }
+
   /**
    * Returns average bitrate for chunks in bits per second. Chunks are included in average until
    * {@code maxDurationMs} or the first unknown length chunk.
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java
new file mode 100644
index 0000000000..9c46f8b827
--- /dev/null
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java
@@ -0,0 +1,234 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.ui;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.SelectionOverride;
+import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo;
+import com.google.android.exoplayer2.trackselection.TrackSelectionUtil;
+import com.google.android.exoplayer2.util.Assertions;
+import java.util.Collections;
+import java.util.List;
+
+/** Builder for a dialog with a {@link TrackSelectionView}. */
+public final class TrackSelectionDialogBuilder {
+
+  /** Callback which is invoked when a track selection has been made. */
+  public interface DialogCallback {
+
+    /**
+     * Called when tracks are selected.
+     *
+     * @param isDisabled Whether the renderer is disabled.
+     * @param overrides List of selected track selection overrides for the renderer.
+     */
+    void onTracksSelected(boolean isDisabled, List<SelectionOverride> overrides);
+  }
+
+  private final Context context;
+  private final CharSequence title;
+  private final MappedTrackInfo mappedTrackInfo;
+  private final int rendererIndex;
+  private final DialogCallback callback;
+
+  private boolean allowAdaptiveSelections;
+  private boolean allowMultipleOverrides;
+  private boolean showDisableOption;
+  @Nullable private TrackNameProvider trackNameProvider;
+  private boolean isDisabled;
+  private List<SelectionOverride> overrides;
+
+  /**
+   * Creates a builder for a track selection dialog.
+   *
+   * @param context The context of the dialog.
+   * @param title The title of the dialog.
+   * @param mappedTrackInfo The {@link MappedTrackInfo} containing the track information.
+   * @param rendererIndex The renderer index in the {@code mappedTrackInfo} for which the track
+   *     selection is shown.
+   * @param callback The {@link DialogCallback} invoked when a track selection has been made.
+   */
+  public TrackSelectionDialogBuilder(
+      Context context,
+      CharSequence title,
+      MappedTrackInfo mappedTrackInfo,
+      int rendererIndex,
+      DialogCallback callback) {
+    this.context = context;
+    this.title = title;
+    this.mappedTrackInfo = mappedTrackInfo;
+    this.rendererIndex = rendererIndex;
+    this.callback = callback;
+    overrides = Collections.emptyList();
+  }
+
+  /**
+   * Creates a builder for a track selection dialog which automatically updates a {@link
+   * DefaultTrackSelector}.
+   *
+   * @param context The context of the dialog.
+   * @param title The title of the dialog.
+   * @param trackSelector A {@link DefaultTrackSelector} whose current selection is used to set up
+   *     the dialog and which is updated when new tracks are selected in the dialog.
+   * @param rendererIndex The renderer index in the {@code trackSelector} for which the track
+   *     selection is shown.
+   */
+  public TrackSelectionDialogBuilder(
+      Context context, CharSequence title, DefaultTrackSelector trackSelector, int rendererIndex) {
+    this.context = context;
+    this.title = title;
+    this.mappedTrackInfo = Assertions.checkNotNull(trackSelector.getCurrentMappedTrackInfo());
+    this.rendererIndex = rendererIndex;
+
+    TrackGroupArray rendererTrackGroups = mappedTrackInfo.getTrackGroups(rendererIndex);
+    DefaultTrackSelector.Parameters selectionParameters = trackSelector.getParameters();
+    isDisabled = selectionParameters.getRendererDisabled(rendererIndex);
+    SelectionOverride override =
+        selectionParameters.getSelectionOverride(rendererIndex, rendererTrackGroups);
+    overrides = override == null ? Collections.emptyList() : Collections.singletonList(override);
+
+    this.callback =
+        (newIsDisabled, newOverrides) ->
+            trackSelector.setParameters(
+                TrackSelectionUtil.updateParametersWithOverride(
+                    selectionParameters,
+                    rendererIndex,
+                    rendererTrackGroups,
+                    newIsDisabled,
+                    newOverrides.isEmpty() ? null : newOverrides.get(0)));
+  }
+
+  /**
+   * Sets whether the selection is initially shown as disabled.
+   *
+   * @param isDisabled Whether the selection is initially shown as disabled.
+   * @return This builder, for convenience.
+   */
+  public TrackSelectionDialogBuilder setIsDisabled(boolean isDisabled) {
+    this.isDisabled = isDisabled;
+    return this;
+  }
+
+  /**
+   * Sets the initial selection override to show.
+   *
+   * @param override The initial override to show, or null for no override.
+   * @return This builder, for convenience.
+   */
+  public TrackSelectionDialogBuilder setOverride(@Nullable SelectionOverride override) {
+    return setOverrides(
+        override == null ? Collections.emptyList() : Collections.singletonList(override));
+  }
+
+  /**
+   * Sets the list of initial selection overrides to show.
+   *
+   * <p>Note that only the first override will be used unless {@link
+   * #setAllowMultipleOverrides(boolean)} is set to {@code true}.
+   *
+   * @param overrides The list of initial overrides to show. There must be at most one override for
+   *     each track group.
+   * @return This builder, for convenience.
+   */
+  public TrackSelectionDialogBuilder setOverrides(List<SelectionOverride> overrides) {
+    this.overrides = overrides;
+    return this;
+  }
+
+  /**
+   * Sets whether adaptive selections (consisting of more than one track) can be made.
+   *
+   * <p>For the selection view to enable adaptive selection it is necessary both for this feature to
+   * be enabled, and for the target renderer to support adaptation between the available tracks.
+   *
+   * @param allowAdaptiveSelections Whether adaptive selection is enabled.
+   * @return This builder, for convenience.
+   */
+  public TrackSelectionDialogBuilder setAllowAdaptiveSelections(boolean allowAdaptiveSelections) {
+    this.allowAdaptiveSelections = allowAdaptiveSelections;
+    return this;
+  }
+
+  /**
+   * Sets whether multiple overrides can be set and selected, i.e. tracks from multiple track groups
+   * can be selected.
+   *
+   * @param allowMultipleOverrides Whether multiple track selection overrides are allowed.
+   * @return This builder, for convenience.
+   */
+  public TrackSelectionDialogBuilder setAllowMultipleOverrides(boolean allowMultipleOverrides) {
+    this.allowMultipleOverrides = allowMultipleOverrides;
+    return this;
+  }
+
+  /**
+   * Sets whether an option is available for disabling the renderer.
+   *
+   * @param showDisableOption Whether the disable option is shown.
+   * @return This builder, for convenience.
+   */
+  public TrackSelectionDialogBuilder setShowDisableOption(boolean showDisableOption) {
+    this.showDisableOption = showDisableOption;
+    return this;
+  }
+
+  /**
+   * Sets the {@link TrackNameProvider} used to generate the user visible name of each track and
+   * updates the view with track names queried from the specified provider.
+   *
+   * @param trackNameProvider The {@link TrackNameProvider} to use, or null to use the default.
+   */
+  public TrackSelectionDialogBuilder setTrackNameProvider(
+      @Nullable TrackNameProvider trackNameProvider) {
+    this.trackNameProvider = trackNameProvider;
+    return this;
+  }
+
+  /** Builds the dialog. */
+  public AlertDialog build() {
+    AlertDialog.Builder builder = new AlertDialog.Builder(context);
+
+    // Inflate with the builder's context to ensure the correct style is used.
+    LayoutInflater dialogInflater = LayoutInflater.from(builder.getContext());
+    View dialogView = dialogInflater.inflate(R.layout.exo_track_selection_dialog, /* root= */ null);
+
+    TrackSelectionView selectionView = dialogView.findViewById(R.id.exo_track_selection_view);
+    selectionView.setAllowMultipleOverrides(allowMultipleOverrides);
+    selectionView.setAllowAdaptiveSelections(allowAdaptiveSelections);
+    selectionView.setShowDisableOption(showDisableOption);
+    if (trackNameProvider != null) {
+      selectionView.setTrackNameProvider(trackNameProvider);
+    }
+    selectionView.init(mappedTrackInfo, rendererIndex, isDisabled, overrides);
+    Dialog.OnClickListener okClickListener =
+        (dialog, which) ->
+            callback.onTracksSelected(selectionView.getIsDisabled(), selectionView.getOverrides());
+
+    return builder
+        .setTitle(title)
+        .setView(dialogView)
+        .setPositiveButton(android.R.string.ok, okClickListener)
+        .setNegativeButton(android.R.string.cancel, null)
+        .create();
+  }
+}
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
index fd78631337..35b7d71b4e 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
@@ -15,14 +15,13 @@
  */
 package com.google.android.exoplayer2.ui;
 
-import android.app.AlertDialog;
-import android.app.Dialog;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.support.annotation.AttrRes;
 import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.Pair;
+import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.CheckedTextView;
@@ -34,115 +33,49 @@ import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.SelectionOverride;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo;
 import com.google.android.exoplayer2.util.Assertions;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 /** A view for making track selections. */
 public class TrackSelectionView extends LinearLayout {
 
-  /** Callback which is invoked when a track selection has been made. */
-  public interface DialogCallback {
-
-    /**
-     * Called when track are selected.
-     *
-     * @param parameters The {@link DefaultTrackSelector.Parameters} for the selected tracks.
-     */
-    void onTracksSelected(DefaultTrackSelector.Parameters parameters);
-  }
-
   private final int selectableItemBackgroundResourceId;
   private final LayoutInflater inflater;
   private final CheckedTextView disableView;
   private final CheckedTextView defaultView;
   private final ComponentListener componentListener;
+  private final SparseArray<SelectionOverride> overrides;
 
   private boolean allowAdaptiveSelections;
+  private boolean allowMultipleOverrides;
 
   private TrackNameProvider trackNameProvider;
   private CheckedTextView[][] trackViews;
 
   private @MonotonicNonNull MappedTrackInfo mappedTrackInfo;
   private int rendererIndex;
-  private DefaultTrackSelector.Parameters parameters;
   private TrackGroupArray trackGroups;
   private boolean isDisabled;
-  @Nullable private SelectionOverride override;
-
-  /**
-   * Gets a pair consisting of a dialog and the {@link TrackSelectionView} that will be shown by it.
-   *
-   * <p>The dialog shows the current configuration of the provided {@code TrackSelector} and updates
-   * the parameters when closing the dialog.
-   *
-   * @param context The parent context.
-   * @param title The dialog's title.
-   * @param trackSelector The track selector.
-   * @param rendererIndex The index of the renderer.
-   * @return The dialog and the {@link TrackSelectionView} that will be shown by it.
-   */
-  public static Pair<AlertDialog, TrackSelectionView> getDialog(
-      Context context, CharSequence title, DefaultTrackSelector trackSelector, int rendererIndex) {
-    return getDialog(
-        context,
-        title,
-        Assertions.checkNotNull(trackSelector.getCurrentMappedTrackInfo()),
-        rendererIndex,
-        trackSelector.getParameters(),
-        trackSelector::setParameters);
-  }
-
-  /**
-   * Gets a pair consisting of a dialog and the {@link TrackSelectionView} that will be shown by it.
-   *
-   * @param context The parent context.
-   * @param title The dialog's title.
-   * @param mappedTrackInfo The {@link MappedTrackInfo}.
-   * @param rendererIndex The index of the renderer.
-   * @param parameters The {@link DefaultTrackSelector.Parameters}.
-   * @param callback The {@link DialogCallback} invoked when the dialog is closed successfully.
-   * @return The dialog and the {@link TrackSelectionView} that will be shown by it.
-   */
-  public static Pair<AlertDialog, TrackSelectionView> getDialog(
-      Context context,
-      CharSequence title,
-      MappedTrackInfo mappedTrackInfo,
-      int rendererIndex,
-      DefaultTrackSelector.Parameters parameters,
-      DialogCallback callback) {
-    AlertDialog.Builder builder = new AlertDialog.Builder(context);
-
-    // Inflate with the builder's context to ensure the correct style is used.
-    LayoutInflater dialogInflater = LayoutInflater.from(builder.getContext());
-    View dialogView = dialogInflater.inflate(R.layout.exo_track_selection_dialog, null);
-
-    TrackSelectionView selectionView = dialogView.findViewById(R.id.exo_track_selection_view);
-    selectionView.init(mappedTrackInfo, rendererIndex, parameters);
-    Dialog.OnClickListener okClickListener =
-        (dialog, which) -> callback.onTracksSelected(selectionView.getSelectionParameters());
-
-    AlertDialog dialog =
-        builder
-            .setTitle(title)
-            .setView(dialogView)
-            .setPositiveButton(android.R.string.ok, okClickListener)
-            .setNegativeButton(android.R.string.cancel, null)
-            .create();
-    return Pair.create(dialog, selectionView);
-  }
 
+  /** Creates a track selection view. */
   public TrackSelectionView(Context context) {
     this(context, null);
   }
 
+  /** Creates a track selection view. */
   public TrackSelectionView(Context context, @Nullable AttributeSet attrs) {
     this(context, attrs, 0);
   }
 
+  /** Creates a track selection view. */
   @SuppressWarnings("nullness")
   public TrackSelectionView(
       Context context, @Nullable AttributeSet attrs, @AttrRes int defStyleAttr) {
     super(context, attrs, defStyleAttr);
+    overrides = new SparseArray<>();
+
     TypedArray attributeArray =
         context
             .getTheme()
@@ -153,7 +86,6 @@ public class TrackSelectionView extends LinearLayout {
     inflater = LayoutInflater.from(context);
     componentListener = new ComponentListener();
     trackNameProvider = new DefaultTrackNameProvider(getResources());
-    parameters = DefaultTrackSelector.Parameters.DEFAULT;
     trackGroups = TrackGroupArray.EMPTY;
 
     // View for disabling the renderer.
@@ -197,6 +129,24 @@ public class TrackSelectionView extends LinearLayout {
     }
   }
 
+  /**
+   * Sets whether tracks from multiple track groups can be selected. This results in multiple {@link
+   * SelectionOverride SelectionOverrides} to be returned by {@link #getOverrides()}.
+   *
+   * @param allowMultipleOverrides Whether multiple track selection overrides can be selected.
+   */
+  public void setAllowMultipleOverrides(boolean allowMultipleOverrides) {
+    if (this.allowMultipleOverrides != allowMultipleOverrides) {
+      this.allowMultipleOverrides = allowMultipleOverrides;
+      if (!allowMultipleOverrides && overrides.size() > 1) {
+        for (int i = overrides.size() - 1; i > 0; i--) {
+          overrides.remove(i);
+        }
+      }
+      updateViews();
+    }
+  }
+
   /**
    * Sets whether an option is available for disabling the renderer.
    *
@@ -223,28 +173,42 @@ public class TrackSelectionView extends LinearLayout {
    *
    * @param mappedTrackInfo The {@link MappedTrackInfo}.
    * @param rendererIndex The index of the renderer.
-   * @param parameters The {@link DefaultTrackSelector.Parameters}.
+   * @param isDisabled Whether the renderer should be initially shown as disabled.
+   * @param overrides List of initial overrides to be shown for this renderer. There must be at most
+   *     one override for each track group. If {@link #setAllowMultipleOverrides(boolean)} hasn't
+   *     been set to {@code true}, only the first override is used.
    */
   public void init(
       MappedTrackInfo mappedTrackInfo,
       int rendererIndex,
-      DefaultTrackSelector.Parameters parameters) {
+      boolean isDisabled,
+      List<SelectionOverride> overrides) {
     this.mappedTrackInfo = mappedTrackInfo;
     this.rendererIndex = rendererIndex;
-    this.parameters = parameters;
+    this.isDisabled = isDisabled;
+    int maxOverrides = allowMultipleOverrides ? overrides.size() : Math.min(overrides.size(), 1);
+    for (int i = 0; i < maxOverrides; i++) {
+      SelectionOverride override = overrides.get(i);
+      this.overrides.put(override.groupIndex, override);
+    }
     updateViews();
   }
 
-  /** Returns the {@link DefaultTrackSelector.Parameters} for the current selection. */
-  public DefaultTrackSelector.Parameters getSelectionParameters() {
-    DefaultTrackSelector.ParametersBuilder parametersBuilder = parameters.buildUpon();
-    parametersBuilder.setRendererDisabled(rendererIndex, isDisabled);
-    if (override != null) {
-      parametersBuilder.setSelectionOverride(rendererIndex, trackGroups, override);
-    } else {
-      parametersBuilder.clearSelectionOverrides(rendererIndex);
+  /** Returns whether the renderer is disabled. */
+  public boolean getIsDisabled() {
+    return isDisabled;
+  }
+
+  /**
+   * Returns the list of selected track selection overrides. There will be at most one override for
+   * each track group.
+   */
+  public List<SelectionOverride> getOverrides() {
+    List<SelectionOverride> overrideList = new ArrayList<>(overrides.size());
+    for (int i = 0; i < overrides.size(); i++) {
+      overrideList.add(overrides.valueAt(i));
     }
-    return parametersBuilder.build();
+    return overrideList;
   }
 
   // Private methods.
@@ -266,14 +230,19 @@ public class TrackSelectionView extends LinearLayout {
 
     trackGroups = mappedTrackInfo.getTrackGroups(rendererIndex);
 
-    isDisabled = parameters.getRendererDisabled(rendererIndex);
-    override = parameters.getSelectionOverride(rendererIndex, trackGroups);
-
     // Add per-track views.
+    if (trackGroups.length == 1 && trackGroups.get(0).length == 1) {
+      // Don't add group selection if there is nothing to select from.
+      trackViews = new CheckedTextView[0][0];
+      updateViewStates();
+      return;
+    }
     trackViews = new CheckedTextView[trackGroups.length][];
+    boolean enableMultipleChoiceForMultipleOverrides =
+        allowMultipleOverrides && trackGroups.length > 1;
     for (int groupIndex = 0; groupIndex < trackGroups.length; groupIndex++) {
       TrackGroup group = trackGroups.get(groupIndex);
-      boolean enableAdaptiveSelections =
+      boolean enableMultipleChoiceForAdaptiveSelections =
           allowAdaptiveSelections
               && trackGroups.get(groupIndex).length > 1
               && mappedTrackInfo.getAdaptiveSupport(rendererIndex, groupIndex, false)
@@ -284,7 +253,7 @@ public class TrackSelectionView extends LinearLayout {
           addView(inflater.inflate(R.layout.exo_list_divider, this, false));
         }
         int trackViewLayoutId =
-            enableAdaptiveSelections
+            enableMultipleChoiceForAdaptiveSelections || enableMultipleChoiceForMultipleOverrides
                 ? android.R.layout.simple_list_item_multiple_choice
                 : android.R.layout.simple_list_item_single_choice;
         CheckedTextView trackView =
@@ -310,11 +279,11 @@ public class TrackSelectionView extends LinearLayout {
 
   private void updateViewStates() {
     disableView.setChecked(isDisabled);
-    defaultView.setChecked(!isDisabled && override == null);
+    defaultView.setChecked(!isDisabled && overrides.size() == 0);
     for (int i = 0; i < trackViews.length; i++) {
+      SelectionOverride override = overrides.get(i);
       for (int j = 0; j < trackViews[i].length; j++) {
-        trackViews[i][j].setChecked(
-            override != null && override.groupIndex == i && override.containsTrack(j));
+        trackViews[i][j].setChecked(override != null && override.containsTrack(j));
       }
     }
   }
@@ -332,12 +301,12 @@ public class TrackSelectionView extends LinearLayout {
 
   private void onDisableViewClicked() {
     isDisabled = true;
-    override = null;
+    overrides.clear();
   }
 
   private void onDefaultViewClicked() {
     isDisabled = false;
-    override = null;
+    overrides.clear();
   }
 
   private void onTrackViewClicked(View view) {
@@ -346,9 +315,21 @@ public class TrackSelectionView extends LinearLayout {
     Pair<Integer, Integer> tag = (Pair<Integer, Integer>) view.getTag();
     int groupIndex = tag.first;
     int trackIndex = tag.second;
-    if (override == null || override.groupIndex != groupIndex || !allowAdaptiveSelections) {
-      // A new override is being started.
-      override = new SelectionOverride(groupIndex, trackIndex);
+    SelectionOverride override = overrides.get(groupIndex);
+    if (!allowMultipleOverrides && override == null && overrides.size() > 0) {
+      // A new override is being started and we don't allow multiple overrides.
+      overrides.clear();
+    }
+    if (override == null || !allowAdaptiveSelections) {
+      // Update override for current group.
+      if (((CheckedTextView) view).isChecked()) {
+        overrides.remove(groupIndex);
+        if (overrides.size() == 0) {
+          isDisabled = true;
+        }
+      } else {
+        overrides.put(groupIndex, new SelectionOverride(groupIndex, trackIndex));
+      }
     } else {
       // An existing override is being modified.
       int overrideLength = override.length;
@@ -357,15 +338,17 @@ public class TrackSelectionView extends LinearLayout {
         // Remove the track from the override.
         if (overrideLength == 1) {
           // The last track is being removed, so the override becomes empty.
-          override = null;
-          isDisabled = true;
+          overrides.remove(groupIndex);
+          if (overrides.size() == 0) {
+            isDisabled = true;
+          }
         } else {
           int[] tracks = getTracksRemoving(overrideTracks, trackIndex);
-          override = new SelectionOverride(groupIndex, tracks);
+          overrides.put(groupIndex, new SelectionOverride(groupIndex, tracks));
         }
       } else {
         int[] tracks = getTracksAdding(overrideTracks, trackIndex);
-        override = new SelectionOverride(groupIndex, tracks);
+        overrides.put(groupIndex, new SelectionOverride(groupIndex, tracks));
       }
     }
   }

From 905927554abfbddb7b61244694d33144687350b8 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Mon, 11 Feb 2019 10:56:23 +0000
Subject: [PATCH 509/832] Fix Cast demo app's blaze build and enable
 proguarding

PiperOrigin-RevId: 233372668
---
 demos/cast/src/main/AndroidManifest.xml | 2 ++
 extensions/cast/proguard-rules.txt      | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/demos/cast/src/main/AndroidManifest.xml b/demos/cast/src/main/AndroidManifest.xml
index 40dfe22167..69887485cb 100644
--- a/demos/cast/src/main/AndroidManifest.xml
+++ b/demos/cast/src/main/AndroidManifest.xml
@@ -17,6 +17,8 @@
     package="com.google.android.exoplayer2.castdemo">
 
   <uses-permission android:name="android.permission.INTERNET"/>
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+
   <uses-sdk/>
 
   <application android:label="@string/application_name" android:icon="@mipmap/ic_launcher"
diff --git a/extensions/cast/proguard-rules.txt b/extensions/cast/proguard-rules.txt
index bc94b33c1c..1271382629 100644
--- a/extensions/cast/proguard-rules.txt
+++ b/extensions/cast/proguard-rules.txt
@@ -2,3 +2,9 @@
 
 # DefaultCastOptionsProvider is commonly referred to only by the app's manifest.
 -keep class com.google.android.exoplayer2.ext.cast.DefaultCastOptionsProvider
+
+# ExoCastOptionsProvider is commonly referred to only by the app's manifest.
+-keep class com.google.android.exoplayer2.ext.cast.ExoCastOptionsProvider
+
+# Don't warn about gms
+-dontwarn com.google.android.gms.**

From 8401097ead92c66bbab2f709716900a84d5f238f Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 11 Feb 2019 13:40:45 +0000
Subject: [PATCH 510/832] Upgrade gradle plugin and friends

PiperOrigin-RevId: 233390513
---
 build.gradle                             | 6 +++---
 constants.gradle                         | 1 -
 demos/cast/build.gradle                  | 1 -
 demos/ima/build.gradle                   | 1 -
 demos/main/build.gradle                  | 1 -
 extensions/cast/build.gradle             | 1 -
 extensions/cronet/build.gradle           | 1 -
 extensions/ffmpeg/build.gradle           | 1 -
 extensions/flac/build.gradle             | 1 -
 extensions/gvr/build.gradle              | 1 -
 extensions/ima/build.gradle              | 1 -
 extensions/jobdispatcher/build.gradle    | 1 -
 extensions/leanback/build.gradle         | 1 -
 extensions/mediasession/build.gradle     | 1 -
 extensions/okhttp/build.gradle           | 1 -
 extensions/opus/build.gradle             | 1 -
 extensions/rtmp/build.gradle             | 1 -
 extensions/vp9/build.gradle              | 1 -
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 javadoc_combined.gradle                  | 2 +-
 javadoc_library.gradle                   | 4 ++--
 library/all/build.gradle                 | 1 -
 library/core/build.gradle                | 1 -
 library/dash/build.gradle                | 1 -
 library/hls/build.gradle                 | 1 -
 library/smoothstreaming/build.gradle     | 1 -
 library/ui/build.gradle                  | 1 -
 playbacktests/build.gradle               | 1 -
 testutils/build.gradle                   | 1 -
 testutils_robolectric/build.gradle       | 1 -
 30 files changed, 8 insertions(+), 34 deletions(-)

diff --git a/build.gradle b/build.gradle
index 96eade1aa3..723546726a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,9 +17,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
-        classpath 'com.novoda:bintray-release:0.8.1'
-        classpath 'com.google.android.gms:strict-version-matcher-plugin:1.0.3'
+        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.novoda:bintray-release:0.9'
+        classpath 'com.google.android.gms:strict-version-matcher-plugin:1.1.0'
     }
     // Workaround for the following test coverage issue. Remove when fixed:
     // https://code.google.com/p/android/issues/detail?id=226070
diff --git a/constants.gradle b/constants.gradle
index a932ef218f..84158f00f6 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -18,7 +18,6 @@ project.ext {
     minSdkVersion = 16
     targetSdkVersion = 28
     compileSdkVersion = 28
-    buildToolsVersion = '28.0.2'
     testSupportLibraryVersion = '0.5'
     supportLibraryVersion = '27.1.1'
     dexmakerVersion = '1.2'
diff --git a/demos/cast/build.gradle b/demos/cast/build.gradle
index cad97358e9..c4fb23248f 100644
--- a/demos/cast/build.gradle
+++ b/demos/cast/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/demos/ima/build.gradle b/demos/ima/build.gradle
index 0530c42eb7..30288845b3 100644
--- a/demos/ima/build.gradle
+++ b/demos/ima/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/demos/main/build.gradle b/demos/main/build.gradle
index e3e382f6d0..206c85cd17 100644
--- a/demos/main/build.gradle
+++ b/demos/main/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/extensions/cast/build.gradle b/extensions/cast/build.gradle
index fea8363960..0fee4dfda2 100644
--- a/extensions/cast/build.gradle
+++ b/extensions/cast/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle
index 1c1c099e7b..161ae4373e 100644
--- a/extensions/cronet/build.gradle
+++ b/extensions/cronet/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion project.ext.minSdkVersion
diff --git a/extensions/ffmpeg/build.gradle b/extensions/ffmpeg/build.gradle
index 1630b6f775..b3962f26da 100644
--- a/extensions/ffmpeg/build.gradle
+++ b/extensions/ffmpeg/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/extensions/flac/build.gradle b/extensions/flac/build.gradle
index e5261902c6..d632b051d9 100644
--- a/extensions/flac/build.gradle
+++ b/extensions/flac/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/extensions/gvr/build.gradle b/extensions/gvr/build.gradle
index 6c0ec05bfb..44200e9259 100644
--- a/extensions/gvr/build.gradle
+++ b/extensions/gvr/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle
index 4d6302c898..d53dcff986 100644
--- a/extensions/ima/build.gradle
+++ b/extensions/ima/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/extensions/jobdispatcher/build.gradle b/extensions/jobdispatcher/build.gradle
index a0e3f8e0c8..b601e013c2 100644
--- a/extensions/jobdispatcher/build.gradle
+++ b/extensions/jobdispatcher/build.gradle
@@ -18,7 +18,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/extensions/leanback/build.gradle b/extensions/leanback/build.gradle
index 10bfef8e7c..3214cb71c1 100644
--- a/extensions/leanback/build.gradle
+++ b/extensions/leanback/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/extensions/mediasession/build.gradle b/extensions/mediasession/build.gradle
index 5fb25c6382..29544c4759 100644
--- a/extensions/mediasession/build.gradle
+++ b/extensions/mediasession/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle
index 78825a6277..172fa175b5 100644
--- a/extensions/okhttp/build.gradle
+++ b/extensions/okhttp/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/extensions/opus/build.gradle b/extensions/opus/build.gradle
index cb12442de8..5ec584bf56 100644
--- a/extensions/opus/build.gradle
+++ b/extensions/opus/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/extensions/rtmp/build.gradle b/extensions/rtmp/build.gradle
index 4869df7a1a..5d8f864594 100644
--- a/extensions/rtmp/build.gradle
+++ b/extensions/rtmp/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/extensions/vp9/build.gradle b/extensions/vp9/build.gradle
index 96c58d7a57..e82371e1f6 100644
--- a/extensions/vp9/build.gradle
+++ b/extensions/vp9/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5559e8ccfa..7061ab9fe7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Sep 05 13:43:42 BST 2017
+#Fri Feb 08 20:49:20 GMT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/javadoc_combined.gradle b/javadoc_combined.gradle
index 209ad3a1a3..d2fa241a81 100644
--- a/javadoc_combined.gradle
+++ b/javadoc_combined.gradle
@@ -42,7 +42,7 @@ class CombinedJavadocPlugin implements Plugin<Project> {
                 if (name == "release") {
                   classpath +=
                       libraryModule.project.files(
-                          variant.javaCompile.classpath.files,
+                          variant.javaCompileProvider.get().classpath.files,
                           libraryModule.project.android.getBootClasspath())
                 }
               }
diff --git a/javadoc_library.gradle b/javadoc_library.gradle
index 65219843e3..a818ea390e 100644
--- a/javadoc_library.gradle
+++ b/javadoc_library.gradle
@@ -21,7 +21,7 @@ android.libraryVariants.all { variant ->
     task("generateJavadoc", type: Javadoc) {
         description = "Generates Javadoc for the ${javadocTitle}."
         title = "ExoPlayer ${javadocTitle}"
-        source = variant.javaCompile.source
+        source = variant.javaCompileProvider.get().source
         options {
             links "http://docs.oracle.com/javase/7/docs/api/"
             linksOffline "https://developer.android.com/reference",
@@ -33,7 +33,7 @@ android.libraryVariants.all { variant ->
         doFirst {
             classpath =
                 files(
-                    variant.javaCompile.classpath.files,
+                    variant.javaCompileProvider.get().classpath.files,
                     project.android.getBootClasspath())
         }
         doLast {
diff --git a/library/all/build.gradle b/library/all/build.gradle
index bb832ba0ff..f78b8b2132 100644
--- a/library/all/build.gradle
+++ b/library/all/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion project.ext.minSdkVersion
diff --git a/library/core/build.gradle b/library/core/build.gradle
index 606033fdea..e143d58ca9 100644
--- a/library/core/build.gradle
+++ b/library/core/build.gradle
@@ -16,7 +16,6 @@ apply from: '../../constants.gradle'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/library/dash/build.gradle b/library/dash/build.gradle
index 40b014aaf9..2c21c6f577 100644
--- a/library/dash/build.gradle
+++ b/library/dash/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/library/hls/build.gradle b/library/hls/build.gradle
index af02544619..165750b3b6 100644
--- a/library/hls/build.gradle
+++ b/library/hls/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/library/smoothstreaming/build.gradle b/library/smoothstreaming/build.gradle
index 2fce6b697c..4957d97c41 100644
--- a/library/smoothstreaming/build.gradle
+++ b/library/smoothstreaming/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/library/ui/build.gradle b/library/ui/build.gradle
index 367f15f028..8418d306ae 100644
--- a/library/ui/build.gradle
+++ b/library/ui/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/playbacktests/build.gradle b/playbacktests/build.gradle
index fe16d3b2c7..f892def24b 100644
--- a/playbacktests/build.gradle
+++ b/playbacktests/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/testutils/build.gradle b/testutils/build.gradle
index 2ef377ba5d..4b7d9d9e48 100644
--- a/testutils/build.gradle
+++ b/testutils/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/testutils_robolectric/build.gradle b/testutils_robolectric/build.gradle
index 2d3317934b..35ccfeafc9 100644
--- a/testutils_robolectric/build.gradle
+++ b/testutils_robolectric/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

From 01836787473f0d8381ee8567fb494e488db02258 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 11 Feb 2019 14:02:46 +0000
Subject: [PATCH 511/832] Suppress obsolete API warning

We'll toggle the publish flag only when doing releases.

Issue: #5477
PiperOrigin-RevId: 233392733
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 723546726a..f8326dd503 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,7 +36,7 @@ allprojects {
         jcenter()
     }
     project.ext {
-        exoplayerPublishEnabled = true
+        exoplayerPublishEnabled = false
     }
     if (it.hasProperty('externalBuildDir')) {
         if (!new File(externalBuildDir).isAbsolute()) {

From 56944caa2167b045f361e6fb86d40570c95e5cc0 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 11 Feb 2019 14:07:13 +0000
Subject: [PATCH 512/832] Allow registration of control overlays for ad
 viewability

Switch from passing an ad UI ViewGroup to passing an object that can also
provide information about controls overlays.

Also switch to using a dedicated overlay for ads instead of the overlay frame
layout, which apps have easy access to.

PiperOrigin-RevId: 233393500
---
 RELEASENOTES.md                               |  4 ++
 .../exoplayer2/imademo/PlayerManager.java     |  5 +-
 .../exoplayer2/demo/PlayerActivity.java       |  9 +---
 .../exoplayer2/ext/ima/ImaAdsLoader.java      | 39 ++++++++++++---
 .../exoplayer2/ext/ima/FakePlayer.java        | 16 ++++++
 .../exoplayer2/ext/ima/ImaAdsLoaderTest.java  | 49 +++++++++++++++----
 .../exoplayer2/source/ads/AdsLoader.java      | 38 ++++++++++----
 .../exoplayer2/source/ads/AdsMediaSource.java | 17 +++----
 .../android/exoplayer2/ui/PlayerView.java     | 20 +++++++-
 9 files changed, 150 insertions(+), 47 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index df0978fa75..87b00b0e11 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -50,6 +50,10 @@
   * Remove deprecated `AdsMediaSource` constructors. Listen for media source
     events using `AdsMediaSource.addEventListener`, and ad interaction events by
     adding a listener when building `ImaAdsLoader`.
+  * Allow apps to register playback-related obstructing views that are on top of
+    their ad display containers via `AdsLoader.AdViewProvider`. `PlayerView`
+    implements this interface and will register its control view. This makes it
+    possible for ad loading SDKs to calculate ad viewability accurately.
 * Remove `player` and `isTopLevelSource` parameters from `MediaSource.prepare`.
 * VP9 extension: Remove RGB output mode and libyuv dependency, and switch to
   surface YUV output as the default. Remove constructor parameters `scaleToFit`
diff --git a/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/PlayerManager.java b/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/PlayerManager.java
index 97c3299a4a..05c804c7a8 100644
--- a/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/PlayerManager.java
+++ b/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/PlayerManager.java
@@ -64,10 +64,7 @@ import com.google.android.exoplayer2.util.Util;
     // Compose the content media source into a new AdsMediaSource with both ads and content.
     MediaSource mediaSourceWithAds =
         new AdsMediaSource(
-            contentMediaSource,
-            /* adMediaSourceFactory= */ this,
-            adsLoader,
-            playerView.getOverlayFrameLayout());
+            contentMediaSource, /* adMediaSourceFactory= */ this, adsLoader, playerView);
 
     // Prepare the player with the source.
     player.seekTo(contentPosition);
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 5284183a90..12fc5eb06f 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
@@ -26,9 +26,7 @@ import android.util.Pair;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -146,7 +144,6 @@ public class PlayerActivity extends Activity
 
   private AdsLoader adsLoader;
   private Uri loadedAdTagUri;
-  private ViewGroup adUiViewGroup;
 
   // Activity lifecycle
 
@@ -464,7 +461,6 @@ public class PlayerActivity extends Activity
     return buildMediaSource(uri, null);
   }
 
-  @SuppressWarnings("unchecked")
   private MediaSource buildMediaSource(Uri uri, @Nullable String overrideExtension) {
     @ContentType int type = Util.inferContentType(uri, overrideExtension);
     List<StreamKey> offlineStreamKeys = getOfflineStreamKeys(uri);
@@ -584,9 +580,6 @@ public class PlayerActivity extends Activity
                 .getConstructor(android.content.Context.class, android.net.Uri.class);
         // LINT.ThenChange(../../../../../../../../proguard-rules.txt)
         adsLoader = loaderConstructor.newInstance(this, adTagUri);
-        adUiViewGroup = new FrameLayout(this);
-        // The demo app has a non-null overlay frame layout.
-        playerView.getOverlayFrameLayout().addView(adUiViewGroup);
       }
       adsLoader.setPlayer(player);
       AdsMediaSource.MediaSourceFactory adMediaSourceFactory =
@@ -601,7 +594,7 @@ public class PlayerActivity extends Activity
               return new int[] {C.TYPE_DASH, C.TYPE_SS, C.TYPE_HLS, C.TYPE_OTHER};
             }
           };
-      return new AdsMediaSource(mediaSource, adMediaSourceFactory, adsLoader, adUiViewGroup);
+      return new AdsMediaSource(mediaSource, adMediaSourceFactory, adsLoader, playerView);
     } catch (ClassNotFoundException e) {
       // IMA extension not loaded.
       return null;
diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
index 4bdec23804..3bfb9aab7b 100644
--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
+++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
@@ -22,6 +22,7 @@ import android.os.SystemClock;
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
+import android.view.View;
 import android.view.ViewGroup;
 import com.google.ads.interactivemedia.v3.api.Ad;
 import com.google.ads.interactivemedia.v3.api.AdDisplayContainer;
@@ -79,6 +80,10 @@ import java.util.Set;
  * <p>The player instance that will play the loaded ads must be set before playback using {@link
  * #setPlayer(Player)}. If the ads loader is no longer required, it must be released by calling
  * {@link #release()}.
+ *
+ * <p>The IMA SDK can take into account video control overlay views when calculating ad viewability.
+ * For more details see {@link AdDisplayContainer#registerVideoControlsOverlay(View)} and {@link
+ * AdViewProvider#getAdOverlayViews()}.
  */
 public final class ImaAdsLoader
     implements Player.EventListener,
@@ -488,13 +493,29 @@ public final class ImaAdsLoader
     return adsLoader;
   }
 
+  /**
+   * Returns the {@link AdDisplayContainer} used by this loader.
+   *
+   * <p>Note: any video controls overlays registered via {@link
+   * AdDisplayContainer#registerVideoControlsOverlay(View)} will be unregistered automatically when
+   * the media source detaches from this instance. It is therefore necessary to re-register views
+   * each time the ads loader is reused. Alternatively, provide overlay views via the {@link
+   * AdsLoader.AdViewProvider} when creating the media source to benefit from automatic
+   * registration.
+   */
+  public AdDisplayContainer getAdDisplayContainer() {
+    return adDisplayContainer;
+  }
+
   /**
    * Sets the slots for displaying companion ads. Individual slots can be created using {@link
    * ImaSdkFactory#createCompanionAdSlot()}.
    *
    * @param companionSlots Slots for displaying companion ads.
    * @see AdDisplayContainer#setCompanionSlots(Collection)
+   * @deprecated Use {@code getAdDisplayContainer().setCompanionSlots(...)}.
    */
+  @Deprecated
   public void setCompanionSlots(Collection<CompanionAdSlot> companionSlots) {
     adDisplayContainer.setCompanionSlots(companionSlots);
   }
@@ -506,14 +527,14 @@ public final class ImaAdsLoader
    * called, so it is only necessary to call this method if you want to request ads before preparing
    * the player.
    *
-   * @param adUiViewGroup A {@link ViewGroup} on top of the player that will show any ad UI.
+   * @param adViewGroup A {@link ViewGroup} on top of the player that will show any ad UI.
    */
-  public void requestAds(ViewGroup adUiViewGroup) {
+  public void requestAds(ViewGroup adViewGroup) {
     if (adPlaybackState != null || adsManager != null || pendingAdRequestContext != null) {
       // Ads have already been requested.
       return;
     }
-    adDisplayContainer.setAdContainer(adUiViewGroup);
+    adDisplayContainer.setAdContainer(adViewGroup);
     pendingAdRequestContext = new Object();
     AdsRequest request = imaFactory.createAdsRequest();
     if (adTagUri != null) {
@@ -563,7 +584,7 @@ public final class ImaAdsLoader
   }
 
   @Override
-  public void start(EventListener eventListener, ViewGroup adUiViewGroup) {
+  public void start(EventListener eventListener, AdViewProvider adViewProvider) {
     Assertions.checkNotNull(
         nextPlayer, "Set player using adsLoader.setPlayer before preparing the player.");
     player = nextPlayer;
@@ -571,7 +592,12 @@ public final class ImaAdsLoader
     lastVolumePercentage = 0;
     lastAdProgress = null;
     lastContentProgress = null;
-    adDisplayContainer.setAdContainer(adUiViewGroup);
+    ViewGroup adViewGroup = adViewProvider.getAdViewGroup();
+    adDisplayContainer.setAdContainer(adViewGroup);
+    View[] adOverlayViews = adViewProvider.getAdOverlayViews();
+    for (View view : adOverlayViews) {
+      adDisplayContainer.registerVideoControlsOverlay(view);
+    }
     player.addListener(this);
     maybeNotifyPendingAdLoadError();
     if (adPlaybackState != null) {
@@ -585,7 +611,7 @@ public final class ImaAdsLoader
       startAdPlayback();
     } else {
       // Ads haven't loaded yet, so request them.
-      requestAds(adUiViewGroup);
+      requestAds(adViewGroup);
     }
   }
 
@@ -600,6 +626,7 @@ public final class ImaAdsLoader
     lastVolumePercentage = getVolume();
     lastAdProgress = getAdProgress();
     lastContentProgress = getContentProgress();
+    adDisplayContainer.unregisterAllVideoControlsOverlays();
     player.removeListener(this);
     player = null;
     eventListener = null;
diff --git a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakePlayer.java b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakePlayer.java
index b8024d6534..d20ccbd728 100644
--- a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakePlayer.java
+++ b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakePlayer.java
@@ -20,6 +20,7 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.testutil.StubExoPlayer;
+import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 import java.util.ArrayList;
 
 /** A fake player for testing content/ad playback. */
@@ -109,6 +110,11 @@ import java.util.ArrayList;
 
   // ExoPlayer methods. Other methods are unsupported.
 
+  @Override
+  public AudioComponent getAudioComponent() {
+    return null;
+  }
+
   @Override
   public Looper getApplicationLooper() {
     return Looper.getMainLooper();
@@ -134,6 +140,16 @@ import java.util.ArrayList;
     return playWhenReady;
   }
 
+  @Override
+  public int getRendererCount() {
+    return 0;
+  }
+
+  @Override
+  public TrackSelectionArray getCurrentTrackSelections() {
+    return new TrackSelectionArray();
+  }
+
   @Override
   public Timeline getCurrentTimeline() {
     return timeline;
diff --git a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java
index 0253e7db13..dabae2de4b 100644
--- a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java
+++ b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java
@@ -17,11 +17,13 @@ package com.google.android.exoplayer2.ext.ima;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.net.Uri;
 import android.support.annotation.Nullable;
+import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import com.google.ads.interactivemedia.v3.api.Ad;
@@ -49,6 +51,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
@@ -73,7 +76,9 @@ public class ImaAdsLoaderTest {
   private @Mock AdDisplayContainer adDisplayContainer;
   private @Mock AdsManager adsManager;
   private SingletonImaFactory testImaFactory;
-  private ViewGroup adUiViewGroup;
+  private ViewGroup adViewGroup;
+  private View adOverlayView;
+  private AdsLoader.AdViewProvider adViewProvider;
   private TestAdsLoaderListener adsLoaderListener;
   private FakePlayer fakeExoPlayer;
   private ImaAdsLoader imaAdsLoader;
@@ -90,7 +95,20 @@ public class ImaAdsLoaderTest {
             adDisplayContainer,
             fakeAdsRequest,
             fakeAdsLoader);
-    adUiViewGroup = new FrameLayout(RuntimeEnvironment.application);
+    adViewGroup = new FrameLayout(RuntimeEnvironment.application);
+    adOverlayView = new View(RuntimeEnvironment.application);
+    adViewProvider =
+        new AdsLoader.AdViewProvider() {
+          @Override
+          public ViewGroup getAdViewGroup() {
+            return adViewGroup;
+          }
+
+          @Override
+          public View[] getAdOverlayViews() {
+            return new View[] {adOverlayView};
+          }
+        };
   }
 
   @After
@@ -111,15 +129,16 @@ public class ImaAdsLoaderTest {
   @Test
   public void testStart_setsAdUiViewGroup() {
     setupPlayback(CONTENT_TIMELINE, PREROLL_ADS_DURATIONS_US, PREROLL_CUE_POINTS_SECONDS);
-    imaAdsLoader.start(adsLoaderListener, adUiViewGroup);
+    imaAdsLoader.start(adsLoaderListener, adViewProvider);
 
-    verify(adDisplayContainer, atLeastOnce()).setAdContainer(adUiViewGroup);
+    verify(adDisplayContainer, atLeastOnce()).setAdContainer(adViewGroup);
+    verify(adDisplayContainer, atLeastOnce()).registerVideoControlsOverlay(adOverlayView);
   }
 
   @Test
   public void testStart_updatesAdPlaybackState() {
     setupPlayback(CONTENT_TIMELINE, PREROLL_ADS_DURATIONS_US, PREROLL_CUE_POINTS_SECONDS);
-    imaAdsLoader.start(adsLoaderListener, adUiViewGroup);
+    imaAdsLoader.start(adsLoaderListener, adViewProvider);
 
     assertThat(adsLoaderListener.adPlaybackState)
         .isEqualTo(
@@ -131,14 +150,14 @@ public class ImaAdsLoaderTest {
   public void testStartAfterRelease() {
     setupPlayback(CONTENT_TIMELINE, PREROLL_ADS_DURATIONS_US, PREROLL_CUE_POINTS_SECONDS);
     imaAdsLoader.release();
-    imaAdsLoader.start(adsLoaderListener, adUiViewGroup);
+    imaAdsLoader.start(adsLoaderListener, adViewProvider);
   }
 
   @Test
   public void testStartAndCallbacksAfterRelease() {
     setupPlayback(CONTENT_TIMELINE, PREROLL_ADS_DURATIONS_US, PREROLL_CUE_POINTS_SECONDS);
     imaAdsLoader.release();
-    imaAdsLoader.start(adsLoaderListener, adUiViewGroup);
+    imaAdsLoader.start(adsLoaderListener, adViewProvider);
     fakeExoPlayer.setPlayingContentPosition(/* position= */ 0);
     fakeExoPlayer.setState(Player.STATE_READY, true);
 
@@ -146,7 +165,7 @@ public class ImaAdsLoaderTest {
     // Note: we can't currently call getContentProgress/getAdProgress as a VerifyError is thrown
     // when using Robolectric and accessing VideoProgressUpdate.VIDEO_TIME_NOT_READY, due to the IMA
     // SDK being proguarded.
-    imaAdsLoader.requestAds(adUiViewGroup);
+    imaAdsLoader.requestAds(adViewGroup);
     imaAdsLoader.onAdEvent(getAdEvent(AdEventType.LOADED, UNSKIPPABLE_AD));
     imaAdsLoader.loadAd(TEST_URI.toString());
     imaAdsLoader.onAdEvent(getAdEvent(AdEventType.CONTENT_PAUSE_REQUESTED, UNSKIPPABLE_AD));
@@ -166,7 +185,7 @@ public class ImaAdsLoaderTest {
     setupPlayback(CONTENT_TIMELINE, PREROLL_ADS_DURATIONS_US, PREROLL_CUE_POINTS_SECONDS);
 
     // Load the preroll ad.
-    imaAdsLoader.start(adsLoaderListener, adUiViewGroup);
+    imaAdsLoader.start(adsLoaderListener, adViewProvider);
     imaAdsLoader.onAdEvent(getAdEvent(AdEventType.LOADED, UNSKIPPABLE_AD));
     imaAdsLoader.loadAd(TEST_URI.toString());
     imaAdsLoader.onAdEvent(getAdEvent(AdEventType.CONTENT_PAUSE_REQUESTED, UNSKIPPABLE_AD));
@@ -201,6 +220,18 @@ public class ImaAdsLoaderTest {
                 .withAdResumePositionUs(/* adResumePositionUs= */ 0));
   }
 
+  @Test
+  public void testStop_unregistersAllVideoControlOverlays() {
+    setupPlayback(CONTENT_TIMELINE, PREROLL_ADS_DURATIONS_US, PREROLL_CUE_POINTS_SECONDS);
+    imaAdsLoader.start(adsLoaderListener, adViewProvider);
+    imaAdsLoader.requestAds(adViewGroup);
+    imaAdsLoader.stop();
+
+    InOrder inOrder = inOrder(adDisplayContainer);
+    inOrder.verify(adDisplayContainer).registerVideoControlsOverlay(adOverlayView);
+    inOrder.verify(adDisplayContainer).unregisterAllVideoControlsOverlays();
+  }
+
   private void setupPlayback(Timeline contentTimeline, long[][] adDurationsUs, Float[] cuePoints) {
     fakeExoPlayer = new FakePlayer();
     adsLoaderListener = new TestAdsLoaderListener(fakeExoPlayer, contentTimeline, adDurationsUs);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsLoader.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsLoader.java
index 48ac79f227..b3054f69a0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsLoader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsLoader.java
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2.source.ads;
 
 import android.support.annotation.Nullable;
+import android.view.View;
 import android.view.ViewGroup;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Player;
@@ -31,16 +32,16 @@ import java.io.IOException;
  * with a new copy of the current {@link AdPlaybackState} whenever further information about ads
  * becomes known (for example, when an ad media URI is available, or an ad has played to the end).
  *
- * <p>{@link #start(EventListener, ViewGroup)} will be called when the ads media source first
+ * <p>{@link #start(EventListener, AdViewProvider)} will be called when the ads media source first
  * initializes, at which point the loader can request ads. If the player enters the background,
  * {@link #stop()} will be called. Loaders should maintain any ad playback state in preparation for
- * a later call to {@link #start(EventListener, ViewGroup)}. If an ad is playing when the player is
- * detached, update the ad playback state with the current playback position using {@link
+ * a later call to {@link #start(EventListener, AdViewProvider)}. If an ad is playing when the
+ * player is detached, update the ad playback state with the current playback position using {@link
  * AdPlaybackState#withAdResumePositionUs(long)}.
  *
  * <p>If {@link EventListener#onAdPlaybackState(AdPlaybackState)} has been called, the
- * implementation of {@link #start(EventListener, ViewGroup)} should invoke the same listener to
- * provide the existing playback state to the new player.
+ * implementation of {@link #start(EventListener, AdViewProvider)} should invoke the same listener
+ * to provide the existing playback state to the new player.
  */
 public interface AdsLoader {
 
@@ -69,6 +70,25 @@ public interface AdsLoader {
     default void onAdTapped() {}
   }
 
+  /** Provides views for the ad UI. */
+  interface AdViewProvider {
+
+    /** Returns the {@link ViewGroup} on top of the player that will show any ad UI. */
+    ViewGroup getAdViewGroup();
+
+    /**
+     * Returns an array of views that are shown on top of the ad view group, but that are essential
+     * for controlling playback and should be excluded from ad viewability measurements by the
+     * {@link AdsLoader} (if it supports this).
+     *
+     * <p>Each view must be either a fully transparent overlay (for capturing touch events), or a
+     * small piece of transient UI that is essential to the user experience of playback (such as a
+     * button to pause/resume playback or a transient full-screen or cast button). For more
+     * information see the documentation for your ads loader.
+     */
+    View[] getAdOverlayViews();
+  }
+
   // Methods called by the application.
 
   /**
@@ -95,8 +115,8 @@ public interface AdsLoader {
 
   /**
    * Sets the supported content types for ad media. Must be called before the first call to {@link
-   * #start(EventListener, ViewGroup)}. Subsequent calls may be ignored. Called on the main thread
-   * by {@link AdsMediaSource}.
+   * #start(EventListener, AdViewProvider)}. Subsequent calls may be ignored. Called on the main
+   * thread by {@link AdsMediaSource}.
    *
    * @param contentTypes The supported content types for ad media. Each element must be one of
    *     {@link C#TYPE_DASH}, {@link C#TYPE_HLS}, {@link C#TYPE_SS} and {@link C#TYPE_OTHER}.
@@ -107,9 +127,9 @@ public interface AdsLoader {
    * Starts using the ads loader for playback. Called on the main thread by {@link AdsMediaSource}.
    *
    * @param eventListener Listener for ads loader events.
-   * @param adUiViewGroup A {@link ViewGroup} on top of the player that will show any ad UI.
+   * @param adViewProvider Provider of views for the ad UI.
    */
-  void start(EventListener eventListener, ViewGroup adUiViewGroup);
+  void start(EventListener eventListener, AdViewProvider adViewProvider);
 
   /**
    * Stops using the ads loader for playback and deregisters the event listener. Called on the main
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
index 75c9c789cf..76fe7f8735 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
@@ -20,7 +20,6 @@ import android.os.Handler;
 import android.os.Looper;
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
-import android.view.ViewGroup;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.source.CompositeMediaSource;
@@ -146,7 +145,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
   private final MediaSource contentMediaSource;
   private final MediaSourceFactory adMediaSourceFactory;
   private final AdsLoader adsLoader;
-  private final ViewGroup adUiViewGroup;
+  private final AdsLoader.AdViewProvider adViewProvider;
   private final Handler mainHandler;
   private final Map<MediaSource, List<DeferredMediaPeriod>> deferredMediaPeriodByAdMediaSource;
   private final Timeline.Period period;
@@ -166,18 +165,18 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
    * @param contentMediaSource The {@link MediaSource} providing the content to play.
    * @param dataSourceFactory Factory for data sources used to load ad media.
    * @param adsLoader The loader for ads.
-   * @param adUiViewGroup A {@link ViewGroup} on top of the player that will show any ad UI.
+   * @param adViewProvider Provider of views for the ad UI.
    */
   public AdsMediaSource(
       MediaSource contentMediaSource,
       DataSource.Factory dataSourceFactory,
       AdsLoader adsLoader,
-      ViewGroup adUiViewGroup) {
+      AdsLoader.AdViewProvider adViewProvider) {
     this(
         contentMediaSource,
         new ProgressiveMediaSource.Factory(dataSourceFactory),
         adsLoader,
-        adUiViewGroup);
+        adViewProvider);
   }
 
   /**
@@ -187,17 +186,17 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
    * @param contentMediaSource The {@link MediaSource} providing the content to play.
    * @param adMediaSourceFactory Factory for media sources used to load ad media.
    * @param adsLoader The loader for ads.
-   * @param adUiViewGroup A {@link ViewGroup} on top of the player that will show any ad UI.
+   * @param adViewProvider Provider of views for the ad UI.
    */
   public AdsMediaSource(
       MediaSource contentMediaSource,
       MediaSourceFactory adMediaSourceFactory,
       AdsLoader adsLoader,
-      ViewGroup adUiViewGroup) {
+      AdsLoader.AdViewProvider adViewProvider) {
     this.contentMediaSource = contentMediaSource;
     this.adMediaSourceFactory = adMediaSourceFactory;
     this.adsLoader = adsLoader;
-    this.adUiViewGroup = adUiViewGroup;
+    this.adViewProvider = adViewProvider;
     mainHandler = new Handler(Looper.getMainLooper());
     deferredMediaPeriodByAdMediaSource = new HashMap<>();
     period = new Timeline.Period();
@@ -218,7 +217,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
     ComponentListener componentListener = new ComponentListener();
     this.componentListener = componentListener;
     prepareChildSource(DUMMY_CONTENT_MEDIA_PERIOD_ID, contentMediaSource);
-    mainHandler.post(() -> adsLoader.start(componentListener, adUiViewGroup));
+    mainHandler.post(() -> adsLoader.start(componentListener, adViewProvider));
   }
 
   @Override
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
index 8871767f49..00ffaa8057 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
@@ -54,6 +54,7 @@ import com.google.android.exoplayer2.Player.VideoComponent;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.id3.ApicFrame;
 import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.source.ads.AdsLoader;
 import com.google.android.exoplayer2.text.Cue;
 import com.google.android.exoplayer2.text.TextOutput;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
@@ -244,7 +245,7 @@ import java.util.List;
  * PlayerView. This will cause the specified layout to be inflated instead of {@code
  * exo_player_view.xml} for only the instance on which the attribute is set.
  */
-public class PlayerView extends FrameLayout {
+public class PlayerView extends FrameLayout implements AdsLoader.AdViewProvider {
 
   // LINT.IfChange
   /**
@@ -283,7 +284,7 @@ public class PlayerView extends FrameLayout {
   private final SubtitleView subtitleView;
   @Nullable private final View bufferingView;
   @Nullable private final TextView errorMessageView;
-  private final PlayerControlView controller;
+  @Nullable private final PlayerControlView controller;
   private final ComponentListener componentListener;
   @Nullable private final FrameLayout adOverlayFrameLayout;
   @Nullable private final FrameLayout overlayFrameLayout;
@@ -1106,6 +1107,21 @@ public class PlayerView extends FrameLayout {
     }
   }
 
+  // AdsLoader.AdViewProvider implementation.
+
+  @Override
+  public ViewGroup getAdViewGroup() {
+    return Assertions.checkNotNull(
+        adOverlayFrameLayout, "exo_ad_overlay must be present for ad playback");
+  }
+
+  @Override
+  public View[] getAdOverlayViews() {
+    return controller != null ? new View[] {controller} : new View[0];
+  }
+
+  // Internal methods.
+
   private boolean toggleControllerVisibility() {
     if (!useController || player == null) {
       return false;

From ae12b76ac44ab19f4ba54cdddc41c3c5629381ab Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 11 Feb 2019 15:53:57 +0000
Subject: [PATCH 513/832] Add tests to ensure DefaultRenderersFactory
 reflection works

Also add explicit Lint.IfChange/ThenChange rules to make it
clearer what needs to be done when changing one of the code
paths that's accessed via reflection.

PiperOrigin-RevId: 233406709
---
 extensions/ffmpeg/build.gradle                |  2 +
 .../ffmpeg/src/test/AndroidManifest.xml       | 17 ++++
 .../ffmpeg/DefaultRenderersFactoryTest.java   | 33 +++++++
 .../src/test/resources/robolectric.properties |  1 +
 extensions/flac/build.gradle                  |  5 +-
 .../exoplayer2/ext/flac/FlacExtractor.java    |  2 +-
 .../ext/flac/LibflacAudioRenderer.java        |  4 +-
 .../ext/flac/DefaultRenderersFactoryTest.java | 33 +++++++
 extensions/opus/build.gradle                  |  2 +
 .../ext/opus/LibopusAudioRenderer.java        |  4 +-
 extensions/opus/src/test/AndroidManifest.xml  | 17 ++++
 .../ext/opus/DefaultRenderersFactoryTest.java | 33 +++++++
 .../src/test/resources/robolectric.properties |  1 +
 extensions/vp9/build.gradle                   |  2 +
 extensions/vp9/src/test/AndroidManifest.xml   | 17 ++++
 .../ext/vp9/DefaultRenderersFactoryTest.java  | 33 +++++++
 .../src/test/resources/robolectric.properties |  1 +
 .../DefaultRenderersFactoryAsserts.java       | 99 +++++++++++++++++++
 18 files changed, 301 insertions(+), 5 deletions(-)
 create mode 100644 extensions/ffmpeg/src/test/AndroidManifest.xml
 create mode 100644 extensions/ffmpeg/src/test/java/com/google/android/exoplayer2/ext/ffmpeg/DefaultRenderersFactoryTest.java
 create mode 100644 extensions/ffmpeg/src/test/resources/robolectric.properties
 create mode 100644 extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultRenderersFactoryTest.java
 create mode 100644 extensions/opus/src/test/AndroidManifest.xml
 create mode 100644 extensions/opus/src/test/java/com/google/android/exoplayer2/ext/opus/DefaultRenderersFactoryTest.java
 create mode 100644 extensions/opus/src/test/resources/robolectric.properties
 create mode 100644 extensions/vp9/src/test/AndroidManifest.xml
 create mode 100644 extensions/vp9/src/test/java/com/google/android/exoplayer2/ext/vp9/DefaultRenderersFactoryTest.java
 create mode 100644 extensions/vp9/src/test/resources/robolectric.properties
 create mode 100644 testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/DefaultRenderersFactoryAsserts.java

diff --git a/extensions/ffmpeg/build.gradle b/extensions/ffmpeg/build.gradle
index b3962f26da..2c2499759d 100644
--- a/extensions/ffmpeg/build.gradle
+++ b/extensions/ffmpeg/build.gradle
@@ -38,6 +38,8 @@ dependencies {
     implementation project(modulePrefix + 'library-core')
     implementation 'com.android.support:support-annotations:' + supportLibraryVersion
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
+    testImplementation project(modulePrefix + 'testutils-robolectric')
+    testImplementation 'junit:junit:' + junitVersion
 }
 
 ext {
diff --git a/extensions/ffmpeg/src/test/AndroidManifest.xml b/extensions/ffmpeg/src/test/AndroidManifest.xml
new file mode 100644
index 0000000000..d53bca4ca2
--- /dev/null
+++ b/extensions/ffmpeg/src/test/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest package="com.google.android.exoplayer2.ext.ffmpeg"/>
diff --git a/extensions/ffmpeg/src/test/java/com/google/android/exoplayer2/ext/ffmpeg/DefaultRenderersFactoryTest.java b/extensions/ffmpeg/src/test/java/com/google/android/exoplayer2/ext/ffmpeg/DefaultRenderersFactoryTest.java
new file mode 100644
index 0000000000..7e99a11861
--- /dev/null
+++ b/extensions/ffmpeg/src/test/java/com/google/android/exoplayer2/ext/ffmpeg/DefaultRenderersFactoryTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.ext.ffmpeg;
+
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Unit test for {@link DefaultRenderersFactoryTest} with {@link FfmpegAudioRenderer}. */
+@RunWith(RobolectricTestRunner.class)
+public final class DefaultRenderersFactoryTest {
+
+  @Test
+  public void createRenderers_instantiatesVpxRenderer() {
+    DefaultRenderersFactoryAsserts.assertExtensionRendererCreated(
+        FfmpegAudioRenderer.class, C.TRACK_TYPE_AUDIO);
+  }
+}
diff --git a/extensions/ffmpeg/src/test/resources/robolectric.properties b/extensions/ffmpeg/src/test/resources/robolectric.properties
new file mode 100644
index 0000000000..2f3210368e
--- /dev/null
+++ b/extensions/ffmpeg/src/test/resources/robolectric.properties
@@ -0,0 +1 @@
+manifest=src/test/AndroidManifest.xml
diff --git a/extensions/flac/build.gradle b/extensions/flac/build.gradle
index d632b051d9..41148bbc7d 100644
--- a/extensions/flac/build.gradle
+++ b/extensions/flac/build.gradle
@@ -36,11 +36,12 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:support-annotations:' + supportLibraryVersion
     implementation project(modulePrefix + 'library-core')
-    androidTestImplementation 'androidx.test:runner:' + testRunnerVersion
+    implementation 'com.android.support:support-annotations:' + supportLibraryVersion
     androidTestImplementation project(modulePrefix + 'testutils')
+    androidTestImplementation 'androidx.test:runner:' + testRunnerVersion
     testImplementation project(modulePrefix + 'testutils-robolectric')
+    testImplementation 'org.robolectric:robolectric:' + robolectricVersion
 }
 
 ext {
diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java
index 8f5dcef16b..cf484732e2 100644
--- a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java
+++ b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java
@@ -94,7 +94,7 @@ public final class FlacExtractor implements Extractor {
 
   /** Constructs an instance with flags = 0. */
   public FlacExtractor() {
-    this(0);
+    this(/* flags= */ 0);
   }
 
   /**
diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java
index 424fcbb285..ac7646cc4b 100644
--- a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java
+++ b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java
@@ -42,7 +42,9 @@ public class LibflacAudioRenderer extends SimpleDecoderAudioRenderer {
    * @param eventListener A listener of events. May be null if delivery of events is not required.
    * @param audioProcessors Optional {@link AudioProcessor}s that will process audio before output.
    */
-  public LibflacAudioRenderer(Handler eventHandler, AudioRendererEventListener eventListener,
+  public LibflacAudioRenderer(
+      Handler eventHandler,
+      AudioRendererEventListener eventListener,
       AudioProcessor... audioProcessors) {
     super(eventHandler, eventListener, audioProcessors);
   }
diff --git a/extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultRenderersFactoryTest.java b/extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultRenderersFactoryTest.java
new file mode 100644
index 0000000000..dfae6551a5
--- /dev/null
+++ b/extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultRenderersFactoryTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.ext.flac;
+
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Unit test for {@link DefaultRenderersFactoryTest} with {@link LibflacAudioRenderer}. */
+@RunWith(RobolectricTestRunner.class)
+public final class DefaultRenderersFactoryTest {
+
+  @Test
+  public void createRenderers_instantiatesVpxRenderer() {
+    DefaultRenderersFactoryAsserts.assertExtensionRendererCreated(
+        LibflacAudioRenderer.class, C.TRACK_TYPE_AUDIO);
+  }
+}
diff --git a/extensions/opus/build.gradle b/extensions/opus/build.gradle
index 5ec584bf56..212c985157 100644
--- a/extensions/opus/build.gradle
+++ b/extensions/opus/build.gradle
@@ -37,6 +37,8 @@ android {
 
 dependencies {
     implementation project(modulePrefix + 'library-core')
+    testImplementation project(modulePrefix + 'testutils-robolectric')
+    testImplementation 'junit:junit:' + junitVersion
     androidTestImplementation 'androidx.test:runner:' + testRunnerVersion
 }
 
diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java
index e288339058..59337c0847 100644
--- a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java
+++ b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java
@@ -47,7 +47,9 @@ public final class LibopusAudioRenderer extends SimpleDecoderAudioRenderer {
    * @param eventListener A listener of events. May be null if delivery of events is not required.
    * @param audioProcessors Optional {@link AudioProcessor}s that will process audio before output.
    */
-  public LibopusAudioRenderer(Handler eventHandler, AudioRendererEventListener eventListener,
+  public LibopusAudioRenderer(
+      Handler eventHandler,
+      AudioRendererEventListener eventListener,
       AudioProcessor... audioProcessors) {
     super(eventHandler, eventListener, audioProcessors);
   }
diff --git a/extensions/opus/src/test/AndroidManifest.xml b/extensions/opus/src/test/AndroidManifest.xml
new file mode 100644
index 0000000000..ac6a3bf68f
--- /dev/null
+++ b/extensions/opus/src/test/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest package="com.google.android.exoplayer2.ext.opus"/>
diff --git a/extensions/opus/src/test/java/com/google/android/exoplayer2/ext/opus/DefaultRenderersFactoryTest.java b/extensions/opus/src/test/java/com/google/android/exoplayer2/ext/opus/DefaultRenderersFactoryTest.java
new file mode 100644
index 0000000000..0fed3f3de6
--- /dev/null
+++ b/extensions/opus/src/test/java/com/google/android/exoplayer2/ext/opus/DefaultRenderersFactoryTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.ext.opus;
+
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Unit test for {@link DefaultRenderersFactoryTest} with {@link LibopusAudioRenderer}. */
+@RunWith(RobolectricTestRunner.class)
+public final class DefaultRenderersFactoryTest {
+
+  @Test
+  public void createRenderers_instantiatesVpxRenderer() {
+    DefaultRenderersFactoryAsserts.assertExtensionRendererCreated(
+        LibopusAudioRenderer.class, C.TRACK_TYPE_AUDIO);
+  }
+}
diff --git a/extensions/opus/src/test/resources/robolectric.properties b/extensions/opus/src/test/resources/robolectric.properties
new file mode 100644
index 0000000000..2f3210368e
--- /dev/null
+++ b/extensions/opus/src/test/resources/robolectric.properties
@@ -0,0 +1 @@
+manifest=src/test/AndroidManifest.xml
diff --git a/extensions/vp9/build.gradle b/extensions/vp9/build.gradle
index e82371e1f6..f6702e28bb 100644
--- a/extensions/vp9/build.gradle
+++ b/extensions/vp9/build.gradle
@@ -38,6 +38,8 @@ android {
 dependencies {
     implementation project(modulePrefix + 'library-core')
     implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+    testImplementation project(modulePrefix + 'testutils-robolectric')
+    testImplementation 'junit:junit:' + junitVersion
     androidTestImplementation 'androidx.test:runner:' + testRunnerVersion
     androidTestImplementation 'com.google.truth:truth:' + truthVersion
 }
diff --git a/extensions/vp9/src/test/AndroidManifest.xml b/extensions/vp9/src/test/AndroidManifest.xml
new file mode 100644
index 0000000000..a0123f17db
--- /dev/null
+++ b/extensions/vp9/src/test/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest package="com.google.android.exoplayer2.ext.vp9"/>
diff --git a/extensions/vp9/src/test/java/com/google/android/exoplayer2/ext/vp9/DefaultRenderersFactoryTest.java b/extensions/vp9/src/test/java/com/google/android/exoplayer2/ext/vp9/DefaultRenderersFactoryTest.java
new file mode 100644
index 0000000000..3277c3ce83
--- /dev/null
+++ b/extensions/vp9/src/test/java/com/google/android/exoplayer2/ext/vp9/DefaultRenderersFactoryTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.ext.vp9;
+
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Unit test for {@link DefaultRenderersFactoryTest} with {@link LibvpxVideoRenderer}. */
+@RunWith(RobolectricTestRunner.class)
+public final class DefaultRenderersFactoryTest {
+
+  @Test
+  public void createRenderers_instantiatesVpxRenderer() {
+    DefaultRenderersFactoryAsserts.assertExtensionRendererCreated(
+        LibvpxVideoRenderer.class, C.TRACK_TYPE_VIDEO);
+  }
+}
diff --git a/extensions/vp9/src/test/resources/robolectric.properties b/extensions/vp9/src/test/resources/robolectric.properties
new file mode 100644
index 0000000000..2f3210368e
--- /dev/null
+++ b/extensions/vp9/src/test/resources/robolectric.properties
@@ -0,0 +1 @@
+manifest=src/test/AndroidManifest.xml
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/DefaultRenderersFactoryAsserts.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/DefaultRenderersFactoryAsserts.java
new file mode 100644
index 0000000000..ea6633c695
--- /dev/null
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/DefaultRenderersFactoryAsserts.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.testutil;
+
+import static com.google.android.exoplayer2.DefaultRenderersFactory.EXTENSION_RENDERER_MODE_OFF;
+import static com.google.android.exoplayer2.DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON;
+import static com.google.android.exoplayer2.DefaultRenderersFactory.EXTENSION_RENDERER_MODE_PREFER;
+import static com.google.common.truth.Truth.assertThat;
+
+import android.os.Handler;
+import android.os.Looper;
+import com.google.android.exoplayer2.DefaultRenderersFactory;
+import com.google.android.exoplayer2.Renderer;
+import com.google.android.exoplayer2.audio.AudioRendererEventListener;
+import com.google.android.exoplayer2.metadata.Metadata;
+import com.google.android.exoplayer2.text.Cue;
+import com.google.android.exoplayer2.video.VideoRendererEventListener;
+import java.util.List;
+import org.robolectric.RuntimeEnvironment;
+
+/** Assertions for {@link DefaultRenderersFactory}. */
+public final class DefaultRenderersFactoryAsserts {
+
+  /**
+   * Asserts that an extension renderer of type {@code clazz} is not instantiated for {@link
+   * DefaultRenderersFactory#EXTENSION_RENDERER_MODE_OFF}, and that it's instantiated in the correct
+   * position relative to other renderers of the same type for {@link
+   * DefaultRenderersFactory#EXTENSION_RENDERER_MODE_ON} and {@link
+   * DefaultRenderersFactory#EXTENSION_RENDERER_MODE_PREFER}, assuming no other extension renderers
+   * can be loaded.
+   *
+   * @param clazz The extension renderer class.
+   * @param type The type of the renderer.
+   */
+  public static void assertExtensionRendererCreated(Class<? extends Renderer> clazz, int type) {
+    // In EXTENSION_RENDERER_MODE_OFF the renderer should not be created.
+    Renderer[] renderers = createRenderers(EXTENSION_RENDERER_MODE_OFF);
+    for (Renderer renderer : renderers) {
+      assertThat(renderer).isNotInstanceOf(clazz);
+    }
+
+    // In EXTENSION_RENDERER_MODE_ON the renderer should be created and last of its type.
+    renderers = createRenderers(EXTENSION_RENDERER_MODE_ON);
+    boolean found = false;
+    for (Renderer renderer : renderers) {
+      if (!found) {
+        if (clazz.isInstance(renderer)) {
+          found = true;
+        }
+      } else {
+        assertThat(renderer.getTrackType()).isNotEqualTo(type);
+      }
+    }
+    assertThat(found).isTrue();
+
+    // In EXTENSION_RENDERER_MODE_PREFER the renderer should be created and first of its type.
+    renderers = createRenderers(EXTENSION_RENDERER_MODE_PREFER);
+    found = false;
+    for (Renderer renderer : renderers) {
+      if (!found) {
+        if (clazz.isInstance(renderer)) {
+          found = true;
+        } else {
+          assertThat(renderer.getTrackType()).isNotEqualTo(type);
+        }
+      } else {
+        assertThat(renderer).isNotInstanceOf(clazz);
+      }
+    }
+    assertThat(found).isTrue();
+  }
+
+  private static Renderer[] createRenderers(
+      @DefaultRenderersFactory.ExtensionRendererMode int extensionRendererMode) {
+    DefaultRenderersFactory factory =
+        new DefaultRenderersFactory(RuntimeEnvironment.application)
+            .setExtensionRendererMode(extensionRendererMode);
+    return factory.createRenderers(
+        new Handler(Looper.getMainLooper()),
+        new VideoRendererEventListener() {},
+        new AudioRendererEventListener() {},
+        (List<Cue> cues) -> {},
+        (Metadata metadata) -> {},
+        /* drmSessionManager= */ null);
+  }
+}

From 71ab19c7717a029f7a475322f8a2df5b7cfbb984 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 11 Feb 2019 16:19:01 +0000
Subject: [PATCH 514/832] Fix a few GVR 360 nits

- Remove unused TAG
- android.Theme.Material can only be used from API level 21
- Rm "Base" from activity name for consistency

PiperOrigin-RevId: 233410603
---
 ...yerActivity.java => GvrPlayerActivity.java} |  9 ++++-----
 .../gvr/src/main/res/values-v21/styles.xml     | 18 ++++++++++++++++++
 extensions/gvr/src/main/res/values/styles.xml  |  5 ++---
 3 files changed, 24 insertions(+), 8 deletions(-)
 rename extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/{BaseGvrPlayerActivity.java => GvrPlayerActivity.java} (97%)
 create mode 100644 extensions/gvr/src/main/res/values-v21/styles.xml

diff --git a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/BaseGvrPlayerActivity.java b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java
similarity index 97%
rename from extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/BaseGvrPlayerActivity.java
rename to extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java
index acddae49e9..81e25fa462 100644
--- a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/BaseGvrPlayerActivity.java
+++ b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java
@@ -50,9 +50,8 @@ import com.google.vr.sdk.controller.ControllerManager;
 import javax.microedition.khronos.egl.EGLConfig;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
-/** VR 360 video player base activity class. */
-public abstract class BaseGvrPlayerActivity extends GvrActivity {
-  private static final String TAG = "GvrPlayerActivity";
+/** Base activity for VR 360 video playback. */
+public abstract class GvrPlayerActivity extends GvrActivity {
 
   private static final int EXIT_FROM_VR_REQUEST_CODE = 42;
 
@@ -66,7 +65,7 @@ public abstract class BaseGvrPlayerActivity extends GvrActivity {
   @MonotonicNonNull private SceneRenderer scene;
   @MonotonicNonNull private PlayerControlView playerControl;
 
-  public BaseGvrPlayerActivity() {
+  public GvrPlayerActivity() {
     mainHandler = new Handler(Looper.getMainLooper());
   }
 
@@ -348,7 +347,7 @@ public abstract class BaseGvrPlayerActivity extends GvrActivity {
               }
             });
       } else if (!appButtonDown && controller.appButtonState) {
-        glView.post(BaseGvrPlayerActivity.this::togglePlayerControlVisibility);
+        glView.post(GvrPlayerActivity.this::togglePlayerControlVisibility);
       }
       appButtonDown = controller.appButtonState;
     }
diff --git a/extensions/gvr/src/main/res/values-v21/styles.xml b/extensions/gvr/src/main/res/values-v21/styles.xml
new file mode 100644
index 0000000000..276db1b42d
--- /dev/null
+++ b/extensions/gvr/src/main/res/values-v21/styles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+  <style name="VrTheme" parent="android:Theme.Material"/>
+</resources>
diff --git a/extensions/gvr/src/main/res/values/styles.xml b/extensions/gvr/src/main/res/values/styles.xml
index c79e1dfa60..ab5fde106a 100644
--- a/extensions/gvr/src/main/res/values/styles.xml
+++ b/extensions/gvr/src/main/res/values/styles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Android Open Source Project
+<!-- Copyright (C) 2019 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<!-- Android Views rendered in VR should use a theme that matches the rest of the VR UI.-->
 <resources>
-  <style name="VrTheme" parent="android:Theme.Material"/>
+  <style name="VrTheme" parent="android:Theme.Holo"/>
 </resources>

From de720fef7705b6a9d8897d82c48509b9f475ab20 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 11 Feb 2019 17:11:08 +0000
Subject: [PATCH 515/832] Add missing permission to IMA demo app

PiperOrigin-RevId: 233418784
---
 demos/ima/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/demos/ima/src/main/AndroidManifest.xml b/demos/ima/src/main/AndroidManifest.xml
index 50ad0c1b54..85439018fd 100644
--- a/demos/ima/src/main/AndroidManifest.xml
+++ b/demos/ima/src/main/AndroidManifest.xml
@@ -17,6 +17,7 @@
     package="com.google.android.exoplayer2.imademo">
 
   <uses-permission android:name="android.permission.INTERNET"/>
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-sdk/>
 
   <application android:label="@string/application_name" android:icon="@mipmap/ic_launcher"

From 6d461f5b25fc09dea43b28e1e42d5754a7ed6910 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 11 Feb 2019 17:19:36 +0000
Subject: [PATCH 516/832] Fix PlayerNotificationManager lint error

builder.mActions is marked as @RestrictTo(LIBRARY_GROUP). We'll
just have to put up with notification flicker on KitKat if the
actions change.

PiperOrigin-RevId: 233420076
---
 .../ui/PlayerNotificationManager.java         | 50 +++++++++++--------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
index 6634fdf820..88087751b3 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
@@ -338,10 +338,9 @@ public class PlayerNotificationManager {
 
   private final Context context;
   private final String channelId;
-  private final NotificationCompat.Builder builder;
   private final int notificationId;
   private final MediaDescriptionAdapter mediaDescriptionAdapter;
-  private final @Nullable CustomActionReceiver customActionReceiver;
+  @Nullable private final CustomActionReceiver customActionReceiver;
   private final Handler mainHandler;
   private final NotificationManagerCompat notificationManager;
   private final IntentFilter intentFilter;
@@ -353,13 +352,15 @@ public class PlayerNotificationManager {
   private final int instanceId;
   private final Timeline.Window window;
 
+  @Nullable private NotificationCompat.Builder builder;
+  @Nullable private ArrayList<NotificationCompat.Action> builderActions;
   @Nullable private Player player;
   @Nullable private PlaybackPreparer playbackPreparer;
   private ControlDispatcher controlDispatcher;
   private boolean isNotificationStarted;
   private int currentNotificationTag;
-  private @Nullable NotificationListener notificationListener;
-  private @Nullable MediaSessionCompat.Token mediaSessionToken;
+  @Nullable private NotificationListener notificationListener;
+  @Nullable private MediaSessionCompat.Token mediaSessionToken;
   private boolean useNavigationActions;
   private boolean usePlayPauseActions;
   private boolean useStopAction;
@@ -369,9 +370,9 @@ public class PlayerNotificationManager {
   private boolean colorized;
   private int defaults;
   private int color;
-  private @DrawableRes int smallIconResourceId;
+  @DrawableRes private int smallIconResourceId;
   private int visibility;
-  private @Priority int priority;
+  @Priority private int priority;
   private boolean useChronometer;
   private boolean wasPlayWhenReady;
   private int lastPlaybackState;
@@ -538,7 +539,6 @@ public class PlayerNotificationManager {
     this.mediaDescriptionAdapter = mediaDescriptionAdapter;
     this.notificationListener = notificationListener;
     this.customActionReceiver = customActionReceiver;
-    builder = new NotificationCompat.Builder(context, channelId);
     controlDispatcher = new DefaultControlDispatcher();
     window = new Timeline.Window();
     instanceId = instanceIdCounter++;
@@ -890,11 +890,12 @@ public class PlayerNotificationManager {
   private Notification startOrUpdateNotification(@Nullable Bitmap bitmap) {
     Player player = this.player;
     boolean ongoing = getOngoing(player);
-    Notification notification = createNotification(player, builder, ongoing, bitmap);
-    if (notification == null) {
+    builder = createNotification(player, builder, ongoing, bitmap);
+    if (builder == null) {
       stopNotification(/* dismissedByUser= */ false);
       return null;
     }
+    Notification notification = builder.build();
     notificationManager.notify(notificationId, notification);
     if (!isNotificationStarted) {
       isNotificationStarted = true;
@@ -926,28 +927,27 @@ public class PlayerNotificationManager {
    * Creates the notification given the current player state.
    *
    * @param player The player for which state to build a notification.
-   * @param builder A builder that can optionally be used for creating the notification. The same
-   *     builder is passed each time this method is called, since reusing the same builder can
-   *     prevent notification flicker when {@code Util#SDK_INT} &lt; 21. This means implementations
-   *     must take care to ensure anything set on the builder during a previous call is cleared, if
-   *     no longer required.
+   * @param builder The builder used to build the last notification, or {@code null}. Re-using the
+   *     builder when possible can prevent notification flicker when {@code Util#SDK_INT} &lt; 21.
    * @param ongoing Whether the notification should be ongoing.
    * @param largeIcon The large icon to be used.
-   * @return The {@link Notification} which has been built, or {@code null} if no notification
-   *     should be displayed.
+   * @return The {@link NotificationCompat.Builder} on which to call {@link
+   *     NotificationCompat.Builder#build()} to obtain the notification, or {@code null} if no
+   *     notification should be displayed.
    */
   @Nullable
-  protected Notification createNotification(
+  protected NotificationCompat.Builder createNotification(
       Player player,
-      NotificationCompat.Builder builder,
+      @Nullable NotificationCompat.Builder builder,
       boolean ongoing,
       @Nullable Bitmap largeIcon) {
     if (player.getPlaybackState() == Player.STATE_IDLE) {
+      builderActions = null;
       return null;
     }
 
-    builder.mActions.clear();
     List<String> actionNames = getActions(player);
+    ArrayList<NotificationCompat.Action> actions = new ArrayList<>(actionNames.size());
     for (int i = 0; i < actionNames.size(); i++) {
       String actionName = actionNames.get(i);
       NotificationCompat.Action action =
@@ -955,7 +955,15 @@ public class PlayerNotificationManager {
               ? playbackActions.get(actionName)
               : customActions.get(actionName);
       if (action != null) {
-        builder.addAction(action);
+        actions.add(action);
+      }
+    }
+
+    if (builder == null || !actions.equals(builderActions)) {
+      builder = new NotificationCompat.Builder(context, channelId);
+      builderActions = actions;
+      for (int i = 0; i < actions.size(); i++) {
+        builder.addAction(actions.get(i));
       }
     }
 
@@ -1010,7 +1018,7 @@ public class PlayerNotificationManager {
     setLargeIcon(builder, largeIcon);
     builder.setContentIntent(mediaDescriptionAdapter.createCurrentContentIntent(player));
 
-    return builder.build();
+    return builder;
   }
 
   /**

From 6a7157de11cb04e1febb1a45b678878a84431b93 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Mon, 11 Feb 2019 17:28:16 +0000
Subject: [PATCH 517/832] Fix flaky test
 DownloadManager.differentDownloadActionsMerged

PiperOrigin-RevId: 233421480
---
 .../google/android/exoplayer2/offline/DownloadManagerTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index 283d343e63..98b21c6e22 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -278,7 +278,7 @@ public class DownloadManagerTest {
     downloader1.assertStarted();
     runner.postDownloadAction(streamKey2);
 
-    downloader1.unblock().assertCanceled();
+    downloader1.assertCanceled();
 
     FakeDownloader downloader2 = runner.getDownloader(1);
     downloader2.assertStarted();

From a21572f0dd665040e49db79b5fe912f5fcc92f7e Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 11 Feb 2019 18:04:02 +0000
Subject: [PATCH 518/832] Fix minor issues and lint errors

PiperOrigin-RevId: 233428556
---
 demos/cast/build.gradle                                |  4 ++--
 .../android/exoplayer2/castdemo/MainActivity.java      |  7 +++++--
 demos/cast/src/main/res/layout/main_activity.xml       |  3 ++-
 demos/cast/src/main/res/values/strings.xml             |  2 +-
 demos/ima/build.gradle                                 |  4 ++--
 demos/main/build.gradle                                |  5 +++--
 demos/main/src/main/AndroidManifest.xml                |  4 +++-
 extensions/cronet/build.gradle                         |  2 +-
 .../android/exoplayer2/ext/gvr/GvrPlayerActivity.java  |  1 -
 extensions/gvr/src/main/res/layout/vr_ui.xml           |  9 +++++----
 extensions/ima/build.gradle                            |  4 ++--
 extensions/leanback/build.gradle                       |  2 +-
 .../android/exoplayer2/extractor/ogg/OggPacket.java    |  2 --
 .../android/exoplayer2/text/subrip/SubripDecoder.java  |  5 ++++-
 .../exoplayer2/upstream/cache/CachedContentIndex.java  |  2 ++
 .../android/exoplayer2/upstream/cache/SimpleCache.java |  4 ++--
 .../exoplayer2/upstream/cache/SimpleCacheSpanTest.java | 10 +++++-----
 .../com/google/android/exoplayer2/ui/PlayerView.java   |  1 -
 .../android/exoplayer2/testutil/HostActivity.java      |  5 +++--
 19 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/demos/cast/build.gradle b/demos/cast/build.gradle
index c4fb23248f..79cf3d9a0a 100644
--- a/demos/cast/build.gradle
+++ b/demos/cast/build.gradle
@@ -44,8 +44,8 @@ android {
     }
 
     lintOptions {
-        // The demo app does not have translations.
-        disable 'MissingTranslation'
+        // The demo app isn't indexed and doesn't have translations.
+        disable 'GoogleAppIndexingWarning','MissingTranslation'
     }
 }
 
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
index 6e36427c5a..5ecfaec78e 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
@@ -150,8 +150,11 @@ public class MainActivity extends AppCompatActivity
 
   @Override
   public void onClick(View view) {
-    new AlertDialog.Builder(this).setTitle(R.string.sample_list_dialog_title)
-        .setView(buildSampleListView()).setPositiveButton(android.R.string.ok, null).create()
+    new AlertDialog.Builder(this)
+        .setTitle(R.string.add_samples)
+        .setView(buildSampleListView())
+        .setPositiveButton(android.R.string.ok, null)
+        .create()
         .show();
   }
 
diff --git a/demos/cast/src/main/res/layout/main_activity.xml b/demos/cast/src/main/res/layout/main_activity.xml
index 01e48cdea7..89b6b1868d 100644
--- a/demos/cast/src/main/res/layout/main_activity.xml
+++ b/demos/cast/src/main/res/layout/main_activity.xml
@@ -40,7 +40,8 @@
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentBottom="true"
-        android:padding="30dp"/>
+        android:padding="30dp"
+        android:contentDescription="@string/add_samples"/>
   </RelativeLayout>
   <com.google.android.exoplayer2.ui.PlayerControlView android:id="@+id/cast_control_view"
       android:layout_width="match_parent"
diff --git a/demos/cast/src/main/res/values/strings.xml b/demos/cast/src/main/res/values/strings.xml
index 13e4bb6928..013b50a175 100644
--- a/demos/cast/src/main/res/values/strings.xml
+++ b/demos/cast/src/main/res/values/strings.xml
@@ -20,7 +20,7 @@
 
   <string name="media_route_menu_title">Cast</string>
 
-  <string name="sample_list_dialog_title">Add samples</string>
+  <string name="add_samples">Add samples</string>
 
   <string name="cast_context_error">Failed to get Cast context. Try updating Google Play Services and restart the app.</string>
 
diff --git a/demos/ima/build.gradle b/demos/ima/build.gradle
index 30288845b3..490967add3 100644
--- a/demos/ima/build.gradle
+++ b/demos/ima/build.gradle
@@ -41,8 +41,8 @@ android {
     }
 
     lintOptions {
-        // The demo app does not have translations.
-        disable 'MissingTranslation'
+        // The demo app isn't indexed and doesn't have translations.
+        disable 'GoogleAppIndexingWarning','MissingTranslation'
     }
 }
 
diff --git a/demos/main/build.gradle b/demos/main/build.gradle
index 206c85cd17..440dc864d6 100644
--- a/demos/main/build.gradle
+++ b/demos/main/build.gradle
@@ -44,8 +44,9 @@ android {
     }
 
     lintOptions {
-        // The demo app does not have translations.
-        disable 'MissingTranslation'
+        // The demo app isn't indexed, doesn't have translations, and has a
+        // banner for AndroidTV that's only in xhdpi density.
+        disable 'GoogleAppIndexingWarning','MissingTranslation','IconDensities'
     }
 
     flavorDimensions "extensions"
diff --git a/demos/main/src/main/AndroidManifest.xml b/demos/main/src/main/AndroidManifest.xml
index e80e37688d..1f013f5add 100644
--- a/demos/main/src/main/AndroidManifest.xml
+++ b/demos/main/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer2.demo">
 
   <uses-permission android:name="android.permission.INTERNET"/>
@@ -33,7 +34,8 @@
       android:banner="@drawable/ic_banner"
       android:largeHeap="true"
       android:allowBackup="false"
-      android:name="com.google.android.exoplayer2.demo.DemoApplication">
+      android:name="com.google.android.exoplayer2.demo.DemoApplication"
+      tools:ignore="UnusedAttribute">
 
     <activity android:name="com.google.android.exoplayer2.demo.SampleChooserActivity"
         android:configChanges="keyboardHidden"
diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle
index 161ae4373e..f1adc9b6ce 100644
--- a/extensions/cronet/build.gradle
+++ b/extensions/cronet/build.gradle
@@ -29,7 +29,7 @@ android {
 }
 
 dependencies {
-    api 'org.chromium.net:cronet-embedded:71.3578.98'
+    api 'org.chromium.net:cronet-embedded:72.3626.96'
     implementation project(modulePrefix + 'library-core')
     implementation 'com.android.support:support-annotations:' + supportLibraryVersion
     testImplementation project(modulePrefix + 'library')
diff --git a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java
index 81e25fa462..fc09a0ca52 100644
--- a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java
+++ b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.google.android.exoplayer2.ext.gvr;
 
 import android.content.Context;
diff --git a/extensions/gvr/src/main/res/layout/vr_ui.xml b/extensions/gvr/src/main/res/layout/vr_ui.xml
index 84e7ac7c6f..e84ee31fe6 100644
--- a/extensions/gvr/src/main/res/layout/vr_ui.xml
+++ b/extensions/gvr/src/main/res/layout/vr_ui.xml
@@ -13,13 +13,14 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<merge
-  xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/video_ui_view"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="#000"
-  android:orientation="horizontal">
+  android:background="@android:color/black"
+  android:orientation="horizontal"
+  tools:ignore="Overdraw">
   <com.google.android.exoplayer2.ui.PlayerControlView
     android:id="@+id/controller"
     android:layout_width="match_parent"
diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle
index d53dcff986..fa263dd53a 100644
--- a/extensions/ima/build.gradle
+++ b/extensions/ima/build.gradle
@@ -32,11 +32,11 @@ android {
 dependencies {
     api 'com.google.ads.interactivemedia.v3:interactivemedia:3.10.6'
     implementation project(modulePrefix + 'library-core')
-    implementation 'com.google.android.gms:play-services-ads:17.1.2'
+    implementation 'com.google.android.gms:play-services-ads:17.1.3'
     // These dependencies are necessary to force the supportLibraryVersion of
     // com.android.support:support-v4 and com.android.support:customtabs to be
     // used. Else older versions are used, for example via:
-    // com.google.android.gms:play-services-ads:17.1.2
+    // com.google.android.gms:play-services-ads:17.1.3
     // |-- com.android.support:customtabs:26.1.0
     implementation 'com.android.support:support-v4:' + supportLibraryVersion
     implementation 'com.android.support:customtabs:' + supportLibraryVersion
diff --git a/extensions/leanback/build.gradle b/extensions/leanback/build.gradle
index 3214cb71c1..e63ce8aae1 100644
--- a/extensions/leanback/build.gradle
+++ b/extensions/leanback/build.gradle
@@ -30,7 +30,7 @@ android {
 
 dependencies {
     implementation project(modulePrefix + 'library-core')
-    implementation('com.android.support:leanback-v17:' + supportLibraryVersion)
+    implementation 'com.android.support:leanback-v17:' + supportLibraryVersion
 }
 
 ext {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java
index ca79c838de..9c594ffde5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java
@@ -15,7 +15,6 @@
  */
 package com.google.android.exoplayer2.extractor.ogg;
 
-import android.support.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.util.Assertions;
@@ -111,7 +110,6 @@ import java.util.Arrays;
    * @return the {@code PageHeader} of the last page read or an empty header if the packet has yet
    *     to be populated.
    */
-  @VisibleForTesting
   public OggPageHeader getPageHeader() {
     return pageHeader;
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
index 3b039061b0..5886b8ca2a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
@@ -247,8 +247,11 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
       case Cue.ANCHOR_TYPE_MIDDLE:
         return SubripDecoder.MID_FRACTION;
       case Cue.ANCHOR_TYPE_END:
-      default:
         return SubripDecoder.END_FRACTION;
+      case Cue.TYPE_UNSET:
+      default:
+        // Should never happen.
+        throw new IllegalArgumentException();
     }
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
index 85e753322a..dc0a635b54 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
+import android.annotation.SuppressLint;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
@@ -294,6 +295,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     return cachedContent;
   }
 
+  @SuppressLint("GetInstance") // Suppress warning about specifying "BC" as an explicit provider.
   private static Cipher getCipher() throws NoSuchPaddingException, NoSuchAlgorithmException {
     // Workaround for https://issuetracker.google.com/issues/36976726
     if (Util.SDK_INT == 18) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index 89007b00dd..bf1c0a8918 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -597,10 +597,10 @@ public final class SimpleCache implements Cache {
     return createUid(directory);
   }
 
+  @SuppressWarnings("TrulyRandom")
   private static long createUid(File directory) throws IOException {
-    SecureRandom random = new SecureRandom();
     // Generate a non-negative UID.
-    long uid = random.nextLong();
+    long uid = new SecureRandom().nextLong();
     uid = uid == Long.MIN_VALUE ? 0 : Math.abs(uid);
     // Persist it as a file.
     String hexUid = Long.toString(uid, /* radix= */ 16);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java
index 10c96917ae..475a4ec3d0 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java
@@ -18,12 +18,12 @@ package com.google.android.exoplayer2.upstream.cache;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
+import android.util.LongSparseArray;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.util.Util;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.Set;
 import java.util.TreeSet;
 import org.junit.After;
@@ -112,7 +112,7 @@ public class SimpleCacheSpanTest {
     TreeSet<SimpleCacheSpan> spans = index.get(key).getSpans();
     assertWithMessage("upgradeOldFiles() shouldn't add any spans.").that(spans.isEmpty()).isTrue();
 
-    HashMap<Long, Long> cachedPositions = new HashMap<>();
+    LongSparseArray<Long> cachedPositions = new LongSparseArray<>();
     for (File file : files) {
       SimpleCacheSpan cacheSpan = SimpleCacheSpan.createCacheEntry(file, file.length(), index);
       if (cacheSpan != null) {
@@ -121,9 +121,9 @@ public class SimpleCacheSpanTest {
       }
     }
 
-    assertThat(cachedPositions.get((long) 0)).isEqualTo(1);
-    assertThat(cachedPositions.get((long) 1)).isEqualTo(2);
-    assertThat(cachedPositions.get((long) 5)).isEqualTo(6);
+    assertThat(cachedPositions.get(0)).isEqualTo(1);
+    assertThat(cachedPositions.get(1)).isEqualTo(2);
+    assertThat(cachedPositions.get(5)).isEqualTo(6);
   }
 
   private static void createTestFile(File file, long length) throws IOException {
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
index 00ffaa8057..ccc204515c 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
@@ -403,7 +403,6 @@ public class PlayerView extends FrameLayout implements AdsLoader.AdViewProvider
           surfaceView = new TextureView(context);
           break;
         case SURFACE_TYPE_MONO360_VIEW:
-          Assertions.checkState(Util.SDK_INT >= 15);
           SphericalSurfaceView sphericalSurfaceView = new SphericalSurfaceView(context);
           sphericalSurfaceView.setSurfaceListener(componentListener);
           sphericalSurfaceView.setSingleTapListener(componentListener);
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/HostActivity.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/HostActivity.java
index 8f2b977f08..73e8ac4f3e 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/HostActivity.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/HostActivity.java
@@ -80,6 +80,7 @@ public final class HostActivity extends Activity implements SurfaceHolder.Callba
   }
 
   private static final String TAG = "HostActivity";
+  private static final String LOCK_TAG = "ExoPlayerTestUtil:" + TAG;
   private static final long START_TIMEOUT_MS = 5000;
 
   private WakeLock wakeLock;
@@ -175,10 +176,10 @@ public final class HostActivity extends Activity implements SurfaceHolder.Callba
   public void onStart() {
     Context appContext = getApplicationContext();
     WifiManager wifiManager = (WifiManager) appContext.getSystemService(Context.WIFI_SERVICE);
-    wifiLock = wifiManager.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, TAG);
+    wifiLock = wifiManager.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, LOCK_TAG);
     wifiLock.acquire();
     PowerManager powerManager = (PowerManager) appContext.getSystemService(Context.POWER_SERVICE);
-    wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);
+    wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, LOCK_TAG);
     wakeLock.acquire();
     super.onStart();
   }

From ad69a93708b45a6510dda216b20d4a45def7645e Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 11 Feb 2019 18:29:18 +0000
Subject: [PATCH 519/832] Handle alternative DV MIME types

Also detect ISOBMFF brand for DV when sniffing.

PiperOrigin-RevId: 233433449
---
 .../exoplayer2/extractor/mp4/Sniffer.java     | 54 ++++++-----
 .../exoplayer2/mediacodec/MediaCodecUtil.java | 96 +++++++++++++------
 2 files changed, 96 insertions(+), 54 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java
index a1c90bf1f2..b22c5203c3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java
@@ -30,32 +30,34 @@ import java.io.IOException;
   /** The maximum number of bytes to peek when sniffing. */
   private static final int SEARCH_LENGTH = 4 * 1024;
 
-  private static final int[] COMPATIBLE_BRANDS = new int[] {
-      Util.getIntegerCodeForString("isom"),
-      Util.getIntegerCodeForString("iso2"),
-      Util.getIntegerCodeForString("iso3"),
-      Util.getIntegerCodeForString("iso4"),
-      Util.getIntegerCodeForString("iso5"),
-      Util.getIntegerCodeForString("iso6"),
-      Util.getIntegerCodeForString("avc1"),
-      Util.getIntegerCodeForString("hvc1"),
-      Util.getIntegerCodeForString("hev1"),
-      Util.getIntegerCodeForString("mp41"),
-      Util.getIntegerCodeForString("mp42"),
-      Util.getIntegerCodeForString("3g2a"),
-      Util.getIntegerCodeForString("3g2b"),
-      Util.getIntegerCodeForString("3gr6"),
-      Util.getIntegerCodeForString("3gs6"),
-      Util.getIntegerCodeForString("3ge6"),
-      Util.getIntegerCodeForString("3gg6"),
-      Util.getIntegerCodeForString("M4V "),
-      Util.getIntegerCodeForString("M4A "),
-      Util.getIntegerCodeForString("f4v "),
-      Util.getIntegerCodeForString("kddi"),
-      Util.getIntegerCodeForString("M4VP"),
-      Util.getIntegerCodeForString("qt  "), // Apple QuickTime
-      Util.getIntegerCodeForString("MSNV"), // Sony PSP
-  };
+  private static final int[] COMPATIBLE_BRANDS =
+      new int[] {
+        Util.getIntegerCodeForString("isom"),
+        Util.getIntegerCodeForString("iso2"),
+        Util.getIntegerCodeForString("iso3"),
+        Util.getIntegerCodeForString("iso4"),
+        Util.getIntegerCodeForString("iso5"),
+        Util.getIntegerCodeForString("iso6"),
+        Util.getIntegerCodeForString("avc1"),
+        Util.getIntegerCodeForString("hvc1"),
+        Util.getIntegerCodeForString("hev1"),
+        Util.getIntegerCodeForString("mp41"),
+        Util.getIntegerCodeForString("mp42"),
+        Util.getIntegerCodeForString("3g2a"),
+        Util.getIntegerCodeForString("3g2b"),
+        Util.getIntegerCodeForString("3gr6"),
+        Util.getIntegerCodeForString("3gs6"),
+        Util.getIntegerCodeForString("3ge6"),
+        Util.getIntegerCodeForString("3gg6"),
+        Util.getIntegerCodeForString("M4V "),
+        Util.getIntegerCodeForString("M4A "),
+        Util.getIntegerCodeForString("f4v "),
+        Util.getIntegerCodeForString("kddi"),
+        Util.getIntegerCodeForString("M4VP"),
+        Util.getIntegerCodeForString("qt  "), // Apple QuickTime
+        Util.getIntegerCodeForString("MSNV"), // Sony PSP
+        Util.getIntegerCodeForString("dby1"), // Dolby Vision
+      };
 
   /**
    * Returns whether data peeked from the current position in {@code input} is consistent with the
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
index 0530057973..6509c8081c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
@@ -250,34 +250,34 @@ public final class MediaCodecUtil {
       for (int i = 0; i < numberOfCodecs; i++) {
         android.media.MediaCodecInfo codecInfo = mediaCodecList.getCodecInfoAt(i);
         String codecName = codecInfo.getName();
-        if (isCodecUsableDecoder(codecInfo, codecName, secureDecodersExplicit, requestedMimeType)) {
-          for (String supportedType : codecInfo.getSupportedTypes()) {
-            if (supportedType.equalsIgnoreCase(mimeType)) {
-              try {
-                CodecCapabilities capabilities = codecInfo.getCapabilitiesForType(supportedType);
-                boolean secure = mediaCodecList.isSecurePlaybackSupported(mimeType, capabilities);
-                boolean forceDisableAdaptive = codecNeedsDisableAdaptationWorkaround(codecName);
-                if ((secureDecodersExplicit && key.secure == secure)
-                    || (!secureDecodersExplicit && !key.secure)) {
-                  decoderInfos.add(MediaCodecInfo.newInstance(codecName, mimeType, capabilities,
-                      forceDisableAdaptive, false));
-                } else if (!secureDecodersExplicit && secure) {
-                  decoderInfos.add(MediaCodecInfo.newInstance(codecName + ".secure", mimeType,
-                      capabilities, forceDisableAdaptive, true));
-                  // It only makes sense to have one synthesized secure decoder, return immediately.
-                  return decoderInfos;
-                }
-              } catch (Exception e) {
-                if (Util.SDK_INT <= 23 && !decoderInfos.isEmpty()) {
-                  // Suppress error querying secondary codec capabilities up to API level 23.
-                  Log.e(TAG, "Skipping codec " + codecName + " (failed to query capabilities)");
-                } else {
-                  // Rethrow error querying primary codec capabilities, or secondary codec
-                  // capabilities if API level is greater than 23.
-                  Log.e(TAG, "Failed to query codec " + codecName + " (" + supportedType + ")");
-                  throw e;
-                }
-              }
+        String codecSupportedType =
+            getCodecSupportedType(codecInfo, codecName, secureDecodersExplicit, requestedMimeType);
+        if (codecSupportedType != null) {
+          try {
+            CodecCapabilities capabilities = codecInfo.getCapabilitiesForType(codecSupportedType);
+            boolean secure = mediaCodecList.isSecurePlaybackSupported(mimeType, capabilities);
+            boolean forceDisableAdaptive = codecNeedsDisableAdaptationWorkaround(codecName);
+            if ((secureDecodersExplicit && key.secure == secure)
+                || (!secureDecodersExplicit && !key.secure)) {
+              decoderInfos.add(
+                  MediaCodecInfo.newInstance(
+                      codecName, mimeType, capabilities, forceDisableAdaptive, false));
+            } else if (!secureDecodersExplicit && secure) {
+              decoderInfos.add(
+                  MediaCodecInfo.newInstance(
+                      codecName + ".secure", mimeType, capabilities, forceDisableAdaptive, true));
+              // It only makes sense to have one synthesized secure decoder, return immediately.
+              return decoderInfos;
+            }
+          } catch (Exception e) {
+            if (Util.SDK_INT <= 23 && !decoderInfos.isEmpty()) {
+              // Suppress error querying secondary codec capabilities up to API level 23.
+              Log.e(TAG, "Skipping codec " + codecName + " (failed to query capabilities)");
+            } else {
+              // Rethrow error querying primary codec capabilities, or secondary codec
+              // capabilities if API level is greater than 23.
+              Log.e(TAG, "Failed to query codec " + codecName + " (" + codecSupportedType + ")");
+              throw e;
             }
           }
         }
@@ -290,6 +290,46 @@ public final class MediaCodecUtil {
     }
   }
 
+  /**
+   * Returns the codec's supported type for decoding {@code requestedMimeType} on the current
+   * device, or {@code null} if the codec can't be used.
+   *
+   * @param info The codec information.
+   * @param name The name of the codec
+   * @param secureDecodersExplicit Whether secure decoders were explicitly listed, if present.
+   * @param requestedMimeType The originally requested MIME type, which may differ from the codec
+   *     key MIME type if the codec key is being considered as a fallback.
+   * @return The codec's supported type for decoding {@code requestedMimeType}, or {@code null} if
+   *     the codec can't be used.
+   */
+  @Nullable
+  private static String getCodecSupportedType(
+      android.media.MediaCodecInfo info,
+      String name,
+      boolean secureDecodersExplicit,
+      String requestedMimeType) {
+    if (isCodecUsableDecoder(info, name, secureDecodersExplicit, requestedMimeType)) {
+      if (requestedMimeType.equals(MimeTypes.VIDEO_DOLBY_VISION)) {
+        // Handle decoders that declare support for DV via MIME types that aren't
+        // video/dolby-vision.
+        if ("OMX.MS.HEVCDV.Decoder".equals(name)) {
+          return "video/hevcdv";
+        } else if ("OMX.RTK.video.decoder".equals(name)
+            || "OMX.realtek.video.decoder.tunneled".equals(name)) {
+          return "video/dv_hevc";
+        }
+      }
+
+      String[] supportedTypes = info.getSupportedTypes();
+      for (String supportedType : supportedTypes) {
+        if (supportedType.equalsIgnoreCase(requestedMimeType)) {
+          return supportedType;
+        }
+      }
+    }
+    return null;
+  }
+
   /**
    * Returns whether the specified codec is usable for decoding on the current device.
    *

From c66d26b6014be13cfa0cc4be35ebc6ae4f85eb00 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 12 Feb 2019 09:18:08 +0000
Subject: [PATCH 520/832] Fix EventMessage timestamp issue

Stop encoding/decoding presentation time as part of the message.
What's actually in emsg boxes is a presentation time delta,
which is why it's only 32 bits, and hence why it doesn't handle
large absolute timestamps. We were using this field to hold
absolute timestamps only for the purpose of passing presentation
times from DashManifestParser.parseEvent back to the calling
method. After this change, we return Pair<Long, EventMessage>
instead.

Issue: #5490
PiperOrigin-RevId: 233561731
---
 RELEASENOTES.md                               |  3 +
 .../extractor/mp4/FragmentedMp4Extractor.java |  8 ++
 .../metadata/emsg/EventMessage.java           | 24 ++----
 .../metadata/emsg/EventMessageDecoder.java    | 22 ++++--
 .../metadata/emsg/EventMessageEncoder.java    | 20 ++---
 .../emsg/EventMessageDecoderTest.java         |  1 -
 .../emsg/EventMessageEncoderTest.java         | 78 ++++++++++---------
 .../metadata/emsg/EventMessageTest.java       |  4 +-
 .../source/dash/EventSampleStream.java        |  3 +-
 .../dash/manifest/DashManifestParser.java     | 38 ++++-----
 .../source/dash/EventSampleStreamTest.java    | 46 +++++------
 .../dash/manifest/DashManifestParserTest.java | 75 +++++++++---------
 12 files changed, 164 insertions(+), 158 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 87b00b0e11..7a7decfbc0 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -8,6 +8,9 @@
   Cast demo app to work with `ExoCastPlayer`.
 * HLS:
   * Form an adaptive track group out of audio renditions with matching name.
+* DASH:
+  * Fix issue handling large `EventStream` presentation timestamps
+    ([#5490](https://github.com/google/ExoPlayer/issues/5490)).
 * `ExtractorMediaSource` renamed to `ProgressiveMediaSource`.
 * Support for playing spherical videos on Daydream.
 * Improve decoder re-use between playbacks. TODO: Write and link a blog post
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
index 72bcaa9fe2..9ccb2556bc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
@@ -601,6 +601,14 @@ public class FragmentedMp4Extractor implements Extractor {
     long presentationTimeDeltaUs =
         Util.scaleLargeTimestamp(atom.readUnsignedInt(), C.MICROS_PER_SECOND, timescale);
 
+    // The presentation_time_delta is accounted for by adjusting the sample timestamp, so we zero it
+    // in the sample data before writing it to the track outputs.
+    int position = atom.getPosition();
+    atom.data[position - 4] = 0;
+    atom.data[position - 3] = 0;
+    atom.data[position - 2] = 0;
+    atom.data[position - 1] = 0;
+
     // Output the sample data.
     for (TrackOutput emsgTrackOutput : emsgTrackOutputs) {
       atom.setPosition(Atom.FULL_HEADER_SIZE);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java
index 7d70d9de1c..8a3467e2ed 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java
@@ -44,13 +44,6 @@ public final class EventMessage implements Metadata.Entry {
    */
   public final long durationMs;
 
-  /**
-   * The presentation time value of this event message in microseconds.
-   * <p>
-   * Except in special cases, application code should <em>not</em> use this field.
-   */
-  public final long presentationTimeUs;
-
   /**
    * The instance identifier.
    */
@@ -70,22 +63,19 @@ public final class EventMessage implements Metadata.Entry {
    * @param durationMs The duration of the event in milliseconds.
    * @param id The instance identifier.
    * @param messageData The body of the message.
-   * @param presentationTimeUs The presentation time value of this event message in microseconds.
    */
-  public EventMessage(String schemeIdUri, String value, long durationMs, long id,
-      byte[] messageData, long presentationTimeUs) {
+  public EventMessage(
+      String schemeIdUri, String value, long durationMs, long id, byte[] messageData) {
     this.schemeIdUri = schemeIdUri;
     this.value = value;
     this.durationMs = durationMs;
     this.id = id;
     this.messageData = messageData;
-    this.presentationTimeUs = presentationTimeUs;
   }
 
   /* package */ EventMessage(Parcel in) {
     schemeIdUri = castNonNull(in.readString());
     value = castNonNull(in.readString());
-    presentationTimeUs = in.readLong();
     durationMs = in.readLong();
     id = in.readLong();
     messageData = castNonNull(in.createByteArray());
@@ -97,7 +87,6 @@ public final class EventMessage implements Metadata.Entry {
       int result = 17;
       result = 31 * result + (schemeIdUri != null ? schemeIdUri.hashCode() : 0);
       result = 31 * result + (value != null ? value.hashCode() : 0);
-      result = 31 * result + (int) (presentationTimeUs ^ (presentationTimeUs >>> 32));
       result = 31 * result + (int) (durationMs ^ (durationMs >>> 32));
       result = 31 * result + (int) (id ^ (id >>> 32));
       result = 31 * result + Arrays.hashCode(messageData);
@@ -115,9 +104,11 @@ public final class EventMessage implements Metadata.Entry {
       return false;
     }
     EventMessage other = (EventMessage) obj;
-    return presentationTimeUs == other.presentationTimeUs && durationMs == other.durationMs
-        && id == other.id && Util.areEqual(schemeIdUri, other.schemeIdUri)
-        && Util.areEqual(value, other.value) && Arrays.equals(messageData, other.messageData);
+    return durationMs == other.durationMs
+        && id == other.id
+        && Util.areEqual(schemeIdUri, other.schemeIdUri)
+        && Util.areEqual(value, other.value)
+        && Arrays.equals(messageData, other.messageData);
   }
 
   @Override
@@ -136,7 +127,6 @@ public final class EventMessage implements Metadata.Entry {
   public void writeToParcel(Parcel dest, int flags) {
     dest.writeString(schemeIdUri);
     dest.writeString(value);
-    dest.writeLong(presentationTimeUs);
     dest.writeLong(durationMs);
     dest.writeLong(id);
     dest.writeByteArray(messageData);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java
index 14f678374c..33d79917eb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java
@@ -15,11 +15,11 @@
  */
 package com.google.android.exoplayer2.metadata.emsg;
 
-import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.MetadataDecoder;
 import com.google.android.exoplayer2.metadata.MetadataInputBuffer;
 import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.Util;
 import java.nio.ByteBuffer;
@@ -27,12 +27,15 @@ import java.util.Arrays;
 
 /**
  * Decodes Event Message (emsg) atoms, as defined in ISO/IEC 23009-1:2014, Section 5.10.3.3.
- * <p>
- * Atom data should be provided to the decoder without the full atom header (i.e. starting from the
- * first byte of the scheme_id_uri field).
+ *
+ * <p>Atom data should be provided to the decoder without the full atom header (i.e. starting from
+ * the first byte of the scheme_id_uri field). It is expected that the presentation_time_delta field
+ * should be 0, having already been accounted for by adjusting the sample timestamp.
  */
 public final class EventMessageDecoder implements MetadataDecoder {
 
+  private static final String TAG = "EventMessageDecoder";
+
   @SuppressWarnings("ByteBufferBackingArray")
   @Override
   public Metadata decode(MetadataInputBuffer inputBuffer) {
@@ -43,13 +46,16 @@ public final class EventMessageDecoder implements MetadataDecoder {
     String schemeIdUri = Assertions.checkNotNull(emsgData.readNullTerminatedString());
     String value = Assertions.checkNotNull(emsgData.readNullTerminatedString());
     long timescale = emsgData.readUnsignedInt();
-    long presentationTimeUs = Util.scaleLargeTimestamp(emsgData.readUnsignedInt(),
-        C.MICROS_PER_SECOND, timescale);
+    long presentationTimeDelta = emsgData.readUnsignedInt();
+    if (presentationTimeDelta != 0) {
+      // We expect the source to have accounted for presentation_time_delta by adjusting the sample
+      // timestamp and zeroing the field in the sample data. Log a warning if the field is non-zero.
+      Log.w(TAG, "Ignoring non-zero presentation_time_delta: " + presentationTimeDelta);
+    }
     long durationMs = Util.scaleLargeTimestamp(emsgData.readUnsignedInt(), 1000, timescale);
     long id = emsgData.readUnsignedInt();
     byte[] messageData = Arrays.copyOfRange(data, emsgData.getPosition(), size);
-    return new Metadata(new EventMessage(schemeIdUri, value, durationMs, id, messageData,
-        presentationTimeUs));
+    return new Metadata(new EventMessage(schemeIdUri, value, durationMs, id, messageData));
   }
 
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoder.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoder.java
index eca498a6df..22708a8448 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoder.java
@@ -16,9 +16,6 @@
 package com.google.android.exoplayer2.metadata.emsg;
 
 import android.support.annotation.Nullable;
-import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.util.Assertions;
-import com.google.android.exoplayer2.util.Util;
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -37,27 +34,22 @@ public final class EventMessageEncoder {
   }
 
   /**
-   * Encodes an {@link EventMessage} to a byte array that can be decoded by
-   * {@link EventMessageDecoder}.
+   * Encodes an {@link EventMessage} to a byte array that can be decoded by {@link
+   * EventMessageDecoder}.
    *
    * @param eventMessage The event message to be encoded.
-   * @param timescale Timescale of the event message, in units per second.
    * @return The serialized byte array.
    */
   @Nullable
-  public byte[] encode(EventMessage eventMessage, long timescale) {
-    Assertions.checkArgument(timescale >= 0);
+  public byte[] encode(EventMessage eventMessage) {
     byteArrayOutputStream.reset();
     try {
       writeNullTerminatedString(dataOutputStream, eventMessage.schemeIdUri);
       String nonNullValue = eventMessage.value != null ? eventMessage.value : "";
       writeNullTerminatedString(dataOutputStream, nonNullValue);
-      writeUnsignedInt(dataOutputStream, timescale);
-      long presentationTime = Util.scaleLargeTimestamp(eventMessage.presentationTimeUs,
-          timescale, C.MICROS_PER_SECOND);
-      writeUnsignedInt(dataOutputStream, presentationTime);
-      long duration = Util.scaleLargeTimestamp(eventMessage.durationMs, timescale, 1000);
-      writeUnsignedInt(dataOutputStream, duration);
+      writeUnsignedInt(dataOutputStream, 1000); // timescale
+      writeUnsignedInt(dataOutputStream, 0); // presentation_time_delta
+      writeUnsignedInt(dataOutputStream, eventMessage.durationMs);
       writeUnsignedInt(dataOutputStream, eventMessage.id);
       dataOutputStream.write(eventMessage.messageData);
       dataOutputStream.flush();
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java
index c6558e3fc9..85d336b439 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java
@@ -51,7 +51,6 @@ public final class EventMessageDecoderTest {
     assertThat(eventMessage.durationMs).isEqualTo(3000);
     assertThat(eventMessage.id).isEqualTo(1000403);
     assertThat(eventMessage.messageData).isEqualTo(new byte[]{0, 1, 2, 3, 4});
-    assertThat(eventMessage.presentationTimeUs).isEqualTo(1000000);
   }
 
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java
index 7195548fbf..2869692272 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java
@@ -33,25 +33,27 @@ public final class EventMessageEncoderTest {
 
   @Test
   public void testEncodeEventStream() throws IOException {
-    EventMessage eventMessage = new EventMessage("urn:test", "123", 3000, 1000403,
-        new byte[] {0, 1, 2, 3, 4}, 1000000);
-    byte[] expectedEmsgBody = new byte[] {
-        117, 114, 110, 58, 116, 101, 115, 116, 0, // scheme_id_uri = "urn:test"
-        49, 50, 51, 0, // value = "123"
-        0, 0, -69, -128, // timescale = 48000
-        0, 0, -69, -128, // presentation_time_delta = 48000
-        0, 2, 50, -128, // event_duration = 144000
-        0, 15, 67, -45, // id = 1000403
-        0, 1, 2, 3, 4}; // message_data = {0, 1, 2, 3, 4}
-    byte[] encodedByteArray = new EventMessageEncoder().encode(eventMessage, 48000);
+    EventMessage eventMessage =
+        new EventMessage("urn:test", "123", 3000, 1000403, new byte[] {0, 1, 2, 3, 4});
+    byte[] expectedEmsgBody =
+        new byte[] {
+          117, 114, 110, 58, 116, 101, 115, 116, 0, // scheme_id_uri = "urn:test"
+          49, 50, 51, 0, // value = "123"
+          0, 0, 3, -24, // timescale = 1000
+          0, 0, 0, 0, // presentation_time_delta = 0
+          0, 0, 11, -72, // event_duration = 3000
+          0, 15, 67, -45, // id = 1000403
+          0, 1, 2, 3, 4
+        }; // message_data = {0, 1, 2, 3, 4}
+    byte[] encodedByteArray = new EventMessageEncoder().encode(eventMessage);
     assertThat(encodedByteArray).isEqualTo(expectedEmsgBody);
   }
 
   @Test
   public void testEncodeDecodeEventStream() throws IOException {
-    EventMessage expectedEmsg = new EventMessage("urn:test", "123", 3000, 1000403,
-        new byte[] {0, 1, 2, 3, 4}, 1000000);
-    byte[] encodedByteArray = new EventMessageEncoder().encode(expectedEmsg, 48000);
+    EventMessage expectedEmsg =
+        new EventMessage("urn:test", "123", 3000, 1000403, new byte[] {0, 1, 2, 3, 4});
+    byte[] encodedByteArray = new EventMessageEncoder().encode(expectedEmsg);
     MetadataInputBuffer buffer = new MetadataInputBuffer();
     buffer.data = ByteBuffer.allocate(encodedByteArray.length).put(encodedByteArray);
 
@@ -63,30 +65,34 @@ public final class EventMessageEncoderTest {
 
   @Test
   public void testEncodeEventStreamMultipleTimesWorkingCorrectly() throws IOException {
-    EventMessage eventMessage = new EventMessage("urn:test", "123", 3000, 1000403,
-        new byte[] {0, 1, 2, 3, 4}, 1000000);
-    byte[] expectedEmsgBody = new byte[] {
-        117, 114, 110, 58, 116, 101, 115, 116, 0, // scheme_id_uri = "urn:test"
-        49, 50, 51, 0, // value = "123"
-        0, 0, -69, -128, // timescale = 48000
-        0, 0, -69, -128, // presentation_time_delta = 48000
-        0, 2, 50, -128, // event_duration = 144000
-        0, 15, 67, -45, // id = 1000403
-        0, 1, 2, 3, 4}; // message_data = {0, 1, 2, 3, 4}
-    EventMessage eventMessage1 = new EventMessage("urn:test", "123", 3000, 1000402,
-        new byte[] {4, 3, 2, 1, 0}, 1000000);
-    byte[] expectedEmsgBody1 = new byte[] {
-        117, 114, 110, 58, 116, 101, 115, 116, 0, // scheme_id_uri = "urn:test"
-        49, 50, 51, 0, // value = "123"
-        0, 0, -69, -128, // timescale = 48000
-        0, 0, -69, -128, // presentation_time_delta = 48000
-        0, 2, 50, -128, // event_duration = 144000
-        0, 15, 67, -46, // id = 1000402
-        4, 3, 2, 1, 0}; // message_data = {4, 3, 2, 1, 0}
+    EventMessage eventMessage =
+        new EventMessage("urn:test", "123", 3000, 1000403, new byte[] {0, 1, 2, 3, 4});
+    byte[] expectedEmsgBody =
+        new byte[] {
+          117, 114, 110, 58, 116, 101, 115, 116, 0, // scheme_id_uri = "urn:test"
+          49, 50, 51, 0, // value = "123"
+          0, 0, 3, -24, // timescale = 1000
+          0, 0, 0, 0, // presentation_time_delta = 0
+          0, 0, 11, -72, // event_duration = 3000
+          0, 15, 67, -45, // id = 1000403
+          0, 1, 2, 3, 4
+        }; // message_data = {0, 1, 2, 3, 4}
+    EventMessage eventMessage1 =
+        new EventMessage("urn:test", "123", 3000, 1000402, new byte[] {4, 3, 2, 1, 0});
+    byte[] expectedEmsgBody1 =
+        new byte[] {
+          117, 114, 110, 58, 116, 101, 115, 116, 0, // scheme_id_uri = "urn:test"
+          49, 50, 51, 0, // value = "123"
+          0, 0, 3, -24, // timescale = 1000
+          0, 0, 0, 0, // presentation_time_delta = 0
+          0, 0, 11, -72, // event_duration = 3000
+          0, 15, 67, -46, // id = 1000402
+          4, 3, 2, 1, 0
+        }; // message_data = {4, 3, 2, 1, 0}
     EventMessageEncoder eventMessageEncoder = new EventMessageEncoder();
-    byte[] encodedByteArray = eventMessageEncoder.encode(eventMessage, 48000);
+    byte[] encodedByteArray = eventMessageEncoder.encode(eventMessage);
     assertThat(encodedByteArray).isEqualTo(expectedEmsgBody);
-    byte[] encodedByteArray1 = eventMessageEncoder.encode(eventMessage1, 48000);
+    byte[] encodedByteArray1 = eventMessageEncoder.encode(eventMessage1);
     assertThat(encodedByteArray1).isEqualTo(expectedEmsgBody1);
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java b/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java
index 30e1cd6c1f..f7970d1a16 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java
@@ -30,8 +30,8 @@ public final class EventMessageTest {
 
   @Test
   public void testEventMessageParcelable() {
-    EventMessage eventMessage = new EventMessage("urn:test", "123", 3000, 1000403,
-        new byte[] {0, 1, 2, 3, 4}, 1000);
+    EventMessage eventMessage =
+        new EventMessage("urn:test", "123", 3000, 1000403, new byte[] {0, 1, 2, 3, 4});
     // Write to parcel.
     Parcel parcel = Parcel.obtain();
     eventMessage.writeToParcel(parcel, 0);
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/EventSampleStream.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/EventSampleStream.java
index 9f812b8e84..f06a709960 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/EventSampleStream.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/EventSampleStream.java
@@ -112,8 +112,7 @@ import java.io.IOException;
       }
     }
     int sampleIndex = currentIndex++;
-    byte[] serializedEvent = eventMessageEncoder.encode(eventStream.events[sampleIndex],
-        eventStream.timescale);
+    byte[] serializedEvent = eventMessageEncoder.encode(eventStream.events[sampleIndex]);
     if (serializedEvent != null) {
       buffer.ensureSpaceForWrite(serializedEvent.length);
       buffer.setFlags(C.BUFFER_FLAG_KEY_FRAME);
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
index c501172dd4..c0aa2a7819 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
@@ -829,13 +829,13 @@ public class DashManifestParser extends DefaultHandler
     String schemeIdUri = parseString(xpp, "schemeIdUri", "");
     String value = parseString(xpp, "value", "");
     long timescale = parseLong(xpp, "timescale", 1);
-    List<EventMessage> eventMessages = new ArrayList<>();
+    List<Pair<Long, EventMessage>> eventMessages = new ArrayList<>();
     ByteArrayOutputStream scratchOutputStream = new ByteArrayOutputStream(512);
     do {
       xpp.next();
       if (XmlPullParserUtil.isStartTag(xpp, "Event")) {
-        EventMessage event = parseEvent(xpp, schemeIdUri, value, timescale,
-            scratchOutputStream);
+        Pair<Long, EventMessage> event =
+            parseEvent(xpp, schemeIdUri, value, timescale, scratchOutputStream);
         eventMessages.add(event);
       } else {
         maybeSkipTag(xpp);
@@ -845,9 +845,9 @@ public class DashManifestParser extends DefaultHandler
     long[] presentationTimesUs = new long[eventMessages.size()];
     EventMessage[] events = new EventMessage[eventMessages.size()];
     for (int i = 0; i < eventMessages.size(); i++) {
-      EventMessage event = eventMessages.get(i);
-      presentationTimesUs[i] = event.presentationTimeUs;
-      events[i] = event;
+      Pair<Long, EventMessage> event = eventMessages.get(i);
+      presentationTimesUs[i] = event.first;
+      events[i] = event.second;
     }
     return buildEventStream(schemeIdUri, value, timescale, presentationTimesUs, events);
   }
@@ -866,11 +866,12 @@ public class DashManifestParser extends DefaultHandler
    * @param timescale The timescale of the parent EventStream.
    * @param scratchOutputStream A {@link ByteArrayOutputStream} that is used when parsing event
    *     objects.
-   * @return The {@link EventMessage} parsed from this EventStream node.
+   * @return A pair containing the node's presentation timestamp in microseconds and the parsed
+   *     {@link EventMessage}.
    * @throws XmlPullParserException If there is any error parsing this node.
    * @throws IOException If there is any error reading from the underlying input stream.
    */
-  protected EventMessage parseEvent(
+  protected Pair<Long, EventMessage> parseEvent(
       XmlPullParser xpp,
       String schemeIdUri,
       String value,
@@ -885,13 +886,14 @@ public class DashManifestParser extends DefaultHandler
         timescale);
     String messageData = parseString(xpp, "messageData", null);
     byte[] eventObject = parseEventObject(xpp, scratchOutputStream);
-    return buildEvent(
-        schemeIdUri,
-        value,
-        id,
-        durationMs,
-        messageData == null ? eventObject : Util.getUtf8Bytes(messageData),
-        presentationTimesUs);
+    return Pair.create(
+        presentationTimesUs,
+        buildEvent(
+            schemeIdUri,
+            value,
+            id,
+            durationMs,
+            messageData == null ? eventObject : Util.getUtf8Bytes(messageData)));
   }
 
   /**
@@ -958,9 +960,9 @@ public class DashManifestParser extends DefaultHandler
     return scratchOutputStream.toByteArray();
   }
 
-  protected EventMessage buildEvent(String schemeIdUri, String value, long id,
-      long durationMs, byte[] messageData, long presentationTimeUs) {
-    return new EventMessage(schemeIdUri, value, durationMs, id, messageData, presentationTimeUs);
+  protected EventMessage buildEvent(
+      String schemeIdUri, String value, long id, long durationMs, byte[] messageData) {
+    return new EventMessage(schemeIdUri, value, durationMs, id, messageData);
   }
 
   protected List<SegmentTimelineElement> parseSegmentTimeline(XmlPullParser xpp)
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/EventSampleStreamTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/EventSampleStreamTest.java
index 9c3752551a..9621381eed 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/EventSampleStreamTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/EventSampleStreamTest.java
@@ -111,7 +111,7 @@ public final class EventSampleStreamTest {
   @Test
   public void testReadDataReturnDataAfterFormat() {
     long presentationTimeUs = 1000000;
-    EventMessage eventMessage = newEventMessageWithIdAndTime(1, presentationTimeUs);
+    EventMessage eventMessage = newEventMessageWithId(1);
     EventStream eventStream = new EventStream(SCHEME_ID, VALUE, TIME_SCALE,
         new long[] {presentationTimeUs}, new EventMessage[] {eventMessage});
     EventSampleStream sampleStream = new EventSampleStream(eventStream, FORMAT, false);
@@ -133,8 +133,8 @@ public final class EventSampleStreamTest {
   public void testSkipDataThenReadDataReturnDataFromSkippedPosition() {
     long presentationTimeUs1 = 1000000;
     long presentationTimeUs2 = 2000000;
-    EventMessage eventMessage1 = newEventMessageWithIdAndTime(1, presentationTimeUs1);
-    EventMessage eventMessage2 = newEventMessageWithIdAndTime(2, presentationTimeUs2);
+    EventMessage eventMessage1 = newEventMessageWithId(1);
+    EventMessage eventMessage2 = newEventMessageWithId(2);
     EventStream eventStream = new EventStream(SCHEME_ID, VALUE, TIME_SCALE,
         new long[] {presentationTimeUs1, presentationTimeUs2},
         new EventMessage[] {eventMessage1, eventMessage2});
@@ -159,8 +159,8 @@ public final class EventSampleStreamTest {
   public void testSeekToUsThenReadDataReturnDataFromSeekPosition() {
     long presentationTimeUs1 = 1000000;
     long presentationTimeUs2 = 2000000;
-    EventMessage eventMessage1 = newEventMessageWithIdAndTime(1, presentationTimeUs1);
-    EventMessage eventMessage2 = newEventMessageWithIdAndTime(2, presentationTimeUs2);
+    EventMessage eventMessage1 = newEventMessageWithId(1);
+    EventMessage eventMessage2 = newEventMessageWithId(2);
     EventStream eventStream = new EventStream(SCHEME_ID, VALUE, TIME_SCALE,
         new long[] {presentationTimeUs1, presentationTimeUs2},
         new EventMessage[] {eventMessage1, eventMessage2});
@@ -186,9 +186,9 @@ public final class EventSampleStreamTest {
     long presentationTimeUs1 = 1000000;
     long presentationTimeUs2 = 2000000;
     long presentationTimeUs3 = 3000000;
-    EventMessage eventMessage1 = newEventMessageWithIdAndTime(1, presentationTimeUs1);
-    EventMessage eventMessage2 = newEventMessageWithIdAndTime(2, presentationTimeUs2);
-    EventMessage eventMessage3 = newEventMessageWithIdAndTime(3, presentationTimeUs3);
+    EventMessage eventMessage1 = newEventMessageWithId(1);
+    EventMessage eventMessage2 = newEventMessageWithId(2);
+    EventMessage eventMessage3 = newEventMessageWithId(3);
     EventStream eventStream1 = new EventStream(SCHEME_ID, VALUE, TIME_SCALE,
         new long[] {presentationTimeUs1, presentationTimeUs2},
         new EventMessage[] {eventMessage1, eventMessage2});
@@ -220,9 +220,9 @@ public final class EventSampleStreamTest {
     long presentationTimeUs1 = 1000000;
     long presentationTimeUs2 = 2000000;
     long presentationTimeUs3 = 3000000;
-    EventMessage eventMessage1 = newEventMessageWithIdAndTime(1, presentationTimeUs1);
-    EventMessage eventMessage2 = newEventMessageWithIdAndTime(2, presentationTimeUs2);
-    EventMessage eventMessage3 = newEventMessageWithIdAndTime(3, presentationTimeUs3);
+    EventMessage eventMessage1 = newEventMessageWithId(1);
+    EventMessage eventMessage2 = newEventMessageWithId(2);
+    EventMessage eventMessage3 = newEventMessageWithId(3);
     EventStream eventStream1 = new EventStream(SCHEME_ID, VALUE, TIME_SCALE,
         new long[] {presentationTimeUs1, presentationTimeUs2},
         new EventMessage[] {eventMessage1, eventMessage2});
@@ -253,9 +253,9 @@ public final class EventSampleStreamTest {
     long presentationTimeUs1 = 1000000;
     long presentationTimeUs2 = 2000000;
     long presentationTimeUs3 = 3000000;
-    EventMessage eventMessage1 = newEventMessageWithIdAndTime(1, presentationTimeUs1);
-    EventMessage eventMessage2 = newEventMessageWithIdAndTime(2, presentationTimeUs2);
-    EventMessage eventMessage3 = newEventMessageWithIdAndTime(3, presentationTimeUs3);
+    EventMessage eventMessage1 = newEventMessageWithId(1);
+    EventMessage eventMessage2 = newEventMessageWithId(2);
+    EventMessage eventMessage3 = newEventMessageWithId(3);
     EventStream eventStream1 = new EventStream(SCHEME_ID, VALUE, TIME_SCALE,
         new long[] {presentationTimeUs1},
         new EventMessage[] {eventMessage1});
@@ -287,9 +287,9 @@ public final class EventSampleStreamTest {
     long presentationTimeUs1 = 1000000;
     long presentationTimeUs2 = 2000000;
     long presentationTimeUs3 = 3000000;
-    EventMessage eventMessage1 = newEventMessageWithIdAndTime(1, presentationTimeUs1);
-    EventMessage eventMessage2 = newEventMessageWithIdAndTime(2, presentationTimeUs2);
-    EventMessage eventMessage3 = newEventMessageWithIdAndTime(3, presentationTimeUs3);
+    EventMessage eventMessage1 = newEventMessageWithId(1);
+    EventMessage eventMessage2 = newEventMessageWithId(2);
+    EventMessage eventMessage3 = newEventMessageWithId(3);
     EventStream eventStream1 = new EventStream(SCHEME_ID, VALUE, TIME_SCALE,
         new long[] {presentationTimeUs1, presentationTimeUs2},
         new EventMessage[] {eventMessage1, eventMessage2});
@@ -319,9 +319,9 @@ public final class EventSampleStreamTest {
     long presentationTimeUs1 = 1000000;
     long presentationTimeUs2 = 2000000;
     long presentationTimeUs3 = 3000000;
-    EventMessage eventMessage1 = newEventMessageWithIdAndTime(1, presentationTimeUs1);
-    EventMessage eventMessage2 = newEventMessageWithIdAndTime(2, presentationTimeUs2);
-    EventMessage eventMessage3 = newEventMessageWithIdAndTime(3, presentationTimeUs3);
+    EventMessage eventMessage1 = newEventMessageWithId(1);
+    EventMessage eventMessage2 = newEventMessageWithId(2);
+    EventMessage eventMessage3 = newEventMessageWithId(3);
     EventStream eventStream1 = new EventStream(SCHEME_ID, VALUE, TIME_SCALE,
         new long[] {presentationTimeUs1},
         new EventMessage[] {eventMessage1});
@@ -345,12 +345,12 @@ public final class EventSampleStreamTest {
     return sampleStream.readData(formatHolder, inputBuffer, false);
   }
 
-  private EventMessage newEventMessageWithIdAndTime(int id, long presentationTimeUs) {
-    return new EventMessage(SCHEME_ID, VALUE, DURATION_MS, id, MESSAGE_DATA, presentationTimeUs);
+  private EventMessage newEventMessageWithId(int id) {
+    return new EventMessage(SCHEME_ID, VALUE, DURATION_MS, id, MESSAGE_DATA);
   }
 
   private byte[] getEncodedMessage(EventMessage eventMessage) {
-    return eventMessageEncoder.encode(eventMessage, TIME_SCALE);
+    return eventMessageEncoder.encode(eventMessage);
   }
 
 }
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java
index a1693f6985..67d8dbecac 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java
@@ -104,52 +104,53 @@ public class DashManifestParserTest {
             "call",
             10000,
             0,
-            "+ 1 800 10101010".getBytes(Charset.forName(C.UTF8_NAME)),
-            0);
+            "+ 1 800 10101010".getBytes(Charset.forName(C.UTF8_NAME)));
     assertThat(eventStream1.events[0]).isEqualTo(expectedEvent1);
+    assertThat(eventStream1.presentationTimesUs[0]).isEqualTo(0);
 
     // assert CData-structured event stream
     EventStream eventStream2 = period.eventStreams.get(1);
     assertThat(eventStream2.events.length).isEqualTo(1);
-    assertThat(eventStream2.events[0])
-        .isEqualTo(
-            new EventMessage(
-                "urn:dvb:iptv:cpm:2014",
-                "",
-                1500000,
-                1,
-                Util.getUtf8Bytes(
-                    "<![CDATA[<BroadcastEvent>\n"
-                        + "      <Program crid=\"crid://broadcaster.example.com/ABCDEF\"/>\n"
-                        + "      <InstanceDescription>\n"
-                        + "      <Title xml:lang=\"en\">The title</Title>\n"
-                        + "      <Synopsis xml:lang=\"en\" length=\"medium\">"
-                        + "The description</Synopsis>\n"
-                        + "      <ParentalGuidance>\n"
-                        + "      <mpeg7:ParentalRating href=\"urn:dvb:iptv:rating:2014:15\"/>\n"
-                        + "      <mpeg7:Region>GB</mpeg7:Region>\n"
-                        + "      </ParentalGuidance>\n"
-                        + "      </InstanceDescription>\n"
-                        + "      </BroadcastEvent>]]>"),
-                300000000));
+    EventMessage expectedEvent2 =
+        new EventMessage(
+            "urn:dvb:iptv:cpm:2014",
+            "",
+            1500000,
+            1,
+            Util.getUtf8Bytes(
+                "<![CDATA[<BroadcastEvent>\n"
+                    + "      <Program crid=\"crid://broadcaster.example.com/ABCDEF\"/>\n"
+                    + "      <InstanceDescription>\n"
+                    + "      <Title xml:lang=\"en\">The title</Title>\n"
+                    + "      <Synopsis xml:lang=\"en\" length=\"medium\">"
+                    + "The description</Synopsis>\n"
+                    + "      <ParentalGuidance>\n"
+                    + "      <mpeg7:ParentalRating href=\"urn:dvb:iptv:rating:2014:15\"/>\n"
+                    + "      <mpeg7:Region>GB</mpeg7:Region>\n"
+                    + "      </ParentalGuidance>\n"
+                    + "      </InstanceDescription>\n"
+                    + "      </BroadcastEvent>]]>"));
+
+    assertThat(eventStream2.events[0]).isEqualTo(expectedEvent2);
+    assertThat(eventStream2.presentationTimesUs[0]).isEqualTo(300000000);
 
     // assert xml-structured event stream
     EventStream eventStream3 = period.eventStreams.get(2);
     assertThat(eventStream3.events.length).isEqualTo(1);
-    assertThat(eventStream3.events[0])
-        .isEqualTo(
-            new EventMessage(
-                "urn:scte:scte35:2014:xml+bin",
-                "",
-                1000000,
-                2,
-                Util.getUtf8Bytes(
-                    "<scte35:Signal>\n"
-                        + "         <scte35:Binary>\n"
-                        + "         /DAIAAAAAAAAAAAQAAZ/I0VniQAQAgBDVUVJQAAAAH+cAAAAAA==\n"
-                        + "         </scte35:Binary>\n"
-                        + "       </scte35:Signal>"),
-                1000000000));
+    EventMessage expectedEvent3 =
+        new EventMessage(
+            "urn:scte:scte35:2014:xml+bin",
+            "",
+            1000000,
+            2,
+            Util.getUtf8Bytes(
+                "<scte35:Signal>\n"
+                    + "         <scte35:Binary>\n"
+                    + "         /DAIAAAAAAAAAAAQAAZ/I0VniQAQAgBDVUVJQAAAAH+cAAAAAA==\n"
+                    + "         </scte35:Binary>\n"
+                    + "       </scte35:Signal>"));
+    assertThat(eventStream3.events[0]).isEqualTo(expectedEvent3);
+    assertThat(eventStream3.presentationTimesUs[0]).isEqualTo(1000000000);
   }
 
   @Test

From 3a5ed6b889003ea03c5b5f1f98d9cfe8f5b8551d Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 12 Feb 2019 11:15:02 +0000
Subject: [PATCH 521/832] Skip ad group on unknown load error

PiperOrigin-RevId: 233576600
---
 .../com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
index 3bfb9aab7b..e817eba1d9 100644
--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
+++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
@@ -1374,7 +1374,8 @@ public final class ImaAdsLoader
   private static boolean isAdGroupLoadError(AdError adError) {
     // TODO: Find out what other errors need to be handled (if any), and whether each one relates to
     // a single ad, ad group or the whole timeline.
-    return adError.getErrorCode() == AdErrorCode.VAST_LINEAR_ASSET_MISMATCH;
+    return adError.getErrorCode() == AdErrorCode.VAST_LINEAR_ASSET_MISMATCH
+        || adError.getErrorCode() == AdErrorCode.UNKNOWN_ERROR;
   }
 
   private static boolean hasMidrollAdGroups(long[] adGroupTimesUs) {

From 55e6d1d70895f735b7a13f821dc452d7c88bb0d7 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Tue, 12 Feb 2019 11:30:54 +0000
Subject: [PATCH 522/832] Prevent concurrent queue modifications from breaking
 the cast demo app UI

PiperOrigin-RevId: 233577854
---
 .../exoplayer2/castdemo/MainActivity.java     | 10 +++--
 .../exoplayer2/castdemo/PlayerManager.java    | 39 +++++++++++++------
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
index 5ecfaec78e..22f9e18b24 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
@@ -211,6 +211,7 @@ public class MainActivity extends AppCompatActivity
   private class QueueItemViewHolder extends RecyclerView.ViewHolder implements OnClickListener {
 
     public final TextView textView;
+    public MediaItem item;
 
     public QueueItemViewHolder(TextView textView) {
       super(textView);
@@ -236,8 +237,9 @@ public class MainActivity extends AppCompatActivity
 
     @Override
     public void onBindViewHolder(QueueItemViewHolder holder, int position) {
+      holder.item = playerManager.getItem(position);
       TextView view = holder.textView;
-      view.setText(playerManager.getItem(position).title);
+      view.setText(holder.item.title);
       // TODO: Solve coloring using the theme's ColorStateList.
       view.setTextColor(ColorUtils.setAlphaComponent(view.getCurrentTextColor(),
            position == playerManager.getCurrentItemIndex() ? 255 : 100));
@@ -278,7 +280,8 @@ public class MainActivity extends AppCompatActivity
     @Override
     public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
       int position = viewHolder.getAdapterPosition();
-      if (playerManager.removeItem(position)) {
+      QueueItemViewHolder queueItemHolder = (QueueItemViewHolder) viewHolder;
+      if (playerManager.removeItem(queueItemHolder.item)) {
         mediaQueueListAdapter.notifyItemRemoved(position);
         // Update whichever item took its place, in case it became the new selected item.
         mediaQueueListAdapter.notifyItemChanged(position);
@@ -289,8 +292,9 @@ public class MainActivity extends AppCompatActivity
     public void clearView(RecyclerView recyclerView, ViewHolder viewHolder) {
       super.clearView(recyclerView, viewHolder);
       if (draggingFromPosition != C.INDEX_UNSET) {
+        QueueItemViewHolder queueItemHolder = (QueueItemViewHolder) viewHolder;
         // A drag has ended. We reflect the media queue change in the player.
-        if (!playerManager.moveItem(draggingFromPosition, draggingToPosition)) {
+        if (!playerManager.moveItem(queueItemHolder.item, draggingToPosition)) {
           // The move failed. The entire sequence of onMove calls since the drag started needs to be
           // invalidated.
           mediaQueueListAdapter.notifyDataSetChanged();
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
index 6b25934227..28dd808fdf 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
@@ -168,10 +168,16 @@ import java.util.ArrayList;
   /**
    * Removes the item at the given index from the media queue.
    *
-   * @param itemIndex The index of the item to remove.
+   * @param item The item to remove.
    * @return Whether the removal was successful.
    */
-  public boolean removeItem(int itemIndex) {
+  public boolean removeItem(MediaItem item) {
+    int itemIndex = mediaQueue.indexOf(item);
+    if (itemIndex == -1) {
+      // This may happen if another sender app removes items while this sender app is in "swiping
+      // an item" state.
+      return false;
+    }
     concatenatingMediaSource.removeMediaSource(itemIndex);
     mediaQueue.remove(itemIndex);
     if (currentPlayer == exoCastPlayer) {
@@ -188,20 +194,29 @@ import java.util.ArrayList;
   /**
    * Moves an item within the queue.
    *
-   * @param fromIndex The index of the item to move.
-   * @param toIndex The target index of the item in the queue.
-   * @return Whether the item move was successful.
+   * @param item The item to move. This method does nothing if {@code item} is not contained in the
+   *     queue.
+   * @param toIndex The target index of the item in the queue. If {@code toIndex} exceeds the last
+   *     position in the queue, {@code toIndex} is clamped to match the largest possible value.
+   * @return True if {@code item} was contained in the queue, and {@code toIndex} was a valid
+   *     position. False otherwise.
    */
-  public boolean moveItem(int fromIndex, int toIndex) {
-    mediaQueue.add(toIndex, mediaQueue.remove(fromIndex));
-    concatenatingMediaSource.moveMediaSource(fromIndex, toIndex);
-    if (currentPlayer == exoCastPlayer) {
-      exoCastPlayer.moveItemInQueue(fromIndex, toIndex);
+  public boolean moveItem(MediaItem item, int toIndex) {
+    int indexOfItem = mediaQueue.indexOf(item);
+    if (indexOfItem == -1) {
+      // This may happen if another sender app removes items while this sender app is in "dragging
+      // an item" state.
+      return false;
+    }
+    int clampedToIndex = Math.min(toIndex, mediaQueue.size() - 1);
+    mediaQueue.add(clampedToIndex, mediaQueue.remove(indexOfItem));
+    concatenatingMediaSource.moveMediaSource(indexOfItem, clampedToIndex);
+    if (currentPlayer == exoCastPlayer) {
+      exoCastPlayer.moveItemInQueue(indexOfItem, clampedToIndex);
     }
-
     // Index update.
     maybeSetCurrentItemAndNotify(currentPlayer.getCurrentWindowIndex());
-    return true;
+    return clampedToIndex == toIndex;
   }
 
   // Miscellaneous methods.

From 00c31265cd0f18915f68da82ba6ae3014328d634 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Tue, 12 Feb 2019 11:35:56 +0000
Subject: [PATCH 523/832] Move depended below dependant as per usual

PiperOrigin-RevId: 233578341
---
 .../exoplayer2/castdemo/MainActivity.java     | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
index 22f9e18b24..245acae28b 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
@@ -208,24 +208,6 @@ public class MainActivity extends AppCompatActivity
 
   // Internal classes.
 
-  private class QueueItemViewHolder extends RecyclerView.ViewHolder implements OnClickListener {
-
-    public final TextView textView;
-    public MediaItem item;
-
-    public QueueItemViewHolder(TextView textView) {
-      super(textView);
-      this.textView = textView;
-      textView.setOnClickListener(this);
-    }
-
-    @Override
-    public void onClick(View v) {
-      playerManager.selectQueueItem(getAdapterPosition());
-    }
-
-  }
-
   private class MediaQueueListAdapter extends RecyclerView.Adapter<QueueItemViewHolder> {
 
     @Override
@@ -303,7 +285,23 @@ public class MainActivity extends AppCompatActivity
       draggingFromPosition = C.INDEX_UNSET;
       draggingToPosition = C.INDEX_UNSET;
     }
+  }
 
+  private class QueueItemViewHolder extends RecyclerView.ViewHolder implements OnClickListener {
+
+    public final TextView textView;
+    public MediaItem item;
+
+    public QueueItemViewHolder(TextView textView) {
+      super(textView);
+      this.textView = textView;
+      textView.setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View v) {
+      playerManager.selectQueueItem(getAdapterPosition());
+    }
   }
 
   private static final class SampleListAdapter extends ArrayAdapter<DemoUtil.Sample> {

From 1dd36ae391447613d9fb67cc514c1fb59ffbbe5a Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 12 Feb 2019 12:20:46 +0000
Subject: [PATCH 524/832] Add TrackSelectionDialog (with swipe tabs) to demo
 app.

PiperOrigin-RevId: 233582549
---
 demos/main/build.gradle                       |   3 +
 demos/main/src/main/AndroidManifest.xml       |   3 +-
 .../exoplayer2/demo/DownloadTracker.java      | 202 ++++-----------
 .../demo/SampleChooserActivity.java           |  10 +-
 .../exoplayer2/demo/TrackSelectionDialog.java | 235 ++++++++++++++++++
 .../src/main/res/drawable-hdpi/ic_edit.png    | Bin 304 -> 0 bytes
 .../src/main/res/drawable-mdpi/ic_edit.png    | Bin 242 -> 0 bytes
 .../src/main/res/drawable-xhdpi/ic_edit.png   | Bin 299 -> 0 bytes
 .../src/main/res/drawable-xxhdpi/ic_edit.png  | Bin 413 -> 0 bytes
 .../src/main/res/drawable-xxxhdpi/ic_edit.png | Bin 449 -> 0 bytes
 ...ownload_dialog.xml => download_dialog.xml} |  12 +-
 .../main/res/layout/download_dialog_tab.xml   |  24 ++
 .../main/res/layout/download_track_item.xml   |  53 ----
 demos/main/src/main/res/values/strings.xml    |   4 -
 14 files changed, 335 insertions(+), 211 deletions(-)
 create mode 100644 demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
 delete mode 100755 demos/main/src/main/res/drawable-hdpi/ic_edit.png
 delete mode 100755 demos/main/src/main/res/drawable-mdpi/ic_edit.png
 delete mode 100755 demos/main/src/main/res/drawable-xhdpi/ic_edit.png
 delete mode 100755 demos/main/src/main/res/drawable-xxhdpi/ic_edit.png
 delete mode 100755 demos/main/src/main/res/drawable-xxxhdpi/ic_edit.png
 rename demos/main/src/main/res/layout/{start_download_dialog.xml => download_dialog.xml} (66%)
 create mode 100644 demos/main/src/main/res/layout/download_dialog_tab.xml
 delete mode 100644 demos/main/src/main/res/layout/download_track_item.xml

diff --git a/demos/main/build.gradle b/demos/main/build.gradle
index 440dc864d6..98e8f72835 100644
--- a/demos/main/build.gradle
+++ b/demos/main/build.gradle
@@ -63,6 +63,9 @@ android {
 
 dependencies {
     implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+    implementation 'com.android.support:support-core-ui:' + supportLibraryVersion
+    implementation 'com.android.support:support-fragment:' + supportLibraryVersion
+    implementation 'com.android.support:design:' + supportLibraryVersion
     implementation project(modulePrefix + 'library-core')
     implementation project(modulePrefix + 'library-dash')
     implementation project(modulePrefix + 'library-hls')
diff --git a/demos/main/src/main/AndroidManifest.xml b/demos/main/src/main/AndroidManifest.xml
index 1f013f5add..355ba43405 100644
--- a/demos/main/src/main/AndroidManifest.xml
+++ b/demos/main/src/main/AndroidManifest.xml
@@ -39,7 +39,8 @@
 
     <activity android:name="com.google.android.exoplayer2.demo.SampleChooserActivity"
         android:configChanges="keyboardHidden"
-        android:label="@string/application_name">
+        android:label="@string/application_name"
+        android:theme="@style/Theme.AppCompat">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
         <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index 50ec5048ce..29e7d0c19f 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -15,20 +15,12 @@
  */
 package com.google.android.exoplayer2.demo;
 
-import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.HandlerThread;
-import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.ImageButton;
-import android.widget.LinearLayout;
-import android.widget.TextView;
+import android.support.v4.app.FragmentManager;
 import android.widget.Toast;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.RenderersFactory;
@@ -46,11 +38,6 @@ import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.SelectionOverride;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo;
-import com.google.android.exoplayer2.trackselection.TrackSelection;
-import com.google.android.exoplayer2.trackselection.TrackSelectionUtil;
-import com.google.android.exoplayer2.ui.DefaultTrackNameProvider;
-import com.google.android.exoplayer2.ui.TrackNameProvider;
-import com.google.android.exoplayer2.ui.TrackSelectionDialogBuilder;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
@@ -81,7 +68,6 @@ public class DownloadTracker implements DownloadManager.Listener {
 
   private final Context context;
   private final DataSource.Factory dataSourceFactory;
-  private final TrackNameProvider trackNameProvider;
   private final CopyOnWriteArraySet<Listener> listeners;
   private final HashMap<Uri, DownloadState> trackedDownloadStates;
   private final DefaultDownloadIndex downloadIndex;
@@ -92,7 +78,6 @@ public class DownloadTracker implements DownloadManager.Listener {
     this.context = context.getApplicationContext();
     this.dataSourceFactory = dataSourceFactory;
     this.downloadIndex = downloadIndex;
-    trackNameProvider = new DefaultTrackNameProvider(context.getResources());
     listeners = new CopyOnWriteArraySet<>();
     trackedDownloadStates = new HashMap<>();
     HandlerThread actionFileWriteThread = new HandlerThread("DownloadTracker");
@@ -122,7 +107,7 @@ public class DownloadTracker implements DownloadManager.Listener {
   }
 
   public void toggleDownload(
-      Activity activity,
+      FragmentManager fragmentManager,
       String name,
       Uri uri,
       String extension,
@@ -133,7 +118,7 @@ public class DownloadTracker implements DownloadManager.Listener {
       startServiceWithAction(removeAction);
     } else {
       new StartDownloadDialogHelper(
-          activity, getDownloadHelper(uri, extension, renderersFactory), name);
+          fragmentManager, getDownloadHelper(uri, extension, renderersFactory), name);
     }
   }
 
@@ -225,42 +210,23 @@ public class DownloadTracker implements DownloadManager.Listener {
     }
   }
 
-  @SuppressWarnings("UngroupedOverloads")
   private final class StartDownloadDialogHelper
       implements DownloadHelper.Callback,
           DialogInterface.OnClickListener,
-          DialogInterface.OnDismissListener,
-          View.OnClickListener {
+          DialogInterface.OnDismissListener {
 
+    private final FragmentManager fragmentManager;
     private final DownloadHelper downloadHelper;
     private final String name;
-    private final LayoutInflater dialogInflater;
-    private final AlertDialog dialog;
-    private final LinearLayout selectionList;
 
+    private TrackSelectionDialog trackSelectionDialog;
     private MappedTrackInfo mappedTrackInfo;
-    private DefaultTrackSelector.Parameters parameters;
 
-    private StartDownloadDialogHelper(
-        Activity activity, DownloadHelper downloadHelper, String name) {
+    public StartDownloadDialogHelper(
+        FragmentManager fragmentManager, DownloadHelper downloadHelper, String name) {
+      this.fragmentManager = fragmentManager;
       this.downloadHelper = downloadHelper;
       this.name = name;
-      AlertDialog.Builder builder =
-          new AlertDialog.Builder(activity)
-              .setTitle(R.string.download_preparing)
-              .setPositiveButton(android.R.string.ok, /* listener= */ this)
-              .setNegativeButton(android.R.string.cancel, /* listener= */ null);
-
-      // Inflate with the builder's context to ensure the correct style is used.
-      dialogInflater = LayoutInflater.from(builder.getContext());
-      selectionList = (LinearLayout) dialogInflater.inflate(R.layout.start_download_dialog, null);
-      builder.setView(selectionList);
-      dialog = builder.create();
-      dialog.setOnDismissListener(/* listener= */ this);
-      dialog.show();
-      dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
-
-      parameters = DownloadHelper.DEFAULT_TRACK_SELECTOR_PARAMETERS;
       downloadHelper.prepare(this);
     }
 
@@ -268,12 +234,19 @@ public class DownloadTracker implements DownloadManager.Listener {
 
     @Override
     public void onPrepared(DownloadHelper helper) {
-      if (helper.getPeriodCount() > 0) {
-        mappedTrackInfo = downloadHelper.getMappedTrackInfo(/* periodIndex= */ 0);
-        updateSelectionList();
+      if (helper.getPeriodCount() == 0) {
+        onPrepareError(helper, new IOException("No periods found."));
+        return;
       }
-      dialog.setTitle(R.string.exo_download_description);
-      dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true);
+      mappedTrackInfo = downloadHelper.getMappedTrackInfo(/* periodIndex= */ 0);
+      trackSelectionDialog = new TrackSelectionDialog();
+      trackSelectionDialog.init(
+          mappedTrackInfo,
+          /* allowAdaptiveSelections =*/ false,
+          /* allowMultipleOverrides= */ true,
+          /* onClickListener= */ this,
+          /* onDismissListener= */ this);
+      trackSelectionDialog.show(fragmentManager, "download");
     }
 
     @Override
@@ -282,33 +255,44 @@ public class DownloadTracker implements DownloadManager.Listener {
               context.getApplicationContext(), R.string.download_start_error, Toast.LENGTH_LONG)
           .show();
       Log.e(TAG, "Failed to start download", e);
-      dialog.cancel();
-    }
-
-    // View.OnClickListener implementation.
-
-    @Override
-    public void onClick(View v) {
-      Integer rendererIndex = (Integer) v.getTag();
-      TrackGroupArray trackGroupArray = mappedTrackInfo.getTrackGroups(rendererIndex);
-      String dialogTitle = getTrackTypeString(mappedTrackInfo.getRendererType(rendererIndex));
-      new TrackSelectionDialogBuilder(
-              dialog.getContext(),
-              dialogTitle,
-              mappedTrackInfo,
-              rendererIndex,
-              (isDisabled, overrides) -> updateTracks(rendererIndex, isDisabled, overrides))
-          .setShowDisableOption(true)
-          .setIsDisabled(parameters.getRendererDisabled(rendererIndex))
-          .setOverride(parameters.getSelectionOverride(rendererIndex, trackGroupArray))
-          .build()
-          .show();
     }
 
     // DialogInterface.OnClickListener implementation.
 
     @Override
     public void onClick(DialogInterface dialog, int which) {
+      DefaultTrackSelector.ParametersBuilder builder =
+          DownloadHelper.DEFAULT_TRACK_SELECTOR_PARAMETERS.buildUpon();
+      for (int i = 0; i < mappedTrackInfo.getRendererCount(); i++) {
+        builder.setRendererDisabled(/* rendererIndex= */ i, /* disabled= */ true);
+      }
+      for (int i = 0; i < downloadHelper.getPeriodCount(); i++) {
+        downloadHelper.clearTrackSelections(/* periodIndex = */ i);
+      }
+      for (int i = 0; i < mappedTrackInfo.getRendererCount(); i++) {
+        if (trackSelectionDialog.getIsDisabled(/* rendererIndex= */ i)) {
+          continue;
+        }
+        builder.setRendererDisabled(/* rendererIndex= */ i, /* disabled= */ false);
+        List<SelectionOverride> overrides =
+            trackSelectionDialog.getOverrides(/* rendererIndex= */ i);
+        if (overrides.isEmpty()) {
+          for (int j = 0; j < downloadHelper.getPeriodCount(); j++) {
+            downloadHelper.addTrackSelection(/* periodIndex = */ j, builder.build());
+          }
+        } else {
+          TrackGroupArray trackGroupArray = mappedTrackInfo.getTrackGroups(/* rendererIndex= */ i);
+          for (int overrideIndex = 0; overrideIndex < overrides.size(); overrideIndex++) {
+            builder.setSelectionOverride(
+                /* rendererIndex= */ i, trackGroupArray, overrides.get(overrideIndex));
+            for (int j = 0; j < downloadHelper.getPeriodCount(); j++) {
+              downloadHelper.addTrackSelection(/* periodIndex = */ j, builder.build());
+            }
+          }
+          builder.clearSelectionOverrides();
+        }
+        builder.setRendererDisabled(/* rendererIndex= */ i, /* disabled= */ true);
+      }
       DownloadAction downloadAction = downloadHelper.getDownloadAction(Util.getUtf8Bytes(name));
       startDownload(downloadAction);
     }
@@ -316,86 +300,8 @@ public class DownloadTracker implements DownloadManager.Listener {
     // DialogInterface.OnDismissListener implementation.
 
     @Override
-    public void onDismiss(DialogInterface dialog) {
+    public void onDismiss(DialogInterface dialogInterface) {
       downloadHelper.release();
     }
-
-    // Internal methods.
-
-    private void updateTracks(
-        int rendererIndex, boolean isDisabled, List<SelectionOverride> overrides) {
-      parameters =
-          TrackSelectionUtil.updateParametersWithOverride(
-              parameters,
-              rendererIndex,
-              mappedTrackInfo.getTrackGroups(rendererIndex),
-              isDisabled,
-              overrides.isEmpty() ? null : overrides.get(0));
-      for (int i = 0; i < downloadHelper.getPeriodCount(); i++) {
-        downloadHelper.replaceTrackSelections(/* periodIndex= */ i, parameters);
-      }
-      updateSelectionList();
-    }
-
-    private void updateSelectionList() {
-      selectionList.removeAllViews();
-      for (int i = 0; i < mappedTrackInfo.getRendererCount(); i++) {
-        TrackGroupArray trackGroupArray = mappedTrackInfo.getTrackGroups(i);
-        if (trackGroupArray.length == 0) {
-          continue;
-        }
-        String trackTypeString =
-            getTrackTypeString(mappedTrackInfo.getRendererType(/* rendererIndex= */ i));
-        if (trackTypeString == null) {
-          return;
-        }
-        String trackSelectionsString = getTrackSelectionString(/* rendererIndex= */ i);
-        View view = dialogInflater.inflate(R.layout.download_track_item, selectionList, false);
-        TextView trackTitleView = view.findViewById(R.id.track_title);
-        TextView trackDescView = view.findViewById(R.id.track_desc);
-        ImageButton editButton = view.findViewById(R.id.edit_button);
-        trackTitleView.setText(trackTypeString);
-        trackDescView.setText(trackSelectionsString);
-        editButton.setTag(i);
-        editButton.setOnClickListener(this);
-        selectionList.addView(view);
-      }
-    }
-
-    private String getTrackSelectionString(int rendererIndex) {
-      List<TrackSelection> trackSelections =
-          downloadHelper.getTrackSelections(/* periodIndex= */ 0, rendererIndex);
-      String selectedTracks = "";
-      Resources resources = selectionList.getResources();
-      for (int i = 0; i < trackSelections.size(); i++) {
-        TrackSelection selection = trackSelections.get(i);
-        for (int j = 0; j < selection.length(); j++) {
-          String trackName = trackNameProvider.getTrackName(selection.getFormat(j));
-          if (i == 0 && j == 0) {
-            selectedTracks = trackName;
-          } else {
-            selectedTracks = resources.getString(R.string.exo_item_list, selectedTracks, trackName);
-          }
-        }
-      }
-      return selectedTracks.isEmpty()
-          ? resources.getString(R.string.exo_track_selection_none)
-          : selectedTracks;
-    }
-
-    @Nullable
-    private String getTrackTypeString(int trackType) {
-      Resources resources = selectionList.getResources();
-      switch (trackType) {
-        case C.TRACK_TYPE_VIDEO:
-          return resources.getString(R.string.exo_track_selection_title_video);
-        case C.TRACK_TYPE_AUDIO:
-          return resources.getString(R.string.exo_track_selection_title_audio);
-        case C.TRACK_TYPE_TEXT:
-          return resources.getString(R.string.exo_track_selection_title_text);
-        default:
-          return 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 5db52fd575..b9ea2da8db 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
@@ -15,7 +15,6 @@
  */
 package com.google.android.exoplayer2.demo;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.AssetManager;
@@ -23,6 +22,7 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
 import android.util.JsonReader;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -55,7 +55,7 @@ import java.util.Collections;
 import java.util.List;
 
 /** An activity for selecting from a list of media samples. */
-public class SampleChooserActivity extends Activity
+public class SampleChooserActivity extends AppCompatActivity
     implements DownloadTracker.Listener, OnChildClickListener {
 
   private static final String TAG = "SampleChooserActivity";
@@ -182,7 +182,11 @@ public class SampleChooserActivity extends Activity
           ((DemoApplication) getApplication())
               .buildRenderersFactory(isNonNullAndChecked(preferExtensionDecodersMenuItem));
       downloadTracker.toggleDownload(
-          this, sample.name, uriSample.uri, uriSample.extension, renderersFactory);
+          getSupportFragmentManager(),
+          sample.name,
+          uriSample.uri,
+          uriSample.extension,
+          renderersFactory);
     }
   }
 
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
new file mode 100644
index 0000000000..3048594955
--- /dev/null
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
@@ -0,0 +1,235 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.demo;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.util.SparseArray;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.SelectionOverride;
+import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo;
+import com.google.android.exoplayer2.ui.TrackSelectionView;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/** Dialog to select tracks. */
+public final class TrackSelectionDialog extends DialogFragment {
+
+  private final SparseArray<TrackSelectionViewFragment> tabFragments;
+  private final List<CharSequence> tabTitles;
+
+  private MappedTrackInfo mappedTrackInfo;
+  private boolean allowAdaptiveSelections;
+  private boolean allowMultipleOverrides;
+  private DialogInterface.OnClickListener onClickListener;
+  private DialogInterface.OnDismissListener onDismissListener;
+
+  /** Creates the dialog. */
+  public TrackSelectionDialog() {
+    tabFragments = new SparseArray<>();
+    tabTitles = new ArrayList<>();
+    // Retain instance across orientation changes to prevent loosing access to init data.
+    setRetainInstance(true);
+  }
+
+  /**
+   * Initializes the dialog.
+   *
+   * @param mappedTrackInfo The {@link MappedTrackInfo} to display.
+   * @param allowAdaptiveSelections Whether adaptive selections (consisting of more than one track)
+   *     can be made.
+   * @param allowMultipleOverrides Whether tracks from multiple track groups can be selected.
+   * @param onClickListener {@link DialogInterface.OnClickListener} called when tracks are selected.
+   * @param onDismissListener {@link DialogInterface.OnDismissListener} called when the dialog is
+   *     dismissed.
+   */
+  public void init(
+      MappedTrackInfo mappedTrackInfo,
+      boolean allowAdaptiveSelections,
+      boolean allowMultipleOverrides,
+      DialogInterface.OnClickListener onClickListener,
+      DialogInterface.OnDismissListener onDismissListener) {
+    this.mappedTrackInfo = mappedTrackInfo;
+    this.allowAdaptiveSelections = allowAdaptiveSelections;
+    this.allowMultipleOverrides = allowMultipleOverrides;
+    this.onClickListener = onClickListener;
+    this.onDismissListener = onDismissListener;
+  }
+
+  /**
+   * Returns whether a renderer is disabled.
+   *
+   * @param rendererIndex Renderer index.
+   * @return Whether the renderer is disabled.
+   */
+  public boolean getIsDisabled(int rendererIndex) {
+    TrackSelectionViewFragment rendererView = tabFragments.get(rendererIndex);
+    return rendererView != null && rendererView.trackSelectionView.getIsDisabled();
+  }
+
+  /**
+   * Returns the list of selected track selection overrides for the specified renderer. There will
+   * be at most one override for each track group.
+   *
+   * @param rendererIndex Renderer index.
+   * @return The list of track selection overrides for this renderer.
+   */
+  public List<SelectionOverride> getOverrides(int rendererIndex) {
+    TrackSelectionViewFragment rendererView = tabFragments.get(rendererIndex);
+    return rendererView == null
+        ? Collections.emptyList()
+        : rendererView.trackSelectionView.getOverrides();
+  }
+
+  @Override
+  public Dialog onCreateDialog(Bundle savedInstanceState) {
+    return new AlertDialog.Builder(getActivity())
+        .setTitle(R.string.exo_download_description)
+        .setPositiveButton(android.R.string.ok, onClickListener)
+        .setNegativeButton(android.R.string.cancel, /* listener= */ null)
+        .create();
+  }
+
+  @Override
+  public void onDismiss(DialogInterface dialog) {
+    super.onDismiss(dialog);
+    onDismissListener.onDismiss(dialog);
+  }
+
+  @Nullable
+  @Override
+  public View onCreateView(
+      LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    for (int i = 0; i < mappedTrackInfo.getRendererCount(); i++) {
+      TrackGroupArray trackGroupArray = mappedTrackInfo.getTrackGroups(i);
+      if (trackGroupArray.length == 0) {
+        continue;
+      }
+      String trackTypeString =
+          getTrackTypeString(mappedTrackInfo.getRendererType(/* rendererIndex= */ i));
+      if (trackTypeString == null) {
+        continue;
+      }
+      TrackSelectionViewFragment tabFragment = new TrackSelectionViewFragment();
+      tabFragment.init(
+          mappedTrackInfo, /* rendererIndex= */ i, allowAdaptiveSelections, allowMultipleOverrides);
+      tabFragments.put(i, tabFragment);
+      tabTitles.add(trackTypeString);
+    }
+    View dialogView = inflater.inflate(R.layout.download_dialog, container, false);
+    TabLayout tabLayout = dialogView.findViewById(R.id.download_dialog_tab_layout);
+    ViewPager viewPager = dialogView.findViewById(R.id.download_dialog_view_pager);
+    viewPager.setAdapter(new FragmentAdapter(getChildFragmentManager()));
+    tabLayout.setupWithViewPager(viewPager);
+    ((AlertDialog) getDialog()).setView(dialogView);
+    return dialogView;
+  }
+
+  @Nullable
+  private String getTrackTypeString(int trackType) {
+    Resources resources = getResources();
+    switch (trackType) {
+      case C.TRACK_TYPE_VIDEO:
+        return resources.getString(R.string.exo_track_selection_title_video);
+      case C.TRACK_TYPE_AUDIO:
+        return resources.getString(R.string.exo_track_selection_title_audio);
+      case C.TRACK_TYPE_TEXT:
+        return resources.getString(R.string.exo_track_selection_title_text);
+      default:
+        return null;
+    }
+  }
+
+  private final class FragmentAdapter extends FragmentPagerAdapter {
+
+    public FragmentAdapter(FragmentManager fragmentManager) {
+      super(fragmentManager);
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+      return tabFragments.valueAt(position);
+    }
+
+    @Override
+    public int getCount() {
+      return tabFragments.size();
+    }
+
+    @Nullable
+    @Override
+    public CharSequence getPageTitle(int position) {
+      return tabTitles.get(position);
+    }
+  }
+
+  /** Fragment to show a track seleciton in tab of the track selection dialog. */
+  public static final class TrackSelectionViewFragment extends Fragment {
+
+    private MappedTrackInfo mappedTrackInfo;
+    private int rendererIndex;
+    private boolean allowAdaptiveSelections;
+    private boolean allowMultipleOverrides;
+
+    /* package */ TrackSelectionView trackSelectionView;
+
+    public void init(
+        MappedTrackInfo mappedTrackInfo,
+        int rendererIndex,
+        boolean allowAdaptiveSelections,
+        boolean allowMultipleOverrides) {
+      this.mappedTrackInfo = mappedTrackInfo;
+      this.rendererIndex = rendererIndex;
+      this.allowAdaptiveSelections = allowAdaptiveSelections;
+      this.allowMultipleOverrides = allowMultipleOverrides;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(
+        LayoutInflater inflater,
+        @Nullable ViewGroup container,
+        @Nullable Bundle savedInstanceState) {
+      View rootView =
+          inflater.inflate(R.layout.download_dialog_tab, container, /* attachToRoot= */ false);
+      trackSelectionView = rootView.findViewById(R.id.download_dialog_track_selection_view);
+      trackSelectionView.setShowDisableOption(true);
+      trackSelectionView.setAllowMultipleOverrides(allowMultipleOverrides);
+      trackSelectionView.setAllowAdaptiveSelections(allowAdaptiveSelections);
+      trackSelectionView.init(
+          mappedTrackInfo,
+          rendererIndex,
+          /* isDisabled= */ false,
+          /* overrides= */ Collections.emptyList());
+      return rootView;
+    }
+  }
+}
diff --git a/demos/main/src/main/res/drawable-hdpi/ic_edit.png b/demos/main/src/main/res/drawable-hdpi/ic_edit.png
deleted file mode 100755
index 25678d6de970f4cf8d98452f9f2d184b7b126530..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 304
zcmV-00nh%4P)<h;3K|Lk000e1NJLTq001@s001@!1ONa4CQPDM0002@Nkl<ZcmeIy
zGh#qN6h`6G$2RJyimR|n6YVuNo7m<CVjDO1+#AjL7w|m}KHr}$oj^<qrin8)sYbmp
zhB)JL$5f$OB;%Km1sB7#K<Zq*AO>6_%g=JPwp^mikG-9oSGg>A)DUNEQ7GKnBdXOc
zb-7*PQXg=G1UmhNg)4f(jS}LD8t3f6_9=hBO%bj@$qo^YE~3;Z;VO{SDA^HJTF32k
z>v2a-zd`jA_y?&$ODY5>#aL1cp884&mek76p++sK@LxxzSW@d&RE!-3MRpVv*-=pR
zeo7OY5=tGLA_{CU6$*;%C@8X{Ae5p<i@@jmlbr+X{2@z^j?>Wq0000<MNUMnLSTXu
C@_;P>

diff --git a/demos/main/src/main/res/drawable-mdpi/ic_edit.png b/demos/main/src/main/res/drawable-mdpi/ic_edit.png
deleted file mode 100755
index dffcd9f61a79913ea289c0a255afab2494532cb8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 242
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8LpPEQxdkP61PXBycKC5SjY{LHpc
zpe;qhMag4^gF=JcLh&2SJPi!CNfB)(6NCON>^}Bjm${TRdqe-a`6dbO^2MC0jl#+N
zY7r|J8t`3d3|K65<?Icn4eJAE&fEDRiP@pgK*Xg=O`w8nDyQ(`tWSw8QQS+@Erj>g
zZD3lEp76xldx~nQ+rEieGdE3)+%mIs?~Fx_JF5(fLwfhjcr0%?k)OGeIhZrKMQd3?
pd&@?rLlKJ1%$k;)3}VmiWn};V$;>=IlNaa-22WQ%mvv4FO#m$xRv-WX

diff --git a/demos/main/src/main/res/drawable-xhdpi/ic_edit.png b/demos/main/src/main/res/drawable-xhdpi/ic_edit.png
deleted file mode 100755
index 82f8563d1e2af42787d9f75cbed64d07b1358815..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 299
zcmV+`0o4A9P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0002;Nkl<ZcmeIs
z#Z^QB5Cze~-BQ5U$eI91fJn%KG;nu!*F139GxoPgV}0Hnx+;N76h+a$sf8wFYG9KT
zDHf?ipjxg-C38--4k!7DN*zw}4&^$W<TXllILQkX<6bYXq~3jsBHZiykTgtz8fgHR
zs_8V69(*{*ywGhT-S}`)q>Q9~FOH2gL;-(VWx_F#oH%==NEt|;90SRjV<5S545S`k
zj)COD@g^BK22#5t$M6_M!O0iSj2fpnIKk26l&f(zf)kwJ1SdFo%31zv4qxPy^5=<h
xP~)J+L5+hN2Q?0A9Mm|daZuwR#fhRQiqaQ2&GRn2nYRD{002ovPDHLkV1l7Veq8_n

diff --git a/demos/main/src/main/res/drawable-xxhdpi/ic_edit.png b/demos/main/src/main/res/drawable-xxhdpi/ic_edit.png
deleted file mode 100755
index f00b4b68c5b0bba9c2703eb3f167aabd1507e1e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 413
zcmV;O0b>4%P)<h;3K|Lk000e1NJLTq003+N003+V1ONa4C2yZb0004GNkl<ZcmeIy
zfks3@0EOWL0w_pH=urZMY_L)`Ar=u56wm?z0(!L&L<l4TQg)+5D5I{+nmPUdd4c=6
zGb5@eA|fIpqBV_lu6?a2ssp`f_PJ;6Dy9>ozBbNenHI@1Es|wgB+Il&mT8eJ(*jrl
zv{TKXh0}(qv?nd8+7|V_iw?9wz5nM?8$D=eH6Oc&9<=RxStZ(KLwBseD$%Z5d=<^=
zM;oiUj{RvrXzK-9!z}N<Kx>>;qFuMoD$|;0nYLP{waW7DinNAVW!g<^tTL_ojykhU
zTdtio?TqqnP0M1HX#p(L7UEd_A9z@>MzCPbGgz>usjNd-b848%dWQuI7A#natU)U4
z4Hhg|u>Lt~E0y&M3)WwQ1#2^p<tCXd!va}`1+okaWEmF7GAxi~SRl)=K$c;FtS&IK
z_M|+RS#dD4;$UXQ!OV(-nH2yFU`d;r{IVSp5fKp)Q7wG{7@3bcn_pyC00000NkvXX
Hu0mjf*r2N$

diff --git a/demos/main/src/main/res/drawable-xxxhdpi/ic_edit.png b/demos/main/src/main/res/drawable-xxxhdpi/ic_edit.png
deleted file mode 100755
index a9f99417fba794c79ac31281ddb405d41d4162fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 449
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ)^zFm`ylIEGX(zP-fg=8`DU`mkS+
zL3E{7i@=uU4!1nHGnE<LxE3AiNEA@aWZuqT{BT~+>RJ1r+gex5nWW+gLQCpzMa{jw
zWY_t-*E4&w6lJeDmlp3{x%ZOH`8B)rt5?0fq{P4IOtZ#E1umNoCjLbSnl(N^nO~1I
zzgT4D(or`xLp<<*UUtih`sY`r7ro9}F?rXjvyGkiq90YRUH6Vnttz{Fx%8ZjJ5uK_
zxTL@R$m40UF0k9iS<p9of9O2Lj%B46jQmv&33q;QQL<@V5j*ekfz2#|(Kh<`pPzK8
zP!gQy(V{N+kkduFLI}(j0J1BX1n0HJKKdEVf2f(AU(TlDgUr{@4=Rr}v!BoUX!Gs!
zgPSn%2M3`FbZ#cv^Usq6stxN-zjVGiot=N)w#pB1`3EN-a>C$W75)X8@<1#bQVkQs
jLVG@3IR_GoDzyv`b*-KC%d=hrqlUrL)z4*}Q$iB}4BWod

diff --git a/demos/main/src/main/res/layout/start_download_dialog.xml b/demos/main/src/main/res/layout/download_dialog.xml
similarity index 66%
rename from demos/main/src/main/res/layout/start_download_dialog.xml
rename to demos/main/src/main/res/layout/download_dialog.xml
index c182047ff8..25819c7ff5 100644
--- a/demos/main/src/main/res/layout/start_download_dialog.xml
+++ b/demos/main/src/main/res/layout/download_dialog.xml
@@ -14,7 +14,15 @@
      limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/selection_list"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"/>
+    android:layout_height="wrap_content">
+  <android.support.design.widget.TabLayout
+      android:id="@+id/download_dialog_tab_layout"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"/>
+  <android.support.v4.view.ViewPager
+      android:id="@+id/download_dialog_view_pager"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"/>
+</LinearLayout>
diff --git a/demos/main/src/main/res/layout/download_dialog_tab.xml b/demos/main/src/main/res/layout/download_dialog_tab.xml
new file mode 100644
index 0000000000..1827b4738b
--- /dev/null
+++ b/demos/main/src/main/res/layout/download_dialog_tab.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+  <com.google.android.exoplayer2.ui.TrackSelectionView
+      android:id="@+id/download_dialog_track_selection_view"
+      android:orientation="vertical"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"/>
+</ScrollView>
diff --git a/demos/main/src/main/res/layout/download_track_item.xml b/demos/main/src/main/res/layout/download_track_item.xml
deleted file mode 100644
index fe1c62b391..0000000000
--- a/demos/main/src/main/res/layout/download_track_item.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingStart="12dp"
-    android:paddingEnd="12dp"
-    android:orientation="horizontal"
-    android:gravity="center_vertical">
-
-  <LinearLayout
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:layout_weight="1"
-      android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/track_title"
-        android:textStyle="bold"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingTop="4dp"/>
-
-    <TextView
-        android:id="@+id/track_desc"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingBottom="4dp"/>
-
-  </LinearLayout>
-
-  <ImageButton
-      android:id="@+id/edit_button"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:background="@android:color/transparent"
-      android:contentDescription="@string/download_edit_track"
-      android:src="@drawable/ic_edit"/>
-
-</LinearLayout>
diff --git a/demos/main/src/main/res/values/strings.xml b/demos/main/src/main/res/values/strings.xml
index 7ac5a65a49..40f065b18e 100644
--- a/demos/main/src/main/res/values/strings.xml
+++ b/demos/main/src/main/res/values/strings.xml
@@ -51,10 +51,6 @@
 
   <string name="ima_not_loaded">Playing sample without ads, as the IMA extension was not loaded</string>
 
-  <string name="download_edit_track">Edit selection</string>
-
-  <string name="download_preparing">Preparing download…</string>
-
   <string name="download_start_error">Failed to start download</string>
 
   <string name="download_playlist_unsupported">This demo app does not support downloading playlists</string>

From 399a963e020d0b145ffb12639bd6f2917b2a2ce6 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 12 Feb 2019 12:39:40 +0000
Subject: [PATCH 525/832] Revert removal of single track option in
 TrackSelectionView.

PiperOrigin-RevId: 233584155
---
 .../google/android/exoplayer2/ui/TrackSelectionView.java    | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
index 35b7d71b4e..fc01e63242 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
@@ -231,12 +231,6 @@ public class TrackSelectionView extends LinearLayout {
     trackGroups = mappedTrackInfo.getTrackGroups(rendererIndex);
 
     // Add per-track views.
-    if (trackGroups.length == 1 && trackGroups.get(0).length == 1) {
-      // Don't add group selection if there is nothing to select from.
-      trackViews = new CheckedTextView[0][0];
-      updateViewStates();
-      return;
-    }
     trackViews = new CheckedTextView[trackGroups.length][];
     boolean enableMultipleChoiceForMultipleOverrides =
         allowMultipleOverrides && trackGroups.length > 1;

From 5782bbc6e551d6668f26e4dfa51394e61d552ca7 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Tue, 12 Feb 2019 13:07:03 +0000
Subject: [PATCH 526/832] Use DownloadState in DownloadManager

PiperOrigin-RevId: 233587184
---
 .../exoplayer2/offline/DownloadAction.java    |   5 -
 .../offline/DownloadActionUtil.java           |  79 -----
 .../exoplayer2/offline/DownloadManager.java   | 186 +++++-----
 .../exoplayer2/offline/DownloadState.java     |  20 +-
 .../offline/DownloadActionTest.java           |  18 +-
 .../offline/DownloadActionUtilTest.java       | 335 ------------------
 .../offline/DownloadManagerTest.java          |  15 -
 .../exoplayer2/offline/DownloadStateTest.java |  22 +-
 8 files changed, 125 insertions(+), 555 deletions(-)
 delete mode 100644 library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadActionUtil.java
 delete mode 100644 library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionUtilTest.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
index 40ea094b5e..0c36b8bb63 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
@@ -172,11 +172,6 @@ public final class DownloadAction {
     return output.toByteArray();
   }
 
-  /** Returns whether this is an action for the same media as the {@code other}. */
-  public boolean isSameMedia(DownloadAction other) {
-    return id.equals(other.id);
-  }
-
   /** Returns keys of streams to be downloaded. */
   public List<StreamKey> getKeys() {
     return keys;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadActionUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadActionUtil.java
deleted file mode 100644
index f722f9b59b..0000000000
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadActionUtil.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.offline;
-
-import com.google.android.exoplayer2.util.Assertions;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.HashSet;
-
-/** {@link DownloadAction} related utility methods. */
-public class DownloadActionUtil {
-
-  private DownloadActionUtil() {}
-
-  /**
-   * Merge {@link DownloadAction}s in {@code actionQueue} to minimum number of actions.
-   *
-   * <p>All actions must have the same type and must be for the same media.
-   *
-   * @param actionQueue Queue of actions. Must not be empty.
-   * @return The first action in the queue.
-   */
-  public static DownloadAction mergeActions(ArrayDeque<DownloadAction> actionQueue) {
-    DownloadAction removeAction = null;
-    DownloadAction downloadAction = null;
-    HashSet<StreamKey> keys = new HashSet<>();
-    boolean downloadAllTracks = false;
-    DownloadAction firstAction = Assertions.checkNotNull(actionQueue.peek());
-
-    while (!actionQueue.isEmpty()) {
-      DownloadAction action = actionQueue.remove();
-      Assertions.checkState(action.type.equals(firstAction.type));
-      Assertions.checkState(action.isSameMedia(firstAction));
-      if (action.isRemoveAction) {
-        removeAction = action;
-        downloadAction = null;
-        keys.clear();
-        downloadAllTracks = false;
-      } else {
-        if (!downloadAllTracks) {
-          if (action.keys.isEmpty()) {
-            downloadAllTracks = true;
-            keys.clear();
-          } else {
-            keys.addAll(action.keys);
-          }
-        }
-        downloadAction = action;
-      }
-    }
-
-    if (removeAction != null) {
-      actionQueue.add(removeAction);
-    }
-    if (downloadAction != null) {
-      actionQueue.add(
-          DownloadAction.createDownloadAction(
-              downloadAction.type,
-              downloadAction.uri,
-              new ArrayList<>(keys),
-              downloadAction.customCacheKey,
-              downloadAction.data));
-    }
-    return Assertions.checkNotNull(actionQueue.peek());
-  }
-}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 731f7fc43e..cd5f0dc6cf 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -46,7 +46,9 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.concurrent.CopyOnWriteArraySet;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
@@ -307,7 +309,7 @@ public final class DownloadManager {
     Assertions.checkState(!released);
     for (int i = 0; i < downloads.size(); i++) {
       Download download = downloads.get(i);
-      if (download.id.equals(id)) {
+      if (download.getId().equals(id)) {
         return download.getDownloadState();
       }
     }
@@ -384,19 +386,15 @@ public final class DownloadManager {
     if (released) {
       return;
     }
-    notifyListenersDownloadStateChange(download);
-    if (download.isFinished()) {
-      downloads.remove(download);
-      saveActions();
-    }
-  }
-
-  private void notifyListenersDownloadStateChange(Download download) {
     logd("Download state is changed", download);
     DownloadState downloadState = download.getDownloadState();
     for (Listener listener : listeners) {
       listener.onDownloadStateChanged(this, downloadState);
     }
+    if (download.isFinished()) {
+      downloads.remove(download);
+      saveActions();
+    }
   }
 
   private void onRequirementsStateChanged(@Requirements.RequirementFlags int notMetRequirements) {
@@ -464,7 +462,7 @@ public final class DownloadManager {
     }
     ArrayList<DownloadAction> actions = new ArrayList<>(downloads.size());
     for (int i = 0; i < downloads.size(); i++) {
-      actions.addAll(downloads.get(i).actionQueue);
+      downloads.get(i).addActions(actions);
     }
     final DownloadAction[] actionsArray = actions.toArray(new DownloadAction[0]);
     fileIOHandler.post(
@@ -551,6 +549,9 @@ public final class DownloadManager {
   }
 
   private void onDownloadThreadStopped(DownloadThread downloadThread, Throwable finalError) {
+    if (released) {
+      return;
+    }
     Download download = downloadThread.download;
     logd("Download is stopped", download);
     activeDownloads.remove(download);
@@ -581,12 +582,9 @@ public final class DownloadManager {
   }
 
   private static final class Download {
-
-    private final String id;
     private final DownloadManager downloadManager;
-    private final long startTimeMs;
-    private final ArrayDeque<DownloadAction> actionQueue;
 
+    private DownloadState downloadState;
     @DownloadState.State private int state;
     @MonotonicNonNull @DownloadState.FailureReason private int failureReason;
     @DownloadState.StopFlags private int stopFlags;
@@ -599,47 +597,26 @@ public final class DownloadManager {
         @DownloadState.StopFlags int stopFlags,
         @Requirements.RequirementFlags int notMetRequirements,
         int manualStopReason) {
-      this.id = action.id;
       this.downloadManager = downloadManager;
       this.notMetRequirements = notMetRequirements;
       this.manualStopReason = manualStopReason;
       this.stopFlags = stopFlags;
-      this.startTimeMs = System.currentTimeMillis();
-      actionQueue = new ArrayDeque<>();
-      actionQueue.add(action);
+      downloadState = new DownloadState(action);
 
-      // Set to queued state but don't notify listeners until we make sure we don't switch to
-      // another state immediately.
-      state = STATE_QUEUED;
-      initialize();
-      if (state == STATE_QUEUED) {
-        downloadManager.onDownloadStateChange(this);
-      }
+      initialize(downloadState.state);
+    }
+
+    public String getId() {
+      return downloadState.id;
     }
 
     public boolean addAction(DownloadAction newAction) {
-      DownloadAction action = actionQueue.peek();
-      if (!action.isSameMedia(newAction)) {
+      if (!getId().equals(newAction.id)) {
         return false;
       }
-      Assertions.checkState(action.type.equals(newAction.type));
-      actionQueue.add(newAction);
-      DownloadAction updatedAction = DownloadActionUtil.mergeActions(actionQueue);
-      if (state == STATE_REMOVING) {
-        Assertions.checkState(updatedAction.isRemoveAction);
-        if (actionQueue.size() > 1) {
-          setState(STATE_RESTARTING);
-        }
-      } else if (state == STATE_RESTARTING) {
-        Assertions.checkState(updatedAction.isRemoveAction);
-        if (actionQueue.size() == 1) {
-          setState(STATE_REMOVING);
-        }
-      } else if (!action.equals(updatedAction)) {
-        Assertions.checkState(
-            state == STATE_DOWNLOADING || state == STATE_QUEUED || state == STATE_STOPPED);
-        initialize();
-      }
+      Assertions.checkState(downloadState.type.equals(newAction.type));
+      downloadState = downloadState.mergeAction(newAction);
+      initialize(downloadState.state);
       return true;
     }
 
@@ -653,24 +630,25 @@ public final class DownloadManager {
         downloadedBytes = downloader.getDownloadedBytes();
         totalBytes = downloader.getTotalBytes();
       }
-      DownloadAction action = actionQueue.peek();
-      return new DownloadState(
-          action.id,
-          action.type,
-          action.uri,
-          action.customCacheKey,
-          state,
-          downloadPercentage,
-          downloadedBytes,
-          totalBytes,
-          failureReason,
-          stopFlags,
-          notMetRequirements,
-          manualStopReason,
-          startTimeMs,
-          /* updateTimeMs= */ System.currentTimeMillis(),
-          action.keys.toArray(new StreamKey[0]),
-          action.data);
+      downloadState =
+          new DownloadState(
+              downloadState.id,
+              downloadState.type,
+              downloadState.uri,
+              downloadState.cacheKey,
+              state,
+              downloadPercentage,
+              downloadedBytes,
+              totalBytes,
+              state != STATE_FAILED ? FAILURE_REASON_NONE : failureReason,
+              stopFlags,
+              notMetRequirements,
+              manualStopReason,
+              downloadState.startTimeMs,
+              /* updateTimeMs= */ System.currentTimeMillis(),
+              downloadState.streamKeys,
+              downloadState.customMetadata);
+      return downloadState;
     }
 
     public boolean isFinished() {
@@ -683,14 +661,14 @@ public final class DownloadManager {
 
     @Override
     public String toString() {
-      return id + ' ' + DownloadState.getStateString(state);
+      return getId() + ' ' + DownloadState.getStateString(state);
     }
 
     public void start() {
       if (state == STATE_QUEUED || state == STATE_DOWNLOADING) {
         startOrQueue();
       } else if (state == STATE_REMOVING || state == STATE_RESTARTING) {
-        downloadManager.startDownloadThread(this, actionQueue.peek());
+        downloadManager.startDownloadThread(this, getAction());
       }
     }
 
@@ -725,26 +703,25 @@ public final class DownloadManager {
       }
     }
 
-    private void initialize() {
-      DownloadAction action = actionQueue.peek();
-      if (action.isRemoveAction) {
-        int result = downloadManager.startDownloadThread(this, action);
-        Assertions.checkState(
-            result == START_THREAD_SUCCEEDED
-                || result == START_THREAD_WAIT_DOWNLOAD_CANCELLATION
-                || result == START_THREAD_NOT_ALLOWED);
-        setState(actionQueue.size() == 1 ? STATE_REMOVING : STATE_RESTARTING);
+    private void initialize(int initialState) {
+      // Don't notify listeners with initial state until we make sure we don't switch to
+      // another state immediately.
+      state = initialState;
+      if (state == STATE_REMOVING || state == STATE_RESTARTING) {
+        downloadManager.startDownloadThread(this, getAction());
       } else if (stopFlags != 0) {
         setState(STATE_STOPPED);
       } else {
         startOrQueue();
       }
+      if (state == initialState) {
+        downloadManager.onDownloadStateChange(this);
+      }
     }
 
     private void startOrQueue() {
-      DownloadAction action = Assertions.checkNotNull(actionQueue.peek());
-      Assertions.checkState(!action.isRemoveAction);
-      @StartThreadResults int result = downloadManager.startDownloadThread(this, action);
+      Assertions.checkState(!(state == STATE_REMOVING || state == STATE_RESTARTING));
+      @StartThreadResults int result = downloadManager.startDownloadThread(this, getAction());
       Assertions.checkState(result != START_THREAD_WAIT_REMOVAL_TO_FINISH);
       if (result == START_THREAD_SUCCEEDED || result == START_THREAD_WAIT_DOWNLOAD_CANCELLATION) {
         setState(STATE_DOWNLOADING);
@@ -753,6 +730,22 @@ public final class DownloadManager {
       }
     }
 
+    private DownloadAction getAction() {
+      Assertions.checkState(state != STATE_REMOVED);
+      if (state == STATE_REMOVING || state == STATE_RESTARTING) {
+        return DownloadAction.createRemoveAction(
+            downloadState.type, downloadState.uri, downloadState.cacheKey);
+      }
+      return getDownloadAction(downloadState);
+    }
+
+    private void addActions(List<DownloadAction> actions) {
+      actions.add(getAction());
+      if (state == STATE_RESTARTING) {
+        actions.add(getDownloadAction(downloadState));
+      }
+    }
+
     private void setState(@DownloadState.State int newState) {
       if (state != newState) {
         state = newState;
@@ -761,29 +754,32 @@ public final class DownloadManager {
     }
 
     private void onDownloadThreadStopped(boolean isCanceled, @Nullable Throwable error) {
-      failureReason = FAILURE_REASON_NONE;
+      if (isIdle()) {
+        return;
+      }
       if (isCanceled) {
-        if (!isIdle()) {
-          downloadManager.startDownloadThread(this, actionQueue.peek());
-        }
-        return;
-      }
-      if (error != null && state == STATE_DOWNLOADING) {
-        failureReason = FAILURE_REASON_UNKNOWN;
-        setState(STATE_FAILED);
-        return;
-      }
-      if (actionQueue.size() == 1) {
-        if (state == STATE_REMOVING) {
-          setState(STATE_REMOVED);
+        downloadManager.startDownloadThread(this, getAction());
+      } else if (state == STATE_RESTARTING) {
+        initialize(STATE_QUEUED);
+      } else if (state == STATE_REMOVING) {
+        setState(STATE_REMOVED);
+      } else { // STATE_DOWNLOADING
+        if (error != null) {
+          failureReason = FAILURE_REASON_UNKNOWN;
+          setState(STATE_FAILED);
         } else {
-          Assertions.checkState(state == STATE_DOWNLOADING);
           setState(STATE_COMPLETED);
         }
-        return;
       }
-      actionQueue.remove();
-      initialize();
+    }
+
+    private static DownloadAction getDownloadAction(DownloadState downloadState) {
+      return DownloadAction.createDownloadAction(
+          downloadState.type,
+          downloadState.uri,
+          Arrays.asList(downloadState.streamKeys),
+          downloadState.cacheKey,
+          downloadState.customMetadata);
     }
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
index b32288fa3f..5bf3496def 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
@@ -247,7 +247,7 @@ public final class DownloadState {
         type,
         action.uri,
         action.customCacheKey,
-        getNextState(action, state),
+        getNextState(state, action.isRemoveAction),
         /* downloadPercentage= */ C.PERCENTAGE_UNSET,
         downloadedBytes,
         /* totalBytes= */ C.LENGTH_UNSET,
@@ -256,25 +256,25 @@ public final class DownloadState {
         notMetRequirements,
         manualStopReason,
         startTimeMs,
-        updateTimeMs,
+        /* updateTimeMs= */ System.currentTimeMillis(),
         mergeStreamKeys(this, action),
         action.data);
   }
 
-  private static int getNextState(DownloadAction action, int currentState) {
-    int newState;
-    if (action.isRemoveAction) {
-      newState = STATE_REMOVING;
+  private static int getNextState(int currentState, boolean remove) {
+    int nextState;
+    if (remove) {
+      nextState = STATE_REMOVING;
     } else {
       if (currentState == STATE_REMOVING || currentState == STATE_RESTARTING) {
-        newState = STATE_RESTARTING;
+        nextState = STATE_RESTARTING;
       } else if (currentState == STATE_STOPPED) {
-        newState = STATE_STOPPED;
+        nextState = STATE_STOPPED;
       } else {
-        newState = STATE_QUEUED;
+        nextState = STATE_QUEUED;
       }
     }
-    return newState;
+    return nextState;
   }
 
   private static StreamKey[] mergeStreamKeys(DownloadState downloadState, DownloadAction action) {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
index 9d057e0f56..96aa4e4509 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
@@ -66,38 +66,38 @@ public class DownloadActionTest {
   }
 
   @Test
-  public void testSameUri_IsSameMedia() {
+  public void testSameUri_hasSameId() {
     DownloadAction action1 = createDownloadAction(uri1);
     DownloadAction action2 = createDownloadAction(uri1);
-    assertThat(action1.isSameMedia(action2)).isTrue();
+    assertThat(action1.id.equals(action2.id)).isTrue();
   }
 
   @Test
-  public void testSameUriDifferentAction_IsSameMedia() {
+  public void testSameUriDifferentAction_hasSameId() {
     DownloadAction action1 = createDownloadAction(uri1);
     DownloadAction action2 = createRemoveAction(uri1);
-    assertThat(action1.isSameMedia(action2)).isTrue();
+    assertThat(action1.id.equals(action2.id)).isTrue();
   }
 
   @Test
   public void testDifferentUri_IsNotSameMedia() {
     DownloadAction action1 = createDownloadAction(uri1);
     DownloadAction action2 = createDownloadAction(uri2);
-    assertThat(action1.isSameMedia(action2)).isFalse();
+    assertThat(action1.id.equals(action2.id)).isFalse();
   }
 
   @Test
-  public void testSameCacheKeyDifferentUri_IsSameMedia() {
+  public void testSameCacheKeyDifferentUri_hasSameId() {
     DownloadAction action1 = DownloadAction.createRemoveAction(TYPE_DASH, uri1, "key123");
     DownloadAction action2 = DownloadAction.createRemoveAction(TYPE_DASH, uri2, "key123");
-    assertThat(action1.isSameMedia(action2)).isTrue();
+    assertThat(action1.id.equals(action2.id)).isTrue();
   }
 
   @Test
-  public void testDifferentCacheDifferentUri_IsNotSameMedia() {
+  public void testDifferentCacheKeyDifferentUri_hasDifferentId() {
     DownloadAction action1 = DownloadAction.createRemoveAction(TYPE_DASH, uri1, "key123");
     DownloadAction action2 = DownloadAction.createRemoveAction(TYPE_DASH, uri2, "key456");
-    assertThat(action1.isSameMedia(action2)).isFalse();
+    assertThat(action1.id.equals(action2.id)).isFalse();
   }
 
   @SuppressWarnings("EqualsWithItself")
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionUtilTest.java
deleted file mode 100644
index a494057a05..0000000000
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionUtilTest.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.offline;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.fail;
-
-import android.net.Uri;
-import java.util.ArrayDeque;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-/** Tests for {@link DownloadActionUtil} class. */
-@RunWith(RobolectricTestRunner.class)
-public class DownloadActionUtilTest {
-  private Uri uri1;
-  private Uri uri2;
-
-  @Before
-  public void setUp() throws Exception {
-    uri1 = Uri.parse("http://abc.com/media1");
-    uri2 = Uri.parse("http://abc.com/media2");
-  }
-
-  @Test
-  public void mergeActions_ifQueueEmpty_throwsException() {
-    try {
-      DownloadActionUtil.mergeActions(toActionQueue());
-      fail();
-    } catch (Exception e) {
-      // Expected.
-    }
-  }
-
-  @Test
-  public void mergeActions_ifOneActionInQueue_returnsTheSameAction() {
-    DownloadAction action = createDownloadAction(uri1);
-
-    assertThat(DownloadActionUtil.mergeActions(toActionQueue(action))).isEqualTo(action);
-  }
-
-  @Test
-  public void mergeActions_ifActionsHaveDifferentType_throwsException() {
-    DownloadAction downloadAction1 =
-        DownloadAction.createDownloadAction(
-            DownloadAction.TYPE_PROGRESSIVE,
-            uri1,
-            Collections.emptyList(),
-            /* customCacheKey= */ null,
-            /* data= */ null);
-    DownloadAction downloadAction2 =
-        DownloadAction.createDownloadAction(
-            DownloadAction.TYPE_DASH,
-            uri1,
-            Collections.emptyList(),
-            /* customCacheKey= */ null,
-            /* data= */ null);
-    ArrayDeque<DownloadAction> actionQueue = toActionQueue(downloadAction1, downloadAction2);
-
-    try {
-      DownloadActionUtil.mergeActions(actionQueue);
-      fail();
-    } catch (Exception e) {
-      // Expected.
-    }
-  }
-
-  @Test
-  public void mergeActions_ifActionsHaveDifferentCacheKeys_throwsException() {
-    DownloadAction downloadAction1 =
-        DownloadAction.createDownloadAction(
-            DownloadAction.TYPE_PROGRESSIVE,
-            uri1,
-            Collections.emptyList(),
-            /* customCacheKey= */ "cacheKey1",
-            /* data= */ null);
-    DownloadAction downloadAction2 =
-        DownloadAction.createDownloadAction(
-            DownloadAction.TYPE_PROGRESSIVE,
-            uri1,
-            Collections.emptyList(),
-            /* customCacheKey= */ "cacheKey2",
-            /* data= */ null);
-    ArrayDeque<DownloadAction> actionQueue = toActionQueue(downloadAction1, downloadAction2);
-
-    try {
-      DownloadActionUtil.mergeActions(actionQueue);
-      fail();
-    } catch (Exception e) {
-      // Expected.
-    }
-  }
-
-  @Test
-  public void mergeActions_nullCacheKeyAndDifferentUrl_throwsException() {
-    DownloadAction downloadAction1 =
-        DownloadAction.createDownloadAction(
-            DownloadAction.TYPE_PROGRESSIVE,
-            uri1,
-            Collections.emptyList(),
-            /* customCacheKey= */ null,
-            /* data= */ null);
-    DownloadAction downloadAction2 =
-        DownloadAction.createDownloadAction(
-            DownloadAction.TYPE_PROGRESSIVE,
-            uri2,
-            Collections.emptyList(),
-            /* customCacheKey= */ null,
-            /* data= */ null);
-    ArrayDeque<DownloadAction> actionQueue = toActionQueue(downloadAction1, downloadAction2);
-
-    try {
-      DownloadActionUtil.mergeActions(actionQueue);
-      fail();
-    } catch (Exception e) {
-      // Expected.
-    }
-  }
-
-  @Test
-  public void mergeActions_sameCacheKeyAndDifferentUrl_latterUrlUsed() {
-    DownloadAction downloadAction1 =
-        DownloadAction.createDownloadAction(
-            DownloadAction.TYPE_PROGRESSIVE,
-            uri1,
-            Collections.emptyList(),
-            /* customCacheKey= */ "cacheKey1",
-            /* data= */ null);
-    DownloadAction downloadAction2 =
-        DownloadAction.createDownloadAction(
-            DownloadAction.TYPE_PROGRESSIVE,
-            uri2,
-            Collections.emptyList(),
-            /* customCacheKey= */ "cacheKey1",
-            /* data= */ null);
-    ArrayDeque<DownloadAction> actionQueue = toActionQueue(downloadAction1, downloadAction2);
-
-    DownloadActionUtil.mergeActions(actionQueue);
-
-    DownloadAction mergedAction = DownloadActionUtil.mergeActions(actionQueue);
-
-    assertThat(mergedAction.uri).isEqualTo(uri2);
-  }
-
-  @Test
-  public void mergeActions_differentData_latterDataUsed() {
-    byte[] data1 = "data1".getBytes();
-    DownloadAction downloadAction1 =
-        DownloadAction.createDownloadAction(
-            DownloadAction.TYPE_PROGRESSIVE,
-            uri1,
-            Collections.emptyList(),
-            /* customCacheKey= */ null,
-            /* data= */ data1);
-    byte[] data2 = "data2".getBytes();
-    DownloadAction downloadAction2 =
-        DownloadAction.createDownloadAction(
-            DownloadAction.TYPE_PROGRESSIVE,
-            uri1,
-            Collections.emptyList(),
-            /* customCacheKey= */ null,
-            /* data= */ data2);
-    ArrayDeque<DownloadAction> actionQueue = toActionQueue(downloadAction1, downloadAction2);
-
-    DownloadActionUtil.mergeActions(actionQueue);
-
-    DownloadAction mergedAction = DownloadActionUtil.mergeActions(actionQueue);
-
-    assertThat(mergedAction.data).isEqualTo(data2);
-  }
-
-  @Test
-  public void mergeActions_ifRemoveActionLast_returnsRemoveAction() {
-    DownloadAction downloadAction = createDownloadAction(uri1);
-    DownloadAction removeAction = createRemoveAction(uri1);
-    ArrayDeque<DownloadAction> actionQueue = toActionQueue(downloadAction, removeAction);
-
-    DownloadAction action = DownloadActionUtil.mergeActions(actionQueue);
-
-    assertThat(action).isEqualTo(removeAction);
-    assertThat(actionQueue).containsExactly(removeAction);
-  }
-
-  @Test
-  public void mergeActions_downloadActionAfterRemove_returnsRemoveKeepsDownload() {
-    DownloadAction removeAction = createRemoveAction(uri1);
-    DownloadAction downloadAction = createDownloadAction(uri1);
-    ArrayDeque<DownloadAction> actionQueue = toActionQueue(removeAction, downloadAction);
-
-    DownloadAction action = DownloadActionUtil.mergeActions(actionQueue);
-
-    assertThat(action).isEqualTo(removeAction);
-    assertThat(actionQueue).containsExactly(removeAction, downloadAction);
-  }
-
-  @Test
-  public void mergeActions_downloadActionsAfterRemove_returnsRemoveMergesDownloads() {
-    DownloadAction removeAction = createRemoveAction(uri1);
-    StreamKey streamKey1 = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
-    DownloadAction downloadAction1 =
-        createDownloadAction(uri1, Collections.singletonList(streamKey1));
-    StreamKey streamKey2 = new StreamKey(/* groupIndex= */ 1, /* trackIndex= */ 1);
-    DownloadAction downloadAction2 =
-        createDownloadAction(uri1, Collections.singletonList(streamKey2));
-    ArrayDeque<DownloadAction> actionQueue =
-        toActionQueue(removeAction, downloadAction1, downloadAction2);
-    DownloadAction mergedDownloadAction =
-        createDownloadAction(uri1, Arrays.asList(streamKey1, streamKey2));
-
-    DownloadAction action = DownloadActionUtil.mergeActions(actionQueue);
-
-    assertThat(action).isEqualTo(removeAction);
-    assertThat(actionQueue).containsExactly(removeAction, mergedDownloadAction);
-  }
-
-  @Test
-  public void mergeActions_actionBeforeRemove_ignoresActionBeforeRemove() {
-    DownloadAction removeAction = createRemoveAction(uri1);
-    StreamKey streamKey1 = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
-    DownloadAction downloadAction1 =
-        createDownloadAction(uri1, Collections.singletonList(streamKey1));
-    StreamKey streamKey2 = new StreamKey(/* groupIndex= */ 1, /* trackIndex= */ 1);
-    DownloadAction downloadAction2 =
-        createDownloadAction(uri1, Collections.singletonList(streamKey2));
-    StreamKey streamKey3 = new StreamKey(/* groupIndex= */ 2, /* trackIndex= */ 2);
-    DownloadAction downloadAction3 =
-        createDownloadAction(uri1, Collections.singletonList(streamKey3));
-    ArrayDeque<DownloadAction> actionQueue =
-        toActionQueue(downloadAction1, removeAction, downloadAction2, downloadAction3);
-    DownloadAction mergedDownloadAction =
-        createDownloadAction(uri1, Arrays.asList(streamKey2, streamKey3));
-
-    DownloadAction action = DownloadActionUtil.mergeActions(actionQueue);
-
-    assertThat(action).isEqualTo(removeAction);
-    assertThat(actionQueue).containsExactly(removeAction, mergedDownloadAction);
-  }
-
-  @Test
-  public void mergeActions_returnsMergedAction() {
-    StreamKey streamKey1 = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
-    StreamKey streamKey2 = new StreamKey(/* groupIndex= */ 1, /* trackIndex= */ 1);
-    StreamKey[] keys1 = new StreamKey[] {streamKey1};
-    StreamKey[] keys2 = new StreamKey[] {streamKey2};
-    StreamKey[] expectedKeys = new StreamKey[] {streamKey1, streamKey2};
-
-    doTestMergeActionsReturnsMergedKeys(keys1, keys2, expectedKeys);
-  }
-
-  @Test
-  public void mergeActions_returnsUniqueKeys() {
-    StreamKey streamKey1 = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
-    StreamKey streamKey1Copy = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
-    StreamKey streamKey2 = new StreamKey(/* groupIndex= */ 1, /* trackIndex= */ 1);
-    StreamKey[] keys1 = new StreamKey[] {streamKey1};
-    StreamKey[] keys2 = new StreamKey[] {streamKey2, streamKey1Copy};
-    StreamKey[] expectedKeys = new StreamKey[] {streamKey1, streamKey2};
-
-    doTestMergeActionsReturnsMergedKeys(keys1, keys2, expectedKeys);
-  }
-
-  @Test
-  public void mergeActions_ifFirstActionKeysEmpty_returnsEmptyKeys() {
-    StreamKey streamKey1 = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
-    StreamKey streamKey2 = new StreamKey(/* groupIndex= */ 1, /* trackIndex= */ 1);
-    StreamKey[] keys1 = new StreamKey[] {};
-    StreamKey[] keys2 = new StreamKey[] {streamKey2, streamKey1};
-    StreamKey[] expectedKeys = new StreamKey[] {};
-
-    doTestMergeActionsReturnsMergedKeys(keys1, keys2, expectedKeys);
-  }
-
-  @Test
-  public void mergeActions_ifNotFirstActionKeysEmpty_returnsEmptyKeys() {
-    StreamKey streamKey1 = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
-    StreamKey streamKey2 = new StreamKey(/* groupIndex= */ 1, /* trackIndex= */ 1);
-    StreamKey[] keys1 = new StreamKey[] {streamKey2, streamKey1};
-    StreamKey[] keys2 = new StreamKey[] {};
-    StreamKey[] expectedKeys = new StreamKey[] {};
-
-    doTestMergeActionsReturnsMergedKeys(keys1, keys2, expectedKeys);
-  }
-
-  private void doTestMergeActionsReturnsMergedKeys(
-      StreamKey[] keys1, StreamKey[] keys2, StreamKey[] expectedKeys) {
-    DownloadAction action1 = createDownloadAction(uri1, Arrays.asList(keys1));
-    DownloadAction action2 = createDownloadAction(uri1, Arrays.asList(keys2));
-    ArrayDeque<DownloadAction> actionQueue = toActionQueue(action1, action2);
-
-    DownloadAction mergedAction = DownloadActionUtil.mergeActions(actionQueue);
-
-    assertThat(mergedAction.type).isEqualTo(action1.type);
-    assertThat(mergedAction.uri).isEqualTo(action1.uri);
-    assertThat(mergedAction.customCacheKey).isEqualTo(action1.customCacheKey);
-    assertThat(mergedAction.isRemoveAction).isEqualTo(action1.isRemoveAction);
-    assertThat(mergedAction.keys).containsExactly((Object[]) expectedKeys);
-    assertThat(actionQueue).containsExactly(mergedAction);
-  }
-
-  private ArrayDeque<DownloadAction> toActionQueue(DownloadAction... actions) {
-    return new ArrayDeque<>(Arrays.asList(actions));
-  }
-
-  private static DownloadAction createDownloadAction(Uri uri) {
-    return createDownloadAction(uri, Collections.emptyList());
-  }
-
-  private static DownloadAction createDownloadAction(Uri uri, List<StreamKey> keys) {
-    return DownloadAction.createDownloadAction(
-        DownloadAction.TYPE_PROGRESSIVE, uri, keys, /* customCacheKey= */ null, /* data= */ null);
-  }
-
-  private static DownloadAction createRemoveAction(Uri uri) {
-    return DownloadAction.createRemoveAction(
-        DownloadAction.TYPE_PROGRESSIVE, uri, /* customCacheKey= */ null);
-  }
-}
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index 98b21c6e22..a4e63a1c78 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -251,21 +251,6 @@ public class DownloadManagerTest {
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
-  @Test
-  public void secondSameDownloadActionIgnored() throws Throwable {
-    DownloadRunner runner = new DownloadRunner(uri1);
-    FakeDownloader downloader1 = runner.getDownloader(0);
-
-    runner.postDownloadAction();
-    downloader1.assertStarted();
-    runner.postDownloadAction();
-
-    downloader1.unblock().assertNotCanceled();
-    runner.getTask().assertCompleted();
-    runner.assertCreatedDownloaderCount(1);
-    downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
-  }
-
   @Test
   public void differentDownloadActionsMerged() throws Throwable {
     DownloadRunner runner = new DownloadRunner(uri1);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
index 982a6e8ef9..dcb0b443af 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
@@ -276,10 +276,16 @@ public class DownloadStateTest {
   }
 
   static void assertEqual(DownloadState downloadState, DownloadState expected) {
-    assertThat(areEqual(downloadState, expected)).isTrue();
+    assertEqual(downloadState, expected, false);
   }
 
-  private static boolean areEqual(DownloadState downloadState, DownloadState that) {
+  static void assertEqual(
+      DownloadState downloadState, DownloadState expected, boolean compareTimeFields) {
+    assertThat(areEqual(downloadState, expected, compareTimeFields)).isTrue();
+  }
+
+  private static boolean areEqual(
+      DownloadState downloadState, DownloadState that, boolean compareTimeFields) {
     if (downloadState.state != that.state) {
       return false;
     }
@@ -292,11 +298,13 @@ public class DownloadStateTest {
     if (downloadState.totalBytes != that.totalBytes) {
       return false;
     }
-    if (downloadState.startTimeMs != that.startTimeMs) {
-      return false;
-    }
-    if (downloadState.updateTimeMs != that.updateTimeMs) {
-      return false;
+    if (compareTimeFields) {
+      if (downloadState.startTimeMs != that.startTimeMs) {
+        return false;
+      }
+      if (downloadState.updateTimeMs != that.updateTimeMs) {
+        return false;
+      }
     }
     if (downloadState.failureReason != that.failureReason) {
       return false;

From c7788c18db53c34b425991e90c081204b2e051f0 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 12 Feb 2019 13:09:56 +0000
Subject: [PATCH 527/832] Fix / cleanup some layout in the Cast demo

PiperOrigin-RevId: 233587404
---
 .../android/exoplayer2/castdemo/MainActivity.java |  2 +-
 ..._message_layout.xml => cast_context_error.xml} | 13 +++----------
 demos/cast/src/main/res/layout/main_activity.xml  | 15 +++++++++++----
 demos/cast/src/main/res/layout/sample_list.xml    |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)
 rename demos/cast/src/main/res/layout/{cast_context_error_message_layout.xml => cast_context_error.xml} (77%)

diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
index 245acae28b..a69b32788d 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
@@ -76,7 +76,7 @@ public class MainActivity extends AppCompatActivity
       Throwable cause = e.getCause();
       while (cause != null) {
         if (cause instanceof DynamiteModule.LoadingException) {
-          setContentView(R.layout.cast_context_error_message_layout);
+          setContentView(R.layout.cast_context_error);
           return;
         }
         cause = cause.getCause();
diff --git a/demos/cast/src/main/res/layout/cast_context_error_message_layout.xml b/demos/cast/src/main/res/layout/cast_context_error.xml
similarity index 77%
rename from demos/cast/src/main/res/layout/cast_context_error_message_layout.xml
rename to demos/cast/src/main/res/layout/cast_context_error.xml
index 6d3260de38..0b3fdb63d2 100644
--- a/demos/cast/src/main/res/layout/cast_context_error_message_layout.xml
+++ b/demos/cast/src/main/res/layout/cast_context_error.xml
@@ -13,17 +13,10 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent">
-
-  <TextView
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/textView"
-    android:layout_width="0dp"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_weight="1"
-    android:textSize="20sp"
     android:gravity="center"
+    android:textSize="20sp"
     android:text="@string/cast_context_error"/>
-</LinearLayout>
diff --git a/demos/cast/src/main/res/layout/main_activity.xml b/demos/cast/src/main/res/layout/main_activity.xml
index 89b6b1868d..98efe2095e 100644
--- a/demos/cast/src/main/res/layout/main_activity.xml
+++ b/demos/cast/src/main/res/layout/main_activity.xml
@@ -19,20 +19,25 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:keepScreenOn="true">
+
   <com.google.android.exoplayer2.ui.PlayerView android:id="@+id/local_player_view"
       android:layout_width="match_parent"
       android:layout_height="0dp"
-      android:layout_weight="12"
+      android:layout_weight="1"
+      android:background="@android:color/black"
       app:repeat_toggle_modes="all|one"/>
+
   <RelativeLayout android:layout_width="match_parent"
       android:layout_height="0dp"
-      android:layout_weight="12">
+      android:layout_weight="1">
+
     <android.support.v7.widget.RecyclerView android:id="@+id/sample_list"
         android:choiceMode="singleChoice"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbars="vertical"
         android:fadeScrollbars="false"/>
+
     <ImageButton android:id="@+id/add_sample_button"
         android:background="@drawable/ic_add_circle_white_24dp"
         android:layout_width="wrap_content"
@@ -42,12 +47,14 @@
         android:layout_alignParentBottom="true"
         android:padding="30dp"
         android:contentDescription="@string/add_samples"/>
+
   </RelativeLayout>
+
   <com.google.android.exoplayer2.ui.PlayerControlView android:id="@+id/cast_control_view"
       android:layout_width="match_parent"
-      android:layout_height="0dp"
-      android:layout_weight="2"
+      android:layout_height="wrap_content"
       android:visibility="gone"
       app:repeat_toggle_modes="all|one"
       app:show_timeout="-1"/>
+
 </LinearLayout>
diff --git a/demos/cast/src/main/res/layout/sample_list.xml b/demos/cast/src/main/res/layout/sample_list.xml
index 910db9e058..183c74eb3a 100644
--- a/demos/cast/src/main/res/layout/sample_list.xml
+++ b/demos/cast/src/main/res/layout/sample_list.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
   <ListView android:id="@+id/sample_list"

From f299a65a335bd703c74d3d3f40e5afd5a17c41ac Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 12 Feb 2019 14:18:05 +0000
Subject: [PATCH 528/832] Fix proguard for external cast extension, disable for
 internal

PiperOrigin-RevId: 233594542
---
 extensions/cast/build.gradle       |  1 -
 extensions/cast/proguard-rules.txt | 10 ----------
 2 files changed, 11 deletions(-)
 delete mode 100644 extensions/cast/proguard-rules.txt

diff --git a/extensions/cast/build.gradle b/extensions/cast/build.gradle
index 0fee4dfda2..2bfd037fbc 100644
--- a/extensions/cast/build.gradle
+++ b/extensions/cast/build.gradle
@@ -25,7 +25,6 @@ android {
     defaultConfig {
         minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
-        consumerProguardFiles 'proguard-rules.txt'
     }
 }
 
diff --git a/extensions/cast/proguard-rules.txt b/extensions/cast/proguard-rules.txt
deleted file mode 100644
index 1271382629..0000000000
--- a/extensions/cast/proguard-rules.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Proguard rules specific to the Cast extension.
-
-# DefaultCastOptionsProvider is commonly referred to only by the app's manifest.
--keep class com.google.android.exoplayer2.ext.cast.DefaultCastOptionsProvider
-
-# ExoCastOptionsProvider is commonly referred to only by the app's manifest.
--keep class com.google.android.exoplayer2.ext.cast.ExoCastOptionsProvider
-
-# Don't warn about gms
--dontwarn com.google.android.gms.**

From edabbd52d0eeaf7c5c28b1a9a34688cec80aa512 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 12 Feb 2019 16:36:03 +0000
Subject: [PATCH 529/832] Update Robolectric and Truth.

PiperOrigin-RevId: 233612344
---
 constants.gradle                              |   4 +-
 extensions/cast/build.gradle                  |   2 +
 .../src/test/resources/robolectric.properties |   1 -
 extensions/cronet/build.gradle                |   2 +
 .../src/test/resources/robolectric.properties |   1 -
 extensions/ffmpeg/build.gradle                |   2 +
 .../src/test/resources/robolectric.properties |   1 -
 extensions/flac/build.gradle                  |   2 +
 .../src/test/resources/robolectric.properties |   1 -
 extensions/gvr/build.gradle                   |   2 +
 extensions/ima/build.gradle                   |   2 +
 .../src/test/resources/robolectric.properties |   1 -
 extensions/jobdispatcher/build.gradle         |   2 +
 extensions/leanback/build.gradle              |   2 +
 extensions/mediasession/build.gradle          |   2 +
 extensions/okhttp/build.gradle                |   2 +
 extensions/opus/build.gradle                  |   2 +
 .../src/test/resources/robolectric.properties |   1 -
 extensions/rtmp/build.gradle                  |   2 +
 extensions/vp9/build.gradle                   |   2 +
 .../src/test/resources/robolectric.properties |   1 -
 gradle.properties                             |   1 +
 library/core/build.gradle                     |   2 +
 .../exoplayer2/audio/AudioFocusManager.java   |   6 +
 .../android/exoplayer2/ExoPlayerTest.java     |   5 +-
 .../audio/AudioFocusManagerTest.java          | 132 ++++++++++++++++--
 .../src/test/resources/robolectric.properties |   1 -
 library/dash/build.gradle                     |   2 +
 .../src/test/resources/robolectric.properties |   1 -
 library/hls/build.gradle                      |   2 +
 .../src/test/resources/robolectric.properties |   1 -
 library/smoothstreaming/build.gradle          |   2 +
 .../src/test/resources/robolectric.properties |   1 -
 library/ui/build.gradle                       |   2 +
 .../src/test/resources/robolectric.properties |   1 -
 playbacktests/build.gradle                    |   2 +
 testutils/build.gradle                        |   2 +
 .../src/test/resources/robolectric.properties |   1 -
 testutils_robolectric/build.gradle            |   2 +
 .../exoplayer2/testutil/RobolectricUtil.java  |   6 +-
 40 files changed, 176 insertions(+), 33 deletions(-)
 delete mode 100644 extensions/cast/src/test/resources/robolectric.properties
 delete mode 100644 extensions/cronet/src/test/resources/robolectric.properties
 delete mode 100644 extensions/ffmpeg/src/test/resources/robolectric.properties
 delete mode 100644 extensions/flac/src/test/resources/robolectric.properties
 delete mode 100644 extensions/ima/src/test/resources/robolectric.properties
 delete mode 100644 extensions/opus/src/test/resources/robolectric.properties
 delete mode 100644 extensions/vp9/src/test/resources/robolectric.properties
 delete mode 100644 library/core/src/test/resources/robolectric.properties
 delete mode 100644 library/dash/src/test/resources/robolectric.properties
 delete mode 100644 library/hls/src/test/resources/robolectric.properties
 delete mode 100644 library/smoothstreaming/src/test/resources/robolectric.properties
 delete mode 100644 library/ui/src/test/resources/robolectric.properties
 delete mode 100644 testutils/src/test/resources/robolectric.properties

diff --git a/constants.gradle b/constants.gradle
index 84158f00f6..ab3d097fbc 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -23,8 +23,8 @@ project.ext {
     dexmakerVersion = '1.2'
     mockitoVersion = '1.9.5'
     junitVersion = '4.12'
-    truthVersion = '0.39'
-    robolectricVersion = '3.7.1'
+    truthVersion = '0.42'
+    robolectricVersion = '4.1'
     autoValueVersion = '1.6'
     checkerframeworkVersion = '2.5.0'
     testRunnerVersion = '1.1.0-alpha3'
diff --git a/extensions/cast/build.gradle b/extensions/cast/build.gradle
index 2bfd037fbc..cc7709e2dc 100644
--- a/extensions/cast/build.gradle
+++ b/extensions/cast/build.gradle
@@ -26,6 +26,8 @@ android {
         minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
     }
+
+    testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
diff --git a/extensions/cast/src/test/resources/robolectric.properties b/extensions/cast/src/test/resources/robolectric.properties
deleted file mode 100644
index 2f3210368e..0000000000
--- a/extensions/cast/src/test/resources/robolectric.properties
+++ /dev/null
@@ -1 +0,0 @@
-manifest=src/test/AndroidManifest.xml
diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle
index f1adc9b6ce..c2654267e6 100644
--- a/extensions/cronet/build.gradle
+++ b/extensions/cronet/build.gradle
@@ -26,6 +26,8 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
diff --git a/extensions/cronet/src/test/resources/robolectric.properties b/extensions/cronet/src/test/resources/robolectric.properties
deleted file mode 100644
index 2f3210368e..0000000000
--- a/extensions/cronet/src/test/resources/robolectric.properties
+++ /dev/null
@@ -1 +0,0 @@
-manifest=src/test/AndroidManifest.xml
diff --git a/extensions/ffmpeg/build.gradle b/extensions/ffmpeg/build.gradle
index 2c2499759d..7147cc7cb7 100644
--- a/extensions/ffmpeg/build.gradle
+++ b/extensions/ffmpeg/build.gradle
@@ -32,6 +32,8 @@ android {
         jniLibs.srcDir 'src/main/libs'
         jni.srcDirs = [] // Disable the automatic ndk-build call by Android Studio.
     }
+
+    testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
diff --git a/extensions/ffmpeg/src/test/resources/robolectric.properties b/extensions/ffmpeg/src/test/resources/robolectric.properties
deleted file mode 100644
index 2f3210368e..0000000000
--- a/extensions/ffmpeg/src/test/resources/robolectric.properties
+++ /dev/null
@@ -1 +0,0 @@
-manifest=src/test/AndroidManifest.xml
diff --git a/extensions/flac/build.gradle b/extensions/flac/build.gradle
index 41148bbc7d..fbc919a4c4 100644
--- a/extensions/flac/build.gradle
+++ b/extensions/flac/build.gradle
@@ -33,6 +33,8 @@ android {
         jniLibs.srcDir 'src/main/libs'
         jni.srcDirs = [] // Disable the automatic ndk-build call by Android Studio.
     }
+
+    testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
diff --git a/extensions/flac/src/test/resources/robolectric.properties b/extensions/flac/src/test/resources/robolectric.properties
deleted file mode 100644
index 2f3210368e..0000000000
--- a/extensions/flac/src/test/resources/robolectric.properties
+++ /dev/null
@@ -1 +0,0 @@
-manifest=src/test/AndroidManifest.xml
diff --git a/extensions/gvr/build.gradle b/extensions/gvr/build.gradle
index 44200e9259..7d8184939d 100644
--- a/extensions/gvr/build.gradle
+++ b/extensions/gvr/build.gradle
@@ -26,6 +26,8 @@ android {
         minSdkVersion 19
         targetSdkVersion project.ext.targetSdkVersion
     }
+
+    testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle
index fa263dd53a..85a9ed1603 100644
--- a/extensions/ima/build.gradle
+++ b/extensions/ima/build.gradle
@@ -27,6 +27,8 @@ android {
         targetSdkVersion project.ext.targetSdkVersion
         consumerProguardFiles 'proguard-rules.txt'
     }
+
+    testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
diff --git a/extensions/ima/src/test/resources/robolectric.properties b/extensions/ima/src/test/resources/robolectric.properties
deleted file mode 100644
index 2f3210368e..0000000000
--- a/extensions/ima/src/test/resources/robolectric.properties
+++ /dev/null
@@ -1 +0,0 @@
-manifest=src/test/AndroidManifest.xml
diff --git a/extensions/jobdispatcher/build.gradle b/extensions/jobdispatcher/build.gradle
index b601e013c2..d7f19d2545 100644
--- a/extensions/jobdispatcher/build.gradle
+++ b/extensions/jobdispatcher/build.gradle
@@ -28,6 +28,8 @@ android {
         minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
     }
+
+    testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
diff --git a/extensions/leanback/build.gradle b/extensions/leanback/build.gradle
index e63ce8aae1..d276fc0f8a 100644
--- a/extensions/leanback/build.gradle
+++ b/extensions/leanback/build.gradle
@@ -26,6 +26,8 @@ android {
         minSdkVersion 17
         targetSdkVersion project.ext.targetSdkVersion
     }
+
+    testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
diff --git a/extensions/mediasession/build.gradle b/extensions/mediasession/build.gradle
index 29544c4759..30e5454772 100644
--- a/extensions/mediasession/build.gradle
+++ b/extensions/mediasession/build.gradle
@@ -26,6 +26,8 @@ android {
         minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
     }
+
+    testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle
index 172fa175b5..9c24c489e2 100644
--- a/extensions/okhttp/build.gradle
+++ b/extensions/okhttp/build.gradle
@@ -27,6 +27,8 @@ android {
         targetSdkVersion project.ext.targetSdkVersion
         consumerProguardFiles 'proguard-rules.txt'
     }
+
+    testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
diff --git a/extensions/opus/build.gradle b/extensions/opus/build.gradle
index 212c985157..0f8669ae9b 100644
--- a/extensions/opus/build.gradle
+++ b/extensions/opus/build.gradle
@@ -33,6 +33,8 @@ android {
         jniLibs.srcDir 'src/main/libs'
         jni.srcDirs = [] // Disable the automatic ndk-build call by Android Studio.
     }
+
+    testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
diff --git a/extensions/opus/src/test/resources/robolectric.properties b/extensions/opus/src/test/resources/robolectric.properties
deleted file mode 100644
index 2f3210368e..0000000000
--- a/extensions/opus/src/test/resources/robolectric.properties
+++ /dev/null
@@ -1 +0,0 @@
-manifest=src/test/AndroidManifest.xml
diff --git a/extensions/rtmp/build.gradle b/extensions/rtmp/build.gradle
index 5d8f864594..cf03ca14b7 100644
--- a/extensions/rtmp/build.gradle
+++ b/extensions/rtmp/build.gradle
@@ -26,6 +26,8 @@ android {
         minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
     }
+
+    testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
diff --git a/extensions/vp9/build.gradle b/extensions/vp9/build.gradle
index f6702e28bb..9e5f15375a 100644
--- a/extensions/vp9/build.gradle
+++ b/extensions/vp9/build.gradle
@@ -33,6 +33,8 @@ android {
         jniLibs.srcDir 'src/main/libs'
         jni.srcDirs = [] // Disable the automatic ndk-build call by Android Studio.
     }
+
+    testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
diff --git a/extensions/vp9/src/test/resources/robolectric.properties b/extensions/vp9/src/test/resources/robolectric.properties
deleted file mode 100644
index 2f3210368e..0000000000
--- a/extensions/vp9/src/test/resources/robolectric.properties
+++ /dev/null
@@ -1 +0,0 @@
-manifest=src/test/AndroidManifest.xml
diff --git a/gradle.properties b/gradle.properties
index b55575bc3b..b1758d4cea 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,4 @@
 ## Project-wide Gradle settings.
 android.useDeprecatedNdk=true
+android.enableUnitTestBinaryResources=true
 buildDir=buildout
diff --git a/library/core/build.gradle b/library/core/build.gradle
index e143d58ca9..86879743a1 100644
--- a/library/core/build.gradle
+++ b/library/core/build.gradle
@@ -53,6 +53,8 @@ android {
         //    testCoverageEnabled = true
         // }
     }
+
+    testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java
index c20ede439f..461849f1e2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java
@@ -21,6 +21,7 @@ import android.media.AudioManager;
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
+import android.support.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Player;
@@ -195,6 +196,11 @@ public final class AudioFocusManager {
 
   // Internal methods.
 
+  @VisibleForTesting
+  /* package */ AudioManager.OnAudioFocusChangeListener getFocusListener() {
+    return focusListener;
+  }
+
   @PlayerCommand
   private int handleIdle(boolean playWhenReady) {
     return playWhenReady ? PLAYER_COMMAND_PLAY_WHEN_READY : PLAYER_COMMAND_DO_NOT_PLAY;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
index 7f01c02b49..960574d30e 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
@@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import android.content.Context;
+import android.graphics.SurfaceTexture;
 import android.support.annotation.Nullable;
 import android.view.Surface;
 import com.google.android.exoplayer2.Player.DiscontinuityReason;
@@ -2593,8 +2594,8 @@ public final class ExoPlayerTest {
   // Internal methods.
 
   private static ActionSchedule.Builder addSurfaceSwitch(ActionSchedule.Builder builder) {
-    final Surface surface1 = new Surface(null);
-    final Surface surface2 = new Surface(null);
+    final Surface surface1 = new Surface(new SurfaceTexture(/* texName= */ 0));
+    final Surface surface2 = new Surface(new SurfaceTexture(/* texName= */ 1));
     return builder
         .executeRunnable(
             new PlayerRunnable() {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/audio/AudioFocusManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/audio/AudioFocusManagerTest.java
index 086c4ebc7f..30d57af4be 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/audio/AudioFocusManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/audio/AudioFocusManagerTest.java
@@ -22,15 +22,18 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import android.content.Context;
+import android.media.AudioFocusRequest;
 import android.media.AudioManager;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Player;
+import com.google.android.exoplayer2.util.Util;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowAudioManager;
 
 /** Unit tests for {@link AudioFocusManager}. */
@@ -69,6 +72,7 @@ public class AudioFocusManagerTest {
   }
 
   @Test
+  @Config(maxSdk = 25)
   public void setAudioAttributes_withNullUsage_releasesAudioFocus() {
     // Create attributes and request audio focus.
     AudioAttributes media = new AudioAttributes.Builder().setUsage(C.USAGE_MEDIA).build();
@@ -92,6 +96,31 @@ public class AudioFocusManagerTest {
     assertThat(lastRequest).isNotNull();
   }
 
+  @Test
+  @Config(minSdk = 26)
+  public void setAudioAttributes_withNullUsage_releasesAudioFocus_v26() {
+    // Create attributes and request audio focus.
+    AudioAttributes media = new AudioAttributes.Builder().setUsage(C.USAGE_MEDIA).build();
+    Shadows.shadowOf(audioManager)
+        .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
+    assertThat(
+            audioFocusManager.setAudioAttributes(
+                media, /* playWhenReady= */ true, Player.STATE_READY))
+        .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
+    ShadowAudioManager.AudioFocusRequest request =
+        Shadows.shadowOf(audioManager).getLastAudioFocusRequest();
+    assertThat(getAudioFocusGainFromRequest(request)).isEqualTo(AudioManager.AUDIOFOCUS_GAIN);
+
+    // Ensure that setting null audio attributes with audio focus releases audio focus.
+    assertThat(
+            audioFocusManager.setAudioAttributes(
+                /* audioAttributes= */ null, /* playWhenReady= */ true, Player.STATE_READY))
+        .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
+    AudioFocusRequest lastRequest =
+        Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusRequest();
+    assertThat(lastRequest).isNotNull();
+  }
+
   @Test
   public void setAudioAttributes_withUsageAlarm_throwsIllegalArgumentException() {
     // Ensure that audio attributes that map to AUDIOFOCUS_GAIN_TRANSIENT* throw
@@ -117,7 +146,7 @@ public class AudioFocusManagerTest {
         .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
     ShadowAudioManager.AudioFocusRequest request =
         Shadows.shadowOf(audioManager).getLastAudioFocusRequest();
-    assertThat(request.durationHint).isEqualTo(AudioManager.AUDIOFOCUS_GAIN);
+    assertThat(getAudioFocusGainFromRequest(request)).isEqualTo(AudioManager.AUDIOFOCUS_GAIN);
   }
 
   @Test
@@ -133,7 +162,7 @@ public class AudioFocusManagerTest {
         .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
     ShadowAudioManager.AudioFocusRequest request =
         Shadows.shadowOf(audioManager).getLastAudioFocusRequest();
-    assertThat(request.durationHint).isEqualTo(AudioManager.AUDIOFOCUS_GAIN);
+    assertThat(getAudioFocusGainFromRequest(request)).isEqualTo(AudioManager.AUDIOFOCUS_GAIN);
   }
 
   @Test
@@ -189,12 +218,12 @@ public class AudioFocusManagerTest {
                 media, /* playWhenReady= */ true, Player.STATE_READY))
         .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
 
-    ShadowAudioManager.AudioFocusRequest request =
-        Shadows.shadowOf(audioManager).getLastAudioFocusRequest();
-    request.listener.onAudioFocusChange(AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK);
+    audioFocusManager
+        .getFocusListener()
+        .onAudioFocusChange(AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK);
     assertThat(testPlayerControl.lastVolumeMultiplier).isLessThan(1.0f);
     assertThat(testPlayerControl.lastPlayerCommand).isEqualTo(NO_COMMAND_RECEIVED);
-    request.listener.onAudioFocusChange(AudioManager.AUDIOFOCUS_GAIN);
+    audioFocusManager.getFocusListener().onAudioFocusChange(AudioManager.AUDIOFOCUS_GAIN);
     assertThat(testPlayerControl.lastVolumeMultiplier).isEqualTo(1.0f);
   }
 
@@ -215,12 +244,12 @@ public class AudioFocusManagerTest {
                 media, /* playWhenReady= */ true, Player.STATE_READY))
         .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
 
-    ShadowAudioManager.AudioFocusRequest request =
-        Shadows.shadowOf(audioManager).getLastAudioFocusRequest();
-    request.listener.onAudioFocusChange(AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK);
+    audioFocusManager
+        .getFocusListener()
+        .onAudioFocusChange(AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK);
     assertThat(testPlayerControl.lastPlayerCommand).isEqualTo(PLAYER_COMMAND_WAIT_FOR_CALLBACK);
     assertThat(testPlayerControl.lastVolumeMultiplier).isEqualTo(1.0f);
-    request.listener.onAudioFocusChange(AudioManager.AUDIOFOCUS_GAIN);
+    audioFocusManager.getFocusListener().onAudioFocusChange(AudioManager.AUDIOFOCUS_GAIN);
     assertThat(testPlayerControl.lastPlayerCommand).isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
   }
 
@@ -237,14 +266,13 @@ public class AudioFocusManagerTest {
                 media, /* playWhenReady= */ true, Player.STATE_READY))
         .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
 
-    ShadowAudioManager.AudioFocusRequest request =
-        Shadows.shadowOf(audioManager).getLastAudioFocusRequest();
-    request.listener.onAudioFocusChange(AudioManager.AUDIOFOCUS_LOSS_TRANSIENT);
+    audioFocusManager.getFocusListener().onAudioFocusChange(AudioManager.AUDIOFOCUS_LOSS_TRANSIENT);
     assertThat(testPlayerControl.lastVolumeMultiplier).isEqualTo(1.0f);
     assertThat(testPlayerControl.lastPlayerCommand).isEqualTo(PLAYER_COMMAND_WAIT_FOR_CALLBACK);
   }
 
   @Test
+  @Config(maxSdk = 25)
   public void onAudioFocusChange_withAudioFocusLost_sendsDoNotPlayAndAbandondsFocus() {
     // Ensure that AUDIOFOCUS_LOSS causes AudioFocusManager to pause playback and abandon audio
     // focus.
@@ -271,6 +299,32 @@ public class AudioFocusManagerTest {
   }
 
   @Test
+  @Config(minSdk = 26)
+  public void onAudioFocusChange_withAudioFocusLost_sendsDoNotPlayAndAbandondsFocus_v26() {
+    // Ensure that AUDIOFOCUS_LOSS causes AudioFocusManager to pause playback and abandon audio
+    // focus.
+    AudioAttributes media =
+        new AudioAttributes.Builder()
+            .setUsage(C.USAGE_MEDIA)
+            .setContentType(C.CONTENT_TYPE_SPEECH)
+            .build();
+
+    Shadows.shadowOf(audioManager)
+        .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
+    assertThat(
+            audioFocusManager.setAudioAttributes(
+                media, /* playWhenReady= */ true, Player.STATE_READY))
+        .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
+    assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusRequest()).isNull();
+
+    audioFocusManager.getFocusListener().onAudioFocusChange(AudioManager.AUDIOFOCUS_LOSS);
+    assertThat(testPlayerControl.lastPlayerCommand).isEqualTo(PLAYER_COMMAND_DO_NOT_PLAY);
+    assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusRequest())
+        .isEqualTo(Shadows.shadowOf(audioManager).getLastAudioFocusRequest().audioFocusRequest);
+  }
+
+  @Test
+  @Config(maxSdk = 25)
   public void handleStop_withAudioFocus_abandonsAudioFocus() {
     // Ensure that handleStop causes AudioFocusManager to abandon audio focus.
     AudioAttributes media =
@@ -295,6 +349,32 @@ public class AudioFocusManagerTest {
   }
 
   @Test
+  @Config(minSdk = 26)
+  public void handleStop_withAudioFocus_abandonsAudioFocus_v26() {
+    // Ensure that handleStop causes AudioFocusManager to abandon audio focus.
+    AudioAttributes media =
+        new AudioAttributes.Builder()
+            .setUsage(C.USAGE_MEDIA)
+            .setContentType(C.CONTENT_TYPE_SPEECH)
+            .build();
+
+    Shadows.shadowOf(audioManager)
+        .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
+    assertThat(
+            audioFocusManager.setAudioAttributes(
+                media, /* playWhenReady= */ true, Player.STATE_READY))
+        .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
+    assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusRequest()).isNull();
+
+    ShadowAudioManager.AudioFocusRequest request =
+        Shadows.shadowOf(audioManager).getLastAudioFocusRequest();
+    audioFocusManager.handleStop();
+    assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusRequest())
+        .isEqualTo(request.audioFocusRequest);
+  }
+
+  @Test
+  @Config(maxSdk = 25)
   public void handleStop_withoutAudioFocus_stillAbandonsFocus() {
     // Ensure that handleStop causes AudioFocusManager to call through to abandon audio focus
     // even if focus wasn't requested.
@@ -320,6 +400,7 @@ public class AudioFocusManagerTest {
   }
 
   @Test
+  @Config(maxSdk = 25)
   public void handleStop_withoutHandlingAudioFocus_isNoOp() {
     // Ensure that handleStop is a no-op if audio focus isn't handled.
     Shadows.shadowOf(audioManager)
@@ -337,6 +418,31 @@ public class AudioFocusManagerTest {
     assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusListener()).isNull();
   }
 
+  @Test
+  @Config(minSdk = 26)
+  public void handleStop_withoutHandlingAudioFocus_isNoOp_v26() {
+    // Ensure that handleStop is a no-op if audio focus isn't handled.
+    Shadows.shadowOf(audioManager)
+        .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
+    assertThat(
+            audioFocusManager.setAudioAttributes(
+                /* audioAttributes= */ null, /* playWhenReady= */ false, Player.STATE_READY))
+        .isEqualTo(PLAYER_COMMAND_DO_NOT_PLAY);
+    assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusRequest()).isNull();
+    ShadowAudioManager.AudioFocusRequest request =
+        Shadows.shadowOf(audioManager).getLastAudioFocusRequest();
+    assertThat(request).isNull();
+
+    audioFocusManager.handleStop();
+    assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusRequest()).isNull();
+  }
+
+  private int getAudioFocusGainFromRequest(ShadowAudioManager.AudioFocusRequest audioFocusRequest) {
+    return Util.SDK_INT >= 26
+        ? audioFocusRequest.audioFocusRequest.getFocusGain()
+        : audioFocusRequest.durationHint;
+  }
+
   private static class TestPlayerControl implements AudioFocusManager.PlayerControl {
     private float lastVolumeMultiplier = 1.0f;
     private int lastPlayerCommand = NO_COMMAND_RECEIVED;
diff --git a/library/core/src/test/resources/robolectric.properties b/library/core/src/test/resources/robolectric.properties
deleted file mode 100644
index 2f3210368e..0000000000
--- a/library/core/src/test/resources/robolectric.properties
+++ /dev/null
@@ -1 +0,0 @@
-manifest=src/test/AndroidManifest.xml
diff --git a/library/dash/build.gradle b/library/dash/build.gradle
index 2c21c6f577..319ca7f6e8 100644
--- a/library/dash/build.gradle
+++ b/library/dash/build.gradle
@@ -35,6 +35,8 @@ android {
         //    testCoverageEnabled = true
         // }
     }
+
+    testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
diff --git a/library/dash/src/test/resources/robolectric.properties b/library/dash/src/test/resources/robolectric.properties
deleted file mode 100644
index 2f3210368e..0000000000
--- a/library/dash/src/test/resources/robolectric.properties
+++ /dev/null
@@ -1 +0,0 @@
-manifest=src/test/AndroidManifest.xml
diff --git a/library/hls/build.gradle b/library/hls/build.gradle
index 165750b3b6..35a63d1d40 100644
--- a/library/hls/build.gradle
+++ b/library/hls/build.gradle
@@ -35,6 +35,8 @@ android {
         //    testCoverageEnabled = true
         // }
     }
+
+    testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
diff --git a/library/hls/src/test/resources/robolectric.properties b/library/hls/src/test/resources/robolectric.properties
deleted file mode 100644
index 2f3210368e..0000000000
--- a/library/hls/src/test/resources/robolectric.properties
+++ /dev/null
@@ -1 +0,0 @@
-manifest=src/test/AndroidManifest.xml
diff --git a/library/smoothstreaming/build.gradle b/library/smoothstreaming/build.gradle
index 4957d97c41..ae47e7fe52 100644
--- a/library/smoothstreaming/build.gradle
+++ b/library/smoothstreaming/build.gradle
@@ -35,6 +35,8 @@ android {
         //    testCoverageEnabled = true
         // }
     }
+
+    testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
diff --git a/library/smoothstreaming/src/test/resources/robolectric.properties b/library/smoothstreaming/src/test/resources/robolectric.properties
deleted file mode 100644
index 2f3210368e..0000000000
--- a/library/smoothstreaming/src/test/resources/robolectric.properties
+++ /dev/null
@@ -1 +0,0 @@
-manifest=src/test/AndroidManifest.xml
diff --git a/library/ui/build.gradle b/library/ui/build.gradle
index 8418d306ae..69e18e1a7d 100644
--- a/library/ui/build.gradle
+++ b/library/ui/build.gradle
@@ -34,6 +34,8 @@ android {
         //    testCoverageEnabled = true
         // }
     }
+
+    testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
diff --git a/library/ui/src/test/resources/robolectric.properties b/library/ui/src/test/resources/robolectric.properties
deleted file mode 100644
index 2f3210368e..0000000000
--- a/library/ui/src/test/resources/robolectric.properties
+++ /dev/null
@@ -1 +0,0 @@
-manifest=src/test/AndroidManifest.xml
diff --git a/playbacktests/build.gradle b/playbacktests/build.gradle
index f892def24b..7670cbb21a 100644
--- a/playbacktests/build.gradle
+++ b/playbacktests/build.gradle
@@ -27,6 +27,8 @@ android {
         targetSdkVersion project.ext.targetSdkVersion
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
+
+    testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
diff --git a/testutils/build.gradle b/testutils/build.gradle
index 4b7d9d9e48..cdf765c5e7 100644
--- a/testutils/build.gradle
+++ b/testutils/build.gradle
@@ -33,6 +33,8 @@ android {
         // See: https://github.com/junit-team/junit4/pull/1187.
         disable 'InvalidPackage'
     }
+
+    testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
diff --git a/testutils/src/test/resources/robolectric.properties b/testutils/src/test/resources/robolectric.properties
deleted file mode 100644
index 2f3210368e..0000000000
--- a/testutils/src/test/resources/robolectric.properties
+++ /dev/null
@@ -1 +0,0 @@
-manifest=src/test/AndroidManifest.xml
diff --git a/testutils_robolectric/build.gradle b/testutils_robolectric/build.gradle
index 35ccfeafc9..e6f20aa448 100644
--- a/testutils_robolectric/build.gradle
+++ b/testutils_robolectric/build.gradle
@@ -32,6 +32,8 @@ android {
         // which is not part of Android.
         disable 'InvalidPackage'
     }
+
+    testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/RobolectricUtil.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/RobolectricUtil.java
index 1e7f09bacf..1a9547d087 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/RobolectricUtil.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/RobolectricUtil.java
@@ -165,7 +165,7 @@ public final class RobolectricUtil {
     public boolean enqueueMessage(Message msg, long when) {
       Looper looper = ShadowLooper.getLooperForThread(looperThread);
       if (shadowOf(looper) instanceof CustomLooper
-          && shadowOf(looper) != ShadowLooper.getShadowMainLooper()) {
+          && shadowOf(looper) != shadowOf(Looper.getMainLooper())) {
         ((CustomLooper) shadowOf(looper)).addPendingMessage(msg, when);
       } else {
         super.enqueueMessage(msg, when);
@@ -177,7 +177,7 @@ public final class RobolectricUtil {
     public void removeMessages(Handler handler, int what, Object object) {
       Looper looper = ShadowLooper.getLooperForThread(looperThread);
       if (shadowOf(looper) instanceof CustomLooper
-          && shadowOf(looper) != ShadowLooper.getShadowMainLooper()) {
+          && shadowOf(looper) != shadowOf(Looper.getMainLooper())) {
         ((CustomLooper) shadowOf(looper)).removeMessages(handler, what, object);
       }
     }
@@ -186,7 +186,7 @@ public final class RobolectricUtil {
     public void removeCallbacksAndMessages(Handler handler, Object object) {
       Looper looper = ShadowLooper.getLooperForThread(looperThread);
       if (shadowOf(looper) instanceof CustomLooper
-          && shadowOf(looper) != ShadowLooper.getShadowMainLooper()) {
+          && shadowOf(looper) != shadowOf(Looper.getMainLooper())) {
         ((CustomLooper) shadowOf(looper)).removeMessages(handler, ANY_MESSAGE, object);
       }
     }

From d6b60637986430620536c70bd65bbd848cd08e9f Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 12 Feb 2019 20:10:27 +0000
Subject: [PATCH 530/832] Allow specifying number of decoding threads to libvpx
 library.

PiperOrigin-RevId: 233653857
---
 .../ext/vp9/LibvpxVideoRenderer.java          | 45 ++++++++++++++++++-
 .../exoplayer2/ext/vp9/VpxDecoder.java        |  8 ++--
 extensions/vp9/src/main/jni/vpx_jni.cc        |  4 +-
 3 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
index 54ccbb40ad..7dda5d4200 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
@@ -15,6 +15,8 @@
  */
 package com.google.android.exoplayer2.ext.vp9;
 
+import static java.lang.Runtime.getRuntime;
+
 import android.os.Handler;
 import android.os.Looper;
 import android.os.SystemClock;
@@ -116,6 +118,7 @@ public class LibvpxVideoRenderer extends BaseRenderer {
   private final TimedValueQueue<Format> formatQueue;
   private final DecoderInputBuffer flagsOnlyBuffer;
   private final DrmSessionManager<ExoMediaCrypto> drmSessionManager;
+  private final int threads;
 
   private Format format;
   private Format pendingFormat;
@@ -209,12 +212,51 @@ public class LibvpxVideoRenderer extends BaseRenderer {
       DrmSessionManager<ExoMediaCrypto> drmSessionManager,
       boolean playClearSamplesWithoutKeys,
       boolean disableLoopFilter) {
+    this(
+        allowedJoiningTimeMs,
+        eventHandler,
+        eventListener,
+        maxDroppedFramesToNotify,
+        drmSessionManager,
+        playClearSamplesWithoutKeys,
+        disableLoopFilter,
+        getRuntime().availableProcessors());
+  }
+
+  /**
+   * @param allowedJoiningTimeMs The maximum duration in milliseconds for which this video renderer
+   *     can attempt to seamlessly join an ongoing playback.
+   * @param eventHandler A handler to use when delivering events to {@code eventListener}. May be
+   *     null if delivery of events is not required.
+   * @param eventListener A listener of events. May be null if delivery of events is not required.
+   * @param maxDroppedFramesToNotify The maximum number of frames that can be dropped between
+   *     invocations of {@link VideoRendererEventListener#onDroppedFrames(int, long)}.
+   * @param drmSessionManager For use with encrypted media. May be null if support for encrypted
+   *     media is not required.
+   * @param playClearSamplesWithoutKeys Encrypted media may contain clear (un-encrypted) regions.
+   *     For example a media file may start with a short clear region so as to allow playback to
+   *     begin in parallel with key acquisition. This parameter specifies whether the renderer is
+   *     permitted to play clear regions of encrypted media files before {@code drmSessionManager}
+   *     has obtained the keys necessary to decrypt encrypted regions of the media.
+   * @param disableLoopFilter Disable the libvpx in-loop smoothing filter.
+   * @param threads Number of threads libvpx will use to decode.
+   */
+  public LibvpxVideoRenderer(
+      long allowedJoiningTimeMs,
+      Handler eventHandler,
+      VideoRendererEventListener eventListener,
+      int maxDroppedFramesToNotify,
+      DrmSessionManager<ExoMediaCrypto> drmSessionManager,
+      boolean playClearSamplesWithoutKeys,
+      boolean disableLoopFilter,
+      int threads) {
     super(C.TRACK_TYPE_VIDEO);
     this.disableLoopFilter = disableLoopFilter;
     this.allowedJoiningTimeMs = allowedJoiningTimeMs;
     this.maxDroppedFramesToNotify = maxDroppedFramesToNotify;
     this.drmSessionManager = drmSessionManager;
     this.playClearSamplesWithoutKeys = playClearSamplesWithoutKeys;
+    this.threads = threads;
     joiningDeadlineMs = C.TIME_UNSET;
     clearReportedVideoSize();
     formatHolder = new FormatHolder();
@@ -721,7 +763,8 @@ public class LibvpxVideoRenderer extends BaseRenderer {
               NUM_OUTPUT_BUFFERS,
               initialInputBufferSize,
               mediaCrypto,
-              disableLoopFilter);
+              disableLoopFilter,
+              threads);
       decoder.setOutputMode(outputMode);
       TraceUtil.endSection();
       long decoderInitializedTimestamp = SystemClock.elapsedRealtime();
diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java
index b157981487..33064af178 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java
@@ -51,6 +51,7 @@ import java.nio.ByteBuffer;
    * @param exoMediaCrypto The {@link ExoMediaCrypto} object required for decoding encrypted
    *     content. Maybe null and can be ignored if decoder does not handle encrypted content.
    * @param disableLoopFilter Disable the libvpx in-loop smoothing filter.
+   * @param threads Number of threads libvpx will use to decode.
    * @throws VpxDecoderException Thrown if an exception occurs when initializing the decoder.
    */
   public VpxDecoder(
@@ -58,7 +59,8 @@ import java.nio.ByteBuffer;
       int numOutputBuffers,
       int initialInputBufferSize,
       ExoMediaCrypto exoMediaCrypto,
-      boolean disableLoopFilter)
+      boolean disableLoopFilter,
+      int threads)
       throws VpxDecoderException {
     super(new VpxInputBuffer[numInputBuffers], new VpxOutputBuffer[numOutputBuffers]);
     if (!VpxLibrary.isAvailable()) {
@@ -68,7 +70,7 @@ import java.nio.ByteBuffer;
     if (exoMediaCrypto != null && !VpxLibrary.vpxIsSecureDecodeSupported()) {
       throw new VpxDecoderException("Vpx decoder does not support secure decode.");
     }
-    vpxDecContext = vpxInit(disableLoopFilter);
+    vpxDecContext = vpxInit(disableLoopFilter, threads);
     if (vpxDecContext == 0) {
       throw new VpxDecoderException("Failed to initialize decoder");
     }
@@ -165,7 +167,7 @@ import java.nio.ByteBuffer;
     }
   }
 
-  private native long vpxInit(boolean disableLoopFilter);
+  private native long vpxInit(boolean disableLoopFilter, int threads);
 
   private native long vpxClose(long context);
   private native long vpxDecode(long context, ByteBuffer encoded, int length);
diff --git a/extensions/vp9/src/main/jni/vpx_jni.cc b/extensions/vp9/src/main/jni/vpx_jni.cc
index c37545190c..6ff86af355 100644
--- a/extensions/vp9/src/main/jni/vpx_jni.cc
+++ b/extensions/vp9/src/main/jni/vpx_jni.cc
@@ -433,11 +433,11 @@ int vpx_release_frame_buffer(void* priv, vpx_codec_frame_buffer_t* fb) {
   return buffer_manager->release(*(int*)fb->priv);
 }
 
-DECODER_FUNC(jlong, vpxInit, jboolean disableLoopFilter) {
+DECODER_FUNC(jlong, vpxInit, jboolean disableLoopFilter, jint threads) {
   JniCtx* context = new JniCtx();
   context->decoder = new vpx_codec_ctx_t();
   vpx_codec_dec_cfg_t cfg = {0, 0, 0};
-  cfg.threads = android_getCpuCount();
+  cfg.threads = threads;
   errorCode = 0;
   vpx_codec_err_t err =
       vpx_codec_dec_init(context->decoder, &vpx_codec_vp9_dx_algo, &cfg, 0);

From ca67c0c2e5eea2a5ef4aa4025d67716515d66efa Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 13 Feb 2019 10:05:09 +0000
Subject: [PATCH 531/832] Extend TrackSelectionDialog for usage in
 PlayerActivity.

We need additional initial selection settings and a configurable title.
The update logic for the track selection parameters moved to a static helper
method in TrackSelectionDialog.

PiperOrigin-RevId: 233713788
---
 .../exoplayer2/demo/DownloadTracker.java      |  4 +-
 .../exoplayer2/demo/PlayerActivity.java       | 77 ++++---------------
 .../exoplayer2/demo/TrackSelectionDialog.java | 72 ++++++++++++++++-
 .../src/main/res/layout/player_activity.xml   | 10 ++-
 demos/main/src/main/res/values/strings.xml    |  2 +
 demos/main/src/main/res/values/styles.xml     |  2 +-
 6 files changed, 99 insertions(+), 68 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index 29e7d0c19f..30a898f07e 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -241,12 +241,14 @@ public class DownloadTracker implements DownloadManager.Listener {
       mappedTrackInfo = downloadHelper.getMappedTrackInfo(/* periodIndex= */ 0);
       trackSelectionDialog = new TrackSelectionDialog();
       trackSelectionDialog.init(
+          /* titleId= */ R.string.exo_download_description,
           mappedTrackInfo,
+          /* initialSelection= */ DownloadHelper.DEFAULT_TRACK_SELECTOR_PARAMETERS,
           /* allowAdaptiveSelections =*/ false,
           /* allowMultipleOverrides= */ true,
           /* onClickListener= */ this,
           /* onDismissListener= */ this);
-      trackSelectionDialog.show(fragmentManager, "download");
+      trackSelectionDialog.show(fragmentManager, /* tag= */ null);
     }
 
     @Override
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 12fc5eb06f..befdff6170 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
@@ -15,13 +15,13 @@
  */
 package com.google.android.exoplayer2.demo;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Pair;
 import android.view.KeyEvent;
 import android.view.View;
@@ -65,7 +65,6 @@ import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 import com.google.android.exoplayer2.ui.DebugTextViewHelper;
 import com.google.android.exoplayer2.ui.PlayerControlView;
 import com.google.android.exoplayer2.ui.PlayerView;
-import com.google.android.exoplayer2.ui.TrackSelectionDialogBuilder;
 import com.google.android.exoplayer2.ui.spherical.SphericalSurfaceView;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.HttpDataSource;
@@ -80,7 +79,7 @@ import java.util.List;
 import java.util.UUID;
 
 /** An activity that plays media using {@link SimpleExoPlayer}. */
-public class PlayerActivity extends Activity
+public class PlayerActivity extends AppCompatActivity
     implements OnClickListener, PlaybackPreparer, PlayerControlView.VisibilityListener {
 
   public static final String DRM_SCHEME_EXTRA = "drm_scheme";
@@ -125,6 +124,7 @@ public class PlayerActivity extends Activity
 
   private PlayerView playerView;
   private LinearLayout debugRootView;
+  private Button selectTracksButton;
   private TextView debugTextView;
 
   private DataSource.Factory dataSourceFactory;
@@ -160,10 +160,10 @@ public class PlayerActivity extends Activity
     }
 
     setContentView(R.layout.player_activity);
-    View rootView = findViewById(R.id.root);
-    rootView.setOnClickListener(this);
     debugRootView = findViewById(R.id.controls_root);
     debugTextView = findViewById(R.id.debug_text_view);
+    selectTracksButton = findViewById(R.id.select_tracks_button);
+    selectTracksButton.setOnClickListener(this);
 
     playerView = findViewById(R.id.player_view);
     playerView.setControllerVisibilityListener(this);
@@ -272,6 +272,7 @@ public class PlayerActivity extends Activity
 
   @Override
   public void onSaveInstanceState(Bundle outState) {
+    super.onSaveInstanceState(outState);
     updateTrackSelectorParameters();
     updateStartPosition();
     outState.putParcelable(KEY_TRACK_SELECTOR_PARAMETERS, trackSelectorParameters);
@@ -292,23 +293,9 @@ public class PlayerActivity extends Activity
 
   @Override
   public void onClick(View view) {
-    if (view.getParent() == debugRootView) {
-      MappedTrackInfo mappedTrackInfo = trackSelector.getCurrentMappedTrackInfo();
-      if (mappedTrackInfo != null) {
-        CharSequence title = ((Button) view).getText();
-        int rendererIndex = (int) view.getTag();
-        int rendererType = mappedTrackInfo.getRendererType(rendererIndex);
-        boolean allowAdaptiveSelections =
-            rendererType == C.TRACK_TYPE_VIDEO
-                || (rendererType == C.TRACK_TYPE_AUDIO
-                    && mappedTrackInfo.getTypeSupport(C.TRACK_TYPE_VIDEO)
-                        == MappedTrackInfo.RENDERER_SUPPORT_NO_TRACKS);
-        new TrackSelectionDialogBuilder(/* context= */ this, title, trackSelector, rendererIndex)
-            .setShowDisableOption(true)
-            .setAllowAdaptiveSelections(allowAdaptiveSelections)
-            .build()
-            .show();
-      }
+    if (view == selectTracksButton) {
+      TrackSelectionDialog dialog = TrackSelectionDialog.createForTrackSelector(trackSelector);
+      dialog.show(getSupportFragmentManager(), /* tag= */ null);
     }
   }
 
@@ -454,7 +441,7 @@ public class PlayerActivity extends Activity
       player.seekTo(startWindow, startPosition);
     }
     player.prepare(mediaSource, !haveStartPosition, false);
-    updateButtonVisibilities();
+    updateButtonVisibility();
   }
 
   private MediaSource buildMediaSource(Uri uri) {
@@ -605,41 +592,9 @@ public class PlayerActivity extends Activity
 
   // User controls
 
-  private void updateButtonVisibilities() {
-    debugRootView.removeAllViews();
-    if (player == null) {
-      return;
-    }
-
-    MappedTrackInfo mappedTrackInfo = trackSelector.getCurrentMappedTrackInfo();
-    if (mappedTrackInfo == null) {
-      return;
-    }
-
-    for (int i = 0; i < mappedTrackInfo.getRendererCount(); i++) {
-      TrackGroupArray trackGroups = mappedTrackInfo.getTrackGroups(i);
-      if (trackGroups.length != 0) {
-        Button button = new Button(this);
-        int label;
-        switch (player.getRendererType(i)) {
-          case C.TRACK_TYPE_AUDIO:
-            label = R.string.exo_track_selection_title_audio;
-            break;
-          case C.TRACK_TYPE_VIDEO:
-            label = R.string.exo_track_selection_title_video;
-            break;
-          case C.TRACK_TYPE_TEXT:
-            label = R.string.exo_track_selection_title_text;
-            break;
-          default:
-            continue;
-        }
-        button.setText(label);
-        button.setTag(i);
-        button.setOnClickListener(this);
-        debugRootView.addView(button);
-      }
-    }
+  private void updateButtonVisibility() {
+    selectTracksButton.setEnabled(
+        player != null && trackSelector.getCurrentMappedTrackInfo() != null);
   }
 
   private void showControls() {
@@ -675,7 +630,7 @@ public class PlayerActivity extends Activity
       if (playbackState == Player.STATE_ENDED) {
         showControls();
       }
-      updateButtonVisibilities();
+      updateButtonVisibility();
     }
 
     @Override
@@ -694,7 +649,7 @@ public class PlayerActivity extends Activity
         initializePlayer();
       } else {
         updateStartPosition();
-        updateButtonVisibilities();
+        updateButtonVisibility();
         showControls();
       }
     }
@@ -702,7 +657,7 @@ public class PlayerActivity extends Activity
     @Override
     @SuppressWarnings("ReferenceEquality")
     public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {
-      updateButtonVisibilities();
+      updateButtonVisibility();
       if (trackGroups != lastSeenTrackGroupArray) {
         MappedTrackInfo mappedTrackInfo = trackSelector.getCurrentMappedTrackInfo();
         if (mappedTrackInfo != null) {
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
index 3048594955..39e16b2ae1 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
@@ -33,9 +33,11 @@ import android.view.View;
 import android.view.ViewGroup;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.SelectionOverride;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo;
 import com.google.android.exoplayer2.ui.TrackSelectionView;
+import com.google.android.exoplayer2.util.Assertions;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -46,12 +48,54 @@ public final class TrackSelectionDialog extends DialogFragment {
   private final SparseArray<TrackSelectionViewFragment> tabFragments;
   private final List<CharSequence> tabTitles;
 
+  private int titleId;
   private MappedTrackInfo mappedTrackInfo;
+  private DefaultTrackSelector.Parameters initialSelection;
   private boolean allowAdaptiveSelections;
   private boolean allowMultipleOverrides;
   private DialogInterface.OnClickListener onClickListener;
   private DialogInterface.OnDismissListener onDismissListener;
 
+  /**
+   * Creates and initialized a dialog with a {@link DefaultTrackSelector} and automatically updates
+   * the track selector's parameters when tracks are selected.
+   *
+   * @param trackSelector A {@link DefaultTrackSelector}.
+   */
+  public static TrackSelectionDialog createForTrackSelector(DefaultTrackSelector trackSelector) {
+    MappedTrackInfo mappedTrackInfo =
+        Assertions.checkNotNull(trackSelector.getCurrentMappedTrackInfo());
+    TrackSelectionDialog trackSelectionDialog = new TrackSelectionDialog();
+    DefaultTrackSelector.Parameters parameters = trackSelector.getParameters();
+    trackSelectionDialog.init(
+        /* titleId= */ R.string.track_selection_title,
+        mappedTrackInfo,
+        /* initialSelection = */ parameters,
+        /* allowAdaptiveSelections =*/ true,
+        /* allowMultipleOverrides= */ false,
+        /* onClickListener= */ (dialog, which) -> {
+          DefaultTrackSelector.ParametersBuilder builder = parameters.buildUpon();
+          for (int i = 0; i < mappedTrackInfo.getRendererCount(); i++) {
+            builder
+                .clearSelectionOverrides(/* rendererIndex= */ i)
+                .setRendererDisabled(
+                    /* rendererIndex= */ i,
+                    trackSelectionDialog.getIsDisabled(/* rendererIndex= */ i));
+            List<SelectionOverride> overrides =
+                trackSelectionDialog.getOverrides(/* rendererIndex= */ i);
+            if (!overrides.isEmpty()) {
+              builder.setSelectionOverride(
+                  /* rendererIndex= */ i,
+                  mappedTrackInfo.getTrackGroups(/* rendererIndex= */ i),
+                  overrides.get(0));
+            }
+          }
+          trackSelector.setParameters(builder);
+        },
+        /* onDismissListener= */ (dialog) -> {});
+    return trackSelectionDialog;
+  }
+
   /** Creates the dialog. */
   public TrackSelectionDialog() {
     tabFragments = new SparseArray<>();
@@ -63,7 +107,10 @@ public final class TrackSelectionDialog extends DialogFragment {
   /**
    * Initializes the dialog.
    *
+   * @param titleId The resource id of the dialog title.
    * @param mappedTrackInfo The {@link MappedTrackInfo} to display.
+   * @param initialSelection The {@link DefaultTrackSelector.Parameters} describing the initial
+   *     track selection.
    * @param allowAdaptiveSelections Whether adaptive selections (consisting of more than one track)
    *     can be made.
    * @param allowMultipleOverrides Whether tracks from multiple track groups can be selected.
@@ -72,12 +119,16 @@ public final class TrackSelectionDialog extends DialogFragment {
    *     dismissed.
    */
   public void init(
+      int titleId,
       MappedTrackInfo mappedTrackInfo,
+      DefaultTrackSelector.Parameters initialSelection,
       boolean allowAdaptiveSelections,
       boolean allowMultipleOverrides,
       DialogInterface.OnClickListener onClickListener,
       DialogInterface.OnDismissListener onDismissListener) {
+    this.titleId = titleId;
     this.mappedTrackInfo = mappedTrackInfo;
+    this.initialSelection = initialSelection;
     this.allowAdaptiveSelections = allowAdaptiveSelections;
     this.allowMultipleOverrides = allowMultipleOverrides;
     this.onClickListener = onClickListener;
@@ -112,7 +163,7 @@ public final class TrackSelectionDialog extends DialogFragment {
   @Override
   public Dialog onCreateDialog(Bundle savedInstanceState) {
     return new AlertDialog.Builder(getActivity())
-        .setTitle(R.string.exo_download_description)
+        .setTitle(titleId)
         .setPositiveButton(android.R.string.ok, onClickListener)
         .setNegativeButton(android.R.string.cancel, /* listener= */ null)
         .create();
@@ -140,7 +191,12 @@ public final class TrackSelectionDialog extends DialogFragment {
       }
       TrackSelectionViewFragment tabFragment = new TrackSelectionViewFragment();
       tabFragment.init(
-          mappedTrackInfo, /* rendererIndex= */ i, allowAdaptiveSelections, allowMultipleOverrides);
+          mappedTrackInfo,
+          /* rendererIndex= */ i,
+          initialSelection.getRendererDisabled(/* rendererIndex= */ i),
+          initialSelection.getSelectionOverride(/* rendererIndex= */ i, trackGroupArray),
+          allowAdaptiveSelections,
+          allowMultipleOverrides);
       tabFragments.put(i, tabFragment);
       tabTitles.add(trackTypeString);
     }
@@ -196,6 +252,8 @@ public final class TrackSelectionDialog extends DialogFragment {
 
     private MappedTrackInfo mappedTrackInfo;
     private int rendererIndex;
+    private boolean initialIsDisabled;
+    @Nullable private SelectionOverride initialOverride;
     private boolean allowAdaptiveSelections;
     private boolean allowMultipleOverrides;
 
@@ -204,10 +262,14 @@ public final class TrackSelectionDialog extends DialogFragment {
     public void init(
         MappedTrackInfo mappedTrackInfo,
         int rendererIndex,
+        boolean initialIsDisabled,
+        @Nullable SelectionOverride initialOverride,
         boolean allowAdaptiveSelections,
         boolean allowMultipleOverrides) {
       this.mappedTrackInfo = mappedTrackInfo;
       this.rendererIndex = rendererIndex;
+      this.initialIsDisabled = initialIsDisabled;
+      this.initialOverride = initialOverride;
       this.allowAdaptiveSelections = allowAdaptiveSelections;
       this.allowMultipleOverrides = allowMultipleOverrides;
     }
@@ -227,8 +289,10 @@ public final class TrackSelectionDialog extends DialogFragment {
       trackSelectionView.init(
           mappedTrackInfo,
           rendererIndex,
-          /* isDisabled= */ false,
-          /* overrides= */ Collections.emptyList());
+          initialIsDisabled,
+          initialOverride == null
+              ? Collections.emptyList()
+              : Collections.singletonList(initialOverride));
       return rootView;
     }
   }
diff --git a/demos/main/src/main/res/layout/player_activity.xml b/demos/main/src/main/res/layout/player_activity.xml
index 6b84033273..ea3de257e2 100644
--- a/demos/main/src/main/res/layout/player_activity.xml
+++ b/demos/main/src/main/res/layout/player_activity.xml
@@ -42,7 +42,15 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:visibility="gone"/>
+        android:visibility="gone">
+
+      <Button android:id="@+id/select_tracks_button"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:text="@string/track_selection_title"
+          android:enabled="false"/>
+
+    </LinearLayout>
 
   </LinearLayout>
 
diff --git a/demos/main/src/main/res/values/strings.xml b/demos/main/src/main/res/values/strings.xml
index 40f065b18e..0729da2fc6 100644
--- a/demos/main/src/main/res/values/strings.xml
+++ b/demos/main/src/main/res/values/strings.xml
@@ -17,6 +17,8 @@
 
   <string name="application_name">ExoPlayer</string>
 
+  <string name="track_selection_title">Select tracks</string>
+
   <string name="unexpected_intent_action">Unexpected intent action: <xliff:g id="action">%1$s</xliff:g></string>
 
   <string name="error_cleartext_not_permitted">Cleartext traffic not permitted</string>
diff --git a/demos/main/src/main/res/values/styles.xml b/demos/main/src/main/res/values/styles.xml
index 25d826bdf6..8dfa4f0e1f 100644
--- a/demos/main/src/main/res/values/styles.xml
+++ b/demos/main/src/main/res/values/styles.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-  <style name="PlayerTheme" parent="android:Theme.Holo">
+  <style name="PlayerTheme" parent="Theme.AppCompat.NoActionBar">
     <item name="android:windowNoTitle">true</item>
     <item name="android:windowBackground">@android:color/black</item>
   </style>

From cc153cfca37aa0f0ca96148681cfd80af353fb38 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 13 Feb 2019 11:35:11 +0000
Subject: [PATCH 532/832] Use floating action button in the cast demo app

PiperOrigin-RevId: 233723028
---
 demos/cast/build.gradle                              |  1 +
 .../{ic_add_circle_white_24dp.xml => ic_plus.xml}    | 12 ++++++++----
 demos/cast/src/main/res/layout/main_activity.xml     |  6 +++---
 3 files changed, 12 insertions(+), 7 deletions(-)
 rename demos/cast/src/main/res/drawable/{ic_add_circle_white_24dp.xml => ic_plus.xml} (59%)

diff --git a/demos/cast/build.gradle b/demos/cast/build.gradle
index 79cf3d9a0a..7e504b6c43 100644
--- a/demos/cast/build.gradle
+++ b/demos/cast/build.gradle
@@ -56,6 +56,7 @@ dependencies {
     implementation project(modulePrefix + 'library-smoothstreaming')
     implementation project(modulePrefix + 'library-ui')
     implementation project(modulePrefix + 'extension-cast')
+    implementation 'com.android.support:design:' + supportLibraryVersion
     implementation 'com.android.support:support-v4:' + supportLibraryVersion
     implementation 'com.android.support:appcompat-v7:' + supportLibraryVersion
     implementation 'com.android.support:recyclerview-v7:' + supportLibraryVersion
diff --git a/demos/cast/src/main/res/drawable/ic_add_circle_white_24dp.xml b/demos/cast/src/main/res/drawable/ic_plus.xml
similarity index 59%
rename from demos/cast/src/main/res/drawable/ic_add_circle_white_24dp.xml
rename to demos/cast/src/main/res/drawable/ic_plus.xml
index 5f3c8961ef..5a5a5154c9 100644
--- a/demos/cast/src/main/res/drawable/ic_add_circle_white_24dp.xml
+++ b/demos/cast/src/main/res/drawable/ic_plus.xml
@@ -13,8 +13,12 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector android:alpha="0.8" android:height="24dp" android:viewportHeight="24.0"
-    android:viewportWidth="24.0" android:width="24dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-  <path android:fillColor="#FFFFFF" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13h-4v4h-2v-4L7,13v-2h4L11,7h2v4h4v2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24.0dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:width="24.0dp" >
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M18,13h-5v5c0,0.55 -0.45,1 -1,1h0c-0.55,0 -1,-0.45 -1,-1v-5H6c-0.55,0 -1,-0.45 -1,-1v0c0,-0.55 0.45,-1 1,-1h5V6c0,-0.55 0.45,-1 1,-1h0c0.55,0 1,0.45 1,1v5h5c0.55,0 1,0.45 1,1v0C19,12.55 18.55,13 18,13z"/>
 </vector>
diff --git a/demos/cast/src/main/res/layout/main_activity.xml b/demos/cast/src/main/res/layout/main_activity.xml
index 98efe2095e..b0be69bed3 100644
--- a/demos/cast/src/main/res/layout/main_activity.xml
+++ b/demos/cast/src/main/res/layout/main_activity.xml
@@ -38,14 +38,14 @@
         android:scrollbars="vertical"
         android:fadeScrollbars="false"/>
 
-    <ImageButton android:id="@+id/add_sample_button"
-        android:background="@drawable/ic_add_circle_white_24dp"
+    <android.support.design.widget.FloatingActionButton android:id="@+id/add_sample_button"
+        android:src="@drawable/ic_plus"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentBottom="true"
-        android:padding="30dp"
+        android:layout_margin="16dp"
         android:contentDescription="@string/add_samples"/>
 
   </RelativeLayout>

From 04e606149870213dd22de3b5e3255a8f41a5c825 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 13 Feb 2019 17:11:27 +0000
Subject: [PATCH 533/832] Reduce the number of parameters required to create an
 HlsMediaChunk

PiperOrigin-RevId: 233765839
---
 .../exoplayer2/source/hls/HlsChunkSource.java |  40 +---
 .../exoplayer2/source/hls/HlsMediaChunk.java  | 187 +++++++++++++-----
 2 files changed, 141 insertions(+), 86 deletions(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
index d01476d004..b188aa74f3 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
@@ -290,8 +290,8 @@ import java.util.List;
       }
     }
 
-    int chunkIndex = (int) (chunkMediaSequence - mediaPlaylist.mediaSequence);
-    if (chunkIndex >= mediaPlaylist.segments.size()) {
+    int segmentIndexInPlaylist = (int) (chunkMediaSequence - mediaPlaylist.mediaSequence);
+    if (segmentIndexInPlaylist >= mediaPlaylist.segments.size()) {
       if (mediaPlaylist.hasEndTag) {
         out.endOfStream = true;
       } else /* Live */ {
@@ -306,7 +306,7 @@ import java.util.List;
     expectedPlaylistUrl = null;
 
     // Handle encryption.
-    HlsMediaPlaylist.Segment segment = mediaPlaylist.segments.get(chunkIndex);
+    HlsMediaPlaylist.Segment segment = mediaPlaylist.segments.get(segmentIndexInPlaylist);
 
     // Check if the segment is completely encrypted using the identity key format.
     if (segment.fullSegmentEncryptionKeyUri != null) {
@@ -324,44 +324,20 @@ import java.util.List;
       clearEncryptionData();
     }
 
-    DataSpec initDataSpec = null;
-    Segment initSegment = segment.initializationSegment;
-    if (initSegment != null) {
-      Uri initSegmentUri = UriUtil.resolveToUri(mediaPlaylist.baseUri, initSegment.url);
-      initDataSpec = new DataSpec(initSegmentUri, initSegment.byterangeOffset,
-          initSegment.byterangeLength, null);
-    }
-
-    // Compute start time of the next chunk.
-    long segmentStartTimeInPeriodUs = startOfPlaylistInPeriodUs + segment.relativeStartTimeUs;
-    int discontinuitySequence = mediaPlaylist.discontinuitySequence
-        + segment.relativeDiscontinuitySequence;
-    TimestampAdjuster timestampAdjuster = timestampAdjusterProvider.getAdjuster(
-        discontinuitySequence);
-
-    // Configure the data source and spec for the chunk.
-    Uri chunkUri = UriUtil.resolveToUri(mediaPlaylist.baseUri, segment.url);
-    DataSpec dataSpec = new DataSpec(chunkUri, segment.byterangeOffset, segment.byterangeLength,
-        null);
     out.chunk =
-        new HlsMediaChunk(
+        HlsMediaChunk.createInstance(
             extractorFactory,
             mediaDataSource,
-            dataSpec,
-            initDataSpec,
+            startOfPlaylistInPeriodUs,
+            mediaPlaylist,
+            segmentIndexInPlaylist,
             selectedUrl,
             muxedCaptionFormats,
             trackSelection.getSelectionReason(),
             trackSelection.getSelectionData(),
-            segmentStartTimeInPeriodUs,
-            segmentStartTimeInPeriodUs + segment.durationUs,
-            chunkMediaSequence,
-            discontinuitySequence,
-            segment.hasGapTag,
             isTimestampMaster,
-            timestampAdjuster,
+            timestampAdjusterProvider,
             previous,
-            segment.drmInitData,
             encryptionKey,
             encryptionIv);
   }
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
index 2995f8b0aa..57f604bb2f 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.source.hls;
 
+import android.net.Uri;
 import android.util.Pair;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
@@ -27,10 +28,12 @@ import com.google.android.exoplayer2.metadata.id3.Id3Decoder;
 import com.google.android.exoplayer2.metadata.id3.PrivFrame;
 import com.google.android.exoplayer2.source.chunk.MediaChunk;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.HlsUrl;
+import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DataSpec;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.TimestampAdjuster;
+import com.google.android.exoplayer2.util.UriUtil;
 import com.google.android.exoplayer2.util.Util;
 import java.io.EOFException;
 import java.io.IOException;
@@ -42,6 +45,112 @@ import java.util.concurrent.atomic.AtomicInteger;
  */
 /* package */ final class HlsMediaChunk extends MediaChunk {
 
+  /**
+   * Creates a new instance.
+   *
+   * @param extractorFactory A {@link HlsExtractorFactory} from which the HLS media chunk extractor
+   *     is obtained.
+   * @param dataSource The source from which the data should be loaded.
+   * @param startOfPlaylistInPeriodUs The position of the playlist in the period in microseconds.
+   * @param mediaPlaylist The media playlist from which this chunk was obtained.
+   * @param hlsUrl The url of the playlist from which this chunk was obtained.
+   * @param muxedCaptionFormats List of muxed caption {@link Format}s. Null if no closed caption
+   *     information is available in the master playlist.
+   * @param trackSelectionReason See {@link #trackSelectionReason}.
+   * @param trackSelectionData See {@link #trackSelectionData}.
+   * @param isMasterTimestampSource True if the chunk can initialize the timestamp adjuster.
+   * @param timestampAdjusterProvider The provider from which to obtain the {@link
+   *     TimestampAdjuster}.
+   * @param previousChunk The {@link HlsMediaChunk} that preceded this one. May be null.
+   * @param fullSegmentEncryptionKey The key to decrypt the full segment, or null if the segment is
+   *     not fully encrypted.
+   * @param encryptionIv The AES initialization vector, or null if the segment is not fully
+   *     encrypted.
+   */
+  public static HlsMediaChunk createInstance(
+      HlsExtractorFactory extractorFactory,
+      DataSource dataSource,
+      long startOfPlaylistInPeriodUs,
+      HlsMediaPlaylist mediaPlaylist,
+      int segmentIndexInPlaylist,
+      HlsUrl hlsUrl,
+      List<Format> muxedCaptionFormats,
+      int trackSelectionReason,
+      Object trackSelectionData,
+      boolean isMasterTimestampSource,
+      TimestampAdjusterProvider timestampAdjusterProvider,
+      HlsMediaChunk previousChunk,
+      byte[] fullSegmentEncryptionKey,
+      byte[] encryptionIv) {
+
+    HlsMediaPlaylist.Segment segment = mediaPlaylist.segments.get(segmentIndexInPlaylist);
+    DataSpec dataSpec =
+        new DataSpec(
+            UriUtil.resolveToUri(mediaPlaylist.baseUri, segment.url),
+            segment.byterangeOffset,
+            segment.byterangeLength,
+            /* key= */ null);
+
+    DataSpec initDataSpec = null;
+    HlsMediaPlaylist.Segment initSegment = segment.initializationSegment;
+    if (initSegment != null) {
+      Uri initSegmentUri = UriUtil.resolveToUri(mediaPlaylist.baseUri, initSegment.url);
+      initDataSpec =
+          new DataSpec(
+              initSegmentUri,
+              initSegment.byterangeOffset,
+              initSegment.byterangeLength,
+              /* key= */ null);
+    }
+
+    long segmentStartTimeInPeriodUs = startOfPlaylistInPeriodUs + segment.relativeStartTimeUs;
+    long segmentEndTimeInPeriodUs = segmentStartTimeInPeriodUs + segment.durationUs;
+    int discontinuitySequenceNumber =
+        mediaPlaylist.discontinuitySequence + segment.relativeDiscontinuitySequence;
+
+    Extractor previousExtractor = null;
+    Id3Decoder id3Decoder;
+    ParsableByteArray scratchId3Data;
+    boolean shouldSpliceIn;
+    if (previousChunk != null) {
+      id3Decoder = previousChunk.id3Decoder;
+      scratchId3Data = previousChunk.scratchId3Data;
+      shouldSpliceIn = previousChunk.hlsUrl != hlsUrl || !previousChunk.loadCompleted;
+      previousExtractor =
+          previousChunk.discontinuitySequenceNumber != discontinuitySequenceNumber || shouldSpliceIn
+              ? null
+              : previousChunk.extractor;
+    } else {
+      id3Decoder = new Id3Decoder();
+      scratchId3Data = new ParsableByteArray(Id3Decoder.ID3_HEADER_LENGTH);
+      shouldSpliceIn = false;
+    }
+
+    return new HlsMediaChunk(
+        extractorFactory,
+        dataSource,
+        dataSpec,
+        initDataSpec,
+        hlsUrl,
+        muxedCaptionFormats,
+        trackSelectionReason,
+        trackSelectionData,
+        segmentStartTimeInPeriodUs,
+        segmentEndTimeInPeriodUs,
+        /* chunkMediaSequence= */ mediaPlaylist.mediaSequence + segmentIndexInPlaylist,
+        discontinuitySequenceNumber,
+        segment.hasGapTag,
+        isMasterTimestampSource,
+        /* timestampAdjuster= */ timestampAdjusterProvider.getAdjuster(discontinuitySequenceNumber),
+        segment.drmInitData,
+        previousExtractor,
+        id3Decoder,
+        scratchId3Data,
+        shouldSpliceIn,
+        fullSegmentEncryptionKey,
+        encryptionIv);
+  }
+
   public static final String PRIV_TIMESTAMP_FRAME_OWNER =
       "com.apple.streaming.transportStreamTimestamp";
 
@@ -74,7 +183,7 @@ import java.util.concurrent.atomic.AtomicInteger;
   private final DrmInitData drmInitData;
   private final Extractor previousExtractor;
   private final Id3Decoder id3Decoder;
-  private final ParsableByteArray id3Data;
+  private final ParsableByteArray scratchId3Data;
 
   private Extractor extractor;
   private HlsSampleStreamWrapper output;
@@ -84,32 +193,7 @@ import java.util.concurrent.atomic.AtomicInteger;
   private volatile boolean loadCanceled;
   private boolean loadCompleted;
 
-  /**
-   * @param extractorFactory A {@link HlsExtractorFactory} from which the HLS media chunk extractor
-   *     is obtained.
-   * @param dataSource The source from which the data should be loaded.
-   * @param dataSpec Defines the data to be loaded.
-   * @param initDataSpec Defines the initialization data to be fed to new extractors. May be null.
-   * @param hlsUrl The url of the playlist from which this chunk was obtained.
-   * @param muxedCaptionFormats List of muxed caption {@link Format}s. Null if no closed caption
-   *     information is available in the master playlist.
-   * @param trackSelectionReason See {@link #trackSelectionReason}.
-   * @param trackSelectionData See {@link #trackSelectionData}.
-   * @param startTimeUs The start time of the chunk in microseconds.
-   * @param endTimeUs The end time of the chunk in microseconds.
-   * @param chunkMediaSequence The media sequence number of the chunk.
-   * @param discontinuitySequenceNumber The discontinuity sequence number of the chunk.
-   * @param hasGapTag Whether the chunk is tagged with EXT-X-GAP.
-   * @param isMasterTimestampSource True if the chunk can initialize the timestamp adjuster.
-   * @param timestampAdjuster Adjuster corresponding to the provided discontinuity sequence number.
-   * @param previousChunk The {@link HlsMediaChunk} that preceded this one. May be null.
-   * @param drmInitData A {@link DrmInitData} to sideload to the extractor.
-   * @param fullSegmentEncryptionKey The key to decrypt the full segment, or null if the segment is
-   *     not fully encrypted.
-   * @param encryptionIv The AES initialization vector, or null if the segment is not fully
-   *     encrypted.
-   */
-  public HlsMediaChunk(
+  private HlsMediaChunk(
       HlsExtractorFactory extractorFactory,
       DataSource dataSource,
       DataSpec dataSpec,
@@ -125,8 +209,11 @@ import java.util.concurrent.atomic.AtomicInteger;
       boolean hasGapTag,
       boolean isMasterTimestampSource,
       TimestampAdjuster timestampAdjuster,
-      HlsMediaChunk previousChunk,
       DrmInitData drmInitData,
+      Extractor previousExtractor,
+      Id3Decoder id3Decoder,
+      ParsableByteArray scratchId3Data,
+      boolean shouldSpliceIn,
       byte[] fullSegmentEncryptionKey,
       byte[] encryptionIv) {
     super(
@@ -148,19 +235,10 @@ import java.util.concurrent.atomic.AtomicInteger;
     this.extractorFactory = extractorFactory;
     this.muxedCaptionFormats = muxedCaptionFormats;
     this.drmInitData = drmInitData;
-    Extractor previousExtractor = null;
-    if (previousChunk != null) {
-      id3Decoder = previousChunk.id3Decoder;
-      id3Data = previousChunk.id3Data;
-      shouldSpliceIn = previousChunk.hlsUrl != hlsUrl || !previousChunk.loadCompleted;
-      previousExtractor = previousChunk.discontinuitySequenceNumber != discontinuitySequenceNumber
-          || shouldSpliceIn ? null : previousChunk.extractor;
-    } else {
-      id3Decoder = new Id3Decoder();
-      id3Data = new ParsableByteArray(Id3Decoder.ID3_HEADER_LENGTH);
-      shouldSpliceIn = false;
-    }
     this.previousExtractor = previousExtractor;
+    this.id3Decoder = id3Decoder;
+    this.scratchId3Data = scratchId3Data;
+    this.shouldSpliceIn = shouldSpliceIn;
     initDataSource = dataSource;
     uid = uidSource.getAndIncrement();
   }
@@ -314,26 +392,26 @@ import java.util.concurrent.atomic.AtomicInteger;
   private long peekId3PrivTimestamp(ExtractorInput input) throws IOException, InterruptedException {
     input.resetPeekPosition();
     try {
-      input.peekFully(id3Data.data, 0, Id3Decoder.ID3_HEADER_LENGTH);
+      input.peekFully(scratchId3Data.data, 0, Id3Decoder.ID3_HEADER_LENGTH);
     } catch (EOFException e) {
       // The input isn't long enough for there to be any ID3 data.
       return C.TIME_UNSET;
     }
-    id3Data.reset(Id3Decoder.ID3_HEADER_LENGTH);
-    int id = id3Data.readUnsignedInt24();
+    scratchId3Data.reset(Id3Decoder.ID3_HEADER_LENGTH);
+    int id = scratchId3Data.readUnsignedInt24();
     if (id != Id3Decoder.ID3_TAG) {
       return C.TIME_UNSET;
     }
-    id3Data.skipBytes(3); // version(2), flags(1).
-    int id3Size = id3Data.readSynchSafeInt();
+    scratchId3Data.skipBytes(3); // version(2), flags(1).
+    int id3Size = scratchId3Data.readSynchSafeInt();
     int requiredCapacity = id3Size + Id3Decoder.ID3_HEADER_LENGTH;
-    if (requiredCapacity > id3Data.capacity()) {
-      byte[] data = id3Data.data;
-      id3Data.reset(requiredCapacity);
-      System.arraycopy(data, 0, id3Data.data, 0, Id3Decoder.ID3_HEADER_LENGTH);
+    if (requiredCapacity > scratchId3Data.capacity()) {
+      byte[] data = scratchId3Data.data;
+      scratchId3Data.reset(requiredCapacity);
+      System.arraycopy(data, 0, scratchId3Data.data, 0, Id3Decoder.ID3_HEADER_LENGTH);
     }
-    input.peekFully(id3Data.data, Id3Decoder.ID3_HEADER_LENGTH, id3Size);
-    Metadata metadata = id3Decoder.decode(id3Data.data, id3Size);
+    input.peekFully(scratchId3Data.data, Id3Decoder.ID3_HEADER_LENGTH, id3Size);
+    Metadata metadata = id3Decoder.decode(scratchId3Data.data, id3Size);
     if (metadata == null) {
       return C.TIME_UNSET;
     }
@@ -343,11 +421,12 @@ import java.util.concurrent.atomic.AtomicInteger;
       if (frame instanceof PrivFrame) {
         PrivFrame privFrame = (PrivFrame) frame;
         if (PRIV_TIMESTAMP_FRAME_OWNER.equals(privFrame.owner)) {
-          System.arraycopy(privFrame.privateData, 0, id3Data.data, 0, 8 /* timestamp size */);
-          id3Data.reset(8);
+          System.arraycopy(
+              privFrame.privateData, 0, scratchId3Data.data, 0, 8 /* timestamp size */);
+          scratchId3Data.reset(8);
           // The top 31 bits should be zeros, but explicitly zero them to wrap in the case that the
           // streaming provider forgot. See: https://github.com/google/ExoPlayer/pull/3495.
-          return id3Data.readLong() & 0x1FFFFFFFFL;
+          return scratchId3Data.readLong() & 0x1FFFFFFFFL;
         }
       }
     }

From 5c2aa4bd9e66d55886e27bef304dba1408a244a4 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 13 Feb 2019 19:10:58 +0000
Subject: [PATCH 534/832] Automated g4 rollback of changelist 233073011.

*** Reason for rollback ***

Pending discussions about cast

*** Original change description ***

Remove default-receiver-related classes from Cast demo app

***

PiperOrigin-RevId: 233790699
---
 demos/cast/build.gradle                       |  16 +
 demos/cast/src/main/AndroidManifest.xml       |   2 +-
 .../DefaultReceiverPlayerManager.java         | 405 +++++++++++++++++
 .../exoplayer2/castdemo/MainActivity.java     |  31 +-
 .../exoplayer2/castdemo/PlayerManager.java    | 407 ++----------------
 5 files changed, 470 insertions(+), 391 deletions(-)
 create mode 100644 demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java

diff --git a/demos/cast/build.gradle b/demos/cast/build.gradle
index 7e504b6c43..49a5e80985 100644
--- a/demos/cast/build.gradle
+++ b/demos/cast/build.gradle
@@ -47,6 +47,22 @@ android {
         // The demo app isn't indexed and doesn't have translations.
         disable 'GoogleAppIndexingWarning','MissingTranslation'
     }
+
+    flavorDimensions "receiver"
+
+    productFlavors {
+        exoCast {
+            dimension "receiver"
+            manifestPlaceholders =
+                    [castOptionsProvider: "com.google.android.exoplayer2.ext.cast.ExoCastOptionsProvider"]
+        }
+        defaultCast {
+            dimension "receiver"
+            manifestPlaceholders =
+                    [castOptionsProvider: "com.google.android.exoplayer2.ext.cast.DefaultCastOptionsProvider"]
+        }
+    }
+
 }
 
 dependencies {
diff --git a/demos/cast/src/main/AndroidManifest.xml b/demos/cast/src/main/AndroidManifest.xml
index 69887485cb..856b0b1235 100644
--- a/demos/cast/src/main/AndroidManifest.xml
+++ b/demos/cast/src/main/AndroidManifest.xml
@@ -25,7 +25,7 @@
       android:largeHeap="true" android:allowBackup="false">
 
     <meta-data android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
-        android:value="com.google.android.exoplayer2.ext.cast.ExoCastOptionsProvider" />
+        android:value="${castOptionsProvider}" />
 
     <activity android:name="com.google.android.exoplayer2.castdemo.MainActivity"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java
new file mode 100644
index 0000000000..7994761b9a
--- /dev/null
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java
@@ -0,0 +1,405 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.castdemo;
+
+import android.content.Context;
+import android.net.Uri;
+import android.support.annotation.Nullable;
+import android.view.KeyEvent;
+import android.view.View;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.DefaultRenderersFactory;
+import com.google.android.exoplayer2.ExoPlayerFactory;
+import com.google.android.exoplayer2.Player;
+import com.google.android.exoplayer2.Player.DiscontinuityReason;
+import com.google.android.exoplayer2.Player.EventListener;
+import com.google.android.exoplayer2.Player.TimelineChangeReason;
+import com.google.android.exoplayer2.RenderersFactory;
+import com.google.android.exoplayer2.SimpleExoPlayer;
+import com.google.android.exoplayer2.Timeline;
+import com.google.android.exoplayer2.Timeline.Period;
+import com.google.android.exoplayer2.ext.cast.CastPlayer;
+import com.google.android.exoplayer2.ext.cast.MediaItem;
+import com.google.android.exoplayer2.ext.cast.SessionAvailabilityListener;
+import com.google.android.exoplayer2.source.ConcatenatingMediaSource;
+import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.ProgressiveMediaSource;
+import com.google.android.exoplayer2.source.dash.DashMediaSource;
+import com.google.android.exoplayer2.source.hls.HlsMediaSource;
+import com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
+import com.google.android.exoplayer2.ui.PlayerControlView;
+import com.google.android.exoplayer2.ui.PlayerView;
+import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
+import com.google.android.gms.cast.MediaInfo;
+import com.google.android.gms.cast.MediaMetadata;
+import com.google.android.gms.cast.MediaQueueItem;
+import com.google.android.gms.cast.framework.CastContext;
+import java.util.ArrayList;
+
+/** Manages players and an internal media queue for the ExoPlayer/Cast demo app. */
+/* package */ class DefaultReceiverPlayerManager
+    implements PlayerManager, EventListener, SessionAvailabilityListener {
+
+  private static final String USER_AGENT = "ExoCastDemoPlayer";
+  private static final DefaultHttpDataSourceFactory DATA_SOURCE_FACTORY =
+      new DefaultHttpDataSourceFactory(USER_AGENT);
+
+  private final PlayerView localPlayerView;
+  private final PlayerControlView castControlView;
+  private final SimpleExoPlayer exoPlayer;
+  private final CastPlayer castPlayer;
+  private final ArrayList<MediaItem> mediaQueue;
+  private final Listener listener;
+  private final ConcatenatingMediaSource concatenatingMediaSource;
+
+  private boolean castMediaQueueCreationPending;
+  private int currentItemIndex;
+  private Player currentPlayer;
+
+  /**
+   * Creates a new manager for {@link SimpleExoPlayer} and {@link CastPlayer}.
+   *
+   * @param listener A {@link Listener} for queue position changes.
+   * @param localPlayerView The {@link PlayerView} for local playback.
+   * @param castControlView The {@link PlayerControlView} to control remote playback.
+   * @param context A {@link Context}.
+   * @param castContext The {@link CastContext}.
+   */
+  public DefaultReceiverPlayerManager(
+      Listener listener,
+      PlayerView localPlayerView,
+      PlayerControlView castControlView,
+      Context context,
+      CastContext castContext) {
+    this.listener = listener;
+    this.localPlayerView = localPlayerView;
+    this.castControlView = castControlView;
+    mediaQueue = new ArrayList<>();
+    currentItemIndex = C.INDEX_UNSET;
+    concatenatingMediaSource = new ConcatenatingMediaSource();
+
+    DefaultTrackSelector trackSelector = new DefaultTrackSelector();
+    RenderersFactory renderersFactory = new DefaultRenderersFactory(context);
+    exoPlayer = ExoPlayerFactory.newSimpleInstance(context, renderersFactory, trackSelector);
+    exoPlayer.addListener(this);
+    localPlayerView.setPlayer(exoPlayer);
+
+    castPlayer = new CastPlayer(castContext);
+    castPlayer.addListener(this);
+    castPlayer.setSessionAvailabilityListener(this);
+    castControlView.setPlayer(castPlayer);
+
+    setCurrentPlayer(castPlayer.isCastSessionAvailable() ? castPlayer : exoPlayer);
+  }
+
+  // Queue manipulation methods.
+
+  /**
+   * Plays a specified queue item in the current player.
+   *
+   * @param itemIndex The index of the item to play.
+   */
+  @Override
+  public void selectQueueItem(int itemIndex) {
+    setCurrentItem(itemIndex, C.TIME_UNSET, true);
+  }
+
+  /** Returns the index of the currently played item. */
+  @Override
+  public int getCurrentItemIndex() {
+    return currentItemIndex;
+  }
+
+  /**
+   * Appends {@code item} to the media queue.
+   *
+   * @param item The {@link MediaItem} to append.
+   */
+  @Override
+  public void addItem(MediaItem item) {
+    mediaQueue.add(item);
+    concatenatingMediaSource.addMediaSource(buildMediaSource(item));
+    if (currentPlayer == castPlayer) {
+      castPlayer.addItems(buildMediaQueueItem(item));
+    }
+  }
+
+  /** Returns the size of the media queue. */
+  @Override
+  public int getMediaQueueSize() {
+    return mediaQueue.size();
+  }
+
+  /**
+   * Returns the item at the given index in the media queue.
+   *
+   * @param position The index of the item.
+   * @return The item at the given index in the media queue.
+   */
+  @Override
+  public MediaItem getItem(int position) {
+    return mediaQueue.get(position);
+  }
+
+  /**
+   * Removes the item at the given index from the media queue.
+   *
+   * @param item The item to remove.
+   * @return Whether the removal was successful.
+   */
+  @Override
+  public boolean removeItem(MediaItem item) {
+    int itemIndex = mediaQueue.indexOf(item);
+    if (itemIndex == -1) {
+      return false;
+    }
+    concatenatingMediaSource.removeMediaSource(itemIndex);
+    if (currentPlayer == castPlayer) {
+      if (castPlayer.getPlaybackState() != Player.STATE_IDLE) {
+        Timeline castTimeline = castPlayer.getCurrentTimeline();
+        if (castTimeline.getPeriodCount() <= itemIndex) {
+          return false;
+        }
+        castPlayer.removeItem((int) castTimeline.getPeriod(itemIndex, new Period()).id);
+      }
+    }
+    mediaQueue.remove(itemIndex);
+    if (itemIndex == currentItemIndex && itemIndex == mediaQueue.size()) {
+      maybeSetCurrentItemAndNotify(C.INDEX_UNSET);
+    } else if (itemIndex < currentItemIndex) {
+      maybeSetCurrentItemAndNotify(currentItemIndex - 1);
+    }
+    return true;
+  }
+
+  /**
+   * Moves an item within the queue.
+   *
+   * @param item The item to move.
+   * @param toIndex The target index of the item in the queue.
+   * @return Whether the item move was successful.
+   */
+  @Override
+  public boolean moveItem(MediaItem item, int toIndex) {
+    int fromIndex = mediaQueue.indexOf(item);
+    if (fromIndex == -1) {
+      return false;
+    }
+    // Player update.
+    concatenatingMediaSource.moveMediaSource(fromIndex, toIndex);
+    if (currentPlayer == castPlayer && castPlayer.getPlaybackState() != Player.STATE_IDLE) {
+      Timeline castTimeline = castPlayer.getCurrentTimeline();
+      int periodCount = castTimeline.getPeriodCount();
+      if (periodCount <= fromIndex || periodCount <= toIndex) {
+        return false;
+      }
+      int elementId = (int) castTimeline.getPeriod(fromIndex, new Period()).id;
+      castPlayer.moveItem(elementId, toIndex);
+    }
+
+    mediaQueue.add(toIndex, mediaQueue.remove(fromIndex));
+
+    // Index update.
+    if (fromIndex == currentItemIndex) {
+      maybeSetCurrentItemAndNotify(toIndex);
+    } else if (fromIndex < currentItemIndex && toIndex >= currentItemIndex) {
+      maybeSetCurrentItemAndNotify(currentItemIndex - 1);
+    } else if (fromIndex > currentItemIndex && toIndex <= currentItemIndex) {
+      maybeSetCurrentItemAndNotify(currentItemIndex + 1);
+    }
+
+    return true;
+  }
+
+  /**
+   * Dispatches a given {@link KeyEvent} to the corresponding view of the current player.
+   *
+   * @param event The {@link KeyEvent}.
+   * @return Whether the event was handled by the target view.
+   */
+  @Override
+  public boolean dispatchKeyEvent(KeyEvent event) {
+    if (currentPlayer == exoPlayer) {
+      return localPlayerView.dispatchKeyEvent(event);
+    } else /* currentPlayer == castPlayer */ {
+      return castControlView.dispatchKeyEvent(event);
+    }
+  }
+
+  /** Releases the manager and the players that it holds. */
+  @Override
+  public void release() {
+    currentItemIndex = C.INDEX_UNSET;
+    mediaQueue.clear();
+    concatenatingMediaSource.clear();
+    castPlayer.setSessionAvailabilityListener(null);
+    castPlayer.release();
+    localPlayerView.setPlayer(null);
+    exoPlayer.release();
+  }
+
+  // Player.EventListener implementation.
+
+  @Override
+  public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
+    updateCurrentItemIndex();
+  }
+
+  @Override
+  public void onPositionDiscontinuity(@DiscontinuityReason int reason) {
+    updateCurrentItemIndex();
+  }
+
+  @Override
+  public void onTimelineChanged(
+      Timeline timeline, @Nullable Object manifest, @TimelineChangeReason int reason) {
+    updateCurrentItemIndex();
+    if (currentPlayer == castPlayer && timeline.isEmpty()) {
+      castMediaQueueCreationPending = true;
+    }
+  }
+
+  // CastPlayer.SessionAvailabilityListener implementation.
+
+  @Override
+  public void onCastSessionAvailable() {
+    setCurrentPlayer(castPlayer);
+  }
+
+  @Override
+  public void onCastSessionUnavailable() {
+    setCurrentPlayer(exoPlayer);
+  }
+
+  // Internal methods.
+
+  private void updateCurrentItemIndex() {
+    int playbackState = currentPlayer.getPlaybackState();
+    maybeSetCurrentItemAndNotify(
+        playbackState != Player.STATE_IDLE && playbackState != Player.STATE_ENDED
+            ? currentPlayer.getCurrentWindowIndex()
+            : C.INDEX_UNSET);
+  }
+
+  private void setCurrentPlayer(Player currentPlayer) {
+    if (this.currentPlayer == currentPlayer) {
+      return;
+    }
+
+    // View management.
+    if (currentPlayer == exoPlayer) {
+      localPlayerView.setVisibility(View.VISIBLE);
+      castControlView.hide();
+    } else /* currentPlayer == castPlayer */ {
+      localPlayerView.setVisibility(View.GONE);
+      castControlView.show();
+    }
+
+    // Player state management.
+    long playbackPositionMs = C.TIME_UNSET;
+    int windowIndex = C.INDEX_UNSET;
+    boolean playWhenReady = false;
+    if (this.currentPlayer != null) {
+      int playbackState = this.currentPlayer.getPlaybackState();
+      if (playbackState != Player.STATE_ENDED) {
+        playbackPositionMs = this.currentPlayer.getCurrentPosition();
+        playWhenReady = this.currentPlayer.getPlayWhenReady();
+        windowIndex = this.currentPlayer.getCurrentWindowIndex();
+        if (windowIndex != currentItemIndex) {
+          playbackPositionMs = C.TIME_UNSET;
+          windowIndex = currentItemIndex;
+        }
+      }
+      this.currentPlayer.stop(true);
+    } else {
+      // This is the initial setup. No need to save any state.
+    }
+
+    this.currentPlayer = currentPlayer;
+
+    // Media queue management.
+    castMediaQueueCreationPending = currentPlayer == castPlayer;
+    if (currentPlayer == exoPlayer) {
+      exoPlayer.prepare(concatenatingMediaSource);
+    }
+
+    // Playback transition.
+    if (windowIndex != C.INDEX_UNSET) {
+      setCurrentItem(windowIndex, playbackPositionMs, playWhenReady);
+    }
+  }
+
+  /**
+   * Starts playback of the item at the given position.
+   *
+   * @param itemIndex The index of the item to play.
+   * @param positionMs The position at which playback should start.
+   * @param playWhenReady Whether the player should proceed when ready to do so.
+   */
+  private void setCurrentItem(int itemIndex, long positionMs, boolean playWhenReady) {
+    maybeSetCurrentItemAndNotify(itemIndex);
+    if (castMediaQueueCreationPending) {
+      MediaQueueItem[] items = new MediaQueueItem[mediaQueue.size()];
+      for (int i = 0; i < items.length; i++) {
+        items[i] = buildMediaQueueItem(mediaQueue.get(i));
+      }
+      castMediaQueueCreationPending = false;
+      castPlayer.loadItems(items, itemIndex, positionMs, Player.REPEAT_MODE_OFF);
+    } else {
+      currentPlayer.seekTo(itemIndex, positionMs);
+      currentPlayer.setPlayWhenReady(playWhenReady);
+    }
+  }
+
+  private void maybeSetCurrentItemAndNotify(int currentItemIndex) {
+    if (this.currentItemIndex != currentItemIndex) {
+      int oldIndex = this.currentItemIndex;
+      this.currentItemIndex = currentItemIndex;
+      listener.onQueuePositionChanged(oldIndex, currentItemIndex);
+    }
+  }
+
+  private static MediaSource buildMediaSource(MediaItem item) {
+    Uri uri = item.media.uri;
+    switch (item.mimeType) {
+      case DemoUtil.MIME_TYPE_SS:
+        return new SsMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
+      case DemoUtil.MIME_TYPE_DASH:
+        return new DashMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
+      case DemoUtil.MIME_TYPE_HLS:
+        return new HlsMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
+      case DemoUtil.MIME_TYPE_VIDEO_MP4:
+        return new ProgressiveMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
+      default:
+        {
+          throw new IllegalStateException("Unsupported type: " + item.mimeType);
+        }
+    }
+  }
+
+  private static MediaQueueItem buildMediaQueueItem(MediaItem item) {
+    MediaMetadata movieMetadata = new MediaMetadata(MediaMetadata.MEDIA_TYPE_MOVIE);
+    movieMetadata.putString(MediaMetadata.KEY_TITLE, item.title);
+    MediaInfo mediaInfo =
+        new MediaInfo.Builder(item.media.uri.toString())
+            .setStreamType(MediaInfo.STREAM_TYPE_BUFFERED)
+            .setContentType(item.mimeType)
+            .setMetadata(movieMetadata)
+            .build();
+    return new MediaQueueItem.Builder(mediaInfo).build();
+  }
+}
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
index a69b32788d..efda40a913 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
@@ -39,6 +39,7 @@ import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.ext.cast.MediaItem;
 import com.google.android.exoplayer2.ui.PlayerControlView;
 import com.google.android.exoplayer2.ui.PlayerView;
+import com.google.android.gms.cast.CastMediaControlIntent;
 import com.google.android.gms.cast.framework.CastButtonFactory;
 import com.google.android.gms.cast.framework.CastContext;
 import com.google.android.gms.dynamite.DynamiteModule;
@@ -117,13 +118,29 @@ public class MainActivity extends AppCompatActivity
       // There is no Cast context to work with. Do nothing.
       return;
     }
-    playerManager =
-        new PlayerManager(
-            /* listener= */ this,
-            localPlayerView,
-            castControlView,
-            /* context= */ this,
-            castContext);
+    String applicationId = castContext.getCastOptions().getReceiverApplicationId();
+    switch (applicationId) {
+      case CastMediaControlIntent.DEFAULT_MEDIA_RECEIVER_APPLICATION_ID:
+        playerManager =
+            new DefaultReceiverPlayerManager(
+                /* listener= */ this,
+                localPlayerView,
+                castControlView,
+                /* context= */ this,
+                castContext);
+        break;
+      case ExoCastOptionsProvider.RECEIVER_ID:
+        playerManager =
+            new ExoCastPlayerManager(
+                /* listener= */ this,
+                localPlayerView,
+                castControlView,
+                /* context= */ this,
+                castContext);
+        break;
+      default:
+        throw new IllegalStateException("Illegal receiver app id: " + applicationId);
+    }
     mediaQueueList.setAdapter(mediaQueueListAdapter);
   }
 
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
index 28dd808fdf..c9a728b3ff 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 The Android Open Source Project
+ * Copyright (C) 2019 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,46 +15,15 @@
  */
 package com.google.android.exoplayer2.castdemo;
 
-import android.content.Context;
-import android.net.Uri;
-import android.support.annotation.Nullable;
 import android.view.KeyEvent;
-import android.view.View;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.DefaultRenderersFactory;
-import com.google.android.exoplayer2.ExoPlaybackException;
-import com.google.android.exoplayer2.ExoPlayerFactory;
-import com.google.android.exoplayer2.Player;
-import com.google.android.exoplayer2.Player.DiscontinuityReason;
-import com.google.android.exoplayer2.Player.EventListener;
-import com.google.android.exoplayer2.Player.TimelineChangeReason;
-import com.google.android.exoplayer2.RenderersFactory;
-import com.google.android.exoplayer2.SimpleExoPlayer;
-import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.ext.cast.DefaultCastSessionManager;
-import com.google.android.exoplayer2.ext.cast.ExoCastPlayer;
 import com.google.android.exoplayer2.ext.cast.MediaItem;
-import com.google.android.exoplayer2.ext.cast.SessionAvailabilityListener;
-import com.google.android.exoplayer2.source.ConcatenatingMediaSource;
-import com.google.android.exoplayer2.source.MediaSource;
-import com.google.android.exoplayer2.source.ProgressiveMediaSource;
-import com.google.android.exoplayer2.source.dash.DashMediaSource;
-import com.google.android.exoplayer2.source.hls.HlsMediaSource;
-import com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource;
-import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
-import com.google.android.exoplayer2.ui.PlayerControlView;
-import com.google.android.exoplayer2.ui.PlayerView;
-import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
-import com.google.android.exoplayer2.util.Assertions;
-import com.google.android.exoplayer2.util.Log;
-import com.google.android.gms.cast.framework.CastContext;
-import java.util.ArrayList;
 
-/** Manages players and an internal media queue for the Cast demo app. */
-/* package */ class PlayerManager implements EventListener, SessionAvailabilityListener {
+/** Manages the players in the Cast demo app. */
+/* package */ interface PlayerManager {
 
   /** Listener for events. */
-  public interface Listener {
+  interface Listener {
 
     /** Called when the currently played item of the media queue changes. */
     void onQueuePositionChanged(int previousIndex, int newIndex);
@@ -66,361 +35,33 @@ import java.util.ArrayList;
     void onPlayerError();
   }
 
-  private static final String TAG = "PlayerManager";
-  private static final String USER_AGENT = "ExoCastDemoPlayer";
-  private static final DefaultHttpDataSourceFactory DATA_SOURCE_FACTORY =
-      new DefaultHttpDataSourceFactory(USER_AGENT);
+  /** Redirects the given {@code keyEvent} to the active player. */
+  boolean dispatchKeyEvent(KeyEvent keyEvent);
 
-  private final PlayerView localPlayerView;
-  private final PlayerControlView castControlView;
-  private final SimpleExoPlayer exoPlayer;
-  private final ExoCastPlayer exoCastPlayer;
-  private final ArrayList<MediaItem> mediaQueue;
-  private final Listener listener;
-  private final ConcatenatingMediaSource concatenatingMediaSource;
+  /** Appends the given {@link MediaItem} to the media queue. */
+  void addItem(MediaItem mediaItem);
 
-  private int currentItemIndex;
-  private Player currentPlayer;
+  /** Returns the number of items in the media queue. */
+  int getMediaQueueSize();
+
+  /** Selects the item at the given position for playback. */
+  void selectQueueItem(int position);
 
   /**
-   * Creates a new manager for {@link SimpleExoPlayer} and {@link ExoCastPlayer}.
-   *
-   * @param listener A {@link Listener}.
-   * @param localPlayerView The {@link PlayerView} for local playback.
-   * @param castControlView The {@link PlayerControlView} to control remote playback.
-   * @param context A {@link Context}.
-   * @param castContext The {@link CastContext}.
+   * Returns the position of the item currently being played, or {@link C#INDEX_UNSET} if no item is
+   * being played.
    */
-  public PlayerManager(
-      Listener listener,
-      PlayerView localPlayerView,
-      PlayerControlView castControlView,
-      Context context,
-      CastContext castContext) {
-    this.listener = listener;
-    this.localPlayerView = localPlayerView;
-    this.castControlView = castControlView;
-    mediaQueue = new ArrayList<>();
-    currentItemIndex = C.INDEX_UNSET;
-    concatenatingMediaSource = new ConcatenatingMediaSource();
+  int getCurrentItemIndex();
 
-    DefaultTrackSelector trackSelector = new DefaultTrackSelector();
-    RenderersFactory renderersFactory = new DefaultRenderersFactory(context);
-    exoPlayer = ExoPlayerFactory.newSimpleInstance(context, renderersFactory, trackSelector);
-    exoPlayer.addListener(this);
-    localPlayerView.setPlayer(exoPlayer);
+  /** Returns the {@link MediaItem} at the given {@code position}. */
+  MediaItem getItem(int position);
 
-    exoCastPlayer =
-        new ExoCastPlayer(
-            sessionManagerListener ->
-                new DefaultCastSessionManager(castContext, sessionManagerListener));
-    exoCastPlayer.addListener(this);
-    exoCastPlayer.setSessionAvailabilityListener(this);
-    castControlView.setPlayer(exoCastPlayer);
+  /** Moves the item at position {@code from} to position {@code to}. */
+  boolean moveItem(MediaItem item, int to);
 
-    setCurrentPlayer(exoCastPlayer.isCastSessionAvailable() ? exoCastPlayer : exoPlayer);
-  }
+  /** Removes the item at position {@code index}. */
+  boolean removeItem(MediaItem item);
 
-  // Queue manipulation methods.
-
-  /**
-   * Plays a specified queue item in the current player.
-   *
-   * @param itemIndex The index of the item to play.
-   */
-  public void selectQueueItem(int itemIndex) {
-    setCurrentItem(itemIndex, C.TIME_UNSET, true);
-  }
-
-  /** Returns the index of the currently played item. */
-  public int getCurrentItemIndex() {
-    return currentItemIndex;
-  }
-
-  /**
-   * Appends {@code item} to the media queue.
-   *
-   * @param item The {@link MediaItem} to append.
-   */
-  public void addItem(MediaItem item) {
-    mediaQueue.add(item);
-    concatenatingMediaSource.addMediaSource(buildMediaSource(item));
-    if (currentPlayer == exoCastPlayer) {
-      exoCastPlayer.addItemsToQueue(item);
-    }
-  }
-
-  /** Returns the size of the media queue. */
-  public int getMediaQueueSize() {
-    return mediaQueue.size();
-  }
-
-  /**
-   * Returns the item at the given index in the media queue.
-   *
-   * @param position The index of the item.
-   * @return The item at the given index in the media queue.
-   */
-  public MediaItem getItem(int position) {
-    return mediaQueue.get(position);
-  }
-
-  /**
-   * Removes the item at the given index from the media queue.
-   *
-   * @param item The item to remove.
-   * @return Whether the removal was successful.
-   */
-  public boolean removeItem(MediaItem item) {
-    int itemIndex = mediaQueue.indexOf(item);
-    if (itemIndex == -1) {
-      // This may happen if another sender app removes items while this sender app is in "swiping
-      // an item" state.
-      return false;
-    }
-    concatenatingMediaSource.removeMediaSource(itemIndex);
-    mediaQueue.remove(itemIndex);
-    if (currentPlayer == exoCastPlayer) {
-      exoCastPlayer.removeItemFromQueue(itemIndex);
-    }
-    if (itemIndex == currentItemIndex && itemIndex == mediaQueue.size()) {
-      maybeSetCurrentItemAndNotify(C.INDEX_UNSET);
-    } else if (itemIndex < currentItemIndex) {
-      maybeSetCurrentItemAndNotify(currentItemIndex - 1);
-    }
-    return true;
-  }
-
-  /**
-   * Moves an item within the queue.
-   *
-   * @param item The item to move. This method does nothing if {@code item} is not contained in the
-   *     queue.
-   * @param toIndex The target index of the item in the queue. If {@code toIndex} exceeds the last
-   *     position in the queue, {@code toIndex} is clamped to match the largest possible value.
-   * @return True if {@code item} was contained in the queue, and {@code toIndex} was a valid
-   *     position. False otherwise.
-   */
-  public boolean moveItem(MediaItem item, int toIndex) {
-    int indexOfItem = mediaQueue.indexOf(item);
-    if (indexOfItem == -1) {
-      // This may happen if another sender app removes items while this sender app is in "dragging
-      // an item" state.
-      return false;
-    }
-    int clampedToIndex = Math.min(toIndex, mediaQueue.size() - 1);
-    mediaQueue.add(clampedToIndex, mediaQueue.remove(indexOfItem));
-    concatenatingMediaSource.moveMediaSource(indexOfItem, clampedToIndex);
-    if (currentPlayer == exoCastPlayer) {
-      exoCastPlayer.moveItemInQueue(indexOfItem, clampedToIndex);
-    }
-    // Index update.
-    maybeSetCurrentItemAndNotify(currentPlayer.getCurrentWindowIndex());
-    return clampedToIndex == toIndex;
-  }
-
-  // Miscellaneous methods.
-
-  public boolean dispatchKeyEvent(KeyEvent event) {
-    if (currentPlayer == exoPlayer) {
-      return localPlayerView.dispatchKeyEvent(event);
-    } else /* currentPlayer == exoCastPlayer */ {
-      return castControlView.dispatchKeyEvent(event);
-    }
-  }
-
-  /** Releases the manager and the players that it holds. */
-  public void release() {
-    currentItemIndex = C.INDEX_UNSET;
-    mediaQueue.clear();
-    concatenatingMediaSource.clear();
-    exoCastPlayer.setSessionAvailabilityListener(null);
-    exoCastPlayer.release();
-    localPlayerView.setPlayer(null);
-    exoPlayer.release();
-  }
-
-  // Player.EventListener implementation.
-
-  @Override
-  public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
-    updateCurrentItemIndex();
-  }
-
-  @Override
-  public void onPositionDiscontinuity(@DiscontinuityReason int reason) {
-    updateCurrentItemIndex();
-  }
-
-  @Override
-  public void onTimelineChanged(
-      Timeline timeline, @Nullable Object manifest, @TimelineChangeReason int reason) {
-    if (currentPlayer == exoCastPlayer && reason != Player.TIMELINE_CHANGE_REASON_RESET) {
-      maybeUpdateLocalQueueWithRemoteQueueAndNotify();
-    }
-    updateCurrentItemIndex();
-  }
-
-  @Override
-  public void onPlayerError(ExoPlaybackException error) {
-    Log.e(TAG, "The player encountered an error.", error);
-    listener.onPlayerError();
-  }
-
-  // CastPlayer.SessionAvailabilityListener implementation.
-
-  @Override
-  public void onCastSessionAvailable() {
-    setCurrentPlayer(exoCastPlayer);
-  }
-
-  @Override
-  public void onCastSessionUnavailable() {
-    setCurrentPlayer(exoPlayer);
-  }
-
-  // Internal methods.
-
-  private void maybeUpdateLocalQueueWithRemoteQueueAndNotify() {
-    Assertions.checkState(currentPlayer == exoCastPlayer);
-    boolean mediaQueuesMatch = mediaQueue.size() == exoCastPlayer.getQueueSize();
-    for (int i = 0; mediaQueuesMatch && i < mediaQueue.size(); i++) {
-      mediaQueuesMatch = mediaQueue.get(i).uuid.equals(exoCastPlayer.getQueueItem(i).uuid);
-    }
-    if (mediaQueuesMatch) {
-      // The media queues match. Do nothing.
-      return;
-    }
-    mediaQueue.clear();
-    concatenatingMediaSource.clear();
-    for (int i = 0; i < exoCastPlayer.getQueueSize(); i++) {
-      MediaItem item = exoCastPlayer.getQueueItem(i);
-      mediaQueue.add(item);
-      concatenatingMediaSource.addMediaSource(buildMediaSource(item));
-    }
-    listener.onQueueContentsExternallyChanged();
-  }
-
-  private void updateCurrentItemIndex() {
-    int playbackState = currentPlayer.getPlaybackState();
-    maybeSetCurrentItemAndNotify(
-        playbackState != Player.STATE_IDLE && playbackState != Player.STATE_ENDED
-            ? currentPlayer.getCurrentWindowIndex()
-            : C.INDEX_UNSET);
-  }
-
-  private void setCurrentPlayer(Player currentPlayer) {
-    if (this.currentPlayer == currentPlayer) {
-      return;
-    }
-
-    // View management.
-    if (currentPlayer == exoPlayer) {
-      localPlayerView.setVisibility(View.VISIBLE);
-      castControlView.hide();
-    } else /* currentPlayer == exoCastPlayer */ {
-      localPlayerView.setVisibility(View.GONE);
-      castControlView.show();
-    }
-
-    // Player state management.
-    long playbackPositionMs = C.TIME_UNSET;
-    int windowIndex = C.INDEX_UNSET;
-    boolean playWhenReady = false;
-    if (this.currentPlayer != null) {
-      int playbackState = this.currentPlayer.getPlaybackState();
-      if (playbackState != Player.STATE_ENDED) {
-        playbackPositionMs = this.currentPlayer.getCurrentPosition();
-        playWhenReady = this.currentPlayer.getPlayWhenReady();
-        windowIndex = this.currentPlayer.getCurrentWindowIndex();
-        if (windowIndex != currentItemIndex) {
-          playbackPositionMs = C.TIME_UNSET;
-          windowIndex = currentItemIndex;
-        }
-      }
-      this.currentPlayer.stop(true);
-    } else {
-      // This is the initial setup. No need to save any state.
-    }
-
-    this.currentPlayer = currentPlayer;
-
-    // Media queue management.
-    boolean shouldSeekInNewCurrentPlayer;
-    if (currentPlayer == exoPlayer) {
-      exoPlayer.prepare(concatenatingMediaSource);
-      shouldSeekInNewCurrentPlayer = true;
-    } else /* currentPlayer == exoCastPlayer */ {
-      if (exoCastPlayer.getPlaybackState() == Player.STATE_IDLE) {
-        exoCastPlayer.prepare();
-      }
-      if (mediaQueue.isEmpty()) {
-        // Casting started with no local queue. We take the receiver app's queue as our own.
-        maybeUpdateLocalQueueWithRemoteQueueAndNotify();
-        shouldSeekInNewCurrentPlayer = false;
-      } else {
-        // Casting started when the sender app had no queue. We just load our items into the
-        // receiver app's queue. If the receiver had no items in its queue, we also seek to wherever
-        // the sender app was playing.
-        int currentExoCastPlayerState = exoCastPlayer.getPlaybackState();
-        shouldSeekInNewCurrentPlayer =
-            currentExoCastPlayerState == Player.STATE_IDLE
-                || currentExoCastPlayerState == Player.STATE_ENDED;
-        exoCastPlayer.addItemsToQueue(mediaQueue.toArray(new MediaItem[0]));
-      }
-    }
-
-    // Playback transition.
-    if (shouldSeekInNewCurrentPlayer && windowIndex != C.INDEX_UNSET) {
-      setCurrentItem(windowIndex, playbackPositionMs, playWhenReady);
-    } else if (getMediaQueueSize() > 0) {
-      maybeSetCurrentItemAndNotify(currentPlayer.getCurrentWindowIndex());
-    }
-  }
-
-  /**
-   * Starts playback of the item at the given position.
-   *
-   * @param itemIndex The index of the item to play.
-   * @param positionMs The position at which playback should start.
-   * @param playWhenReady Whether the player should proceed when ready to do so.
-   */
-  private void setCurrentItem(int itemIndex, long positionMs, boolean playWhenReady) {
-    maybeSetCurrentItemAndNotify(itemIndex);
-    currentPlayer.seekTo(itemIndex, positionMs);
-    if (currentPlayer.getPlaybackState() == Player.STATE_IDLE) {
-      if (currentPlayer == exoCastPlayer) {
-        exoCastPlayer.prepare();
-      } else {
-        exoPlayer.prepare(concatenatingMediaSource);
-      }
-    }
-    currentPlayer.setPlayWhenReady(playWhenReady);
-  }
-
-  private void maybeSetCurrentItemAndNotify(int currentItemIndex) {
-    if (this.currentItemIndex != currentItemIndex) {
-      int oldIndex = this.currentItemIndex;
-      this.currentItemIndex = currentItemIndex;
-      listener.onQueuePositionChanged(oldIndex, currentItemIndex);
-    }
-  }
-
-  private static MediaSource buildMediaSource(MediaItem item) {
-    Uri uri = item.media.uri;
-    switch (item.mimeType) {
-      case DemoUtil.MIME_TYPE_SS:
-        return new SsMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
-      case DemoUtil.MIME_TYPE_DASH:
-        return new DashMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
-      case DemoUtil.MIME_TYPE_HLS:
-        return new HlsMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
-      case DemoUtil.MIME_TYPE_VIDEO_MP4:
-        return new ProgressiveMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
-      default:
-        {
-          throw new IllegalStateException("Unsupported type: " + item.mimeType);
-        }
-    }
-  }
+  /** Releases any acquired resources. */
+  void release();
 }

From 73d9b2d21a3bc28b84403157609368f51dfcedd1 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 13 Feb 2019 19:21:23 +0000
Subject: [PATCH 535/832] Hide ExoCastPlayer components again

This CL is effectively a rollback of cr/233072247.

PiperOrigin-RevId: 233793032
---
 RELEASENOTES.md         | 4 ----
 demos/cast/build.gradle | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 7a7decfbc0..b65ea50c08 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,10 +2,6 @@
 
 ### dev-v2 (not yet released) ###
 
-* Add `ExoCastPlayer` to cast to custom receiver apps using ExoPlayer's custom
-  communication protocol
-  ([#5486](https://github.com/google/ExoPlayer/issues/5486)). Also update the
-  Cast demo app to work with `ExoCastPlayer`.
 * HLS:
   * Form an adaptive track group out of audio renditions with matching name.
 * DASH:
diff --git a/demos/cast/build.gradle b/demos/cast/build.gradle
index 49a5e80985..48a9b5da6f 100644
--- a/demos/cast/build.gradle
+++ b/demos/cast/build.gradle
@@ -51,11 +51,6 @@ android {
     flavorDimensions "receiver"
 
     productFlavors {
-        exoCast {
-            dimension "receiver"
-            manifestPlaceholders =
-                    [castOptionsProvider: "com.google.android.exoplayer2.ext.cast.ExoCastOptionsProvider"]
-        }
         defaultCast {
             dimension "receiver"
             manifestPlaceholders =

From 1c38b226ea547783f63bd1732549e198a56f6878 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 14 Feb 2019 14:35:27 +0000
Subject: [PATCH 536/832] Stop using AlertDialog for TrackSelectionDialog.

AlertDialog owns its view, which causes problems with TabLayout on API 21
and 22. Now using AppCompatDialog instead so that we can own the view
ourselves.

Also:
 - Renamed layout files from download_xyz to track_selection_xyz.
 - Added OK and Cancel buttons to the view.
 - Applied alert dialog style to the "normal" dialog to get a nicer UI.
PiperOrigin-RevId: 233944647
---
 .../exoplayer2/demo/TrackSelectionDialog.java | 36 +++++++++-----
 .../src/main/res/layout/download_dialog.xml   | 28 -----------
 .../res/layout/track_selection_dialog.xml     | 48 +++++++++++++++++++
 ...tab.xml => track_selection_dialog_tab.xml} |  0
 4 files changed, 73 insertions(+), 39 deletions(-)
 delete mode 100644 demos/main/src/main/res/layout/download_dialog.xml
 create mode 100644 demos/main/src/main/res/layout/track_selection_dialog.xml
 rename demos/main/src/main/res/layout/{download_dialog_tab.xml => track_selection_dialog_tab.xml} (100%)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
index 39e16b2ae1..6be8cf6a77 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
@@ -15,7 +15,6 @@
  */
 package com.google.android.exoplayer2.demo;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.res.Resources;
@@ -27,10 +26,13 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
+import android.support.v7.app.AppCompatDialog;
 import android.util.SparseArray;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
@@ -162,11 +164,15 @@ public final class TrackSelectionDialog extends DialogFragment {
 
   @Override
   public Dialog onCreateDialog(Bundle savedInstanceState) {
-    return new AlertDialog.Builder(getActivity())
-        .setTitle(titleId)
-        .setPositiveButton(android.R.string.ok, onClickListener)
-        .setNegativeButton(android.R.string.cancel, /* listener= */ null)
-        .create();
+    // We need to own the view to let tab layout work correctly on all API levels. That's why we
+    // can't use an AlertDialog as it owns its view itself. Using AppCompatDialog instead. We still
+    // want the "alertDialogTheme" style attribute of the current theme instead of AppCompatDialog's
+    // default "dialogTheme" style, so obtain that manually.
+    TypedValue alertDialogStyle = new TypedValue();
+    getActivity().getTheme().resolveAttribute(R.attr.alertDialogTheme, alertDialogStyle, true);
+    AppCompatDialog dialog = new AppCompatDialog(getActivity(), alertDialogStyle.resourceId);
+    dialog.setTitle(titleId);
+    return dialog;
   }
 
   @Override
@@ -200,12 +206,19 @@ public final class TrackSelectionDialog extends DialogFragment {
       tabFragments.put(i, tabFragment);
       tabTitles.add(trackTypeString);
     }
-    View dialogView = inflater.inflate(R.layout.download_dialog, container, false);
-    TabLayout tabLayout = dialogView.findViewById(R.id.download_dialog_tab_layout);
-    ViewPager viewPager = dialogView.findViewById(R.id.download_dialog_view_pager);
+    View dialogView = inflater.inflate(R.layout.track_selection_dialog, container, false);
+    TabLayout tabLayout = dialogView.findViewById(R.id.track_selection_dialog_tab_layout);
+    ViewPager viewPager = dialogView.findViewById(R.id.track_selection_dialog_view_pager);
+    Button cancelButton = dialogView.findViewById(R.id.track_selection_dialog_cancel_button);
+    Button okButton = dialogView.findViewById(R.id.track_selection_dialog_ok_button);
     viewPager.setAdapter(new FragmentAdapter(getChildFragmentManager()));
     tabLayout.setupWithViewPager(viewPager);
-    ((AlertDialog) getDialog()).setView(dialogView);
+    cancelButton.setOnClickListener(view -> dismiss());
+    okButton.setOnClickListener(
+        view -> {
+          onClickListener.onClick(getDialog(), DialogInterface.BUTTON_POSITIVE);
+          dismiss();
+        });
     return dialogView;
   }
 
@@ -281,7 +294,8 @@ public final class TrackSelectionDialog extends DialogFragment {
         @Nullable ViewGroup container,
         @Nullable Bundle savedInstanceState) {
       View rootView =
-          inflater.inflate(R.layout.download_dialog_tab, container, /* attachToRoot= */ false);
+          inflater.inflate(
+              R.layout.track_selection_dialog_tab, container, /* attachToRoot= */ false);
       trackSelectionView = rootView.findViewById(R.id.download_dialog_track_selection_view);
       trackSelectionView.setShowDisableOption(true);
       trackSelectionView.setAllowMultipleOverrides(allowMultipleOverrides);
diff --git a/demos/main/src/main/res/layout/download_dialog.xml b/demos/main/src/main/res/layout/download_dialog.xml
deleted file mode 100644
index 25819c7ff5..0000000000
--- a/demos/main/src/main/res/layout/download_dialog.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-  <android.support.design.widget.TabLayout
-      android:id="@+id/download_dialog_tab_layout"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"/>
-  <android.support.v4.view.ViewPager
-      android:id="@+id/download_dialog_view_pager"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"/>
-</LinearLayout>
diff --git a/demos/main/src/main/res/layout/track_selection_dialog.xml b/demos/main/src/main/res/layout/track_selection_dialog.xml
new file mode 100644
index 0000000000..0a5cd480b3
--- /dev/null
+++ b/demos/main/src/main/res/layout/track_selection_dialog.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+  <android.support.v4.view.ViewPager
+      android:id="@+id/track_selection_dialog_view_pager"
+      android:layout_width="match_parent"
+      android:layout_height="0dp"
+      android:layout_weight="1">
+    <android.support.design.widget.TabLayout
+        android:id="@+id/track_selection_dialog_tab_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+  </android.support.v4.view.ViewPager>
+  <LinearLayout
+      android:orientation="horizontal"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:gravity="end">
+    <Button
+        android:id="@+id/track_selection_dialog_cancel_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@android:string/cancel"
+        style="?android:attr/borderlessButtonStyle"/>
+    <Button
+        android:id="@+id/track_selection_dialog_ok_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@android:string/ok"
+        style="?android:attr/borderlessButtonStyle"/>
+  </LinearLayout>
+</LinearLayout>
diff --git a/demos/main/src/main/res/layout/download_dialog_tab.xml b/demos/main/src/main/res/layout/track_selection_dialog_tab.xml
similarity index 100%
rename from demos/main/src/main/res/layout/download_dialog_tab.xml
rename to demos/main/src/main/res/layout/track_selection_dialog_tab.xml

From 12ed18c74cac660433a6ed796fd26e423adfcc19 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 14 Feb 2019 15:42:16 +0000
Subject: [PATCH 537/832] Add encryption information to initialization segments

PiperOrigin-RevId: 233953493
---
 .../source/hls/playlist/HlsMediaPlaylist.java | 13 ++++-
 .../hls/playlist/HlsPlaylistParser.java       | 34 +++++++----
 .../playlist/HlsMediaPlaylistParserTest.java  | 57 +++++++++++++++++++
 3 files changed, 90 insertions(+), 14 deletions(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java
index 81d4e7a818..5200de048b 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java
@@ -88,8 +88,15 @@ public final class HlsMediaPlaylist extends HlsPlaylist {
      * @param uri See {@link #url}.
      * @param byterangeOffset See {@link #byterangeOffset}.
      * @param byterangeLength See {@link #byterangeLength}.
+     * @param fullSegmentEncryptionKeyUri See {@link #fullSegmentEncryptionKeyUri}.
+     * @param encryptionIV See {@link #encryptionIV}.
      */
-    public Segment(String uri, long byterangeOffset, long byterangeLength) {
+    public Segment(
+        String uri,
+        long byterangeOffset,
+        long byterangeLength,
+        String fullSegmentEncryptionKeyUri,
+        String encryptionIV) {
       this(
           uri,
           /* initializationSegment= */ null,
@@ -98,8 +105,8 @@ public final class HlsMediaPlaylist extends HlsPlaylist {
           /* relativeDiscontinuitySequence= */ -1,
           /* relativeStartTimeUs= */ C.TIME_UNSET,
           /* drmInitData= */ null,
-          /* fullSegmentEncryptionKeyUri= */ null,
-          /* encryptionIV= */ null,
+          fullSegmentEncryptionKeyUri,
+          encryptionIV,
           byterangeOffset,
           byterangeLength,
           /* hasGapTag= */ false);
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
index 26e1e1a9a7..58d1597d95 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
@@ -455,8 +455,8 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
     boolean hasGapTag = false;
 
     DrmInitData playlistProtectionSchemes = null;
-    String encryptionKeyUri = null;
-    String encryptionIV = null;
+    String fullSegmentEncryptionKeyUri = null;
+    String fullSegmentEncryptionIV = null;
     TreeMap<String, SchemeData> currentSchemeDatas = new TreeMap<>();
     String encryptionScheme = null;
     DrmInitData cachedDrmInitData = null;
@@ -489,7 +489,19 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
             segmentByteRangeOffset = Long.parseLong(splitByteRange[1]);
           }
         }
-        initializationSegment = new Segment(uri, segmentByteRangeOffset, segmentByteRangeLength);
+        if (fullSegmentEncryptionKeyUri != null && fullSegmentEncryptionIV == null) {
+          // See RFC 8216, Section 4.3.2.5.
+          throw new ParserException(
+              "The encryption IV attribute must be present when an initialization segment is "
+                  + "encrypted with METHOD=AES-128.");
+        }
+        initializationSegment =
+            new Segment(
+                uri,
+                segmentByteRangeOffset,
+                segmentByteRangeLength,
+                fullSegmentEncryptionKeyUri,
+                fullSegmentEncryptionIV);
         segmentByteRangeOffset = 0;
         segmentByteRangeLength = C.LENGTH_UNSET;
       } else if (line.startsWith(TAG_TARGET_DURATION)) {
@@ -521,17 +533,17 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
         String method = parseStringAttr(line, REGEX_METHOD, variableDefinitions);
         String keyFormat =
             parseOptionalStringAttr(line, REGEX_KEYFORMAT, KEYFORMAT_IDENTITY, variableDefinitions);
-        encryptionKeyUri = null;
-        encryptionIV = null;
+        fullSegmentEncryptionKeyUri = null;
+        fullSegmentEncryptionIV = null;
         if (METHOD_NONE.equals(method)) {
           currentSchemeDatas.clear();
           cachedDrmInitData = null;
         } else /* !METHOD_NONE.equals(method) */ {
-          encryptionIV = parseOptionalStringAttr(line, REGEX_IV, variableDefinitions);
+          fullSegmentEncryptionIV = parseOptionalStringAttr(line, REGEX_IV, variableDefinitions);
           if (KEYFORMAT_IDENTITY.equals(keyFormat)) {
             if (METHOD_AES_128.equals(method)) {
               // The segment is fully encrypted using an identity key.
-              encryptionKeyUri = parseStringAttr(line, REGEX_URI, variableDefinitions);
+              fullSegmentEncryptionKeyUri = parseStringAttr(line, REGEX_URI, variableDefinitions);
             } else {
               // Do nothing. Samples are encrypted using an identity key, but this is not supported.
               // Hopefully, a traditional DRM alternative is also provided.
@@ -581,10 +593,10 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
         hasEndTag = true;
       } else if (!line.startsWith("#")) {
         String segmentEncryptionIV;
-        if (encryptionKeyUri == null) {
+        if (fullSegmentEncryptionKeyUri == null) {
           segmentEncryptionIV = null;
-        } else if (encryptionIV != null) {
-          segmentEncryptionIV = encryptionIV;
+        } else if (fullSegmentEncryptionIV != null) {
+          segmentEncryptionIV = fullSegmentEncryptionIV;
         } else {
           segmentEncryptionIV = Long.toHexString(segmentMediaSequence);
         }
@@ -615,7 +627,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
                 relativeDiscontinuitySequence,
                 segmentStartTimeUs,
                 cachedDrmInitData,
-                encryptionKeyUri,
+                fullSegmentEncryptionKeyUri,
                 segmentEncryptionIV,
                 segmentByteRangeOffset,
                 segmentByteRangeLength,
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java
index e7bf3c6324..9fc761badb 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java
@@ -16,9 +16,11 @@
 package com.google.android.exoplayer2.source.hls.playlist;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
 
 import android.net.Uri;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist.Segment;
 import com.google.android.exoplayer2.util.Util;
 import java.io.ByteArrayInputStream;
@@ -365,6 +367,61 @@ public class HlsMediaPlaylistParserTest {
     assertThat(segments.get(3).initializationSegment.url).isEqualTo("init2.ts");
   }
 
+  @Test
+  public void testEncryptedMapTag() throws IOException {
+    Uri playlistUri = Uri.parse("https://example.com/test3.m3u8");
+    String playlistString =
+        "#EXTM3U\n"
+            + "#EXT-X-VERSION:3\n"
+            + "#EXT-X-TARGETDURATION:5\n"
+            + "#EXT-X-MEDIA-SEQUENCE:10\n"
+            + "#EXT-X-KEY:METHOD=AES-128,"
+            + "URI=\"https://priv.example.com/key.php?r=2680\",IV=0x1566B\n"
+            + "#EXT-X-MAP:URI=\"init1.ts\""
+            + "#EXTINF:5.005,\n"
+            + "02/00/32.ts\n"
+            + "#EXT-X-KEY:METHOD=NONE\n"
+            + "#EXT-X-MAP:URI=\"init2.ts\""
+            + "#EXTINF:5.005,\n"
+            + "02/00/47.ts\n";
+    InputStream inputStream = new ByteArrayInputStream(Util.getUtf8Bytes(playlistString));
+    HlsMediaPlaylist playlist =
+        (HlsMediaPlaylist) new HlsPlaylistParser().parse(playlistUri, inputStream);
+
+    List<Segment> segments = playlist.segments;
+    Segment initSegment1 = segments.get(0).initializationSegment;
+    assertThat(initSegment1.fullSegmentEncryptionKeyUri)
+        .isEqualTo("https://priv.example.com/key.php?r=2680");
+    assertThat(initSegment1.encryptionIV).isEqualTo("0x1566B");
+    Segment initSegment2 = segments.get(1).initializationSegment;
+    assertThat(initSegment2.fullSegmentEncryptionKeyUri).isNull();
+    assertThat(initSegment2.encryptionIV).isNull();
+  }
+
+  @Test
+  public void testEncryptedMapTagWithNoIvFails() throws IOException {
+    Uri playlistUri = Uri.parse("https://example.com/test3.m3u8");
+    String playlistString =
+        "#EXTM3U\n"
+            + "#EXT-X-VERSION:3\n"
+            + "#EXT-X-TARGETDURATION:5\n"
+            + "#EXT-X-MEDIA-SEQUENCE:10\n"
+            + "#EXT-X-KEY:METHOD=AES-128,"
+            + "URI=\"https://priv.example.com/key.php?r=2680\"\n"
+            + "#EXT-X-MAP:URI=\"init1.ts\""
+            + "#EXTINF:5.005,\n"
+            + "02/00/32.ts\n";
+    InputStream inputStream = new ByteArrayInputStream(Util.getUtf8Bytes(playlistString));
+
+    try {
+      new HlsPlaylistParser().parse(playlistUri, inputStream);
+      fail();
+    } catch (ParserException e) {
+      // Expected because the initialization segment does not have a defined initialization vector,
+      // although it is affected by an EXT-X-KEY tag.
+    }
+  }
+
   @Test
   public void testMasterPlaylistAttributeInheritance() throws IOException {
     Uri playlistUri = Uri.parse("https://example.com/test3.m3u8");

From 3e6cf42f83635a6db42915797d4bc057a0b85bde Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 14 Feb 2019 19:06:19 +0000
Subject: [PATCH 538/832] Factor out default audio sink configuration

This cleanup is in preparation for draining audio processors on reconfiguration
to a format that doesn't require a new AudioTrack to be created.

PiperOrigin-RevId: 233990983
---
 .../exoplayer2/audio/DefaultAudioSink.java    | 401 ++++++++++--------
 1 file changed, 228 insertions(+), 173 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
index 6f3ee63d3d..baeea07683 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
@@ -242,18 +242,10 @@ public final class DefaultAudioSink implements AudioSink {
   /** Used to keep the audio session active on pre-V21 builds (see {@link #initialize()}). */
   @Nullable private AudioTrack keepSessionIdAudioTrack;
 
+  private Configuration configuration;
   private AudioTrack audioTrack;
-  private boolean isInputPcm;
-  private boolean shouldConvertHighResIntPcmToFloat;
-  private int inputSampleRate;
-  private int outputSampleRate;
-  private int outputChannelConfig;
-  private @C.Encoding int outputEncoding;
-  private AudioAttributes audioAttributes;
-  private boolean processingEnabled;
-  private boolean canApplyPlaybackParameters;
-  private int bufferSize;
 
+  private AudioAttributes audioAttributes;
   @Nullable private PlaybackParameters afterDrainPlaybackParameters;
   private PlaybackParameters playbackParameters;
   private long playbackParametersOffsetUs;
@@ -262,10 +254,8 @@ public final class DefaultAudioSink implements AudioSink {
   @Nullable private ByteBuffer avSyncHeader;
   private int bytesUntilNextAvSync;
 
-  private int pcmFrameSize;
   private long submittedPcmBytes;
   private long submittedEncodedFrames;
-  private int outputPcmFrameSize;
   private long writtenPcmBytes;
   private long writtenEncodedFrames;
   private int framesPerEncodedSample;
@@ -397,7 +387,7 @@ public final class DefaultAudioSink implements AudioSink {
       return CURRENT_POSITION_NOT_SET;
     }
     long positionUs = audioTrackPositionTracker.getCurrentPositionUs(sourceEnded);
-    positionUs = Math.min(positionUs, framesToDurationUs(getWrittenFrames()));
+    positionUs = Math.min(positionUs, configuration.framesToDurationUs(getWrittenFrames()));
     return startMediaTimeUs + applySkipping(applySpeedup(positionUs));
   }
 
@@ -411,23 +401,7 @@ public final class DefaultAudioSink implements AudioSink {
       int trimStartFrames,
       int trimEndFrames)
       throws ConfigurationException {
-    boolean flush = false;
-    this.inputSampleRate = inputSampleRate;
-    int channelCount = inputChannelCount;
-    int sampleRate = inputSampleRate;
-    isInputPcm = Util.isEncodingLinearPcm(inputEncoding);
-    shouldConvertHighResIntPcmToFloat =
-        enableConvertHighResIntPcmToFloat
-            && supportsOutput(channelCount, C.ENCODING_PCM_FLOAT)
-            && Util.isEncodingHighResolutionIntegerPcm(inputEncoding);
-    if (isInputPcm) {
-      pcmFrameSize = Util.getPcmFrameSize(inputEncoding, channelCount);
-    }
-    @C.Encoding int encoding = inputEncoding;
-    boolean processingEnabled = isInputPcm && inputEncoding != C.ENCODING_PCM_FLOAT;
-    canApplyPlaybackParameters = processingEnabled && !shouldConvertHighResIntPcmToFloat;
-
-    if (Util.SDK_INT < 21 && channelCount == 8 && outputChannels == null) {
+    if (Util.SDK_INT < 21 && inputChannelCount == 8 && outputChannels == null) {
       // AudioTrack doesn't support 8 channel output before Android L. Discard the last two (side)
       // channels to give a 6 channel stream that is supported.
       outputChannels = new int[6];
@@ -436,10 +410,24 @@ public final class DefaultAudioSink implements AudioSink {
       }
     }
 
+    boolean isInputPcm = Util.isEncodingLinearPcm(inputEncoding);
+    boolean processingEnabled = isInputPcm && inputEncoding != C.ENCODING_PCM_FLOAT;
+    int sampleRate = inputSampleRate;
+    int channelCount = inputChannelCount;
+    @C.Encoding int encoding = inputEncoding;
+    boolean shouldConvertHighResIntPcmToFloat =
+        enableConvertHighResIntPcmToFloat
+            && supportsOutput(inputChannelCount, C.ENCODING_PCM_FLOAT)
+            && Util.isEncodingHighResolutionIntegerPcm(inputEncoding);
+    AudioProcessor[] availableAudioProcessors =
+        shouldConvertHighResIntPcmToFloat
+            ? toFloatPcmAvailableAudioProcessors
+            : toIntPcmAvailableAudioProcessors;
+    boolean flush = false;
     if (processingEnabled) {
       trimmingAudioProcessor.setTrimFrameCount(trimStartFrames, trimEndFrames);
       channelMappingAudioProcessor.setChannelMap(outputChannels);
-      for (AudioProcessor audioProcessor : getAvailableAudioProcessors()) {
+      for (AudioProcessor audioProcessor : availableAudioProcessors) {
         try {
           flush |= audioProcessor.configure(sampleRate, channelCount, encoding);
         } catch (AudioProcessor.UnhandledFormatException e) {
@@ -453,53 +441,39 @@ public final class DefaultAudioSink implements AudioSink {
       }
     }
 
-    int channelConfig = getChannelConfig(channelCount, isInputPcm);
-    if (channelConfig == AudioFormat.CHANNEL_INVALID) {
+    int outputChannelConfig = getChannelConfig(channelCount, isInputPcm);
+    if (outputChannelConfig == AudioFormat.CHANNEL_INVALID) {
       throw new ConfigurationException("Unsupported channel count: " + channelCount);
     }
 
-    if (!flush
-        && isInitialized()
-        && outputEncoding == encoding
-        && outputSampleRate == sampleRate
-        && outputChannelConfig == channelConfig) {
-      // We already have an audio track with the correct sample rate, channel config and encoding.
-      return;
-    }
-
-    flush();
-
-    this.processingEnabled = processingEnabled;
-    outputSampleRate = sampleRate;
-    outputChannelConfig = channelConfig;
-    outputEncoding = encoding;
-    outputPcmFrameSize =
-        isInputPcm ? Util.getPcmFrameSize(outputEncoding, channelCount) : C.LENGTH_UNSET;
-    bufferSize = specifiedBufferSize != 0 ? specifiedBufferSize : getDefaultBufferSize();
-  }
-
-  private int getDefaultBufferSize() {
-    if (isInputPcm) {
-      int minBufferSize =
-          AudioTrack.getMinBufferSize(outputSampleRate, outputChannelConfig, outputEncoding);
-      Assertions.checkState(minBufferSize != ERROR_BAD_VALUE);
-      int multipliedBufferSize = minBufferSize * BUFFER_MULTIPLICATION_FACTOR;
-      int minAppBufferSize = (int) durationUsToFrames(MIN_BUFFER_DURATION_US) * outputPcmFrameSize;
-      int maxAppBufferSize = (int) Math.max(minBufferSize,
-          durationUsToFrames(MAX_BUFFER_DURATION_US) * outputPcmFrameSize);
-      return Util.constrainValue(multipliedBufferSize, minAppBufferSize, maxAppBufferSize);
-    } else {
-      int rate = getMaximumEncodedRateBytesPerSecond(outputEncoding);
-      if (outputEncoding == C.ENCODING_AC3) {
-        rate *= AC3_BUFFER_MULTIPLICATION_FACTOR;
-      }
-      return (int) (PASSTHROUGH_BUFFER_DURATION_US * rate / C.MICROS_PER_SECOND);
+    int inputPcmFrameSize =
+        isInputPcm ? Util.getPcmFrameSize(inputEncoding, inputChannelCount) : C.LENGTH_UNSET;
+    int outputPcmFrameSize =
+        isInputPcm ? Util.getPcmFrameSize(encoding, channelCount) : C.LENGTH_UNSET;
+    boolean canApplyPlaybackParameters = processingEnabled && !shouldConvertHighResIntPcmToFloat;
+    Configuration pendingConfiguration =
+        new Configuration(
+            isInputPcm,
+            inputPcmFrameSize,
+            inputSampleRate,
+            outputPcmFrameSize,
+            sampleRate,
+            outputChannelConfig,
+            encoding,
+            specifiedBufferSize,
+            processingEnabled,
+            canApplyPlaybackParameters,
+            availableAudioProcessors);
+    if (flush || configuration == null || !pendingConfiguration.canReuseAudioTrack(configuration)) {
+      flush();
     }
+    configuration = pendingConfiguration;
   }
 
   private void setupAudioProcessors() {
+    AudioProcessor[] audioProcessors = configuration.availableAudioProcessors;
     ArrayList<AudioProcessor> newAudioProcessors = new ArrayList<>();
-    for (AudioProcessor audioProcessor : getAvailableAudioProcessors()) {
+    for (AudioProcessor audioProcessor : audioProcessors) {
       if (audioProcessor.isActive()) {
         newAudioProcessors.add(audioProcessor);
       } else {
@@ -528,7 +502,9 @@ public final class DefaultAudioSink implements AudioSink {
     // initialization of the audio track to fail.
     releasingConditionVariable.block();
 
-    audioTrack = initializeAudioTrack();
+    audioTrack =
+        Assertions.checkNotNull(configuration)
+            .buildAudioTrack(tunneling, audioAttributes, audioSessionId);
     int audioSessionId = audioTrack.getAudioSessionId();
     if (enablePreV21AudioSessionWorkaround) {
       if (Util.SDK_INT < 21) {
@@ -551,13 +527,16 @@ public final class DefaultAudioSink implements AudioSink {
     }
 
     playbackParameters =
-        canApplyPlaybackParameters
+        configuration.canApplyPlaybackParameters
             ? audioProcessorChain.applyPlaybackParameters(playbackParameters)
             : PlaybackParameters.DEFAULT;
     setupAudioProcessors();
 
     audioTrackPositionTracker.setAudioTrack(
-        audioTrack, outputEncoding, outputPcmFrameSize, bufferSize);
+        audioTrack,
+        configuration.outputEncoding,
+        configuration.outputPcmFrameSize,
+        configuration.bufferSize);
     setVolumeInternal();
 
     if (auxEffectInfo.effectId != AuxEffectInfo.NO_AUX_EFFECT_ID) {
@@ -606,9 +585,9 @@ public final class DefaultAudioSink implements AudioSink {
         return true;
       }
 
-      if (!isInputPcm && framesPerEncodedSample == 0) {
+      if (!configuration.isInputPcm && framesPerEncodedSample == 0) {
         // If this is the first encoded sample, calculate the sample size in frames.
-        framesPerEncodedSample = getFramesPerEncodedSample(outputEncoding, buffer);
+        framesPerEncodedSample = getFramesPerEncodedSample(configuration.outputEncoding, buffer);
         if (framesPerEncodedSample == 0) {
           // We still don't know the number of frames per sample, so drop the buffer.
           // For TrueHD this can occur after some seek operations, as not every sample starts with
@@ -631,7 +610,7 @@ public final class DefaultAudioSink implements AudioSink {
             new PlaybackParametersCheckpoint(
                 newPlaybackParameters,
                 Math.max(0, presentationTimeUs),
-                framesToDurationUs(getWrittenFrames())));
+                configuration.framesToDurationUs(getWrittenFrames())));
         // Update the set of active audio processors to take into account the new parameters.
         setupAudioProcessors();
       }
@@ -643,7 +622,7 @@ public final class DefaultAudioSink implements AudioSink {
         // Sanity check that presentationTimeUs is consistent with the expected value.
         long expectedPresentationTimeUs =
             startMediaTimeUs
-                + inputFramesToDurationUs(
+                + configuration.inputFramesToDurationUs(
                     getSubmittedFrames() - trimmingAudioProcessor.getTrimmedFrameCount());
         if (startMediaTimeState == START_IN_SYNC
             && Math.abs(expectedPresentationTimeUs - presentationTimeUs) > 200000) {
@@ -663,7 +642,7 @@ public final class DefaultAudioSink implements AudioSink {
         }
       }
 
-      if (isInputPcm) {
+      if (configuration.isInputPcm) {
         submittedPcmBytes += buffer.remaining();
       } else {
         submittedEncodedFrames += framesPerEncodedSample;
@@ -672,7 +651,7 @@ public final class DefaultAudioSink implements AudioSink {
       inputBuffer = buffer;
     }
 
-    if (processingEnabled) {
+    if (configuration.processingEnabled) {
       processBuffers(presentationTimeUs);
     } else {
       writeBuffer(inputBuffer, presentationTimeUs);
@@ -769,11 +748,11 @@ public final class DefaultAudioSink implements AudioSink {
       throw new WriteException(bytesWritten);
     }
 
-    if (isInputPcm) {
+    if (configuration.isInputPcm) {
       writtenPcmBytes += bytesWritten;
     }
     if (bytesWritten == bytesRemaining) {
-      if (!isInputPcm) {
+      if (!configuration.isInputPcm) {
         writtenEncodedFrames += framesPerEncodedSample;
       }
       outputBuffer = null;
@@ -798,7 +777,8 @@ public final class DefaultAudioSink implements AudioSink {
   private boolean drainAudioProcessorsToEndOfStream() throws WriteException {
     boolean audioProcessorNeedsEndOfStream = false;
     if (drainingAudioProcessorIndex == C.INDEX_UNSET) {
-      drainingAudioProcessorIndex = processingEnabled ? 0 : activeAudioProcessors.length;
+      drainingAudioProcessorIndex =
+          configuration.processingEnabled ? 0 : activeAudioProcessors.length;
       audioProcessorNeedsEndOfStream = true;
     }
     while (drainingAudioProcessorIndex < activeAudioProcessors.length) {
@@ -837,7 +817,7 @@ public final class DefaultAudioSink implements AudioSink {
 
   @Override
   public PlaybackParameters setPlaybackParameters(PlaybackParameters playbackParameters) {
-    if (isInitialized() && !canApplyPlaybackParameters) {
+    if (configuration != null && !configuration.canApplyPlaybackParameters) {
       this.playbackParameters = PlaybackParameters.DEFAULT;
       return this.playbackParameters;
     }
@@ -1060,99 +1040,27 @@ public final class DefaultAudioSink implements AudioSink {
   }
 
   private long applySkipping(long positionUs) {
-    return positionUs + framesToDurationUs(audioProcessorChain.getSkippedOutputFrameCount());
+    return positionUs
+        + configuration.framesToDurationUs(audioProcessorChain.getSkippedOutputFrameCount());
   }
 
   private boolean isInitialized() {
     return audioTrack != null;
   }
 
-  private long inputFramesToDurationUs(long frameCount) {
-    return (frameCount * C.MICROS_PER_SECOND) / inputSampleRate;
-  }
-
-  private long framesToDurationUs(long frameCount) {
-    return (frameCount * C.MICROS_PER_SECOND) / outputSampleRate;
-  }
-
-  private long durationUsToFrames(long durationUs) {
-    return (durationUs * outputSampleRate) / C.MICROS_PER_SECOND;
-  }
-
   private long getSubmittedFrames() {
-    return isInputPcm ? (submittedPcmBytes / pcmFrameSize) : submittedEncodedFrames;
+    return configuration.isInputPcm
+        ? (submittedPcmBytes / configuration.inputPcmFrameSize)
+        : submittedEncodedFrames;
   }
 
   private long getWrittenFrames() {
-    return isInputPcm ? (writtenPcmBytes / outputPcmFrameSize) : writtenEncodedFrames;
+    return configuration.isInputPcm
+        ? (writtenPcmBytes / configuration.outputPcmFrameSize)
+        : writtenEncodedFrames;
   }
 
-  private AudioTrack initializeAudioTrack() throws InitializationException {
-    AudioTrack audioTrack;
-    if (Util.SDK_INT >= 21) {
-      audioTrack = createAudioTrackV21();
-    } else {
-      int streamType = Util.getStreamTypeForAudioUsage(audioAttributes.usage);
-      if (audioSessionId == C.AUDIO_SESSION_ID_UNSET) {
-        audioTrack =
-            new AudioTrack(
-                streamType,
-                outputSampleRate,
-                outputChannelConfig,
-                outputEncoding,
-                bufferSize,
-                MODE_STREAM);
-      } else {
-        // Re-attach to the same audio session.
-        audioTrack =
-            new AudioTrack(
-                streamType,
-                outputSampleRate,
-                outputChannelConfig,
-                outputEncoding,
-                bufferSize,
-                MODE_STREAM,
-                audioSessionId);
-      }
-    }
-
-    int state = audioTrack.getState();
-    if (state != STATE_INITIALIZED) {
-      try {
-        audioTrack.release();
-      } catch (Exception e) {
-        // The track has already failed to initialize, so it wouldn't be that surprising if release
-        // were to fail too. Swallow the exception.
-      }
-      throw new InitializationException(state, outputSampleRate, outputChannelConfig, bufferSize);
-    }
-    return audioTrack;
-  }
-
-  @TargetApi(21)
-  private AudioTrack createAudioTrackV21() {
-    android.media.AudioAttributes attributes;
-    if (tunneling) {
-      attributes = new android.media.AudioAttributes.Builder()
-          .setContentType(android.media.AudioAttributes.CONTENT_TYPE_MOVIE)
-          .setFlags(android.media.AudioAttributes.FLAG_HW_AV_SYNC)
-          .setUsage(android.media.AudioAttributes.USAGE_MEDIA)
-          .build();
-    } else {
-      attributes = audioAttributes.getAudioAttributesV21();
-    }
-    AudioFormat format =
-        new AudioFormat.Builder()
-            .setChannelMask(outputChannelConfig)
-            .setEncoding(outputEncoding)
-            .setSampleRate(outputSampleRate)
-            .build();
-    int audioSessionId = this.audioSessionId != C.AUDIO_SESSION_ID_UNSET ? this.audioSessionId
-        : AudioManager.AUDIO_SESSION_ID_GENERATE;
-    return new AudioTrack(attributes, format, bufferSize, MODE_STREAM, audioSessionId);
-  }
-
-  private AudioTrack initializeKeepSessionIdAudioTrack(int audioSessionId) {
+  private static AudioTrack initializeKeepSessionIdAudioTrack(int audioSessionId) {
     int sampleRate = 4000; // Equal to private AudioTrack.MIN_SAMPLE_RATE.
     int channelConfig = AudioFormat.CHANNEL_OUT_MONO;
     @C.PcmEncoding int encoding = C.ENCODING_PCM_16BIT;
@@ -1161,12 +1069,6 @@ public final class DefaultAudioSink implements AudioSink {
         MODE_STATIC, audioSessionId);
   }
 
-  private AudioProcessor[] getAvailableAudioProcessors() {
-    return shouldConvertHighResIntPcmToFloat
-        ? toFloatPcmAvailableAudioProcessors
-        : toIntPcmAvailableAudioProcessors;
-  }
-
   private static int getChannelConfig(int channelCount, boolean isInputPcm) {
     if (Util.SDK_INT <= 28 && !isInputPcm) {
       // In passthrough mode the channel count used to configure the audio track doesn't affect how
@@ -1288,9 +1190,7 @@ public final class DefaultAudioSink implements AudioSink {
     audioTrack.setStereoVolume(volume, volume);
   }
 
-  /**
-   * Stores playback parameters with the position and media time at which they apply.
-   */
+  /** Stores playback parameters with the position and media time at which they apply. */
   private static final class PlaybackParametersCheckpoint {
 
     private final PlaybackParameters playbackParameters;
@@ -1371,4 +1271,159 @@ public final class DefaultAudioSink implements AudioSink {
       }
     }
   }
+
+  /** Stores configuration relating to the audio format. */
+  private static final class Configuration {
+
+    public final boolean isInputPcm;
+    public final int inputPcmFrameSize;
+    public final int inputSampleRate;
+    public final int outputPcmFrameSize;
+    public final int outputSampleRate;
+    public final int outputChannelConfig;
+    @C.Encoding public final int outputEncoding;
+    public final int bufferSize;
+    public final boolean processingEnabled;
+    public final boolean canApplyPlaybackParameters;
+    public final AudioProcessor[] availableAudioProcessors;
+
+    public Configuration(
+        boolean isInputPcm,
+        int inputPcmFrameSize,
+        int inputSampleRate,
+        int outputPcmFrameSize,
+        int outputSampleRate,
+        int outputChannelConfig,
+        int outputEncoding,
+        int specifiedBufferSize,
+        boolean processingEnabled,
+        boolean canApplyPlaybackParameters,
+        AudioProcessor[] availableAudioProcessors) {
+      this.isInputPcm = isInputPcm;
+      this.inputPcmFrameSize = inputPcmFrameSize;
+      this.inputSampleRate = inputSampleRate;
+      this.outputPcmFrameSize = outputPcmFrameSize;
+      this.outputSampleRate = outputSampleRate;
+      this.outputChannelConfig = outputChannelConfig;
+      this.outputEncoding = outputEncoding;
+      this.bufferSize = specifiedBufferSize != 0 ? specifiedBufferSize : getDefaultBufferSize();
+      this.processingEnabled = processingEnabled;
+      this.canApplyPlaybackParameters = canApplyPlaybackParameters;
+      this.availableAudioProcessors = availableAudioProcessors;
+    }
+
+    public boolean canReuseAudioTrack(Configuration audioTrackConfiguration) {
+      return audioTrackConfiguration.outputEncoding == outputEncoding
+          && audioTrackConfiguration.outputSampleRate == outputSampleRate
+          && audioTrackConfiguration.outputChannelConfig == outputChannelConfig;
+    }
+
+    public long inputFramesToDurationUs(long frameCount) {
+      return (frameCount * C.MICROS_PER_SECOND) / inputSampleRate;
+    }
+
+    public long framesToDurationUs(long frameCount) {
+      return (frameCount * C.MICROS_PER_SECOND) / outputSampleRate;
+    }
+
+    public long durationUsToFrames(long durationUs) {
+      return (durationUs * outputSampleRate) / C.MICROS_PER_SECOND;
+    }
+
+    public AudioTrack buildAudioTrack(
+        boolean tunneling, AudioAttributes audioAttributes, int audioSessionId)
+        throws InitializationException {
+      AudioTrack audioTrack;
+      if (Util.SDK_INT >= 21) {
+        audioTrack = createAudioTrackV21(tunneling, audioAttributes, audioSessionId);
+      } else {
+        int streamType = Util.getStreamTypeForAudioUsage(audioAttributes.usage);
+        if (audioSessionId == C.AUDIO_SESSION_ID_UNSET) {
+          audioTrack =
+              new AudioTrack(
+                  streamType,
+                  outputSampleRate,
+                  outputChannelConfig,
+                  outputEncoding,
+                  bufferSize,
+                  MODE_STREAM);
+        } else {
+          // Re-attach to the same audio session.
+          audioTrack =
+              new AudioTrack(
+                  streamType,
+                  outputSampleRate,
+                  outputChannelConfig,
+                  outputEncoding,
+                  bufferSize,
+                  MODE_STREAM,
+                  audioSessionId);
+        }
+      }
+
+      int state = audioTrack.getState();
+      if (state != STATE_INITIALIZED) {
+        try {
+          audioTrack.release();
+        } catch (Exception e) {
+          // The track has already failed to initialize, so it wouldn't be that surprising if
+          // release were to fail too. Swallow the exception.
+        }
+        throw new InitializationException(state, outputSampleRate, outputChannelConfig, bufferSize);
+      }
+      return audioTrack;
+    }
+
+    @TargetApi(21)
+    private AudioTrack createAudioTrackV21(
+        boolean tunneling, AudioAttributes audioAttributes, int audioSessionId) {
+      android.media.AudioAttributes attributes;
+      if (tunneling) {
+        attributes =
+            new android.media.AudioAttributes.Builder()
+                .setContentType(android.media.AudioAttributes.CONTENT_TYPE_MOVIE)
+                .setFlags(android.media.AudioAttributes.FLAG_HW_AV_SYNC)
+                .setUsage(android.media.AudioAttributes.USAGE_MEDIA)
+                .build();
+      } else {
+        attributes = audioAttributes.getAudioAttributesV21();
+      }
+      AudioFormat format =
+          new AudioFormat.Builder()
+              .setChannelMask(outputChannelConfig)
+              .setEncoding(outputEncoding)
+              .setSampleRate(outputSampleRate)
+              .build();
+      return new AudioTrack(
+          attributes,
+          format,
+          bufferSize,
+          MODE_STREAM,
+          audioSessionId != C.AUDIO_SESSION_ID_UNSET
+              ? audioSessionId
+              : AudioManager.AUDIO_SESSION_ID_GENERATE);
+    }
+
+    private int getDefaultBufferSize() {
+      if (isInputPcm) {
+        int minBufferSize =
+            AudioTrack.getMinBufferSize(outputSampleRate, outputChannelConfig, outputEncoding);
+        Assertions.checkState(minBufferSize != ERROR_BAD_VALUE);
+        int multipliedBufferSize = minBufferSize * BUFFER_MULTIPLICATION_FACTOR;
+        int minAppBufferSize =
+            (int) durationUsToFrames(MIN_BUFFER_DURATION_US) * outputPcmFrameSize;
+        int maxAppBufferSize =
+            (int)
+                Math.max(
+                    minBufferSize, durationUsToFrames(MAX_BUFFER_DURATION_US) * outputPcmFrameSize);
+        return Util.constrainValue(multipliedBufferSize, minAppBufferSize, maxAppBufferSize);
+      } else {
+        int rate = getMaximumEncodedRateBytesPerSecond(outputEncoding);
+        if (outputEncoding == C.ENCODING_AC3) {
+          rate *= AC3_BUFFER_MULTIPLICATION_FACTOR;
+        }
+        return (int) (PASSTHROUGH_BUFFER_DURATION_US * rate / C.MICROS_PER_SECOND);
+      }
+    }
+  }
 }

From 03006f0595ee6b82fdee6dd5050df53d00451140 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 14 Feb 2019 21:23:47 +0000
Subject: [PATCH 539/832] Fix some AudioProcessor nits

- Fix nullness warnings
- Fix annotations
- Make TeeAudioProcessor flush its sink for every format change

PiperOrigin-RevId: 234017068
---
 .../exoplayer2/ext/gvr/GvrAudioProcessor.java |  5 ++---
 .../audio/ChannelMappingAudioProcessor.java   |  6 +++---
 .../audio/FloatResamplingAudioProcessor.java  |  2 +-
 .../audio/ResamplingAudioProcessor.java       |  2 +-
 .../audio/SilenceSkippingAudioProcessor.java  |  2 +-
 .../exoplayer2/audio/SonicAudioProcessor.java |  7 +++----
 .../exoplayer2/audio/TeeAudioProcessor.java   | 19 ++++++++++---------
 .../audio/TrimmingAudioProcessor.java         |  2 +-
 8 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrAudioProcessor.java b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrAudioProcessor.java
index eca31c98e4..b3429ef06d 100644
--- a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrAudioProcessor.java
+++ b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrAudioProcessor.java
@@ -194,10 +194,9 @@ public final class GvrAudioProcessor implements AudioProcessor {
   }
 
   private void maybeReleaseGvrAudioSurround() {
-    if (this.gvrAudioSurround != null) {
-      GvrAudioSurround gvrAudioSurround = this.gvrAudioSurround;
-      this.gvrAudioSurround = null;
+    if (gvrAudioSurround != null) {
       gvrAudioSurround.release();
+      gvrAudioSurround = null;
     }
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java
index e53eb08c83..a6d4d08077 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java
@@ -32,10 +32,10 @@ import java.util.Arrays;
 
   private int channelCount;
   private int sampleRateHz;
-  private @Nullable int[] pendingOutputChannels;
+  @Nullable private int[] pendingOutputChannels;
 
   private boolean active;
-  private @Nullable int[] outputChannels;
+  @Nullable private int[] outputChannels;
   private ByteBuffer buffer;
   private ByteBuffer outputBuffer;
   private boolean inputEnded;
@@ -112,7 +112,7 @@ import java.util.Arrays;
 
   @Override
   public void queueInput(ByteBuffer inputBuffer) {
-    Assertions.checkState(outputChannels != null);
+    int[] outputChannels = Assertions.checkNotNull(this.outputChannels);
     int position = inputBuffer.position();
     int limit = inputBuffer.limit();
     int frameCount = (limit - position) / (2 * channelCount);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/FloatResamplingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/FloatResamplingAudioProcessor.java
index e3c91cd344..c347cce0d8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/FloatResamplingAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/FloatResamplingAudioProcessor.java
@@ -32,7 +32,7 @@ import java.nio.ByteOrder;
 
   private int sampleRateHz;
   private int channelCount;
-  private @C.PcmEncoding int sourceEncoding;
+  @C.PcmEncoding private int sourceEncoding;
   private ByteBuffer buffer;
   private ByteBuffer outputBuffer;
   private boolean inputEnded;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java
index 3ae1a393f9..ba84b06e95 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java
@@ -28,7 +28,7 @@ import java.nio.ByteOrder;
 
   private int sampleRateHz;
   private int channelCount;
-  private @C.PcmEncoding int encoding;
+  @C.PcmEncoding private int encoding;
   private ByteBuffer buffer;
   private ByteBuffer outputBuffer;
   private boolean inputEnded;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java
index a1ff7028c1..1149a10fb8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java
@@ -93,7 +93,7 @@ public final class SilenceSkippingAudioProcessor implements AudioProcessor {
    */
   private byte[] paddingBuffer;
 
-  private @State int state;
+  @State private int state;
   private int maybeSilenceBufferSize;
   private int paddingSize;
   private boolean hasOutputNoise;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/SonicAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/SonicAudioProcessor.java
index 2ca2d47828..28fd38cccb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/SonicAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/SonicAudioProcessor.java
@@ -69,7 +69,7 @@ public final class SonicAudioProcessor implements AudioProcessor {
   private int outputSampleRateHz;
   private int pendingOutputSampleRateHz;
 
-  private @Nullable Sonic sonic;
+  @Nullable private Sonic sonic;
   private ByteBuffer buffer;
   private ShortBuffer shortBuffer;
   private ByteBuffer outputBuffer;
@@ -201,7 +201,7 @@ public final class SonicAudioProcessor implements AudioProcessor {
 
   @Override
   public void queueInput(ByteBuffer inputBuffer) {
-    Assertions.checkState(sonic != null);
+    Sonic sonic = Assertions.checkNotNull(this.sonic);
     if (inputBuffer.hasRemaining()) {
       ShortBuffer shortBuffer = inputBuffer.asShortBuffer();
       int inputSize = inputBuffer.remaining();
@@ -227,8 +227,7 @@ public final class SonicAudioProcessor implements AudioProcessor {
 
   @Override
   public void queueEndOfStream() {
-    Assertions.checkState(sonic != null);
-    sonic.queueEndOfStream();
+    Assertions.checkNotNull(sonic).queueEndOfStream();
     inputEnded = true;
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/TeeAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/TeeAudioProcessor.java
index 0072b7c2a3..442ade6afb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/TeeAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/TeeAudioProcessor.java
@@ -56,8 +56,7 @@ public final class TeeAudioProcessor implements AudioProcessor {
 
   private int sampleRateHz;
   private int channelCount;
-  private @C.Encoding int encoding;
-  private boolean isActive;
+  @C.Encoding private int encoding;
 
   private ByteBuffer buffer;
   private ByteBuffer outputBuffer;
@@ -79,19 +78,21 @@ public final class TeeAudioProcessor implements AudioProcessor {
   }
 
   @Override
-  public boolean configure(int sampleRateHz, int channelCount, @C.Encoding int encoding)
-      throws UnhandledFormatException {
+  public boolean configure(int sampleRateHz, int channelCount, @C.Encoding int encoding) {
+    boolean formatChanged =
+        sampleRateHz != this.sampleRateHz
+            || channelCount != this.channelCount
+            || encoding != this.encoding;
     this.sampleRateHz = sampleRateHz;
     this.channelCount = channelCount;
     this.encoding = encoding;
-    boolean wasActive = isActive;
-    isActive = true;
-    return !wasActive;
+    // The sink always needs to be flushed if the format is changing.
+    return formatChanged;
   }
 
   @Override
   public boolean isActive() {
-    return isActive;
+    return sampleRateHz != Format.NO_VALUE;
   }
 
   @Override
@@ -145,7 +146,7 @@ public final class TeeAudioProcessor implements AudioProcessor {
   @SuppressWarnings("ReferenceEquality")
   @Override
   public boolean isEnded() {
-    return inputEnded && buffer == EMPTY_BUFFER;
+    return inputEnded && outputBuffer == EMPTY_BUFFER;
   }
 
   @Override
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
index 7b66bd63d2..3225defaf9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
@@ -25,7 +25,7 @@ import java.nio.ByteOrder;
 /** Audio processor for trimming samples from the start/end of data. */
 /* package */ final class TrimmingAudioProcessor implements AudioProcessor {
 
-  private static final int OUTPUT_ENCODING = C.ENCODING_PCM_16BIT;
+  @C.Encoding private static final int OUTPUT_ENCODING = C.ENCODING_PCM_16BIT;
 
   private boolean isActive;
   private int trimStartFrames;

From 83545fb7b2d929c7bcd83210496546cb009de2b4 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 14 Feb 2019 22:06:03 +0000
Subject: [PATCH 540/832] Factor out common audio processor functionality

PiperOrigin-RevId: 234025553
---
 .../exoplayer2/audio/AudioProcessor.java      |   7 +-
 .../exoplayer2/audio/BaseAudioProcessor.java  | 155 ++++++++++++++++++
 .../audio/ChannelMappingAudioProcessor.java   |  74 +--------
 .../audio/FloatResamplingAudioProcessor.java  |  86 +---------
 .../audio/ResamplingAudioProcessor.java       |  80 +--------
 .../audio/SilenceSkippingAudioProcessor.java  |  93 ++---------
 .../exoplayer2/audio/TeeAudioProcessor.java   | 113 ++-----------
 .../audio/TrimmingAudioProcessor.java         |  75 ++-------
 8 files changed, 218 insertions(+), 465 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/audio/BaseAudioProcessor.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java
index f82be31f72..4cf8ef2a8b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java
@@ -38,7 +38,8 @@ public interface AudioProcessor {
   /** Exception thrown when a processor can't be configured for a given input audio format. */
   final class UnhandledFormatException extends Exception {
 
-    public UnhandledFormatException(int sampleRateHz, int channelCount, @C.Encoding int encoding) {
+    public UnhandledFormatException(
+        int sampleRateHz, int channelCount, @C.PcmEncoding int encoding) {
       super("Unhandled format: " + sampleRateHz + " Hz, " + channelCount + " channels in encoding "
           + encoding);
     }
@@ -60,7 +61,7 @@ public interface AudioProcessor {
    * @return Whether to {@link #flush()} the processor.
    * @throws UnhandledFormatException Thrown if the specified format can't be handled as input.
    */
-  boolean configure(int sampleRateHz, int channelCount, @C.Encoding int encoding)
+  boolean configure(int sampleRateHz, int channelCount, @C.PcmEncoding int encoding)
       throws UnhandledFormatException;
 
   /** Returns whether the processor is configured and will process input buffers. */
@@ -78,7 +79,7 @@ public interface AudioProcessor {
    * result of calling {@link #configure(int, int, int)} and is undefined if the instance is not
    * active.
    */
-  @C.Encoding
+  @C.PcmEncoding
   int getOutputEncoding();
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/BaseAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/BaseAudioProcessor.java
new file mode 100644
index 0000000000..0357326a31
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/BaseAudioProcessor.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.audio;
+
+import android.support.annotation.CallSuper;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+/**
+ * Base class for audio processors that keep an output buffer and an internal buffer that is reused
+ * whenever input is queued.
+ */
+public abstract class BaseAudioProcessor implements AudioProcessor {
+
+  /** The configured input sample rate, in Hertz, or {@link Format#NO_VALUE} if not configured. */
+  protected int sampleRateHz;
+  /** The configured input channel count, or {@link Format#NO_VALUE} if not configured. */
+  protected int channelCount;
+  /** The configured input encoding, or {@link Format#NO_VALUE} if not configured. */
+  @C.PcmEncoding protected int encoding;
+
+  private ByteBuffer buffer;
+  private ByteBuffer outputBuffer;
+  private boolean inputEnded;
+
+  public BaseAudioProcessor() {
+    buffer = EMPTY_BUFFER;
+    outputBuffer = EMPTY_BUFFER;
+    channelCount = Format.NO_VALUE;
+    sampleRateHz = Format.NO_VALUE;
+    encoding = Format.NO_VALUE;
+  }
+
+  @Override
+  public boolean isActive() {
+    return sampleRateHz != Format.NO_VALUE;
+  }
+
+  @Override
+  public int getOutputChannelCount() {
+    return channelCount;
+  }
+
+  @Override
+  public int getOutputEncoding() {
+    return encoding;
+  }
+
+  @Override
+  public int getOutputSampleRateHz() {
+    return sampleRateHz;
+  }
+
+  @Override
+  public final void queueEndOfStream() {
+    inputEnded = true;
+    onQueueEndOfStream();
+  }
+
+  @CallSuper
+  @Override
+  public ByteBuffer getOutput() {
+    ByteBuffer outputBuffer = this.outputBuffer;
+    this.outputBuffer = EMPTY_BUFFER;
+    return outputBuffer;
+  }
+
+  @CallSuper
+  @SuppressWarnings("ReferenceEquality")
+  @Override
+  public boolean isEnded() {
+    return inputEnded && outputBuffer == EMPTY_BUFFER;
+  }
+
+  @Override
+  public final void flush() {
+    outputBuffer = EMPTY_BUFFER;
+    inputEnded = false;
+    onFlush();
+  }
+
+  @Override
+  public final void reset() {
+    flush();
+    buffer = EMPTY_BUFFER;
+    sampleRateHz = Format.NO_VALUE;
+    channelCount = Format.NO_VALUE;
+    encoding = Format.NO_VALUE;
+    onReset();
+  }
+
+  /** Sets the input format of this processor, returning whether the input format has changed. */
+  protected final boolean setInputFormat(
+      int sampleRateHz, int channelCount, @C.PcmEncoding int encoding) {
+    if (sampleRateHz == this.sampleRateHz
+        && channelCount == this.channelCount
+        && encoding == this.encoding) {
+      return false;
+    }
+    this.sampleRateHz = sampleRateHz;
+    this.channelCount = channelCount;
+    this.encoding = encoding;
+    return true;
+  }
+
+  /**
+   * Replaces the current output buffer with a buffer of at least {@code count} bytes and returns
+   * it. Callers should write to the returned buffer then {@link ByteBuffer#flip()} it so it can be
+   * read via {@link #getOutput()}.
+   */
+  protected final ByteBuffer replaceOutputBuffer(int count) {
+    if (buffer.capacity() < count) {
+      buffer = ByteBuffer.allocateDirect(count).order(ByteOrder.nativeOrder());
+    } else {
+      buffer.clear();
+    }
+    outputBuffer = buffer;
+    return buffer;
+  }
+
+  /** Returns whether the current output buffer has any data remaining. */
+  protected final boolean hasPendingOutput() {
+    return outputBuffer.hasRemaining();
+  }
+
+  /** Called when the end-of-stream is queued to the processor. */
+  protected void onQueueEndOfStream() {
+    // Do nothing.
+  }
+
+  /** Called when the processor is flushed, directly or as part of resetting. */
+  protected void onFlush() {
+    // Do nothing.
+  }
+
+  /** Called when the processor is reset. */
+  protected void onReset() {
+    // Do nothing.
+  }
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java
index a6d4d08077..a345cebd02 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java
@@ -17,36 +17,20 @@ package com.google.android.exoplayer2.audio;
 
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.C.Encoding;
-import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.util.Assertions;
 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 import java.util.Arrays;
 
 /**
  * An {@link AudioProcessor} that applies a mapping from input channels onto specified output
  * channels. This can be used to reorder, duplicate or discard channels.
  */
-/* package */ final class ChannelMappingAudioProcessor implements AudioProcessor {
+/* package */ final class ChannelMappingAudioProcessor extends BaseAudioProcessor {
 
-  private int channelCount;
-  private int sampleRateHz;
   @Nullable private int[] pendingOutputChannels;
 
   private boolean active;
   @Nullable private int[] outputChannels;
-  private ByteBuffer buffer;
-  private ByteBuffer outputBuffer;
-  private boolean inputEnded;
-
-  /** Creates a new processor that applies a channel mapping. */
-  public ChannelMappingAudioProcessor() {
-    buffer = EMPTY_BUFFER;
-    outputBuffer = EMPTY_BUFFER;
-    channelCount = Format.NO_VALUE;
-    sampleRateHz = Format.NO_VALUE;
-  }
 
   /**
    * Resets the channel mapping. After calling this method, call {@link #configure(int, int, int)}
@@ -61,10 +45,12 @@ import java.util.Arrays;
   }
 
   @Override
-  public boolean configure(int sampleRateHz, int channelCount, @Encoding int encoding)
+  public boolean configure(int sampleRateHz, int channelCount, @C.PcmEncoding int encoding)
       throws UnhandledFormatException {
     boolean outputChannelsChanged = !Arrays.equals(pendingOutputChannels, outputChannels);
     outputChannels = pendingOutputChannels;
+
+    int[] outputChannels = this.outputChannels;
     if (outputChannels == null) {
       active = false;
       return outputChannelsChanged;
@@ -72,12 +58,9 @@ import java.util.Arrays;
     if (encoding != C.ENCODING_PCM_16BIT) {
       throw new UnhandledFormatException(sampleRateHz, channelCount, encoding);
     }
-    if (!outputChannelsChanged && this.sampleRateHz == sampleRateHz
-        && this.channelCount == channelCount) {
+    if (!outputChannelsChanged && !setInputFormat(sampleRateHz, channelCount, encoding)) {
       return false;
     }
-    this.sampleRateHz = sampleRateHz;
-    this.channelCount = channelCount;
 
     active = channelCount != outputChannels.length;
     for (int i = 0; i < outputChannels.length; i++) {
@@ -100,16 +83,6 @@ import java.util.Arrays;
     return outputChannels == null ? channelCount : outputChannels.length;
   }
 
-  @Override
-  public int getOutputEncoding() {
-    return C.ENCODING_PCM_16BIT;
-  }
-
-  @Override
-  public int getOutputSampleRateHz() {
-    return sampleRateHz;
-  }
-
   @Override
   public void queueInput(ByteBuffer inputBuffer) {
     int[] outputChannels = Assertions.checkNotNull(this.outputChannels);
@@ -117,11 +90,7 @@ import java.util.Arrays;
     int limit = inputBuffer.limit();
     int frameCount = (limit - position) / (2 * channelCount);
     int outputSize = frameCount * outputChannels.length * 2;
-    if (buffer.capacity() < outputSize) {
-      buffer = ByteBuffer.allocateDirect(outputSize).order(ByteOrder.nativeOrder());
-    } else {
-      buffer.clear();
-    }
+    ByteBuffer buffer = replaceOutputBuffer(outputSize);
     while (position < limit) {
       for (int channelIndex : outputChannels) {
         buffer.putShort(inputBuffer.getShort(position + 2 * channelIndex));
@@ -130,39 +99,10 @@ import java.util.Arrays;
     }
     inputBuffer.position(limit);
     buffer.flip();
-    outputBuffer = buffer;
   }
 
   @Override
-  public void queueEndOfStream() {
-    inputEnded = true;
-  }
-
-  @Override
-  public ByteBuffer getOutput() {
-    ByteBuffer outputBuffer = this.outputBuffer;
-    this.outputBuffer = EMPTY_BUFFER;
-    return outputBuffer;
-  }
-
-  @SuppressWarnings("ReferenceEquality")
-  @Override
-  public boolean isEnded() {
-    return inputEnded && outputBuffer == EMPTY_BUFFER;
-  }
-
-  @Override
-  public void flush() {
-    outputBuffer = EMPTY_BUFFER;
-    inputEnded = false;
-  }
-
-  @Override
-  public void reset() {
-    flush();
-    buffer = EMPTY_BUFFER;
-    channelCount = Format.NO_VALUE;
-    sampleRateHz = Format.NO_VALUE;
+  protected void onReset() {
     outputChannels = null;
     pendingOutputChannels = null;
     active = false;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/FloatResamplingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/FloatResamplingAudioProcessor.java
index c347cce0d8..2274d53b55 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/FloatResamplingAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/FloatResamplingAudioProcessor.java
@@ -16,61 +16,30 @@
 package com.google.android.exoplayer2.audio;
 
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.util.Util;
 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 
 /**
  * An {@link AudioProcessor} that converts 24-bit and 32-bit integer PCM audio to 32-bit float PCM
  * audio.
  */
-/* package */ final class FloatResamplingAudioProcessor implements AudioProcessor {
+/* package */ final class FloatResamplingAudioProcessor extends BaseAudioProcessor {
 
   private static final int FLOAT_NAN_AS_INT = Float.floatToIntBits(Float.NaN);
   private static final double PCM_32_BIT_INT_TO_PCM_32_BIT_FLOAT_FACTOR = 1.0 / 0x7FFFFFFF;
 
-  private int sampleRateHz;
-  private int channelCount;
-  @C.PcmEncoding private int sourceEncoding;
-  private ByteBuffer buffer;
-  private ByteBuffer outputBuffer;
-  private boolean inputEnded;
-
-  /** Creates a new audio processor that converts audio data to {@link C#ENCODING_PCM_FLOAT}. */
-  public FloatResamplingAudioProcessor() {
-    sampleRateHz = Format.NO_VALUE;
-    channelCount = Format.NO_VALUE;
-    sourceEncoding = C.ENCODING_INVALID;
-    buffer = EMPTY_BUFFER;
-    outputBuffer = EMPTY_BUFFER;
-  }
-
   @Override
-  public boolean configure(int sampleRateHz, int channelCount, @C.Encoding int encoding)
+  public boolean configure(int sampleRateHz, int channelCount, @C.PcmEncoding int encoding)
       throws UnhandledFormatException {
     if (!Util.isEncodingHighResolutionIntegerPcm(encoding)) {
       throw new UnhandledFormatException(sampleRateHz, channelCount, encoding);
     }
-    if (this.sampleRateHz == sampleRateHz
-        && this.channelCount == channelCount
-        && sourceEncoding == encoding) {
-      return false;
-    }
-    this.sampleRateHz = sampleRateHz;
-    this.channelCount = channelCount;
-    sourceEncoding = encoding;
-    return true;
+    return setInputFormat(sampleRateHz, channelCount, encoding);
   }
 
   @Override
   public boolean isActive() {
-    return Util.isEncodingHighResolutionIntegerPcm(sourceEncoding);
-  }
-
-  @Override
-  public int getOutputChannelCount() {
-    return channelCount;
+    return Util.isEncodingHighResolutionIntegerPcm(encoding);
   }
 
   @Override
@@ -78,24 +47,15 @@ import java.nio.ByteOrder;
     return C.ENCODING_PCM_FLOAT;
   }
 
-  @Override
-  public int getOutputSampleRateHz() {
-    return sampleRateHz;
-  }
-
   @Override
   public void queueInput(ByteBuffer inputBuffer) {
-    boolean isInput32Bit = sourceEncoding == C.ENCODING_PCM_32BIT;
+    boolean isInput32Bit = encoding == C.ENCODING_PCM_32BIT;
     int position = inputBuffer.position();
     int limit = inputBuffer.limit();
     int size = limit - position;
 
     int resampledSize = isInput32Bit ? size : (size / 3) * 4;
-    if (buffer.capacity() < resampledSize) {
-      buffer = ByteBuffer.allocateDirect(resampledSize).order(ByteOrder.nativeOrder());
-    } else {
-      buffer.clear();
-    }
+    ByteBuffer buffer = replaceOutputBuffer(resampledSize);
     if (isInput32Bit) {
       for (int i = position; i < limit; i += 4) {
         int pcm32BitInteger =
@@ -117,40 +77,6 @@ import java.nio.ByteOrder;
 
     inputBuffer.position(inputBuffer.limit());
     buffer.flip();
-    outputBuffer = buffer;
-  }
-
-  @Override
-  public void queueEndOfStream() {
-    inputEnded = true;
-  }
-
-  @Override
-  public ByteBuffer getOutput() {
-    ByteBuffer outputBuffer = this.outputBuffer;
-    this.outputBuffer = EMPTY_BUFFER;
-    return outputBuffer;
-  }
-
-  @SuppressWarnings("ReferenceEquality")
-  @Override
-  public boolean isEnded() {
-    return inputEnded && outputBuffer == EMPTY_BUFFER;
-  }
-
-  @Override
-  public void flush() {
-    outputBuffer = EMPTY_BUFFER;
-    inputEnded = false;
-  }
-
-  @Override
-  public void reset() {
-    flush();
-    sampleRateHz = Format.NO_VALUE;
-    channelCount = Format.NO_VALUE;
-    sourceEncoding = C.ENCODING_INVALID;
-    buffer = EMPTY_BUFFER;
   }
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java
index ba84b06e95..d0c057b676 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java
@@ -18,45 +18,21 @@ package com.google.android.exoplayer2.audio;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 
 /**
  * An {@link AudioProcessor} that converts 8-bit, 24-bit and 32-bit integer PCM audio to 16-bit
  * integer PCM audio.
  */
-/* package */ final class ResamplingAudioProcessor implements AudioProcessor {
-
-  private int sampleRateHz;
-  private int channelCount;
-  @C.PcmEncoding private int encoding;
-  private ByteBuffer buffer;
-  private ByteBuffer outputBuffer;
-  private boolean inputEnded;
-
-  /** Creates a new audio processor that converts audio data to {@link C#ENCODING_PCM_16BIT}. */
-  public ResamplingAudioProcessor() {
-    sampleRateHz = Format.NO_VALUE;
-    channelCount = Format.NO_VALUE;
-    encoding = C.ENCODING_INVALID;
-    buffer = EMPTY_BUFFER;
-    outputBuffer = EMPTY_BUFFER;
-  }
+/* package */ final class ResamplingAudioProcessor extends BaseAudioProcessor {
 
   @Override
-  public boolean configure(int sampleRateHz, int channelCount, @C.Encoding int encoding)
+  public boolean configure(int sampleRateHz, int channelCount, @C.PcmEncoding int encoding)
       throws UnhandledFormatException {
     if (encoding != C.ENCODING_PCM_8BIT && encoding != C.ENCODING_PCM_16BIT
         && encoding != C.ENCODING_PCM_24BIT && encoding != C.ENCODING_PCM_32BIT) {
       throw new UnhandledFormatException(sampleRateHz, channelCount, encoding);
     }
-    if (this.sampleRateHz == sampleRateHz && this.channelCount == channelCount
-        && this.encoding == encoding) {
-      return false;
-    }
-    this.sampleRateHz = sampleRateHz;
-    this.channelCount = channelCount;
-    this.encoding = encoding;
-    return true;
+    return setInputFormat(sampleRateHz, channelCount, encoding);
   }
 
   @Override
@@ -64,21 +40,11 @@ import java.nio.ByteOrder;
     return encoding != C.ENCODING_INVALID && encoding != C.ENCODING_PCM_16BIT;
   }
 
-  @Override
-  public int getOutputChannelCount() {
-    return channelCount;
-  }
-
   @Override
   public int getOutputEncoding() {
     return C.ENCODING_PCM_16BIT;
   }
 
-  @Override
-  public int getOutputSampleRateHz() {
-    return sampleRateHz;
-  }
-
   @Override
   public void queueInput(ByteBuffer inputBuffer) {
     // Prepare the output buffer.
@@ -105,13 +71,9 @@ import java.nio.ByteOrder;
       default:
         throw new IllegalStateException();
     }
-    if (buffer.capacity() < resampledSize) {
-      buffer = ByteBuffer.allocateDirect(resampledSize).order(ByteOrder.nativeOrder());
-    } else {
-      buffer.clear();
-    }
 
     // Resample the little endian input and update the input/output buffers.
+    ByteBuffer buffer = replaceOutputBuffer(resampledSize);
     switch (encoding) {
       case C.ENCODING_PCM_8BIT:
         // 8->16 bit resampling. Shift each byte from [0, 256) to [-128, 128) and scale up.
@@ -146,40 +108,6 @@ import java.nio.ByteOrder;
     }
     inputBuffer.position(inputBuffer.limit());
     buffer.flip();
-    outputBuffer = buffer;
-  }
-
-  @Override
-  public void queueEndOfStream() {
-    inputEnded = true;
-  }
-
-  @Override
-  public ByteBuffer getOutput() {
-    ByteBuffer outputBuffer = this.outputBuffer;
-    this.outputBuffer = EMPTY_BUFFER;
-    return outputBuffer;
-  }
-
-  @SuppressWarnings("ReferenceEquality")
-  @Override
-  public boolean isEnded() {
-    return inputEnded && outputBuffer == EMPTY_BUFFER;
-  }
-
-  @Override
-  public void flush() {
-    outputBuffer = EMPTY_BUFFER;
-    inputEnded = false;
-  }
-
-  @Override
-  public void reset() {
-    flush();
-    sampleRateHz = Format.NO_VALUE;
-    channelCount = Format.NO_VALUE;
-    encoding = C.ENCODING_INVALID;
-    buffer = EMPTY_BUFFER;
   }
 
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java
index 1149a10fb8..9052ea12ec 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java
@@ -17,19 +17,17 @@ package com.google.android.exoplayer2.audio;
 
 import android.support.annotation.IntDef;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.util.Util;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 
 /**
  * An {@link AudioProcessor} that skips silence in the input stream. Input and output are 16-bit
  * PCM.
  */
-public final class SilenceSkippingAudioProcessor implements AudioProcessor {
+public final class SilenceSkippingAudioProcessor extends BaseAudioProcessor {
 
   /**
    * The minimum duration of audio that must be below {@link #SILENCE_THRESHOLD_LEVEL} to classify
@@ -70,16 +68,10 @@ public final class SilenceSkippingAudioProcessor implements AudioProcessor {
   /** State when the input is silent. */
   private static final int STATE_SILENT = 2;
 
-  private int channelCount;
-  private int sampleRateHz;
   private int bytesPerFrame;
 
   private boolean enabled;
 
-  private ByteBuffer buffer;
-  private ByteBuffer outputBuffer;
-  private boolean inputEnded;
-
   /**
    * Buffers audio data that may be classified as silence while in {@link #STATE_MAYBE_SILENT}. If
    * the input becomes noisy before the buffer has filled, it will be output. Otherwise, the buffer
@@ -101,10 +93,6 @@ public final class SilenceSkippingAudioProcessor implements AudioProcessor {
 
   /** Creates a new silence trimming audio processor. */
   public SilenceSkippingAudioProcessor() {
-    buffer = EMPTY_BUFFER;
-    outputBuffer = EMPTY_BUFFER;
-    channelCount = Format.NO_VALUE;
-    sampleRateHz = Format.NO_VALUE;
     maybeSilenceBuffer = Util.EMPTY_BYTE_ARRAY;
     paddingBuffer = Util.EMPTY_BYTE_ARRAY;
   }
@@ -131,43 +119,23 @@ public final class SilenceSkippingAudioProcessor implements AudioProcessor {
   // AudioProcessor implementation.
 
   @Override
-  public boolean configure(int sampleRateHz, int channelCount, int encoding)
+  public boolean configure(int sampleRateHz, int channelCount, @C.PcmEncoding int encoding)
       throws UnhandledFormatException {
     if (encoding != C.ENCODING_PCM_16BIT) {
       throw new UnhandledFormatException(sampleRateHz, channelCount, encoding);
     }
-    if (this.sampleRateHz == sampleRateHz && this.channelCount == channelCount) {
-      return false;
-    }
-    this.sampleRateHz = sampleRateHz;
-    this.channelCount = channelCount;
     bytesPerFrame = channelCount * 2;
-    return true;
+    return setInputFormat(sampleRateHz, channelCount, encoding);
   }
 
   @Override
   public boolean isActive() {
-    return sampleRateHz != Format.NO_VALUE && enabled;
-  }
-
-  @Override
-  public int getOutputChannelCount() {
-    return channelCount;
-  }
-
-  @Override
-  public @C.Encoding int getOutputEncoding() {
-    return C.ENCODING_PCM_16BIT;
-  }
-
-  @Override
-  public int getOutputSampleRateHz() {
-    return sampleRateHz;
+    return super.isActive() && enabled;
   }
 
   @Override
   public void queueInput(ByteBuffer inputBuffer) {
-    while (inputBuffer.hasRemaining() && !outputBuffer.hasRemaining()) {
+    while (inputBuffer.hasRemaining() && !hasPendingOutput()) {
       switch (state) {
         case STATE_NOISY:
           processNoisy(inputBuffer);
@@ -185,8 +153,7 @@ public final class SilenceSkippingAudioProcessor implements AudioProcessor {
   }
 
   @Override
-  public void queueEndOfStream() {
-    inputEnded = true;
+  protected void onQueueEndOfStream() {
     if (maybeSilenceBufferSize > 0) {
       // We haven't received enough silence to transition to the silent state, so output the buffer.
       output(maybeSilenceBuffer, maybeSilenceBufferSize);
@@ -197,20 +164,7 @@ public final class SilenceSkippingAudioProcessor implements AudioProcessor {
   }
 
   @Override
-  public ByteBuffer getOutput() {
-    ByteBuffer outputBuffer = this.outputBuffer;
-    this.outputBuffer = EMPTY_BUFFER;
-    return outputBuffer;
-  }
-
-  @SuppressWarnings("ReferenceEquality")
-  @Override
-  public boolean isEnded() {
-    return inputEnded && outputBuffer == EMPTY_BUFFER;
-  }
-
-  @Override
-  public void flush() {
+  protected void onFlush() {
     if (isActive()) {
       int maybeSilenceBufferSize = durationUsToFrames(MINIMUM_SILENCE_DURATION_US) * bytesPerFrame;
       if (maybeSilenceBuffer.length != maybeSilenceBufferSize) {
@@ -222,20 +176,14 @@ public final class SilenceSkippingAudioProcessor implements AudioProcessor {
       }
     }
     state = STATE_NOISY;
-    outputBuffer = EMPTY_BUFFER;
-    inputEnded = false;
     skippedFrames = 0;
     maybeSilenceBufferSize = 0;
     hasOutputNoise = false;
   }
 
   @Override
-  public void reset() {
+  protected void onReset() {
     enabled = false;
-    flush();
-    buffer = EMPTY_BUFFER;
-    channelCount = Format.NO_VALUE;
-    sampleRateHz = Format.NO_VALUE;
     paddingSize = 0;
     maybeSilenceBuffer = Util.EMPTY_BYTE_ARRAY;
     paddingBuffer = Util.EMPTY_BYTE_ARRAY;
@@ -330,30 +278,19 @@ public final class SilenceSkippingAudioProcessor implements AudioProcessor {
    * processor.
    */
   private void output(byte[] data, int length) {
-    prepareForOutput(length);
-    buffer.put(data, 0, length);
-    buffer.flip();
-    outputBuffer = buffer;
+    replaceOutputBuffer(length).put(data, 0, length).flip();
+    if (length > 0) {
+      hasOutputNoise = true;
+    }
   }
 
   /**
    * Copies remaining bytes from {@code data} to populate a new output buffer from the processor.
    */
   private void output(ByteBuffer data) {
-    prepareForOutput(data.remaining());
-    buffer.put(data);
-    buffer.flip();
-    outputBuffer = buffer;
-  }
-
-  /** Prepares to output {@code size} bytes in {@code buffer}. */
-  private void prepareForOutput(int size) {
-    if (buffer.capacity() < size) {
-      buffer = ByteBuffer.allocateDirect(size).order(ByteOrder.nativeOrder());
-    } else {
-      buffer.clear();
-    }
-    if (size > 0) {
+    int length = data.remaining();
+    replaceOutputBuffer(length).put(data).flip();
+    if (length > 0) {
       hasOutputNoise = true;
     }
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/TeeAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/TeeAudioProcessor.java
index 442ade6afb..ba651912ff 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/TeeAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/TeeAudioProcessor.java
@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.audio;
 
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
@@ -36,13 +35,13 @@ import java.nio.ByteOrder;
  * custom {@link com.google.android.exoplayer2.audio.DefaultAudioSink.AudioProcessorChain} when
  * creating the audio sink, and include this audio processor after all other audio processors.
  */
-public final class TeeAudioProcessor implements AudioProcessor {
+public final class TeeAudioProcessor extends BaseAudioProcessor {
 
   /** A sink for audio buffers handled by the audio processor. */
   public interface AudioBufferSink {
 
     /** Called when the audio processor is flushed with a format of subsequent input. */
-    void flush(int sampleRateHz, int channelCount, @C.Encoding int encoding);
+    void flush(int sampleRateHz, int channelCount, @C.PcmEncoding int encoding);
 
     /**
      * Called when data is written to the audio processor.
@@ -54,14 +53,6 @@ public final class TeeAudioProcessor implements AudioProcessor {
 
   private final AudioBufferSink audioBufferSink;
 
-  private int sampleRateHz;
-  private int channelCount;
-  @C.Encoding private int encoding;
-
-  private ByteBuffer buffer;
-  private ByteBuffer outputBuffer;
-  private boolean inputEnded;
-
   /**
    * Creates a new tee audio processor, sending incoming data to the given {@link AudioBufferSink}.
    *
@@ -70,100 +61,28 @@ public final class TeeAudioProcessor implements AudioProcessor {
    */
   public TeeAudioProcessor(AudioBufferSink audioBufferSink) {
     this.audioBufferSink = Assertions.checkNotNull(audioBufferSink);
-
-    buffer = EMPTY_BUFFER;
-    outputBuffer = EMPTY_BUFFER;
-    channelCount = Format.NO_VALUE;
-    sampleRateHz = Format.NO_VALUE;
   }
 
   @Override
-  public boolean configure(int sampleRateHz, int channelCount, @C.Encoding int encoding) {
-    boolean formatChanged =
-        sampleRateHz != this.sampleRateHz
-            || channelCount != this.channelCount
-            || encoding != this.encoding;
-    this.sampleRateHz = sampleRateHz;
-    this.channelCount = channelCount;
-    this.encoding = encoding;
-    // The sink always needs to be flushed if the format is changing.
-    return formatChanged;
+  public boolean configure(int sampleRateHz, int channelCount, @C.PcmEncoding int encoding) {
+    return setInputFormat(sampleRateHz, channelCount, encoding);
   }
 
   @Override
-  public boolean isActive() {
-    return sampleRateHz != Format.NO_VALUE;
-  }
-
-  @Override
-  public int getOutputChannelCount() {
-    return channelCount;
-  }
-
-  @Override
-  public int getOutputEncoding() {
-    return encoding;
-  }
-
-  @Override
-  public int getOutputSampleRateHz() {
-    return sampleRateHz;
-  }
-
-  @Override
-  public void queueInput(ByteBuffer buffer) {
-    int remaining = buffer.remaining();
+  public void queueInput(ByteBuffer inputBuffer) {
+    int remaining = inputBuffer.remaining();
     if (remaining == 0) {
       return;
     }
+    audioBufferSink.handleBuffer(inputBuffer.asReadOnlyBuffer());
+    replaceOutputBuffer(remaining).put(inputBuffer).flip();
+  }
 
-    audioBufferSink.handleBuffer(buffer.asReadOnlyBuffer());
-
-    if (this.buffer.capacity() < remaining) {
-      this.buffer = ByteBuffer.allocateDirect(remaining).order(ByteOrder.nativeOrder());
-    } else {
-      this.buffer.clear();
+  @Override
+  protected void onFlush() {
+    if (isActive()) {
+      audioBufferSink.flush(sampleRateHz, channelCount, encoding);
     }
-
-    this.buffer.put(buffer);
-
-    this.buffer.flip();
-    outputBuffer = this.buffer;
-  }
-
-  @Override
-  public void queueEndOfStream() {
-    inputEnded = true;
-  }
-
-  @Override
-  public ByteBuffer getOutput() {
-    ByteBuffer outputBuffer = this.outputBuffer;
-    this.outputBuffer = EMPTY_BUFFER;
-    return outputBuffer;
-  }
-
-  @SuppressWarnings("ReferenceEquality")
-  @Override
-  public boolean isEnded() {
-    return inputEnded && outputBuffer == EMPTY_BUFFER;
-  }
-
-  @Override
-  public void flush() {
-    outputBuffer = EMPTY_BUFFER;
-    inputEnded = false;
-
-    audioBufferSink.flush(sampleRateHz, channelCount, encoding);
-  }
-
-  @Override
-  public void reset() {
-    flush();
-    buffer = EMPTY_BUFFER;
-    sampleRateHz = Format.NO_VALUE;
-    channelCount = Format.NO_VALUE;
-    encoding = Format.NO_VALUE;
   }
 
   /**
@@ -188,8 +107,8 @@ public final class TeeAudioProcessor implements AudioProcessor {
 
     private int sampleRateHz;
     private int channelCount;
-    private @C.Encoding int encoding;
-    private @Nullable RandomAccessFile randomAccessFile;
+    @C.PcmEncoding private int encoding;
+    @Nullable private RandomAccessFile randomAccessFile;
     private int counter;
     private int bytesWritten;
 
@@ -205,7 +124,7 @@ public final class TeeAudioProcessor implements AudioProcessor {
     }
 
     @Override
-    public void flush(int sampleRateHz, int channelCount, int encoding) {
+    public void flush(int sampleRateHz, int channelCount, @C.PcmEncoding int encoding) {
       try {
         reset();
       } catch (IOException e) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
index 3225defaf9..09325ca14b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
@@ -16,39 +16,27 @@
 package com.google.android.exoplayer2.audio;
 
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.C.Encoding;
-import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.util.Util;
 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 
 /** Audio processor for trimming samples from the start/end of data. */
-/* package */ final class TrimmingAudioProcessor implements AudioProcessor {
+/* package */ final class TrimmingAudioProcessor extends BaseAudioProcessor {
 
-  @C.Encoding private static final int OUTPUT_ENCODING = C.ENCODING_PCM_16BIT;
+  @C.PcmEncoding private static final int OUTPUT_ENCODING = C.ENCODING_PCM_16BIT;
 
   private boolean isActive;
   private int trimStartFrames;
   private int trimEndFrames;
-  private int channelCount;
-  private int sampleRateHz;
   private int bytesPerFrame;
   private boolean receivedInputSinceConfigure;
 
   private int pendingTrimStartBytes;
-  private ByteBuffer buffer;
-  private ByteBuffer outputBuffer;
   private byte[] endBuffer;
   private int endBufferSize;
-  private boolean inputEnded;
   private long trimmedFrameCount;
 
   /** Creates a new audio processor for trimming samples from the start/end of data. */
   public TrimmingAudioProcessor() {
-    buffer = EMPTY_BUFFER;
-    outputBuffer = EMPTY_BUFFER;
-    channelCount = Format.NO_VALUE;
-    sampleRateHz = Format.NO_VALUE;
     endBuffer = Util.EMPTY_BYTE_ARRAY;
   }
 
@@ -80,7 +68,7 @@ import java.nio.ByteOrder;
   }
 
   @Override
-  public boolean configure(int sampleRateHz, int channelCount, @Encoding int encoding)
+  public boolean configure(int sampleRateHz, int channelCount, @C.PcmEncoding int encoding)
       throws UnhandledFormatException {
     if (encoding != OUTPUT_ENCODING) {
       throw new UnhandledFormatException(sampleRateHz, channelCount, encoding);
@@ -88,8 +76,6 @@ import java.nio.ByteOrder;
     if (endBufferSize > 0) {
       trimmedFrameCount += endBufferSize / bytesPerFrame;
     }
-    this.channelCount = channelCount;
-    this.sampleRateHz = sampleRateHz;
     bytesPerFrame = Util.getPcmFrameSize(OUTPUT_ENCODING, channelCount);
     endBuffer = new byte[trimEndFrames * bytesPerFrame];
     endBufferSize = 0;
@@ -97,6 +83,7 @@ import java.nio.ByteOrder;
     boolean wasActive = isActive;
     isActive = trimStartFrames != 0 || trimEndFrames != 0;
     receivedInputSinceConfigure = false;
+    setInputFormat(sampleRateHz, channelCount, encoding);
     return wasActive != isActive;
   }
 
@@ -105,21 +92,6 @@ import java.nio.ByteOrder;
     return isActive;
   }
 
-  @Override
-  public int getOutputChannelCount() {
-    return channelCount;
-  }
-
-  @Override
-  public int getOutputEncoding() {
-    return OUTPUT_ENCODING;
-  }
-
-  @Override
-  public int getOutputSampleRateHz() {
-    return sampleRateHz;
-  }
-
   @Override
   public void queueInput(ByteBuffer inputBuffer) {
     int position = inputBuffer.position();
@@ -147,11 +119,7 @@ import java.nio.ByteOrder;
     // endBuffer as full as possible, the output should be any surplus bytes currently in endBuffer
     // followed by any surplus bytes in the new inputBuffer.
     int remainingBytesToOutput = endBufferSize + remaining - endBuffer.length;
-    if (buffer.capacity() < remainingBytesToOutput) {
-      buffer = ByteBuffer.allocateDirect(remainingBytesToOutput).order(ByteOrder.nativeOrder());
-    } else {
-      buffer.clear();
-    }
+    ByteBuffer buffer = replaceOutputBuffer(remainingBytesToOutput);
 
     // Output from endBuffer.
     int endBufferBytesToOutput = Util.constrainValue(remainingBytesToOutput, 0, endBufferSize);
@@ -172,48 +140,31 @@ import java.nio.ByteOrder;
     endBufferSize += remaining;
 
     buffer.flip();
-    outputBuffer = buffer;
-  }
-
-  @Override
-  public void queueEndOfStream() {
-    inputEnded = true;
   }
 
   @SuppressWarnings("ReferenceEquality")
   @Override
   public ByteBuffer getOutput() {
-    ByteBuffer outputBuffer = this.outputBuffer;
-    if (inputEnded && endBufferSize > 0 && outputBuffer == EMPTY_BUFFER) {
+    if (super.isEnded() && endBufferSize > 0) {
       // Because audio processors may be drained in the middle of the stream we assume that the
       // contents of the end buffer need to be output. Gapless transitions don't involve a call to
       // queueEndOfStream so won't be affected. When audio is actually ending we play the padding
       // data which is incorrect. This behavior can be fixed once we have the timestamps associated
       // with input buffers.
-      if (buffer.capacity() < endBufferSize) {
-        buffer = ByteBuffer.allocateDirect(endBufferSize).order(ByteOrder.nativeOrder());
-      } else {
-        buffer.clear();
-      }
-      buffer.put(endBuffer, 0, endBufferSize);
+      replaceOutputBuffer(endBufferSize).put(endBuffer, 0, endBufferSize).flip();
       endBufferSize = 0;
-      buffer.flip();
-      outputBuffer = buffer;
     }
-    this.outputBuffer = EMPTY_BUFFER;
-    return outputBuffer;
+    return super.getOutput();
   }
 
   @SuppressWarnings("ReferenceEquality")
   @Override
   public boolean isEnded() {
-    return inputEnded && endBufferSize == 0 && outputBuffer == EMPTY_BUFFER;
+    return super.isEnded() && endBufferSize == 0;
   }
 
   @Override
-  public void flush() {
-    outputBuffer = EMPTY_BUFFER;
-    inputEnded = false;
+  protected void onFlush() {
     if (receivedInputSinceConfigure) {
       // Audio processors are flushed after initial configuration, so we leave the pending trim
       // start byte count unmodified if the processor was just configured. Otherwise we (possibly
@@ -226,11 +177,7 @@ import java.nio.ByteOrder;
   }
 
   @Override
-  public void reset() {
-    flush();
-    buffer = EMPTY_BUFFER;
-    channelCount = Format.NO_VALUE;
-    sampleRateHz = Format.NO_VALUE;
+  protected void onReset() {
     endBuffer = Util.EMPTY_BYTE_ARRAY;
   }
 

From 31911ca54a13b0003d6cf902b95c2ed445afa930 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 14 Feb 2019 22:45:35 +0000
Subject: [PATCH 541/832] Drain audio processors on reconfiguration

Previously we would get a new AudioTrack and flush all audio processors if any
AudioProcessor needed to be flushed on reconfiguration. This was problematic for
the case of TrimmingAudioProcessor because it could become active or inactive
due to transitioning to a period with gapless metadata or without it (we don't
keep it active all the time because it is wasteful to populate its end buffer
for content that is not gapless).

This change handles the case where we don't need an AudioTrack but
AudioProcessors do need to be flushed. In this case we drain all the audio
processors when next handling data then switch to the new configuration.

This avoids truncation when period transitions change whether
TrimmingAudioProcessor is active but don't require a new AudioTrack, and is also
a step towards draining the AudioTrack when transitioning between periods if we
do need a new AudioTrack.

To do this, it needs to be possible to drain any pending output data from an
AudioProcessor after it's configured to a new format, so this change makes sure
AudioProcessors allow calling playToEndOfStream and getOutput after
reconfiguration and before flush.

PiperOrigin-RevId: 234033552
---
 RELEASENOTES.md                               |  6 +++
 .../exoplayer2/ext/gvr/GvrAudioProcessor.java | 45 +++++++++++--------
 .../exoplayer2/audio/AudioProcessor.java      | 39 +++++++++-------
 .../exoplayer2/audio/DefaultAudioSink.java    | 34 ++++++++++++--
 .../exoplayer2/audio/SonicAudioProcessor.java | 16 ++++---
 .../audio/TrimmingAudioProcessor.java         |  8 ++--
 6 files changed, 99 insertions(+), 49 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index b65ea50c08..70da743164 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -37,6 +37,12 @@
   * Replace DownloadState.action with DownloadAction fields.
 * DRM: Fix black flicker when keys rotate in DRM protected content
   ([#3561](https://github.com/google/ExoPlayer/issues/3561)).
+* Audio:
+  * Allow `AudioProcessor`s to be drained of pending output after they are
+    reconfigured.
+  * Fix an issue that caused audio to be truncated at the end of a period
+    when switching to a new period where gapless playback information was newly
+    present or newly absent.
 * Add support for SHOUTcast ICY metadata
   ([#3735](https://github.com/google/ExoPlayer/issues/3735)).
 * CEA-608: Improved conformance to the specification
diff --git a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrAudioProcessor.java b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrAudioProcessor.java
index b3429ef06d..d0aa922d38 100644
--- a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrAudioProcessor.java
+++ b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrAudioProcessor.java
@@ -38,9 +38,11 @@ public final class GvrAudioProcessor implements AudioProcessor {
   private static final int FRAMES_PER_OUTPUT_BUFFER = 1024;
   private static final int OUTPUT_CHANNEL_COUNT = 2;
   private static final int OUTPUT_FRAME_SIZE = OUTPUT_CHANNEL_COUNT * 2; // 16-bit stereo output.
+  private static final int NO_SURROUND_FORMAT = GvrAudioSurround.SurroundFormat.INVALID;
 
   private int sampleRateHz;
   private int channelCount;
+  private int pendingGvrAudioSurroundFormat;
   @Nullable private GvrAudioSurround gvrAudioSurround;
   private ByteBuffer buffer;
   private boolean inputEnded;
@@ -57,6 +59,7 @@ public final class GvrAudioProcessor implements AudioProcessor {
     sampleRateHz = Format.NO_VALUE;
     channelCount = Format.NO_VALUE;
     buffer = EMPTY_BUFFER;
+    pendingGvrAudioSurroundFormat = NO_SURROUND_FORMAT;
   }
 
   /**
@@ -92,33 +95,28 @@ public final class GvrAudioProcessor implements AudioProcessor {
     }
     this.sampleRateHz = sampleRateHz;
     this.channelCount = channelCount;
-    maybeReleaseGvrAudioSurround();
-    int surroundFormat;
     switch (channelCount) {
       case 1:
-        surroundFormat = GvrAudioSurround.SurroundFormat.SURROUND_MONO;
+        pendingGvrAudioSurroundFormat = GvrAudioSurround.SurroundFormat.SURROUND_MONO;
         break;
       case 2:
-        surroundFormat = GvrAudioSurround.SurroundFormat.SURROUND_STEREO;
+        pendingGvrAudioSurroundFormat = GvrAudioSurround.SurroundFormat.SURROUND_STEREO;
         break;
       case 4:
-        surroundFormat = GvrAudioSurround.SurroundFormat.FIRST_ORDER_AMBISONICS;
+        pendingGvrAudioSurroundFormat = GvrAudioSurround.SurroundFormat.FIRST_ORDER_AMBISONICS;
         break;
       case 6:
-        surroundFormat = GvrAudioSurround.SurroundFormat.SURROUND_FIVE_DOT_ONE;
+        pendingGvrAudioSurroundFormat = GvrAudioSurround.SurroundFormat.SURROUND_FIVE_DOT_ONE;
         break;
       case 9:
-        surroundFormat = GvrAudioSurround.SurroundFormat.SECOND_ORDER_AMBISONICS;
+        pendingGvrAudioSurroundFormat = GvrAudioSurround.SurroundFormat.SECOND_ORDER_AMBISONICS;
         break;
       case 16:
-        surroundFormat = GvrAudioSurround.SurroundFormat.THIRD_ORDER_AMBISONICS;
+        pendingGvrAudioSurroundFormat = GvrAudioSurround.SurroundFormat.THIRD_ORDER_AMBISONICS;
         break;
       default:
         throw new UnhandledFormatException(sampleRateHz, channelCount, encoding);
     }
-    gvrAudioSurround = new GvrAudioSurround(surroundFormat, sampleRateHz, channelCount,
-        FRAMES_PER_OUTPUT_BUFFER);
-    gvrAudioSurround.updateNativeOrientation(w, x, y, z);
     if (buffer == EMPTY_BUFFER) {
       buffer = ByteBuffer.allocateDirect(FRAMES_PER_OUTPUT_BUFFER * OUTPUT_FRAME_SIZE)
           .order(ByteOrder.nativeOrder());
@@ -128,7 +126,7 @@ public final class GvrAudioProcessor implements AudioProcessor {
 
   @Override
   public boolean isActive() {
-    return gvrAudioSurround != null;
+    return pendingGvrAudioSurroundFormat != NO_SURROUND_FORMAT || gvrAudioSurround != null;
   }
 
   @Override
@@ -156,14 +154,17 @@ public final class GvrAudioProcessor implements AudioProcessor {
 
   @Override
   public void queueEndOfStream() {
-    Assertions.checkNotNull(gvrAudioSurround);
+    if (gvrAudioSurround != null) {
+      gvrAudioSurround.triggerProcessing();
+    }
     inputEnded = true;
-    gvrAudioSurround.triggerProcessing();
   }
 
   @Override
   public ByteBuffer getOutput() {
-    Assertions.checkNotNull(gvrAudioSurround);
+    if (gvrAudioSurround == null) {
+      return EMPTY_BUFFER;
+    }
     int writtenBytes = gvrAudioSurround.getOutput(buffer, 0, buffer.capacity());
     buffer.position(0).limit(writtenBytes);
     return buffer;
@@ -171,13 +172,20 @@ public final class GvrAudioProcessor implements AudioProcessor {
 
   @Override
   public boolean isEnded() {
-    Assertions.checkNotNull(gvrAudioSurround);
-    return inputEnded && gvrAudioSurround.getAvailableOutputSize() == 0;
+    return inputEnded
+        && (gvrAudioSurround == null || gvrAudioSurround.getAvailableOutputSize() == 0);
   }
 
   @Override
   public void flush() {
-    if (gvrAudioSurround != null) {
+    if (pendingGvrAudioSurroundFormat != NO_SURROUND_FORMAT) {
+      maybeReleaseGvrAudioSurround();
+      gvrAudioSurround =
+          new GvrAudioSurround(
+              pendingGvrAudioSurroundFormat, sampleRateHz, channelCount, FRAMES_PER_OUTPUT_BUFFER);
+      gvrAudioSurround.updateNativeOrientation(w, x, y, z);
+      pendingGvrAudioSurroundFormat = NO_SURROUND_FORMAT;
+    } else if (gvrAudioSurround != null) {
       gvrAudioSurround.flush();
     }
     inputEnded = false;
@@ -191,6 +199,7 @@ public final class GvrAudioProcessor implements AudioProcessor {
     sampleRateHz = Format.NO_VALUE;
     channelCount = Format.NO_VALUE;
     buffer = EMPTY_BUFFER;
+    pendingGvrAudioSurroundFormat = NO_SURROUND_FORMAT;
   }
 
   private void maybeReleaseGvrAudioSurround() {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java
index 4cf8ef2a8b..1bf141cb43 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java
@@ -24,11 +24,10 @@ import java.nio.ByteOrder;
  * modifying its channel count, encoding and/or sample rate.
  *
  * <p>Call {@link #configure(int, int, int)} to configure the processor to receive input audio, then
- * call {@link #isActive()} to determine whether the processor is active. {@link
- * #queueInput(ByteBuffer)}, {@link #queueEndOfStream()}, {@link #getOutput()}, {@link #isEnded()},
- * {@link #getOutputChannelCount()}, {@link #getOutputEncoding()} and {@link
- * #getOutputSampleRateHz()} may only be called if the processor is active. Call {@link #reset()} to
- * reset the processor to its unconfigured state and release any resources.
+ * call {@link #isActive()} to determine whether the processor is active in the new configuration.
+ * {@link #queueInput(ByteBuffer)}, {@link #getOutputChannelCount()}, {@link #getOutputEncoding()}
+ * and {@link #getOutputSampleRateHz()} may only be called if the processor is active. Call {@link
+ * #reset()} to reset the processor to its unconfigured state and release any resources.
  *
  * <p>In addition to being able to modify the format of audio, implementations may allow parameters
  * to be set that affect the output audio and whether the processor is active/inactive.
@@ -50,15 +49,21 @@ public interface AudioProcessor {
   ByteBuffer EMPTY_BUFFER = ByteBuffer.allocateDirect(0).order(ByteOrder.nativeOrder());
 
   /**
-   * Configures the processor to process input audio with the specified format and returns whether
-   * to {@link #flush()} it. After calling this method, if the processor is active, {@link
-   * #getOutputSampleRateHz()}, {@link #getOutputChannelCount()} and {@link #getOutputEncoding()}
-   * return its output format.
+   * Configures the processor to process input audio with the specified format. After calling this
+   * method, call {@link #isActive()} to determine whether the audio processor is active.
+   *
+   * <p>If the audio processor is active after configuration, call {@link #getOutputSampleRateHz()},
+   * {@link #getOutputChannelCount()} and {@link #getOutputEncoding()} to get its new output format.
+   *
+   * <p>If this method returns {@code true}, it is necessary to {@link #flush()} the processor
+   * before queueing more data, but you can (optionally) first drain output in the previous
+   * configuration by calling {@link #queueEndOfStream()} and {@link #getOutput()}. If this method
+   * returns {@code false}, it is safe to queue new input immediately.
    *
    * @param sampleRateHz The sample rate of input audio in Hz.
    * @param channelCount The number of interleaved channels in input audio.
    * @param encoding The encoding of input audio.
-   * @return Whether to {@link #flush()} the processor.
+   * @return Whether the processor must be {@link #flush() flushed} before queueing more input.
    * @throws UnhandledFormatException Thrown if the specified format can't be handled as input.
    */
   boolean configure(int sampleRateHz, int channelCount, @C.PcmEncoding int encoding)
@@ -69,23 +74,20 @@ public interface AudioProcessor {
 
   /**
    * Returns the number of audio channels in the data output by the processor. The value may change
-   * as a result of calling {@link #configure(int, int, int)} and is undefined if the instance is
-   * not active.
+   * as a result of calling {@link #configure(int, int, int)}.
    */
   int getOutputChannelCount();
 
   /**
    * Returns the audio encoding used in the data output by the processor. The value may change as a
-   * result of calling {@link #configure(int, int, int)} and is undefined if the instance is not
-   * active.
+   * result of calling {@link #configure(int, int, int)}.
    */
   @C.PcmEncoding
   int getOutputEncoding();
 
   /**
    * Returns the sample rate of audio output by the processor, in hertz. The value may change as a
-   * result of calling {@link #configure(int, int, int)} and is undefined if the instance is not
-   * active.
+   * result of calling {@link #configure(int, int, int)}.
    */
   int getOutputSampleRateHz();
 
@@ -124,7 +126,10 @@ public interface AudioProcessor {
    */
   boolean isEnded();
 
-  /** Clears any state in preparation for receiving a new stream of input buffers. */
+  /**
+   * Clears any buffered data and pending output. If the audio processor is active, also prepares
+   * the audio processor to receive a new stream of input in the last configured (pending) format.
+   */
   void flush();
 
   /** Resets the processor to its unconfigured state. */
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
index baeea07683..e48d33294a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
@@ -242,6 +242,7 @@ public final class DefaultAudioSink implements AudioSink {
   /** Used to keep the audio session active on pre-V21 builds (see {@link #initialize()}). */
   @Nullable private AudioTrack keepSessionIdAudioTrack;
 
+  @Nullable private Configuration pendingConfiguration;
   private Configuration configuration;
   private AudioTrack audioTrack;
 
@@ -423,13 +424,13 @@ public final class DefaultAudioSink implements AudioSink {
         shouldConvertHighResIntPcmToFloat
             ? toFloatPcmAvailableAudioProcessors
             : toIntPcmAvailableAudioProcessors;
-    boolean flush = false;
+    boolean flushAudioProcessors = false;
     if (processingEnabled) {
       trimmingAudioProcessor.setTrimFrameCount(trimStartFrames, trimEndFrames);
       channelMappingAudioProcessor.setChannelMap(outputChannels);
       for (AudioProcessor audioProcessor : availableAudioProcessors) {
         try {
-          flush |= audioProcessor.configure(sampleRate, channelCount, encoding);
+          flushAudioProcessors |= audioProcessor.configure(sampleRate, channelCount, encoding);
         } catch (AudioProcessor.UnhandledFormatException e) {
           throw new ConfigurationException(e);
         }
@@ -464,8 +465,14 @@ public final class DefaultAudioSink implements AudioSink {
             processingEnabled,
             canApplyPlaybackParameters,
             availableAudioProcessors);
-    if (flush || configuration == null || !pendingConfiguration.canReuseAudioTrack(configuration)) {
+    if (configuration == null || !pendingConfiguration.canReuseAudioTrack(configuration)) {
+      // We need a new AudioTrack before we can handle more input. We should first stop() the track
+      // (if we have one) and wait for audio to play out. Tracked by [Internal: b/33161961].
       flush();
+    } else if (flushAudioProcessors) {
+      // We don't need a new AudioTrack but audio processors need to be flushed.
+      this.pendingConfiguration = pendingConfiguration;
+      return;
     }
     configuration = pendingConfiguration;
   }
@@ -567,6 +574,21 @@ public final class DefaultAudioSink implements AudioSink {
   public boolean handleBuffer(ByteBuffer buffer, long presentationTimeUs)
       throws InitializationException, WriteException {
     Assertions.checkArgument(inputBuffer == null || buffer == inputBuffer);
+
+    if (pendingConfiguration != null) {
+      // We are waiting for audio processors to drain before applying a the new configuration.
+      if (!drainAudioProcessorsToEndOfStream()) {
+        return false;
+      }
+      configuration = pendingConfiguration;
+      pendingConfiguration = null;
+      playbackParameters =
+          configuration.canApplyPlaybackParameters
+              ? audioProcessorChain.applyPlaybackParameters(playbackParameters)
+              : PlaybackParameters.DEFAULT;
+      setupAudioProcessors();
+    }
+
     if (!isInitialized()) {
       initialize();
       if (playing) {
@@ -948,9 +970,9 @@ public final class DefaultAudioSink implements AudioSink {
       playbackParametersOffsetUs = 0;
       playbackParametersPositionUs = 0;
       trimmingAudioProcessor.resetTrimmedFrameCount();
+      flushAudioProcessors();
       inputBuffer = null;
       outputBuffer = null;
-      flushAudioProcessors();
       handledEndOfStream = false;
       drainingAudioProcessorIndex = C.INDEX_UNSET;
       avSyncHeader = null;
@@ -962,6 +984,10 @@ public final class DefaultAudioSink implements AudioSink {
       // AudioTrack.release can take some time, so we call it on a background thread.
       final AudioTrack toRelease = audioTrack;
       audioTrack = null;
+      if (pendingConfiguration != null) {
+        configuration = pendingConfiguration;
+        pendingConfiguration = null;
+      }
       audioTrackPositionTracker.reset();
       releasingConditionVariable.close();
       new Thread() {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/SonicAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/SonicAudioProcessor.java
index 28fd38cccb..9bf9917a9d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/SonicAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/SonicAudioProcessor.java
@@ -69,6 +69,7 @@ public final class SonicAudioProcessor implements AudioProcessor {
   private int outputSampleRateHz;
   private int pendingOutputSampleRateHz;
 
+  private boolean pendingSonicRecreation;
   @Nullable private Sonic sonic;
   private ByteBuffer buffer;
   private ShortBuffer shortBuffer;
@@ -103,7 +104,7 @@ public final class SonicAudioProcessor implements AudioProcessor {
     speed = Util.constrainValue(speed, MINIMUM_SPEED, MAXIMUM_SPEED);
     if (this.speed != speed) {
       this.speed = speed;
-      sonic = null;
+      pendingSonicRecreation = true;
     }
     flush();
     return speed;
@@ -120,7 +121,7 @@ public final class SonicAudioProcessor implements AudioProcessor {
     pitch = Util.constrainValue(pitch, MINIMUM_PITCH, MAXIMUM_PITCH);
     if (this.pitch != pitch) {
       this.pitch = pitch;
-      sonic = null;
+      pendingSonicRecreation = true;
     }
     flush();
     return pitch;
@@ -172,7 +173,7 @@ public final class SonicAudioProcessor implements AudioProcessor {
     this.sampleRateHz = sampleRateHz;
     this.channelCount = channelCount;
     this.outputSampleRateHz = outputSampleRateHz;
-    sonic = null;
+    pendingSonicRecreation = true;
     return true;
   }
 
@@ -227,7 +228,9 @@ public final class SonicAudioProcessor implements AudioProcessor {
 
   @Override
   public void queueEndOfStream() {
-    Assertions.checkNotNull(sonic).queueEndOfStream();
+    if (sonic != null) {
+      sonic.queueEndOfStream();
+    }
     inputEnded = true;
   }
 
@@ -246,9 +249,9 @@ public final class SonicAudioProcessor implements AudioProcessor {
   @Override
   public void flush() {
     if (isActive()) {
-      if (sonic == null) {
+      if (pendingSonicRecreation) {
         sonic = new Sonic(sampleRateHz, channelCount, speed, pitch, outputSampleRateHz);
-      } else {
+      } else if (sonic != null) {
         sonic.flush();
       }
     }
@@ -269,6 +272,7 @@ public final class SonicAudioProcessor implements AudioProcessor {
     shortBuffer = buffer.asShortBuffer();
     outputBuffer = EMPTY_BUFFER;
     pendingOutputSampleRateHz = SAMPLE_RATE_NO_CHANGE;
+    pendingSonicRecreation = false;
     sonic = null;
     inputBytes = 0;
     outputBytes = 0;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
index 09325ca14b..c9e9f921c7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
@@ -147,10 +147,10 @@ import java.nio.ByteBuffer;
   public ByteBuffer getOutput() {
     if (super.isEnded() && endBufferSize > 0) {
       // Because audio processors may be drained in the middle of the stream we assume that the
-      // contents of the end buffer need to be output. Gapless transitions don't involve a call to
-      // queueEndOfStream so won't be affected. When audio is actually ending we play the padding
-      // data which is incorrect. This behavior can be fixed once we have the timestamps associated
-      // with input buffers.
+      // contents of the end buffer need to be output. For gapless transitions, configure will be
+      // always be called, which clears the end buffer as needed. When audio is actually ending we
+      // play the padding data which is incorrect. This behavior can be fixed once we have the
+      // timestamps associated with input buffers.
       replaceOutputBuffer(endBufferSize).put(endBuffer, 0, endBufferSize).flip();
       endBufferSize = 0;
     }

From d61171a100a738fe2bda9125fa1ff6859c905726 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 14 Feb 2019 23:35:25 +0000
Subject: [PATCH 542/832] [libvpx] Reducing the number of buffers for LibVPX in
 order to avoid OOM crashes.

PiperOrigin-RevId: 234042474
---
 .../android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
index 7dda5d4200..86b5514795 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
@@ -97,15 +97,13 @@ public class LibvpxVideoRenderer extends BaseRenderer {
    */
   public static final int MSG_SET_OUTPUT_BUFFER_RENDERER = C.MSG_CUSTOM_BASE;
 
-  /**
-   * The number of input buffers.
-   */
-  private static final int NUM_INPUT_BUFFERS = 8;
+  /** The number of input buffers. */
+  private static final int NUM_INPUT_BUFFERS = 4;
   /**
    * The number of output buffers. The renderer may limit the minimum possible value due to
    * requiring multiple output buffers to be dequeued at a time for it to make progress.
    */
-  private static final int NUM_OUTPUT_BUFFERS = 8;
+  private static final int NUM_OUTPUT_BUFFERS = 4;
   /** The default input buffer size. */
   private static final int DEFAULT_INPUT_BUFFER_SIZE = 768 * 1024; // Value based on cs/SoftVpx.cpp.
 

From 8982da4b7502cddc4946a0acfe62de3986ee36c0 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 15 Feb 2019 11:09:16 +0000
Subject: [PATCH 543/832] Support encrypted initialization segment

Defined in RFC 8216 Section 4.3.2.5.

Issue:#5441
PiperOrigin-RevId: 234114119
---
 RELEASENOTES.md                               |   2 +
 .../exoplayer2/source/hls/HlsChunkSource.java | 137 +++++++++--------
 .../exoplayer2/source/hls/HlsMediaChunk.java  | 139 ++++++++++++------
 3 files changed, 173 insertions(+), 105 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 70da743164..08837b4a60 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -4,6 +4,8 @@
 
 * HLS:
   * Form an adaptive track group out of audio renditions with matching name.
+  * Support encrypted initialization segments
+    ([#5441](https://github.com/google/ExoPlayer/issues/5441)).
 * DASH:
   * Fix issue handling large `EventStream` presentation timestamps
     ([#5490](https://github.com/google/ExoPlayer/issues/5490)).
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
index b188aa74f3..13af2dbc79 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
@@ -40,9 +40,11 @@ import com.google.android.exoplayer2.util.TimestampAdjuster;
 import com.google.android.exoplayer2.util.UriUtil;
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
-import java.math.BigInteger;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Source of Hls (possibly adaptive) chunks.
@@ -84,6 +86,12 @@ import java.util.List;
 
   }
 
+  /**
+   * The maximum number of keys that the key cache can hold. This value must be 2 or greater in
+   * order to hold initialization segment and media segment keys simultaneously.
+   */
+  private static final int KEY_CACHE_SIZE = 4;
+
   private final HlsExtractorFactory extractorFactory;
   private final DataSource mediaDataSource;
   private final DataSource encryptionDataSource;
@@ -92,6 +100,7 @@ import java.util.List;
   private final HlsPlaylistTracker playlistTracker;
   private final TrackGroup trackGroup;
   private final List<Format> muxedCaptionFormats;
+  private final FullSegmentEncryptionKeyCache keyCache;
 
   private boolean isTimestampMaster;
   private byte[] scratchSpace;
@@ -99,11 +108,6 @@ import java.util.List;
   private HlsUrl expectedPlaylistUrl;
   private boolean independentSegments;
 
-  private Uri encryptionKeyUri;
-  private byte[] encryptionKey;
-  private String encryptionIvString;
-  private byte[] encryptionIv;
-
   // Note: The track group in the selection is typically *not* equal to trackGroup. This is due to
   // the way in which HlsSampleStreamWrapper generates track groups. Use only index based methods
   // in TrackSelection to avoid unexpected behavior.
@@ -139,6 +143,7 @@ import java.util.List;
     this.variants = variants;
     this.timestampAdjusterProvider = timestampAdjusterProvider;
     this.muxedCaptionFormats = muxedCaptionFormats;
+    keyCache = new FullSegmentEncryptionKeyCache();
     liveEdgeInPeriodTimeUs = C.TIME_UNSET;
     Format[] variantFormats = new Format[variants.length];
     int[] initialTrackSelection = new int[variants.length];
@@ -308,20 +313,16 @@ import java.util.List;
     // Handle encryption.
     HlsMediaPlaylist.Segment segment = mediaPlaylist.segments.get(segmentIndexInPlaylist);
 
-    // Check if the segment is completely encrypted using the identity key format.
-    if (segment.fullSegmentEncryptionKeyUri != null) {
-      Uri keyUri = UriUtil.resolveToUri(mediaPlaylist.baseUri, segment.fullSegmentEncryptionKeyUri);
-      if (!keyUri.equals(encryptionKeyUri)) {
-        // Encryption is specified and the key has changed.
-        out.chunk = newEncryptionKeyChunk(keyUri, segment.encryptionIV, selectedVariantIndex,
-            trackSelection.getSelectionReason(), trackSelection.getSelectionData());
-        return;
-      }
-      if (!Util.areEqual(segment.encryptionIV, encryptionIvString)) {
-        setEncryptionData(keyUri, segment.encryptionIV, encryptionKey);
-      }
-    } else {
-      clearEncryptionData();
+    // Check if the segment or its initialization segment are fully encrypted.
+    out.chunk =
+        maybeCreateEncryptionChunkFor(
+            segment.initializationSegment, mediaPlaylist, selectedVariantIndex);
+    if (out.chunk != null) {
+      return;
+    }
+    out.chunk = maybeCreateEncryptionChunkFor(segment, mediaPlaylist, selectedVariantIndex);
+    if (out.chunk != null) {
+      return;
     }
 
     out.chunk =
@@ -338,8 +339,7 @@ import java.util.List;
             isTimestampMaster,
             timestampAdjusterProvider,
             previous,
-            encryptionKey,
-            encryptionIv);
+            keyCache.asUnmodifiable());
   }
 
   /**
@@ -352,8 +352,7 @@ import java.util.List;
     if (chunk instanceof EncryptionKeyChunk) {
       EncryptionKeyChunk encryptionKeyChunk = (EncryptionKeyChunk) chunk;
       scratchSpace = encryptionKeyChunk.getDataHolder();
-      setEncryptionData(encryptionKeyChunk.dataSpec.uri, encryptionKeyChunk.iv,
-          encryptionKeyChunk.getResult());
+      keyCache.put(encryptionKeyChunk.dataSpec.uri, encryptionKeyChunk.getResult());
     }
   }
 
@@ -486,38 +485,27 @@ import java.util.List;
             : (mediaPlaylist.getEndTimeUs() - playlistTracker.getInitialStartTimeUs());
   }
 
-  private EncryptionKeyChunk newEncryptionKeyChunk(Uri keyUri, String iv, int variantIndex,
-      int trackSelectionReason, Object trackSelectionData) {
-    DataSpec dataSpec = new DataSpec(keyUri, 0, C.LENGTH_UNSET, null, DataSpec.FLAG_ALLOW_GZIP);
-    return new EncryptionKeyChunk(encryptionDataSource, dataSpec, variants[variantIndex].format,
-        trackSelectionReason, trackSelectionData, scratchSpace, iv);
-  }
-
-  private void setEncryptionData(Uri keyUri, String iv, byte[] secretKey) {
-    String trimmedIv;
-    if (Util.toLowerInvariant(iv).startsWith("0x")) {
-      trimmedIv = iv.substring(2);
-    } else {
-      trimmedIv = iv;
+  private Chunk maybeCreateEncryptionChunkFor(
+      @Nullable Segment segment, HlsMediaPlaylist mediaPlaylist, int selectedVariantIndex) {
+    if (segment == null || segment.fullSegmentEncryptionKeyUri == null) {
+      return null;
     }
-
-    byte[] ivData = new BigInteger(trimmedIv, 16).toByteArray();
-    byte[] ivDataWithPadding = new byte[16];
-    int offset = ivData.length > 16 ? ivData.length - 16 : 0;
-    System.arraycopy(ivData, offset, ivDataWithPadding, ivDataWithPadding.length - ivData.length
-        + offset, ivData.length - offset);
-
-    encryptionKeyUri = keyUri;
-    encryptionKey = secretKey;
-    encryptionIvString = iv;
-    encryptionIv = ivDataWithPadding;
-  }
-
-  private void clearEncryptionData() {
-    encryptionKeyUri = null;
-    encryptionKey = null;
-    encryptionIvString = null;
-    encryptionIv = null;
+    Uri keyUri = UriUtil.resolveToUri(mediaPlaylist.baseUri, segment.fullSegmentEncryptionKeyUri);
+    if (keyCache.containsKey(keyUri)) {
+      // The key is present in the key cache. We re-insert it to prevent it from being evicted by
+      // the following key addition. Note that removal of the key is necessary to affect the
+      // eviction order.
+      keyCache.put(keyUri, keyCache.remove(keyUri));
+      return null;
+    }
+    DataSpec dataSpec = new DataSpec(keyUri, 0, C.LENGTH_UNSET, null, DataSpec.FLAG_ALLOW_GZIP);
+    return new EncryptionKeyChunk(
+        encryptionDataSource,
+        dataSpec,
+        variants[selectedVariantIndex].format,
+        trackSelection.getSelectionReason(),
+        trackSelection.getSelectionData(),
+        scratchSpace);
   }
 
   // Private classes.
@@ -575,19 +563,21 @@ import java.util.List;
 
   private static final class EncryptionKeyChunk extends DataChunk {
 
-    public final String iv;
-
     private byte[] result;
 
-    public EncryptionKeyChunk(DataSource dataSource, DataSpec dataSpec, Format trackFormat,
-        int trackSelectionReason, Object trackSelectionData, byte[] scratchSpace, String iv) {
+    public EncryptionKeyChunk(
+        DataSource dataSource,
+        DataSpec dataSpec,
+        Format trackFormat,
+        int trackSelectionReason,
+        Object trackSelectionData,
+        byte[] scratchSpace) {
       super(dataSource, dataSpec, C.DATA_TYPE_DRM, trackFormat, trackSelectionReason,
           trackSelectionData, scratchSpace);
-      this.iv = iv;
     }
 
     @Override
-    protected void consume(byte[] data, int limit) throws IOException {
+    protected void consume(byte[] data, int limit) {
       result = Arrays.copyOf(data, limit);
     }
 
@@ -642,4 +632,29 @@ import java.util.List;
       return segmentStartTimeInPeriodUs + segment.durationUs;
     }
   }
+
+  /**
+   * LRU cache that holds up to {@link #KEY_CACHE_SIZE} full-segment-encryption keys. Which each
+   * addition, once the cache's size exceeds {@link #KEY_CACHE_SIZE}, the oldest item (according to
+   * insertion order) is removed.
+   */
+  private static final class FullSegmentEncryptionKeyCache extends LinkedHashMap<Uri, byte[]> {
+
+    private final Map<Uri, byte[]> unmodifiableView;
+
+    public FullSegmentEncryptionKeyCache() {
+      super(
+          /* initialCapacity= */ KEY_CACHE_SIZE * 2, /* loadFactor= */ 1, /* accessOrder= */ false);
+      unmodifiableView = Collections.unmodifiableMap(this);
+    }
+
+    @Override
+    protected boolean removeEldestEntry(Map.Entry<Uri, byte[]> entry) {
+      return size() > KEY_CACHE_SIZE;
+    }
+
+    public Map<Uri, byte[]> asUnmodifiable() {
+      return unmodifiableView;
+    }
+  }
 }
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
index 57f604bb2f..d307bbb04d 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2.source.hls;
 
 import android.net.Uri;
+import android.support.annotation.Nullable;
 import android.util.Pair;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
@@ -37,7 +38,9 @@ import com.google.android.exoplayer2.util.UriUtil;
 import com.google.android.exoplayer2.util.Util;
 import java.io.EOFException;
 import java.io.IOException;
+import java.math.BigInteger;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -62,10 +65,7 @@ import java.util.concurrent.atomic.AtomicInteger;
    * @param timestampAdjusterProvider The provider from which to obtain the {@link
    *     TimestampAdjuster}.
    * @param previousChunk The {@link HlsMediaChunk} that preceded this one. May be null.
-   * @param fullSegmentEncryptionKey The key to decrypt the full segment, or null if the segment is
-   *     not fully encrypted.
-   * @param encryptionIv The AES initialization vector, or null if the segment is not fully
-   *     encrypted.
+   * @param keyCache A map from encryption key URI to the corresponding encryption key.
    */
   public static HlsMediaChunk createInstance(
       HlsExtractorFactory extractorFactory,
@@ -74,26 +74,41 @@ import java.util.concurrent.atomic.AtomicInteger;
       HlsMediaPlaylist mediaPlaylist,
       int segmentIndexInPlaylist,
       HlsUrl hlsUrl,
-      List<Format> muxedCaptionFormats,
+      @Nullable List<Format> muxedCaptionFormats,
       int trackSelectionReason,
-      Object trackSelectionData,
+      @Nullable Object trackSelectionData,
       boolean isMasterTimestampSource,
       TimestampAdjusterProvider timestampAdjusterProvider,
-      HlsMediaChunk previousChunk,
-      byte[] fullSegmentEncryptionKey,
-      byte[] encryptionIv) {
-
-    HlsMediaPlaylist.Segment segment = mediaPlaylist.segments.get(segmentIndexInPlaylist);
+      @Nullable HlsMediaChunk previousChunk,
+      Map<Uri, byte[]> keyCache) {
+    // Media segment.
+    HlsMediaPlaylist.Segment mediaSegment = mediaPlaylist.segments.get(segmentIndexInPlaylist);
     DataSpec dataSpec =
         new DataSpec(
-            UriUtil.resolveToUri(mediaPlaylist.baseUri, segment.url),
-            segment.byterangeOffset,
-            segment.byterangeLength,
+            UriUtil.resolveToUri(mediaPlaylist.baseUri, mediaSegment.url),
+            mediaSegment.byterangeOffset,
+            mediaSegment.byterangeLength,
             /* key= */ null);
+    byte[] mediaSegmentKey =
+        keyCache.get(
+            UriUtil.resolveToUri(mediaPlaylist.baseUri, mediaSegment.fullSegmentEncryptionKeyUri));
+    boolean mediaSegmentEncrypted = mediaSegmentKey != null;
+    byte[] mediaSegmentIv =
+        mediaSegmentEncrypted ? getEncryptionIvArray(mediaSegment.encryptionIV) : null;
+    DataSource mediaDataSource = buildDataSource(dataSource, mediaSegmentKey, mediaSegmentIv);
 
+    // Init segment.
+    HlsMediaPlaylist.Segment initSegment = mediaSegment.initializationSegment;
     DataSpec initDataSpec = null;
-    HlsMediaPlaylist.Segment initSegment = segment.initializationSegment;
+    boolean initSegmentEncrypted = false;
+    DataSource initDataSource = null;
     if (initSegment != null) {
+      byte[] initSegmentKey =
+          keyCache.get(
+              UriUtil.resolveToUri(mediaPlaylist.baseUri, initSegment.fullSegmentEncryptionKeyUri));
+      initSegmentEncrypted = initSegmentKey != null;
+      byte[] initSegmentIv =
+          initSegmentEncrypted ? getEncryptionIvArray(initSegment.encryptionIV) : null;
       Uri initSegmentUri = UriUtil.resolveToUri(mediaPlaylist.baseUri, initSegment.url);
       initDataSpec =
           new DataSpec(
@@ -101,12 +116,13 @@ import java.util.concurrent.atomic.AtomicInteger;
               initSegment.byterangeOffset,
               initSegment.byterangeLength,
               /* key= */ null);
+      initDataSource = buildDataSource(dataSource, initSegmentKey, initSegmentIv);
     }
 
-    long segmentStartTimeInPeriodUs = startOfPlaylistInPeriodUs + segment.relativeStartTimeUs;
-    long segmentEndTimeInPeriodUs = segmentStartTimeInPeriodUs + segment.durationUs;
+    long segmentStartTimeInPeriodUs = startOfPlaylistInPeriodUs + mediaSegment.relativeStartTimeUs;
+    long segmentEndTimeInPeriodUs = segmentStartTimeInPeriodUs + mediaSegment.durationUs;
     int discontinuitySequenceNumber =
-        mediaPlaylist.discontinuitySequence + segment.relativeDiscontinuitySequence;
+        mediaPlaylist.discontinuitySequence + mediaSegment.relativeDiscontinuitySequence;
 
     Extractor previousExtractor = null;
     Id3Decoder id3Decoder;
@@ -128,9 +144,12 @@ import java.util.concurrent.atomic.AtomicInteger;
 
     return new HlsMediaChunk(
         extractorFactory,
-        dataSource,
+        mediaDataSource,
         dataSpec,
+        mediaSegmentEncrypted,
+        initDataSource,
         initDataSpec,
+        initSegmentEncrypted,
         hlsUrl,
         muxedCaptionFormats,
         trackSelectionReason,
@@ -139,16 +158,14 @@ import java.util.concurrent.atomic.AtomicInteger;
         segmentEndTimeInPeriodUs,
         /* chunkMediaSequence= */ mediaPlaylist.mediaSequence + segmentIndexInPlaylist,
         discontinuitySequenceNumber,
-        segment.hasGapTag,
+        mediaSegment.hasGapTag,
         isMasterTimestampSource,
         /* timestampAdjuster= */ timestampAdjusterProvider.getAdjuster(discontinuitySequenceNumber),
-        segment.drmInitData,
+        mediaSegment.drmInitData,
         previousExtractor,
         id3Decoder,
         scratchId3Data,
-        shouldSpliceIn,
-        fullSegmentEncryptionKey,
-        encryptionIv);
+        shouldSpliceIn);
   }
 
   public static final String PRIV_TIMESTAMP_FRAME_OWNER =
@@ -171,19 +188,20 @@ import java.util.concurrent.atomic.AtomicInteger;
    */
   public final HlsUrl hlsUrl;
 
-  private final DataSource initDataSource;
-  private final DataSpec initDataSpec;
-  private final boolean isEncrypted;
+  @Nullable private final DataSource initDataSource;
+  @Nullable private final DataSpec initDataSpec;
   private final boolean isMasterTimestampSource;
   private final boolean hasGapTag;
   private final TimestampAdjuster timestampAdjuster;
   private final boolean shouldSpliceIn;
   private final HlsExtractorFactory extractorFactory;
-  private final List<Format> muxedCaptionFormats;
-  private final DrmInitData drmInitData;
-  private final Extractor previousExtractor;
+  @Nullable private final List<Format> muxedCaptionFormats;
+  @Nullable private final DrmInitData drmInitData;
+  @Nullable private final Extractor previousExtractor;
   private final Id3Decoder id3Decoder;
   private final ParsableByteArray scratchId3Data;
+  private final boolean mediaSegmentEncrypted;
+  private final boolean initSegmentEncrypted;
 
   private Extractor extractor;
   private HlsSampleStreamWrapper output;
@@ -195,11 +213,14 @@ import java.util.concurrent.atomic.AtomicInteger;
 
   private HlsMediaChunk(
       HlsExtractorFactory extractorFactory,
-      DataSource dataSource,
+      DataSource mediaDataSource,
       DataSpec dataSpec,
-      DataSpec initDataSpec,
+      boolean mediaSegmentEncrypted,
+      DataSource initDataSource,
+      @Nullable DataSpec initDataSpec,
+      boolean initSegmentEncrypted,
       HlsUrl hlsUrl,
-      List<Format> muxedCaptionFormats,
+      @Nullable List<Format> muxedCaptionFormats,
       int trackSelectionReason,
       Object trackSelectionData,
       long startTimeUs,
@@ -209,15 +230,13 @@ import java.util.concurrent.atomic.AtomicInteger;
       boolean hasGapTag,
       boolean isMasterTimestampSource,
       TimestampAdjuster timestampAdjuster,
-      DrmInitData drmInitData,
-      Extractor previousExtractor,
+      @Nullable DrmInitData drmInitData,
+      @Nullable Extractor previousExtractor,
       Id3Decoder id3Decoder,
       ParsableByteArray scratchId3Data,
-      boolean shouldSpliceIn,
-      byte[] fullSegmentEncryptionKey,
-      byte[] encryptionIv) {
+      boolean shouldSpliceIn) {
     super(
-        buildDataSource(dataSource, fullSegmentEncryptionKey, encryptionIv),
+        mediaDataSource,
         dataSpec,
         hlsUrl.format,
         trackSelectionReason,
@@ -225,12 +244,14 @@ import java.util.concurrent.atomic.AtomicInteger;
         startTimeUs,
         endTimeUs,
         chunkMediaSequence);
+    this.mediaSegmentEncrypted = mediaSegmentEncrypted;
     this.discontinuitySequenceNumber = discontinuitySequenceNumber;
+    this.initDataSource = initDataSource;
     this.initDataSpec = initDataSpec;
+    this.initSegmentEncrypted = initSegmentEncrypted;
     this.hlsUrl = hlsUrl;
     this.isMasterTimestampSource = isMasterTimestampSource;
     this.timestampAdjuster = timestampAdjuster;
-    this.isEncrypted = fullSegmentEncryptionKey != null;
     this.hasGapTag = hasGapTag;
     this.extractorFactory = extractorFactory;
     this.muxedCaptionFormats = muxedCaptionFormats;
@@ -239,7 +260,6 @@ import java.util.concurrent.atomic.AtomicInteger;
     this.id3Decoder = id3Decoder;
     this.scratchId3Data = scratchId3Data;
     this.shouldSpliceIn = shouldSpliceIn;
-    initDataSource = dataSource;
     uid = uidSource.getAndIncrement();
   }
 
@@ -283,9 +303,20 @@ import java.util.concurrent.atomic.AtomicInteger;
       // Note: The HLS spec forbids initialization segments for packed audio.
       return;
     }
-    DataSpec initSegmentDataSpec = initDataSpec.subrange(initSegmentBytesLoaded);
+    DataSpec initSegmentDataSpec;
+    boolean skipLoadedBytes;
+    if (initSegmentEncrypted) {
+      initSegmentDataSpec = initDataSpec;
+      skipLoadedBytes = initSegmentBytesLoaded != 0;
+    } else {
+      initSegmentDataSpec = initDataSpec.subrange(initSegmentBytesLoaded);
+      skipLoadedBytes = false;
+    }
     try {
       DefaultExtractorInput input = prepareExtraction(initDataSource, initSegmentDataSpec);
+      if (skipLoadedBytes) {
+        input.skipFully(initSegmentBytesLoaded);
+      }
       try {
         int result = Extractor.RESULT_CONTINUE;
         while (result == Extractor.RESULT_CONTINUE && !loadCanceled) {
@@ -307,7 +338,7 @@ import java.util.concurrent.atomic.AtomicInteger;
     // remainder of the chunk directly.
     DataSpec loadDataSpec;
     boolean skipLoadedBytes;
-    if (isEncrypted) {
+    if (mediaSegmentEncrypted) {
       loadDataSpec = dataSpec;
       skipLoadedBytes = nextLoadPosition != 0;
     } else {
@@ -433,7 +464,27 @@ import java.util.concurrent.atomic.AtomicInteger;
     return C.TIME_UNSET;
   }
 
-  // Internal factory methods.
+  // Internal methods.
+
+  private static byte[] getEncryptionIvArray(String ivString) {
+    String trimmedIv;
+    if (Util.toLowerInvariant(ivString).startsWith("0x")) {
+      trimmedIv = ivString.substring(2);
+    } else {
+      trimmedIv = ivString;
+    }
+
+    byte[] ivData = new BigInteger(trimmedIv, /* radix= */ 16).toByteArray();
+    byte[] ivDataWithPadding = new byte[16];
+    int offset = ivData.length > 16 ? ivData.length - 16 : 0;
+    System.arraycopy(
+        ivData,
+        offset,
+        ivDataWithPadding,
+        ivDataWithPadding.length - ivData.length + offset,
+        ivData.length - offset);
+    return ivDataWithPadding;
+  }
 
   /**
    * If the segment is fully encrypted, returns an {@link Aes128DataSource} that wraps the original

From b69041bea2c86722ab4a213be3d506d0dc330ec0 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Fri, 15 Feb 2019 12:39:51 +0000
Subject: [PATCH 544/832] Prevent NullPointerException exceptions in
 SimpleCache initialization

This is a temporary fix to prevent NullPointerException exceptions.
Though writing to cache will still fail if the cache folder isn't a real
folder.

There are a few thing we can try:
* The listing might be failing because the cache folder is just created.
We can wait and try again.
* If the cache folder is a regular file, we can try deleting and creating
a folder with the same name.

PiperOrigin-RevId: 234121925
---
 .../upstream/cache/SimpleCache.java           | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index bf1c0a8918..c5956aa0ed 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -582,15 +582,17 @@ public final class SimpleCache implements Cache {
    * @throws IOException If there is an error loading or generating the UID.
    */
   private static long loadUid(File directory, File[] files) throws IOException {
-    for (File file : files) {
-      String fileName = file.getName();
-      if (fileName.endsWith(UID_FILE_SUFFIX)) {
-        try {
-          return parseUid(fileName);
-        } catch (NumberFormatException e) {
-          // This should never happen, but if it does delete the malformed UID file and continue.
-          Log.e(TAG, "Malformed UID file: " + file);
-          file.delete();
+    if (files != null) {
+      for (File file : files) {
+        String fileName = file.getName();
+        if (fileName.endsWith(UID_FILE_SUFFIX)) {
+          try {
+            return parseUid(fileName);
+          } catch (NumberFormatException e) {
+            // This should never happen, but if it does delete the malformed UID file and continue.
+            Log.e(TAG, "Malformed UID file: " + file);
+            file.delete();
+          }
         }
       }
     }

From eae09c67e7bad6e1314523c337748ffc86e38e8a Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 15 Feb 2019 13:48:10 +0000
Subject: [PATCH 545/832] Release download helper if new download track
 selection is started.

PiperOrigin-RevId: 234128521
---
 .../exoplayer2/demo/DownloadTracker.java       | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index 30a898f07e..fbaf95f3aa 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -20,6 +20,7 @@ import android.content.DialogInterface;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.HandlerThread;
+import android.support.annotation.Nullable;
 import android.support.v4.app.FragmentManager;
 import android.widget.Toast;
 import com.google.android.exoplayer2.C;
@@ -73,6 +74,8 @@ public class DownloadTracker implements DownloadManager.Listener {
   private final DefaultDownloadIndex downloadIndex;
   private final Handler actionFileIOHandler;
 
+  @Nullable private StartDownloadDialogHelper startDownloadDialogHelper;
+
   public DownloadTracker(
       Context context, DataSource.Factory dataSourceFactory, DefaultDownloadIndex downloadIndex) {
     this.context = context.getApplicationContext();
@@ -117,8 +120,12 @@ public class DownloadTracker implements DownloadManager.Listener {
           getDownloadHelper(uri, extension, renderersFactory).getRemoveAction();
       startServiceWithAction(removeAction);
     } else {
-      new StartDownloadDialogHelper(
-          fragmentManager, getDownloadHelper(uri, extension, renderersFactory), name);
+      if (startDownloadDialogHelper != null) {
+        startDownloadDialogHelper.release();
+      }
+      startDownloadDialogHelper =
+          new StartDownloadDialogHelper(
+              fragmentManager, getDownloadHelper(uri, extension, renderersFactory), name);
     }
   }
 
@@ -230,6 +237,11 @@ public class DownloadTracker implements DownloadManager.Listener {
       downloadHelper.prepare(this);
     }
 
+    public void release() {
+      downloadHelper.release();
+      startDownloadDialogHelper = null;
+    }
+
     // DownloadHelper.Callback implementation.
 
     @Override
@@ -303,7 +315,7 @@ public class DownloadTracker implements DownloadManager.Listener {
 
     @Override
     public void onDismiss(DialogInterface dialogInterface) {
-      downloadHelper.release();
+      release();
     }
   }
 }

From bcadb47a74fee9482ea904721943fa833682178d Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 15 Feb 2019 15:05:14 +0000
Subject: [PATCH 546/832] Fix typo

PiperOrigin-RevId: 234137695
---
 .../google/android/exoplayer2/upstream/cache/SimpleCache.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index c5956aa0ed..d648fe2994 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -577,7 +577,7 @@ public final class SimpleCache implements Cache {
    * Loads the cache UID from the files belonging to the root directory, generating one if needed.
    *
    * @param directory The root directory.
-   * @param files The files belonging to the rood directory.
+   * @param files The files belonging to the root directory.
    * @return The cache loaded UID.
    * @throws IOException If there is an error loading or generating the UID.
    */

From f9f55ae4d51246dabea22b9d6114e4eb2be6addb Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Fri, 15 Feb 2019 15:09:05 +0000
Subject: [PATCH 547/832] improve documentation on how to update queue when
 asynchronously loading media item assets

Issue #5494

PiperOrigin-RevId: 234138162
---
 .../ext/mediasession/MediaSessionConnector.java     | 13 ++++++++++---
 .../ext/mediasession/TimelineQueueNavigator.java    |  5 +++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
index b4811f040a..2a0fb7fa6a 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
@@ -79,6 +79,9 @@ import java.util.Map;
  *   <li>An {@link ErrorMessageProvider} for providing human readable error messages and
  *       corresponding error codes can be set by calling {@link
  *       #setErrorMessageProvider(ErrorMessageProvider)}.
+ *   <li>A {@link MediaMetadataProvider} can be set by calling {@link
+ *       #setMediaMetadataProvider(MediaMetadataProvider)}. By default the {@link
+ *       DefaultMediaMetadataProvider} is used.
  * </ul>
  */
 public final class MediaSessionConnector {
@@ -562,7 +565,8 @@ public final class MediaSessionConnector {
   }
 
   /**
-   * Sets a provider of metadata to be published to the media session.
+   * Sets a provider of metadata to be published to the media session. Pass {@code null} if no
+   * metadata should be published.
    *
    * @param mediaMetadataProvider The provider of metadata to publish, or {@code null} if no
    *     metadata should be published.
@@ -579,6 +583,9 @@ public final class MediaSessionConnector {
    *
    * <p>Apps normally only need to call this method when the backing data for a given media item has
    * changed and the metadata should be updated immediately.
+   *
+   * <p>The {@link MediaMetadataCompat} which is published to the session is obtained by calling
+   * {@link MediaMetadataProvider#getMetadata(Player)}.
    */
   public final void invalidateMediaSessionMetadata() {
     MediaMetadataCompat metadata =
@@ -779,8 +786,8 @@ public final class MediaSessionConnector {
   }
 
   /**
-   * Provides a default {@link MediaMetadataCompat} with properties and extras propagated from the
-   * active queue item to the session metadata.
+   * Provides a default {@link MediaMetadataCompat} with properties and extras taken from the {@link
+   * MediaDescriptionCompat} of the {@link MediaSessionCompat.QueueItem} of the active queue item.
    */
   public static final class DefaultMediaMetadataProvider implements MediaMetadataProvider {
 
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
index d0047637dd..0121e7ddb3 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
@@ -76,6 +76,11 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
   /**
    * Gets the {@link MediaDescriptionCompat} for a given timeline window index.
    *
+   * <p>Often artworks and icons need to be loaded asynchronously. In such a case, return a {@link
+   * MediaDescriptionCompat} without the images, load your images asynchronously off the main thread
+   * and then call {@link MediaSessionConnector#invalidateMediaSessionQueue()} to make the connector
+   * update the queue by calling {@link #getMediaDescription(Player, int)} again.
+   *
    * @param player The current player.
    * @param windowIndex The timeline window index for which to provide a description.
    * @return A {@link MediaDescriptionCompat}.

From c6195dbbaf6909e48e212fd4e15a3b23022daa8a Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 15 Feb 2019 16:55:17 +0000
Subject: [PATCH 548/832] Handle recreation of TrackSelectionView instances.

TrackSelectionView requires an initialization with a call to init(...).
That's why we shouldn't let the view retain its view hierarchy automatically
as the views won't be backed by data if restored. Instead add a listener
which lets the containing activity/fragment save and restore the state if
needed.

PiperOrigin-RevId: 234152491
---
 .../exoplayer2/demo/TrackSelectionDialog.java | 28 +++++++++++--------
 .../ui/TrackSelectionDialogBuilder.java       |  2 +-
 .../exoplayer2/ui/TrackSelectionView.java     | 26 +++++++++++++++--
 3 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
index 6be8cf6a77..1b9cf9aeb9 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
@@ -261,15 +261,17 @@ public final class TrackSelectionDialog extends DialogFragment {
   }
 
   /** Fragment to show a track seleciton in tab of the track selection dialog. */
-  public static final class TrackSelectionViewFragment extends Fragment {
+  public static final class TrackSelectionViewFragment extends Fragment
+      implements TrackSelectionView.TrackSelectionListener {
 
     private MappedTrackInfo mappedTrackInfo;
     private int rendererIndex;
-    private boolean initialIsDisabled;
-    @Nullable private SelectionOverride initialOverride;
     private boolean allowAdaptiveSelections;
     private boolean allowMultipleOverrides;
 
+    private boolean isDisabled;
+    private List<SelectionOverride> overrides;
+
     /* package */ TrackSelectionView trackSelectionView;
 
     public void init(
@@ -281,8 +283,11 @@ public final class TrackSelectionDialog extends DialogFragment {
         boolean allowMultipleOverrides) {
       this.mappedTrackInfo = mappedTrackInfo;
       this.rendererIndex = rendererIndex;
-      this.initialIsDisabled = initialIsDisabled;
-      this.initialOverride = initialOverride;
+      this.isDisabled = initialIsDisabled;
+      this.overrides =
+          initialOverride == null
+              ? Collections.emptyList()
+              : Collections.singletonList(initialOverride);
       this.allowAdaptiveSelections = allowAdaptiveSelections;
       this.allowMultipleOverrides = allowMultipleOverrides;
     }
@@ -301,13 +306,14 @@ public final class TrackSelectionDialog extends DialogFragment {
       trackSelectionView.setAllowMultipleOverrides(allowMultipleOverrides);
       trackSelectionView.setAllowAdaptiveSelections(allowAdaptiveSelections);
       trackSelectionView.init(
-          mappedTrackInfo,
-          rendererIndex,
-          initialIsDisabled,
-          initialOverride == null
-              ? Collections.emptyList()
-              : Collections.singletonList(initialOverride));
+          mappedTrackInfo, rendererIndex, isDisabled, overrides, /* listener= */ this);
       return rootView;
     }
+
+    @Override
+    public void onTrackSelectionChanged(boolean isDisabled, List<SelectionOverride> overrides) {
+      this.isDisabled = isDisabled;
+      this.overrides = overrides;
+    }
   }
 }
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java
index 9c46f8b827..667c59f8c3 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java
@@ -219,7 +219,7 @@ public final class TrackSelectionDialogBuilder {
     if (trackNameProvider != null) {
       selectionView.setTrackNameProvider(trackNameProvider);
     }
-    selectionView.init(mappedTrackInfo, rendererIndex, isDisabled, overrides);
+    selectionView.init(mappedTrackInfo, rendererIndex, isDisabled, overrides, /* listener= */ null);
     Dialog.OnClickListener okClickListener =
         (dialog, which) ->
             callback.onTracksSelected(selectionView.getIsDisabled(), selectionView.getOverrides());
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
index fc01e63242..cee2b6f89e 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
@@ -41,6 +41,18 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 /** A view for making track selections. */
 public class TrackSelectionView extends LinearLayout {
 
+  /** Listener for changes to the selected tracks. */
+  public interface TrackSelectionListener {
+
+    /**
+     * Called when the selected tracks changed.
+     *
+     * @param isDisabled Whether the renderer is disabled.
+     * @param overrides List of selected track selection overrides for the renderer.
+     */
+    void onTrackSelectionChanged(boolean isDisabled, List<SelectionOverride> overrides);
+  }
+
   private final int selectableItemBackgroundResourceId;
   private final LayoutInflater inflater;
   private final CheckedTextView disableView;
@@ -54,10 +66,11 @@ public class TrackSelectionView extends LinearLayout {
   private TrackNameProvider trackNameProvider;
   private CheckedTextView[][] trackViews;
 
-  private @MonotonicNonNull MappedTrackInfo mappedTrackInfo;
+  @MonotonicNonNull private MappedTrackInfo mappedTrackInfo;
   private int rendererIndex;
   private TrackGroupArray trackGroups;
   private boolean isDisabled;
+  @Nullable private TrackSelectionListener listener;
 
   /** Creates a track selection view. */
   public TrackSelectionView(Context context) {
@@ -76,6 +89,9 @@ public class TrackSelectionView extends LinearLayout {
     super(context, attrs, defStyleAttr);
     overrides = new SparseArray<>();
 
+    // Don't save view hierarchy as it needs to be reinitialized with a call to init.
+    setSaveFromParentEnabled(false);
+
     TypedArray attributeArray =
         context
             .getTheme()
@@ -177,15 +193,18 @@ public class TrackSelectionView extends LinearLayout {
    * @param overrides List of initial overrides to be shown for this renderer. There must be at most
    *     one override for each track group. If {@link #setAllowMultipleOverrides(boolean)} hasn't
    *     been set to {@code true}, only the first override is used.
+   * @param listener An optional listener for track selection updates.
    */
   public void init(
       MappedTrackInfo mappedTrackInfo,
       int rendererIndex,
       boolean isDisabled,
-      List<SelectionOverride> overrides) {
+      List<SelectionOverride> overrides,
+      @Nullable TrackSelectionListener listener) {
     this.mappedTrackInfo = mappedTrackInfo;
     this.rendererIndex = rendererIndex;
     this.isDisabled = isDisabled;
+    this.listener = listener;
     int maxOverrides = allowMultipleOverrides ? overrides.size() : Math.min(overrides.size(), 1);
     for (int i = 0; i < maxOverrides; i++) {
       SelectionOverride override = overrides.get(i);
@@ -291,6 +310,9 @@ public class TrackSelectionView extends LinearLayout {
       onTrackViewClicked(view);
     }
     updateViewStates();
+    if (listener != null) {
+      listener.onTrackSelectionChanged(getIsDisabled(), getOverrides());
+    }
   }
 
   private void onDisableViewClicked() {

From cedfa1998897de850feecaa89499047856d3bdbb Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 15 Feb 2019 17:19:20 +0000
Subject: [PATCH 549/832] Prevent using view state and use state saved in
 fragment instead.

The system may destroy views at any time and may not have created the view
at all. Use the state saved in the fragment to be independant of the existance
of the view.

PiperOrigin-RevId: 234156285
---
 .../exoplayer2/demo/TrackSelectionDialog.java  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
index 1b9cf9aeb9..8597e7296c 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
@@ -145,7 +145,7 @@ public final class TrackSelectionDialog extends DialogFragment {
    */
   public boolean getIsDisabled(int rendererIndex) {
     TrackSelectionViewFragment rendererView = tabFragments.get(rendererIndex);
-    return rendererView != null && rendererView.trackSelectionView.getIsDisabled();
+    return rendererView != null && rendererView.isDisabled;
   }
 
   /**
@@ -157,9 +157,7 @@ public final class TrackSelectionDialog extends DialogFragment {
    */
   public List<SelectionOverride> getOverrides(int rendererIndex) {
     TrackSelectionViewFragment rendererView = tabFragments.get(rendererIndex);
-    return rendererView == null
-        ? Collections.emptyList()
-        : rendererView.trackSelectionView.getOverrides();
+    return rendererView == null ? Collections.emptyList() : rendererView.overrides;
   }
 
   @Override
@@ -269,10 +267,13 @@ public final class TrackSelectionDialog extends DialogFragment {
     private boolean allowAdaptiveSelections;
     private boolean allowMultipleOverrides;
 
-    private boolean isDisabled;
-    private List<SelectionOverride> overrides;
+    /* package */ boolean isDisabled;
+    /* package */ List<SelectionOverride> overrides;
 
-    /* package */ TrackSelectionView trackSelectionView;
+    public TrackSelectionViewFragment() {
+      // Retain instance across orientation changes to prevent loosing access to init data.
+      setRetainInstance(true);
+    }
 
     public void init(
         MappedTrackInfo mappedTrackInfo,
@@ -301,7 +302,8 @@ public final class TrackSelectionDialog extends DialogFragment {
       View rootView =
           inflater.inflate(
               R.layout.track_selection_dialog_tab, container, /* attachToRoot= */ false);
-      trackSelectionView = rootView.findViewById(R.id.download_dialog_track_selection_view);
+      TrackSelectionView trackSelectionView =
+          rootView.findViewById(R.id.download_dialog_track_selection_view);
       trackSelectionView.setShowDisableOption(true);
       trackSelectionView.setAllowMultipleOverrides(allowMultipleOverrides);
       trackSelectionView.setAllowAdaptiveSelections(allowAdaptiveSelections);

From 5d8e1784b94fcb501ea50ee9be7542913eacee25 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 18 Feb 2019 11:18:53 +0000
Subject: [PATCH 550/832] Fix MIME type for divx in Matroska

Issue: #3863
PiperOrigin-RevId: 234453728
---
 .../android/exoplayer2/extractor/mkv/MatroskaExtractor.java     | 2 +-
 .../main/java/com/google/android/exoplayer2/util/MimeTypes.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
index e7ca6de910..7fef710081 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
@@ -2070,7 +2070,7 @@ public class MatroskaExtractor implements Extractor {
         buffer.skipBytes(16); // size(4), width(4), height(4), planes(2), bitcount(2).
         long compression = buffer.readLittleEndianUnsignedInt();
         if (compression == FOURCC_COMPRESSION_DIVX) {
-          return new Pair<>(MimeTypes.VIDEO_H263, null);
+          return new Pair<>(MimeTypes.VIDEO_DIVX, null);
         } else if (compression == FOURCC_COMPRESSION_VC1) {
           // Search for the initialization data from the end of the BITMAPINFOHEADER. The last 20
           // bytes of which are: sizeImage(4), xPel/m (4), yPel/m (4), clrUsed(4), clrImportant(4).
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java b/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
index 003496a014..19e1f9b196 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
@@ -41,6 +41,7 @@ public final class MimeTypes {
   public static final String VIDEO_MPEG = BASE_TYPE_VIDEO + "/mpeg";
   public static final String VIDEO_MPEG2 = BASE_TYPE_VIDEO + "/mpeg2";
   public static final String VIDEO_VC1 = BASE_TYPE_VIDEO + "/wvc1";
+  public static final String VIDEO_DIVX = BASE_TYPE_VIDEO + "/divx";
   public static final String VIDEO_DOLBY_VISION = BASE_TYPE_VIDEO + "/dolby-vision";
   public static final String VIDEO_UNKNOWN = BASE_TYPE_VIDEO + "/x-unknown";
 

From e97910a694e5374a1104f1f279de1480deecd02a Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 18 Feb 2019 14:48:45 +0000
Subject: [PATCH 551/832] Fix seek exception unit

PiperOrigin-RevId: 234475237
---
 .../com/google/android/exoplayer2/ExoPlayerImplInternal.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index 670353c4f9..d9113e6b64 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -1472,8 +1472,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
           seekPosition.windowPositionUs);
     } catch (IndexOutOfBoundsException e) {
       // The window index of the seek position was outside the bounds of the timeline.
-      throw new IllegalSeekPositionException(timeline, seekPosition.windowIndex,
-          seekPosition.windowPositionUs);
+      throw new IllegalSeekPositionException(
+          timeline, seekPosition.windowIndex, C.usToMs(seekPosition.windowPositionUs));
     }
     if (timeline == seekTimeline) {
       // Our internal timeline is the seek timeline, so the mapped position is correct.

From 0ceff589b33992a98db0e439b24aea75f772e6ef Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Mon, 18 Feb 2019 15:33:17 +0000
Subject: [PATCH 552/832] HLS Bugfix: Avoid loading initialization segment when
 reusing extractor

This bug affects any playlist that uses initialization segments. In practice,
almost exclusively fragmented mp4 segmented playlists are affected.

The bottom line is that extractors are chosen for reuse after the
initialization segment connection is open. However, reused extractors
do not need re-parsing the init segment, so loading the initialization is
wasteful.

PiperOrigin-RevId: 234479467
---
 RELEASENOTES.md                               |  2 +
 .../hls/DefaultHlsExtractorFactory.java       | 49 ++++++++++++-------
 .../source/hls/HlsExtractorFactory.java       | 34 +++++++++++--
 .../exoplayer2/source/hls/HlsMediaChunk.java  | 33 +++++++------
 4 files changed, 80 insertions(+), 38 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 08837b4a60..6fd0e7d682 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -6,6 +6,8 @@
   * Form an adaptive track group out of audio renditions with matching name.
   * Support encrypted initialization segments
     ([#5441](https://github.com/google/ExoPlayer/issues/5441)).
+  * Prevent unnecessary reloads of the initialization segment for reused
+    extractors.
 * DASH:
   * Fix issue handling large `EventStream` presentation timestamps
     ([#5490](https://github.com/google/ExoPlayer/issues/5490)).
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
index 8a403c3759..8be0371072 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.source.hls;
 
 import android.net.Uri;
 import android.text.TextUtils;
-import android.util.Pair;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.extractor.Extractor;
@@ -71,7 +70,7 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
   }
 
   @Override
-  public Pair<Extractor, Boolean> createExtractor(
+  public Result createExtractor(
       Extractor previousExtractor,
       Uri uri,
       Format format,
@@ -84,21 +83,15 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
 
     if (previousExtractor != null) {
       // A extractor has already been successfully used. Return one of the same type.
-      if (previousExtractor instanceof TsExtractor
-          || previousExtractor instanceof FragmentedMp4Extractor) {
-        // TS and fMP4 extractors can be reused.
+      if (isReusable(previousExtractor)) {
         return buildResult(previousExtractor);
-      } else if (previousExtractor instanceof WebvttExtractor) {
-        return buildResult(new WebvttExtractor(format.language, timestampAdjuster));
-      } else if (previousExtractor instanceof AdtsExtractor) {
-        return buildResult(new AdtsExtractor());
-      } else if (previousExtractor instanceof Ac3Extractor) {
-        return buildResult(new Ac3Extractor());
-      } else if (previousExtractor instanceof Mp3Extractor) {
-        return buildResult(new Mp3Extractor());
       } else {
-        throw new IllegalArgumentException(
-            "Unexpected previousExtractor type: " + previousExtractor.getClass().getSimpleName());
+        Result result =
+            buildResultForSameExtractorType(previousExtractor, format, timestampAdjuster);
+        if (result == null) {
+          throw new IllegalArgumentException(
+              "Unexpected previousExtractor type: " + previousExtractor.getClass().getSimpleName());
+        }
       }
     }
 
@@ -249,12 +242,28 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
         new DefaultTsPayloadReaderFactory(payloadReaderFactoryFlags, muxedCaptionFormats));
   }
 
-  private static Pair<Extractor, Boolean> buildResult(Extractor extractor) {
-    return new Pair<>(
+  private static Result buildResultForSameExtractorType(
+      Extractor previousExtractor, Format format, TimestampAdjuster timestampAdjuster) {
+    if (previousExtractor instanceof WebvttExtractor) {
+      return buildResult(new WebvttExtractor(format.language, timestampAdjuster));
+    } else if (previousExtractor instanceof AdtsExtractor) {
+      return buildResult(new AdtsExtractor());
+    } else if (previousExtractor instanceof Ac3Extractor) {
+      return buildResult(new Ac3Extractor());
+    } else if (previousExtractor instanceof Mp3Extractor) {
+      return buildResult(new Mp3Extractor());
+    } else {
+      return null;
+    }
+  }
+
+  private static Result buildResult(Extractor extractor) {
+    return new Result(
         extractor,
         extractor instanceof AdtsExtractor
             || extractor instanceof Ac3Extractor
-            || extractor instanceof Mp3Extractor);
+            || extractor instanceof Mp3Extractor,
+        isReusable(extractor));
   }
 
   private static boolean sniffQuietly(Extractor extractor, ExtractorInput input)
@@ -270,4 +279,8 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
     return result;
   }
 
+  private static boolean isReusable(Extractor previousExtractor) {
+    return previousExtractor instanceof TsExtractor
+        || previousExtractor instanceof FragmentedMp4Extractor;
+  }
 }
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsExtractorFactory.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsExtractorFactory.java
index eea64d4dc6..103d89188f 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsExtractorFactory.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsExtractorFactory.java
@@ -16,7 +16,6 @@
 package com.google.android.exoplayer2.source.hls;
 
 import android.net.Uri;
-import android.util.Pair;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.extractor.Extractor;
@@ -32,6 +31,33 @@ import java.util.Map;
  */
 public interface HlsExtractorFactory {
 
+  /** Holds an {@link Extractor} and associated parameters. */
+  final class Result {
+
+    /** The created extractor; */
+    public final Extractor extractor;
+    /** Whether the segments for which {@link #extractor} is created are packed audio segments. */
+    public final boolean isPackedAudioExtractor;
+    /**
+     * Whether {@link #extractor} may be reused for following continuous (no immediately preceding
+     * discontinuities) segments of the same variant.
+     */
+    public final boolean isReusable;
+
+    /**
+     * Creates a result.
+     *
+     * @param extractor See {@link #extractor}.
+     * @param isPackedAudioExtractor See {@link #isPackedAudioExtractor}.
+     * @param isReusable See {@link #isReusable}.
+     */
+    public Result(Extractor extractor, boolean isPackedAudioExtractor, boolean isReusable) {
+      this.extractor = extractor;
+      this.isPackedAudioExtractor = isPackedAudioExtractor;
+      this.isReusable = isReusable;
+    }
+  }
+
   HlsExtractorFactory DEFAULT = new DefaultHlsExtractorFactory();
 
   /**
@@ -51,13 +77,11 @@ public interface HlsExtractorFactory {
    * @param sniffingExtractorInput The first extractor input that will be passed to the returned
    *     extractor's {@link Extractor#read(ExtractorInput, PositionHolder)}. Must only be used to
    *     call {@link Extractor#sniff(ExtractorInput)}.
-   * @return A pair containing the {@link Extractor} and a boolean that indicates whether it is a
-   *     packed audio extractor. The first element may be {@code previousExtractor} if the factory
-   *     has determined it can be re-used.
+   * @return A {@link Result}.
    * @throws InterruptedException If the thread is interrupted while sniffing.
    * @throws IOException If an I/O error is encountered while sniffing.
    */
-  Pair<Extractor, Boolean> createExtractor(
+  Result createExtractor(
       Extractor previousExtractor,
       Uri uri,
       Format format,
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
index d307bbb04d..a7e8fcc292 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.source.hls;
 
 import android.net.Uri;
 import android.support.annotation.Nullable;
-import android.util.Pair;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.drm.DrmInitData;
@@ -133,9 +132,11 @@ import java.util.concurrent.atomic.AtomicInteger;
       scratchId3Data = previousChunk.scratchId3Data;
       shouldSpliceIn = previousChunk.hlsUrl != hlsUrl || !previousChunk.loadCompleted;
       previousExtractor =
-          previousChunk.discontinuitySequenceNumber != discontinuitySequenceNumber || shouldSpliceIn
-              ? null
-              : previousChunk.extractor;
+          previousChunk.isExtractorReusable
+                  && previousChunk.discontinuitySequenceNumber == discontinuitySequenceNumber
+                  && !shouldSpliceIn
+              ? previousChunk.extractor
+              : null;
     } else {
       id3Decoder = new Id3Decoder();
       scratchId3Data = new ParsableByteArray(Id3Decoder.ID3_HEADER_LENGTH);
@@ -204,6 +205,7 @@ import java.util.concurrent.atomic.AtomicInteger;
   private final boolean initSegmentEncrypted;
 
   private Extractor extractor;
+  private boolean isExtractorReusable;
   private HlsSampleStreamWrapper output;
   private int initSegmentBytesLoaded;
   private int nextLoadPosition;
@@ -287,6 +289,12 @@ import java.util.concurrent.atomic.AtomicInteger;
 
   @Override
   public void load() throws IOException, InterruptedException {
+    if (extractor == null && previousExtractor != null) {
+      extractor = previousExtractor;
+      isExtractorReusable = true;
+      initLoadCompleted = initDataSpec != null;
+      output.init(uid, shouldSpliceIn, /* reusingExtractor= */ true);
+    }
     maybeLoadInitData();
     if (!loadCanceled) {
       if (!hasGapTag) {
@@ -380,7 +388,7 @@ import java.util.concurrent.atomic.AtomicInteger;
       long id3Timestamp = peekId3PrivTimestamp(extractorInput);
       extractorInput.resetPeekPosition();
 
-      Pair<Extractor, Boolean> extractorData =
+      HlsExtractorFactory.Result result =
           extractorFactory.createExtractor(
               previousExtractor,
               dataSpec.uri,
@@ -390,21 +398,16 @@ import java.util.concurrent.atomic.AtomicInteger;
               timestampAdjuster,
               dataSource.getResponseHeaders(),
               extractorInput);
-      extractor = extractorData.first;
-      boolean reusingExtractor = extractor == previousExtractor;
-      boolean isPackedAudioExtractor = extractorData.second;
-      if (isPackedAudioExtractor) {
+      extractor = result.extractor;
+      isExtractorReusable = result.isReusable;
+      if (result.isPackedAudioExtractor) {
         output.setSampleOffsetUs(
             id3Timestamp != C.TIME_UNSET
                 ? timestampAdjuster.adjustTsTimestamp(id3Timestamp)
                 : startTimeUs);
       }
-      initLoadCompleted = reusingExtractor && initDataSpec != null;
-
-      output.init(uid, shouldSpliceIn, reusingExtractor);
-      if (!reusingExtractor) {
-        extractor.init(output);
-      }
+      output.init(uid, shouldSpliceIn, /* reusingExtractor= */ false);
+      extractor.init(output);
     }
 
     return extractorInput;

From 2b67f2a6268daf1d05904db0be11c898f511e695 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 18 Feb 2019 15:50:55 +0000
Subject: [PATCH 553/832] Avoid crashing process on OOM

Catch OutOfMemoryErrors and surface them as unexpected ExoPlaybackExceptions.

PiperOrigin-RevId: 234481140
---
 .../exoplayer2/ExoPlaybackException.java      | 33 +++++++++++++++----
 .../exoplayer2/ExoPlayerImplInternal.java     |  9 +++--
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
index d5ceb3db30..48f82b2c45 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
@@ -31,11 +31,11 @@ public final class ExoPlaybackException extends Exception {
 
   /**
    * The type of source that produced the error. One of {@link #TYPE_SOURCE}, {@link #TYPE_RENDERER}
-   * or {@link #TYPE_UNEXPECTED}.
+   * {@link #TYPE_UNEXPECTED}, {@link #TYPE_REMOTE} or {@link #TYPE_OUT_OF_MEMORY}.
    */
   @Documented
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({TYPE_SOURCE, TYPE_RENDERER, TYPE_UNEXPECTED, TYPE_REMOTE})
+  @IntDef({TYPE_SOURCE, TYPE_RENDERER, TYPE_UNEXPECTED, TYPE_REMOTE, TYPE_OUT_OF_MEMORY})
   public @interface Type {}
   /**
    * The error occurred loading data from a {@link MediaSource}.
@@ -61,10 +61,12 @@ public final class ExoPlaybackException extends Exception {
    * <p>Call {@link #getMessage()} to retrieve the message associated with the error.
    */
   public static final int TYPE_REMOTE = 3;
+  /** The error was an {@link OutOfMemoryError}. */
+  public static final int TYPE_OUT_OF_MEMORY = 4;
 
   /**
-   * The type of the playback failure. One of {@link #TYPE_SOURCE}, {@link #TYPE_RENDERER} and
-   * {@link #TYPE_UNEXPECTED}.
+   * The type of the playback failure. One of {@link #TYPE_SOURCE}, {@link #TYPE_RENDERER}, {@link
+   * #TYPE_UNEXPECTED}, {@link #TYPE_REMOTE} and {@link #TYPE_OUT_OF_MEMORY}.
    */
   @Type public final int type;
 
@@ -82,7 +84,7 @@ public final class ExoPlaybackException extends Exception {
    * @return The created instance.
    */
   public static ExoPlaybackException createForSource(IOException cause) {
-    return new ExoPlaybackException(TYPE_SOURCE, cause, C.INDEX_UNSET);
+    return new ExoPlaybackException(TYPE_SOURCE, cause, /* rendererIndex= */ C.INDEX_UNSET);
   }
 
   /**
@@ -103,7 +105,7 @@ public final class ExoPlaybackException extends Exception {
    * @return The created instance.
    */
   /* package */ static ExoPlaybackException createForUnexpected(RuntimeException cause) {
-    return new ExoPlaybackException(TYPE_UNEXPECTED, cause, C.INDEX_UNSET);
+    return new ExoPlaybackException(TYPE_UNEXPECTED, cause, /* rendererIndex= */ C.INDEX_UNSET);
   }
 
   /**
@@ -116,6 +118,16 @@ public final class ExoPlaybackException extends Exception {
     return new ExoPlaybackException(TYPE_REMOTE, message);
   }
 
+  /**
+   * Creates an instance of type {@link #TYPE_OUT_OF_MEMORY}.
+   *
+   * @param cause The cause of the failure.
+   * @return The created instance.
+   */
+  /* package */ static ExoPlaybackException createForOutOfMemoryError(OutOfMemoryError cause) {
+    return new ExoPlaybackException(TYPE_OUT_OF_MEMORY, cause, /* rendererIndex= */ C.INDEX_UNSET);
+  }
+
   private ExoPlaybackException(@Type int type, Throwable cause, int rendererIndex) {
     super(cause);
     this.type = type;
@@ -160,4 +172,13 @@ public final class ExoPlaybackException extends Exception {
     return (RuntimeException) Assertions.checkNotNull(cause);
   }
 
+  /**
+   * Retrieves the underlying error when {@link #type} is {@link #TYPE_OUT_OF_MEMORY}.
+   *
+   * @throws IllegalStateException If {@link #type} is not {@link #TYPE_OUT_OF_MEMORY}.
+   */
+  public OutOfMemoryError getOutOfMemoryError() {
+    Assertions.checkState(type == TYPE_OUT_OF_MEMORY);
+    return (OutOfMemoryError) Assertions.checkNotNull(cause);
+  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index d9113e6b64..8bdd12c049 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -389,14 +389,17 @@ import java.util.concurrent.atomic.AtomicBoolean;
           /* acknowledgeStop= */ false);
       eventHandler.obtainMessage(MSG_ERROR, ExoPlaybackException.createForSource(e)).sendToTarget();
       maybeNotifyPlaybackInfoChanged();
-    } catch (RuntimeException e) {
+    } catch (RuntimeException | OutOfMemoryError e) {
       Log.e(TAG, "Internal runtime error.", e);
       stopInternal(
           /* forceResetRenderers= */ true,
           /* resetPositionAndState= */ false,
           /* acknowledgeStop= */ false);
-      eventHandler.obtainMessage(MSG_ERROR, ExoPlaybackException.createForUnexpected(e))
-          .sendToTarget();
+      ExoPlaybackException error =
+          e instanceof OutOfMemoryError
+              ? ExoPlaybackException.createForOutOfMemoryError((OutOfMemoryError) e)
+              : ExoPlaybackException.createForUnexpected((RuntimeException) e);
+      eventHandler.obtainMessage(MSG_ERROR, error).sendToTarget();
       maybeNotifyPlaybackInfoChanged();
     }
     return true;

From 03e28d4689ea17d09bbe7209428d27280ac33000 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Mon, 18 Feb 2019 15:55:27 +0000
Subject: [PATCH 554/832] Support stopping/starting single downloads

Also added intent actions to stop/start one or all downloads.

Issue: #4433
Issue: #4860
PiperOrigin-RevId: 234481515
---
 .../exoplayer2/offline/DownloadManager.java   | 61 ++++++++++++++---
 .../exoplayer2/offline/DownloadService.java   | 65 +++++++++++++++++++
 .../offline/DownloadManagerTest.java          | 58 +++++++++++++++++
 3 files changed, 176 insertions(+), 8 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index cd5f0dc6cf..3ccba10807 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -260,7 +260,7 @@ public final class DownloadManager {
 
   /** Signals all downloads to stop. Call {@link #startDownloads()} to let them to be started. */
   public void stopDownloads() {
-    stopDownloads(0);
+    stopDownloads(/* manualStopReason= */ 0);
   }
 
   /**
@@ -277,6 +277,45 @@ public final class DownloadManager {
     }
   }
 
+  /**
+   * Clears {@link DownloadState#STOP_FLAG_MANUAL} flag of the download with the {@code id}.
+   * Download is started if the requirements are met.
+   *
+   * @param id The unique content id of the download to be started.
+   */
+  public void startDownload(String id) {
+    Download download = getDownload(id);
+    if (download != null) {
+      logd("download is started manually", download);
+      download.clearManualStopReason();
+    }
+  }
+
+  /**
+   * Signals the download with the {@code id} to stop. Call {@link #startDownload(String)} to let it
+   * to be started.
+   *
+   * @param id The unique content id of the download to be stopped.
+   */
+  public void stopDownload(String id) {
+    stopDownload(id, /* manualStopReason= */ 0);
+  }
+
+  /**
+   * Signals the download with the {@code id} to stop. Call {@link #startDownload(String)} to let it
+   * to be started.
+   *
+   * @param id The unique content id of the download to be stopped.
+   * @param manualStopReason An application defined stop reason.
+   */
+  public void stopDownload(String id, int manualStopReason) {
+    Download download = getDownload(id);
+    if (download != null) {
+      logd("download is stopped manually", download);
+      download.setManualStopReason(manualStopReason);
+    }
+  }
+
   /**
    * Handles the given action.
    *
@@ -307,13 +346,8 @@ public final class DownloadManager {
   @Nullable
   public DownloadState getDownloadState(String id) {
     Assertions.checkState(!released);
-    for (int i = 0; i < downloads.size(); i++) {
-      Download download = downloads.get(i);
-      if (download.getId().equals(id)) {
-        return download.getDownloadState();
-      }
-    }
-    return null;
+    Download download = getDownload(id);
+    return download != null ? download.getDownloadState() : null;
   }
 
   /** Returns the states of all current downloads. */
@@ -418,6 +452,17 @@ public final class DownloadManager {
     }
   }
 
+  @Nullable
+  private Download getDownload(String id) {
+    for (int i = 0; i < downloads.size(); i++) {
+      Download download = downloads.get(i);
+      if (download.getId().equals(id)) {
+        return download;
+      }
+    }
+    return null;
+  }
+
   private void loadActions() {
     fileIOHandler.post(
         () -> {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index 305620d5f3..2db33cb59c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -43,6 +43,14 @@ public abstract class DownloadService extends Service {
   /** Starts a download service, adding a new {@link DownloadAction} to be executed. */
   public static final String ACTION_ADD = "com.google.android.exoplayer.downloadService.action.ADD";
 
+  /** Stops one or all downloads. */
+  public static final String ACTION_STOP =
+      "com.google.android.exoplayer.downloadService.action.STOP";
+
+  /** Starts one or all downloads. */
+  public static final String ACTION_START =
+      "com.google.android.exoplayer.downloadService.action.START";
+
   /** Like {@link #ACTION_INIT}, but with {@link #KEY_FOREGROUND} implicitly set to true. */
   private static final String ACTION_RESTART =
       "com.google.android.exoplayer.downloadService.action.RESTART";
@@ -50,6 +58,12 @@ public abstract class DownloadService extends Service {
   /** Key for the {@link DownloadAction} in an {@link #ACTION_ADD} intent. */
   public static final String KEY_DOWNLOAD_ACTION = "download_action";
 
+  /** Key for content id in an {@link #ACTION_STOP} or {@link #ACTION_START} intent. */
+  public static final String KEY_CONTENT_ID = "content_id";
+
+  /** Key for manual stop reason in an {@link #ACTION_STOP} intent. */
+  public static final String KEY_STOP_REASON = "stop_reason";
+
   /** Invalid foreground notification id which can be used to run the service in the background. */
   public static final int FOREGROUND_NOTIFICATION_ID_NONE = 0;
 
@@ -165,6 +179,40 @@ public abstract class DownloadService extends Service {
         .putExtra(KEY_FOREGROUND, foreground);
   }
 
+  /**
+   * Builds an {@link Intent} for stopping the download with the {@code id}. If {@code id} is null,
+   * stops all downloads.
+   *
+   * @param context A {@link Context}.
+   * @param clazz The concrete download service being targeted by the intent.
+   * @param id The content id, or null if all downloads should be stopped.
+   * @param manualStopReason An application defined stop reason.
+   * @return Created Intent.
+   */
+  public static Intent buildStopDownloadIntent(
+      Context context,
+      Class<? extends DownloadService> clazz,
+      @Nullable String id,
+      int manualStopReason) {
+    return getIntent(context, clazz, ACTION_STOP)
+        .putExtra(KEY_CONTENT_ID, id)
+        .putExtra(KEY_STOP_REASON, manualStopReason);
+  }
+
+  /**
+   * Builds an {@link Intent} for starting the download with the {@code id}. If {@code id} is null,
+   * starts all downloads.
+   *
+   * @param context A {@link Context}.
+   * @param clazz The concrete download service being targeted by the intent.
+   * @param id The content id, or null if all downloads should be started.
+   * @return Created Intent.
+   */
+  public static Intent buildStartDownloadIntent(
+      Context context, Class<? extends DownloadService> clazz, @Nullable String id) {
+    return getIntent(context, clazz, ACTION_START).putExtra(KEY_CONTENT_ID, id);
+  }
+
   /**
    * Starts the service, adding an action to be executed.
    *
@@ -263,6 +311,23 @@ public abstract class DownloadService extends Service {
           }
         }
         break;
+      case ACTION_STOP:
+        String stopDownloadId = intent.getStringExtra(KEY_CONTENT_ID);
+        int stopReason = intent.getIntExtra(KEY_STOP_REASON, 0);
+        if (stopDownloadId == null) {
+          downloadManager.stopDownloads(stopReason);
+        } else {
+          downloadManager.stopDownload(stopDownloadId, stopReason);
+        }
+        break;
+      case ACTION_START:
+        String startDownloadId = intent.getStringExtra(KEY_CONTENT_ID);
+        if (startDownloadId == null) {
+          downloadManager.startDownloads();
+        } else {
+          downloadManager.startDownload(startDownloadId);
+        }
+        break;
       default:
         Log.e(TAG, "Ignoring unrecognized action: " + intentAction);
         break;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index a4e63a1c78..74b9c4dfce 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -403,6 +403,64 @@ public class DownloadManagerTest {
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
+  @Test
+  public void stopAndResumeSingleDownload() throws Throwable {
+    DownloadRunner runner = new DownloadRunner(uri1).postDownloadAction();
+    TaskWrapper task = runner.getTask();
+
+    task.assertDownloading();
+
+    runOnMainThread(() -> downloadManager.stopDownload(task.taskId));
+
+    task.assertStopped();
+
+    runOnMainThread(() -> downloadManager.startDownload(task.taskId));
+
+    runner.getDownloader(1).assertStarted().unblock();
+
+    downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
+  }
+
+  @Test
+  public void stoppedDownloadCanBeCancelled() throws Throwable {
+    DownloadRunner runner = new DownloadRunner(uri1).postDownloadAction();
+    TaskWrapper task = runner.getTask();
+
+    task.assertDownloading();
+
+    runOnMainThread(() -> downloadManager.stopDownload(task.taskId));
+
+    task.assertStopped();
+
+    runner.postRemoveAction();
+    runner.getDownloader(1).assertStarted().unblock();
+    task.assertRemoved();
+
+    downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
+  }
+
+  @Test
+  public void stoppedSingleDownload_doesNotAffectOthers() throws Throwable {
+    DownloadRunner runner1 = new DownloadRunner(uri1);
+    DownloadRunner runner2 = new DownloadRunner(uri2);
+    DownloadRunner runner3 = new DownloadRunner(uri3);
+
+    runner1.postDownloadAction().getTask().assertDownloading();
+    runner2.postRemoveAction().getTask().assertRemoving();
+
+    runOnMainThread(() -> downloadManager.stopDownload(runner1.getTask().taskId));
+
+    runner1.getTask().assertStopped();
+
+    // Other downloads aren't affected.
+    runner2.getDownloader(0).unblock().assertReleased();
+
+    // New download actions can be added and they start.
+    runner3.postDownloadAction().getDownloader(0).assertStarted().unblock();
+
+    downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
+  }
+
   private void setUpDownloadManager(final int maxActiveDownloadTasks) throws Exception {
     if (downloadManager != null) {
       releaseDownloadManager();

From f3bd93394be715203e48e95102489cd4245975db Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 18 Feb 2019 18:43:56 +0000
Subject: [PATCH 555/832] Fix copybara stripping

PiperOrigin-RevId: 234496529
---
 .../google/android/exoplayer2/castdemo/MainActivity.java | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
index efda40a913..8533bf8899 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
@@ -129,15 +129,6 @@ public class MainActivity extends AppCompatActivity
                 /* context= */ this,
                 castContext);
         break;
-      case ExoCastOptionsProvider.RECEIVER_ID:
-        playerManager =
-            new ExoCastPlayerManager(
-                /* listener= */ this,
-                localPlayerView,
-                castControlView,
-                /* context= */ this,
-                castContext);
-        break;
       default:
         throw new IllegalStateException("Illegal receiver app id: " + applicationId);
     }

From 0622afe170d3e9d3803572cb81e84dad975de121 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 18 Feb 2019 21:24:24 +0000
Subject: [PATCH 556/832] Migrate to androidx

Issue: #5489
PiperOrigin-RevId: 234507428

Add missing annotation dependency

Issue: #5489
PiperOrigin-RevId: 234566177
---
 demos/cast/build.gradle                          |  8 ++++----
 demos/cast/proguard-rules.txt                    |  2 +-
 .../castdemo/DefaultReceiverPlayerManager.java   |  2 +-
 .../android/exoplayer2/castdemo/DemoUtil.java    |  2 +-
 .../exoplayer2/castdemo/MainActivity.java        | 14 +++++++-------
 demos/cast/src/main/res/layout/main_activity.xml |  4 ++--
 demos/cast/src/main/res/menu/menu.xml            |  2 +-
 demos/ima/build.gradle                           |  2 +-
 demos/main/build.gradle                          |  8 ++++----
 .../android/exoplayer2/demo/DownloadTracker.java |  4 ++--
 .../android/exoplayer2/demo/PlayerActivity.java  |  6 +++---
 .../exoplayer2/demo/SampleChooserActivity.java   |  4 ++--
 .../exoplayer2/demo/TrackSelectionDialog.java    | 16 ++++++++--------
 .../main/res/layout/track_selection_dialog.xml   |  6 +++---
 .../src/main/res/menu/sample_chooser_menu.xml    | 15 ++++++++-------
 extensions/cast/build.gradle                     | 14 +++-----------
 .../android/exoplayer2/ext/cast/CastPlayer.java  |  4 ++--
 .../exoplayer2/ext/cast/CastTimeline.java        |  2 +-
 .../android/exoplayer2/ext/cast/MediaItem.java   |  2 +-
 extensions/cronet/build.gradle                   |  2 +-
 .../exoplayer2/ext/cronet/CronetDataSource.java  |  2 +-
 .../ext/cronet/CronetDataSourceFactory.java      |  2 +-
 .../ext/cronet/CronetEngineWrapper.java          |  2 +-
 extensions/ffmpeg/build.gradle                   |  2 +-
 .../ext/ffmpeg/FfmpegAudioRenderer.java          |  2 +-
 .../exoplayer2/ext/ffmpeg/FfmpegDecoder.java     |  2 +-
 .../exoplayer2/ext/ffmpeg/FfmpegLibrary.java     |  2 +-
 extensions/flac/build.gradle                     |  2 +-
 .../ext/flac/FlacExtractorSeekTest.java          |  2 +-
 .../exoplayer2/ext/flac/FlacExtractor.java       |  4 ++--
 extensions/gvr/build.gradle                      |  2 +-
 .../exoplayer2/ext/gvr/GvrAudioProcessor.java    |  2 +-
 .../exoplayer2/ext/gvr/GvrPlayerActivity.java    |  8 ++++----
 extensions/ima/build.gradle                      |  7 -------
 .../android/exoplayer2/ext/ima/ImaAdsLoader.java |  6 +++---
 .../exoplayer2/ext/ima/ImaAdsLoaderTest.java     |  2 +-
 extensions/leanback/build.gradle                 |  2 +-
 .../ext/leanback/LeanbackPlayerAdapter.java      | 10 +++++-----
 extensions/mediasession/build.gradle             |  2 +-
 .../ext/mediasession/MediaSessionConnector.java  |  6 +++---
 .../ext/mediasession/TimelineQueueEditor.java    |  4 ++--
 .../ext/mediasession/TimelineQueueNavigator.java |  2 +-
 extensions/okhttp/build.gradle                   |  2 +-
 .../exoplayer2/ext/okhttp/OkHttpDataSource.java  |  2 +-
 .../ext/okhttp/OkHttpDataSourceFactory.java      |  2 +-
 extensions/rtmp/build.gradle                     |  2 +-
 .../exoplayer2/ext/rtmp/RtmpDataSource.java      |  2 +-
 .../ext/rtmp/RtmpDataSourceFactory.java          |  2 +-
 extensions/vp9/build.gradle                      |  2 +-
 .../exoplayer2/ext/vp9/LibvpxVideoRenderer.java  |  6 +++---
 gradle.properties                                |  2 ++
 library/core/build.gradle                        |  2 +-
 .../upstream/ContentDataSourceTest.java          |  4 ++--
 .../google/android/exoplayer2/BasePlayer.java    |  2 +-
 .../google/android/exoplayer2/BaseRenderer.java  |  2 +-
 .../java/com/google/android/exoplayer2/C.java    |  2 +-
 .../android/exoplayer2/DefaultMediaClock.java    |  2 +-
 .../exoplayer2/DefaultRenderersFactory.java      |  4 ++--
 .../android/exoplayer2/ExoPlaybackException.java |  4 ++--
 .../com/google/android/exoplayer2/ExoPlayer.java |  2 +-
 .../android/exoplayer2/ExoPlayerFactory.java     |  2 +-
 .../google/android/exoplayer2/ExoPlayerImpl.java |  2 +-
 .../exoplayer2/ExoPlayerImplInternal.java        |  4 ++--
 .../com/google/android/exoplayer2/Format.java    |  2 +-
 .../google/android/exoplayer2/FormatHolder.java  |  2 +-
 .../android/exoplayer2/MediaPeriodHolder.java    |  2 +-
 .../android/exoplayer2/MediaPeriodInfo.java      |  2 +-
 .../android/exoplayer2/MediaPeriodQueue.java     |  2 +-
 .../android/exoplayer2/NoSampleRenderer.java     |  2 +-
 .../google/android/exoplayer2/PlaybackInfo.java  |  4 ++--
 .../android/exoplayer2/PlaybackParameters.java   |  2 +-
 .../com/google/android/exoplayer2/Player.java    |  4 ++--
 .../google/android/exoplayer2/PlayerMessage.java |  2 +-
 .../com/google/android/exoplayer2/Renderer.java  |  2 +-
 .../exoplayer2/RendererConfiguration.java        |  2 +-
 .../android/exoplayer2/RenderersFactory.java     |  2 +-
 .../android/exoplayer2/SeekParameters.java       |  2 +-
 .../android/exoplayer2/SimpleExoPlayer.java      |  2 +-
 .../com/google/android/exoplayer2/Timeline.java  |  2 +-
 .../exoplayer2/analytics/AnalyticsCollector.java |  2 +-
 .../exoplayer2/analytics/AnalyticsListener.java  |  2 +-
 .../google/android/exoplayer2/audio/Ac3Util.java |  2 +-
 .../exoplayer2/audio/AudioAttributes.java        |  2 +-
 .../exoplayer2/audio/AudioCapabilities.java      |  2 +-
 .../audio/AudioCapabilitiesReceiver.java         |  2 +-
 .../exoplayer2/audio/AudioFocusManager.java      |  8 ++++----
 .../audio/AudioRendererEventListener.java        |  2 +-
 .../android/exoplayer2/audio/AudioSink.java      |  2 +-
 .../exoplayer2/audio/AudioTimestampPoller.java   |  4 ++--
 .../audio/AudioTrackPositionTracker.java         |  4 ++--
 .../android/exoplayer2/audio/AuxEffectInfo.java  |  2 +-
 .../exoplayer2/audio/BaseAudioProcessor.java     |  2 +-
 .../audio/ChannelMappingAudioProcessor.java      |  2 +-
 .../exoplayer2/audio/DefaultAudioSink.java       |  4 ++--
 .../audio/MediaCodecAudioRenderer.java           |  4 ++--
 .../audio/SilenceSkippingAudioProcessor.java     |  2 +-
 .../audio/SimpleDecoderAudioRenderer.java        |  4 ++--
 .../exoplayer2/audio/SonicAudioProcessor.java    |  2 +-
 .../exoplayer2/audio/TeeAudioProcessor.java      |  2 +-
 .../exoplayer2/database/VersionTable.java        |  4 ++--
 .../exoplayer2/decoder/DecoderInputBuffer.java   |  2 +-
 .../exoplayer2/decoder/SimpleDecoder.java        |  2 +-
 .../exoplayer2/drm/DefaultDrmSession.java        |  2 +-
 .../exoplayer2/drm/DefaultDrmSessionManager.java |  4 ++--
 .../android/exoplayer2/drm/DrmInitData.java      |  2 +-
 .../android/exoplayer2/drm/DrmSession.java       |  4 ++--
 .../exoplayer2/drm/ErrorStateDrmSession.java     |  2 +-
 .../android/exoplayer2/drm/ExoMediaDrm.java      |  2 +-
 .../exoplayer2/drm/FrameworkMediaDrm.java        |  2 +-
 .../exoplayer2/drm/HttpMediaDrmCallback.java     |  2 +-
 .../exoplayer2/drm/OfflineLicenseHelper.java     |  2 +-
 .../exoplayer2/drm/UnsupportedDrmException.java  |  2 +-
 .../android/exoplayer2/drm/WidevineUtil.java     |  2 +-
 .../exoplayer2/extractor/BinarySearchSeeker.java |  4 ++--
 .../exoplayer2/extractor/DummyTrackOutput.java   |  2 +-
 .../android/exoplayer2/extractor/Extractor.java  |  2 +-
 .../android/exoplayer2/extractor/Id3Peeker.java  |  2 +-
 .../android/exoplayer2/extractor/SeekMap.java    |  2 +-
 .../android/exoplayer2/extractor/SeekPoint.java  |  2 +-
 .../exoplayer2/extractor/TrackOutput.java        |  2 +-
 .../exoplayer2/extractor/amr/AmrExtractor.java   |  4 ++--
 .../exoplayer2/extractor/flv/FlvExtractor.java   |  2 +-
 .../extractor/mkv/DefaultEbmlReader.java         |  2 +-
 .../exoplayer2/extractor/mkv/EbmlProcessor.java  |  2 +-
 .../extractor/mkv/MatroskaExtractor.java         |  6 +++---
 .../exoplayer2/extractor/mp3/Mp3Extractor.java   |  4 ++--
 .../exoplayer2/extractor/mp3/VbriSeeker.java     |  2 +-
 .../exoplayer2/extractor/mp3/XingSeeker.java     |  2 +-
 .../android/exoplayer2/extractor/mp4/Atom.java   |  2 +-
 .../exoplayer2/extractor/mp4/AtomParsers.java    |  2 +-
 .../extractor/mp4/FragmentedMp4Extractor.java    |  4 ++--
 .../extractor/mp4/MdtaMetadataEntry.java         |  2 +-
 .../exoplayer2/extractor/mp4/MetadataUtil.java   |  2 +-
 .../exoplayer2/extractor/mp4/Mp4Extractor.java   |  2 +-
 .../exoplayer2/extractor/mp4/PsshAtomUtil.java   |  2 +-
 .../android/exoplayer2/extractor/mp4/Track.java  |  4 ++--
 .../extractor/mp4/TrackEncryptionBox.java        |  2 +-
 .../extractor/ogg/DefaultOggSeeker.java          |  2 +-
 .../exoplayer2/extractor/ogg/VorbisReader.java   |  2 +-
 .../exoplayer2/extractor/ts/Ac3Reader.java       |  2 +-
 .../exoplayer2/extractor/ts/AdtsExtractor.java   |  4 ++--
 .../ts/DefaultTsPayloadReaderFactory.java        |  2 +-
 .../exoplayer2/extractor/ts/LatmReader.java      |  2 +-
 .../exoplayer2/extractor/ts/TsExtractor.java     |  2 +-
 .../exoplayer2/extractor/ts/TsPayloadReader.java |  2 +-
 .../exoplayer2/mediacodec/MediaCodecInfo.java    |  2 +-
 .../mediacodec/MediaCodecRenderer.java           |  6 +++---
 .../mediacodec/MediaCodecSelector.java           |  2 +-
 .../exoplayer2/mediacodec/MediaCodecUtil.java    |  2 +-
 .../exoplayer2/mediacodec/MediaFormatUtil.java   |  2 +-
 .../android/exoplayer2/metadata/Metadata.java    |  2 +-
 .../exoplayer2/metadata/MetadataDecoder.java     |  2 +-
 .../exoplayer2/metadata/MetadataRenderer.java    |  2 +-
 .../exoplayer2/metadata/emsg/EventMessage.java   |  2 +-
 .../metadata/emsg/EventMessageEncoder.java       |  2 +-
 .../exoplayer2/metadata/icy/IcyDecoder.java      |  4 ++--
 .../exoplayer2/metadata/icy/IcyHeaders.java      |  2 +-
 .../android/exoplayer2/metadata/icy/IcyInfo.java |  2 +-
 .../exoplayer2/metadata/id3/ApicFrame.java       |  2 +-
 .../exoplayer2/metadata/id3/BinaryFrame.java     |  2 +-
 .../exoplayer2/metadata/id3/ChapterFrame.java    |  2 +-
 .../exoplayer2/metadata/id3/ChapterTocFrame.java |  2 +-
 .../exoplayer2/metadata/id3/CommentFrame.java    |  2 +-
 .../exoplayer2/metadata/id3/GeobFrame.java       |  2 +-
 .../exoplayer2/metadata/id3/Id3Decoder.java      |  2 +-
 .../exoplayer2/metadata/id3/InternalFrame.java   |  2 +-
 .../exoplayer2/metadata/id3/MlltFrame.java       |  2 +-
 .../exoplayer2/metadata/id3/PrivFrame.java       |  2 +-
 .../metadata/id3/TextInformationFrame.java       |  2 +-
 .../exoplayer2/metadata/id3/UrlLinkFrame.java    |  2 +-
 .../exoplayer2/offline/DefaultDownloadIndex.java |  4 ++--
 .../offline/DefaultDownloaderFactory.java        |  2 +-
 .../exoplayer2/offline/DownloadAction.java       |  2 +-
 .../exoplayer2/offline/DownloadHelper.java       |  2 +-
 .../exoplayer2/offline/DownloadIndex.java        |  2 +-
 .../exoplayer2/offline/DownloadIndexUtil.java    |  2 +-
 .../exoplayer2/offline/DownloadManager.java      |  4 ++--
 .../exoplayer2/offline/DownloadService.java      |  4 ++--
 .../exoplayer2/offline/DownloadState.java        |  4 ++--
 .../offline/DownloaderConstructorHelper.java     |  2 +-
 .../offline/FilteringManifestParser.java         |  2 +-
 .../offline/ProgressiveDownloader.java           |  2 +-
 .../exoplayer2/offline/SegmentDownloader.java    |  2 +-
 .../android/exoplayer2/offline/StreamKey.java    |  4 ++--
 .../exoplayer2/scheduler/PlatformScheduler.java  |  2 +-
 .../exoplayer2/scheduler/Requirements.java       |  2 +-
 .../scheduler/RequirementsWatcher.java           |  2 +-
 .../exoplayer2/source/BaseMediaSource.java       |  2 +-
 .../exoplayer2/source/ClippingMediaSource.java   |  4 ++--
 .../exoplayer2/source/CompositeMediaSource.java  |  4 ++--
 .../source/ConcatenatingMediaSource.java         |  6 +++---
 .../source/DefaultMediaSourceEventListener.java  |  2 +-
 .../exoplayer2/source/DeferredMediaPeriod.java   |  2 +-
 .../exoplayer2/source/ExtractorMediaSource.java  |  2 +-
 .../android/exoplayer2/source/IcyDataSource.java |  2 +-
 .../exoplayer2/source/LoopingMediaSource.java    |  2 +-
 .../android/exoplayer2/source/MediaSource.java   |  2 +-
 .../source/MediaSourceEventListener.java         |  4 ++--
 .../exoplayer2/source/MergingMediaSource.java    |  4 ++--
 .../source/ProgressiveMediaPeriod.java           |  2 +-
 .../source/ProgressiveMediaSource.java           |  2 +-
 .../android/exoplayer2/source/SampleQueue.java   |  2 +-
 .../exoplayer2/source/SinglePeriodTimeline.java  |  2 +-
 .../source/SingleSampleMediaPeriod.java          |  2 +-
 .../source/SingleSampleMediaSource.java          |  2 +-
 .../android/exoplayer2/source/TrackGroup.java    |  2 +-
 .../exoplayer2/source/TrackGroupArray.java       |  2 +-
 .../exoplayer2/source/ads/AdPlaybackState.java   |  4 ++--
 .../android/exoplayer2/source/ads/AdsLoader.java |  2 +-
 .../exoplayer2/source/ads/AdsMediaSource.java    |  4 ++--
 .../source/ads/SinglePeriodAdTimeline.java       |  2 +-
 .../android/exoplayer2/source/chunk/Chunk.java   |  2 +-
 .../source/chunk/ChunkExtractorWrapper.java      |  2 +-
 .../source/chunk/ChunkSampleStream.java          |  2 +-
 .../source/chunk/InitializationChunk.java        |  2 +-
 .../exoplayer2/text/CaptionStyleCompat.java      |  2 +-
 .../com/google/android/exoplayer2/text/Cue.java  |  2 +-
 .../android/exoplayer2/text/TextRenderer.java    |  4 ++--
 .../android/exoplayer2/text/cea/Cea708Cue.java   |  2 +-
 .../android/exoplayer2/text/cea/CeaDecoder.java  |  2 +-
 .../exoplayer2/text/subrip/SubripDecoder.java    |  2 +-
 .../android/exoplayer2/text/ttml/TtmlNode.java   |  2 +-
 .../android/exoplayer2/text/ttml/TtmlStyle.java  |  2 +-
 .../exoplayer2/text/ttml/TtmlSubtitle.java       |  2 +-
 .../exoplayer2/text/webvtt/WebvttCssStyle.java   |  2 +-
 .../exoplayer2/text/webvtt/WebvttCueParser.java  |  2 +-
 .../trackselection/AdaptiveTrackSelection.java   |  2 +-
 .../trackselection/BaseTrackSelection.java       |  2 +-
 .../BufferSizeAdaptationBuilder.java             |  2 +-
 .../trackselection/DefaultTrackSelector.java     |  4 ++--
 .../trackselection/FixedTrackSelection.java      |  2 +-
 .../trackselection/MappingTrackSelector.java     |  4 ++--
 .../trackselection/RandomTrackSelection.java     |  2 +-
 .../trackselection/TrackBitrateEstimator.java    |  2 +-
 .../trackselection/TrackSelection.java           |  2 +-
 .../trackselection/TrackSelectionArray.java      |  2 +-
 .../trackselection/TrackSelectionParameters.java |  2 +-
 .../trackselection/TrackSelectionUtil.java       |  4 ++--
 .../exoplayer2/trackselection/TrackSelector.java |  2 +-
 .../trackselection/TrackSelectorResult.java      |  2 +-
 .../WindowedTrackBitrateEstimator.java           |  2 +-
 .../exoplayer2/upstream/AssetDataSource.java     |  2 +-
 .../exoplayer2/upstream/BandwidthMeter.java      |  2 +-
 .../exoplayer2/upstream/BaseDataSource.java      |  2 +-
 .../exoplayer2/upstream/ByteArrayDataSource.java |  2 +-
 .../exoplayer2/upstream/ContentDataSource.java   |  2 +-
 .../upstream/DataSchemeDataSource.java           |  2 +-
 .../android/exoplayer2/upstream/DataSource.java  |  2 +-
 .../upstream/DataSourceInputStream.java          |  2 +-
 .../android/exoplayer2/upstream/DataSpec.java    |  4 ++--
 .../upstream/DefaultBandwidthMeter.java          |  2 +-
 .../exoplayer2/upstream/DefaultDataSource.java   |  2 +-
 .../upstream/DefaultDataSourceFactory.java       |  2 +-
 .../upstream/DefaultHttpDataSource.java          |  2 +-
 .../upstream/DefaultHttpDataSourceFactory.java   |  2 +-
 .../exoplayer2/upstream/DummyDataSource.java     |  2 +-
 .../exoplayer2/upstream/FileDataSource.java      |  2 +-
 .../upstream/FileDataSourceFactory.java          |  2 +-
 .../exoplayer2/upstream/HttpDataSource.java      |  4 ++--
 .../android/exoplayer2/upstream/Loader.java      |  4 ++--
 .../exoplayer2/upstream/ParsingLoadable.java     |  2 +-
 .../exoplayer2/upstream/PriorityDataSource.java  |  2 +-
 .../upstream/RawResourceDataSource.java          |  2 +-
 .../exoplayer2/upstream/StatsDataSource.java     |  2 +-
 .../exoplayer2/upstream/TeeDataSource.java       |  2 +-
 .../exoplayer2/upstream/UdpDataSource.java       |  2 +-
 .../android/exoplayer2/upstream/cache/Cache.java |  2 +-
 .../upstream/cache/CacheDataSource.java          |  4 ++--
 .../upstream/cache/CacheDataSourceFactory.java   |  2 +-
 .../exoplayer2/upstream/cache/CacheSpan.java     |  4 ++--
 .../exoplayer2/upstream/cache/CacheUtil.java     |  2 +-
 .../exoplayer2/upstream/cache/CachedContent.java |  2 +-
 .../upstream/cache/CachedContentIndex.java       |  4 ++--
 .../upstream/cache/CachedRegionTracker.java      |  2 +-
 .../upstream/cache/ContentMetadata.java          |  2 +-
 .../upstream/cache/ContentMetadataMutations.java |  2 +-
 .../upstream/cache/DefaultContentMetadata.java   |  2 +-
 .../exoplayer2/upstream/cache/SimpleCache.java   |  4 ++--
 .../upstream/cache/SimpleCacheSpan.java          |  2 +-
 .../upstream/crypto/AesCipherDataSource.java     |  2 +-
 .../android/exoplayer2/util/Assertions.java      |  2 +-
 .../android/exoplayer2/util/AtomicFile.java      |  2 +-
 .../google/android/exoplayer2/util/Clock.java    |  2 +-
 .../exoplayer2/util/CodecSpecificDataUtil.java   |  2 +-
 .../exoplayer2/util/EGLSurfaceTexture.java       |  4 ++--
 .../android/exoplayer2/util/EventLogger.java     |  2 +-
 .../com/google/android/exoplayer2/util/Log.java  |  4 ++--
 .../android/exoplayer2/util/MimeTypes.java       |  2 +-
 .../exoplayer2/util/NotificationUtil.java        |  6 +++---
 .../exoplayer2/util/ParsableByteArray.java       |  2 +-
 .../android/exoplayer2/util/RepeatModeUtil.java  |  2 +-
 .../android/exoplayer2/util/SystemClock.java     |  2 +-
 .../android/exoplayer2/util/TimedValueQueue.java |  2 +-
 .../com/google/android/exoplayer2/util/Util.java |  2 +-
 .../exoplayer2/util/XmlPullParserUtil.java       |  2 +-
 .../android/exoplayer2/video/ColorInfo.java      |  2 +-
 .../exoplayer2/video/DolbyVisionConfig.java      |  2 +-
 .../android/exoplayer2/video/DummySurface.java   |  2 +-
 .../android/exoplayer2/video/HevcConfig.java     |  2 +-
 .../video/MediaCodecVideoRenderer.java           |  6 +++---
 .../video/VideoFrameReleaseTimeHelper.java       |  2 +-
 .../video/VideoRendererEventListener.java        |  2 +-
 .../video/spherical/CameraMotionRenderer.java    |  2 +-
 .../exoplayer2/video/spherical/Projection.java   |  2 +-
 .../video/spherical/ProjectionDecoder.java       |  2 +-
 .../google/android/exoplayer2/ExoPlayerTest.java |  2 +-
 .../analytics/AnalyticsCollectorTest.java        |  2 +-
 .../extractor/amr/AmrExtractorTest.java          |  2 +-
 .../exoplayer2/offline/DownloadStateBuilder.java |  2 +-
 .../source/ClippingMediaSourceTest.java          |  2 +-
 .../exoplayer2/source/SampleQueueTest.java       |  2 +-
 .../exoplayer2/upstream/BaseDataSourceTest.java  |  2 +-
 .../upstream/cache/CacheDataSourceTest.java      |  2 +-
 .../upstream/cache/CachedContentIndexTest.java   |  2 +-
 library/dash/build.gradle                        |  2 +-
 .../exoplayer2/source/dash/DashChunkSource.java  |  2 +-
 .../exoplayer2/source/dash/DashMediaPeriod.java  |  4 ++--
 .../exoplayer2/source/dash/DashMediaSource.java  |  2 +-
 .../android/exoplayer2/source/dash/DashUtil.java |  2 +-
 .../source/dash/DefaultDashChunkSource.java      |  4 ++--
 .../source/dash/PlayerEmsgHandler.java           |  2 +-
 .../source/dash/manifest/DashManifest.java       |  2 +-
 .../source/dash/manifest/Descriptor.java         |  4 ++--
 .../exoplayer2/source/dash/manifest/Period.java  |  2 +-
 .../source/dash/manifest/ProgramInformation.java |  2 +-
 .../source/dash/manifest/RangedUri.java          |  2 +-
 .../source/dash/offline/DashDownloader.java      |  2 +-
 .../source/dash/DashMediaPeriodTest.java         |  2 +-
 .../dash/offline/DownloadManagerDashTest.java    |  2 +-
 .../dash/offline/DownloadServiceDashTest.java    |  2 +-
 library/hls/build.gradle                         |  2 +-
 .../exoplayer2/source/hls/Aes128DataSource.java  |  2 +-
 .../exoplayer2/source/hls/HlsChunkSource.java    |  2 +-
 .../exoplayer2/source/hls/HlsMediaChunk.java     |  2 +-
 .../exoplayer2/source/hls/HlsMediaPeriod.java    |  2 +-
 .../exoplayer2/source/hls/HlsMediaSource.java    |  2 +-
 .../source/hls/HlsSampleStreamWrapper.java       |  2 +-
 .../source/hls/SampleQueueMappingException.java  |  2 +-
 .../hls/playlist/DefaultHlsPlaylistTracker.java  |  2 +-
 .../source/hls/playlist/HlsMediaPlaylist.java    |  6 +++---
 .../source/hls/playlist/HlsPlaylistParser.java   |  2 +-
 .../source/hls/playlist/HlsPlaylistTracker.java  |  2 +-
 library/smoothstreaming/build.gradle             |  2 +-
 .../smoothstreaming/DefaultSsChunkSource.java    |  2 +-
 .../source/smoothstreaming/SsChunkSource.java    |  2 +-
 .../source/smoothstreaming/SsMediaPeriod.java    |  2 +-
 .../source/smoothstreaming/SsMediaSource.java    |  2 +-
 library/ui/build.gradle                          |  4 ++--
 .../exoplayer2/ui/AspectRatioFrameLayout.java    |  2 +-
 .../android/exoplayer2/ui/DefaultTimeBar.java    |  4 ++--
 .../ui/DownloadNotificationHelper.java           |  8 ++++----
 .../exoplayer2/ui/DownloadNotificationUtil.java  |  4 ++--
 .../android/exoplayer2/ui/PlayerControlView.java |  2 +-
 .../exoplayer2/ui/PlayerNotificationManager.java | 14 +++++++-------
 .../google/android/exoplayer2/ui/PlayerView.java |  6 +++---
 .../exoplayer2/ui/SimpleExoPlayerView.java       |  4 ++--
 .../android/exoplayer2/ui/SubtitleView.java      |  2 +-
 .../google/android/exoplayer2/ui/TimeBar.java    |  2 +-
 .../ui/TrackSelectionDialogBuilder.java          |  2 +-
 .../exoplayer2/ui/TrackSelectionView.java        |  4 ++--
 .../exoplayer2/ui/spherical/CanvasRenderer.java  |  2 +-
 .../exoplayer2/ui/spherical/GlViewGroup.java     |  4 ++--
 .../ui/spherical/OrientationListener.java        |  2 +-
 .../exoplayer2/ui/spherical/SceneRenderer.java   |  2 +-
 .../ui/spherical/SphericalSurfaceView.java       | 10 +++++-----
 .../exoplayer2/ui/spherical/TouchTracker.java    |  4 ++--
 .../ui/spherical/CanvasRendererTest.java         |  2 +-
 playbacktests/build.gradle                       |  2 +-
 testutils/build.gradle                           |  2 +-
 .../android/exoplayer2/testutil/Action.java      |  2 +-
 .../exoplayer2/testutil/ActionSchedule.java      |  2 +-
 .../testutil/DebugRenderersFactory.java          |  2 +-
 .../exoplayer2/testutil/ExoPlayerTestRunner.java |  2 +-
 .../testutil/FakeAdaptiveMediaPeriod.java        |  2 +-
 .../testutil/FakeAdaptiveMediaSource.java        |  2 +-
 .../exoplayer2/testutil/FakeChunkSource.java     |  2 +-
 .../android/exoplayer2/testutil/FakeDataSet.java |  2 +-
 .../exoplayer2/testutil/FakeMediaPeriod.java     |  2 +-
 .../exoplayer2/testutil/FakeMediaSource.java     |  2 +-
 .../exoplayer2/testutil/FakeSampleStream.java    |  2 +-
 testutils_robolectric/build.gradle               |  2 +-
 .../exoplayer2/testutil/MediaPeriodAsserts.java  |  2 +-
 .../testutil/MediaSourceTestRunner.java          |  2 +-
 .../exoplayer2/testutil/RobolectricUtil.java     |  4 ++--
 384 files changed, 521 insertions(+), 533 deletions(-)

diff --git a/demos/cast/build.gradle b/demos/cast/build.gradle
index 48a9b5da6f..03a54947cf 100644
--- a/demos/cast/build.gradle
+++ b/demos/cast/build.gradle
@@ -67,10 +67,10 @@ dependencies {
     implementation project(modulePrefix + 'library-smoothstreaming')
     implementation project(modulePrefix + 'library-ui')
     implementation project(modulePrefix + 'extension-cast')
-    implementation 'com.android.support:design:' + supportLibraryVersion
-    implementation 'com.android.support:support-v4:' + supportLibraryVersion
-    implementation 'com.android.support:appcompat-v7:' + supportLibraryVersion
-    implementation 'com.android.support:recyclerview-v7:' + supportLibraryVersion
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
 }
 
 apply plugin: 'com.google.android.gms.strict-version-matcher-plugin'
diff --git a/demos/cast/proguard-rules.txt b/demos/cast/proguard-rules.txt
index 3221818080..e6bf2dd3bf 100644
--- a/demos/cast/proguard-rules.txt
+++ b/demos/cast/proguard-rules.txt
@@ -1,6 +1,6 @@
 # Proguard rules specific to the Cast demo app.
 
 # Accessed via menu.xml
--keep class android.support.v7.app.MediaRouteActionProvider {
+-keep class androidx.mediarouter.app.MediaRouteActionProvider {
   *;
 }
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java
index 7994761b9a..4b71b3a001 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.castdemo;
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.KeyEvent;
 import android.view.View;
 import com.google.android.exoplayer2.C;
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
index 735084495f..ecf28a03be 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.castdemo;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.MimeTypes;
 import java.util.ArrayList;
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
index 8533bf8899..17eeed2da7 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
@@ -17,13 +17,13 @@ package com.google.android.exoplayer2.castdemo;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.graphics.ColorUtils;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.ViewHolder;
-import android.support.v7.widget.helper.ItemTouchHelper;
+import androidx.core.graphics.ColorUtils;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
diff --git a/demos/cast/src/main/res/layout/main_activity.xml b/demos/cast/src/main/res/layout/main_activity.xml
index b0be69bed3..71dbcdcd9c 100644
--- a/demos/cast/src/main/res/layout/main_activity.xml
+++ b/demos/cast/src/main/res/layout/main_activity.xml
@@ -31,14 +31,14 @@
       android:layout_height="0dp"
       android:layout_weight="1">
 
-    <android.support.v7.widget.RecyclerView android:id="@+id/sample_list"
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/sample_list"
         android:choiceMode="singleChoice"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbars="vertical"
         android:fadeScrollbars="false"/>
 
-    <android.support.design.widget.FloatingActionButton android:id="@+id/add_sample_button"
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/add_sample_button"
         android:src="@drawable/ic_plus"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/demos/cast/src/main/res/menu/menu.xml b/demos/cast/src/main/res/menu/menu.xml
index 075ad34ec4..95419adf3c 100644
--- a/demos/cast/src/main/res/menu/menu.xml
+++ b/demos/cast/src/main/res/menu/menu.xml
@@ -19,7 +19,7 @@
   <item
       android:id="@+id/media_route_menu_item"
       android:title="@string/media_route_menu_title"
-      app:actionProviderClass="android.support.v7.app.MediaRouteActionProvider"
+      app:actionProviderClass="androidx.mediarouter.app.MediaRouteActionProvider"
       app:showAsAction="always" />
 
 </menu>
diff --git a/demos/ima/build.gradle b/demos/ima/build.gradle
index 490967add3..1d2068e5f7 100644
--- a/demos/ima/build.gradle
+++ b/demos/ima/build.gradle
@@ -53,7 +53,7 @@ dependencies {
     implementation project(modulePrefix + 'library-hls')
     implementation project(modulePrefix + 'library-smoothstreaming')
     implementation project(modulePrefix + 'extension-ima')
-    implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+    implementation 'androidx.annotation:annotation:1.0.1'
 }
 
 apply plugin: 'com.google.android.gms.strict-version-matcher-plugin'
diff --git a/demos/main/build.gradle b/demos/main/build.gradle
index 98e8f72835..84a8a4087c 100644
--- a/demos/main/build.gradle
+++ b/demos/main/build.gradle
@@ -62,10 +62,10 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:support-annotations:' + supportLibraryVersion
-    implementation 'com.android.support:support-core-ui:' + supportLibraryVersion
-    implementation 'com.android.support:support-fragment:' + supportLibraryVersion
-    implementation 'com.android.support:design:' + supportLibraryVersion
+    implementation 'androidx.annotation:annotation:1.0.1'
+    implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
+    implementation 'androidx.fragment:fragment:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
     implementation project(modulePrefix + 'library-core')
     implementation project(modulePrefix + 'library-dash')
     implementation project(modulePrefix + 'library-hls')
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index fbaf95f3aa..c61828406b 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -20,8 +20,8 @@ import android.content.DialogInterface;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.HandlerThread;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentManager;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentManager;
 import android.widget.Toast;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.RenderersFactory;
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 befdff6170..2839d3937c 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
@@ -19,9 +19,9 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Pair;
 import android.view.KeyEvent;
 import android.view.View;
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 b9ea2da8db..7245de01c6 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
@@ -21,8 +21,8 @@ import android.content.res.AssetManager;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.JsonReader;
 import android.view.Menu;
 import android.view.MenuInflater;
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
index 8597e7296c..2f2461f82f 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
@@ -19,14 +19,14 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatDialog;
+import androidx.annotation.Nullable;
+import com.google.android.material.tabs.TabLayout;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatDialog;
 import android.util.SparseArray;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
diff --git a/demos/main/src/main/res/layout/track_selection_dialog.xml b/demos/main/src/main/res/layout/track_selection_dialog.xml
index 0a5cd480b3..922d6ee825 100644
--- a/demos/main/src/main/res/layout/track_selection_dialog.xml
+++ b/demos/main/src/main/res/layout/track_selection_dialog.xml
@@ -17,16 +17,16 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-  <android.support.v4.view.ViewPager
+  <androidx.viewpager.widget.ViewPager
       android:id="@+id/track_selection_dialog_view_pager"
       android:layout_width="match_parent"
       android:layout_height="0dp"
       android:layout_weight="1">
-    <android.support.design.widget.TabLayout
+    <com.google.android.material.tabs.TabLayout
         android:id="@+id/track_selection_dialog_tab_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
-  </android.support.v4.view.ViewPager>
+  </androidx.viewpager.widget.ViewPager>
   <LinearLayout
       android:orientation="horizontal"
       android:layout_width="match_parent"
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 566b23a0d5..9934e9db95 100644
--- a/demos/main/src/main/res/menu/sample_chooser_menu.xml
+++ b/demos/main/src/main/res/menu/sample_chooser_menu.xml
@@ -13,13 +13,14 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
   <item android:id="@+id/prefer_extension_decoders"
-    android:title="@string/prefer_extension_decoders"
-    android:showAsAction="never"
-    android:checkable="true"/>
+      android:title="@string/prefer_extension_decoders"
+      android:checkable="true"
+      app:showAsAction="never"/>
   <item android:id="@+id/random_abr"
-    android:title="@string/random_abr"
-    android:showAsAction="never"
-    android:checkable="true"/>
+      android:title="@string/random_abr"
+      android:checkable="true"
+      app:showAsAction="never"/>
 </menu>
diff --git a/extensions/cast/build.gradle b/extensions/cast/build.gradle
index cc7709e2dc..071a70c545 100644
--- a/extensions/cast/build.gradle
+++ b/extensions/cast/build.gradle
@@ -32,24 +32,16 @@ android {
 
 dependencies {
     api 'com.google.android.gms:play-services-cast-framework:16.1.2'
-    compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
-    compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion
+    implementation 'androidx.annotation:annotation:1.0.1'
     implementation project(modulePrefix + 'library-core')
     implementation project(modulePrefix + 'library-ui')
+    compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
+    compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion
     testImplementation project(modulePrefix + 'testutils')
     testImplementation 'junit:junit:' + junitVersion
     testImplementation 'org.mockito:mockito-core:' + mockitoVersion
     testImplementation 'org.robolectric:robolectric:' + robolectricVersion
     testImplementation project(modulePrefix + 'testutils-robolectric')
-    // These dependencies are necessary to force the supportLibraryVersion of
-    // com.android.support:support-v4, com.android.support:appcompat-v7 and
-    // com.android.support:mediarouter-v7 to be used. Else older versions are
-    // used, for example via:
-    // com.google.android.gms:play-services-cast-framework:15.0.1
-    // |-- com.android.support:mediarouter-v7:26.1.0
-    api 'com.android.support:support-v4:' + supportLibraryVersion
-    api 'com.android.support:mediarouter-v7:' + supportLibraryVersion
-    api 'com.android.support:recyclerview-v7:' + supportLibraryVersion
 }
 
 ext {
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
index 871c28b785..0fdce79087 100644
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
@@ -16,8 +16,8 @@
 package com.google.android.exoplayer2.ext.cast;
 
 import android.os.Looper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.BasePlayer;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java
index d86c4b3ebf..649f579c81 100644
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.ext.cast;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.SparseIntArray;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Timeline;
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java
index 8ab10e165d..adb8e59070 100644
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.ext.cast;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle
index c2654267e6..baf925acbd 100644
--- a/extensions/cronet/build.gradle
+++ b/extensions/cronet/build.gradle
@@ -33,7 +33,7 @@ android {
 dependencies {
     api 'org.chromium.net:cronet-embedded:72.3626.96'
     implementation project(modulePrefix + 'library-core')
-    implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+    implementation 'androidx.annotation:annotation:1.0.1'
     testImplementation project(modulePrefix + 'library')
     testImplementation project(modulePrefix + 'testutils-robolectric')
 }
diff --git a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java b/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java
index 88276c17fe..a9995af0e4 100644
--- a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java
+++ b/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.ext.cronet;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
diff --git a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceFactory.java b/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceFactory.java
index d832e4625d..93edb4e893 100644
--- a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceFactory.java
+++ b/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceFactory.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.ext.cronet;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
 import com.google.android.exoplayer2.upstream.HttpDataSource;
 import com.google.android.exoplayer2.upstream.HttpDataSource.BaseFactory;
diff --git a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetEngineWrapper.java b/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetEngineWrapper.java
index 829b53f863..270c1f6323 100644
--- a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetEngineWrapper.java
+++ b/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetEngineWrapper.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.ext.cronet;
 
 import android.content.Context;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
 import java.lang.annotation.Documented;
diff --git a/extensions/ffmpeg/build.gradle b/extensions/ffmpeg/build.gradle
index 7147cc7cb7..16796d66e4 100644
--- a/extensions/ffmpeg/build.gradle
+++ b/extensions/ffmpeg/build.gradle
@@ -38,7 +38,7 @@ android {
 
 dependencies {
     implementation project(modulePrefix + 'library-core')
-    implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+    implementation 'androidx.annotation:annotation:1.0.1'
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     testImplementation project(modulePrefix + 'testutils-robolectric')
     testImplementation 'junit:junit:' + junitVersion
diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java
index f0b30baa8a..c5d80aa32b 100644
--- a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java
+++ b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.ext.ffmpeg;
 
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.Format;
diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoder.java b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoder.java
index c5b76002fa..7c5864420a 100644
--- a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoder.java
+++ b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoder.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.ext.ffmpeg;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java
index e5018a49b3..bc36fc4f3b 100644
--- a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java
+++ b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.ext.ffmpeg;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.util.LibraryLoader;
diff --git a/extensions/flac/build.gradle b/extensions/flac/build.gradle
index fbc919a4c4..4ed81db030 100644
--- a/extensions/flac/build.gradle
+++ b/extensions/flac/build.gradle
@@ -39,7 +39,7 @@ android {
 
 dependencies {
     implementation project(modulePrefix + 'library-core')
-    implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+    implementation 'androidx.annotation:annotation:1.0.1'
     androidTestImplementation project(modulePrefix + 'testutils')
     androidTestImplementation 'androidx.test:runner:' + testRunnerVersion
     testImplementation project(modulePrefix + 'testutils-robolectric')
diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java
index 58ab260277..252dedd939 100644
--- a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java
+++ b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java
@@ -19,7 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.test.InstrumentationTestCase;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.extractor.DefaultExtractorInput;
diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java
index cf484732e2..bb72e114fe 100644
--- a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java
+++ b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java
@@ -17,8 +17,8 @@ package com.google.android.exoplayer2.ext.flac;
 
 import static com.google.android.exoplayer2.util.Util.getPcmEncoding;
 
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.extractor.BinarySearchSeeker;
diff --git a/extensions/gvr/build.gradle b/extensions/gvr/build.gradle
index 7d8184939d..6c4bfa469a 100644
--- a/extensions/gvr/build.gradle
+++ b/extensions/gvr/build.gradle
@@ -33,7 +33,7 @@ android {
 dependencies {
     implementation project(modulePrefix + 'library-core')
     implementation project(modulePrefix + 'library-ui')
-    implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+    implementation 'androidx.annotation:annotation:1.0.1'
     api 'com.google.vr:sdk-base:1.190.0'
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
 }
diff --git a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrAudioProcessor.java b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrAudioProcessor.java
index d0aa922d38..02e4328ec7 100644
--- a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrAudioProcessor.java
+++ b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrAudioProcessor.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.ext.gvr;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.Format;
diff --git a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java
index fc09a0ca52..46cb423aa6 100644
--- a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java
+++ b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java
@@ -22,10 +22,10 @@ import android.opengl.Matrix;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.BinderThread;
-import android.support.annotation.CallSuper;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
+import androidx.annotation.BinderThread;
+import androidx.annotation.CallSuper;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
 import android.view.ContextThemeWrapper;
 import android.view.MotionEvent;
 import android.view.Surface;
diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle
index 85a9ed1603..f0099da737 100644
--- a/extensions/ima/build.gradle
+++ b/extensions/ima/build.gradle
@@ -35,13 +35,6 @@ dependencies {
     api 'com.google.ads.interactivemedia.v3:interactivemedia:3.10.6'
     implementation project(modulePrefix + 'library-core')
     implementation 'com.google.android.gms:play-services-ads:17.1.3'
-    // These dependencies are necessary to force the supportLibraryVersion of
-    // com.android.support:support-v4 and com.android.support:customtabs to be
-    // used. Else older versions are used, for example via:
-    // com.google.android.gms:play-services-ads:17.1.3
-    // |-- com.android.support:customtabs:26.1.0
-    implementation 'com.android.support:support-v4:' + supportLibraryVersion
-    implementation 'com.android.support:customtabs:' + supportLibraryVersion
     testImplementation 'com.google.truth:truth:' + truthVersion
     testImplementation 'junit:junit:' + junitVersion
     testImplementation 'org.mockito:mockito-core:' + mockitoVersion
diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
index e817eba1d9..465ad51ac5 100644
--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
+++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
@@ -19,9 +19,9 @@ import android.content.Context;
 import android.net.Uri;
 import android.os.Looper;
 import android.os.SystemClock;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import android.view.View;
 import android.view.ViewGroup;
 import com.google.ads.interactivemedia.v3.api.Ad;
diff --git a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java
index dabae2de4b..daffa639b4 100644
--- a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java
+++ b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java
@@ -22,7 +22,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
diff --git a/extensions/leanback/build.gradle b/extensions/leanback/build.gradle
index d276fc0f8a..6319cb173d 100644
--- a/extensions/leanback/build.gradle
+++ b/extensions/leanback/build.gradle
@@ -32,7 +32,7 @@ android {
 
 dependencies {
     implementation project(modulePrefix + 'library-core')
-    implementation 'com.android.support:leanback-v17:' + supportLibraryVersion
+    implementation 'androidx.leanback:leanback:1.0.0'
 }
 
 ext {
diff --git a/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/LeanbackPlayerAdapter.java b/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/LeanbackPlayerAdapter.java
index 0c9491bb1a..3f4c5d6229 100644
--- a/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/LeanbackPlayerAdapter.java
+++ b/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/LeanbackPlayerAdapter.java
@@ -17,11 +17,11 @@ package com.google.android.exoplayer2.ext.leanback;
 
 import android.content.Context;
 import android.os.Handler;
-import android.support.annotation.Nullable;
-import android.support.v17.leanback.R;
-import android.support.v17.leanback.media.PlaybackGlueHost;
-import android.support.v17.leanback.media.PlayerAdapter;
-import android.support.v17.leanback.media.SurfaceHolderGlueHost;
+import androidx.annotation.Nullable;
+import androidx.leanback.R;
+import androidx.leanback.media.PlaybackGlueHost;
+import androidx.leanback.media.PlayerAdapter;
+import androidx.leanback.media.SurfaceHolderGlueHost;
 import android.util.Pair;
 import android.view.Surface;
 import android.view.SurfaceHolder;
diff --git a/extensions/mediasession/build.gradle b/extensions/mediasession/build.gradle
index 30e5454772..186fdb1621 100644
--- a/extensions/mediasession/build.gradle
+++ b/extensions/mediasession/build.gradle
@@ -32,7 +32,7 @@ android {
 
 dependencies {
     implementation project(modulePrefix + 'library-core')
-    api 'com.android.support:support-media-compat:' + supportLibraryVersion
+    api 'androidx.media:media:1.0.0'
 }
 
 ext {
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
index 2a0fb7fa6a..9074f9e16d 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
@@ -22,9 +22,9 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.ResultReceiver;
 import android.os.SystemClock;
-import android.support.annotation.LongDef;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.LongDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.support.v4.media.MediaDescriptionCompat;
 import android.support.v4.media.MediaMetadataCompat;
 import android.support.v4.media.RatingCompat;
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
index b92d7a27b7..d076404bb4 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
@@ -17,8 +17,8 @@ package com.google.android.exoplayer2.ext.mediasession;
 
 import android.os.Bundle;
 import android.os.ResultReceiver;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.support.v4.media.MediaDescriptionCompat;
 import android.support.v4.media.session.MediaControllerCompat;
 import android.support.v4.media.session.MediaSessionCompat;
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
index 0121e7ddb3..8575a74c70 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.ext.mediasession;
 
 import android.os.Bundle;
 import android.os.ResultReceiver;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.support.v4.media.MediaDescriptionCompat;
 import android.support.v4.media.session.MediaSessionCompat;
 import android.support.v4.media.session.PlaybackStateCompat;
diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle
index 9c24c489e2..eddd364370 100644
--- a/extensions/okhttp/build.gradle
+++ b/extensions/okhttp/build.gradle
@@ -33,7 +33,7 @@ android {
 
 dependencies {
     implementation project(modulePrefix + 'library-core')
-    implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+    implementation 'androidx.annotation:annotation:1.0.1'
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     api 'com.squareup.okhttp3:okhttp:3.12.1'
 }
diff --git a/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java b/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java
index dd1db8211a..a749495184 100644
--- a/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java
+++ b/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java
@@ -18,7 +18,7 @@ package com.google.android.exoplayer2.ext.okhttp;
 import static com.google.android.exoplayer2.util.Util.castNonNull;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.metadata.icy.IcyHeaders;
diff --git a/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSourceFactory.java b/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSourceFactory.java
index 09f4e0b61a..d0ef35cb07 100644
--- a/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSourceFactory.java
+++ b/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSourceFactory.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.ext.okhttp;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.upstream.HttpDataSource;
 import com.google.android.exoplayer2.upstream.HttpDataSource.BaseFactory;
 import com.google.android.exoplayer2.upstream.HttpDataSource.Factory;
diff --git a/extensions/rtmp/build.gradle b/extensions/rtmp/build.gradle
index cf03ca14b7..c919f41321 100644
--- a/extensions/rtmp/build.gradle
+++ b/extensions/rtmp/build.gradle
@@ -33,7 +33,7 @@ android {
 dependencies {
     implementation project(modulePrefix + 'library-core')
     implementation 'net.butterflytv.utils:rtmp-client:3.0.1'
-    implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+    implementation 'androidx.annotation:annotation:1.0.1'
     testImplementation 'junit:junit:' + junitVersion
     testImplementation 'org.robolectric:robolectric:' + robolectricVersion
 }
diff --git a/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSource.java b/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSource.java
index 08c328ce81..272a8d1eb4 100644
--- a/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSource.java
+++ b/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSource.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.ext.rtmp;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.upstream.BaseDataSource;
diff --git a/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSourceFactory.java b/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSourceFactory.java
index d1350276f2..36abf825d6 100644
--- a/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSourceFactory.java
+++ b/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSourceFactory.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.ext.rtmp;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.HttpDataSource.Factory;
 import com.google.android.exoplayer2.upstream.TransferListener;
diff --git a/extensions/vp9/build.gradle b/extensions/vp9/build.gradle
index 9e5f15375a..7e3a1a6327 100644
--- a/extensions/vp9/build.gradle
+++ b/extensions/vp9/build.gradle
@@ -39,7 +39,7 @@ android {
 
 dependencies {
     implementation project(modulePrefix + 'library-core')
-    implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+    implementation 'androidx.annotation:annotation:1.0.1'
     testImplementation project(modulePrefix + 'testutils-robolectric')
     testImplementation 'junit:junit:' + junitVersion
     androidTestImplementation 'androidx.test:runner:' + testRunnerVersion
diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
index 86b5514795..e64a128a86 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
@@ -20,9 +20,9 @@ import static java.lang.Runtime.getRuntime;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.SystemClock;
-import android.support.annotation.CallSuper;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.CallSuper;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import android.view.Surface;
 import com.google.android.exoplayer2.BaseRenderer;
 import com.google.android.exoplayer2.C;
diff --git a/gradle.properties b/gradle.properties
index b1758d4cea..364a5d03c5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,6 @@
 ## Project-wide Gradle settings.
+android.useAndroidX=true
+android.enableJetifier=true
 android.useDeprecatedNdk=true
 android.enableUnitTestBinaryResources=true
 buildDir=buildout
diff --git a/library/core/build.gradle b/library/core/build.gradle
index 86879743a1..7c0b3a2413 100644
--- a/library/core/build.gradle
+++ b/library/core/build.gradle
@@ -58,7 +58,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+    implementation 'androidx.annotation:annotation:1.0.1'
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion
     androidTestImplementation 'androidx.test:runner:' + testRunnerVersion
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java
index 45b784e30f..df5b9f0ff9 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java
@@ -26,8 +26,8 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.ParcelFileDescriptor;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.test.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java
index 4c1b84b4fd..774f1b452c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Util;
 
 /** Abstract base {@link Player} which implements common implementation independent methods. */
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/BaseRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/BaseRenderer.java
index 79192ade15..1099b14bfc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/BaseRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/BaseRenderer.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
 import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.drm.DrmSessionManager;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/C.java b/library/core/src/main/java/com/google/android/exoplayer2/C.java
index d163fabd60..2eed9f03a9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/C.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/C.java
@@ -21,7 +21,7 @@ import android.media.AudioFormat;
 import android.media.AudioManager;
 import android.media.MediaCodec;
 import android.media.MediaFormat;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import android.view.Surface;
 import com.google.android.exoplayer2.PlayerMessage.Target;
 import com.google.android.exoplayer2.audio.AuxEffectInfo;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/DefaultMediaClock.java b/library/core/src/main/java/com/google/android/exoplayer2/DefaultMediaClock.java
index ed57cec70c..89e7d857c8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/DefaultMediaClock.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/DefaultMediaClock.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Clock;
 import com.google.android.exoplayer2.util.MediaClock;
 import com.google.android.exoplayer2.util.StandaloneMediaClock;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
index ef0a008849..2a977f5bba 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
@@ -19,8 +19,8 @@ import android.content.Context;
 import android.media.MediaCodec;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.audio.AudioCapabilities;
 import com.google.android.exoplayer2.audio.AudioProcessor;
 import com.google.android.exoplayer2.audio.AudioRendererEventListener;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
index 48f82b2c45..5ac4e39546 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
@@ -15,8 +15,8 @@
  */
 package com.google.android.exoplayer2;
 
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
index db168d9c29..0ba4501207 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2;
 
 import android.os.Looper;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.audio.MediaCodecAudioRenderer;
 import com.google.android.exoplayer2.metadata.MetadataRenderer;
 import com.google.android.exoplayer2.source.ClippingMediaSource;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java
index 551895ad93..59647feaa9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2;
 
 import android.content.Context;
 import android.os.Looper;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.analytics.AnalyticsCollector;
 import com.google.android.exoplayer2.drm.DrmSessionManager;
 import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index 8736417362..6d8725e9fa 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -19,7 +19,7 @@ import android.annotation.SuppressLint;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Pair;
 import com.google.android.exoplayer2.PlayerMessage.Target;
 import com.google.android.exoplayer2.source.MediaSource;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index 8bdd12c049..f6013212d0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -21,8 +21,8 @@ import android.os.Looper;
 import android.os.Message;
 import android.os.Process;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.Pair;
 import com.google.android.exoplayer2.DefaultMediaClock.PlaybackParameterListener;
 import com.google.android.exoplayer2.Player.DiscontinuityReason;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Format.java b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
index c3028e153c..8778a4244b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Format.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.util.MimeTypes;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/FormatHolder.java b/library/core/src/main/java/com/google/android/exoplayer2/FormatHolder.java
index 8c7ba1eb91..fcee2241e8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/FormatHolder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/FormatHolder.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * Holds a {@link Format}.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
index be3fde0fca..5950bc627f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.source.ClippingMediaPeriod;
 import com.google.android.exoplayer2.source.EmptySampleStream;
 import com.google.android.exoplayer2.source.MediaPeriod;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfo.java
index cd4e74b2ef..bc1ea7b1e1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfo.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.source.MediaPeriod;
 import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 import com.google.android.exoplayer2.util.Util;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
index 64719a0ab4..249548340e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Pair;
 import com.google.android.exoplayer2.Player.RepeatMode;
 import com.google.android.exoplayer2.source.MediaPeriod;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/NoSampleRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/NoSampleRenderer.java
index e6223dfe16..e901025a07 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/NoSampleRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/NoSampleRenderer.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.source.SampleStream;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.MediaClock;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java
index 4333f51bf7..0792bf0c7d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java
@@ -15,8 +15,8 @@
  */
 package com.google.android.exoplayer2;
 
-import android.support.annotation.CheckResult;
-import android.support.annotation.Nullable;
+import androidx.annotation.CheckResult;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/PlaybackParameters.java b/library/core/src/main/java/com/google/android/exoplayer2/PlaybackParameters.java
index 6f2db4ff5e..057cb371e5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/PlaybackParameters.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/PlaybackParameters.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Assertions;
 
 /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Player.java b/library/core/src/main/java/com/google/android/exoplayer2/Player.java
index e3441fb2a7..8885be2e02 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Player.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Player.java
@@ -16,8 +16,8 @@
 package com.google.android.exoplayer2;
 
 import android.os.Looper;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/PlayerMessage.java b/library/core/src/main/java/com/google/android/exoplayer2/PlayerMessage.java
index d60d428563..7904942c1b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/PlayerMessage.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/PlayerMessage.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2;
 
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Assertions;
 
 /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java b/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java
index 3434cc7603..9f52e8d9de 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import com.google.android.exoplayer2.source.SampleStream;
 import com.google.android.exoplayer2.util.MediaClock;
 import java.io.IOException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/RendererConfiguration.java b/library/core/src/main/java/com/google/android/exoplayer2/RendererConfiguration.java
index 684072efc6..bc8c6ff633 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/RendererConfiguration.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/RendererConfiguration.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * The configuration of a {@link Renderer}.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/RenderersFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/RenderersFactory.java
index e221898471..6f0d125bcf 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/RenderersFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/RenderersFactory.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2;
 
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.audio.AudioRendererEventListener;
 import com.google.android.exoplayer2.drm.DrmSessionManager;
 import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SeekParameters.java b/library/core/src/main/java/com/google/android/exoplayer2/SeekParameters.java
index ca0433f96d..7a0ad67a28 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SeekParameters.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SeekParameters.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Assertions;
 
 /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index 35924a01fb..7167ebe8be 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -23,7 +23,7 @@ import android.media.MediaCodec;
 import android.media.PlaybackParams;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java b/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java
index 45cb37e919..9c26b546bd 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Pair;
 import com.google.android.exoplayer2.source.ads.AdPlaybackState;
 import com.google.android.exoplayer2.util.Assertions;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java
index 154cc11dca..c0d96e8e88 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.analytics;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.Surface;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java
index e5ed530268..7f74216cc8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.analytics;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.Surface;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java
index 230b96d01f..99afff42fc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.audio;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.audio.Ac3Util.SyncFrameInfo.StreamType;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioAttributes.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioAttributes.java
index 848b3ee10c..9c63eb42c6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioAttributes.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioAttributes.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.audio;
 
 import android.annotation.TargetApi;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 
 /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java
index 6a5e58ef2a..e7495acd89 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java
@@ -22,7 +22,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.media.AudioFormat;
 import android.media.AudioManager;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import java.util.Arrays;
 
 /** Represents the set of audio formats that a device is capable of playing. */
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java
index aa610db8b1..ed7a6f91d3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java
@@ -21,7 +21,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.media.AudioManager;
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java
index 461849f1e2..3cc05e87df 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java
@@ -18,10 +18,10 @@ package com.google.android.exoplayer2.audio;
 import android.content.Context;
 import android.media.AudioFocusRequest;
 import android.media.AudioManager;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Player;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java
index 48fbea75b4..042738b4f6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.audio;
 
 import android.os.Handler;
 import android.os.SystemClock;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.Renderer;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java
index 5e8efdc788..393380453c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.audio;
 
 import android.media.AudioTrack;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.PlaybackParameters;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTimestampPoller.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTimestampPoller.java
index 569260efeb..d43972d7b0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTimestampPoller.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTimestampPoller.java
@@ -18,8 +18,8 @@ package com.google.android.exoplayer2.audio;
 import android.annotation.TargetApi;
 import android.media.AudioTimestamp;
 import android.media.AudioTrack;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Util;
 import java.lang.annotation.Documented;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java
index 62b120f00a..2ce9b8bdbe 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java
@@ -20,8 +20,8 @@ import static com.google.android.exoplayer2.util.Util.castNonNull;
 import android.media.AudioTimestamp;
 import android.media.AudioTrack;
 import android.os.SystemClock;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AuxEffectInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AuxEffectInfo.java
index 7462a9c4b0..968d8acebd 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AuxEffectInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AuxEffectInfo.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.audio;
 
 import android.media.AudioTrack;
 import android.media.audiofx.AudioEffect;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * Represents auxiliary effect information, which can be used to attach an auxiliary effect to an
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/BaseAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/BaseAudioProcessor.java
index 0357326a31..a3a85bb43a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/BaseAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/BaseAudioProcessor.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.audio;
 
-import android.support.annotation.CallSuper;
+import androidx.annotation.CallSuper;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import java.nio.ByteBuffer;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java
index a345cebd02..ea155323bb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.audio;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 import java.nio.ByteBuffer;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
index e48d33294a..12087382ef 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
@@ -22,8 +22,8 @@ import android.media.AudioManager;
 import android.media.AudioTrack;
 import android.os.ConditionVariable;
 import android.os.SystemClock;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.PlaybackParameters;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
index 04c6b2ec9c..41f16c0e52 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
@@ -22,8 +22,8 @@ import android.media.MediaCrypto;
 import android.media.MediaFormat;
 import android.media.audiofx.Virtualizer;
 import android.os.Handler;
-import android.support.annotation.CallSuper;
-import android.support.annotation.Nullable;
+import androidx.annotation.CallSuper;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayer;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java
index 9052ea12ec..caf8a61651 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.audio;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Util;
 import java.lang.annotation.Documented;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
index f2e8a23811..553dfb1187 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
@@ -19,8 +19,8 @@ import android.media.audiofx.Virtualizer;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.SystemClock;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.BaseRenderer;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/SonicAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/SonicAudioProcessor.java
index 9bf9917a9d..0d938d33f4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/SonicAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/SonicAudioProcessor.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.audio;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.C.Encoding;
 import com.google.android.exoplayer2.Format;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/TeeAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/TeeAudioProcessor.java
index ba651912ff..6e4c97701a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/TeeAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/TeeAudioProcessor.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.audio;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java b/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
index 471b7706ca..c01e16e03a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
@@ -19,8 +19,8 @@ import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.DatabaseUtils;
 import android.database.sqlite.SQLiteDatabase;
-import android.support.annotation.IntDef;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.IntDef;
+import androidx.annotation.VisibleForTesting;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java b/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java
index 983c96f89d..7fc6fb625a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.decoder;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import com.google.android.exoplayer2.C;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java
index 7e5ae694ce..f8204f6be3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.decoder;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 import java.util.ArrayDeque;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
index faf4b68f10..775d56f40b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
@@ -22,7 +22,7 @@ import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
 import android.os.Message;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Pair;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
index 5f166c6114..e7828c0fed 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
@@ -20,8 +20,8 @@ import android.annotation.TargetApi;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.drm.DefaultDrmSession.ProvisioningManager;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
index ff01cbc2b5..7402396042 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.drm;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 import com.google.android.exoplayer2.util.Assertions;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java
index a23f26f067..392b0734b1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java
@@ -16,8 +16,8 @@
 package com.google.android.exoplayer2.drm;
 
 import android.media.MediaDrm;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/ErrorStateDrmSession.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/ErrorStateDrmSession.java
index f0335b50c9..82fd9a5549 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/ErrorStateDrmSession.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/ErrorStateDrmSession.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.drm;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Assertions;
 import java.util.Map;
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java
index aca56139de..49915f3af5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java
@@ -21,7 +21,7 @@ import android.media.MediaDrm;
 import android.media.MediaDrmException;
 import android.media.NotProvisionedException;
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 import java.util.HashMap;
 import java.util.List;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
index b139288f98..c9b295a1e4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
@@ -23,7 +23,7 @@ import android.media.MediaDrm;
 import android.media.MediaDrmException;
 import android.media.NotProvisionedException;
 import android.media.UnsupportedSchemeException;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java
index 4ff0af3c0e..a3e602e404 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.drm;
 
 import android.annotation.TargetApi;
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.drm.ExoMediaDrm.KeyRequest;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/OfflineLicenseHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/OfflineLicenseHelper.java
index d596b4ab90..ed77f41c83 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/OfflineLicenseHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/OfflineLicenseHelper.java
@@ -19,7 +19,7 @@ import android.media.MediaDrm;
 import android.os.ConditionVariable;
 import android.os.Handler;
 import android.os.HandlerThread;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Pair;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.drm.DefaultDrmSessionManager.Mode;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/UnsupportedDrmException.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/UnsupportedDrmException.java
index 7f4a0f5f03..a89196dc04 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/UnsupportedDrmException.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/UnsupportedDrmException.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.drm;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/WidevineUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/WidevineUtil.java
index b8b80490a1..9fed3b38e8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/WidevineUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/WidevineUtil.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.drm;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Pair;
 import com.google.android.exoplayer2.C;
 import java.util.Map;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java
index af40206ede..06d3ed603e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java
@@ -15,8 +15,8 @@
  */
 package com.google.android.exoplayer2.extractor;
 
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java
index 9eaf0f7ef7..f1aeccacb7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.util.ParsableByteArray;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java
index 05f5d98d3c..083f31bcc3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import com.google.android.exoplayer2.C;
 import java.io.IOException;
 import java.lang.annotation.Documented;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/Id3Peeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/Id3Peeker.java
index 8dbcfafaf2..255799c026 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/Id3Peeker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/Id3Peeker.java
@@ -16,7 +16,7 @@
 
 package com.google.android.exoplayer2.extractor;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.id3.Id3Decoder;
 import com.google.android.exoplayer2.util.ParsableByteArray;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/SeekMap.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/SeekMap.java
index b7aaa2a31b..0cb55dffa5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/SeekMap.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/SeekMap.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/SeekPoint.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/SeekPoint.java
index 8b920bc024..182db85c9e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/SeekPoint.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/SeekPoint.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /** Defines a seek point in a media stream. */
 public final class SeekPoint {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java
index 7b832eb400..d7a1c75302 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.util.ParsableByteArray;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java
index b93969acfe..caf12948ad 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java
@@ -15,8 +15,8 @@
  */
 package com.google.android.exoplayer2.extractor.amr;
 
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ParserException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java
index 4211cab489..0a2c0c46f6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor.flv;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java
index 40908b9680..b5da6dbf2f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor.mkv;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlProcessor.java
index 43e911e7f3..01fe5ff984 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlProcessor.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor.mkv;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
 import java.io.IOException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
index 7fef710081..577f843b10 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
@@ -15,9 +15,9 @@
  */
 package com.google.android.exoplayer2.extractor.mkv;
 
-import android.support.annotation.CallSuper;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.CallSuper;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import android.util.Pair;
 import android.util.SparseArray;
 import com.google.android.exoplayer2.C;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java
index e8848bf983..4db715f53e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java
@@ -15,8 +15,8 @@
  */
 package com.google.android.exoplayer2.extractor.mp3;
 
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ParserException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/VbriSeeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/VbriSeeker.java
index 15e778115d..ba8b26b7c1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/VbriSeeker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/VbriSeeker.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor.mp3;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.extractor.MpegAudioHeader;
 import com.google.android.exoplayer2.extractor.SeekPoint;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/XingSeeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/XingSeeker.java
index 42752e55fb..116a123094 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/XingSeeker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/XingSeeker.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor.mp3;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.extractor.MpegAudioHeader;
 import com.google.android.exoplayer2.extractor.SeekPoint;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
index d5fcf46025..8a004d2e99 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor.mp4;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.Util;
 import java.util.ArrayList;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
index 3b4a5c0c5b..aad6530384 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.extractor.mp4;
 
 import static com.google.android.exoplayer2.util.MimeTypes.getMimeTypeFromMp4ObjectType;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Pair;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
index 9ccb2556bc..dc9134459e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
@@ -15,8 +15,8 @@
  */
 package com.google.android.exoplayer2.extractor.mp4;
 
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import android.util.Pair;
 import android.util.SparseArray;
 import com.google.android.exoplayer2.C;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntry.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntry.java
index b458a8f0f4..e50fbd54f7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntry.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntry.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.extractor.mp4;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.util.Util;
 import java.util.Arrays;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java
index 02522897ce..e9c9f7faf5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor.mp4;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.extractor.GaplessInfoHolder;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
index 5356fdb548..5552b97dd6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor.mp4;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ParserException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtil.java
index 40cfa13325..957c3ba209 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtil.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor.mp4;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import java.nio.ByteBuffer;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java
index b4a7b278cf..9d3635e8b3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java
@@ -15,8 +15,8 @@
  */
 package com.google.android.exoplayer2.extractor.mp4;
 
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import java.lang.annotation.Documented;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackEncryptionBox.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackEncryptionBox.java
index f09e6ae421..5bd29c6e75 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackEncryptionBox.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackEncryptionBox.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor.mp4;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.extractor.TrackOutput;
 import com.google.android.exoplayer2.util.Assertions;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java
index d251dc1d5d..c83662ee83 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor.ogg;
 
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.extractor.SeekMap;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java
index 3c62f7a824..2675edd5b1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor.ogg;
 
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.extractor.ogg.VorbisUtil.Mode;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java
index 93724be92d..a5fd290e41 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor.ts;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.audio.Ac3Util;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java
index 77b79fa19f..9526a65766 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java
@@ -17,8 +17,8 @@ package com.google.android.exoplayer2.extractor.ts;
 
 import static com.google.android.exoplayer2.extractor.ts.TsPayloadReader.FLAG_DATA_ALIGNMENT_INDICATOR;
 
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.extractor.ConstantBitrateSeekMap;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java
index 88805d9362..ed708f349e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor.ts;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import android.util.SparseArray;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.EsInfo;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/LatmReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/LatmReader.java
index 2a633c191d..39e74ae6a2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/LatmReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/LatmReader.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor.ts;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Pair;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java
index d91842423d..c243458dd3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.extractor.ts;
 
 import static com.google.android.exoplayer2.extractor.ts.TsPayloadReader.FLAG_PAYLOAD_UNIT_START_INDICATOR;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import android.util.SparseArray;
 import android.util.SparseBooleanArray;
 import android.util.SparseIntArray;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsPayloadReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsPayloadReader.java
index 9289ba4d2e..536a31c9fc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsPayloadReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsPayloadReader.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor.ts;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import android.util.SparseArray;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.extractor.ExtractorOutput;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java
index c9493e1208..08ba94f257 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java
@@ -22,7 +22,7 @@ import android.media.MediaCodecInfo.AudioCapabilities;
 import android.media.MediaCodecInfo.CodecCapabilities;
 import android.media.MediaCodecInfo.CodecProfileLevel;
 import android.media.MediaCodecInfo.VideoCapabilities;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Pair;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.util.Assertions;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index e3fcf9397b..cee54d77f8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -25,9 +25,9 @@ import android.media.MediaFormat;
 import android.os.Bundle;
 import android.os.Looper;
 import android.os.SystemClock;
-import android.support.annotation.CheckResult;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.CheckResult;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.BaseRenderer;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecSelector.java
index d92e93d45b..496d015b58 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecSelector.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.mediacodec;
 
 import android.media.MediaCodec;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.mediacodec.MediaCodecUtil.DecoderQueryException;
 import java.util.Collections;
 import java.util.List;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
index 6509c8081c..a7c6405c82 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
@@ -20,7 +20,7 @@ import android.annotation.TargetApi;
 import android.media.MediaCodecInfo.CodecCapabilities;
 import android.media.MediaCodecInfo.CodecProfileLevel;
 import android.media.MediaCodecList;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Pair;
 import android.util.SparseIntArray;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaFormatUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaFormatUtil.java
index 95cc5d4a37..118445835b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaFormatUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaFormatUtil.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.mediacodec;
 
 import android.media.MediaFormat;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.video.ColorInfo;
 import java.nio.ByteBuffer;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java
index fbed096aab..ff2463dfa7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.metadata;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Util;
 import java.util.Arrays;
 import java.util.List;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoder.java
index 7e4861a8cb..1d95d32290 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoder.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.metadata;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * Decodes metadata from binary data.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataRenderer.java
index 864616e810..d360224872 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataRenderer.java
@@ -19,7 +19,7 @@ import android.os.Handler;
 import android.os.Handler.Callback;
 import android.os.Looper;
 import android.os.Message;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.BaseRenderer;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java
index 8a3467e2ed..ca1e390181 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java
@@ -19,7 +19,7 @@ import static com.google.android.exoplayer2.util.Util.castNonNull;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.util.Util;
 import java.util.Arrays;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoder.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoder.java
index 22708a8448..dd33d591a7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoder.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.metadata.emsg;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyDecoder.java
index 1eac663956..d04cd3a999 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyDecoder.java
@@ -15,8 +15,8 @@
  */
 package com.google.android.exoplayer2.metadata.icy;
 
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.MetadataDecoder;
 import com.google.android.exoplayer2.metadata.MetadataInputBuffer;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyHeaders.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyHeaders.java
index cd8c5b17d2..35c5be86d6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyHeaders.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyHeaders.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.metadata.icy;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.metadata.Metadata;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyInfo.java
index a9671bb68d..e6b915a6c8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyInfo.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.metadata.icy;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.util.Util;
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java
index 53976da0d1..c233ad61b2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java
@@ -19,7 +19,7 @@ import static com.google.android.exoplayer2.util.Util.castNonNull;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Util;
 import java.util.Arrays;
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java
index c48829ae54..6c6057bb7a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java
@@ -19,7 +19,7 @@ import static com.google.android.exoplayer2.util.Util.castNonNull;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import java.util.Arrays;
 
 /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java
index 7ffb6d028c..bf5d2de6ea 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java
@@ -18,7 +18,7 @@ package com.google.android.exoplayer2.metadata.id3;
 import static com.google.android.exoplayer2.util.Util.castNonNull;
 
 import android.os.Parcel;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Util;
 import java.util.Arrays;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java
index c4a7c06e49..98688ad098 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java
@@ -18,7 +18,7 @@ package com.google.android.exoplayer2.metadata.id3;
 import static com.google.android.exoplayer2.util.Util.castNonNull;
 
 import android.os.Parcel;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Util;
 import java.util.Arrays;
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java
index 5666e48939..363057f17a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java
@@ -19,7 +19,7 @@ import static com.google.android.exoplayer2.util.Util.castNonNull;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Util;
 
 /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java
index 990d8f2e48..6023f76aa1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java
@@ -19,7 +19,7 @@ import static com.google.android.exoplayer2.util.Util.castNonNull;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Util;
 import java.util.Arrays;
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java
index 63bf30dd11..4bc864935f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.metadata.id3;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.MetadataDecoder;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/InternalFrame.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/InternalFrame.java
index c191676ce2..762ca0da00 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/InternalFrame.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/InternalFrame.java
@@ -18,7 +18,7 @@ package com.google.android.exoplayer2.metadata.id3;
 import static com.google.android.exoplayer2.util.Util.castNonNull;
 
 import android.os.Parcel;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Util;
 
 /** Internal ID3 frame that is intended for use by the player. */
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java
index 06a4dd9d2d..7d0a1dba31 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.metadata.id3;
 
 import android.os.Parcel;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import java.util.Arrays;
 
 /** MPEG location lookup table frame. */
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java
index a10ce229d9..6e53485453 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java
@@ -19,7 +19,7 @@ import static com.google.android.exoplayer2.util.Util.castNonNull;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Util;
 import java.util.Arrays;
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java
index 62175ee90c..8a36276b91 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java
@@ -19,7 +19,7 @@ import static com.google.android.exoplayer2.util.Util.castNonNull;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Util;
 
 /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java
index 4b35131bea..8be9ed1881 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java
@@ -19,7 +19,7 @@ import static com.google.android.exoplayer2.util.Util.castNonNull;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Util;
 
 /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
index 37b0f43f8b..a6dd4131d3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -19,8 +19,8 @@ import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.database.DatabaseProvider;
 import com.google.android.exoplayer2.database.VersionTable;
 import com.google.android.exoplayer2.util.Assertions;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java
index 63ec72f358..db8090c22e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.offline;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import java.lang.reflect.Constructor;
 import java.util.List;
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
index 0c36b8bb63..cf22e56c5b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.offline;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
 import java.io.ByteArrayInputStream;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index f88371f36d..bc19b886a0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -20,7 +20,7 @@ import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
 import android.os.Message;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Pair;
 import android.util.SparseIntArray;
 import com.google.android.exoplayer2.C;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java
index 7b903d3321..77840cc65b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.offline;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /** Persists {@link DownloadState}s. */
 interface DownloadIndex {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
index f9a33f3e7b..c93fa2135b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.offline;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import java.io.IOException;
 
 /** {@link DownloadIndex} related utility methods. */
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 3ccba10807..f007f8c9ac 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -33,8 +33,8 @@ import android.os.ConditionVariable;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.scheduler.RequirementsWatcher;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index 2db33cb59c..3a782d80a7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -22,8 +22,8 @@ import android.content.Intent;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.scheduler.Scheduler;
 import com.google.android.exoplayer2.util.Assertions;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
index 5bf3496def..b7d2944e63 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
@@ -16,8 +16,8 @@
 package com.google.android.exoplayer2.offline;
 
 import android.net.Uri;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.scheduler.Requirements.RequirementFlags;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java
index 48e70e37fc..65dcd187a9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.offline;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.upstream.DataSink;
 import com.google.android.exoplayer2.upstream.DataSource;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/FilteringManifestParser.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/FilteringManifestParser.java
index c25e5099cf..7e15987c40 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/FilteringManifestParser.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/FilteringManifestParser.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.offline;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.upstream.ParsingLoadable.Parser;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
index 25b4e07bcd..e712f9ddc3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.offline;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.upstream.DataSpec;
 import com.google.android.exoplayer2.upstream.cache.Cache;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
index 1b32abff60..e0c906469f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.offline;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DataSpec;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/StreamKey.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/StreamKey.java
index 1caeaca61e..4d1de5f32d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/StreamKey.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/StreamKey.java
@@ -15,8 +15,8 @@
  */
 package com.google.android.exoplayer2.offline;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 /**
  * A key for a subset of media which can be separately loaded (a "stream").
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java
index b8272dc036..aa77078b72 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java
@@ -24,7 +24,7 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.os.PersistableBundle;
-import android.support.annotation.RequiresPermission;
+import androidx.annotation.RequiresPermission;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
index 508c3393c5..0aa8a63339 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
@@ -24,7 +24,7 @@ import android.net.NetworkCapabilities;
 import android.net.NetworkInfo;
 import android.os.BatteryManager;
 import android.os.PowerManager;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
index dfced7c0ab..710dee6e11 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
@@ -27,7 +27,7 @@ import android.net.NetworkRequest;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.PowerManager;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/BaseMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/BaseMediaSource.java
index 189467b47e..f6ea3da089 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/BaseMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/BaseMediaSource.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.source;
 
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.upstream.TransferListener;
 import com.google.android.exoplayer2.util.Assertions;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
index d3b8226822..ce6254e975 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
@@ -15,8 +15,8 @@
  */
 package com.google.android.exoplayer2.source;
 
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.upstream.Allocator;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/CompositeMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/CompositeMediaSource.java
index dbf5812f98..9323f7505c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/CompositeMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/CompositeMediaSource.java
@@ -16,8 +16,8 @@
 package com.google.android.exoplayer2.source;
 
 import android.os.Handler;
-import android.support.annotation.CallSuper;
-import android.support.annotation.Nullable;
+import androidx.annotation.CallSuper;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.upstream.TransferListener;
 import com.google.android.exoplayer2.util.Assertions;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
index d223f653e1..e73fdd58a3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
@@ -17,9 +17,9 @@ package com.google.android.exoplayer2.source;
 
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.GuardedBy;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.GuardedBy;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.Pair;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Timeline;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceEventListener.java b/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceEventListener.java
index fd7c037fb9..14bafdaf4b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceEventListener.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceEventListener.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.source;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 import java.io.IOException;
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/DeferredMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/DeferredMediaPeriod.java
index 858769180d..abf02541c8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/DeferredMediaPeriod.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/DeferredMediaPeriod.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.source;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.SeekParameters;
 import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
index 5e0960aaf0..f3ed19db3d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.source;
 
 import android.net.Uri;
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/IcyDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/IcyDataSource.java
index 96546d4f8a..3d31e2a771 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/IcyDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/IcyDataSource.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.source;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DataSpec;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java
index e19a02b7b3..769f545aaa 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.source;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Player;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
index 759208c67b..994c37bb93 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.source;
 
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Timeline;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSourceEventListener.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSourceEventListener.java
index 98d1d0a2ab..233e19b29c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSourceEventListener.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSourceEventListener.java
@@ -19,8 +19,8 @@ import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.SystemClock;
-import android.support.annotation.CheckResult;
-import android.support.annotation.Nullable;
+import androidx.annotation.CheckResult;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.Player;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java
index 1ea3404e81..6b1a362b59 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java
@@ -15,8 +15,8 @@
  */
 package com.google.android.exoplayer2.source;
 
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.upstream.TransferListener;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
index ab14554a21..f55c490501 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.source;
 
 import android.net.Uri;
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.FormatHolder;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
index dac340cede..4130ce3e98 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.source;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
 import com.google.android.exoplayer2.extractor.Extractor;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
index 0886e79d21..133de437d4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.source;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.FormatHolder;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SinglePeriodTimeline.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SinglePeriodTimeline.java
index 9e33a2d898..acdfbcc8c0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/SinglePeriodTimeline.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SinglePeriodTimeline.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.source;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.util.Assertions;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaPeriod.java
index 73d590951d..386b637b2e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaPeriod.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaPeriod.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.source;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.FormatHolder;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
index 7611d76260..6f85a2b0f8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.source;
 
 import android.net.Uri;
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.upstream.Allocator;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/TrackGroup.java b/library/core/src/main/java/com/google/android/exoplayer2/source/TrackGroup.java
index 56c9989f34..9e837bf05d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/TrackGroup.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/TrackGroup.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.source;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.util.Assertions;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/TrackGroupArray.java b/library/core/src/main/java/com/google/android/exoplayer2/source/TrackGroupArray.java
index a155032a9f..e737a5fafa 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/TrackGroupArray.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/TrackGroupArray.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.source;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import java.util.Arrays;
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdPlaybackState.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdPlaybackState.java
index fc1355df6a..be9dea91f1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdPlaybackState.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdPlaybackState.java
@@ -16,8 +16,8 @@
 package com.google.android.exoplayer2.source.ads;
 
 import android.net.Uri;
-import android.support.annotation.CheckResult;
-import android.support.annotation.IntDef;
+import androidx.annotation.CheckResult;
+import androidx.annotation.IntDef;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 import java.lang.annotation.Documented;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsLoader.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsLoader.java
index b3054f69a0..2b90fac6ab 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsLoader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsLoader.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.source.ads;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 import com.google.android.exoplayer2.C;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
index 76fe7f8735..1998977961 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
@@ -18,8 +18,8 @@ package com.google.android.exoplayer2.source.ads;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.source.CompositeMediaSource;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/SinglePeriodAdTimeline.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/SinglePeriodAdTimeline.java
index 0594a635a5..25a1440c80 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/SinglePeriodAdTimeline.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/SinglePeriodAdTimeline.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.source.ads;
 
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.source.ForwardingTimeline;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/Chunk.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/Chunk.java
index 91c3afec80..2e7581eba5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/Chunk.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/Chunk.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.source.chunk;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.upstream.DataSource;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkExtractorWrapper.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkExtractorWrapper.java
index a8676b5a05..fc07a318b1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkExtractorWrapper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkExtractorWrapper.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.source.chunk;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.SparseArray;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java
index 9fac69b281..18eada4708 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.source.chunk;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.FormatHolder;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/InitializationChunk.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/InitializationChunk.java
index eecf471b24..37c70d5498 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/InitializationChunk.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/InitializationChunk.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.source.chunk;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.extractor.DefaultExtractorInput;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/CaptionStyleCompat.java b/library/core/src/main/java/com/google/android/exoplayer2/text/CaptionStyleCompat.java
index e7bb0e16bf..b863d80c9a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/CaptionStyleCompat.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/CaptionStyleCompat.java
@@ -18,7 +18,7 @@ package com.google.android.exoplayer2.text;
 import android.annotation.TargetApi;
 import android.graphics.Color;
 import android.graphics.Typeface;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import android.view.accessibility.CaptioningManager;
 import android.view.accessibility.CaptioningManager.CaptionStyle;
 import com.google.android.exoplayer2.util.Util;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/Cue.java b/library/core/src/main/java/com/google/android/exoplayer2/text/Cue.java
index a5c666c44a..4b54b3ea9a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/Cue.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/Cue.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.text;
 
 import android.graphics.Bitmap;
 import android.graphics.Color;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import android.text.Layout.Alignment;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java
index 16f82a7293..55bee5bd6a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java
@@ -19,8 +19,8 @@ import android.os.Handler;
 import android.os.Handler.Callback;
 import android.os.Looper;
 import android.os.Message;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.BaseRenderer;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Cue.java b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Cue.java
index 0a3f36fa87..a0201e19e6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Cue.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Cue.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.text.cea;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.Layout.Alignment;
 import com.google.android.exoplayer2.text.Cue;
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaDecoder.java
index 3efc16bdd0..ce9da9f5d5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaDecoder.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.text.cea;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.text.Subtitle;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
index 5886b8ca2a..6f9fd366ec 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.text.subrip;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.Html;
 import android.text.Spanned;
 import android.text.TextUtils;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
index 020bbe201b..ecf5c8b0a0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.text.ttml;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.SpannableStringBuilder;
 import android.util.Base64;
 import android.util.Pair;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java
index a4f0cca955..9fdcc48c12 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.text.ttml;
 
 import android.graphics.Typeface;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import android.text.Layout;
 import com.google.android.exoplayer2.util.Assertions;
 import java.lang.annotation.Documented;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java
index 1779d9890a..6a52338a94 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.text.ttml;
 
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.text.Cue;
 import com.google.android.exoplayer2.text.Subtitle;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java
index fe274a6241..ded7ef73ff 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.text.webvtt;
 
 import android.graphics.Typeface;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import android.text.Layout;
 import com.google.android.exoplayer2.util.Util;
 import java.lang.annotation.Documented;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java
index 9900ca0e72..2361c9729f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.text.webvtt;
 
 import android.graphics.Typeface;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.Layout.Alignment;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
index dd2d0001f8..32e6a499cd 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.trackselection;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayerFactory;
 import com.google.android.exoplayer2.Format;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BaseTrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BaseTrackSelection.java
index 798b6ce810..dc0b3f6747 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BaseTrackSelection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BaseTrackSelection.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.trackselection;
 
 import android.os.SystemClock;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.TrackGroup;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java
index ee1d1c62da..3c3e5e11db 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.trackselection;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Pair;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.DefaultLoadControl;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
index 43157c5866..601de5fe3e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -19,8 +19,8 @@ import android.content.Context;
 import android.graphics.Point;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Pair;
 import android.util.SparseArray;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/FixedTrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/FixedTrackSelection.java
index 79b5d93dc7..3bdaeeeafb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/FixedTrackSelection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/FixedTrackSelection.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.trackselection;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.chunk.MediaChunk;
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 f9c63805f2..2738ee5926 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
@@ -15,8 +15,8 @@
  */
 package com.google.android.exoplayer2.trackselection;
 
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import android.util.Pair;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/RandomTrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/RandomTrackSelection.java
index 217a16e4a6..8053212969 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/RandomTrackSelection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/RandomTrackSelection.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.trackselection;
 
 import android.os.SystemClock;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.chunk.MediaChunk;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackBitrateEstimator.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackBitrateEstimator.java
index 94513b8250..1cd6c09bfe 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackBitrateEstimator.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackBitrateEstimator.java
@@ -16,7 +16,7 @@
 
 package com.google.android.exoplayer2.trackselection;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.chunk.MediaChunk;
 import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java
index 251c0ac76b..e244bf4a8c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.trackselection;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.TrackGroup;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionArray.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionArray.java
index 48151002be..bc905ace4b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionArray.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionArray.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.trackselection;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import java.util.Arrays;
 import org.checkerframework.checker.nullness.compatqual.NullableType;
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java
index f411d431e2..70572e6660 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.trackselection;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Util;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
index b94102a0b1..3fd763157e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
@@ -15,8 +15,8 @@
  */
 package com.google.android.exoplayer2.trackselection;
 
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.TrackGroupArray;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java
index 2a66186b29..f2fbd89118 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.trackselection;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Renderer;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectorResult.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectorResult.java
index 4bc4975a1c..fc723134f7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectorResult.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectorResult.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.trackselection;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.RendererConfiguration;
 import com.google.android.exoplayer2.util.Util;
 import org.checkerframework.checker.nullness.compatqual.NullableType;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimator.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimator.java
index 0def71c800..25f7e4ea73 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimator.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimator.java
@@ -16,7 +16,7 @@
 
 package com.google.android.exoplayer2.trackselection;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.chunk.MediaChunk;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/AssetDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/AssetDataSource.java
index 16c27ccde8..9224e14d4a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/AssetDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/AssetDataSource.java
@@ -18,7 +18,7 @@ package com.google.android.exoplayer2.upstream;
 import android.content.Context;
 import android.content.res.AssetManager;
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/BandwidthMeter.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/BandwidthMeter.java
index 85bcda4e32..853a9af526 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/BandwidthMeter.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/BandwidthMeter.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.upstream;
 
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * Provides estimates of the currently available bandwidth.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/BaseDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/BaseDataSource.java
index 5ed2e33d2b..21f2d5993a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/BaseDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/BaseDataSource.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.upstream;
 
 import static com.google.android.exoplayer2.util.Util.castNonNull;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import java.util.ArrayList;
 
 /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSource.java
index 16637b4052..c450896676 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSource.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.upstream;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java
index 30051a53e6..c723d3f1ca 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java
@@ -19,7 +19,7 @@ import android.content.ContentResolver;
 import android.content.Context;
 import android.content.res.AssetFileDescriptor;
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import java.io.EOFException;
 import java.io.FileInputStream;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSchemeDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSchemeDataSource.java
index 2d2a7587f7..de4a75d607 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSchemeDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSchemeDataSource.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.upstream;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Base64;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ParserException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java
index ab22e18358..204b9d4d66 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.upstream;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import java.io.IOException;
 import java.util.Collections;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSourceInputStream.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSourceInputStream.java
index 2f2075f354..6c4e77a90a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSourceInputStream.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSourceInputStream.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.upstream;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java
index 2996de4527..6a4ed43155 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java
@@ -16,8 +16,8 @@
 package com.google.android.exoplayer2.upstream;
 
 import android.net.Uri;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 import java.lang.annotation.Documented;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
index d1bda8010f..f3792b3f27 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
@@ -22,7 +22,7 @@ import android.content.IntentFilter;
 import android.net.ConnectivityManager;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.SparseArray;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java
index 808252fb15..8b4107850c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.upstream;
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSourceFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSourceFactory.java
index 8183a89064..9639b4ede1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSourceFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSourceFactory.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.upstream;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.upstream.DataSource.Factory;
 
 /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
index ebeb9a1913..6aad517004 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.upstream;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.metadata.icy.IcyHeaders;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceFactory.java
index 95ea49132d..ef1a3aa7a7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceFactory.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.upstream;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.upstream.HttpDataSource.BaseFactory;
 import com.google.android.exoplayer2.upstream.HttpDataSource.Factory;
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DummyDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DummyDataSource.java
index 13c5732a62..026bc0b9c7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DummyDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DummyDataSource.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.upstream;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import java.io.IOException;
 
 /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSource.java
index 582b2b06da..3cfdc4812b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSource.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.upstream;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSourceFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSourceFactory.java
index fd1920991e..3a47df7654 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSourceFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSourceFactory.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.upstream;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * A {@link DataSource.Factory} that produces {@link FileDataSource}.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
index e3e93bd6fb..07155ee2bc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
@@ -15,8 +15,8 @@
  */
 package com.google.android.exoplayer2.upstream;
 
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import com.google.android.exoplayer2.util.Predicate;
 import com.google.android.exoplayer2.util.Util;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/Loader.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/Loader.java
index ac3b3c5c5e..878c40dc9e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/Loader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/Loader.java
@@ -20,8 +20,8 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.os.SystemClock;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java
index b41f1aa09f..edec849b88 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.upstream;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.upstream.Loader.Loadable;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSource.java
index 9f9a3f9a91..62e68cd920 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSource.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.upstream;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.PriorityTaskManager;
 import java.io.IOException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/RawResourceDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/RawResourceDataSource.java
index 7f51efda0f..1f0313594b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/RawResourceDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/RawResourceDataSource.java
@@ -19,7 +19,7 @@ import android.content.Context;
 import android.content.res.AssetFileDescriptor;
 import android.content.res.Resources;
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import com.google.android.exoplayer2.C;
 import java.io.EOFException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/StatsDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/StatsDataSource.java
index 04b29b531c..b7a01505f8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/StatsDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/StatsDataSource.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.upstream;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/TeeDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/TeeDataSource.java
index 3c021b0b74..ecf25f2eb6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/TeeDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/TeeDataSource.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.upstream;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java
index 8d6b39fa98..e7aab31cc2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.upstream;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import java.io.IOException;
 import java.net.DatagramPacket;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
index 6bbe1edd1d..c477c87952 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import java.io.File;
 import java.io.IOException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
index 909bd40023..58b2d176cf 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
@@ -16,8 +16,8 @@
 package com.google.android.exoplayer2.upstream.cache;
 
 import android.net.Uri;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.upstream.DataSink;
 import com.google.android.exoplayer2.upstream.DataSource;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceFactory.java
index 9675aa1762..2f0f6caa2c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceFactory.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.upstream.DataSink;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.FileDataSourceFactory;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java
index 2082740bb4..7dbcd4a922 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java
@@ -15,8 +15,8 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import java.io.File;
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
index 9714df6ad0..e41fa98eeb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.upstream.cache;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DataSpec;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java
index 80b50d862a..e244163bc8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
 import java.io.File;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
index dc0a635b54..3bfed74bf0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
@@ -20,8 +20,8 @@ import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import android.util.SparseArray;
 import android.util.SparseBooleanArray;
 import com.google.android.exoplayer2.database.DatabaseProvider;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTracker.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTracker.java
index e8315385e0..fb2d4f694f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTracker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTracker.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.google.android.exoplayer2.extractor.ChunkIndex;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadata.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadata.java
index f0075343ad..4cc6e6b860 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadata.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadata.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.upstream.cache;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 
 /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadataMutations.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadataMutations.java
index fb3f6e362d..5715b8fbd4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadataMutations.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadataMutations.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.upstream.cache;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 import java.util.ArrayList;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadata.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadata.java
index 9e878ebfbd..1f07af938a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadata.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadata.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index d648fe2994..78e3b405d0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -16,8 +16,8 @@
 package com.google.android.exoplayer2.upstream.cache;
 
 import android.os.ConditionVariable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
index 82563af01c..7235830019 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSource.java
index 801c84dc51..7a7af6b8a4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSource.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.upstream.crypto;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DataSpec;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Assertions.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Assertions.java
index c6ad5dfe52..b4ccc5bcc4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/Assertions.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Assertions.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.util;
 
 import android.os.Looper;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import org.checkerframework.checker.nullness.qual.EnsuresNonNull;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java b/library/core/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java
index b7b6c05d82..6fdb00dff2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.util;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Clock.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Clock.java
index 36fc3b1bf8..7a87d7d9a3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/Clock.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Clock.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.util;
 
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * An interface through which system clocks can be read and {@link HandlerWrapper}s created. The
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/CodecSpecificDataUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/util/CodecSpecificDataUtil.java
index 627cf7e070..16a891dbc6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/CodecSpecificDataUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/CodecSpecificDataUtil.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.util;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Pair;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ParserException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java b/library/core/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java
index 216ddb3c4e..33b50934f1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java
@@ -24,8 +24,8 @@ import android.opengl.EGLDisplay;
 import android.opengl.EGLSurface;
 import android.opengl.GLES20;
 import android.os.Handler;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java b/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java
index 25f3a0c100..bb3dc8b83a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.util;
 
 import android.os.SystemClock;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.Surface;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Log.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Log.java
index 34fb684d25..2c3e4f1e7c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/Log.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Log.java
@@ -15,8 +15,8 @@
  */
 package com.google.android.exoplayer2.util;
 
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java b/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
index 19e1f9b196..4838f322ed 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.util;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import com.google.android.exoplayer2.C;
 import java.util.ArrayList;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/NotificationUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/util/NotificationUtil.java
index e45ab0952e..e1c98c6575 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/NotificationUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/NotificationUtil.java
@@ -21,9 +21,9 @@ import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java b/library/core/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java
index b928ffc02b..0c5116624e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.util;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/RepeatModeUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/util/RepeatModeUtil.java
index cc23c9763c..3485877bc4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/RepeatModeUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/RepeatModeUtil.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.util;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import com.google.android.exoplayer2.Player;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/SystemClock.java b/library/core/src/main/java/com/google/android/exoplayer2/util/SystemClock.java
index 72d3df46e1..be526595c6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/SystemClock.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/SystemClock.java
@@ -18,7 +18,7 @@ package com.google.android.exoplayer2.util;
 import android.os.Handler;
 import android.os.Handler.Callback;
 import android.os.Looper;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * The standard implementation of {@link Clock}.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/TimedValueQueue.java b/library/core/src/main/java/com/google/android/exoplayer2/util/TimedValueQueue.java
index 3fe3c56c15..3ac76eb54c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/TimedValueQueue.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/TimedValueQueue.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.util;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import java.util.Arrays;
 import org.checkerframework.checker.nullness.compatqual.NullableType;
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
index b9d78f8af2..5a2732a05d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
@@ -39,7 +39,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Parcel;
 import android.security.NetworkSecurityPolicy;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.view.Display;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/XmlPullParserUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/util/XmlPullParserUtil.java
index 3b72a60fb9..a9b252b775 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/XmlPullParserUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/XmlPullParserUtil.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.util;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/ColorInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/video/ColorInfo.java
index 77ca936a90..a6c62b16f6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/ColorInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/ColorInfo.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.video;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.util.Util;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/DolbyVisionConfig.java b/library/core/src/main/java/com/google/android/exoplayer2/video/DolbyVisionConfig.java
index 3a7c12dd14..3aeff9d553 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/DolbyVisionConfig.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/DolbyVisionConfig.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.video;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 
 /** Dolby Vision configuration data. */
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/DummySurface.java b/library/core/src/main/java/com/google/android/exoplayer2/video/DummySurface.java
index c43d81010f..f302279f06 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/DummySurface.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/DummySurface.java
@@ -29,7 +29,7 @@ import android.os.Handler;
 import android.os.Handler.Callback;
 import android.os.HandlerThread;
 import android.os.Message;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.Surface;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.EGLSurfaceTexture;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/HevcConfig.java b/library/core/src/main/java/com/google/android/exoplayer2/video/HevcConfig.java
index 089ff6343f..727883f678 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/HevcConfig.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/HevcConfig.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.video;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.util.NalUnitUtil;
 import com.google.android.exoplayer2.util.ParsableByteArray;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index a4f67b1eda..f0d944e5a1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -25,9 +25,9 @@ import android.media.MediaCrypto;
 import android.media.MediaFormat;
 import android.os.Handler;
 import android.os.SystemClock;
-import android.support.annotation.CallSuper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.CallSuper;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.Pair;
 import android.view.Surface;
 import com.google.android.exoplayer2.C;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameReleaseTimeHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameReleaseTimeHelper.java
index c7e34d00e9..caa79d7c18 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameReleaseTimeHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameReleaseTimeHelper.java
@@ -21,7 +21,7 @@ import android.hardware.display.DisplayManager;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Message;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.Choreographer;
 import android.view.Choreographer.FrameCallback;
 import android.view.Display;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java b/library/core/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java
index f2f451b3d0..2f76a2c23d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.video;
 
 import android.os.Handler;
 import android.os.SystemClock;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.Surface;
 import android.view.TextureView;
 import com.google.android.exoplayer2.Format;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionRenderer.java
index 663c9fe284..eb7110834b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionRenderer.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.video.spherical;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.BaseRenderer;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/Projection.java b/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/Projection.java
index 3d4879d50a..8ba24bb06e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/Projection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/Projection.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.video.spherical;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.C.StereoMode;
 import com.google.android.exoplayer2.util.Assertions;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/ProjectionDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/ProjectionDecoder.java
index 7a3c4998b3..527aa5db4f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/ProjectionDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/ProjectionDecoder.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.video.spherical;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.ParsableBitArray;
 import com.google.android.exoplayer2.util.ParsableByteArray;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
index 960574d30e..9b41d19123 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
@@ -20,7 +20,7 @@ import static org.junit.Assert.fail;
 
 import android.content.Context;
 import android.graphics.SurfaceTexture;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.Surface;
 import com.google.android.exoplayer2.Player.DiscontinuityReason;
 import com.google.android.exoplayer2.Player.EventListener;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
index 3649685f3e..49bd634099 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
@@ -19,7 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.os.Handler;
 import android.os.SystemClock;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.Surface;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.Format;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorTest.java
index c3c33e3350..912b4bd7c7 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorTest.java
@@ -22,7 +22,7 @@ import static com.google.android.exoplayer2.extractor.amr.AmrExtractor.frameSize
 import static com.google.common.truth.Truth.assertThat;
 import static junit.framework.Assert.fail;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.extractor.PositionHolder;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
index 501042e69c..38ddc81304 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.offline;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 
 /**
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java
index ee8cdf4887..8077b77d7e 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java
@@ -19,7 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java
index 3d78ecfb4c..99dfc1b04e 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java
@@ -23,7 +23,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static java.lang.Long.MIN_VALUE;
 import static java.util.Arrays.copyOfRange;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.FormatHolder;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/BaseDataSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/BaseDataSourceTest.java
index 7155c37e29..f962e0d8fd 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/BaseDataSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/BaseDataSourceTest.java
@@ -18,7 +18,7 @@ package com.google.android.exoplayer2.upstream;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import java.io.IOException;
 import org.junit.Test;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
index f8c417499f..4aa16c6454 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
@@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.CacheAsserts;
 import com.google.android.exoplayer2.testutil.FakeDataSet.FakeData;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
index d25aa6784e..6433faa8d5 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
@@ -19,7 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.SparseArray;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.TestUtil;
diff --git a/library/dash/build.gradle b/library/dash/build.gradle
index 319ca7f6e8..d7186749c2 100644
--- a/library/dash/build.gradle
+++ b/library/dash/build.gradle
@@ -42,7 +42,7 @@ android {
 dependencies {
     implementation project(modulePrefix + 'library-core')
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
-    implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+    implementation 'androidx.annotation:annotation:1.0.1'
     testImplementation project(modulePrefix + 'testutils-robolectric')
 }
 
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashChunkSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashChunkSource.java
index c6cdc88f2f..f808d7c1b6 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashChunkSource.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashChunkSource.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.source.dash;
 
 import android.os.SystemClock;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.source.chunk.ChunkSource;
 import com.google.android.exoplayer2.source.dash.PlayerEmsgHandler.PlayerTrackEmsgHandler;
 import com.google.android.exoplayer2.source.dash.manifest.DashManifest;
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java
index fd0453e79e..a2a7208d99 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java
@@ -15,8 +15,8 @@
  */
 package com.google.android.exoplayer2.source.dash;
 
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import android.util.Pair;
 import android.util.SparseIntArray;
 import com.google.android.exoplayer2.C;
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
index cfdbdac1ea..732ca61b62 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
@@ -18,7 +18,7 @@ package com.google.android.exoplayer2.source.dash;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.SystemClock;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.SparseArray;
 import com.google.android.exoplayer2.C;
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashUtil.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashUtil.java
index 743462bd89..6a6e08ce1d 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashUtil.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashUtil.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.source.dash;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.drm.DrmInitData;
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
index a02b2f1ee7..6282195d67 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
@@ -17,8 +17,8 @@ package com.google.android.exoplayer2.source.dash;
 
 import android.net.Uri;
 import android.os.SystemClock;
-import android.support.annotation.CheckResult;
-import android.support.annotation.Nullable;
+import androidx.annotation.CheckResult;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.SeekParameters;
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/PlayerEmsgHandler.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/PlayerEmsgHandler.java
index 3ab9f470c3..34e1ecc2b6 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/PlayerEmsgHandler.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/PlayerEmsgHandler.java
@@ -19,7 +19,7 @@ import static com.google.android.exoplayer2.util.Util.parseXsDateTime;
 
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.FormatHolder;
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java
index 3637b80ecb..0c3f641cbe 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.source.dash.manifest;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.offline.FilterableManifest;
 import com.google.android.exoplayer2.offline.StreamKey;
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Descriptor.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Descriptor.java
index 0e21df64bb..493a8da09c 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Descriptor.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Descriptor.java
@@ -15,8 +15,8 @@
  */
 package com.google.android.exoplayer2.source.dash.manifest;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Util;
 
 /**
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Period.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Period.java
index b6f7ef0a3b..18614ca4b0 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Period.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Period.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.source.dash.manifest;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import java.util.Collections;
 import java.util.List;
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java
index e3072c86bd..62934d7433 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.source.dash.manifest;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Util;
 
 /** A parsed program information element. */
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/RangedUri.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/RangedUri.java
index e226667337..c7bb4adec5 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/RangedUri.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/RangedUri.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.source.dash.manifest;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.UriUtil;
 
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.java
index 5dad468724..5636c73491 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.source.dash.offline;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.extractor.ChunkIndex;
 import com.google.android.exoplayer2.offline.DownloadException;
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java
index 0d9fee282c..04820fd20c 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java
@@ -18,7 +18,7 @@ package com.google.android.exoplayer2.source.dash;
 import static org.mockito.Mockito.mock;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.CompositeSequenceableLoaderFactory;
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
index 8d36ea68a4..e1aec6d4ed 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
@@ -24,7 +24,7 @@ import static com.google.common.truth.Truth.assertThat;
 import android.content.Context;
 import android.net.Uri;
 import android.os.ConditionVariable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.offline.DefaultDownloaderFactory;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadManager;
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
index bf32b65ba7..168fd9bf6e 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
@@ -23,7 +23,7 @@ import static com.google.android.exoplayer2.testutil.CacheAsserts.assertCachedDa
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.offline.DefaultDownloaderFactory;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadManager;
diff --git a/library/hls/build.gradle b/library/hls/build.gradle
index 35a63d1d40..abdceb1bb8 100644
--- a/library/hls/build.gradle
+++ b/library/hls/build.gradle
@@ -40,7 +40,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+    implementation 'androidx.annotation:annotation:1.0.1'
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     implementation project(modulePrefix + 'library-core')
     testImplementation project(modulePrefix + 'testutils-robolectric')
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/Aes128DataSource.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/Aes128DataSource.java
index 55a648a0b8..4fe76cdf81 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/Aes128DataSource.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/Aes128DataSource.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.source.hls;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DataSourceInputStream;
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
index 13af2dbc79..4a913961f4 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.source.hls;
 
 import android.net.Uri;
 import android.os.SystemClock;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.BehindLiveWindowException;
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
index a7e8fcc292..7e24f193ec 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.source.hls;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.drm.DrmInitData;
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
index a31f040a32..1c3e2f141d 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.source.hls;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.SeekParameters;
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
index f2b76dddc4..9b05cfc76f 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.source.hls;
 
 import android.net.Uri;
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.extractor.Extractor;
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
index df32b4ed84..6e9d9cd424 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.source.hls;
 
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.FormatHolder;
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/SampleQueueMappingException.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/SampleQueueMappingException.java
index 9c9cb532a6..38b18da50b 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/SampleQueueMappingException.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/SampleQueueMappingException.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.source.hls;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.source.SampleQueue;
 import com.google.android.exoplayer2.source.TrackGroup;
 import java.io.IOException;
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
index 4269b66d30..ee20423577 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
@@ -18,7 +18,7 @@ package com.google.android.exoplayer2.source.hls.playlist;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.SystemClock;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.source.MediaSourceEventListener.EventDispatcher;
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java
index 5200de048b..e45d6c7043 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java
@@ -15,9 +15,9 @@
  */
 package com.google.android.exoplayer2.source.hls.playlist;
 
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.offline.StreamKey;
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
index 58d1597d95..100323b862 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.source.hls.playlist;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Base64;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java
index c73c9fa835..12df8f310e 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.source.hls.playlist;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.source.MediaSourceEventListener.EventDispatcher;
 import com.google.android.exoplayer2.source.hls.HlsDataSourceFactory;
diff --git a/library/smoothstreaming/build.gradle b/library/smoothstreaming/build.gradle
index ae47e7fe52..9799f09e61 100644
--- a/library/smoothstreaming/build.gradle
+++ b/library/smoothstreaming/build.gradle
@@ -42,7 +42,7 @@ android {
 dependencies {
     implementation project(modulePrefix + 'library-core')
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
-    implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+    implementation 'androidx.annotation:annotation:1.0.1'
     testImplementation project(modulePrefix + 'testutils-robolectric')
 }
 
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java
index 45521726c0..59e18195e2 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.source.smoothstreaming;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.SeekParameters;
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsChunkSource.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsChunkSource.java
index 4940f1592f..b763a484b8 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsChunkSource.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsChunkSource.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.source.smoothstreaming;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.source.chunk.ChunkSource;
 import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java
index ae6b60183c..135ee4a58e 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.source.smoothstreaming;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.SeekParameters;
 import com.google.android.exoplayer2.offline.StreamKey;
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
index 0f5544a993..867b17ac35 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
@@ -18,7 +18,7 @@ package com.google.android.exoplayer2.source.smoothstreaming;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.SystemClock;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.ParserException;
diff --git a/library/ui/build.gradle b/library/ui/build.gradle
index 69e18e1a7d..9c47f3684d 100644
--- a/library/ui/build.gradle
+++ b/library/ui/build.gradle
@@ -40,8 +40,8 @@ android {
 
 dependencies {
     implementation project(modulePrefix + 'library-core')
-    implementation 'com.android.support:support-media-compat:' + supportLibraryVersion
-    implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+    implementation 'androidx.media:media:1.0.0'
+    implementation 'androidx.annotation:annotation:1.0.1'
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     testImplementation project(modulePrefix + 'testutils-robolectric')
 }
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java
index 0d4c6a4038..d4a37ea4ef 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.ui;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 import java.lang.annotation.Documented;
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
index 0c3d39a13a..d9722f40f1 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
@@ -25,8 +25,8 @@ import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.annotation.ColorInt;
-import android.support.annotation.Nullable;
+import androidx.annotation.ColorInt;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.view.KeyEvent;
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
index 94bd0b81c5..d68ab41733 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
@@ -18,10 +18,10 @@ package com.google.android.exoplayer2.ui;
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.Context;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.app.NotificationCompat;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.core.app.NotificationCompat;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.offline.DownloadState;
 
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java
index b9e952e62f..f66352d7f7 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java
@@ -18,8 +18,8 @@ package com.google.android.exoplayer2.ui;
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.Context;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.Nullable;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.offline.DownloadState;
 import com.google.android.exoplayer2.util.Util;
 
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
index 7ac813211a..345e0f89fc 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
@@ -22,7 +22,7 @@ import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.os.Looper;
 import android.os.SystemClock;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
index 88087751b3..809c76f19a 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
@@ -25,13 +25,13 @@ import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationManagerCompat;
-import android.support.v4.media.app.NotificationCompat.MediaStyle;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
+import androidx.media.app.NotificationCompat.MediaStyle;
 import android.support.v4.media.session.MediaSessionCompat;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ControlDispatcher;
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
index ccc204515c..fcd281f312 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
@@ -28,9 +28,9 @@ import android.graphics.RectF;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Looper;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java
index b01e7a308c..955fab14c9 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java
@@ -16,8 +16,8 @@
 package com.google.android.exoplayer2.ui;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.SimpleExoPlayer;
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java
index 50a923bced..5d99eda109 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java
@@ -19,7 +19,7 @@ import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Canvas;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.View;
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TimeBar.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TimeBar.java
index 866921c2f9..aabeb85c07 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TimeBar.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TimeBar.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.ui;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 
 /**
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java
index 667c59f8c3..0df3fff5fe 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java
@@ -18,7 +18,7 @@ package com.google.android.exoplayer2.ui;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import com.google.android.exoplayer2.source.TrackGroupArray;
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
index cee2b6f89e..e95d70f026 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
@@ -17,8 +17,8 @@ package com.google.android.exoplayer2.ui;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.AttrRes;
-import android.support.annotation.Nullable;
+import androidx.annotation.AttrRes;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.Pair;
 import android.util.SparseArray;
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java
index 955418acf7..fdd59101e7 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java
@@ -24,7 +24,7 @@ import android.graphics.Rect;
 import android.graphics.SurfaceTexture;
 import android.opengl.GLES11Ext;
 import android.opengl.GLES20;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.Surface;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.GlUtil;
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/GlViewGroup.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/GlViewGroup.java
index b3c1a963b8..9ff6fcaf1f 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/GlViewGroup.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/GlViewGroup.java
@@ -22,8 +22,8 @@ import android.graphics.Color;
 import android.graphics.PointF;
 import android.graphics.PorterDuff;
 import android.os.SystemClock;
-import android.support.annotation.AnyThread;
-import android.support.annotation.UiThread;
+import androidx.annotation.AnyThread;
+import androidx.annotation.UiThread;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.ViewGroup;
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/OrientationListener.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/OrientationListener.java
index 2371f6f65c..80de418199 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/OrientationListener.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/OrientationListener.java
@@ -20,7 +20,7 @@ import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.opengl.Matrix;
-import android.support.annotation.BinderThread;
+import androidx.annotation.BinderThread;
 import android.view.Display;
 import android.view.Surface;
 import com.google.android.exoplayer2.video.spherical.FrameRotationQueue;
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java
index 6793b0c584..2889351f19 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java
@@ -20,7 +20,7 @@ import static com.google.android.exoplayer2.util.GlUtil.checkGlError;
 import android.graphics.SurfaceTexture;
 import android.opengl.GLES20;
 import android.opengl.Matrix;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.util.Assertions;
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java
index adbeb7773d..1029a28323 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java
@@ -25,11 +25,11 @@ import android.opengl.GLSurfaceView;
 import android.opengl.Matrix;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.AnyThread;
-import android.support.annotation.BinderThread;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.AnyThread;
+import androidx.annotation.BinderThread;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
+import androidx.annotation.VisibleForTesting;
 import android.util.AttributeSet;
 import android.view.Display;
 import android.view.Surface;
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/TouchTracker.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/TouchTracker.java
index dfafd448c9..142f2fc668 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/TouchTracker.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/TouchTracker.java
@@ -17,8 +17,8 @@ package com.google.android.exoplayer2.ui.spherical;
 
 import android.content.Context;
 import android.graphics.PointF;
-import android.support.annotation.BinderThread;
-import android.support.annotation.Nullable;
+import androidx.annotation.BinderThread;
+import androidx.annotation.Nullable;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;
diff --git a/library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/CanvasRendererTest.java b/library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/CanvasRendererTest.java
index d0503d4a93..e3ec5e4ece 100644
--- a/library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/CanvasRendererTest.java
+++ b/library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/CanvasRendererTest.java
@@ -18,7 +18,7 @@ package com.google.android.exoplayer2.ui.spherical;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.graphics.PointF;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
diff --git a/playbacktests/build.gradle b/playbacktests/build.gradle
index 7670cbb21a..11b7c00906 100644
--- a/playbacktests/build.gradle
+++ b/playbacktests/build.gradle
@@ -34,7 +34,7 @@ android {
 dependencies {
     androidTestImplementation 'androidx.test:rules:' + testRunnerVersion
     androidTestImplementation 'androidx.test:runner:' + testRunnerVersion
-    androidTestImplementation 'com.android.support:support-annotations:' + supportLibraryVersion
+    androidTestImplementation 'androidx.annotation:annotation:1.0.1'
     androidTestImplementation project(modulePrefix + 'library-core')
     androidTestImplementation project(modulePrefix + 'library-dash')
     androidTestImplementation project(modulePrefix + 'library-hls')
diff --git a/testutils/build.gradle b/testutils/build.gradle
index cdf765c5e7..322d7f75b8 100644
--- a/testutils/build.gradle
+++ b/testutils/build.gradle
@@ -40,7 +40,7 @@ android {
 dependencies {
     api 'org.mockito:mockito-core:' + mockitoVersion
     api 'com.google.truth:truth:' + truthVersion
-    implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+    implementation 'androidx.annotation:annotation:1.0.1'
     implementation project(modulePrefix + 'library-core')
     implementation 'com.google.auto.value:auto-value-annotations:' + autoValueVersion
     annotationProcessor 'com.google.auto.value:auto-value:' + autoValueVersion
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/Action.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/Action.java
index c988c0c172..f1fdfc42aa 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/Action.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/Action.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.testutil;
 
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.Surface;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ActionSchedule.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ActionSchedule.java
index 71f5fdeae1..7f688cacf7 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ActionSchedule.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ActionSchedule.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.testutil;
 
 import android.os.Looper;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.Surface;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/DebugRenderersFactory.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/DebugRenderersFactory.java
index 54e6088168..70059114db 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/DebugRenderersFactory.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/DebugRenderersFactory.java
@@ -20,7 +20,7 @@ import android.content.Context;
 import android.media.MediaCodec;
 import android.media.MediaCrypto;
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.DefaultRenderersFactory;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.Format;
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java
index 401a2fae1b..517f1ce2e7 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java
@@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
 import android.content.Context;
 import android.os.HandlerThread;
 import android.os.Looper;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.DefaultLoadControl;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.Format;
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaPeriod.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaPeriod.java
index f8bf950ef2..1e3b3bf82b 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaPeriod.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaPeriod.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.testutil;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.source.CompositeSequenceableLoader;
 import com.google.android.exoplayer2.source.MediaPeriod;
 import com.google.android.exoplayer2.source.MediaSourceEventListener.EventDispatcher;
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaSource.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaSource.java
index 089528bfde..5a158a3659 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaSource.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaSource.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.testutil;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.Timeline.Period;
 import com.google.android.exoplayer2.source.MediaSource;
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeChunkSource.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeChunkSource.java
index b5db0dc489..54c700933a 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeChunkSource.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeChunkSource.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.testutil;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.SeekParameters;
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSet.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSet.java
index e77e0714e7..77ae19f083 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSet.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSet.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.testutil;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.upstream.DataSpec;
 import com.google.android.exoplayer2.util.Assertions;
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaPeriod.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaPeriod.java
index f2739f2b4d..d524d381fa 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaPeriod.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaPeriod.java
@@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.SystemClock;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.SeekParameters;
 import com.google.android.exoplayer2.source.MediaPeriod;
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
index de4be82b38..b89acae6c8 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
@@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.SystemClock;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.Timeline;
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSampleStream.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSampleStream.java
index 8b653f6642..a60c1c9c6d 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSampleStream.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSampleStream.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.testutil;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.FormatHolder;
diff --git a/testutils_robolectric/build.gradle b/testutils_robolectric/build.gradle
index e6f20aa448..61c81bc326 100644
--- a/testutils_robolectric/build.gradle
+++ b/testutils_robolectric/build.gradle
@@ -40,5 +40,5 @@ dependencies {
     api 'org.robolectric:robolectric:' + robolectricVersion
     api project(modulePrefix + 'testutils')
     implementation project(modulePrefix + 'library-core')
-    implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+    implementation 'androidx.annotation:annotation:1.0.1'
 }
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaPeriodAsserts.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaPeriodAsserts.java
index e99e2f45bb..681f166837 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaPeriodAsserts.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaPeriodAsserts.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.testutil;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.offline.FilterableManifest;
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaSourceTestRunner.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaSourceTestRunner.java
index 9514768416..0873dbd145 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaSourceTestRunner.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaSourceTestRunner.java
@@ -22,7 +22,7 @@ import android.os.ConditionVariable;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Pair;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.source.MediaPeriod;
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/RobolectricUtil.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/RobolectricUtil.java
index 1a9547d087..ad1fa6bb29 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/RobolectricUtil.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/RobolectricUtil.java
@@ -22,8 +22,8 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.os.MessageQueue;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Util;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.PriorityBlockingQueue;

From 44e23fabe694d3c2d8606de17e2e32dfb8bb6da2 Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Tue, 19 Feb 2019 11:15:16 +0000
Subject: [PATCH 557/832] let apps intercept/handle media button events by
 using a MediaButtonEventHandler

Issue #5179

PiperOrigin-RevId: 234571837
---
 RELEASENOTES.md                               |  2 +
 .../mediasession/MediaSessionConnector.java   | 45 +++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 6fd0e7d682..967b039757 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -75,6 +75,8 @@
   `DownloadNotificationHelper`.
 * Move creation of dialogs for `TrackSelectionView`s to
   `TrackSelectionDialogBuilder` and add option to select multiple overrides.
+* MediaSessionConnector: Let apps intercept media button events
+  ([#5179](https://github.com/google/ExoPlayer/issues/5179)).
 
 ### 2.9.5 ###
 
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
index 9074f9e16d..6d80c1001f 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.ext.mediasession;
 
+import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
@@ -76,6 +77,9 @@ import java.util.Map;
  *       is recommended for most use cases.
  *   <li>To enable editing of the media queue, you can set a {@link QueueEditor} by calling {@link
  *       #setQueueEditor(QueueEditor)}.
+ *   <li>A {@link MediaButtonEventHandler} can be set by calling {@link
+ *       #setMediaButtonEventHandler(MediaButtonEventHandler)}. By default media button events are
+ *       handled by {@link MediaSessionCompat.Callback#onMediaButtonEvent(Intent)}.
  *   <li>An {@link ErrorMessageProvider} for providing human readable error messages and
  *       corresponding error codes can be set by calling {@link
  *       #setErrorMessageProvider(ErrorMessageProvider)}.
@@ -300,6 +304,21 @@ public final class MediaSessionConnector {
     void onSetRating(Player player, RatingCompat rating, Bundle extras);
   }
 
+  /** Handles a media button event. */
+  public interface MediaButtonEventHandler {
+    /**
+     * See {@link MediaSessionCompat.Callback#onMediaButtonEvent(Intent)}.
+     *
+     * @param player The {@link Player}.
+     * @param controlDispatcher A {@link ControlDispatcher} that should be used for dispatching
+     *     changes to the player.
+     * @param mediaButtonEvent The {@link Intent}.
+     * @return True if the event was handled, false otherwise.
+     */
+    boolean onMediaButtonEvent(
+        Player player, ControlDispatcher controlDispatcher, Intent mediaButtonEvent);
+  }
+
   /**
    * Provides a {@link PlaybackStateCompat.CustomAction} to be published and handles the action when
    * sent by a media controller.
@@ -357,6 +376,7 @@ public final class MediaSessionConnector {
   @Nullable private QueueNavigator queueNavigator;
   @Nullable private QueueEditor queueEditor;
   @Nullable private RatingCallback ratingCallback;
+  @Nullable private MediaButtonEventHandler mediaButtonEventHandler;
 
   private long enabledPlaybackActions;
   private int rewindMs;
@@ -432,6 +452,18 @@ public final class MediaSessionConnector {
     }
   }
 
+  /**
+   * Sets the {@link MediaButtonEventHandler}. Pass {@code null} if the media button event should be
+   * handled by {@link MediaSessionCompat.Callback#onMediaButtonEvent(Intent)}.
+   *
+   * @param mediaButtonEventHandler The {@link MediaButtonEventHandler}, or null to let the event be
+   *     handled by {@link MediaSessionCompat.Callback#onMediaButtonEvent(Intent)}.
+   */
+  public void setMediaButtonEventHandler(
+      @Nullable MediaButtonEventHandler mediaButtonEventHandler) {
+    this.mediaButtonEventHandler = mediaButtonEventHandler;
+  }
+
   /**
    * Sets the enabled playback actions.
    *
@@ -753,6 +785,10 @@ public final class MediaSessionConnector {
     return player != null && queueEditor != null;
   }
 
+  private boolean canDispatchMediaButtonEvent() {
+    return player != null && mediaButtonEventHandler != null;
+  }
+
   private void stopPlayerForPrepare(boolean playWhenReady) {
     if (player != null) {
       player.stop();
@@ -1169,5 +1205,14 @@ public final class MediaSessionConnector {
         queueEditor.onRemoveQueueItem(player, description);
       }
     }
+
+    @Override
+    public boolean onMediaButtonEvent(Intent mediaButtonEvent) {
+      boolean isHandled =
+          canDispatchMediaButtonEvent()
+              && mediaButtonEventHandler.onMediaButtonEvent(
+                  player, controlDispatcher, mediaButtonEvent);
+      return isHandled || super.onMediaButtonEvent(mediaButtonEvent);
+    }
   }
 }

From d79735cbc359ce074be5a4f888d0df1c2c9d4f3e Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 19 Feb 2019 11:31:57 +0000
Subject: [PATCH 558/832] Strip unnecessary constant

PiperOrigin-RevId: 234573193
---
 constants.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/constants.gradle b/constants.gradle
index ab3d097fbc..1e1bfd593f 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -19,7 +19,6 @@ project.ext {
     targetSdkVersion = 28
     compileSdkVersion = 28
     testSupportLibraryVersion = '0.5'
-    supportLibraryVersion = '27.1.1'
     dexmakerVersion = '1.2'
     mockitoVersion = '1.9.5'
     junitVersion = '4.12'

From 8e7ae9201a3188591e38bda4286301465f6ce6ea Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 19 Feb 2019 12:32:54 +0000
Subject: [PATCH 559/832] Bump version for 2.9.6 release

PiperOrigin-RevId: 234578712
---
 RELEASENOTES.md                               | 34 ++++++++++---------
 constants.gradle                              |  4 +--
 .../exoplayer2/ExoPlayerLibraryInfo.java      |  6 ++--
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 967b039757..5eead25cfb 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -8,9 +8,6 @@
     ([#5441](https://github.com/google/ExoPlayer/issues/5441)).
   * Prevent unnecessary reloads of the initialization segment for reused
     extractors.
-* DASH:
-  * Fix issue handling large `EventStream` presentation timestamps
-    ([#5490](https://github.com/google/ExoPlayer/issues/5490)).
 * `ExtractorMediaSource` renamed to `ProgressiveMediaSource`.
 * Support for playing spherical videos on Daydream.
 * Improve decoder re-use between playbacks. TODO: Write and link a blog post
@@ -51,19 +48,6 @@
   ([#3735](https://github.com/google/ExoPlayer/issues/3735)).
 * CEA-608: Improved conformance to the specification
   ([#3860](https://github.com/google/ExoPlayer/issues/3860)).
-* IMA extension:
-  * Require setting the `Player` on `AdsLoader` instances before
-    playback.
-  * Remove deprecated `ImaAdsMediaSource`. Create `AdsMediaSource` with an
-    `ImaAdsLoader` instead.
-  * Remove deprecated `AdsMediaSource` constructors. Listen for media source
-    events using `AdsMediaSource.addEventListener`, and ad interaction events by
-    adding a listener when building `ImaAdsLoader`.
-  * Allow apps to register playback-related obstructing views that are on top of
-    their ad display containers via `AdsLoader.AdViewProvider`. `PlayerView`
-    implements this interface and will register its control view. This makes it
-    possible for ad loading SDKs to calculate ad viewability accurately.
-* Remove `player` and `isTopLevelSource` parameters from `MediaSource.prepare`.
 * VP9 extension: Remove RGB output mode and libyuv dependency, and switch to
   surface YUV output as the default. Remove constructor parameters `scaleToFit`
   and `useSurfaceYuvOutput`.
@@ -78,6 +62,24 @@
 * MediaSessionConnector: Let apps intercept media button events
   ([#5179](https://github.com/google/ExoPlayer/issues/5179)).
 
+### 2.9.6 ###
+
+* Remove `player` and `isTopLevelSource` parameters from `MediaSource.prepare`.
+* IMA extension:
+  * Require setting the `Player` on `AdsLoader` instances before
+    playback.
+  * Remove deprecated `ImaAdsMediaSource`. Create `AdsMediaSource` with an
+    `ImaAdsLoader` instead.
+  * Remove deprecated `AdsMediaSource` constructors. Listen for media source
+    events using `AdsMediaSource.addEventListener`, and ad interaction events by
+    adding a listener when building `ImaAdsLoader`.
+  * Allow apps to register playback-related obstructing views that are on top of
+    their ad display containers via `AdsLoader.AdViewProvider`. `PlayerView`
+    implements this interface and will register its control view. This makes it
+    possible for ad loading SDKs to calculate ad viewability accurately.
+* DASH: Fix issue handling large `EventStream` presentation timestamps
+  ([#5490](https://github.com/google/ExoPlayer/issues/5490)).
+
 ### 2.9.5 ###
 
 * HLS: Parse `CHANNELS` attribute from `EXT-X-MEDIA` tag.
diff --git a/constants.gradle b/constants.gradle
index 1e1bfd593f..3f69ab6754 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -13,8 +13,8 @@
 // limitations under the License.
 project.ext {
     // ExoPlayer version and version code.
-    releaseVersion = '2.9.5'
-    releaseVersionCode = 2009005
+    releaseVersion = '2.9.6'
+    releaseVersionCode = 2009006
     minSdkVersion = 16
     targetSdkVersion = 28
     compileSdkVersion = 28
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
index e3a2e1cd27..b389ec742f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
@@ -29,11 +29,11 @@ public final class ExoPlayerLibraryInfo {
 
   /** The version of the library expressed as a string, for example "1.2.3". */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION_INT) or vice versa.
-  public static final String VERSION = "2.9.5";
+  public static final String VERSION = "2.9.6";
 
   /** The version of the library expressed as {@code "ExoPlayerLib/" + VERSION}. */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
-  public static final String VERSION_SLASHY = "ExoPlayerLib/2.9.5";
+  public static final String VERSION_SLASHY = "ExoPlayerLib/2.9.6";
 
   /**
    * The version of the library expressed as an integer, for example 1002003.
@@ -43,7 +43,7 @@ public final class ExoPlayerLibraryInfo {
    * integer version 123045006 (123-045-006).
    */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
-  public static final int VERSION_INT = 2009005;
+  public static final int VERSION_INT = 2009006;
 
   /**
    * Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions}

From 774c01d02046993e824aa31e2cb49bfc1283bc78 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Tue, 19 Feb 2019 12:43:52 +0000
Subject: [PATCH 560/832] Make MimeType top level check related methods more
 robust

Throwing an IllegalArgumentException doesn't help the method signature.

PiperOrigin-RevId: 234579722
---
 .../android/exoplayer2/util/MimeTypes.java    | 36 ++++---------------
 1 file changed, 7 insertions(+), 29 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java b/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
index 4838f322ed..01b4388eb4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
@@ -120,42 +120,22 @@ public final class MimeTypes {
     customMimeTypes.add(customMimeType);
   }
 
-  /**
-   * Whether the top-level type of {@code mimeType} is audio.
-   *
-   * @param mimeType The mimeType to test.
-   * @return Whether the top level type is audio.
-   */
+  /** Returns whether the given string is an audio mime type. */
   public static boolean isAudio(@Nullable String mimeType) {
     return BASE_TYPE_AUDIO.equals(getTopLevelType(mimeType));
   }
 
-  /**
-   * Whether the top-level type of {@code mimeType} is video.
-   *
-   * @param mimeType The mimeType to test.
-   * @return Whether the top level type is video.
-   */
+  /** Returns whether the given string is a video mime type. */
   public static boolean isVideo(@Nullable String mimeType) {
     return BASE_TYPE_VIDEO.equals(getTopLevelType(mimeType));
   }
 
-  /**
-   * Whether the top-level type of {@code mimeType} is text.
-   *
-   * @param mimeType The mimeType to test.
-   * @return Whether the top level type is text.
-   */
+  /** Returns whether the given string is a text mime type. */
   public static boolean isText(@Nullable String mimeType) {
     return BASE_TYPE_TEXT.equals(getTopLevelType(mimeType));
   }
 
-  /**
-   * Whether the top-level type of {@code mimeType} is application.
-   *
-   * @param mimeType The mimeType to test.
-   * @return Whether the top level type is application.
-   */
+  /** Returns whether the given string is an application mime type. */
   public static boolean isApplication(@Nullable String mimeType) {
     return BASE_TYPE_APPLICATION.equals(getTopLevelType(mimeType));
   }
@@ -384,10 +364,8 @@ public final class MimeTypes {
   }
 
   /**
-   * Returns the top-level type of {@code mimeType}.
-   *
-   * @param mimeType The mimeType whose top-level type is required.
-   * @return The top-level type, or null if the mimeType is null.
+   * Returns the top-level type of {@code mimeType}, or null if {@code mimeType} is null or does not
+   * contain a forward slash character ({@code '/'}).
    */
   private static @Nullable String getTopLevelType(@Nullable String mimeType) {
     if (mimeType == null) {
@@ -395,7 +373,7 @@ public final class MimeTypes {
     }
     int indexOfSlash = mimeType.indexOf('/');
     if (indexOfSlash == -1) {
-      throw new IllegalArgumentException("Invalid mime type: " + mimeType);
+      return null;
     }
     return mimeType.substring(0, indexOfSlash);
   }

From a174af0d70929c53093c62186a1d336e1837ea4d Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Tue, 19 Feb 2019 13:55:45 +0000
Subject: [PATCH 561/832] Remove deprecated HLS-related constructors

PiperOrigin-RevId: 234586744
---
 .../exoplayer2/source/hls/HlsMediaSource.java | 96 -------------------
 .../playlist/DefaultHlsPlaylistTracker.java   | 39 --------
 2 files changed, 135 deletions(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
index 9b05cfc76f..114a64f99f 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
@@ -36,15 +36,12 @@ import com.google.android.exoplayer2.source.hls.playlist.DefaultHlsPlaylistParse
 import com.google.android.exoplayer2.source.hls.playlist.DefaultHlsPlaylistTracker;
 import com.google.android.exoplayer2.source.hls.playlist.FilteringHlsPlaylistParserFactory;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist;
-import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylist;
-import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylistParser;
 import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylistParserFactory;
 import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylistTracker;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DefaultLoadErrorHandlingPolicy;
 import com.google.android.exoplayer2.upstream.LoadErrorHandlingPolicy;
-import com.google.android.exoplayer2.upstream.ParsingLoadable;
 import com.google.android.exoplayer2.upstream.TransferListener;
 import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
@@ -297,99 +294,6 @@ public final class HlsMediaSource extends BaseMediaSource
 
   private @Nullable TransferListener mediaTransferListener;
 
-  /**
-   * @param manifestUri The {@link Uri} of the HLS manifest.
-   * @param dataSourceFactory An {@link HlsDataSourceFactory} for {@link DataSource}s for manifests,
-   *     segments and keys.
-   * @param eventHandler A handler for events. May be null if delivery of events is not required.
-   * @param eventListener A {@link MediaSourceEventListener}. May be null if delivery of events is
-   *     not required.
-   * @deprecated Use {@link Factory} instead.
-   */
-  @Deprecated
-  @SuppressWarnings("deprecation")
-  public HlsMediaSource(
-      Uri manifestUri,
-      DataSource.Factory dataSourceFactory,
-      Handler eventHandler,
-      MediaSourceEventListener eventListener) {
-    this(
-        manifestUri,
-        dataSourceFactory,
-        DefaultLoadErrorHandlingPolicy.DEFAULT_MIN_LOADABLE_RETRY_COUNT,
-        eventHandler,
-        eventListener);
-  }
-
-  /**
-   * @param manifestUri The {@link Uri} of the HLS manifest.
-   * @param dataSourceFactory An {@link HlsDataSourceFactory} for {@link DataSource}s for manifests,
-   *     segments and keys.
-   * @param minLoadableRetryCount The minimum number of times loads must be retried before errors
-   *     are propagated.
-   * @param eventHandler A handler for events. May be null if delivery of events is not required.
-   * @param eventListener A {@link MediaSourceEventListener}. May be null if delivery of events is
-   *     not required.
-   * @deprecated Use {@link Factory} instead.
-   */
-  @Deprecated
-  @SuppressWarnings("deprecation")
-  public HlsMediaSource(
-      Uri manifestUri,
-      DataSource.Factory dataSourceFactory,
-      int minLoadableRetryCount,
-      Handler eventHandler,
-      MediaSourceEventListener eventListener) {
-    this(
-        manifestUri,
-        new DefaultHlsDataSourceFactory(dataSourceFactory),
-        HlsExtractorFactory.DEFAULT,
-        minLoadableRetryCount,
-        eventHandler,
-        eventListener,
-        new HlsPlaylistParser());
-  }
-
-  /**
-   * @param manifestUri The {@link Uri} of the HLS manifest.
-   * @param dataSourceFactory An {@link HlsDataSourceFactory} for {@link DataSource}s for manifests,
-   *     segments and keys.
-   * @param extractorFactory An {@link HlsExtractorFactory} for {@link Extractor}s for the segments.
-   * @param minLoadableRetryCount The minimum number of times loads must be retried before errors
-   *     are propagated.
-   * @param eventHandler A handler for events. May be null if delivery of events is not required.
-   * @param eventListener A {@link MediaSourceEventListener}. May be null if delivery of events is
-   *     not required.
-   * @param playlistParser A {@link ParsingLoadable.Parser} for HLS playlists.
-   * @deprecated Use {@link Factory} instead.
-   */
-  @Deprecated
-  @SuppressWarnings("deprecation")
-  public HlsMediaSource(
-      Uri manifestUri,
-      HlsDataSourceFactory dataSourceFactory,
-      HlsExtractorFactory extractorFactory,
-      int minLoadableRetryCount,
-      Handler eventHandler,
-      MediaSourceEventListener eventListener,
-      ParsingLoadable.Parser<HlsPlaylist> playlistParser) {
-    this(
-        manifestUri,
-        dataSourceFactory,
-        extractorFactory,
-        new DefaultCompositeSequenceableLoaderFactory(),
-        new DefaultLoadErrorHandlingPolicy(minLoadableRetryCount),
-        new DefaultHlsPlaylistTracker(
-            dataSourceFactory,
-            new DefaultLoadErrorHandlingPolicy(minLoadableRetryCount),
-            playlistParser),
-        /* allowChunklessPreparation= */ false,
-        /* tag= */ null);
-    if (eventHandler != null && eventListener != null) {
-      addEventListener(eventHandler, eventListener);
-    }
-  }
-
   private HlsMediaSource(
       Uri manifestUri,
       HlsDataSourceFactory dataSourceFactory,
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
index ee20423577..41cc66b1bd 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
@@ -67,23 +67,6 @@ public final class DefaultHlsPlaylistTracker
   private boolean isLive;
   private long initialStartTimeUs;
 
-  /**
-   * @param dataSourceFactory A factory for {@link DataSource} instances.
-   * @param loadErrorHandlingPolicy The {@link LoadErrorHandlingPolicy}.
-   * @param playlistParser A {@link ParsingLoadable.Parser} for HLS playlists.
-   * @deprecated Use {@link #DefaultHlsPlaylistTracker(HlsDataSourceFactory,
-   *     LoadErrorHandlingPolicy, HlsPlaylistParserFactory)} instead. Using this constructor
-   *     prevents support for attributes that are carried over from the master playlist to the media
-   *     playlists.
-   */
-  @Deprecated
-  public DefaultHlsPlaylistTracker(
-      HlsDataSourceFactory dataSourceFactory,
-      LoadErrorHandlingPolicy loadErrorHandlingPolicy,
-      ParsingLoadable.Parser<HlsPlaylist> playlistParser) {
-    this(dataSourceFactory, loadErrorHandlingPolicy, createFixedFactory(playlistParser));
-  }
-
   /**
    * @param dataSourceFactory A factory for {@link DataSource} instances.
    * @param loadErrorHandlingPolicy The {@link LoadErrorHandlingPolicy}.
@@ -654,26 +637,4 @@ public final class DefaultHlsPlaylistTracker
       return primaryHlsUrl == playlistUrl && !maybeSelectNewPrimaryUrl();
     }
   }
-
-  /**
-   * Creates a factory which always returns the given playlist parser.
-   *
-   * @param playlistParser The parser to return.
-   * @return A factory which always returns the given playlist parser.
-   */
-  private static HlsPlaylistParserFactory createFixedFactory(
-      ParsingLoadable.Parser<HlsPlaylist> playlistParser) {
-    return new HlsPlaylistParserFactory() {
-      @Override
-      public ParsingLoadable.Parser<HlsPlaylist> createPlaylistParser() {
-        return playlistParser;
-      }
-
-      @Override
-      public ParsingLoadable.Parser<HlsPlaylist> createPlaylistParser(
-          HlsMasterPlaylist masterPlaylist) {
-        return playlistParser;
-      }
-    };
-  }
 }

From 28434cff4c11b0e19a3145bfbaff6c9507a574b1 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Tue, 19 Feb 2019 13:56:31 +0000
Subject: [PATCH 562/832] Support customization of the PlaylistStuckException
 waiting period

Issue:#5487
PiperOrigin-RevId: 234586819
---
 .../playlist/DefaultHlsPlaylistTracker.java   | 35 ++++++++++++++++---
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
index 41cc66b1bd..f0032ef475 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
@@ -45,16 +45,17 @@ public final class DefaultHlsPlaylistTracker
   public static final Factory FACTORY = DefaultHlsPlaylistTracker::new;
 
   /**
-   * Coefficient applied on the target duration of a playlist to determine the amount of time after
-   * which an unchanging playlist is considered stuck.
+   * Default coefficient applied on the target duration of a playlist to determine the amount of
+   * time after which an unchanging playlist is considered stuck.
    */
-  private static final double PLAYLIST_STUCK_TARGET_DURATION_COEFFICIENT = 3.5;
+  public static final double DEFAULT_PLAYLIST_STUCK_TARGET_DURATION_COEFFICIENT = 3.5;
 
   private final HlsDataSourceFactory dataSourceFactory;
   private final HlsPlaylistParserFactory playlistParserFactory;
   private final LoadErrorHandlingPolicy loadErrorHandlingPolicy;
   private final IdentityHashMap<HlsUrl, MediaPlaylistBundle> playlistBundles;
   private final List<PlaylistEventListener> listeners;
+  private final double playlistStuckTargetDurationCoefficient;
 
   private @Nullable ParsingLoadable.Parser<HlsPlaylist> mediaPlaylistParser;
   private @Nullable EventDispatcher eventDispatcher;
@@ -68,6 +69,8 @@ public final class DefaultHlsPlaylistTracker
   private long initialStartTimeUs;
 
   /**
+   * Creates an instance.
+   *
    * @param dataSourceFactory A factory for {@link DataSource} instances.
    * @param loadErrorHandlingPolicy The {@link LoadErrorHandlingPolicy}.
    * @param playlistParserFactory An {@link HlsPlaylistParserFactory}.
@@ -76,9 +79,33 @@ public final class DefaultHlsPlaylistTracker
       HlsDataSourceFactory dataSourceFactory,
       LoadErrorHandlingPolicy loadErrorHandlingPolicy,
       HlsPlaylistParserFactory playlistParserFactory) {
+    this(
+        dataSourceFactory,
+        loadErrorHandlingPolicy,
+        playlistParserFactory,
+        DEFAULT_PLAYLIST_STUCK_TARGET_DURATION_COEFFICIENT);
+  }
+
+  /**
+   * Creates an instance.
+   *
+   * @param dataSourceFactory A factory for {@link DataSource} instances.
+   * @param loadErrorHandlingPolicy The {@link LoadErrorHandlingPolicy}.
+   * @param playlistParserFactory An {@link HlsPlaylistParserFactory}.
+   * @param playlistStuckTargetDurationCoefficient A coefficient to apply to the target duration of
+   *     media playlists in order to determine that a non-changing playlist is stuck. Once a
+   *     playlist is deemed stuck, a {@link PlaylistStuckException} is thrown via {@link
+   *     #maybeThrowPlaylistRefreshError(HlsUrl)}.
+   */
+  public DefaultHlsPlaylistTracker(
+      HlsDataSourceFactory dataSourceFactory,
+      LoadErrorHandlingPolicy loadErrorHandlingPolicy,
+      HlsPlaylistParserFactory playlistParserFactory,
+      double playlistStuckTargetDurationCoefficient) {
     this.dataSourceFactory = dataSourceFactory;
     this.playlistParserFactory = playlistParserFactory;
     this.loadErrorHandlingPolicy = loadErrorHandlingPolicy;
+    this.playlistStuckTargetDurationCoefficient = playlistStuckTargetDurationCoefficient;
     listeners = new ArrayList<>();
     playlistBundles = new IdentityHashMap<>();
     initialStartTimeUs = C.TIME_UNSET;
@@ -597,7 +624,7 @@ public final class DefaultHlsPlaylistTracker
           notifyPlaylistError(playlistUrl, C.TIME_UNSET);
         } else if (currentTimeMs - lastSnapshotChangeMs
             > C.usToMs(playlistSnapshot.targetDurationUs)
-                * PLAYLIST_STUCK_TARGET_DURATION_COEFFICIENT) {
+                * playlistStuckTargetDurationCoefficient) {
           // TODO: Allow customization of stuck playlists handling.
           playlistError = new PlaylistStuckException(playlistUrl.url);
           long blacklistDurationMs =

From b68fda0322938809df1704144874fe1222af6319 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 19 Feb 2019 15:50:40 +0000
Subject: [PATCH 563/832] Update release notes to include HLS init segment fix

PiperOrigin-RevId: 234600750
---
 RELEASENOTES.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 5eead25cfb..26db5c1c8b 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -4,10 +4,6 @@
 
 * HLS:
   * Form an adaptive track group out of audio renditions with matching name.
-  * Support encrypted initialization segments
-    ([#5441](https://github.com/google/ExoPlayer/issues/5441)).
-  * Prevent unnecessary reloads of the initialization segment for reused
-    extractors.
 * `ExtractorMediaSource` renamed to `ProgressiveMediaSource`.
 * Support for playing spherical videos on Daydream.
 * Improve decoder re-use between playbacks. TODO: Write and link a blog post
@@ -79,6 +75,10 @@
     possible for ad loading SDKs to calculate ad viewability accurately.
 * DASH: Fix issue handling large `EventStream` presentation timestamps
   ([#5490](https://github.com/google/ExoPlayer/issues/5490)).
+* HLS:
+  * Prevent unnecessary reloads of initialization segments.
+  * Support encrypted initialization segments
+    ([#5441](https://github.com/google/ExoPlayer/issues/5441)).
 
 ### 2.9.5 ###
 

From bfc60e1694ba09876b47e44d0ae2841f8467184f Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 19 Feb 2019 18:53:26 +0000
Subject: [PATCH 564/832] Set vertical orientation by default in
 TrackSelectionView

Horizontal orientation doesn't make sense. I thought about
overriding the setter to throw something, but it's probably
not worth the extra lines.

PiperOrigin-RevId: 234632530
---
 demos/main/src/main/res/layout/track_selection_dialog_tab.xml  | 3 ++-
 .../com/google/android/exoplayer2/ui/TrackSelectionView.java   | 2 ++
 library/ui/src/main/res/layout/exo_track_selection_dialog.xml  | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/demos/main/src/main/res/layout/track_selection_dialog_tab.xml b/demos/main/src/main/res/layout/track_selection_dialog_tab.xml
index 1827b4738b..33e69e5bee 100644
--- a/demos/main/src/main/res/layout/track_selection_dialog_tab.xml
+++ b/demos/main/src/main/res/layout/track_selection_dialog_tab.xml
@@ -16,9 +16,10 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
+
   <com.google.android.exoplayer2.ui.TrackSelectionView
       android:id="@+id/download_dialog_track_selection_view"
-      android:orientation="vertical"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"/>
+
 </ScrollView>
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
index e95d70f026..7af1a905ef 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
@@ -87,6 +87,8 @@ public class TrackSelectionView extends LinearLayout {
   public TrackSelectionView(
       Context context, @Nullable AttributeSet attrs, @AttrRes int defStyleAttr) {
     super(context, attrs, defStyleAttr);
+    setOrientation(LinearLayout.VERTICAL);
+
     overrides = new SparseArray<>();
 
     // Don't save view hierarchy as it needs to be reinitialized with a call to init.
diff --git a/library/ui/src/main/res/layout/exo_track_selection_dialog.xml b/library/ui/src/main/res/layout/exo_track_selection_dialog.xml
index 2ad8e2ea9b..07f59c3a59 100644
--- a/library/ui/src/main/res/layout/exo_track_selection_dialog.xml
+++ b/library/ui/src/main/res/layout/exo_track_selection_dialog.xml
@@ -18,7 +18,6 @@
     android:layout_height="match_parent">
 
   <com.google.android.exoplayer2.ui.TrackSelectionView android:id="@+id/exo_track_selection_view"
-      android:orientation="vertical"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"/>
 

From 5b891a4c1f25f0dd9570605516574db15e61cdcb Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Tue, 19 Feb 2019 19:36:21 +0000
Subject: [PATCH 565/832] add GitHub issue templates according

PiperOrigin-RevId: 234641428
---
 .../ISSUE_TEMPLATE/bug.md                     | 53 +++++++++++--------
 .github/ISSUE_TEMPLATE/content_not_playing.md | 44 +++++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.md     | 31 +++++++++++
 .github/ISSUE_TEMPLATE/question.md            | 31 +++++++++++
 4 files changed, 138 insertions(+), 21 deletions(-)
 rename ISSUE_TEMPLATE => .github/ISSUE_TEMPLATE/bug.md (53%)
 create mode 100644 .github/ISSUE_TEMPLATE/content_not_playing.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
 create mode 100644 .github/ISSUE_TEMPLATE/question.md

diff --git a/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE/bug.md
similarity index 53%
rename from ISSUE_TEMPLATE
rename to .github/ISSUE_TEMPLATE/bug.md
index 8d2f66093d..7e9c631fc0 100644
--- a/ISSUE_TEMPLATE
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -1,13 +1,20 @@
-Before filing an issue:
+---
+name: Bug report
+about: Issue template for a bug report.
+title: ''
+labels: bug, 'needs triage'
+assignees: ''
+---
+
+Before filing a bug:
 -----------------------
 - Search existing issues, including issues that are closed.
 - Consult our FAQs, supported devices and supported formats pages. These can be
   found at https://google.github.io/ExoPlayer/.
 - Rule out issues in your own code. A good way to do this is to try and
-  reproduce the issue in the ExoPlayer demo app.
-- This issue tracker is intended for bugs, feature requests and ExoPlayer
-  specific questions. If you're asking a general Android development question,
-  please do so on Stack Overflow.
+  reproduce the issue in the ExoPlayer demo app. Information about the ExoPlayer
+  demo app can be found here:
+  http://google.github.io/ExoPlayer/demo-application.html.
 
 When reporting a bug:
 -----------------------
@@ -15,29 +22,33 @@ Fill out the sections below, leaving the headers but replacing the content. If
 you're unable to provide certain information, please explain why in the relevant
 section. We may close issues if they do not include sufficient information.
 
-### Issue description
+### [REQUIRED] Issue description
 Describe the issue in detail, including observed and expected behavior.
 
-### Reproduction steps
-Describe how the issue can be reproduced, ideally using the ExoPlayer demo app.
+### [REQUIRED] Reproduction steps
+Describe how the issue can be reproduced, ideally using the ExoPlayer demo app
+or a small sample app that you’re able to share as source code on GitHub.
 
-### Link to test content
-Provide a link to media that reproduces the issue. If you don't wish to post it
-publicly, please submit the issue, then email the link to
-dev.exoplayer@gmail.com using a subject in the format "Issue #1234".
+### [REQUIRED] Link to test content
+Provide a JSON snippet for the demo app’s media.exolist.json file, or a link to
+media that reproduces the issue. If you don't wish to post it publicly, please
+submit the issue, then email the link to dev.exoplayer@gmail.com using a subject
+in the format "Issue #1234". Provide all the metadata we'd need to play the
+content like drm license urls or similar. If the content is accessible only in
+certain countries or regions, please say so.
 
-### Version of ExoPlayer being used
-Specify the absolute version number. Avoid using terms such as "latest".
-
-### Device(s) and version(s) of Android being used
-Specify the devices and versions of Android on which the issue can be
-reproduced, and how easily it reproduces. If possible, please test on multiple
-devices and Android versions.
-
-### A full bug report captured from the device
+### [REQUIRED] A full bug report captured from the device
 Capture a full bug report using "adb bugreport". Output from "adb logcat" or a
 log snippet is NOT sufficient. Please attach the captured bug report as a file.
 If you don't wish to post it publicly, please submit the issue, then email the
 bug report to dev.exoplayer@gmail.com using a subject in the format
 "Issue #1234".
 
+### [REQUIRED] Version of ExoPlayer being used
+Specify the absolute version number. Avoid using terms such as "latest".
+
+### [REQUIRED] Device(s) and version(s) of Android being used
+Specify the devices and versions of Android on which the issue can be
+reproduced, and how easily it reproduces. If possible, please test on multiple
+devices and Android versions.
+
diff --git a/.github/ISSUE_TEMPLATE/content_not_playing.md b/.github/ISSUE_TEMPLATE/content_not_playing.md
new file mode 100644
index 0000000000..47c09a7a59
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/content_not_playing.md
@@ -0,0 +1,44 @@
+---
+name: Content not playing correctly
+about: Issue template for a content not playing issue.
+title: ''
+labels: 'content not playing', 'needs triage'
+assignees: ''
+---
+
+Before filing a content issue:
+------------------------------
+- Search existing issues, including issues that are closed.
+- Consult our supported formats page, which can be found at
+  https://google.github.io/ExoPlayer/supported-formats.html.
+- Try playing your content in the ExoPlayer demo app. Information about the
+  ExoPlayer demo app can be found here:
+  http://google.github.io/ExoPlayer/demo-application.html.
+
+When reporting a content issue:
+-----------------------------
+Fill out the sections below, leaving the headers but replacing the content. If
+you're unable to provide certain information, please explain why in the relevant
+section. We may close issues if they do not include sufficient information.
+
+### [REQUIRED] Content description
+Describe the content and any specifics you expected to play but did not. This
+could be the container or sample format itself or any features the stream has
+and you expect to play, like 5.1 audio track, text tracks or drm systems.
+
+### [REQUIRED] Link to test content
+Provide a JSON snippet for the demo app’s media.exolist.json file, or a link to
+media that reproduces the issue. If you don't wish to post it publicly, please
+submit the issue, then email the link to dev.exoplayer@gmail.com using a subject
+in the format "Issue #1234". Provide all the metadata we'd need to play the
+content like drm license urls or similar. If the content is accessible only in
+certain countries or regions, please say so.
+
+### [REQUIRED] Version of ExoPlayer being used
+Specify the absolute version number. Avoid using terms such as "latest".
+
+### [REQUIRED] Device(s) and version(s) of Android being used
+Specify the devices and versions of Android on which you expect the content to
+play. If possible, please test on multiple devices and Android versions.
+
+
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..17a07ef39b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,31 @@
+---
+name: Feature request
+about: Issue template for a feature request.
+title: ''
+labels: enhancement, 'needs triage'
+assignees: ''
+---
+
+Before filing a feature request:
+-----------------------
+- Search existing open issues, specifically with the label ‘enhancement’.
+- Search existing pull requests.
+
+When filing a feature request:
+-----------------------
+Fill out the sections below, leaving the headers but replacing the content. If
+you're unable to provide certain information, please explain why in the relevant
+section. We may close issues if they do not include sufficient information.
+
+### [REQUIRED] Use case description
+Describe the use case or problem you are trying to solve in detail. If there are
+any standards or specifications involved, please provide the relevant details.
+
+### Proposed solution
+A clear and concise description of your proposed solution, if you have one.
+
+### Alternatives considered
+A clear and concise description of any alternative solutions you considered,
+if applicable.
+
+
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 0000000000..9d0ddfe4a1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,31 @@
+---
+name: Question
+about: Issue template for a question.
+title: ''
+labels: question, 'needs triage'
+assignees: ''
+---
+
+Before filing a question:
+-----------------------
+- This issue tracker is intended ExoPlayer specific questions. If you're asking
+  a general Android development question, please do so on Stack Overflow.
+- Search existing issues, including issues that are closed. It’s often the
+  quickest way to get an answer!
+- Consult our FAQs, developer guide and the class reference of ExoPlayer. These
+  can be found at https://google.github.io/ExoPlayer/.
+
+When filing a question:
+-----------------------
+Fill out the sections below, leaving the headers but replacing the content. If
+you're unable to provide certain information, please explain why in the relevant
+section. We may close issues if they do not include sufficient information.
+
+### [REQUIRED] Searched documentation and issues
+Tell us where you’ve already looked for an answer to your question. It’s
+important for us to know this so that we can improve our documentation.
+
+### [REQUIRED] Question
+Describe your question in detail.
+
+

From 2685b8bd9029ae5b02e12db288300d5ce6d5edb0 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 19 Feb 2019 21:28:40 +0000
Subject: [PATCH 566/832] Support multiple instances of database features

- Use Cache UID for CacheContentIndex and CacheFileMetadataIndex. This
  enables SD card swapping for a single device.
- I'm hopeful of finding a way to get the Cache UID to DefaultDownloadIndex
  so we can do the same there.

PiperOrigin-RevId: 234662753
---
 .../exoplayer2/database/VersionTable.java     | 49 +++++++----
 .../offline/DefaultDownloadIndex.java         |  8 +-
 .../cache/CacheFileMetadataIndex.java         | 81 +++++++++----------
 .../upstream/cache/CachedContentIndex.java    | 75 +++++++++++------
 .../upstream/cache/SimpleCache.java           | 12 +--
 .../exoplayer2/database/VersionTableTest.java | 71 +++++++++-------
 .../offline/DefaultDownloadIndexTest.java     | 13 ++-
 .../cache/CachedContentIndexTest.java         |  6 +-
 8 files changed, 188 insertions(+), 127 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java b/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
index c01e16e03a..e0a4210136 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
@@ -31,7 +31,7 @@ import java.lang.annotation.RetentionPolicy;
  */
 public final class VersionTable {
 
-  /** Returned by {@link #getVersion(SQLiteDatabase, int)} if the version is unset. */
+  /** Returned by {@link #getVersion(SQLiteDatabase, int, String)} if the version is unset. */
   public static final int VERSION_UNSET = -1;
   /** Version of tables used for offline functionality. */
   public static final int FEATURE_OFFLINE = 0;
@@ -43,18 +43,26 @@ public final class VersionTable {
   private static final String TABLE_NAME = DatabaseProvider.TABLE_PREFIX + "Versions";
 
   private static final String COLUMN_FEATURE = "feature";
+  private static final String COLUMN_INSTANCE_UID = "instance_uid";
   private static final String COLUMN_VERSION = "version";
 
-  private static final String WHERE_FEATURE_EQUALS = COLUMN_FEATURE + " = ?";
+  private static final String WHERE_FEATURE_AND_INSTANCE_UID_EQUALS =
+      COLUMN_FEATURE + " = ? AND " + COLUMN_INSTANCE_UID + " = ?";
 
+  private static final String PRIMARY_KEY =
+      "PRIMARY KEY (" + COLUMN_FEATURE + ", " + COLUMN_INSTANCE_UID + ")";
   private static final String SQL_CREATE_TABLE_IF_NOT_EXISTS =
       "CREATE TABLE IF NOT EXISTS "
           + TABLE_NAME
           + " ("
           + COLUMN_FEATURE
-          + " INTEGER PRIMARY KEY NOT NULL,"
+          + " INTEGER NOT NULL,"
+          + COLUMN_INSTANCE_UID
+          + " TEXT NOT NULL,"
           + COLUMN_VERSION
-          + " INTEGER NOT NULL)";
+          + " INTEGER NOT NULL,"
+          + PRIMARY_KEY
+          + ")";
 
   @Documented
   @Retention(RetentionPolicy.SOURCE)
@@ -64,42 +72,51 @@ public final class VersionTable {
   private VersionTable() {}
 
   /**
-   * Sets the version of the specified feature.
+   * Sets the version of a specified instance of a specified feature.
    *
    * @param writableDatabase The database to update.
    * @param feature The feature.
+   * @param instanceUid The unique identifier of the instance of the feature.
    * @param version The version.
    */
   public static void setVersion(
-      SQLiteDatabase writableDatabase, @Feature int feature, int version) {
+      SQLiteDatabase writableDatabase, @Feature int feature, String instanceUid, int version) {
     writableDatabase.execSQL(SQL_CREATE_TABLE_IF_NOT_EXISTS);
     ContentValues values = new ContentValues();
     values.put(COLUMN_FEATURE, feature);
+    values.put(COLUMN_INSTANCE_UID, instanceUid);
     values.put(COLUMN_VERSION, version);
     writableDatabase.replace(TABLE_NAME, /* nullColumnHack= */ null, values);
   }
 
   /**
-   * Removes the version of the specified feature.
+   * Removes the version of a specified instance of a feature.
    *
    * @param writableDatabase The database to update.
    * @param feature The feature.
+   * @param instanceUid The unique identifier of the instance of the feature.
    */
-  public static void removeVersion(SQLiteDatabase writableDatabase, @Feature int feature) {
+  public static void removeVersion(
+      SQLiteDatabase writableDatabase, @Feature int feature, String instanceUid) {
     if (!tableExists(writableDatabase, TABLE_NAME)) {
       return;
     }
-    writableDatabase.delete(TABLE_NAME, WHERE_FEATURE_EQUALS, featureArgument(feature));
+    writableDatabase.delete(
+        TABLE_NAME,
+        WHERE_FEATURE_AND_INSTANCE_UID_EQUALS,
+        featureAndInstanceUidArguments(feature, instanceUid));
   }
 
   /**
-   * Returns the version of the specified feature, or {@link #VERSION_UNSET} if no version
-   * information is available.
+   * Returns the version of a specified instance of a feature, or {@link #VERSION_UNSET} if no
+   * version is set.
    *
    * @param database The database to query.
    * @param feature The feature.
+   * @param instanceUid The unique identifier of the instance of the feature.
+   * @return The version, or {@link #VERSION_UNSET} if no version is set.
    */
-  public static int getVersion(SQLiteDatabase database, @Feature int feature) {
+  public static int getVersion(SQLiteDatabase database, @Feature int feature, String instanceUid) {
     if (!tableExists(database, TABLE_NAME)) {
       return VERSION_UNSET;
     }
@@ -107,8 +124,8 @@ public final class VersionTable {
         database.query(
             TABLE_NAME,
             new String[] {COLUMN_VERSION},
-            WHERE_FEATURE_EQUALS,
-            featureArgument(feature),
+            WHERE_FEATURE_AND_INSTANCE_UID_EQUALS,
+            featureAndInstanceUidArguments(feature, instanceUid),
             /* groupBy= */ null,
             /* having= */ null,
             /* orderBy= */ null)) {
@@ -128,7 +145,7 @@ public final class VersionTable {
     return count > 0;
   }
 
-  private static String[] featureArgument(int feature) {
-    return new String[] {Integer.toString(feature)};
+  private static String[] featureAndInstanceUidArguments(int feature, String instance) {
+    return new String[] {Integer.toString(feature), instance};
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
index a6dd4131d3..f224258495 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -37,6 +37,8 @@ public final class DefaultDownloadIndex implements DownloadIndex {
   @VisibleForTesting
   /* package */ static final String TABLE_NAME = DatabaseProvider.TABLE_PREFIX + "Downloads";
 
+  // TODO: Support multiple instances. Probably using the underlying cache UID.
+  @VisibleForTesting /* package */ static final String INSTANCE_UID = "singleton";
   @VisibleForTesting /* package */ static final int TABLE_VERSION = 1;
 
   private static final String COLUMN_ID = "id";
@@ -218,12 +220,14 @@ public final class DefaultDownloadIndex implements DownloadIndex {
       return;
     }
     SQLiteDatabase readableDatabase = databaseProvider.getReadableDatabase();
-    int version = VersionTable.getVersion(readableDatabase, VersionTable.FEATURE_OFFLINE);
+    int version =
+        VersionTable.getVersion(readableDatabase, VersionTable.FEATURE_OFFLINE, INSTANCE_UID);
     if (version == VersionTable.VERSION_UNSET || version > TABLE_VERSION) {
       SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
       writableDatabase.beginTransaction();
       try {
-        VersionTable.setVersion(writableDatabase, VersionTable.FEATURE_OFFLINE, TABLE_VERSION);
+        VersionTable.setVersion(
+            writableDatabase, VersionTable.FEATURE_OFFLINE, INSTANCE_UID, TABLE_VERSION);
         writableDatabase.execSQL(SQL_DROP_TABLE_IF_EXISTS);
         writableDatabase.execSQL(SQL_CREATE_TABLE);
         writableDatabase.setTransactionSuccessful();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
index 96213b4bbc..a370311939 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
@@ -20,14 +20,16 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import com.google.android.exoplayer2.database.DatabaseProvider;
 import com.google.android.exoplayer2.database.VersionTable;
+import com.google.android.exoplayer2.util.Assertions;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 /** Maintains an index of cache file metadata. */
 /* package */ final class CacheFileMetadataIndex {
 
-  private static final String TABLE_NAME = DatabaseProvider.TABLE_PREFIX + "CacheFileMetadata";
+  private static final String TABLE_PREFIX = DatabaseProvider.TABLE_PREFIX + "CacheFileMetadata";
   private static final int TABLE_VERSION = 1;
 
   private static final String COLUMN_NAME = "name";
@@ -44,12 +46,8 @@ import java.util.Set;
       new String[] {
         COLUMN_NAME, COLUMN_LENGTH, COLUMN_LAST_ACCESS_TIMESTAMP,
       };
-
-  private static final String SQL_DROP_TABLE_IF_EXISTS = "DROP TABLE IF EXISTS " + TABLE_NAME;
-  private static final String SQL_CREATE_TABLE =
-      "CREATE TABLE "
-          + TABLE_NAME
-          + " ("
+  private static final String TABLE_SCHEMA =
+      "("
           + COLUMN_NAME
           + " TEXT PRIMARY KEY NOT NULL,"
           + COLUMN_LENGTH
@@ -59,18 +57,42 @@ import java.util.Set;
 
   private final DatabaseProvider databaseProvider;
 
-  private boolean initialized;
+  @MonotonicNonNull private String tableName;
 
   public CacheFileMetadataIndex(DatabaseProvider databaseProvider) {
     this.databaseProvider = databaseProvider;
   }
 
+  /** Initializes the index for the given cache UID. */
+  public void initialize(long uid) {
+    String hexUid = Long.toHexString(uid);
+    tableName = TABLE_PREFIX + hexUid;
+    SQLiteDatabase readableDatabase = databaseProvider.getReadableDatabase();
+    int version =
+        VersionTable.getVersion(readableDatabase, VersionTable.FEATURE_CACHE_FILE_METADATA, hexUid);
+    if (version == VersionTable.VERSION_UNSET || version > TABLE_VERSION) {
+      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+      writableDatabase.beginTransaction();
+      try {
+        VersionTable.setVersion(
+            writableDatabase, VersionTable.FEATURE_CACHE_FILE_METADATA, hexUid, TABLE_VERSION);
+        writableDatabase.execSQL("DROP TABLE IF EXISTS " + tableName);
+        writableDatabase.execSQL("CREATE TABLE " + tableName + " " + TABLE_SCHEMA);
+        writableDatabase.setTransactionSuccessful();
+      } finally {
+        writableDatabase.endTransaction();
+      }
+    } else if (version < TABLE_VERSION) {
+      // There is no previous version currently.
+      throw new IllegalStateException();
+    }
+  }
+
   /**
    * Returns all file metadata keyed by file name. The returned map is mutable and may be modified
    * by the caller.
    */
   public Map<String, CacheFileMetadata> getAll() {
-    ensureInitialized();
     try (Cursor cursor = getCursor()) {
       Map<String, CacheFileMetadata> fileMetadata = new HashMap<>(cursor.getCount());
       while (cursor.moveToNext()) {
@@ -91,13 +113,13 @@ import java.util.Set;
    * @param lastAccessTimestamp The file last access timestamp.
    */
   public void set(String name, long length, long lastAccessTimestamp) {
-    ensureInitialized();
+    Assertions.checkNotNull(tableName);
     SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
     ContentValues values = new ContentValues();
     values.put(COLUMN_NAME, name);
     values.put(COLUMN_LENGTH, length);
     values.put(COLUMN_LAST_ACCESS_TIMESTAMP, lastAccessTimestamp);
-    writableDatabase.replace(TABLE_NAME, /* nullColumnHack= */ null, values);
+    writableDatabase.replace(tableName, /* nullColumnHack= */ null, values);
   }
 
   /**
@@ -106,9 +128,9 @@ import java.util.Set;
    * @param name The name of the file whose metadata is to be removed.
    */
   public void remove(String name) {
-    ensureInitialized();
+    Assertions.checkNotNull(tableName);
     SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
-    writableDatabase.delete(TABLE_NAME, WHERE_NAME_EQUALS, new String[] {name});
+    writableDatabase.delete(tableName, WHERE_NAME_EQUALS, new String[] {name});
   }
 
   /**
@@ -117,12 +139,12 @@ import java.util.Set;
    * @param names The names of the files whose metadata is to be removed.
    */
   public void removeAll(Set<String> names) {
-    ensureInitialized();
+    Assertions.checkNotNull(tableName);
     SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
     writableDatabase.beginTransaction();
     try {
       for (String name : names) {
-        writableDatabase.delete(TABLE_NAME, WHERE_NAME_EQUALS, new String[] {name});
+        writableDatabase.delete(tableName, WHERE_NAME_EQUALS, new String[] {name});
       }
       writableDatabase.setTransactionSuccessful();
     } finally {
@@ -130,37 +152,12 @@ import java.util.Set;
     }
   }
 
-  private void ensureInitialized() {
-    if (initialized) {
-      return;
-    }
-    SQLiteDatabase readableDatabase = databaseProvider.getReadableDatabase();
-    int version =
-        VersionTable.getVersion(readableDatabase, VersionTable.FEATURE_CACHE_FILE_METADATA);
-    if (version == VersionTable.VERSION_UNSET || version > TABLE_VERSION) {
-      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
-      writableDatabase.beginTransaction();
-      try {
-        VersionTable.setVersion(
-            writableDatabase, VersionTable.FEATURE_CACHE_FILE_METADATA, TABLE_VERSION);
-        writableDatabase.execSQL(SQL_DROP_TABLE_IF_EXISTS);
-        writableDatabase.execSQL(SQL_CREATE_TABLE);
-        writableDatabase.setTransactionSuccessful();
-      } finally {
-        writableDatabase.endTransaction();
-      }
-    } else if (version < TABLE_VERSION) {
-      // There is no previous version currently.
-      throw new IllegalStateException();
-    }
-    initialized = true;
-  }
-
   private Cursor getCursor() {
+    Assertions.checkNotNull(tableName);
     return databaseProvider
         .getReadableDatabase()
         .query(
-            TABLE_NAME,
+            tableName,
             COLUMNS,
             /* selection */ null,
             /* selectionArgs= */ null,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
index 3bfed74bf0..6670cee90e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
@@ -159,8 +159,16 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     }
   }
 
-  /** Loads the index file. */
-  public void load() {
+  /**
+   * Loads the index file for the given cache UID.
+   *
+   * @param uid The UID of the cache whose index is to be loaded.
+   */
+  public void initialize(long uid) {
+    storage.initialize(uid);
+    if (previousStorage != null) {
+      previousStorage.initialize(uid);
+    }
     if (!storage.exists() && previousStorage != null && previousStorage.exists()) {
       // Copy from previous storage into current storage.
       loadFrom(previousStorage);
@@ -383,6 +391,9 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   /** Interface for the persistent index. */
   private interface Storage {
 
+    /** Initializes the storage for the given cache UID. */
+    void initialize(long uid);
+
     /** Returns whether the persisted index exists. */
     boolean exists();
 
@@ -409,9 +420,9 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     void storeFully(HashMap<String, CachedContent> content) throws CacheException;
 
     /**
-     * Ensures incremental changes to the index since the last {@link #load()} or {@link
-     * #storeFully(HashMap)} are persisted. The storage will have been notified of all such changes
-     * via {@link #onUpdate(CachedContent)} and {@link #onRemove(CachedContent)}.
+     * Ensures incremental changes to the index since the initial {@link #initialize(long)} or last
+     * {@link #storeFully(HashMap)} are persisted. The storage will have been notified of all such
+     * changes via {@link #onUpdate(CachedContent)} and {@link #onRemove(CachedContent)}.
      *
      * @param content The key to content map to persist.
      * @throws CacheException If an error occurs persisting the index.
@@ -457,7 +468,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
           throw new IllegalStateException(e); // Should never happen.
         }
       } else {
-        Assertions.checkState(!encrypt);
+        Assertions.checkArgument(!encrypt);
       }
       this.encrypt = encrypt;
       this.cipher = cipher;
@@ -466,6 +477,11 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
       atomicFile = new AtomicFile(file);
     }
 
+    @Override
+    public void initialize(long uid) {
+      // Do nothing. Legacy storage uses a separate file for each cache.
+    }
+
     @Override
     public boolean exists() {
       return atomicFile.exists();
@@ -665,7 +681,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   /** {@link Storage} implementation that uses an SQL database. */
   private static final class DatabaseStorage implements Storage {
 
-    private static final String TABLE_NAME = DatabaseProvider.TABLE_PREFIX + "CacheContentMetadata";
+    private static final String TABLE_PREFIX = DatabaseProvider.TABLE_PREFIX + "CacheIndex";
     private static final int TABLE_VERSION = 1;
 
     private static final String COLUMN_ID = "id";
@@ -679,12 +695,8 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     private static final String WHERE_ID_EQUALS = COLUMN_ID + " = ?";
 
     private static final String[] COLUMNS = new String[] {COLUMN_ID, COLUMN_KEY, COLUMN_METADATA};
-
-    private static final String SQL_DROP_TABLE_IF_EXISTS = "DROP TABLE IF EXISTS " + TABLE_NAME;
-    private static final String SQL_CREATE_TABLE =
-        "CREATE TABLE "
-            + TABLE_NAME
-            + " ("
+    private static final String TABLE_SCHEMA =
+        "("
             + COLUMN_ID
             + " INTEGER PRIMARY KEY NOT NULL,"
             + COLUMN_KEY
@@ -695,15 +707,26 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     private final DatabaseProvider databaseProvider;
     private final SparseArray<CachedContent> pendingUpdates;
 
+    private String hexUid;
+    private String tableName;
+
     public DatabaseStorage(DatabaseProvider databaseProvider) {
       this.databaseProvider = databaseProvider;
       pendingUpdates = new SparseArray<>();
     }
 
+    @Override
+    public void initialize(long uid) {
+      hexUid = Long.toHexString(uid);
+      tableName = TABLE_PREFIX + hexUid;
+    }
+
     @Override
     public boolean exists() {
       return VersionTable.getVersion(
-              databaseProvider.getReadableDatabase(), VersionTable.FEATURE_CACHE_CONTENT_METADATA)
+              databaseProvider.getReadableDatabase(),
+              VersionTable.FEATURE_CACHE_CONTENT_METADATA,
+              hexUid)
           != VersionTable.VERSION_UNSET;
     }
 
@@ -712,8 +735,9 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
       SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
       writableDatabase.beginTransaction();
       try {
-        VersionTable.removeVersion(writableDatabase, VersionTable.FEATURE_CACHE_CONTENT_METADATA);
-        writableDatabase.execSQL(SQL_DROP_TABLE_IF_EXISTS);
+        VersionTable.removeVersion(
+            writableDatabase, VersionTable.FEATURE_CACHE_CONTENT_METADATA, hexUid);
+        dropTable(writableDatabase);
         writableDatabase.setTransactionSuccessful();
       } finally {
         writableDatabase.endTransaction();
@@ -728,7 +752,8 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
         int version =
             VersionTable.getVersion(
                 databaseProvider.getReadableDatabase(),
-                VersionTable.FEATURE_CACHE_CONTENT_METADATA);
+                VersionTable.FEATURE_CACHE_CONTENT_METADATA,
+                hexUid);
         if (version == VersionTable.VERSION_UNSET || version > TABLE_VERSION) {
           SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
           writableDatabase.beginTransaction();
@@ -821,7 +846,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
       return databaseProvider
           .getReadableDatabase()
           .query(
-              TABLE_NAME,
+              tableName,
               COLUMNS,
               /* selection= */ null,
               /* selectionArgs= */ null,
@@ -832,13 +857,17 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 
     private void initializeTable(SQLiteDatabase writableDatabase) {
       VersionTable.setVersion(
-          writableDatabase, VersionTable.FEATURE_CACHE_CONTENT_METADATA, TABLE_VERSION);
-      writableDatabase.execSQL(SQL_DROP_TABLE_IF_EXISTS);
-      writableDatabase.execSQL(SQL_CREATE_TABLE);
+          writableDatabase, VersionTable.FEATURE_CACHE_CONTENT_METADATA, hexUid, TABLE_VERSION);
+      dropTable(writableDatabase);
+      writableDatabase.execSQL("CREATE TABLE " + tableName + " " + TABLE_SCHEMA);
+    }
+
+    private void dropTable(SQLiteDatabase writableDatabase) {
+      writableDatabase.execSQL("DROP TABLE IF EXISTS " + tableName);
     }
 
     private void deleteRow(SQLiteDatabase writableDatabase, int key) {
-      writableDatabase.delete(TABLE_NAME, WHERE_ID_EQUALS, new String[] {Integer.toString(key)});
+      writableDatabase.delete(tableName, WHERE_ID_EQUALS, new String[] {Integer.toString(key)});
     }
 
     private void addOrUpdateRow(SQLiteDatabase writableDatabase, CachedContent cachedContent)
@@ -851,7 +880,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
       values.put(COLUMN_ID, cachedContent.id);
       values.put(COLUMN_KEY, cachedContent.key);
       values.put(COLUMN_METADATA, data);
-      writableDatabase.replace(TABLE_NAME, /* nullColumnHack= */ null, values);
+      writableDatabase.replace(tableName, /* nullColumnHack= */ null, values);
     }
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index 78e3b405d0..c8e05d21e5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -254,8 +254,8 @@ public final class SimpleCache implements Cache {
   }
 
   @Override
-  public synchronized @Nullable SimpleCacheSpan startReadWriteNonBlocking(String key, long position)
-      throws CacheException {
+  public synchronized @Nullable SimpleCacheSpan startReadWriteNonBlocking(
+      String key, long position) {
     Assertions.checkState(!released);
     SimpleCacheSpan span = getSpan(key, position);
 
@@ -290,7 +290,7 @@ public final class SimpleCache implements Cache {
   }
 
   @Override
-  public synchronized File startFile(String key, long position, long length) throws CacheException {
+  public synchronized File startFile(String key, long position, long length) {
     Assertions.checkState(!released);
     CachedContent cachedContent = contentIndex.get(key);
     Assertions.checkNotNull(cachedContent);
@@ -399,7 +399,7 @@ public final class SimpleCache implements Cache {
    * @param position The position of the span being requested.
    * @return The corresponding cache {@link SimpleCacheSpan}.
    */
-  private SimpleCacheSpan getSpan(String key, long position) throws CacheException {
+  private SimpleCacheSpan getSpan(String key, long position) {
     CachedContent cachedContent = contentIndex.get(key);
     if (cachedContent == null) {
       return SimpleCacheSpan.createOpenHole(key, position);
@@ -432,9 +432,9 @@ public final class SimpleCache implements Cache {
       // TODO: Decide how to handle this.
     }
 
-    // TODO: Pass the UID to the index, and use it.
-    contentIndex.load();
+    contentIndex.initialize(uid);
     if (fileIndex != null) {
+      fileIndex.initialize(uid);
       Map<String, CacheFileMetadata> fileMetadata = fileIndex.getAll();
       loadDirectory(cacheDir, /* isRoot= */ true, files, fileMetadata);
       fileIndex.removeAll(fileMetadata.keySet());
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java b/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java
index 2e17b25a45..c2d902ebb7 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java
@@ -15,77 +15,86 @@
  */
 package com.google.android.exoplayer2.database;
 
-import static com.google.android.exoplayer2.database.VersionTable.FEATURE_CACHE_CONTENT_METADATA;
-import static com.google.android.exoplayer2.database.VersionTable.FEATURE_OFFLINE;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.database.sqlite.SQLiteDatabase;
-import org.junit.After;
+import com.google.android.exoplayer2.testutil.TestUtil;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Unit tests for {@link VersionTable}. */
 @RunWith(RobolectricTestRunner.class)
 public class VersionTableTest {
 
-  private ExoDatabaseProvider databaseProvider;
-  private SQLiteDatabase readableDatabase;
-  private SQLiteDatabase writableDatabase;
+  private static final int FEATURE_1 = 1;
+  private static final int FEATURE_2 = 2;
+  private static final String INSTANCE_1 = "1";
+  private static final String INSTANCE_2 = "2";
+
+  private DatabaseProvider databaseProvider;
+  private SQLiteDatabase database;
 
   @Before
   public void setUp() {
-    databaseProvider = new ExoDatabaseProvider(RuntimeEnvironment.application);
-    readableDatabase = databaseProvider.getReadableDatabase();
-    writableDatabase = databaseProvider.getWritableDatabase();
-  }
-
-  @After
-  public void tearDown() {
-    databaseProvider.close();
+    databaseProvider = TestUtil.getTestDatabaseProvider();
+    database = databaseProvider.getWritableDatabase();
   }
 
   @Test
-  public void getVersion_nonExistingTable_returnsVersionUnset() {
-    int version = VersionTable.getVersion(readableDatabase, FEATURE_OFFLINE);
+  public void getVersion_unsetFeature_returnsVersionUnset() {
+    int version = VersionTable.getVersion(database, FEATURE_1, INSTANCE_1);
+    assertThat(version).isEqualTo(VersionTable.VERSION_UNSET);
+  }
+
+  @Test
+  public void getVersion_unsetVersion_returnsVersionUnset() {
+    VersionTable.setVersion(database, FEATURE_1, INSTANCE_1, 1);
+    int version = VersionTable.getVersion(database, FEATURE_1, INSTANCE_2);
     assertThat(version).isEqualTo(VersionTable.VERSION_UNSET);
   }
 
   @Test
   public void getVersion_returnsSetVersion() {
-    VersionTable.setVersion(writableDatabase, FEATURE_OFFLINE, 1);
-    assertThat(VersionTable.getVersion(readableDatabase, FEATURE_OFFLINE)).isEqualTo(1);
+    VersionTable.setVersion(database, FEATURE_1, INSTANCE_1, 1);
+    assertThat(VersionTable.getVersion(database, FEATURE_1, INSTANCE_1)).isEqualTo(1);
 
-    VersionTable.setVersion(writableDatabase, FEATURE_OFFLINE, 10);
-    assertThat(VersionTable.getVersion(readableDatabase, FEATURE_OFFLINE)).isEqualTo(10);
+    VersionTable.setVersion(database, FEATURE_1, INSTANCE_1, 2);
+    assertThat(VersionTable.getVersion(database, FEATURE_1, INSTANCE_1)).isEqualTo(2);
 
-    VersionTable.setVersion(writableDatabase, FEATURE_CACHE_CONTENT_METADATA, 5);
-    assertThat(VersionTable.getVersion(readableDatabase, FEATURE_CACHE_CONTENT_METADATA))
-        .isEqualTo(5);
-    assertThat(VersionTable.getVersion(readableDatabase, FEATURE_OFFLINE)).isEqualTo(10);
+    VersionTable.setVersion(database, FEATURE_2, INSTANCE_1, 3);
+    assertThat(VersionTable.getVersion(database, FEATURE_2, INSTANCE_1)).isEqualTo(3);
+    assertThat(VersionTable.getVersion(database, FEATURE_1, INSTANCE_1)).isEqualTo(2);
+
+    VersionTable.setVersion(database, FEATURE_2, INSTANCE_2, 4);
+    assertThat(VersionTable.getVersion(database, FEATURE_2, INSTANCE_2)).isEqualTo(4);
+    assertThat(VersionTable.getVersion(database, FEATURE_2, INSTANCE_1)).isEqualTo(3);
+    assertThat(VersionTable.getVersion(database, FEATURE_1, INSTANCE_1)).isEqualTo(2);
   }
 
   @Test
   public void removeVersion_removesSetVersion() {
-    VersionTable.setVersion(writableDatabase, FEATURE_OFFLINE, 1);
-    assertThat(VersionTable.getVersion(readableDatabase, FEATURE_OFFLINE)).isEqualTo(1);
+    VersionTable.setVersion(database, FEATURE_1, INSTANCE_1, 1);
+    VersionTable.setVersion(database, FEATURE_1, INSTANCE_2, 2);
+    assertThat(VersionTable.getVersion(database, FEATURE_1, INSTANCE_1)).isEqualTo(1);
+    assertThat(VersionTable.getVersion(database, FEATURE_1, INSTANCE_2)).isEqualTo(2);
 
-    VersionTable.removeVersion(writableDatabase, FEATURE_OFFLINE);
-    assertThat(VersionTable.getVersion(readableDatabase, FEATURE_OFFLINE))
+    VersionTable.removeVersion(database, FEATURE_1, INSTANCE_1);
+    assertThat(VersionTable.getVersion(database, FEATURE_1, INSTANCE_1))
         .isEqualTo(VersionTable.VERSION_UNSET);
+    assertThat(VersionTable.getVersion(database, FEATURE_1, INSTANCE_2)).isEqualTo(2);
   }
 
   @Test
   public void doesTableExist_nonExistingTable_returnsFalse() {
-    assertThat(VersionTable.tableExists(readableDatabase, "NonExistingTable")).isFalse();
+    assertThat(VersionTable.tableExists(database, "NonExistingTable")).isFalse();
   }
 
   @Test
   public void doesTableExist_existingTable_returnsTrue() {
     String table = "TestTable";
     databaseProvider.getWritableDatabase().execSQL("CREATE TABLE " + table + " (dummy INTEGER)");
-    assertThat(VersionTable.tableExists(readableDatabase, table)).isTrue();
+    assertThat(VersionTable.tableExists(database, table)).isTrue();
   }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
index 07254ef7f9..72ef80336b 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.offline;
 
+import static com.google.android.exoplayer2.offline.DefaultDownloadIndex.INSTANCE_UID;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.database.sqlite.SQLiteDatabase;
@@ -180,12 +181,14 @@ public class DefaultDownloadIndexTest {
   @Test
   public void putDownloadState_setsVersion() {
     SQLiteDatabase readableDatabase = databaseProvider.getReadableDatabase();
-    assertThat(VersionTable.getVersion(readableDatabase, VersionTable.FEATURE_OFFLINE))
+    assertThat(
+            VersionTable.getVersion(readableDatabase, VersionTable.FEATURE_OFFLINE, INSTANCE_UID))
         .isEqualTo(VersionTable.VERSION_UNSET);
 
     downloadIndex.putDownloadState(new DownloadStateBuilder("id1").build());
 
-    assertThat(VersionTable.getVersion(readableDatabase, VersionTable.FEATURE_OFFLINE))
+    assertThat(
+            VersionTable.getVersion(readableDatabase, VersionTable.FEATURE_OFFLINE, INSTANCE_UID))
         .isEqualTo(DefaultDownloadIndex.TABLE_VERSION);
   }
 
@@ -198,14 +201,16 @@ public class DefaultDownloadIndexTest {
     cursor.close();
 
     SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
-    VersionTable.setVersion(writableDatabase, VersionTable.FEATURE_OFFLINE, Integer.MAX_VALUE);
+    VersionTable.setVersion(
+        writableDatabase, VersionTable.FEATURE_OFFLINE, INSTANCE_UID, Integer.MAX_VALUE);
 
     downloadIndex = new DefaultDownloadIndex(databaseProvider);
 
     cursor = downloadIndex.getDownloadStates();
     assertThat(cursor.getCount()).isEqualTo(0);
     cursor.close();
-    assertThat(VersionTable.getVersion(writableDatabase, VersionTable.FEATURE_OFFLINE))
+    assertThat(
+            VersionTable.getVersion(writableDatabase, VersionTable.FEATURE_OFFLINE, INSTANCE_UID))
         .isEqualTo(DefaultDownloadIndex.TABLE_VERSION);
   }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
index 6433faa8d5..2b128314fe 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
@@ -160,7 +160,7 @@ public class CachedContentIndexTest {
     fos.write(testIndexV1File);
     fos.close();
 
-    index.load();
+    index.initialize(/* uid= */ 0);
     assertThat(index.getAll()).hasSize(2);
 
     assertThat(index.assignIdForKey("ABCDE")).isEqualTo(5);
@@ -181,7 +181,7 @@ public class CachedContentIndexTest {
     fos.write(testIndexV2File);
     fos.close();
 
-    index.load();
+    index.initialize(/* uid= */ 0);
     assertThat(index.getAll()).hasSize(2);
 
     assertThat(index.assignIdForKey("ABCDE")).isEqualTo(5);
@@ -325,7 +325,7 @@ public class CachedContentIndexTest {
     index.getOrAdd("ABCDE").applyMetadataMutations(mutations2);
     index.store();
 
-    index2.load();
+    index2.initialize(/* uid= */ 0);
     Set<String> keys = index.getKeys();
     Set<String> keys2 = index2.getKeys();
     assertThat(keys2).isEqualTo(keys);

From 16f41dbaab2262538f87c6213dd617e059c5bf1f Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 20 Feb 2019 10:49:26 +0000
Subject: [PATCH 567/832] Fix HlsSampleStream#read non-fatal lack of mapping

HlsSampleStream#read should return end of stream when
there is no mapping for the sample stream, instead of
nothing read. This allows the player to transition to
ended.

Issue:#5524
PiperOrigin-RevId: 234764027
---
 RELEASENOTES.md                                               | 2 ++
 .../google/android/exoplayer2/source/hls/HlsSampleStream.java | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 26db5c1c8b..69e8bc249e 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -76,6 +76,8 @@
 * DASH: Fix issue handling large `EventStream` presentation timestamps
   ([#5490](https://github.com/google/ExoPlayer/issues/5490)).
 * HLS:
+  * Fix transition to STATE_ENDED when playing fragmented mp4 in chunkless
+    preparation ([#5524](https://github.com/google/ExoPlayer/issues/5524)).
   * Prevent unnecessary reloads of initialization segments.
   * Support encrypted initialization segments
     ([#5441](https://github.com/google/ExoPlayer/issues/5441)).
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStream.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStream.java
index f43d119018..cf879e91c6 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStream.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStream.java
@@ -68,6 +68,10 @@ import java.io.IOException;
 
   @Override
   public int readData(FormatHolder formatHolder, DecoderInputBuffer buffer, boolean requireFormat) {
+    if (sampleQueueIndex == HlsSampleStreamWrapper.SAMPLE_QUEUE_INDEX_NO_MAPPING_NON_FATAL) {
+      buffer.addFlag(C.BUFFER_FLAG_END_OF_STREAM);
+      return C.RESULT_BUFFER_READ;
+    }
     return hasValidSampleQueueIndex()
         ? sampleStreamWrapper.readData(sampleQueueIndex, formatHolder, buffer, requireFormat)
         : C.RESULT_NOTHING_READ;

From 0d24098c7dd516c02b4970da03120ac402b51f7a Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 20 Feb 2019 11:03:46 +0000
Subject: [PATCH 568/832] Remove lates HLS changes from 2.9.6 release notes

PiperOrigin-RevId: 234765847
---
 RELEASENOTES.md | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 69e8bc249e..51544f5244 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -3,7 +3,10 @@
 ### dev-v2 (not yet released) ###
 
 * HLS:
+  * Prevent unnecessary reloads of initialization segments.
   * Form an adaptive track group out of audio renditions with matching name.
+  * Support encrypted initialization segments
+    ([#5441](https://github.com/google/ExoPlayer/issues/5441)).
 * `ExtractorMediaSource` renamed to `ProgressiveMediaSource`.
 * Support for playing spherical videos on Daydream.
 * Improve decoder re-use between playbacks. TODO: Write and link a blog post
@@ -75,12 +78,8 @@
     possible for ad loading SDKs to calculate ad viewability accurately.
 * DASH: Fix issue handling large `EventStream` presentation timestamps
   ([#5490](https://github.com/google/ExoPlayer/issues/5490)).
-* HLS:
-  * Fix transition to STATE_ENDED when playing fragmented mp4 in chunkless
-    preparation ([#5524](https://github.com/google/ExoPlayer/issues/5524)).
-  * Prevent unnecessary reloads of initialization segments.
-  * Support encrypted initialization segments
-    ([#5441](https://github.com/google/ExoPlayer/issues/5441)).
+* HLS: Fix transition to STATE_ENDED when playing fragmented mp4 in chunkless
+  preparation ([#5524](https://github.com/google/ExoPlayer/issues/5524)).
 
 ### 2.9.5 ###
 

From e502672b89dc53ad90da570cf98f027442cd2c1b Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 20 Feb 2019 12:30:42 +0000
Subject: [PATCH 569/832] Encapsulate the key cache in HlsChunkSource

PiperOrigin-RevId: 234773649
---
 .../exoplayer2/source/hls/HlsChunkSource.java | 48 ++++++++++++-------
 .../exoplayer2/source/hls/HlsMediaChunk.java  | 14 ++----
 2 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
index 4a913961f4..b37433a618 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
@@ -36,12 +36,12 @@ import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DataSpec;
 import com.google.android.exoplayer2.upstream.TransferListener;
+import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.TimestampAdjuster;
 import com.google.android.exoplayer2.util.UriUtil;
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -314,13 +314,13 @@ import java.util.Map;
     HlsMediaPlaylist.Segment segment = mediaPlaylist.segments.get(segmentIndexInPlaylist);
 
     // Check if the segment or its initialization segment are fully encrypted.
-    out.chunk =
-        maybeCreateEncryptionChunkFor(
-            segment.initializationSegment, mediaPlaylist, selectedVariantIndex);
+    Uri initSegmentKeyUri = getFullEncryptionKeyUri(mediaPlaylist, segment.initializationSegment);
+    out.chunk = maybeCreateEncryptionChunkFor(initSegmentKeyUri, selectedVariantIndex);
     if (out.chunk != null) {
       return;
     }
-    out.chunk = maybeCreateEncryptionChunkFor(segment, mediaPlaylist, selectedVariantIndex);
+    Uri mediaSegmentKeyUri = getFullEncryptionKeyUri(mediaPlaylist, segment);
+    out.chunk = maybeCreateEncryptionChunkFor(mediaSegmentKeyUri, selectedVariantIndex);
     if (out.chunk != null) {
       return;
     }
@@ -339,7 +339,8 @@ import java.util.Map;
             isTimestampMaster,
             timestampAdjusterProvider,
             previous,
-            keyCache.asUnmodifiable());
+            /* mediaSegmentKey= */ keyCache.get(mediaSegmentKeyUri),
+            /* initSegmentKey= */ keyCache.get(initSegmentKeyUri));
   }
 
   /**
@@ -485,12 +486,11 @@ import java.util.Map;
             : (mediaPlaylist.getEndTimeUs() - playlistTracker.getInitialStartTimeUs());
   }
 
-  private Chunk maybeCreateEncryptionChunkFor(
-      @Nullable Segment segment, HlsMediaPlaylist mediaPlaylist, int selectedVariantIndex) {
-    if (segment == null || segment.fullSegmentEncryptionKeyUri == null) {
+  @Nullable
+  private Chunk maybeCreateEncryptionChunkFor(@Nullable Uri keyUri, int selectedVariantIndex) {
+    if (keyUri == null) {
       return null;
     }
-    Uri keyUri = UriUtil.resolveToUri(mediaPlaylist.baseUri, segment.fullSegmentEncryptionKeyUri);
     if (keyCache.containsKey(keyUri)) {
       // The key is present in the key cache. We re-insert it to prevent it from being evicted by
       // the following key addition. Note that removal of the key is necessary to affect the
@@ -508,6 +508,14 @@ import java.util.Map;
         scratchSpace);
   }
 
+  @Nullable
+  private static Uri getFullEncryptionKeyUri(HlsMediaPlaylist playlist, @Nullable Segment segment) {
+    if (segment == null || segment.fullSegmentEncryptionKeyUri == null) {
+      return null;
+    }
+    return UriUtil.resolveToUri(playlist.baseUri, segment.fullSegmentEncryptionKeyUri);
+  }
+
   // Private classes.
 
   /**
@@ -640,21 +648,27 @@ import java.util.Map;
    */
   private static final class FullSegmentEncryptionKeyCache extends LinkedHashMap<Uri, byte[]> {
 
-    private final Map<Uri, byte[]> unmodifiableView;
-
     public FullSegmentEncryptionKeyCache() {
       super(
           /* initialCapacity= */ KEY_CACHE_SIZE * 2, /* loadFactor= */ 1, /* accessOrder= */ false);
-      unmodifiableView = Collections.unmodifiableMap(this);
+    }
+
+    @Override
+    public byte[] get(Object keyUri) {
+      if (keyUri == null) {
+        return null;
+      }
+      return super.get(keyUri);
+    }
+
+    @Override
+    public byte[] put(Uri keyUri, byte[] key) {
+      return super.put(keyUri, Assertions.checkNotNull(key));
     }
 
     @Override
     protected boolean removeEldestEntry(Map.Entry<Uri, byte[]> entry) {
       return size() > KEY_CACHE_SIZE;
     }
-
-    public Map<Uri, byte[]> asUnmodifiable() {
-      return unmodifiableView;
-    }
   }
 }
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
index 7e24f193ec..d3f2e2c661 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
@@ -39,7 +39,6 @@ import java.io.EOFException;
 import java.io.IOException;
 import java.math.BigInteger;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -64,7 +63,9 @@ import java.util.concurrent.atomic.AtomicInteger;
    * @param timestampAdjusterProvider The provider from which to obtain the {@link
    *     TimestampAdjuster}.
    * @param previousChunk The {@link HlsMediaChunk} that preceded this one. May be null.
-   * @param keyCache A map from encryption key URI to the corresponding encryption key.
+   * @param mediaSegmentKey The media segment decryption key, if fully encrypted. Null otherwise.
+   * @param initSegmentKey The initialization segment decryption key, if fully encrypted. Null
+   *     otherwise.
    */
   public static HlsMediaChunk createInstance(
       HlsExtractorFactory extractorFactory,
@@ -79,7 +80,8 @@ import java.util.concurrent.atomic.AtomicInteger;
       boolean isMasterTimestampSource,
       TimestampAdjusterProvider timestampAdjusterProvider,
       @Nullable HlsMediaChunk previousChunk,
-      Map<Uri, byte[]> keyCache) {
+      @Nullable byte[] mediaSegmentKey,
+      @Nullable byte[] initSegmentKey) {
     // Media segment.
     HlsMediaPlaylist.Segment mediaSegment = mediaPlaylist.segments.get(segmentIndexInPlaylist);
     DataSpec dataSpec =
@@ -88,9 +90,6 @@ import java.util.concurrent.atomic.AtomicInteger;
             mediaSegment.byterangeOffset,
             mediaSegment.byterangeLength,
             /* key= */ null);
-    byte[] mediaSegmentKey =
-        keyCache.get(
-            UriUtil.resolveToUri(mediaPlaylist.baseUri, mediaSegment.fullSegmentEncryptionKeyUri));
     boolean mediaSegmentEncrypted = mediaSegmentKey != null;
     byte[] mediaSegmentIv =
         mediaSegmentEncrypted ? getEncryptionIvArray(mediaSegment.encryptionIV) : null;
@@ -102,9 +101,6 @@ import java.util.concurrent.atomic.AtomicInteger;
     boolean initSegmentEncrypted = false;
     DataSource initDataSource = null;
     if (initSegment != null) {
-      byte[] initSegmentKey =
-          keyCache.get(
-              UriUtil.resolveToUri(mediaPlaylist.baseUri, initSegment.fullSegmentEncryptionKeyUri));
       initSegmentEncrypted = initSegmentKey != null;
       byte[] initSegmentIv =
           initSegmentEncrypted ? getEncryptionIvArray(initSegment.encryptionIV) : null;

From 1450b3713fc91d97333e2e8368840b19cee6f658 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 21 Feb 2019 03:32:57 +0000
Subject: [PATCH 570/832] Suppress warnings emitted by Checker Framework
 version 2.6.0

PiperOrigin-RevId: 234917536
---
 .../google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java | 2 ++
 .../java/com/google/android/exoplayer2/drm/DrmInitData.java  | 5 ++++-
 .../android/exoplayer2/metadata/id3/ChapterTocFrame.java     | 5 ++++-
 .../google/android/exoplayer2/metadata/id3/MlltFrame.java    | 5 ++++-
 .../google/android/exoplayer2/offline/DownloadHelper.java    | 2 ++
 .../exoplayer2/trackselection/DefaultTrackSelector.java      | 5 ++++-
 .../main/java/com/google/android/exoplayer2/util/Util.java   | 2 ++
 .../android/exoplayer2/ui/PlayerNotificationManager.java     | 2 ++
 8 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java
index 46cb423aa6..0462f39050 100644
--- a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java
+++ b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java
@@ -68,6 +68,8 @@ public abstract class GvrPlayerActivity extends GvrActivity {
     mainHandler = new Handler(Looper.getMainLooper());
   }
 
+  // TODO(b/124903498): Incompatible parameter type for savedInstanceState.
+  @SuppressWarnings("nullness:override.param.invalid")
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
index 7402396042..af2bd057b5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
@@ -136,7 +136,10 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
     Arrays.sort(this.schemeDatas, this);
   }
 
-  /* package */ DrmInitData(Parcel in) {
+  /* package */
+  // TODO(b/124903498): incompatible types in assignment.
+  @SuppressWarnings("nullness:assignment.type.incompatible")
+  DrmInitData(Parcel in) {
     schemeType = in.readString();
     schemeDatas = in.createTypedArray(SchemeData.CREATOR);
     schemeDataCount = schemeDatas.length;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java
index 98688ad098..2184e4f9ec 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java
@@ -45,7 +45,10 @@ public final class ChapterTocFrame extends Id3Frame {
     this.subFrames = subFrames;
   }
 
-  /* package */ ChapterTocFrame(Parcel in) {
+  /* package */
+  // TODO(b/124903498): incompatible types in assignment.
+  @SuppressWarnings("nullness:assignment.type.incompatible")
+  ChapterTocFrame(Parcel in) {
     super(ID);
     this.elementId = castNonNull(in.readString());
     this.isRoot = in.readByte() != 0;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java
index 7d0a1dba31..df41ce863f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java
@@ -44,7 +44,10 @@ public final class MlltFrame extends Id3Frame {
     this.millisecondsDeviations = millisecondsDeviations;
   }
 
-  /* package */ MlltFrame(Parcel in) {
+  /* package */
+  // TODO(b/124903498): incompatible types in assignment.
+  @SuppressWarnings("nullness:assignment.type.incompatible")
+  MlltFrame(Parcel in) {
     super(ID);
     this.mpegFramesBetweenReference = in.readInt();
     this.bytesBetweenReference = in.readInt();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index bc19b886a0..fe58323dad 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -363,6 +363,8 @@ public final class DownloadHelper {
    *     Looper}, in which case it will be called on the application's main thread.
    * @throws IllegalStateException If the download helper has already been prepared.
    */
+  // TODO(b/124903498): incompatible types in argument.
+  @SuppressWarnings("nullness:argument.type.incompatible")
   public void prepare(Callback callback) {
     Assertions.checkState(this.callback == null);
     this.callback = callback;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
index 601de5fe3e..aa122f3082 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -888,7 +888,10 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       this.rendererDisabledFlags = rendererDisabledFlags;
     }
 
-    /* package */ Parameters(Parcel in) {
+    /* package */
+    // TODO(b/124903498): incompatible types in assignment.
+    @SuppressWarnings("nullness:assignment.type.incompatible")
+    Parameters(Parcel in) {
       super(in);
       // Video
       this.maxVideoWidth = in.readInt();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
index 5a2732a05d..c0f83674e3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
@@ -162,6 +162,8 @@ public final class Util {
    * @param intent The intent to pass to the called method.
    * @return The result of the called method.
    */
+  // TODO(b/124903498): incompatible types in return.
+  @SuppressWarnings("nullness:return.type.incompatible")
   public static ComponentName startForegroundService(Context context, Intent intent) {
     if (Util.SDK_INT >= 26) {
       return context.startForegroundService(intent);
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
index 809c76f19a..cd232a21db 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
@@ -1265,6 +1265,8 @@ public class PlayerNotificationManager {
 
   private class NotificationBroadcastReceiver extends BroadcastReceiver {
 
+    // TODO(b/124903498): incompatible types in argument.
+    @SuppressWarnings("nullness:argument.type.incompatible")
     @Override
     public void onReceive(Context context, Intent intent) {
       Player player = PlayerNotificationManager.this.player;

From 253ea78679376bed4c29cfde04d05feab6a62d21 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 21 Feb 2019 11:08:11 +0000
Subject: [PATCH 571/832] Register the overlay view as non-obstructing

Currently IMA determines that the overlay is obstructing, even
if it's empty. Register it as friendly, which means we're
assuming that anything the apps puts in it is necessary for
playback.

PiperOrigin-RevId: 234963065
---
 .../com/google/android/exoplayer2/ui/PlayerView.java   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
index fcd281f312..93461c1b24 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
@@ -70,6 +70,7 @@ import com.google.android.exoplayer2.video.VideoListener;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -1116,7 +1117,14 @@ public class PlayerView extends FrameLayout implements AdsLoader.AdViewProvider
 
   @Override
   public View[] getAdOverlayViews() {
-    return controller != null ? new View[] {controller} : new View[0];
+    ArrayList<View> overlayViews = new ArrayList<>();
+    if (overlayFrameLayout != null) {
+      overlayViews.add(overlayFrameLayout);
+    }
+    if (controller != null) {
+      overlayViews.add(controller);
+    }
+    return overlayViews.toArray(new View[0]);
   }
 
   // Internal methods.

From 6b4c48a329efc7838ac57591b34d68abac4dd72a Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 21 Feb 2019 11:48:00 +0000
Subject: [PATCH 572/832] Replace initLoadCompleted with initDataLoadRequired

PiperOrigin-RevId: 234966936
---
 .../android/exoplayer2/source/hls/HlsMediaChunk.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
index d3f2e2c661..419d11cba1 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
@@ -205,7 +205,7 @@ import java.util.concurrent.atomic.AtomicInteger;
   private HlsSampleStreamWrapper output;
   private int initSegmentBytesLoaded;
   private int nextLoadPosition;
-  private boolean initLoadCompleted;
+  private boolean initDataLoadRequired;
   private volatile boolean loadCanceled;
   private boolean loadCompleted;
 
@@ -258,6 +258,7 @@ import java.util.concurrent.atomic.AtomicInteger;
     this.id3Decoder = id3Decoder;
     this.scratchId3Data = scratchId3Data;
     this.shouldSpliceIn = shouldSpliceIn;
+    initDataLoadRequired = initDataSpec != null;
     uid = uidSource.getAndIncrement();
   }
 
@@ -288,7 +289,7 @@ import java.util.concurrent.atomic.AtomicInteger;
     if (extractor == null && previousExtractor != null) {
       extractor = previousExtractor;
       isExtractorReusable = true;
-      initLoadCompleted = initDataSpec != null;
+      initDataLoadRequired = false;
       output.init(uid, shouldSpliceIn, /* reusingExtractor= */ true);
     }
     maybeLoadInitData();
@@ -303,8 +304,7 @@ import java.util.concurrent.atomic.AtomicInteger;
   // Internal methods.
 
   private void maybeLoadInitData() throws IOException, InterruptedException {
-    if (initLoadCompleted || initDataSpec == null) {
-      // Note: The HLS spec forbids initialization segments for packed audio.
+    if (!initDataLoadRequired) {
       return;
     }
     DataSpec initSegmentDataSpec;
@@ -332,7 +332,7 @@ import java.util.concurrent.atomic.AtomicInteger;
     } finally {
       Util.closeQuietly(initDataSource);
     }
-    initLoadCompleted = true;
+    initDataLoadRequired = false;
   }
 
   private void loadMedia() throws IOException, InterruptedException {

From 8746d4a885851e5740ff3ba6bd43908f40764a7c Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 21 Feb 2019 11:51:45 +0000
Subject: [PATCH 573/832] Automated g4 rollback of changelist 230206675.

*** Reason for rollback ***

Reverting as this may break playback on other Amlogic devices and/or playback of non-interlaced content.

*** Original change description ***

Add max video size workaround for Amlogic decoder.

The Amlogic awesome decoder reduces the video size of interlaced videos by half
if the internal configuration isn't force reset with new maximum input size
values. The product of these new values must exceed 1920x1088 to force the
reset.

Issue:#5003

***

PiperOrigin-RevId: 234967314
---
 RELEASENOTES.md                                  |  3 +++
 .../video/MediaCodecVideoRenderer.java           | 16 ----------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 51544f5244..43a4f7d1c4 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -80,6 +80,9 @@
   ([#5490](https://github.com/google/ExoPlayer/issues/5490)).
 * HLS: Fix transition to STATE_ENDED when playing fragmented mp4 in chunkless
   preparation ([#5524](https://github.com/google/ExoPlayer/issues/5524)).
+* Revert workaround for video quality problems with Amlogic decoders, as this
+  may cause problems for some devices and/or non-interlaced content
+  ([#5003](https://github.com/google/ExoPlayer/issues/5003)).
 
 ### 2.9.5 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index f0d944e5a1..9c16fa6380 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -1105,10 +1105,6 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
       throws DecoderQueryException {
     int maxWidth = format.width;
     int maxHeight = format.height;
-    if (codecNeedsMaxVideoSizeResetWorkaround(codecInfo.name)) {
-      maxWidth = Math.max(maxWidth, 1920);
-      maxHeight = Math.max(maxHeight, 1089);
-    }
     int maxInputSize = getMaxInputSize(codecInfo, format);
     if (streamFormats.length == 1) {
       // The single entry in streamFormats must correspond to the format for which the codec is
@@ -1296,18 +1292,6 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
     return "NVIDIA".equals(Util.MANUFACTURER);
   }
 
-  /**
-   * Returns whether the codec is known to have problems with the configuration for interlaced
-   * content and needs minimum values for the maximum video size to force reset the configuration.
-   *
-   * <p>See https://github.com/google/ExoPlayer/issues/5003.
-   *
-   * @param name The name of the codec.
-   */
-  private static boolean codecNeedsMaxVideoSizeResetWorkaround(String name) {
-    return "OMX.amlogic.avc.decoder.awesome".equals(name) && Util.SDK_INT <= 25;
-  }
-
   /*
    * TODO:
    *

From 06ed877845dbe971fc92df94872520119e8a9543 Mon Sep 17 00:00:00 2001
From: Arnold Szabo <szaboaarnold@gmail.com>
Date: Wed, 27 Feb 2019 23:53:52 +0200
Subject: [PATCH 574/832] Pass role and accessibility descriptor values from
 adaptation set to format

---
 .../com/google/android/exoplayer2/Format.java | 68 ++++++++++++++++++-
 .../dash/manifest/DashManifestParser.java     | 44 +++++++++++-
 .../hls/playlist/HlsPlaylistParser.java       |  4 +-
 3 files changed, 111 insertions(+), 5 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Format.java b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
index 8778a4244b..3ed5a99f23 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Format.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
@@ -167,6 +167,16 @@ public final class Format implements Parcelable {
    */
   public final int accessibilityChannel;
 
+  /**
+   * The Role descriptor value.
+   */
+  public final String role;
+
+  /**
+   * The Accessibility descriptor value.
+   */
+  public final String accessibility;
+
   // Lazily initialized hashcode.
   private int hashCode;
 
@@ -234,6 +244,8 @@ public final class Format implements Parcelable {
         selectionFlags,
         /* language= */ null,
         /* accessibilityChannel= */ NO_VALUE,
+        /* role= */ null,
+        /* accessibility= */ null,
         OFFSET_SAMPLE_RELATIVE,
         initializationData,
         /* drmInitData= */ null,
@@ -337,6 +349,8 @@ public final class Format implements Parcelable {
         /* selectionFlags= */ 0,
         /* language= */ null,
         /* accessibilityChannel= */ NO_VALUE,
+        /* role= */ null,
+        /* accessibility= */ null,
         OFFSET_SAMPLE_RELATIVE,
         initializationData,
         drmInitData,
@@ -407,6 +421,8 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         /* accessibilityChannel= */ NO_VALUE,
+        /* role= */ null,
+        /* accessibility= */ null,
         OFFSET_SAMPLE_RELATIVE,
         initializationData,
         /* drmInitData= */ null,
@@ -511,6 +527,8 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         /* accessibilityChannel= */ NO_VALUE,
+        /* role= */ null,
+        /* accessibility= */ null,
         OFFSET_SAMPLE_RELATIVE,
         initializationData,
         drmInitData,
@@ -557,7 +575,9 @@ public final class Format implements Parcelable {
         bitrate,
         selectionFlags,
         language,
-        /* accessibilityChannel= */ NO_VALUE);
+        /* accessibilityChannel= */ NO_VALUE,
+        /* role= */ null,
+        /* accessibility= */ null);
   }
 
   public static Format createTextContainerFormat(
@@ -569,7 +589,9 @@ public final class Format implements Parcelable {
       int bitrate,
       @C.SelectionFlags int selectionFlags,
       @Nullable String language,
-      int accessibilityChannel) {
+      int accessibilityChannel,
+      @Nullable String role,
+      @Nullable String accessibility) {
     return new Format(
         id,
         label,
@@ -594,6 +616,8 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         accessibilityChannel,
+        role,
+        accessibility,
         OFFSET_SAMPLE_RELATIVE,
         /* initializationData= */ null,
         /* drmInitData= */ null,
@@ -706,6 +730,8 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         accessibilityChannel,
+        /* role= */ null,
+        /* accessibility= */ null,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -747,6 +773,8 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         /* accessibilityChannel= */ NO_VALUE,
+        /* role= */ null,
+        /* accessibility= */ null,
         OFFSET_SAMPLE_RELATIVE,
         initializationData,
         drmInitData,
@@ -808,6 +836,8 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         /* accessibilityChannel= */ NO_VALUE,
+        /* role= */ null,
+        /* accessibility= */ null,
         OFFSET_SAMPLE_RELATIVE,
         /* initializationData= */ null,
         /* drmInitData= */ null,
@@ -840,6 +870,8 @@ public final class Format implements Parcelable {
         /* selectionFlags= */ 0,
         /* language= */ null,
         /* accessibilityChannel= */ NO_VALUE,
+        /* role= */ null,
+        /* accessibility= */ null,
         subsampleOffsetUs,
         /* initializationData= */ null,
         /* drmInitData= */ null,
@@ -876,6 +908,8 @@ public final class Format implements Parcelable {
         /* selectionFlags= */ 0,
         /* language= */ null,
         /* accessibilityChannel= */ NO_VALUE,
+        /* role= */ null,
+        /* accessibility= */ null,
         OFFSET_SAMPLE_RELATIVE,
         /* initializationData= */ null,
         drmInitData,
@@ -906,6 +940,8 @@ public final class Format implements Parcelable {
       @C.SelectionFlags int selectionFlags,
       @Nullable String language,
       int accessibilityChannel,
+      @Nullable String role,
+      @Nullable String accessibility,
       long subsampleOffsetUs,
       @Nullable List<byte[]> initializationData,
       @Nullable DrmInitData drmInitData,
@@ -934,6 +970,8 @@ public final class Format implements Parcelable {
     this.selectionFlags = selectionFlags;
     this.language = Util.normalizeLanguageCode(language);
     this.accessibilityChannel = accessibilityChannel;
+    this.role = role;
+    this.accessibility = accessibility;
     this.subsampleOffsetUs = subsampleOffsetUs;
     this.initializationData =
         initializationData == null ? Collections.emptyList() : initializationData;
@@ -967,6 +1005,8 @@ public final class Format implements Parcelable {
     selectionFlags = in.readInt();
     language = in.readString();
     accessibilityChannel = in.readInt();
+    role = in.readString();
+    accessibility = in.readString();
     subsampleOffsetUs = in.readLong();
     int initializationDataSize = in.readInt();
     initializationData = new ArrayList<>(initializationDataSize);
@@ -1002,6 +1042,8 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         accessibilityChannel,
+        role,
+        accessibility,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1033,6 +1075,8 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         accessibilityChannel,
+        role,
+        accessibility,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1073,6 +1117,8 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         accessibilityChannel,
+        role,
+        accessibility,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1144,6 +1190,8 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         accessibilityChannel,
+        role,
+        accessibility,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1175,6 +1223,8 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         accessibilityChannel,
+        role,
+        accessibility,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1206,6 +1256,8 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         accessibilityChannel,
+        role,
+        accessibility,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1237,6 +1289,8 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         accessibilityChannel,
+        role,
+        accessibility,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1268,6 +1322,8 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         accessibilityChannel,
+        role,
+        accessibility,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1299,6 +1355,8 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         accessibilityChannel,
+        role,
+        accessibility,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1330,6 +1388,8 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         accessibilityChannel,
+        role,
+        accessibility,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1439,6 +1499,8 @@ public final class Format implements Parcelable {
         && Util.areEqual(label, other.label)
         && Util.areEqual(language, other.language)
         && accessibilityChannel == other.accessibilityChannel
+        && Util.areEqual(role, other.role)
+        && Util.areEqual(accessibility, other.accessibility)
         && Util.areEqual(containerMimeType, other.containerMimeType)
         && Util.areEqual(sampleMimeType, other.sampleMimeType)
         && Util.areEqual(codecs, other.codecs)
@@ -1540,6 +1602,8 @@ public final class Format implements Parcelable {
     dest.writeInt(selectionFlags);
     dest.writeString(language);
     dest.writeInt(accessibilityChannel);
+    dest.writeString(role);
+    dest.writeString(accessibility);
     dest.writeLong(subsampleOffsetUs);
     int initializationDataSize = initializationData.size();
     dest.writeInt(initializationDataSize);
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
index c0aa2a7819..41a460075e 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
@@ -276,6 +276,7 @@ public class DashManifestParser extends DefaultHandler
     ArrayList<SchemeData> drmSchemeDatas = new ArrayList<>();
     ArrayList<Descriptor> inbandEventStreams = new ArrayList<>();
     ArrayList<Descriptor> accessibilityDescriptors = new ArrayList<>();
+    ArrayList<Descriptor> roleDescriptors = new ArrayList<>();
     ArrayList<Descriptor> supplementalProperties = new ArrayList<>();
     List<RepresentationInfo> representationInfos = new ArrayList<>();
     @C.SelectionFlags int selectionFlags = 0;
@@ -300,7 +301,10 @@ public class DashManifestParser extends DefaultHandler
         language = checkLanguageConsistency(language, xpp.getAttributeValue(null, "lang"));
         contentType = checkContentTypeConsistency(contentType, parseContentType(xpp));
       } else if (XmlPullParserUtil.isStartTag(xpp, "Role")) {
-        selectionFlags |= parseRole(xpp);
+        Descriptor descriptor = parseDescriptor(xpp, "Role");
+        selectionFlags |= "urn:mpeg:dash:role:2011".equals(descriptor.schemeIdUri)
+                && "main".equals(descriptor.value) ? C.SELECTION_FLAG_DEFAULT : 0;
+        roleDescriptors.add(descriptor);
       } else if (XmlPullParserUtil.isStartTag(xpp, "AudioChannelConfiguration")) {
         audioChannels = parseAudioChannelConfiguration(xpp);
       } else if (XmlPullParserUtil.isStartTag(xpp, "Accessibility")) {
@@ -322,6 +326,7 @@ public class DashManifestParser extends DefaultHandler
                 audioSamplingRate,
                 language,
                 selectionFlags,
+                roleDescriptors,
                 accessibilityDescriptors,
                 segmentBase);
         contentType = checkContentTypeConsistency(contentType,
@@ -509,6 +514,7 @@ public class DashManifestParser extends DefaultHandler
       int adaptationSetAudioSamplingRate,
       String adaptationSetLanguage,
       @C.SelectionFlags int adaptationSetSelectionFlags,
+      List<Descriptor> adaptationSetRoleDescriptors,
       List<Descriptor> adaptationSetAccessibilityDescriptors,
       SegmentBase segmentBase)
       throws XmlPullParserException, IOException {
@@ -573,6 +579,7 @@ public class DashManifestParser extends DefaultHandler
             bandwidth,
             adaptationSetLanguage,
             adaptationSetSelectionFlags,
+            adaptationSetRoleDescriptors,
             adaptationSetAccessibilityDescriptors,
             codecs,
             supplementalProperties);
@@ -594,6 +601,7 @@ public class DashManifestParser extends DefaultHandler
       int bitrate,
       String language,
       @C.SelectionFlags int selectionFlags,
+      List<Descriptor> roleDescriptors,
       List<Descriptor> accessibilityDescriptors,
       String codecs,
       List<Descriptor> supplementalProperties) {
@@ -637,6 +645,10 @@ public class DashManifestParser extends DefaultHandler
         } else {
           accessibilityChannel = Format.NO_VALUE;
         }
+
+        String role = parseRole(roleDescriptors);
+        String accessibility = parseAccessibility(accessibilityDescriptors);
+
         return Format.createTextContainerFormat(
             id,
             label,
@@ -646,7 +658,9 @@ public class DashManifestParser extends DefaultHandler
             bitrate,
             selectionFlags,
             language,
-            accessibilityChannel);
+            accessibilityChannel,
+            role,
+            accessibility);
       }
     }
     return Format.createContainerFormat(
@@ -1266,6 +1280,32 @@ public class DashManifestParser extends DefaultHandler
     return MimeTypes.AUDIO_E_AC3;
   }
 
+  protected static String parseRole(List<Descriptor> roleDescriptors) {
+    for (int i = 0; i < roleDescriptors.size(); i++) {
+      Descriptor descriptor = roleDescriptors.get(i);
+      if ("urn:mpeg:dash:role:2011".equals(descriptor.schemeIdUri) && descriptor.value != null) {
+        return descriptor.value;
+      }
+    }
+    return null;
+  }
+
+  protected static String parseAccessibility(List<Descriptor> accessibilityDescriptors) {
+    for (int i = 0; i < accessibilityDescriptors.size(); i++) {
+      Descriptor descriptor = accessibilityDescriptors.get(i);
+      if ("urn:mpeg:dash:role:2011".equals(descriptor.schemeIdUri) && descriptor.value != null) {
+        return descriptor.value;
+      }
+
+      if ("urn:tva:metadata:cs:AudioPurposeCS:2007".equals(descriptor.schemeIdUri)) {
+        if ("1".equals(descriptor.value) || "2".equals(descriptor.value)) {
+          return descriptor.value;
+        }
+      }
+    }
+    return null;
+  }
+
   protected static float parseFrameRate(XmlPullParser xpp, float defaultValue) {
     float frameRate = defaultValue;
     String frameRateAttribute = xpp.getAttributeValue(null, "frameRate");
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
index 100323b862..e9fd1fb803 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
@@ -405,7 +405,9 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
                   /* bitrate= */ Format.NO_VALUE,
                   selectionFlags,
                   language,
-                  accessibilityChannel));
+                  accessibilityChannel,
+                  /* role= */ null,
+                  /* accessibility= */ null));
           break;
         default:
           // Do nothing.

From 43ea3880980b01a7740a51e3a223fea5b7af498b Mon Sep 17 00:00:00 2001
From: Arnold Szabo <szaboaarnold@gmail.com>
Date: Thu, 28 Feb 2019 00:11:04 +0200
Subject: [PATCH 575/832] Remove old parseRole method that looked only for main

---
 .../dash/manifest/DashManifestParser.java      | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
index 41a460075e..d7f02926cd 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
@@ -469,24 +469,6 @@ public class DashManifestParser extends DefaultHandler
     return Pair.create(schemeType, schemeData);
   }
 
-  /**
-   * Parses a Role element.
-   *
-   * @param xpp The parser from which to read.
-   * @throws XmlPullParserException If an error occurs parsing the element.
-   * @throws IOException If an error occurs reading the element.
-   * @return {@link C.SelectionFlags} parsed from the element.
-   */
-  protected int parseRole(XmlPullParser xpp) throws XmlPullParserException, IOException {
-    String schemeIdUri = parseString(xpp, "schemeIdUri", null);
-    String value = parseString(xpp, "value", null);
-    do {
-      xpp.next();
-    } while (!XmlPullParserUtil.isEndTag(xpp, "Role"));
-    return "urn:mpeg:dash:role:2011".equals(schemeIdUri) && "main".equals(value)
-        ? C.SELECTION_FLAG_DEFAULT : 0;
-  }
-
   /**
    * Parses children of AdaptationSet elements not specifically parsed elsewhere.
    *

From 58d746ecaa811d29f9bb52b1e4e232b3bc92ed07 Mon Sep 17 00:00:00 2001
From: Arnold Szabo <szaboaarnold@gmail.com>
Date: Sun, 3 Mar 2019 20:26:31 +0200
Subject: [PATCH 576/832] Add IntDef for role and accessibility descriptor's
 value, parse these also for video / audio tracks

---
 .../java/com/google/android/exoplayer2/C.java |  48 ++++++++
 .../com/google/android/exoplayer2/Format.java | 109 +++++++++--------
 .../dash/manifest/DashManifestParser.java     | 114 ++++++++++++------
 .../exoplayer2/source/hls/HlsMediaPeriod.java |   8 +-
 .../hls/playlist/HlsPlaylistParser.java       |  12 +-
 .../manifest/SsManifestParser.java            |   8 +-
 6 files changed, 206 insertions(+), 93 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/C.java b/library/core/src/main/java/com/google/android/exoplayer2/C.java
index 2eed9f03a9..19545fe0c3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/C.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/C.java
@@ -976,6 +976,54 @@ public final class C {
    */
   public static final int NETWORK_TYPE_OTHER = 8;
 
+  /**
+   * Adaptation set's role descriptor value (ISO 23009-1)
+   */
+  @Documented
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({
+    ROLE_UNSET,
+    ROLE_MAIN,
+    ROLE_ALTERNATE,
+    ROLE_SUPPLEMENTARY,
+    ROLE_COMMENTARY,
+    ROLE_DUB,
+    ROLE_EMERGENCY,
+    ROLE_CAPTION,
+    ROLE_SIGN
+  })
+  public @interface Role {}
+
+  public static final int ROLE_UNSET = -1;
+  public static final int ROLE_MAIN = 0;
+  public static final int ROLE_ALTERNATE = 1;
+  public static final int ROLE_SUPPLEMENTARY = 2;
+  public static final int ROLE_COMMENTARY = 3;
+  public static final int ROLE_DUB = 4;
+  public static final int ROLE_EMERGENCY = 5;
+  public static final int ROLE_CAPTION = 6;
+  public static final int ROLE_SIGN = 7;
+
+  /**
+   * Adaptation set's accessibility descriptor value (ISO 23009-1)
+   */
+  @Documented
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({
+    ACCESSIBILITY_UNSET,
+    ACCESSIBILITY_ENHANCED_AUDIO_INTELLIGIBILITY,
+    ACCESSIBILITY_DESCRIPTION,
+    ACCESSIBILITY_CAPTION,
+    ACCESSIBILITY_SIGN
+  })
+  public @interface Accessibility {}
+
+  public static final int ACCESSIBILITY_UNSET = -1;
+  public static final int ACCESSIBILITY_ENHANCED_AUDIO_INTELLIGIBILITY = 1;
+  public static final int ACCESSIBILITY_DESCRIPTION = 2;
+  public static final int ACCESSIBILITY_CAPTION = 3;
+  public static final int ACCESSIBILITY_SIGN = 4;
+
   /**
    * Converts a time in microseconds to the corresponding time in milliseconds, preserving
    * {@link #TIME_UNSET} and {@link #TIME_END_OF_SOURCE} values.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Format.java b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
index 3ed5a99f23..43ca19e444 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Format.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
@@ -48,7 +48,18 @@ public final class Format implements Parcelable {
   public final @Nullable String id;
   /** The human readable label, or null if unknown or not applicable. */
   public final @Nullable String label;
-
+  /** Track selection flags. **/
+  @C.SelectionFlags
+  public final int selectionFlags;
+  /** Track role descriptor value, or {@link C#ROLE_UNSET} if unknown or not applicable. **/
+  @C.Role
+  public final int role;
+  /**
+   * Track accessibility descriptor value, or {@link C#ACCESSIBILITY_UNSET} if unknown
+   * or not applicable.
+   */
+  @C.Accessibility
+  public final int accessibility;
   /**
    * The average bandwidth in bits per second, or {@link #NO_VALUE} if unknown or not applicable.
    */
@@ -153,12 +164,6 @@ public final class Format implements Parcelable {
 
   // Audio and text specific.
 
-  /**
-   * Track selection flags.
-   */
-  @C.SelectionFlags
-  public final int selectionFlags;
-
   /** The language as ISO 639-2/T three-letter code, or null if unknown or not applicable. */
   public final @Nullable String language;
 
@@ -167,16 +172,6 @@ public final class Format implements Parcelable {
    */
   public final int accessibilityChannel;
 
-  /**
-   * The Role descriptor value.
-   */
-  public final String role;
-
-  /**
-   * The Accessibility descriptor value.
-   */
-  public final String accessibility;
-
   // Lazily initialized hashcode.
   private int hashCode;
 
@@ -193,7 +188,9 @@ public final class Format implements Parcelable {
       int height,
       float frameRate,
       @Nullable List<byte[]> initializationData,
-      @C.SelectionFlags int selectionFlags) {
+      @C.SelectionFlags int selectionFlags,
+      @C.Role int role,
+      @C.Accessibility int accessibility) {
     return createVideoContainerFormat(
         id,
         /* label= */ null,
@@ -205,7 +202,9 @@ public final class Format implements Parcelable {
         height,
         frameRate,
         initializationData,
-        selectionFlags);
+        selectionFlags,
+        role,
+        accessibility);
   }
 
   public static Format createVideoContainerFormat(
@@ -219,7 +218,9 @@ public final class Format implements Parcelable {
       int height,
       float frameRate,
       @Nullable List<byte[]> initializationData,
-      @C.SelectionFlags int selectionFlags) {
+      @C.SelectionFlags int selectionFlags,
+      @C.Role int role,
+      @C.Accessibility int accessibility) {
     return new Format(
         id,
         label,
@@ -244,8 +245,8 @@ public final class Format implements Parcelable {
         selectionFlags,
         /* language= */ null,
         /* accessibilityChannel= */ NO_VALUE,
-        /* role= */ null,
-        /* accessibility= */ null,
+        role,
+        accessibility,
         OFFSET_SAMPLE_RELATIVE,
         initializationData,
         /* drmInitData= */ null,
@@ -349,8 +350,8 @@ public final class Format implements Parcelable {
         /* selectionFlags= */ 0,
         /* language= */ null,
         /* accessibilityChannel= */ NO_VALUE,
-        /* role= */ null,
-        /* accessibility= */ null,
+        /* role= */ C.ROLE_UNSET,
+        /* accessibility= */ C.ACCESSIBILITY_UNSET,
         OFFSET_SAMPLE_RELATIVE,
         initializationData,
         drmInitData,
@@ -370,7 +371,9 @@ public final class Format implements Parcelable {
       int sampleRate,
       @Nullable List<byte[]> initializationData,
       @C.SelectionFlags int selectionFlags,
-      @Nullable String language) {
+      @Nullable String language,
+      @C.Role int role,
+      @C.Accessibility int accessibility) {
     return createAudioContainerFormat(
         id,
         /* label= */ null,
@@ -382,7 +385,9 @@ public final class Format implements Parcelable {
         sampleRate,
         initializationData,
         selectionFlags,
-        language);
+        language,
+        role,
+        accessibility);
   }
 
   public static Format createAudioContainerFormat(
@@ -396,7 +401,9 @@ public final class Format implements Parcelable {
       int sampleRate,
       @Nullable List<byte[]> initializationData,
       @C.SelectionFlags int selectionFlags,
-      @Nullable String language) {
+      @Nullable String language,
+      @C.Role int role,
+      @C.Accessibility int accessibility) {
     return new Format(
         id,
         label,
@@ -421,8 +428,8 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         /* accessibilityChannel= */ NO_VALUE,
-        /* role= */ null,
-        /* accessibility= */ null,
+        role,
+        accessibility,
         OFFSET_SAMPLE_RELATIVE,
         initializationData,
         /* drmInitData= */ null,
@@ -527,8 +534,8 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         /* accessibilityChannel= */ NO_VALUE,
-        /* role= */ null,
-        /* accessibility= */ null,
+        /* role= */ C.ROLE_UNSET,
+        /* accessibility= */ C.ACCESSIBILITY_UNSET,
         OFFSET_SAMPLE_RELATIVE,
         initializationData,
         drmInitData,
@@ -576,8 +583,8 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         /* accessibilityChannel= */ NO_VALUE,
-        /* role= */ null,
-        /* accessibility= */ null);
+        /* role= */ C.ROLE_UNSET,
+        /* accessibility= */ C.ACCESSIBILITY_UNSET);
   }
 
   public static Format createTextContainerFormat(
@@ -590,8 +597,8 @@ public final class Format implements Parcelable {
       @C.SelectionFlags int selectionFlags,
       @Nullable String language,
       int accessibilityChannel,
-      @Nullable String role,
-      @Nullable String accessibility) {
+      @C.Role int role,
+      @C.Accessibility int accessibility) {
     return new Format(
         id,
         label,
@@ -730,8 +737,8 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         accessibilityChannel,
-        /* role= */ null,
-        /* accessibility= */ null,
+        /* role= */ C.ROLE_UNSET,
+        /* accessibility= */ C.ACCESSIBILITY_UNSET,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -773,8 +780,8 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         /* accessibilityChannel= */ NO_VALUE,
-        /* role= */ null,
-        /* accessibility= */ null,
+        /* role= */ C.ROLE_UNSET,
+        /* accessibility= */ C.ACCESSIBILITY_UNSET,
         OFFSET_SAMPLE_RELATIVE,
         initializationData,
         drmInitData,
@@ -836,8 +843,8 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         /* accessibilityChannel= */ NO_VALUE,
-        /* role= */ null,
-        /* accessibility= */ null,
+        /* role= */ C.ROLE_UNSET,
+        /* accessibility= */ C.ACCESSIBILITY_UNSET,
         OFFSET_SAMPLE_RELATIVE,
         /* initializationData= */ null,
         /* drmInitData= */ null,
@@ -870,8 +877,8 @@ public final class Format implements Parcelable {
         /* selectionFlags= */ 0,
         /* language= */ null,
         /* accessibilityChannel= */ NO_VALUE,
-        /* role= */ null,
-        /* accessibility= */ null,
+        /* role= */ C.ROLE_UNSET,
+        /* accessibility= */ C.ACCESSIBILITY_UNSET,
         subsampleOffsetUs,
         /* initializationData= */ null,
         /* drmInitData= */ null,
@@ -908,8 +915,8 @@ public final class Format implements Parcelable {
         /* selectionFlags= */ 0,
         /* language= */ null,
         /* accessibilityChannel= */ NO_VALUE,
-        /* role= */ null,
-        /* accessibility= */ null,
+        /* role= */ C.ROLE_UNSET,
+        /* accessibility= */ C.ACCESSIBILITY_UNSET,
         OFFSET_SAMPLE_RELATIVE,
         /* initializationData= */ null,
         drmInitData,
@@ -940,8 +947,8 @@ public final class Format implements Parcelable {
       @C.SelectionFlags int selectionFlags,
       @Nullable String language,
       int accessibilityChannel,
-      @Nullable String role,
-      @Nullable String accessibility,
+      @C.Role int role,
+      @C.Accessibility int accessibility,
       long subsampleOffsetUs,
       @Nullable List<byte[]> initializationData,
       @Nullable DrmInitData drmInitData,
@@ -1005,8 +1012,8 @@ public final class Format implements Parcelable {
     selectionFlags = in.readInt();
     language = in.readString();
     accessibilityChannel = in.readInt();
-    role = in.readString();
-    accessibility = in.readString();
+    role = in.readInt();
+    accessibility = in.readInt();
     subsampleOffsetUs = in.readLong();
     int initializationDataSize = in.readInt();
     initializationData = new ArrayList<>(initializationDataSize);
@@ -1602,8 +1609,8 @@ public final class Format implements Parcelable {
     dest.writeInt(selectionFlags);
     dest.writeString(language);
     dest.writeInt(accessibilityChannel);
-    dest.writeString(role);
-    dest.writeString(accessibility);
+    dest.writeInt(role);
+    dest.writeInt(accessibility);
     dest.writeLong(subsampleOffsetUs);
     int initializationDataSize = initializationData.size();
     dest.writeInt(initializationDataSize);
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
index d7f02926cd..462ebc6300 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
@@ -302,8 +302,7 @@ public class DashManifestParser extends DefaultHandler
         contentType = checkContentTypeConsistency(contentType, parseContentType(xpp));
       } else if (XmlPullParserUtil.isStartTag(xpp, "Role")) {
         Descriptor descriptor = parseDescriptor(xpp, "Role");
-        selectionFlags |= "urn:mpeg:dash:role:2011".equals(descriptor.schemeIdUri)
-                && "main".equals(descriptor.value) ? C.SELECTION_FLAG_DEFAULT : 0;
+        selectionFlags |= parseSelectionFlags(descriptor);
         roleDescriptors.add(descriptor);
       } else if (XmlPullParserUtil.isStartTag(xpp, "AudioChannelConfiguration")) {
         audioChannels = parseAudioChannelConfiguration(xpp);
@@ -589,6 +588,8 @@ public class DashManifestParser extends DefaultHandler
       List<Descriptor> supplementalProperties) {
     String sampleMimeType = getSampleMimeType(containerMimeType, codecs);
     if (sampleMimeType != null) {
+      int role = parseRole(roleDescriptors);
+      int accessibility = parseAccessibility(accessibilityDescriptors);
       if (MimeTypes.AUDIO_E_AC3.equals(sampleMimeType)) {
         sampleMimeType = parseEac3SupplementalProperties(supplementalProperties);
       }
@@ -604,7 +605,9 @@ public class DashManifestParser extends DefaultHandler
             height,
             frameRate,
             /* initializationData= */ null,
-            selectionFlags);
+            selectionFlags,
+            role,
+            accessibility);
       } else if (MimeTypes.isAudio(sampleMimeType)) {
         return Format.createAudioContainerFormat(
             id,
@@ -617,7 +620,9 @@ public class DashManifestParser extends DefaultHandler
             audioSamplingRate,
             /* initializationData= */ null,
             selectionFlags,
-            language);
+            language,
+            role,
+            accessibility);
       } else if (mimeTypeIsRawText(sampleMimeType)) {
         int accessibilityChannel;
         if (MimeTypes.APPLICATION_CEA608.equals(sampleMimeType)) {
@@ -627,10 +632,6 @@ public class DashManifestParser extends DefaultHandler
         } else {
           accessibilityChannel = Format.NO_VALUE;
         }
-
-        String role = parseRole(roleDescriptors);
-        String accessibility = parseAccessibility(accessibilityDescriptors);
-
         return Format.createTextContainerFormat(
             id,
             label,
@@ -1060,6 +1061,77 @@ public class DashManifestParser extends DefaultHandler
     return audioChannels;
   }
 
+  // Selection flag parsing.
+
+  protected int parseSelectionFlags(Descriptor roleDescriptor) {
+    return "urn:mpeg:dash:role:2011".equals(roleDescriptor.schemeIdUri)
+      && "main".equals(roleDescriptor.value) ? C.SELECTION_FLAG_DEFAULT : 0;
+  }
+
+  // Role and Accessibility parsing.
+
+  protected @C.Role int parseRole(List<Descriptor> roleDescriptors) {
+    for (int i = 0; i < roleDescriptors.size(); i++) {
+      Descriptor descriptor = roleDescriptors.get(i);
+      if ("urn:mpeg:dash:role:2011".equalsIgnoreCase(descriptor.schemeIdUri) && descriptor.value != null) {
+        switch (descriptor.value) {
+          case "main":
+            return C.ROLE_MAIN;
+          case "alternate":
+            return C.ROLE_ALTERNATE;
+          case "supplementary":
+            return C.ROLE_SUPPLEMENTARY;
+          case "commentary":
+            return C.ROLE_COMMENTARY;
+          case "dub":
+            return C.ROLE_DUB;
+          case "emergency":
+            return C.ROLE_EMERGENCY;
+          case "caption":
+            return C.ROLE_CAPTION;
+          case "sign":
+            return C.ROLE_SIGN;
+          default:
+            return C.ROLE_UNSET;
+        }
+      }
+    }
+    return C.ROLE_UNSET;
+  }
+
+  protected @C.Accessibility int parseAccessibility(List<Descriptor> accessibilityDescriptors) {
+    for (int i = 0; i < accessibilityDescriptors.size(); i++) {
+      Descriptor descriptor = accessibilityDescriptors.get(i);
+      if ("urn:mpeg:dash:role:2011".equalsIgnoreCase(descriptor.schemeIdUri) && descriptor.value != null) {
+        switch (descriptor.value){
+          case "description":
+            return C.ACCESSIBILITY_DESCRIPTION;
+          case "enhanced-audio-intelligibility":
+            return C.ACCESSIBILITY_ENHANCED_AUDIO_INTELLIGIBILITY;
+          case "caption":
+            return C.ACCESSIBILITY_CAPTION;
+          case "sign":
+            return C.ACCESSIBILITY_SIGN;
+          default:
+            return C.ACCESSIBILITY_UNSET;
+        }
+      }
+
+      if ("urn:tva:metadata:cs:AudioPurposeCS:2007".equalsIgnoreCase(descriptor.schemeIdUri) &&
+              descriptor.value != null) {
+        switch (descriptor.value){
+          case "1":
+            return C.ACCESSIBILITY_ENHANCED_AUDIO_INTELLIGIBILITY;
+          case "2":
+            return C.ACCESSIBILITY_CAPTION;
+          default:
+            return C.ACCESSIBILITY_UNSET;
+        }
+      }
+    }
+    return C.ACCESSIBILITY_UNSET;
+  }
+
   // Utility methods.
 
   /**
@@ -1262,32 +1334,6 @@ public class DashManifestParser extends DefaultHandler
     return MimeTypes.AUDIO_E_AC3;
   }
 
-  protected static String parseRole(List<Descriptor> roleDescriptors) {
-    for (int i = 0; i < roleDescriptors.size(); i++) {
-      Descriptor descriptor = roleDescriptors.get(i);
-      if ("urn:mpeg:dash:role:2011".equals(descriptor.schemeIdUri) && descriptor.value != null) {
-        return descriptor.value;
-      }
-    }
-    return null;
-  }
-
-  protected static String parseAccessibility(List<Descriptor> accessibilityDescriptors) {
-    for (int i = 0; i < accessibilityDescriptors.size(); i++) {
-      Descriptor descriptor = accessibilityDescriptors.get(i);
-      if ("urn:mpeg:dash:role:2011".equals(descriptor.schemeIdUri) && descriptor.value != null) {
-        return descriptor.value;
-      }
-
-      if ("urn:tva:metadata:cs:AudioPurposeCS:2007".equals(descriptor.schemeIdUri)) {
-        if ("1".equals(descriptor.value) || "2".equals(descriptor.value)) {
-          return descriptor.value;
-        }
-      }
-    }
-    return null;
-  }
-
   protected static float parseFrameRate(XmlPullParser xpp, float defaultValue) {
     float frameRate = defaultValue;
     String frameRateAttribute = xpp.getAttributeValue(null, "frameRate");
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
index 1c3e2f141d..61244f9a45 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
@@ -702,7 +702,9 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
         variantFormat.height,
         variantFormat.frameRate,
         /* initializationData= */ null,
-        variantFormat.selectionFlags);
+        variantFormat.selectionFlags,
+        /* role= */ C.ROLE_UNSET,
+        /* accessibility= */ C.ACCESSIBILITY_UNSET);
   }
 
   private static Format deriveAudioFormat(
@@ -740,7 +742,9 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
         /* sampleRate= */ Format.NO_VALUE,
         /* initializationData= */ null,
         selectionFlags,
-        language);
+        language,
+        /* role= */ C.ROLE_UNSET,
+        /* accessibility= */ C.ACCESSIBILITY_UNSET);
   }
 
 }
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
index e9fd1fb803..7e273fbd3f 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
@@ -329,7 +329,9 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
                   height,
                   frameRate,
                   /* initializationData= */ null,
-                  /* selectionFlags= */ 0);
+                  /* selectionFlags= */ 0,
+                  /* role= */ C.ROLE_UNSET,
+                  /* accessibility= */ C.ACCESSIBILITY_UNSET);
           variants.add(new HlsMasterPlaylist.HlsUrl(line, format, /* name= */ ""));
         }
       }
@@ -361,7 +363,9 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
                   /* sampleRate= */ Format.NO_VALUE,
                   /* initializationData= */ null,
                   selectionFlags,
-                  language);
+                  language,
+                  /* role= */ C.ROLE_UNSET,
+                  /* accessibility= */ C.ACCESSIBILITY_UNSET);
           if (isMediaTagMuxed(variants, uri)) {
             muxedAudioFormat = format;
           } else {
@@ -406,8 +410,8 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
                   selectionFlags,
                   language,
                   accessibilityChannel,
-                  /* role= */ null,
-                  /* accessibility= */ null));
+                  /* role= */ C.ROLE_UNSET,
+                  /* accessibility= */ C.ACCESSIBILITY_UNSET));
           break;
         default:
           // Do nothing.
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java
index 4c1c6ee0cc..b58f672983 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java
@@ -681,7 +681,9 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
                 height,
                 /* frameRate= */ Format.NO_VALUE,
                 codecSpecificData,
-                /* selectionFlags= */ 0);
+                /* selectionFlags= */ 0,
+                /* role= */ C.ROLE_UNSET,
+                /* accessibility= */ C.ACCESSIBILITY_UNSET);
       } else if (type == C.TRACK_TYPE_AUDIO) {
         sampleMimeType = sampleMimeType == null ? MimeTypes.AUDIO_AAC : sampleMimeType;
         int channels = parseRequiredInt(parser, KEY_CHANNELS);
@@ -705,7 +707,9 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
                 samplingRate,
                 codecSpecificData,
                 /* selectionFlags= */ 0,
-                language);
+                language,
+                /* role= */ C.ROLE_UNSET,
+                /* accessibility= */ C.ACCESSIBILITY_UNSET);
       } else if (type == C.TRACK_TYPE_TEXT) {
         String language = (String) getNormalizedAttribute(KEY_LANGUAGE);
         format =

From 854419962ada33b34a734b3801edd9e05c083684 Mon Sep 17 00:00:00 2001
From: Arnold Szabo <szaboaarnold@gmail.com>
Date: Tue, 5 Mar 2019 23:38:49 +0200
Subject: [PATCH 577/832] Merge role and accessibility fields into RoleFlags

---
 .../java/com/google/android/exoplayer2/C.java |  66 ++++------
 .../com/google/android/exoplayer2/Format.java | 111 ++++++-----------
 .../dash/manifest/DashManifestParser.java     | 117 ++++++++++--------
 .../exoplayer2/source/hls/HlsMediaPeriod.java |   6 +-
 .../hls/playlist/HlsPlaylistParser.java       |   9 +-
 .../manifest/SsManifestParser.java            |   6 +-
 6 files changed, 134 insertions(+), 181 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/C.java b/library/core/src/main/java/com/google/android/exoplayer2/C.java
index 19545fe0c3..75f1263a31 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/C.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/C.java
@@ -977,52 +977,36 @@ public final class C {
   public static final int NETWORK_TYPE_OTHER = 8;
 
   /**
-   * Adaptation set's role descriptor value (ISO 23009-1)
+   * Adaptation set's role and accessibility descriptor value.
    */
   @Documented
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({
-    ROLE_UNSET,
-    ROLE_MAIN,
-    ROLE_ALTERNATE,
-    ROLE_SUPPLEMENTARY,
-    ROLE_COMMENTARY,
-    ROLE_DUB,
-    ROLE_EMERGENCY,
-    ROLE_CAPTION,
-    ROLE_SIGN
+  @IntDef(
+      flag = true,
+      value = {
+        ROLE_FLAGS_MAIN,
+        ROLE_FLAGS_ALTERNATE,
+        ROLE_FLAGS_SUPPLEMENTARY,
+        ROLE_FLAGS_COMMENTARY,
+        ROLE_FLAGS_DUB,
+        ROLE_FLAGS_EMERGENCY,
+        ROLE_FLAGS_CAPTION,
+        ROLE_FLAGS_SIGN,
+        ROLE_FLAGS_ENHANCED_AUDIO_INTELLIGIBILITY,
+        ROLE_FLAGS_DESCRIPTION
   })
-  public @interface Role {}
+  public @interface RoleFlags {}
 
-  public static final int ROLE_UNSET = -1;
-  public static final int ROLE_MAIN = 0;
-  public static final int ROLE_ALTERNATE = 1;
-  public static final int ROLE_SUPPLEMENTARY = 2;
-  public static final int ROLE_COMMENTARY = 3;
-  public static final int ROLE_DUB = 4;
-  public static final int ROLE_EMERGENCY = 5;
-  public static final int ROLE_CAPTION = 6;
-  public static final int ROLE_SIGN = 7;
-
-  /**
-   * Adaptation set's accessibility descriptor value (ISO 23009-1)
-   */
-  @Documented
-  @Retention(RetentionPolicy.SOURCE)
-  @IntDef({
-    ACCESSIBILITY_UNSET,
-    ACCESSIBILITY_ENHANCED_AUDIO_INTELLIGIBILITY,
-    ACCESSIBILITY_DESCRIPTION,
-    ACCESSIBILITY_CAPTION,
-    ACCESSIBILITY_SIGN
-  })
-  public @interface Accessibility {}
-
-  public static final int ACCESSIBILITY_UNSET = -1;
-  public static final int ACCESSIBILITY_ENHANCED_AUDIO_INTELLIGIBILITY = 1;
-  public static final int ACCESSIBILITY_DESCRIPTION = 2;
-  public static final int ACCESSIBILITY_CAPTION = 3;
-  public static final int ACCESSIBILITY_SIGN = 4;
+  public static final int ROLE_FLAGS_MAIN = 1;
+  public static final int ROLE_FLAGS_ALTERNATE = 1 << 1;
+  public static final int ROLE_FLAGS_SUPPLEMENTARY = 1 << 2;
+  public static final int ROLE_FLAGS_COMMENTARY = 1 << 3;
+  public static final int ROLE_FLAGS_DUB = 1 << 4;
+  public static final int ROLE_FLAGS_EMERGENCY = 1 << 5;
+  public static final int ROLE_FLAGS_CAPTION = 1 << 6;
+  public static final int ROLE_FLAGS_SIGN = 1 << 7;
+  public static final int ROLE_FLAGS_ENHANCED_AUDIO_INTELLIGIBILITY = 1 << 8;
+  public static final int ROLE_FLAGS_DESCRIPTION = 1 << 9;
 
   /**
    * Converts a time in microseconds to the corresponding time in milliseconds, preserving
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Format.java b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
index 43ca19e444..509ef8011f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Format.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
@@ -51,15 +51,9 @@ public final class Format implements Parcelable {
   /** Track selection flags. **/
   @C.SelectionFlags
   public final int selectionFlags;
-  /** Track role descriptor value, or {@link C#ROLE_UNSET} if unknown or not applicable. **/
-  @C.Role
-  public final int role;
-  /**
-   * Track accessibility descriptor value, or {@link C#ACCESSIBILITY_UNSET} if unknown
-   * or not applicable.
-   */
-  @C.Accessibility
-  public final int accessibility;
+  /** Track role and accessibility descriptor values. **/
+  @C.RoleFlags
+  public final int roleFlags;
   /**
    * The average bandwidth in bits per second, or {@link #NO_VALUE} if unknown or not applicable.
    */
@@ -189,8 +183,7 @@ public final class Format implements Parcelable {
       float frameRate,
       @Nullable List<byte[]> initializationData,
       @C.SelectionFlags int selectionFlags,
-      @C.Role int role,
-      @C.Accessibility int accessibility) {
+      @C.RoleFlags int roleFlags) {
     return createVideoContainerFormat(
         id,
         /* label= */ null,
@@ -203,8 +196,7 @@ public final class Format implements Parcelable {
         frameRate,
         initializationData,
         selectionFlags,
-        role,
-        accessibility);
+        roleFlags);
   }
 
   public static Format createVideoContainerFormat(
@@ -219,8 +211,7 @@ public final class Format implements Parcelable {
       float frameRate,
       @Nullable List<byte[]> initializationData,
       @C.SelectionFlags int selectionFlags,
-      @C.Role int role,
-      @C.Accessibility int accessibility) {
+      @C.RoleFlags int roleFlags) {
     return new Format(
         id,
         label,
@@ -245,8 +236,7 @@ public final class Format implements Parcelable {
         selectionFlags,
         /* language= */ null,
         /* accessibilityChannel= */ NO_VALUE,
-        role,
-        accessibility,
+        roleFlags,
         OFFSET_SAMPLE_RELATIVE,
         initializationData,
         /* drmInitData= */ null,
@@ -350,8 +340,7 @@ public final class Format implements Parcelable {
         /* selectionFlags= */ 0,
         /* language= */ null,
         /* accessibilityChannel= */ NO_VALUE,
-        /* role= */ C.ROLE_UNSET,
-        /* accessibility= */ C.ACCESSIBILITY_UNSET,
+        /* roleFlags= */ 0,
         OFFSET_SAMPLE_RELATIVE,
         initializationData,
         drmInitData,
@@ -372,8 +361,7 @@ public final class Format implements Parcelable {
       @Nullable List<byte[]> initializationData,
       @C.SelectionFlags int selectionFlags,
       @Nullable String language,
-      @C.Role int role,
-      @C.Accessibility int accessibility) {
+      @C.RoleFlags int roleFlags) {
     return createAudioContainerFormat(
         id,
         /* label= */ null,
@@ -386,8 +374,7 @@ public final class Format implements Parcelable {
         initializationData,
         selectionFlags,
         language,
-        role,
-        accessibility);
+        roleFlags);
   }
 
   public static Format createAudioContainerFormat(
@@ -402,8 +389,7 @@ public final class Format implements Parcelable {
       @Nullable List<byte[]> initializationData,
       @C.SelectionFlags int selectionFlags,
       @Nullable String language,
-      @C.Role int role,
-      @C.Accessibility int accessibility) {
+      @C.RoleFlags int roleFlags) {
     return new Format(
         id,
         label,
@@ -428,8 +414,7 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         /* accessibilityChannel= */ NO_VALUE,
-        role,
-        accessibility,
+        roleFlags,
         OFFSET_SAMPLE_RELATIVE,
         initializationData,
         /* drmInitData= */ null,
@@ -534,8 +519,7 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         /* accessibilityChannel= */ NO_VALUE,
-        /* role= */ C.ROLE_UNSET,
-        /* accessibility= */ C.ACCESSIBILITY_UNSET,
+        /* roleFlags= */ 0,
         OFFSET_SAMPLE_RELATIVE,
         initializationData,
         drmInitData,
@@ -583,8 +567,7 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         /* accessibilityChannel= */ NO_VALUE,
-        /* role= */ C.ROLE_UNSET,
-        /* accessibility= */ C.ACCESSIBILITY_UNSET);
+        /* roleFlags= */ 0);
   }
 
   public static Format createTextContainerFormat(
@@ -597,8 +580,7 @@ public final class Format implements Parcelable {
       @C.SelectionFlags int selectionFlags,
       @Nullable String language,
       int accessibilityChannel,
-      @C.Role int role,
-      @C.Accessibility int accessibility) {
+      @C.RoleFlags int roleFlags) {
     return new Format(
         id,
         label,
@@ -623,8 +605,7 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         accessibilityChannel,
-        role,
-        accessibility,
+        roleFlags,
         OFFSET_SAMPLE_RELATIVE,
         /* initializationData= */ null,
         /* drmInitData= */ null,
@@ -737,8 +718,7 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         accessibilityChannel,
-        /* role= */ C.ROLE_UNSET,
-        /* accessibility= */ C.ACCESSIBILITY_UNSET,
+        /* roleFlags= */ 0,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -780,8 +760,7 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         /* accessibilityChannel= */ NO_VALUE,
-        /* role= */ C.ROLE_UNSET,
-        /* accessibility= */ C.ACCESSIBILITY_UNSET,
+        /* roleFlags= */ 0,
         OFFSET_SAMPLE_RELATIVE,
         initializationData,
         drmInitData,
@@ -843,8 +822,7 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         /* accessibilityChannel= */ NO_VALUE,
-        /* role= */ C.ROLE_UNSET,
-        /* accessibility= */ C.ACCESSIBILITY_UNSET,
+        /* roleFlags= */ 0,
         OFFSET_SAMPLE_RELATIVE,
         /* initializationData= */ null,
         /* drmInitData= */ null,
@@ -877,8 +855,7 @@ public final class Format implements Parcelable {
         /* selectionFlags= */ 0,
         /* language= */ null,
         /* accessibilityChannel= */ NO_VALUE,
-        /* role= */ C.ROLE_UNSET,
-        /* accessibility= */ C.ACCESSIBILITY_UNSET,
+        /* roleFlags= */ 0,
         subsampleOffsetUs,
         /* initializationData= */ null,
         /* drmInitData= */ null,
@@ -915,8 +892,7 @@ public final class Format implements Parcelable {
         /* selectionFlags= */ 0,
         /* language= */ null,
         /* accessibilityChannel= */ NO_VALUE,
-        /* role= */ C.ROLE_UNSET,
-        /* accessibility= */ C.ACCESSIBILITY_UNSET,
+        /* roleFlags= */ 0,
         OFFSET_SAMPLE_RELATIVE,
         /* initializationData= */ null,
         drmInitData,
@@ -947,8 +923,7 @@ public final class Format implements Parcelable {
       @C.SelectionFlags int selectionFlags,
       @Nullable String language,
       int accessibilityChannel,
-      @C.Role int role,
-      @C.Accessibility int accessibility,
+      @C.RoleFlags int roleFlags,
       long subsampleOffsetUs,
       @Nullable List<byte[]> initializationData,
       @Nullable DrmInitData drmInitData,
@@ -977,8 +952,7 @@ public final class Format implements Parcelable {
     this.selectionFlags = selectionFlags;
     this.language = Util.normalizeLanguageCode(language);
     this.accessibilityChannel = accessibilityChannel;
-    this.role = role;
-    this.accessibility = accessibility;
+    this.roleFlags = roleFlags;
     this.subsampleOffsetUs = subsampleOffsetUs;
     this.initializationData =
         initializationData == null ? Collections.emptyList() : initializationData;
@@ -1012,8 +986,7 @@ public final class Format implements Parcelable {
     selectionFlags = in.readInt();
     language = in.readString();
     accessibilityChannel = in.readInt();
-    role = in.readInt();
-    accessibility = in.readInt();
+    roleFlags = in.readInt();
     subsampleOffsetUs = in.readLong();
     int initializationDataSize = in.readInt();
     initializationData = new ArrayList<>(initializationDataSize);
@@ -1049,8 +1022,7 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         accessibilityChannel,
-        role,
-        accessibility,
+        roleFlags,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1082,8 +1054,7 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         accessibilityChannel,
-        role,
-        accessibility,
+        roleFlags,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1124,8 +1095,7 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         accessibilityChannel,
-        role,
-        accessibility,
+        roleFlags,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1197,8 +1167,7 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         accessibilityChannel,
-        role,
-        accessibility,
+        roleFlags,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1230,8 +1199,7 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         accessibilityChannel,
-        role,
-        accessibility,
+        roleFlags,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1263,8 +1231,7 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         accessibilityChannel,
-        role,
-        accessibility,
+        roleFlags,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1296,8 +1263,7 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         accessibilityChannel,
-        role,
-        accessibility,
+        roleFlags,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1329,8 +1295,7 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         accessibilityChannel,
-        role,
-        accessibility,
+        roleFlags,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1362,8 +1327,7 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         accessibilityChannel,
-        role,
-        accessibility,
+        roleFlags,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1395,8 +1359,7 @@ public final class Format implements Parcelable {
         selectionFlags,
         language,
         accessibilityChannel,
-        role,
-        accessibility,
+        roleFlags,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1506,8 +1469,7 @@ public final class Format implements Parcelable {
         && Util.areEqual(label, other.label)
         && Util.areEqual(language, other.language)
         && accessibilityChannel == other.accessibilityChannel
-        && Util.areEqual(role, other.role)
-        && Util.areEqual(accessibility, other.accessibility)
+        && roleFlags == other.roleFlags
         && Util.areEqual(containerMimeType, other.containerMimeType)
         && Util.areEqual(sampleMimeType, other.sampleMimeType)
         && Util.areEqual(codecs, other.codecs)
@@ -1609,8 +1571,7 @@ public final class Format implements Parcelable {
     dest.writeInt(selectionFlags);
     dest.writeString(language);
     dest.writeInt(accessibilityChannel);
-    dest.writeInt(role);
-    dest.writeInt(accessibility);
+    dest.writeInt(roleFlags);
     dest.writeLong(subsampleOffsetUs);
     int initializationDataSize = initializationData.size();
     dest.writeInt(initializationDataSize);
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
index 462ebc6300..0a629b3d19 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
@@ -588,8 +588,9 @@ public class DashManifestParser extends DefaultHandler
       List<Descriptor> supplementalProperties) {
     String sampleMimeType = getSampleMimeType(containerMimeType, codecs);
     if (sampleMimeType != null) {
-      int role = parseRole(roleDescriptors);
-      int accessibility = parseAccessibility(accessibilityDescriptors);
+      @C.RoleFlags int role = parseRole(roleDescriptors);
+      @C.RoleFlags int accessibility = parseAccessibility(accessibilityDescriptors);
+      @C.RoleFlags int roleFlags = role | accessibility;
       if (MimeTypes.AUDIO_E_AC3.equals(sampleMimeType)) {
         sampleMimeType = parseEac3SupplementalProperties(supplementalProperties);
       }
@@ -606,8 +607,7 @@ public class DashManifestParser extends DefaultHandler
             frameRate,
             /* initializationData= */ null,
             selectionFlags,
-            role,
-            accessibility);
+            roleFlags);
       } else if (MimeTypes.isAudio(sampleMimeType)) {
         return Format.createAudioContainerFormat(
             id,
@@ -621,8 +621,7 @@ public class DashManifestParser extends DefaultHandler
             /* initializationData= */ null,
             selectionFlags,
             language,
-            role,
-            accessibility);
+            roleFlags);
       } else if (mimeTypeIsRawText(sampleMimeType)) {
         int accessibilityChannel;
         if (MimeTypes.APPLICATION_CEA608.equals(sampleMimeType)) {
@@ -642,8 +641,7 @@ public class DashManifestParser extends DefaultHandler
             selectionFlags,
             language,
             accessibilityChannel,
-            role,
-            accessibility);
+            roleFlags);
       }
     }
     return Format.createContainerFormat(
@@ -1070,66 +1068,83 @@ public class DashManifestParser extends DefaultHandler
 
   // Role and Accessibility parsing.
 
-  protected @C.Role int parseRole(List<Descriptor> roleDescriptors) {
+  protected @C.RoleFlags int parseRole(List<Descriptor> roleDescriptors) {
+    @C.RoleFlags int result = 0;
     for (int i = 0; i < roleDescriptors.size(); i++) {
       Descriptor descriptor = roleDescriptors.get(i);
       if ("urn:mpeg:dash:role:2011".equalsIgnoreCase(descriptor.schemeIdUri) && descriptor.value != null) {
-        switch (descriptor.value) {
-          case "main":
-            return C.ROLE_MAIN;
-          case "alternate":
-            return C.ROLE_ALTERNATE;
-          case "supplementary":
-            return C.ROLE_SUPPLEMENTARY;
-          case "commentary":
-            return C.ROLE_COMMENTARY;
-          case "dub":
-            return C.ROLE_DUB;
-          case "emergency":
-            return C.ROLE_EMERGENCY;
-          case "caption":
-            return C.ROLE_CAPTION;
-          case "sign":
-            return C.ROLE_SIGN;
-          default:
-            return C.ROLE_UNSET;
-        }
+        result |= parseRoleSchemeValue(descriptor.value);
       }
     }
-    return C.ROLE_UNSET;
+    return result;
   }
 
-  protected @C.Accessibility int parseAccessibility(List<Descriptor> accessibilityDescriptors) {
+  protected @C.RoleFlags int parseAccessibility(List<Descriptor> accessibilityDescriptors) {
+    @C.RoleFlags int result = 0;
     for (int i = 0; i < accessibilityDescriptors.size(); i++) {
       Descriptor descriptor = accessibilityDescriptors.get(i);
       if ("urn:mpeg:dash:role:2011".equalsIgnoreCase(descriptor.schemeIdUri) && descriptor.value != null) {
-        switch (descriptor.value){
-          case "description":
-            return C.ACCESSIBILITY_DESCRIPTION;
-          case "enhanced-audio-intelligibility":
-            return C.ACCESSIBILITY_ENHANCED_AUDIO_INTELLIGIBILITY;
-          case "caption":
-            return C.ACCESSIBILITY_CAPTION;
-          case "sign":
-            return C.ACCESSIBILITY_SIGN;
-          default:
-            return C.ACCESSIBILITY_UNSET;
-        }
+        result |= parseRoleSchemeValue(descriptor.value);
       }
-
       if ("urn:tva:metadata:cs:AudioPurposeCS:2007".equalsIgnoreCase(descriptor.schemeIdUri) &&
               descriptor.value != null) {
         switch (descriptor.value){
-          case "1":
-            return C.ACCESSIBILITY_ENHANCED_AUDIO_INTELLIGIBILITY;
-          case "2":
-            return C.ACCESSIBILITY_CAPTION;
-          default:
-            return C.ACCESSIBILITY_UNSET;
+          case "1": // Audio description for the visually impaired
+            result |= C.ROLE_FLAGS_DESCRIPTION;
+            break;
+          case "2": // Audio description for the hard of hearing
+            result |= C.ROLE_FLAGS_ENHANCED_AUDIO_INTELLIGIBILITY;
+            break;
+          case "3": // Supplemental commentary
+            result |= C.ROLE_FLAGS_SUPPLEMENTARY;
+            break;
+          case "4": // Director's commentary
+            result |= C.ROLE_FLAGS_COMMENTARY;
+            break;
+          case "6": // Main programme audio
+            result |= C.ROLE_FLAGS_MAIN;
+            break;
         }
       }
     }
-    return C.ACCESSIBILITY_UNSET;
+    return result;
+  }
+
+  protected @C.RoleFlags int parseRoleSchemeValue(String value){
+    @C.RoleFlags int result = 0;
+    switch (value) {
+      case "main":
+        result |= C.ROLE_FLAGS_MAIN;
+        break;
+      case "alternate":
+        result |= C.ROLE_FLAGS_ALTERNATE;
+        break;
+      case "supplementary":
+        result |= C.ROLE_FLAGS_SUPPLEMENTARY;
+        break;
+      case "commentary":
+        result |= C.ROLE_FLAGS_COMMENTARY;
+        break;
+      case "dub":
+        result |= C.ROLE_FLAGS_DUB;
+        break;
+      case "emergency":
+        result |= C.ROLE_FLAGS_EMERGENCY;
+        break;
+      case "caption":
+        result |= C.ROLE_FLAGS_CAPTION;
+        break;
+      case "sign":
+        result |= C.ROLE_FLAGS_SIGN;
+        break;
+      case "description":
+        result |= C.ROLE_FLAGS_DESCRIPTION;
+        break;
+      case "enhanced-audio-intelligibility":
+        result |= C.ROLE_FLAGS_ENHANCED_AUDIO_INTELLIGIBILITY;
+        break;
+    }
+    return result;
   }
 
   // Utility methods.
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
index 61244f9a45..3465bfe6a9 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
@@ -703,8 +703,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
         variantFormat.frameRate,
         /* initializationData= */ null,
         variantFormat.selectionFlags,
-        /* role= */ C.ROLE_UNSET,
-        /* accessibility= */ C.ACCESSIBILITY_UNSET);
+        /* roleFlags= */ 0);
   }
 
   private static Format deriveAudioFormat(
@@ -743,8 +742,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
         /* initializationData= */ null,
         selectionFlags,
         language,
-        /* role= */ C.ROLE_UNSET,
-        /* accessibility= */ C.ACCESSIBILITY_UNSET);
+        /* roleFlags= */ 0);
   }
 
 }
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
index 7e273fbd3f..31528353ee 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
@@ -330,8 +330,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
                   frameRate,
                   /* initializationData= */ null,
                   /* selectionFlags= */ 0,
-                  /* role= */ C.ROLE_UNSET,
-                  /* accessibility= */ C.ACCESSIBILITY_UNSET);
+                  /* roleFlags= */ 0);
           variants.add(new HlsMasterPlaylist.HlsUrl(line, format, /* name= */ ""));
         }
       }
@@ -364,8 +363,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
                   /* initializationData= */ null,
                   selectionFlags,
                   language,
-                  /* role= */ C.ROLE_UNSET,
-                  /* accessibility= */ C.ACCESSIBILITY_UNSET);
+                  /* roleFlags= */ 0);
           if (isMediaTagMuxed(variants, uri)) {
             muxedAudioFormat = format;
           } else {
@@ -410,8 +408,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
                   selectionFlags,
                   language,
                   accessibilityChannel,
-                  /* role= */ C.ROLE_UNSET,
-                  /* accessibility= */ C.ACCESSIBILITY_UNSET));
+                  /* roleFlags= */ 0));
           break;
         default:
           // Do nothing.
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java
index b58f672983..8785a402b0 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java
@@ -682,8 +682,7 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
                 /* frameRate= */ Format.NO_VALUE,
                 codecSpecificData,
                 /* selectionFlags= */ 0,
-                /* role= */ C.ROLE_UNSET,
-                /* accessibility= */ C.ACCESSIBILITY_UNSET);
+                /* roleFlags= */ 0);
       } else if (type == C.TRACK_TYPE_AUDIO) {
         sampleMimeType = sampleMimeType == null ? MimeTypes.AUDIO_AAC : sampleMimeType;
         int channels = parseRequiredInt(parser, KEY_CHANNELS);
@@ -708,8 +707,7 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
                 codecSpecificData,
                 /* selectionFlags= */ 0,
                 language,
-                /* role= */ C.ROLE_UNSET,
-                /* accessibility= */ C.ACCESSIBILITY_UNSET);
+                /* roleFlags= */ 0);
       } else if (type == C.TRACK_TYPE_TEXT) {
         String language = (String) getNormalizedAttribute(KEY_LANGUAGE);
         format =

From 7f9a156323df278f09ed0e2e0f38a5c195eb1fe0 Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Thu, 21 Feb 2019 16:14:30 +0000
Subject: [PATCH 578/832] fix issue templates

PiperOrigin-RevId: 234997641
---
 .github/ISSUE_TEMPLATE/bug.md                 | 2 +-
 .github/ISSUE_TEMPLATE/content_not_playing.md | 2 +-
 .github/ISSUE_TEMPLATE/feature_request.md     | 2 +-
 .github/ISSUE_TEMPLATE/question.md            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index 7e9c631fc0..8f2b02013e 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -2,7 +2,7 @@
 name: Bug report
 about: Issue template for a bug report.
 title: ''
-labels: bug, 'needs triage'
+labels: bug, needs triage
 assignees: ''
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/content_not_playing.md b/.github/ISSUE_TEMPLATE/content_not_playing.md
index 47c09a7a59..a6a0b50b9d 100644
--- a/.github/ISSUE_TEMPLATE/content_not_playing.md
+++ b/.github/ISSUE_TEMPLATE/content_not_playing.md
@@ -2,7 +2,7 @@
 name: Content not playing correctly
 about: Issue template for a content not playing issue.
 title: ''
-labels: 'content not playing', 'needs triage'
+labels: content not playing, needs triage
 assignees: ''
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 17a07ef39b..5e8d3f9208 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,7 @@
 name: Feature request
 about: Issue template for a feature request.
 title: ''
-labels: enhancement, 'needs triage'
+labels: enhancement, needs triage
 assignees: ''
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 9d0ddfe4a1..5316fbe492 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -2,7 +2,7 @@
 name: Question
 about: Issue template for a question.
 title: ''
-labels: question, 'needs triage'
+labels: question, needs triage
 assignees: ''
 ---
 

From 325029d58eb67a72d0ee8204e280cfd555f15b14 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 22 Feb 2019 09:38:19 +0000
Subject: [PATCH 579/832] Migrate Mockito Matchers.{hamcrestMethods} to
 MockitoHamcrest.{hamcrestMethods}

All methods accepting a hamcrest Matcher in org.mockito.Matchers have been changed
to only accept an ArgumentMatcher. The corresponding methods are now available on
MockitoHamcrest.

For more information see http://go/mockito-2-lsc

Tested:
    TAP --sample for global presubmit queue
    http://test/OCL:235033293:BASE:234998256:1550793421835:c2ccbbda
PiperOrigin-RevId: 235153912
---
 .../exoplayer2/trackselection/AdaptiveTrackSelectionTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
index bf6b935161..260d3f03e9 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.trackselection;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.argThat;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
@@ -44,6 +43,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentMatcher;
 import org.mockito.Mock;
+import org.mockito.hamcrest.MockitoHamcrest;
 import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link AdaptiveTrackSelection}. */
@@ -276,7 +276,7 @@ public final class AdaptiveTrackSelectionTest {
         };
     verify(estimator)
         .getBitrates(
-            argThat(matcher),
+            MockitoHamcrest.argThat(matcher),
             eq(Collections.emptyList()),
             eq(THREE_EMPTY_MEDIA_CHUNK_ITERATORS),
             any());

From 6682580ad71de542569180e3c49415b29ebd162c Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 22 Feb 2019 11:34:44 +0000
Subject: [PATCH 580/832] Extract HlsMediaChunk#feedDataToExtractor method

Deduplicates the call to Extractor#read and sorrounding logic.

PiperOrigin-RevId: 235165499
---
 .../exoplayer2/source/hls/HlsMediaChunk.java  | 57 ++++++++-----------
 1 file changed, 23 insertions(+), 34 deletions(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
index 419d11cba1..330d2976c5 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
@@ -203,7 +203,8 @@ import java.util.concurrent.atomic.AtomicInteger;
   private Extractor extractor;
   private boolean isExtractorReusable;
   private HlsSampleStreamWrapper output;
-  private int initSegmentBytesLoaded;
+  // nextLoadPosition refers to the init segment if initDataLoadRequired is true.
+  // Otherwise, nextLoadPosition refers to the media segment.
   private int nextLoadPosition;
   private boolean initDataLoadRequired;
   private volatile boolean loadCanceled;
@@ -307,54 +308,42 @@ import java.util.concurrent.atomic.AtomicInteger;
     if (!initDataLoadRequired) {
       return;
     }
-    DataSpec initSegmentDataSpec;
-    boolean skipLoadedBytes;
-    if (initSegmentEncrypted) {
-      initSegmentDataSpec = initDataSpec;
-      skipLoadedBytes = initSegmentBytesLoaded != 0;
-    } else {
-      initSegmentDataSpec = initDataSpec.subrange(initSegmentBytesLoaded);
-      skipLoadedBytes = false;
-    }
-    try {
-      DefaultExtractorInput input = prepareExtraction(initDataSource, initSegmentDataSpec);
-      if (skipLoadedBytes) {
-        input.skipFully(initSegmentBytesLoaded);
-      }
-      try {
-        int result = Extractor.RESULT_CONTINUE;
-        while (result == Extractor.RESULT_CONTINUE && !loadCanceled) {
-          result = extractor.read(input, null);
-        }
-      } finally {
-        initSegmentBytesLoaded = (int) (input.getPosition() - initDataSpec.absoluteStreamPosition);
-      }
-    } finally {
-      Util.closeQuietly(initDataSource);
-    }
+    feedDataToExtractor(initDataSource, initDataSpec, initSegmentEncrypted);
+    nextLoadPosition = 0;
     initDataLoadRequired = false;
   }
 
   private void loadMedia() throws IOException, InterruptedException {
+    if (!isMasterTimestampSource) {
+      timestampAdjuster.waitUntilInitialized();
+    } else if (timestampAdjuster.getFirstSampleTimestampUs() == TimestampAdjuster.DO_NOT_OFFSET) {
+      // We're the master and we haven't set the desired first sample timestamp yet.
+      timestampAdjuster.setFirstSampleTimestampUs(startTimeUs);
+    }
+    feedDataToExtractor(dataSource, dataSpec, mediaSegmentEncrypted);
+  }
+
+  /**
+   * Attempts to feed the given {@code dataSpec} to {@code this.extractor}. Whenever the operation
+   * concludes (because of a thrown exception or because the operation finishes), the number of fed
+   * bytes is written to {@code nextLoadPosition}.
+   */
+  private void feedDataToExtractor(
+      DataSource dataSource, DataSpec dataSpec, boolean dataIsEncrypted)
+      throws IOException, InterruptedException {
     // If we previously fed part of this chunk to the extractor, we need to skip it this time. For
     // encrypted content we need to skip the data by reading it through the source, so as to ensure
     // correct decryption of the remainder of the chunk. For clear content, we can request the
     // remainder of the chunk directly.
     DataSpec loadDataSpec;
     boolean skipLoadedBytes;
-    if (mediaSegmentEncrypted) {
+    if (dataIsEncrypted) {
       loadDataSpec = dataSpec;
       skipLoadedBytes = nextLoadPosition != 0;
     } else {
       loadDataSpec = dataSpec.subrange(nextLoadPosition);
       skipLoadedBytes = false;
     }
-    if (!isMasterTimestampSource) {
-      timestampAdjuster.waitUntilInitialized();
-    } else if (timestampAdjuster.getFirstSampleTimestampUs() == TimestampAdjuster.DO_NOT_OFFSET) {
-      // We're the master and we haven't set the desired first sample timestamp yet.
-      timestampAdjuster.setFirstSampleTimestampUs(startTimeUs);
-    }
     try {
       ExtractorInput input = prepareExtraction(dataSource, loadDataSpec);
       if (skipLoadedBytes) {
@@ -363,7 +352,7 @@ import java.util.concurrent.atomic.AtomicInteger;
       try {
         int result = Extractor.RESULT_CONTINUE;
         while (result == Extractor.RESULT_CONTINUE && !loadCanceled) {
-          result = extractor.read(input, null);
+          result = extractor.read(input, /* seekPosition= */ null);
         }
       } finally {
         nextLoadPosition = (int) (input.getPosition() - dataSpec.absoluteStreamPosition);

From ff7f0304e583296f290d8d80d15ba4e213edf6ba Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 22 Feb 2019 15:12:10 +0000
Subject: [PATCH 581/832] Automated g4 rollback of changelist 235153912.

*** Reason for rollback ***

Breaks ExoPlayer's gradle build

*** Original change description ***

Migrate Mockito Matchers.{hamcrestMethods} to MockitoHamcrest.{hamcrestMethods}

All methods accepting a hamcrest Matcher in org.mockito.Matchers have been changed
to only accept an ArgumentMatcher. The corresponding methods are now available on
MockitoHamcrest.

For more information see http://go/mockito-2-lsc

Tested:
    TAP --sample for global presubmit queue
    http://test/OCL:235033293:BASE:234998256:1550793421835:c2ccbbda

***

PiperOrigin-RevId: 235186705
---
 .../exoplayer2/trackselection/AdaptiveTrackSelectionTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
index 260d3f03e9..bf6b935161 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.trackselection;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.argThat;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
@@ -43,7 +44,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentMatcher;
 import org.mockito.Mock;
-import org.mockito.hamcrest.MockitoHamcrest;
 import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link AdaptiveTrackSelection}. */
@@ -276,7 +276,7 @@ public final class AdaptiveTrackSelectionTest {
         };
     verify(estimator)
         .getBitrates(
-            MockitoHamcrest.argThat(matcher),
+            argThat(matcher),
             eq(Collections.emptyList()),
             eq(THREE_EMPTY_MEDIA_CHUNK_ITERATORS),
             any());

From 3e03e71cf96679c9307bbe212d69909138c3f698 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 22 Feb 2019 15:27:28 +0000
Subject: [PATCH 582/832] Start enabling database based SimpleCache indexing

- Expose constructor (package private for now, for tests only)
- Add some tests for cache initialization
- Add some TODOs for handling initialization failure

PiperOrigin-RevId: 235188386
---
 .../upstream/cache/CachedContentIndex.java    |   2 +-
 .../upstream/cache/SimpleCache.java           | 109 ++++++++++++++----
 .../upstream/cache/SimpleCacheTest.java       |  40 ++++++-
 3 files changed, 120 insertions(+), 31 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
index 6670cee90e..f14e7cef5b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
@@ -126,7 +126,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
    * @param legacyStorageSecretKey A 16 byte AES key for reading, and optionally writing, legacy
    *     storage.
    * @param legacyStorageEncrypt Whether to encrypt when writing to legacy storage. Must be false if
-   *     {@code secretKey} is null.
+   *     {@code legacyStorageSecretKey} is null.
    * @param preferLegacyStorage Whether to use prefer legacy storage if both storage types are
    *     enabled. This option is only useful for downgrading from database storage back to legacy
    *     storage.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index c8e05d21e5..888f1a1696 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -19,6 +19,7 @@ import android.os.ConditionVariable;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.database.DatabaseProvider;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
 import java.io.File;
@@ -61,6 +62,7 @@ public final class SimpleCache implements Cache {
   private final HashMap<String, ArrayList<Listener>> listeners;
   private final Random random;
 
+  private long uid;
   private long totalSpace;
   private boolean released;
 
@@ -109,7 +111,7 @@ public final class SimpleCache implements Cache {
    * @param secretKey If not null, cache keys will be stored encrypted on filesystem using AES/CBC.
    *     The key must be 16 bytes long.
    */
-  public SimpleCache(File cacheDir, CacheEvictor evictor, byte[] secretKey) {
+  public SimpleCache(File cacheDir, CacheEvictor evictor, @Nullable byte[] secretKey) {
     this(cacheDir, evictor, secretKey, secretKey != null);
   }
 
@@ -124,16 +126,55 @@ public final class SimpleCache implements Cache {
    * @param encrypt Whether the index will be encrypted when written. Must be false if {@code
    *     secretKey} is null.
    */
-  public SimpleCache(File cacheDir, CacheEvictor evictor, byte[] secretKey, boolean encrypt) {
+  public SimpleCache(
+      File cacheDir, CacheEvictor evictor, @Nullable byte[] secretKey, boolean encrypt) {
+    this(
+        cacheDir,
+        evictor,
+        /* databaseProvider= */ null,
+        secretKey,
+        encrypt,
+        /* preferLegacyIndex= */ true);
+  }
+
+  // TODO: Make public and consider a constructor that takes DatabaseProvider but not legacy args.
+  /**
+   * Constructs the cache. The cache will delete any unrecognized files from the cache directory.
+   * Hence the directory cannot be used to store other files.
+   *
+   * @param cacheDir A dedicated cache directory.
+   * @param evictor The evictor to be used.
+   * @param databaseProvider Provides the database in which the cache index is stored, or {@code
+   *     null} to use a legacy index. Using the database index is highly recommended for performance
+   *     reasons.
+   * @param legacyIndexSecretKey A 16 byte AES key for reading, and optionally writing, the legacy
+   *     index. Not used by the database index, however should still be provided when using the
+   *     database index in cases where upgrading from the legacy index may be necessary.
+   * @param legacyIndexEncrypt Whether to encrypt when writing to the legacy index. Must be false if
+   *     {@code legacyIndexSecretKey} is null. Not used by the database index.
+   * @param preferLegacyIndex Whether to use the legacy index even if a {@code databaseProvider} is
+   *     provided. Should be {@code false} in most cases. Setting this to {@code true} is only
+   *     useful for downgrading from the database index back to the legacy index.
+   */
+  /* package */ SimpleCache(
+      File cacheDir,
+      CacheEvictor evictor,
+      @Nullable DatabaseProvider databaseProvider,
+      @Nullable byte[] legacyIndexSecretKey,
+      boolean legacyIndexEncrypt,
+      boolean preferLegacyIndex) {
     this(
         cacheDir,
         evictor,
         new CachedContentIndex(
-            /* databaseProvider= */ null,
+            databaseProvider,
             cacheDir,
-            secretKey,
-            encrypt,
-            /* preferLegacyStorage= */ true));
+            legacyIndexSecretKey,
+            legacyIndexEncrypt,
+            preferLegacyIndex),
+        databaseProvider != null && !preferLegacyIndex
+            ? new CacheFileMetadataIndex(databaseProvider)
+            : null);
   }
 
   /**
@@ -143,8 +184,13 @@ public final class SimpleCache implements Cache {
    * @param cacheDir A dedicated cache directory.
    * @param evictor The evictor to be used.
    * @param contentIndex The content index to be used.
+   * @param fileIndex The file index to be used.
    */
-  /* package */ SimpleCache(File cacheDir, CacheEvictor evictor, CachedContentIndex contentIndex) {
+  /* package */ SimpleCache(
+      File cacheDir,
+      CacheEvictor evictor,
+      CachedContentIndex contentIndex,
+      @Nullable CacheFileMetadataIndex fileIndex) {
     if (!lockFolder(cacheDir)) {
       throw new IllegalStateException("Another SimpleCache instance uses the folder: " + cacheDir);
     }
@@ -152,9 +198,10 @@ public final class SimpleCache implements Cache {
     this.cacheDir = cacheDir;
     this.evictor = evictor;
     this.contentIndex = contentIndex;
-    this.fileIndex = null;
+    this.fileIndex = fileIndex;
     listeners = new HashMap<>();
     random = new Random();
+    uid = -1;
 
     // Start cache initialization.
     final ConditionVariable conditionVariable = new ConditionVariable();
@@ -261,7 +308,7 @@ public final class SimpleCache implements Cache {
 
     // Read case.
     if (span.isCached) {
-      String fileName = span.file.getName();
+      String fileName = Assertions.checkNotNull(span.file).getName();
       long length = span.length;
       long lastAccessTimestamp = System.currentTimeMillis();
       boolean updateFile = false;
@@ -386,6 +433,11 @@ public final class SimpleCache implements Cache {
     return contentIndex.getContentMetadata(key);
   }
 
+  /** Returns the non-negative cache UID, or -1 if cache initialization failed. */
+  /* package */ synchronized long getUid() {
+    return uid;
+  }
+
   /**
    * Returns the cache {@link SimpleCacheSpan} corresponding to the provided lookup {@link
    * SimpleCacheSpan}.
@@ -419,21 +471,30 @@ public final class SimpleCache implements Cache {
   /** Ensures that the cache's in-memory representation has been initialized. */
   private void initialize() {
     if (!cacheDir.exists()) {
-      cacheDir.mkdirs();
-      return;
+      // Attempt to create the cache directory.
+      if (!cacheDir.mkdirs()) {
+        // TODO: Initialization failed. Decide how to handle this.
+        return;
+      }
     }
 
     File[] files = cacheDir.listFiles();
+    if (files == null) {
+      // TODO: Initialization failed. Decide how to handle this.
+      return;
+    }
 
-    long uid = 0;
     try {
       uid = loadUid(cacheDir, files);
     } catch (IOException e) {
-      // TODO: Decide how to handle this.
+      // TODO: Initialization failed. Decide how to handle this.
+      return;
     }
 
+    // TODO: Handle content index initialization failures.
     contentIndex.initialize(uid);
     if (fileIndex != null) {
+      // TODO: Handle file index initialization failures.
       fileIndex.initialize(uid);
       Map<String, CacheFileMetadata> fileMetadata = fileIndex.getAll();
       loadDirectory(cacheDir, /* isRoot= */ true, files, fileMetadata);
@@ -462,7 +523,7 @@ public final class SimpleCache implements Cache {
   private void loadDirectory(
       File directory,
       boolean isRoot,
-      File[] files,
+      @Nullable File[] files,
       @Nullable Map<String, CacheFileMetadata> fileMetadata) {
     if (files == null || files.length == 0) {
       // Either (a) directory isn't really a directory (b) it's empty, or (c) listing files failed.
@@ -582,17 +643,15 @@ public final class SimpleCache implements Cache {
    * @throws IOException If there is an error loading or generating the UID.
    */
   private static long loadUid(File directory, File[] files) throws IOException {
-    if (files != null) {
-      for (File file : files) {
-        String fileName = file.getName();
-        if (fileName.endsWith(UID_FILE_SUFFIX)) {
-          try {
-            return parseUid(fileName);
-          } catch (NumberFormatException e) {
-            // This should never happen, but if it does delete the malformed UID file and continue.
-            Log.e(TAG, "Malformed UID file: " + file);
-            file.delete();
-          }
+    for (File file : files) {
+      String fileName = file.getName();
+      if (fileName.endsWith(UID_FILE_SUFFIX)) {
+        try {
+          return parseUid(fileName);
+        } catch (NumberFormatException e) {
+          // This should never happen, but if it does delete the malformed UID file and continue.
+          Log.e(TAG, "Malformed UID file: " + file);
+          file.delete();
         }
       }
     }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
index cf76feca49..6c3521d62e 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
@@ -55,14 +55,43 @@ public class SimpleCacheTest {
   @Before
   public void setUp() throws Exception {
     MockitoAnnotations.initMocks(this);
-    cacheDir = Util.createTempDirectory(RuntimeEnvironment.application, "ExoPlayerTest");
+    cacheDir = Util.createTempFile(RuntimeEnvironment.application, "ExoPlayerTest");
+    // Delete the file. SimpleCache initialization should create a directory with the same name.
+    assertThat(cacheDir.delete()).isTrue();
   }
 
   @After
-  public void tearDown() throws Exception {
+  public void tearDown() {
     Util.recursiveDelete(cacheDir);
   }
 
+  @Test
+  public void testCacheInitialization() {
+    SimpleCache cache = getSimpleCache();
+
+    // Cache initialization should have created a non-negative UID.
+    long uid = cache.getUid();
+    assertThat(uid).isAtLeast(0L);
+    // And the cache directory.
+    assertThat(cacheDir.exists()).isTrue();
+
+    // Reinitialization should load the same non-negative UID.
+    cache.release();
+    cache = getSimpleCache();
+    assertThat(cache.getUid()).isEqualTo(uid);
+  }
+
+  @Test
+  public void testCacheInitializationError() throws IOException {
+    // Creating a file where the cache should be will cause an error during initialization.
+    assertThat(cacheDir.createNewFile()).isTrue();
+
+    // Cache initialization should not throw an exception, but no UID will be generated.
+    SimpleCache cache = getSimpleCache();
+    long uid = cache.getUid();
+    assertThat(uid).isEqualTo(-1L);
+  }
+
   @Test
   public void testCommittingOneFile() throws Exception {
     SimpleCache simpleCache = getSimpleCache();
@@ -294,10 +323,11 @@ public class SimpleCacheTest {
   /* Tests https://github.com/google/ExoPlayer/issues/3260 case. */
   @Test
   public void testExceptionDuringEvictionByLeastRecentlyUsedCacheEvictorNotHang() throws Exception {
-    CachedContentIndex index =
+    CachedContentIndex contentIndex =
         Mockito.spy(new CachedContentIndex(TestUtil.getTestDatabaseProvider()));
     SimpleCache simpleCache =
-        new SimpleCache(cacheDir, new LeastRecentlyUsedCacheEvictor(20), index);
+        new SimpleCache(
+            cacheDir, new LeastRecentlyUsedCacheEvictor(20), contentIndex, /* fileIndex= */ null);
 
     // Add some content.
     CacheSpan cacheSpan = simpleCache.startReadWrite(KEY_1, 0);
@@ -308,7 +338,7 @@ public class SimpleCacheTest {
             invocation -> {
               throw new CacheException("SimpleCacheTest");
             })
-        .when(index)
+        .when(contentIndex)
         .store();
 
     // Adding more content will make LeastRecentlyUsedCacheEvictor evict previous content.

From eea1ce3e0a505f04d17feeaceffea6c1ee1df442 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 22 Feb 2019 15:39:36 +0000
Subject: [PATCH 583/832] Fix channel count propagation on HLS traditional
 preparation

PiperOrigin-RevId: 235189983
---
 .../src/main/java/com/google/android/exoplayer2/Format.java  | 1 +
 .../exoplayer2/source/hls/HlsSampleStreamWrapper.java        | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Format.java b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
index 8778a4244b..975f32f64d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Format.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
@@ -1047,6 +1047,7 @@ public final class Format implements Parcelable {
       int bitrate,
       int width,
       int height,
+      int channelCount,
       @C.SelectionFlags int selectionFlags,
       @Nullable String language) {
     return new Format(
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
index 6e9d9cd424..c5e0c02925 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
@@ -1094,6 +1094,10 @@ import java.util.List;
       return sampleFormat;
     }
     int bitrate = propagateBitrate ? playlistFormat.bitrate : Format.NO_VALUE;
+    int channelCount =
+        playlistFormat.channelCount != Format.NO_VALUE
+            ? playlistFormat.channelCount
+            : sampleFormat.channelCount;
     int sampleTrackType = MimeTypes.getTrackType(sampleFormat.sampleMimeType);
     String codecs = Util.getCodecsOfType(playlistFormat.codecs, sampleTrackType);
     String mimeType = MimeTypes.getMediaMimeType(codecs);
@@ -1108,6 +1112,7 @@ import java.util.List;
         bitrate,
         playlistFormat.width,
         playlistFormat.height,
+        channelCount,
         playlistFormat.selectionFlags,
         playlistFormat.language);
   }

From e8077fb3f4a8f970e8d1314975b42ee8f746804f Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Fri, 22 Feb 2019 16:29:36 +0000
Subject: [PATCH 584/832] honour shuffle order when publishing queue to media
 session

Issue #5360

PiperOrigin-RevId: 235196177
---
 RELEASENOTES.md                               |  2 +
 .../mediasession/MediaSessionConnector.java   |  1 +
 .../mediasession/TimelineQueueNavigator.java  | 53 ++++++++++++++-----
 3 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 43a4f7d1c4..a73b56a7fe 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -60,6 +60,8 @@
   `TrackSelectionDialogBuilder` and add option to select multiple overrides.
 * MediaSessionConnector: Let apps intercept media button events
   ([#5179](https://github.com/google/ExoPlayer/issues/5179)).
+* Fix issue with `TimelineQueueNavigator` not publishing the queue in shuffled
+  order when in shuffle mode.
 
 ### 2.9.6 ###
 
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
index 6d80c1001f..617423a399 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
@@ -971,6 +971,7 @@ public final class MediaSessionConnector {
               ? PlaybackStateCompat.SHUFFLE_MODE_ALL
               : PlaybackStateCompat.SHUFFLE_MODE_NONE);
       invalidateMediaSessionPlaybackState();
+      invalidateMediaSessionQueue();
     }
 
     @Override
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
index 8575a74c70..6e61ad2fe2 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
@@ -25,10 +25,10 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ControlDispatcher;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.util.Util;
+import com.google.android.exoplayer2.util.Assertions;
+import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List;
 
 /**
  * An abstract implementation of the {@link MediaSessionConnector.QueueNavigator} that maps the
@@ -67,6 +67,7 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
    * @param maxQueueSize The maximum queue size.
    */
   public TimelineQueueNavigator(MediaSessionCompat mediaSession, int maxQueueSize) {
+    Assertions.checkState(maxQueueSize > 0);
     this.mediaSession = mediaSession;
     this.maxQueueSize = maxQueueSize;
     activeQueueItemId = MediaSessionCompat.QueueItem.UNKNOWN_ID;
@@ -193,22 +194,50 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
   // Helper methods.
 
   private void publishFloatingQueueWindow(Player player) {
-    if (player.getCurrentTimeline().isEmpty()) {
+    Timeline timeline = player.getCurrentTimeline();
+    if (timeline.isEmpty()) {
       mediaSession.setQueue(Collections.emptyList());
       activeQueueItemId = MediaSessionCompat.QueueItem.UNKNOWN_ID;
       return;
     }
-    int windowCount = player.getCurrentTimeline().getWindowCount();
+    ArrayDeque<MediaSessionCompat.QueueItem> queue = new ArrayDeque<>();
+    int queueSize = Math.min(maxQueueSize, timeline.getWindowCount());
+
+    // Add the active queue item.
     int currentWindowIndex = player.getCurrentWindowIndex();
-    int queueSize = Math.min(maxQueueSize, windowCount);
-    int startIndex = Util.constrainValue(currentWindowIndex - ((queueSize - 1) / 2), 0,
-        windowCount - queueSize);
-    List<MediaSessionCompat.QueueItem> queue = new ArrayList<>();
-    for (int i = startIndex; i < startIndex + queueSize; i++) {
-      queue.add(new MediaSessionCompat.QueueItem(getMediaDescription(player, i), i));
+    queue.add(
+        new MediaSessionCompat.QueueItem(
+            getMediaDescription(player, currentWindowIndex), currentWindowIndex));
+
+    // Fill queue alternating with next and/or previous queue items.
+    int firstWindowIndex = currentWindowIndex;
+    int lastWindowIndex = currentWindowIndex;
+    boolean shuffleModeEnabled = player.getShuffleModeEnabled();
+    while ((firstWindowIndex != C.INDEX_UNSET || lastWindowIndex != C.INDEX_UNSET)
+        && queue.size() < queueSize) {
+      // Begin with next to have a longer tail than head if an even sized queue needs to be trimmed.
+      if (lastWindowIndex != C.INDEX_UNSET) {
+        lastWindowIndex =
+            timeline.getNextWindowIndex(
+                lastWindowIndex, Player.REPEAT_MODE_OFF, shuffleModeEnabled);
+        if (lastWindowIndex != C.INDEX_UNSET) {
+          queue.add(
+              new MediaSessionCompat.QueueItem(
+                  getMediaDescription(player, lastWindowIndex), lastWindowIndex));
+        }
+      }
+      if (firstWindowIndex != C.INDEX_UNSET && queue.size() < queueSize) {
+        firstWindowIndex =
+            timeline.getPreviousWindowIndex(
+                firstWindowIndex, Player.REPEAT_MODE_OFF, shuffleModeEnabled);
+        if (firstWindowIndex != C.INDEX_UNSET) {
+          queue.addFirst(
+              new MediaSessionCompat.QueueItem(
+                  getMediaDescription(player, firstWindowIndex), firstWindowIndex));
+        }
+      }
     }
-    mediaSession.setQueue(queue);
+    mediaSession.setQueue(new ArrayList<>(queue));
     activeQueueItemId = currentWindowIndex;
   }
-
 }

From caeaa9574e5f3841425d970ee6cf564bed1ec9dd Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Sat, 23 Feb 2019 20:20:10 +0000
Subject: [PATCH 585/832] Avoid draining audio processors while reset

If the DefaultAudioSink was reconfigured in a way that was compatible with the
previous configuration just after having been reset, we would try to drain audio
processors despite not having an AudioTrack. This could result in a
NullPointerException if speed adjustment was active.

Fix this behavior by only trying to drain audio processors if we actually have
an AudioTrack.

PiperOrigin-RevId: 235355466
---
 .../exoplayer2/audio/DefaultAudioSink.java    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
index 12087382ef..f1c64e904c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
@@ -465,14 +465,17 @@ public final class DefaultAudioSink implements AudioSink {
             processingEnabled,
             canApplyPlaybackParameters,
             availableAudioProcessors);
-    if (configuration == null || !pendingConfiguration.canReuseAudioTrack(configuration)) {
-      // We need a new AudioTrack before we can handle more input. We should first stop() the track
-      // (if we have one) and wait for audio to play out. Tracked by [Internal: b/33161961].
-      flush();
-    } else if (flushAudioProcessors) {
-      // We don't need a new AudioTrack but audio processors need to be flushed.
-      this.pendingConfiguration = pendingConfiguration;
-      return;
+    if (isInitialized()) {
+      if (!pendingConfiguration.canReuseAudioTrack(configuration)) {
+        // We need a new AudioTrack before we can handle more input. We should first stop() the
+        // track and wait for audio to play out (tracked by [Internal: b/33161961]), but for now we
+        // discard the audio track immediately.
+        flush();
+      } else if (flushAudioProcessors) {
+        // We don't need a new AudioTrack but audio processors need to be drained and flushed.
+        this.pendingConfiguration = pendingConfiguration;
+        return;
+      }
     }
     configuration = pendingConfiguration;
   }

From f394697d4a485a4c2b1f75b2d470d621ba5675c8 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 25 Feb 2019 10:20:47 +0000
Subject: [PATCH 586/832] Fix updating rate with codec reuse while disabled

While disabled the renderer does not have non-null stream formats. This means
that setting the operating rate could cause a NullPointerException if there was
a codec for reuse.

Check for being enabled/started before trying to set the operating rate. After
the renderer is enabled it should receive a new input format which will update
the operating rate as needed.

PiperOrigin-RevId: 235494384
---
 .../android/exoplayer2/mediacodec/MediaCodecRenderer.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index cee54d77f8..75ef3c28e1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -559,7 +559,9 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   @Override
   public final void setOperatingRate(float operatingRate) throws ExoPlaybackException {
     rendererOperatingRate = operatingRate;
-    if (codec != null && codecDrainAction != DRAIN_ACTION_REINITIALIZE) {
+    if (codec != null
+        && codecDrainAction != DRAIN_ACTION_REINITIALIZE
+        && getState() != STATE_DISABLED) {
       updateCodecOperatingRate();
     }
   }

From 8edecd5ccb59880a24e9d3f104920eb1a1ce161e Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 25 Feb 2019 15:11:00 +0000
Subject: [PATCH 587/832] Update Matroska video codec FourCCs

Issue: #5503
PiperOrigin-RevId: 235523955
---
 .../exoplayer2/extractor/mkv/MatroskaExtractor.java        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
index 577f843b10..9469ecf6ce 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
@@ -219,8 +219,9 @@ public class MatroskaExtractor implements Extractor {
   private static final int LACING_FIXED_SIZE = 2;
   private static final int LACING_EBML = 3;
 
-  private static final int FOURCC_COMPRESSION_VC1 = 0x31435657;
   private static final int FOURCC_COMPRESSION_DIVX = 0x58564944;
+  private static final int FOURCC_COMPRESSION_H263 = 0x33363248;
+  private static final int FOURCC_COMPRESSION_VC1 = 0x31435657;
 
   /**
    * A template for the prefix that must be added to each subrip sample. The 12 byte end timecode
@@ -2057,8 +2058,6 @@ public class MatroskaExtractor implements Extractor {
     /**
      * Builds initialization data for a {@link Format} from FourCC codec private data.
      *
-     * <p>VC1 and H263 are the only supported compression types.
-     *
      * @return The codec mime type and initialization data. If the compression type is not supported
      *     then the mime type is set to {@link MimeTypes#VIDEO_UNKNOWN} and the initialization data
      *     is {@code null}.
@@ -2071,6 +2070,8 @@ public class MatroskaExtractor implements Extractor {
         long compression = buffer.readLittleEndianUnsignedInt();
         if (compression == FOURCC_COMPRESSION_DIVX) {
           return new Pair<>(MimeTypes.VIDEO_DIVX, null);
+        } else if (compression == FOURCC_COMPRESSION_H263) {
+          return new Pair<>(MimeTypes.VIDEO_H263, null);
         } else if (compression == FOURCC_COMPRESSION_VC1) {
           // Search for the initialization data from the end of the BITMAPINFOHEADER. The last 20
           // bytes of which are: sizeImage(4), xPel/m (4), yPel/m (4), clrUsed(4), clrImportant(4).

From 8449e7f45072b4a88da4835684c1437a1762200b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 25 Feb 2019 17:14:14 +0000
Subject: [PATCH 588/832] Add stubs for onCreate() and onPostCreate()

PiperOrigin-RevId: 235541545
---
 .../google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java
index 0462f39050..2c912c17f2 100644
--- a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java
+++ b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.android.exoplayer2.ext.gvr;
 
 import android.content.Context;
@@ -68,10 +69,8 @@ public abstract class GvrPlayerActivity extends GvrActivity {
     mainHandler = new Handler(Looper.getMainLooper());
   }
 
-  // TODO(b/124903498): Incompatible parameter type for savedInstanceState.
-  @SuppressWarnings("nullness:override.param.invalid")
   @Override
-  protected void onCreate(Bundle savedInstanceState) {
+  protected void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setScreenAlwaysOn(true);
 

From 0645a1838adf54cdf628cdda6721c6d23136484d Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 25 Feb 2019 20:07:22 +0000
Subject: [PATCH 589/832] [libvpx] Allow enabling row multi thread mode
 decoding in LibVPX

PiperOrigin-RevId: 235576645
---
 .../exoplayer2/ext/vp9/LibvpxVideoRenderer.java        |  6 ++++++
 .../google/android/exoplayer2/ext/vp9/VpxDecoder.java  |  7 +++++--
 extensions/vp9/src/main/jni/vpx_jni.cc                 | 10 +++++++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
index e64a128a86..be4e358073 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
@@ -107,6 +107,7 @@ public class LibvpxVideoRenderer extends BaseRenderer {
   /** The default input buffer size. */
   private static final int DEFAULT_INPUT_BUFFER_SIZE = 768 * 1024; // Value based on cs/SoftVpx.cpp.
 
+  private final boolean enableRowMultiThreadMode;
   private final boolean disableLoopFilter;
   private final long allowedJoiningTimeMs;
   private final int maxDroppedFramesToNotify;
@@ -218,6 +219,7 @@ public class LibvpxVideoRenderer extends BaseRenderer {
         drmSessionManager,
         playClearSamplesWithoutKeys,
         disableLoopFilter,
+        /* enableRowMultiThreadMode= */ false,
         getRuntime().availableProcessors());
   }
 
@@ -237,6 +239,7 @@ public class LibvpxVideoRenderer extends BaseRenderer {
    *     permitted to play clear regions of encrypted media files before {@code drmSessionManager}
    *     has obtained the keys necessary to decrypt encrypted regions of the media.
    * @param disableLoopFilter Disable the libvpx in-loop smoothing filter.
+   * @param enableRowMultiThreadMode Whether row multi threading decoding is enabled.
    * @param threads Number of threads libvpx will use to decode.
    */
   public LibvpxVideoRenderer(
@@ -247,6 +250,7 @@ public class LibvpxVideoRenderer extends BaseRenderer {
       DrmSessionManager<ExoMediaCrypto> drmSessionManager,
       boolean playClearSamplesWithoutKeys,
       boolean disableLoopFilter,
+      boolean enableRowMultiThreadMode,
       int threads) {
     super(C.TRACK_TYPE_VIDEO);
     this.disableLoopFilter = disableLoopFilter;
@@ -254,6 +258,7 @@ public class LibvpxVideoRenderer extends BaseRenderer {
     this.maxDroppedFramesToNotify = maxDroppedFramesToNotify;
     this.drmSessionManager = drmSessionManager;
     this.playClearSamplesWithoutKeys = playClearSamplesWithoutKeys;
+    this.enableRowMultiThreadMode = enableRowMultiThreadMode;
     this.threads = threads;
     joiningDeadlineMs = C.TIME_UNSET;
     clearReportedVideoSize();
@@ -762,6 +767,7 @@ public class LibvpxVideoRenderer extends BaseRenderer {
               initialInputBufferSize,
               mediaCrypto,
               disableLoopFilter,
+              enableRowMultiThreadMode,
               threads);
       decoder.setOutputMode(outputMode);
       TraceUtil.endSection();
diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java
index 33064af178..57e5481b55 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java
@@ -51,6 +51,7 @@ import java.nio.ByteBuffer;
    * @param exoMediaCrypto The {@link ExoMediaCrypto} object required for decoding encrypted
    *     content. Maybe null and can be ignored if decoder does not handle encrypted content.
    * @param disableLoopFilter Disable the libvpx in-loop smoothing filter.
+   * @param enableRowMultiThreadMode Whether row multi threading decoding is enabled.
    * @param threads Number of threads libvpx will use to decode.
    * @throws VpxDecoderException Thrown if an exception occurs when initializing the decoder.
    */
@@ -60,6 +61,7 @@ import java.nio.ByteBuffer;
       int initialInputBufferSize,
       ExoMediaCrypto exoMediaCrypto,
       boolean disableLoopFilter,
+      boolean enableRowMultiThreadMode,
       int threads)
       throws VpxDecoderException {
     super(new VpxInputBuffer[numInputBuffers], new VpxOutputBuffer[numOutputBuffers]);
@@ -70,7 +72,7 @@ import java.nio.ByteBuffer;
     if (exoMediaCrypto != null && !VpxLibrary.vpxIsSecureDecodeSupported()) {
       throw new VpxDecoderException("Vpx decoder does not support secure decode.");
     }
-    vpxDecContext = vpxInit(disableLoopFilter, threads);
+    vpxDecContext = vpxInit(disableLoopFilter, enableRowMultiThreadMode, threads);
     if (vpxDecContext == 0) {
       throw new VpxDecoderException("Failed to initialize decoder");
     }
@@ -167,7 +169,8 @@ import java.nio.ByteBuffer;
     }
   }
 
-  private native long vpxInit(boolean disableLoopFilter, int threads);
+  private native long vpxInit(
+      boolean disableLoopFilter, boolean enableRowMultiThreadMode, int threads);
 
   private native long vpxClose(long context);
   private native long vpxDecode(long context, ByteBuffer encoded, int length);
diff --git a/extensions/vp9/src/main/jni/vpx_jni.cc b/extensions/vp9/src/main/jni/vpx_jni.cc
index 6ff86af355..8036e78cbe 100644
--- a/extensions/vp9/src/main/jni/vpx_jni.cc
+++ b/extensions/vp9/src/main/jni/vpx_jni.cc
@@ -433,7 +433,8 @@ int vpx_release_frame_buffer(void* priv, vpx_codec_frame_buffer_t* fb) {
   return buffer_manager->release(*(int*)fb->priv);
 }
 
-DECODER_FUNC(jlong, vpxInit, jboolean disableLoopFilter, jint threads) {
+DECODER_FUNC(jlong, vpxInit, jboolean disableLoopFilter,
+             jboolean enableRowMultiThreadMode, jint threads) {
   JniCtx* context = new JniCtx();
   context->decoder = new vpx_codec_ctx_t();
   vpx_codec_dec_cfg_t cfg = {0, 0, 0};
@@ -446,6 +447,13 @@ DECODER_FUNC(jlong, vpxInit, jboolean disableLoopFilter, jint threads) {
     errorCode = err;
     return 0;
   }
+#ifdef VPX_CTRL_VP9_DECODE_SET_ROW_MT
+  err = vpx_codec_control_(context->decoder, VP9D_SET_ROW_MT,
+                           enableRowMultiThreadMode);
+  if (err) {
+    LOGE("ERROR: Failed to enable row multi thread mode, error = %d.", err);
+  }
+#endif
   if (disableLoopFilter) {
     // TODO(b/71930387): Use vpx_codec_control(), not vpx_codec_control_().
     err = vpx_codec_control_(context->decoder, VP9_SET_SKIP_LOOP_FILTER, true);

From 9798fdeadee1b66e40274cd4571f1ed896780180 Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Tue, 26 Feb 2019 10:26:17 +0000
Subject: [PATCH 590/832] add comments to issue templates which make the bot
 validate them

PiperOrigin-RevId: 235685393
---
 .github/ISSUE_TEMPLATE/bug.md                 | 4 ++++
 .github/ISSUE_TEMPLATE/content_not_playing.md | 5 ++++-
 .github/ISSUE_TEMPLATE/feature_request.md     | 5 ++++-
 .github/ISSUE_TEMPLATE/question.md            | 5 ++++-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index 8f2b02013e..f2cc754221 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -52,3 +52,7 @@ Specify the devices and versions of Android on which the issue can be
 reproduced, and how easily it reproduces. If possible, please test on multiple
 devices and Android versions.
 
+<!-- DO NOT DELETE
+validate_template=true
+template_path=.github/ISSUE_TEMPLATE/bug.md
+-->
diff --git a/.github/ISSUE_TEMPLATE/content_not_playing.md b/.github/ISSUE_TEMPLATE/content_not_playing.md
index a6a0b50b9d..a8265c4bd6 100644
--- a/.github/ISSUE_TEMPLATE/content_not_playing.md
+++ b/.github/ISSUE_TEMPLATE/content_not_playing.md
@@ -41,4 +41,7 @@ Specify the absolute version number. Avoid using terms such as "latest".
 Specify the devices and versions of Android on which you expect the content to
 play. If possible, please test on multiple devices and Android versions.
 
-
+<!-- DO NOT DELETE
+validate_template=true
+template_path=.github/ISSUE_TEMPLATE/content_not_playing.md
+-->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 5e8d3f9208..089de35910 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -28,4 +28,7 @@ A clear and concise description of your proposed solution, if you have one.
 A clear and concise description of any alternative solutions you considered,
 if applicable.
 
-
+<!-- DO NOT DELETE
+validate_template=true
+template_path=.github/ISSUE_TEMPLATE/feature_request.md
+-->
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 5316fbe492..57202f17dd 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -28,4 +28,7 @@ important for us to know this so that we can improve our documentation.
 ### [REQUIRED] Question
 Describe your question in detail.
 
-
+<!-- DO NOT DELETE
+validate_template=true
+template_path=.github/ISSUE_TEMPLATE/question.md
+-->

From b25d2c9978d69de6836b7a06cf6e4aa658abea85 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 27 Feb 2019 00:07:01 +0000
Subject: [PATCH 591/832] Adding @SuppressWarnings for the latest stable SDK Q
 drop

Global Presubmit : https://test.corp.google.com/ui#id=OCL:235456897:BASE:235767406:1551211793273:aa1704f6

LSC doc: go/android-sdk-lsc

PiperOrigin-RevId: 235812819
---
 .../com/google/android/exoplayer2/drm/FrameworkMediaDrm.java  | 4 ++++
 .../android/exoplayer2/scheduler/PlatformScheduler.java       | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
index c9b295a1e4..ede979fc43 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
@@ -75,6 +75,8 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
     }
   }
 
+  // FIXME: incompatible types in argument.
+  @SuppressWarnings("nullness:argument.type.incompatible")
   @Override
   public void setOnEventListener(
       final ExoMediaDrm.OnEventListener<? super FrameworkMediaCrypto> listener) {
@@ -146,6 +148,8 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
     return new KeyRequest(requestData, licenseServerUrl);
   }
 
+  // FIXME: incompatible types in return.
+  @SuppressWarnings("nullness:return.type.incompatible")
   @Override
   public byte[] provideKeyResponse(byte[] scope, byte[] response)
       throws NotProvisionedException, DeniedByServerException {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java
index aa77078b72..ec0bfe150f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java
@@ -153,6 +153,8 @@ public final class PlatformScheduler implements Scheduler {
         logd("Requirements are met");
         String serviceAction = extras.getString(KEY_SERVICE_ACTION);
         String servicePackage = extras.getString(KEY_SERVICE_PACKAGE);
+        // FIXME: incompatible types in argument.
+        @SuppressWarnings("nullness:argument.type.incompatible")
         Intent intent = new Intent(serviceAction).setPackage(servicePackage);
         logd("Starting service action: " + serviceAction + " package: " + servicePackage);
         Util.startForegroundService(this, intent);

From 92a7bb534a706fe917308af48a4958c99b3bb754 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 28 Feb 2019 11:21:09 +0000
Subject: [PATCH 592/832] Remove wrong documentation.

This is a left-over from the past and is no longer true.

PiperOrigin-RevId: 236089921
---
 .../main/java/com/google/android/exoplayer2/ExoPlayer.java  | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
index 0ba4501207..d0f9e2ae04 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
@@ -153,18 +153,12 @@ public interface ExoPlayer extends Player {
   /**
    * Prepares the player to play the provided {@link MediaSource}. Equivalent to
    * {@code prepare(mediaSource, true, true)}.
-   * <p>
-   * Note: {@link MediaSource} instances are not designed to be re-used. If you want to prepare a
-   * player more than once with the same piece of media, use a new instance each time.
    */
   void prepare(MediaSource mediaSource);
 
   /**
    * Prepares the player to play the provided {@link MediaSource}, optionally resetting the playback
    * position the default position in the first {@link Timeline.Window}.
-   * <p>
-   * Note: {@link MediaSource} instances are not designed to be re-used. If you want to prepare a
-   * player more than once with the same piece of media, use a new instance each time.
    *
    * @param mediaSource The {@link MediaSource} to play.
    * @param resetPosition Whether the playback position should be reset to the default position in

From 377e550d0fa7036853fa16514ca129d20212544e Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 28 Feb 2019 11:55:24 +0000
Subject: [PATCH 593/832] Improve new error type documentation and prevent NPE
 in error listener.

Adding new error types may cause issues when listeners assume a fixed set of
error types and don't handle arbitrary defaults.

Fixing error handling in one case and improving documentation to make people
aware of the issue.

PiperOrigin-RevId: 236093265
---
 RELEASENOTES.md                                   |  2 ++
 .../android/exoplayer2/ExoPlaybackException.java  | 15 ++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index a73b56a7fe..db15ff8653 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,6 +2,8 @@
 
 ### dev-v2 (not yet released) ###
 
+* Add new `ExoPlaybackException` types for remote exceptions and out-of-memory
+  errors.
 * HLS:
   * Prevent unnecessary reloads of initialization segments.
   * Form an adaptive track group out of audio renditions with matching name.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
index 5ac4e39546..4a8f8709e9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2;
 
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
@@ -31,7 +32,8 @@ public final class ExoPlaybackException extends Exception {
 
   /**
    * The type of source that produced the error. One of {@link #TYPE_SOURCE}, {@link #TYPE_RENDERER}
-   * {@link #TYPE_UNEXPECTED}, {@link #TYPE_REMOTE} or {@link #TYPE_OUT_OF_MEMORY}.
+   * {@link #TYPE_UNEXPECTED}, {@link #TYPE_REMOTE} or {@link #TYPE_OUT_OF_MEMORY}. Note that new
+   * types may be added in the future and error handling should handle unknown type values.
    */
   @Documented
   @Retention(RetentionPolicy.SOURCE)
@@ -64,10 +66,7 @@ public final class ExoPlaybackException extends Exception {
   /** The error was an {@link OutOfMemoryError}. */
   public static final int TYPE_OUT_OF_MEMORY = 4;
 
-  /**
-   * The type of the playback failure. One of {@link #TYPE_SOURCE}, {@link #TYPE_RENDERER}, {@link
-   * #TYPE_UNEXPECTED}, {@link #TYPE_REMOTE} and {@link #TYPE_OUT_OF_MEMORY}.
-   */
+  /** The {@link Type} of the playback failure. */
   @Type public final int type;
 
   /**
@@ -104,7 +103,8 @@ public final class ExoPlaybackException extends Exception {
    * @param cause The cause of the failure.
    * @return The created instance.
    */
-  /* package */ static ExoPlaybackException createForUnexpected(RuntimeException cause) {
+  @VisibleForTesting
+  public static ExoPlaybackException createForUnexpected(RuntimeException cause) {
     return new ExoPlaybackException(TYPE_UNEXPECTED, cause, /* rendererIndex= */ C.INDEX_UNSET);
   }
 
@@ -124,7 +124,8 @@ public final class ExoPlaybackException extends Exception {
    * @param cause The cause of the failure.
    * @return The created instance.
    */
-  /* package */ static ExoPlaybackException createForOutOfMemoryError(OutOfMemoryError cause) {
+  @VisibleForTesting
+  public static ExoPlaybackException createForOutOfMemoryError(OutOfMemoryError cause) {
     return new ExoPlaybackException(TYPE_OUT_OF_MEMORY, cause, /* rendererIndex= */ C.INDEX_UNSET);
   }
 

From 2ae07936baf638bfd2a714a1a73ef9f31eab8e9c Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 28 Feb 2019 13:00:20 +0000
Subject: [PATCH 594/832] Handle !resetPosition as initial seek position.

The flag in ExoPlayer.prepare is documented as keeping the current window
index and window position. We are currently using the current period UID and
period position instead. This causes problems when the media source is changed
but the position is not reset.

Using the initial seek position instead ensures we actually use the window
index and position.

Issue:#5520
PiperOrigin-RevId: 236101024
---
 RELEASENOTES.md                               |  3 ++
 .../exoplayer2/ExoPlayerImplInternal.java     |  6 +++
 .../android/exoplayer2/ExoPlayerTest.java     | 39 +++++++++++++++++++
 3 files changed, 48 insertions(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index db15ff8653..3136cdadcc 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -64,6 +64,9 @@
   ([#5179](https://github.com/google/ExoPlayer/issues/5179)).
 * Fix issue with `TimelineQueueNavigator` not publishing the queue in shuffled
   order when in shuffle mode.
+* Fix issue where not resetting the position for a new `MediaSource` in calls to
+  `ExoPlayer.prepare` causes an `IndexOutOfBoundsException`
+  ([#5520](https://github.com/google/ExoPlayer/issues/5520)).
 
 ### 2.9.6 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index f6013212d0..0a1a73023f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -436,6 +436,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
   private void prepareInternal(MediaSource mediaSource, boolean resetPosition, boolean resetState) {
     pendingPrepareCount++;
+    if (!resetPosition && pendingInitialSeekPosition == null && !playbackInfo.timeline.isEmpty()) {
+      playbackInfo.timeline.getPeriodByUid(playbackInfo.periodId.periodUid, period);
+      long windowPositionUs = playbackInfo.positionUs + period.getPositionInWindowUs();
+      pendingInitialSeekPosition =
+          new SeekPosition(Timeline.EMPTY, period.windowIndex, windowPositionUs);
+    }
     resetInternal(
         /* resetRenderers= */ false, /* releaseMediaSource= */ true, resetPosition, resetState);
     loadControl.onPrepared();
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
index 9b41d19123..fa8445475b 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
@@ -1124,6 +1124,45 @@ public final class ExoPlayerTest {
     testRunner.assertPlayedPeriodIndices(0, 1);
   }
 
+  @Test
+  public void testReprepareAndKeepPositionWithNewMediaSource() throws Exception {
+    Timeline timeline =
+        new FakeTimeline(
+            new TimelineWindowDefinition(/* periodCount= */ 1, /* id= */ new Object()));
+    Timeline secondTimeline =
+        new FakeTimeline(
+            new TimelineWindowDefinition(/* periodCount= */ 1, /* id= */ new Object()));
+    MediaSource secondSource = new FakeMediaSource(secondTimeline, /* manifest= */ null);
+    AtomicLong positionAfterReprepare = new AtomicLong();
+    ActionSchedule actionSchedule =
+        new ActionSchedule.Builder("testReprepareAndKeepPositionWithNewMediaSource")
+            .pause()
+            .waitForPlaybackState(Player.STATE_READY)
+            .playUntilPosition(/* windowIndex= */ 0, /* positionMs= */ 2000)
+            .prepareSource(secondSource, /* resetPosition= */ false, /* resetState= */ true)
+            .waitForTimelineChanged(secondTimeline)
+            .executeRunnable(
+                new PlayerRunnable() {
+                  @Override
+                  public void run(SimpleExoPlayer player) {
+                    positionAfterReprepare.set(player.getCurrentPosition());
+                  }
+                })
+            .play()
+            .build();
+    ExoPlayerTestRunner testRunner =
+        new ExoPlayerTestRunner.Builder()
+            .setTimeline(timeline)
+            .setActionSchedule(actionSchedule)
+            .build(context)
+            .start()
+            .blockUntilActionScheduleFinished(TIMEOUT_MS)
+            .blockUntilEnded(TIMEOUT_MS);
+
+    testRunner.assertTimelinesEqual(timeline, Timeline.EMPTY, secondTimeline);
+    assertThat(positionAfterReprepare.get()).isAtLeast(2000L);
+  }
+
   @Test
   public void testStopDuringPreparationOverwritesPreparation() throws Exception {
     Timeline timeline = new FakeTimeline(/* windowCount= */ 1);

From 0bb123aa4c9cc1c0dc94ef2ba3d326658e2c53d1 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 28 Feb 2019 15:31:09 +0000
Subject: [PATCH 595/832] TrackSelectionView: Use same "isAdaptive" logic in
 updateViews and onClick.

We currently do not show check boxes if the renderer does not support adaptive
switches between tracks in one group. However, we assume check boxes in the
onClick method.

Use same logic for both methods to be consistent.

PiperOrigin-RevId: 236118372
---
 .../exoplayer2/ui/TrackSelectionView.java     | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
index 7af1a905ef..2171d4eac2 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
@@ -37,6 +37,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
+import org.checkerframework.checker.nullness.qual.RequiresNonNull;
 
 /** A view for making track selections. */
 public class TrackSelectionView extends LinearLayout {
@@ -257,11 +258,7 @@ public class TrackSelectionView extends LinearLayout {
         allowMultipleOverrides && trackGroups.length > 1;
     for (int groupIndex = 0; groupIndex < trackGroups.length; groupIndex++) {
       TrackGroup group = trackGroups.get(groupIndex);
-      boolean enableMultipleChoiceForAdaptiveSelections =
-          allowAdaptiveSelections
-              && trackGroups.get(groupIndex).length > 1
-              && mappedTrackInfo.getAdaptiveSupport(rendererIndex, groupIndex, false)
-                  != RendererCapabilities.ADAPTIVE_NOT_SUPPORTED;
+      boolean enableMultipleChoiceForAdaptiveSelections = shouldEnableAdaptiveSelection(groupIndex);
       trackViews[groupIndex] = new CheckedTextView[group.length];
       for (int trackIndex = 0; trackIndex < group.length; trackIndex++) {
         if (trackIndex == 0) {
@@ -334,11 +331,13 @@ public class TrackSelectionView extends LinearLayout {
     int groupIndex = tag.first;
     int trackIndex = tag.second;
     SelectionOverride override = overrides.get(groupIndex);
+    Assertions.checkNotNull(mappedTrackInfo);
+    boolean adaptiveSelectionsEnabled = shouldEnableAdaptiveSelection(groupIndex);
     if (!allowMultipleOverrides && override == null && overrides.size() > 0) {
       // A new override is being started and we don't allow multiple overrides.
       overrides.clear();
     }
-    if (override == null || !allowAdaptiveSelections) {
+    if (override == null || !adaptiveSelectionsEnabled) {
       // Update override for current group.
       if (((CheckedTextView) view).isChecked()) {
         overrides.remove(groupIndex);
@@ -371,6 +370,14 @@ public class TrackSelectionView extends LinearLayout {
     }
   }
 
+  @RequiresNonNull("mappedTrackInfo")
+  private boolean shouldEnableAdaptiveSelection(int groupIndex) {
+    return allowAdaptiveSelections
+        && trackGroups.get(groupIndex).length > 1
+        && mappedTrackInfo.getAdaptiveSupport(rendererIndex, groupIndex, false)
+            != RendererCapabilities.ADAPTIVE_NOT_SUPPORTED;
+  }
+
   private static int[] getTracksAdding(int[] tracks, int addedTrack) {
     tracks = Arrays.copyOf(tracks, tracks.length + 1);
     tracks[tracks.length - 1] = addedTrack;

From 84e20216d7b283cb76e9978a27030d717067832a Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 28 Feb 2019 15:31:33 +0000
Subject: [PATCH 596/832] Do not allow deselection of radio button.

Instead just set the currently clicked item as override. If the already
selected button is clicked, the override is reset with the same value.

PiperOrigin-RevId: 236118429
---
 .../android/exoplayer2/ui/TrackSelectionView.java     | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
index 2171d4eac2..621eeda1dd 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
@@ -338,15 +338,8 @@ public class TrackSelectionView extends LinearLayout {
       overrides.clear();
     }
     if (override == null || !adaptiveSelectionsEnabled) {
-      // Update override for current group.
-      if (((CheckedTextView) view).isChecked()) {
-        overrides.remove(groupIndex);
-        if (overrides.size() == 0) {
-          isDisabled = true;
-        }
-      } else {
-        overrides.put(groupIndex, new SelectionOverride(groupIndex, trackIndex));
-      }
+      // Set new override for current group.
+      overrides.put(groupIndex, new SelectionOverride(groupIndex, trackIndex));
     } else {
       // An existing override is being modified.
       int overrideLength = override.length;

From 3eeb3acb3b50676bedbfd4cdcb631d15ec7b9f91 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 28 Feb 2019 15:33:17 +0000
Subject: [PATCH 597/832] Remove nullness suppressions.

These were added in an internal clean-up and are better fixed than suppressed.

PiperOrigin-RevId: 236118715
---
 .../com/google/android/exoplayer2/drm/DrmInitData.java     | 4 +---
 .../android/exoplayer2/metadata/id3/ChapterTocFrame.java   | 4 +---
 .../google/android/exoplayer2/metadata/id3/MlltFrame.java  | 7 +++----
 .../google/android/exoplayer2/offline/DownloadHelper.java  | 6 ++----
 .../exoplayer2/trackselection/DefaultTrackSelector.java    | 4 +---
 .../main/java/com/google/android/exoplayer2/util/Util.java | 3 +--
 .../android/exoplayer2/ui/PlayerNotificationManager.java   | 6 +++---
 7 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
index af2bd057b5..60701be63c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
@@ -137,11 +137,9 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
   }
 
   /* package */
-  // TODO(b/124903498): incompatible types in assignment.
-  @SuppressWarnings("nullness:assignment.type.incompatible")
   DrmInitData(Parcel in) {
     schemeType = in.readString();
-    schemeDatas = in.createTypedArray(SchemeData.CREATOR);
+    schemeDatas = Util.castNonNull(in.createTypedArray(SchemeData.CREATOR));
     schemeDataCount = schemeDatas.length;
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java
index 2184e4f9ec..5d454e84ac 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java
@@ -46,14 +46,12 @@ public final class ChapterTocFrame extends Id3Frame {
   }
 
   /* package */
-  // TODO(b/124903498): incompatible types in assignment.
-  @SuppressWarnings("nullness:assignment.type.incompatible")
   ChapterTocFrame(Parcel in) {
     super(ID);
     this.elementId = castNonNull(in.readString());
     this.isRoot = in.readByte() != 0;
     this.isOrdered = in.readByte() != 0;
-    this.children = in.createStringArray();
+    this.children = castNonNull(in.createStringArray());
     int subFrameCount = in.readInt();
     subFrames = new Id3Frame[subFrameCount];
     for (int i = 0; i < subFrameCount; i++) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java
index df41ce863f..0cdd2e038e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.metadata.id3;
 
 import android.os.Parcel;
 import androidx.annotation.Nullable;
+import com.google.android.exoplayer2.util.Util;
 import java.util.Arrays;
 
 /** MPEG location lookup table frame. */
@@ -45,15 +46,13 @@ public final class MlltFrame extends Id3Frame {
   }
 
   /* package */
-  // TODO(b/124903498): incompatible types in assignment.
-  @SuppressWarnings("nullness:assignment.type.incompatible")
   MlltFrame(Parcel in) {
     super(ID);
     this.mpegFramesBetweenReference = in.readInt();
     this.bytesBetweenReference = in.readInt();
     this.millisecondsBetweenReference = in.readInt();
-    this.bytesDeviations = in.createIntArray();
-    this.millisecondsDeviations = in.createIntArray();
+    this.bytesDeviations = Util.castNonNull(in.createIntArray());
+    this.millisecondsDeviations = Util.castNonNull(in.createIntArray());
   }
 
   @Override
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index fe58323dad..e4e92c8cab 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -363,13 +363,11 @@ public final class DownloadHelper {
    *     Looper}, in which case it will be called on the application's main thread.
    * @throws IllegalStateException If the download helper has already been prepared.
    */
-  // TODO(b/124903498): incompatible types in argument.
-  @SuppressWarnings("nullness:argument.type.incompatible")
   public void prepare(Callback callback) {
     Assertions.checkState(this.callback == null);
     this.callback = callback;
-    callbackHandler =
-        new Handler(Looper.myLooper() != null ? Looper.myLooper() : Looper.getMainLooper());
+    Looper myLooper = Looper.myLooper();
+    callbackHandler = new Handler(myLooper != null ? myLooper : Looper.getMainLooper());
     if (mediaSource != null) {
       mediaPreparer = new MediaPreparer(mediaSource, /* downloadHelper= */ this);
     } else {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
index aa122f3082..7d488b93c6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -889,8 +889,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     }
 
     /* package */
-    // TODO(b/124903498): incompatible types in assignment.
-    @SuppressWarnings("nullness:assignment.type.incompatible")
     Parameters(Parcel in) {
       super(in);
       // Video
@@ -917,7 +915,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       this.tunnelingAudioSessionId = in.readInt();
       // Overrides
       this.selectionOverrides = readSelectionOverrides(in);
-      this.rendererDisabledFlags = in.readSparseBooleanArray();
+      this.rendererDisabledFlags = Util.castNonNull(in.readSparseBooleanArray());
       // Deprecated fields.
       this.allowMixedMimeAdaptiveness = allowVideoMixedMimeTypeAdaptiveness;
       this.allowNonSeamlessAdaptiveness = allowVideoNonSeamlessAdaptiveness;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
index c0f83674e3..489314cbc8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
@@ -162,8 +162,7 @@ public final class Util {
    * @param intent The intent to pass to the called method.
    * @return The result of the called method.
    */
-  // TODO(b/124903498): incompatible types in return.
-  @SuppressWarnings("nullness:return.type.incompatible")
+  @Nullable
   public static ComponentName startForegroundService(Context context, Intent intent) {
     if (Util.SDK_INT >= 26) {
       return context.startForegroundService(intent);
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
index cd232a21db..828b206f44 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
@@ -1265,8 +1265,6 @@ public class PlayerNotificationManager {
 
   private class NotificationBroadcastReceiver extends BroadcastReceiver {
 
-    // TODO(b/124903498): incompatible types in argument.
-    @SuppressWarnings("nullness:argument.type.incompatible")
     @Override
     public void onReceive(Context context, Intent intent) {
       Player player = PlayerNotificationManager.this.player;
@@ -1299,7 +1297,9 @@ public class PlayerNotificationManager {
         controlDispatcher.dispatchStop(player, /* reset= */ true);
       } else if (ACTION_DISMISS.equals(action)) {
         stopNotification(/* dismissedByUser= */ true);
-      } else if (customActionReceiver != null && customActions.containsKey(action)) {
+      } else if (action != null
+          && customActionReceiver != null
+          && customActions.containsKey(action)) {
         customActionReceiver.onCustomAction(player, action, intent);
       }
     }

From 84c8842dfa78becbc4bfccc2e26426a6cb4f840f Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 28 Feb 2019 15:38:42 +0000
Subject: [PATCH 598/832] Prevent multiple track selection dialogs in
 PlayerActivity.

PiperOrigin-RevId: 236119640
---
 .../android/exoplayer2/demo/PlayerActivity.java       | 11 ++++++++---
 .../android/exoplayer2/demo/TrackSelectionDialog.java |  7 +++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

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 2839d3937c..2c252714b4 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
@@ -126,6 +126,7 @@ public class PlayerActivity extends AppCompatActivity
   private LinearLayout debugRootView;
   private Button selectTracksButton;
   private TextView debugTextView;
+  private boolean isShowingTrackSelectionDialog;
 
   private DataSource.Factory dataSourceFactory;
   private SimpleExoPlayer player;
@@ -293,9 +294,13 @@ public class PlayerActivity extends AppCompatActivity
 
   @Override
   public void onClick(View view) {
-    if (view == selectTracksButton) {
-      TrackSelectionDialog dialog = TrackSelectionDialog.createForTrackSelector(trackSelector);
-      dialog.show(getSupportFragmentManager(), /* tag= */ null);
+    if (view == selectTracksButton && !isShowingTrackSelectionDialog) {
+      isShowingTrackSelectionDialog = true;
+      TrackSelectionDialog newDialog =
+          TrackSelectionDialog.createForTrackSelector(
+              trackSelector,
+              /* onDismissListener= */ dialog -> isShowingTrackSelectionDialog = false);
+      newDialog.show(getSupportFragmentManager(), /* tag= */ null);
     }
   }
 
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
index 2f2461f82f..dfd137e723 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
@@ -63,8 +63,11 @@ public final class TrackSelectionDialog extends DialogFragment {
    * the track selector's parameters when tracks are selected.
    *
    * @param trackSelector A {@link DefaultTrackSelector}.
+   * @param onDismissListener {@link DialogInterface.OnDismissListener} called when the dialog is
+   *     dismissed.
    */
-  public static TrackSelectionDialog createForTrackSelector(DefaultTrackSelector trackSelector) {
+  public static TrackSelectionDialog createForTrackSelector(
+      DefaultTrackSelector trackSelector, DialogInterface.OnDismissListener onDismissListener) {
     MappedTrackInfo mappedTrackInfo =
         Assertions.checkNotNull(trackSelector.getCurrentMappedTrackInfo());
     TrackSelectionDialog trackSelectionDialog = new TrackSelectionDialog();
@@ -94,7 +97,7 @@ public final class TrackSelectionDialog extends DialogFragment {
           }
           trackSelector.setParameters(builder);
         },
-        /* onDismissListener= */ (dialog) -> {});
+        onDismissListener);
     return trackSelectionDialog;
   }
 

From cde6189c14c8eebc8485ea274b20500ab44a2233 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 28 Feb 2019 15:42:37 +0000
Subject: [PATCH 599/832] Repair progressive downloads in DownloadTracker.

They are currently broken because we ignore downloads without periods.
As the DownloadHelper doesn't create periods for progressive media, we don't
download them. Fixing by starting download automatically without showing
track selection dialog.

PiperOrigin-RevId: 236120202
---
 .../com/google/android/exoplayer2/demo/DownloadTracker.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index c61828406b..ef7cf5e25a 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -247,7 +247,10 @@ public class DownloadTracker implements DownloadManager.Listener {
     @Override
     public void onPrepared(DownloadHelper helper) {
       if (helper.getPeriodCount() == 0) {
-        onPrepareError(helper, new IOException("No periods found."));
+        Log.d(TAG, "No periods found. Downloading entire stream.");
+        DownloadAction downloadAction = downloadHelper.getDownloadAction(Util.getUtf8Bytes(name));
+        startDownload(downloadAction);
+        downloadHelper.release();
         return;
       }
       mappedTrackInfo = downloadHelper.getMappedTrackInfo(/* periodIndex= */ 0);

From f87cb81f3541a0f35314626dcfd7b2da37b16959 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 28 Feb 2019 16:02:24 +0000
Subject: [PATCH 600/832] Enable caching in internal demo app.

So far it's only enabled in the external demo app.

PiperOrigin-RevId: 236122825
---
 .../exoplayer2/demo/DemoApplication.java      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
index 27033bb03e..f2d10807fb 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
@@ -102,6 +102,14 @@ public class DemoApplication extends Application {
     return downloadTracker;
   }
 
+  protected synchronized Cache getDownloadCache() {
+    if (downloadCache == null) {
+      File downloadContentDirectory = new File(getDownloadDirectory(), DOWNLOAD_CONTENT_DIRECTORY);
+      downloadCache = new SimpleCache(downloadContentDirectory, new NoOpCacheEvictor());
+    }
+    return downloadCache;
+  }
+
   private synchronized void initDownloadManager() {
     if (downloadManager == null) {
       DefaultDownloadIndex downloadIndex = new DefaultDownloadIndex(new ExoDatabaseProvider(this));
@@ -130,14 +138,6 @@ public class DemoApplication extends Application {
     }
   }
 
-  private synchronized Cache getDownloadCache() {
-    if (downloadCache == null) {
-      File downloadContentDirectory = new File(getDownloadDirectory(), DOWNLOAD_CONTENT_DIRECTORY);
-      downloadCache = new SimpleCache(downloadContentDirectory, new NoOpCacheEvictor());
-    }
-    return downloadCache;
-  }
-
   private File getDownloadDirectory() {
     if (downloadDirectory == null) {
       downloadDirectory = getExternalFilesDir(null);
@@ -148,8 +148,8 @@ public class DemoApplication extends Application {
     return downloadDirectory;
   }
 
-  private static CacheDataSourceFactory buildReadOnlyCacheDataSource(
-      DefaultDataSourceFactory upstreamFactory, Cache cache) {
+  protected static CacheDataSourceFactory buildReadOnlyCacheDataSource(
+      DataSource.Factory upstreamFactory, Cache cache) {
     return new CacheDataSourceFactory(
         cache,
         upstreamFactory,

From 0624046a7b8eaefc5c5c5714a7d4e20ca2260f27 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 28 Feb 2019 17:10:22 +0000
Subject: [PATCH 601/832] Stop using deprecated method in demo app.

PiperOrigin-RevId: 236133636
---
 .../com/google/android/exoplayer2/demo/DemoApplication.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
index f2d10807fb..8ed4a128d4 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
@@ -89,7 +89,8 @@ public class DemoApplication extends Application {
                 ? DefaultRenderersFactory.EXTENSION_RENDERER_MODE_PREFER
                 : DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON)
             : DefaultRenderersFactory.EXTENSION_RENDERER_MODE_OFF;
-    return new DefaultRenderersFactory(this, extensionRendererMode);
+    return new DefaultRenderersFactory(/* context= */ this)
+        .setExtensionRendererMode(extensionRendererMode);
   }
 
   public DownloadManager getDownloadManager() {

From b48ceb19bd656fefbed95e78c53a24e4d2c6c814 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 28 Feb 2019 17:27:13 +0000
Subject: [PATCH 602/832] Remove unneccessary deprecated constants and classes.

This constants and classes are defined by the same name in the super class and
thus can be safely removed.

PiperOrigin-RevId: 236136197
---
 .../exoplayer2/ui/PlaybackControlView.java    | 23 -------------------
 1 file changed, 23 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlaybackControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlaybackControlView.java
index 5467538c0f..47d60e0233 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlaybackControlView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlaybackControlView.java
@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.ui;
 
 import android.content.Context;
 import android.util.AttributeSet;
-import com.google.android.exoplayer2.util.RepeatModeUtil;
 
 /** @deprecated Use {@link PlayerControlView}. */
 @Deprecated
@@ -27,13 +26,6 @@ public class PlaybackControlView extends PlayerControlView {
   @Deprecated
   public interface ControlDispatcher extends com.google.android.exoplayer2.ControlDispatcher {}
 
-  /**
-   * @deprecated Use {@link com.google.android.exoplayer2.ui.PlayerControlView.VisibilityListener}.
-   */
-  @Deprecated
-  public interface VisibilityListener
-      extends com.google.android.exoplayer2.ui.PlayerControlView.VisibilityListener {}
-
   @Deprecated
   @SuppressWarnings("deprecation")
   private static final class DefaultControlDispatcher
@@ -43,20 +35,6 @@ public class PlaybackControlView extends PlayerControlView {
   @SuppressWarnings("deprecation")
   public static final ControlDispatcher DEFAULT_CONTROL_DISPATCHER = new DefaultControlDispatcher();
 
-  /** The default fast forward increment, in milliseconds. */
-  public static final int DEFAULT_FAST_FORWARD_MS = PlayerControlView.DEFAULT_FAST_FORWARD_MS;
-  /** The default rewind increment, in milliseconds. */
-  public static final int DEFAULT_REWIND_MS = PlayerControlView.DEFAULT_REWIND_MS;
-  /** The default show timeout, in milliseconds. */
-  public static final int DEFAULT_SHOW_TIMEOUT_MS = PlayerControlView.DEFAULT_SHOW_TIMEOUT_MS;
-  /** The default repeat toggle modes. */
-  public static final @RepeatModeUtil.RepeatToggleModes int DEFAULT_REPEAT_TOGGLE_MODES =
-      PlayerControlView.DEFAULT_REPEAT_TOGGLE_MODES;
-
-  /** The maximum number of windows that can be shown in a multi-window time bar. */
-  public static final int MAX_WINDOWS_FOR_MULTI_WINDOW_TIME_BAR =
-      PlayerControlView.MAX_WINDOWS_FOR_MULTI_WINDOW_TIME_BAR;
-
   public PlaybackControlView(Context context) {
     super(context);
   }
@@ -73,5 +51,4 @@ public class PlaybackControlView extends PlayerControlView {
       Context context, AttributeSet attrs, int defStyleAttr, AttributeSet playbackAttrs) {
     super(context, attrs, defStyleAttr, playbackAttrs);
   }
-
 }

From 8fce3ce678689888f7b499b3f15180286a6e20b8 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 1 Mar 2019 08:59:42 +0000
Subject: [PATCH 603/832] Do not throw in resolveSeekPosition on playback
 thread.

We currently throw if a pending seek position was valid when the user issued
it on the app thread, but can't be resolved on the playback thread because the
timeline changed in the meantime. Throwing in this case seems wrong as the
user could not have known about the issue (and the seek position was actually
valid). Also, in other cases where the currently playing period is no longer
in the new timeline, we gracefully use a subsequent period or transition to
ENDED state instead of throwing. So it seems more consistent to transition to
ENDED state as well.

PiperOrigin-RevId: 236274862
---
 .../exoplayer2/ExoPlayerImplInternal.java     | 19 +-----
 .../android/exoplayer2/ExoPlayerTest.java     | 62 ++++++-------------
 2 files changed, 23 insertions(+), 58 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index 0a1a73023f..4c8cda9e27 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -1268,20 +1268,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
       playbackInfoUpdate.incrementPendingOperationAcks(pendingPrepareCount);
       pendingPrepareCount = 0;
       if (pendingInitialSeekPosition != null) {
-        Pair<Object, Long> periodPosition;
-        try {
-          periodPosition =
-              resolveSeekPosition(pendingInitialSeekPosition, /* trySubsequentPeriods= */ true);
-        } catch (IllegalSeekPositionException e) {
-          MediaPeriodId firstMediaPeriodId =
-              playbackInfo.getDummyFirstMediaPeriodId(shuffleModeEnabled, window);
-          playbackInfo =
-              playbackInfo.resetToNewPosition(
-                  firstMediaPeriodId,
-                  /* startPositionUs= */ C.TIME_UNSET,
-                  /* contentPositionUs= */ C.TIME_UNSET);
-          throw e;
-        }
+        Pair<Object, Long> periodPosition =
+            resolveSeekPosition(pendingInitialSeekPosition, /* trySubsequentPeriods= */ true);
         pendingInitialSeekPosition = null;
         if (periodPosition == null) {
           // The seek position was valid for the timeline that it was performed into, but the
@@ -1481,8 +1469,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
           seekPosition.windowPositionUs);
     } catch (IndexOutOfBoundsException e) {
       // The window index of the seek position was outside the bounds of the timeline.
-      throw new IllegalSeekPositionException(
-          timeline, seekPosition.windowIndex, C.usToMs(seekPosition.windowPositionUs));
+      return null;
     }
     if (timeline == seekTimeline) {
       // Our internal timeline is the seek timeline, so the mapped position is correct.
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
index fa8445475b..bba75adb5e 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
@@ -549,12 +549,9 @@ public final class ExoPlayerTest {
     ActionSchedule actionSchedule =
         new ActionSchedule.Builder("testSeekProcessedCalledWithIllegalSeekPosition")
             .waitForPlaybackState(Player.STATE_BUFFERING)
-            // Cause an illegal seek exception by seeking to an invalid position while the media
-            // source is still being prepared and the player doesn't immediately know it will fail.
-            // Because the media source prepares immediately, the exception will be thrown when the
-            // player processed the seek.
+            // The illegal seek position will end playback.
             .seek(/* windowIndex= */ 100, /* positionMs= */ 0)
-            .waitForPlaybackState(Player.STATE_IDLE)
+            .waitForPlaybackState(Player.STATE_ENDED)
             .build();
     final boolean[] onSeekProcessedCalled = new boolean[1];
     EventListener listener =
@@ -566,13 +563,7 @@ public final class ExoPlayerTest {
         };
     ExoPlayerTestRunner testRunner =
         new Builder().setActionSchedule(actionSchedule).setEventListener(listener).build(context);
-    try {
-      testRunner.start().blockUntilActionScheduleFinished(TIMEOUT_MS).blockUntilEnded(TIMEOUT_MS);
-      fail();
-    } catch (ExoPlaybackException e) {
-      // Expected exception.
-      assertThat(e.getUnexpectedException()).isInstanceOf(IllegalSeekPositionException.class);
-    }
+    testRunner.start().blockUntilActionScheduleFinished(TIMEOUT_MS).blockUntilEnded(TIMEOUT_MS);
     assertThat(onSeekProcessedCalled[0]).isTrue();
   }
 
@@ -1295,59 +1286,51 @@ public final class ExoPlayerTest {
   }
 
   @Test
-  public void testPlaybackErrorDuringSourceInfoRefreshStillUpdatesTimeline() throws Exception {
+  public void testInvalidSeekPositionAfterSourceInfoRefreshStillUpdatesTimeline() throws Exception {
     final Timeline timeline = new FakeTimeline(/* windowCount= */ 1);
     final FakeMediaSource mediaSource =
         new FakeMediaSource(/* timeline= */ null, /* manifest= */ null);
     ActionSchedule actionSchedule =
-        new ActionSchedule.Builder("testPlaybackErrorDuringSourceInfoRefreshStillUpdatesTimeline")
+        new ActionSchedule.Builder("testInvalidSeekPositionSourceInfoRefreshStillUpdatesTimeline")
             .waitForPlaybackState(Player.STATE_BUFFERING)
-            // Cause an internal exception by seeking to an invalid position while the media source
-            // is still being prepared. The error will be thrown while the player handles the new
-            // source info.
+            // Seeking to an invalid position will end playback.
             .seek(/* windowIndex= */ 100, /* positionMs= */ 0)
             .executeRunnable(() -> mediaSource.setNewSourceInfo(timeline, /* newManifest= */ null))
-            .waitForPlaybackState(Player.STATE_IDLE)
+            .waitForPlaybackState(Player.STATE_ENDED)
             .build();
     ExoPlayerTestRunner testRunner =
         new ExoPlayerTestRunner.Builder()
             .setMediaSource(mediaSource)
             .setActionSchedule(actionSchedule)
             .build(context);
-    try {
-      testRunner.start().blockUntilActionScheduleFinished(TIMEOUT_MS).blockUntilEnded(TIMEOUT_MS);
-      fail();
-    } catch (ExoPlaybackException e) {
-      // Expected exception.
-      assertThat(e.getUnexpectedException()).isInstanceOf(IllegalSeekPositionException.class);
-    }
+    testRunner.start().blockUntilActionScheduleFinished(TIMEOUT_MS).blockUntilEnded(TIMEOUT_MS);
+
     testRunner.assertTimelinesEqual(timeline);
     testRunner.assertTimelineChangeReasonsEqual(Player.TIMELINE_CHANGE_REASON_PREPARED);
   }
 
   @Test
-  public void testPlaybackErrorDuringSourceInfoRefreshWithShuffleModeEnabledUsesCorrectFirstPeriod()
-      throws Exception {
+  public void
+      testInvalidSeekPositionAfterSourceInfoRefreshWithShuffleModeEnabledUsesCorrectFirstPeriod()
+          throws Exception {
     FakeMediaSource mediaSource =
         new FakeMediaSource(new FakeTimeline(/* windowCount= */ 1), /* manifest= */ null);
     ConcatenatingMediaSource concatenatingMediaSource =
         new ConcatenatingMediaSource(
             /* isAtomic= */ false, new FakeShuffleOrder(0), mediaSource, mediaSource);
-    AtomicInteger windowIndexAfterError = new AtomicInteger();
+    AtomicInteger windowIndexAfterUpdate = new AtomicInteger();
     ActionSchedule actionSchedule =
-        new ActionSchedule.Builder("testPlaybackErrorDuringSourceInfoRefreshUsesCorrectFirstPeriod")
+        new ActionSchedule.Builder("testInvalidSeekPositionSourceInfoRefreshUsesCorrectFirstPeriod")
             .setShuffleModeEnabled(true)
             .waitForPlaybackState(Player.STATE_BUFFERING)
-            // Cause an internal exception by seeking to an invalid position while the media source
-            // is still being prepared. The error will be thrown while the player handles the new
-            // source info.
+            // Seeking to an invalid position will end playback.
             .seek(/* windowIndex= */ 100, /* positionMs= */ 0)
-            .waitForPlaybackState(Player.STATE_IDLE)
+            .waitForPlaybackState(Player.STATE_ENDED)
             .executeRunnable(
                 new PlayerRunnable() {
                   @Override
                   public void run(SimpleExoPlayer player) {
-                    windowIndexAfterError.set(player.getCurrentWindowIndex());
+                    windowIndexAfterUpdate.set(player.getCurrentWindowIndex());
                   }
                 })
             .build();
@@ -1356,14 +1339,9 @@ public final class ExoPlayerTest {
             .setMediaSource(concatenatingMediaSource)
             .setActionSchedule(actionSchedule)
             .build(context);
-    try {
-      testRunner.start().blockUntilActionScheduleFinished(TIMEOUT_MS).blockUntilEnded(TIMEOUT_MS);
-      fail();
-    } catch (ExoPlaybackException e) {
-      // Expected exception.
-      assertThat(e.getUnexpectedException()).isInstanceOf(IllegalSeekPositionException.class);
-    }
-    assertThat(windowIndexAfterError.get()).isEqualTo(1);
+    testRunner.start().blockUntilActionScheduleFinished(TIMEOUT_MS).blockUntilEnded(TIMEOUT_MS);
+
+    assertThat(windowIndexAfterUpdate.get()).isEqualTo(1);
   }
 
   @Test

From 7a1b8a95850bdf9142865b764432ec62f49b9bed Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Mon, 4 Mar 2019 11:10:19 +0000
Subject: [PATCH 604/832] Extract method in MediaCodecRenderer

Deduplicates a bit of code

PiperOrigin-RevId: 236621851
---
 .../mediacodec/MediaCodecRenderer.java        | 40 ++++++++-----------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index 75ef3c28e1..55846b0258 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -635,22 +635,9 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
       renderToEndOfStream();
       return;
     }
-    if (inputFormat == null) {
-      // We don't have a format yet, so try and read one.
-      flagsOnlyBuffer.clear();
-      int result = readSource(formatHolder, flagsOnlyBuffer, true);
-      if (result == C.RESULT_FORMAT_READ) {
-        onInputFormatChanged(formatHolder.format);
-      } else if (result == C.RESULT_BUFFER_READ) {
-        // End of stream read having not read a format.
-        Assertions.checkState(flagsOnlyBuffer.isEndOfStream());
-        inputStreamEnded = true;
-        processEndOfStream();
-        return;
-      } else {
+    if (inputFormat == null && !readToFlagsOnlyBuffer(/* requireFormat= */ true)) {
         // We still don't have a format and can't make progress without one.
         return;
-      }
     }
     // We have a format.
     maybeInitCodec();
@@ -666,15 +653,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
       // updated, and so that we have the most recent format should the codec be initialized. We may
       // also reach the end of the stream. Note that readSource will not read a sample into a
       // flags-only buffer.
-      flagsOnlyBuffer.clear();
-      int result = readSource(formatHolder, flagsOnlyBuffer, false);
-      if (result == C.RESULT_FORMAT_READ) {
-        onInputFormatChanged(formatHolder.format);
-      } else if (result == C.RESULT_BUFFER_READ) {
-        Assertions.checkState(flagsOnlyBuffer.isEndOfStream());
-        inputStreamEnded = true;
-        processEndOfStream();
-      }
+      readToFlagsOnlyBuffer(/* requireFormat= */ false);
     }
     decoderCounters.ensureUpdated();
   }
@@ -737,6 +716,21 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     return false;
   }
 
+  /** Reads into {@link #flagsOnlyBuffer} and returns whether a format was read. */
+  private boolean readToFlagsOnlyBuffer(boolean requireFormat) throws ExoPlaybackException {
+    flagsOnlyBuffer.clear();
+    int result = readSource(formatHolder, flagsOnlyBuffer, requireFormat);
+    if (result == C.RESULT_FORMAT_READ) {
+      onInputFormatChanged(formatHolder.format);
+      return true;
+    } else if (result == C.RESULT_BUFFER_READ) {
+      Assertions.checkState(flagsOnlyBuffer.isEndOfStream());
+      inputStreamEnded = true;
+      processEndOfStream();
+    }
+    return false;
+  }
+
   private void maybeInitCodecWithFallback(
       MediaCrypto crypto, boolean mediaCryptoRequiresSecureDecoder)
       throws DecoderInitializationException {

From 28c7cb3716c2c054d47a55a927f368058a0ed2a5 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 4 Mar 2019 11:30:06 +0000
Subject: [PATCH 605/832] Reset period position when resetState=True.

This is more in line with "forgetting all previous state" as documented for
resetState=True. Also only apply the current position as initial seek position
in this case.
PiperOrigin-RevId: 236623630
---
 .../android/exoplayer2/ExoPlayerImpl.java     |  2 ++
 .../exoplayer2/ExoPlayerImplInternal.java     | 22 ++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index 6d8725e9fa..d81eb16b83 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -661,6 +661,8 @@ import java.util.concurrent.CopyOnWriteArrayList;
       maskingPeriodIndex = getCurrentPeriodIndex();
       maskingWindowPositionMs = getCurrentPosition();
     }
+    // Also reset period-based PlaybackInfo positions if resetting the state.
+    resetPosition = resetPosition || resetState;
     MediaPeriodId mediaPeriodId =
         resetPosition
             ? playbackInfo.getDummyFirstMediaPeriodId(shuffleModeEnabled, window)
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index 4c8cda9e27..9dbe8f2e90 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -436,12 +436,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
   private void prepareInternal(MediaSource mediaSource, boolean resetPosition, boolean resetState) {
     pendingPrepareCount++;
-    if (!resetPosition && pendingInitialSeekPosition == null && !playbackInfo.timeline.isEmpty()) {
-      playbackInfo.timeline.getPeriodByUid(playbackInfo.periodId.periodUid, period);
-      long windowPositionUs = playbackInfo.positionUs + period.getPositionInWindowUs();
-      pendingInitialSeekPosition =
-          new SeekPosition(Timeline.EMPTY, period.windowIndex, windowPositionUs);
-    }
     resetInternal(
         /* resetRenderers= */ false, /* releaseMediaSource= */ true, resetPosition, resetState);
     loadControl.onPrepared();
@@ -864,11 +858,23 @@ import java.util.concurrent.atomic.AtomicBoolean;
       }
     }
     enabledRenderers = new Renderer[0];
-    queue.clear(/* keepFrontPeriodUid= */ !resetPosition);
-    setIsLoading(false);
+
     if (resetPosition) {
       pendingInitialSeekPosition = null;
+    } else if (resetState) {
+      // When resetting the state, also reset the period-based PlaybackInfo position and convert
+      // existing position to initial seek instead.
+      resetPosition = true;
+      if (pendingInitialSeekPosition == null && !playbackInfo.timeline.isEmpty()) {
+        playbackInfo.timeline.getPeriodByUid(playbackInfo.periodId.periodUid, period);
+        long windowPositionUs = playbackInfo.positionUs + period.getPositionInWindowUs();
+        pendingInitialSeekPosition =
+            new SeekPosition(Timeline.EMPTY, period.windowIndex, windowPositionUs);
+      }
     }
+
+    queue.clear(/* keepFrontPeriodUid= */ !resetPosition);
+    setIsLoading(false);
     if (resetState) {
       queue.setTimeline(Timeline.EMPTY);
       for (PendingMessageInfo pendingMessageInfo : pendingMessages) {

From d68c861b21e6ab4760be76f99f15d57b32c20a06 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 4 Mar 2019 15:00:03 +0000
Subject: [PATCH 606/832] Remove duplicate layout file

PiperOrigin-RevId: 236645446
---
 .../exoplayer2/demo/TrackSelectionDialog.java |  5 ++--
 .../res/layout/track_selection_dialog.xml     | 13 +++++++++-
 .../res/layout/track_selection_dialog_tab.xml | 25 -------------------
 3 files changed, 14 insertions(+), 29 deletions(-)
 delete mode 100644 demos/main/src/main/res/layout/track_selection_dialog_tab.xml

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
index dfd137e723..56abe9fa40 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
@@ -304,9 +304,8 @@ public final class TrackSelectionDialog extends DialogFragment {
         @Nullable Bundle savedInstanceState) {
       View rootView =
           inflater.inflate(
-              R.layout.track_selection_dialog_tab, container, /* attachToRoot= */ false);
-      TrackSelectionView trackSelectionView =
-          rootView.findViewById(R.id.download_dialog_track_selection_view);
+              R.layout.exo_track_selection_dialog, container, /* attachToRoot= */ false);
+      TrackSelectionView trackSelectionView = rootView.findViewById(R.id.exo_track_selection_view);
       trackSelectionView.setShowDisableOption(true);
       trackSelectionView.setAllowMultipleOverrides(allowMultipleOverrides);
       trackSelectionView.setAllowAdaptiveSelections(allowAdaptiveSelections);
diff --git a/demos/main/src/main/res/layout/track_selection_dialog.xml b/demos/main/src/main/res/layout/track_selection_dialog.xml
index 922d6ee825..7f6c45e131 100644
--- a/demos/main/src/main/res/layout/track_selection_dialog.xml
+++ b/demos/main/src/main/res/layout/track_selection_dialog.xml
@@ -14,35 +14,46 @@
      limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
+
   <androidx.viewpager.widget.ViewPager
       android:id="@+id/track_selection_dialog_view_pager"
       android:layout_width="match_parent"
       android:layout_height="0dp"
       android:layout_weight="1">
+
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/track_selection_dialog_tab_layout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        app:tabGravity="fill"
+        app:tabMode="fixed"/>
+
   </androidx.viewpager.widget.ViewPager>
+
   <LinearLayout
       android:orientation="horizontal"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:gravity="end">
+
     <Button
         android:id="@+id/track_selection_dialog_cancel_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@android:string/cancel"
         style="?android:attr/borderlessButtonStyle"/>
+
     <Button
         android:id="@+id/track_selection_dialog_ok_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@android:string/ok"
         style="?android:attr/borderlessButtonStyle"/>
+
   </LinearLayout>
+
 </LinearLayout>
diff --git a/demos/main/src/main/res/layout/track_selection_dialog_tab.xml b/demos/main/src/main/res/layout/track_selection_dialog_tab.xml
deleted file mode 100644
index 33e69e5bee..0000000000
--- a/demos/main/src/main/res/layout/track_selection_dialog_tab.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-  <com.google.android.exoplayer2.ui.TrackSelectionView
-      android:id="@+id/download_dialog_track_selection_view"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"/>
-
-</ScrollView>

From 8a2fc55c497caee0fbd54acdc0fc2b7677e407e0 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Mon, 4 Mar 2019 15:24:54 +0000
Subject: [PATCH 607/832] Fix load error handling policy invocation

PiperOrigin-RevId: 236648435
---
 .../android/exoplayer2/source/SingleSampleMediaPeriod.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaPeriod.java
index 386b637b2e..3fb61767d6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaPeriod.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaPeriod.java
@@ -251,7 +251,7 @@ import java.util.Arrays;
       int errorCount) {
     long retryDelay =
         loadErrorHandlingPolicy.getRetryDelayMsFor(
-            C.DATA_TYPE_MEDIA, durationUs, error, errorCount);
+            C.DATA_TYPE_MEDIA, loadDurationMs, error, errorCount);
     boolean errorCanBePropagated =
         retryDelay == C.TIME_UNSET
             || errorCount

From 641c1d2af4f9bf7a1fb60d0e054373af0bb23926 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 4 Mar 2019 15:55:09 +0000
Subject: [PATCH 608/832] Properly release DownloadHelper and
 TrackSelectionDialog.

The release needs to post to the MediaSource thread and also needs to post
back to the DownloadHelper thread to prevent sending updates after release has
been called. The point where we release the downloadHelper also needs to
dismiss the dialog in case the creation has already been queued before the
release.

PiperOrigin-RevId: 236652309
---
 .../exoplayer2/demo/DownloadTracker.java      |  6 +-
 .../exoplayer2/offline/DownloadHelper.java    | 57 +++++++++++++++----
 2 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index ef7cf5e25a..9afcc20d26 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -239,6 +239,9 @@ public class DownloadTracker implements DownloadManager.Listener {
 
     public void release() {
       downloadHelper.release();
+      if (trackSelectionDialog != null) {
+        trackSelectionDialog.dismiss();
+      }
       startDownloadDialogHelper = null;
     }
 
@@ -318,7 +321,8 @@ public class DownloadTracker implements DownloadManager.Listener {
 
     @Override
     public void onDismiss(DialogInterface dialogInterface) {
-      release();
+      trackSelectionDialog = null;
+      downloadHelper.release();
     }
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index e4e92c8cab..4cd6a891b1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -366,8 +366,7 @@ public final class DownloadHelper {
   public void prepare(Callback callback) {
     Assertions.checkState(this.callback == null);
     this.callback = callback;
-    Looper myLooper = Looper.myLooper();
-    callbackHandler = new Handler(myLooper != null ? myLooper : Looper.getMainLooper());
+    callbackHandler = new Handler(Util.getLooper());
     if (mediaSource != null) {
       mediaPreparer = new MediaPreparer(mediaSource, /* downloadHelper= */ this);
     } else {
@@ -745,23 +744,32 @@ public final class DownloadHelper {
     private static final int MESSAGE_PREPARE_SOURCE = 0;
     private static final int MESSAGE_CHECK_FOR_FAILURE = 1;
     private static final int MESSAGE_CONTINUE_LOADING = 2;
+    private static final int MESSAGE_RELEASE = 3;
+
+    private static final int DOWNLOAD_HELPER_CALLBACK_MESSAGE_PREPARED = 0;
+    private static final int DOWNLOAD_HELPER_CALLBACK_MESSAGE_FAILED = 1;
 
     private final MediaSource mediaSource;
     private final DownloadHelper downloadHelper;
     private final Allocator allocator;
     private final HandlerThread mediaSourceThread;
     private final Handler mediaSourceHandler;
+    private final Handler downloadHelperHandler;
+    private final ArrayList<MediaPeriod> pendingMediaPeriods;
 
     @Nullable public Object manifest;
     public @MonotonicNonNull Timeline timeline;
     public MediaPeriod @MonotonicNonNull [] mediaPeriods;
 
-    private final ArrayList<MediaPeriod> pendingMediaPeriods;
+    private boolean released;
 
     public MediaPreparer(MediaSource mediaSource, DownloadHelper downloadHelper) {
       this.mediaSource = mediaSource;
       this.downloadHelper = downloadHelper;
       allocator = new DefaultAllocator(true, C.DEFAULT_BUFFER_SEGMENT_SIZE);
+      @SuppressWarnings("methodref.receiver.bound.invalid")
+      Handler downloadThreadHandler = Util.createHandler(this::handleDownloadHelperCallbackMessage);
+      this.downloadHelperHandler = downloadThreadHandler;
       mediaSourceThread = new HandlerThread("DownloadHelper");
       mediaSourceThread.start();
       mediaSourceHandler = Util.createHandler(mediaSourceThread.getLooper(), /* callback= */ this);
@@ -770,13 +778,11 @@ public final class DownloadHelper {
     }
 
     public void release() {
-      if (mediaPeriods != null) {
-        for (MediaPeriod mediaPeriod : mediaPeriods) {
-          mediaSource.releasePeriod(mediaPeriod);
-        }
+      if (released) {
+        return;
       }
-      mediaSource.releaseSource(this);
-      mediaSourceThread.quit();
+      released = true;
+      mediaSourceHandler.sendEmptyMessage(MESSAGE_RELEASE);
     }
 
     // Handler.Callback
@@ -800,7 +806,9 @@ public final class DownloadHelper {
             mediaSourceHandler.sendEmptyMessageDelayed(
                 MESSAGE_CHECK_FOR_FAILURE, /* delayMillis= */ 100);
           } catch (IOException e) {
-            downloadHelper.onMediaPreparationFailed(e);
+            downloadHelperHandler
+                .obtainMessage(DOWNLOAD_HELPER_CALLBACK_MESSAGE_FAILED, /* obj= */ e)
+                .sendToTarget();
           }
           return true;
         case MESSAGE_CONTINUE_LOADING:
@@ -809,6 +817,16 @@ public final class DownloadHelper {
             mediaPeriod.continueLoading(/* positionUs= */ 0);
           }
           return true;
+        case MESSAGE_RELEASE:
+          if (mediaPeriods != null) {
+            for (MediaPeriod period : mediaPeriods) {
+              mediaSource.releasePeriod(period);
+            }
+          }
+          mediaSource.releaseSource(this);
+          mediaSourceHandler.removeCallbacksAndMessages(null);
+          mediaSourceThread.quit();
+          return true;
         default:
           return false;
       }
@@ -847,7 +865,7 @@ public final class DownloadHelper {
       pendingMediaPeriods.remove(mediaPeriod);
       if (pendingMediaPeriods.isEmpty()) {
         mediaSourceHandler.removeMessages(MESSAGE_CHECK_FOR_FAILURE);
-        downloadHelper.onMediaPrepared();
+        downloadHelperHandler.sendEmptyMessage(DOWNLOAD_HELPER_CALLBACK_MESSAGE_PREPARED);
       }
     }
 
@@ -857,6 +875,23 @@ public final class DownloadHelper {
         mediaSourceHandler.obtainMessage(MESSAGE_CONTINUE_LOADING, mediaPeriod).sendToTarget();
       }
     }
+
+    private boolean handleDownloadHelperCallbackMessage(Message msg) {
+      if (released) {
+        // Stale message.
+        return false;
+      }
+      switch (msg.what) {
+        case DOWNLOAD_HELPER_CALLBACK_MESSAGE_PREPARED:
+          downloadHelper.onMediaPrepared();
+          return true;
+        case DOWNLOAD_HELPER_CALLBACK_MESSAGE_FAILED:
+          downloadHelper.onMediaPreparationFailed((IOException) Util.castNonNull(msg.obj));
+          return true;
+        default:
+          return false;
+      }
+    }
   }
 
   private static final class DownloadTrackSelection extends BaseTrackSelection {

From 36060e36cb01dc80067a6f6ccd09cd0cdeb6beb0 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 4 Mar 2019 17:38:27 +0000
Subject: [PATCH 609/832] Fix TrackSelectionView selection/deselection again.

There are 6 different situations which are now more explicitly covered to
ensure we handle them correctly:
1. Radio button (non-adaptive, single group only)
   Selected -> Do nothing.
   Unselected -> Replace override with selected track.
2. Check box (non-adaptive, but multi-group allowed)
   Selected -> Remove track (and override). If last one, set isDisabled flag.
   Unselected -> Replace override with selected track.
3. Check box (adaptive allowed, single or multi group)
   Selected -> Remove track. If last, remove override and maybe set isDisabled.
   Unselected -> Add track to override.

PiperOrigin-RevId: 236668642
---
 .../exoplayer2/ui/TrackSelectionView.java     | 37 ++++++++++++-------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
index 621eeda1dd..e83a4abdfb 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
@@ -254,8 +254,7 @@ public class TrackSelectionView extends LinearLayout {
 
     // Add per-track views.
     trackViews = new CheckedTextView[trackGroups.length][];
-    boolean enableMultipleChoiceForMultipleOverrides =
-        allowMultipleOverrides && trackGroups.length > 1;
+    boolean enableMultipleChoiceForMultipleOverrides = shouldEnableMultiGroupSelection();
     for (int groupIndex = 0; groupIndex < trackGroups.length; groupIndex++) {
       TrackGroup group = trackGroups.get(groupIndex);
       boolean enableMultipleChoiceForAdaptiveSelections = shouldEnableAdaptiveSelection(groupIndex);
@@ -332,19 +331,21 @@ public class TrackSelectionView extends LinearLayout {
     int trackIndex = tag.second;
     SelectionOverride override = overrides.get(groupIndex);
     Assertions.checkNotNull(mappedTrackInfo);
-    boolean adaptiveSelectionsEnabled = shouldEnableAdaptiveSelection(groupIndex);
-    if (!allowMultipleOverrides && override == null && overrides.size() > 0) {
-      // A new override is being started and we don't allow multiple overrides.
-      overrides.clear();
-    }
-    if (override == null || !adaptiveSelectionsEnabled) {
-      // Set new override for current group.
+    if (override == null) {
+      // Start new override.
+      if (!allowMultipleOverrides && overrides.size() > 0) {
+        // Removed other overrides if we don't allow multiple overrides.
+        overrides.clear();
+      }
       overrides.put(groupIndex, new SelectionOverride(groupIndex, trackIndex));
     } else {
       // An existing override is being modified.
       int overrideLength = override.length;
       int[] overrideTracks = override.tracks;
-      if (((CheckedTextView) view).isChecked()) {
+      boolean isCurrentlySelected = ((CheckedTextView) view).isChecked();
+      boolean isAdaptiveAllowed = shouldEnableAdaptiveSelection(groupIndex);
+      boolean isUsingCheckBox = isAdaptiveAllowed || shouldEnableMultiGroupSelection();
+      if (isCurrentlySelected && isUsingCheckBox) {
         // Remove the track from the override.
         if (overrideLength == 1) {
           // The last track is being removed, so the override becomes empty.
@@ -356,9 +357,15 @@ public class TrackSelectionView extends LinearLayout {
           int[] tracks = getTracksRemoving(overrideTracks, trackIndex);
           overrides.put(groupIndex, new SelectionOverride(groupIndex, tracks));
         }
-      } else {
-        int[] tracks = getTracksAdding(overrideTracks, trackIndex);
-        overrides.put(groupIndex, new SelectionOverride(groupIndex, tracks));
+      } else if (!isCurrentlySelected) {
+        if (isAdaptiveAllowed) {
+          // Add new track to adaptive override.
+          int[] tracks = getTracksAdding(overrideTracks, trackIndex);
+          overrides.put(groupIndex, new SelectionOverride(groupIndex, tracks));
+        } else {
+          // Replace existing track in override.
+          overrides.put(groupIndex, new SelectionOverride(groupIndex, trackIndex));
+        }
       }
     }
   }
@@ -371,6 +378,10 @@ public class TrackSelectionView extends LinearLayout {
             != RendererCapabilities.ADAPTIVE_NOT_SUPPORTED;
   }
 
+  private boolean shouldEnableMultiGroupSelection() {
+    return allowMultipleOverrides && trackGroups.length > 1;
+  }
+
   private static int[] getTracksAdding(int[] tracks, int addedTrack) {
     tracks = Arrays.copyOf(tracks, tracks.length + 1);
     tracks[tracks.length - 1] = addedTrack;

From 034209c5a20e078b640899aeb2a0b4b912bd0635 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 5 Mar 2019 09:16:39 +0000
Subject: [PATCH 610/832] Remove vp9 RGB output mode-related code

PiperOrigin-RevId: 236805460
---
 .../com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java
index f5cdb6e11a..22330e0a05 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java
@@ -67,6 +67,7 @@ public final class VpxOutputBuffer extends OutputBuffer {
     this.timeUs = timeUs;
     this.mode = mode;
   }
+
   /**
    * Resizes the buffer based on the given stride. Called via JNI after decoding completes.
    *

From febb8c589ecf0d88f0ba4b7ddc000b2fe6c10389 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 5 Mar 2019 14:51:07 +0000
Subject: [PATCH 611/832] Improve handling of failed NAL prefix reads

nalPrefix.readUnsignedIntToInt() will throw if the unsigned output doesn't fit
in an int. Before this change, in the error case we'd retry reading from after
the NAL prefix position. Throw a ParserException so that reading an obviously
invalid NAL prefix will be treated as a fatal exception by the default load
error handling policy.

PiperOrigin-RevId: 236839690
---
 .../exoplayer2/extractor/mp4/FragmentedMp4Extractor.java  | 6 +++++-
 .../android/exoplayer2/extractor/mp4/Mp4Extractor.java    | 8 ++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
index dc9134459e..116b0b88ef 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
@@ -1251,7 +1251,11 @@ public class FragmentedMp4Extractor implements Extractor {
           // Read the NAL length so that we know where we find the next one, and its type.
           input.readFully(nalPrefixData, nalUnitLengthFieldLengthDiff, nalUnitPrefixLength);
           nalPrefix.setPosition(0);
-          sampleCurrentNalBytesRemaining = nalPrefix.readUnsignedIntToInt() - 1;
+          int nalLengthInt = nalPrefix.readInt();
+          if (nalLengthInt < 1) {
+            throw new ParserException("Invalid NAL length");
+          }
+          sampleCurrentNalBytesRemaining = nalLengthInt - 1;
           // Write a start code for the current NAL unit.
           nalStartCode.setPosition(0);
           output.sampleData(nalStartCode, 4);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
index 5552b97dd6..6847c9cbe2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
@@ -520,9 +520,13 @@ public final class Mp4Extractor implements Extractor, SeekMap {
       while (sampleBytesWritten < sampleSize) {
         if (sampleCurrentNalBytesRemaining == 0) {
           // Read the NAL length so that we know where we find the next one.
-          input.readFully(nalLength.data, nalUnitLengthFieldLengthDiff, nalUnitLengthFieldLength);
+          input.readFully(nalLengthData, nalUnitLengthFieldLengthDiff, nalUnitLengthFieldLength);
           nalLength.setPosition(0);
-          sampleCurrentNalBytesRemaining = nalLength.readUnsignedIntToInt();
+          int nalLengthInt = nalLength.readInt();
+          if (nalLengthInt < 0) {
+            throw new ParserException("Invalid NAL length");
+          }
+          sampleCurrentNalBytesRemaining = nalLengthInt;
           // Write a start code for the current NAL unit.
           nalStartCode.setPosition(0);
           trackOutput.sampleData(nalStartCode, 4);

From 3500f07be6c266e0903bc42f1dfdb0df63b1c1b9 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 6 Mar 2019 10:49:13 +0000
Subject: [PATCH 612/832] Use theme overlay for track selection dialog.

We currrently just inherit the acitivity's alertDialogTheme style (which
is equivalent to ThemeOverlay.AppCompat.Dialog.Alert). Using the theme
overlay directly and also force-enable the title such that the title is
shown even if the activity disabled the title.

PiperOrigin-RevId: 237012601
---
 .../exoplayer2/demo/TrackSelectionDialog.java       | 13 +++++--------
 demos/main/src/main/res/values/styles.xml           |  5 ++++-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
index 56abe9fa40..f6d7eff526 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
@@ -28,7 +28,6 @@ import androidx.fragment.app.FragmentPagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 import androidx.appcompat.app.AppCompatDialog;
 import android.util.SparseArray;
-import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -165,13 +164,11 @@ public final class TrackSelectionDialog extends DialogFragment {
 
   @Override
   public Dialog onCreateDialog(Bundle savedInstanceState) {
-    // We need to own the view to let tab layout work correctly on all API levels. That's why we
-    // can't use an AlertDialog as it owns its view itself. Using AppCompatDialog instead. We still
-    // want the "alertDialogTheme" style attribute of the current theme instead of AppCompatDialog's
-    // default "dialogTheme" style, so obtain that manually.
-    TypedValue alertDialogStyle = new TypedValue();
-    getActivity().getTheme().resolveAttribute(R.attr.alertDialogTheme, alertDialogStyle, true);
-    AppCompatDialog dialog = new AppCompatDialog(getActivity(), alertDialogStyle.resourceId);
+    // We need to own the view to let tab layout work correctly on all API levels. We can't use
+    // AlertDialog because it owns the view itself, so we use AppCompatDialog instead, themed using
+    // the AlertDialog theme overlay with force-enabled title.
+    AppCompatDialog dialog =
+        new AppCompatDialog(getActivity(), R.style.TrackSelectionDialogThemeOverlay);
     dialog.setTitle(titleId);
     return dialog;
   }
diff --git a/demos/main/src/main/res/values/styles.xml b/demos/main/src/main/res/values/styles.xml
index 8dfa4f0e1f..04c5b90edc 100644
--- a/demos/main/src/main/res/values/styles.xml
+++ b/demos/main/src/main/res/values/styles.xml
@@ -15,8 +15,11 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
+  <style name="TrackSelectionDialogThemeOverlay" parent="ThemeOverlay.AppCompat.Dialog.Alert">
+    <item name="windowNoTitle">false</item>
+  </style>
+
   <style name="PlayerTheme" parent="Theme.AppCompat.NoActionBar">
-    <item name="android:windowNoTitle">true</item>
     <item name="android:windowBackground">@android:color/black</item>
   </style>
 

From a4754bb7410cd8ca31c0bd8261762cf5c425f31e Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 6 Mar 2019 12:57:32 +0000
Subject: [PATCH 613/832] Don't show track selection tabs if there's only one

PiperOrigin-RevId: 237025639
---
 .../android/exoplayer2/demo/TrackSelectionDialog.java      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
index f6d7eff526..e66be8c6f0 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
@@ -58,7 +58,7 @@ public final class TrackSelectionDialog extends DialogFragment {
   private DialogInterface.OnDismissListener onDismissListener;
 
   /**
-   * Creates and initialized a dialog with a {@link DefaultTrackSelector} and automatically updates
+   * Creates and initializes a dialog with a {@link DefaultTrackSelector} and automatically updates
    * the track selector's parameters when tracks are selected.
    *
    * @param trackSelector A {@link DefaultTrackSelector}.
@@ -104,7 +104,7 @@ public final class TrackSelectionDialog extends DialogFragment {
   public TrackSelectionDialog() {
     tabFragments = new SparseArray<>();
     tabTitles = new ArrayList<>();
-    // Retain instance across orientation changes to prevent loosing access to init data.
+    // Retain instance across activity re-creation to prevent losing access to init data.
     setRetainInstance(true);
   }
 
@@ -211,6 +211,7 @@ public final class TrackSelectionDialog extends DialogFragment {
     Button okButton = dialogView.findViewById(R.id.track_selection_dialog_ok_button);
     viewPager.setAdapter(new FragmentAdapter(getChildFragmentManager()));
     tabLayout.setupWithViewPager(viewPager);
+    tabLayout.setVisibility(tabFragments.size() > 1 ? View.VISIBLE : View.GONE);
     cancelButton.setOnClickListener(view -> dismiss());
     okButton.setOnClickListener(
         view -> {
@@ -271,7 +272,7 @@ public final class TrackSelectionDialog extends DialogFragment {
     /* package */ List<SelectionOverride> overrides;
 
     public TrackSelectionViewFragment() {
-      // Retain instance across orientation changes to prevent loosing access to init data.
+      // Retain instance across activity re-creation to prevent losing access to init data.
       setRetainInstance(true);
     }
 

From 155a129d2c3bd887e9795fa329727e1374dc1f7d Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 6 Mar 2019 13:11:09 +0000
Subject: [PATCH 614/832] Make flags-only DecoderInputBuffer hold all flags

Currently a flags-only DecoderInputBuffer may hold only the end-of-stream
flag. This change makes flags-only buffer read any kind of flag set in
the next sample. If no sample is available RESULT_NOTHING_READ is
returned.

PiperOrigin-RevId: 237027581
---
 .../mediacodec/MediaCodecRenderer.java        |  3 +-
 .../source/SampleMetadataQueue.java           | 42 +++++++++++--------
 .../exoplayer2/source/SampleQueue.java        | 28 ++++++++-----
 .../exoplayer2/source/SampleStream.java       | 20 +++++----
 .../source/SingleSampleMediaPeriod.java       |  5 ++-
 5 files changed, 58 insertions(+), 40 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index 55846b0258..e0faad6fef 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -723,8 +723,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     if (result == C.RESULT_FORMAT_READ) {
       onInputFormatChanged(formatHolder.format);
       return true;
-    } else if (result == C.RESULT_BUFFER_READ) {
-      Assertions.checkState(flagsOnlyBuffer.isEndOfStream());
+    } else if (result == C.RESULT_BUFFER_READ && flagsOnlyBuffer.isEndOfStream()) {
       inputStreamEnded = true;
       processEndOfStream();
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleMetadataQueue.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SampleMetadataQueue.java
index ab5c5e57d9..25cc73d4ae 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleMetadataQueue.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SampleMetadataQueue.java
@@ -219,25 +219,31 @@ import com.google.android.exoplayer2.util.Util;
    *
    * @param formatHolder A {@link FormatHolder} to populate in the case of reading a format.
    * @param buffer A {@link DecoderInputBuffer} to populate in the case of reading a sample or the
-   *     end of the stream. If a sample is read then the buffer is populated with information
-   *     about the sample, but not its data. The size and absolute position of the data in the
-   *     rolling buffer is stored in {@code extrasHolder}, along with an encryption id if present
-   *     and the absolute position of the first byte that may still be required after the current
-   *     sample has been read. May be null if the caller requires that the format of the stream be
-   *     read even if it's not changing.
-   * @param formatRequired Whether the caller requires that the format of the stream be read even
-   *     if it's not changing. A sample will never be read if set to true, however it is still
-   *     possible for the end of stream or nothing to be read.
+   *     end of the stream. If a sample is read then the buffer is populated with information about
+   *     the sample, but not its data. The size and absolute position of the data in the rolling
+   *     buffer is stored in {@code extrasHolder}, along with an encryption id if present and the
+   *     absolute position of the first byte that may still be required after the current sample has
+   *     been read. If a {@link DecoderInputBuffer#isFlagsOnly() flags-only} buffer is passed, only
+   *     the buffer flags may be populated by this method and the read position of the queue will
+   *     not change. May be null if the caller requires that the format of the stream be read even
+   *     if it's not changing.
+   * @param formatRequired Whether the caller requires that the format of the stream be read even if
+   *     it's not changing. A sample will never be read if set to true, however it is still possible
+   *     for the end of stream or nothing to be read.
    * @param loadingFinished True if an empty queue should be considered the end of the stream.
-   * @param downstreamFormat The current downstream {@link Format}. If the format of the next
-   *     sample is different to the current downstream format then a format will be read.
+   * @param downstreamFormat The current downstream {@link Format}. If the format of the next sample
+   *     is different to the current downstream format then a format will be read.
    * @param extrasHolder The holder into which extra sample information should be written.
-   * @return The result, which can be {@link C#RESULT_NOTHING_READ}, {@link C#RESULT_FORMAT_READ}
-   *     or {@link C#RESULT_BUFFER_READ}.
+   * @return The result, which can be {@link C#RESULT_NOTHING_READ}, {@link C#RESULT_FORMAT_READ} or
+   *     {@link C#RESULT_BUFFER_READ}.
    */
   @SuppressWarnings("ReferenceEquality")
-  public synchronized int read(FormatHolder formatHolder, DecoderInputBuffer buffer,
-      boolean formatRequired, boolean loadingFinished, Format downstreamFormat,
+  public synchronized int read(
+      FormatHolder formatHolder,
+      DecoderInputBuffer buffer,
+      boolean formatRequired,
+      boolean loadingFinished,
+      Format downstreamFormat,
       SampleExtrasHolder extrasHolder) {
     if (!hasNextSample()) {
       if (loadingFinished || isLastSampleQueued) {
@@ -258,12 +264,12 @@ import com.google.android.exoplayer2.util.Util;
       return C.RESULT_FORMAT_READ;
     }
 
+    buffer.setFlags(flags[relativeReadIndex]);
+    buffer.timeUs = timesUs[relativeReadIndex];
     if (buffer.isFlagsOnly()) {
-      return C.RESULT_NOTHING_READ;
+      return C.RESULT_BUFFER_READ;
     }
 
-    buffer.timeUs = timesUs[relativeReadIndex];
-    buffer.setFlags(flags[relativeReadIndex]);
     extrasHolder.size = sizes[relativeReadIndex];
     extrasHolder.offset = offsets[relativeReadIndex];
     extrasHolder.cryptoData = cryptoDatas[relativeReadIndex];
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
index 133de437d4..e8f4953436 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
@@ -317,8 +317,10 @@ public class SampleQueue implements TrackOutput {
    *
    * @param formatHolder A {@link FormatHolder} to populate in the case of reading a format.
    * @param buffer A {@link DecoderInputBuffer} to populate in the case of reading a sample or the
-   *     end of the stream. If the end of the stream has been reached, the
-   *     {@link C#BUFFER_FLAG_END_OF_STREAM} flag will be set on the buffer.
+   *     end of the stream. If the end of the stream has been reached, the {@link
+   *     C#BUFFER_FLAG_END_OF_STREAM} flag will be set on the buffer. If a {@link
+   *     DecoderInputBuffer#isFlagsOnly() flags-only} buffer is passed, only the buffer flags may be
+   *     populated by this method and the read position of the queue will not change.
    * @param formatRequired Whether the caller requires that the format of the stream be read even if
    *     it's not changing. A sample will never be read if set to true, however it is still possible
    *     for the end of stream or nothing to be read.
@@ -328,8 +330,12 @@ public class SampleQueue implements TrackOutput {
    * @return The result, which can be {@link C#RESULT_NOTHING_READ}, {@link C#RESULT_FORMAT_READ} or
    *     {@link C#RESULT_BUFFER_READ}.
    */
-  public int read(FormatHolder formatHolder, DecoderInputBuffer buffer, boolean formatRequired,
-      boolean loadingFinished, long decodeOnlyUntilUs) {
+  public int read(
+      FormatHolder formatHolder,
+      DecoderInputBuffer buffer,
+      boolean formatRequired,
+      boolean loadingFinished,
+      long decodeOnlyUntilUs) {
     int result = metadataQueue.read(formatHolder, buffer, formatRequired, loadingFinished,
         downstreamFormat, extrasHolder);
     switch (result) {
@@ -341,13 +347,15 @@ public class SampleQueue implements TrackOutput {
           if (buffer.timeUs < decodeOnlyUntilUs) {
             buffer.addFlag(C.BUFFER_FLAG_DECODE_ONLY);
           }
-          // Read encryption data if the sample is encrypted.
-          if (buffer.isEncrypted()) {
-            readEncryptionData(buffer, extrasHolder);
+          if (!buffer.isFlagsOnly()) {
+            // Read encryption data if the sample is encrypted.
+            if (buffer.isEncrypted()) {
+              readEncryptionData(buffer, extrasHolder);
+            }
+            // Write the sample data into the holder.
+            buffer.ensureSpaceForWrite(extrasHolder.size);
+            readData(extrasHolder.offset, buffer.data, extrasHolder.size);
           }
-          // Write the sample data into the holder.
-          buffer.ensureSpaceForWrite(extrasHolder.size);
-          readData(extrasHolder.offset, buffer.data, extrasHolder.size);
         }
         return C.RESULT_BUFFER_READ;
       case C.RESULT_NOTHING_READ:
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleStream.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SampleStream.java
index 06efc980e2..54293aa4c1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleStream.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SampleStream.java
@@ -45,18 +45,20 @@ public interface SampleStream {
 
   /**
    * Attempts to read from the stream.
-   * <p>
-   * If the stream has ended then {@link C#BUFFER_FLAG_END_OF_STREAM} flag is set on {@code buffer}
-   * and {@link C#RESULT_BUFFER_READ} is returned. Else if no data is available then
-   * {@link C#RESULT_NOTHING_READ} is returned. Else if the format of the media is changing or if
-   * {@code formatRequired} is set then {@code formatHolder} is populated and
-   * {@link C#RESULT_FORMAT_READ} is returned. Else {@code buffer} is populated and
-   * {@link C#RESULT_BUFFER_READ} is returned.
+   *
+   * <p>If the stream has ended then {@link C#BUFFER_FLAG_END_OF_STREAM} flag is set on {@code
+   * buffer} and {@link C#RESULT_BUFFER_READ} is returned. Else if no data is available then {@link
+   * C#RESULT_NOTHING_READ} is returned. Else if the format of the media is changing or if {@code
+   * formatRequired} is set then {@code formatHolder} is populated and {@link C#RESULT_FORMAT_READ}
+   * is returned. Else {@code buffer} is populated and {@link C#RESULT_BUFFER_READ} is returned.
    *
    * @param formatHolder A {@link FormatHolder} to populate in the case of reading a format.
    * @param buffer A {@link DecoderInputBuffer} to populate in the case of reading a sample or the
-   *     end of the stream. If the end of the stream has been reached, the
-   *     {@link C#BUFFER_FLAG_END_OF_STREAM} flag will be set on the buffer.
+   *     end of the stream. If the end of the stream has been reached, the {@link
+   *     C#BUFFER_FLAG_END_OF_STREAM} flag will be set on the buffer. If a {@link
+   *     DecoderInputBuffer#isFlagsOnly() flags-only} buffer is passed, then no {@link
+   *     DecoderInputBuffer#data} will be read and the read position of the stream will not change,
+   *     but the flags of the buffer will be populated.
    * @param formatRequired Whether the caller requires that the format of the stream be read even if
    *     it's not changing. A sample will never be read if set to true, however it is still possible
    *     for the end of stream or nothing to be read.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaPeriod.java
index 3fb61767d6..e0c2a00df3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaPeriod.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaPeriod.java
@@ -326,8 +326,11 @@ import java.util.Arrays;
         return C.RESULT_FORMAT_READ;
       } else if (loadingFinished) {
         if (loadingSucceeded) {
-          buffer.timeUs = 0;
           buffer.addFlag(C.BUFFER_FLAG_KEY_FRAME);
+          buffer.timeUs = 0;
+          if (buffer.isFlagsOnly()) {
+            return C.RESULT_BUFFER_READ;
+          }
           buffer.ensureSpaceForWrite(sampleSize);
           buffer.data.put(sampleData, 0, sampleSize);
         } else {

From dd06a2d5f17c6c8a7fc5187ad364a3052c20837f Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Wed, 6 Mar 2019 13:18:14 +0000
Subject: [PATCH 615/832] Fix integer bitrate division

PiperOrigin-RevId: 237028164
---
 .../exoplayer2/trackselection/BufferSizeAdaptationBuilder.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java
index 3c3e5e11db..8288c5ff33 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java
@@ -352,7 +352,8 @@ public final class BufferSizeAdaptationBuilder {
       // buffer = slope * ln(bitrate) + intercept,
       // with buffer(minBitrate) = minBuffer and buffer(maxBitrate) = maxBuffer - hysteresisBuffer.
       bitrateToBufferFunctionSlope =
-          (maxBufferUs - hysteresisBufferUs - minBufferUs) / Math.log(maxBitrate / minBitrate);
+          (maxBufferUs - hysteresisBufferUs - minBufferUs)
+              / Math.log((double) maxBitrate / minBitrate);
       bitrateToBufferFunctionIntercept =
           minBufferUs - bitrateToBufferFunctionSlope * Math.log(minBitrate);
     }

From ab5dae64b9caf51752a095d2f8fbdd6f0e618a59 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 6 Mar 2019 14:51:03 +0000
Subject: [PATCH 616/832] Make sure we handle SQLiteException and other IO
 errors properly

SQLiteException is a runtime exception, which makes it easy to
forget to handle it. This change converts SQLiteExceptions into
a checked exception, which is then handled appropriately.

PiperOrigin-RevId: 237038793
---
 .../exoplayer2/demo/DownloadTracker.java      |  39 ++--
 .../database/DatabaseIOException.java         |  31 +++
 .../exoplayer2/database/VersionTable.java     |  79 +++++---
 .../offline/DefaultDownloadIndex.java         | 132 +++++++-----
 .../exoplayer2/offline/DownloadIndex.java     |  20 +-
 .../exoplayer2/offline/DownloadIndexUtil.java |   3 +-
 .../exoplayer2/offline/DownloadManager.java   |   1 +
 .../cache/CacheFileMetadataIndex.java         | 111 ++++++----
 .../upstream/cache/CachedContentIndex.java    | 189 ++++++++++--------
 .../upstream/cache/SimpleCache.java           | 107 +++++++---
 .../exoplayer2/database/VersionTableTest.java |   8 +-
 .../offline/DefaultDownloadIndexTest.java     |  29 ++-
 .../offline/DownloadIndexUtilTest.java        |  10 +-
 .../cache/CachedContentIndexTest.java         |   5 +-
 .../upstream/cache/SimpleCacheTest.java       |   9 +-
 15 files changed, 485 insertions(+), 288 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseIOException.java

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index 9afcc20d26..ed12353687 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -29,6 +29,7 @@ import com.google.android.exoplayer2.offline.ActionFile;
 import com.google.android.exoplayer2.offline.DefaultDownloadIndex;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadHelper;
+import com.google.android.exoplayer2.offline.DownloadIndex;
 import com.google.android.exoplayer2.offline.DownloadManager;
 import com.google.android.exoplayer2.offline.DownloadService;
 import com.google.android.exoplayer2.offline.DownloadState;
@@ -71,8 +72,8 @@ public class DownloadTracker implements DownloadManager.Listener {
   private final DataSource.Factory dataSourceFactory;
   private final CopyOnWriteArraySet<Listener> listeners;
   private final HashMap<Uri, DownloadState> trackedDownloadStates;
-  private final DefaultDownloadIndex downloadIndex;
-  private final Handler actionFileIOHandler;
+  private final DownloadIndex downloadIndex;
+  private final Handler indexHandler;
 
   @Nullable private StartDownloadDialogHelper startDownloadDialogHelper;
 
@@ -83,9 +84,9 @@ public class DownloadTracker implements DownloadManager.Listener {
     this.downloadIndex = downloadIndex;
     listeners = new CopyOnWriteArraySet<>();
     trackedDownloadStates = new HashMap<>();
-    HandlerThread actionFileWriteThread = new HandlerThread("DownloadTracker");
-    actionFileWriteThread.start();
-    actionFileIOHandler = new Handler(actionFileWriteThread.getLooper());
+    HandlerThread indexThread = new HandlerThread("DownloadTracker");
+    indexThread.start();
+    indexHandler = new Handler(indexThread.getLooper());
     loadTrackedActions();
   }
 
@@ -163,24 +164,32 @@ public class DownloadTracker implements DownloadManager.Listener {
   // Internal methods
 
   private void loadTrackedActions() {
-    DownloadStateCursor downloadStates = downloadIndex.getDownloadStates();
-    while (downloadStates.moveToNext()) {
-      DownloadState downloadState = downloadStates.getDownloadState();
-      trackedDownloadStates.put(downloadState.uri, downloadState);
+    try {
+      DownloadStateCursor downloadStates = downloadIndex.getDownloadStates();
+      while (downloadStates.moveToNext()) {
+        DownloadState downloadState = downloadStates.getDownloadState();
+        trackedDownloadStates.put(downloadState.uri, downloadState);
+      }
+      downloadStates.close();
+    } catch (IOException e) {
+      Log.w(TAG, "Failed to query download states", e);
     }
-    downloadStates.close();
   }
 
   private void handleTrackedDownloadStateChanged(DownloadState downloadState) {
     for (Listener listener : listeners) {
       listener.onDownloadsChanged();
     }
-    actionFileIOHandler.post(
+    indexHandler.post(
         () -> {
-          if (downloadState.state == DownloadState.STATE_REMOVED) {
-            downloadIndex.removeDownloadState(downloadState.id);
-          } else {
-            downloadIndex.putDownloadState(downloadState);
+          try {
+            if (downloadState.state == DownloadState.STATE_REMOVED) {
+              downloadIndex.removeDownloadState(downloadState.id);
+            } else {
+              downloadIndex.putDownloadState(downloadState);
+            }
+          } catch (IOException e) {
+            // TODO: This whole method is going away in cr/232854678.
           }
         });
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseIOException.java b/library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseIOException.java
new file mode 100644
index 0000000000..b0fd1cf2f0
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseIOException.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.database;
+
+import android.database.SQLException;
+import java.io.IOException;
+
+/** An {@link IOException} whose cause is an {@link SQLException}. */
+public final class DatabaseIOException extends IOException {
+
+  public DatabaseIOException(SQLException cause) {
+    super(cause);
+  }
+
+  public DatabaseIOException(SQLException cause, String message) {
+    super(message, cause);
+  }
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java b/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
index e0a4210136..be367d2f22 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.database;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.DatabaseUtils;
+import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import androidx.annotation.IntDef;
 import androidx.annotation.VisibleForTesting;
@@ -78,15 +79,21 @@ public final class VersionTable {
    * @param feature The feature.
    * @param instanceUid The unique identifier of the instance of the feature.
    * @param version The version.
+   * @throws DatabaseIOException If an error occurs executing the SQL.
    */
   public static void setVersion(
-      SQLiteDatabase writableDatabase, @Feature int feature, String instanceUid, int version) {
-    writableDatabase.execSQL(SQL_CREATE_TABLE_IF_NOT_EXISTS);
-    ContentValues values = new ContentValues();
-    values.put(COLUMN_FEATURE, feature);
-    values.put(COLUMN_INSTANCE_UID, instanceUid);
-    values.put(COLUMN_VERSION, version);
-    writableDatabase.replace(TABLE_NAME, /* nullColumnHack= */ null, values);
+      SQLiteDatabase writableDatabase, @Feature int feature, String instanceUid, int version)
+      throws DatabaseIOException {
+    try {
+      writableDatabase.execSQL(SQL_CREATE_TABLE_IF_NOT_EXISTS);
+      ContentValues values = new ContentValues();
+      values.put(COLUMN_FEATURE, feature);
+      values.put(COLUMN_INSTANCE_UID, instanceUid);
+      values.put(COLUMN_VERSION, version);
+      writableDatabase.replaceOrThrow(TABLE_NAME, /* nullColumnHack= */ null, values);
+    } catch (SQLException e) {
+      throw new DatabaseIOException(e);
+    }
   }
 
   /**
@@ -95,16 +102,22 @@ public final class VersionTable {
    * @param writableDatabase The database to update.
    * @param feature The feature.
    * @param instanceUid The unique identifier of the instance of the feature.
+   * @throws DatabaseIOException If an error occurs executing the SQL.
    */
   public static void removeVersion(
-      SQLiteDatabase writableDatabase, @Feature int feature, String instanceUid) {
-    if (!tableExists(writableDatabase, TABLE_NAME)) {
-      return;
+      SQLiteDatabase writableDatabase, @Feature int feature, String instanceUid)
+      throws DatabaseIOException {
+    try {
+      if (!tableExists(writableDatabase, TABLE_NAME)) {
+        return;
+      }
+      writableDatabase.delete(
+          TABLE_NAME,
+          WHERE_FEATURE_AND_INSTANCE_UID_EQUALS,
+          featureAndInstanceUidArguments(feature, instanceUid));
+    } catch (SQLException e) {
+      throw new DatabaseIOException(e);
     }
-    writableDatabase.delete(
-        TABLE_NAME,
-        WHERE_FEATURE_AND_INSTANCE_UID_EQUALS,
-        featureAndInstanceUidArguments(feature, instanceUid));
   }
 
   /**
@@ -115,25 +128,31 @@ public final class VersionTable {
    * @param feature The feature.
    * @param instanceUid The unique identifier of the instance of the feature.
    * @return The version, or {@link #VERSION_UNSET} if no version is set.
+   * @throws DatabaseIOException If an error occurs executing the SQL.
    */
-  public static int getVersion(SQLiteDatabase database, @Feature int feature, String instanceUid) {
-    if (!tableExists(database, TABLE_NAME)) {
-      return VERSION_UNSET;
-    }
-    try (Cursor cursor =
-        database.query(
-            TABLE_NAME,
-            new String[] {COLUMN_VERSION},
-            WHERE_FEATURE_AND_INSTANCE_UID_EQUALS,
-            featureAndInstanceUidArguments(feature, instanceUid),
-            /* groupBy= */ null,
-            /* having= */ null,
-            /* orderBy= */ null)) {
-      if (cursor.getCount() == 0) {
+  public static int getVersion(SQLiteDatabase database, @Feature int feature, String instanceUid)
+      throws DatabaseIOException {
+    try {
+      if (!tableExists(database, TABLE_NAME)) {
         return VERSION_UNSET;
       }
-      cursor.moveToNext();
-      return cursor.getInt(/* COLUMN_VERSION index */ 0);
+      try (Cursor cursor =
+          database.query(
+              TABLE_NAME,
+              new String[] {COLUMN_VERSION},
+              WHERE_FEATURE_AND_INSTANCE_UID_EQUALS,
+              featureAndInstanceUidArguments(feature, instanceUid),
+              /* groupBy= */ null,
+              /* having= */ null,
+              /* orderBy= */ null)) {
+        if (cursor.getCount() == 0) {
+          return VERSION_UNSET;
+        }
+        cursor.moveToNext();
+        return cursor.getInt(/* COLUMN_VERSION index */ 0);
+      }
+    } catch (SQLException e) {
+      throw new DatabaseIOException(e);
     }
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
index f224258495..402003ea7f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -17,10 +17,13 @@ package com.google.android.exoplayer2.offline;
 
 import android.content.ContentValues;
 import android.database.Cursor;
+import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteException;
 import android.net.Uri;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+import com.google.android.exoplayer2.database.DatabaseIOException;
 import com.google.android.exoplayer2.database.DatabaseProvider;
 import com.google.android.exoplayer2.database.VersionTable;
 import com.google.android.exoplayer2.util.Assertions;
@@ -152,7 +155,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
 
   @Override
   @Nullable
-  public DownloadState getDownloadState(String id) {
+  public DownloadState getDownloadState(String id) throws DatabaseIOException {
     ensureInitialized();
     try (Cursor cursor = getCursor(WHERE_ID_EQUALS, new String[] {id})) {
       if (cursor.getCount() == 0) {
@@ -162,83 +165,102 @@ public final class DefaultDownloadIndex implements DownloadIndex {
       DownloadState downloadState = getDownloadStateForCurrentRow(cursor);
       Assertions.checkState(id.equals(downloadState.id));
       return downloadState;
+    } catch (SQLiteException e) {
+      throw new DatabaseIOException(e);
     }
   }
 
   @Override
-  public DownloadStateCursor getDownloadStates(@DownloadState.State int... states) {
+  public DownloadStateCursor getDownloadStates(@DownloadState.State int... states)
+      throws DatabaseIOException {
     ensureInitialized();
-    String selection = null;
-    if (states.length > 0) {
-      StringBuilder selectionBuilder = new StringBuilder();
-      selectionBuilder.append(COLUMN_STATE).append(" IN (");
-      for (int i = 0; i < states.length; i++) {
-        if (i > 0) {
-          selectionBuilder.append(',');
+    try {
+      String selection = null;
+      if (states.length > 0) {
+        StringBuilder selectionBuilder = new StringBuilder();
+        selectionBuilder.append(COLUMN_STATE).append(" IN (");
+        for (int i = 0; i < states.length; i++) {
+          if (i > 0) {
+            selectionBuilder.append(',');
+          }
+          selectionBuilder.append(states[i]);
         }
-        selectionBuilder.append(states[i]);
+        selectionBuilder.append(')');
+        selection = selectionBuilder.toString();
       }
-      selectionBuilder.append(')');
-      selection = selectionBuilder.toString();
+      Cursor cursor = getCursor(selection, /* selectionArgs= */ null);
+      return new DownloadStateCursorImpl(cursor);
+    } catch (SQLiteException e) {
+      throw new DatabaseIOException(e);
     }
-    Cursor cursor = getCursor(selection, /* selectionArgs= */ null);
-    return new DownloadStateCursorImpl(cursor);
   }
 
   @Override
-  public void putDownloadState(DownloadState downloadState) {
+  public void putDownloadState(DownloadState downloadState) throws DatabaseIOException {
     ensureInitialized();
-    SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
-    ContentValues values = new ContentValues();
-    values.put(COLUMN_ID, downloadState.id);
-    values.put(COLUMN_TYPE, downloadState.type);
-    values.put(COLUMN_URI, downloadState.uri.toString());
-    values.put(COLUMN_CACHE_KEY, downloadState.cacheKey);
-    values.put(COLUMN_STATE, downloadState.state);
-    values.put(COLUMN_DOWNLOAD_PERCENTAGE, downloadState.downloadPercentage);
-    values.put(COLUMN_DOWNLOADED_BYTES, downloadState.downloadedBytes);
-    values.put(COLUMN_TOTAL_BYTES, downloadState.totalBytes);
-    values.put(COLUMN_FAILURE_REASON, downloadState.failureReason);
-    values.put(COLUMN_STOP_FLAGS, downloadState.stopFlags);
-    values.put(COLUMN_NOT_MET_REQUIREMENTS, downloadState.notMetRequirements);
-    values.put(COLUMN_MANUAL_STOP_REASON, downloadState.manualStopReason);
-    values.put(COLUMN_START_TIME_MS, downloadState.startTimeMs);
-    values.put(COLUMN_UPDATE_TIME_MS, downloadState.updateTimeMs);
-    values.put(COLUMN_STREAM_KEYS, encodeStreamKeys(downloadState.streamKeys));
-    values.put(COLUMN_CUSTOM_METADATA, downloadState.customMetadata);
-    writableDatabase.replace(TABLE_NAME, /* nullColumnHack= */ null, values);
+    try {
+      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+      ContentValues values = new ContentValues();
+      values.put(COLUMN_ID, downloadState.id);
+      values.put(COLUMN_TYPE, downloadState.type);
+      values.put(COLUMN_URI, downloadState.uri.toString());
+      values.put(COLUMN_CACHE_KEY, downloadState.cacheKey);
+      values.put(COLUMN_STATE, downloadState.state);
+      values.put(COLUMN_DOWNLOAD_PERCENTAGE, downloadState.downloadPercentage);
+      values.put(COLUMN_DOWNLOADED_BYTES, downloadState.downloadedBytes);
+      values.put(COLUMN_TOTAL_BYTES, downloadState.totalBytes);
+      values.put(COLUMN_FAILURE_REASON, downloadState.failureReason);
+      values.put(COLUMN_STOP_FLAGS, downloadState.stopFlags);
+      values.put(COLUMN_NOT_MET_REQUIREMENTS, downloadState.notMetRequirements);
+      values.put(COLUMN_MANUAL_STOP_REASON, downloadState.manualStopReason);
+      values.put(COLUMN_START_TIME_MS, downloadState.startTimeMs);
+      values.put(COLUMN_UPDATE_TIME_MS, downloadState.updateTimeMs);
+      values.put(COLUMN_STREAM_KEYS, encodeStreamKeys(downloadState.streamKeys));
+      values.put(COLUMN_CUSTOM_METADATA, downloadState.customMetadata);
+      writableDatabase.replaceOrThrow(TABLE_NAME, /* nullColumnHack= */ null, values);
+    } catch (SQLiteException e) {
+      throw new DatabaseIOException(e);
+    }
   }
 
   @Override
-  public void removeDownloadState(String id) {
+  public void removeDownloadState(String id) throws DatabaseIOException {
     ensureInitialized();
-    databaseProvider.getWritableDatabase().delete(TABLE_NAME, WHERE_ID_EQUALS, new String[] {id});
+    try {
+      databaseProvider.getWritableDatabase().delete(TABLE_NAME, WHERE_ID_EQUALS, new String[] {id});
+    } catch (SQLiteException e) {
+      throw new DatabaseIOException(e);
+    }
   }
 
-  private void ensureInitialized() {
+  private void ensureInitialized() throws DatabaseIOException {
     if (initialized) {
       return;
     }
-    SQLiteDatabase readableDatabase = databaseProvider.getReadableDatabase();
-    int version =
-        VersionTable.getVersion(readableDatabase, VersionTable.FEATURE_OFFLINE, INSTANCE_UID);
-    if (version == VersionTable.VERSION_UNSET || version > TABLE_VERSION) {
-      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
-      writableDatabase.beginTransaction();
-      try {
-        VersionTable.setVersion(
-            writableDatabase, VersionTable.FEATURE_OFFLINE, INSTANCE_UID, TABLE_VERSION);
-        writableDatabase.execSQL(SQL_DROP_TABLE_IF_EXISTS);
-        writableDatabase.execSQL(SQL_CREATE_TABLE);
-        writableDatabase.setTransactionSuccessful();
-      } finally {
-        writableDatabase.endTransaction();
+    try {
+      SQLiteDatabase readableDatabase = databaseProvider.getReadableDatabase();
+      int version =
+          VersionTable.getVersion(readableDatabase, VersionTable.FEATURE_OFFLINE, INSTANCE_UID);
+      if (version == VersionTable.VERSION_UNSET || version > TABLE_VERSION) {
+        SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+        writableDatabase.beginTransaction();
+        try {
+          VersionTable.setVersion(
+              writableDatabase, VersionTable.FEATURE_OFFLINE, INSTANCE_UID, TABLE_VERSION);
+          writableDatabase.execSQL(SQL_DROP_TABLE_IF_EXISTS);
+          writableDatabase.execSQL(SQL_CREATE_TABLE);
+          writableDatabase.setTransactionSuccessful();
+        } finally {
+          writableDatabase.endTransaction();
+        }
+      } else if (version < TABLE_VERSION) {
+        // There is no previous version currently.
+        throw new IllegalStateException();
       }
-    } else if (version < TABLE_VERSION) {
-      // There is no previous version currently.
-      throw new IllegalStateException();
+      initialized = true;
+    } catch (SQLException e) {
+      throw new DatabaseIOException(e);
     }
-    initialized = true;
   }
 
   private Cursor getCursor(@Nullable String selection, @Nullable String[] selectionArgs) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java
index 77840cc65b..8d997e07ff 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java
@@ -16,9 +16,10 @@
 package com.google.android.exoplayer2.offline;
 
 import androidx.annotation.Nullable;
+import java.io.IOException;
 
 /** Persists {@link DownloadState}s. */
-interface DownloadIndex {
+public interface DownloadIndex {
 
   /**
    * Returns the {@link DownloadState} with the given {@code id}, or null.
@@ -26,25 +27,32 @@ interface DownloadIndex {
    * @param id ID of a {@link DownloadState}.
    * @return The {@link DownloadState} with the given {@code id}, or null if a download state with
    *     this id doesn't exist.
+   * @throws IOException If an error occurs reading the state.
    */
   @Nullable
-  DownloadState getDownloadState(String id);
+  DownloadState getDownloadState(String id) throws IOException;
 
   /**
    * Returns a {@link DownloadStateCursor} to {@link DownloadState}s with the given {@code states}.
    *
    * @param states Returns only the {@link DownloadState}s with this states. If empty, returns all.
    * @return A cursor to {@link DownloadState}s with the given {@code states}.
+   * @throws IOException If an error occurs reading the state.
    */
-  DownloadStateCursor getDownloadStates(@DownloadState.State int... states);
+  DownloadStateCursor getDownloadStates(@DownloadState.State int... states) throws IOException;
 
   /**
    * Adds or replaces a {@link DownloadState}.
    *
    * @param downloadState The {@link DownloadState} to be added.
+   * @throws IOException If an error occurs setting the state.
    */
-  void putDownloadState(DownloadState downloadState);
+  void putDownloadState(DownloadState downloadState) throws IOException;
 
-  /** Removes the {@link DownloadState} with the given {@code id}. */
-  void removeDownloadState(String id);
+  /**
+   * Removes the {@link DownloadState} with the given {@code id}.
+   *
+   * @throws IOException If an error occurs removing the state.
+   */
+  void removeDownloadState(String id) throws IOException;
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
index c93fa2135b..ef1418b24f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
@@ -69,9 +69,10 @@ public final class DownloadIndexUtil {
    * @param downloadIndex The action is converted to {@link DownloadState} and stored in this index.
    * @param id A nullable custom download id which overwrites {@link DownloadAction#id}.
    * @param action The action to be stored in {@link DownloadIndex}.
+   * @throws IOException If an error occurs storing the state in the {@link DownloadIndex}.
    */
   public static void addAction(
-      DownloadIndex downloadIndex, @Nullable String id, DownloadAction action) {
+      DownloadIndex downloadIndex, @Nullable String id, DownloadAction action) throws IOException {
     DownloadState downloadState = downloadIndex.getDownloadState(id != null ? id : action.id);
     if (downloadState != null) {
       downloadState = downloadState.mergeAction(action);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index f007f8c9ac..3415db8ead 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -810,6 +810,7 @@ public final class DownloadManager {
         setState(STATE_REMOVED);
       } else { // STATE_DOWNLOADING
         if (error != null) {
+          Log.e(TAG, "Download failed: " + downloadState.id, error);
           failureReason = FAILURE_REASON_UNKNOWN;
           setState(STATE_FAILED);
         } else {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
index a370311939..2b5f116d1f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
@@ -17,7 +17,9 @@ package com.google.android.exoplayer2.upstream.cache;
 
 import android.content.ContentValues;
 import android.database.Cursor;
+import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
+import com.google.android.exoplayer2.database.DatabaseIOException;
 import com.google.android.exoplayer2.database.DatabaseProvider;
 import com.google.android.exoplayer2.database.VersionTable;
 import com.google.android.exoplayer2.util.Assertions;
@@ -63,36 +65,48 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
     this.databaseProvider = databaseProvider;
   }
 
-  /** Initializes the index for the given cache UID. */
-  public void initialize(long uid) {
-    String hexUid = Long.toHexString(uid);
-    tableName = TABLE_PREFIX + hexUid;
-    SQLiteDatabase readableDatabase = databaseProvider.getReadableDatabase();
-    int version =
-        VersionTable.getVersion(readableDatabase, VersionTable.FEATURE_CACHE_FILE_METADATA, hexUid);
-    if (version == VersionTable.VERSION_UNSET || version > TABLE_VERSION) {
-      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
-      writableDatabase.beginTransaction();
-      try {
-        VersionTable.setVersion(
-            writableDatabase, VersionTable.FEATURE_CACHE_FILE_METADATA, hexUid, TABLE_VERSION);
-        writableDatabase.execSQL("DROP TABLE IF EXISTS " + tableName);
-        writableDatabase.execSQL("CREATE TABLE " + tableName + " " + TABLE_SCHEMA);
-        writableDatabase.setTransactionSuccessful();
-      } finally {
-        writableDatabase.endTransaction();
+  /**
+   * Initializes the index for the given cache UID.
+   *
+   * @throws DatabaseIOException If an error occurs initializing the index.
+   */
+  public void initialize(long uid) throws DatabaseIOException {
+    try {
+      String hexUid = Long.toHexString(uid);
+      tableName = TABLE_PREFIX + hexUid;
+      SQLiteDatabase readableDatabase = databaseProvider.getReadableDatabase();
+      int version =
+          VersionTable.getVersion(
+              readableDatabase, VersionTable.FEATURE_CACHE_FILE_METADATA, hexUid);
+      if (version == VersionTable.VERSION_UNSET || version > TABLE_VERSION) {
+        SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+        writableDatabase.beginTransaction();
+        try {
+          VersionTable.setVersion(
+              writableDatabase, VersionTable.FEATURE_CACHE_FILE_METADATA, hexUid, TABLE_VERSION);
+          writableDatabase.execSQL("DROP TABLE IF EXISTS " + tableName);
+          writableDatabase.execSQL("CREATE TABLE " + tableName + " " + TABLE_SCHEMA);
+          writableDatabase.setTransactionSuccessful();
+        } finally {
+          writableDatabase.endTransaction();
+        }
+      } else if (version < TABLE_VERSION) {
+        // There is no previous version currently.
+        throw new IllegalStateException();
       }
-    } else if (version < TABLE_VERSION) {
-      // There is no previous version currently.
-      throw new IllegalStateException();
+    } catch (SQLException e) {
+      throw new DatabaseIOException(e);
     }
   }
 
   /**
    * Returns all file metadata keyed by file name. The returned map is mutable and may be modified
    * by the caller.
+   *
+   * @return The file metadata keyed by file name.
+   * @throws DatabaseIOException If an error occurs loading the metadata.
    */
-  public Map<String, CacheFileMetadata> getAll() {
+  public Map<String, CacheFileMetadata> getAll() throws DatabaseIOException {
     try (Cursor cursor = getCursor()) {
       Map<String, CacheFileMetadata> fileMetadata = new HashMap<>(cursor.getCount());
       while (cursor.moveToNext()) {
@@ -102,6 +116,8 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
         fileMetadata.put(name, new CacheFileMetadata(length, lastAccessTimestamp));
       }
       return fileMetadata;
+    } catch (SQLException e) {
+      throw new DatabaseIOException(e);
     }
   }
 
@@ -111,44 +127,59 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
    * @param name The name of the file.
    * @param length The file length.
    * @param lastAccessTimestamp The file last access timestamp.
+   * @throws DatabaseIOException If an error occurs setting the metadata.
    */
-  public void set(String name, long length, long lastAccessTimestamp) {
+  public void set(String name, long length, long lastAccessTimestamp) throws DatabaseIOException {
     Assertions.checkNotNull(tableName);
-    SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
-    ContentValues values = new ContentValues();
-    values.put(COLUMN_NAME, name);
-    values.put(COLUMN_LENGTH, length);
-    values.put(COLUMN_LAST_ACCESS_TIMESTAMP, lastAccessTimestamp);
-    writableDatabase.replace(tableName, /* nullColumnHack= */ null, values);
+    try {
+      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+      ContentValues values = new ContentValues();
+      values.put(COLUMN_NAME, name);
+      values.put(COLUMN_LENGTH, length);
+      values.put(COLUMN_LAST_ACCESS_TIMESTAMP, lastAccessTimestamp);
+      writableDatabase.replaceOrThrow(tableName, /* nullColumnHack= */ null, values);
+    } catch (SQLException e) {
+      throw new DatabaseIOException(e);
+    }
   }
 
   /**
    * Removes metadata.
    *
    * @param name The name of the file whose metadata is to be removed.
+   * @throws DatabaseIOException If an error occurs removing the metadata.
    */
-  public void remove(String name) {
+  public void remove(String name) throws DatabaseIOException {
     Assertions.checkNotNull(tableName);
-    SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
-    writableDatabase.delete(tableName, WHERE_NAME_EQUALS, new String[] {name});
+    try {
+      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+      writableDatabase.delete(tableName, WHERE_NAME_EQUALS, new String[] {name});
+    } catch (SQLException e) {
+      throw new DatabaseIOException(e);
+    }
   }
 
   /**
    * Removes metadata.
    *
    * @param names The names of the files whose metadata is to be removed.
+   * @throws DatabaseIOException If an error occurs removing the metadata.
    */
-  public void removeAll(Set<String> names) {
+  public void removeAll(Set<String> names) throws DatabaseIOException {
     Assertions.checkNotNull(tableName);
-    SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
-    writableDatabase.beginTransaction();
     try {
-      for (String name : names) {
-        writableDatabase.delete(tableName, WHERE_NAME_EQUALS, new String[] {name});
+      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+      writableDatabase.beginTransaction();
+      try {
+        for (String name : names) {
+          writableDatabase.delete(tableName, WHERE_NAME_EQUALS, new String[] {name});
+        }
+        writableDatabase.setTransactionSuccessful();
+      } finally {
+        writableDatabase.endTransaction();
       }
-      writableDatabase.setTransactionSuccessful();
-    } finally {
-      writableDatabase.endTransaction();
+    } catch (SQLException e) {
+      throw new DatabaseIOException(e);
     }
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
index f14e7cef5b..c25c88a361 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
@@ -18,15 +18,16 @@ package com.google.android.exoplayer2.upstream.cache;
 import android.annotation.SuppressLint;
 import android.content.ContentValues;
 import android.database.Cursor;
+import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import android.util.SparseArray;
 import android.util.SparseBooleanArray;
+import com.google.android.exoplayer2.database.DatabaseIOException;
 import com.google.android.exoplayer2.database.DatabaseProvider;
 import com.google.android.exoplayer2.database.VersionTable;
-import com.google.android.exoplayer2.upstream.cache.Cache.CacheException;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.AtomicFile;
 import com.google.android.exoplayer2.util.ReusableBufferedOutputStream;
@@ -160,28 +161,23 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   }
 
   /**
-   * Loads the index file for the given cache UID.
+   * Loads the index data for the given cache UID.
    *
    * @param uid The UID of the cache whose index is to be loaded.
+   * @throws IOException If an error occurs initializing the index data.
    */
-  public void initialize(long uid) {
+  public void initialize(long uid) throws IOException {
     storage.initialize(uid);
     if (previousStorage != null) {
       previousStorage.initialize(uid);
     }
     if (!storage.exists() && previousStorage != null && previousStorage.exists()) {
       // Copy from previous storage into current storage.
-      loadFrom(previousStorage);
-      try {
-        storage.storeFully(keyToContent);
-      } catch (CacheException e) {
-        // We failed to copy into current storage, so keep using previous storage.
-        storage = previousStorage;
-        previousStorage = null;
-      }
+      previousStorage.load(keyToContent, idToKey);
+      storage.storeFully(keyToContent);
     } else {
       // Load from the current storage.
-      loadFrom(storage);
+      storage.load(keyToContent, idToKey);
     }
     if (previousStorage != null) {
       previousStorage.delete();
@@ -189,8 +185,12 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     }
   }
 
-  /** Stores the index data to index file if there is a change. */
-  public void store() throws CacheException {
+  /**
+   * Stores the index data to index file if there is a change.
+   *
+   * @throws IOException If an error occurs storing the index data.
+   */
+  public void store() throws IOException {
     storage.storeIncremental(keyToContent);
     // Make ids that were removed since the index was last stored eligible for re-use.
     int removedIdCount = removedIds.size();
@@ -286,14 +286,6 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     return cachedContent != null ? cachedContent.getMetadata() : DefaultContentMetadata.EMPTY;
   }
 
-  /** Loads the index from the specified storage. */
-  private void loadFrom(Storage storage) {
-    if (!storage.load(keyToContent, idToKey)) {
-      keyToContent.clear();
-      idToKey.clear();
-    }
-  }
-
   private CachedContent addNew(String key) {
     int id = getNewId(idToKey);
     CachedContent cachedContent = new CachedContent(id, key);
@@ -341,7 +333,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
    *
    * @param input Input stream to read from.
    * @return a {@link DefaultContentMetadata} instance.
-   * @throws IOException If an error occurs during reading from input.
+   * @throws IOException If an error occurs during reading from the input.
    */
   private static DefaultContentMetadata readContentMetadata(DataInputStream input)
       throws IOException {
@@ -374,7 +366,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
    * Serializes itself to a {@link DataOutputStream}.
    *
    * @param output Output stream to store the values.
-   * @throws IOException If an error occurs during writing values to output.
+   * @throws IOException If an error occurs writing to the output.
    */
   private static void writeContentMetadata(DefaultContentMetadata metadata, DataOutputStream output)
       throws IOException {
@@ -394,30 +386,43 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     /** Initializes the storage for the given cache UID. */
     void initialize(long uid);
 
-    /** Returns whether the persisted index exists. */
-    boolean exists();
+    /**
+     * Returns whether the persisted index exists.
+     *
+     * @throws IOException If an error occurs determining whether the persisted index exists.
+     */
+    boolean exists() throws IOException;
 
-    /** Deletes the persisted index. */
-    void delete();
+    /**
+     * Deletes the persisted index.
+     *
+     * @throws IOException If an error occurs deleting the index.
+     */
+    void delete() throws IOException;
 
     /**
      * Loads the persisted index into {@code content} and {@code idToKey}, creating it if it doesn't
      * already exist.
      *
+     * <p>If the persisted index is in a permanently bad state (i.e. all further attempts to load it
+     * are also expected to fail) then it will be deleted and the call will return successfully. For
+     * transient failures, {@link IOException} will be thrown.
+     *
      * @param content The key to content map to populate with persisted data.
      * @param idToKey The id to key map to populate with persisted data.
-     * @return Whether the load was successful.
+     * @throws IOException If an error occurs loading the index.
      */
-    boolean load(HashMap<String, CachedContent> content, SparseArray<@NullableType String> idToKey);
+    void load(HashMap<String, CachedContent> content, SparseArray<@NullableType String> idToKey)
+        throws IOException;
 
     /**
      * Writes the persisted index, creating it if it doesn't already exist and replacing any
      * existing content if it does.
      *
      * @param content The key to content map to persist.
-     * @throws CacheException If an error occurs persisting the index.
+     * @throws IOException If an error occurs persisting the index.
      */
-    void storeFully(HashMap<String, CachedContent> content) throws CacheException;
+    void storeFully(HashMap<String, CachedContent> content) throws IOException;
 
     /**
      * Ensures incremental changes to the index since the initial {@link #initialize(long)} or last
@@ -425,9 +430,9 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
      * changes via {@link #onUpdate(CachedContent)} and {@link #onRemove(CachedContent)}.
      *
      * @param content The key to content map to persist.
-     * @throws CacheException If an error occurs persisting the index.
+     * @throws IOException If an error occurs persisting the index.
      */
-    void storeIncremental(HashMap<String, CachedContent> content) throws CacheException;
+    void storeIncremental(HashMap<String, CachedContent> content) throws IOException;
 
     /**
      * Called when a {@link CachedContent} is added or updated.
@@ -493,24 +498,24 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     }
 
     @Override
-    public boolean load(
+    public void load(
         HashMap<String, CachedContent> content, SparseArray<@NullableType String> idToKey) {
       Assertions.checkState(!changed);
       if (!readFile(content, idToKey)) {
+        content.clear();
+        idToKey.clear();
         atomicFile.delete();
-        return false;
       }
-      return true;
     }
 
     @Override
-    public void storeFully(HashMap<String, CachedContent> content) throws CacheException {
+    public void storeFully(HashMap<String, CachedContent> content) throws IOException {
       writeFile(content);
       changed = false;
     }
 
     @Override
-    public void storeIncremental(HashMap<String, CachedContent> content) throws CacheException {
+    public void storeIncremental(HashMap<String, CachedContent> content) throws IOException {
       if (!changed) {
         return;
       }
@@ -529,6 +534,10 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 
     private boolean readFile(
         HashMap<String, CachedContent> content, SparseArray<@NullableType String> idToKey) {
+      if (!atomicFile.exists()) {
+        return true;
+      }
+
       DataInputStream input = null;
       try {
         InputStream inputStream = new BufferedInputStream(atomicFile.openRead());
@@ -579,7 +588,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
       return true;
     }
 
-    private void writeFile(HashMap<String, CachedContent> content) throws CacheException {
+    private void writeFile(HashMap<String, CachedContent> content) throws IOException {
       DataOutputStream output = null;
       try {
         OutputStream outputStream = atomicFile.startWrite();
@@ -619,8 +628,6 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
         // Avoid calling close twice. Duplicate CipherOutputStream.close calls did
         // not used to be no-ops: https://android-review.googlesource.com/#/c/272799/
         output = null;
-      } catch (IOException e) {
-        throw new CacheException(e);
       } finally {
         Util.closeQuietly(output);
       }
@@ -722,7 +729,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     }
 
     @Override
-    public boolean exists() {
+    public boolean exists() throws DatabaseIOException {
       return VersionTable.getVersion(
               databaseProvider.getReadableDatabase(),
               VersionTable.FEATURE_CACHE_CONTENT_METADATA,
@@ -731,22 +738,27 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     }
 
     @Override
-    public void delete() {
-      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
-      writableDatabase.beginTransaction();
+    public void delete() throws DatabaseIOException {
       try {
-        VersionTable.removeVersion(
-            writableDatabase, VersionTable.FEATURE_CACHE_CONTENT_METADATA, hexUid);
-        dropTable(writableDatabase);
-        writableDatabase.setTransactionSuccessful();
-      } finally {
-        writableDatabase.endTransaction();
+        SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+        writableDatabase.beginTransaction();
+        try {
+          VersionTable.removeVersion(
+              writableDatabase, VersionTable.FEATURE_CACHE_CONTENT_METADATA, hexUid);
+          dropTable(writableDatabase);
+          writableDatabase.setTransactionSuccessful();
+        } finally {
+          writableDatabase.endTransaction();
+        }
+      } catch (SQLException e) {
+        throw new DatabaseIOException(e);
       }
     }
 
     @Override
-    public boolean load(
-        HashMap<String, CachedContent> content, SparseArray<@NullableType String> idToKey) {
+    public void load(
+        HashMap<String, CachedContent> content, SparseArray<@NullableType String> idToKey)
+        throws IOException {
       Assertions.checkState(pendingUpdates.size() == 0);
       try {
         int version =
@@ -783,52 +795,57 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
             idToKey.put(cachedContent.id, cachedContent.key);
           }
         }
-        return true;
-      } catch (IOException | SQLiteException e) {
-        return false;
+      } catch (SQLiteException e) {
+        content.clear();
+        idToKey.clear();
+        throw new DatabaseIOException(e);
       }
     }
 
     @Override
-    public void storeFully(HashMap<String, CachedContent> content) throws CacheException {
-      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
-      writableDatabase.beginTransaction();
+    public void storeFully(HashMap<String, CachedContent> content) throws IOException {
       try {
-        initializeTable(writableDatabase);
-        for (CachedContent cachedContent : content.values()) {
-          addOrUpdateRow(writableDatabase, cachedContent);
+        SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+        writableDatabase.beginTransaction();
+        try {
+          initializeTable(writableDatabase);
+          for (CachedContent cachedContent : content.values()) {
+            addOrUpdateRow(writableDatabase, cachedContent);
+          }
+          writableDatabase.setTransactionSuccessful();
+          pendingUpdates.clear();
+        } finally {
+          writableDatabase.endTransaction();
         }
-        writableDatabase.setTransactionSuccessful();
-        pendingUpdates.clear();
-      } catch (IOException | SQLiteException e) {
-        throw new CacheException(e);
-      } finally {
-        writableDatabase.endTransaction();
+      } catch (SQLException e) {
+        throw new DatabaseIOException(e);
       }
     }
 
     @Override
-    public void storeIncremental(HashMap<String, CachedContent> content) throws CacheException {
+    public void storeIncremental(HashMap<String, CachedContent> content) throws IOException {
       if (pendingUpdates.size() == 0) {
         return;
       }
-      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
-      writableDatabase.beginTransaction();
       try {
-        for (int i = 0; i < pendingUpdates.size(); i++) {
-          CachedContent cachedContent = pendingUpdates.valueAt(i);
-          if (cachedContent == null) {
-            deleteRow(writableDatabase, pendingUpdates.keyAt(i));
-          } else {
-            addOrUpdateRow(writableDatabase, cachedContent);
+        SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+        writableDatabase.beginTransaction();
+        try {
+          for (int i = 0; i < pendingUpdates.size(); i++) {
+            CachedContent cachedContent = pendingUpdates.valueAt(i);
+            if (cachedContent == null) {
+              deleteRow(writableDatabase, pendingUpdates.keyAt(i));
+            } else {
+              addOrUpdateRow(writableDatabase, cachedContent);
+            }
           }
+          writableDatabase.setTransactionSuccessful();
+          pendingUpdates.clear();
+        } finally {
+          writableDatabase.endTransaction();
         }
-        writableDatabase.setTransactionSuccessful();
-        pendingUpdates.clear();
-      } catch (IOException | SQLiteException e) {
-        throw new CacheException(e);
-      } finally {
-        writableDatabase.endTransaction();
+      } catch (SQLException e) {
+        throw new DatabaseIOException(e);
       }
     }
 
@@ -855,7 +872,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
               /* orderBy= */ null);
     }
 
-    private void initializeTable(SQLiteDatabase writableDatabase) {
+    private void initializeTable(SQLiteDatabase writableDatabase) throws DatabaseIOException {
       VersionTable.setVersion(
           writableDatabase, VersionTable.FEATURE_CACHE_CONTENT_METADATA, hexUid, TABLE_VERSION);
       dropTable(writableDatabase);
@@ -880,7 +897,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
       values.put(COLUMN_ID, cachedContent.id);
       values.put(COLUMN_KEY, cachedContent.key);
       values.put(COLUMN_METADATA, data);
-      writableDatabase.replace(tableName, /* nullColumnHack= */ null, values);
+      writableDatabase.replaceOrThrow(tableName, /* nullColumnHack= */ null, values);
     }
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index 888f1a1696..a0fde79bee 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -33,6 +33,7 @@ import java.util.NavigableSet;
 import java.util.Random;
 import java.util.Set;
 import java.util.TreeSet;
+import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 /**
  * A {@link Cache} implementation that maintains an in-memory representation. Note, only one
@@ -65,6 +66,7 @@ public final class SimpleCache implements Cache {
   private long uid;
   private long totalSpace;
   private boolean released;
+  @MonotonicNonNull private CacheException initializationException;
 
   /**
    * Returns whether {@code cacheFolder} is locked by a {@link SimpleCache} instance. To unlock the
@@ -218,6 +220,17 @@ public final class SimpleCache implements Cache {
     conditionVariable.block();
   }
 
+  /**
+   * Checks whether the cache was initialized successfully.
+   *
+   * @throws CacheException If an error occurred during initialization.
+   */
+  public synchronized void checkInitialization() throws CacheException {
+    if (initializationException != null) {
+      throw initializationException;
+    }
+  }
+
   @Override
   public synchronized void release() {
     if (released) {
@@ -227,7 +240,7 @@ public final class SimpleCache implements Cache {
     removeStaleSpans();
     try {
       contentIndex.store();
-    } catch (CacheException e) {
+    } catch (IOException e) {
       Log.e(TAG, "Storing index file failed", e);
     } finally {
       unlockFolder(cacheDir);
@@ -286,6 +299,9 @@ public final class SimpleCache implements Cache {
   @Override
   public synchronized SimpleCacheSpan startReadWrite(String key, long position)
       throws InterruptedException, CacheException {
+    Assertions.checkState(!released);
+    checkInitialization();
+
     while (true) {
       SimpleCacheSpan span = startReadWriteNonBlocking(key, position);
       if (span != null) {
@@ -301,9 +317,12 @@ public final class SimpleCache implements Cache {
   }
 
   @Override
-  public synchronized @Nullable SimpleCacheSpan startReadWriteNonBlocking(
-      String key, long position) {
+  @Nullable
+  public synchronized SimpleCacheSpan startReadWriteNonBlocking(String key, long position)
+      throws CacheException {
     Assertions.checkState(!released);
+    checkInitialization();
+
     SimpleCacheSpan span = getSpan(key, position);
 
     // Read case.
@@ -313,7 +332,11 @@ public final class SimpleCache implements Cache {
       long lastAccessTimestamp = System.currentTimeMillis();
       boolean updateFile = false;
       if (fileIndex != null) {
-        fileIndex.set(fileName, length, lastAccessTimestamp);
+        try {
+          fileIndex.set(fileName, length, lastAccessTimestamp);
+        } catch (IOException e) {
+          throw new CacheException(e);
+        }
       } else {
         // Updating the file itself to incorporate the new last access timestamp is much slower than
         // updating the file index. Hence we only update the file if we don't have a file index.
@@ -337,8 +360,10 @@ public final class SimpleCache implements Cache {
   }
 
   @Override
-  public synchronized File startFile(String key, long position, long length) {
+  public synchronized File startFile(String key, long position, long length) throws CacheException {
     Assertions.checkState(!released);
+    checkInitialization();
+
     CachedContent cachedContent = contentIndex.get(key);
     Assertions.checkNotNull(cachedContent);
     Assertions.checkState(cachedContent.isLocked());
@@ -368,10 +393,9 @@ public final class SimpleCache implements Cache {
       return;
     }
 
-    SimpleCacheSpan span = SimpleCacheSpan.createCacheEntry(file, length, contentIndex);
-    Assertions.checkState(span != null);
-    CachedContent cachedContent = contentIndex.get(span.key);
-    Assertions.checkNotNull(cachedContent);
+    SimpleCacheSpan span =
+        Assertions.checkNotNull(SimpleCacheSpan.createCacheEntry(file, length, contentIndex));
+    CachedContent cachedContent = Assertions.checkNotNull(contentIndex.get(span.key));
     Assertions.checkState(cachedContent.isLocked());
 
     // Check if the span conflicts with the set content length
@@ -381,10 +405,19 @@ public final class SimpleCache implements Cache {
     }
 
     if (fileIndex != null) {
-      fileIndex.set(file.getName(), span.length, span.lastAccessTimestamp);
+      String fileName = file.getName();
+      try {
+        fileIndex.set(fileName, span.length, span.lastAccessTimestamp);
+      } catch (IOException e) {
+        throw new CacheException(e);
+      }
     }
     addSpan(span);
-    contentIndex.store();
+    try {
+      contentIndex.store();
+    } catch (IOException e) {
+      throw new CacheException(e);
+    }
     notifyAll();
   }
 
@@ -423,8 +456,14 @@ public final class SimpleCache implements Cache {
   public synchronized void applyContentMetadataMutations(
       String key, ContentMetadataMutations mutations) throws CacheException {
     Assertions.checkState(!released);
+    checkInitialization();
+
     contentIndex.applyContentMetadataMutations(key, mutations);
-    contentIndex.store();
+    try {
+      contentIndex.store();
+    } catch (IOException e) {
+      throw new CacheException(e);
+    }
   }
 
   @Override
@@ -471,41 +510,46 @@ public final class SimpleCache implements Cache {
   /** Ensures that the cache's in-memory representation has been initialized. */
   private void initialize() {
     if (!cacheDir.exists()) {
-      // Attempt to create the cache directory.
       if (!cacheDir.mkdirs()) {
-        // TODO: Initialization failed. Decide how to handle this.
+        initializationException =
+            new CacheException("Failed to create cache directory: " + cacheDir);
         return;
       }
     }
 
     File[] files = cacheDir.listFiles();
     if (files == null) {
-      // TODO: Initialization failed. Decide how to handle this.
+      initializationException =
+          new CacheException("Failed to list cache directory files: " + cacheDir);
       return;
     }
 
     try {
       uid = loadUid(cacheDir, files);
     } catch (IOException e) {
-      // TODO: Initialization failed. Decide how to handle this.
+      initializationException = new CacheException("Failed to load cache UID: " + cacheDir);
       return;
     }
 
-    // TODO: Handle content index initialization failures.
-    contentIndex.initialize(uid);
-    if (fileIndex != null) {
-      // TODO: Handle file index initialization failures.
-      fileIndex.initialize(uid);
-      Map<String, CacheFileMetadata> fileMetadata = fileIndex.getAll();
-      loadDirectory(cacheDir, /* isRoot= */ true, files, fileMetadata);
-      fileIndex.removeAll(fileMetadata.keySet());
-    } else {
-      loadDirectory(cacheDir, /* isRoot= */ true, files, /* fileMetadata= */ null);
+    try {
+      contentIndex.initialize(uid);
+      if (fileIndex != null) {
+        fileIndex.initialize(uid);
+        Map<String, CacheFileMetadata> fileMetadata = fileIndex.getAll();
+        loadDirectory(cacheDir, /* isRoot= */ true, files, fileMetadata);
+        fileIndex.removeAll(fileMetadata.keySet());
+      } else {
+        loadDirectory(cacheDir, /* isRoot= */ true, files, /* fileMetadata= */ null);
+      }
+    } catch (IOException e) {
+      initializationException = new CacheException(e);
+      return;
     }
+
     contentIndex.removeEmpty();
     try {
       contentIndex.store();
-    } catch (CacheException e) {
+    } catch (IOException e) {
       Log.e(TAG, "Storing index file failed", e);
     }
   }
@@ -580,7 +624,14 @@ public final class SimpleCache implements Cache {
     }
     totalSpace -= span.length;
     if (fileIndex != null) {
-      fileIndex.remove(span.file.getName());
+      String fileName = span.file.getName();
+      try {
+        fileIndex.remove(fileName);
+      } catch (IOException e) {
+        // This will leave a stale entry in the file index. It will be removed next time the cache
+        // is initialized.
+        Log.w(TAG, "Failed to remove file index entry for: " + fileName);
+      }
     }
     contentIndex.maybeRemove(cachedContent.key);
     notifySpanRemoved(span);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java b/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java
index c2d902ebb7..977feaf44b 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java
@@ -43,20 +43,20 @@ public class VersionTableTest {
   }
 
   @Test
-  public void getVersion_unsetFeature_returnsVersionUnset() {
+  public void getVersion_unsetFeature_returnsVersionUnset() throws DatabaseIOException {
     int version = VersionTable.getVersion(database, FEATURE_1, INSTANCE_1);
     assertThat(version).isEqualTo(VersionTable.VERSION_UNSET);
   }
 
   @Test
-  public void getVersion_unsetVersion_returnsVersionUnset() {
+  public void getVersion_unsetVersion_returnsVersionUnset() throws DatabaseIOException {
     VersionTable.setVersion(database, FEATURE_1, INSTANCE_1, 1);
     int version = VersionTable.getVersion(database, FEATURE_1, INSTANCE_2);
     assertThat(version).isEqualTo(VersionTable.VERSION_UNSET);
   }
 
   @Test
-  public void getVersion_returnsSetVersion() {
+  public void getVersion_returnsSetVersion() throws DatabaseIOException {
     VersionTable.setVersion(database, FEATURE_1, INSTANCE_1, 1);
     assertThat(VersionTable.getVersion(database, FEATURE_1, INSTANCE_1)).isEqualTo(1);
 
@@ -74,7 +74,7 @@ public class VersionTableTest {
   }
 
   @Test
-  public void removeVersion_removesSetVersion() {
+  public void removeVersion_removesSetVersion() throws DatabaseIOException {
     VersionTable.setVersion(database, FEATURE_1, INSTANCE_1, 1);
     VersionTable.setVersion(database, FEATURE_1, INSTANCE_2, 2);
     assertThat(VersionTable.getVersion(database, FEATURE_1, INSTANCE_1)).isEqualTo(1);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
index 72ef80336b..1c5ac3e0f7 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
@@ -19,6 +19,7 @@ import static com.google.android.exoplayer2.offline.DefaultDownloadIndex.INSTANC
 import static com.google.common.truth.Truth.assertThat;
 
 import android.database.sqlite.SQLiteDatabase;
+import com.google.android.exoplayer2.database.DatabaseIOException;
 import com.google.android.exoplayer2.database.ExoDatabaseProvider;
 import com.google.android.exoplayer2.database.VersionTable;
 import org.junit.After;
@@ -47,12 +48,13 @@ public class DefaultDownloadIndexTest {
   }
 
   @Test
-  public void getDownloadState_nonExistingId_returnsNull() {
+  public void getDownloadState_nonExistingId_returnsNull() throws DatabaseIOException {
     assertThat(downloadIndex.getDownloadState("non existing id")).isNull();
   }
 
   @Test
-  public void addAndGetDownloadState_nonExistingId_returnsTheSameDownloadState() {
+  public void addAndGetDownloadState_nonExistingId_returnsTheSameDownloadState()
+      throws DatabaseIOException {
     String id = "id";
     DownloadState downloadState = new DownloadStateBuilder(id).build();
 
@@ -63,7 +65,8 @@ public class DefaultDownloadIndexTest {
   }
 
   @Test
-  public void addAndGetDownloadState_existingId_returnsUpdatedDownloadState() {
+  public void addAndGetDownloadState_existingId_returnsUpdatedDownloadState()
+      throws DatabaseIOException {
     String id = "id";
     DownloadStateBuilder downloadStateBuilder = new DownloadStateBuilder(id);
     downloadIndex.putDownloadState(downloadStateBuilder.build());
@@ -97,7 +100,8 @@ public class DefaultDownloadIndexTest {
   }
 
   @Test
-  public void releaseAndRecreateDownloadIndex_returnsTheSameDownloadState() {
+  public void releaseAndRecreateDownloadIndex_returnsTheSameDownloadState()
+      throws DatabaseIOException {
     String id = "id";
     DownloadState downloadState = new DownloadStateBuilder(id).build();
     downloadIndex.putDownloadState(downloadState);
@@ -109,12 +113,13 @@ public class DefaultDownloadIndexTest {
   }
 
   @Test
-  public void removeDownloadState_nonExistingId_doesNotFail() {
+  public void removeDownloadState_nonExistingId_doesNotFail() throws DatabaseIOException {
     downloadIndex.removeDownloadState("non existing id");
   }
 
   @Test
-  public void removeDownloadState_existingId_getDownloadStateReturnsNull() {
+  public void removeDownloadState_existingId_getDownloadStateReturnsNull()
+      throws DatabaseIOException {
     String id = "id";
     DownloadState downloadState = new DownloadStateBuilder(id).build();
     downloadIndex.putDownloadState(downloadState);
@@ -125,12 +130,13 @@ public class DefaultDownloadIndexTest {
   }
 
   @Test
-  public void getDownloadStates_emptyDownloadIndex_returnsEmptyArray() {
+  public void getDownloadStates_emptyDownloadIndex_returnsEmptyArray() throws DatabaseIOException {
     assertThat(downloadIndex.getDownloadStates().getCount()).isEqualTo(0);
   }
 
   @Test
-  public void getDownloadStates_noState_returnsAllDownloadStatusSortedByStartTime() {
+  public void getDownloadStates_noState_returnsAllDownloadStatusSortedByStartTime()
+      throws DatabaseIOException {
     DownloadState downloadState1 = new DownloadStateBuilder("id1").setStartTimeMs(1).build();
     downloadIndex.putDownloadState(downloadState1);
     DownloadState downloadState2 = new DownloadStateBuilder("id2").setStartTimeMs(0).build();
@@ -147,7 +153,8 @@ public class DefaultDownloadIndexTest {
   }
 
   @Test
-  public void getDownloadStates_withStates_returnsAllDownloadStatusWithTheSameStates() {
+  public void getDownloadStates_withStates_returnsAllDownloadStatusWithTheSameStates()
+      throws DatabaseIOException {
     DownloadState downloadState1 =
         new DownloadStateBuilder("id1")
             .setStartTimeMs(0)
@@ -179,7 +186,7 @@ public class DefaultDownloadIndexTest {
   }
 
   @Test
-  public void putDownloadState_setsVersion() {
+  public void putDownloadState_setsVersion() throws DatabaseIOException {
     SQLiteDatabase readableDatabase = databaseProvider.getReadableDatabase();
     assertThat(
             VersionTable.getVersion(readableDatabase, VersionTable.FEATURE_OFFLINE, INSTANCE_UID))
@@ -193,7 +200,7 @@ public class DefaultDownloadIndexTest {
   }
 
   @Test
-  public void downloadIndex_versionDowngradeWipesData() {
+  public void downloadIndex_versionDowngradeWipesData() throws DatabaseIOException {
     DownloadState downloadState1 = new DownloadStateBuilder("id1").build();
     downloadIndex.putDownloadState(downloadState1);
     DownloadStateCursor cursor = downloadIndex.getDownloadStates();
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
index a2b560cecd..3372d41d32 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
@@ -22,6 +22,7 @@ import android.net.Uri;
 import com.google.android.exoplayer2.database.ExoDatabaseProvider;
 import com.google.android.exoplayer2.util.Util;
 import java.io.File;
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import org.junit.After;
@@ -53,7 +54,7 @@ public class DownloadIndexUtilTest {
   }
 
   @Test
-  public void addAction_nonExistingDownloadState_createsNewDownloadState() {
+  public void addAction_nonExistingDownloadState_createsNewDownloadState() throws IOException {
     byte[] data = new byte[] {1, 2, 3, 4};
     DownloadAction action =
         DownloadAction.createDownloadAction(
@@ -71,7 +72,7 @@ public class DownloadIndexUtilTest {
   }
 
   @Test
-  public void addAction_existingDownloadState_createsMergedDownloadState() {
+  public void addAction_existingDownloadState_createsMergedDownloadState() throws IOException {
     StreamKey streamKey1 =
         new StreamKey(/* periodIndex= */ 3, /* groupIndex= */ 4, /* trackIndex= */ 5);
     StreamKey streamKey2 =
@@ -105,7 +106,7 @@ public class DownloadIndexUtilTest {
   }
 
   @Test
-  public void upgradeActionFile_createsDownloadStates() throws Exception {
+  public void upgradeActionFile_createsDownloadStates() throws IOException {
     ActionFile actionFile = new ActionFile(tempFile);
     StreamKey streamKey1 =
         new StreamKey(/* periodIndex= */ 3, /* groupIndex= */ 4, /* trackIndex= */ 5);
@@ -138,7 +139,8 @@ public class DownloadIndexUtilTest {
     assertDownloadIndexContainsAction(action3, DownloadState.STATE_REMOVING);
   }
 
-  private void assertDownloadIndexContainsAction(DownloadAction action, int state) {
+  private void assertDownloadIndexContainsAction(DownloadAction action, int state)
+      throws IOException {
     DownloadState downloadState = downloadIndex.getDownloadState(action.id);
     assertThat(downloadState).isNotNull();
     assertThat(downloadState.type).isEqualTo(action.type);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
index 2b128314fe..fea82fa302 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
@@ -21,7 +21,6 @@ import static com.google.common.truth.Truth.assertWithMessage;
 import android.net.Uri;
 import androidx.annotation.Nullable;
 import android.util.SparseArray;
-import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.util.Util;
 import java.io.File;
@@ -222,8 +221,8 @@ public class CachedContentIndexTest {
 
   @Test
   public void testLegacyEncryption() throws Exception {
-    byte[] key = "Bar12345Bar12345".getBytes(C.UTF8_NAME); // 128 bit key
-    byte[] key2 = "Foo12345Foo12345".getBytes(C.UTF8_NAME); // 128 bit key
+    byte[] key = Util.getUtf8Bytes("Bar12345Bar12345"); // 128 bit key
+    byte[] key2 = Util.getUtf8Bytes("Foo12345Foo12345"); // 128 bit key
 
     assertStoredAndLoadedEqual(newLegacyInstance(key), newLegacyInstance(key));
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
index 6c3521d62e..9ac126b7c6 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
@@ -21,7 +21,6 @@ import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 import static org.mockito.Mockito.doAnswer;
 
-import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.upstream.cache.Cache.CacheException;
 import com.google.android.exoplayer2.util.Util;
@@ -229,7 +228,7 @@ public class SimpleCacheTest {
 
   @Test
   public void testEncryptedIndex() throws Exception {
-    byte[] key = "Bar12345Bar12345".getBytes(C.UTF8_NAME); // 128 bit key
+    byte[] key = Util.getUtf8Bytes("Bar12345Bar12345"); // 128 bit key
     SimpleCache simpleCache = getEncryptedSimpleCache(key);
 
     // write data
@@ -248,7 +247,7 @@ public class SimpleCacheTest {
 
   @Test
   public void testEncryptedIndexWrongKey() throws Exception {
-    byte[] key = "Bar12345Bar12345".getBytes(C.UTF8_NAME); // 128 bit key
+    byte[] key = Util.getUtf8Bytes("Bar12345Bar12345"); // 128 bit key
     SimpleCache simpleCache = getEncryptedSimpleCache(key);
 
     // write data
@@ -258,7 +257,7 @@ public class SimpleCacheTest {
     simpleCache.release();
 
     // Reload cache
-    byte[] key2 = "Foo12345Foo12345".getBytes(C.UTF8_NAME); // 128 bit key
+    byte[] key2 = Util.getUtf8Bytes("Foo12345Foo12345"); // 128 bit key
     simpleCache = getEncryptedSimpleCache(key2);
 
     // Cache should be cleared
@@ -268,7 +267,7 @@ public class SimpleCacheTest {
 
   @Test
   public void testEncryptedIndexLostKey() throws Exception {
-    byte[] key = "Bar12345Bar12345".getBytes(C.UTF8_NAME); // 128 bit key
+    byte[] key = Util.getUtf8Bytes("Bar12345Bar12345"); // 128 bit key
     SimpleCache simpleCache = getEncryptedSimpleCache(key);
 
     // write data

From ea42bfbf3452c64454676cfedef446865002c3b5 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 6 Mar 2019 15:31:00 +0000
Subject: [PATCH 617/832] Don't retry UnexpectedLoaderExceptions.

These are thrown for non-IOException encountered during loading. Also, they
are thrown from an unexpected position and retrying is likely to fail anyway
because the Extractor is left in an unrecoverable state.

PiperOrigin-RevId: 237043948
---
 .../upstream/DefaultLoadErrorHandlingPolicy.java      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicy.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicy.java
index 720a8b08d4..307652f456 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicy.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicy.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.upstream;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.upstream.HttpDataSource.InvalidResponseCodeException;
+import com.google.android.exoplayer2.upstream.Loader.UnexpectedLoaderException;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 
@@ -77,14 +78,16 @@ public class DefaultLoadErrorHandlingPolicy implements LoadErrorHandlingPolicy {
   }
 
   /**
-   * Retries for any exception that is not a subclass of {@link ParserException} or {@link
-   * FileNotFoundException}. The retry delay is calculated as {@code Math.min((errorCount - 1) *
-   * 1000, 5000)}.
+   * Retries for any exception that is not a subclass of {@link ParserException}, {@link
+   * FileNotFoundException} or {@link UnexpectedLoaderException}. The retry delay is calculated as
+   * {@code Math.min((errorCount - 1) * 1000, 5000)}.
    */
   @Override
   public long getRetryDelayMsFor(
       int dataType, long loadDurationMs, IOException exception, int errorCount) {
-    return exception instanceof ParserException || exception instanceof FileNotFoundException
+    return exception instanceof ParserException
+            || exception instanceof FileNotFoundException
+            || exception instanceof UnexpectedLoaderException
         ? C.TIME_UNSET
         : Math.min((errorCount - 1) * 1000, 5000);
   }

From a8d8f610ba486a0b6db5150fd63dacf60683172b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 6 Mar 2019 16:20:57 +0000
Subject: [PATCH 618/832] Add SimpleCache deletion functionality

This is needed now that index data may be stored outside
of the cache directory.

PiperOrigin-RevId: 237051112
---
 .../cache/CacheFileMetadataIndex.java         | 41 ++++++++++-
 .../upstream/cache/CachedContentIndex.java    | 67 +++++++++++------
 .../upstream/cache/SimpleCache.java           | 72 +++++++++++++++----
 3 files changed, 146 insertions(+), 34 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
index 2b5f116d1f..084c02b11b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
@@ -61,6 +61,34 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
   @MonotonicNonNull private String tableName;
 
+  /**
+   * Deletes index data for the specified cache.
+   *
+   * @param databaseProvider Provides the database in which the index is stored.
+   * @param uid The cache UID.
+   * @throws DatabaseIOException If an error occurs deleting the index data.
+   */
+  public static void delete(DatabaseProvider databaseProvider, long uid)
+      throws DatabaseIOException {
+    String hexUid = Long.toHexString(uid);
+    try {
+      String tableName = getTableName(hexUid);
+      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+      writableDatabase.beginTransaction();
+      try {
+        VersionTable.removeVersion(
+            writableDatabase, VersionTable.FEATURE_CACHE_FILE_METADATA, hexUid);
+        dropTable(writableDatabase, tableName);
+        writableDatabase.setTransactionSuccessful();
+      } finally {
+        writableDatabase.endTransaction();
+      }
+    } catch (SQLException e) {
+      throw new DatabaseIOException(e);
+    }
+  }
+
+  /** @param databaseProvider Provides the database in which the index is stored. */
   public CacheFileMetadataIndex(DatabaseProvider databaseProvider) {
     this.databaseProvider = databaseProvider;
   }
@@ -68,12 +96,13 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
   /**
    * Initializes the index for the given cache UID.
    *
+   * @param uid The cache UID.
    * @throws DatabaseIOException If an error occurs initializing the index.
    */
   public void initialize(long uid) throws DatabaseIOException {
     try {
       String hexUid = Long.toHexString(uid);
-      tableName = TABLE_PREFIX + hexUid;
+      tableName = getTableName(hexUid);
       SQLiteDatabase readableDatabase = databaseProvider.getReadableDatabase();
       int version =
           VersionTable.getVersion(
@@ -84,7 +113,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
         try {
           VersionTable.setVersion(
               writableDatabase, VersionTable.FEATURE_CACHE_FILE_METADATA, hexUid, TABLE_VERSION);
-          writableDatabase.execSQL("DROP TABLE IF EXISTS " + tableName);
+          dropTable(writableDatabase, tableName);
           writableDatabase.execSQL("CREATE TABLE " + tableName + " " + TABLE_SCHEMA);
           writableDatabase.setTransactionSuccessful();
         } finally {
@@ -196,4 +225,12 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
             /* having= */ null,
             /* orderBy= */ null);
   }
+
+  private static void dropTable(SQLiteDatabase writableDatabase, String tableName) {
+    writableDatabase.execSQL("DROP TABLE IF EXISTS " + tableName);
+  }
+
+  private static String getTableName(String hexUid) {
+    return TABLE_PREFIX + hexUid;
+  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
index c25c88a361..8fa04e5338 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
@@ -103,6 +103,18 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     return fileName.startsWith(FILE_NAME_ATOMIC);
   }
 
+  /**
+   * Deletes index data for the specified cache.
+   *
+   * @param databaseProvider Provides the database in which the index is stored.
+   * @param uid The cache UID.
+   * @throws DatabaseIOException If an error occurs deleting the index data.
+   */
+  public static void delete(DatabaseProvider databaseProvider, long uid)
+      throws DatabaseIOException {
+    DatabaseStorage.delete(databaseProvider, uid);
+  }
+
   /**
    * Creates an instance supporting database storage only.
    *
@@ -717,6 +729,11 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     private String hexUid;
     private String tableName;
 
+    public static void delete(DatabaseProvider databaseProvider, long uid)
+        throws DatabaseIOException {
+      delete(databaseProvider, Long.toHexString(uid));
+    }
+
     public DatabaseStorage(DatabaseProvider databaseProvider) {
       this.databaseProvider = databaseProvider;
       pendingUpdates = new SparseArray<>();
@@ -725,7 +742,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     @Override
     public void initialize(long uid) {
       hexUid = Long.toHexString(uid);
-      tableName = TABLE_PREFIX + hexUid;
+      tableName = getTableName(hexUid);
     }
 
     @Override
@@ -739,20 +756,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 
     @Override
     public void delete() throws DatabaseIOException {
-      try {
-        SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
-        writableDatabase.beginTransaction();
-        try {
-          VersionTable.removeVersion(
-              writableDatabase, VersionTable.FEATURE_CACHE_CONTENT_METADATA, hexUid);
-          dropTable(writableDatabase);
-          writableDatabase.setTransactionSuccessful();
-        } finally {
-          writableDatabase.endTransaction();
-        }
-      } catch (SQLException e) {
-        throw new DatabaseIOException(e);
-      }
+      delete(databaseProvider, hexUid);
     }
 
     @Override
@@ -875,14 +879,10 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     private void initializeTable(SQLiteDatabase writableDatabase) throws DatabaseIOException {
       VersionTable.setVersion(
           writableDatabase, VersionTable.FEATURE_CACHE_CONTENT_METADATA, hexUid, TABLE_VERSION);
-      dropTable(writableDatabase);
+      dropTable(writableDatabase, tableName);
       writableDatabase.execSQL("CREATE TABLE " + tableName + " " + TABLE_SCHEMA);
     }
 
-    private void dropTable(SQLiteDatabase writableDatabase) {
-      writableDatabase.execSQL("DROP TABLE IF EXISTS " + tableName);
-    }
-
     private void deleteRow(SQLiteDatabase writableDatabase, int key) {
       writableDatabase.delete(tableName, WHERE_ID_EQUALS, new String[] {Integer.toString(key)});
     }
@@ -899,5 +899,32 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
       values.put(COLUMN_METADATA, data);
       writableDatabase.replaceOrThrow(tableName, /* nullColumnHack= */ null, values);
     }
+
+    private static void delete(DatabaseProvider databaseProvider, String hexUid)
+        throws DatabaseIOException {
+      try {
+        String tableName = getTableName(hexUid);
+        SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+        writableDatabase.beginTransaction();
+        try {
+          VersionTable.removeVersion(
+              writableDatabase, VersionTable.FEATURE_CACHE_CONTENT_METADATA, hexUid);
+          dropTable(writableDatabase, tableName);
+          writableDatabase.setTransactionSuccessful();
+        } finally {
+          writableDatabase.endTransaction();
+        }
+      } catch (SQLException e) {
+        throw new DatabaseIOException(e);
+      }
+    }
+
+    private static void dropTable(SQLiteDatabase writableDatabase, String tableName) {
+      writableDatabase.execSQL("DROP TABLE IF EXISTS " + tableName);
+    }
+
+    private static String getTableName(String hexUid) {
+      return TABLE_PREFIX + hexUid;
+    }
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index a0fde79bee..3e0d06ea12 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -19,9 +19,11 @@ import android.os.ConditionVariable;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.database.DatabaseIOException;
 import com.google.android.exoplayer2.database.DatabaseProvider;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
+import com.google.android.exoplayer2.util.Util;
 import java.io.File;
 import java.io.IOException;
 import java.security.SecureRandom;
@@ -36,8 +38,13 @@ import java.util.TreeSet;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 /**
- * A {@link Cache} implementation that maintains an in-memory representation. Note, only one
- * instance of SimpleCache is allowed for a given directory at a given time.
+ * A {@link Cache} implementation that maintains an in-memory representation.
+ *
+ * <p>Only one instance of SimpleCache is allowed for a given directory at a given time.
+ *
+ * <p>To delete a SimpleCache, use {@link #delete(File, DatabaseProvider)} rather than deleting the
+ * directory and its contents directly. This is necessary to ensure that associated index data is
+ * also removed.
  */
 public final class SimpleCache implements Cache {
 
@@ -93,6 +100,45 @@ public final class SimpleCache implements Cache {
     lockedCacheDirs.clear();
   }
 
+  /**
+   * Deletes all content belonging to a cache instance.
+   *
+   * @param cacheDir The cache directory.
+   * @param databaseProvider The database in which index data is stored, or {@code null} if the
+   *     cache used a legacy index.
+   */
+  public static void delete(File cacheDir, @Nullable DatabaseProvider databaseProvider) {
+    if (!cacheDir.exists()) {
+      return;
+    }
+
+    File[] files = cacheDir.listFiles();
+    if (files == null) {
+      cacheDir.delete();
+      return;
+    }
+
+    if (databaseProvider != null) {
+      // Make a best effort to read the cache UID and delete associated index data before deleting
+      // cache directory itself.
+      long uid = loadUid(files);
+      if (uid != -1) {
+        try {
+          CacheFileMetadataIndex.delete(databaseProvider, uid);
+        } catch (DatabaseIOException e) {
+          Log.w(TAG, "Failed to delete file metadata: " + uid);
+        }
+        try {
+          CachedContentIndex.delete(databaseProvider, uid);
+        } catch (DatabaseIOException e) {
+          Log.w(TAG, "Failed to delete file metadata: " + uid);
+        }
+      }
+    }
+
+    Util.recursiveDelete(cacheDir);
+  }
+
   /**
    * Constructs the cache. The cache will delete any unrecognized files from the directory. Hence
    * the directory cannot be used to store other files.
@@ -524,11 +570,14 @@ public final class SimpleCache implements Cache {
       return;
     }
 
-    try {
-      uid = loadUid(cacheDir, files);
-    } catch (IOException e) {
-      initializationException = new CacheException("Failed to load cache UID: " + cacheDir);
-      return;
+    uid = loadUid(files);
+    if (uid == -1) {
+      try {
+        uid = createUid(cacheDir);
+      } catch (IOException e) {
+        initializationException = new CacheException("Failed to create cache UID: " + cacheDir);
+        return;
+      }
     }
 
     try {
@@ -686,14 +735,13 @@ public final class SimpleCache implements Cache {
   }
 
   /**
-   * Loads the cache UID from the files belonging to the root directory, generating one if needed.
+   * Loads the cache UID from the files belonging to the root directory.
    *
-   * @param directory The root directory.
    * @param files The files belonging to the root directory.
-   * @return The cache loaded UID.
+   * @return The loaded UID, or -1 if a UID has not yet been created.
    * @throws IOException If there is an error loading or generating the UID.
    */
-  private static long loadUid(File directory, File[] files) throws IOException {
+  private static long loadUid(File[] files) {
     for (File file : files) {
       String fileName = file.getName();
       if (fileName.endsWith(UID_FILE_SUFFIX)) {
@@ -706,7 +754,7 @@ public final class SimpleCache implements Cache {
         }
       }
     }
-    return createUid(directory);
+    return -1;
   }
 
   @SuppressWarnings("TrulyRandom")

From 97ea23fb89514ba744d2a92c35bcdb28750a36b8 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 6 Mar 2019 16:27:30 +0000
Subject: [PATCH 619/832] Fix load error handling call in
 ProgressiveMediaPeriod

PiperOrigin-RevId: 237052069
---
 .../android/exoplayer2/source/ProgressiveMediaPeriod.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
index f55c490501..c7418ff956 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
@@ -576,7 +576,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     copyLengthFromLoader(loadable);
     LoadErrorAction loadErrorAction;
     long retryDelayMs =
-        loadErrorHandlingPolicy.getRetryDelayMsFor(dataType, durationUs, error, errorCount);
+        loadErrorHandlingPolicy.getRetryDelayMsFor(dataType, loadDurationMs, error, errorCount);
     if (retryDelayMs == C.TIME_UNSET) {
       loadErrorAction = Loader.DONT_RETRY_FATAL;
     } else /* the load should be retried */ {

From f35dbeb567cc009db799572beedb714b369a04b5 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 6 Mar 2019 16:33:20 +0000
Subject: [PATCH 620/832] TrackSelectionView: Default to Auto when last check
 box deselected

PiperOrigin-RevId: 237052890
---
 .../com/google/android/exoplayer2/ui/TrackSelectionView.java   | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
index e83a4abdfb..c55cf31149 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
@@ -350,9 +350,6 @@ public class TrackSelectionView extends LinearLayout {
         if (overrideLength == 1) {
           // The last track is being removed, so the override becomes empty.
           overrides.remove(groupIndex);
-          if (overrides.size() == 0) {
-            isDisabled = true;
-          }
         } else {
           int[] tracks = getTracksRemoving(overrideTracks, trackIndex);
           overrides.put(groupIndex, new SelectionOverride(groupIndex, tracks));

From d7c2519a5dbfac421ff24770785ad4097eed5033 Mon Sep 17 00:00:00 2001
From: Arnold Szabo <szaboaarnold@gmail.com>
Date: Thu, 7 Mar 2019 00:09:11 +0200
Subject: [PATCH 621/832] Fixes according to the code review

---
 .../java/com/google/android/exoplayer2/C.java |   5 +-
 .../com/google/android/exoplayer2/Format.java |  75 +++++-----
 .../dash/manifest/DashManifestParser.java     | 132 +++++++++---------
 .../source/dash/DashMediaPeriodTest.java      |   3 +
 .../exoplayer2/source/dash/DashUtilTest.java  |   3 +-
 .../exoplayer2/source/hls/HlsMediaPeriod.java |   4 +-
 .../hls/playlist/HlsMasterPlaylist.java       |   1 +
 .../hls/playlist/HlsPlaylistParser.java       |   8 +-
 .../manifest/SsManifestParser.java            |   5 +-
 9 files changed, 126 insertions(+), 110 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/C.java b/library/core/src/main/java/com/google/android/exoplayer2/C.java
index 75f1263a31..2997c250e3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/C.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/C.java
@@ -977,7 +977,10 @@ public final class C {
   public static final int NETWORK_TYPE_OTHER = 8;
 
   /**
-   * Adaptation set's role and accessibility descriptor value.
+   * Track role flags. Possible values are {@link #ROLE_FLAGS_MAIN}, {@link #ROLE_FLAGS_ALTERNATE},
+   * {@link #ROLE_FLAGS_SUPPLEMENTARY}, {@link #ROLE_FLAGS_COMMENTARY}, {@link #ROLE_FLAGS_DUB},
+   * {@link #ROLE_FLAGS_EMERGENCY}, {@link #ROLE_FLAGS_CAPTION}, {@link #ROLE_FLAGS_SIGN},
+   * {@link #ROLE_FLAGS_ENHANCED_AUDIO_INTELLIGIBILITY}, {@link #ROLE_FLAGS_DESCRIPTION}.
    */
   @Documented
   @Retention(RetentionPolicy.SOURCE)
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Format.java b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
index 509ef8011f..b20b3ba86c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Format.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
@@ -51,7 +51,7 @@ public final class Format implements Parcelable {
   /** Track selection flags. **/
   @C.SelectionFlags
   public final int selectionFlags;
-  /** Track role and accessibility descriptor values. **/
+  /** Track role flags. **/
   @C.RoleFlags
   public final int roleFlags;
   /**
@@ -234,9 +234,9 @@ public final class Format implements Parcelable {
         /* encoderDelay= */ NO_VALUE,
         /* encoderPadding= */ NO_VALUE,
         selectionFlags,
+        roleFlags,
         /* language= */ null,
         /* accessibilityChannel= */ NO_VALUE,
-        roleFlags,
         OFFSET_SAMPLE_RELATIVE,
         initializationData,
         /* drmInitData= */ null,
@@ -338,9 +338,9 @@ public final class Format implements Parcelable {
         /* encoderDelay= */ NO_VALUE,
         /* encoderPadding= */ NO_VALUE,
         /* selectionFlags= */ 0,
+        /* roleFlags= */ 0,
         /* language= */ null,
         /* accessibilityChannel= */ NO_VALUE,
-        /* roleFlags= */ 0,
         OFFSET_SAMPLE_RELATIVE,
         initializationData,
         drmInitData,
@@ -360,8 +360,8 @@ public final class Format implements Parcelable {
       int sampleRate,
       @Nullable List<byte[]> initializationData,
       @C.SelectionFlags int selectionFlags,
-      @Nullable String language,
-      @C.RoleFlags int roleFlags) {
+      @C.RoleFlags int roleFlags,
+      @Nullable String language) {
     return createAudioContainerFormat(
         id,
         /* label= */ null,
@@ -373,8 +373,8 @@ public final class Format implements Parcelable {
         sampleRate,
         initializationData,
         selectionFlags,
-        language,
-        roleFlags);
+        roleFlags,
+        language);
   }
 
   public static Format createAudioContainerFormat(
@@ -388,8 +388,8 @@ public final class Format implements Parcelable {
       int sampleRate,
       @Nullable List<byte[]> initializationData,
       @C.SelectionFlags int selectionFlags,
-      @Nullable String language,
-      @C.RoleFlags int roleFlags) {
+      @C.RoleFlags int roleFlags,
+      @Nullable String language) {
     return new Format(
         id,
         label,
@@ -412,9 +412,9 @@ public final class Format implements Parcelable {
         /* encoderDelay= */ NO_VALUE,
         /* encoderPadding= */ NO_VALUE,
         selectionFlags,
+        roleFlags,
         language,
         /* accessibilityChannel= */ NO_VALUE,
-        roleFlags,
         OFFSET_SAMPLE_RELATIVE,
         initializationData,
         /* drmInitData= */ null,
@@ -517,9 +517,9 @@ public final class Format implements Parcelable {
         encoderDelay,
         encoderPadding,
         selectionFlags,
+        /* roleFlags= */ 0,
         language,
         /* accessibilityChannel= */ NO_VALUE,
-        /* roleFlags= */ 0,
         OFFSET_SAMPLE_RELATIVE,
         initializationData,
         drmInitData,
@@ -565,9 +565,9 @@ public final class Format implements Parcelable {
         codecs,
         bitrate,
         selectionFlags,
+        /* roleFlags= */ 0,
         language,
-        /* accessibilityChannel= */ NO_VALUE,
-        /* roleFlags= */ 0);
+        /* accessibilityChannel= */ NO_VALUE);
   }
 
   public static Format createTextContainerFormat(
@@ -578,9 +578,9 @@ public final class Format implements Parcelable {
       @Nullable String codecs,
       int bitrate,
       @C.SelectionFlags int selectionFlags,
+      @C.RoleFlags int roleFlags,
       @Nullable String language,
-      int accessibilityChannel,
-      @C.RoleFlags int roleFlags) {
+      int accessibilityChannel) {
     return new Format(
         id,
         label,
@@ -603,9 +603,9 @@ public final class Format implements Parcelable {
         /* encoderDelay= */ NO_VALUE,
         /* encoderPadding= */ NO_VALUE,
         selectionFlags,
+        roleFlags,
         language,
         accessibilityChannel,
-        roleFlags,
         OFFSET_SAMPLE_RELATIVE,
         /* initializationData= */ null,
         /* drmInitData= */ null,
@@ -716,9 +716,9 @@ public final class Format implements Parcelable {
         /* encoderDelay= */ NO_VALUE,
         /* encoderPadding= */ NO_VALUE,
         selectionFlags,
+        /* roleFlags= */ 0,
         language,
         accessibilityChannel,
-        /* roleFlags= */ 0,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -758,9 +758,9 @@ public final class Format implements Parcelable {
         /* encoderDelay= */ NO_VALUE,
         /* encoderPadding= */ NO_VALUE,
         selectionFlags,
+        /* roleFlags= */ 0,
         language,
         /* accessibilityChannel= */ NO_VALUE,
-        /* roleFlags= */ 0,
         OFFSET_SAMPLE_RELATIVE,
         initializationData,
         drmInitData,
@@ -777,6 +777,7 @@ public final class Format implements Parcelable {
       @Nullable String codecs,
       int bitrate,
       @C.SelectionFlags int selectionFlags,
+      @C.RoleFlags int roleFlags,
       @Nullable String language) {
     return createContainerFormat(
         id,
@@ -786,6 +787,7 @@ public final class Format implements Parcelable {
         codecs,
         bitrate,
         selectionFlags,
+        roleFlags,
         language);
   }
 
@@ -797,6 +799,7 @@ public final class Format implements Parcelable {
       @Nullable String codecs,
       int bitrate,
       @C.SelectionFlags int selectionFlags,
+      @C.RoleFlags int roleFlags,
       @Nullable String language) {
     return new Format(
         id,
@@ -820,9 +823,9 @@ public final class Format implements Parcelable {
         /* encoderDelay= */ NO_VALUE,
         /* encoderPadding= */ NO_VALUE,
         selectionFlags,
+        roleFlags,
         language,
         /* accessibilityChannel= */ NO_VALUE,
-        /* roleFlags= */ 0,
         OFFSET_SAMPLE_RELATIVE,
         /* initializationData= */ null,
         /* drmInitData= */ null,
@@ -853,9 +856,9 @@ public final class Format implements Parcelable {
         /* encoderDelay= */ NO_VALUE,
         /* encoderPadding= */ NO_VALUE,
         /* selectionFlags= */ 0,
+        /* roleFlags= */ 0,
         /* language= */ null,
         /* accessibilityChannel= */ NO_VALUE,
-        /* roleFlags= */ 0,
         subsampleOffsetUs,
         /* initializationData= */ null,
         /* drmInitData= */ null,
@@ -890,9 +893,9 @@ public final class Format implements Parcelable {
         /* encoderDelay= */ NO_VALUE,
         /* encoderPadding= */ NO_VALUE,
         /* selectionFlags= */ 0,
+        /* roleFlags= */ 0,
         /* language= */ null,
         /* accessibilityChannel= */ NO_VALUE,
-        /* roleFlags= */ 0,
         OFFSET_SAMPLE_RELATIVE,
         /* initializationData= */ null,
         drmInitData,
@@ -921,9 +924,9 @@ public final class Format implements Parcelable {
       int encoderDelay,
       int encoderPadding,
       @C.SelectionFlags int selectionFlags,
+      @C.RoleFlags int roleFlags,
       @Nullable String language,
       int accessibilityChannel,
-      @C.RoleFlags int roleFlags,
       long subsampleOffsetUs,
       @Nullable List<byte[]> initializationData,
       @Nullable DrmInitData drmInitData,
@@ -950,9 +953,9 @@ public final class Format implements Parcelable {
     this.encoderDelay = encoderDelay == Format.NO_VALUE ? 0 : encoderDelay;
     this.encoderPadding = encoderPadding == Format.NO_VALUE ? 0 : encoderPadding;
     this.selectionFlags = selectionFlags;
+    this.roleFlags = roleFlags;
     this.language = Util.normalizeLanguageCode(language);
     this.accessibilityChannel = accessibilityChannel;
-    this.roleFlags = roleFlags;
     this.subsampleOffsetUs = subsampleOffsetUs;
     this.initializationData =
         initializationData == null ? Collections.emptyList() : initializationData;
@@ -984,9 +987,9 @@ public final class Format implements Parcelable {
     encoderDelay = in.readInt();
     encoderPadding = in.readInt();
     selectionFlags = in.readInt();
+    roleFlags = in.readInt();
     language = in.readString();
     accessibilityChannel = in.readInt();
-    roleFlags = in.readInt();
     subsampleOffsetUs = in.readLong();
     int initializationDataSize = in.readInt();
     initializationData = new ArrayList<>(initializationDataSize);
@@ -1020,9 +1023,9 @@ public final class Format implements Parcelable {
         encoderDelay,
         encoderPadding,
         selectionFlags,
+        roleFlags,
         language,
         accessibilityChannel,
-        roleFlags,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1052,9 +1055,9 @@ public final class Format implements Parcelable {
         encoderDelay,
         encoderPadding,
         selectionFlags,
+        roleFlags,
         language,
         accessibilityChannel,
-        roleFlags,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1093,9 +1096,9 @@ public final class Format implements Parcelable {
         encoderDelay,
         encoderPadding,
         selectionFlags,
+        roleFlags,
         language,
         accessibilityChannel,
-        roleFlags,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1165,9 +1168,9 @@ public final class Format implements Parcelable {
         encoderDelay,
         encoderPadding,
         selectionFlags,
+        roleFlags,
         language,
         accessibilityChannel,
-        roleFlags,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1197,9 +1200,9 @@ public final class Format implements Parcelable {
         encoderDelay,
         encoderPadding,
         selectionFlags,
+        roleFlags,
         language,
         accessibilityChannel,
-        roleFlags,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1229,9 +1232,9 @@ public final class Format implements Parcelable {
         encoderDelay,
         encoderPadding,
         selectionFlags,
+        roleFlags,
         language,
         accessibilityChannel,
-        roleFlags,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1261,9 +1264,9 @@ public final class Format implements Parcelable {
         encoderDelay,
         encoderPadding,
         selectionFlags,
+        roleFlags,
         language,
         accessibilityChannel,
-        roleFlags,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1293,9 +1296,9 @@ public final class Format implements Parcelable {
         encoderDelay,
         encoderPadding,
         selectionFlags,
+        roleFlags,
         language,
         accessibilityChannel,
-        roleFlags,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1325,9 +1328,9 @@ public final class Format implements Parcelable {
         encoderDelay,
         encoderPadding,
         selectionFlags,
+        roleFlags,
         language,
         accessibilityChannel,
-        roleFlags,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1357,9 +1360,9 @@ public final class Format implements Parcelable {
         encoderDelay,
         encoderPadding,
         selectionFlags,
+        roleFlags,
         language,
         accessibilityChannel,
-        roleFlags,
         subsampleOffsetUs,
         initializationData,
         drmInitData,
@@ -1465,11 +1468,11 @@ public final class Format implements Parcelable {
         && encoderPadding == other.encoderPadding
         && subsampleOffsetUs == other.subsampleOffsetUs
         && selectionFlags == other.selectionFlags
+        && roleFlags == other.roleFlags
         && Util.areEqual(id, other.id)
         && Util.areEqual(label, other.label)
         && Util.areEqual(language, other.language)
         && accessibilityChannel == other.accessibilityChannel
-        && roleFlags == other.roleFlags
         && Util.areEqual(containerMimeType, other.containerMimeType)
         && Util.areEqual(sampleMimeType, other.sampleMimeType)
         && Util.areEqual(codecs, other.codecs)
@@ -1569,9 +1572,9 @@ public final class Format implements Parcelable {
     dest.writeInt(encoderDelay);
     dest.writeInt(encoderPadding);
     dest.writeInt(selectionFlags);
+    dest.writeInt(roleFlags);
     dest.writeString(language);
     dest.writeInt(accessibilityChannel);
-    dest.writeInt(roleFlags);
     dest.writeLong(subsampleOffsetUs);
     int initializationDataSize = initializationData.size();
     dest.writeInt(initializationDataSize);
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
index 0a629b3d19..1b432beb2c 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
@@ -279,7 +279,6 @@ public class DashManifestParser extends DefaultHandler
     ArrayList<Descriptor> roleDescriptors = new ArrayList<>();
     ArrayList<Descriptor> supplementalProperties = new ArrayList<>();
     List<RepresentationInfo> representationInfos = new ArrayList<>();
-    @C.SelectionFlags int selectionFlags = 0;
 
     boolean seenFirstBaseUrl = false;
     do {
@@ -301,9 +300,7 @@ public class DashManifestParser extends DefaultHandler
         language = checkLanguageConsistency(language, xpp.getAttributeValue(null, "lang"));
         contentType = checkContentTypeConsistency(contentType, parseContentType(xpp));
       } else if (XmlPullParserUtil.isStartTag(xpp, "Role")) {
-        Descriptor descriptor = parseDescriptor(xpp, "Role");
-        selectionFlags |= parseSelectionFlags(descriptor);
-        roleDescriptors.add(descriptor);
+        roleDescriptors.add(parseDescriptor(xpp, "Role"));
       } else if (XmlPullParserUtil.isStartTag(xpp, "AudioChannelConfiguration")) {
         audioChannels = parseAudioChannelConfiguration(xpp);
       } else if (XmlPullParserUtil.isStartTag(xpp, "Accessibility")) {
@@ -324,7 +321,6 @@ public class DashManifestParser extends DefaultHandler
                 audioChannels,
                 audioSamplingRate,
                 language,
-                selectionFlags,
                 roleDescriptors,
                 accessibilityDescriptors,
                 segmentBase);
@@ -494,7 +490,6 @@ public class DashManifestParser extends DefaultHandler
       int adaptationSetAudioChannels,
       int adaptationSetAudioSamplingRate,
       String adaptationSetLanguage,
-      @C.SelectionFlags int adaptationSetSelectionFlags,
       List<Descriptor> adaptationSetRoleDescriptors,
       List<Descriptor> adaptationSetAccessibilityDescriptors,
       SegmentBase segmentBase)
@@ -559,7 +554,6 @@ public class DashManifestParser extends DefaultHandler
             audioSamplingRate,
             bandwidth,
             adaptationSetLanguage,
-            adaptationSetSelectionFlags,
             adaptationSetRoleDescriptors,
             adaptationSetAccessibilityDescriptors,
             codecs,
@@ -581,16 +575,16 @@ public class DashManifestParser extends DefaultHandler
       int audioSamplingRate,
       int bitrate,
       String language,
-      @C.SelectionFlags int selectionFlags,
       List<Descriptor> roleDescriptors,
       List<Descriptor> accessibilityDescriptors,
       String codecs,
       List<Descriptor> supplementalProperties) {
     String sampleMimeType = getSampleMimeType(containerMimeType, codecs);
+    @C.SelectionFlags int selectionFlags = parseSelection(roleDescriptors);
+    @C.RoleFlags int role = parseRole(roleDescriptors);
+    @C.RoleFlags int accessibility = parseAccessibility(accessibilityDescriptors);
+    @C.RoleFlags int roleFlags = role | accessibility;
     if (sampleMimeType != null) {
-      @C.RoleFlags int role = parseRole(roleDescriptors);
-      @C.RoleFlags int accessibility = parseAccessibility(accessibilityDescriptors);
-      @C.RoleFlags int roleFlags = role | accessibility;
       if (MimeTypes.AUDIO_E_AC3.equals(sampleMimeType)) {
         sampleMimeType = parseEac3SupplementalProperties(supplementalProperties);
       }
@@ -620,8 +614,8 @@ public class DashManifestParser extends DefaultHandler
             audioSamplingRate,
             /* initializationData= */ null,
             selectionFlags,
-            language,
-            roleFlags);
+            roleFlags,
+            language);
       } else if (mimeTypeIsRawText(sampleMimeType)) {
         int accessibilityChannel;
         if (MimeTypes.APPLICATION_CEA608.equals(sampleMimeType)) {
@@ -639,13 +633,21 @@ public class DashManifestParser extends DefaultHandler
             codecs,
             bitrate,
             selectionFlags,
+            roleFlags,
             language,
-            accessibilityChannel,
-            roleFlags);
+            accessibilityChannel);
       }
     }
     return Format.createContainerFormat(
-        id, label, containerMimeType, sampleMimeType, codecs, bitrate, selectionFlags, language);
+        id,
+        label,
+        containerMimeType,
+        sampleMimeType,
+        codecs,
+        bitrate,
+        selectionFlags,
+        roleFlags,
+        language);
   }
 
   protected Representation buildRepresentation(
@@ -1061,9 +1063,16 @@ public class DashManifestParser extends DefaultHandler
 
   // Selection flag parsing.
 
-  protected int parseSelectionFlags(Descriptor roleDescriptor) {
-    return "urn:mpeg:dash:role:2011".equals(roleDescriptor.schemeIdUri)
-      && "main".equals(roleDescriptor.value) ? C.SELECTION_FLAG_DEFAULT : 0;
+  protected int parseSelection(List<Descriptor> roleDescriptors) {
+    for (int i = 0; i < roleDescriptors.size(); i++) {
+      Descriptor descriptor = roleDescriptors.get(i);
+      if ("urn:mpeg:dash:role:2011".equalsIgnoreCase(descriptor.schemeIdUri)
+          && "main".equals(descriptor.value)) {
+        return C.SELECTION_FLAG_DEFAULT;
+      }
+    }
+
+    return 0;
   }
 
   // Role and Accessibility parsing.
@@ -1072,7 +1081,7 @@ public class DashManifestParser extends DefaultHandler
     @C.RoleFlags int result = 0;
     for (int i = 0; i < roleDescriptors.size(); i++) {
       Descriptor descriptor = roleDescriptors.get(i);
-      if ("urn:mpeg:dash:role:2011".equalsIgnoreCase(descriptor.schemeIdUri) && descriptor.value != null) {
+      if ("urn:mpeg:dash:role:2011".equalsIgnoreCase(descriptor.schemeIdUri)) {
         result |= parseRoleSchemeValue(descriptor.value);
       }
     }
@@ -1083,68 +1092,63 @@ public class DashManifestParser extends DefaultHandler
     @C.RoleFlags int result = 0;
     for (int i = 0; i < accessibilityDescriptors.size(); i++) {
       Descriptor descriptor = accessibilityDescriptors.get(i);
-      if ("urn:mpeg:dash:role:2011".equalsIgnoreCase(descriptor.schemeIdUri) && descriptor.value != null) {
+      if ("urn:mpeg:dash:role:2011".equalsIgnoreCase(descriptor.schemeIdUri)) {
         result |= parseRoleSchemeValue(descriptor.value);
-      }
-      if ("urn:tva:metadata:cs:AudioPurposeCS:2007".equalsIgnoreCase(descriptor.schemeIdUri) &&
-              descriptor.value != null) {
-        switch (descriptor.value){
-          case "1": // Audio description for the visually impaired
-            result |= C.ROLE_FLAGS_DESCRIPTION;
-            break;
-          case "2": // Audio description for the hard of hearing
-            result |= C.ROLE_FLAGS_ENHANCED_AUDIO_INTELLIGIBILITY;
-            break;
-          case "3": // Supplemental commentary
-            result |= C.ROLE_FLAGS_SUPPLEMENTARY;
-            break;
-          case "4": // Director's commentary
-            result |= C.ROLE_FLAGS_COMMENTARY;
-            break;
-          case "6": // Main programme audio
-            result |= C.ROLE_FLAGS_MAIN;
-            break;
-        }
+      } else if ("urn:tva:metadata:cs:AudioPurposeCS:2007".equalsIgnoreCase(descriptor.schemeIdUri)) {
+        result |= parseAudioPurposeValue(descriptor.value);
       }
     }
     return result;
   }
 
-  protected @C.RoleFlags int parseRoleSchemeValue(String value){
-    @C.RoleFlags int result = 0;
+  protected @C.RoleFlags int parseRoleSchemeValue(String value) {
+    if (value == null) {
+      return 0;
+    }
     switch (value) {
       case "main":
-        result |= C.ROLE_FLAGS_MAIN;
-        break;
+        return C.ROLE_FLAGS_MAIN;
       case "alternate":
-        result |= C.ROLE_FLAGS_ALTERNATE;
-        break;
+        return C.ROLE_FLAGS_ALTERNATE;
       case "supplementary":
-        result |= C.ROLE_FLAGS_SUPPLEMENTARY;
-        break;
+        return C.ROLE_FLAGS_SUPPLEMENTARY;
       case "commentary":
-        result |= C.ROLE_FLAGS_COMMENTARY;
-        break;
+        return C.ROLE_FLAGS_COMMENTARY;
       case "dub":
-        result |= C.ROLE_FLAGS_DUB;
-        break;
+        return C.ROLE_FLAGS_DUB;
       case "emergency":
-        result |= C.ROLE_FLAGS_EMERGENCY;
-        break;
+        return C.ROLE_FLAGS_EMERGENCY;
       case "caption":
-        result |= C.ROLE_FLAGS_CAPTION;
-        break;
+        return C.ROLE_FLAGS_CAPTION;
       case "sign":
-        result |= C.ROLE_FLAGS_SIGN;
-        break;
+        return C.ROLE_FLAGS_SIGN;
       case "description":
-        result |= C.ROLE_FLAGS_DESCRIPTION;
-        break;
+        return C.ROLE_FLAGS_DESCRIPTION;
       case "enhanced-audio-intelligibility":
-        result |= C.ROLE_FLAGS_ENHANCED_AUDIO_INTELLIGIBILITY;
-        break;
+        return C.ROLE_FLAGS_ENHANCED_AUDIO_INTELLIGIBILITY;
+      default:
+        return 0;
+    }
+  }
+
+  protected @C.RoleFlags int parseAudioPurposeValue(String value) {
+    if (value == null) {
+      return 0;
+    }
+    switch (value) {
+      case "1": // Audio description for the visually impaired
+        return C.ROLE_FLAGS_DESCRIPTION;
+      case "2": // Audio description for the hard of hearing
+        return C.ROLE_FLAGS_ENHANCED_AUDIO_INTELLIGIBILITY;
+      case "3": // Supplemental commentary
+        return C.ROLE_FLAGS_SUPPLEMENTARY;
+      case "4": // Director's commentary
+        return C.ROLE_FLAGS_COMMENTARY;
+      case "6": // Main programme audio
+        return C.ROLE_FLAGS_MAIN;
+      default:
+        return 0;
     }
-    return result;
   }
 
   // Utility methods.
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java
index 04820fd20c..077a34a6ab 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java
@@ -193,6 +193,7 @@ public final class DashMediaPeriodTest {
         /* codecs= */ null,
         bitrate,
         /* selectionFlags= */ 0,
+        /* roleFlags= */ 0,
         /* language= */ null);
   }
 
@@ -207,6 +208,7 @@ public final class DashMediaPeriodTest {
             /* codecs= */ null,
             bitrate,
             /* selectionFlags= */ 0,
+            /* roleFlags= */ 0,
             /* language= */ null),
         /* baseUrl= */ "",
         new SingleSegmentBase());
@@ -223,6 +225,7 @@ public final class DashMediaPeriodTest {
             /* codecs= */ null,
             /* bitrate= */ Format.NO_VALUE,
             /* selectionFlags= */ 0,
+            /* roleFlags= */ 0,
             language),
         /* baseUrl= */ "",
         new SingleSegmentBase());
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java
index 3f5d317519..df451bb3a8 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java
@@ -85,7 +85,8 @@ public final class DashUtilTest {
             /* height= */ 768,
             Format.NO_VALUE,
             /* initializationData= */ null,
-            /* selectionFlags= */ 0);
+            /* selectionFlags= */ 0,
+            /* roleFlags= */ 0);
     if (drmInitData != null) {
       format = format.copyWithDrmInitData(drmInitData);
     }
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
index 3465bfe6a9..e4e0245605 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
@@ -741,8 +741,8 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
         /* sampleRate= */ Format.NO_VALUE,
         /* initializationData= */ null,
         selectionFlags,
-        language,
-        /* roleFlags= */ 0);
+        /* roleFlags= */ 0,
+        language);
   }
 
 }
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
index ac14ea6de5..0e7f07cd7c 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
@@ -78,6 +78,7 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
               /* codecs= */ null,
               /* bitrate= */ Format.NO_VALUE,
               /* selectionFlags= */ 0,
+              /* roleFlags= */ 0,
               /* language= */ null);
       return new HlsUrl(url, format, /* name= */ "");
     }
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
index 31528353ee..177c9aaeff 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
@@ -362,8 +362,8 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
                   /* sampleRate= */ Format.NO_VALUE,
                   /* initializationData= */ null,
                   selectionFlags,
-                  language,
-                  /* roleFlags= */ 0);
+                  /* roleFlags= */ 0,
+                  language);
           if (isMediaTagMuxed(variants, uri)) {
             muxedAudioFormat = format;
           } else {
@@ -406,9 +406,9 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
                   /* codecs= */ null,
                   /* bitrate= */ Format.NO_VALUE,
                   selectionFlags,
+                  /* roleFlags= */ 0,
                   language,
-                  accessibilityChannel,
-                  /* roleFlags= */ 0));
+                  accessibilityChannel));
           break;
         default:
           // Do nothing.
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java
index 8785a402b0..2047ef1c62 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java
@@ -706,8 +706,8 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
                 samplingRate,
                 codecSpecificData,
                 /* selectionFlags= */ 0,
-                language,
-                /* roleFlags= */ 0);
+                /* roleFlags= */ 0,
+                language);
       } else if (type == C.TRACK_TYPE_TEXT) {
         String language = (String) getNormalizedAttribute(KEY_LANGUAGE);
         format =
@@ -730,6 +730,7 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
                 /* codecs= */ null,
                 bitrate,
                 /* selectionFlags= */ 0,
+                /* roleFlags= */ 0,
                 /* language= */ null);
       }
     }

From 851134ec163d5eb8022b643a2371545c9b8519df Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 6 Mar 2019 17:58:31 +0000
Subject: [PATCH 622/832] Derive Format.frameRate for MP4 videos

Issue: #5598
PiperOrigin-RevId: 237067179
---
 .../exoplayer2/extractor/mp4/Mp4Extractor.java     | 14 ++++++++++----
 library/core/src/test/assets/mp4/sample.mp4.0.dump |  2 +-
 library/core/src/test/assets/mp4/sample.mp4.1.dump |  2 +-
 library/core/src/test/assets/mp4/sample.mp4.2.dump |  2 +-
 library/core/src/test/assets/mp4/sample.mp4.3.dump |  2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
index 6847c9cbe2..2a61e7dd15 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
@@ -401,21 +401,27 @@ public final class Mp4Extractor implements Extractor, SeekMap {
     for (int i = 0; i < trackCount; i++) {
       TrackSampleTable trackSampleTable = trackSampleTables.get(i);
       Track track = trackSampleTable.track;
+      long trackDurationUs =
+          track.durationUs != C.TIME_UNSET ? track.durationUs : trackSampleTable.durationUs;
+      durationUs = Math.max(durationUs, trackDurationUs);
       Mp4Track mp4Track = new Mp4Track(track, trackSampleTable,
           extractorOutput.track(i, track.type));
+
       // Each sample has up to three bytes of overhead for the start code that replaces its length.
       // Allow ten source samples per output sample, like the platform extractor.
       int maxInputSize = trackSampleTable.maximumSize + 3 * 10;
       Format format = track.format.copyWithMaxInputSize(maxInputSize);
+      if (track.type == C.TRACK_TYPE_VIDEO
+          && trackDurationUs > 0
+          && trackSampleTable.sampleCount > 1) {
+        float frameRate = trackSampleTable.sampleCount / (trackDurationUs / 1000000f);
+        format = format.copyWithFrameRate(frameRate);
+      }
       format =
           MetadataUtil.getFormatWithMetadata(
               track.type, format, udtaMetadata, mdtaMetadata, gaplessInfoHolder);
       mp4Track.trackOutput.format(format);
 
-      durationUs =
-          Math.max(
-              durationUs,
-              track.durationUs != C.TIME_UNSET ? track.durationUs : trackSampleTable.durationUs);
       if (track.type == C.TRACK_TYPE_VIDEO && firstVideoTrackIndex == C.INDEX_UNSET) {
         firstVideoTrackIndex = tracks.size();
       }
diff --git a/library/core/src/test/assets/mp4/sample.mp4.0.dump b/library/core/src/test/assets/mp4/sample.mp4.0.dump
index b05d8250ab..37e1054f79 100644
--- a/library/core/src/test/assets/mp4/sample.mp4.0.dump
+++ b/library/core/src/test/assets/mp4/sample.mp4.0.dump
@@ -12,7 +12,7 @@ track 0:
     maxInputSize = 36722
     width = 1080
     height = 720
-    frameRate = -1.0
+    frameRate = 29.970028
     rotationDegrees = 0
     pixelWidthHeightRatio = 1.0
     channelCount = -1
diff --git a/library/core/src/test/assets/mp4/sample.mp4.1.dump b/library/core/src/test/assets/mp4/sample.mp4.1.dump
index 84d86f8ccf..6284e85034 100644
--- a/library/core/src/test/assets/mp4/sample.mp4.1.dump
+++ b/library/core/src/test/assets/mp4/sample.mp4.1.dump
@@ -12,7 +12,7 @@ track 0:
     maxInputSize = 36722
     width = 1080
     height = 720
-    frameRate = -1.0
+    frameRate = 29.970028
     rotationDegrees = 0
     pixelWidthHeightRatio = 1.0
     channelCount = -1
diff --git a/library/core/src/test/assets/mp4/sample.mp4.2.dump b/library/core/src/test/assets/mp4/sample.mp4.2.dump
index 9bbe8caa01..15b56a036f 100644
--- a/library/core/src/test/assets/mp4/sample.mp4.2.dump
+++ b/library/core/src/test/assets/mp4/sample.mp4.2.dump
@@ -12,7 +12,7 @@ track 0:
     maxInputSize = 36722
     width = 1080
     height = 720
-    frameRate = -1.0
+    frameRate = 29.970028
     rotationDegrees = 0
     pixelWidthHeightRatio = 1.0
     channelCount = -1
diff --git a/library/core/src/test/assets/mp4/sample.mp4.3.dump b/library/core/src/test/assets/mp4/sample.mp4.3.dump
index f210f277b3..073d5c774a 100644
--- a/library/core/src/test/assets/mp4/sample.mp4.3.dump
+++ b/library/core/src/test/assets/mp4/sample.mp4.3.dump
@@ -12,7 +12,7 @@ track 0:
     maxInputSize = 36722
     width = 1080
     height = 720
-    frameRate = -1.0
+    frameRate = 29.970028
     rotationDegrees = 0
     pixelWidthHeightRatio = 1.0
     channelCount = -1

From 1aad0f8e22f9d4517f368e5cc77bef23254d33ad Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 7 Mar 2019 14:35:35 +0000
Subject: [PATCH 623/832] Don't throw in
 ProgressiveMediaPeriod.onLoadCompleted.

We may currently throw if the load completes before we finished preparation.
Don't throw and instead check for this condition in maybeThrowPrepareError.

PiperOrigin-RevId: 237237000
---
 .../exoplayer2/source/ProgressiveMediaPeriod.java      | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
index c7418ff956..a179e6e3dd 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
@@ -21,6 +21,7 @@ import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.FormatHolder;
+import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.SeekParameters;
 import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
 import com.google.android.exoplayer2.extractor.DefaultExtractorInput;
@@ -218,6 +219,9 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   @Override
   public void maybeThrowPrepareError() throws IOException {
     maybeThrowError();
+    if (loadingFinished && !prepared) {
+      throw new ParserException("Loading finished before preparation is complete.");
+    }
   }
 
   @Override
@@ -512,12 +516,12 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   @Override
   public void onLoadCompleted(ExtractingLoadable loadable, long elapsedRealtimeMs,
       long loadDurationMs) {
-    if (durationUs == C.TIME_UNSET) {
-      SeekMap seekMap = Assertions.checkNotNull(this.seekMap);
+    if (durationUs == C.TIME_UNSET && seekMap != null) {
+      boolean isSeekable = seekMap.isSeekable();
       long largestQueuedTimestampUs = getLargestQueuedTimestampUs();
       durationUs = largestQueuedTimestampUs == Long.MIN_VALUE ? 0
           : largestQueuedTimestampUs + DEFAULT_LAST_SAMPLE_DURATION_US;
-      listener.onSourceInfoRefreshed(durationUs, seekMap.isSeekable());
+      listener.onSourceInfoRefreshed(durationUs, isSeekable);
     }
     eventDispatcher.loadCompleted(
         loadable.dataSpec,

From 3ea6d78ee7690c26a1841246a266141134747952 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 7 Mar 2019 15:59:27 +0000
Subject: [PATCH 624/832] Add some tests for DefaultAudioSink

PiperOrigin-RevId: 237247769
---
 .../audio/DefaultAudioSinkTest.java           | 240 ++++++++++++++++++
 1 file changed, 240 insertions(+)
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/audio/DefaultAudioSinkTest.java

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/audio/DefaultAudioSinkTest.java b/library/core/src/test/java/com/google/android/exoplayer2/audio/DefaultAudioSinkTest.java
new file mode 100644
index 0000000000..16c724f583
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/audio/DefaultAudioSinkTest.java
@@ -0,0 +1,240 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.audio;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.robolectric.annotation.Config.NEWEST_SDK;
+import static org.robolectric.annotation.Config.OLDEST_SDK;
+
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.PlaybackParameters;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Arrays;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/**
+ * Unit tests for {@link DefaultAudioSink}.
+ *
+ * <p>Note: the Robolectric-provided AudioTrack instantiated in the audio sink uses only the Java
+ * part of AudioTrack with a {@code ShadowPlayerBase} underneath. This means it will not consume
+ * data (i.e., the {@link android.media.AudioTrack#write} methods just return 0), so these tests are
+ * currently limited to verifying behavior that doesn't rely on consuming data, and the position
+ * will stay at its initial value. For example, we can't verify {@link
+ * AudioSink#handleBuffer(ByteBuffer, long)} handling a complete buffer, or queueing audio then
+ * draining to the end of the stream. This could be worked around by having a test-only mode where
+ * {@link DefaultAudioSink} automatically treats audio as consumed.
+ */
+@RunWith(RobolectricTestRunner.class)
+public final class DefaultAudioSinkTest {
+
+  private static final int CHANNEL_COUNT_MONO = 1;
+  private static final int CHANNEL_COUNT_STEREO = 2;
+  private static final int BYTES_PER_FRAME_16_BIT = 2;
+  private static final int SAMPLE_RATE_44_1 = 44100;
+  private static final int TRIM_100_MS_FRAME_COUNT = 4410;
+  private static final int TRIM_10_MS_FRAME_COUNT = 441;
+
+  private DefaultAudioSink defaultAudioSink;
+  private ArrayAudioBufferSink arrayAudioBufferSink;
+
+  @Before
+  public void setUp() {
+    // For capturing output.
+    arrayAudioBufferSink = new ArrayAudioBufferSink();
+    TeeAudioProcessor teeAudioProcessor = new TeeAudioProcessor(arrayAudioBufferSink);
+    defaultAudioSink =
+        new DefaultAudioSink(
+            AudioCapabilities.DEFAULT_AUDIO_CAPABILITIES,
+            new DefaultAudioSink.DefaultAudioProcessorChain(teeAudioProcessor),
+            /* enableConvertHighResIntPcmToFloat= */ false);
+  }
+
+  @Test
+  public void handlesBufferAfterReset() throws Exception {
+    configureDefaultAudioSink(CHANNEL_COUNT_STEREO);
+    defaultAudioSink.handleBuffer(createDefaultSilenceBuffer(), /* presentationTimeUs= */ 0);
+
+    // After reset and re-configure we can successfully queue more input.
+    defaultAudioSink.reset();
+    configureDefaultAudioSink(CHANNEL_COUNT_STEREO);
+    defaultAudioSink.handleBuffer(createDefaultSilenceBuffer(), /* presentationTimeUs= */ 0);
+  }
+
+  @Test
+  public void handlesBufferAfterReset_withPlaybackParameters() throws Exception {
+    PlaybackParameters playbackParameters = new PlaybackParameters(1.5f);
+    defaultAudioSink.setPlaybackParameters(playbackParameters);
+    configureDefaultAudioSink(CHANNEL_COUNT_STEREO);
+    defaultAudioSink.handleBuffer(createDefaultSilenceBuffer(), /* presentationTimeUs= */ 0);
+
+    // After reset and re-configure we can successfully queue more input.
+    defaultAudioSink.reset();
+    configureDefaultAudioSink(CHANNEL_COUNT_STEREO);
+    defaultAudioSink.handleBuffer(createDefaultSilenceBuffer(), /* presentationTimeUs= */ 0);
+    assertThat(defaultAudioSink.getPlaybackParameters()).isEqualTo(playbackParameters);
+  }
+
+  @Test
+  public void handlesBufferAfterReset_withFormatChange() throws Exception {
+    configureDefaultAudioSink(CHANNEL_COUNT_STEREO);
+    defaultAudioSink.handleBuffer(createDefaultSilenceBuffer(), /* presentationTimeUs= */ 0);
+
+    // After reset and re-configure we can successfully queue more input.
+    defaultAudioSink.reset();
+    configureDefaultAudioSink(CHANNEL_COUNT_MONO);
+    defaultAudioSink.handleBuffer(createDefaultSilenceBuffer(), /* presentationTimeUs= */ 0);
+  }
+
+  @Test
+  public void handlesBufferAfterReset_withFormatChangeAndPlaybackParameters() throws Exception {
+    PlaybackParameters playbackParameters = new PlaybackParameters(1.5f);
+    defaultAudioSink.setPlaybackParameters(playbackParameters);
+    configureDefaultAudioSink(CHANNEL_COUNT_STEREO);
+    defaultAudioSink.handleBuffer(createDefaultSilenceBuffer(), /* presentationTimeUs= */ 0);
+
+    // After reset and re-configure we can successfully queue more input.
+    defaultAudioSink.reset();
+    configureDefaultAudioSink(CHANNEL_COUNT_MONO);
+    defaultAudioSink.handleBuffer(createDefaultSilenceBuffer(), /* presentationTimeUs= */ 0);
+    assertThat(defaultAudioSink.getPlaybackParameters()).isEqualTo(playbackParameters);
+  }
+
+  @Test
+  public void trimsStartFrames() throws Exception {
+    configureDefaultAudioSink(
+        CHANNEL_COUNT_STEREO,
+        /* trimStartFrames= */ TRIM_100_MS_FRAME_COUNT,
+        /* trimEndFrames= */ 0);
+    defaultAudioSink.handleBuffer(createDefaultSilenceBuffer(), /* presentationTimeUs= */ 0);
+
+    assertThat(arrayAudioBufferSink.output)
+        .hasLength(
+            (BYTES_PER_FRAME_16_BIT
+                * CHANNEL_COUNT_STEREO
+                * (SAMPLE_RATE_44_1 - TRIM_100_MS_FRAME_COUNT)));
+  }
+
+  @Test
+  public void trimsEndFrames() throws Exception {
+    configureDefaultAudioSink(
+        CHANNEL_COUNT_STEREO,
+        /* trimStartFrames= */ 0,
+        /* trimEndFrames= */ TRIM_10_MS_FRAME_COUNT);
+    defaultAudioSink.handleBuffer(createDefaultSilenceBuffer(), /* presentationTimeUs= */ 0);
+
+    assertThat(arrayAudioBufferSink.output)
+        .hasLength(
+            (BYTES_PER_FRAME_16_BIT
+                * CHANNEL_COUNT_STEREO
+                * (SAMPLE_RATE_44_1 - TRIM_10_MS_FRAME_COUNT)));
+  }
+
+  @Test
+  public void trimsStartAndEndFrames() throws Exception {
+    configureDefaultAudioSink(
+        CHANNEL_COUNT_STEREO,
+        /* trimStartFrames= */ TRIM_100_MS_FRAME_COUNT,
+        /* trimEndFrames= */ TRIM_10_MS_FRAME_COUNT);
+    defaultAudioSink.handleBuffer(createDefaultSilenceBuffer(), /* presentationTimeUs= */ 0);
+
+    assertThat(arrayAudioBufferSink.output)
+        .hasLength(
+            (BYTES_PER_FRAME_16_BIT
+                * CHANNEL_COUNT_STEREO
+                * (SAMPLE_RATE_44_1 - TRIM_100_MS_FRAME_COUNT - TRIM_10_MS_FRAME_COUNT)));
+  }
+
+  @Test
+  public void getCurrentPosition_returnsPositionFromFirstBuffer() throws Exception {
+    configureDefaultAudioSink(CHANNEL_COUNT_STEREO);
+    defaultAudioSink.handleBuffer(
+        createDefaultSilenceBuffer(), /* presentationTimeUs= */ 5 * C.MICROS_PER_SECOND);
+    assertThat(defaultAudioSink.getCurrentPositionUs(/* sourceEnded= */ false))
+        .isEqualTo(5 * C.MICROS_PER_SECOND);
+
+    defaultAudioSink.reset();
+    configureDefaultAudioSink(CHANNEL_COUNT_STEREO);
+    defaultAudioSink.handleBuffer(
+        createDefaultSilenceBuffer(), /* presentationTimeUs= */ 8 * C.MICROS_PER_SECOND);
+    assertThat(defaultAudioSink.getCurrentPositionUs(/* sourceEnded= */ false))
+        .isEqualTo(8 * C.MICROS_PER_SECOND);
+  }
+
+  @Config(minSdk = OLDEST_SDK, maxSdk = 20)
+  @Test
+  public void doesNotSupportFloatOutputBeforeApi21() {
+    assertThat(defaultAudioSink.supportsOutput(CHANNEL_COUNT_STEREO, C.ENCODING_PCM_FLOAT))
+        .isFalse();
+  }
+
+  @Config(minSdk = 21, maxSdk = NEWEST_SDK)
+  @Test
+  public void supportsFloatOutputFromApi21() {
+    assertThat(defaultAudioSink.supportsOutput(CHANNEL_COUNT_STEREO, C.ENCODING_PCM_FLOAT))
+        .isTrue();
+  }
+
+  private void configureDefaultAudioSink(int channelCount) throws AudioSink.ConfigurationException {
+    configureDefaultAudioSink(channelCount, /* trimStartFrames= */ 0, /* trimEndFrames= */ 0);
+  }
+
+  private void configureDefaultAudioSink(int channelCount, int trimStartFrames, int trimEndFrames)
+      throws AudioSink.ConfigurationException {
+    defaultAudioSink.configure(
+        C.ENCODING_PCM_16BIT,
+        channelCount,
+        SAMPLE_RATE_44_1,
+        /* specifiedBufferSize= */ 0,
+        /* outputChannels= */ null,
+        /* trimStartFrames= */ trimStartFrames,
+        /* trimEndFrames= */ trimEndFrames);
+  }
+
+  /** Creates a one second silence buffer for 44.1 kHz stereo 16-bit audio. */
+  private static ByteBuffer createDefaultSilenceBuffer() {
+    return ByteBuffer.allocateDirect(
+            SAMPLE_RATE_44_1 * CHANNEL_COUNT_STEREO * BYTES_PER_FRAME_16_BIT)
+        .order(ByteOrder.nativeOrder());
+  }
+
+  private static final class ArrayAudioBufferSink implements TeeAudioProcessor.AudioBufferSink {
+
+    private byte[] output;
+
+    public ArrayAudioBufferSink() {
+      output = new byte[0];
+    }
+
+    @Override
+    public void flush(int sampleRateHz, int channelCount, int encoding) {
+      output = new byte[0];
+    }
+
+    @Override
+    public void handleBuffer(ByteBuffer buffer) {
+      int position = buffer.position();
+      int remaining = buffer.remaining();
+      output = Arrays.copyOf(output, output.length + remaining);
+      buffer.get(output, 0, remaining);
+      buffer.position(position);
+    }
+  }
+}

From d92973dbe2fb0abd9d89e8c5fc51832cedf6fe59 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 8 Mar 2019 10:33:22 +0000
Subject: [PATCH 625/832] Add release notes for time bar changes.

PiperOrigin-RevId: 237416206
---
 RELEASENOTES.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 3136cdadcc..3126b32473 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -67,6 +67,9 @@
 * Fix issue where not resetting the position for a new `MediaSource` in calls to
   `ExoPlayer.prepare` causes an `IndexOutOfBoundsException`
   ([#5520](https://github.com/google/ExoPlayer/issues/5520)).
+* Update `DefaultTimeBar` based on duration of media and add parameter to set
+  the minimum update interval to control the smoothness of the updates
+  ([#5040](https://github.com/google/ExoPlayer/issues/5040)).
 
 ### 2.9.6 ###
 

From 57e2ec6a1d9e10aa3d6e736f1f585b5e8dd12b4a Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 8 Mar 2019 11:15:40 +0000
Subject: [PATCH 626/832] Actually use view atrribute for min update interval.

We didn't read the attribute value so far.

PiperOrigin-RevId: 237420697
---
 .../com/google/android/exoplayer2/ui/PlayerControlView.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
index 612ea70fd9..afd344432f 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
@@ -293,6 +293,10 @@ public class PlayerControlView extends FrameLayout {
         repeatToggleModes = getRepeatToggleModes(a, repeatToggleModes);
         showShuffleButton =
             a.getBoolean(R.styleable.PlayerControlView_show_shuffle_button, showShuffleButton);
+        setTimeBarMinUpdateInterval(
+            a.getInt(
+                R.styleable.PlayerControlView_time_bar_min_update_interval,
+                timeBarMinUpdateIntervalMs));
       } finally {
         a.recycle();
       }

From c0e1f425e8807ef6624c67e40bdc6fe6880d1703 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 8 Mar 2019 17:56:01 +0000
Subject: [PATCH 627/832] Fix gradle leanback build by switching to androidx
 leanback.

PiperOrigin-RevId: 237467628
---
 extensions/leanback/build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extensions/leanback/build.gradle b/extensions/leanback/build.gradle
index 6319cb173d..967662cedc 100644
--- a/extensions/leanback/build.gradle
+++ b/extensions/leanback/build.gradle
@@ -32,7 +32,8 @@ android {
 
 dependencies {
     implementation project(modulePrefix + 'library-core')
-    implementation 'androidx.leanback:leanback:1.0.0'
+    implementation 'androidx.annotation:annotation:1.0.1'
+    implementation 'androidx.leanback:leanback:1.1.0-alpha01'
 }
 
 ext {

From 64af87cba0d42db8069890205e07654028bdb49a Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 11 Mar 2019 10:46:44 +0000
Subject: [PATCH 628/832] Depend on androidx leanback 1.0 for the leanback
 extension.

PiperOrigin-RevId: 237772784
---
 extensions/leanback/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/leanback/build.gradle b/extensions/leanback/build.gradle
index 967662cedc..a86eedc2d4 100644
--- a/extensions/leanback/build.gradle
+++ b/extensions/leanback/build.gradle
@@ -33,7 +33,7 @@ android {
 dependencies {
     implementation project(modulePrefix + 'library-core')
     implementation 'androidx.annotation:annotation:1.0.1'
-    implementation 'androidx.leanback:leanback:1.1.0-alpha01'
+    implementation 'androidx.leanback:leanback:1.0.0'
 }
 
 ext {

From 7bf963c06c275f4f328243cc058902bf12a7a321 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 11 Mar 2019 15:08:15 +0000
Subject: [PATCH 629/832] Add unit tests for buffer-based ABR.

PiperOrigin-RevId: 237803831
---
 .../BufferSizeAdaptationBuilder.java          |   4 +-
 .../BufferSizeAdaptiveTrackSelectionTest.java | 248 ++++++++++++++++++
 2 files changed, 250 insertions(+), 2 deletions(-)
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptiveTrackSelectionTest.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java
index 8288c5ff33..4b2a07a59a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java
@@ -114,7 +114,7 @@ public final class BufferSizeAdaptationBuilder {
   private int startUpMinBufferForQualityIncreaseMs;
   @Nullable private PriorityTaskManager priorityTaskManager;
   private DynamicFormatFilter dynamicFormatFilter;
-  boolean buildCalled;
+  private boolean buildCalled;
 
   /** Creates builder with default values. */
   public BufferSizeAdaptationBuilder() {
@@ -434,7 +434,7 @@ public final class BufferSizeAdaptationBuilder {
       int lowestBitrateNonBlacklistedIndex = 0;
       for (int i = 0; i < formatBitrates.length; i++) {
         if (formatBitrates[i] != BITRATE_BLACKLISTED) {
-          if (getTargetBufferForBitrateUs(formatBitrates[i]) < bufferUs
+          if (getTargetBufferForBitrateUs(formatBitrates[i]) <= bufferUs
               && dynamicFormatFilter.isFormatAllowed(
                   getFormat(i), formatBitrates[i], /* isInitialSelection= */ false)) {
             return i;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptiveTrackSelectionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptiveTrackSelectionTest.java
new file mode 100644
index 0000000000..9fa84e42f3
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptiveTrackSelectionTest.java
@@ -0,0 +1,248 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.trackselection;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.initMocks;
+
+import android.util.Pair;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.LoadControl;
+import com.google.android.exoplayer2.source.TrackGroup;
+import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
+import com.google.android.exoplayer2.upstream.BandwidthMeter;
+import com.google.android.exoplayer2.util.MimeTypes;
+import java.util.Collections;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.robolectric.RobolectricTestRunner;
+
+/** Unit test for the track selection created by {@link BufferSizeAdaptationBuilder}. */
+@RunWith(RobolectricTestRunner.class)
+public final class BufferSizeAdaptiveTrackSelectionTest {
+
+  private static final int MIN_BUFFER_MS = 15_000;
+  private static final int MAX_BUFFER_MS = 50_000;
+  private static final int HYSTERESIS_BUFFER_MS = 10_000;
+  private static final float BANDWIDTH_FRACTION = 0.5f;
+  private static final int MIN_BUFFER_FOR_QUALITY_INCREASE_MS = 10_000;
+
+  /**
+   * Factor between bitrates is always the same (=2.2). That means buffer levels should be linearly
+   * distributed between MIN_BUFFER=15s and MAX_BUFFER-HYSTERESIS=50s-10s=40s.
+   */
+  private static final Format format1 =
+      createVideoFormat(/* bitrate= */ 500, /* width= */ 320, /* height= */ 240);
+
+  private static final Format format2 =
+      createVideoFormat(/* bitrate= */ 1100, /* width= */ 640, /* height= */ 480);
+  private static final Format format3 =
+      createVideoFormat(/* bitrate= */ 2420, /* width= */ 960, /* height= */ 720);
+  private static final int BUFFER_LEVEL_FORMAT_2 =
+      (MIN_BUFFER_MS + MAX_BUFFER_MS - HYSTERESIS_BUFFER_MS) / 2;
+  private static final int BUFFER_LEVEL_FORMAT_3 = MAX_BUFFER_MS - HYSTERESIS_BUFFER_MS;
+
+  @Mock private BandwidthMeter mockBandwidthMeter;
+  private TrackSelection trackSelection;
+
+  @Before
+  public void setUp() {
+    initMocks(this);
+    Pair<TrackSelection.Factory, LoadControl> trackSelectionFactoryAndLoadControl =
+        new BufferSizeAdaptationBuilder()
+            .setBufferDurationsMs(
+                MIN_BUFFER_MS,
+                MAX_BUFFER_MS,
+                /* bufferForPlaybackMs= */ 1000,
+                /* bufferForPlaybackAfterRebufferMs= */ 1000)
+            .setHysteresisBufferMs(HYSTERESIS_BUFFER_MS)
+            .setStartUpTrackSelectionParameters(
+                BANDWIDTH_FRACTION, MIN_BUFFER_FOR_QUALITY_INCREASE_MS)
+            .buildPlayerComponents();
+    trackSelection =
+        trackSelectionFactoryAndLoadControl
+            .first
+            .createTrackSelections(
+                new TrackSelection.Definition[] {
+                  new TrackSelection.Definition(
+                      new TrackGroup(format1, format2, format3), /* tracks= */ 0, 1, 2)
+                },
+                mockBandwidthMeter)[0];
+    trackSelection.enable();
+  }
+
+  @Test
+  public void updateSelectedTrack_usesBandwidthEstimateForInitialSelection() {
+    when(mockBandwidthMeter.getBitrateEstimate()).thenReturn(getBitrateEstimateEnoughFor(format2));
+
+    updateSelectedTrack(/* bufferedDurationMs= */ 0);
+
+    assertThat(trackSelection.getSelectedFormat()).isEqualTo(format2);
+    assertThat(trackSelection.getSelectionReason()).isEqualTo(C.SELECTION_REASON_INITIAL);
+  }
+
+  @Test
+  public void updateSelectedTrack_withLowerBandwidthEstimateDuringStartUp_switchesDown() {
+    when(mockBandwidthMeter.getBitrateEstimate()).thenReturn(getBitrateEstimateEnoughFor(format2));
+    updateSelectedTrack(/* bufferedDurationMs= */ 0);
+    when(mockBandwidthMeter.getBitrateEstimate()).thenReturn(0L);
+
+    updateSelectedTrack(/* bufferedDurationMs= */ 0);
+
+    assertThat(trackSelection.getSelectedFormat()).isEqualTo(format1);
+    assertThat(trackSelection.getSelectionReason()).isEqualTo(C.SELECTION_REASON_ADAPTIVE);
+  }
+
+  @Test
+  public void
+      updateSelectedTrack_withHigherBandwidthEstimateDuringStartUp_andLowBuffer_keepsSelection() {
+    when(mockBandwidthMeter.getBitrateEstimate()).thenReturn(getBitrateEstimateEnoughFor(format2));
+    updateSelectedTrack(/* bufferedDurationMs= */ 0);
+    when(mockBandwidthMeter.getBitrateEstimate()).thenReturn(getBitrateEstimateEnoughFor(format3));
+
+    updateSelectedTrack(/* bufferedDurationMs= */ MIN_BUFFER_FOR_QUALITY_INCREASE_MS - 1);
+
+    assertThat(trackSelection.getSelectedFormat()).isEqualTo(format2);
+    assertThat(trackSelection.getSelectionReason()).isEqualTo(C.SELECTION_REASON_INITIAL);
+  }
+
+  @Test
+  public void
+      updateSelectedTrack_withHigherBandwidthEstimateDuringStartUp_andHighBuffer_switchesUp() {
+    when(mockBandwidthMeter.getBitrateEstimate()).thenReturn(getBitrateEstimateEnoughFor(format2));
+    updateSelectedTrack(/* bufferedDurationMs= */ 0);
+    when(mockBandwidthMeter.getBitrateEstimate()).thenReturn(getBitrateEstimateEnoughFor(format3));
+
+    updateSelectedTrack(/* bufferedDurationMs= */ MIN_BUFFER_FOR_QUALITY_INCREASE_MS);
+
+    assertThat(trackSelection.getSelectedFormat()).isEqualTo(format3);
+    assertThat(trackSelection.getSelectionReason()).isEqualTo(C.SELECTION_REASON_ADAPTIVE);
+  }
+
+  @Test
+  public void
+      updateSelectedTrack_withIncreasedBandwidthEstimate_onceSteadyStateBufferIsReached_keepsSelection() {
+    when(mockBandwidthMeter.getBitrateEstimate()).thenReturn(getBitrateEstimateEnoughFor(format2));
+    updateSelectedTrack(/* bufferedDurationMs= */ 0);
+    updateSelectedTrack(/* bufferedDurationMs= */ BUFFER_LEVEL_FORMAT_2);
+    when(mockBandwidthMeter.getBitrateEstimate()).thenReturn(getBitrateEstimateEnoughFor(format3));
+
+    updateSelectedTrack(/* bufferedDurationMs= */ BUFFER_LEVEL_FORMAT_2);
+
+    assertThat(trackSelection.getSelectedFormat()).isEqualTo(format2);
+    assertThat(trackSelection.getSelectionReason()).isEqualTo(C.SELECTION_REASON_INITIAL);
+  }
+
+  @Test
+  public void
+      updateSelectedTrack_withDecreasedBandwidthEstimate_onceSteadyStateBufferIsReached_keepsSelection() {
+    when(mockBandwidthMeter.getBitrateEstimate()).thenReturn(getBitrateEstimateEnoughFor(format2));
+    updateSelectedTrack(/* bufferedDurationMs= */ 0);
+    updateSelectedTrack(/* bufferedDurationMs= */ BUFFER_LEVEL_FORMAT_2);
+    when(mockBandwidthMeter.getBitrateEstimate()).thenReturn(0L);
+
+    updateSelectedTrack(/* bufferedDurationMs= */ BUFFER_LEVEL_FORMAT_2);
+
+    assertThat(trackSelection.getSelectedFormat()).isEqualTo(format2);
+    assertThat(trackSelection.getSelectionReason()).isEqualTo(C.SELECTION_REASON_INITIAL);
+  }
+
+  @Test
+  public void updateSelectedTrack_withIncreasedBufferInSteadyState_switchesUp() {
+    when(mockBandwidthMeter.getBitrateEstimate()).thenReturn(getBitrateEstimateEnoughFor(format2));
+    updateSelectedTrack(/* bufferedDurationMs= */ 0);
+    updateSelectedTrack(/* bufferedDurationMs= */ BUFFER_LEVEL_FORMAT_2);
+
+    updateSelectedTrack(/* bufferedDurationMs= */ BUFFER_LEVEL_FORMAT_3);
+
+    assertThat(trackSelection.getSelectedFormat()).isEqualTo(format3);
+    assertThat(trackSelection.getSelectionReason()).isEqualTo(C.SELECTION_REASON_ADAPTIVE);
+  }
+
+  @Test
+  public void updateSelectedTrack_withDecreasedBufferInSteadyState_switchesDown() {
+    when(mockBandwidthMeter.getBitrateEstimate()).thenReturn(getBitrateEstimateEnoughFor(format2));
+    updateSelectedTrack(/* bufferedDurationMs= */ 0);
+    updateSelectedTrack(/* bufferedDurationMs= */ BUFFER_LEVEL_FORMAT_2);
+    when(mockBandwidthMeter.getBitrateEstimate()).thenReturn(0L);
+
+    updateSelectedTrack(/* bufferedDurationMs= */ BUFFER_LEVEL_FORMAT_2 - HYSTERESIS_BUFFER_MS - 1);
+
+    assertThat(trackSelection.getSelectedFormat()).isEqualTo(format1);
+    assertThat(trackSelection.getSelectionReason()).isEqualTo(C.SELECTION_REASON_ADAPTIVE);
+  }
+
+  @Test
+  public void
+      updateSelectedTrack_withDecreasedBufferInSteadyState_withinHysteresis_keepsSelection() {
+    when(mockBandwidthMeter.getBitrateEstimate()).thenReturn(getBitrateEstimateEnoughFor(format2));
+    updateSelectedTrack(/* bufferedDurationMs= */ 0);
+    updateSelectedTrack(/* bufferedDurationMs= */ BUFFER_LEVEL_FORMAT_2);
+    when(mockBandwidthMeter.getBitrateEstimate()).thenReturn(0L);
+
+    updateSelectedTrack(/* bufferedDurationMs= */ BUFFER_LEVEL_FORMAT_2 - HYSTERESIS_BUFFER_MS);
+
+    assertThat(trackSelection.getSelectedFormat()).isEqualTo(format2);
+    assertThat(trackSelection.getSelectionReason()).isEqualTo(C.SELECTION_REASON_INITIAL);
+  }
+
+  @Test
+  public void onDiscontinuity_switchesBackToStartUpState() {
+    when(mockBandwidthMeter.getBitrateEstimate()).thenReturn(getBitrateEstimateEnoughFor(format2));
+    updateSelectedTrack(/* bufferedDurationMs= */ 0);
+    updateSelectedTrack(/* bufferedDurationMs= */ BUFFER_LEVEL_FORMAT_2);
+    when(mockBandwidthMeter.getBitrateEstimate()).thenReturn(0L);
+
+    trackSelection.onDiscontinuity();
+    updateSelectedTrack(/* bufferedDurationMs= */ BUFFER_LEVEL_FORMAT_2 - 1);
+
+    assertThat(trackSelection.getSelectedFormat()).isEqualTo(format1);
+    assertThat(trackSelection.getSelectionReason()).isEqualTo(C.SELECTION_REASON_ADAPTIVE);
+  }
+
+  private void updateSelectedTrack(long bufferedDurationMs) {
+    trackSelection.updateSelectedTrack(
+        /* playbackPositionUs= */ 0,
+        /* bufferedDurationUs= */ C.msToUs(bufferedDurationMs),
+        /* availableDurationUs= */ C.TIME_UNSET,
+        /* queue= */ Collections.emptyList(),
+        /* mediaChunkIterators= */ new MediaChunkIterator[] {
+          MediaChunkIterator.EMPTY, MediaChunkIterator.EMPTY, MediaChunkIterator.EMPTY
+        });
+  }
+
+  private static Format createVideoFormat(int bitrate, int width, int height) {
+    return Format.createVideoSampleFormat(
+        /* id= */ null,
+        /* sampleMimeType= */ MimeTypes.VIDEO_H264,
+        /* codecs= */ null,
+        /* bitrate= */ bitrate,
+        /* maxInputSize= */ Format.NO_VALUE,
+        /* width= */ width,
+        /* height= */ height,
+        /* frameRate= */ Format.NO_VALUE,
+        /* initializationData= */ null,
+        /* drmInitData= */ null);
+  }
+
+  private static long getBitrateEstimateEnoughFor(Format format) {
+    return (long) (format.bitrate / BANDWIDTH_FRACTION) + 1;
+  }
+}

From 7acc0ee798d4e5fb1bc97a179d47fa232f166680 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 11 Mar 2019 22:50:35 +0000
Subject: [PATCH 630/832] Fix ProgressiveMediaSource DefaultExtractorsFactory
 proguarding

PiperOrigin-RevId: 237900673
---
 RELEASENOTES.md                               |  5 ++++
 .../exoplayer2/ext/flac/FlacPlaybackTest.java |  4 ++--
 .../exoplayer2/ext/opus/OpusPlaybackTest.java |  4 ++--
 .../exoplayer2/ext/vp9/VpxPlaybackTest.java   |  4 ++--
 .../source/ProgressiveMediaSource.java        | 23 +++++++++++++++----
 5 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 3126b32473..0394f8d83d 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -70,6 +70,11 @@
 * Update `DefaultTimeBar` based on duration of media and add parameter to set
   the minimum update interval to control the smoothness of the updates
   ([#5040](https://github.com/google/ExoPlayer/issues/5040)).
+* Fix issue where using `ProgressiveMediaSource.Factory` would mean that
+  `DefaultExtractorsFactory` would be kept by proguard. Custom
+  `ExtractorsFactory` instances must now be passed via the
+  `ProgressiveMediaSource.Factory` constructor, and `setExtractorsFactory` is
+  deprecated.
 
 ### 2.9.6 ###
 
diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java
index 5448919626..5904a8eb2b 100644
--- a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java
+++ b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java
@@ -87,8 +87,8 @@ public class FlacPlaybackTest {
       player.addListener(this);
       MediaSource mediaSource =
           new ProgressiveMediaSource.Factory(
-                  new DefaultDataSourceFactory(context, "ExoPlayerExtFlacTest"))
-              .setExtractorsFactory(MatroskaExtractor.FACTORY)
+                  new DefaultDataSourceFactory(context, "ExoPlayerExtFlacTest"),
+                  MatroskaExtractor.FACTORY)
               .createMediaSource(uri);
       player.prepare(mediaSource);
       player.setPlayWhenReady(true);
diff --git a/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java b/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java
index 6a254c8230..536f605293 100644
--- a/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java
+++ b/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java
@@ -87,8 +87,8 @@ public class OpusPlaybackTest {
       player.addListener(this);
       MediaSource mediaSource =
           new ProgressiveMediaSource.Factory(
-                  new DefaultDataSourceFactory(context, "ExoPlayerExtOpusTest"))
-              .setExtractorsFactory(MatroskaExtractor.FACTORY)
+                  new DefaultDataSourceFactory(context, "ExoPlayerExtOpusTest"),
+                  MatroskaExtractor.FACTORY)
               .createMediaSource(uri);
       player.prepare(mediaSource);
       player.setPlayWhenReady(true);
diff --git a/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java b/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
index a36b578588..e835810778 100644
--- a/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
+++ b/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
@@ -120,8 +120,8 @@ public class VpxPlaybackTest {
       player.addListener(this);
       MediaSource mediaSource =
           new ProgressiveMediaSource.Factory(
-                  new DefaultDataSourceFactory(context, "ExoPlayerExtVp9Test"))
-              .setExtractorsFactory(MatroskaExtractor.FACTORY)
+                  new DefaultDataSourceFactory(context, "ExoPlayerExtVp9Test"),
+                  MatroskaExtractor.FACTORY)
               .createMediaSource(uri);
       player
           .createMessage(videoRenderer)
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
index 4130ce3e98..f448b0b6c8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
@@ -49,7 +49,7 @@ public final class ProgressiveMediaSource extends BaseMediaSource
 
     private final DataSource.Factory dataSourceFactory;
 
-    @Nullable private ExtractorsFactory extractorsFactory;
+    private ExtractorsFactory extractorsFactory;
     @Nullable private String customCacheKey;
     @Nullable private Object tag;
     private LoadErrorHandlingPolicy loadErrorHandlingPolicy;
@@ -57,12 +57,24 @@ public final class ProgressiveMediaSource extends BaseMediaSource
     private boolean isCreateCalled;
 
     /**
-     * Creates a new factory for {@link ProgressiveMediaSource}s.
+     * Creates a new factory for {@link ProgressiveMediaSource}s, using the extractors provided by
+     * {@link DefaultExtractorsFactory}.
      *
      * @param dataSourceFactory A factory for {@link DataSource}s to read the media.
      */
     public Factory(DataSource.Factory dataSourceFactory) {
+      this(dataSourceFactory, new DefaultExtractorsFactory());
+    }
+
+    /**
+     * Creates a new factory for {@link ProgressiveMediaSource}s.
+     *
+     * @param dataSourceFactory A factory for {@link DataSource}s to read the media.
+     * @param extractorsFactory A factory for extractors used to extract media from its container.
+     */
+    public Factory(DataSource.Factory dataSourceFactory, ExtractorsFactory extractorsFactory) {
       this.dataSourceFactory = dataSourceFactory;
+      this.extractorsFactory = extractorsFactory;
       loadErrorHandlingPolicy = new DefaultLoadErrorHandlingPolicy();
       continueLoadingCheckIntervalBytes = DEFAULT_LOADING_CHECK_INTERVAL_BYTES;
     }
@@ -76,7 +88,11 @@ public final class ProgressiveMediaSource extends BaseMediaSource
      *     formats.
      * @return This factory, for convenience.
      * @throws IllegalStateException If one of the {@code create} methods has already been called.
+     * @deprecated Pass the {@link ExtractorsFactory} via {@link #Factory(DataSource.Factory,
+     *     ExtractorsFactory)}. This is necessary so that proguard can treat the default extractors
+     *     factory as unused.
      */
+    @Deprecated
     public Factory setExtractorsFactory(ExtractorsFactory extractorsFactory) {
       Assertions.checkState(!isCreateCalled);
       this.extractorsFactory = extractorsFactory;
@@ -153,9 +169,6 @@ public final class ProgressiveMediaSource extends BaseMediaSource
     @Override
     public ProgressiveMediaSource createMediaSource(Uri uri) {
       isCreateCalled = true;
-      if (extractorsFactory == null) {
-        extractorsFactory = new DefaultExtractorsFactory();
-      }
       return new ProgressiveMediaSource(
           uri,
           dataSourceFactory,

From 76e99504097a7519d496de3d709f14c7e73bb55e Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 11 Mar 2019 22:57:26 +0000
Subject: [PATCH 631/832] Make MatroskaExtractor.seek() non-final

Now that this class can be extended, it makes sense for subclasses to be able
to clear state in seek().

PiperOrigin-RevId: 237902276
---
 .../android/exoplayer2/extractor/mkv/MatroskaExtractor.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
index 9469ecf6ce..e53a25d0af 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
@@ -412,8 +412,9 @@ public class MatroskaExtractor implements Extractor {
     extractorOutput = output;
   }
 
+  @CallSuper
   @Override
-  public final void seek(long position, long timeUs) {
+  public void seek(long position, long timeUs) {
     clusterTimecodeUs = C.TIME_UNSET;
     blockState = BLOCK_STATE_START;
     reader.reset();

From 9c6c74d564d7cb2a939d87e26b60df70484c211f Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Tue, 12 Mar 2019 13:31:08 +0000
Subject: [PATCH 632/832] Fix merging download action to completed and stop
 flag set download

PiperOrigin-RevId: 238002393
---
 .../exoplayer2/offline/DownloadState.java        |  6 +++---
 .../exoplayer2/offline/DownloadStateTest.java    | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
index b7d2944e63..472c672574 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
@@ -247,7 +247,7 @@ public final class DownloadState {
         type,
         action.uri,
         action.customCacheKey,
-        getNextState(state, action.isRemoveAction),
+        getNextState(state, stopFlags != 0, action.isRemoveAction),
         /* downloadPercentage= */ C.PERCENTAGE_UNSET,
         downloadedBytes,
         /* totalBytes= */ C.LENGTH_UNSET,
@@ -261,14 +261,14 @@ public final class DownloadState {
         action.data);
   }
 
-  private static int getNextState(int currentState, boolean remove) {
+  private static int getNextState(int currentState, boolean stopFlagsSet, boolean remove) {
     int nextState;
     if (remove) {
       nextState = STATE_REMOVING;
     } else {
       if (currentState == STATE_REMOVING || currentState == STATE_RESTARTING) {
         nextState = STATE_RESTARTING;
-      } else if (currentState == STATE_STOPPED) {
+      } else if (stopFlagsSet) {
         nextState = STATE_STOPPED;
       } else {
         nextState = STATE_QUEUED;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
index dcb0b443af..de6369d1fe 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
@@ -195,6 +195,22 @@ public class DownloadStateTest {
     assertEqual(mergedDownloadState, expectedDownloadState);
   }
 
+  @Test
+  public void mergeAction_stopFlagSetButNotInStoppedState_stateBecomesStopped() {
+    DownloadAction downloadAction = createDownloadAction();
+    DownloadStateBuilder downloadStateBuilder =
+        new DownloadStateBuilder(downloadAction)
+            .setState(DownloadState.STATE_COMPLETED)
+            .setStopFlags(DownloadState.STOP_FLAG_MANUAL);
+    DownloadState downloadState = downloadStateBuilder.build();
+
+    DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);
+
+    DownloadState expectedDownloadState =
+        downloadStateBuilder.setState(DownloadState.STATE_STOPPED).build();
+    assertEqual(mergedDownloadState, expectedDownloadState);
+  }
+
   @Test
   public void mergeAction_restartingDownloadRemoveAction_stateBecomesRemoving() {
     DownloadAction downloadAction = createRemoveAction();

From 8e80acd18fe00b2e75d19dd43f91a9a72a228d97 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 12 Mar 2019 14:39:44 +0000
Subject: [PATCH 633/832] Use androidx.test and extensions.

This replaces the deprecated usages of RobolectricTestRunner and
RuntimeEnvironent and fully migrates the tests to androidx.

PiperOrigin-RevId: 238011667
---
 constants.gradle                              |   7 +-
 extensions/cast/build.gradle                  |   4 -
 .../ext/cast/CastTimelineTrackerTest.java     |   4 +-
 .../exoplayer2/ext/cast/MediaItemTest.java    |   4 +-
 .../ByteArrayUploadDataProviderTest.java      |   4 +-
 .../ext/cronet/CronetDataSourceTest.java      |   4 +-
 extensions/ffmpeg/build.gradle                |   1 -
 .../ffmpeg/DefaultRenderersFactoryTest.java   |   4 +-
 extensions/flac/build.gradle                  |   3 +-
 .../flac/src/androidTest/AndroidManifest.xml  |   1 +
 .../ext/flac/FlacBinarySearchSeekerTest.java  |  20 ++--
 .../ext/flac/FlacExtractorSeekTest.java       |  19 ++--
 .../ext/flac/FlacExtractorTest.java           |  23 ++--
 .../exoplayer2/ext/flac/FlacPlaybackTest.java |   6 +-
 .../flac/DefaultExtractorsFactoryTest.java    |   4 +-
 .../ext/flac/DefaultRenderersFactoryTest.java |   4 +-
 extensions/ima/build.gradle                   |   4 -
 .../exoplayer2/ext/ima/ImaAdsLoaderTest.java  |  12 +-
 extensions/opus/build.gradle                  |   4 +-
 .../opus/src/androidTest/AndroidManifest.xml  |   1 +
 .../exoplayer2/ext/opus/OpusPlaybackTest.java |   6 +-
 .../ext/opus/DefaultRenderersFactoryTest.java |   4 +-
 extensions/rtmp/build.gradle                  |   3 +-
 .../ext/rtmp/DefaultDataSourceTest.java       |  10 +-
 extensions/vp9/build.gradle                   |   6 +-
 .../vp9/src/androidTest/AndroidManifest.xml   |   1 +
 .../exoplayer2/ext/vp9/VpxPlaybackTest.java   |   6 +-
 .../ext/vp9/DefaultRenderersFactoryTest.java  |   4 +-
 library/core/build.gradle                     |  10 +-
 .../core/src/androidTest/AndroidManifest.xml  |   1 +
 .../upstream/ContentDataSourceTest.java       |   2 +-
 .../com/google/android/exoplayer2/CTest.java  |   8 +-
 .../exoplayer2/DefaultLoadControlTest.java    |   4 +-
 .../exoplayer2/DefaultMediaClockTest.java     |   8 +-
 .../android/exoplayer2/ExoPlayerTest.java     |   8 +-
 .../google/android/exoplayer2/FormatTest.java |   8 +-
 .../exoplayer2/MediaPeriodQueueTest.java      |   4 +-
 .../android/exoplayer2/TimelineTest.java      |   4 +-
 .../analytics/AnalyticsCollectorTest.java     |   8 +-
 .../android/exoplayer2/audio/Ac3UtilTest.java |   4 +-
 .../audio/AudioFocusManagerTest.java          |  12 +-
 .../audio/DefaultAudioSinkTest.java           |   4 +-
 .../SilenceSkippingAudioProcessorTest.java    |   4 +-
 .../audio/SimpleDecoderAudioRendererTest.java |   8 +-
 .../audio/SonicAudioProcessorTest.java        |   8 +-
 .../exoplayer2/database/VersionTableTest.java |   4 +-
 .../exoplayer2/drm/ClearKeyUtilTest.java      |   8 +-
 .../exoplayer2/drm/DrmInitDataTest.java       |   8 +-
 .../drm/OfflineLicenseHelperTest.java         |   4 +-
 .../extractor/ConstantBitrateSeekMapTest.java |   4 +-
 .../extractor/DefaultExtractorInputTest.java  |   8 +-
 .../DefaultExtractorsFactoryTest.java         |   4 +-
 .../exoplayer2/extractor/ExtractorTest.java   |   8 +-
 .../exoplayer2/extractor/Id3PeekerTest.java   |   4 +-
 .../extractor/amr/AmrExtractorSeekTest.java   |  32 +++---
 .../extractor/amr/AmrExtractorTest.java       |   4 +-
 .../extractor/flv/FlvExtractorTest.java       |   4 +-
 .../extractor/mkv/DefaultEbmlReaderTest.java  |   8 +-
 .../extractor/mkv/MatroskaExtractorTest.java  |   4 +-
 .../extractor/mkv/VarintReaderTest.java       |   8 +-
 .../extractor/mp3/Mp3ExtractorTest.java       |   4 +-
 .../extractor/mp3/XingSeekerTest.java         |   8 +-
 .../extractor/mp4/AtomParsersTest.java        |   8 +-
 .../mp4/FragmentedMp4ExtractorTest.java       |   4 +-
 .../extractor/mp4/MdtaMetadataEntryTest.java  |   4 +-
 .../extractor/mp4/Mp4ExtractorTest.java       |   4 +-
 .../extractor/mp4/PsshAtomUtilTest.java       |   8 +-
 .../extractor/ogg/DefaultOggSeekerTest.java   |   4 +-
 .../ogg/DefaultOggSeekerUtilMethodsTest.java  |   8 +-
 .../extractor/ogg/OggExtractorTest.java       |   4 +-
 .../extractor/ogg/OggPacketTest.java          |   8 +-
 .../extractor/ogg/OggPageHeaderTest.java      |   8 +-
 .../extractor/ogg/VorbisBitArrayTest.java     |   8 +-
 .../extractor/ogg/VorbisReaderTest.java       |   8 +-
 .../extractor/ogg/VorbisUtilTest.java         |   8 +-
 .../extractor/rawcc/RawCcExtractorTest.java   |   4 +-
 .../extractor/ts/Ac3ExtractorTest.java        |   4 +-
 .../extractor/ts/AdtsExtractorSeekTest.java   |  20 ++--
 .../extractor/ts/AdtsExtractorTest.java       |   4 +-
 .../extractor/ts/AdtsReaderTest.java          |   4 +-
 .../extractor/ts/PsDurationReaderTest.java    |  12 +-
 .../extractor/ts/PsExtractorSeekTest.java     |  11 +-
 .../extractor/ts/PsExtractorTest.java         |   4 +-
 .../extractor/ts/SectionReaderTest.java       |   8 +-
 .../extractor/ts/TsDurationReaderTest.java    |  14 ++-
 .../extractor/ts/TsExtractorSeekTest.java     |  10 +-
 .../extractor/ts/TsExtractorTest.java         |  18 +--
 .../extractor/wav/WavExtractorTest.java       |   4 +-
 .../emsg/EventMessageDecoderTest.java         |   8 +-
 .../emsg/EventMessageEncoderTest.java         |   8 +-
 .../metadata/emsg/EventMessageTest.java       |   8 +-
 .../metadata/icy/IcyDecoderTest.java          |   4 +-
 .../metadata/icy/IcyHeadersTest.java          |   4 +-
 .../metadata/icy/IcyStreamInfoTest.java       |   4 +-
 .../metadata/id3/ChapterFrameTest.java        |   8 +-
 .../metadata/id3/ChapterTocFrameTest.java     |   8 +-
 .../metadata/id3/Id3DecoderTest.java          |   8 +-
 .../metadata/id3/MlltFrameTest.java           |   4 +-
 .../scte35/SpliceInfoDecoderTest.java         |   8 +-
 .../exoplayer2/offline/ActionFileTest.java    |   8 +-
 .../offline/DefaultDownloadIndexTest.java     |   8 +-
 .../offline/DefaultDownloaderFactoryTest.java |   4 +-
 .../offline/DownloadActionTest.java           |   9 +-
 .../offline/DownloadHelperTest.java           |   4 +-
 .../offline/DownloadIndexUtilTest.java        |  10 +-
 .../offline/DownloadManagerTest.java          |  10 +-
 .../exoplayer2/offline/DownloadStateTest.java |   4 +-
 .../source/ClippingMediaSourceTest.java       |   4 +-
 .../CompositeSequenceableLoaderTest.java      |   8 +-
 .../source/ConcatenatingMediaSourceTest.java  |   4 +-
 .../source/LoopingMediaSourceTest.java        |   4 +-
 .../source/MergingMediaSourceTest.java        |   4 +-
 .../exoplayer2/source/SampleQueueTest.java    |   8 +-
 .../exoplayer2/source/ShuffleOrderTest.java   |   8 +-
 .../source/SinglePeriodTimelineTest.java      |   8 +-
 .../source/TrackGroupArrayTest.java           |   4 +-
 .../exoplayer2/source/TrackGroupTest.java     |   4 +-
 .../source/ads/AdPlaybackStateTest.java       |   4 +-
 .../chunk/MediaChunkListIteratorTest.java     |   4 +-
 .../exoplayer2/text/ssa/SsaDecoderTest.java   |  25 +++--
 .../text/subrip/SubripDecoderTest.java        |  37 ++++---
 .../exoplayer2/text/ttml/TtmlDecoderTest.java |   8 +-
 .../text/ttml/TtmlRenderUtilTest.java         |   8 +-
 .../exoplayer2/text/ttml/TtmlStyleTest.java   |   4 +-
 .../exoplayer2/text/tx3g/Tx3gDecoderTest.java |  48 +++++---
 .../exoplayer2/text/webvtt/CssParserTest.java |   8 +-
 .../text/webvtt/Mp4WebvttDecoderTest.java     |   8 +-
 .../text/webvtt/WebvttCueParserTest.java      |   8 +-
 .../text/webvtt/WebvttDecoderTest.java        |  10 +-
 .../text/webvtt/WebvttSubtitleTest.java       |   8 +-
 .../AdaptiveTrackSelectionTest.java           |   4 +-
 .../BufferSizeAdaptiveTrackSelectionTest.java |   4 +-
 .../DefaultTrackSelectorTest.java             |   8 +-
 .../MappingTrackSelectorTest.java             |   8 +-
 .../TrackSelectionUtilTest.java               |   4 +-
 .../trackselection/TrackSelectorTest.java     |   4 +-
 .../WindowedTrackBitrateEstimatorTest.java    |   4 +-
 .../upstream/AssetDataSourceTest.java         |  14 +--
 .../upstream/BaseDataSourceTest.java          |   4 +-
 .../upstream/ByteArrayDataSourceTest.java     |   8 +-
 .../upstream/DataSchemeDataSourceTest.java    |   8 +-
 .../upstream/DataSourceInputStreamTest.java   |   8 +-
 .../upstream/DefaultBandwidthMeterTest.java   | 103 +++++++++---------
 .../DefaultLoadErrorHandlingPolicyTest.java   |   4 +-
 .../upstream/cache/CacheDataSourceTest.java   |  13 +--
 .../upstream/cache/CacheDataSourceTest2.java  |  13 +--
 .../upstream/cache/CacheUtilTest.java         |  13 +--
 .../cache/CachedContentIndexTest.java         |   8 +-
 .../cache/CachedRegionTrackerTest.java        |   9 +-
 .../cache/DefaultContentMetadataTest.java     |   4 +-
 .../LeastRecentlyUsedCacheEvictorTest.java    |   8 +-
 .../upstream/cache/SimpleCacheSpanTest.java   |   8 +-
 .../upstream/cache/SimpleCacheTest.java       |  15 ++-
 .../crypto/AesFlushingCipherTest.java         |   8 +-
 .../exoplayer2/util/AtomicFileTest.java       |  13 +--
 .../exoplayer2/util/ColorParserTest.java      |   8 +-
 .../exoplayer2/util/MimeTypesTest.java        |   4 +-
 .../exoplayer2/util/NalUnitUtilTest.java      |   8 +-
 .../exoplayer2/util/ParsableBitArrayTest.java |   8 +-
 .../util/ParsableByteArrayTest.java           |   8 +-
 .../util/ParsableNalUnitBitArrayTest.java     |   8 +-
 .../ReusableBufferedOutputStreamTest.java     |   8 +-
 .../exoplayer2/util/TimedValueQueueTest.java  |   4 +-
 .../android/exoplayer2/util/UriUtilTest.java  |   8 +-
 .../android/exoplayer2/util/UtilTest.java     |   8 +-
 .../spherical/FrameRotationQueueTest.java     |   4 +-
 .../spherical/ProjectionDecoderTest.java      |   4 +-
 .../video/spherical/ProjectionTest.java       |   4 +-
 .../source/dash/DashMediaPeriodTest.java      |   4 +-
 .../source/dash/DashMediaSourceTest.java      |   4 +-
 .../exoplayer2/source/dash/DashUtilTest.java  |   4 +-
 .../source/dash/EventSampleStreamTest.java    |   8 +-
 .../dash/manifest/DashManifestParserTest.java |  19 ++--
 .../dash/manifest/DashManifestTest.java       |   4 +-
 .../source/dash/manifest/RangedUriTest.java   |   4 +-
 .../source/dash/manifest/UrlTemplateTest.java |   4 +-
 .../dash/offline/DashDownloaderTest.java      |   9 +-
 .../dash/offline/DownloadHelperTest.java      |   4 +-
 .../dash/offline/DownloadManagerDashTest.java |  10 +-
 .../dash/offline/DownloadServiceDashTest.java |  10 +-
 .../source/hls/Aes128DataSourceTest.java      |   4 +-
 .../source/hls/HlsMediaPeriodTest.java        |   4 +-
 .../source/hls/WebvttExtractorTest.java       |   4 +-
 .../hls/offline/DownloadHelperTest.java       |   4 +-
 .../source/hls/offline/HlsDownloaderTest.java |   9 +-
 .../playlist/HlsMasterPlaylistParserTest.java |   4 +-
 .../playlist/HlsMediaPlaylistParserTest.java  |   4 +-
 .../smoothstreaming/SsMediaPeriodTest.java    |   4 +-
 .../manifest/SsManifestParserTest.java        |  10 +-
 .../manifest/SsManifestTest.java              |   4 +-
 .../offline/DownloadHelperTest.java           |   4 +-
 .../offline/SsDownloaderTest.java             |   4 +-
 .../ui/spherical/CanvasRendererTest.java      |   4 +-
 .../ui/spherical/TouchTrackerTest.java        |   8 +-
 playbacktests/build.gradle                    |   4 +-
 .../src/androidTest/AndroidManifest.xml       |   1 +
 .../gts/CommonEncryptionDrmTest.java          |   6 +-
 .../playbacktests/gts/DashDownloadTest.java   |   5 +-
 .../playbacktests/gts/DashStreamingTest.java  |   5 +-
 .../playbacktests/gts/DashTestRunner.java     |  20 +---
 .../gts/DashWidevineOfflineTest.java          |   5 +-
 .../gts/EnumerateDecodersTest.java            |  10 +-
 testutils/build.gradle                        |   3 +-
 .../exoplayer2/testutil/ExtractorAsserts.java |  22 +---
 .../exoplayer2/testutil/MetricsLogger.java    |   8 +-
 .../testutil/FakeAdaptiveDataSetTest.java     |   4 +-
 .../exoplayer2/testutil/FakeClockTest.java    |   4 +-
 .../exoplayer2/testutil/FakeDataSetTest.java  |   4 +-
 .../testutil/FakeDataSourceTest.java          |   4 +-
 testutils_robolectric/build.gradle            |   1 +
 .../DefaultRenderersFactoryAsserts.java       |   4 +-
 211 files changed, 765 insertions(+), 849 deletions(-)

diff --git a/constants.gradle b/constants.gradle
index 3f69ab6754..1d6cd4fd73 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -18,15 +18,12 @@ project.ext {
     minSdkVersion = 16
     targetSdkVersion = 28
     compileSdkVersion = 28
-    testSupportLibraryVersion = '0.5'
     dexmakerVersion = '1.2'
     mockitoVersion = '1.9.5'
-    junitVersion = '4.12'
-    truthVersion = '0.42'
-    robolectricVersion = '4.1'
+    robolectricVersion = '4.2'
     autoValueVersion = '1.6'
     checkerframeworkVersion = '2.5.0'
-    testRunnerVersion = '1.1.0-alpha3'
+    androidXTestVersion = '1.1.0'
     modulePrefix = ':'
     if (gradle.ext.has('exoplayerModulePrefix')) {
         modulePrefix += gradle.ext.exoplayerModulePrefix
diff --git a/extensions/cast/build.gradle b/extensions/cast/build.gradle
index 071a70c545..573426df2e 100644
--- a/extensions/cast/build.gradle
+++ b/extensions/cast/build.gradle
@@ -37,10 +37,6 @@ dependencies {
     implementation project(modulePrefix + 'library-ui')
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion
-    testImplementation project(modulePrefix + 'testutils')
-    testImplementation 'junit:junit:' + junitVersion
-    testImplementation 'org.mockito:mockito-core:' + mockitoVersion
-    testImplementation 'org.robolectric:robolectric:' + robolectricVersion
     testImplementation project(modulePrefix + 'testutils-robolectric')
 }
 
diff --git a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTimelineTrackerTest.java b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTimelineTrackerTest.java
index 4c60e7c0b3..23c58d4884 100644
--- a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTimelineTrackerTest.java
+++ b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTimelineTrackerTest.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.ext.cast;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.TimelineAsserts;
 import com.google.android.exoplayer2.util.MimeTypes;
@@ -25,10 +26,9 @@ import java.util.ArrayList;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.robolectric.RobolectricTestRunner;
 
 /** Tests for {@link CastTimelineTracker}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class CastTimelineTrackerTest {
 
   private static final long DURATION_1_MS = 1000;
diff --git a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/MediaItemTest.java b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/MediaItemTest.java
index 98df0d5690..9cdc073b06 100644
--- a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/MediaItemTest.java
+++ b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/MediaItemTest.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.ext.cast;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.MimeTypes;
 import java.util.Arrays;
@@ -26,10 +27,9 @@ import java.util.List;
 import java.util.UUID;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Test for {@link MediaItem}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class MediaItemTest {
 
   @Test
diff --git a/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.java b/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.java
index 117518a1eb..244ba9083b 100644
--- a/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.java
+++ b/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.java
@@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
@@ -28,10 +29,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
 
 /** Tests for {@link ByteArrayUploadDataProvider}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class ByteArrayUploadDataProviderTest {
 
   private static final byte[] TEST_DATA = new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
diff --git a/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java b/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
index 7d47b0da64..7c4c03dd87 100644
--- a/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
+++ b/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
@@ -31,6 +31,7 @@ import static org.mockito.Mockito.when;
 import android.net.Uri;
 import android.os.ConditionVariable;
 import android.os.SystemClock;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.upstream.DataSpec;
 import com.google.android.exoplayer2.upstream.HttpDataSource;
@@ -62,10 +63,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
 
 /** Tests for {@link CronetDataSource}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class CronetDataSourceTest {
 
   private static final int TEST_CONNECT_TIMEOUT_MS = 100;
diff --git a/extensions/ffmpeg/build.gradle b/extensions/ffmpeg/build.gradle
index 16796d66e4..ee3358d21a 100644
--- a/extensions/ffmpeg/build.gradle
+++ b/extensions/ffmpeg/build.gradle
@@ -41,7 +41,6 @@ dependencies {
     implementation 'androidx.annotation:annotation:1.0.1'
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     testImplementation project(modulePrefix + 'testutils-robolectric')
-    testImplementation 'junit:junit:' + junitVersion
 }
 
 ext {
diff --git a/extensions/ffmpeg/src/test/java/com/google/android/exoplayer2/ext/ffmpeg/DefaultRenderersFactoryTest.java b/extensions/ffmpeg/src/test/java/com/google/android/exoplayer2/ext/ffmpeg/DefaultRenderersFactoryTest.java
index 7e99a11861..a52d1b1d7a 100644
--- a/extensions/ffmpeg/src/test/java/com/google/android/exoplayer2/ext/ffmpeg/DefaultRenderersFactoryTest.java
+++ b/extensions/ffmpeg/src/test/java/com/google/android/exoplayer2/ext/ffmpeg/DefaultRenderersFactoryTest.java
@@ -15,14 +15,14 @@
  */
 package com.google.android.exoplayer2.ext.ffmpeg;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link DefaultRenderersFactoryTest} with {@link FfmpegAudioRenderer}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class DefaultRenderersFactoryTest {
 
   @Test
diff --git a/extensions/flac/build.gradle b/extensions/flac/build.gradle
index 4ed81db030..9a247c3f8f 100644
--- a/extensions/flac/build.gradle
+++ b/extensions/flac/build.gradle
@@ -41,9 +41,8 @@ dependencies {
     implementation project(modulePrefix + 'library-core')
     implementation 'androidx.annotation:annotation:1.0.1'
     androidTestImplementation project(modulePrefix + 'testutils')
-    androidTestImplementation 'androidx.test:runner:' + testRunnerVersion
+    androidTestImplementation 'androidx.test:runner:' + androidXTestVersion
     testImplementation project(modulePrefix + 'testutils-robolectric')
-    testImplementation 'org.robolectric:robolectric:' + robolectricVersion
 }
 
 ext {
diff --git a/extensions/flac/src/androidTest/AndroidManifest.xml b/extensions/flac/src/androidTest/AndroidManifest.xml
index 68ab6fe0c3..39b92aa217 100644
--- a/extensions/flac/src/androidTest/AndroidManifest.xml
+++ b/extensions/flac/src/androidTest/AndroidManifest.xml
@@ -19,6 +19,7 @@
     package="com.google.android.exoplayer2.ext.flac.test">
 
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+  <uses-sdk/>
 
   <application android:debuggable="true"
       android:allowBackup="false"
diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacBinarySearchSeekerTest.java b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacBinarySearchSeekerTest.java
index f8e61a0609..435279fc45 100644
--- a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacBinarySearchSeekerTest.java
+++ b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacBinarySearchSeekerTest.java
@@ -16,22 +16,26 @@
 package com.google.android.exoplayer2.ext.flac;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
 
-import android.test.InstrumentationTestCase;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.extractor.SeekMap;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import java.io.IOException;
+import org.junit.Before;
+import org.junit.runner.RunWith;
 
 /** Unit test for {@link FlacBinarySearchSeeker}. */
-public final class FlacBinarySearchSeekerTest extends InstrumentationTestCase {
+@RunWith(AndroidJUnit4.class)
+public final class FlacBinarySearchSeekerTest {
 
   private static final String NOSEEKTABLE_FLAC = "bear_no_seek.flac";
   private static final int DURATION_US = 2_741_000;
 
-  @Override
-  protected void setUp() throws Exception {
-    super.setUp();
+  @Before
+  public void setUp() {
     if (!FlacLibrary.isAvailable()) {
       fail("Flac library not available.");
     }
@@ -39,7 +43,8 @@ public final class FlacBinarySearchSeekerTest extends InstrumentationTestCase {
 
   public void testGetSeekMap_returnsSeekMapWithCorrectDuration()
       throws IOException, FlacDecoderException, InterruptedException {
-    byte[] data = TestUtil.getByteArray(getInstrumentation().getContext(), NOSEEKTABLE_FLAC);
+    byte[] data =
+        TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), NOSEEKTABLE_FLAC);
 
     FakeExtractorInput input = new FakeExtractorInput.Builder().setData(data).build();
     FlacDecoderJni decoderJni = new FlacDecoderJni();
@@ -57,7 +62,8 @@ public final class FlacBinarySearchSeekerTest extends InstrumentationTestCase {
 
   public void testSetSeekTargetUs_returnsSeekPending()
       throws IOException, FlacDecoderException, InterruptedException {
-    byte[] data = TestUtil.getByteArray(getInstrumentation().getContext(), NOSEEKTABLE_FLAC);
+    byte[] data =
+        TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), NOSEEKTABLE_FLAC);
 
     FakeExtractorInput input = new FakeExtractorInput.Builder().setData(data).build();
     FlacDecoderJni decoderJni = new FlacDecoderJni();
diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java
index 252dedd939..6008d99448 100644
--- a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java
+++ b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java
@@ -16,11 +16,13 @@
 package com.google.android.exoplayer2.ext.flac;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
 
 import android.content.Context;
 import android.net.Uri;
 import androidx.annotation.Nullable;
-import android.test.InstrumentationTestCase;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.extractor.DefaultExtractorInput;
 import com.google.android.exoplayer2.extractor.Extractor;
@@ -38,9 +40,12 @@ import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
 import java.util.List;
 import java.util.Random;
+import org.junit.Before;
+import org.junit.runner.RunWith;
 
 /** Seeking tests for {@link FlacExtractor} when the FLAC stream does not have a SEEKTABLE. */
-public final class FlacExtractorSeekTest extends InstrumentationTestCase {
+@RunWith(AndroidJUnit4.class)
+public final class FlacExtractorSeekTest {
 
   private static final String NO_SEEKTABLE_FLAC = "bear_no_seek.flac";
   private static final int DURATION_US = 2_741_000;
@@ -54,18 +59,18 @@ public final class FlacExtractorSeekTest extends InstrumentationTestCase {
   private PositionHolder positionHolder;
   private long totalInputLength;
 
-  @Override
-  protected void setUp() throws Exception {
-    super.setUp();
+  @Before
+  public void setUp() throws Exception {
     if (!FlacLibrary.isAvailable()) {
       fail("Flac library not available.");
     }
     expectedOutput = new FakeExtractorOutput();
-    extractAllSamplesFromFileToExpectedOutput(getInstrumentation().getContext(), NO_SEEKTABLE_FLAC);
+    extractAllSamplesFromFileToExpectedOutput(
+        ApplicationProvider.getApplicationContext(), NO_SEEKTABLE_FLAC);
     expectedTrackOutput = expectedOutput.trackOutputs.get(0);
 
     dataSource =
-        new DefaultDataSourceFactory(getInstrumentation().getContext(), "UserAgent")
+        new DefaultDataSourceFactory(ApplicationProvider.getApplicationContext(), "UserAgent")
             .createDataSource();
     totalInputLength = readInputLength();
     positionHolder = new PositionHolder();
diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java
index 29a597daa4..d9cbac6ad5 100644
--- a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java
+++ b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java
@@ -15,17 +15,20 @@
  */
 package com.google.android.exoplayer2.ext.flac;
 
-import android.test.InstrumentationTestCase;
+import static org.junit.Assert.fail;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.ExtractorAsserts;
+import org.junit.Before;
+import org.junit.runner.RunWith;
 
-/**
- * Unit test for {@link FlacExtractor}.
- */
-public class FlacExtractorTest extends InstrumentationTestCase {
+/** Unit test for {@link FlacExtractor}. */
+@RunWith(AndroidJUnit4.class)
+public class FlacExtractorTest {
 
-  @Override
-  protected void setUp() throws Exception {
-    super.setUp();
+  @Before
+  public void setUp() throws Exception {
     if (!FlacLibrary.isAvailable()) {
       fail("Flac library not available.");
     }
@@ -33,11 +36,11 @@ public class FlacExtractorTest extends InstrumentationTestCase {
 
   public void testExtractFlacSample() throws Exception {
     ExtractorAsserts.assertBehavior(
-        FlacExtractor::new, "bear.flac", getInstrumentation().getContext());
+        FlacExtractor::new, "bear.flac", ApplicationProvider.getApplicationContext());
   }
 
   public void testExtractFlacSampleWithId3Header() throws Exception {
     ExtractorAsserts.assertBehavior(
-        FlacExtractor::new, "bear_with_id3.flac", getInstrumentation().getContext());
+        FlacExtractor::new, "bear_with_id3.flac", ApplicationProvider.getApplicationContext());
   }
 }
diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java
index 5904a8eb2b..1cd9483178 100644
--- a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java
+++ b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java
@@ -15,13 +15,13 @@
  */
 package com.google.android.exoplayer2.ext.flac;
 
-import static androidx.test.InstrumentationRegistry.getContext;
 import static org.junit.Assert.fail;
 
 import android.content.Context;
 import android.net.Uri;
 import android.os.Looper;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ExoPlayerFactory;
@@ -56,7 +56,7 @@ public class FlacPlaybackTest {
 
   private void playUri(String uri) throws Exception {
     TestPlaybackRunnable testPlaybackRunnable =
-        new TestPlaybackRunnable(Uri.parse(uri), getContext());
+        new TestPlaybackRunnable(Uri.parse(uri), ApplicationProvider.getApplicationContext());
     Thread thread = new Thread(testPlaybackRunnable);
     thread.start();
     thread.join();
diff --git a/extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultExtractorsFactoryTest.java b/extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultExtractorsFactoryTest.java
index 79c4452928..ef6f4e97bb 100644
--- a/extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultExtractorsFactoryTest.java
+++ b/extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultExtractorsFactoryTest.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.ext.flac;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.extractor.amr.AmrExtractor;
@@ -35,10 +36,9 @@ import java.util.ArrayList;
 import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link DefaultExtractorsFactory}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class DefaultExtractorsFactoryTest {
 
   @Test
diff --git a/extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultRenderersFactoryTest.java b/extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultRenderersFactoryTest.java
index dfae6551a5..fb20ff1114 100644
--- a/extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultRenderersFactoryTest.java
+++ b/extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultRenderersFactoryTest.java
@@ -15,14 +15,14 @@
  */
 package com.google.android.exoplayer2.ext.flac;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link DefaultRenderersFactoryTest} with {@link LibflacAudioRenderer}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class DefaultRenderersFactoryTest {
 
   @Test
diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle
index f0099da737..ee1a1940a4 100644
--- a/extensions/ima/build.gradle
+++ b/extensions/ima/build.gradle
@@ -35,10 +35,6 @@ dependencies {
     api 'com.google.ads.interactivemedia.v3:interactivemedia:3.10.6'
     implementation project(modulePrefix + 'library-core')
     implementation 'com.google.android.gms:play-services-ads:17.1.3'
-    testImplementation 'com.google.truth:truth:' + truthVersion
-    testImplementation 'junit:junit:' + junitVersion
-    testImplementation 'org.mockito:mockito-core:' + mockitoVersion
-    testImplementation 'org.robolectric:robolectric:' + robolectricVersion
     testImplementation project(modulePrefix + 'testutils-robolectric')
 }
 
diff --git a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java
index daffa639b4..1e1935c63a 100644
--- a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java
+++ b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java
@@ -26,6 +26,8 @@ import androidx.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.ads.interactivemedia.v3.api.Ad;
 import com.google.ads.interactivemedia.v3.api.AdDisplayContainer;
 import com.google.ads.interactivemedia.v3.api.AdEvent;
@@ -54,11 +56,9 @@ import org.junit.runner.RunWith;
 import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Test for {@link ImaAdsLoader}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class ImaAdsLoaderTest {
 
   private static final long CONTENT_DURATION_US = 10 * C.MICROS_PER_SECOND;
@@ -95,8 +95,8 @@ public class ImaAdsLoaderTest {
             adDisplayContainer,
             fakeAdsRequest,
             fakeAdsLoader);
-    adViewGroup = new FrameLayout(RuntimeEnvironment.application);
-    adOverlayView = new View(RuntimeEnvironment.application);
+    adViewGroup = new FrameLayout(ApplicationProvider.getApplicationContext());
+    adOverlayView = new View(ApplicationProvider.getApplicationContext());
     adViewProvider =
         new AdsLoader.AdViewProvider() {
           @Override
@@ -237,7 +237,7 @@ public class ImaAdsLoaderTest {
     adsLoaderListener = new TestAdsLoaderListener(fakeExoPlayer, contentTimeline, adDurationsUs);
     when(adsManager.getAdCuePoints()).thenReturn(Arrays.asList(cuePoints));
     imaAdsLoader =
-        new ImaAdsLoader.Builder(RuntimeEnvironment.application)
+        new ImaAdsLoader.Builder(ApplicationProvider.getApplicationContext())
             .setImaFactory(testImaFactory)
             .setImaSdkSettings(imaSdkSettings)
             .buildForAdTag(TEST_URI);
diff --git a/extensions/opus/build.gradle b/extensions/opus/build.gradle
index 0f8669ae9b..56acbdb7d3 100644
--- a/extensions/opus/build.gradle
+++ b/extensions/opus/build.gradle
@@ -40,8 +40,8 @@ android {
 dependencies {
     implementation project(modulePrefix + 'library-core')
     testImplementation project(modulePrefix + 'testutils-robolectric')
-    testImplementation 'junit:junit:' + junitVersion
-    androidTestImplementation 'androidx.test:runner:' + testRunnerVersion
+    androidTestImplementation 'androidx.test:runner:' + androidXTestVersion
+    androidTestImplementation 'androidx.test.ext:junit:' + androidXTestVersion
 }
 
 ext {
diff --git a/extensions/opus/src/androidTest/AndroidManifest.xml b/extensions/opus/src/androidTest/AndroidManifest.xml
index 9c1241a512..7f775f4d32 100644
--- a/extensions/opus/src/androidTest/AndroidManifest.xml
+++ b/extensions/opus/src/androidTest/AndroidManifest.xml
@@ -19,6 +19,7 @@
     package="com.google.android.exoplayer2.ext.opus.test">
 
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+  <uses-sdk/>
 
   <application android:debuggable="true"
       android:allowBackup="false"
diff --git a/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java b/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java
index 536f605293..dcd5f4957a 100644
--- a/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java
+++ b/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java
@@ -15,13 +15,13 @@
  */
 package com.google.android.exoplayer2.ext.opus;
 
-import static androidx.test.InstrumentationRegistry.getContext;
 import static org.junit.Assert.fail;
 
 import android.content.Context;
 import android.net.Uri;
 import android.os.Looper;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ExoPlayerFactory;
@@ -56,7 +56,7 @@ public class OpusPlaybackTest {
 
   private void playUri(String uri) throws Exception {
     TestPlaybackRunnable testPlaybackRunnable =
-        new TestPlaybackRunnable(Uri.parse(uri), getContext());
+        new TestPlaybackRunnable(Uri.parse(uri), ApplicationProvider.getApplicationContext());
     Thread thread = new Thread(testPlaybackRunnable);
     thread.start();
     thread.join();
diff --git a/extensions/opus/src/test/java/com/google/android/exoplayer2/ext/opus/DefaultRenderersFactoryTest.java b/extensions/opus/src/test/java/com/google/android/exoplayer2/ext/opus/DefaultRenderersFactoryTest.java
index 0fed3f3de6..e57ad84a41 100644
--- a/extensions/opus/src/test/java/com/google/android/exoplayer2/ext/opus/DefaultRenderersFactoryTest.java
+++ b/extensions/opus/src/test/java/com/google/android/exoplayer2/ext/opus/DefaultRenderersFactoryTest.java
@@ -15,14 +15,14 @@
  */
 package com.google.android.exoplayer2.ext.opus;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link DefaultRenderersFactoryTest} with {@link LibopusAudioRenderer}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class DefaultRenderersFactoryTest {
 
   @Test
diff --git a/extensions/rtmp/build.gradle b/extensions/rtmp/build.gradle
index c919f41321..e7c7fce164 100644
--- a/extensions/rtmp/build.gradle
+++ b/extensions/rtmp/build.gradle
@@ -34,8 +34,7 @@ dependencies {
     implementation project(modulePrefix + 'library-core')
     implementation 'net.butterflytv.utils:rtmp-client:3.0.1'
     implementation 'androidx.annotation:annotation:1.0.1'
-    testImplementation 'junit:junit:' + junitVersion
-    testImplementation 'org.robolectric:robolectric:' + robolectricVersion
+    testImplementation project(modulePrefix + 'testutils-robolectric')
 }
 
 ext {
diff --git a/extensions/rtmp/src/test/java/com/google/android/exoplayer2/ext/rtmp/DefaultDataSourceTest.java b/extensions/rtmp/src/test/java/com/google/android/exoplayer2/ext/rtmp/DefaultDataSourceTest.java
index f4753798b8..469e66a884 100644
--- a/extensions/rtmp/src/test/java/com/google/android/exoplayer2/ext/rtmp/DefaultDataSourceTest.java
+++ b/extensions/rtmp/src/test/java/com/google/android/exoplayer2/ext/rtmp/DefaultDataSourceTest.java
@@ -16,23 +16,25 @@
 package com.google.android.exoplayer2.ext.rtmp;
 
 import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.upstream.DataSpec;
 import com.google.android.exoplayer2.upstream.DefaultDataSource;
 import java.io.IOException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Unit test for {@link DefaultDataSource} with RTMP URIs. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class DefaultDataSourceTest {
 
   @Test
   public void openRtmpDataSpec_instantiatesRtmpDataSourceViaReflection() throws IOException {
     DefaultDataSource dataSource =
         new DefaultDataSource(
-            RuntimeEnvironment.application, "userAgent", /* allowCrossProtocolRedirects= */ false);
+            ApplicationProvider.getApplicationContext(),
+            "userAgent",
+            /* allowCrossProtocolRedirects= */ false);
     DataSpec dataSpec = new DataSpec(Uri.parse("rtmp://test.com/stream"));
     try {
       dataSource.open(dataSpec);
diff --git a/extensions/vp9/build.gradle b/extensions/vp9/build.gradle
index 7e3a1a6327..4b2ba26ca2 100644
--- a/extensions/vp9/build.gradle
+++ b/extensions/vp9/build.gradle
@@ -41,9 +41,9 @@ dependencies {
     implementation project(modulePrefix + 'library-core')
     implementation 'androidx.annotation:annotation:1.0.1'
     testImplementation project(modulePrefix + 'testutils-robolectric')
-    testImplementation 'junit:junit:' + junitVersion
-    androidTestImplementation 'androidx.test:runner:' + testRunnerVersion
-    androidTestImplementation 'com.google.truth:truth:' + truthVersion
+    androidTestImplementation 'androidx.test:runner:' + androidXTestVersion
+    androidTestImplementation 'androidx.test.ext:junit:' + androidXTestVersion
+    androidTestImplementation 'androidx.test.ext:truth:' + androidXTestVersion
 }
 
 ext {
diff --git a/extensions/vp9/src/androidTest/AndroidManifest.xml b/extensions/vp9/src/androidTest/AndroidManifest.xml
index aef376237e..6ca2e7164a 100644
--- a/extensions/vp9/src/androidTest/AndroidManifest.xml
+++ b/extensions/vp9/src/androidTest/AndroidManifest.xml
@@ -19,6 +19,7 @@
     package="com.google.android.exoplayer2.ext.vp9.test">
 
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+  <uses-sdk/>
 
   <application android:debuggable="true"
       android:allowBackup="false"
diff --git a/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java b/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
index e835810778..5120004889 100644
--- a/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
+++ b/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
@@ -15,14 +15,14 @@
  */
 package com.google.android.exoplayer2.ext.vp9;
 
-import static androidx.test.InstrumentationRegistry.getContext;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import android.content.Context;
 import android.net.Uri;
 import android.os.Looper;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ExoPlayerFactory;
@@ -89,7 +89,7 @@ public class VpxPlaybackTest {
 
   private void playUri(String uri) throws Exception {
     TestPlaybackRunnable testPlaybackRunnable =
-        new TestPlaybackRunnable(Uri.parse(uri), getContext());
+        new TestPlaybackRunnable(Uri.parse(uri), ApplicationProvider.getApplicationContext());
     Thread thread = new Thread(testPlaybackRunnable);
     thread.start();
     thread.join();
diff --git a/extensions/vp9/src/test/java/com/google/android/exoplayer2/ext/vp9/DefaultRenderersFactoryTest.java b/extensions/vp9/src/test/java/com/google/android/exoplayer2/ext/vp9/DefaultRenderersFactoryTest.java
index 3277c3ce83..33de600aa7 100644
--- a/extensions/vp9/src/test/java/com/google/android/exoplayer2/ext/vp9/DefaultRenderersFactoryTest.java
+++ b/extensions/vp9/src/test/java/com/google/android/exoplayer2/ext/vp9/DefaultRenderersFactoryTest.java
@@ -15,14 +15,14 @@
  */
 package com.google.android.exoplayer2.ext.vp9;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link DefaultRenderersFactoryTest} with {@link LibvpxVideoRenderer}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class DefaultRenderersFactoryTest {
 
   @Test
diff --git a/library/core/build.gradle b/library/core/build.gradle
index 7c0b3a2413..7ae3497d71 100644
--- a/library/core/build.gradle
+++ b/library/core/build.gradle
@@ -61,15 +61,17 @@ dependencies {
     implementation 'androidx.annotation:annotation:1.0.1'
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion
-    androidTestImplementation 'androidx.test:runner:' + testRunnerVersion
+    androidTestImplementation 'androidx.test:runner:' + androidXTestVersion
+    androidTestImplementation 'androidx.test.ext:junit:' + androidXTestVersion
+    androidTestImplementation 'androidx.test.ext:truth:' + androidXTestVersion
     androidTestImplementation 'com.google.auto.value:auto-value-annotations:' + autoValueVersion
     androidTestImplementation 'com.google.dexmaker:dexmaker:' + dexmakerVersion
     androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion
-    androidTestImplementation 'com.google.truth:truth:' + truthVersion
     androidTestImplementation 'org.mockito:mockito-core:' + mockitoVersion
     androidTestAnnotationProcessor 'com.google.auto.value:auto-value:' + autoValueVersion
-    testImplementation 'com.google.truth:truth:' + truthVersion
-    testImplementation 'junit:junit:' + junitVersion
+    testImplementation 'androidx.test:core:' + androidXTestVersion
+    testImplementation 'androidx.test.ext:junit:' + androidXTestVersion
+    testImplementation 'androidx.test.ext:truth:' + androidXTestVersion
     testImplementation 'org.mockito:mockito-core:' + mockitoVersion
     testImplementation 'org.robolectric:robolectric:' + robolectricVersion
     testImplementation 'com.google.auto.value:auto-value-annotations:' + autoValueVersion
diff --git a/library/core/src/androidTest/AndroidManifest.xml b/library/core/src/androidTest/AndroidManifest.xml
index c3c0852b29..e6e874a27a 100644
--- a/library/core/src/androidTest/AndroidManifest.xml
+++ b/library/core/src/androidTest/AndroidManifest.xml
@@ -19,6 +19,7 @@
     package="com.google.android.exoplayer2.core.test">
 
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+  <uses-sdk/>
 
   <application android:debuggable="true"
       android:allowBackup="false"
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java
index df5b9f0ff9..a76b5cf6c1 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java
@@ -29,7 +29,7 @@ import android.os.ParcelFileDescriptor;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import java.io.FileNotFoundException;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/CTest.java b/library/core/src/test/java/com/google/android/exoplayer2/CTest.java
index f56510f654..26a7102b16 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/CTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/CTest.java
@@ -19,14 +19,12 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.annotation.SuppressLint;
 import android.media.MediaCodec;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit test for {@link C}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit test for {@link C}. */
+@RunWith(AndroidJUnit4.class)
 public class CTest {
 
   @SuppressLint("InlinedApi")
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/DefaultLoadControlTest.java b/library/core/src/test/java/com/google/android/exoplayer2/DefaultLoadControlTest.java
index 93ec5e0264..31f432db15 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/DefaultLoadControlTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/DefaultLoadControlTest.java
@@ -17,15 +17,15 @@ package com.google.android.exoplayer2;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.DefaultLoadControl.Builder;
 import com.google.android.exoplayer2.upstream.DefaultAllocator;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit tests for {@link DefaultLoadControl}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class DefaultLoadControlTest {
 
   private static final float SPEED = 1f;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/DefaultMediaClockTest.java b/library/core/src/test/java/com/google/android/exoplayer2/DefaultMediaClockTest.java
index d2d032870e..be0f7f55c7 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/DefaultMediaClockTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/DefaultMediaClockTest.java
@@ -22,6 +22,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.MockitoAnnotations.initMocks;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.DefaultMediaClock.PlaybackParameterListener;
 import com.google.android.exoplayer2.testutil.FakeClock;
 import com.google.android.exoplayer2.testutil.FakeMediaClockRenderer;
@@ -29,12 +30,9 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit test for {@link DefaultMediaClock}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit test for {@link DefaultMediaClock}. */
+@RunWith(AndroidJUnit4.class)
 public class DefaultMediaClockTest {
 
   private static final long TEST_POSITION_US = 123456789012345678L;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
index bba75adb5e..a715289a04 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
@@ -22,6 +22,8 @@ import android.content.Context;
 import android.graphics.SurfaceTexture;
 import androidx.annotation.Nullable;
 import android.view.Surface;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.Player.DiscontinuityReason;
 import com.google.android.exoplayer2.Player.EventListener;
 import com.google.android.exoplayer2.Timeline.Window;
@@ -66,12 +68,10 @@ import java.util.concurrent.atomic.AtomicReference;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 /** Unit test for {@link ExoPlayer}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 @Config(shadows = {RobolectricUtil.CustomLooper.class, RobolectricUtil.CustomMessageQueue.class})
 public final class ExoPlayerTest {
 
@@ -86,7 +86,7 @@ public final class ExoPlayerTest {
 
   @Before
   public void setUp() {
-    context = RuntimeEnvironment.application;
+    context = ApplicationProvider.getApplicationContext();
   }
 
   /**
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/FormatTest.java b/library/core/src/test/java/com/google/android/exoplayer2/FormatTest.java
index 33e6ed0838..acb9e4d1ce 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/FormatTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/FormatTest.java
@@ -21,6 +21,7 @@ import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_WEBM;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.os.Parcel;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.id3.TextInformationFrame;
@@ -32,12 +33,9 @@ import java.util.Collections;
 import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit test for {@link Format}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit test for {@link Format}. */
+@RunWith(AndroidJUnit4.class)
 public final class FormatTest {
 
   private static final List<byte[]> INIT_DATA;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java b/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java
index 37f8a05790..73f42c5fc9 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertNull;
 import static org.mockito.Mockito.mock;
 
 import android.net.Uri;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 import com.google.android.exoplayer2.source.SinglePeriodTimeline;
@@ -30,10 +31,9 @@ import com.google.android.exoplayer2.upstream.Allocator;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit tests for {@link MediaPeriodQueue}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class MediaPeriodQueueTest {
 
   private static final long CONTENT_DURATION_US = 30 * C.MICROS_PER_SECOND;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/TimelineTest.java b/library/core/src/test/java/com/google/android/exoplayer2/TimelineTest.java
index 88617ce8ec..d6e65cb34d 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/TimelineTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/TimelineTest.java
@@ -15,15 +15,15 @@
  */
 package com.google.android.exoplayer2;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.FakeTimeline;
 import com.google.android.exoplayer2.testutil.FakeTimeline.TimelineWindowDefinition;
 import com.google.android.exoplayer2.testutil.TimelineAsserts;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link Timeline}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class TimelineTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
index 49bd634099..5f307d3a88 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
@@ -21,6 +21,8 @@ import android.os.Handler;
 import android.os.SystemClock;
 import androidx.annotation.Nullable;
 import android.view.Surface;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.PlaybackParameters;
@@ -56,12 +58,10 @@ import java.util.Iterator;
 import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 /** Integration test for {@link AnalyticsCollector}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 @Config(shadows = {RobolectricUtil.CustomLooper.class, RobolectricUtil.CustomMessageQueue.class})
 public final class AnalyticsCollectorTest {
 
@@ -727,7 +727,7 @@ public final class AnalyticsCollectorTest {
           .setRenderersFactory(renderersFactory)
           .setAnalyticsListener(listener)
           .setActionSchedule(actionSchedule)
-          .build(RuntimeEnvironment.application)
+          .build(ApplicationProvider.getApplicationContext())
           .start()
           .blockUntilActionScheduleFinished(TIMEOUT_MS)
           .blockUntilEnded(TIMEOUT_MS);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/audio/Ac3UtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/audio/Ac3UtilTest.java
index e41e270966..8a7d0b6f06 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/audio/Ac3UtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/audio/Ac3UtilTest.java
@@ -17,13 +17,13 @@ package com.google.android.exoplayer2.audio;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.util.Util;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit tests for {@link Ac3Util}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class Ac3UtilTest {
 
   private static final int TRUEHD_SYNCFRAME_SAMPLE_COUNT = 40;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/audio/AudioFocusManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/audio/AudioFocusManagerTest.java
index 30d57af4be..272c944e46 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/audio/AudioFocusManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/audio/AudioFocusManagerTest.java
@@ -24,20 +24,20 @@ import static org.junit.Assert.fail;
 import android.content.Context;
 import android.media.AudioFocusRequest;
 import android.media.AudioManager;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.util.Util;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowAudioManager;
 
 /** Unit tests for {@link AudioFocusManager}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class AudioFocusManagerTest {
   private static final int NO_COMMAND_RECEIVED = ~PLAYER_COMMAND_WAIT_FOR_CALLBACK;
 
@@ -49,10 +49,12 @@ public class AudioFocusManagerTest {
   @Before
   public void setUp() {
     audioManager =
-        (AudioManager) RuntimeEnvironment.application.getSystemService(Context.AUDIO_SERVICE);
+        (AudioManager)
+            ApplicationProvider.getApplicationContext().getSystemService(Context.AUDIO_SERVICE);
 
     testPlayerControl = new TestPlayerControl();
-    audioFocusManager = new AudioFocusManager(RuntimeEnvironment.application, testPlayerControl);
+    audioFocusManager =
+        new AudioFocusManager(ApplicationProvider.getApplicationContext(), testPlayerControl);
   }
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/audio/DefaultAudioSinkTest.java b/library/core/src/test/java/com/google/android/exoplayer2/audio/DefaultAudioSinkTest.java
index 16c724f583..d41c99183d 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/audio/DefaultAudioSinkTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/audio/DefaultAudioSinkTest.java
@@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.robolectric.annotation.Config.NEWEST_SDK;
 import static org.robolectric.annotation.Config.OLDEST_SDK;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.PlaybackParameters;
 import java.nio.ByteBuffer;
@@ -27,7 +28,6 @@ import java.util.Arrays;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 /**
@@ -42,7 +42,7 @@ import org.robolectric.annotation.Config;
  * draining to the end of the stream. This could be worked around by having a test-only mode where
  * {@link DefaultAudioSink} automatically treats audio as consumed.
  */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class DefaultAudioSinkTest {
 
   private static final int CHANNEL_COUNT_MONO = 1;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessorTest.java
index bd559218c6..128591124d 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessorTest.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.audio;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.audio.AudioProcessor.UnhandledFormatException;
 import com.google.android.exoplayer2.util.Assertions;
@@ -26,10 +27,9 @@ import java.nio.ShortBuffer;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit tests for {@link SilenceSkippingAudioProcessor}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class SilenceSkippingAudioProcessorTest {
 
   private static final int TEST_SIGNAL_SAMPLE_RATE_HZ = 1000;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRendererTest.java b/library/core/src/test/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRendererTest.java
index 3f28999820..950061e9bc 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRendererTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRendererTest.java
@@ -24,6 +24,7 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.RendererConfiguration;
@@ -39,13 +40,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-/**
- * Unit test for {@link SimpleDecoderAudioRenderer}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit test for {@link SimpleDecoderAudioRenderer}. */
+@RunWith(AndroidJUnit4.class)
 public class SimpleDecoderAudioRendererTest {
 
   private static final Format FORMAT = Format.createSampleFormat(null, MimeTypes.AUDIO_RAW, 0);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/audio/SonicAudioProcessorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/audio/SonicAudioProcessorTest.java
index 1ba462d4af..837d7a97a4 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/audio/SonicAudioProcessorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/audio/SonicAudioProcessorTest.java
@@ -18,16 +18,14 @@ package com.google.android.exoplayer2.audio;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit test for {@link SonicAudioProcessor}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit test for {@link SonicAudioProcessor}. */
+@RunWith(AndroidJUnit4.class)
 public final class SonicAudioProcessorTest {
 
   private SonicAudioProcessor sonicAudioProcessor;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java b/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java
index 977feaf44b..08b0c52fe5 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java
@@ -18,14 +18,14 @@ package com.google.android.exoplayer2.database;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.database.sqlite.SQLiteDatabase;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit tests for {@link VersionTable}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class VersionTableTest {
 
   private static final int FEATURE_1 = 1;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/drm/ClearKeyUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/drm/ClearKeyUtilTest.java
index 460a237698..d12319ad46 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/drm/ClearKeyUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/drm/ClearKeyUtilTest.java
@@ -17,16 +17,14 @@ package com.google.android.exoplayer2.drm;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.util.Util;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-/**
- * Unit test for {@link ClearKeyUtil}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit test for {@link ClearKeyUtil}. */
+@RunWith(AndroidJUnit4.class)
 public final class ClearKeyUtilTest {
 
   private static final byte[] SINGLE_KEY_RESPONSE =
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java b/library/core/src/test/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java
index 2b740de113..36287d0579 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java
@@ -22,6 +22,7 @@ import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_MP4;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.os.Parcel;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 import com.google.android.exoplayer2.testutil.TestUtil;
@@ -29,12 +30,9 @@ import java.util.ArrayList;
 import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit test for {@link DrmInitData}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit test for {@link DrmInitData}. */
+@RunWith(AndroidJUnit4.class)
 public class DrmInitDataTest {
 
   private static final SchemeData DATA_1 = new SchemeData(WIDEVINE_UUID, VIDEO_MP4,
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java b/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
index bba487f321..52fbae784a 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
@@ -21,6 +21,7 @@ import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.when;
 
 import android.util.Pair;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 import com.google.android.exoplayer2.testutil.RobolectricUtil;
@@ -31,11 +32,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 /** Tests {@link OfflineLicenseHelper}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 @Config(shadows = {RobolectricUtil.CustomLooper.class, RobolectricUtil.CustomMessageQueue.class})
 public class OfflineLicenseHelperTest {
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ConstantBitrateSeekMapTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ConstantBitrateSeekMapTest.java
index 0fa33dd348..bc3ccf499f 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ConstantBitrateSeekMapTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ConstantBitrateSeekMapTest.java
@@ -18,13 +18,13 @@ package com.google.android.exoplayer2.extractor;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link ConstantBitrateSeekMap}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class ConstantBitrateSeekMapTest {
 
   private ConstantBitrateSeekMap constantBitrateSeekMap;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java
index 8b26361578..6dbec3ecf4 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java
@@ -22,6 +22,7 @@ import static java.util.Arrays.copyOfRange;
 import static org.junit.Assert.fail;
 
 import android.net.Uri;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.FakeDataSource;
 import com.google.android.exoplayer2.upstream.DataSpec;
@@ -30,12 +31,9 @@ import java.io.IOException;
 import java.util.Arrays;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Test for {@link DefaultExtractorInput}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Test for {@link DefaultExtractorInput}. */
+@RunWith(AndroidJUnit4.class)
 public class DefaultExtractorInputTest {
 
   private static final String TEST_URI = "http://www.google.com";
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactoryTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactoryTest.java
index 148e04ca77..8de7441496 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactoryTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactoryTest.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.extractor;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.extractor.amr.AmrExtractor;
 import com.google.android.exoplayer2.extractor.flv.FlvExtractor;
 import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor;
@@ -33,10 +34,9 @@ import java.util.ArrayList;
 import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link DefaultExtractorsFactory}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class DefaultExtractorsFactoryTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ExtractorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ExtractorTest.java
index 3271e1ddf6..0401b2be83 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ExtractorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ExtractorTest.java
@@ -17,15 +17,13 @@ package com.google.android.exoplayer2.extractor;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit test for {@link Extractor}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit test for {@link Extractor}. */
+@RunWith(AndroidJUnit4.class)
 public final class ExtractorTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/Id3PeekerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/Id3PeekerTest.java
index f43f356482..59e904a5a4 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/Id3PeekerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/Id3PeekerTest.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.extractor;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.id3.ApicFrame;
 import com.google.android.exoplayer2.metadata.id3.CommentFrame;
@@ -26,10 +27,9 @@ import com.google.android.exoplayer2.testutil.FakeExtractorInput;
 import java.io.IOException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link Id3Peeker}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class Id3PeekerTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorSeekTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorSeekTest.java
index 9f9051087d..d131fce6b7 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorSeekTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorSeekTest.java
@@ -18,6 +18,8 @@ package com.google.android.exoplayer2.extractor.amr;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.extractor.SeekMap;
 import com.google.android.exoplayer2.testutil.FakeExtractorOutput;
 import com.google.android.exoplayer2.testutil.FakeTrackOutput;
@@ -30,11 +32,9 @@ import java.util.Random;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Unit test for {@link AmrExtractor}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class AmrExtractorSeekTest {
 
   private static final Random random = new Random(1234L);
@@ -51,7 +51,7 @@ public final class AmrExtractorSeekTest {
   @Before
   public void setUp() {
     dataSource =
-        new DefaultDataSourceFactory(RuntimeEnvironment.application, "UserAgent")
+        new DefaultDataSourceFactory(ApplicationProvider.getApplicationContext(), "UserAgent")
             .createDataSource();
   }
 
@@ -62,7 +62,7 @@ public final class AmrExtractorSeekTest {
     Uri fileUri = TestUtil.buildAssetUri(fileName);
     expectedTrackOutput =
         TestUtil.extractAllSamplesFromFile(
-                createAmrExtractor(), RuntimeEnvironment.application, fileName)
+                createAmrExtractor(), ApplicationProvider.getApplicationContext(), fileName)
             .trackOutputs
             .get(0);
 
@@ -82,7 +82,7 @@ public final class AmrExtractorSeekTest {
     Uri fileUri = TestUtil.buildAssetUri(fileName);
     expectedTrackOutput =
         TestUtil.extractAllSamplesFromFile(
-                createAmrExtractor(), RuntimeEnvironment.application, fileName)
+                createAmrExtractor(), ApplicationProvider.getApplicationContext(), fileName)
             .trackOutputs
             .get(0);
 
@@ -109,7 +109,7 @@ public final class AmrExtractorSeekTest {
     Uri fileUri = TestUtil.buildAssetUri(fileName);
     expectedTrackOutput =
         TestUtil.extractAllSamplesFromFile(
-                createAmrExtractor(), RuntimeEnvironment.application, fileName)
+                createAmrExtractor(), ApplicationProvider.getApplicationContext(), fileName)
             .trackOutputs
             .get(0);
     AmrExtractor extractor = createAmrExtractor();
@@ -136,7 +136,7 @@ public final class AmrExtractorSeekTest {
     Uri fileUri = TestUtil.buildAssetUri(fileName);
     expectedTrackOutput =
         TestUtil.extractAllSamplesFromFile(
-                createAmrExtractor(), RuntimeEnvironment.application, fileName)
+                createAmrExtractor(), ApplicationProvider.getApplicationContext(), fileName)
             .trackOutputs
             .get(0);
     AmrExtractor extractor = createAmrExtractor();
@@ -165,7 +165,7 @@ public final class AmrExtractorSeekTest {
     Uri fileUri = TestUtil.buildAssetUri(fileName);
     expectedTrackOutput =
         TestUtil.extractAllSamplesFromFile(
-                createAmrExtractor(), RuntimeEnvironment.application, fileName)
+                createAmrExtractor(), ApplicationProvider.getApplicationContext(), fileName)
             .trackOutputs
             .get(0);
     AmrExtractor extractor = createAmrExtractor();
@@ -194,7 +194,7 @@ public final class AmrExtractorSeekTest {
     Uri fileUri = TestUtil.buildAssetUri(fileName);
     expectedTrackOutput =
         TestUtil.extractAllSamplesFromFile(
-                createAmrExtractor(), RuntimeEnvironment.application, fileName)
+                createAmrExtractor(), ApplicationProvider.getApplicationContext(), fileName)
             .trackOutputs
             .get(0);
     AmrExtractor extractor = createAmrExtractor();
@@ -223,7 +223,7 @@ public final class AmrExtractorSeekTest {
     Uri fileUri = TestUtil.buildAssetUri(fileName);
     expectedTrackOutput =
         TestUtil.extractAllSamplesFromFile(
-                createAmrExtractor(), RuntimeEnvironment.application, fileName)
+                createAmrExtractor(), ApplicationProvider.getApplicationContext(), fileName)
             .trackOutputs
             .get(0);
 
@@ -243,7 +243,7 @@ public final class AmrExtractorSeekTest {
     Uri fileUri = TestUtil.buildAssetUri(fileName);
     expectedTrackOutput =
         TestUtil.extractAllSamplesFromFile(
-                createAmrExtractor(), RuntimeEnvironment.application, fileName)
+                createAmrExtractor(), ApplicationProvider.getApplicationContext(), fileName)
             .trackOutputs
             .get(0);
 
@@ -270,7 +270,7 @@ public final class AmrExtractorSeekTest {
     Uri fileUri = TestUtil.buildAssetUri(fileName);
     expectedTrackOutput =
         TestUtil.extractAllSamplesFromFile(
-                createAmrExtractor(), RuntimeEnvironment.application, fileName)
+                createAmrExtractor(), ApplicationProvider.getApplicationContext(), fileName)
             .trackOutputs
             .get(0);
     AmrExtractor extractor = createAmrExtractor();
@@ -297,7 +297,7 @@ public final class AmrExtractorSeekTest {
     Uri fileUri = TestUtil.buildAssetUri(fileName);
     expectedTrackOutput =
         TestUtil.extractAllSamplesFromFile(
-                createAmrExtractor(), RuntimeEnvironment.application, fileName)
+                createAmrExtractor(), ApplicationProvider.getApplicationContext(), fileName)
             .trackOutputs
             .get(0);
     AmrExtractor extractor = createAmrExtractor();
@@ -326,7 +326,7 @@ public final class AmrExtractorSeekTest {
     Uri fileUri = TestUtil.buildAssetUri(fileName);
     expectedTrackOutput =
         TestUtil.extractAllSamplesFromFile(
-                createAmrExtractor(), RuntimeEnvironment.application, fileName)
+                createAmrExtractor(), ApplicationProvider.getApplicationContext(), fileName)
             .trackOutputs
             .get(0);
     AmrExtractor extractor = createAmrExtractor();
@@ -355,7 +355,7 @@ public final class AmrExtractorSeekTest {
     Uri fileUri = TestUtil.buildAssetUri(fileName);
     expectedTrackOutput =
         TestUtil.extractAllSamplesFromFile(
-                createAmrExtractor(), RuntimeEnvironment.application, fileName)
+                createAmrExtractor(), ApplicationProvider.getApplicationContext(), fileName)
             .trackOutputs
             .get(0);
     AmrExtractor extractor = createAmrExtractor();
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorTest.java
index 912b4bd7c7..de7642a94b 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorTest.java
@@ -23,6 +23,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static junit.framework.Assert.fail;
 
 import androidx.annotation.NonNull;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.extractor.PositionHolder;
@@ -34,10 +35,9 @@ import java.io.IOException;
 import java.util.Random;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link AmrExtractor}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class AmrExtractorTest {
 
   private static final Random RANDOM = new Random(1234);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java
index 316148d9b9..e0505095fe 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java
@@ -15,13 +15,13 @@
  */
 package com.google.android.exoplayer2.extractor.flv;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.ExtractorAsserts;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link FlvExtractor}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class FlvExtractorTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java
index b1c5171746..642b9946ed 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.extractor.mkv;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput;
 import com.google.android.exoplayer2.testutil.TestUtil;
@@ -26,12 +27,9 @@ import java.util.Arrays;
 import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Tests {@link DefaultEbmlReader}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Tests {@link DefaultEbmlReader}. */
+@RunWith(AndroidJUnit4.class)
 public class DefaultEbmlReaderTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java
index 2e673037d0..9c20a9668f 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java
@@ -15,13 +15,13 @@
  */
 package com.google.android.exoplayer2.extractor.mkv;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.ExtractorAsserts;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Tests for {@link MatroskaExtractor}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class MatroskaExtractorTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java
index a13a185b3e..86df3f50e3 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java
@@ -20,6 +20,7 @@ import static com.google.android.exoplayer2.C.RESULT_MAX_LENGTH_EXCEEDED;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput;
@@ -28,12 +29,9 @@ import java.io.EOFException;
 import java.io.IOException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Tests for {@link VarintReader}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Tests for {@link VarintReader}. */
+@RunWith(AndroidJUnit4.class)
 public final class VarintReaderTest {
 
   private static final byte MAX_BYTE = (byte) 0xFF;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java
index 62a4f1a193..670296cc13 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java
@@ -15,13 +15,13 @@
  */
 package com.google.android.exoplayer2.extractor.mp3;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.ExtractorAsserts;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link Mp3Extractor}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class Mp3ExtractorTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java
index 6df40b5dcc..96fee1d07a 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.extractor.mp3;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.extractor.MpegAudioHeader;
 import com.google.android.exoplayer2.extractor.SeekMap.SeekPoints;
@@ -26,12 +27,9 @@ import com.google.android.exoplayer2.util.Util;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Tests for {@link XingSeeker}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Tests for {@link XingSeeker}. */
+@RunWith(AndroidJUnit4.class)
 public final class XingSeekerTest {
 
   // Xing header/payload from http://storage.googleapis.com/exoplayer-test-media-0/play.mp3.
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java
index 9c7f0e8acc..712f8e43fe 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java
@@ -17,16 +17,14 @@ package com.google.android.exoplayer2.extractor.mp4;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.Util;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Tests for {@link AtomParsers}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Tests for {@link AtomParsers}. */
+@RunWith(AndroidJUnit4.class)
 public final class AtomParsersTest {
 
   private static final String ATOM_HEADER = "000000000000000000000000";
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java
index f9362f9cda..a29dfcc310 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor.mp4;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.testutil.ExtractorAsserts;
 import com.google.android.exoplayer2.testutil.ExtractorAsserts.ExtractorFactory;
@@ -23,10 +24,9 @@ import java.util.Collections;
 import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link FragmentedMp4Extractor}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class FragmentedMp4ExtractorTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntryTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntryTest.java
index 2f81836540..ea1ec1d8cd 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntryTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntryTest.java
@@ -18,12 +18,12 @@ package com.google.android.exoplayer2.extractor.mp4;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.os.Parcel;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Test for {@link MdtaMetadataEntry}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class MdtaMetadataEntryTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java
index 3c84214686..981ee17e92 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java
@@ -15,13 +15,13 @@
  */
 package com.google.android.exoplayer2.extractor.mp4;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.ExtractorAsserts;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Tests for {@link Mp4Extractor}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class Mp4ExtractorTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java
index d7a13ab061..13d4529451 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java
@@ -21,17 +21,15 @@ import static com.google.android.exoplayer2.extractor.mp4.Atom.parseFullAtomFlag
 import static com.google.android.exoplayer2.extractor.mp4.Atom.parseFullAtomVersion;
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import java.util.UUID;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Tests for {@link PsshAtomUtil}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Tests for {@link PsshAtomUtil}. */
+@RunWith(AndroidJUnit4.class)
 public final class PsshAtomUtilTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java
index 1b6df9c5a4..8d1818845d 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java
@@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 import static org.junit.Assert.fail;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput;
 import com.google.android.exoplayer2.util.ParsableByteArray;
@@ -26,10 +27,9 @@ import java.io.IOException;
 import java.util.Random;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link DefaultOggSeeker}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class DefaultOggSeekerTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java
index ef38282691..d6691f50f8 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.extractor.ogg;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput;
 import com.google.android.exoplayer2.testutil.OggTestData;
@@ -27,12 +28,9 @@ import java.io.IOException;
 import java.util.Random;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit test for {@link DefaultOggSeeker} utility methods.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit test for {@link DefaultOggSeeker} utility methods. */
+@RunWith(AndroidJUnit4.class)
 public final class DefaultOggSeekerUtilMethodsTest {
 
   private final Random random = new Random(0);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java
index 289c168725..b09f7f204f 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.extractor.ogg;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.ExtractorAsserts;
 import com.google.android.exoplayer2.testutil.ExtractorAsserts.ExtractorFactory;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput;
@@ -25,10 +26,9 @@ import com.google.android.exoplayer2.testutil.TestUtil;
 import java.io.IOException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link OggExtractor}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class OggExtractorTest {
 
   private static final ExtractorFactory OGG_EXTRACTOR_FACTORY = OggExtractor::new;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java
index e9af630f83..70f64d3dbe 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java
@@ -17,6 +17,8 @@ package com.google.android.exoplayer2.extractor.ogg;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput;
 import com.google.android.exoplayer2.testutil.OggTestData;
 import com.google.android.exoplayer2.testutil.TestUtil;
@@ -27,11 +29,9 @@ import java.util.Random;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Unit test for {@link OggPacket}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class OggPacketTest {
 
   private static final String TEST_FILE = "ogg/bear.opus";
@@ -233,7 +233,7 @@ public final class OggPacketTest {
 
   @Test
   public void testParseRealFile() throws IOException, InterruptedException {
-    byte[] data = TestUtil.getByteArray(RuntimeEnvironment.application, TEST_FILE);
+    byte[] data = TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), TEST_FILE);
     FakeExtractorInput input = new FakeExtractorInput.Builder().setData(data).build();
     int packetCounter = 0;
     while (readPacket(input)) {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java
index 930d067d2b..3c8911adec 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.extractor.ogg;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput.SimulatedIOException;
 import com.google.android.exoplayer2.testutil.OggTestData;
@@ -24,12 +25,9 @@ import com.google.android.exoplayer2.testutil.TestUtil;
 import java.io.IOException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit test for {@link OggPageHeader}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit test for {@link OggPageHeader}. */
+@RunWith(AndroidJUnit4.class)
 public final class OggPageHeaderTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArrayTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArrayTest.java
index eca94f076e..0b36924e55 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArrayTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArrayTest.java
@@ -17,15 +17,13 @@ package com.google.android.exoplayer2.extractor.ogg;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit test for {@link VorbisBitArray}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit test for {@link VorbisBitArray}. */
+@RunWith(AndroidJUnit4.class)
 public final class VorbisBitArrayTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java
index f0361c5395..ab521fc99e 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java
@@ -19,6 +19,7 @@ import static com.google.android.exoplayer2.extractor.ogg.VorbisReader.readBits;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.extractor.ogg.VorbisReader.VorbisSetup;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput;
@@ -28,12 +29,9 @@ import com.google.android.exoplayer2.util.ParsableByteArray;
 import java.io.IOException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit test for {@link VorbisReader}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit test for {@link VorbisReader}. */
+@RunWith(AndroidJUnit4.class)
 public final class VorbisReaderTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtilTest.java
index 5b395771fc..dc3b1510ef 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtilTest.java
@@ -20,17 +20,15 @@ import static com.google.android.exoplayer2.extractor.ogg.VorbisUtil.verifyVorbi
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.testutil.OggTestData;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit test for {@link VorbisUtil}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit test for {@link VorbisUtil}. */
+@RunWith(AndroidJUnit4.class)
 public final class VorbisUtilTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java
index 9551c9df29..4210bebd54 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java
@@ -15,15 +15,15 @@
  */
 package com.google.android.exoplayer2.extractor.rawcc;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.testutil.ExtractorAsserts;
 import com.google.android.exoplayer2.util.MimeTypes;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Tests for {@link RawCcExtractor}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class RawCcExtractorTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java
index 92dcf10f19..0fe15ac86e 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java
@@ -15,13 +15,13 @@
  */
 package com.google.android.exoplayer2.extractor.ts;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.ExtractorAsserts;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link Ac3Extractor}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class Ac3ExtractorTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorSeekTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorSeekTest.java
index c0a35427b0..4527e41f34 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorSeekTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorSeekTest.java
@@ -18,6 +18,8 @@ package com.google.android.exoplayer2.extractor.ts;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.extractor.SeekMap;
 import com.google.android.exoplayer2.testutil.FakeExtractorOutput;
 import com.google.android.exoplayer2.testutil.FakeTrackOutput;
@@ -30,11 +32,9 @@ import java.util.Random;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Unit test for {@link AdtsExtractor}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class AdtsExtractorSeekTest {
 
   private static final Random random = new Random(1234L);
@@ -49,7 +49,7 @@ public final class AdtsExtractorSeekTest {
   @Before
   public void setUp() {
     dataSource =
-        new DefaultDataSourceFactory(RuntimeEnvironment.application, "UserAgent")
+        new DefaultDataSourceFactory(ApplicationProvider.getApplicationContext(), "UserAgent")
             .createDataSource();
   }
 
@@ -60,7 +60,7 @@ public final class AdtsExtractorSeekTest {
     Uri fileUri = TestUtil.buildAssetUri(fileName);
     expectedTrackOutput =
         TestUtil.extractAllSamplesFromFile(
-                createAdtsExtractor(), RuntimeEnvironment.application, fileName)
+                createAdtsExtractor(), ApplicationProvider.getApplicationContext(), fileName)
             .trackOutputs
             .get(0);
 
@@ -80,7 +80,7 @@ public final class AdtsExtractorSeekTest {
     Uri fileUri = TestUtil.buildAssetUri(fileName);
     expectedTrackOutput =
         TestUtil.extractAllSamplesFromFile(
-                createAdtsExtractor(), RuntimeEnvironment.application, fileName)
+                createAdtsExtractor(), ApplicationProvider.getApplicationContext(), fileName)
             .trackOutputs
             .get(0);
 
@@ -107,7 +107,7 @@ public final class AdtsExtractorSeekTest {
     Uri fileUri = TestUtil.buildAssetUri(fileName);
     expectedTrackOutput =
         TestUtil.extractAllSamplesFromFile(
-                createAdtsExtractor(), RuntimeEnvironment.application, fileName)
+                createAdtsExtractor(), ApplicationProvider.getApplicationContext(), fileName)
             .trackOutputs
             .get(0);
     AdtsExtractor extractor = createAdtsExtractor();
@@ -134,7 +134,7 @@ public final class AdtsExtractorSeekTest {
     Uri fileUri = TestUtil.buildAssetUri(fileName);
     expectedTrackOutput =
         TestUtil.extractAllSamplesFromFile(
-                createAdtsExtractor(), RuntimeEnvironment.application, fileName)
+                createAdtsExtractor(), ApplicationProvider.getApplicationContext(), fileName)
             .trackOutputs
             .get(0);
     AdtsExtractor extractor = createAdtsExtractor();
@@ -163,7 +163,7 @@ public final class AdtsExtractorSeekTest {
     Uri fileUri = TestUtil.buildAssetUri(fileName);
     expectedTrackOutput =
         TestUtil.extractAllSamplesFromFile(
-                createAdtsExtractor(), RuntimeEnvironment.application, fileName)
+                createAdtsExtractor(), ApplicationProvider.getApplicationContext(), fileName)
             .trackOutputs
             .get(0);
     AdtsExtractor extractor = createAdtsExtractor();
@@ -192,7 +192,7 @@ public final class AdtsExtractorSeekTest {
     Uri fileUri = TestUtil.buildAssetUri(fileName);
     expectedTrackOutput =
         TestUtil.extractAllSamplesFromFile(
-                createAdtsExtractor(), RuntimeEnvironment.application, fileName)
+                createAdtsExtractor(), ApplicationProvider.getApplicationContext(), fileName)
             .trackOutputs
             .get(0);
     AdtsExtractor extractor = createAdtsExtractor();
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java
index 7f0db67133..25e2a336ff 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java
@@ -15,13 +15,13 @@
  */
 package com.google.android.exoplayer2.extractor.ts;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.ExtractorAsserts;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link AdtsExtractor}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class AdtsExtractorTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java
index 62da914f5b..1562475822 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.extractor.ts;
 
 import static com.google.android.exoplayer2.extractor.ts.TsPayloadReader.FLAG_DATA_ALIGNMENT_INDICATOR;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.TrackIdGenerator;
@@ -28,10 +29,9 @@ import java.util.Arrays;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Test for {@link AdtsReader}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class AdtsReaderTest {
 
   public static final byte[] ID3_DATA_1 =
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/PsDurationReaderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/PsDurationReaderTest.java
index 418b2726bf..d522178ceb 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/PsDurationReaderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/PsDurationReaderTest.java
@@ -17,6 +17,8 @@ package com.google.android.exoplayer2.extractor.ts;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.extractor.PositionHolder;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput;
@@ -25,11 +27,9 @@ import java.io.IOException;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Unit test for {@link PsDurationReader}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class PsDurationReaderTest {
 
   private PsDurationReader tsDurationReader;
@@ -50,7 +50,8 @@ public final class PsDurationReaderTest {
   public void testReadDuration_returnsCorrectDuration() throws IOException, InterruptedException {
     FakeExtractorInput input =
         new FakeExtractorInput.Builder()
-            .setData(TestUtil.getByteArray(RuntimeEnvironment.application, "ts/sample.ps"))
+            .setData(
+                TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), "ts/sample.ps"))
             .build();
 
     int result = Extractor.RESULT_CONTINUE;
@@ -69,7 +70,8 @@ public final class PsDurationReaderTest {
       throws IOException, InterruptedException {
     FakeExtractorInput input =
         new FakeExtractorInput.Builder()
-            .setData(TestUtil.getByteArray(RuntimeEnvironment.application, "ts/sample.ps"))
+            .setData(
+                TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), "ts/sample.ps"))
             .build();
 
     input.setPosition(1234);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorSeekTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorSeekTest.java
index 33be3a26fd..f974a86622 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorSeekTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorSeekTest.java
@@ -19,6 +19,8 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
 import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.extractor.DefaultExtractorInput;
 import com.google.android.exoplayer2.extractor.Extractor;
@@ -39,11 +41,9 @@ import java.util.Random;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Seeking tests for {@link PsExtractor}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class PsExtractorSeekTest {
 
   private static final String PS_FILE_PATH = "ts/elephants_dream.mpg";
@@ -63,11 +63,12 @@ public final class PsExtractorSeekTest {
   public void setUp() throws IOException, InterruptedException {
     expectedOutput = new FakeExtractorOutput();
     positionHolder = new PositionHolder();
-    extractAllSamplesFromFileToExpectedOutput(RuntimeEnvironment.application, PS_FILE_PATH);
+    extractAllSamplesFromFileToExpectedOutput(
+        ApplicationProvider.getApplicationContext(), PS_FILE_PATH);
     expectedTrackOutput = expectedOutput.trackOutputs.get(VIDEO_TRACK_ID);
 
     dataSource =
-        new DefaultDataSourceFactory(RuntimeEnvironment.application, "UserAgent")
+        new DefaultDataSourceFactory(ApplicationProvider.getApplicationContext(), "UserAgent")
             .createDataSource();
     totalInputLength = readInputLength();
   }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java
index 0e0fd52175..4cf8f817fe 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java
@@ -15,13 +15,13 @@
  */
 package com.google.android.exoplayer2.extractor.ts;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.ExtractorAsserts;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link PsExtractor}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class PsExtractorTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java
index 7bff736b4a..a089751464 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java
@@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.extractor.ExtractorOutput;
 import com.google.android.exoplayer2.testutil.FakeExtractorOutput;
 import com.google.android.exoplayer2.util.ParsableByteArray;
@@ -30,12 +31,9 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Test for {@link SectionReader}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Test for {@link SectionReader}. */
+@RunWith(AndroidJUnit4.class)
 public final class SectionReaderTest {
 
   private byte[] packetPayload;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/TsDurationReaderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/TsDurationReaderTest.java
index e7e100f38c..b1531e91f7 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/TsDurationReaderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/TsDurationReaderTest.java
@@ -17,6 +17,8 @@ package com.google.android.exoplayer2.extractor.ts;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.extractor.PositionHolder;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput;
@@ -25,11 +27,9 @@ import java.io.IOException;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Unit test for {@link TsDurationReader}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class TsDurationReaderTest {
 
   private TsDurationReader tsDurationReader;
@@ -50,7 +50,9 @@ public final class TsDurationReaderTest {
   public void testReadDuration_returnsCorrectDuration() throws IOException, InterruptedException {
     FakeExtractorInput input =
         new FakeExtractorInput.Builder()
-            .setData(TestUtil.getByteArray(RuntimeEnvironment.application, "ts/bbb_2500ms.ts"))
+            .setData(
+                TestUtil.getByteArray(
+                    ApplicationProvider.getApplicationContext(), "ts/bbb_2500ms.ts"))
             .setSimulateIOErrors(false)
             .setSimulateUnknownLength(false)
             .setSimulatePartialReads(false)
@@ -73,7 +75,9 @@ public final class TsDurationReaderTest {
       throws IOException, InterruptedException {
     FakeExtractorInput input =
         new FakeExtractorInput.Builder()
-            .setData(TestUtil.getByteArray(RuntimeEnvironment.application, "ts/bbb_2500ms.ts"))
+            .setData(
+                TestUtil.getByteArray(
+                    ApplicationProvider.getApplicationContext(), "ts/bbb_2500ms.ts"))
             .setSimulateIOErrors(false)
             .setSimulateUnknownLength(false)
             .setSimulatePartialReads(false)
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorSeekTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorSeekTest.java
index 4d421b05a4..956ccc2390 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorSeekTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorSeekTest.java
@@ -18,6 +18,8 @@ package com.google.android.exoplayer2.extractor.ts;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.extractor.PositionHolder;
@@ -34,11 +36,9 @@ import java.util.Random;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Seeking tests for {@link TsExtractor}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class TsExtractorSeekTest {
 
   private static final String TEST_FILE = "ts/bbb_2500ms.ts";
@@ -57,12 +57,12 @@ public final class TsExtractorSeekTest {
     positionHolder = new PositionHolder();
     expectedTrackOutput =
         TestUtil.extractAllSamplesFromFile(
-                new TsExtractor(), RuntimeEnvironment.application, TEST_FILE)
+                new TsExtractor(), ApplicationProvider.getApplicationContext(), TEST_FILE)
             .trackOutputs
             .get(AUDIO_TRACK_ID);
 
     dataSource =
-        new DefaultDataSourceFactory(RuntimeEnvironment.application, "UserAgent")
+        new DefaultDataSourceFactory(ApplicationProvider.getApplicationContext(), "UserAgent")
             .createDataSource();
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java
index beaa5ffa83..f1b962a712 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java
@@ -18,6 +18,8 @@ package com.google.android.exoplayer2.extractor.ts;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.util.SparseArray;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.extractor.Extractor;
@@ -37,11 +39,9 @@ import java.io.ByteArrayOutputStream;
 import java.util.Random;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Unit test for {@link TsExtractor}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class TsExtractorTest {
 
   private static final int TS_PACKET_SIZE = 188;
@@ -55,7 +55,8 @@ public final class TsExtractorTest {
   @Test
   public void testStreamWithJunkData() throws Exception {
     Random random = new Random(0);
-    byte[] fileData = TestUtil.getByteArray(RuntimeEnvironment.application, "ts/sample.ts");
+    byte[] fileData =
+        TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), "ts/sample.ts");
     ByteArrayOutputStream out = new ByteArrayOutputStream(fileData.length * 2);
     int bytesLeft = fileData.length;
 
@@ -74,7 +75,7 @@ public final class TsExtractorTest {
     fileData = out.toByteArray();
 
     ExtractorAsserts.assertOutput(
-        TsExtractor::new, "ts/sample.ts", fileData, RuntimeEnvironment.application);
+        TsExtractor::new, "ts/sample.ts", fileData, ApplicationProvider.getApplicationContext());
   }
 
   @Test
@@ -84,7 +85,8 @@ public final class TsExtractorTest {
         new TsExtractor(TsExtractor.MODE_MULTI_PMT, new TimestampAdjuster(0), factory);
     FakeExtractorInput input =
         new FakeExtractorInput.Builder()
-            .setData(TestUtil.getByteArray(RuntimeEnvironment.application, "ts/sample.ts"))
+            .setData(
+                TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), "ts/sample.ts"))
             .setSimulateIOErrors(false)
             .setSimulateUnknownLength(false)
             .setSimulatePartialReads(false)
@@ -114,7 +116,9 @@ public final class TsExtractorTest {
         new TsExtractor(TsExtractor.MODE_MULTI_PMT, new TimestampAdjuster(0), factory);
     FakeExtractorInput input =
         new FakeExtractorInput.Builder()
-            .setData(TestUtil.getByteArray(RuntimeEnvironment.application, "ts/sample_with_sdt.ts"))
+            .setData(
+                TestUtil.getByteArray(
+                    ApplicationProvider.getApplicationContext(), "ts/sample_with_sdt.ts"))
             .setSimulateIOErrors(false)
             .setSimulateUnknownLength(false)
             .setSimulatePartialReads(false)
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java
index f4df4036f6..c617b672e2 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java
@@ -15,13 +15,13 @@
  */
 package com.google.android.exoplayer2.extractor.wav;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.ExtractorAsserts;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link WavExtractor}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class WavExtractorTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java
index 85d336b439..d870afac3a 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java
@@ -17,17 +17,15 @@ package com.google.android.exoplayer2.metadata.emsg;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.MetadataInputBuffer;
 import java.nio.ByteBuffer;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Test for {@link EventMessageDecoder}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Test for {@link EventMessageDecoder}. */
+@RunWith(AndroidJUnit4.class)
 public final class EventMessageDecoderTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java
index 2869692272..ca8303d3e2 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java
@@ -17,18 +17,16 @@ package com.google.android.exoplayer2.metadata.emsg;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.MetadataInputBuffer;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit test for {@link EventMessageEncoder}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit test for {@link EventMessageEncoder}. */
+@RunWith(AndroidJUnit4.class)
 public final class EventMessageEncoderTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java b/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java
index f7970d1a16..d9e9ab7ea7 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java
@@ -18,14 +18,12 @@ package com.google.android.exoplayer2.metadata.emsg;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.os.Parcel;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Test for {@link EventMessage}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Test for {@link EventMessage}. */
+@RunWith(AndroidJUnit4.class)
 public final class EventMessageTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyDecoderTest.java
index 66387470e9..9cbcea5814 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyDecoderTest.java
@@ -17,13 +17,13 @@ package com.google.android.exoplayer2.metadata.icy;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.metadata.Metadata;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Test for {@link IcyDecoder}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class IcyDecoderTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyHeadersTest.java b/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyHeadersTest.java
index a33c3fed8b..93f88c76e7 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyHeadersTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyHeadersTest.java
@@ -18,12 +18,12 @@ package com.google.android.exoplayer2.metadata.icy;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.os.Parcel;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Test for {@link IcyHeaders}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class IcyHeadersTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyStreamInfoTest.java b/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyStreamInfoTest.java
index 85823680eb..2bffe171d3 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyStreamInfoTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyStreamInfoTest.java
@@ -18,12 +18,12 @@ package com.google.android.exoplayer2.metadata.icy;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.os.Parcel;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Test for {@link IcyInfo}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class IcyStreamInfoTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java b/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java
index 714f77a752..fbd824c7c1 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java
@@ -18,14 +18,12 @@ package com.google.android.exoplayer2.metadata.id3;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.os.Parcel;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Test for {@link ChapterFrame}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Test for {@link ChapterFrame}. */
+@RunWith(AndroidJUnit4.class)
 public final class ChapterFrameTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java b/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java
index 98a99a4219..daf9ff1bb5 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java
@@ -18,14 +18,12 @@ package com.google.android.exoplayer2.metadata.id3;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.os.Parcel;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Test for {@link ChapterTocFrame}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Test for {@link ChapterTocFrame}. */
+@RunWith(AndroidJUnit4.class)
 public final class ChapterTocFrameTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java
index 3fa491ea50..a20cbb66a2 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.metadata.id3;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.util.Assertions;
@@ -24,12 +25,9 @@ import java.nio.charset.Charset;
 import java.util.Arrays;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Test for {@link Id3Decoder}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Test for {@link Id3Decoder}. */
+@RunWith(AndroidJUnit4.class)
 public final class Id3DecoderTest {
 
   private static final byte[] TAG_HEADER = new byte[] {'I', 'D', '3', 4, 0, 0, 0, 0, 0, 0};
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java b/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java
index 3e6520beca..d6bbecdf6c 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java
@@ -18,12 +18,12 @@ package com.google.android.exoplayer2.metadata.id3;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.os.Parcel;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Test for {@link MlltFrame}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class MlltFrameTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java
index d8a4e97791..92fa147c30 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.metadata.scte35;
 import static com.google.android.exoplayer2.C.TIME_UNSET;
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.MetadataInputBuffer;
 import com.google.android.exoplayer2.util.TimestampAdjuster;
@@ -26,12 +27,9 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Test for {@link SpliceInfoDecoder}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Test for {@link SpliceInfoDecoder}. */
+@RunWith(AndroidJUnit4.class)
 public final class SpliceInfoDecoderTest {
 
   private SpliceInfoDecoder decoder;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
index 2e3da2cc7f..4f82bdb09c 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
@@ -18,6 +18,8 @@ package com.google.android.exoplayer2.offline;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.util.Util;
 import java.io.DataOutputStream;
@@ -30,11 +32,9 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Unit tests for {@link ActionFile}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class ActionFileTest {
 
   private File tempFile;
@@ -43,7 +43,7 @@ public class ActionFileTest {
 
   @Before
   public void setUp() throws Exception {
-    tempFile = Util.createTempFile(RuntimeEnvironment.application, "ExoPlayerTest");
+    tempFile = Util.createTempFile(ApplicationProvider.getApplicationContext(), "ExoPlayerTest");
     action1 =
         buildAction(
             DownloadAction.TYPE_PROGRESSIVE,
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
index 1c5ac3e0f7..f967a9c0d7 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
@@ -19,6 +19,8 @@ import static com.google.android.exoplayer2.offline.DefaultDownloadIndex.INSTANC
 import static com.google.common.truth.Truth.assertThat;
 
 import android.database.sqlite.SQLiteDatabase;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.database.DatabaseIOException;
 import com.google.android.exoplayer2.database.ExoDatabaseProvider;
 import com.google.android.exoplayer2.database.VersionTable;
@@ -26,11 +28,9 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Unit tests for {@link DefaultDownloadIndex}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class DefaultDownloadIndexTest {
 
   private ExoDatabaseProvider databaseProvider;
@@ -38,7 +38,7 @@ public class DefaultDownloadIndexTest {
 
   @Before
   public void setUp() {
-    databaseProvider = new ExoDatabaseProvider(RuntimeEnvironment.application);
+    databaseProvider = new ExoDatabaseProvider(ApplicationProvider.getApplicationContext());
     downloadIndex = new DefaultDownloadIndex(databaseProvider);
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactoryTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactoryTest.java
index 346d033e1a..21152c3341 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactoryTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactoryTest.java
@@ -18,16 +18,16 @@ package com.google.android.exoplayer2.offline;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.upstream.DummyDataSource;
 import com.google.android.exoplayer2.upstream.cache.Cache;
 import java.util.Collections;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit tests for {@link DefaultDownloaderFactory}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class DefaultDownloaderFactoryTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
index 96aa4e4509..571d76125c 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
@@ -22,6 +22,8 @@ import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_SS;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -35,11 +37,9 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Unit tests for {@link DownloadAction}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class DownloadActionTest {
 
   private Uri uri1;
@@ -291,7 +291,8 @@ public class DownloadActionTest {
   private static void assertDeserialization(String fileName, DownloadAction expectedAction)
       throws IOException {
     InputStream input =
-        TestUtil.getInputStream(RuntimeEnvironment.application, "download-actions/" + fileName);
+        TestUtil.getInputStream(
+            ApplicationProvider.getApplicationContext(), "download-actions/" + fileName);
     DownloadAction deserializedAction = DownloadAction.deserializeFromStream(input);
 
     assertEqual(deserializedAction, expectedAction);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
index 6f41e10046..a78b229043 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.offline;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.Renderer;
@@ -51,12 +52,11 @@ import java.util.concurrent.atomic.AtomicReference;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLooper;
 
 /** Unit tests for {@link DownloadHelper}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 @Config(shadows = {RobolectricUtil.CustomLooper.class, RobolectricUtil.CustomMessageQueue.class})
 public class DownloadHelperTest {
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
index 3372d41d32..f22024d87c 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
@@ -19,6 +19,8 @@ import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_DASH;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.database.ExoDatabaseProvider;
 import com.google.android.exoplayer2.util.Util;
 import java.io.File;
@@ -29,11 +31,9 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Unit tests for {@link DownloadIndexUtil}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class DownloadIndexUtilTest {
 
   private File tempFile;
@@ -42,8 +42,8 @@ public class DownloadIndexUtilTest {
 
   @Before
   public void setUp() throws Exception {
-    tempFile = Util.createTempFile(RuntimeEnvironment.application, "ExoPlayerTest");
-    databaseProvider = new ExoDatabaseProvider(RuntimeEnvironment.application);
+    tempFile = Util.createTempFile(ApplicationProvider.getApplicationContext(), "ExoPlayerTest");
+    databaseProvider = new ExoDatabaseProvider(ApplicationProvider.getApplicationContext());
     downloadIndex = new DefaultDownloadIndex(databaseProvider);
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index 74b9c4dfce..ba1238d158 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -19,6 +19,8 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.offline.DownloadState.State;
 import com.google.android.exoplayer2.scheduler.Requirements;
@@ -39,13 +41,11 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLog;
 
 /** Tests {@link DownloadManager}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 @Config(shadows = {RobolectricUtil.CustomLooper.class, RobolectricUtil.CustomMessageQueue.class})
 public class DownloadManagerTest {
 
@@ -77,7 +77,7 @@ public class DownloadManagerTest {
     uri2 = Uri.parse("http://abc.com/media2");
     uri3 = Uri.parse("http://abc.com/media3");
     dummyMainThread = new DummyMainThread();
-    actionFile = Util.createTempFile(RuntimeEnvironment.application, "ExoPlayerTest");
+    actionFile = Util.createTempFile(ApplicationProvider.getApplicationContext(), "ExoPlayerTest");
     downloaderFactory = new FakeDownloaderFactory();
     setUpDownloadManager(100);
   }
@@ -470,7 +470,7 @@ public class DownloadManagerTest {
           () -> {
             downloadManager =
                 new DownloadManager(
-                    RuntimeEnvironment.application,
+                    ApplicationProvider.getApplicationContext(),
                     actionFile,
                     downloaderFactory,
                     maxActiveDownloadTasks,
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
index de6369d1fe..38c8f1bc6e 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
@@ -19,15 +19,15 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import android.net.Uri;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.util.Arrays;
 import java.util.Collections;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit tests for {@link DownloadState}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class DownloadStateTest {
 
   private Uri testUri;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java
index 8077b77d7e..fc29e134d9 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.fail;
 
 import android.os.Handler;
 import androidx.annotation.Nullable;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
@@ -42,11 +43,10 @@ import java.io.IOException;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 /** Unit tests for {@link ClippingMediaSource}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 @Config(shadows = {RobolectricUtil.CustomLooper.class, RobolectricUtil.CustomMessageQueue.class})
 public final class ClippingMediaSourceTest {
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/CompositeSequenceableLoaderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/CompositeSequenceableLoaderTest.java
index 82d7f21852..4a881d53b4 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/source/CompositeSequenceableLoaderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/CompositeSequenceableLoaderTest.java
@@ -17,15 +17,13 @@ package com.google.android.exoplayer2.source;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit test for {@link CompositeSequenceableLoader}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit test for {@link CompositeSequenceableLoader}. */
+@RunWith(AndroidJUnit4.class)
 public final class CompositeSequenceableLoaderTest {
 
   /**
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
index 2665b61f8a..685801abdf 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
@@ -22,6 +22,7 @@ import static org.mockito.Mockito.verify;
 
 import android.os.ConditionVariable;
 import android.os.Handler;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
@@ -44,11 +45,10 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 /** Unit tests for {@link ConcatenatingMediaSource}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 @Config(shadows = {RobolectricUtil.CustomLooper.class, RobolectricUtil.CustomMessageQueue.class})
 public final class ConcatenatingMediaSourceTest {
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/LoopingMediaSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/LoopingMediaSourceTest.java
index 9b7455ee37..68de5fef18 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/source/LoopingMediaSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/LoopingMediaSourceTest.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.source;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
@@ -28,11 +29,10 @@ import java.io.IOException;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 /** Unit tests for {@link LoopingMediaSource}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 @Config(shadows = {RobolectricUtil.CustomLooper.class, RobolectricUtil.CustomMessageQueue.class})
 public class LoopingMediaSourceTest {
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/MergingMediaSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/MergingMediaSourceTest.java
index 3318f5a42f..130ba3c2dd 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/source/MergingMediaSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/MergingMediaSourceTest.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.source;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.source.MergingMediaSource.IllegalMergeException;
@@ -29,11 +30,10 @@ import com.google.android.exoplayer2.testutil.RobolectricUtil;
 import java.io.IOException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 /** Unit tests for {@link MergingMediaSource}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 @Config(shadows = {RobolectricUtil.CustomLooper.class, RobolectricUtil.CustomMessageQueue.class})
 public class MergingMediaSourceTest {
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java
index 99dfc1b04e..450f0ecd3a 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java
@@ -24,6 +24,7 @@ import static java.lang.Long.MIN_VALUE;
 import static java.util.Arrays.copyOfRange;
 
 import androidx.annotation.Nullable;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.FormatHolder;
@@ -36,12 +37,9 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Test for {@link SampleQueue}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Test for {@link SampleQueue}. */
+@RunWith(AndroidJUnit4.class)
 public final class SampleQueueTest {
 
   private static final int ALLOCATION_SIZE = 16;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java
index 430ceb87f1..8fce472c68 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java
@@ -18,17 +18,15 @@ package com.google.android.exoplayer2.source;
 import static com.google.android.exoplayer2.C.INDEX_UNSET;
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.source.ShuffleOrder.DefaultShuffleOrder;
 import com.google.android.exoplayer2.source.ShuffleOrder.UnshuffledShuffleOrder;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit test for {@link ShuffleOrder}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit test for {@link ShuffleOrder}. */
+@RunWith(AndroidJUnit4.class)
 public final class ShuffleOrderTest {
 
   public static final long RANDOM_SEED = 1234567890L;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/SinglePeriodTimelineTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/SinglePeriodTimelineTest.java
index 1b57341d33..bdd6820efa 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/source/SinglePeriodTimelineTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/SinglePeriodTimelineTest.java
@@ -18,18 +18,16 @@ package com.google.android.exoplayer2.source;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.util.Pair;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Timeline.Period;
 import com.google.android.exoplayer2.Timeline.Window;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit test for {@link SinglePeriodTimeline}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit test for {@link SinglePeriodTimeline}. */
+@RunWith(AndroidJUnit4.class)
 public final class SinglePeriodTimelineTest {
 
   private Window window;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/TrackGroupArrayTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/TrackGroupArrayTest.java
index 86778a0fa0..36adc97147 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/source/TrackGroupArrayTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/TrackGroupArrayTest.java
@@ -18,14 +18,14 @@ package com.google.android.exoplayer2.source;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.os.Parcel;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.util.MimeTypes;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link TrackGroupArray}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class TrackGroupArrayTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/TrackGroupTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/TrackGroupTest.java
index 1900f3c586..4de1f8eb84 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/source/TrackGroupTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/TrackGroupTest.java
@@ -18,14 +18,14 @@ package com.google.android.exoplayer2.source;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.os.Parcel;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.util.MimeTypes;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link TrackGroup}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class TrackGroupTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/ads/AdPlaybackStateTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/ads/AdPlaybackStateTest.java
index da03df9b8a..80e7383d12 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/source/ads/AdPlaybackStateTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/ads/AdPlaybackStateTest.java
@@ -19,14 +19,14 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import android.net.Uri;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link AdPlaybackState}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class AdPlaybackStateTest {
 
   private static final long[] TEST_AD_GROUP_TMES_US = new long[] {0, C.msToUs(10_000)};
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/chunk/MediaChunkListIteratorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/chunk/MediaChunkListIteratorTest.java
index 590c06f3d5..d2169d0a38 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/source/chunk/MediaChunkListIteratorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/chunk/MediaChunkListIteratorTest.java
@@ -17,16 +17,16 @@ package com.google.android.exoplayer2.source.chunk;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.testutil.FakeMediaChunk;
 import java.util.Arrays;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Tests for {@link MediaChunkListIterator}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class MediaChunkListIteratorTest {
 
   private static final Format TEST_FORMAT = Format.createSampleFormat(null, null, 0);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/ssa/SsaDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/ssa/SsaDecoderTest.java
index 746066cb35..ab67ac115b 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/ssa/SsaDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/ssa/SsaDecoderTest.java
@@ -17,16 +17,16 @@ package com.google.android.exoplayer2.text.ssa;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import java.io.IOException;
 import java.util.ArrayList;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Unit test for {@link SsaDecoder}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class SsaDecoderTest {
 
   private static final String EMPTY = "ssa/empty";
@@ -40,7 +40,7 @@ public final class SsaDecoderTest {
   @Test
   public void testDecodeEmpty() throws IOException {
     SsaDecoder decoder = new SsaDecoder();
-    byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, EMPTY);
+    byte[] bytes = TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), EMPTY);
     SsaSubtitle subtitle = decoder.decode(bytes, bytes.length, false);
 
     assertThat(subtitle.getEventTimeCount()).isEqualTo(0);
@@ -50,7 +50,7 @@ public final class SsaDecoderTest {
   @Test
   public void testDecodeTypical() throws IOException {
     SsaDecoder decoder = new SsaDecoder();
-    byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, TYPICAL);
+    byte[] bytes = TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), TYPICAL);
     SsaSubtitle subtitle = decoder.decode(bytes, bytes.length, false);
 
     assertThat(subtitle.getEventTimeCount()).isEqualTo(6);
@@ -61,13 +61,16 @@ public final class SsaDecoderTest {
 
   @Test
   public void testDecodeTypicalWithInitializationData() throws IOException {
-    byte[] headerBytes = TestUtil.getByteArray(RuntimeEnvironment.application, TYPICAL_HEADER_ONLY);
-    byte[] formatBytes = TestUtil.getByteArray(RuntimeEnvironment.application, TYPICAL_FORMAT_ONLY);
+    byte[] headerBytes =
+        TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), TYPICAL_HEADER_ONLY);
+    byte[] formatBytes =
+        TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), TYPICAL_FORMAT_ONLY);
     ArrayList<byte[]> initializationData = new ArrayList<>();
     initializationData.add(formatBytes);
     initializationData.add(headerBytes);
     SsaDecoder decoder = new SsaDecoder(initializationData);
-    byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, TYPICAL_DIALOGUE_ONLY);
+    byte[] bytes =
+        TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), TYPICAL_DIALOGUE_ONLY);
     SsaSubtitle subtitle = decoder.decode(bytes, bytes.length, false);
 
     assertThat(subtitle.getEventTimeCount()).isEqualTo(6);
@@ -80,7 +83,8 @@ public final class SsaDecoderTest {
   public void testDecodeInvalidTimecodes() throws IOException {
     // Parsing should succeed, parsing the third cue only.
     SsaDecoder decoder = new SsaDecoder();
-    byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, INVALID_TIMECODES);
+    byte[] bytes =
+        TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), INVALID_TIMECODES);
     SsaSubtitle subtitle = decoder.decode(bytes, bytes.length, false);
 
     assertThat(subtitle.getEventTimeCount()).isEqualTo(2);
@@ -90,7 +94,8 @@ public final class SsaDecoderTest {
   @Test
   public void testDecodeNoEndTimecodes() throws IOException {
     SsaDecoder decoder = new SsaDecoder();
-    byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, NO_END_TIMECODES);
+    byte[] bytes =
+        TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), NO_END_TIMECODES);
     SsaSubtitle subtitle = decoder.decode(bytes, bytes.length, false);
 
     assertThat(subtitle.getEventTimeCount()).isEqualTo(3);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
index 1430c70e09..9520262207 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
@@ -17,16 +17,16 @@ package com.google.android.exoplayer2.text.subrip;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.text.Cue;
 import java.io.IOException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Unit test for {@link SubripDecoder}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class SubripDecoderTest {
 
   private static final String EMPTY_FILE = "subrip/empty";
@@ -43,7 +43,7 @@ public final class SubripDecoderTest {
   @Test
   public void testDecodeEmpty() throws IOException {
     SubripDecoder decoder = new SubripDecoder();
-    byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, EMPTY_FILE);
+    byte[] bytes = TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), EMPTY_FILE);
     SubripSubtitle subtitle = decoder.decode(bytes, bytes.length, false);
 
     assertThat(subtitle.getEventTimeCount()).isEqualTo(0);
@@ -53,7 +53,7 @@ public final class SubripDecoderTest {
   @Test
   public void testDecodeTypical() throws IOException {
     SubripDecoder decoder = new SubripDecoder();
-    byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, TYPICAL_FILE);
+    byte[] bytes = TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), TYPICAL_FILE);
     SubripSubtitle subtitle = decoder.decode(bytes, bytes.length, false);
 
     assertThat(subtitle.getEventTimeCount()).isEqualTo(6);
@@ -66,7 +66,8 @@ public final class SubripDecoderTest {
   public void testDecodeTypicalWithByteOrderMark() throws IOException {
     SubripDecoder decoder = new SubripDecoder();
     byte[] bytes =
-        TestUtil.getByteArray(RuntimeEnvironment.application, TYPICAL_WITH_BYTE_ORDER_MARK);
+        TestUtil.getByteArray(
+            ApplicationProvider.getApplicationContext(), TYPICAL_WITH_BYTE_ORDER_MARK);
     SubripSubtitle subtitle = decoder.decode(bytes, bytes.length, false);
 
     assertThat(subtitle.getEventTimeCount()).isEqualTo(6);
@@ -78,7 +79,9 @@ public final class SubripDecoderTest {
   @Test
   public void testDecodeTypicalExtraBlankLine() throws IOException {
     SubripDecoder decoder = new SubripDecoder();
-    byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, TYPICAL_EXTRA_BLANK_LINE);
+    byte[] bytes =
+        TestUtil.getByteArray(
+            ApplicationProvider.getApplicationContext(), TYPICAL_EXTRA_BLANK_LINE);
     SubripSubtitle subtitle = decoder.decode(bytes, bytes.length, false);
 
     assertThat(subtitle.getEventTimeCount()).isEqualTo(6);
@@ -91,7 +94,9 @@ public final class SubripDecoderTest {
   public void testDecodeTypicalMissingTimecode() throws IOException {
     // Parsing should succeed, parsing the first and third cues only.
     SubripDecoder decoder = new SubripDecoder();
-    byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, TYPICAL_MISSING_TIMECODE);
+    byte[] bytes =
+        TestUtil.getByteArray(
+            ApplicationProvider.getApplicationContext(), TYPICAL_MISSING_TIMECODE);
     SubripSubtitle subtitle = decoder.decode(bytes, bytes.length, false);
 
     assertThat(subtitle.getEventTimeCount()).isEqualTo(4);
@@ -103,7 +108,9 @@ public final class SubripDecoderTest {
   public void testDecodeTypicalMissingSequence() throws IOException {
     // Parsing should succeed, parsing the first and third cues only.
     SubripDecoder decoder = new SubripDecoder();
-    byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, TYPICAL_MISSING_SEQUENCE);
+    byte[] bytes =
+        TestUtil.getByteArray(
+            ApplicationProvider.getApplicationContext(), TYPICAL_MISSING_SEQUENCE);
     SubripSubtitle subtitle = decoder.decode(bytes, bytes.length, false);
 
     assertThat(subtitle.getEventTimeCount()).isEqualTo(4);
@@ -116,7 +123,8 @@ public final class SubripDecoderTest {
     // Parsing should succeed, parsing the third cue only.
     SubripDecoder decoder = new SubripDecoder();
     byte[] bytes =
-        TestUtil.getByteArray(RuntimeEnvironment.application, TYPICAL_NEGATIVE_TIMESTAMPS);
+        TestUtil.getByteArray(
+            ApplicationProvider.getApplicationContext(), TYPICAL_NEGATIVE_TIMESTAMPS);
     SubripSubtitle subtitle = decoder.decode(bytes, bytes.length, false);
 
     assertThat(subtitle.getEventTimeCount()).isEqualTo(2);
@@ -127,7 +135,8 @@ public final class SubripDecoderTest {
   public void testDecodeTypicalUnexpectedEnd() throws IOException {
     // Parsing should succeed, parsing the first and second cues only.
     SubripDecoder decoder = new SubripDecoder();
-    byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, TYPICAL_UNEXPECTED_END);
+    byte[] bytes =
+        TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), TYPICAL_UNEXPECTED_END);
     SubripSubtitle subtitle = decoder.decode(bytes, bytes.length, false);
 
     assertThat(subtitle.getEventTimeCount()).isEqualTo(4);
@@ -138,7 +147,8 @@ public final class SubripDecoderTest {
   @Test
   public void testDecodeNoEndTimecodes() throws IOException {
     SubripDecoder decoder = new SubripDecoder();
-    byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, NO_END_TIMECODES_FILE);
+    byte[] bytes =
+        TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), NO_END_TIMECODES_FILE);
     SubripSubtitle subtitle = decoder.decode(bytes, bytes.length, false);
 
     assertThat(subtitle.getEventTimeCount()).isEqualTo(3);
@@ -159,7 +169,8 @@ public final class SubripDecoderTest {
   @Test
   public void testDecodeCueWithTag() throws IOException {
     SubripDecoder decoder = new SubripDecoder();
-    byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, TYPICAL_WITH_TAGS);
+    byte[] bytes =
+        TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), TYPICAL_WITH_TAGS);
     SubripSubtitle subtitle = decoder.decode(bytes, bytes.length, false);
 
     assertTypicalCue1(subtitle, 0);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java
index 72fff9606c..000d0634ce 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java
@@ -30,6 +30,8 @@ import android.text.style.StrikethroughSpan;
 import android.text.style.StyleSpan;
 import android.text.style.TypefaceSpan;
 import android.text.style.UnderlineSpan;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.text.Cue;
 import com.google.android.exoplayer2.text.SubtitleDecoderException;
@@ -39,11 +41,9 @@ import java.util.List;
 import java.util.Map;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Unit test for {@link TtmlDecoder}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class TtmlDecoderTest {
 
   private static final String INLINE_ATTRIBUTES_TTML_FILE = "ttml/inline_style_attributes.xml";
@@ -700,7 +700,7 @@ public final class TtmlDecoderTest {
 
   private TtmlSubtitle getSubtitle(String file) throws IOException, SubtitleDecoderException {
     TtmlDecoder ttmlDecoder = new TtmlDecoder();
-    byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, file);
+    byte[] bytes = TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), file);
     return ttmlDecoder.decode(bytes, bytes.length, false);
   }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java
index 536ddbabbc..40fd6f288a 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java
@@ -24,16 +24,14 @@ import static com.google.android.exoplayer2.text.ttml.TtmlStyle.STYLE_BOLD_ITALI
 import static com.google.common.truth.Truth.assertThat;
 
 import android.graphics.Color;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit test for {@link TtmlRenderUtil}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit test for {@link TtmlRenderUtil}. */
+@RunWith(AndroidJUnit4.class)
 public final class TtmlRenderUtilTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java
index aa46584f54..24b5ca678f 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java
@@ -26,13 +26,13 @@ import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
 import android.graphics.Color;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link TtmlStyle}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class TtmlStyleTest {
 
   private static final String FONT_FAMILY = "serif";
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoderTest.java
index 155b8f5993..16b997e117 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoderTest.java
@@ -25,6 +25,8 @@ import android.text.style.ForegroundColorSpan;
 import android.text.style.StyleSpan;
 import android.text.style.TypefaceSpan;
 import android.text.style.UnderlineSpan;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.text.Cue;
@@ -34,11 +36,9 @@ import java.io.IOException;
 import java.util.Collections;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Unit test for {@link Tx3gDecoder}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class Tx3gDecoderTest {
 
   private static final String NO_SUBTITLE = "tx3g/no_subtitle";
@@ -56,7 +56,7 @@ public final class Tx3gDecoderTest {
   @Test
   public void testDecodeNoSubtitle() throws IOException, SubtitleDecoderException {
     Tx3gDecoder decoder = new Tx3gDecoder(Collections.emptyList());
-    byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, NO_SUBTITLE);
+    byte[] bytes = TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), NO_SUBTITLE);
     Subtitle subtitle = decoder.decode(bytes, bytes.length, false);
     assertThat(subtitle.getCues(0)).isEmpty();
   }
@@ -64,7 +64,8 @@ public final class Tx3gDecoderTest {
   @Test
   public void testDecodeJustText() throws IOException, SubtitleDecoderException {
     Tx3gDecoder decoder = new Tx3gDecoder(Collections.emptyList());
-    byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, SAMPLE_JUST_TEXT);
+    byte[] bytes =
+        TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), SAMPLE_JUST_TEXT);
     Subtitle subtitle = decoder.decode(bytes, bytes.length, false);
     SpannedString text = new SpannedString(subtitle.getCues(0).get(0).text);
     assertThat(text.toString()).isEqualTo("CC Test");
@@ -75,7 +76,8 @@ public final class Tx3gDecoderTest {
   @Test
   public void testDecodeWithStyl() throws IOException, SubtitleDecoderException {
     Tx3gDecoder decoder = new Tx3gDecoder(Collections.emptyList());
-    byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, SAMPLE_WITH_STYL);
+    byte[] bytes =
+        TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), SAMPLE_WITH_STYL);
     Subtitle subtitle = decoder.decode(bytes, bytes.length, false);
     SpannedString text = new SpannedString(subtitle.getCues(0).get(0).text);
     assertThat(text.toString()).isEqualTo("CC Test");
@@ -92,7 +94,8 @@ public final class Tx3gDecoderTest {
   public void testDecodeWithStylAllDefaults() throws IOException, SubtitleDecoderException {
     Tx3gDecoder decoder = new Tx3gDecoder(Collections.emptyList());
     byte[] bytes =
-        TestUtil.getByteArray(RuntimeEnvironment.application, SAMPLE_WITH_STYL_ALL_DEFAULTS);
+        TestUtil.getByteArray(
+            ApplicationProvider.getApplicationContext(), SAMPLE_WITH_STYL_ALL_DEFAULTS);
     Subtitle subtitle = decoder.decode(bytes, bytes.length, false);
     SpannedString text = new SpannedString(subtitle.getCues(0).get(0).text);
     assertThat(text.toString()).isEqualTo("CC Test");
@@ -103,7 +106,8 @@ public final class Tx3gDecoderTest {
   @Test
   public void testDecodeUtf16BeNoStyl() throws IOException, SubtitleDecoderException {
     Tx3gDecoder decoder = new Tx3gDecoder(Collections.emptyList());
-    byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, SAMPLE_UTF16_BE_NO_STYL);
+    byte[] bytes =
+        TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), SAMPLE_UTF16_BE_NO_STYL);
     Subtitle subtitle = decoder.decode(bytes, bytes.length, false);
     SpannedString text = new SpannedString(subtitle.getCues(0).get(0).text);
     assertThat(text.toString()).isEqualTo("你好");
@@ -114,7 +118,8 @@ public final class Tx3gDecoderTest {
   @Test
   public void testDecodeUtf16LeNoStyl() throws IOException, SubtitleDecoderException {
     Tx3gDecoder decoder = new Tx3gDecoder(Collections.emptyList());
-    byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, SAMPLE_UTF16_LE_NO_STYL);
+    byte[] bytes =
+        TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), SAMPLE_UTF16_LE_NO_STYL);
     Subtitle subtitle = decoder.decode(bytes, bytes.length, false);
     SpannedString text = new SpannedString(subtitle.getCues(0).get(0).text);
     assertThat(text.toString()).isEqualTo("你好");
@@ -125,7 +130,9 @@ public final class Tx3gDecoderTest {
   @Test
   public void testDecodeWithMultipleStyl() throws IOException, SubtitleDecoderException {
     Tx3gDecoder decoder = new Tx3gDecoder(Collections.emptyList());
-    byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, SAMPLE_WITH_MULTIPLE_STYL);
+    byte[] bytes =
+        TestUtil.getByteArray(
+            ApplicationProvider.getApplicationContext(), SAMPLE_WITH_MULTIPLE_STYL);
     Subtitle subtitle = decoder.decode(bytes, bytes.length, false);
     SpannedString text = new SpannedString(subtitle.getCues(0).get(0).text);
     assertThat(text.toString()).isEqualTo("Line 2\nLine 3");
@@ -144,7 +151,8 @@ public final class Tx3gDecoderTest {
   public void testDecodeWithOtherExtension() throws IOException, SubtitleDecoderException {
     Tx3gDecoder decoder = new Tx3gDecoder(Collections.emptyList());
     byte[] bytes =
-        TestUtil.getByteArray(RuntimeEnvironment.application, SAMPLE_WITH_OTHER_EXTENSION);
+        TestUtil.getByteArray(
+            ApplicationProvider.getApplicationContext(), SAMPLE_WITH_OTHER_EXTENSION);
     Subtitle subtitle = decoder.decode(bytes, bytes.length, false);
     SpannedString text = new SpannedString(subtitle.getCues(0).get(0).text);
     assertThat(text.toString()).isEqualTo("CC Test");
@@ -158,9 +166,11 @@ public final class Tx3gDecoderTest {
 
   @Test
   public void testInitializationDecodeWithStyl() throws IOException, SubtitleDecoderException {
-    byte[] initBytes = TestUtil.getByteArray(RuntimeEnvironment.application, INITIALIZATION);
+    byte[] initBytes =
+        TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), INITIALIZATION);
     Tx3gDecoder decoder = new Tx3gDecoder(Collections.singletonList(initBytes));
-    byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, SAMPLE_WITH_STYL);
+    byte[] bytes =
+        TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), SAMPLE_WITH_STYL);
     Subtitle subtitle = decoder.decode(bytes, bytes.length, false);
     SpannedString text = new SpannedString(subtitle.getCues(0).get(0).text);
     assertThat(text.toString()).isEqualTo("CC Test");
@@ -179,9 +189,11 @@ public final class Tx3gDecoderTest {
 
   @Test
   public void testInitializationDecodeWithTbox() throws IOException, SubtitleDecoderException {
-    byte[] initBytes = TestUtil.getByteArray(RuntimeEnvironment.application, INITIALIZATION);
+    byte[] initBytes =
+        TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), INITIALIZATION);
     Tx3gDecoder decoder = new Tx3gDecoder(Collections.singletonList(initBytes));
-    byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, SAMPLE_WITH_TBOX);
+    byte[] bytes =
+        TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), SAMPLE_WITH_TBOX);
     Subtitle subtitle = decoder.decode(bytes, bytes.length, false);
     SpannedString text = new SpannedString(subtitle.getCues(0).get(0).text);
     assertThat(text.toString()).isEqualTo("CC Test");
@@ -200,9 +212,11 @@ public final class Tx3gDecoderTest {
   public void testInitializationAllDefaultsDecodeWithStyl()
       throws IOException, SubtitleDecoderException {
     byte[] initBytes =
-        TestUtil.getByteArray(RuntimeEnvironment.application, INITIALIZATION_ALL_DEFAULTS);
+        TestUtil.getByteArray(
+            ApplicationProvider.getApplicationContext(), INITIALIZATION_ALL_DEFAULTS);
     Tx3gDecoder decoder = new Tx3gDecoder(Collections.singletonList(initBytes));
-    byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, SAMPLE_WITH_STYL);
+    byte[] bytes =
+        TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), SAMPLE_WITH_STYL);
     Subtitle subtitle = decoder.decode(bytes, bytes.length, false);
     SpannedString text = new SpannedString(subtitle.getCues(0).get(0).text);
     assertThat(text.toString()).isEqualTo("CC Test");
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java
index b81c0c68c3..fb9e1a875f 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java
@@ -18,17 +18,15 @@ package com.google.android.exoplayer2.text.webvtt;
 import static com.google.android.exoplayer2.text.webvtt.CssParser.parseNextToken;
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.Util;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit test for {@link CssParser}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit test for {@link CssParser}. */
+@RunWith(AndroidJUnit4.class)
 public final class CssParserTest {
 
   private CssParser parser;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java
index f0c426ea65..f930c4590f 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java
@@ -18,18 +18,16 @@ package com.google.android.exoplayer2.text.webvtt;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.text.Cue;
 import com.google.android.exoplayer2.text.Subtitle;
 import com.google.android.exoplayer2.text.SubtitleDecoderException;
 import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit test for {@link Mp4WebvttDecoder}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit test for {@link Mp4WebvttDecoder}. */
+@RunWith(AndroidJUnit4.class)
 public final class Mp4WebvttDecoderTest {
 
   private static final byte[] SINGLE_CUE_SAMPLE = {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java
index 9e42f0c049..32d2dc2060 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java
@@ -23,15 +23,13 @@ import android.graphics.Typeface;
 import android.text.Spanned;
 import android.text.style.StyleSpan;
 import android.text.style.UnderlineSpan;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.util.Collections;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit test for {@link WebvttCueParser}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit test for {@link WebvttCueParser}. */
+@RunWith(AndroidJUnit4.class)
 public final class WebvttCueParserTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java
index c4724bc8b9..2a7289c039 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java
@@ -26,6 +26,8 @@ import android.text.style.ForegroundColorSpan;
 import android.text.style.StyleSpan;
 import android.text.style.TypefaceSpan;
 import android.text.style.UnderlineSpan;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.text.Cue;
 import com.google.android.exoplayer2.text.SubtitleDecoderException;
@@ -33,11 +35,9 @@ import java.io.IOException;
 import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Unit test for {@link WebvttDecoder}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class WebvttDecoderTest {
 
   private static final String TYPICAL_FILE = "webvtt/typical";
@@ -55,7 +55,7 @@ public class WebvttDecoderTest {
   @Test
   public void testDecodeEmpty() throws IOException {
     WebvttDecoder decoder = new WebvttDecoder();
-    byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, EMPTY_FILE);
+    byte[] bytes = TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), EMPTY_FILE);
     try {
       decoder.decode(bytes, bytes.length, /* reset= */ false);
       fail();
@@ -394,7 +394,7 @@ public class WebvttDecoderTest {
   private WebvttSubtitle getSubtitleForTestAsset(String asset)
       throws IOException, SubtitleDecoderException {
     WebvttDecoder decoder = new WebvttDecoder();
-    byte[] bytes = TestUtil.getByteArray(RuntimeEnvironment.application, asset);
+    byte[] bytes = TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), asset);
     return decoder.decode(bytes, bytes.length, /* reset= */ false);
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java
index af165ffe9b..0f0f2572b7 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java
@@ -19,18 +19,16 @@ import static com.google.android.exoplayer2.C.INDEX_UNSET;
 import static com.google.common.truth.Truth.assertThat;
 import static java.lang.Long.MAX_VALUE;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.text.Cue;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit test for {@link WebvttSubtitle}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit test for {@link WebvttSubtitle}. */
+@RunWith(AndroidJUnit4.class)
 public class WebvttSubtitleTest {
 
   private static final String FIRST_SUBTITLE_STRING = "This is the first subtitle.";
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
index bf6b935161..666cb9815f 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
@@ -26,6 +26,7 @@ import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.TrackGroup;
@@ -44,10 +45,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentMatcher;
 import org.mockito.Mock;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link AdaptiveTrackSelection}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class AdaptiveTrackSelectionTest {
 
   private static final MediaChunkIterator[] THREE_EMPTY_MEDIA_CHUNK_ITERATORS =
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptiveTrackSelectionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptiveTrackSelectionTest.java
index 9fa84e42f3..8b20630a23 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptiveTrackSelectionTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptiveTrackSelectionTest.java
@@ -20,6 +20,7 @@ import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
 import android.util.Pair;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.LoadControl;
@@ -32,10 +33,9 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for the track selection created by {@link BufferSizeAdaptationBuilder}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class BufferSizeAdaptiveTrackSelectionTest {
 
   private static final int MIN_BUFFER_MS = 15_000;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
index 53bc9f4eea..94ae1b5898 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
@@ -30,6 +30,7 @@ import static org.mockito.MockitoAnnotations.initMocks;
 import android.os.Parcel;
 import android.util.SparseArray;
 import android.util.SparseBooleanArray;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.Format;
@@ -53,12 +54,9 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit tests for {@link DefaultTrackSelector}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit tests for {@link DefaultTrackSelector}. */
+@RunWith(AndroidJUnit4.class)
 public final class DefaultTrackSelectorTest {
 
   private static final RendererCapabilities ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES =
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java
index 140a9733b3..efb828fc57 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.trackselection;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.util.Pair;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.Format;
@@ -32,12 +33,9 @@ import com.google.android.exoplayer2.util.MimeTypes;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit tests for {@link MappingTrackSelector}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit tests for {@link MappingTrackSelector}. */
+@RunWith(AndroidJUnit4.class)
 public final class MappingTrackSelectorTest {
 
   private static final RendererCapabilities VIDEO_CAPABILITIES =
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java
index c513b86263..9acef96c0b 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.trackselection;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
@@ -28,10 +29,9 @@ import java.util.Arrays;
 import java.util.Collections;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** {@link TrackSelectionUtil} tests. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class TrackSelectionUtilTest {
 
   public static final long MAX_DURATION_US = 30 * C.MICROS_PER_SECOND;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectorTest.java
index 3b88c00e2e..477f7226a4 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectorTest.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.trackselection;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.RendererCapabilities;
 import com.google.android.exoplayer2.Timeline;
@@ -29,10 +30,9 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link TrackSelector}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class TrackSelectorTest {
 
   private TrackSelector trackSelector;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimatorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimatorTest.java
index 52b52e1df4..887338078e 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimatorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimatorTest.java
@@ -19,6 +19,7 @@ package com.google.android.exoplayer2.trackselection;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.chunk.MediaChunk;
@@ -29,10 +30,9 @@ import com.google.android.exoplayer2.upstream.DataSpec;
 import java.util.Collections;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** {@link WindowedTrackBitrateEstimator} tests. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class WindowedTrackBitrateEstimatorTest {
 
   private static final long MAX_DURATION_MS = 30_000;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/AssetDataSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/AssetDataSourceTest.java
index 7ffc14d51f..7e25eacfe2 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/AssetDataSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/AssetDataSourceTest.java
@@ -16,37 +16,37 @@
 package com.google.android.exoplayer2.upstream;
 
 import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Unit tests for {@link AssetDataSource}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class AssetDataSourceTest {
 
   private static final String DATA_PATH = "binary/1024_incrementing_bytes.mp3";
 
   @Test
   public void testReadFileUri() throws Exception {
-    AssetDataSource dataSource = new AssetDataSource(RuntimeEnvironment.application);
+    AssetDataSource dataSource = new AssetDataSource(ApplicationProvider.getApplicationContext());
     DataSpec dataSpec = new DataSpec(Uri.parse("file:///android_asset/" + DATA_PATH));
     TestUtil.assertDataSourceContent(
         dataSource,
         dataSpec,
-        TestUtil.getByteArray(RuntimeEnvironment.application, DATA_PATH),
+        TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), DATA_PATH),
         true);
   }
 
   @Test
   public void testReadAssetUri() throws Exception {
-    AssetDataSource dataSource = new AssetDataSource(RuntimeEnvironment.application);
+    AssetDataSource dataSource = new AssetDataSource(ApplicationProvider.getApplicationContext());
     DataSpec dataSpec = new DataSpec(Uri.parse("asset:///" + DATA_PATH));
     TestUtil.assertDataSourceContent(
         dataSource,
         dataSpec,
-        TestUtil.getByteArray(RuntimeEnvironment.application, DATA_PATH),
+        TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), DATA_PATH),
         true);
   }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/BaseDataSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/BaseDataSourceTest.java
index f962e0d8fd..289de08c47 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/BaseDataSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/BaseDataSourceTest.java
@@ -19,14 +19,14 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
 import androidx.annotation.Nullable;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import java.io.IOException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link BaseDataSource}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class BaseDataSourceTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/ByteArrayDataSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/ByteArrayDataSourceTest.java
index f04f01bd5f..ee64e56c51 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/ByteArrayDataSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/ByteArrayDataSourceTest.java
@@ -18,16 +18,14 @@ package com.google.android.exoplayer2.upstream;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import java.io.IOException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit tests for {@link ByteArrayDataSource}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit tests for {@link ByteArrayDataSource}. */
+@RunWith(AndroidJUnit4.class)
 public final class ByteArrayDataSourceTest {
 
   private static final byte[] TEST_DATA = new byte[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSchemeDataSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSchemeDataSourceTest.java
index dd1ae30bdb..2df9a608e9 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSchemeDataSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSchemeDataSourceTest.java
@@ -20,17 +20,15 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import android.net.Uri;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit tests for {@link DataSchemeDataSource}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit tests for {@link DataSchemeDataSource}. */
+@RunWith(AndroidJUnit4.class)
 public final class DataSchemeDataSourceTest {
 
   private DataSource schemeDataDataSource;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSourceInputStreamTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSourceInputStreamTest.java
index f47cfc4469..257f1c45b3 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSourceInputStreamTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSourceInputStreamTest.java
@@ -18,18 +18,16 @@ package com.google.android.exoplayer2.upstream;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.FakeDataSource;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import java.io.IOException;
 import java.util.Arrays;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit tests for {@link DataSourceInputStream}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit tests for {@link DataSourceInputStream}. */
+@RunWith(AndroidJUnit4.class)
 public final class DataSourceInputStreamTest {
 
   private static final byte[] TEST_DATA = TestUtil.buildTestData(16);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeterTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeterTest.java
index ec5d82e712..d8d22a7b2f 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeterTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeterTest.java
@@ -23,6 +23,8 @@ import android.net.NetworkInfo;
 import android.net.NetworkInfo.DetailedState;
 import android.net.Uri;
 import android.telephony.TelephonyManager;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.FakeClock;
 import com.google.android.exoplayer2.testutil.FakeDataSource;
@@ -30,13 +32,11 @@ import java.util.Random;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.shadows.ShadowNetworkInfo;
 
 /** Unit test for {@link DefaultBandwidthMeter}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class DefaultBandwidthMeterTest {
 
   private static final int SIMULATED_TRANSFER_COUNT = 100;
@@ -56,10 +56,11 @@ public final class DefaultBandwidthMeterTest {
   public void setUp() {
     connectivityManager =
         (ConnectivityManager)
-            RuntimeEnvironment.application.getSystemService(Context.CONNECTIVITY_SERVICE);
+            ApplicationProvider.getApplicationContext()
+                .getSystemService(Context.CONNECTIVITY_SERVICE);
     telephonyManager =
         (TelephonyManager)
-            RuntimeEnvironment.application.getSystemService(Context.TELEPHONY_SERVICE);
+            ApplicationProvider.getApplicationContext().getSystemService(Context.TELEPHONY_SERVICE);
     Shadows.shadowOf(telephonyManager).setNetworkCountryIso(FAST_COUNTRY_ISO);
     networkInfoOffline =
         ShadowNetworkInfo.newInstance(
@@ -109,12 +110,12 @@ public final class DefaultBandwidthMeterTest {
   public void defaultInitialBitrateEstimate_forWifi_isGreaterThanEstimateFor2G() {
     setActiveNetworkInfo(networkInfoWifi);
     DefaultBandwidthMeter bandwidthMeterWifi =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimateWifi = bandwidthMeterWifi.getBitrateEstimate();
 
     setActiveNetworkInfo(networkInfo2g);
     DefaultBandwidthMeter bandwidthMeter2g =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimate2g = bandwidthMeter2g.getBitrateEstimate();
 
     assertThat(initialEstimateWifi).isGreaterThan(initialEstimate2g);
@@ -124,12 +125,12 @@ public final class DefaultBandwidthMeterTest {
   public void defaultInitialBitrateEstimate_forWifi_isGreaterThanEstimateFor3G() {
     setActiveNetworkInfo(networkInfoWifi);
     DefaultBandwidthMeter bandwidthMeterWifi =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimateWifi = bandwidthMeterWifi.getBitrateEstimate();
 
     setActiveNetworkInfo(networkInfo3g);
     DefaultBandwidthMeter bandwidthMeter3g =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimate3g = bandwidthMeter3g.getBitrateEstimate();
 
     assertThat(initialEstimateWifi).isGreaterThan(initialEstimate3g);
@@ -139,12 +140,12 @@ public final class DefaultBandwidthMeterTest {
   public void defaultInitialBitrateEstimate_forEthernet_isGreaterThanEstimateFor2G() {
     setActiveNetworkInfo(networkInfoEthernet);
     DefaultBandwidthMeter bandwidthMeterEthernet =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimateEthernet = bandwidthMeterEthernet.getBitrateEstimate();
 
     setActiveNetworkInfo(networkInfo2g);
     DefaultBandwidthMeter bandwidthMeter2g =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimate2g = bandwidthMeter2g.getBitrateEstimate();
 
     assertThat(initialEstimateEthernet).isGreaterThan(initialEstimate2g);
@@ -154,12 +155,12 @@ public final class DefaultBandwidthMeterTest {
   public void defaultInitialBitrateEstimate_forEthernet_isGreaterThanEstimateFor3G() {
     setActiveNetworkInfo(networkInfoEthernet);
     DefaultBandwidthMeter bandwidthMeterEthernet =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimateEthernet = bandwidthMeterEthernet.getBitrateEstimate();
 
     setActiveNetworkInfo(networkInfo3g);
     DefaultBandwidthMeter bandwidthMeter3g =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimate3g = bandwidthMeter3g.getBitrateEstimate();
 
     assertThat(initialEstimateEthernet).isGreaterThan(initialEstimate3g);
@@ -169,12 +170,12 @@ public final class DefaultBandwidthMeterTest {
   public void defaultInitialBitrateEstimate_for4G_isGreaterThanEstimateFor2G() {
     setActiveNetworkInfo(networkInfo4g);
     DefaultBandwidthMeter bandwidthMeter4g =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimate4g = bandwidthMeter4g.getBitrateEstimate();
 
     setActiveNetworkInfo(networkInfo2g);
     DefaultBandwidthMeter bandwidthMeter2g =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimate2g = bandwidthMeter2g.getBitrateEstimate();
 
     assertThat(initialEstimate4g).isGreaterThan(initialEstimate2g);
@@ -184,12 +185,12 @@ public final class DefaultBandwidthMeterTest {
   public void defaultInitialBitrateEstimate_for4G_isGreaterThanEstimateFor3G() {
     setActiveNetworkInfo(networkInfo4g);
     DefaultBandwidthMeter bandwidthMeter4g =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimate4g = bandwidthMeter4g.getBitrateEstimate();
 
     setActiveNetworkInfo(networkInfo3g);
     DefaultBandwidthMeter bandwidthMeter3g =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimate3g = bandwidthMeter3g.getBitrateEstimate();
 
     assertThat(initialEstimate4g).isGreaterThan(initialEstimate3g);
@@ -199,12 +200,12 @@ public final class DefaultBandwidthMeterTest {
   public void defaultInitialBitrateEstimate_for3G_isGreaterThanEstimateFor2G() {
     setActiveNetworkInfo(networkInfo3g);
     DefaultBandwidthMeter bandwidthMeter3g =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimate3g = bandwidthMeter3g.getBitrateEstimate();
 
     setActiveNetworkInfo(networkInfo2g);
     DefaultBandwidthMeter bandwidthMeter2g =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimate2g = bandwidthMeter2g.getBitrateEstimate();
 
     assertThat(initialEstimate3g).isGreaterThan(initialEstimate2g);
@@ -214,7 +215,7 @@ public final class DefaultBandwidthMeterTest {
   public void defaultInitialBitrateEstimate_forOffline_isReasonable() {
     setActiveNetworkInfo(networkInfoOffline);
     DefaultBandwidthMeter bandwidthMeter =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
 
     assertThat(initialEstimate).isGreaterThan(100_000L);
@@ -227,12 +228,12 @@ public final class DefaultBandwidthMeterTest {
     setActiveNetworkInfo(networkInfoWifi);
     setNetworkCountryIso(FAST_COUNTRY_ISO);
     DefaultBandwidthMeter bandwidthMeterFast =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimateFast = bandwidthMeterFast.getBitrateEstimate();
 
     setNetworkCountryIso(SLOW_COUNTRY_ISO);
     DefaultBandwidthMeter bandwidthMeterSlow =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimateSlow = bandwidthMeterSlow.getBitrateEstimate();
 
     assertThat(initialEstimateFast).isGreaterThan(initialEstimateSlow);
@@ -244,12 +245,12 @@ public final class DefaultBandwidthMeterTest {
     setActiveNetworkInfo(networkInfoEthernet);
     setNetworkCountryIso(FAST_COUNTRY_ISO);
     DefaultBandwidthMeter bandwidthMeterFast =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimateFast = bandwidthMeterFast.getBitrateEstimate();
 
     setNetworkCountryIso(SLOW_COUNTRY_ISO);
     DefaultBandwidthMeter bandwidthMeterSlow =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimateSlow = bandwidthMeterSlow.getBitrateEstimate();
 
     assertThat(initialEstimateFast).isGreaterThan(initialEstimateSlow);
@@ -261,12 +262,12 @@ public final class DefaultBandwidthMeterTest {
     setActiveNetworkInfo(networkInfo2g);
     setNetworkCountryIso(FAST_COUNTRY_ISO);
     DefaultBandwidthMeter bandwidthMeterFast =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimateFast = bandwidthMeterFast.getBitrateEstimate();
 
     setNetworkCountryIso(SLOW_COUNTRY_ISO);
     DefaultBandwidthMeter bandwidthMeterSlow =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimateSlow = bandwidthMeterSlow.getBitrateEstimate();
 
     assertThat(initialEstimateFast).isGreaterThan(initialEstimateSlow);
@@ -278,12 +279,12 @@ public final class DefaultBandwidthMeterTest {
     setActiveNetworkInfo(networkInfo3g);
     setNetworkCountryIso(FAST_COUNTRY_ISO);
     DefaultBandwidthMeter bandwidthMeterFast =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimateFast = bandwidthMeterFast.getBitrateEstimate();
 
     setNetworkCountryIso(SLOW_COUNTRY_ISO);
     DefaultBandwidthMeter bandwidthMeterSlow =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimateSlow = bandwidthMeterSlow.getBitrateEstimate();
 
     assertThat(initialEstimateFast).isGreaterThan(initialEstimateSlow);
@@ -295,12 +296,12 @@ public final class DefaultBandwidthMeterTest {
     setActiveNetworkInfo(networkInfo4g);
     setNetworkCountryIso(FAST_COUNTRY_ISO);
     DefaultBandwidthMeter bandwidthMeterFast =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimateFast = bandwidthMeterFast.getBitrateEstimate();
 
     setNetworkCountryIso(SLOW_COUNTRY_ISO);
     DefaultBandwidthMeter bandwidthMeterSlow =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimateSlow = bandwidthMeterSlow.getBitrateEstimate();
 
     assertThat(initialEstimateFast).isGreaterThan(initialEstimateSlow);
@@ -310,7 +311,7 @@ public final class DefaultBandwidthMeterTest {
   public void initialBitrateEstimateOverwrite_whileConnectedToNetwork_setsInitialEstimate() {
     setActiveNetworkInfo(networkInfoWifi);
     DefaultBandwidthMeter bandwidthMeter =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext())
             .setInitialBitrateEstimate(123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -322,7 +323,7 @@ public final class DefaultBandwidthMeterTest {
   public void initialBitrateEstimateOverwrite_whileOffline_setsInitialEstimate() {
     setActiveNetworkInfo(networkInfoOffline);
     DefaultBandwidthMeter bandwidthMeter =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext())
             .setInitialBitrateEstimate(123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -334,7 +335,7 @@ public final class DefaultBandwidthMeterTest {
   public void initialBitrateEstimateOverwrite_forWifi_whileConnectedToWifi_setsInitialEstimate() {
     setActiveNetworkInfo(networkInfoWifi);
     DefaultBandwidthMeter bandwidthMeter =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext())
             .setInitialBitrateEstimate(C.NETWORK_TYPE_WIFI, 123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -347,7 +348,7 @@ public final class DefaultBandwidthMeterTest {
       initialBitrateEstimateOverwrite_forWifi_whileConnectedToOtherNetwork_doesNotSetInitialEstimate() {
     setActiveNetworkInfo(networkInfo2g);
     DefaultBandwidthMeter bandwidthMeter =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext())
             .setInitialBitrateEstimate(C.NETWORK_TYPE_WIFI, 123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -360,7 +361,7 @@ public final class DefaultBandwidthMeterTest {
       initialBitrateEstimateOverwrite_forEthernet_whileConnectedToEthernet_setsInitialEstimate() {
     setActiveNetworkInfo(networkInfoEthernet);
     DefaultBandwidthMeter bandwidthMeter =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext())
             .setInitialBitrateEstimate(C.NETWORK_TYPE_ETHERNET, 123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -373,7 +374,7 @@ public final class DefaultBandwidthMeterTest {
       initialBitrateEstimateOverwrite_forEthernet_whileConnectedToOtherNetwork_doesNotSetInitialEstimate() {
     setActiveNetworkInfo(networkInfo2g);
     DefaultBandwidthMeter bandwidthMeter =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext())
             .setInitialBitrateEstimate(C.NETWORK_TYPE_WIFI, 123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -385,7 +386,7 @@ public final class DefaultBandwidthMeterTest {
   public void initialBitrateEstimateOverwrite_for2G_whileConnectedTo2G_setsInitialEstimate() {
     setActiveNetworkInfo(networkInfo2g);
     DefaultBandwidthMeter bandwidthMeter =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext())
             .setInitialBitrateEstimate(C.NETWORK_TYPE_2G, 123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -398,7 +399,7 @@ public final class DefaultBandwidthMeterTest {
       initialBitrateEstimateOverwrite_for2G_whileConnectedToOtherNetwork_doesNotSetInitialEstimate() {
     setActiveNetworkInfo(networkInfoWifi);
     DefaultBandwidthMeter bandwidthMeter =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext())
             .setInitialBitrateEstimate(C.NETWORK_TYPE_2G, 123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -410,7 +411,7 @@ public final class DefaultBandwidthMeterTest {
   public void initialBitrateEstimateOverwrite_for3G_whileConnectedTo3G_setsInitialEstimate() {
     setActiveNetworkInfo(networkInfo3g);
     DefaultBandwidthMeter bandwidthMeter =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext())
             .setInitialBitrateEstimate(C.NETWORK_TYPE_3G, 123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -423,7 +424,7 @@ public final class DefaultBandwidthMeterTest {
       initialBitrateEstimateOverwrite_for3G_whileConnectedToOtherNetwork_doesNotSetInitialEstimate() {
     setActiveNetworkInfo(networkInfoWifi);
     DefaultBandwidthMeter bandwidthMeter =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext())
             .setInitialBitrateEstimate(C.NETWORK_TYPE_3G, 123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -435,7 +436,7 @@ public final class DefaultBandwidthMeterTest {
   public void initialBitrateEstimateOverwrite_for4G_whileConnectedTo4G_setsInitialEstimate() {
     setActiveNetworkInfo(networkInfo4g);
     DefaultBandwidthMeter bandwidthMeter =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext())
             .setInitialBitrateEstimate(C.NETWORK_TYPE_4G, 123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -448,7 +449,7 @@ public final class DefaultBandwidthMeterTest {
       initialBitrateEstimateOverwrite_for4G_whileConnectedToOtherNetwork_doesNotSetInitialEstimate() {
     setActiveNetworkInfo(networkInfoWifi);
     DefaultBandwidthMeter bandwidthMeter =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext())
             .setInitialBitrateEstimate(C.NETWORK_TYPE_4G, 123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -460,7 +461,7 @@ public final class DefaultBandwidthMeterTest {
   public void initialBitrateEstimateOverwrite_forOffline_whileOffline_setsInitialEstimate() {
     setActiveNetworkInfo(networkInfoOffline);
     DefaultBandwidthMeter bandwidthMeter =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext())
             .setInitialBitrateEstimate(C.NETWORK_TYPE_OFFLINE, 123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -473,7 +474,7 @@ public final class DefaultBandwidthMeterTest {
       initialBitrateEstimateOverwrite_forOffline_whileConnectedToNetwork_doesNotSetInitialEstimate() {
     setActiveNetworkInfo(networkInfoWifi);
     DefaultBandwidthMeter bandwidthMeter =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext())
             .setInitialBitrateEstimate(C.NETWORK_TYPE_OFFLINE, 123456789)
             .build();
     long initialEstimate = bandwidthMeter.getBitrateEstimate();
@@ -485,12 +486,12 @@ public final class DefaultBandwidthMeterTest {
   public void initialBitrateEstimateOverwrite_forCountry_usesDefaultValuesForCountry() {
     setNetworkCountryIso(SLOW_COUNTRY_ISO);
     DefaultBandwidthMeter bandwidthMeterSlow =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimateSlow = bandwidthMeterSlow.getBitrateEstimate();
 
     setNetworkCountryIso(FAST_COUNTRY_ISO);
     DefaultBandwidthMeter bandwidthMeterFastWithSlowOverwrite =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application)
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext())
             .setInitialBitrateEstimate(SLOW_COUNTRY_ISO)
             .build();
     long initialEstimateFastWithSlowOverwrite =
@@ -503,7 +504,7 @@ public final class DefaultBandwidthMeterTest {
   public void networkTypeOverride_updatesBitrateEstimate() {
     setActiveNetworkInfo(networkInfoEthernet);
     DefaultBandwidthMeter bandwidthMeter =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build();
     long initialEstimateEthernet = bandwidthMeter.getBitrateEstimate();
 
     bandwidthMeter.setNetworkTypeOverride(C.NETWORK_TYPE_2G);
@@ -518,13 +519,17 @@ public final class DefaultBandwidthMeterTest {
     setActiveNetworkInfo(networkInfoEthernet);
     FakeClock clock = new FakeClock(/* initialTimeMs= */ 0);
     DefaultBandwidthMeter bandwidthMeter =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).setClock(clock).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext())
+            .setClock(clock)
+            .build();
     long[] bitrateEstimatesWithNewInstance = simulateTransfers(bandwidthMeter, clock);
 
     // Create a new instance and seed with some transfers.
     setActiveNetworkInfo(networkInfo2g);
     bandwidthMeter =
-        new DefaultBandwidthMeter.Builder(RuntimeEnvironment.application).setClock(clock).build();
+        new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext())
+            .setClock(clock)
+            .build();
     simulateTransfers(bandwidthMeter, clock);
 
     // Override the network type to ethernet and simulate transfers again.
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicyTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicyTest.java
index cf30fce3a6..8840abfcdc 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicyTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicyTest.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.upstream;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.upstream.HttpDataSource.InvalidResponseCodeException;
@@ -25,10 +26,9 @@ import java.io.IOException;
 import java.util.Collections;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit tests for {@link DefaultLoadErrorHandlingPolicy}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class DefaultLoadErrorHandlingPolicyTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
index 4aa16c6454..4005edc3a6 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
@@ -21,6 +21,8 @@ import static org.junit.Assert.fail;
 
 import android.net.Uri;
 import androidx.annotation.Nullable;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.CacheAsserts;
 import com.google.android.exoplayer2.testutil.FakeDataSet.FakeData;
@@ -37,13 +39,9 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
-/**
- * Unit tests for {@link CacheDataSource}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit tests for {@link CacheDataSource}. */
+@RunWith(AndroidJUnit4.class)
 public final class CacheDataSourceTest {
 
   private static final byte[] TEST_DATA = new byte[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
@@ -71,7 +69,8 @@ public final class CacheDataSourceTest {
     defaultCacheKey = CacheUtil.DEFAULT_CACHE_KEY_FACTORY.buildCacheKey(unboundedDataSpec);
     customCacheKey = "customKey." + defaultCacheKey;
     cacheKeyFactory = dataSpec -> customCacheKey;
-    tempFolder = Util.createTempDirectory(RuntimeEnvironment.application, "ExoPlayerTest");
+    tempFolder =
+        Util.createTempDirectory(ApplicationProvider.getApplicationContext(), "ExoPlayerTest");
     cache = new SimpleCache(tempFolder, new NoOpCacheEvictor());
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java
index 1e6febd8a9..bb32f47ba8 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java
@@ -21,6 +21,8 @@ import static java.util.Arrays.copyOfRange;
 
 import android.content.Context;
 import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.FakeDataSource;
 import com.google.android.exoplayer2.testutil.TestUtil;
@@ -37,13 +39,9 @@ import java.io.IOException;
 import java.util.Random;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
-/**
- * Additional tests for {@link CacheDataSource}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Additional tests for {@link CacheDataSource}. */
+@RunWith(AndroidJUnit4.class)
 public final class CacheDataSourceTest2 {
 
   private static final String EXO_CACHE_DIR = "exo";
@@ -83,7 +81,8 @@ public final class CacheDataSourceTest2 {
   private void testReads(boolean useEncryption) throws IOException {
     FakeDataSource upstreamSource = buildFakeUpstreamSource();
     CacheDataSource source =
-        buildCacheDataSource(RuntimeEnvironment.application, upstreamSource, useEncryption);
+        buildCacheDataSource(
+            ApplicationProvider.getApplicationContext(), upstreamSource, useEncryption);
     // First read, should arrive from upstream.
     testRead(END_ON_BOUNDARY, source);
     assertSingleOpen(upstreamSource, 0, OFFSET_ON_BOUNDARY);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
index 228567a4bc..6b58e25444 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
@@ -22,6 +22,8 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.FakeDataSet;
 import com.google.android.exoplayer2.testutil.FakeDataSource;
@@ -39,13 +41,9 @@ import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
-/**
- * Tests {@link CacheUtil}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Tests {@link CacheUtil}. */
+@RunWith(AndroidJUnit4.class)
 public final class CacheUtilTest {
 
   /**
@@ -96,7 +94,8 @@ public final class CacheUtilTest {
   public void setUp() throws Exception {
     MockitoAnnotations.initMocks(this);
     mockCache.init();
-    tempFolder = Util.createTempDirectory(RuntimeEnvironment.application, "ExoPlayerTest");
+    tempFolder =
+        Util.createTempDirectory(ApplicationProvider.getApplicationContext(), "ExoPlayerTest");
     cache = new SimpleCache(tempFolder, new NoOpCacheEvictor());
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
index fea82fa302..bebcf0ec12 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
@@ -21,6 +21,8 @@ import static com.google.common.truth.Truth.assertWithMessage;
 import android.net.Uri;
 import androidx.annotation.Nullable;
 import android.util.SparseArray;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.util.Util;
 import java.io.File;
@@ -33,11 +35,9 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Tests {@link CachedContentIndex}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class CachedContentIndexTest {
 
   private final byte[] testIndexV1File = {
@@ -79,7 +79,7 @@ public class CachedContentIndexTest {
   @Before
   public void setUp() throws Exception {
     cacheDir =
-        Util.createTempDirectory(RuntimeEnvironment.application, "ExoPlayerTest");
+        Util.createTempDirectory(ApplicationProvider.getApplicationContext(), "ExoPlayerTest");
   }
 
   @After
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java
index 231ab3fb2b..5efdf36191 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java
@@ -20,6 +20,8 @@ import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.when;
 
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.extractor.ChunkIndex;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.util.Util;
@@ -33,11 +35,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Tests for {@link CachedRegionTracker}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class CachedRegionTrackerTest {
 
   private static final String CACHE_KEY = "abc";
@@ -64,7 +64,8 @@ public final class CachedRegionTrackerTest {
     MockitoAnnotations.initMocks(this);
     when(cache.addListener(anyString(), any(Cache.Listener.class))).thenReturn(new TreeSet<>());
     tracker = new CachedRegionTracker(cache, CACHE_KEY, CHUNK_INDEX);
-    cacheDir = Util.createTempDirectory(RuntimeEnvironment.application, "ExoPlayerTest");
+    cacheDir =
+        Util.createTempDirectory(ApplicationProvider.getApplicationContext(), "ExoPlayerTest");
     index = new CachedContentIndex(TestUtil.getTestDatabaseProvider());
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadataTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadataTest.java
index e4ec278c22..9c9b7073eb 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadataTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadataTest.java
@@ -17,13 +17,13 @@ package com.google.android.exoplayer2.upstream.cache;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Tests {@link DefaultContentMetadata}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class DefaultContentMetadataTest {
 
   private DefaultContentMetadata contentMetadata;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictorTest.java
index 84327e1091..482174e3da 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictorTest.java
@@ -15,17 +15,15 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit tests for {@link LeastRecentlyUsedCacheEvictor}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit tests for {@link LeastRecentlyUsedCacheEvictor}. */
+@RunWith(AndroidJUnit4.class)
 public class LeastRecentlyUsedCacheEvictorTest {
 
   @Before
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java
index 475a4ec3d0..028937dc5a 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java
@@ -19,6 +19,8 @@ import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
 import android.util.LongSparseArray;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.util.Util;
 import java.io.File;
@@ -30,11 +32,9 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Unit tests for {@link SimpleCacheSpan}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class SimpleCacheSpanTest {
 
   public static File createCacheSpanFile(
@@ -51,7 +51,7 @@ public class SimpleCacheSpanTest {
   @Before
   public void setUp() throws Exception {
     cacheDir =
-        Util.createTempDirectory(RuntimeEnvironment.application, "ExoPlayerTest");
+        Util.createTempDirectory(ApplicationProvider.getApplicationContext(), "ExoPlayerTest");
     index = new CachedContentIndex(TestUtil.getTestDatabaseProvider());
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
index 9ac126b7c6..da2815f09f 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
@@ -21,6 +21,8 @@ import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 import static org.mockito.Mockito.doAnswer;
 
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.upstream.cache.Cache.CacheException;
 import com.google.android.exoplayer2.util.Util;
@@ -37,13 +39,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
-/**
- * Unit tests for {@link SimpleCache}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit tests for {@link SimpleCache}. */
+@RunWith(AndroidJUnit4.class)
 public class SimpleCacheTest {
 
   private static final String KEY_1 = "key1";
@@ -54,7 +52,7 @@ public class SimpleCacheTest {
   @Before
   public void setUp() throws Exception {
     MockitoAnnotations.initMocks(this);
-    cacheDir = Util.createTempFile(RuntimeEnvironment.application, "ExoPlayerTest");
+    cacheDir = Util.createTempFile(ApplicationProvider.getApplicationContext(), "ExoPlayerTest");
     // Delete the file. SimpleCache initialization should create a directory with the same name.
     assertThat(cacheDir.delete()).isTrue();
   }
@@ -209,7 +207,8 @@ public class SimpleCacheTest {
     // Don't release the cache. This means the index file wont have been written to disk after the
     // data for KEY_2 was removed. Move the cache instead, so we can reload it without failing the
     // folder locking check.
-    File cacheDir2 = Util.createTempFile(RuntimeEnvironment.application, "ExoPlayerTest");
+    File cacheDir2 =
+        Util.createTempFile(ApplicationProvider.getApplicationContext(), "ExoPlayerTest");
     cacheDir2.delete();
     cacheDir.renameTo(cacheDir2);
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipherTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipherTest.java
index 40b626a7db..fde2bf5a30 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipherTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipherTest.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.upstream.crypto;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.util.Util;
 import java.util.Random;
@@ -25,12 +26,9 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit tests for {@link AesFlushingCipher}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit tests for {@link AesFlushingCipher}. */
+@RunWith(AndroidJUnit4.class)
 public class AesFlushingCipherTest {
 
   private static final int DATA_LENGTH = 65536;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/AtomicFileTest.java b/library/core/src/test/java/com/google/android/exoplayer2/util/AtomicFileTest.java
index 4d80a9647e..c0bf459be8 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/util/AtomicFileTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/util/AtomicFileTest.java
@@ -17,6 +17,8 @@ package com.google.android.exoplayer2.util;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -25,13 +27,9 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
-/**
- * Tests {@link AtomicFile}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Tests {@link AtomicFile}. */
+@RunWith(AndroidJUnit4.class)
 public final class AtomicFileTest {
 
   private File tempFolder;
@@ -40,7 +38,8 @@ public final class AtomicFileTest {
 
   @Before
   public void setUp() throws Exception {
-    tempFolder = Util.createTempDirectory(RuntimeEnvironment.application, "ExoPlayerTest");
+    tempFolder =
+        Util.createTempDirectory(ApplicationProvider.getApplicationContext(), "ExoPlayerTest");
     file = new File(tempFolder, "atomicFile");
     atomicFile = new AtomicFile(file);
   }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/ColorParserTest.java b/library/core/src/test/java/com/google/android/exoplayer2/util/ColorParserTest.java
index af596c35f3..0392f8b26d 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/util/ColorParserTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/util/ColorParserTest.java
@@ -24,14 +24,12 @@ import static com.google.android.exoplayer2.util.ColorParser.parseTtmlColor;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.graphics.Color;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit test for <code>ColorParser</code>.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit test for <code>ColorParser</code>. */
+@RunWith(AndroidJUnit4.class)
 public final class ColorParserTest {
 
   // Negative tests.
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/MimeTypesTest.java b/library/core/src/test/java/com/google/android/exoplayer2/util/MimeTypesTest.java
index c607e92055..288ad918b2 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/util/MimeTypesTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/util/MimeTypesTest.java
@@ -17,12 +17,12 @@ package com.google.android.exoplayer2.util;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link MimeTypes}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class MimeTypesTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java
index 473e5a8b05..2cc26feda3 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java
@@ -18,16 +18,14 @@ package com.google.android.exoplayer2.util;
 import static com.google.android.exoplayer2.testutil.TestUtil.createByteArray;
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Tests for {@link NalUnitUtil}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Tests for {@link NalUnitUtil}. */
+@RunWith(AndroidJUnit4.class)
 public final class NalUnitUtilTest {
 
   private static final int TEST_PARTIAL_NAL_POSITION = 4;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/ParsableBitArrayTest.java b/library/core/src/test/java/com/google/android/exoplayer2/util/ParsableBitArrayTest.java
index 438643b933..e2552589fa 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/util/ParsableBitArrayTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/util/ParsableBitArrayTest.java
@@ -17,15 +17,13 @@ package com.google.android.exoplayer2.util;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Tests for {@link ParsableBitArray}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Tests for {@link ParsableBitArray}. */
+@RunWith(AndroidJUnit4.class)
 public final class ParsableBitArrayTest {
 
   private static final byte[] TEST_DATA = new byte[] {0x3C, (byte) 0xD2, (byte) 0x5F, (byte) 0x01,
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java b/library/core/src/test/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java
index 701f532d6a..7b441b83a1 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java
@@ -19,16 +19,14 @@ import static com.google.common.truth.Truth.assertThat;
 import static java.nio.charset.Charset.forName;
 import static org.junit.Assert.fail;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Tests for {@link ParsableByteArray}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Tests for {@link ParsableByteArray}. */
+@RunWith(AndroidJUnit4.class)
 public final class ParsableByteArrayTest {
 
   private static final byte[] TEST_DATA =
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java b/library/core/src/test/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java
index 210c42cfa5..3940c3d2a1 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java
@@ -19,14 +19,12 @@ import static com.google.android.exoplayer2.testutil.TestUtil.createByteArray;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Tests for {@link ParsableNalUnitBitArray}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Tests for {@link ParsableNalUnitBitArray}. */
+@RunWith(AndroidJUnit4.class)
 public final class ParsableNalUnitBitArrayTest {
 
   private static final byte[] NO_ESCAPING_TEST_DATA = createByteArray(0, 3, 0, 1, 3, 0, 0);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStreamTest.java b/library/core/src/test/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStreamTest.java
index 4daa29afd0..77f59962d0 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStreamTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStreamTest.java
@@ -17,15 +17,13 @@ package com.google.android.exoplayer2.util;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.io.ByteArrayOutputStream;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Tests {@link ReusableBufferedOutputStream}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Tests {@link ReusableBufferedOutputStream}. */
+@RunWith(AndroidJUnit4.class)
 public final class ReusableBufferedOutputStreamTest {
 
   private static final byte[] TEST_DATA_1 = Util.getUtf8Bytes("test data 1");
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/TimedValueQueueTest.java b/library/core/src/test/java/com/google/android/exoplayer2/util/TimedValueQueueTest.java
index ca34bc3216..f21e15a0ed 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/util/TimedValueQueueTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/util/TimedValueQueueTest.java
@@ -17,13 +17,13 @@ package com.google.android.exoplayer2.util;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link TimedValueQueue}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class TimedValueQueueTest {
 
   private TimedValueQueue<String> queue;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/UriUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/util/UriUtilTest.java
index 82c62ecb3e..95d8a6b9a0 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/util/UriUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/util/UriUtilTest.java
@@ -20,14 +20,12 @@ import static com.google.android.exoplayer2.util.UriUtil.resolve;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit tests for {@link UriUtil}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit tests for {@link UriUtil}. */
+@RunWith(AndroidJUnit4.class)
 public final class UriUtilTest {
 
   /**
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/UtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/util/UtilTest.java
index baf8aa7c40..8f4aad42a5 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/util/UtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/util/UtilTest.java
@@ -24,6 +24,7 @@ import static com.google.android.exoplayer2.util.Util.parseXsDuration;
 import static com.google.android.exoplayer2.util.Util.unescapeFileName;
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import java.util.ArrayList;
@@ -33,12 +34,9 @@ import java.util.Random;
 import java.util.zip.Deflater;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit tests for {@link Util}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit tests for {@link Util}. */
+@RunWith(AndroidJUnit4.class)
 public class UtilTest {
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/video/spherical/FrameRotationQueueTest.java b/library/core/src/test/java/com/google/android/exoplayer2/video/spherical/FrameRotationQueueTest.java
index 071cd582d5..887c8da09f 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/video/spherical/FrameRotationQueueTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/video/spherical/FrameRotationQueueTest.java
@@ -18,13 +18,13 @@ package com.google.android.exoplayer2.video.spherical;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.opengl.Matrix;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Tests {@link FrameRotationQueue}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class FrameRotationQueueTest {
 
   private FrameRotationQueue frameRotationQueue;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/video/spherical/ProjectionDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/video/spherical/ProjectionDecoderTest.java
index af1a8421b4..1dadfe9909 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/video/spherical/ProjectionDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/video/spherical/ProjectionDecoderTest.java
@@ -17,16 +17,16 @@ package com.google.android.exoplayer2.video.spherical;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Util;
 import java.util.Arrays;
 import junit.framework.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Tests for {@link ProjectionDecoder}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class ProjectionDecoderTest {
 
   private static final byte[] PROJ_DATA =
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/video/spherical/ProjectionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/video/spherical/ProjectionTest.java
index 0e2d0999fb..8add0eac61 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/video/spherical/ProjectionTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/video/spherical/ProjectionTest.java
@@ -19,13 +19,13 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Tests for {@link Projection}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class ProjectionTest {
   private static final float EPSILON = .00001f;
 
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java
index 04820fd20c..87656422e1 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java
@@ -19,6 +19,7 @@ import static org.mockito.Mockito.mock;
 
 import android.net.Uri;
 import androidx.annotation.Nullable;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.CompositeSequenceableLoaderFactory;
@@ -44,11 +45,10 @@ import java.util.Arrays;
 import java.util.Collections;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 /** Unit tests for {@link DashMediaPeriod}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 @Config(shadows = {RobolectricUtil.CustomLooper.class, RobolectricUtil.CustomMessageQueue.class})
 public final class DashMediaPeriodTest {
 
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaSourceTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaSourceTest.java
index 1c440c70be..2aca8c3c05 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaSourceTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaSourceTest.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.source.dash;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.upstream.ParsingLoadable;
 import com.google.android.exoplayer2.util.Util;
@@ -25,10 +26,9 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link DashMediaSource}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class DashMediaSourceTest {
 
   @Test
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java
index 3f5d317519..5bef7d1bf2 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.source.dash;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.drm.DrmInitData;
@@ -30,10 +31,9 @@ import com.google.android.exoplayer2.util.MimeTypes;
 import java.util.Arrays;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit tests for {@link DashUtil}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class DashUtilTest {
 
   @Test
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/EventSampleStreamTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/EventSampleStreamTest.java
index 9621381eed..b946931f59 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/EventSampleStreamTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/EventSampleStreamTest.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.source.dash;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.FormatHolder;
@@ -29,12 +30,9 @@ import com.google.android.exoplayer2.util.MimeTypes;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
-/**
- * Unit test for {@link EventSampleStream}.
- */
-@RunWith(RobolectricTestRunner.class)
+/** Unit test for {@link EventSampleStream}. */
+@RunWith(AndroidJUnit4.class)
 public final class EventSampleStreamTest {
 
   private static final String SCHEME_ID = "urn:test";
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java
index 67d8dbecac..d1e795e643 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java
@@ -18,6 +18,8 @@ package com.google.android.exoplayer2.source.dash.manifest;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.metadata.emsg.EventMessage;
@@ -29,11 +31,9 @@ import java.util.Collections;
 import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Unit tests for {@link DashManifestParser}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class DashManifestParserTest {
 
   private static final String SAMPLE_MPD_1 = "sample_mpd_1";
@@ -47,10 +47,11 @@ public class DashManifestParserTest {
     DashManifestParser parser = new DashManifestParser();
     parser.parse(
         Uri.parse("https://example.com/test.mpd"),
-        TestUtil.getInputStream(RuntimeEnvironment.application, SAMPLE_MPD_1));
+        TestUtil.getInputStream(ApplicationProvider.getApplicationContext(), SAMPLE_MPD_1));
     parser.parse(
         Uri.parse("https://example.com/test.mpd"),
-        TestUtil.getInputStream(RuntimeEnvironment.application, SAMPLE_MPD_2_UNKNOWN_MIME_TYPE));
+        TestUtil.getInputStream(
+            ApplicationProvider.getApplicationContext(), SAMPLE_MPD_2_UNKNOWN_MIME_TYPE));
   }
 
   @Test
@@ -59,7 +60,8 @@ public class DashManifestParserTest {
     DashManifest mpd =
         parser.parse(
             Uri.parse("https://example.com/test.mpd"),
-            TestUtil.getInputStream(RuntimeEnvironment.application, SAMPLE_MPD_3_SEGMENT_TEMPLATE));
+            TestUtil.getInputStream(
+                ApplicationProvider.getApplicationContext(), SAMPLE_MPD_3_SEGMENT_TEMPLATE));
 
     assertThat(mpd.getPeriodCount()).isEqualTo(1);
 
@@ -90,7 +92,8 @@ public class DashManifestParserTest {
     DashManifest mpd =
         parser.parse(
             Uri.parse("https://example.com/test.mpd"),
-            TestUtil.getInputStream(RuntimeEnvironment.application, SAMPLE_MPD_4_EVENT_STREAM));
+            TestUtil.getInputStream(
+                ApplicationProvider.getApplicationContext(), SAMPLE_MPD_4_EVENT_STREAM));
 
     Period period = mpd.getPeriod(0);
     assertThat(period.eventStreams).hasSize(3);
@@ -159,7 +162,7 @@ public class DashManifestParserTest {
     DashManifest mpd =
         parser.parse(
             Uri.parse("Https://example.com/test.mpd"),
-            TestUtil.getInputStream(RuntimeEnvironment.application, SAMPLE_MPD_1));
+            TestUtil.getInputStream(ApplicationProvider.getApplicationContext(), SAMPLE_MPD_1));
     ProgramInformation expectedProgramInformation =
         new ProgramInformation(
             "MediaTitle", "MediaSource", "MediaCopyright", "www.example.com", "enUs");
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java
index d0820aa9b7..a336602965 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.source.dash.manifest;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.source.dash.manifest.SegmentBase.SingleSegmentBase;
@@ -27,10 +28,9 @@ import java.util.List;
 import java.util.Random;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit tests for {@link DashManifest}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class DashManifestTest {
 
   private static final UtcTimingElement DUMMY_UTC_TIMING = new UtcTimingElement("", "");
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/RangedUriTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/RangedUriTest.java
index 16c9a4706e..be1866206d 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/RangedUriTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/RangedUriTest.java
@@ -17,13 +17,13 @@ package com.google.android.exoplayer2.source.dash.manifest;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link RangedUri}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class RangedUriTest {
 
   private static final String BASE_URI = "http://www.test.com/";
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplateTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplateTest.java
index 4192280c81..c65c2d0b0c 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplateTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplateTest.java
@@ -18,12 +18,12 @@ package com.google.android.exoplayer2.source.dash.manifest;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link UrlTemplate}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class UrlTemplateTest {
 
   @Test
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
index 76699217e3..fb7a19ba34 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
@@ -26,6 +26,8 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.offline.DefaultDownloaderFactory;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadException;
@@ -53,11 +55,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Unit tests for {@link DashDownloader}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class DashDownloaderTest {
 
   private SimpleCache cache;
@@ -66,7 +66,8 @@ public class DashDownloaderTest {
   @Before
   public void setUp() throws Exception {
     MockitoAnnotations.initMocks(this);
-    tempFolder = Util.createTempDirectory(RuntimeEnvironment.application, "ExoPlayerTest");
+    tempFolder =
+        Util.createTempDirectory(ApplicationProvider.getApplicationContext(), "ExoPlayerTest");
     cache = new SimpleCache(tempFolder, new NoOpCacheEvictor());
   }
 
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadHelperTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadHelperTest.java
index eb4af58675..0b7c06f813 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadHelperTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadHelperTest.java
@@ -16,15 +16,15 @@
 package com.google.android.exoplayer2.source.dash.offline;
 
 import android.net.Uri;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.Renderer;
 import com.google.android.exoplayer2.offline.DownloadHelper;
 import com.google.android.exoplayer2.testutil.FakeDataSource;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test to verify creation of a DASH {@link DownloadHelper}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class DownloadHelperTest {
 
   @Test
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
index e1aec6d4ed..d1d9c0f488 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
@@ -25,6 +25,8 @@ import android.content.Context;
 import android.net.Uri;
 import android.os.ConditionVariable;
 import androidx.annotation.Nullable;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.offline.DefaultDownloaderFactory;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadManager;
@@ -50,13 +52,11 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLog;
 
 /** Tests {@link DownloadManager}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 @Config(shadows = {RobolectricUtil.CustomLooper.class, RobolectricUtil.CustomMessageQueue.class})
 public class DownloadManagerDashTest {
 
@@ -76,7 +76,7 @@ public class DownloadManagerDashTest {
   public void setUp() throws Exception {
     ShadowLog.stream = System.out;
     dummyMainThread = new DummyMainThread();
-    Context context = RuntimeEnvironment.application;
+    Context context = ApplicationProvider.getApplicationContext();
     tempFolder = Util.createTempDirectory(context, "ExoPlayerTest");
     File cacheFolder = new File(tempFolder, "cache");
     cacheFolder.mkdir();
@@ -244,7 +244,7 @@ public class DownloadManagerDashTest {
           Factory fakeDataSourceFactory = new FakeDataSource.Factory().setFakeDataSet(fakeDataSet);
           downloadManager =
               new DownloadManager(
-                  RuntimeEnvironment.application,
+                  ApplicationProvider.getApplicationContext(),
                   actionFile,
                   new DefaultDownloaderFactory(
                       new DownloaderConstructorHelper(cache, fakeDataSourceFactory)),
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
index 168fd9bf6e..7533f3a8cc 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
@@ -24,6 +24,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import androidx.annotation.Nullable;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.offline.DefaultDownloaderFactory;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadManager;
@@ -52,12 +54,10 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 /** Unit tests for {@link DownloadService}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 @Config(shadows = {RobolectricUtil.CustomLooper.class, RobolectricUtil.CustomMessageQueue.class})
 public class DownloadServiceDashTest {
 
@@ -75,7 +75,7 @@ public class DownloadServiceDashTest {
   @Before
   public void setUp() throws IOException {
     dummyMainThread = new DummyMainThread();
-    context = RuntimeEnvironment.application;
+    context = ApplicationProvider.getApplicationContext();
     tempFolder = Util.createTempDirectory(context, "ExoPlayerTest");
     cache = new SimpleCache(tempFolder, new NoOpCacheEvictor());
 
@@ -118,7 +118,7 @@ public class DownloadServiceDashTest {
           actionFile.delete();
           final DownloadManager dashDownloadManager =
               new DownloadManager(
-                  RuntimeEnvironment.application,
+                  ApplicationProvider.getApplicationContext(),
                   actionFile,
                   new DefaultDownloaderFactory(
                       new DownloaderConstructorHelper(cache, fakeDataSourceFactory)),
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/Aes128DataSourceTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/Aes128DataSourceTest.java
index defc838c6a..3eef5c36d2 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/Aes128DataSourceTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/Aes128DataSourceTest.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.source.hls;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DataSpec;
@@ -28,10 +29,9 @@ import javax.crypto.Cipher;
 import javax.crypto.NoSuchPaddingException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Test for {@link Aes128DataSource}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class Aes128DataSourceTest {
 
   @Test
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
index 2793f31af4..41d78ae099 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
@@ -19,6 +19,7 @@ import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.CompositeSequenceableLoaderFactory;
 import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
@@ -40,11 +41,10 @@ import java.util.Collections;
 import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 /** Unit test for {@link HlsMediaPeriod}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 @Config(shadows = {RobolectricUtil.CustomLooper.class, RobolectricUtil.CustomMessageQueue.class})
 public final class HlsMediaPeriodTest {
 
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/WebvttExtractorTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/WebvttExtractorTest.java
index e3e2feed8b..4f7e26fce0 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/WebvttExtractorTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/WebvttExtractorTest.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.source.hls;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput;
 import com.google.android.exoplayer2.util.TimestampAdjuster;
@@ -24,10 +25,9 @@ import java.io.EOFException;
 import java.io.IOException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Tests for {@link WebvttExtractor}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class WebvttExtractorTest {
 
   @Test
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/DownloadHelperTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/DownloadHelperTest.java
index dca8f9c3e8..c7a8034ee7 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/DownloadHelperTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/DownloadHelperTest.java
@@ -16,15 +16,15 @@
 package com.google.android.exoplayer2.source.hls.offline;
 
 import android.net.Uri;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.Renderer;
 import com.google.android.exoplayer2.offline.DownloadHelper;
 import com.google.android.exoplayer2.testutil.FakeDataSource;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test to verify creation of a HLS {@link DownloadHelper}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class DownloadHelperTest {
 
   @Test
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
index 90ccbba2de..728f2d1dcd 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
@@ -35,6 +35,8 @@ import static com.google.android.exoplayer2.testutil.CacheAsserts.assertCachedDa
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.offline.DefaultDownloaderFactory;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.Downloader;
@@ -58,11 +60,9 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Unit tests for {@link HlsDownloader}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class HlsDownloaderTest {
 
   private SimpleCache cache;
@@ -71,7 +71,8 @@ public class HlsDownloaderTest {
 
   @Before
   public void setUp() throws Exception {
-    tempFolder = Util.createTempDirectory(RuntimeEnvironment.application, "ExoPlayerTest");
+    tempFolder =
+        Util.createTempDirectory(ApplicationProvider.getApplicationContext(), "ExoPlayerTest");
     cache = new SimpleCache(tempFolder, new NoOpCacheEvictor());
 
     fakeDataSet =
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
index 80a9bd3eab..59924bf1a5 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
@@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import android.net.Uri;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ParserException;
@@ -29,10 +30,9 @@ import java.nio.charset.Charset;
 import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Test for {@link HlsMasterPlaylistParserTest}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class HlsMasterPlaylistParserTest {
 
   private static final String PLAYLIST_URI = "https://example.com/test.m3u8";
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java
index 9fc761badb..83d9731dca 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java
@@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import android.net.Uri;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist.Segment;
@@ -31,10 +32,9 @@ import java.util.HashMap;
 import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Test for {@link HlsMediaPlaylistParserTest}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class HlsMediaPlaylistParserTest {
 
   @Test
diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriodTest.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriodTest.java
index bceaf8cdf2..948be70712 100644
--- a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriodTest.java
+++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriodTest.java
@@ -19,6 +19,7 @@ import static com.google.android.exoplayer2.source.smoothstreaming.SsTestUtils.c
 import static com.google.android.exoplayer2.source.smoothstreaming.SsTestUtils.createStreamElement;
 import static org.mockito.Mockito.mock;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.CompositeSequenceableLoaderFactory;
@@ -35,11 +36,10 @@ import com.google.android.exoplayer2.upstream.TransferListener;
 import com.google.android.exoplayer2.util.MimeTypes;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 /** Unit tests for {@link SsMediaPeriod}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 @Config(shadows = {RobolectricUtil.CustomLooper.class, RobolectricUtil.CustomMessageQueue.class})
 public class SsMediaPeriodTest {
 
diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParserTest.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParserTest.java
index 2ce9fec970..94be71e84e 100644
--- a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParserTest.java
+++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParserTest.java
@@ -16,15 +16,15 @@
 package com.google.android.exoplayer2.source.smoothstreaming.manifest;
 
 import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import java.io.IOException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Unit tests for {@link SsManifestParser}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class SsManifestParserTest {
 
   private static final String SAMPLE_ISMC_1 = "sample_ismc_1";
@@ -36,9 +36,9 @@ public final class SsManifestParserTest {
     SsManifestParser parser = new SsManifestParser();
     parser.parse(
         Uri.parse("https://example.com/test.ismc"),
-        TestUtil.getInputStream(RuntimeEnvironment.application, SAMPLE_ISMC_1));
+        TestUtil.getInputStream(ApplicationProvider.getApplicationContext(), SAMPLE_ISMC_1));
     parser.parse(
         Uri.parse("https://example.com/test.ismc"),
-        TestUtil.getInputStream(RuntimeEnvironment.application, SAMPLE_ISMC_2));
+        TestUtil.getInputStream(ApplicationProvider.getApplicationContext(), SAMPLE_ISMC_2));
   }
 }
diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestTest.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestTest.java
index ea32c34348..26afe5d666 100644
--- a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestTest.java
+++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestTest.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.source.smoothstreaming.manifest;
 import static com.google.android.exoplayer2.source.smoothstreaming.SsTestUtils.createSsManifest;
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.offline.StreamKey;
@@ -30,10 +31,9 @@ import java.util.List;
 import java.util.Random;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit tests for {@link SsManifest}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class SsManifestTest {
 
   @Test
diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/DownloadHelperTest.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/DownloadHelperTest.java
index 071fc46313..4da08f7631 100644
--- a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/DownloadHelperTest.java
+++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/DownloadHelperTest.java
@@ -16,15 +16,15 @@
 package com.google.android.exoplayer2.source.smoothstreaming.offline;
 
 import android.net.Uri;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.Renderer;
 import com.google.android.exoplayer2.offline.DownloadHelper;
 import com.google.android.exoplayer2.testutil.FakeDataSource;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test to verify creation of a SmoothStreaming {@link DownloadHelper}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class DownloadHelperTest {
 
   @Test
diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java
index e47ffec64f..e0304c1864 100644
--- a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java
+++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.source.smoothstreaming.offline;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.offline.DefaultDownloaderFactory;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.Downloader;
@@ -30,10 +31,9 @@ import java.util.Collections;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit tests for {@link SsDownloader}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class SsDownloaderTest {
 
   @Test
diff --git a/library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/CanvasRendererTest.java b/library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/CanvasRendererTest.java
index e3ec5e4ece..098f4157ef 100644
--- a/library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/CanvasRendererTest.java
+++ b/library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/CanvasRendererTest.java
@@ -19,12 +19,12 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.graphics.PointF;
 import androidx.annotation.Nullable;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Tests for {@link CanvasRenderer}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class CanvasRendererTest {
 
   private static final float JUST_BELOW_45_DEGREES = (float) (Math.PI / 4 - 1.0E-08);
diff --git a/library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/TouchTrackerTest.java b/library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/TouchTrackerTest.java
index 337fb4c593..6212a74f30 100644
--- a/library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/TouchTrackerTest.java
+++ b/library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/TouchTrackerTest.java
@@ -19,14 +19,14 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
 import android.view.MotionEvent;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 /** Tests for {@link TouchTracker}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class TouchTrackerTest {
   private static final float EPSILON = 0.00001f;
   private static final int SWIPE_PX = 100;
@@ -45,7 +45,7 @@ public class TouchTrackerTest {
 
   @Before
   public void setUp() {
-    Context context = RuntimeEnvironment.application;
+    Context context = ApplicationProvider.getApplicationContext();
     tracker =
         new TouchTracker(
             context,
diff --git a/playbacktests/build.gradle b/playbacktests/build.gradle
index 11b7c00906..0e1c8a1268 100644
--- a/playbacktests/build.gradle
+++ b/playbacktests/build.gradle
@@ -32,8 +32,8 @@ android {
 }
 
 dependencies {
-    androidTestImplementation 'androidx.test:rules:' + testRunnerVersion
-    androidTestImplementation 'androidx.test:runner:' + testRunnerVersion
+    androidTestImplementation 'androidx.test:rules:' + androidXTestVersion
+    androidTestImplementation 'androidx.test:runner:' + androidXTestVersion
     androidTestImplementation 'androidx.annotation:annotation:1.0.1'
     androidTestImplementation project(modulePrefix + 'library-core')
     androidTestImplementation project(modulePrefix + 'library-dash')
diff --git a/playbacktests/src/androidTest/AndroidManifest.xml b/playbacktests/src/androidTest/AndroidManifest.xml
index 4165a42568..be71884846 100644
--- a/playbacktests/src/androidTest/AndroidManifest.xml
+++ b/playbacktests/src/androidTest/AndroidManifest.xml
@@ -21,6 +21,7 @@
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.WAKE_LOCK"/>
+  <uses-sdk/>
 
   <application android:debuggable="true"
       android:allowBackup="false"
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/CommonEncryptionDrmTest.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/CommonEncryptionDrmTest.java
index 1832e16a98..a01ab3a250 100644
--- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/CommonEncryptionDrmTest.java
+++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/CommonEncryptionDrmTest.java
@@ -15,10 +15,8 @@
  */
 package com.google.android.exoplayer2.playbacktests.gts;
 
-import static androidx.test.InstrumentationRegistry.getInstrumentation;
-
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.testutil.ActionSchedule;
 import com.google.android.exoplayer2.testutil.HostActivity;
@@ -52,7 +50,7 @@ public final class CommonEncryptionDrmTest {
   @Before
   public void setUp() {
     testRunner =
-        new DashTestRunner(TAG, testRule.getActivity(), getInstrumentation())
+        new DashTestRunner(TAG, testRule.getActivity())
             .setWidevineInfo(MimeTypes.VIDEO_H264, false)
             .setActionSchedule(ACTION_SCHEDULE_WITH_SEEKS)
             .setAudioVideoFormats(ID_AUDIO, IDS_VIDEO)
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashDownloadTest.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashDownloadTest.java
index 7d000de4b0..67c840e681 100644
--- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashDownloadTest.java
+++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashDownloadTest.java
@@ -15,12 +15,11 @@
  */
 package com.google.android.exoplayer2.playbacktests.gts;
 
-import static androidx.test.InstrumentationRegistry.getInstrumentation;
 import static com.google.common.truth.Truth.assertWithMessage;
 
 import android.net.Uri;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.source.dash.DashUtil;
@@ -64,7 +63,7 @@ public final class DashDownloadTest {
   @Before
   public void setUp() throws Exception {
     testRunner =
-        new DashTestRunner(TAG, testRule.getActivity(), getInstrumentation())
+        new DashTestRunner(TAG, testRule.getActivity())
             .setManifestUrl(DashTestData.H264_MANIFEST)
             .setFullPlaybackNoSeeking(true)
             .setCanIncludeAdditionalVideoFormats(false)
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java
index 56806183cc..e2988b88b6 100644
--- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java
+++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java
@@ -15,11 +15,10 @@
  */
 package com.google.android.exoplayer2.playbacktests.gts;
 
-import static androidx.test.InstrumentationRegistry.getInstrumentation;
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.mediacodec.MediaCodecInfo;
@@ -91,7 +90,7 @@ public final class DashStreamingTest {
 
   @Before
   public void setUp() {
-    testRunner = new DashTestRunner(TAG, testRule.getActivity(), getInstrumentation());
+    testRunner = new DashTestRunner(TAG, testRule.getActivity());
   }
 
   @After
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
index 2446094136..a3d4a112b7 100644
--- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
+++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.playbacktests.gts;
 import static com.google.android.exoplayer2.C.WIDEVINE_UUID;
 
 import android.annotation.TargetApi;
-import android.app.Instrumentation;
 import android.media.MediaDrm;
 import android.media.UnsupportedSchemeException;
 import android.net.Uri;
@@ -72,9 +71,6 @@ public final class DashTestRunner {
 
   private static final long TEST_TIMEOUT_MS = 5 * 60 * 1000;
 
-  private static final String REPORT_NAME = "GtsExoPlayerTestCases";
-  private static final String REPORT_OBJECT_NAME = "playbacktest";
-
   // Whether adaptive tests should enable video formats beyond those mandated by the Android CDD
   // if the device advertises support for them.
   private static final boolean ALLOW_ADDITIONAL_VIDEO_FORMATS = Util.SDK_INT >= 24;
@@ -92,7 +88,6 @@ public final class DashTestRunner {
 
   private final String tag;
   private final HostActivity activity;
-  private final Instrumentation instrumentation;
 
   private String streamName;
   private boolean fullPlaybackNoSeeking;
@@ -125,10 +120,9 @@ public final class DashTestRunner {
     return false;
   }
 
-  public DashTestRunner(String tag, HostActivity activity, Instrumentation instrumentation) {
+  public DashTestRunner(String tag, HostActivity activity) {
     this.tag = tag;
     this.activity = activity;
-    this.instrumentation = instrumentation;
   }
 
   public DashTestRunner setStreamName(String streamName) {
@@ -182,20 +176,18 @@ public final class DashTestRunner {
   }
 
   public void run() {
-    DashHostedTest test = createDashHostedTest(canIncludeAdditionalVideoFormats, false,
-        instrumentation);
+    DashHostedTest test = createDashHostedTest(canIncludeAdditionalVideoFormats, false);
     activity.runTest(test, TEST_TIMEOUT_MS);
     // Retry test exactly once if adaptive test fails due to excessive dropped buffers when
     // playing non-CDD required formats (b/28220076).
     if (test.needsCddLimitedRetry) {
-      activity.runTest(createDashHostedTest(false, true, instrumentation), TEST_TIMEOUT_MS);
+      activity.runTest(createDashHostedTest(false, true), TEST_TIMEOUT_MS);
     }
   }
 
-  private DashHostedTest createDashHostedTest(boolean canIncludeAdditionalVideoFormats,
-      boolean isCddLimitedRetry, Instrumentation instrumentation) {
-    MetricsLogger metricsLogger = MetricsLogger.Factory.createDefault(instrumentation, tag,
-        REPORT_NAME, REPORT_OBJECT_NAME);
+  private DashHostedTest createDashHostedTest(
+      boolean canIncludeAdditionalVideoFormats, boolean isCddLimitedRetry) {
+    MetricsLogger metricsLogger = MetricsLogger.Factory.createDefault(tag);
     return new DashHostedTest(tag, streamName, manifestUrl, metricsLogger, fullPlaybackNoSeeking,
         audioFormat, canIncludeAdditionalVideoFormats, isCddLimitedRetry, actionSchedule,
         offlineLicenseKeySetId, widevineLicenseUrl, useL1Widevine, dataSourceFactory,
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashWidevineOfflineTest.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashWidevineOfflineTest.java
index 7beaafd143..efc6c011cc 100644
--- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashWidevineOfflineTest.java
+++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashWidevineOfflineTest.java
@@ -15,7 +15,6 @@
  */
 package com.google.android.exoplayer2.playbacktests.gts;
 
-import static androidx.test.InstrumentationRegistry.getInstrumentation;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 import static org.junit.Assert.fail;
@@ -23,8 +22,8 @@ import static org.junit.Assert.fail;
 import android.media.MediaDrm.MediaDrmStateException;
 import android.net.Uri;
 import android.util.Pair;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.drm.DrmSession.DrmSessionException;
@@ -62,7 +61,7 @@ public final class DashWidevineOfflineTest {
   @Before
   public void setUp() throws Exception {
     testRunner =
-        new DashTestRunner(TAG, testRule.getActivity(), getInstrumentation())
+        new DashTestRunner(TAG, testRule.getActivity())
             .setStreamName("test_widevine_h264_fixed_offline")
             .setManifestUrl(DashTestData.WIDEVINE_H264_MANIFEST)
             .setWidevineInfo(MimeTypes.VIDEO_H264, true)
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/EnumerateDecodersTest.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/EnumerateDecodersTest.java
index b9c513fe72..d40a705414 100644
--- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/EnumerateDecodersTest.java
+++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/EnumerateDecodersTest.java
@@ -15,13 +15,12 @@
  */
 package com.google.android.exoplayer2.playbacktests.gts;
 
-import static androidx.test.InstrumentationRegistry.getInstrumentation;
 
 import android.media.MediaCodecInfo.AudioCapabilities;
 import android.media.MediaCodecInfo.CodecCapabilities;
 import android.media.MediaCodecInfo.CodecProfileLevel;
 import android.media.MediaCodecInfo.VideoCapabilities;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.mediacodec.MediaCodecInfo;
 import com.google.android.exoplayer2.mediacodec.MediaCodecUtil;
 import com.google.android.exoplayer2.mediacodec.MediaCodecUtil.DecoderQueryException;
@@ -41,16 +40,11 @@ public class EnumerateDecodersTest {
 
   private static final String TAG = "EnumerateDecodersTest";
 
-  private static final String REPORT_NAME = "GtsExoPlayerTestCases";
-  private static final String REPORT_OBJECT_NAME = "enumeratedecoderstest";
-
   private MetricsLogger metricsLogger;
 
   @Before
   public void setUp() {
-    metricsLogger =
-        MetricsLogger.Factory.createDefault(
-            getInstrumentation(), TAG, REPORT_NAME, REPORT_OBJECT_NAME);
+    metricsLogger = MetricsLogger.Factory.createDefault(TAG);
   }
 
   @Test
diff --git a/testutils/build.gradle b/testutils/build.gradle
index 322d7f75b8..ab78e6673f 100644
--- a/testutils/build.gradle
+++ b/testutils/build.gradle
@@ -39,7 +39,8 @@ android {
 
 dependencies {
     api 'org.mockito:mockito-core:' + mockitoVersion
-    api 'com.google.truth:truth:' + truthVersion
+    api 'androidx.test.ext:junit:' + androidXTestVersion
+    api 'androidx.test.ext:truth:' + androidXTestVersion
     implementation 'androidx.annotation:annotation:1.0.1'
     implementation project(modulePrefix + 'library-core')
     implementation 'com.google.auto.value:auto-value-annotations:' + autoValueVersion
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExtractorAsserts.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExtractorAsserts.java
index 1e4811aadf..3937dabcaf 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExtractorAsserts.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExtractorAsserts.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.testutil;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
+import androidx.test.core.app.ApplicationProvider;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
@@ -27,7 +28,6 @@ import com.google.android.exoplayer2.extractor.SeekMap;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput.SimulatedIOException;
 import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
-import java.lang.reflect.Field;
 import java.util.Arrays;
 
 /**
@@ -35,22 +35,6 @@ import java.util.Arrays;
  */
 public final class ExtractorAsserts {
 
-  private static Context robolectricContext;
-
-  static {
-    try {
-      Class<?> runtimeEnvironmentClass = Class.forName("org.robolectric.RuntimeEnvironment");
-      Field applicationField = runtimeEnvironmentClass.getDeclaredField("application");
-      robolectricContext = (Context) applicationField.get(null);
-    } catch (ClassNotFoundException e) {
-      // Keep Robolectric context at null if not found.
-    } catch (NoSuchFieldException e) {
-      // Keep Robolectric context at null if not found.
-    } catch (IllegalAccessException e) {
-      // Keep Robolectric context at null if not found.
-    }
-  }
-
   /**
    * A factory for {@link Extractor} instances.
    */
@@ -85,8 +69,8 @@ public final class ExtractorAsserts {
     extractor.seek(0, 0);
     extractor.release();
     // Assert output.
-    byte[] fileData = TestUtil.getByteArray(robolectricContext, file);
-    assertOutput(factory, file, fileData, robolectricContext);
+    byte[] fileData = TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), file);
+    assertOutput(factory, file, fileData, ApplicationProvider.getApplicationContext());
   }
 
   /**
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/MetricsLogger.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/MetricsLogger.java
index 64d1944927..9edccadcab 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/MetricsLogger.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/MetricsLogger.java
@@ -15,8 +15,6 @@
  */
 package com.google.android.exoplayer2.testutil;
 
-import android.app.Instrumentation;
-
 /**
  * Metric Logging interface for ExoPlayer playback tests.
  */
@@ -76,13 +74,9 @@ public interface MetricsLogger {
     /**
      * Obtains a new instance of {@link MetricsLogger}.
      *
-     * @param instrumentation The test instrumentation.
      * @param tag The tag to be used for logcat logs.
-     * @param reportName The name of the report log.
-     * @param streamName The name of the stream of metrics.
      */
-    public static MetricsLogger createDefault(Instrumentation instrumentation, String tag,
-        String reportName, String streamName) {
+    public static MetricsLogger createDefault(String tag) {
       return new LogcatMetricsLogger(tag);
     }
   }
diff --git a/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSetTest.java b/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSetTest.java
index 7fd84f6287..714c77f8d3 100644
--- a/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSetTest.java
+++ b/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSetTest.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.testutil;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.TrackGroup;
@@ -27,10 +28,9 @@ import java.util.List;
 import java.util.Random;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link FakeAdaptiveDataSet}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class FakeAdaptiveDataSetTest {
 
   private static final Format[] TEST_FORMATS = {
diff --git a/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeClockTest.java b/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeClockTest.java
index 90e70e4538..65b0efa72a 100644
--- a/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeClockTest.java
+++ b/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeClockTest.java
@@ -19,17 +19,17 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.os.ConditionVariable;
 import android.os.HandlerThread;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.util.Clock;
 import com.google.android.exoplayer2.util.HandlerWrapper;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 /** Unit test for {@link FakeClock}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 @Config(shadows = {RobolectricUtil.CustomLooper.class, RobolectricUtil.CustomMessageQueue.class})
 public final class FakeClockTest {
 
diff --git a/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSetTest.java b/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSetTest.java
index 99469295bb..0f7aabffc1 100644
--- a/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSetTest.java
+++ b/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSetTest.java
@@ -18,15 +18,15 @@ package com.google.android.exoplayer2.testutil;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.FakeDataSet.FakeData.Segment;
 import java.io.IOException;
 import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link FakeDataSet} */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class FakeDataSetTest {
 
   @Test
diff --git a/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSourceTest.java b/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSourceTest.java
index c88aba4e08..9af0c6e1ca 100644
--- a/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSourceTest.java
+++ b/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSourceTest.java
@@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import android.net.Uri;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.upstream.DataSpec;
 import java.io.IOException;
@@ -26,10 +27,9 @@ import java.util.Arrays;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Unit test for {@link FakeDataSource}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public final class FakeDataSourceTest {
 
   private static final String URI_STRING = "test://test.test";
diff --git a/testutils_robolectric/build.gradle b/testutils_robolectric/build.gradle
index 61c81bc326..44459ea272 100644
--- a/testutils_robolectric/build.gradle
+++ b/testutils_robolectric/build.gradle
@@ -37,6 +37,7 @@ android {
 }
 
 dependencies {
+    api 'androidx.test:core:' + androidXTestVersion
     api 'org.robolectric:robolectric:' + robolectricVersion
     api project(modulePrefix + 'testutils')
     implementation project(modulePrefix + 'library-core')
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/DefaultRenderersFactoryAsserts.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/DefaultRenderersFactoryAsserts.java
index ea6633c695..3720b8a0b3 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/DefaultRenderersFactoryAsserts.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/DefaultRenderersFactoryAsserts.java
@@ -22,6 +22,7 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.os.Handler;
 import android.os.Looper;
+import androidx.test.core.app.ApplicationProvider;
 import com.google.android.exoplayer2.DefaultRenderersFactory;
 import com.google.android.exoplayer2.Renderer;
 import com.google.android.exoplayer2.audio.AudioRendererEventListener;
@@ -29,7 +30,6 @@ import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.text.Cue;
 import com.google.android.exoplayer2.video.VideoRendererEventListener;
 import java.util.List;
-import org.robolectric.RuntimeEnvironment;
 
 /** Assertions for {@link DefaultRenderersFactory}. */
 public final class DefaultRenderersFactoryAsserts {
@@ -86,7 +86,7 @@ public final class DefaultRenderersFactoryAsserts {
   private static Renderer[] createRenderers(
       @DefaultRenderersFactory.ExtensionRendererMode int extensionRendererMode) {
     DefaultRenderersFactory factory =
-        new DefaultRenderersFactory(RuntimeEnvironment.application)
+        new DefaultRenderersFactory(ApplicationProvider.getApplicationContext())
             .setExtensionRendererMode(extensionRendererMode);
     return factory.createRenderers(
         new Handler(Looper.getMainLooper()),

From d93ee00d195e3f28cdc2edc92e877bc0beeecfc1 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 13 Mar 2019 15:16:03 +0000
Subject: [PATCH 634/832] Add convenience method to DownloadHelper to add
 selection for single renderer.

This simplifies the DownloadHelper code in the demo app and is generally
useful for more specific updates with SelectionOverrides.

PiperOrigin-RevId: 238228276
---
 .../exoplayer2/demo/DownloadTracker.java      | 41 ++++---------------
 .../exoplayer2/offline/DownloadHelper.java    | 33 +++++++++++++++
 2 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index ed12353687..13e75ca9c2 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -36,9 +36,6 @@ import com.google.android.exoplayer2.offline.DownloadState;
 import com.google.android.exoplayer2.offline.DownloadStateCursor;
 import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.scheduler.Requirements;
-import com.google.android.exoplayer2.source.TrackGroupArray;
-import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
-import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.SelectionOverride;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.util.Log;
@@ -290,37 +287,17 @@ public class DownloadTracker implements DownloadManager.Listener {
 
     @Override
     public void onClick(DialogInterface dialog, int which) {
-      DefaultTrackSelector.ParametersBuilder builder =
-          DownloadHelper.DEFAULT_TRACK_SELECTOR_PARAMETERS.buildUpon();
-      for (int i = 0; i < mappedTrackInfo.getRendererCount(); i++) {
-        builder.setRendererDisabled(/* rendererIndex= */ i, /* disabled= */ true);
-      }
-      for (int i = 0; i < downloadHelper.getPeriodCount(); i++) {
-        downloadHelper.clearTrackSelections(/* periodIndex = */ i);
-      }
-      for (int i = 0; i < mappedTrackInfo.getRendererCount(); i++) {
-        if (trackSelectionDialog.getIsDisabled(/* rendererIndex= */ i)) {
-          continue;
-        }
-        builder.setRendererDisabled(/* rendererIndex= */ i, /* disabled= */ false);
-        List<SelectionOverride> overrides =
-            trackSelectionDialog.getOverrides(/* rendererIndex= */ i);
-        if (overrides.isEmpty()) {
-          for (int j = 0; j < downloadHelper.getPeriodCount(); j++) {
-            downloadHelper.addTrackSelection(/* periodIndex = */ j, builder.build());
+      for (int periodIndex = 0; periodIndex < downloadHelper.getPeriodCount(); periodIndex++) {
+        downloadHelper.clearTrackSelections(periodIndex);
+        for (int i = 0; i < mappedTrackInfo.getRendererCount(); i++) {
+          if (!trackSelectionDialog.getIsDisabled(/* rendererIndex= */ i)) {
+            downloadHelper.addTrackSelectionForSingleRenderer(
+                periodIndex,
+                /* rendererIndex= */ i,
+                DownloadHelper.DEFAULT_TRACK_SELECTOR_PARAMETERS,
+                trackSelectionDialog.getOverrides(/* rendererIndex= */ i));
           }
-        } else {
-          TrackGroupArray trackGroupArray = mappedTrackInfo.getTrackGroups(/* rendererIndex= */ i);
-          for (int overrideIndex = 0; overrideIndex < overrides.size(); overrideIndex++) {
-            builder.setSelectionOverride(
-                /* rendererIndex= */ i, trackGroupArray, overrides.get(overrideIndex));
-            for (int j = 0; j < downloadHelper.getPeriodCount(); j++) {
-              downloadHelper.addTrackSelection(/* periodIndex = */ j, builder.build());
-            }
-          }
-          builder.clearSelectionOverrides();
         }
-        builder.setRendererDisabled(/* rendererIndex= */ i, /* disabled= */ true);
       }
       DownloadAction downloadAction = downloadHelper.getDownloadAction(Util.getUtf8Bytes(name));
       startDownload(downloadAction);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index 4cd6a891b1..2c81ae1840 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -38,6 +38,7 @@ import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.trackselection.BaseTrackSelection;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.Parameters;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.SelectionOverride;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
@@ -546,6 +547,38 @@ public final class DownloadHelper {
     }
   }
 
+  /**
+   * Convenience method to add a selection of tracks to be downloaded for a single renderer. Must
+   * not be called until after preparation completes.
+   *
+   * @param periodIndex The period index the track selection is added for.
+   * @param rendererIndex The renderer index the track selection is added for.
+   * @param trackSelectorParameters The {@link DefaultTrackSelector.Parameters} to obtain the new
+   *     selection of tracks.
+   * @param overrides A list of {@link SelectionOverride SelectionOverrides} to apply to the {@code
+   *     trackSelectorParameters}. If empty, {@code trackSelectorParameters} are used as they are.
+   */
+  public void addTrackSelectionForSingleRenderer(
+      int periodIndex,
+      int rendererIndex,
+      DefaultTrackSelector.Parameters trackSelectorParameters,
+      List<SelectionOverride> overrides) {
+    assertPreparedWithMedia();
+    DefaultTrackSelector.ParametersBuilder builder = trackSelectorParameters.buildUpon();
+    for (int i = 0; i < mappedTrackInfos[periodIndex].getRendererCount(); i++) {
+      builder.setRendererDisabled(/* rendererIndex= */ i, /* disabled= */ i != rendererIndex);
+    }
+    if (overrides.isEmpty()) {
+      addTrackSelection(periodIndex, builder.build());
+    } else {
+      TrackGroupArray trackGroupArray = mappedTrackInfos[periodIndex].getTrackGroups(rendererIndex);
+      for (int i = 0; i < overrides.size(); i++) {
+        builder.setSelectionOverride(rendererIndex, trackGroupArray, overrides.get(i));
+        addTrackSelection(periodIndex, builder.build());
+      }
+    }
+  }
+
   /**
    * Builds a {@link DownloadAction} for downloading the selected tracks. Must not be called until
    * after preparation completes.

From f566c9486c5efb0c19719b0daa1d98eb6c979f79 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 14 Mar 2019 09:17:38 +0000
Subject: [PATCH 635/832] Remove app-specific build configurations
 recommendations from dev-guide and readme

Issue:#5572
PiperOrigin-RevId: 238401862
---
 README.md | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/README.md b/README.md
index 03f16bd655..cedafe0ad9 100644
--- a/README.md
+++ b/README.md
@@ -95,20 +95,6 @@ compileOptions {
 }
 ```
 
-Note that if you want to use Java 8 features in your own code, the following
-additional options need to be set:
-
-```gradle
-// For Java compilers:
-compileOptions {
-  sourceCompatibility JavaVersion.VERSION_1_8
-}
-// For Kotlin compilers:
-kotlinOptions {
-  jvmTarget = JavaVersion.VERSION_1_8
-}
-```
-
 ### Locally ###
 
 Cloning the repository and depending on the modules locally is required when

From d088be7accf0aa68f926e0d537f81d55aaed4f09 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Thu, 14 Mar 2019 14:59:54 +0000
Subject: [PATCH 636/832] Remove DownloadState.stopFlags

PiperOrigin-RevId: 238442845
---
 .../offline/DefaultDownloadIndex.java         | 22 ++---
 .../exoplayer2/offline/DownloadManager.java   | 93 ++++++++-----------
 .../exoplayer2/offline/DownloadState.java     | 40 +++-----
 .../offline/DefaultDownloadIndexTest.java     |  2 -
 .../offline/DownloadStateBuilder.java         |  8 --
 .../exoplayer2/offline/DownloadStateTest.java | 26 +++++-
 6 files changed, 84 insertions(+), 107 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
index 402003ea7f..04694ba76c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -53,7 +53,6 @@ public final class DefaultDownloadIndex implements DownloadIndex {
   private static final String COLUMN_DOWNLOADED_BYTES = "downloaded_bytes";
   private static final String COLUMN_TOTAL_BYTES = "total_bytes";
   private static final String COLUMN_FAILURE_REASON = "failure_reason";
-  private static final String COLUMN_STOP_FLAGS = "stop_flags";
   private static final String COLUMN_NOT_MET_REQUIREMENTS = "not_met_requirements";
   private static final String COLUMN_MANUAL_STOP_REASON = "manual_stop_reason";
   private static final String COLUMN_START_TIME_MS = "start_time_ms";
@@ -61,6 +60,10 @@ public final class DefaultDownloadIndex implements DownloadIndex {
   private static final String COLUMN_STREAM_KEYS = "stream_keys";
   private static final String COLUMN_CUSTOM_METADATA = "custom_metadata";
 
+  @SuppressWarnings("DeprecatedIsStillUsed")
+  @Deprecated
+  private static final String COLUMN_STOP_FLAGS = "stop_flags";
+
   private static final int COLUMN_INDEX_ID = 0;
   private static final int COLUMN_INDEX_TYPE = 1;
   private static final int COLUMN_INDEX_URI = 2;
@@ -70,13 +73,12 @@ public final class DefaultDownloadIndex implements DownloadIndex {
   private static final int COLUMN_INDEX_DOWNLOADED_BYTES = 6;
   private static final int COLUMN_INDEX_TOTAL_BYTES = 7;
   private static final int COLUMN_INDEX_FAILURE_REASON = 8;
-  private static final int COLUMN_INDEX_STOP_FLAGS = 9;
-  private static final int COLUMN_INDEX_NOT_MET_REQUIREMENTS = 10;
-  private static final int COLUMN_INDEX_MANUAL_STOP_REASON = 11;
-  private static final int COLUMN_INDEX_START_TIME_MS = 12;
-  private static final int COLUMN_INDEX_UPDATE_TIME_MS = 13;
-  private static final int COLUMN_INDEX_STREAM_KEYS = 14;
-  private static final int COLUMN_INDEX_CUSTOM_METADATA = 15;
+  private static final int COLUMN_INDEX_NOT_MET_REQUIREMENTS = 9;
+  private static final int COLUMN_INDEX_MANUAL_STOP_REASON = 10;
+  private static final int COLUMN_INDEX_START_TIME_MS = 11;
+  private static final int COLUMN_INDEX_UPDATE_TIME_MS = 12;
+  private static final int COLUMN_INDEX_STREAM_KEYS = 13;
+  private static final int COLUMN_INDEX_CUSTOM_METADATA = 14;
 
   private static final String WHERE_ID_EQUALS = COLUMN_ID + " = ?";
 
@@ -91,7 +93,6 @@ public final class DefaultDownloadIndex implements DownloadIndex {
         COLUMN_DOWNLOADED_BYTES,
         COLUMN_TOTAL_BYTES,
         COLUMN_FAILURE_REASON,
-        COLUMN_STOP_FLAGS,
         COLUMN_NOT_MET_REQUIREMENTS,
         COLUMN_MANUAL_STOP_REASON,
         COLUMN_START_TIME_MS,
@@ -210,7 +211,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
       values.put(COLUMN_DOWNLOADED_BYTES, downloadState.downloadedBytes);
       values.put(COLUMN_TOTAL_BYTES, downloadState.totalBytes);
       values.put(COLUMN_FAILURE_REASON, downloadState.failureReason);
-      values.put(COLUMN_STOP_FLAGS, downloadState.stopFlags);
+      values.put(COLUMN_STOP_FLAGS, /*stopFlags*/ 0);
       values.put(COLUMN_NOT_MET_REQUIREMENTS, downloadState.notMetRequirements);
       values.put(COLUMN_MANUAL_STOP_REASON, downloadState.manualStopReason);
       values.put(COLUMN_START_TIME_MS, downloadState.startTimeMs);
@@ -288,7 +289,6 @@ public final class DefaultDownloadIndex implements DownloadIndex {
         cursor.getLong(COLUMN_INDEX_DOWNLOADED_BYTES),
         cursor.getLong(COLUMN_INDEX_TOTAL_BYTES),
         cursor.getInt(COLUMN_INDEX_FAILURE_REASON),
-        cursor.getInt(COLUMN_INDEX_STOP_FLAGS),
         cursor.getInt(COLUMN_INDEX_NOT_MET_REQUIREMENTS),
         cursor.getInt(COLUMN_INDEX_MANUAL_STOP_REASON),
         cursor.getLong(COLUMN_INDEX_START_TIME_MS),
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 3415db8ead..7cfe02eeb1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -17,6 +17,8 @@ package com.google.android.exoplayer2.offline;
 
 import static com.google.android.exoplayer2.offline.DownloadState.FAILURE_REASON_NONE;
 import static com.google.android.exoplayer2.offline.DownloadState.FAILURE_REASON_UNKNOWN;
+import static com.google.android.exoplayer2.offline.DownloadState.MANUAL_STOP_REASON_NONE;
+import static com.google.android.exoplayer2.offline.DownloadState.MANUAL_STOP_REASON_UNDEFINED;
 import static com.google.android.exoplayer2.offline.DownloadState.STATE_COMPLETED;
 import static com.google.android.exoplayer2.offline.DownloadState.STATE_DOWNLOADING;
 import static com.google.android.exoplayer2.offline.DownloadState.STATE_FAILED;
@@ -25,8 +27,6 @@ import static com.google.android.exoplayer2.offline.DownloadState.STATE_REMOVED;
 import static com.google.android.exoplayer2.offline.DownloadState.STATE_REMOVING;
 import static com.google.android.exoplayer2.offline.DownloadState.STATE_RESTARTING;
 import static com.google.android.exoplayer2.offline.DownloadState.STATE_STOPPED;
-import static com.google.android.exoplayer2.offline.DownloadState.STOP_FLAG_MANUAL;
-import static com.google.android.exoplayer2.offline.DownloadState.STOP_FLAG_REQUIREMENTS_NOT_MET;
 
 import android.content.Context;
 import android.os.ConditionVariable;
@@ -140,7 +140,6 @@ public final class DownloadManager {
 
   private boolean initialized;
   private boolean released;
-  @DownloadState.StopFlags private int stopFlags;
   @Requirements.RequirementFlags private int notMetRequirements;
   private int manualStopReason;
   private RequirementsWatcher requirementsWatcher;
@@ -186,7 +185,7 @@ public final class DownloadManager {
     this.maxSimultaneousDownloads = maxSimultaneousDownloads;
     this.minRetryCount = minRetryCount;
 
-    stopFlags = STOP_FLAG_MANUAL;
+    manualStopReason = MANUAL_STOP_REASON_UNDEFINED;
     downloads = new ArrayList<>();
     activeDownloads = new HashMap<>();
 
@@ -203,7 +202,7 @@ public final class DownloadManager {
     listeners = new CopyOnWriteArraySet<>();
     actionQueue = new ArrayDeque<>();
 
-    setNotMetRequirements(watchRequirements(requirements));
+    notMetRequirements = watchRequirements(requirements);
     loadActions();
     logd("Created");
   }
@@ -246,48 +245,49 @@ public final class DownloadManager {
   }
 
   /**
-   * Clears {@link DownloadState#STOP_FLAG_MANUAL} flag of all downloads. Downloads are started if
-   * the requirements are met.
+   * Clears manual stop reason of all downloads. Downloads are started if the requirements are met.
    */
   public void startDownloads() {
-    logd("manual stopped is cancelled");
-    manualStopReason = 0;
-    stopFlags &= ~STOP_FLAG_MANUAL;
+    logd("manual stop is cancelled");
+    manualStopReason = MANUAL_STOP_REASON_NONE;
     for (int i = 0; i < downloads.size(); i++) {
-      downloads.get(i).clearManualStopReason();
+      downloads.get(i).setManualStopReason(MANUAL_STOP_REASON_NONE);
     }
   }
 
   /** Signals all downloads to stop. Call {@link #startDownloads()} to let them to be started. */
   public void stopDownloads() {
-    stopDownloads(/* manualStopReason= */ 0);
+    stopDownloads(/* manualStopReason= */ MANUAL_STOP_REASON_UNDEFINED);
   }
 
   /**
    * Signals all downloads to stop. Call {@link #startDownloads()} to let them to be started.
    *
-   * @param manualStopReason An application defined stop reason.
+   * @param manualStopReason An application defined stop reason. Value {@value
+   *     DownloadState#MANUAL_STOP_REASON_NONE} is not allowed and value {@value
+   *     DownloadState#MANUAL_STOP_REASON_UNDEFINED} is reserved for {@link
+   *     DownloadState#MANUAL_STOP_REASON_UNDEFINED}.
    */
   public void stopDownloads(int manualStopReason) {
+    Assertions.checkArgument(manualStopReason != MANUAL_STOP_REASON_NONE);
     logd("downloads are stopped manually");
     this.manualStopReason = manualStopReason;
-    stopFlags |= STOP_FLAG_MANUAL;
     for (int i = 0; i < downloads.size(); i++) {
       downloads.get(i).setManualStopReason(this.manualStopReason);
     }
   }
 
   /**
-   * Clears {@link DownloadState#STOP_FLAG_MANUAL} flag of the download with the {@code id}.
-   * Download is started if the requirements are met.
+   * Clears manual stop reason of the download with the {@code id}. Download is started if the
+   * requirements are met.
    *
    * @param id The unique content id of the download to be started.
    */
   public void startDownload(String id) {
     Download download = getDownload(id);
     if (download != null) {
-      logd("download is started manually", download);
-      download.clearManualStopReason();
+      logd("manual stop is cancelled", download);
+      download.setManualStopReason(MANUAL_STOP_REASON_NONE);
     }
   }
 
@@ -298,7 +298,7 @@ public final class DownloadManager {
    * @param id The unique content id of the download to be stopped.
    */
   public void stopDownload(String id) {
-    stopDownload(id, /* manualStopReason= */ 0);
+    stopDownload(id, /* manualStopReason= */ MANUAL_STOP_REASON_UNDEFINED);
   }
 
   /**
@@ -306,9 +306,13 @@ public final class DownloadManager {
    * to be started.
    *
    * @param id The unique content id of the download to be stopped.
-   * @param manualStopReason An application defined stop reason.
+   * @param manualStopReason An application defined stop reason. Value {@value
+   *     DownloadState#MANUAL_STOP_REASON_NONE} is not allowed and value {@value
+   *     DownloadState#MANUAL_STOP_REASON_UNDEFINED} is reserved for {@link
+   *     DownloadState#MANUAL_STOP_REASON_UNDEFINED}.
    */
   public void stopDownload(String id, int manualStopReason) {
+    Assertions.checkArgument(manualStopReason != MANUAL_STOP_REASON_NONE);
     Download download = getDownload(id);
     if (download != null) {
       logd("download is stopped manually", download);
@@ -401,7 +405,7 @@ public final class DownloadManager {
         return;
       }
     }
-    Download download = new Download(this, action, stopFlags, notMetRequirements, manualStopReason);
+    Download download = new Download(this, action, notMetRequirements, manualStopReason);
     downloads.add(download);
     logd("Download is added", download);
   }
@@ -432,7 +436,7 @@ public final class DownloadManager {
   }
 
   private void onRequirementsStateChanged(@Requirements.RequirementFlags int notMetRequirements) {
-    setNotMetRequirements(notMetRequirements);
+    this.notMetRequirements = notMetRequirements;
     logdFlags("Not met requirements are changed", notMetRequirements);
     Requirements requirements = requirementsWatcher.getRequirements();
     for (Listener listener : listeners) {
@@ -443,15 +447,6 @@ public final class DownloadManager {
     }
   }
 
-  private void setNotMetRequirements(@Requirements.RequirementFlags int notMetRequirements) {
-    this.notMetRequirements = notMetRequirements;
-    if (notMetRequirements == 0) {
-      stopFlags &= ~STOP_FLAG_REQUIREMENTS_NOT_MET;
-    } else {
-      stopFlags |= STOP_FLAG_REQUIREMENTS_NOT_MET;
-    }
-  }
-
   @Nullable
   private Download getDownload(String id) {
     for (int i = 0; i < downloads.size(); i++) {
@@ -632,20 +627,17 @@ public final class DownloadManager {
     private DownloadState downloadState;
     @DownloadState.State private int state;
     @MonotonicNonNull @DownloadState.FailureReason private int failureReason;
-    @DownloadState.StopFlags private int stopFlags;
     @Requirements.RequirementFlags private int notMetRequirements;
     private int manualStopReason;
 
     private Download(
         DownloadManager downloadManager,
         DownloadAction action,
-        @DownloadState.StopFlags int stopFlags,
         @Requirements.RequirementFlags int notMetRequirements,
         int manualStopReason) {
       this.downloadManager = downloadManager;
       this.notMetRequirements = notMetRequirements;
       this.manualStopReason = manualStopReason;
-      this.stopFlags = stopFlags;
       downloadState = new DownloadState(action);
 
       initialize(downloadState.state);
@@ -686,7 +678,6 @@ public final class DownloadManager {
               downloadedBytes,
               totalBytes,
               state != STATE_FAILED ? FAILURE_REASON_NONE : failureReason,
-              stopFlags,
               notMetRequirements,
               manualStopReason,
               downloadState.startTimeMs,
@@ -719,32 +710,24 @@ public final class DownloadManager {
 
     public void setNotMetRequirements(@Requirements.RequirementFlags int notMetRequirements) {
       this.notMetRequirements = notMetRequirements;
-      updateStopFlags(STOP_FLAG_REQUIREMENTS_NOT_MET, /* setFlags= */ notMetRequirements != 0);
+      updateStopState();
     }
 
     public void setManualStopReason(int manualStopReason) {
       this.manualStopReason = manualStopReason;
-      updateStopFlags(STOP_FLAG_MANUAL, /* setFlags= */ true);
+      updateStopState();
     }
 
-    public void clearManualStopReason() {
-      this.manualStopReason = 0;
-      updateStopFlags(STOP_FLAG_MANUAL, /* setFlags= */ false);
-    }
-
-    private void updateStopFlags(int flags, boolean setFlags) {
-      if (setFlags) {
-        stopFlags |= flags;
+    private void updateStopState() {
+      if (canStart()) {
+        if (state == STATE_STOPPED) {
+          startOrQueue();
+        }
       } else {
-        stopFlags &= ~flags;
-      }
-      if (stopFlags != 0) {
         if (state == STATE_DOWNLOADING || state == STATE_QUEUED) {
           downloadManager.stopDownloadThread(this);
           setState(STATE_STOPPED);
         }
-      } else if (state == STATE_STOPPED) {
-        startOrQueue();
       }
     }
 
@@ -754,16 +737,20 @@ public final class DownloadManager {
       state = initialState;
       if (state == STATE_REMOVING || state == STATE_RESTARTING) {
         downloadManager.startDownloadThread(this, getAction());
-      } else if (stopFlags != 0) {
-        setState(STATE_STOPPED);
-      } else {
+      } else if (canStart()) {
         startOrQueue();
+      } else {
+        setState(STATE_STOPPED);
       }
       if (state == initialState) {
         downloadManager.onDownloadStateChange(this);
       }
     }
 
+    private boolean canStart() {
+      return manualStopReason == MANUAL_STOP_REASON_NONE && notMetRequirements == 0;
+    }
+
     private void startOrQueue() {
       Assertions.checkState(!(state == STATE_REMOVING || state == STATE_RESTARTING));
       @StartThreadResults int result = downloadManager.startDownloadThread(this, getAction());
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
index 472c672574..26f2fd8d73 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
@@ -76,20 +76,10 @@ public final class DownloadState {
   /** The download is failed because of unknown reason. */
   public static final int FAILURE_REASON_UNKNOWN = 1;
 
-  /**
-   * Download stop flags. Possible flag values are {@link #STOP_FLAG_MANUAL} and {@link
-   * #STOP_FLAG_REQUIREMENTS_NOT_MET}.
-   */
-  @Documented
-  @Retention(RetentionPolicy.SOURCE)
-  @IntDef(
-      flag = true,
-      value = {STOP_FLAG_MANUAL, STOP_FLAG_REQUIREMENTS_NOT_MET})
-  public @interface StopFlags {}
-  /** Download is stopped by the application. */
-  public static final int STOP_FLAG_MANUAL = 1;
-  /** Download is stopped as the requirements are not met. */
-  public static final int STOP_FLAG_REQUIREMENTS_NOT_MET = 1 << 1;
+  /** The download isn't manually stopped. */
+  public static final int MANUAL_STOP_REASON_NONE = 0;
+  /** The download is manually stopped but a reason isn't specified. */
+  public static final int MANUAL_STOP_REASON_UNDEFINED = Integer.MAX_VALUE;
 
   /** Returns the state string for the given state value. */
   public static String getStateString(@State int state) {
@@ -156,11 +146,9 @@ public final class DownloadState {
    * #FAILURE_REASON_NONE}.
    */
   @FailureReason public final int failureReason;
-  /** Download stop flags. These flags stop downloading any content. */
-  @StopFlags public final int stopFlags;
   /** Not met requirements to download. */
   @Requirements.RequirementFlags public final int notMetRequirements;
-  /** If {@link #STOP_FLAG_MANUAL} is set then this field holds the manual stop reason. */
+  /** The manual stop reason. */
   public final int manualStopReason;
 
   /**
@@ -183,7 +171,6 @@ public final class DownloadState {
         /* downloadedBytes= */ 0,
         /* totalBytes= */ C.LENGTH_UNSET,
         FAILURE_REASON_NONE,
-        /* stopFlags= */ 0,
         /* notMetRequirements= */ 0,
         /* manualStopReason= */ 0,
         /* startTimeMs= */ currentTimeMs,
@@ -202,7 +189,6 @@ public final class DownloadState {
       long downloadedBytes,
       long totalBytes,
       @FailureReason int failureReason,
-      @StopFlags int stopFlags,
       @RequirementFlags int notMetRequirements,
       int manualStopReason,
       long startTimeMs,
@@ -210,10 +196,9 @@ public final class DownloadState {
       StreamKey[] streamKeys,
       byte[] customMetadata) {
     Assertions.checkState((failureReason == FAILURE_REASON_NONE) == (state != STATE_FAILED));
-    Assertions.checkState(stopFlags == 0 || (state != STATE_DOWNLOADING && state != STATE_QUEUED));
-    Assertions.checkState(
-        ((stopFlags & STOP_FLAG_REQUIREMENTS_NOT_MET) == 0) == (notMetRequirements == 0));
-    Assertions.checkState(((stopFlags & STOP_FLAG_MANUAL) != 0) || (manualStopReason == 0));
+    if (manualStopReason != 0 || notMetRequirements != 0) {
+      Assertions.checkState(state != STATE_DOWNLOADING && state != STATE_QUEUED);
+    }
     this.id = id;
     this.type = type;
     this.uri = uri;
@@ -223,7 +208,6 @@ public final class DownloadState {
     this.downloadedBytes = downloadedBytes;
     this.totalBytes = totalBytes;
     this.failureReason = failureReason;
-    this.stopFlags = stopFlags;
     this.notMetRequirements = notMetRequirements;
     this.manualStopReason = manualStopReason;
     this.startTimeMs = startTimeMs;
@@ -247,12 +231,12 @@ public final class DownloadState {
         type,
         action.uri,
         action.customCacheKey,
-        getNextState(state, stopFlags != 0, action.isRemoveAction),
+        getNextState(
+            state, manualStopReason != 0 || notMetRequirements != 0, action.isRemoveAction),
         /* downloadPercentage= */ C.PERCENTAGE_UNSET,
         downloadedBytes,
         /* totalBytes= */ C.LENGTH_UNSET,
         FAILURE_REASON_NONE,
-        stopFlags,
         notMetRequirements,
         manualStopReason,
         startTimeMs,
@@ -261,14 +245,14 @@ public final class DownloadState {
         action.data);
   }
 
-  private static int getNextState(int currentState, boolean stopFlagsSet, boolean remove) {
+  private static int getNextState(int currentState, boolean isStopped, boolean remove) {
     int nextState;
     if (remove) {
       nextState = STATE_REMOVING;
     } else {
       if (currentState == STATE_REMOVING || currentState == STATE_RESTARTING) {
         nextState = STATE_RESTARTING;
-      } else if (stopFlagsSet) {
+      } else if (isStopped) {
         nextState = STATE_STOPPED;
       } else {
         nextState = STATE_QUEUED;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
index f967a9c0d7..5486ee9ffe 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
@@ -81,8 +81,6 @@ public class DefaultDownloadIndexTest {
             .setDownloadedBytes(200)
             .setTotalBytes(400)
             .setFailureReason(DownloadState.FAILURE_REASON_UNKNOWN)
-            .setStopFlags(
-                DownloadState.STOP_FLAG_REQUIREMENTS_NOT_MET | DownloadState.STOP_FLAG_MANUAL)
             .setNotMetRequirements(0x87654321)
             .setManualStopReason(0x12345678)
             .setStartTimeMs(10)
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
index 38ddc81304..cfed9a61ce 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
@@ -36,7 +36,6 @@ class DownloadStateBuilder {
   private long downloadedBytes;
   private long totalBytes;
   private int failureReason;
-  private int stopFlags;
   private int notMetRequirements;
   private int manualStopReason;
   private long startTimeMs;
@@ -74,7 +73,6 @@ class DownloadStateBuilder {
     this.downloadedBytes = (long) 0;
     this.totalBytes = (long) C.LENGTH_UNSET;
     this.failureReason = DownloadState.FAILURE_REASON_NONE;
-    this.stopFlags = 0;
     this.startTimeMs = (long) 0;
     this.updateTimeMs = (long) 0;
     this.streamKeys = streamKeys;
@@ -131,11 +129,6 @@ class DownloadStateBuilder {
     return this;
   }
 
-  public DownloadStateBuilder setStopFlags(int stopFlags) {
-    this.stopFlags = stopFlags;
-    return this;
-  }
-
   public DownloadStateBuilder setNotMetRequirements(int notMetRequirements) {
     this.notMetRequirements = notMetRequirements;
     return this;
@@ -177,7 +170,6 @@ class DownloadStateBuilder {
         downloadedBytes,
         totalBytes,
         failureReason,
-        stopFlags,
         notMetRequirements,
         manualStopReason,
         startTimeMs,
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
index 38c8f1bc6e..4b00a6b6c6 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
@@ -171,7 +171,7 @@ public class DownloadStateTest {
     DownloadStateBuilder downloadStateBuilder =
         new DownloadStateBuilder(downloadAction)
             .setState(DownloadState.STATE_STOPPED)
-            .setStopFlags(DownloadState.STOP_FLAG_MANUAL);
+            .setManualStopReason(DownloadState.MANUAL_STOP_REASON_UNDEFINED);
     DownloadState downloadState = downloadStateBuilder.build();
 
     DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);
@@ -185,7 +185,7 @@ public class DownloadStateTest {
     DownloadStateBuilder downloadStateBuilder =
         new DownloadStateBuilder(downloadAction)
             .setState(DownloadState.STATE_STOPPED)
-            .setStopFlags(DownloadState.STOP_FLAG_MANUAL);
+            .setManualStopReason(DownloadState.MANUAL_STOP_REASON_UNDEFINED);
     DownloadState downloadState = downloadStateBuilder.build();
 
     DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);
@@ -196,12 +196,28 @@ public class DownloadStateTest {
   }
 
   @Test
-  public void mergeAction_stopFlagSetButNotInStoppedState_stateBecomesStopped() {
+  public void mergeAction_manualStopReasonSetButNotInStoppedState_stateBecomesStopped() {
     DownloadAction downloadAction = createDownloadAction();
     DownloadStateBuilder downloadStateBuilder =
         new DownloadStateBuilder(downloadAction)
             .setState(DownloadState.STATE_COMPLETED)
-            .setStopFlags(DownloadState.STOP_FLAG_MANUAL);
+            .setManualStopReason(DownloadState.MANUAL_STOP_REASON_UNDEFINED);
+    DownloadState downloadState = downloadStateBuilder.build();
+
+    DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);
+
+    DownloadState expectedDownloadState =
+        downloadStateBuilder.setState(DownloadState.STATE_STOPPED).build();
+    assertEqual(mergedDownloadState, expectedDownloadState);
+  }
+
+  @Test
+  public void mergeAction_notMetRequirementsSetButNotInStoppedState_stateBecomesStopped() {
+    DownloadAction downloadAction = createDownloadAction();
+    DownloadStateBuilder downloadStateBuilder =
+        new DownloadStateBuilder(downloadAction)
+            .setState(DownloadState.STATE_COMPLETED)
+            .setNotMetRequirements(0x12345678);
     DownloadState downloadState = downloadStateBuilder.build();
 
     DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);
@@ -325,7 +341,7 @@ public class DownloadStateTest {
     if (downloadState.failureReason != that.failureReason) {
       return false;
     }
-    if (downloadState.stopFlags != that.stopFlags) {
+    if (downloadState.manualStopReason != that.manualStopReason) {
       return false;
     }
     if (downloadState.notMetRequirements != that.notMetRequirements) {

From f9055396b80e284bfa49687c2df7b952218bc37a Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 15 Mar 2019 01:04:55 +0000
Subject: [PATCH 637/832] Post errors before calling stopInternal

When an error occurs we call stopInternal, and this clears the MediaPeriodQueue,
which in turn releases media period holders and notifies that media periods have
been released. AnalyticsCollector updates its information about media periods
using the media period release events, which means that if we post the source
error after stopInternal posts its events we can't determine what media period
the source error corresponds to.

Move error notifications before calling stopInternal, so that
AnalyticsCollector's model of the media period queue contains the loading period
at the point when it handles the error.

For consistency also move the other (non-source) error notifications to match
the new ordering.

PiperOrigin-RevId: 238559324
---
 .../android/exoplayer2/ExoPlayerImplInternal.java    | 12 ++++++------
 .../exoplayer2/analytics/AnalyticsCollectorTest.java |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index 9dbe8f2e90..e61c689233 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -375,31 +375,31 @@ import java.util.concurrent.atomic.AtomicBoolean;
       maybeNotifyPlaybackInfoChanged();
     } catch (ExoPlaybackException e) {
       Log.e(TAG, "Playback error.", e);
+      eventHandler.obtainMessage(MSG_ERROR, e).sendToTarget();
       stopInternal(
           /* forceResetRenderers= */ true,
           /* resetPositionAndState= */ false,
           /* acknowledgeStop= */ false);
-      eventHandler.obtainMessage(MSG_ERROR, e).sendToTarget();
       maybeNotifyPlaybackInfoChanged();
     } catch (IOException e) {
       Log.e(TAG, "Source error.", e);
+      eventHandler.obtainMessage(MSG_ERROR, ExoPlaybackException.createForSource(e)).sendToTarget();
       stopInternal(
           /* forceResetRenderers= */ false,
           /* resetPositionAndState= */ false,
           /* acknowledgeStop= */ false);
-      eventHandler.obtainMessage(MSG_ERROR, ExoPlaybackException.createForSource(e)).sendToTarget();
       maybeNotifyPlaybackInfoChanged();
     } catch (RuntimeException | OutOfMemoryError e) {
       Log.e(TAG, "Internal runtime error.", e);
-      stopInternal(
-          /* forceResetRenderers= */ true,
-          /* resetPositionAndState= */ false,
-          /* acknowledgeStop= */ false);
       ExoPlaybackException error =
           e instanceof OutOfMemoryError
               ? ExoPlaybackException.createForOutOfMemoryError((OutOfMemoryError) e)
               : ExoPlaybackException.createForUnexpected((RuntimeException) e);
       eventHandler.obtainMessage(MSG_ERROR, error).sendToTarget();
+      stopInternal(
+          /* forceResetRenderers= */ true,
+          /* resetPositionAndState= */ false,
+          /* acknowledgeStop= */ false);
       maybeNotifyPlaybackInfoChanged();
     }
     return true;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
index 5f307d3a88..af9591d1b7 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
@@ -533,7 +533,7 @@ public final class AnalyticsCollectorTest {
         .containsExactly(WINDOW_0 /* prepared */, WINDOW_0 /* prepared */);
     assertThat(listener.getEvents(EVENT_LOADING_CHANGED))
         .containsExactly(period0Seq0, period0Seq0, period0Seq0, period0Seq0);
-    assertThat(listener.getEvents(EVENT_PLAYER_ERROR)).containsExactly(WINDOW_0);
+    assertThat(listener.getEvents(EVENT_PLAYER_ERROR)).containsExactly(period0Seq0);
     assertThat(listener.getEvents(EVENT_TRACKS_CHANGED)).containsExactly(period0Seq0, period0Seq0);
     assertThat(listener.getEvents(EVENT_LOAD_STARTED))
         .containsExactly(

From 07702cecddf989fa56cfe422e240365cf19a9131 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 15 Mar 2019 12:24:43 +0000
Subject: [PATCH 638/832] Allow exoplayer/v2/ mockito2

PiperOrigin-RevId: 238625384
---
 RELEASENOTES.md                                               | 1 +
 constants.gradle                                              | 4 ++--
 .../java/com/google/android/exoplayer2/castdemo/DemoUtil.java | 1 +
 library/core/build.gradle                                     | 4 ++--
 .../com/google/android/exoplayer2/source/MediaSource.java     | 1 +
 .../android/exoplayer2/drm/OfflineLicenseHelperTest.java      | 2 +-
 .../exoplayer2/trackselection/AdaptiveTrackSelectionTest.java | 4 ++--
 7 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 0394f8d83d..42ddce0b87 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,6 +2,7 @@
 
 ### dev-v2 (not yet released) ###
 
+* Update to Mockito 2
 * Add new `ExoPlaybackException` types for remote exceptions and out-of-memory
   errors.
 * HLS:
diff --git a/constants.gradle b/constants.gradle
index 1d6cd4fd73..e164fb4446 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -18,8 +18,8 @@ project.ext {
     minSdkVersion = 16
     targetSdkVersion = 28
     compileSdkVersion = 28
-    dexmakerVersion = '1.2'
-    mockitoVersion = '1.9.5'
+    dexmakerVersion = '2.21.0'
+    mockitoVersion = '2.25.0'
     robolectricVersion = '4.2'
     autoValueVersion = '1.6'
     checkerframeworkVersion = '2.5.0'
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
index ecf28a03be..9625304252 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
@@ -97,6 +97,7 @@ import java.util.UUID;
     samples.add(
         new Sample(
             "https://html5demos.com/assets/dizzy.mp4", "Clear MP4: Dizzy", MIME_TYPE_VIDEO_MP4));
+
     SAMPLES = Collections.unmodifiableList(samples);
   }
 
diff --git a/library/core/build.gradle b/library/core/build.gradle
index 7ae3497d71..deb9f24dce 100644
--- a/library/core/build.gradle
+++ b/library/core/build.gradle
@@ -65,8 +65,8 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:' + androidXTestVersion
     androidTestImplementation 'androidx.test.ext:truth:' + androidXTestVersion
     androidTestImplementation 'com.google.auto.value:auto-value-annotations:' + autoValueVersion
-    androidTestImplementation 'com.google.dexmaker:dexmaker:' + dexmakerVersion
-    androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion
+    androidTestImplementation 'com.linkedin.dexmaker:dexmaker:' + dexmakerVersion
+    androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:' + dexmakerVersion
     androidTestImplementation 'org.mockito:mockito-core:' + mockitoVersion
     androidTestAnnotationProcessor 'com.google.auto.value:auto-value:' + autoValueVersion
     testImplementation 'androidx.test:core:' + androidXTestVersion
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
index 994c37bb93..d7b7c75210 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
@@ -238,6 +238,7 @@ public interface MediaSource {
   default Object getTag() {
     return null;
   }
+
   /**
    * Starts source preparation if not yet started, and adds a listener for timeline and/or manifest
    * updates.
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java b/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
index 52fbae784a..30dde1db57 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
@@ -148,7 +148,7 @@ public class OfflineLicenseHelperTest {
 
   private void setStubKeySetId(byte[] keySetId)
       throws android.media.NotProvisionedException, android.media.DeniedByServerException {
-    when(mediaDrm.provideKeyResponse(any(byte[].class), any(byte[].class))).thenReturn(keySetId);
+    when(mediaDrm.provideKeyResponse(any(byte[].class), any())).thenReturn(keySetId);
   }
 
   private static void assertOfflineLicenseKeySetIdEqual(
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
index 666cb9815f..cb7ef40726 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
@@ -16,8 +16,8 @@
 package com.google.android.exoplayer2.trackselection;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.argThat;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
@@ -268,7 +268,7 @@ public final class AdaptiveTrackSelectionTest {
     ArgumentMatcher<Format[]> matcher =
         new ArgumentMatcher<Format[]>() {
           @Override
-          public boolean matches(Object argument) {
+          public boolean matches(Format[] argument) {
             Format[] formats = (Format[]) argument;
             return formats.length == 3
                 && Arrays.asList(formats).containsAll(Arrays.asList(format1, format2, format3));

From a291d6221f5b05b5d4ffb281a6a7dd0c54ba6d75 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 15 Mar 2019 12:37:15 +0000
Subject: [PATCH 639/832] Automated g4 rollback of changelist 238625384.

*** Original change description ***

Allow exoplayer/v2 mockito2

***

PiperOrigin-RevId: 238626401
---
 RELEASENOTES.md                                               | 1 -
 constants.gradle                                              | 4 ++--
 library/core/build.gradle                                     | 4 ++--
 .../android/exoplayer2/drm/OfflineLicenseHelperTest.java      | 2 +-
 .../exoplayer2/trackselection/AdaptiveTrackSelectionTest.java | 4 ++--
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 42ddce0b87..0394f8d83d 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,7 +2,6 @@
 
 ### dev-v2 (not yet released) ###
 
-* Update to Mockito 2
 * Add new `ExoPlaybackException` types for remote exceptions and out-of-memory
   errors.
 * HLS:
diff --git a/constants.gradle b/constants.gradle
index e164fb4446..1d6cd4fd73 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -18,8 +18,8 @@ project.ext {
     minSdkVersion = 16
     targetSdkVersion = 28
     compileSdkVersion = 28
-    dexmakerVersion = '2.21.0'
-    mockitoVersion = '2.25.0'
+    dexmakerVersion = '1.2'
+    mockitoVersion = '1.9.5'
     robolectricVersion = '4.2'
     autoValueVersion = '1.6'
     checkerframeworkVersion = '2.5.0'
diff --git a/library/core/build.gradle b/library/core/build.gradle
index deb9f24dce..7ae3497d71 100644
--- a/library/core/build.gradle
+++ b/library/core/build.gradle
@@ -65,8 +65,8 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:' + androidXTestVersion
     androidTestImplementation 'androidx.test.ext:truth:' + androidXTestVersion
     androidTestImplementation 'com.google.auto.value:auto-value-annotations:' + autoValueVersion
-    androidTestImplementation 'com.linkedin.dexmaker:dexmaker:' + dexmakerVersion
-    androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:' + dexmakerVersion
+    androidTestImplementation 'com.google.dexmaker:dexmaker:' + dexmakerVersion
+    androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion
     androidTestImplementation 'org.mockito:mockito-core:' + mockitoVersion
     androidTestAnnotationProcessor 'com.google.auto.value:auto-value:' + autoValueVersion
     testImplementation 'androidx.test:core:' + androidXTestVersion
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java b/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
index 30dde1db57..52fbae784a 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
@@ -148,7 +148,7 @@ public class OfflineLicenseHelperTest {
 
   private void setStubKeySetId(byte[] keySetId)
       throws android.media.NotProvisionedException, android.media.DeniedByServerException {
-    when(mediaDrm.provideKeyResponse(any(byte[].class), any())).thenReturn(keySetId);
+    when(mediaDrm.provideKeyResponse(any(byte[].class), any(byte[].class))).thenReturn(keySetId);
   }
 
   private static void assertOfflineLicenseKeySetIdEqual(
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
index cb7ef40726..666cb9815f 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
@@ -16,8 +16,8 @@
 package com.google.android.exoplayer2.trackselection;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.argThat;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
@@ -268,7 +268,7 @@ public final class AdaptiveTrackSelectionTest {
     ArgumentMatcher<Format[]> matcher =
         new ArgumentMatcher<Format[]>() {
           @Override
-          public boolean matches(Format[] argument) {
+          public boolean matches(Object argument) {
             Format[] formats = (Format[]) argument;
             return formats.length == 3
                 && Arrays.asList(formats).containsAll(Arrays.asList(format1, format2, format3));

From 2959b5f9c2a0c6b26345a1020f1b66d81719ff11 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 15 Mar 2019 17:32:12 +0000
Subject: [PATCH 640/832] Roll forward of 238625384.

PiperOrigin-RevId: 238666870
---
 RELEASENOTES.md                                               | 1 +
 constants.gradle                                              | 4 ++--
 library/core/build.gradle                                     | 4 ++--
 .../android/exoplayer2/drm/OfflineLicenseHelperTest.java      | 2 +-
 .../exoplayer2/trackselection/AdaptiveTrackSelectionTest.java | 4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 0394f8d83d..42ddce0b87 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,6 +2,7 @@
 
 ### dev-v2 (not yet released) ###
 
+* Update to Mockito 2
 * Add new `ExoPlaybackException` types for remote exceptions and out-of-memory
   errors.
 * HLS:
diff --git a/constants.gradle b/constants.gradle
index 1d6cd4fd73..e164fb4446 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -18,8 +18,8 @@ project.ext {
     minSdkVersion = 16
     targetSdkVersion = 28
     compileSdkVersion = 28
-    dexmakerVersion = '1.2'
-    mockitoVersion = '1.9.5'
+    dexmakerVersion = '2.21.0'
+    mockitoVersion = '2.25.0'
     robolectricVersion = '4.2'
     autoValueVersion = '1.6'
     checkerframeworkVersion = '2.5.0'
diff --git a/library/core/build.gradle b/library/core/build.gradle
index 7ae3497d71..deb9f24dce 100644
--- a/library/core/build.gradle
+++ b/library/core/build.gradle
@@ -65,8 +65,8 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:' + androidXTestVersion
     androidTestImplementation 'androidx.test.ext:truth:' + androidXTestVersion
     androidTestImplementation 'com.google.auto.value:auto-value-annotations:' + autoValueVersion
-    androidTestImplementation 'com.google.dexmaker:dexmaker:' + dexmakerVersion
-    androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion
+    androidTestImplementation 'com.linkedin.dexmaker:dexmaker:' + dexmakerVersion
+    androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:' + dexmakerVersion
     androidTestImplementation 'org.mockito:mockito-core:' + mockitoVersion
     androidTestAnnotationProcessor 'com.google.auto.value:auto-value:' + autoValueVersion
     testImplementation 'androidx.test:core:' + androidXTestVersion
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java b/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
index 52fbae784a..30dde1db57 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
@@ -148,7 +148,7 @@ public class OfflineLicenseHelperTest {
 
   private void setStubKeySetId(byte[] keySetId)
       throws android.media.NotProvisionedException, android.media.DeniedByServerException {
-    when(mediaDrm.provideKeyResponse(any(byte[].class), any(byte[].class))).thenReturn(keySetId);
+    when(mediaDrm.provideKeyResponse(any(byte[].class), any())).thenReturn(keySetId);
   }
 
   private static void assertOfflineLicenseKeySetIdEqual(
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
index 666cb9815f..cb7ef40726 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
@@ -16,8 +16,8 @@
 package com.google.android.exoplayer2.trackselection;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.argThat;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
@@ -268,7 +268,7 @@ public final class AdaptiveTrackSelectionTest {
     ArgumentMatcher<Format[]> matcher =
         new ArgumentMatcher<Format[]>() {
           @Override
-          public boolean matches(Object argument) {
+          public boolean matches(Format[] argument) {
             Format[] formats = (Format[]) argument;
             return formats.length == 3
                 && Arrays.asList(formats).containsAll(Arrays.asList(format1, format2, format3));

From 3e4c15aa15410828753cfbf40f01d2847c9c7286 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Mon, 18 Mar 2019 11:03:43 +0000
Subject: [PATCH 641/832] Add methods to DefaultDownloadIndex to set manual
 stop reason and not met requirements

PiperOrigin-RevId: 238960156
---
 .../offline/DefaultDownloadIndex.java         | 92 ++++++++++++-------
 .../offline/DefaultDownloadIndexTest.java     | 57 +++++++++++-
 .../exoplayer2/offline/DownloadStateTest.java | 66 +++----------
 3 files changed, 130 insertions(+), 85 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
index 04694ba76c..5909c60d16 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -81,6 +81,8 @@ public final class DefaultDownloadIndex implements DownloadIndex {
   private static final int COLUMN_INDEX_CUSTOM_METADATA = 14;
 
   private static final String WHERE_ID_EQUALS = COLUMN_ID + " = ?";
+  private static final String WHERE_STATE_TERMINAL =
+      getStateQuery(DownloadState.STATE_COMPLETED, DownloadState.STATE_FAILED);
 
   private static final String[] COLUMNS =
       new String[] {
@@ -139,6 +141,8 @@ public final class DefaultDownloadIndex implements DownloadIndex {
           + COLUMN_CUSTOM_METADATA
           + " BLOB NOT NULL)";
 
+  private static final String TRUE = "1";
+
   private final DatabaseProvider databaseProvider;
 
   private boolean initialized;
@@ -175,32 +179,15 @@ public final class DefaultDownloadIndex implements DownloadIndex {
   public DownloadStateCursor getDownloadStates(@DownloadState.State int... states)
       throws DatabaseIOException {
     ensureInitialized();
-    try {
-      String selection = null;
-      if (states.length > 0) {
-        StringBuilder selectionBuilder = new StringBuilder();
-        selectionBuilder.append(COLUMN_STATE).append(" IN (");
-        for (int i = 0; i < states.length; i++) {
-          if (i > 0) {
-            selectionBuilder.append(',');
-          }
-          selectionBuilder.append(states[i]);
-        }
-        selectionBuilder.append(')');
-        selection = selectionBuilder.toString();
-      }
-      Cursor cursor = getCursor(selection, /* selectionArgs= */ null);
-      return new DownloadStateCursorImpl(cursor);
-    } catch (SQLiteException e) {
-      throw new DatabaseIOException(e);
-    }
+    Cursor cursor = getCursor(getStateQuery(states), /* selectionArgs= */ null);
+    return new DownloadStateCursorImpl(cursor);
   }
 
   @Override
   public void putDownloadState(DownloadState downloadState) throws DatabaseIOException {
     ensureInitialized();
+    Assertions.checkState(downloadState.state != DownloadState.STATE_REMOVED);
     try {
-      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
       ContentValues values = new ContentValues();
       values.put(COLUMN_ID, downloadState.id);
       values.put(COLUMN_TYPE, downloadState.type);
@@ -218,6 +205,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
       values.put(COLUMN_UPDATE_TIME_MS, downloadState.updateTimeMs);
       values.put(COLUMN_STREAM_KEYS, encodeStreamKeys(downloadState.streamKeys));
       values.put(COLUMN_CUSTOM_METADATA, downloadState.customMetadata);
+      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
       writableDatabase.replaceOrThrow(TABLE_NAME, /* nullColumnHack= */ null, values);
     } catch (SQLiteException e) {
       throw new DatabaseIOException(e);
@@ -234,6 +222,25 @@ public final class DefaultDownloadIndex implements DownloadIndex {
     }
   }
 
+  /**
+   * Sets the manual stop reason of the downloads in a terminal state ({@link
+   * DownloadState#STATE_COMPLETED}, {@link DownloadState#STATE_FAILED}).
+   *
+   * @param manualStopReason The manual stop reason.
+   * @throws DatabaseIOException If an error occurs updating the state.
+   */
+  public void setManualStopReason(int manualStopReason) throws DatabaseIOException {
+    ensureInitialized();
+    try {
+      ContentValues values = new ContentValues();
+      values.put(COLUMN_MANUAL_STOP_REASON, manualStopReason);
+      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+      writableDatabase.update(TABLE_NAME, values, WHERE_STATE_TERMINAL, /* whereArgs= */ null);
+    } catch (SQLException e) {
+      throw new DatabaseIOException(e);
+    }
+  }
+
   private void ensureInitialized() throws DatabaseIOException {
     if (initialized) {
       return;
@@ -264,18 +271,39 @@ public final class DefaultDownloadIndex implements DownloadIndex {
     }
   }
 
-  private Cursor getCursor(@Nullable String selection, @Nullable String[] selectionArgs) {
-    String sortOrder = COLUMN_START_TIME_MS + " ASC";
-    return databaseProvider
-        .getReadableDatabase()
-        .query(
-            TABLE_NAME,
-            COLUMNS,
-            selection,
-            selectionArgs,
-            /* groupBy= */ null,
-            /* having= */ null,
-            sortOrder);
+  private Cursor getCursor(String selection, @Nullable String[] selectionArgs)
+      throws DatabaseIOException {
+    try {
+      String sortOrder = COLUMN_START_TIME_MS + " ASC";
+      return databaseProvider
+          .getReadableDatabase()
+          .query(
+              TABLE_NAME,
+              COLUMNS,
+              selection,
+              selectionArgs,
+              /* groupBy= */ null,
+              /* having= */ null,
+              sortOrder);
+    } catch (SQLiteException e) {
+      throw new DatabaseIOException(e);
+    }
+  }
+
+  private static String getStateQuery(@DownloadState.State int... states) {
+    if (states.length == 0) {
+      return TRUE;
+    }
+    StringBuilder selectionBuilder = new StringBuilder();
+    selectionBuilder.append(COLUMN_STATE).append(" IN (");
+    for (int i = 0; i < states.length; i++) {
+      if (i > 0) {
+        selectionBuilder.append(',');
+      }
+      selectionBuilder.append(states[i]);
+    }
+    selectionBuilder.append(')');
+    return selectionBuilder.toString();
   }
 
   private static DownloadState getDownloadStateForCurrentRow(Cursor cursor) {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
index 5486ee9ffe..37c3f69514 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
@@ -156,7 +156,7 @@ public class DefaultDownloadIndexTest {
     DownloadState downloadState1 =
         new DownloadStateBuilder("id1")
             .setStartTimeMs(0)
-            .setState(DownloadState.STATE_REMOVED)
+            .setState(DownloadState.STATE_REMOVING)
             .build();
     downloadIndex.putDownloadState(downloadState1);
     DownloadState downloadState2 =
@@ -173,7 +173,8 @@ public class DefaultDownloadIndexTest {
     downloadIndex.putDownloadState(downloadState3);
 
     DownloadStateCursor cursor =
-        downloadIndex.getDownloadStates(DownloadState.STATE_REMOVED, DownloadState.STATE_COMPLETED);
+        downloadIndex.getDownloadStates(
+            DownloadState.STATE_REMOVING, DownloadState.STATE_COMPLETED);
 
     assertThat(cursor.getCount()).isEqualTo(2);
     cursor.moveToNext();
@@ -218,4 +219,56 @@ public class DefaultDownloadIndexTest {
             VersionTable.getVersion(writableDatabase, VersionTable.FEATURE_OFFLINE, INSTANCE_UID))
         .isEqualTo(DefaultDownloadIndex.TABLE_VERSION);
   }
+
+  @Test
+  public void setManualStopReason_setToReasonNone() throws Exception {
+    String id = "id";
+    DownloadStateBuilder downloadStateBuilder =
+        new DownloadStateBuilder(id)
+            .setState(DownloadState.STATE_COMPLETED)
+            .setManualStopReason(0x12345678);
+    DownloadState downloadState = downloadStateBuilder.build();
+    downloadIndex.putDownloadState(downloadState);
+
+    downloadIndex.setManualStopReason(DownloadState.MANUAL_STOP_REASON_NONE);
+
+    DownloadState readDownloadState = downloadIndex.getDownloadState(id);
+    DownloadState expectedDownloadState =
+        downloadStateBuilder.setManualStopReason(DownloadState.MANUAL_STOP_REASON_NONE).build();
+    DownloadStateTest.assertEqual(readDownloadState, expectedDownloadState);
+  }
+
+  @Test
+  public void setManualStopReason_setReason() throws Exception {
+    String id = "id";
+    DownloadStateBuilder downloadStateBuilder =
+        new DownloadStateBuilder(id)
+            .setState(DownloadState.STATE_FAILED)
+            .setFailureReason(DownloadState.FAILURE_REASON_UNKNOWN);
+    DownloadState downloadState = downloadStateBuilder.build();
+    downloadIndex.putDownloadState(downloadState);
+    int manualStopReason = 0x12345678;
+
+    downloadIndex.setManualStopReason(manualStopReason);
+
+    DownloadState readDownloadState = downloadIndex.getDownloadState(id);
+    DownloadState expectedDownloadState =
+        downloadStateBuilder.setManualStopReason(manualStopReason).build();
+    DownloadStateTest.assertEqual(readDownloadState, expectedDownloadState);
+  }
+
+  @Test
+  public void setManualStopReason_notTerminalState_doesNotSetManualStopReason() throws Exception {
+    String id = "id";
+    DownloadStateBuilder downloadStateBuilder =
+        new DownloadStateBuilder(id).setState(DownloadState.STATE_DOWNLOADING);
+    DownloadState downloadState = downloadStateBuilder.build();
+    downloadIndex.putDownloadState(downloadState);
+    int notMetRequirements = 0x12345678;
+
+    downloadIndex.setManualStopReason(notMetRequirements);
+
+    DownloadState readDownloadState = downloadIndex.getDownloadState(id);
+    DownloadStateTest.assertEqual(readDownloadState, downloadState);
+  }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
index 4b00a6b6c6..5d2af47781 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
@@ -312,60 +312,24 @@ public class DownloadStateTest {
   }
 
   static void assertEqual(
-      DownloadState downloadState, DownloadState expected, boolean compareTimeFields) {
-    assertThat(areEqual(downloadState, expected, compareTimeFields)).isTrue();
-  }
-
-  private static boolean areEqual(
       DownloadState downloadState, DownloadState that, boolean compareTimeFields) {
-    if (downloadState.state != that.state) {
-      return false;
-    }
-    if (Float.compare(that.downloadPercentage, downloadState.downloadPercentage) != 0) {
-      return false;
-    }
-    if (downloadState.downloadedBytes != that.downloadedBytes) {
-      return false;
-    }
-    if (downloadState.totalBytes != that.totalBytes) {
-      return false;
-    }
+    assertThat(downloadState.state).isEqualTo(that.state);
+    assertThat(downloadState.downloadPercentage).isEqualTo(that.downloadPercentage);
+    assertThat(downloadState.downloadedBytes).isEqualTo(that.downloadedBytes);
+    assertThat(downloadState.totalBytes).isEqualTo(that.totalBytes);
     if (compareTimeFields) {
-      if (downloadState.startTimeMs != that.startTimeMs) {
-        return false;
-      }
-      if (downloadState.updateTimeMs != that.updateTimeMs) {
-        return false;
-      }
+      assertThat(downloadState.startTimeMs).isEqualTo(that.startTimeMs);
+      assertThat(downloadState.updateTimeMs).isEqualTo(that.updateTimeMs);
     }
-    if (downloadState.failureReason != that.failureReason) {
-      return false;
-    }
-    if (downloadState.manualStopReason != that.manualStopReason) {
-      return false;
-    }
-    if (downloadState.notMetRequirements != that.notMetRequirements) {
-      return false;
-    }
-    if (!downloadState.id.equals(that.id)) {
-      return false;
-    }
-    if (!downloadState.type.equals(that.type)) {
-      return false;
-    }
-    if (!downloadState.uri.equals(that.uri)) {
-      return false;
-    }
-    if (downloadState.cacheKey != null
-        ? !downloadState.cacheKey.equals(that.cacheKey)
-        : that.cacheKey != null) {
-      return false;
-    }
-    if (downloadState.streamKeys.length != that.streamKeys.length
-        || !Arrays.asList(downloadState.streamKeys).containsAll(Arrays.asList(that.streamKeys))) {
-      return false;
-    }
-    return Arrays.equals(downloadState.customMetadata, that.customMetadata);
+    assertThat(downloadState.failureReason).isEqualTo(that.failureReason);
+    assertThat(downloadState.manualStopReason).isEqualTo(that.manualStopReason);
+    assertThat(downloadState.notMetRequirements).isEqualTo(that.notMetRequirements);
+    assertThat(downloadState.id).isEqualTo(that.id);
+    assertThat(downloadState.type).isEqualTo(that.type);
+    assertThat(downloadState.uri).isEqualTo(that.uri);
+    assertThat(downloadState.cacheKey).isEqualTo(that.cacheKey);
+    assertThat(Arrays.asList(downloadState.streamKeys)).containsExactlyElementsIn(that.streamKeys);
+    assertThat(downloadState.customMetadata).isEqualTo(that.customMetadata);
   }
 
   private DownloadAction createDownloadAction() {

From a5616cb552a4c07e03f848d1f35f44d85b4a0564 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 18 Mar 2019 14:41:44 +0000
Subject: [PATCH 642/832] Extract AV1 streams in DASH (fMP4/Matroska)

PiperOrigin-RevId: 238983394
---
 .../extractor/mkv/MatroskaExtractor.java      |  5 ++++
 .../exoplayer2/extractor/mp4/Atom.java        |  8 +++---
 .../exoplayer2/extractor/mp4/AtomParsers.java |  4 +++
 .../exoplayer2/extractor/mp4/Sniffer.java     |  1 +
 .../exoplayer2/mediacodec/MediaCodecUtil.java | 25 +++++++++++--------
 .../android/exoplayer2/util/MimeTypes.java    |  3 +++
 6 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
index e53a25d0af..c785865f6a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
@@ -96,6 +96,7 @@ public class MatroskaExtractor implements Extractor {
   private static final String DOC_TYPE_WEBM = "webm";
   private static final String CODEC_ID_VP8 = "V_VP8";
   private static final String CODEC_ID_VP9 = "V_VP9";
+  private static final String CODEC_ID_AV1 = "V_AV1";
   private static final String CODEC_ID_MPEG2 = "V_MPEG2";
   private static final String CODEC_ID_MPEG4_SP = "V_MPEG4/ISO/SP";
   private static final String CODEC_ID_MPEG4_ASP = "V_MPEG4/ISO/ASP";
@@ -1536,6 +1537,7 @@ public class MatroskaExtractor implements Extractor {
   private static boolean isCodecSupported(String codecId) {
     return CODEC_ID_VP8.equals(codecId)
         || CODEC_ID_VP9.equals(codecId)
+        || CODEC_ID_AV1.equals(codecId)
         || CODEC_ID_MPEG2.equals(codecId)
         || CODEC_ID_MPEG4_SP.equals(codecId)
         || CODEC_ID_MPEG4_ASP.equals(codecId)
@@ -1780,6 +1782,9 @@ public class MatroskaExtractor implements Extractor {
         case CODEC_ID_VP9:
           mimeType = MimeTypes.VIDEO_VP9;
           break;
+        case CODEC_ID_AV1:
+          mimeType = MimeTypes.VIDEO_AV1;
+          break;
         case CODEC_ID_MPEG2:
           mimeType = MimeTypes.VIDEO_MPEG2;
           break;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
index 8a004d2e99..f383305fcc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
@@ -57,6 +57,11 @@ import java.util.List;
   public static final int TYPE_hvc1 = Util.getIntegerCodeForString("hvc1");
   public static final int TYPE_hev1 = Util.getIntegerCodeForString("hev1");
   public static final int TYPE_hvcC = Util.getIntegerCodeForString("hvcC");
+  public static final int TYPE_vp08 = Util.getIntegerCodeForString("vp08");
+  public static final int TYPE_vp09 = Util.getIntegerCodeForString("vp09");
+  public static final int TYPE_vpcC = Util.getIntegerCodeForString("vpcC");
+  public static final int TYPE_av01 = Util.getIntegerCodeForString("av01");
+  public static final int TYPE_av1C = Util.getIntegerCodeForString("av1C");
   public static final int TYPE_dvav = Util.getIntegerCodeForString("dvav");
   public static final int TYPE_dva1 = Util.getIntegerCodeForString("dva1");
   public static final int TYPE_dvhe = Util.getIntegerCodeForString("dvhe");
@@ -145,9 +150,6 @@ import java.util.List;
   public static final int TYPE_st3d = Util.getIntegerCodeForString("st3d");
   public static final int TYPE_sv3d = Util.getIntegerCodeForString("sv3d");
   public static final int TYPE_proj = Util.getIntegerCodeForString("proj");
-  public static final int TYPE_vp08 = Util.getIntegerCodeForString("vp08");
-  public static final int TYPE_vp09 = Util.getIntegerCodeForString("vp09");
-  public static final int TYPE_vpcC = Util.getIntegerCodeForString("vpcC");
   public static final int TYPE_camm = Util.getIntegerCodeForString("camm");
   public static final int TYPE_alac = Util.getIntegerCodeForString("alac");
   public static final int TYPE_alaw = Util.getIntegerCodeForString("alaw");
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
index aad6530384..0a87ab92c4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
@@ -745,6 +745,7 @@ import java.util.List;
           || childAtomType == Atom.TYPE_s263
           || childAtomType == Atom.TYPE_vp08
           || childAtomType == Atom.TYPE_vp09
+          || childAtomType == Atom.TYPE_av01
           || childAtomType == Atom.TYPE_dvav
           || childAtomType == Atom.TYPE_dva1
           || childAtomType == Atom.TYPE_dvhe
@@ -902,6 +903,9 @@ import java.util.List;
       } else if (childAtomType == Atom.TYPE_vpcC) {
         Assertions.checkState(mimeType == null);
         mimeType = (atomType == Atom.TYPE_vp08) ? MimeTypes.VIDEO_VP8 : MimeTypes.VIDEO_VP9;
+      } else if (childAtomType == Atom.TYPE_av1C) {
+        Assertions.checkState(mimeType == null);
+        mimeType = MimeTypes.VIDEO_AV1;
       } else if (childAtomType == Atom.TYPE_d263) {
         Assertions.checkState(mimeType == null);
         mimeType = MimeTypes.VIDEO_H263;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java
index b22c5203c3..5c5afe39a8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java
@@ -41,6 +41,7 @@ import java.io.IOException;
         Util.getIntegerCodeForString("avc1"),
         Util.getIntegerCodeForString("hvc1"),
         Util.getIntegerCodeForString("hev1"),
+        Util.getIntegerCodeForString("av01"),
         Util.getIntegerCodeForString("mp41"),
         Util.getIntegerCodeForString("mp42"),
         Util.getIntegerCodeForString("3g2a"),
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
index a7c6405c82..5a3179f110 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
@@ -110,7 +110,8 @@ public final class MediaCodecUtil {
    * @return A {@link MediaCodecInfo} describing the decoder, or null if no suitable decoder exists.
    * @throws DecoderQueryException If there was an error querying the available decoders.
    */
-  public static @Nullable MediaCodecInfo getPassthroughDecoderInfo() throws DecoderQueryException {
+  @Nullable
+  public static MediaCodecInfo getPassthroughDecoderInfo() throws DecoderQueryException {
     MediaCodecInfo decoderInfo = getDecoderInfo(MimeTypes.AUDIO_RAW, /* secure= */ false);
     return decoderInfo == null ? null : MediaCodecInfo.newPassthroughInstance(decoderInfo.name);
   }
@@ -124,7 +125,8 @@ public final class MediaCodecUtil {
    * @return A {@link MediaCodecInfo} describing the decoder, or null if no suitable decoder exists.
    * @throws DecoderQueryException If there was an error querying the available decoders.
    */
-  public static @Nullable MediaCodecInfo getDecoderInfo(String mimeType, boolean secure)
+  @Nullable
+  public static MediaCodecInfo getDecoderInfo(String mimeType, boolean secure)
       throws DecoderQueryException {
     List<MediaCodecInfo> decoderInfos = getDecoderInfos(mimeType, secure);
     return decoderInfos.isEmpty() ? null : decoderInfos.get(0);
@@ -204,21 +206,24 @@ public final class MediaCodecUtil {
    * @return A pair (profile constant, level constant) if {@code codec} is well-formed and
    *     recognized, or null otherwise
    */
-  public static @Nullable Pair<Integer, Integer> getCodecProfileAndLevel(String codec) {
+  @Nullable
+  public static Pair<Integer, Integer> getCodecProfileAndLevel(String codec) {
     if (codec == null) {
       return null;
     }
+    // TODO: Check codec profile/level for AV1 once targeting Android Q and [Internal: b/128552878]
+    // has been fixed.
     String[] parts = codec.split("\\.");
     switch (parts[0]) {
+      case CODEC_ID_AVC1:
+      case CODEC_ID_AVC2:
+        return getAvcProfileAndLevel(codec, parts);
       case CODEC_ID_HEV1:
       case CODEC_ID_HVC1:
         return getHevcProfileAndLevel(codec, parts);
       case CODEC_ID_DVHE:
       case CODEC_ID_DVH1:
         return getDolbyVisionProfileAndLevel(codec, parts);
-      case CODEC_ID_AVC1:
-      case CODEC_ID_AVC2:
-        return getAvcProfileAndLevel(codec, parts);
       case CODEC_ID_MP4A:
         return getAacCodecProfileAndLevel(codec, parts);
       default:
@@ -536,8 +541,8 @@ public final class MediaCodecUtil {
       Log.w(TAG, "Ignoring malformed AVC codec string: " + codec);
       return null;
     }
-    Integer profileInteger;
-    Integer levelInteger;
+    int profileInteger;
+    int levelInteger;
     try {
       if (parts[1].length() == 6) {
         // Format: avc1.xxccyy, where xx is profile and yy level, both hexadecimal.
@@ -610,8 +615,8 @@ public final class MediaCodecUtil {
     }
   }
 
-  private static @Nullable Pair<Integer, Integer> getAacCodecProfileAndLevel(
-      String codec, String[] parts) {
+  @Nullable
+  private static Pair<Integer, Integer> getAacCodecProfileAndLevel(String codec, String[] parts) {
     if (parts.length != 3) {
       Log.w(TAG, "Ignoring malformed MP4A codec string: " + codec);
       return null;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java b/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
index 01b4388eb4..5eaed8ad2f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
@@ -37,6 +37,7 @@ public final class MimeTypes {
   public static final String VIDEO_H265 = BASE_TYPE_VIDEO + "/hevc";
   public static final String VIDEO_VP8 = BASE_TYPE_VIDEO + "/x-vnd.on2.vp8";
   public static final String VIDEO_VP9 = BASE_TYPE_VIDEO + "/x-vnd.on2.vp9";
+  public static final String VIDEO_AV1 = BASE_TYPE_VIDEO + "/av01";
   public static final String VIDEO_MP4V = BASE_TYPE_VIDEO + "/mp4v-es";
   public static final String VIDEO_MPEG = BASE_TYPE_VIDEO + "/mpeg";
   public static final String VIDEO_MPEG2 = BASE_TYPE_VIDEO + "/mpeg2";
@@ -200,6 +201,8 @@ public final class MimeTypes {
         || codec.startsWith("dvhe")
         || codec.startsWith("dvh1")) {
       return MimeTypes.VIDEO_DOLBY_VISION;
+    } else if (codec.startsWith("av01")) {
+      return MimeTypes.VIDEO_AV1;
     } else if (codec.startsWith("vp9") || codec.startsWith("vp09")) {
       return MimeTypes.VIDEO_VP9;
     } else if (codec.startsWith("vp8") || codec.startsWith("vp08")) {

From d229e1f4051694d82ed13a8598c9a402bf3fb6ad Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Mon, 18 Mar 2019 16:40:47 +0000
Subject: [PATCH 643/832] Add helper methods to check existence and delete
 ActionFiles

PiperOrigin-RevId: 239002281
---
 .../android/exoplayer2/offline/ActionFile.java      | 13 ++++++++++---
 .../google/android/exoplayer2/util/AtomicFile.java  |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
index f77c83b33b..a62fb02ff5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
@@ -31,13 +31,11 @@ public final class ActionFile {
   /* package */ static final int VERSION = 0;
 
   private final AtomicFile atomicFile;
-  private final File actionFile;
 
   /**
    * @param actionFile File to be used to store and load {@link DownloadAction}s.
    */
   public ActionFile(File actionFile) {
-    this.actionFile = actionFile;
     atomicFile = new AtomicFile(actionFile);
   }
 
@@ -48,7 +46,7 @@ public final class ActionFile {
    * @throws IOException If there is an error during loading.
    */
   public DownloadAction[] load() throws IOException {
-    if (!actionFile.exists()) {
+    if (!exists()) {
       return new DownloadAction[0];
     }
     InputStream inputStream = null;
@@ -93,4 +91,13 @@ public final class ActionFile {
     }
   }
 
+  /** Returns whether the file or its backup exists. */
+  public boolean exists() {
+    return atomicFile.exists();
+  }
+
+  /** Delete the action file and its backup. */
+  public void delete() {
+    atomicFile.delete();
+  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java b/library/core/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java
index 6fdb00dff2..74e50dfd92 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java
@@ -52,7 +52,7 @@ public final class AtomicFile {
     backupName = new File(baseName.getPath() + ".bak");
   }
 
-  /** Whether the file or its backup exists. */
+  /** Returns whether the file or its backup exists. */
   public boolean exists() {
     return baseName.exists() || backupName.exists();
   }

From d85ee01ae70f8702431e52c425a367e1343886b8 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Mon, 18 Mar 2019 18:00:43 +0000
Subject: [PATCH 644/832] Convert DownloadManager.Listener methods no-op
 default methods

PiperOrigin-RevId: 239019504
---
 .../exoplayer2/demo/DownloadTracker.java      | 19 -------------------
 .../exoplayer2/offline/DownloadManager.java   | 12 +++++++-----
 .../exoplayer2/offline/DownloadService.java   |  5 -----
 .../testutil/TestDownloadManagerListener.java |  7 -------
 4 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index 13e75ca9c2..6cac50db81 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -35,7 +35,6 @@ import com.google.android.exoplayer2.offline.DownloadService;
 import com.google.android.exoplayer2.offline.DownloadState;
 import com.google.android.exoplayer2.offline.DownloadStateCursor;
 import com.google.android.exoplayer2.offline.StreamKey;
-import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.util.Log;
@@ -129,11 +128,6 @@ public class DownloadTracker implements DownloadManager.Listener {
 
   // DownloadManager.Listener
 
-  @Override
-  public void onInitialized(DownloadManager downloadManager) {
-    // Do nothing.
-  }
-
   @Override
   public void onDownloadStateChanged(DownloadManager downloadManager, DownloadState downloadState) {
     if (downloadState.state == DownloadState.STATE_REMOVED
@@ -145,19 +139,6 @@ public class DownloadTracker implements DownloadManager.Listener {
     }
   }
 
-  @Override
-  public void onIdle(DownloadManager downloadManager) {
-    // Do nothing.
-  }
-
-  @Override
-  public void onRequirementsStateChanged(
-      DownloadManager downloadManager,
-      Requirements requirements,
-      @Requirements.RequirementFlags int notMetRequirements) {
-    // Do nothing.
-  }
-
   // Internal methods
 
   private void loadTrackedActions() {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 7cfe02eeb1..6b47299de5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -68,21 +68,23 @@ public final class DownloadManager {
      *
      * @param downloadManager The reporting instance.
      */
-    void onInitialized(DownloadManager downloadManager);
+    default void onInitialized(DownloadManager downloadManager) {}
+
     /**
      * Called when the state of a download changes.
      *
      * @param downloadManager The reporting instance.
      * @param downloadState The state of the download.
      */
-    void onDownloadStateChanged(DownloadManager downloadManager, DownloadState downloadState);
+    default void onDownloadStateChanged(
+        DownloadManager downloadManager, DownloadState downloadState) {}
 
     /**
      * Called when there is no active download left.
      *
      * @param downloadManager The reporting instance.
      */
-    void onIdle(DownloadManager downloadManager);
+    default void onIdle(DownloadManager downloadManager) {}
 
     /**
      * Called when the download requirements state changed.
@@ -92,10 +94,10 @@ public final class DownloadManager {
      * @param notMetRequirements {@link Requirements.RequirementFlags RequirementFlags} that are not
      *     met, or 0.
      */
-    void onRequirementsStateChanged(
+    default void onRequirementsStateChanged(
         DownloadManager downloadManager,
         Requirements requirements,
-        @Requirements.RequirementFlags int notMetRequirements);
+        @Requirements.RequirementFlags int notMetRequirements) {}
   }
 
   /** The default maximum number of simultaneous downloads. */
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index 3a782d80a7..b95e88cba8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -532,11 +532,6 @@ public abstract class DownloadService extends Service {
       }
     }
 
-    @Override
-    public void onInitialized(DownloadManager downloadManager) {
-      // Do nothing.
-    }
-
     @Override
     public void onDownloadStateChanged(
         DownloadManager downloadManager, DownloadState downloadState) {
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
index 2109cceda8..8216b881f3 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
@@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat;
 import android.os.ConditionVariable;
 import com.google.android.exoplayer2.offline.DownloadManager;
 import com.google.android.exoplayer2.offline.DownloadState;
-import com.google.android.exoplayer2.scheduler.Requirements;
 import java.util.HashMap;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.CountDownLatch;
@@ -83,12 +82,6 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
     }
   }
 
-  @Override
-  public void onRequirementsStateChanged(
-      DownloadManager downloadManager, Requirements requirements, int notMetRequirements) {
-    // Do nothing.
-  }
-
   /**
    * Blocks until all remove and download tasks are complete and throws an exception if there was an
    * error.

From b5e4523b584f8abcd054ededafd3aa3474f11229 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Mon, 18 Mar 2019 20:08:37 +0000
Subject: [PATCH 645/832] Remove index modifier methods from DownloadIndex
 interface

PiperOrigin-RevId: 239045412
---
 .../android/exoplayer2/demo/DownloadTracker.java   |  3 +--
 .../exoplayer2/offline/DefaultDownloadIndex.java   | 13 +++++++++++--
 .../android/exoplayer2/offline/DownloadIndex.java  | 14 --------------
 .../exoplayer2/offline/DownloadIndexUtil.java      |  5 +++--
 4 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index 6cac50db81..6fd186cd9e 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -29,7 +29,6 @@ import com.google.android.exoplayer2.offline.ActionFile;
 import com.google.android.exoplayer2.offline.DefaultDownloadIndex;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadHelper;
-import com.google.android.exoplayer2.offline.DownloadIndex;
 import com.google.android.exoplayer2.offline.DownloadManager;
 import com.google.android.exoplayer2.offline.DownloadService;
 import com.google.android.exoplayer2.offline.DownloadState;
@@ -68,7 +67,7 @@ public class DownloadTracker implements DownloadManager.Listener {
   private final DataSource.Factory dataSourceFactory;
   private final CopyOnWriteArraySet<Listener> listeners;
   private final HashMap<Uri, DownloadState> trackedDownloadStates;
-  private final DownloadIndex downloadIndex;
+  private final DefaultDownloadIndex downloadIndex;
   private final Handler indexHandler;
 
   @Nullable private StartDownloadDialogHelper startDownloadDialogHelper;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
index 5909c60d16..e84f90a811 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -183,7 +183,12 @@ public final class DefaultDownloadIndex implements DownloadIndex {
     return new DownloadStateCursorImpl(cursor);
   }
 
-  @Override
+  /**
+   * Adds or replaces a {@link DownloadState}.
+   *
+   * @param downloadState The {@link DownloadState} to be added.
+   * @throws DatabaseIOException If an error occurs setting the state.
+   */
   public void putDownloadState(DownloadState downloadState) throws DatabaseIOException {
     ensureInitialized();
     Assertions.checkState(downloadState.state != DownloadState.STATE_REMOVED);
@@ -212,7 +217,11 @@ public final class DefaultDownloadIndex implements DownloadIndex {
     }
   }
 
-  @Override
+  /**
+   * Removes the {@link DownloadState} with the given {@code id}.
+   *
+   * @throws DatabaseIOException If an error occurs removing the state.
+   */
   public void removeDownloadState(String id) throws DatabaseIOException {
     ensureInitialized();
     try {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java
index 8d997e07ff..a9a4c69954 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java
@@ -41,18 +41,4 @@ public interface DownloadIndex {
    */
   DownloadStateCursor getDownloadStates(@DownloadState.State int... states) throws IOException;
 
-  /**
-   * Adds or replaces a {@link DownloadState}.
-   *
-   * @param downloadState The {@link DownloadState} to be added.
-   * @throws IOException If an error occurs setting the state.
-   */
-  void putDownloadState(DownloadState downloadState) throws IOException;
-
-  /**
-   * Removes the {@link DownloadState} with the given {@code id}.
-   *
-   * @throws IOException If an error occurs removing the state.
-   */
-  void removeDownloadState(String id) throws IOException;
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
index ef1418b24f..524e71e9e2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
@@ -48,7 +48,7 @@ public final class DownloadIndexUtil {
    */
   public static void upgradeActionFile(
       ActionFile actionFile,
-      DownloadIndex downloadIndex,
+      DefaultDownloadIndex downloadIndex,
       @Nullable DownloadIdProvider downloadIdProvider)
       throws IOException {
     if (downloadIdProvider == null) {
@@ -72,7 +72,8 @@ public final class DownloadIndexUtil {
    * @throws IOException If an error occurs storing the state in the {@link DownloadIndex}.
    */
   public static void addAction(
-      DownloadIndex downloadIndex, @Nullable String id, DownloadAction action) throws IOException {
+      DefaultDownloadIndex downloadIndex, @Nullable String id, DownloadAction action)
+      throws IOException {
     DownloadState downloadState = downloadIndex.getDownloadState(id != null ? id : action.id);
     if (downloadState != null) {
       downloadState = downloadState.mergeAction(action);

From c81c14ae86dc736eda72c45baf0c5fe423e5d125 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Mon, 18 Mar 2019 21:53:29 +0000
Subject: [PATCH 646/832] Work around lack of LA_URL attributes in PlayReady
 key requests init data

PiperOrigin-RevId: 239066912
---
 RELEASENOTES.md                               |  1 +
 .../java/com/google/android/exoplayer2/C.java |  3 +
 .../exoplayer2/drm/FrameworkMediaDrm.java     | 67 +++++++++++++++++++
 3 files changed, 71 insertions(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 42ddce0b87..d12b369eb4 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -6,6 +6,7 @@
 * Add new `ExoPlaybackException` types for remote exceptions and out-of-memory
   errors.
 * HLS:
+  * Work around lack of LA_URL attribute in PlayReady key request init data.
   * Prevent unnecessary reloads of initialization segments.
   * Form an adaptive track group out of audio renditions with matching name.
   * Support encrypted initialization segments
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/C.java b/library/core/src/main/java/com/google/android/exoplayer2/C.java
index 2eed9f03a9..c3619f1dc3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/C.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/C.java
@@ -101,6 +101,9 @@ public final class C {
    */
   public static final String UTF16_NAME = "UTF-16";
 
+  /** The name of the UTF-16 little-endian charset. */
+  public static final String UTF16LE_NAME = "UTF-16LE";
+
   /**
    * The name of the serif font family.
    */
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
index ede979fc43..615aa0e7b1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
@@ -29,8 +29,13 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil;
 import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.MimeTypes;
+import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.Util;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -44,6 +49,10 @@ import java.util.UUID;
 public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto> {
 
   private static final String CENC_SCHEME_MIME_TYPE = "cenc";
+  private static final String MOCK_LA_URL_VALUE = "https://x";
+  private static final String MOCK_LA_URL = "<LA_URL>" + MOCK_LA_URL_VALUE + "</LA_URL>";
+  private static final int UTF_16_BYTES_PER_CHARACTER = 2;
+  private static final String TAG = "FrameworkMediaDrm";
 
   private final UUID uuid;
   private final MediaDrm mediaDrm;
@@ -139,6 +148,9 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
     byte[] requestData = adjustRequestData(uuid, request.getData());
 
     String licenseServerUrl = request.getDefaultUrl();
+    if (MOCK_LA_URL_VALUE.equals(licenseServerUrl)) {
+      licenseServerUrl = "";
+    }
     if (TextUtils.isEmpty(licenseServerUrl)
         && schemeData != null
         && !TextUtils.isEmpty(schemeData.licenseServerUrl)) {
@@ -277,6 +289,18 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
   }
 
   private static byte[] adjustRequestInitData(UUID uuid, byte[] initData) {
+    // TODO: Add API level check once [Internal ref: b/112142048] is fixed.
+    if (C.PLAYREADY_UUID.equals(uuid)) {
+      byte[] schemeSpecificData = PsshAtomUtil.parseSchemeSpecificData(initData, uuid);
+      if (schemeSpecificData == null) {
+        // The init data is not contained in a pssh box.
+        schemeSpecificData = initData;
+      }
+      initData =
+          PsshAtomUtil.buildPsshAtom(
+              C.PLAYREADY_UUID, addLaUrlAttributeIfMissing(schemeSpecificData));
+    }
+
     // Prior to L the Widevine CDM required data to be extracted from the PSSH atom. Some Amazon
     // devices also required data to be extracted from the PSSH atom for PlayReady.
     if ((Util.SDK_INT < 21 && C.WIDEVINE_UUID.equals(uuid))
@@ -324,4 +348,47 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
   private static boolean needsForceWidevineL3Workaround() {
     return "ASUS_Z00AD".equals(Util.MODEL);
   }
+
+  /**
+   * If the LA_URL tag is missing, injects a mock LA_URL value to avoid causing the CDM to throw
+   * when creating the key request. The LA_URL attribute is optional but some Android PlayReady
+   * implementations are known to require it. Does nothing it the provided {@code data} already
+   * contains an LA_URL value.
+   */
+  private static byte[] addLaUrlAttributeIfMissing(byte[] data) {
+    ParsableByteArray byteArray = new ParsableByteArray(data);
+    // See https://docs.microsoft.com/en-us/playready/specifications/specifications for more
+    // information about the init data format.
+    int length = byteArray.readLittleEndianInt();
+    int objectRecordCount = byteArray.readLittleEndianShort();
+    int recordType = byteArray.readLittleEndianShort();
+    if (objectRecordCount != 1 || recordType != 1) {
+      Log.i(TAG, "Unexpected record count or type. Skipping LA_URL workaround.");
+      return data;
+    }
+    int recordLength = byteArray.readLittleEndianShort();
+    String xml = byteArray.readString(recordLength, Charset.forName(C.UTF16LE_NAME));
+    if (xml.contains("<LA_URL>")) {
+      // LA_URL already present. Do nothing.
+      return data;
+    }
+    // This PlayReady object record does not include an LA_URL. We add a mock value for it.
+    int endOfDataTagIndex = xml.indexOf("</DATA>");
+    if (endOfDataTagIndex == -1) {
+      Log.w(TAG, "Could not find the </DATA> tag. Skipping LA_URL workaround.");
+    }
+    String xmlWithMockLaUrl =
+        xml.substring(/* beginIndex= */ 0, /* endIndex= */ endOfDataTagIndex)
+            + MOCK_LA_URL
+            + xml.substring(/* beginIndex= */ endOfDataTagIndex);
+    int extraBytes = MOCK_LA_URL.length() * UTF_16_BYTES_PER_CHARACTER;
+    ByteBuffer newData = ByteBuffer.allocate(length + extraBytes);
+    newData.order(ByteOrder.LITTLE_ENDIAN);
+    newData.putInt(length + extraBytes);
+    newData.putShort((short) objectRecordCount);
+    newData.putShort((short) recordType);
+    newData.putShort((short) (xmlWithMockLaUrl.length() * UTF_16_BYTES_PER_CHARACTER));
+    newData.put(xmlWithMockLaUrl.getBytes(Charset.forName(C.UTF16LE_NAME)));
+    return newData.array();
+  }
 }

From 8ffd7da890fcbe6d96d31db43746f4559c9d603a Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 19 Mar 2019 04:24:15 +0000
Subject: [PATCH 647/832] [libvpx] Add flag to experiment with the impact of
 input/output buffers

PiperOrigin-RevId: 239122083
---
 .../ext/vp9/LibvpxVideoRenderer.java          | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
index be4e358073..952e15aad6 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
@@ -98,12 +98,12 @@ public class LibvpxVideoRenderer extends BaseRenderer {
   public static final int MSG_SET_OUTPUT_BUFFER_RENDERER = C.MSG_CUSTOM_BASE;
 
   /** The number of input buffers. */
-  private static final int NUM_INPUT_BUFFERS = 4;
+  private final int numInputBuffers;
   /**
    * The number of output buffers. The renderer may limit the minimum possible value due to
    * requiring multiple output buffers to be dequeued at a time for it to make progress.
    */
-  private static final int NUM_OUTPUT_BUFFERS = 4;
+  private final int numOutputBuffers;
   /** The default input buffer size. */
   private static final int DEFAULT_INPUT_BUFFER_SIZE = 768 * 1024; // Value based on cs/SoftVpx.cpp.
 
@@ -220,7 +220,9 @@ public class LibvpxVideoRenderer extends BaseRenderer {
         playClearSamplesWithoutKeys,
         disableLoopFilter,
         /* enableRowMultiThreadMode= */ false,
-        getRuntime().availableProcessors());
+        getRuntime().availableProcessors(),
+        /* numInputBuffers= */ 8,
+        /* numOutputBuffers= */ 8);
   }
 
   /**
@@ -241,6 +243,8 @@ public class LibvpxVideoRenderer extends BaseRenderer {
    * @param disableLoopFilter Disable the libvpx in-loop smoothing filter.
    * @param enableRowMultiThreadMode Whether row multi threading decoding is enabled.
    * @param threads Number of threads libvpx will use to decode.
+   * @param numInputBuffers Number of input buffers.
+   * @param numOutputBuffers Number of output buffers.
    */
   public LibvpxVideoRenderer(
       long allowedJoiningTimeMs,
@@ -251,7 +255,9 @@ public class LibvpxVideoRenderer extends BaseRenderer {
       boolean playClearSamplesWithoutKeys,
       boolean disableLoopFilter,
       boolean enableRowMultiThreadMode,
-      int threads) {
+      int threads,
+      int numInputBuffers,
+      int numOutputBuffers) {
     super(C.TRACK_TYPE_VIDEO);
     this.disableLoopFilter = disableLoopFilter;
     this.allowedJoiningTimeMs = allowedJoiningTimeMs;
@@ -260,6 +266,8 @@ public class LibvpxVideoRenderer extends BaseRenderer {
     this.playClearSamplesWithoutKeys = playClearSamplesWithoutKeys;
     this.enableRowMultiThreadMode = enableRowMultiThreadMode;
     this.threads = threads;
+    this.numInputBuffers = numInputBuffers;
+    this.numOutputBuffers = numOutputBuffers;
     joiningDeadlineMs = C.TIME_UNSET;
     clearReportedVideoSize();
     formatHolder = new FormatHolder();
@@ -762,8 +770,8 @@ public class LibvpxVideoRenderer extends BaseRenderer {
           format.maxInputSize != Format.NO_VALUE ? format.maxInputSize : DEFAULT_INPUT_BUFFER_SIZE;
       decoder =
           new VpxDecoder(
-              NUM_INPUT_BUFFERS,
-              NUM_OUTPUT_BUFFERS,
+              numInputBuffers,
+              numOutputBuffers,
               initialInputBufferSize,
               mediaCrypto,
               disableLoopFilter,

From 2b42f0d35af80af4ae14a290a7250b1a5c3e2693 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 19 Mar 2019 09:06:56 +0000
Subject: [PATCH 648/832] Remove unnecessary check

PiperOrigin-RevId: 239149688
---
 .../exoplayer2/extractor/mp4/FragmentedMp4Extractor.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
index 116b0b88ef..efecbb60ac 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
@@ -1059,7 +1059,7 @@ public class FragmentedMp4Extractor implements Extractor {
     byte[] keyId = new byte[16];
     sgpd.readBytes(keyId, 0, keyId.length);
     byte[] constantIv = null;
-    if (isProtected && perSampleIvSize == 0) {
+    if (perSampleIvSize == 0) {
       int constantIvSize = sgpd.readUnsignedByte();
       constantIv = new byte[constantIvSize];
       sgpd.readBytes(constantIv, 0, constantIvSize);

From 35d82e1808566f9c39df9742add776bdcf0960f0 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 19 Mar 2019 10:14:54 +0000
Subject: [PATCH 649/832] Upgrade IMA to 3.10.9

PiperOrigin-RevId: 239157535
---
 extensions/ima/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle
index ee1a1940a4..c80fb26124 100644
--- a/extensions/ima/build.gradle
+++ b/extensions/ima/build.gradle
@@ -32,9 +32,9 @@ android {
 }
 
 dependencies {
-    api 'com.google.ads.interactivemedia.v3:interactivemedia:3.10.6'
+    api 'com.google.ads.interactivemedia.v3:interactivemedia:3.10.9'
     implementation project(modulePrefix + 'library-core')
-    implementation 'com.google.android.gms:play-services-ads:17.1.3'
+    implementation 'com.google.android.gms:play-services-ads:17.2.0'
     testImplementation project(modulePrefix + 'testutils-robolectric')
 }
 

From d775b9b4126fa0b920c08fdae89cafe437b12cf5 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 19 Mar 2019 23:33:17 +0000
Subject: [PATCH 650/832] Automated g4 rollback of changelist 237051112.

*** Original change description ***

Add SimpleCache deletion functionality

This is needed now that index data may be stored outside
of the cache directory.

***

PiperOrigin-RevId: 239294713
---
 .../cache/CacheFileMetadataIndex.java         | 41 +----------
 .../upstream/cache/CachedContentIndex.java    | 67 ++++++-----------
 .../upstream/cache/SimpleCache.java           | 72 ++++---------------
 3 files changed, 34 insertions(+), 146 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
index 084c02b11b..2b5f116d1f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
@@ -61,34 +61,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
   @MonotonicNonNull private String tableName;
 
-  /**
-   * Deletes index data for the specified cache.
-   *
-   * @param databaseProvider Provides the database in which the index is stored.
-   * @param uid The cache UID.
-   * @throws DatabaseIOException If an error occurs deleting the index data.
-   */
-  public static void delete(DatabaseProvider databaseProvider, long uid)
-      throws DatabaseIOException {
-    String hexUid = Long.toHexString(uid);
-    try {
-      String tableName = getTableName(hexUid);
-      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
-      writableDatabase.beginTransaction();
-      try {
-        VersionTable.removeVersion(
-            writableDatabase, VersionTable.FEATURE_CACHE_FILE_METADATA, hexUid);
-        dropTable(writableDatabase, tableName);
-        writableDatabase.setTransactionSuccessful();
-      } finally {
-        writableDatabase.endTransaction();
-      }
-    } catch (SQLException e) {
-      throw new DatabaseIOException(e);
-    }
-  }
-
-  /** @param databaseProvider Provides the database in which the index is stored. */
   public CacheFileMetadataIndex(DatabaseProvider databaseProvider) {
     this.databaseProvider = databaseProvider;
   }
@@ -96,13 +68,12 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
   /**
    * Initializes the index for the given cache UID.
    *
-   * @param uid The cache UID.
    * @throws DatabaseIOException If an error occurs initializing the index.
    */
   public void initialize(long uid) throws DatabaseIOException {
     try {
       String hexUid = Long.toHexString(uid);
-      tableName = getTableName(hexUid);
+      tableName = TABLE_PREFIX + hexUid;
       SQLiteDatabase readableDatabase = databaseProvider.getReadableDatabase();
       int version =
           VersionTable.getVersion(
@@ -113,7 +84,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
         try {
           VersionTable.setVersion(
               writableDatabase, VersionTable.FEATURE_CACHE_FILE_METADATA, hexUid, TABLE_VERSION);
-          dropTable(writableDatabase, tableName);
+          writableDatabase.execSQL("DROP TABLE IF EXISTS " + tableName);
           writableDatabase.execSQL("CREATE TABLE " + tableName + " " + TABLE_SCHEMA);
           writableDatabase.setTransactionSuccessful();
         } finally {
@@ -225,12 +196,4 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
             /* having= */ null,
             /* orderBy= */ null);
   }
-
-  private static void dropTable(SQLiteDatabase writableDatabase, String tableName) {
-    writableDatabase.execSQL("DROP TABLE IF EXISTS " + tableName);
-  }
-
-  private static String getTableName(String hexUid) {
-    return TABLE_PREFIX + hexUid;
-  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
index 8fa04e5338..c25c88a361 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
@@ -103,18 +103,6 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     return fileName.startsWith(FILE_NAME_ATOMIC);
   }
 
-  /**
-   * Deletes index data for the specified cache.
-   *
-   * @param databaseProvider Provides the database in which the index is stored.
-   * @param uid The cache UID.
-   * @throws DatabaseIOException If an error occurs deleting the index data.
-   */
-  public static void delete(DatabaseProvider databaseProvider, long uid)
-      throws DatabaseIOException {
-    DatabaseStorage.delete(databaseProvider, uid);
-  }
-
   /**
    * Creates an instance supporting database storage only.
    *
@@ -729,11 +717,6 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     private String hexUid;
     private String tableName;
 
-    public static void delete(DatabaseProvider databaseProvider, long uid)
-        throws DatabaseIOException {
-      delete(databaseProvider, Long.toHexString(uid));
-    }
-
     public DatabaseStorage(DatabaseProvider databaseProvider) {
       this.databaseProvider = databaseProvider;
       pendingUpdates = new SparseArray<>();
@@ -742,7 +725,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     @Override
     public void initialize(long uid) {
       hexUid = Long.toHexString(uid);
-      tableName = getTableName(hexUid);
+      tableName = TABLE_PREFIX + hexUid;
     }
 
     @Override
@@ -756,7 +739,20 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 
     @Override
     public void delete() throws DatabaseIOException {
-      delete(databaseProvider, hexUid);
+      try {
+        SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+        writableDatabase.beginTransaction();
+        try {
+          VersionTable.removeVersion(
+              writableDatabase, VersionTable.FEATURE_CACHE_CONTENT_METADATA, hexUid);
+          dropTable(writableDatabase);
+          writableDatabase.setTransactionSuccessful();
+        } finally {
+          writableDatabase.endTransaction();
+        }
+      } catch (SQLException e) {
+        throw new DatabaseIOException(e);
+      }
     }
 
     @Override
@@ -879,10 +875,14 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     private void initializeTable(SQLiteDatabase writableDatabase) throws DatabaseIOException {
       VersionTable.setVersion(
           writableDatabase, VersionTable.FEATURE_CACHE_CONTENT_METADATA, hexUid, TABLE_VERSION);
-      dropTable(writableDatabase, tableName);
+      dropTable(writableDatabase);
       writableDatabase.execSQL("CREATE TABLE " + tableName + " " + TABLE_SCHEMA);
     }
 
+    private void dropTable(SQLiteDatabase writableDatabase) {
+      writableDatabase.execSQL("DROP TABLE IF EXISTS " + tableName);
+    }
+
     private void deleteRow(SQLiteDatabase writableDatabase, int key) {
       writableDatabase.delete(tableName, WHERE_ID_EQUALS, new String[] {Integer.toString(key)});
     }
@@ -899,32 +899,5 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
       values.put(COLUMN_METADATA, data);
       writableDatabase.replaceOrThrow(tableName, /* nullColumnHack= */ null, values);
     }
-
-    private static void delete(DatabaseProvider databaseProvider, String hexUid)
-        throws DatabaseIOException {
-      try {
-        String tableName = getTableName(hexUid);
-        SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
-        writableDatabase.beginTransaction();
-        try {
-          VersionTable.removeVersion(
-              writableDatabase, VersionTable.FEATURE_CACHE_CONTENT_METADATA, hexUid);
-          dropTable(writableDatabase, tableName);
-          writableDatabase.setTransactionSuccessful();
-        } finally {
-          writableDatabase.endTransaction();
-        }
-      } catch (SQLException e) {
-        throw new DatabaseIOException(e);
-      }
-    }
-
-    private static void dropTable(SQLiteDatabase writableDatabase, String tableName) {
-      writableDatabase.execSQL("DROP TABLE IF EXISTS " + tableName);
-    }
-
-    private static String getTableName(String hexUid) {
-      return TABLE_PREFIX + hexUid;
-    }
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index 3e0d06ea12..a0fde79bee 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -19,11 +19,9 @@ import android.os.ConditionVariable;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.database.DatabaseIOException;
 import com.google.android.exoplayer2.database.DatabaseProvider;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
-import com.google.android.exoplayer2.util.Util;
 import java.io.File;
 import java.io.IOException;
 import java.security.SecureRandom;
@@ -38,13 +36,8 @@ import java.util.TreeSet;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 /**
- * A {@link Cache} implementation that maintains an in-memory representation.
- *
- * <p>Only one instance of SimpleCache is allowed for a given directory at a given time.
- *
- * <p>To delete a SimpleCache, use {@link #delete(File, DatabaseProvider)} rather than deleting the
- * directory and its contents directly. This is necessary to ensure that associated index data is
- * also removed.
+ * A {@link Cache} implementation that maintains an in-memory representation. Note, only one
+ * instance of SimpleCache is allowed for a given directory at a given time.
  */
 public final class SimpleCache implements Cache {
 
@@ -100,45 +93,6 @@ public final class SimpleCache implements Cache {
     lockedCacheDirs.clear();
   }
 
-  /**
-   * Deletes all content belonging to a cache instance.
-   *
-   * @param cacheDir The cache directory.
-   * @param databaseProvider The database in which index data is stored, or {@code null} if the
-   *     cache used a legacy index.
-   */
-  public static void delete(File cacheDir, @Nullable DatabaseProvider databaseProvider) {
-    if (!cacheDir.exists()) {
-      return;
-    }
-
-    File[] files = cacheDir.listFiles();
-    if (files == null) {
-      cacheDir.delete();
-      return;
-    }
-
-    if (databaseProvider != null) {
-      // Make a best effort to read the cache UID and delete associated index data before deleting
-      // cache directory itself.
-      long uid = loadUid(files);
-      if (uid != -1) {
-        try {
-          CacheFileMetadataIndex.delete(databaseProvider, uid);
-        } catch (DatabaseIOException e) {
-          Log.w(TAG, "Failed to delete file metadata: " + uid);
-        }
-        try {
-          CachedContentIndex.delete(databaseProvider, uid);
-        } catch (DatabaseIOException e) {
-          Log.w(TAG, "Failed to delete file metadata: " + uid);
-        }
-      }
-    }
-
-    Util.recursiveDelete(cacheDir);
-  }
-
   /**
    * Constructs the cache. The cache will delete any unrecognized files from the directory. Hence
    * the directory cannot be used to store other files.
@@ -570,14 +524,11 @@ public final class SimpleCache implements Cache {
       return;
     }
 
-    uid = loadUid(files);
-    if (uid == -1) {
-      try {
-        uid = createUid(cacheDir);
-      } catch (IOException e) {
-        initializationException = new CacheException("Failed to create cache UID: " + cacheDir);
-        return;
-      }
+    try {
+      uid = loadUid(cacheDir, files);
+    } catch (IOException e) {
+      initializationException = new CacheException("Failed to load cache UID: " + cacheDir);
+      return;
     }
 
     try {
@@ -735,13 +686,14 @@ public final class SimpleCache implements Cache {
   }
 
   /**
-   * Loads the cache UID from the files belonging to the root directory.
+   * Loads the cache UID from the files belonging to the root directory, generating one if needed.
    *
+   * @param directory The root directory.
    * @param files The files belonging to the root directory.
-   * @return The loaded UID, or -1 if a UID has not yet been created.
+   * @return The cache loaded UID.
    * @throws IOException If there is an error loading or generating the UID.
    */
-  private static long loadUid(File[] files) {
+  private static long loadUid(File directory, File[] files) throws IOException {
     for (File file : files) {
       String fileName = file.getName();
       if (fileName.endsWith(UID_FILE_SUFFIX)) {
@@ -754,7 +706,7 @@ public final class SimpleCache implements Cache {
         }
       }
     }
-    return -1;
+    return createUid(directory);
   }
 
   @SuppressWarnings("TrulyRandom")

From 448ca0cf7f7503e459ff7b428d1014bffc9bdc8a Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 20 Mar 2019 11:13:14 +0000
Subject: [PATCH 651/832] Sanitize internal parameter ordering in Format

This is a precursor to merging https://github.com/google/ExoPlayer/pull/5578

PiperOrigin-RevId: 239371046
---
 .../com/google/android/exoplayer2/Format.java | 496 +++++++++---------
 .../google/android/exoplayer2/FormatTest.java |  27 +-
 2 files changed, 274 insertions(+), 249 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Format.java b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
index 975f32f64d..da330bcf03 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Format.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
@@ -48,7 +48,8 @@ public final class Format implements Parcelable {
   public final @Nullable String id;
   /** The human readable label, or null if unknown or not applicable. */
   public final @Nullable String label;
-
+  /** Track selection flags. */
+  @C.SelectionFlags public final int selectionFlags;
   /**
    * The average bandwidth in bits per second, or {@link #NO_VALUE} if unknown or not applicable.
    */
@@ -153,15 +154,8 @@ public final class Format implements Parcelable {
 
   // Audio and text specific.
 
-  /**
-   * Track selection flags.
-   */
-  @C.SelectionFlags
-  public final int selectionFlags;
-
   /** The language as ISO 639-2/T three-letter code, or null if unknown or not applicable. */
   public final @Nullable String language;
-
   /**
    * The Accessibility channel, or {@link #NO_VALUE} if not known or applicable.
    */
@@ -213,11 +207,16 @@ public final class Format implements Parcelable {
     return new Format(
         id,
         label,
+        selectionFlags,
+        bitrate,
+        codecs,
+        /* metadata= */ null,
         containerMimeType,
         sampleMimeType,
-        codecs,
-        bitrate,
         /* maxInputSize= */ NO_VALUE,
+        initializationData,
+        /* drmInitData= */ null,
+        OFFSET_SAMPLE_RELATIVE,
         width,
         height,
         frameRate,
@@ -231,13 +230,8 @@ public final class Format implements Parcelable {
         /* pcmEncoding= */ NO_VALUE,
         /* encoderDelay= */ NO_VALUE,
         /* encoderPadding= */ NO_VALUE,
-        selectionFlags,
         /* language= */ null,
-        /* accessibilityChannel= */ NO_VALUE,
-        OFFSET_SAMPLE_RELATIVE,
-        initializationData,
-        /* drmInitData= */ null,
-        /* metadata= */ null);
+        /* accessibilityChannel= */ NO_VALUE);
   }
 
   public static Format createVideoSampleFormat(
@@ -316,11 +310,16 @@ public final class Format implements Parcelable {
     return new Format(
         id,
         /* label= */ null,
+        /* selectionFlags= */ 0,
+        bitrate,
+        codecs,
+        /* metadata= */ null,
         /* containerMimeType= */ null,
         sampleMimeType,
-        codecs,
-        bitrate,
         maxInputSize,
+        initializationData,
+        drmInitData,
+        OFFSET_SAMPLE_RELATIVE,
         width,
         height,
         frameRate,
@@ -334,13 +333,8 @@ public final class Format implements Parcelable {
         /* pcmEncoding= */ NO_VALUE,
         /* encoderDelay= */ NO_VALUE,
         /* encoderPadding= */ NO_VALUE,
-        /* selectionFlags= */ 0,
         /* language= */ null,
-        /* accessibilityChannel= */ NO_VALUE,
-        OFFSET_SAMPLE_RELATIVE,
-        initializationData,
-        drmInitData,
-        /* metadata= */ null);
+        /* accessibilityChannel= */ NO_VALUE);
   }
 
   // Audio.
@@ -386,11 +380,16 @@ public final class Format implements Parcelable {
     return new Format(
         id,
         label,
+        selectionFlags,
+        bitrate,
+        codecs,
+        /* metadata= */ null,
         containerMimeType,
         sampleMimeType,
-        codecs,
-        bitrate,
         /* maxInputSize= */ NO_VALUE,
+        initializationData,
+        /* drmInitData= */ null,
+        OFFSET_SAMPLE_RELATIVE,
         /* width= */ NO_VALUE,
         /* height= */ NO_VALUE,
         /* frameRate= */ NO_VALUE,
@@ -404,13 +403,8 @@ public final class Format implements Parcelable {
         /* pcmEncoding= */ NO_VALUE,
         /* encoderDelay= */ NO_VALUE,
         /* encoderPadding= */ NO_VALUE,
-        selectionFlags,
         language,
-        /* accessibilityChannel= */ NO_VALUE,
-        OFFSET_SAMPLE_RELATIVE,
-        initializationData,
-        /* drmInitData= */ null,
-        /* metadata= */ null);
+        /* accessibilityChannel= */ NO_VALUE);
   }
 
   public static Format createAudioSampleFormat(
@@ -490,11 +484,16 @@ public final class Format implements Parcelable {
     return new Format(
         id,
         /* label= */ null,
+        selectionFlags,
+        bitrate,
+        codecs,
+        metadata,
         /* containerMimeType= */ null,
         sampleMimeType,
-        codecs,
-        bitrate,
         maxInputSize,
+        initializationData,
+        drmInitData,
+        OFFSET_SAMPLE_RELATIVE,
         /* width= */ NO_VALUE,
         /* height= */ NO_VALUE,
         /* frameRate= */ NO_VALUE,
@@ -508,13 +507,8 @@ public final class Format implements Parcelable {
         pcmEncoding,
         encoderDelay,
         encoderPadding,
-        selectionFlags,
         language,
-        /* accessibilityChannel= */ NO_VALUE,
-        OFFSET_SAMPLE_RELATIVE,
-        initializationData,
-        drmInitData,
-        metadata);
+        /* accessibilityChannel= */ NO_VALUE);
   }
 
   // Text.
@@ -573,11 +567,16 @@ public final class Format implements Parcelable {
     return new Format(
         id,
         label,
+        selectionFlags,
+        bitrate,
+        codecs,
+        /* metadata= */ null,
         containerMimeType,
         sampleMimeType,
-        codecs,
-        bitrate,
         /* maxInputSize= */ NO_VALUE,
+        /* initializationData= */ null,
+        /* drmInitData= */ null,
+        OFFSET_SAMPLE_RELATIVE,
         /* width= */ NO_VALUE,
         /* height= */ NO_VALUE,
         /* frameRate= */ NO_VALUE,
@@ -591,13 +590,8 @@ public final class Format implements Parcelable {
         /* pcmEncoding= */ NO_VALUE,
         /* encoderDelay= */ NO_VALUE,
         /* encoderPadding= */ NO_VALUE,
-        selectionFlags,
         language,
-        accessibilityChannel,
-        OFFSET_SAMPLE_RELATIVE,
-        /* initializationData= */ null,
-        /* drmInitData= */ null,
-        /* metadata= */ null);
+        accessibilityChannel);
   }
 
   public static Format createTextSampleFormat(
@@ -685,11 +679,16 @@ public final class Format implements Parcelable {
     return new Format(
         id,
         /* label= */ null,
+        selectionFlags,
+        bitrate,
+        codecs,
+        /* metadata= */ null,
         /* containerMimeType= */ null,
         sampleMimeType,
-        codecs,
-        bitrate,
         /* maxInputSize= */ NO_VALUE,
+        initializationData,
+        drmInitData,
+        subsampleOffsetUs,
         /* width= */ NO_VALUE,
         /* height= */ NO_VALUE,
         /* frameRate= */ NO_VALUE,
@@ -703,13 +702,8 @@ public final class Format implements Parcelable {
         /* pcmEncoding= */ NO_VALUE,
         /* encoderDelay= */ NO_VALUE,
         /* encoderPadding= */ NO_VALUE,
-        selectionFlags,
         language,
-        accessibilityChannel,
-        subsampleOffsetUs,
-        initializationData,
-        drmInitData,
-        /* metadata= */ null);
+        accessibilityChannel);
   }
 
   // Image.
@@ -726,11 +720,16 @@ public final class Format implements Parcelable {
     return new Format(
         id,
         /* label= */ null,
+        selectionFlags,
+        bitrate,
+        codecs,
+        /* metadata=*/ null,
         /* containerMimeType= */ null,
         sampleMimeType,
-        codecs,
-        bitrate,
         /* maxInputSize= */ NO_VALUE,
+        initializationData,
+        drmInitData,
+        OFFSET_SAMPLE_RELATIVE,
         /* width= */ NO_VALUE,
         /* height= */ NO_VALUE,
         /* frameRate= */ NO_VALUE,
@@ -744,13 +743,8 @@ public final class Format implements Parcelable {
         /* pcmEncoding= */ NO_VALUE,
         /* encoderDelay= */ NO_VALUE,
         /* encoderPadding= */ NO_VALUE,
-        selectionFlags,
         language,
-        /* accessibilityChannel= */ NO_VALUE,
-        OFFSET_SAMPLE_RELATIVE,
-        initializationData,
-        drmInitData,
-        /* metadata=*/ null);
+        /* accessibilityChannel= */ NO_VALUE);
   }
 
   // Generic.
@@ -787,11 +781,16 @@ public final class Format implements Parcelable {
     return new Format(
         id,
         label,
+        selectionFlags,
+        bitrate,
+        codecs,
+        /* metadata= */ null,
         containerMimeType,
         sampleMimeType,
-        codecs,
-        bitrate,
         /* maxInputSize= */ NO_VALUE,
+        /* initializationData= */ null,
+        /* drmInitData= */ null,
+        OFFSET_SAMPLE_RELATIVE,
         /* width= */ NO_VALUE,
         /* height= */ NO_VALUE,
         /* frameRate= */ NO_VALUE,
@@ -805,13 +804,8 @@ public final class Format implements Parcelable {
         /* pcmEncoding= */ NO_VALUE,
         /* encoderDelay= */ NO_VALUE,
         /* encoderPadding= */ NO_VALUE,
-        selectionFlags,
         language,
-        /* accessibilityChannel= */ NO_VALUE,
-        OFFSET_SAMPLE_RELATIVE,
-        /* initializationData= */ null,
-        /* drmInitData= */ null,
-        /* metadata= */ null);
+        /* accessibilityChannel= */ NO_VALUE);
   }
 
   public static Format createSampleFormat(
@@ -819,11 +813,16 @@ public final class Format implements Parcelable {
     return new Format(
         id,
         /* label= */ null,
+        /* selectionFlags= */ 0,
+        /* bitrate= */ NO_VALUE,
+        /* codecs= */ null,
+        /* metadata= */ null,
         /* containerMimeType= */ null,
         sampleMimeType,
-        /* codecs= */ null,
-        /* bitrate= */ NO_VALUE,
         /* maxInputSize= */ NO_VALUE,
+        /* initializationData= */ null,
+        /* drmInitData= */ null,
+        subsampleOffsetUs,
         /* width= */ NO_VALUE,
         /* height= */ NO_VALUE,
         /* frameRate= */ NO_VALUE,
@@ -837,13 +836,8 @@ public final class Format implements Parcelable {
         /* pcmEncoding= */ NO_VALUE,
         /* encoderDelay= */ NO_VALUE,
         /* encoderPadding= */ NO_VALUE,
-        /* selectionFlags= */ 0,
         /* language= */ null,
-        /* accessibilityChannel= */ NO_VALUE,
-        subsampleOffsetUs,
-        /* initializationData= */ null,
-        /* drmInitData= */ null,
-        /* metadata= */ null);
+        /* accessibilityChannel= */ NO_VALUE);
   }
 
   public static Format createSampleFormat(
@@ -855,11 +849,16 @@ public final class Format implements Parcelable {
     return new Format(
         id,
         /* label= */ null,
+        /* selectionFlags= */ 0,
+        bitrate,
+        codecs,
+        /* metadata= */ null,
         /* containerMimeType= */ null,
         sampleMimeType,
-        codecs,
-        bitrate,
         /* maxInputSize= */ NO_VALUE,
+        /* initializationData= */ null,
+        drmInitData,
+        OFFSET_SAMPLE_RELATIVE,
         /* width= */ NO_VALUE,
         /* height= */ NO_VALUE,
         /* frameRate= */ NO_VALUE,
@@ -873,23 +872,26 @@ public final class Format implements Parcelable {
         /* pcmEncoding= */ NO_VALUE,
         /* encoderDelay= */ NO_VALUE,
         /* encoderPadding= */ NO_VALUE,
-        /* selectionFlags= */ 0,
         /* language= */ null,
-        /* accessibilityChannel= */ NO_VALUE,
-        OFFSET_SAMPLE_RELATIVE,
-        /* initializationData= */ null,
-        drmInitData,
-        /* metadata= */ null);
+        /* accessibilityChannel= */ NO_VALUE);
   }
 
   /* package */ Format(
       @Nullable String id,
       @Nullable String label,
-      @Nullable String containerMimeType,
-      @Nullable String sampleMimeType,
-      @Nullable String codecs,
+      @C.SelectionFlags int selectionFlags,
       int bitrate,
+      @Nullable String codecs,
+      @Nullable Metadata metadata,
+      // Container specific.
+      @Nullable String containerMimeType,
+      // Elementary stream specific.
+      @Nullable String sampleMimeType,
       int maxInputSize,
+      @Nullable List<byte[]> initializationData,
+      @Nullable DrmInitData drmInitData,
+      long subsampleOffsetUs,
+      // Video specific.
       int width,
       int height,
       float frameRate,
@@ -898,25 +900,31 @@ public final class Format implements Parcelable {
       @Nullable byte[] projectionData,
       @C.StereoMode int stereoMode,
       @Nullable ColorInfo colorInfo,
+      // Audio specific.
       int channelCount,
       int sampleRate,
       @C.PcmEncoding int pcmEncoding,
       int encoderDelay,
       int encoderPadding,
-      @C.SelectionFlags int selectionFlags,
+      // Audio and text specific.
       @Nullable String language,
-      int accessibilityChannel,
-      long subsampleOffsetUs,
-      @Nullable List<byte[]> initializationData,
-      @Nullable DrmInitData drmInitData,
-      @Nullable Metadata metadata) {
+      int accessibilityChannel) {
     this.id = id;
     this.label = label;
-    this.containerMimeType = containerMimeType;
-    this.sampleMimeType = sampleMimeType;
-    this.codecs = codecs;
+    this.selectionFlags = selectionFlags;
     this.bitrate = bitrate;
+    this.codecs = codecs;
+    this.metadata = metadata;
+    // Container specific.
+    this.containerMimeType = containerMimeType;
+    // Elementary stream specific.
+    this.sampleMimeType = sampleMimeType;
     this.maxInputSize = maxInputSize;
+    this.initializationData =
+        initializationData == null ? Collections.emptyList() : initializationData;
+    this.drmInitData = drmInitData;
+    this.subsampleOffsetUs = subsampleOffsetUs;
+    // Video specific.
     this.width = width;
     this.height = height;
     this.frameRate = frameRate;
@@ -926,30 +934,38 @@ public final class Format implements Parcelable {
     this.projectionData = projectionData;
     this.stereoMode = stereoMode;
     this.colorInfo = colorInfo;
+    // Audio specific.
     this.channelCount = channelCount;
     this.sampleRate = sampleRate;
     this.pcmEncoding = pcmEncoding;
     this.encoderDelay = encoderDelay == Format.NO_VALUE ? 0 : encoderDelay;
     this.encoderPadding = encoderPadding == Format.NO_VALUE ? 0 : encoderPadding;
-    this.selectionFlags = selectionFlags;
+    // Audio and text specific.
     this.language = Util.normalizeLanguageCode(language);
     this.accessibilityChannel = accessibilityChannel;
-    this.subsampleOffsetUs = subsampleOffsetUs;
-    this.initializationData =
-        initializationData == null ? Collections.emptyList() : initializationData;
-    this.drmInitData = drmInitData;
-    this.metadata = metadata;
   }
 
   @SuppressWarnings("ResourceType")
   /* package */ Format(Parcel in) {
     id = in.readString();
     label = in.readString();
-    containerMimeType = in.readString();
-    sampleMimeType = in.readString();
-    codecs = in.readString();
+    selectionFlags = in.readInt();
     bitrate = in.readInt();
+    codecs = in.readString();
+    metadata = in.readParcelable(Metadata.class.getClassLoader());
+    // Container specific.
+    containerMimeType = in.readString();
+    // Elementary stream specific.
+    sampleMimeType = in.readString();
     maxInputSize = in.readInt();
+    int initializationDataSize = in.readInt();
+    initializationData = new ArrayList<>(initializationDataSize);
+    for (int i = 0; i < initializationDataSize; i++) {
+      initializationData.add(in.createByteArray());
+    }
+    drmInitData = in.readParcelable(DrmInitData.class.getClassLoader());
+    subsampleOffsetUs = in.readLong();
+    // Video specific.
     width = in.readInt();
     height = in.readInt();
     frameRate = in.readFloat();
@@ -959,33 +975,32 @@ public final class Format implements Parcelable {
     projectionData = hasProjectionData ? in.createByteArray() : null;
     stereoMode = in.readInt();
     colorInfo = in.readParcelable(ColorInfo.class.getClassLoader());
+    // Audio specific.
     channelCount = in.readInt();
     sampleRate = in.readInt();
     pcmEncoding = in.readInt();
     encoderDelay = in.readInt();
     encoderPadding = in.readInt();
-    selectionFlags = in.readInt();
+    // Audio and text specific.
     language = in.readString();
     accessibilityChannel = in.readInt();
-    subsampleOffsetUs = in.readLong();
-    int initializationDataSize = in.readInt();
-    initializationData = new ArrayList<>(initializationDataSize);
-    for (int i = 0; i < initializationDataSize; i++) {
-      initializationData.add(in.createByteArray());
-    }
-    drmInitData = in.readParcelable(DrmInitData.class.getClassLoader());
-    metadata = in.readParcelable(Metadata.class.getClassLoader());
   }
 
+
   public Format copyWithMaxInputSize(int maxInputSize) {
     return new Format(
         id,
         label,
+        selectionFlags,
+        bitrate,
+        codecs,
+        metadata,
         containerMimeType,
         sampleMimeType,
-        codecs,
-        bitrate,
         maxInputSize,
+        initializationData,
+        drmInitData,
+        subsampleOffsetUs,
         width,
         height,
         frameRate,
@@ -999,24 +1014,24 @@ public final class Format implements Parcelable {
         pcmEncoding,
         encoderDelay,
         encoderPadding,
-        selectionFlags,
         language,
-        accessibilityChannel,
-        subsampleOffsetUs,
-        initializationData,
-        drmInitData,
-        metadata);
+        accessibilityChannel);
   }
 
   public Format copyWithSubsampleOffsetUs(long subsampleOffsetUs) {
     return new Format(
         id,
         label,
+        selectionFlags,
+        bitrate,
+        codecs,
+        metadata,
         containerMimeType,
         sampleMimeType,
-        codecs,
-        bitrate,
         maxInputSize,
+        initializationData,
+        drmInitData,
+        subsampleOffsetUs,
         width,
         height,
         frameRate,
@@ -1030,13 +1045,8 @@ public final class Format implements Parcelable {
         pcmEncoding,
         encoderDelay,
         encoderPadding,
-        selectionFlags,
         language,
-        accessibilityChannel,
-        subsampleOffsetUs,
-        initializationData,
-        drmInitData,
-        metadata);
+        accessibilityChannel);
   }
 
   public Format copyWithContainerInfo(
@@ -1053,11 +1063,16 @@ public final class Format implements Parcelable {
     return new Format(
         id,
         label,
+        selectionFlags,
+        bitrate,
+        codecs,
+        metadata,
         containerMimeType,
         sampleMimeType,
-        codecs,
-        bitrate,
         maxInputSize,
+        initializationData,
+        drmInitData,
+        subsampleOffsetUs,
         width,
         height,
         frameRate,
@@ -1071,13 +1086,8 @@ public final class Format implements Parcelable {
         pcmEncoding,
         encoderDelay,
         encoderPadding,
-        selectionFlags,
         language,
-        accessibilityChannel,
-        subsampleOffsetUs,
-        initializationData,
-        drmInitData,
-        metadata);
+        accessibilityChannel);
   }
 
   @SuppressWarnings("ReferenceEquality")
@@ -1124,11 +1134,16 @@ public final class Format implements Parcelable {
     return new Format(
         id,
         label,
+        selectionFlags,
+        bitrate,
+        codecs,
+        metadata,
         containerMimeType,
         sampleMimeType,
-        codecs,
-        bitrate,
         maxInputSize,
+        initializationData,
+        drmInitData,
+        subsampleOffsetUs,
         width,
         height,
         frameRate,
@@ -1142,24 +1157,24 @@ public final class Format implements Parcelable {
         pcmEncoding,
         encoderDelay,
         encoderPadding,
-        selectionFlags,
         language,
-        accessibilityChannel,
-        subsampleOffsetUs,
-        initializationData,
-        drmInitData,
-        metadata);
+        accessibilityChannel);
   }
 
   public Format copyWithGaplessInfo(int encoderDelay, int encoderPadding) {
     return new Format(
         id,
         label,
+        selectionFlags,
+        bitrate,
+        codecs,
+        metadata,
         containerMimeType,
         sampleMimeType,
-        codecs,
-        bitrate,
         maxInputSize,
+        initializationData,
+        drmInitData,
+        subsampleOffsetUs,
         width,
         height,
         frameRate,
@@ -1173,24 +1188,24 @@ public final class Format implements Parcelable {
         pcmEncoding,
         encoderDelay,
         encoderPadding,
-        selectionFlags,
         language,
-        accessibilityChannel,
-        subsampleOffsetUs,
-        initializationData,
-        drmInitData,
-        metadata);
+        accessibilityChannel);
   }
 
   public Format copyWithFrameRate(float frameRate) {
     return new Format(
         id,
         label,
+        selectionFlags,
+        bitrate,
+        codecs,
+        metadata,
         containerMimeType,
         sampleMimeType,
-        codecs,
-        bitrate,
         maxInputSize,
+        initializationData,
+        drmInitData,
+        subsampleOffsetUs,
         width,
         height,
         frameRate,
@@ -1204,24 +1219,24 @@ public final class Format implements Parcelable {
         pcmEncoding,
         encoderDelay,
         encoderPadding,
-        selectionFlags,
         language,
-        accessibilityChannel,
-        subsampleOffsetUs,
-        initializationData,
-        drmInitData,
-        metadata);
+        accessibilityChannel);
   }
 
   public Format copyWithDrmInitData(@Nullable DrmInitData drmInitData) {
     return new Format(
         id,
         label,
+        selectionFlags,
+        bitrate,
+        codecs,
+        metadata,
         containerMimeType,
         sampleMimeType,
-        codecs,
-        bitrate,
         maxInputSize,
+        initializationData,
+        drmInitData,
+        subsampleOffsetUs,
         width,
         height,
         frameRate,
@@ -1235,24 +1250,24 @@ public final class Format implements Parcelable {
         pcmEncoding,
         encoderDelay,
         encoderPadding,
-        selectionFlags,
         language,
-        accessibilityChannel,
-        subsampleOffsetUs,
-        initializationData,
-        drmInitData,
-        metadata);
+        accessibilityChannel);
   }
 
   public Format copyWithMetadata(@Nullable Metadata metadata) {
     return new Format(
         id,
         label,
+        selectionFlags,
+        bitrate,
+        codecs,
+        metadata,
         containerMimeType,
         sampleMimeType,
-        codecs,
-        bitrate,
         maxInputSize,
+        initializationData,
+        drmInitData,
+        subsampleOffsetUs,
         width,
         height,
         frameRate,
@@ -1266,24 +1281,24 @@ public final class Format implements Parcelable {
         pcmEncoding,
         encoderDelay,
         encoderPadding,
-        selectionFlags,
         language,
-        accessibilityChannel,
-        subsampleOffsetUs,
-        initializationData,
-        drmInitData,
-        metadata);
+        accessibilityChannel);
   }
 
   public Format copyWithRotationDegrees(int rotationDegrees) {
     return new Format(
         id,
         label,
+        selectionFlags,
+        bitrate,
+        codecs,
+        metadata,
         containerMimeType,
         sampleMimeType,
-        codecs,
-        bitrate,
         maxInputSize,
+        initializationData,
+        drmInitData,
+        subsampleOffsetUs,
         width,
         height,
         frameRate,
@@ -1297,24 +1312,24 @@ public final class Format implements Parcelable {
         pcmEncoding,
         encoderDelay,
         encoderPadding,
-        selectionFlags,
         language,
-        accessibilityChannel,
-        subsampleOffsetUs,
-        initializationData,
-        drmInitData,
-        metadata);
+        accessibilityChannel);
   }
 
   public Format copyWithBitrate(int bitrate) {
     return new Format(
         id,
         label,
+        selectionFlags,
+        bitrate,
+        codecs,
+        metadata,
         containerMimeType,
         sampleMimeType,
-        codecs,
-        bitrate,
         maxInputSize,
+        initializationData,
+        drmInitData,
+        subsampleOffsetUs,
         width,
         height,
         frameRate,
@@ -1328,13 +1343,8 @@ public final class Format implements Parcelable {
         pcmEncoding,
         encoderDelay,
         encoderPadding,
-        selectionFlags,
         language,
-        accessibilityChannel,
-        subsampleOffsetUs,
-        initializationData,
-        drmInitData,
-        metadata);
+        accessibilityChannel);
   }
 
   /**
@@ -1378,32 +1388,40 @@ public final class Format implements Parcelable {
   @Override
   public int hashCode() {
     if (hashCode == 0) {
+      // Some fields for which hashing is expensive are deliberately omitted.
       int result = 17;
       result = 31 * result + (id == null ? 0 : id.hashCode());
-      result = 31 * result + (containerMimeType == null ? 0 : containerMimeType.hashCode());
-      result = 31 * result + (sampleMimeType == null ? 0 : sampleMimeType.hashCode());
-      result = 31 * result + (codecs == null ? 0 : codecs.hashCode());
+      result = 31 * result + (label != null ? label.hashCode() : 0);
+      result = 31 * result + selectionFlags;
       result = 31 * result + bitrate;
+      result = 31 * result + (codecs == null ? 0 : codecs.hashCode());
+      result = 31 * result + (metadata == null ? 0 : metadata.hashCode());
+      // Container specific.
+      result = 31 * result + (containerMimeType == null ? 0 : containerMimeType.hashCode());
+      // Elementary stream specific.
+      result = 31 * result + (sampleMimeType == null ? 0 : sampleMimeType.hashCode());
+      result = 31 * result + maxInputSize;
+      // [Omitted] initializationData.
+      // [Omitted] drmInitData.
+      result = 31 * result + (int) subsampleOffsetUs;
+      // Video specific.
       result = 31 * result + width;
       result = 31 * result + height;
+      result = 31 * result + Float.floatToIntBits(frameRate);
+      result = 31 * result + rotationDegrees;
+      result = 31 * result + Float.floatToIntBits(pixelWidthHeightRatio);
+      // [Omitted] projectionData.
+      result = 31 * result + stereoMode;
+      // [Omitted] colorInfo.
+      // Audio specific.
       result = 31 * result + channelCount;
       result = 31 * result + sampleRate;
-      result = 31 * result + (language == null ? 0 : language.hashCode());
-      result = 31 * result + accessibilityChannel;
-      result = 31 * result + (drmInitData == null ? 0 : drmInitData.hashCode());
-      result = 31 * result + (metadata == null ? 0 : metadata.hashCode());
-      result = 31 * result + (label != null ? label.hashCode() : 0);
-      result = 31 * result + maxInputSize;
-      result = 31 * result + (int) subsampleOffsetUs;
-      result = 31 * result + Float.floatToIntBits(frameRate);
-      result = 31 * result + Float.floatToIntBits(pixelWidthHeightRatio);
-      result = 31 * result + rotationDegrees;
-      result = 31 * result + stereoMode;
       result = 31 * result + pcmEncoding;
       result = 31 * result + encoderDelay;
       result = 31 * result + encoderPadding;
-      result = 31 * result + selectionFlags;
-      // Not all of the fields are included to keep the calculation quick enough.
+      // Audio and text specific.
+      result = 31 * result + (language == null ? 0 : language.hashCode());
+      result = 31 * result + accessibilityChannel;
       hashCode = result;
     }
     return hashCode;
@@ -1421,32 +1439,33 @@ public final class Format implements Parcelable {
     if (hashCode != 0 && other.hashCode != 0 && hashCode != other.hashCode) {
       return false;
     }
-    return bitrate == other.bitrate
+    // Field equality checks ordered by type, with the cheapest checks first.
+    return selectionFlags == other.selectionFlags
+        && bitrate == other.bitrate
         && maxInputSize == other.maxInputSize
+        && subsampleOffsetUs == other.subsampleOffsetUs
         && width == other.width
         && height == other.height
-        && Float.compare(frameRate, other.frameRate) == 0
         && rotationDegrees == other.rotationDegrees
-        && Float.compare(pixelWidthHeightRatio, other.pixelWidthHeightRatio) == 0
         && stereoMode == other.stereoMode
         && channelCount == other.channelCount
         && sampleRate == other.sampleRate
         && pcmEncoding == other.pcmEncoding
         && encoderDelay == other.encoderDelay
         && encoderPadding == other.encoderPadding
-        && subsampleOffsetUs == other.subsampleOffsetUs
-        && selectionFlags == other.selectionFlags
+        && accessibilityChannel == other.accessibilityChannel
+        && Float.compare(frameRate, other.frameRate) == 0
+        && Float.compare(pixelWidthHeightRatio, other.pixelWidthHeightRatio) == 0
         && Util.areEqual(id, other.id)
         && Util.areEqual(label, other.label)
-        && Util.areEqual(language, other.language)
-        && accessibilityChannel == other.accessibilityChannel
+        && Util.areEqual(codecs, other.codecs)
         && Util.areEqual(containerMimeType, other.containerMimeType)
         && Util.areEqual(sampleMimeType, other.sampleMimeType)
-        && Util.areEqual(codecs, other.codecs)
-        && Util.areEqual(drmInitData, other.drmInitData)
+        && Util.areEqual(language, other.language)
+        && Arrays.equals(projectionData, other.projectionData)
         && Util.areEqual(metadata, other.metadata)
         && Util.areEqual(colorInfo, other.colorInfo)
-        && Arrays.equals(projectionData, other.projectionData)
+        && Util.areEqual(drmInitData, other.drmInitData)
         && initializationDataEquals(other);
   }
 
@@ -1517,11 +1536,23 @@ public final class Format implements Parcelable {
   public void writeToParcel(Parcel dest, int flags) {
     dest.writeString(id);
     dest.writeString(label);
-    dest.writeString(containerMimeType);
-    dest.writeString(sampleMimeType);
-    dest.writeString(codecs);
+    dest.writeInt(selectionFlags);
     dest.writeInt(bitrate);
+    dest.writeString(codecs);
+    dest.writeParcelable(metadata, 0);
+    // Container specific.
+    dest.writeString(containerMimeType);
+    // Elementary stream specific.
+    dest.writeString(sampleMimeType);
     dest.writeInt(maxInputSize);
+    int initializationDataSize = initializationData.size();
+    dest.writeInt(initializationDataSize);
+    for (int i = 0; i < initializationDataSize; i++) {
+      dest.writeByteArray(initializationData.get(i));
+    }
+    dest.writeParcelable(drmInitData, 0);
+    dest.writeLong(subsampleOffsetUs);
+    // Video specific.
     dest.writeInt(width);
     dest.writeInt(height);
     dest.writeFloat(frameRate);
@@ -1533,22 +1564,15 @@ public final class Format implements Parcelable {
     }
     dest.writeInt(stereoMode);
     dest.writeParcelable(colorInfo, flags);
+    // Audio specific.
     dest.writeInt(channelCount);
     dest.writeInt(sampleRate);
     dest.writeInt(pcmEncoding);
     dest.writeInt(encoderDelay);
     dest.writeInt(encoderPadding);
-    dest.writeInt(selectionFlags);
+    // Audio and text specific.
     dest.writeString(language);
     dest.writeInt(accessibilityChannel);
-    dest.writeLong(subsampleOffsetUs);
-    int initializationDataSize = initializationData.size();
-    dest.writeInt(initializationDataSize);
-    for (int i = 0; i < initializationDataSize; i++) {
-      dest.writeByteArray(initializationData.get(i));
-    }
-    dest.writeParcelable(drmInitData, 0);
-    dest.writeParcelable(metadata, 0);
   }
 
   public static final Creator<Format> CREATOR = new Creator<Format>() {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/FormatTest.java b/library/core/src/test/java/com/google/android/exoplayer2/FormatTest.java
index acb9e4d1ce..e2e6b6cdfa 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/FormatTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/FormatTest.java
@@ -38,14 +38,15 @@ import org.junit.runner.RunWith;
 @RunWith(AndroidJUnit4.class)
 public final class FormatTest {
 
-  private static final List<byte[]> INIT_DATA;
+  private static final List<byte[]> initData;
+
   static {
     byte[] initData1 = new byte[] {1, 2, 3};
     byte[] initData2 = new byte[] {4, 5, 6};
-    List<byte[]> initData = new ArrayList<>();
-    initData.add(initData1);
-    initData.add(initData2);
-    INIT_DATA = Collections.unmodifiableList(initData);
+    List<byte[]> initDataList = new ArrayList<>();
+    initDataList.add(initData1);
+    initDataList.add(initData2);
+    initData = Collections.unmodifiableList(initDataList);
   }
 
   @Test
@@ -66,11 +67,16 @@ public final class FormatTest {
         new Format(
             "id",
             "label",
+            C.SELECTION_FLAG_DEFAULT,
+            /* bitrate= */ 1024,
+            "codec",
+            metadata,
             /* containerMimeType= */ MimeTypes.VIDEO_MP4,
             /* sampleMimeType= */ MimeTypes.VIDEO_H264,
-            "codec",
-            /* bitrate= */ 1024,
             /* maxInputSize= */ 2048,
+            initData,
+            drmInitData,
+            Format.OFFSET_SAMPLE_RELATIVE,
             /* width= */ 1920,
             /* height= */ 1080,
             /* frameRate= */ 24,
@@ -84,13 +90,8 @@ public final class FormatTest {
             C.ENCODING_PCM_24BIT,
             /* encoderDelay= */ 1001,
             /* encoderPadding= */ 1002,
-            C.SELECTION_FLAG_DEFAULT,
             "language",
-            /* accessibilityChannel= */ Format.NO_VALUE,
-            Format.OFFSET_SAMPLE_RELATIVE,
-            INIT_DATA,
-            drmInitData,
-            metadata);
+            /* accessibilityChannel= */ Format.NO_VALUE);
 
     Parcel parcel = Parcel.obtain();
     formatToParcel.writeToParcel(parcel, 0);

From f7f500988378c4a854652fe3507dac6addb41134 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 20 Mar 2019 15:40:58 +0000
Subject: [PATCH 652/832] Add workaround for PlayReady issue with
 setMediaDrmSession

PiperOrigin-RevId: 239403506
---
 .../android/exoplayer2/mediacodec/MediaCodecRenderer.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index e0faad6fef..3040fc74bb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -1623,6 +1623,12 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
       reinitializeCodec();
       return;
     }
+    if (C.PLAYREADY_UUID.equals(sessionMediaCrypto.uuid)) {
+      // The PlayReady CDM does not implement setMediaDrmSession.
+      // TODO: Add API check once [Internal ref: b/128835874] is fixed.
+      reinitializeCodec();
+      return;
+    }
 
     if (flushOrReinitializeCodec()) {
       // The codec was reinitialized. The new codec will be using the new DRM session, so there's

From 3abf5ed1433f423118bab7aa486e685eb4a58f49 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 20 Mar 2019 17:50:23 +0000
Subject: [PATCH 653/832] Automated g4 rollback of changelist 239294713.

*** Reason for rollback ***

Trying to forward fix instead.

*** Original change description ***

Automated g4 rollback of changelist 237051112.

*** Original change description ***

Add SimpleCache deletion functionality

This is needed now that index data may be stored outside
of the cache directory.

***

***

PiperOrigin-RevId: 239429430
---
 .../cache/CacheFileMetadataIndex.java         | 41 ++++++++++-
 .../upstream/cache/CachedContentIndex.java    | 67 +++++++++++------
 .../upstream/cache/SimpleCache.java           | 72 +++++++++++++++----
 3 files changed, 146 insertions(+), 34 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
index 2b5f116d1f..084c02b11b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
@@ -61,6 +61,34 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
   @MonotonicNonNull private String tableName;
 
+  /**
+   * Deletes index data for the specified cache.
+   *
+   * @param databaseProvider Provides the database in which the index is stored.
+   * @param uid The cache UID.
+   * @throws DatabaseIOException If an error occurs deleting the index data.
+   */
+  public static void delete(DatabaseProvider databaseProvider, long uid)
+      throws DatabaseIOException {
+    String hexUid = Long.toHexString(uid);
+    try {
+      String tableName = getTableName(hexUid);
+      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+      writableDatabase.beginTransaction();
+      try {
+        VersionTable.removeVersion(
+            writableDatabase, VersionTable.FEATURE_CACHE_FILE_METADATA, hexUid);
+        dropTable(writableDatabase, tableName);
+        writableDatabase.setTransactionSuccessful();
+      } finally {
+        writableDatabase.endTransaction();
+      }
+    } catch (SQLException e) {
+      throw new DatabaseIOException(e);
+    }
+  }
+
+  /** @param databaseProvider Provides the database in which the index is stored. */
   public CacheFileMetadataIndex(DatabaseProvider databaseProvider) {
     this.databaseProvider = databaseProvider;
   }
@@ -68,12 +96,13 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
   /**
    * Initializes the index for the given cache UID.
    *
+   * @param uid The cache UID.
    * @throws DatabaseIOException If an error occurs initializing the index.
    */
   public void initialize(long uid) throws DatabaseIOException {
     try {
       String hexUid = Long.toHexString(uid);
-      tableName = TABLE_PREFIX + hexUid;
+      tableName = getTableName(hexUid);
       SQLiteDatabase readableDatabase = databaseProvider.getReadableDatabase();
       int version =
           VersionTable.getVersion(
@@ -84,7 +113,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
         try {
           VersionTable.setVersion(
               writableDatabase, VersionTable.FEATURE_CACHE_FILE_METADATA, hexUid, TABLE_VERSION);
-          writableDatabase.execSQL("DROP TABLE IF EXISTS " + tableName);
+          dropTable(writableDatabase, tableName);
           writableDatabase.execSQL("CREATE TABLE " + tableName + " " + TABLE_SCHEMA);
           writableDatabase.setTransactionSuccessful();
         } finally {
@@ -196,4 +225,12 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
             /* having= */ null,
             /* orderBy= */ null);
   }
+
+  private static void dropTable(SQLiteDatabase writableDatabase, String tableName) {
+    writableDatabase.execSQL("DROP TABLE IF EXISTS " + tableName);
+  }
+
+  private static String getTableName(String hexUid) {
+    return TABLE_PREFIX + hexUid;
+  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
index c25c88a361..8fa04e5338 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
@@ -103,6 +103,18 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     return fileName.startsWith(FILE_NAME_ATOMIC);
   }
 
+  /**
+   * Deletes index data for the specified cache.
+   *
+   * @param databaseProvider Provides the database in which the index is stored.
+   * @param uid The cache UID.
+   * @throws DatabaseIOException If an error occurs deleting the index data.
+   */
+  public static void delete(DatabaseProvider databaseProvider, long uid)
+      throws DatabaseIOException {
+    DatabaseStorage.delete(databaseProvider, uid);
+  }
+
   /**
    * Creates an instance supporting database storage only.
    *
@@ -717,6 +729,11 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     private String hexUid;
     private String tableName;
 
+    public static void delete(DatabaseProvider databaseProvider, long uid)
+        throws DatabaseIOException {
+      delete(databaseProvider, Long.toHexString(uid));
+    }
+
     public DatabaseStorage(DatabaseProvider databaseProvider) {
       this.databaseProvider = databaseProvider;
       pendingUpdates = new SparseArray<>();
@@ -725,7 +742,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     @Override
     public void initialize(long uid) {
       hexUid = Long.toHexString(uid);
-      tableName = TABLE_PREFIX + hexUid;
+      tableName = getTableName(hexUid);
     }
 
     @Override
@@ -739,20 +756,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 
     @Override
     public void delete() throws DatabaseIOException {
-      try {
-        SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
-        writableDatabase.beginTransaction();
-        try {
-          VersionTable.removeVersion(
-              writableDatabase, VersionTable.FEATURE_CACHE_CONTENT_METADATA, hexUid);
-          dropTable(writableDatabase);
-          writableDatabase.setTransactionSuccessful();
-        } finally {
-          writableDatabase.endTransaction();
-        }
-      } catch (SQLException e) {
-        throw new DatabaseIOException(e);
-      }
+      delete(databaseProvider, hexUid);
     }
 
     @Override
@@ -875,14 +879,10 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     private void initializeTable(SQLiteDatabase writableDatabase) throws DatabaseIOException {
       VersionTable.setVersion(
           writableDatabase, VersionTable.FEATURE_CACHE_CONTENT_METADATA, hexUid, TABLE_VERSION);
-      dropTable(writableDatabase);
+      dropTable(writableDatabase, tableName);
       writableDatabase.execSQL("CREATE TABLE " + tableName + " " + TABLE_SCHEMA);
     }
 
-    private void dropTable(SQLiteDatabase writableDatabase) {
-      writableDatabase.execSQL("DROP TABLE IF EXISTS " + tableName);
-    }
-
     private void deleteRow(SQLiteDatabase writableDatabase, int key) {
       writableDatabase.delete(tableName, WHERE_ID_EQUALS, new String[] {Integer.toString(key)});
     }
@@ -899,5 +899,32 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
       values.put(COLUMN_METADATA, data);
       writableDatabase.replaceOrThrow(tableName, /* nullColumnHack= */ null, values);
     }
+
+    private static void delete(DatabaseProvider databaseProvider, String hexUid)
+        throws DatabaseIOException {
+      try {
+        String tableName = getTableName(hexUid);
+        SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+        writableDatabase.beginTransaction();
+        try {
+          VersionTable.removeVersion(
+              writableDatabase, VersionTable.FEATURE_CACHE_CONTENT_METADATA, hexUid);
+          dropTable(writableDatabase, tableName);
+          writableDatabase.setTransactionSuccessful();
+        } finally {
+          writableDatabase.endTransaction();
+        }
+      } catch (SQLException e) {
+        throw new DatabaseIOException(e);
+      }
+    }
+
+    private static void dropTable(SQLiteDatabase writableDatabase, String tableName) {
+      writableDatabase.execSQL("DROP TABLE IF EXISTS " + tableName);
+    }
+
+    private static String getTableName(String hexUid) {
+      return TABLE_PREFIX + hexUid;
+    }
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index a0fde79bee..3e0d06ea12 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -19,9 +19,11 @@ import android.os.ConditionVariable;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.database.DatabaseIOException;
 import com.google.android.exoplayer2.database.DatabaseProvider;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
+import com.google.android.exoplayer2.util.Util;
 import java.io.File;
 import java.io.IOException;
 import java.security.SecureRandom;
@@ -36,8 +38,13 @@ import java.util.TreeSet;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 /**
- * A {@link Cache} implementation that maintains an in-memory representation. Note, only one
- * instance of SimpleCache is allowed for a given directory at a given time.
+ * A {@link Cache} implementation that maintains an in-memory representation.
+ *
+ * <p>Only one instance of SimpleCache is allowed for a given directory at a given time.
+ *
+ * <p>To delete a SimpleCache, use {@link #delete(File, DatabaseProvider)} rather than deleting the
+ * directory and its contents directly. This is necessary to ensure that associated index data is
+ * also removed.
  */
 public final class SimpleCache implements Cache {
 
@@ -93,6 +100,45 @@ public final class SimpleCache implements Cache {
     lockedCacheDirs.clear();
   }
 
+  /**
+   * Deletes all content belonging to a cache instance.
+   *
+   * @param cacheDir The cache directory.
+   * @param databaseProvider The database in which index data is stored, or {@code null} if the
+   *     cache used a legacy index.
+   */
+  public static void delete(File cacheDir, @Nullable DatabaseProvider databaseProvider) {
+    if (!cacheDir.exists()) {
+      return;
+    }
+
+    File[] files = cacheDir.listFiles();
+    if (files == null) {
+      cacheDir.delete();
+      return;
+    }
+
+    if (databaseProvider != null) {
+      // Make a best effort to read the cache UID and delete associated index data before deleting
+      // cache directory itself.
+      long uid = loadUid(files);
+      if (uid != -1) {
+        try {
+          CacheFileMetadataIndex.delete(databaseProvider, uid);
+        } catch (DatabaseIOException e) {
+          Log.w(TAG, "Failed to delete file metadata: " + uid);
+        }
+        try {
+          CachedContentIndex.delete(databaseProvider, uid);
+        } catch (DatabaseIOException e) {
+          Log.w(TAG, "Failed to delete file metadata: " + uid);
+        }
+      }
+    }
+
+    Util.recursiveDelete(cacheDir);
+  }
+
   /**
    * Constructs the cache. The cache will delete any unrecognized files from the directory. Hence
    * the directory cannot be used to store other files.
@@ -524,11 +570,14 @@ public final class SimpleCache implements Cache {
       return;
     }
 
-    try {
-      uid = loadUid(cacheDir, files);
-    } catch (IOException e) {
-      initializationException = new CacheException("Failed to load cache UID: " + cacheDir);
-      return;
+    uid = loadUid(files);
+    if (uid == -1) {
+      try {
+        uid = createUid(cacheDir);
+      } catch (IOException e) {
+        initializationException = new CacheException("Failed to create cache UID: " + cacheDir);
+        return;
+      }
     }
 
     try {
@@ -686,14 +735,13 @@ public final class SimpleCache implements Cache {
   }
 
   /**
-   * Loads the cache UID from the files belonging to the root directory, generating one if needed.
+   * Loads the cache UID from the files belonging to the root directory.
    *
-   * @param directory The root directory.
    * @param files The files belonging to the root directory.
-   * @return The cache loaded UID.
+   * @return The loaded UID, or -1 if a UID has not yet been created.
    * @throws IOException If there is an error loading or generating the UID.
    */
-  private static long loadUid(File directory, File[] files) throws IOException {
+  private static long loadUid(File[] files) {
     for (File file : files) {
       String fileName = file.getName();
       if (fileName.endsWith(UID_FILE_SUFFIX)) {
@@ -706,7 +754,7 @@ public final class SimpleCache implements Cache {
         }
       }
     }
-    return createUid(directory);
+    return -1;
   }
 
   @SuppressWarnings("TrulyRandom")

From 68ef1d3e97cbb45a34c83d1faf787a7da0d9134b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 20 Mar 2019 21:35:20 +0000
Subject: [PATCH 654/832] Temporarily disable cache UID creation.

PiperOrigin-RevId: 239476751
---
 .../exoplayer2/upstream/cache/Cache.java      |  3 +++
 .../upstream/cache/SimpleCache.java           | 21 ++++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
index c477c87952..c673768a7a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
@@ -77,6 +77,9 @@ public interface Cache {
       super(cause);
     }
 
+    public CacheException(String message, Throwable cause) {
+      super(message, cause);
+    }
   }
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index 3e0d06ea12..b7440e531c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -557,16 +557,18 @@ public final class SimpleCache implements Cache {
   private void initialize() {
     if (!cacheDir.exists()) {
       if (!cacheDir.mkdirs()) {
-        initializationException =
-            new CacheException("Failed to create cache directory: " + cacheDir);
+        String message = "Failed to create cache directory: " + cacheDir;
+        Log.e(TAG, message);
+        initializationException = new CacheException(message);
         return;
       }
     }
 
     File[] files = cacheDir.listFiles();
     if (files == null) {
-      initializationException =
-          new CacheException("Failed to list cache directory files: " + cacheDir);
+      String message = "Failed to list cache directory files: " + cacheDir;
+      Log.e(TAG, message);
+      initializationException = new CacheException(message);
       return;
     }
 
@@ -575,8 +577,11 @@ public final class SimpleCache implements Cache {
       try {
         uid = createUid(cacheDir);
       } catch (IOException e) {
-        initializationException = new CacheException("Failed to create cache UID: " + cacheDir);
-        return;
+        String message = "Failed to create cache UID: " + cacheDir;
+        Log.e(TAG, message, e);
+        // TODO: Reinstate this only when a database index is used [Internal ref: b/128933265].
+        // initializationException = new CacheException(message, e);
+        // return;
       }
     }
 
@@ -591,7 +596,9 @@ public final class SimpleCache implements Cache {
         loadDirectory(cacheDir, /* isRoot= */ true, files, /* fileMetadata= */ null);
       }
     } catch (IOException e) {
-      initializationException = new CacheException(e);
+      String message = "Failed to initialize cache indices: " + cacheDir;
+      Log.e(TAG, message, e);
+      initializationException = new CacheException(message, e);
       return;
     }
 

From a989304a4d0f524fafcbc9919999b775d38eb7ad Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 21 Mar 2019 10:07:30 +0000
Subject: [PATCH 655/832] Add missing thread verification to
 SimpleExoPlayer.release().

This call also needs to be made from the right thread to prevent messages
from getting lost and causing ANRs.

PiperOrigin-RevId: 239564573
---
 .../main/java/com/google/android/exoplayer2/SimpleExoPlayer.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index 7167ebe8be..d6543810e5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -980,6 +980,7 @@ public class SimpleExoPlayer extends BasePlayer
 
   @Override
   public void release() {
+    verifyApplicationThread();
     audioFocusManager.handleStop();
     player.release();
     removeSurfaceCallbacks();

From b7299a1164c5358fcc8a8a09f2b7fc7465e41881 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 21 Mar 2019 14:51:22 +0000
Subject: [PATCH 656/832] DefaultTrackSelector: make audio track selections
 before text

PiperOrigin-RevId: 239594105
---
 .../trackselection/DefaultTrackSelector.java  | 46 ++++++++++---------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
index 7d488b93c6..df8b705de5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -1485,34 +1485,38 @@ public class DefaultTrackSelector extends MappingTrackSelector {
 
     AudioTrackScore selectedAudioTrackScore = null;
     int selectedAudioRendererIndex = C.INDEX_UNSET;
+    for (int i = 0; i < rendererCount; i++) {
+      if (C.TRACK_TYPE_AUDIO == mappedTrackInfo.getRendererType(i)) {
+        Pair<TrackSelection.Definition, AudioTrackScore> audioSelection =
+            selectAudioTrack(
+                mappedTrackInfo.getTrackGroups(i),
+                rendererFormatSupports[i],
+                rendererMixedMimeTypeAdaptationSupports[i],
+                params,
+                !seenVideoRendererWithMappedTracks);
+        if (audioSelection != null
+            && (selectedAudioTrackScore == null
+                || audioSelection.second.compareTo(selectedAudioTrackScore) > 0)) {
+          if (selectedAudioRendererIndex != C.INDEX_UNSET) {
+            // We've already made a selection for another audio renderer, but it had a lower
+            // score. Clear the selection for that renderer.
+            definitions[selectedAudioRendererIndex] = null;
+          }
+          definitions[i] = audioSelection.first;
+          selectedAudioTrackScore = audioSelection.second;
+          selectedAudioRendererIndex = i;
+        }
+      }
+    }
+
     int selectedTextTrackScore = Integer.MIN_VALUE;
     int selectedTextRendererIndex = C.INDEX_UNSET;
     for (int i = 0; i < rendererCount; i++) {
       int trackType = mappedTrackInfo.getRendererType(i);
       switch (trackType) {
         case C.TRACK_TYPE_VIDEO:
-          // Already done. Do nothing.
-          break;
         case C.TRACK_TYPE_AUDIO:
-          Pair<TrackSelection.Definition, AudioTrackScore> audioSelection =
-              selectAudioTrack(
-                  mappedTrackInfo.getTrackGroups(i),
-                  rendererFormatSupports[i],
-                  rendererMixedMimeTypeAdaptationSupports[i],
-                  params,
-                  !seenVideoRendererWithMappedTracks);
-          if (audioSelection != null
-              && (selectedAudioTrackScore == null
-                  || audioSelection.second.compareTo(selectedAudioTrackScore) > 0)) {
-            if (selectedAudioRendererIndex != C.INDEX_UNSET) {
-              // We've already made a selection for another audio renderer, but it had a lower
-              // score. Clear the selection for that renderer.
-              definitions[selectedAudioRendererIndex] = null;
-            }
-            definitions[i] = audioSelection.first;
-            selectedAudioTrackScore = audioSelection.second;
-            selectedAudioRendererIndex = i;
-          }
+          // Already done. Do nothing.
           break;
         case C.TRACK_TYPE_TEXT:
           Pair<TrackSelection.Definition, Integer> textSelection =

From 3543116da4486fd013229f762bf3ba86a30526e7 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 21 Mar 2019 16:04:48 +0000
Subject: [PATCH 657/832] Prevent seeking when ICY metadata is present.

Any seek map with non-zero offsets breaks playback with ICY metadata as
the metadata is no longer read from the correct position.

Issue:#5658
PiperOrigin-RevId: 239605839
---
 RELEASENOTES.md                                                | 2 ++
 .../android/exoplayer2/source/ProgressiveMediaPeriod.java      | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index f5b1dd7fc6..398c041111 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -78,6 +78,8 @@
   `ExtractorsFactory` instances must now be passed via the
   `ProgressiveMediaSource.Factory` constructor, and `setExtractorsFactory` is
   deprecated.
+* Prevent seeking when ICY metadata is present to prevent playback problems
+  ([#5658](https://github.com/google/ExoPlayer/issues/5658)).
 
 ### 2.9.6 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
index a179e6e3dd..d9f0008a7f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
@@ -31,6 +31,7 @@ import com.google.android.exoplayer2.extractor.ExtractorOutput;
 import com.google.android.exoplayer2.extractor.PositionHolder;
 import com.google.android.exoplayer2.extractor.SeekMap;
 import com.google.android.exoplayer2.extractor.SeekMap.SeekPoints;
+import com.google.android.exoplayer2.extractor.SeekMap.Unseekable;
 import com.google.android.exoplayer2.extractor.TrackOutput;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.icy.IcyHeaders;
@@ -626,7 +627,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 
   @Override
   public void seekMap(SeekMap seekMap) {
-    this.seekMap = seekMap;
+    this.seekMap = icyHeaders == null ? seekMap : new Unseekable(/* durationUs */ C.TIME_UNSET);
     handler.post(maybeFinishPrepareRunnable);
   }
 

From e5aed73fbaf9a30900dd9f13a714d288d8dc68a7 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 22 Mar 2019 13:13:34 +0000
Subject: [PATCH 658/832] Switch format language tag to use full BCP 47 codes.

This allows to distinguish between regional variants and scripts.

We still need to normalize the language code itself to make track selection
independent of the whether 2 or 3 letter codes are used.

PiperOrigin-RevId: 239783115
---
 RELEASENOTES.md                               |  1 +
 .../com/google/android/exoplayer2/Format.java |  2 +-
 .../exoplayer2/offline/DownloadHelper.java    |  4 +-
 .../trackselection/DefaultTrackSelector.java  | 44 ++++++++++---------
 .../TrackSelectionParameters.java             |  6 +--
 .../google/android/exoplayer2/util/Util.java  | 18 ++++++--
 .../DefaultTrackSelectorTest.java             |  2 +-
 .../android/exoplayer2/util/UtilTest.java     | 27 +++++++++++-
 .../ui/DefaultTrackNameProvider.java          |  2 +-
 9 files changed, 71 insertions(+), 35 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 398c041111..563d0a275b 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -80,6 +80,7 @@
   deprecated.
 * Prevent seeking when ICY metadata is present to prevent playback problems
   ([#5658](https://github.com/google/ExoPlayer/issues/5658)).
+* Use full BCP 47 language tags in `Format`.
 
 ### 2.9.6 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Format.java b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
index 140da38337..e170faf50b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Format.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
@@ -156,7 +156,7 @@ public final class Format implements Parcelable {
 
   // Audio and text specific.
 
-  /** The language as ISO 639-2/T three-letter code, or null if unknown or not applicable. */
+  /** The language as an IETF BCP 47 conformant tag, or null if unknown or not applicable. */
   public final @Nullable String language;
   /**
    * The Accessibility channel, or {@link #NO_VALUE} if not known or applicable.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index 2c81ae1840..ae22200329 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -495,7 +495,7 @@ public final class DownloadHelper {
    * used instead. Must not be called until after preparation completes.
    *
    * @param languages A list of audio languages for which tracks should be added to the download
-   *     selection, as ISO 639-1 two-letter or ISO 639-2 three-letter codes.
+   *     selection, as IETF BCP 47 conformant tags.
    */
   public void addAudioLanguagesToSelection(String... languages) {
     assertPreparedWithMedia();
@@ -524,7 +524,7 @@ public final class DownloadHelper {
    *     selected for downloading if no track with one of the specified {@code languages} is
    *     available.
    * @param languages A list of text languages for which tracks should be added to the download
-   *     selection, as ISO 639-1 two-letter or ISO 639-2 three-letter codes.
+   *     selection, as IETF BCP 47 conformant tags.
    */
   public void addTextLanguagesToSelection(
       boolean selectUndeterminedTextLanguage, String... languages) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
index df8b705de5..0b510ea496 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -2017,28 +2017,24 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           boolean isDefault = (maskedSelectionFlags & C.SELECTION_FLAG_DEFAULT) != 0;
           boolean isForced = (maskedSelectionFlags & C.SELECTION_FLAG_FORCED) != 0;
           int trackScore;
-          boolean preferredLanguageFound = formatHasLanguage(format, params.preferredTextLanguage);
-          if (preferredLanguageFound
+          int languageScore = getFormatLanguageScore(format, params.preferredTextLanguage);
+          if (languageScore > 0
               || (params.selectUndeterminedTextLanguage && formatHasNoLanguage(format))) {
             if (isDefault) {
-              trackScore = 8;
+              trackScore = 11;
             } else if (!isForced) {
               // Prefer non-forced to forced if a preferred text language has been specified. Where
               // both are provided the non-forced track will usually contain the forced subtitles as
               // a subset.
-              trackScore = 6;
+              trackScore = 8;
             } else {
-              trackScore = 4;
+              trackScore = 5;
             }
-            trackScore += preferredLanguageFound ? 1 : 0;
+            trackScore += languageScore;
           } else if (isDefault) {
-            trackScore = 3;
+            trackScore = 4;
           } else if (isForced) {
-            if (formatHasLanguage(format, params.preferredAudioLanguage)) {
-              trackScore = 2;
-            } else {
-              trackScore = 1;
-            }
+            trackScore = 1 + languageScore;
           } else {
             // Track should not be selected.
             continue;
@@ -2234,20 +2230,26 @@ public class DefaultTrackSelector extends MappingTrackSelector {
    * @return Whether the {@link Format} does not define a language.
    */
   protected static boolean formatHasNoLanguage(Format format) {
-    return TextUtils.isEmpty(format.language) || formatHasLanguage(format, C.LANGUAGE_UNDETERMINED);
+    return TextUtils.isEmpty(format.language)
+        || TextUtils.equals(format.language, C.LANGUAGE_UNDETERMINED);
   }
 
   /**
-   * Returns whether a {@link Format} specifies a particular language, or {@code false} if {@code
-   * language} is null.
+   * Returns a score for how well a language specified in a {@link Format} fits a given language.
    *
    * @param format The {@link Format}.
-   * @param language The language.
-   * @return Whether the format specifies the language, or {@code false} if {@code language} is
-   *     null.
+   * @param language The language, or null.
+   * @return A score of 0 if the languages don't fit, a score of 1 if the languages fit partly and a
+   *     score of 2 if the languages fit fully.
    */
-  protected static boolean formatHasLanguage(Format format, @Nullable String language) {
-    return language != null && TextUtils.equals(language, format.language);
+  protected static int getFormatLanguageScore(Format format, @Nullable String language) {
+    if (language == null) {
+      return 0;
+    }
+    if (TextUtils.equals(language, format.language)) {
+      return 2;
+    }
+    return format.language != null && format.language.startsWith(language) ? 1 : 0;
   }
 
   private static List<Integer> getViewportFilteredTrackIndices(TrackGroup group, int viewportWidth,
@@ -2335,7 +2337,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     public AudioTrackScore(Format format, Parameters parameters, int formatSupport) {
       this.parameters = parameters;
       withinRendererCapabilitiesScore = isSupported(formatSupport, false) ? 1 : 0;
-      matchLanguageScore = formatHasLanguage(format, parameters.preferredAudioLanguage) ? 1 : 0;
+      matchLanguageScore = getFormatLanguageScore(format, parameters.preferredAudioLanguage);
       defaultSelectionFlagScore = (format.selectionFlags & C.SELECTION_FLAG_DEFAULT) != 0 ? 1 : 0;
       channelCount = format.channelCount;
       sampleRate = format.sampleRate;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java
index 70572e6660..66a4707496 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java
@@ -59,8 +59,7 @@ public class TrackSelectionParameters implements Parcelable {
     /**
      * See {@link TrackSelectionParameters#preferredAudioLanguage}.
      *
-     * @param preferredAudioLanguage Preferred audio language as an ISO 639-1 two-letter or ISO
-     *     639-2 three-letter code.
+     * @param preferredAudioLanguage Preferred audio language as an IETF BCP 47 conformant tag.
      * @return This builder.
      */
     public Builder setPreferredAudioLanguage(@Nullable String preferredAudioLanguage) {
@@ -73,8 +72,7 @@ public class TrackSelectionParameters implements Parcelable {
     /**
      * See {@link TrackSelectionParameters#preferredTextLanguage}.
      *
-     * @param preferredTextLanguage Preferred text language as an ISO 639-1 two-letter or ISO 639-2
-     *     three-letter code.
+     * @param preferredTextLanguage Preferred text language as an IETF BCP 47 conformant tag.
      * @return This builder.
      */
     public Builder setPreferredTextLanguage(@Nullable String preferredTextLanguage) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
index 489314cbc8..d0f6766e34 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
@@ -419,16 +419,26 @@ public final class Util {
   }
 
   /**
-   * Returns a normalized ISO 639-2/T code for {@code language}.
+   * Returns a normalized IETF BCP 47 language tag for {@code language}.
    *
-   * @param language A case-insensitive ISO 639-1 two-letter or ISO 639-2 three-letter language
-   *     code.
+   * @param language A case-insensitive language code supported by {@link
+   *     Locale#forLanguageTag(String)}.
    * @return The all-lowercase normalized code, or null if the input was null, or {@code
    *     language.toLowerCase()} if the language could not be normalized.
    */
   public static @Nullable String normalizeLanguageCode(@Nullable String language) {
+    if (language == null) {
+      return null;
+    }
     try {
-      return language == null ? null : new Locale(language).getISO3Language();
+      Locale locale = Util.SDK_INT >= 21 ? Locale.forLanguageTag(language) : new Locale(language);
+      int localeLanguageLength = locale.getLanguage().length();
+      String normLanguage = locale.getISO3Language();
+      if (normLanguage.isEmpty()) {
+        return toLowerInvariant(language);
+      }
+      String normTag = Util.SDK_INT >= 21 ? locale.toLanguageTag() : locale.toString();
+      return toLowerInvariant(normLanguage + normTag.substring(localeLanguageLength));
     } catch (MissingResourceException e) {
       return toLowerInvariant(language);
     }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
index 94ae1b5898..d2aad12f24 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
@@ -930,7 +930,7 @@ public final class DefaultTrackSelectorTest {
     // matches the preferred audio language.
     trackGroups = wrapFormats(forcedDefault, forcedOnly, defaultOnly, noFlag, forcedOnlySpanish);
     trackSelector.setParameters(
-        trackSelector.getParameters().buildUpon().setPreferredAudioLanguage("spa").build());
+        trackSelector.getParameters().buildUpon().setPreferredTextLanguage("spa").build());
     result = trackSelector.selectTracks(textRendererCapabilities, trackGroups, periodId, TIMELINE);
     assertFixedSelection(result.selections.get(0), trackGroups, forcedOnlySpanish);
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/UtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/util/UtilTest.java
index 8f4aad42a5..9abec0cd8f 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/util/UtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/util/UtilTest.java
@@ -34,6 +34,7 @@ import java.util.Random;
 import java.util.zip.Deflater;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
 
 /** Unit tests for {@link Util}. */
 @RunWith(AndroidJUnit4.class)
@@ -264,6 +265,31 @@ public class UtilTest {
     assertThat(Arrays.copyOf(output.data, output.limit())).isEqualTo(testData);
   }
 
+  @Test
+  @Config(sdk = 21)
+  public void testNormalizeLanguageCodeV21() {
+    assertThat(Util.normalizeLanguageCode("es")).isEqualTo("spa");
+    assertThat(Util.normalizeLanguageCode("spa")).isEqualTo("spa");
+    assertThat(Util.normalizeLanguageCode("es-AR")).isEqualTo("spa-ar");
+    assertThat(Util.normalizeLanguageCode("SpA-ar")).isEqualTo("spa-ar");
+    assertThat(Util.normalizeLanguageCode("es-AR-dialect")).isEqualTo("spa-ar-dialect");
+    assertThat(Util.normalizeLanguageCode("es-419")).isEqualTo("spa-419");
+    assertThat(Util.normalizeLanguageCode("zh-hans-tw")).isEqualTo("zho-hans-tw");
+    assertThat(Util.normalizeLanguageCode("zh-tw-hans")).isEqualTo("zho-tw");
+    assertThat(Util.normalizeLanguageCode("und")).isEqualTo("und");
+    assertThat(Util.normalizeLanguageCode("DoesNotExist")).isEqualTo("doesnotexist");
+  }
+
+  @Test
+  @Config(sdk = 16)
+  public void testNormalizeLanguageCode() {
+    assertThat(Util.normalizeLanguageCode("es")).isEqualTo("spa");
+    assertThat(Util.normalizeLanguageCode("spa")).isEqualTo("spa");
+    assertThat(Util.normalizeLanguageCode("es-AR")).isEqualTo("es-ar");
+    assertThat(Util.normalizeLanguageCode("und")).isEqualTo("und");
+    assertThat(Util.normalizeLanguageCode("DoesNotExist")).isEqualTo("doesnotexist");
+  }
+
   private static void assertEscapeUnescapeFileName(String fileName, String escapedFileName) {
     assertThat(escapeFileName(fileName)).isEqualTo(escapedFileName);
     assertThat(unescapeFileName(escapedFileName)).isEqualTo(fileName);
@@ -273,5 +299,4 @@ public class UtilTest {
     String escapedFileName = Util.escapeFileName(fileName);
     assertThat(unescapeFileName(escapedFileName)).isEqualTo(fileName);
   }
-
 }
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTrackNameProvider.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTrackNameProvider.java
index 5d68387869..7034ba73f5 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTrackNameProvider.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTrackNameProvider.java
@@ -100,7 +100,7 @@ public class DefaultTrackNameProvider implements TrackNameProvider {
 
   private String buildLanguageString(String language) {
     Locale locale = Util.SDK_INT >= 21 ? Locale.forLanguageTag(language) : new Locale(language);
-    return locale.getDisplayLanguage();
+    return locale.getDisplayName();
   }
 
   private String joinWithSeparator(String... items) {

From cdd433acda1b8fd9f842f395473d71694f164418 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 22 Mar 2019 16:43:19 +0000
Subject: [PATCH 659/832] Disambiguate comment in Ac3Reader

PiperOrigin-RevId: 239810798
---
 .../com/google/android/exoplayer2/extractor/ts/Ac3Reader.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java
index a5fd290e41..cd07a40c6d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java
@@ -201,7 +201,7 @@ public final class Ac3Reader implements ElementaryStreamReader {
       output.format(format);
     }
     sampleSize = frameInfo.frameSize;
-    // In this class a sample is an access unit (syncframe in AC-3), but the MediaFormat sample rate
+    // In this class a sample is an access unit (syncframe in AC-3), but Format#sampleRate
     // specifies the number of PCM audio samples per second.
     sampleDurationUs = C.MICROS_PER_SECOND * frameInfo.sampleCount / format.sampleRate;
   }

From 77d597de5f1565419ec9ec7ada0633379b15b1b3 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 22 Mar 2019 19:41:25 +0000
Subject: [PATCH 660/832] Parse CHARACTERISTICS attribute for EXT-X-MEDIA tags

PiperOrigin-RevId: 239844963
---
 RELEASENOTES.md                               |  1 +
 .../java/com/google/android/exoplayer2/C.java | 30 +++++++++++------
 .../com/google/android/exoplayer2/Format.java | 23 ++-----------
 .../DefaultTrackSelectorTest.java             |  1 +
 .../dash/manifest/DashManifestParser.java     |  8 ++---
 .../exoplayer2/source/hls/HlsMediaPeriod.java |  7 ++--
 .../hls/playlist/HlsPlaylistParser.java       | 32 +++++++++++++++++--
 .../source/hls/HlsMediaPeriodTest.java        |  1 +
 .../manifest/SsManifestParser.java            |  1 +
 9 files changed, 65 insertions(+), 39 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 563d0a275b..63edfff07c 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -12,6 +12,7 @@
   * Form an adaptive track group out of audio renditions with matching name.
   * Support encrypted initialization segments
     ([#5441](https://github.com/google/ExoPlayer/issues/5441)).
+  * Parse `EXT-X-MEDIA` `CHARACTERISTICS` attribute into `Format.roleFlags`.
 * `ExtractorMediaSource` renamed to `ProgressiveMediaSource`.
 * Support for playing spherical videos on Daydream.
 * Improve decoder re-use between playbacks. TODO: Write and link a blog post
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/C.java b/library/core/src/main/java/com/google/android/exoplayer2/C.java
index 601cdd5e09..d0676e946d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/C.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/C.java
@@ -980,11 +980,12 @@ public final class C {
   public static final int NETWORK_TYPE_OTHER = 8;
 
   /**
-   * Track role flags. Possible values are {@link #ROLE_FLAG_MAIN}, {@link #ROLE_FLAG_ALTERNATE},
-   * {@link #ROLE_FLAG_SUPPLEMENTARY}, {@link #ROLE_FLAG_COMMENTARY}, {@link #ROLE_FLAG_DUB}, {@link
-   * #ROLE_FLAG_EMERGENCY}, {@link #ROLE_FLAG_CAPTION}, {@link #ROLE_FLAG_SUBTITLE}, {@link
-   * #ROLE_FLAG_SIGN}, {@link #ROLE_FLAG_ENHANCED_AUDIO_INTELLIGIBILITY}, {@link
-   * #ROLE_FLAG_DESCRIPTION}.
+   * Track role flags. Possible flag values are {@link #ROLE_FLAG_MAIN}, {@link
+   * #ROLE_FLAG_ALTERNATE}, {@link #ROLE_FLAG_SUPPLEMENTARY}, {@link #ROLE_FLAG_COMMENTARY}, {@link
+   * #ROLE_FLAG_DUB}, {@link #ROLE_FLAG_EMERGENCY}, {@link #ROLE_FLAG_CAPTION}, {@link
+   * #ROLE_FLAG_SUBTITLE}, {@link #ROLE_FLAG_SIGN}, {@link #ROLE_FLAG_DESCRIBES_VIDEO}, {@link
+   * #ROLE_FLAG_DESCRIBES_MUSIC_AND_SOUND}, {@link #ROLE_FLAG_ENHANCED_DIALOG_INTELLIGIBILITY},
+   * {@link #ROLE_FLAG_TRANSCRIBES_DIALOG} and {@link #ROLE_FLAG_EASY_TO_READ}.
    */
   @Documented
   @Retention(RetentionPolicy.SOURCE)
@@ -1000,8 +1001,11 @@ public final class C {
         ROLE_FLAG_CAPTION,
         ROLE_FLAG_SUBTITLE,
         ROLE_FLAG_SIGN,
-        ROLE_FLAG_ENHANCED_AUDIO_INTELLIGIBILITY,
-        ROLE_FLAG_DESCRIPTION
+        ROLE_FLAG_DESCRIBES_VIDEO,
+        ROLE_FLAG_DESCRIBES_MUSIC_AND_SOUND,
+        ROLE_FLAG_ENHANCED_DIALOG_INTELLIGIBILITY,
+        ROLE_FLAG_TRANSCRIBES_DIALOG,
+        ROLE_FLAG_EASY_TO_READ
       })
   public @interface RoleFlags {}
   /** Indicates a main track. */
@@ -1037,10 +1041,16 @@ public final class C {
   public static final int ROLE_FLAG_SUBTITLE = 1 << 7;
   /** Indicates the track contains a visual sign-language interpretation of an audio track. */
   public static final int ROLE_FLAG_SIGN = 1 << 8;
-  /** Indicates the track is designed for improved intelligibility of dialogue. */
-  public static final int ROLE_FLAG_ENHANCED_AUDIO_INTELLIGIBILITY = 1 << 9;
   /** Indicates the track contains an audio or textual description of a video track. */
-  public static final int ROLE_FLAG_DESCRIPTION = 1 << 10;
+  public static final int ROLE_FLAG_DESCRIBES_VIDEO = 1 << 9;
+  /** Indicates the track contains a textual description of music and sound. */
+  public static final int ROLE_FLAG_DESCRIBES_MUSIC_AND_SOUND = 1 << 10;
+  /** Indicates the track is designed for improved intelligibility of dialogue. */
+  public static final int ROLE_FLAG_ENHANCED_DIALOG_INTELLIGIBILITY = 1 << 11;
+  /** Indicates the track contains a transcription of spoken dialog. */
+  public static final int ROLE_FLAG_TRANSCRIBES_DIALOG = 1 << 12;
+  /** Indicates the track contains a text that has been edited for ease of reading. */
+  public static final int ROLE_FLAG_EASY_TO_READ = 1 << 13;
 
   /**
    * Converts a time in microseconds to the corresponding time in milliseconds, preserving
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Format.java b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
index e170faf50b..8628ead4d6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Format.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
@@ -523,26 +523,6 @@ public final class Format implements Parcelable {
 
   // Text.
 
-  @Deprecated
-  public static Format createTextContainerFormat(
-      @Nullable String id,
-      @Nullable String containerMimeType,
-      @Nullable String sampleMimeType,
-      @Nullable String codecs,
-      int bitrate,
-      @C.SelectionFlags int selectionFlags,
-      @Nullable String language) {
-    return createTextContainerFormat(
-        id,
-        /* label= */ null,
-        containerMimeType,
-        sampleMimeType,
-        codecs,
-        bitrate,
-        selectionFlags,
-        language);
-  }
-
   public static Format createTextContainerFormat(
       @Nullable String id,
       @Nullable String label,
@@ -551,6 +531,7 @@ public final class Format implements Parcelable {
       @Nullable String codecs,
       int bitrate,
       @C.SelectionFlags int selectionFlags,
+      @C.RoleFlags int roleFlags,
       @Nullable String language) {
     return createTextContainerFormat(
         id,
@@ -560,7 +541,7 @@ public final class Format implements Parcelable {
         codecs,
         bitrate,
         selectionFlags,
-        /* roleFlags= */ 0,
+        roleFlags,
         language,
         /* accessibilityChannel= */ NO_VALUE);
   }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
index d2aad12f24..aaeb6b7c99 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
@@ -1603,6 +1603,7 @@ public final class DefaultTrackSelectorTest {
         /* codecs= */ null,
         /* bitrate= */ Format.NO_VALUE,
         selectionFlags,
+        /* roleFlags= */ 0,
         language);
   }
 
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
index 8cdc54bec8..c4f61a73cd 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
@@ -1128,9 +1128,9 @@ public class DashManifestParser extends DefaultHandler
       case "sign":
         return C.ROLE_FLAG_SIGN;
       case "description":
-        return C.ROLE_FLAG_DESCRIPTION;
+        return C.ROLE_FLAG_DESCRIBES_VIDEO;
       case "enhanced-audio-intelligibility":
-        return C.ROLE_FLAG_ENHANCED_AUDIO_INTELLIGIBILITY;
+        return C.ROLE_FLAG_ENHANCED_DIALOG_INTELLIGIBILITY;
       default:
         return 0;
     }
@@ -1143,9 +1143,9 @@ public class DashManifestParser extends DefaultHandler
     }
     switch (value) {
       case "1": // Audio description for the visually impaired.
-        return C.ROLE_FLAG_DESCRIPTION;
+        return C.ROLE_FLAG_DESCRIBES_VIDEO;
       case "2": // Audio description for the hard of hearing.
-        return C.ROLE_FLAG_ENHANCED_AUDIO_INTELLIGIBILITY;
+        return C.ROLE_FLAG_ENHANCED_DIALOG_INTELLIGIBILITY;
       case "3": // Supplemental commentary.
         return C.ROLE_FLAG_SUPPLEMENTARY;
       case "4": // Director's commentary.
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
index e4e0245605..c6df726c2c 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
@@ -703,7 +703,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
         variantFormat.frameRate,
         /* initializationData= */ null,
         variantFormat.selectionFlags,
-        /* roleFlags= */ 0);
+        variantFormat.roleFlags);
   }
 
   private static Format deriveAudioFormat(
@@ -711,12 +711,14 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
     String codecs;
     int channelCount = Format.NO_VALUE;
     int selectionFlags = 0;
+    int roleFlags = 0;
     String language = null;
     String label = null;
     if (mediaTagFormat != null) {
       codecs = mediaTagFormat.codecs;
       channelCount = mediaTagFormat.channelCount;
       selectionFlags = mediaTagFormat.selectionFlags;
+      roleFlags = mediaTagFormat.roleFlags;
       language = mediaTagFormat.language;
       label = mediaTagFormat.label;
     } else {
@@ -724,6 +726,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
       if (isPrimaryTrackInVariant) {
         channelCount = variantFormat.channelCount;
         selectionFlags = variantFormat.selectionFlags;
+        roleFlags = mediaTagFormat.roleFlags;
         language = variantFormat.language;
         label = variantFormat.label;
       }
@@ -741,7 +744,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
         /* sampleRate= */ Format.NO_VALUE,
         /* initializationData= */ null,
         selectionFlags,
-        /* roleFlags= */ 0,
+        roleFlags,
         language);
   }
 
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
index 177c9aaeff..fd49e10bea 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.source.hls.playlist;
 
 import android.net.Uri;
 import androidx.annotation.Nullable;
+import android.text.TextUtils;
 import android.util.Base64;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
@@ -145,6 +146,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
   private static final Pattern REGEX_LANGUAGE = Pattern.compile("LANGUAGE=\"(.+?)\"");
   private static final Pattern REGEX_NAME = Pattern.compile("NAME=\"(.+?)\"");
   private static final Pattern REGEX_GROUP_ID = Pattern.compile("GROUP-ID=\"(.+?)\"");
+  private static final Pattern REGEX_CHARACTERISTICS = Pattern.compile("CHARACTERISTICS=\"(.+?)\"");
   private static final Pattern REGEX_INSTREAM_ID =
       Pattern.compile("INSTREAM-ID=\"((?:CC|SERVICE)\\d+)\"");
   private static final Pattern REGEX_AUTOSELECT = compileBooleanAttrPattern("AUTOSELECT");
@@ -339,6 +341,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
     for (int i = 0; i < mediaTags.size(); i++) {
       line = mediaTags.get(i);
       @C.SelectionFlags int selectionFlags = parseSelectionFlags(line);
+      @C.RoleFlags int roleFlags = parseRoleFlags(line, variableDefinitions);
       String uri = parseOptionalStringAttr(line, REGEX_URI, variableDefinitions);
       String name = parseStringAttr(line, REGEX_NAME, variableDefinitions);
       String language = parseOptionalStringAttr(line, REGEX_LANGUAGE, variableDefinitions);
@@ -362,7 +365,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
                   /* sampleRate= */ Format.NO_VALUE,
                   /* initializationData= */ null,
                   selectionFlags,
-                  /* roleFlags= */ 0,
+                  roleFlags,
                   language);
           if (isMediaTagMuxed(variants, uri)) {
             muxedAudioFormat = format;
@@ -380,6 +383,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
                   /* codecs= */ null,
                   /* bitrate= */ Format.NO_VALUE,
                   selectionFlags,
+                  roleFlags,
                   language);
           subtitles.add(new HlsMasterPlaylist.HlsUrl(uri, format, name));
           break;
@@ -406,7 +410,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
                   /* codecs= */ null,
                   /* bitrate= */ Format.NO_VALUE,
                   selectionFlags,
-                  /* roleFlags= */ 0,
+                  roleFlags,
                   language,
                   accessibilityChannel));
           break;
@@ -678,6 +682,30 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
     return flags;
   }
 
+  @C.RoleFlags
+  private static int parseRoleFlags(String line, Map<String, String> variableDefinitions) {
+    String concatenatedCharacteristics =
+        parseOptionalStringAttr(line, REGEX_CHARACTERISTICS, variableDefinitions);
+    if (TextUtils.isEmpty(concatenatedCharacteristics)) {
+      return 0;
+    }
+    String[] characteristics = Util.split(concatenatedCharacteristics, ",");
+    @C.RoleFlags int roleFlags = 0;
+    if (Util.contains(characteristics, "public.accessibility.describes-video")) {
+      roleFlags |= C.ROLE_FLAG_DESCRIBES_VIDEO;
+    }
+    if (Util.contains(characteristics, "public.accessibility.transcribes-spoken-dialog")) {
+      roleFlags |= C.ROLE_FLAG_TRANSCRIBES_DIALOG;
+    }
+    if (Util.contains(characteristics, "public.accessibility.describes-music-and-sound")) {
+      roleFlags |= C.ROLE_FLAG_DESCRIBES_MUSIC_AND_SOUND;
+    }
+    if (Util.contains(characteristics, "public.easy-to-read")) {
+      roleFlags |= C.ROLE_FLAG_EASY_TO_READ;
+    }
+    return roleFlags;
+  }
+
   private static int parseChannelsAttribute(String line, Map<String, String> variableDefinitions) {
     String channelsString = parseOptionalStringAttr(line, REGEX_CHANNELS, variableDefinitions);
     return channelsString != null
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
index add244db15..a3e2af53b6 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
@@ -184,6 +184,7 @@ public final class HlsMediaPeriodTest {
         /* codecs= */ null,
         /* bitrate= */ Format.NO_VALUE,
         /* selectionFlags= */ 0,
+        /* roleFlags= */ 0,
         language);
   }
 }
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java
index 2047ef1c62..66731660f5 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java
@@ -719,6 +719,7 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
                 /* codecs= */ null,
                 bitrate,
                 /* selectionFlags= */ 0,
+                /* roleFlags= */ 0,
                 language);
       } else {
         format =

From afd9014b823a3ff194a6f410cefe4bed53280693 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 25 Mar 2019 10:10:27 +0000
Subject: [PATCH 661/832] Ignore AC-3 tracks with fscod=3.

3 ("11") is the reserved code for fscod in AC3. The spec says that "If the
reserved code is indicated, the decoder should not attempt to decode audio and
should mute."

We currently throw an exception as we try to access an array with an invalid
index. Now ignoring the track instead by invalidating the format.

Issue:#5638
PiperOrigin-RevId: 240106255
---
 .../android/exoplayer2/audio/Ac3Util.java       | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java
index 99afff42fc..4e4964e817 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2.audio;
 
 import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.audio.Ac3Util.SyncFrameInfo.StreamType;
@@ -55,10 +56,10 @@ public final class Ac3Util {
     public static final int STREAM_TYPE_TYPE2 = 2;
 
     /**
-     * The sample mime type of the bitstream. One of {@link MimeTypes#AUDIO_AC3} and
-     * {@link MimeTypes#AUDIO_E_AC3}.
+     * The sample mime type of the bitstream. One of {@link MimeTypes#AUDIO_AC3} and {@link
+     * MimeTypes#AUDIO_E_AC3}.
      */
-    public final String mimeType;
+    @Nullable public final String mimeType;
     /**
      * The type of the stream if {@link #mimeType} is {@link MimeTypes#AUDIO_E_AC3}, or {@link
      * #STREAM_TYPE_UNDEFINED} otherwise.
@@ -82,7 +83,7 @@ public final class Ac3Util {
     public final int sampleCount;
 
     private SyncFrameInfo(
-        String mimeType,
+        @Nullable String mimeType,
         @StreamType int streamType,
         int channelCount,
         int sampleRate,
@@ -433,6 +434,11 @@ public final class Ac3Util {
       mimeType = MimeTypes.AUDIO_AC3;
       data.skipBits(16 + 16); // syncword, crc1
       int fscod = data.readBits(2);
+      if (fscod == 3) {
+        // fscod '11' indicates that the decoder should not attempt to decode audio. We invalidate
+        // the mime type to prevent association with a renderer.
+        mimeType = null;
+      }
       int frmsizecod = data.readBits(6);
       frameSize = getAc3SyncframeSize(fscod, frmsizecod);
       data.skipBits(5 + 3); // bsid, bsmod
@@ -446,7 +452,8 @@ public final class Ac3Util {
       if (acmod == 2) {
         data.skipBits(2); // dsurmod
       }
-      sampleRate = SAMPLE_RATE_BY_FSCOD[fscod];
+      sampleRate =
+          fscod < SAMPLE_RATE_BY_FSCOD.length ? SAMPLE_RATE_BY_FSCOD[fscod] : Format.NO_VALUE;
       sampleCount = AC3_SYNCFRAME_AUDIO_SAMPLE_COUNT;
       lfeon = data.readBit();
       channelCount = CHANNEL_COUNT_BY_ACMOD[acmod] + (lfeon ? 1 : 0);

From 6f9d33dbd3be68a31ce32bc4d04594d1aafbdbf8 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Mon, 25 Mar 2019 10:37:35 +0000
Subject: [PATCH 662/832] Add DefaultDownloadIndex setManualStopReason variant
 for single download

PiperOrigin-RevId: 240108843
---
 .../offline/DefaultDownloadIndex.java         | 25 +++++++++
 .../offline/DefaultDownloadIndexTest.java     | 55 ++++++++++++++++++-
 2 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
index e84f90a811..10e01969bb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -220,6 +220,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
   /**
    * Removes the {@link DownloadState} with the given {@code id}.
    *
+   * @param id ID of a {@link DownloadState}.
    * @throws DatabaseIOException If an error occurs removing the state.
    */
   public void removeDownloadState(String id) throws DatabaseIOException {
@@ -250,6 +251,30 @@ public final class DefaultDownloadIndex implements DownloadIndex {
     }
   }
 
+  /**
+   * Sets the manual stop reason of the download with the given {@code id} in a terminal state
+   * ({@link DownloadState#STATE_COMPLETED}, {@link DownloadState#STATE_FAILED}).
+   *
+   * <p>If there's no {@link DownloadState} with the given {@code id} or it isn't in a terminal
+   * state, then nothing happens.
+   *
+   * @param id ID of a {@link DownloadState}.
+   * @param manualStopReason The manual stop reason.
+   * @throws DatabaseIOException If an error occurs updating the state.
+   */
+  public void setManualStopReason(String id, int manualStopReason) throws DatabaseIOException {
+    ensureInitialized();
+    try {
+      ContentValues values = new ContentValues();
+      values.put(COLUMN_MANUAL_STOP_REASON, manualStopReason);
+      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+      writableDatabase.update(
+          TABLE_NAME, values, WHERE_STATE_TERMINAL + " AND " + WHERE_ID_EQUALS, new String[] {id});
+    } catch (SQLException e) {
+      throw new DatabaseIOException(e);
+    }
+  }
+
   private void ensureInitialized() throws DatabaseIOException {
     if (initialized) {
       return;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
index 37c3f69514..c537eb1152 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
@@ -221,7 +221,7 @@ public class DefaultDownloadIndexTest {
   }
 
   @Test
-  public void setManualStopReason_setToReasonNone() throws Exception {
+  public void setManualStopReason_setReasonToNone() throws Exception {
     String id = "id";
     DownloadStateBuilder downloadStateBuilder =
         new DownloadStateBuilder(id)
@@ -271,4 +271,57 @@ public class DefaultDownloadIndexTest {
     DownloadState readDownloadState = downloadIndex.getDownloadState(id);
     DownloadStateTest.assertEqual(readDownloadState, downloadState);
   }
+
+  @Test
+  public void setSingleDownloadManualStopReason_setReasonToNone() throws Exception {
+    String id = "id";
+    DownloadStateBuilder downloadStateBuilder =
+        new DownloadStateBuilder(id)
+            .setState(DownloadState.STATE_COMPLETED)
+            .setManualStopReason(0x12345678);
+    DownloadState downloadState = downloadStateBuilder.build();
+    downloadIndex.putDownloadState(downloadState);
+
+    downloadIndex.setManualStopReason(id, DownloadState.MANUAL_STOP_REASON_NONE);
+
+    DownloadState readDownloadState = downloadIndex.getDownloadState(id);
+    DownloadState expectedDownloadState =
+        downloadStateBuilder.setManualStopReason(DownloadState.MANUAL_STOP_REASON_NONE).build();
+    DownloadStateTest.assertEqual(readDownloadState, expectedDownloadState);
+  }
+
+  @Test
+  public void setSingleDownloadManualStopReason_setReason() throws Exception {
+    String id = "id";
+    DownloadStateBuilder downloadStateBuilder =
+        new DownloadStateBuilder(id)
+            .setState(DownloadState.STATE_FAILED)
+            .setFailureReason(DownloadState.FAILURE_REASON_UNKNOWN);
+    DownloadState downloadState = downloadStateBuilder.build();
+    downloadIndex.putDownloadState(downloadState);
+    int manualStopReason = 0x12345678;
+
+    downloadIndex.setManualStopReason(id, manualStopReason);
+
+    DownloadState readDownloadState = downloadIndex.getDownloadState(id);
+    DownloadState expectedDownloadState =
+        downloadStateBuilder.setManualStopReason(manualStopReason).build();
+    DownloadStateTest.assertEqual(readDownloadState, expectedDownloadState);
+  }
+
+  @Test
+  public void setSingleDownloadManualStopReason_notTerminalState_doesNotSetManualStopReason()
+      throws Exception {
+    String id = "id";
+    DownloadStateBuilder downloadStateBuilder =
+        new DownloadStateBuilder(id).setState(DownloadState.STATE_DOWNLOADING);
+    DownloadState downloadState = downloadStateBuilder.build();
+    downloadIndex.putDownloadState(downloadState);
+    int notMetRequirements = 0x12345678;
+
+    downloadIndex.setManualStopReason(id, notMetRequirements);
+
+    DownloadState readDownloadState = downloadIndex.getDownloadState(id);
+    DownloadStateTest.assertEqual(readDownloadState, downloadState);
+  }
 }

From b0bb6ec8a5b5ba0e4645244fa517830264f66b80 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 25 Mar 2019 11:35:44 +0000
Subject: [PATCH 663/832] Allow to set selection reason and data when
 specifying an override.

It's currently very difficult to actually set a reason for track selection
triggered by a SelectionOverride. It would require creating a new custom
TrackSelection.Factory where the reason gets injected somehow before the
override is specified on the player.

Simplify this whole procedure by allowing to set the reason directly and
forward this reason to all fixed selections created based on this override.

PiperOrigin-RevId: 240114942
---
 RELEASENOTES.md                               |  1 +
 .../AdaptiveTrackSelection.java               |  4 ++-
 .../trackselection/DefaultTrackSelector.java  | 32 +++++++++++++++++--
 .../trackselection/TrackSelection.java        | 16 ++++++++++
 .../trackselection/TrackSelectionUtil.java    |  4 ++-
 5 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 6158ea9e07..989d67a49a 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -22,6 +22,7 @@
     ([#3314](https://github.com/google/ExoPlayer/issues/3314)).
   * Update `TrackSelection.Factory` interface to support creating all track
     selections together.
+  * Allow to specify a selection reason for a `SelectionOverride`.
 * Do not retry failed loads whose error is `FileNotFoundException`.
 * Support Dolby Vision extraction in MP4 and fMP4.
 * Offline:
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
index 32e6a499cd..ba4dd6e8a9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
@@ -242,7 +242,9 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
               createAdaptiveTrackSelection(definition.group, bandwidthMeter, definition.tracks);
           selections[i] = adaptiveSelection;
         } else {
-          selections[i] = new FixedTrackSelection(definition.group, definition.tracks[0]);
+          selections[i] =
+              new FixedTrackSelection(
+                  definition.group, definition.tracks[0], definition.reason, definition.data);
           int trackBitrate = definition.group.getFormat(definition.tracks[0]).bitrate;
           if (trackBitrate != Format.NO_VALUE) {
             totalFixedBandwidth += trackBitrate;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
index 0b510ea496..9852736e4d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -1173,15 +1173,29 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     public final int groupIndex;
     public final int[] tracks;
     public final int length;
+    public final int reason;
+    public final int data;
 
     /**
      * @param groupIndex The overriding track group index.
      * @param tracks The overriding track indices within the track group.
      */
     public SelectionOverride(int groupIndex, int... tracks) {
+      this(groupIndex, tracks, C.SELECTION_REASON_MANUAL, /* data= */ 0);
+    }
+
+    /**
+     * @param groupIndex The overriding track group index.
+     * @param tracks The overriding track indices within the track group.
+     * @param reason The reason for the override. One of the {@link C} SELECTION_REASON_ constants.
+     * @param data Optional data associated with this override.
+     */
+    public SelectionOverride(int groupIndex, int[] tracks, int reason, int data) {
       this.groupIndex = groupIndex;
       this.tracks = Arrays.copyOf(tracks, tracks.length);
       this.length = tracks.length;
+      this.reason = reason;
+      this.data = data;
       Arrays.sort(this.tracks);
     }
 
@@ -1190,6 +1204,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       length = in.readByte();
       tracks = new int[length];
       in.readIntArray(tracks);
+      reason = in.readInt();
+      data = in.readInt();
     }
 
     /** Returns whether this override contains the specified track index. */
@@ -1204,7 +1220,9 @@ public class DefaultTrackSelector extends MappingTrackSelector {
 
     @Override
     public int hashCode() {
-      return 31 * groupIndex + Arrays.hashCode(tracks);
+      int hash = 31 * groupIndex + Arrays.hashCode(tracks);
+      hash = 31 * hash + reason;
+      return 31 * hash + data;
     }
 
     @Override
@@ -1216,7 +1234,10 @@ public class DefaultTrackSelector extends MappingTrackSelector {
         return false;
       }
       SelectionOverride other = (SelectionOverride) obj;
-      return groupIndex == other.groupIndex && Arrays.equals(tracks, other.tracks);
+      return groupIndex == other.groupIndex
+          && Arrays.equals(tracks, other.tracks)
+          && reason == other.reason
+          && data == other.data;
     }
 
     // Parcelable implementation.
@@ -1231,6 +1252,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       dest.writeInt(groupIndex);
       dest.writeInt(tracks.length);
       dest.writeIntArray(tracks);
+      dest.writeInt(reason);
+      dest.writeInt(data);
     }
 
     public static final Parcelable.Creator<SelectionOverride> CREATOR =
@@ -1405,7 +1428,10 @@ public class DefaultTrackSelector extends MappingTrackSelector {
             override == null
                 ? null
                 : new TrackSelection.Definition(
-                    rendererTrackGroups.get(override.groupIndex), override.tracks);
+                    rendererTrackGroups.get(override.groupIndex),
+                    override.tracks,
+                    override.reason,
+                    override.data);
       }
     }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java
index e244bf4a8c..bd99403b07 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java
@@ -43,6 +43,10 @@ public interface TrackSelection {
     public final TrackGroup group;
     /** The indices of the selected tracks in {@link #group}. */
     public final int[] tracks;
+    /** The track selection reason. One of the {@link C} SELECTION_REASON_ constants. */
+    public final int reason;
+    /** Optional data associated with this selection of tracks. */
+    @Nullable public final Object data;
 
     /**
      * @param group The {@link TrackGroup}. Must not be null.
@@ -50,8 +54,20 @@ public interface TrackSelection {
      *     null or empty. May be in any order.
      */
     public Definition(TrackGroup group, int... tracks) {
+      this(group, tracks, C.SELECTION_REASON_UNKNOWN, /* data= */ null);
+    }
+
+    /**
+     * @param group The {@link TrackGroup}. Must not be null.
+     * @param tracks The indices of the selected tracks within the {@link TrackGroup}. Must not be
+     * @param reason The track selection reason. One of the {@link C} SELECTION_REASON_ constants.
+     * @param data Optional data associated with this selection of tracks.
+     */
+    public Definition(TrackGroup group, int[] tracks, int reason, @Nullable Object data) {
       this.group = group;
       this.tracks = tracks;
+      this.reason = reason;
+      this.data = data;
     }
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
index 3fd763157e..71afd87b0f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
@@ -71,7 +71,9 @@ public final class TrackSelectionUtil {
         createdAdaptiveTrackSelection = true;
         selections[i] = adaptiveTrackSelectionFactory.createAdaptiveTrackSelection(definition);
       } else {
-        selections[i] = new FixedTrackSelection(definition.group, definition.tracks[0]);
+        selections[i] =
+            new FixedTrackSelection(
+                definition.group, definition.tracks[0], definition.reason, definition.data);
       }
     }
     return selections;

From e91eec7cf8e482e52227ed6f26ebc20fa758f227 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 25 Mar 2019 12:30:30 +0000
Subject: [PATCH 664/832] Make DownloadThread extend Thread

PiperOrigin-RevId: 240120782
---
 .../android/exoplayer2/offline/DownloadManager.java       | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 6b47299de5..e804611497 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -818,26 +818,24 @@ public final class DownloadManager {
     }
   }
 
-  private class DownloadThread implements Runnable {
+  private class DownloadThread extends Thread {
 
     private final Download download;
     private final Downloader downloader;
     private final boolean isRemoveThread;
-    private final Thread thread;
     private volatile boolean isCanceled;
 
     private DownloadThread(Download download, Downloader downloader, boolean isRemoveThread) {
       this.download = download;
       this.downloader = downloader;
       this.isRemoveThread = isRemoveThread;
-      thread = new Thread(this);
-      thread.start();
+      start();
     }
 
     public void cancel() {
       isCanceled = true;
       downloader.cancel();
-      thread.interrupt();
+      interrupt();
     }
 
     // Methods running on download thread.

From 32347362f452c83d28021a92b578d15f6666dc23 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Mon, 25 Mar 2019 14:18:09 +0000
Subject: [PATCH 665/832] Select text track matching selected audio language
 when selecting forced text tracks

PiperOrigin-RevId: 240133676
---
 .../trackselection/DefaultTrackSelector.java  | 35 ++++++++++---
 .../DefaultTrackSelectorTest.java             | 51 ++++++++++++++++++-
 2 files changed, 77 insertions(+), 9 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
index 9852736e4d..dd2a91f04d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -1510,6 +1510,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     }
 
     AudioTrackScore selectedAudioTrackScore = null;
+    String selectedAudioLanguage = null;
     int selectedAudioRendererIndex = C.INDEX_UNSET;
     for (int i = 0; i < rendererCount; i++) {
       if (C.TRACK_TYPE_AUDIO == mappedTrackInfo.getRendererType(i)) {
@@ -1528,7 +1529,10 @@ public class DefaultTrackSelector extends MappingTrackSelector {
             // score. Clear the selection for that renderer.
             definitions[selectedAudioRendererIndex] = null;
           }
-          definitions[i] = audioSelection.first;
+          TrackSelection.Definition definition = audioSelection.first;
+          definitions[i] = definition;
+          // We assume that audio tracks in the same group have matching language.
+          selectedAudioLanguage = definition.group.getFormat(definition.tracks[0]).language;
           selectedAudioTrackScore = audioSelection.second;
           selectedAudioRendererIndex = i;
         }
@@ -1546,7 +1550,11 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           break;
         case C.TRACK_TYPE_TEXT:
           Pair<TrackSelection.Definition, Integer> textSelection =
-              selectTextTrack(mappedTrackInfo.getTrackGroups(i), rendererFormatSupports[i], params);
+              selectTextTrack(
+                  mappedTrackInfo.getTrackGroups(i),
+                  rendererFormatSupports[i],
+                  params,
+                  selectedAudioLanguage);
           if (textSelection != null && textSelection.second > selectedTextTrackScore) {
             if (selectedTextRendererIndex != C.INDEX_UNSET) {
               // We've already made a selection for another text renderer, but it had a lower score.
@@ -2020,13 +2028,18 @@ public class DefaultTrackSelector extends MappingTrackSelector {
    * @param formatSupport The result of {@link RendererCapabilities#supportsFormat} for each mapped
    *     track, indexed by track group index and track index (in that order).
    * @param params The selector's current constraint parameters.
+   * @param selectedAudioLanguage The language of the selected audio track. May be null if the
+   *     selected audio track declares no language or no audio track was selected.
    * @return The {@link TrackSelection.Definition} and corresponding track score, or null if no
    *     selection was made.
    * @throws ExoPlaybackException If an error occurs while selecting the tracks.
    */
   @Nullable
   protected Pair<TrackSelection.Definition, Integer> selectTextTrack(
-      TrackGroupArray groups, int[][] formatSupport, Parameters params)
+      TrackGroupArray groups,
+      int[][] formatSupport,
+      Parameters params,
+      @Nullable String selectedAudioLanguage)
       throws ExoPlaybackException {
     TrackGroup selectedGroup = null;
     int selectedTrackIndex = 0;
@@ -2047,20 +2060,26 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           if (languageScore > 0
               || (params.selectUndeterminedTextLanguage && formatHasNoLanguage(format))) {
             if (isDefault) {
-              trackScore = 11;
+              trackScore = 13;
             } else if (!isForced) {
               // Prefer non-forced to forced if a preferred text language has been specified. Where
               // both are provided the non-forced track will usually contain the forced subtitles as
               // a subset.
-              trackScore = 8;
+              trackScore = 10;
             } else {
-              trackScore = 5;
+              trackScore = 7;
             }
             trackScore += languageScore;
           } else if (isDefault) {
-            trackScore = 4;
+            trackScore = 6;
           } else if (isForced) {
-            trackScore = 1 + languageScore;
+            int preferredAudioLanguageScore =
+                getFormatLanguageScore(format, params.preferredAudioLanguage);
+            if (preferredAudioLanguageScore > 0) {
+              trackScore = 3 + preferredAudioLanguageScore;
+            } else {
+              trackScore = 1 + getFormatLanguageScore(format, selectedAudioLanguage);
+            }
           } else {
             // Track should not be selected.
             continue;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
index aaeb6b7c99..3091e46456 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
@@ -888,7 +888,7 @@ public final class DefaultTrackSelectorTest {
 
   /** Tests text track selection flags. */
   @Test
-  public void testsTextTrackSelectionFlags() throws ExoPlaybackException {
+  public void testTextTrackSelectionFlags() throws ExoPlaybackException {
     Format forcedOnly = buildTextFormat("forcedOnly", "eng", C.SELECTION_FLAG_FORCED);
     Format forcedDefault =
         buildTextFormat("forcedDefault", "eng", C.SELECTION_FLAG_FORCED | C.SELECTION_FLAG_DEFAULT);
@@ -967,6 +967,55 @@ public final class DefaultTrackSelectorTest {
     assertFixedSelection(result.selections.get(0), trackGroups, noFlag);
   }
 
+  /**
+   * Tests that the default track selector will select a forced text track matching the selected
+   * audio language when no text language preferences match.
+   */
+  @Test
+  public void testSelectingForcedTextTrackMatchesAudioLanguage() throws ExoPlaybackException {
+    Format forcedEnglish =
+        buildTextFormat(/* id= */ "forcedEnglish", /* language= */ "eng", C.SELECTION_FLAG_FORCED);
+    Format forcedGerman =
+        buildTextFormat(/* id= */ "forcedGerman", /* language= */ "deu", C.SELECTION_FLAG_FORCED);
+    Format audio = buildAudioFormat(/* id= */ "audio");
+    Format germanAudio =
+        buildAudioFormat(
+            /* id= */ "germanAudio",
+            MimeTypes.AUDIO_AAC,
+            /* bitrate= */ Format.NO_VALUE,
+            "deu",
+            /* selectionFlags= */ 0,
+            /* channelCount= */ Format.NO_VALUE,
+            /* sampleRate= */ Format.NO_VALUE);
+
+    RendererCapabilities[] rendererCapabilities =
+        new RendererCapabilities[] {
+          ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES,
+          ALL_TEXT_FORMAT_SUPPORTED_RENDERER_CAPABILITIES
+        };
+
+    // The audio declares no language. The first forced text track should be selected.
+    TrackGroupArray trackGroups = wrapFormats(audio, forcedEnglish, forcedGerman);
+    TrackSelectorResult result =
+        trackSelector.selectTracks(rendererCapabilities, trackGroups, periodId, TIMELINE);
+    assertFixedSelection(result.selections.get(1), trackGroups, forcedEnglish);
+
+    // Ditto.
+    trackGroups = wrapFormats(audio, forcedGerman, forcedEnglish);
+    result = trackSelector.selectTracks(rendererCapabilities, trackGroups, periodId, TIMELINE);
+    assertFixedSelection(result.selections.get(1), trackGroups, forcedGerman);
+
+    // The audio declares german. The german forced track should be selected.
+    trackGroups = wrapFormats(germanAudio, forcedGerman, forcedEnglish);
+    result = trackSelector.selectTracks(rendererCapabilities, trackGroups, periodId, TIMELINE);
+    assertFixedSelection(result.selections.get(1), trackGroups, forcedGerman);
+
+    // Ditto
+    trackGroups = wrapFormats(germanAudio, forcedEnglish, forcedGerman);
+    result = trackSelector.selectTracks(rendererCapabilities, trackGroups, periodId, TIMELINE);
+    assertFixedSelection(result.selections.get(1), trackGroups, forcedGerman);
+  }
+
   /**
    * Tests that the default track selector will select a text track with undetermined language if no
    * text track with the preferred language is available but

From 679b628326ab128bc03ea15f6c157da76b2132a2 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 25 Mar 2019 16:03:33 +0000
Subject: [PATCH 666/832] Add experimental option for multiple parallel
 adaptive track selections.

If enabled, DefaultTrackSelector returns multiple groups with more than one
track. AdaptiveTrackSelection then decides on the order in which the tracks
are changed such that the BandwidthProvider for each selection can figure out
the allocated bandwidth.

PiperOrigin-RevId: 240150206
---
 .../AdaptiveTrackSelection.java               | 174 +++++++++++++++++-
 .../trackselection/DefaultTrackSelector.java  |  15 +-
 2 files changed, 183 insertions(+), 6 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
index ba4dd6e8a9..93c31f899f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
@@ -23,8 +23,10 @@ import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.chunk.MediaChunk;
 import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
 import com.google.android.exoplayer2.upstream.BandwidthMeter;
+import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Clock;
 import com.google.android.exoplayer2.util.Util;
+import java.util.ArrayList;
 import java.util.List;
 import org.checkerframework.checker.nullness.compatqual.NullableType;
 
@@ -230,7 +232,7 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
     public @NullableType TrackSelection[] createTrackSelections(
         @NullableType Definition[] definitions, BandwidthMeter bandwidthMeter) {
       TrackSelection[] selections = new TrackSelection[definitions.length];
-      AdaptiveTrackSelection adaptiveSelection = null;
+      List<AdaptiveTrackSelection> adaptiveSelections = new ArrayList<>();
       int totalFixedBandwidth = 0;
       for (int i = 0; i < definitions.length; i++) {
         Definition definition = definitions[i];
@@ -238,8 +240,9 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
           continue;
         }
         if (definition.tracks.length > 1) {
-          adaptiveSelection =
+          AdaptiveTrackSelection adaptiveSelection =
               createAdaptiveTrackSelection(definition.group, bandwidthMeter, definition.tracks);
+          adaptiveSelections.add(adaptiveSelection);
           selections[i] = adaptiveSelection;
         } else {
           selections[i] =
@@ -251,8 +254,27 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
           }
         }
       }
-      if (blockFixedTrackSelectionBandwidth && adaptiveSelection != null) {
-        adaptiveSelection.experimental_setNonAllocatableBandwidth(totalFixedBandwidth);
+      if (blockFixedTrackSelectionBandwidth) {
+        for (int i = 0; i < adaptiveSelections.size(); i++) {
+          adaptiveSelections.get(i).experimental_setNonAllocatableBandwidth(totalFixedBandwidth);
+        }
+      }
+      if (adaptiveSelections.size() > 1) {
+        long[][] adaptiveTrackBitrates = new long[adaptiveSelections.size()][];
+        for (int i = 0; i < adaptiveSelections.size(); i++) {
+          AdaptiveTrackSelection adaptiveSelection = adaptiveSelections.get(i);
+          adaptiveTrackBitrates[i] = new long[adaptiveSelection.length()];
+          for (int j = 0; j < adaptiveSelection.length(); j++) {
+            adaptiveTrackBitrates[i][j] =
+                adaptiveSelection.getFormat(adaptiveSelection.length() - j - 1).bitrate;
+          }
+        }
+        long[][][] bandwidthCheckpoints = getAllocationCheckpoints(adaptiveTrackBitrates);
+        for (int i = 0; i < adaptiveSelections.size(); i++) {
+          adaptiveSelections
+              .get(i)
+              .experimental_setBandwidthAllocationCheckpoints(bandwidthCheckpoints[i]);
+        }
       }
       return selections;
     }
@@ -430,6 +452,17 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
         .experimental_setNonAllocatableBandwidth(nonAllocatableBandwidth);
   }
 
+  /**
+   * Sets checkpoints to determine the allocation bandwidth based on the total bandwidth.
+   *
+   * @param allocationCheckpoints List of checkpoints. Each element must be a long[2], with [0]
+   *     being the total bandwidth and [1] being the allocated bandwidth.
+   */
+  public void experimental_setBandwidthAllocationCheckpoints(long[][] allocationCheckpoints) {
+    ((DefaultBandwidthProvider) bandwidthProvider)
+        .experimental_setBandwidthAllocationCheckpoints(allocationCheckpoints);
+  }
+
   @Override
   public void enable() {
     lastBufferEvaluationMs = C.TIME_UNSET;
@@ -630,6 +663,8 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
 
     private long nonAllocatableBandwidth;
 
+    @Nullable private long[][] allocationCheckpoints;
+
     /* package */ DefaultBandwidthProvider(BandwidthMeter bandwidthMeter, float bandwidthFraction) {
       this.bandwidthMeter = bandwidthMeter;
       this.bandwidthFraction = bandwidthFraction;
@@ -638,11 +673,140 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
     @Override
     public long getAllocatedBandwidth() {
       long totalBandwidth = (long) (bandwidthMeter.getBitrateEstimate() * bandwidthFraction);
-      return Math.max(0L, totalBandwidth - nonAllocatableBandwidth);
+      long allocatableBandwidth = Math.max(0L, totalBandwidth - nonAllocatableBandwidth);
+      if (allocationCheckpoints == null) {
+        return allocatableBandwidth;
+      }
+      int nextIndex = 1;
+      while (nextIndex < allocationCheckpoints.length - 1
+          && allocationCheckpoints[nextIndex][0] < allocatableBandwidth) {
+        nextIndex++;
+      }
+      long[] previous = allocationCheckpoints[nextIndex - 1];
+      long[] next = allocationCheckpoints[nextIndex];
+      float fractionBetweenCheckpoints =
+          (float) (allocatableBandwidth - previous[0]) / (next[0] - previous[0]);
+      return previous[1] + (long) (fractionBetweenCheckpoints * (next[1] - previous[1]));
     }
 
     /* package */ void experimental_setNonAllocatableBandwidth(long nonAllocatableBandwidth) {
       this.nonAllocatableBandwidth = nonAllocatableBandwidth;
     }
+
+    /* package */ void experimental_setBandwidthAllocationCheckpoints(
+        long[][] allocationCheckpoints) {
+      Assertions.checkArgument(allocationCheckpoints.length >= 2);
+      this.allocationCheckpoints = allocationCheckpoints;
+    }
+  }
+
+  /**
+   * Returns allocation checkpoints for allocating bandwidth between multiple adaptive track
+   * selections.
+   *
+   * @param trackBitrates Array of [selectionIndex][trackIndex] -> trackBitrate.
+   * @return Array of allocation checkpoints [selectionIndex][checkpointIndex][2] with [0]=total
+   *     bandwidth at checkpoint and [1]=allocated bandwidth at checkpoint.
+   */
+  private static long[][][] getAllocationCheckpoints(long[][] trackBitrates) {
+    // Algorithm:
+    //  1. Use log bitrates to treat all resolution update steps equally.
+    //  2. Distribute switch points for each selection equally in the same [0.0-1.0] range.
+    //  3. Switch up one format at a time in the order of the switch points.
+    double[][] logBitrates = getLogArrayValues(trackBitrates);
+    double[][] switchPoints = getSwitchPoints(logBitrates);
+
+    // There will be (count(switch point) + 3) checkpoints:
+    // [0] = all zero, [1] = minimum bitrates, [2-(end-1)] = up-switch points,
+    // [end] = extra point to set slope for additional bitrate.
+    int checkpointCount = countArrayElements(switchPoints) + 3;
+    long[][][] checkpoints = new long[logBitrates.length][checkpointCount][2];
+    int[] currentSelection = new int[logBitrates.length];
+    setCheckpointValues(checkpoints, /* checkpointIndex= */ 1, trackBitrates, currentSelection);
+    for (int checkpointIndex = 2; checkpointIndex < checkpointCount - 1; checkpointIndex++) {
+      int nextUpdateIndex = 0;
+      double nextUpdateSwitchPoint = Double.MAX_VALUE;
+      for (int i = 0; i < logBitrates.length; i++) {
+        if (currentSelection[i] + 1 == logBitrates[i].length) {
+          continue;
+        }
+        double switchPoint = switchPoints[i][currentSelection[i]];
+        if (switchPoint < nextUpdateSwitchPoint) {
+          nextUpdateSwitchPoint = switchPoint;
+          nextUpdateIndex = i;
+        }
+      }
+      currentSelection[nextUpdateIndex]++;
+      setCheckpointValues(checkpoints, checkpointIndex, trackBitrates, currentSelection);
+    }
+    for (long[][] points : checkpoints) {
+      points[checkpointCount - 1][0] = 2 * points[checkpointCount - 2][0];
+      points[checkpointCount - 1][1] = 2 * points[checkpointCount - 2][1];
+    }
+    return checkpoints;
+  }
+
+  /** Converts all input values to Math.log(value). */
+  private static double[][] getLogArrayValues(long[][] values) {
+    double[][] logValues = new double[values.length][];
+    for (int i = 0; i < values.length; i++) {
+      logValues[i] = new double[values[i].length];
+      for (int j = 0; j < values[i].length; j++) {
+        logValues[i][j] = Math.log(values[i][j]);
+      }
+    }
+    return logValues;
+  }
+
+  /**
+   * Returns idealized switch points for each switch between consecutive track selection bitrates.
+   *
+   * @param logBitrates Log bitrates with [selectionCount][formatCount].
+   * @return Linearly distributed switch points in the range of [0.0-1.0].
+   */
+  private static double[][] getSwitchPoints(double[][] logBitrates) {
+    double[][] switchPoints = new double[logBitrates.length][];
+    for (int i = 0; i < logBitrates.length; i++) {
+      switchPoints[i] = new double[logBitrates[i].length - 1];
+      if (switchPoints[i].length == 0) {
+        continue;
+      }
+      double totalBitrateDiff = logBitrates[i][logBitrates[i].length - 1] - logBitrates[i][0];
+      for (int j = 0; j < logBitrates[i].length - 1; j++) {
+        double switchBitrate = 0.5 * (logBitrates[i][j] + logBitrates[i][j + 1]);
+        switchPoints[i][j] = (switchBitrate - logBitrates[i][0]) / totalBitrateDiff;
+      }
+    }
+    return switchPoints;
+  }
+
+  /** Returns total number of elements in a 2D array. */
+  private static int countArrayElements(double[][] array) {
+    int count = 0;
+    for (double[] subArray : array) {
+      count += subArray.length;
+    }
+    return count;
+  }
+
+  /**
+   * Sets checkpoint bitrates.
+   *
+   * @param checkpoints Output checkpoints with [selectionIndex][checkpointIndex][2] where [0]=Total
+   *     bitrate and [1]=Allocated bitrate.
+   * @param checkpointIndex The checkpoint index.
+   * @param trackBitrates The track bitrates with [selectionIndex][trackIndex].
+   * @param selectedTracks The indices of selected tracks for each selection for this checkpoint.
+   */
+  private static void setCheckpointValues(
+      long[][][] checkpoints, int checkpointIndex, long[][] trackBitrates, int[] selectedTracks) {
+    long totalBitrate = 0;
+    for (int i = 0; i < checkpoints.length; i++) {
+      checkpoints[i][checkpointIndex][1] = trackBitrates[i][selectedTracks[i]];
+      totalBitrate += checkpoints[i][checkpointIndex][1];
+    }
+    for (long[][] points : checkpoints) {
+      points[checkpointIndex][0] = totalBitrate;
+    }
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
index dd2a91f04d..5fc839cd32 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -1283,6 +1283,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
   private final TrackSelection.Factory trackSelectionFactory;
   private final AtomicReference<Parameters> parametersReference;
 
+  private boolean allowMultipleAdaptiveSelections;
+
   public DefaultTrackSelector() {
     this(new AdaptiveTrackSelection.Factory());
   }
@@ -1397,6 +1399,15 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     setParameters(buildUponParameters().setTunnelingAudioSessionId(tunnelingAudioSessionId));
   }
 
+  /**
+   * Allows the creation of multiple adaptive track selections.
+   *
+   * <p>This method is experimental, and will be renamed or removed in a future release.
+   */
+  public void experimental_allowMultipleAdaptiveSelections() {
+    this.allowMultipleAdaptiveSelections = true;
+  }
+
   // MappingTrackSelector implementation.
 
   @Override
@@ -1514,13 +1525,15 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     int selectedAudioRendererIndex = C.INDEX_UNSET;
     for (int i = 0; i < rendererCount; i++) {
       if (C.TRACK_TYPE_AUDIO == mappedTrackInfo.getRendererType(i)) {
+        boolean enableAdaptiveTrackSelection =
+            allowMultipleAdaptiveSelections || !seenVideoRendererWithMappedTracks;
         Pair<TrackSelection.Definition, AudioTrackScore> audioSelection =
             selectAudioTrack(
                 mappedTrackInfo.getTrackGroups(i),
                 rendererFormatSupports[i],
                 rendererMixedMimeTypeAdaptationSupports[i],
                 params,
-                !seenVideoRendererWithMappedTracks);
+                enableAdaptiveTrackSelection);
         if (audioSelection != null
             && (selectedAudioTrackScore == null
                 || audioSelection.second.compareTo(selectedAudioTrackScore) > 0)) {

From e4b49477ec74f83f0369e9d25cae8a46889f3361 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 26 Mar 2019 11:04:01 +0000
Subject: [PATCH 667/832] Some nullability cleanup for HLS playlists

PiperOrigin-RevId: 240318686
---
 .../source/hls/playlist/HlsMediaPlaylist.java          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java
index e45d6c7043..4411c9865e 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java
@@ -43,7 +43,7 @@ public final class HlsMediaPlaylist extends HlsPlaylist {
      * the media playlist does not define a media section for this segment. The same instance is
      * used for all segments that share an EXT-X-MAP tag.
      */
-    public final @Nullable Segment initializationSegment;
+    @Nullable public final Segment initializationSegment;
     /** The duration of the segment in microseconds, as defined by #EXTINF. */
     public final long durationUs;
     /** The human readable title of the segment. */
@@ -60,17 +60,17 @@ public final class HlsMediaPlaylist extends HlsPlaylist {
      * DRM initialization data for sample decryption, or null if the segment does not use CDM-DRM
      * protection.
      */
-    public final @Nullable DrmInitData drmInitData;
+    @Nullable public final DrmInitData drmInitData;
     /**
      * The encryption identity key uri as defined by #EXT-X-KEY, or null if the segment does not use
      * full segment encryption with identity key.
      */
-    public final @Nullable String fullSegmentEncryptionKeyUri;
+    @Nullable public final String fullSegmentEncryptionKeyUri;
     /**
      * The encryption initialization vector as defined by #EXT-X-KEY, or null if the segment is not
      * encrypted.
      */
-    public final @Nullable String encryptionIV;
+    @Nullable public final String encryptionIV;
     /**
      * The segment's byte range offset, as defined by #EXT-X-BYTERANGE.
      */
@@ -222,7 +222,7 @@ public final class HlsMediaPlaylist extends HlsPlaylist {
    * Contains the CDM protection schemes used by segments in this playlist. Does not contain any key
    * acquisition data. Null if none of the segments in the playlist is CDM-encrypted.
    */
-  public final @Nullable DrmInitData protectionSchemes;
+  @Nullable public final DrmInitData protectionSchemes;
   /**
    * The list of segments in the playlist.
    */

From 3919f3843d55197996784de3c060584122e28b34 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Tue, 26 Mar 2019 11:20:13 +0000
Subject: [PATCH 668/832] Make DownloadManager use DownloadIndex

PiperOrigin-RevId: 240320220
---
 .../exoplayer2/demo/DemoApplication.java      |  25 +-
 .../exoplayer2/demo/DownloadTracker.java      |  82 ++---
 .../exoplayer2/offline/DownloadManager.java   | 325 +++++++++++-------
 .../offline/DownloadManagerTest.java          |  16 +-
 .../dash/offline/DownloadManagerDashTest.java |  11 +-
 .../dash/offline/DownloadServiceDashTest.java |  14 +-
 .../exoplayer2/testutil/DummyMainThread.java  |  32 +-
 7 files changed, 285 insertions(+), 220 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
index 8ed4a128d4..380aa98bde 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
@@ -114,21 +114,14 @@ public class DemoApplication extends Application {
   private synchronized void initDownloadManager() {
     if (downloadManager == null) {
       DefaultDownloadIndex downloadIndex = new DefaultDownloadIndex(new ExoDatabaseProvider(this));
-      File actionFile = new File(getDownloadDirectory(), DOWNLOAD_TRACKER_ACTION_FILE);
-      if (actionFile.exists()) {
-        try {
-          DownloadIndexUtil.upgradeActionFile(new ActionFile(actionFile), downloadIndex, null);
-        } catch (IOException e) {
-          Log.e(TAG, "Upgrading action file failed", e);
-        }
-        actionFile.delete();
-      }
+      upgradeActionFile(DOWNLOAD_TRACKER_ACTION_FILE, downloadIndex);
+      upgradeActionFile(DOWNLOAD_ACTION_FILE, downloadIndex);
       DownloaderConstructorHelper downloaderConstructorHelper =
           new DownloaderConstructorHelper(getDownloadCache(), buildHttpDataSourceFactory());
       downloadManager =
           new DownloadManager(
               this,
-              new File(getDownloadDirectory(), DOWNLOAD_ACTION_FILE),
+              downloadIndex,
               new DefaultDownloaderFactory(downloaderConstructorHelper),
               MAX_SIMULTANEOUS_DOWNLOADS,
               DownloadManager.DEFAULT_MIN_RETRY_COUNT,
@@ -139,6 +132,18 @@ public class DemoApplication extends Application {
     }
   }
 
+  private void upgradeActionFile(String file, DefaultDownloadIndex downloadIndex) {
+    ActionFile actionFile = new ActionFile(new File(getDownloadDirectory(), file));
+    if (actionFile.exists()) {
+      try {
+        DownloadIndexUtil.upgradeActionFile(actionFile, downloadIndex, null);
+      } catch (IOException e) {
+        Log.e(TAG, "Upgrading action file failed", e);
+      }
+      actionFile.delete();
+    }
+  }
+
   private File getDownloadDirectory() {
     if (downloadDirectory == null) {
       downloadDirectory = getExternalFilesDir(null);
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index 6fd186cd9e..46e700c812 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -18,8 +18,6 @@ package com.google.android.exoplayer2.demo;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.net.Uri;
-import android.os.Handler;
-import android.os.HandlerThread;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentManager;
 import android.widget.Toast;
@@ -66,9 +64,8 @@ public class DownloadTracker implements DownloadManager.Listener {
   private final Context context;
   private final DataSource.Factory dataSourceFactory;
   private final CopyOnWriteArraySet<Listener> listeners;
-  private final HashMap<Uri, DownloadState> trackedDownloadStates;
+  private final HashMap<Uri, DownloadState> downloadStates;
   private final DefaultDownloadIndex downloadIndex;
-  private final Handler indexHandler;
 
   @Nullable private StartDownloadDialogHelper startDownloadDialogHelper;
 
@@ -78,11 +75,8 @@ public class DownloadTracker implements DownloadManager.Listener {
     this.dataSourceFactory = dataSourceFactory;
     this.downloadIndex = downloadIndex;
     listeners = new CopyOnWriteArraySet<>();
-    trackedDownloadStates = new HashMap<>();
-    HandlerThread indexThread = new HandlerThread("DownloadTracker");
-    indexThread.start();
-    indexHandler = new Handler(indexThread.getLooper());
-    loadTrackedActions();
+    downloadStates = new HashMap<>();
+    loadDownloads();
   }
 
   public void addListener(Listener listener) {
@@ -94,15 +88,16 @@ public class DownloadTracker implements DownloadManager.Listener {
   }
 
   public boolean isDownloaded(Uri uri) {
-    return trackedDownloadStates.containsKey(uri);
+    DownloadState downloadState = downloadStates.get(uri);
+    return downloadState != null && downloadState.state != DownloadState.STATE_FAILED;
   }
 
   @SuppressWarnings("unchecked")
   public List<StreamKey> getOfflineStreamKeys(Uri uri) {
-    if (!trackedDownloadStates.containsKey(uri)) {
-      return Collections.emptyList();
-    }
-    return Arrays.asList(trackedDownloadStates.get(uri).streamKeys);
+    DownloadState downloadState = downloadStates.get(uri);
+    return downloadState != null && downloadState.state != DownloadState.STATE_FAILED
+        ? Arrays.asList(downloadState.streamKeys)
+        : Collections.emptyList();
   }
 
   public void toggleDownload(
@@ -129,59 +124,34 @@ public class DownloadTracker implements DownloadManager.Listener {
 
   @Override
   public void onDownloadStateChanged(DownloadManager downloadManager, DownloadState downloadState) {
-    if (downloadState.state == DownloadState.STATE_REMOVED
-        || downloadState.state == DownloadState.STATE_FAILED) {
-      // A download has been removed, or has failed. Stop tracking it.
-      if (trackedDownloadStates.remove(downloadState.uri) != null) {
-        handleTrackedDownloadStateChanged(downloadState);
+    boolean downloaded = isDownloaded(downloadState.uri);
+    if (downloadState.state == DownloadState.STATE_REMOVED) {
+      downloadStates.remove(downloadState.uri);
+    } else {
+      downloadStates.put(downloadState.uri, downloadState);
+    }
+    if (downloaded != isDownloaded(downloadState.uri)) {
+      for (Listener listener : listeners) {
+        listener.onDownloadsChanged();
       }
     }
   }
 
   // Internal methods
 
-  private void loadTrackedActions() {
+  private void loadDownloads() {
     try {
-      DownloadStateCursor downloadStates = downloadIndex.getDownloadStates();
-      while (downloadStates.moveToNext()) {
-        DownloadState downloadState = downloadStates.getDownloadState();
-        trackedDownloadStates.put(downloadState.uri, downloadState);
+      DownloadStateCursor loadedDownloadStates = downloadIndex.getDownloadStates();
+      while (loadedDownloadStates.moveToNext()) {
+        DownloadState downloadState = loadedDownloadStates.getDownloadState();
+        downloadStates.put(downloadState.uri, downloadState);
       }
-      downloadStates.close();
+      loadedDownloadStates.close();
     } catch (IOException e) {
       Log.w(TAG, "Failed to query download states", e);
     }
   }
 
-  private void handleTrackedDownloadStateChanged(DownloadState downloadState) {
-    for (Listener listener : listeners) {
-      listener.onDownloadsChanged();
-    }
-    indexHandler.post(
-        () -> {
-          try {
-            if (downloadState.state == DownloadState.STATE_REMOVED) {
-              downloadIndex.removeDownloadState(downloadState.id);
-            } else {
-              downloadIndex.putDownloadState(downloadState);
-            }
-          } catch (IOException e) {
-            // TODO: This whole method is going away in cr/232854678.
-          }
-        });
-  }
-
-  private void startDownload(DownloadAction action) {
-    if (trackedDownloadStates.containsKey(action.uri)) {
-      // This content is already being downloaded. Do nothing.
-      return;
-    }
-    DownloadState downloadState = new DownloadState(action);
-    trackedDownloadStates.put(downloadState.uri, downloadState);
-    handleTrackedDownloadStateChanged(downloadState);
-    startServiceWithAction(action);
-  }
-
   private void startServiceWithAction(DownloadAction action) {
     DownloadService.startWithAction(context, DemoDownloadService.class, action, false);
   }
@@ -238,7 +208,7 @@ public class DownloadTracker implements DownloadManager.Listener {
       if (helper.getPeriodCount() == 0) {
         Log.d(TAG, "No periods found. Downloading entire stream.");
         DownloadAction downloadAction = downloadHelper.getDownloadAction(Util.getUtf8Bytes(name));
-        startDownload(downloadAction);
+        startServiceWithAction(downloadAction);
         downloadHelper.release();
         return;
       }
@@ -280,7 +250,7 @@ public class DownloadTracker implements DownloadManager.Listener {
         }
       }
       DownloadAction downloadAction = downloadHelper.getDownloadAction(Util.getUtf8Bytes(name));
-      startDownload(downloadAction);
+      startServiceWithAction(downloadAction);
     }
 
     // DialogInterface.OnDismissListener implementation.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index e804611497..3e0f712a76 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -36,11 +36,12 @@ import android.os.Looper;
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.database.DatabaseIOException;
+import com.google.android.exoplayer2.database.DatabaseProvider;
 import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.scheduler.RequirementsWatcher;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
-import java.io.File;
 import java.io.IOException;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -48,7 +49,6 @@ import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.concurrent.CopyOnWriteArraySet;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
@@ -130,7 +130,7 @@ public final class DownloadManager {
   private final int maxSimultaneousDownloads;
   private final int minRetryCount;
   private final Context context;
-  private final ActionFile actionFile;
+  private final DefaultDownloadIndex downloadIndex;
   private final DownloaderFactory downloaderFactory;
   private final ArrayList<Download> downloads;
   private final HashMap<Download, DownloadThread> activeDownloads;
@@ -146,18 +146,20 @@ public final class DownloadManager {
   private int manualStopReason;
   private RequirementsWatcher requirementsWatcher;
   private int simultaneousDownloads;
+  private boolean loadingDownload;
 
   /**
    * Constructs a {@link DownloadManager}.
    *
    * @param context Any context.
-   * @param actionFile The file in which active actions are saved.
+   * @param databaseProvider Used to create a {@link DownloadIndex} which holds download states.
    * @param downloaderFactory A factory for creating {@link Downloader}s.
    */
-  public DownloadManager(Context context, File actionFile, DownloaderFactory downloaderFactory) {
+  public DownloadManager(
+      Context context, DatabaseProvider databaseProvider, DownloaderFactory downloaderFactory) {
     this(
         context,
-        actionFile,
+        databaseProvider,
         downloaderFactory,
         DEFAULT_MAX_SIMULTANEOUS_DOWNLOADS,
         DEFAULT_MIN_RETRY_COUNT,
@@ -168,7 +170,7 @@ public final class DownloadManager {
    * Constructs a {@link DownloadManager}.
    *
    * @param context Any context.
-   * @param actionFile The file in which active actions are saved.
+   * @param databaseProvider Used to create a {@link DownloadIndex} which holds download states.
    * @param downloaderFactory A factory for creating {@link Downloader}s.
    * @param maxSimultaneousDownloads The maximum number of simultaneous downloads.
    * @param minRetryCount The minimum number of times a download must be retried before failing.
@@ -176,13 +178,39 @@ public final class DownloadManager {
    */
   public DownloadManager(
       Context context,
-      File actionFile,
+      DatabaseProvider databaseProvider,
+      DownloaderFactory downloaderFactory,
+      int maxSimultaneousDownloads,
+      int minRetryCount,
+      Requirements requirements) {
+    this(
+        context,
+        new DefaultDownloadIndex(databaseProvider),
+        downloaderFactory,
+        maxSimultaneousDownloads,
+        minRetryCount,
+        requirements);
+  }
+
+  /**
+   * Constructs a {@link DownloadManager}.
+   *
+   * @param context Any context.
+   * @param downloadIndex The {@link DefaultDownloadIndex} which holds download states.
+   * @param downloaderFactory A factory for creating {@link Downloader}s.
+   * @param maxSimultaneousDownloads The maximum number of simultaneous downloads.
+   * @param minRetryCount The minimum number of times a download must be retried before failing.
+   * @param requirements The requirements needed to be met to start downloads.
+   */
+  public DownloadManager(
+      Context context,
+      DefaultDownloadIndex downloadIndex,
       DownloaderFactory downloaderFactory,
       int maxSimultaneousDownloads,
       int minRetryCount,
       Requirements requirements) {
     this.context = context.getApplicationContext();
-    this.actionFile = new ActionFile(actionFile);
+    this.downloadIndex = downloadIndex;
     this.downloaderFactory = downloaderFactory;
     this.maxSimultaneousDownloads = maxSimultaneousDownloads;
     this.minRetryCount = minRetryCount;
@@ -204,11 +232,16 @@ public final class DownloadManager {
     listeners = new CopyOnWriteArraySet<>();
     actionQueue = new ArrayDeque<>();
 
-    notMetRequirements = watchRequirements(requirements);
-    loadActions();
+    setNotMetRequirements(watchRequirements(requirements));
+    loadDownloads();
     logd("Created");
   }
 
+  /** Returns the used {@link DownloadIndex}. */
+  public DownloadIndex getDownloadIndex() {
+    return downloadIndex;
+  }
+
   /**
    * Sets the requirements needed to be met to start downloads.
    *
@@ -251,10 +284,7 @@ public final class DownloadManager {
    */
   public void startDownloads() {
     logd("manual stop is cancelled");
-    manualStopReason = MANUAL_STOP_REASON_NONE;
-    for (int i = 0; i < downloads.size(); i++) {
-      downloads.get(i).setManualStopReason(MANUAL_STOP_REASON_NONE);
-    }
+    setManualStopReason(/* id= */ null, MANUAL_STOP_REASON_NONE);
   }
 
   /** Signals all downloads to stop. Call {@link #startDownloads()} to let them to be started. */
@@ -273,10 +303,7 @@ public final class DownloadManager {
   public void stopDownloads(int manualStopReason) {
     Assertions.checkArgument(manualStopReason != MANUAL_STOP_REASON_NONE);
     logd("downloads are stopped manually");
-    this.manualStopReason = manualStopReason;
-    for (int i = 0; i < downloads.size(); i++) {
-      downloads.get(i).setManualStopReason(this.manualStopReason);
-    }
+    setManualStopReason(/* id= */ null, manualStopReason);
   }
 
   /**
@@ -286,11 +313,7 @@ public final class DownloadManager {
    * @param id The unique content id of the download to be started.
    */
   public void startDownload(String id) {
-    Download download = getDownload(id);
-    if (download != null) {
-      logd("manual stop is cancelled", download);
-      download.setManualStopReason(MANUAL_STOP_REASON_NONE);
-    }
+    setManualStopReason(id, MANUAL_STOP_REASON_NONE);
   }
 
   /**
@@ -315,11 +338,7 @@ public final class DownloadManager {
    */
   public void stopDownload(String id, int manualStopReason) {
     Assertions.checkArgument(manualStopReason != MANUAL_STOP_REASON_NONE);
-    Download download = getDownload(id);
-    if (download != null) {
-      logd("download is stopped manually", download);
-      download.setManualStopReason(manualStopReason);
-    }
+    setManualStopReason(id, manualStopReason);
   }
 
   /**
@@ -329,11 +348,9 @@ public final class DownloadManager {
    */
   public void handleAction(DownloadAction action) {
     Assertions.checkState(!released);
+    actionQueue.add(action);
     if (initialized) {
-      addDownloadForAction(action);
-      saveActions();
-    } else {
-      actionQueue.add(action);
+      processActionQueue();
     }
   }
 
@@ -343,25 +360,12 @@ public final class DownloadManager {
     return downloads.size();
   }
 
-  /**
-   * Returns {@link DownloadState} for the given content id, or null if no such download exists.
-   *
-   * @param id The unique content id.
-   * @return DownloadState for the given content id, or null if no such download exists.
-   */
-  @Nullable
-  public DownloadState getDownloadState(String id) {
-    Assertions.checkState(!released);
-    Download download = getDownload(id);
-    return download != null ? download.getDownloadState() : null;
-  }
-
   /** Returns the states of all current downloads. */
   public DownloadState[] getAllDownloadStates() {
     Assertions.checkState(!released);
     DownloadState[] states = new DownloadState[downloads.size()];
     for (int i = 0; i < states.length; i++) {
-      states[i] = downloads.get(i).getDownloadState();
+      states[i] = downloads.get(i).getUpdatedDownloadState();
     }
     return states;
   }
@@ -375,7 +379,7 @@ public final class DownloadManager {
   /** Returns whether there are no active downloads. */
   public boolean isIdle() {
     Assertions.checkState(!released);
-    return initialized && activeDownloads.isEmpty();
+    return initialized && activeDownloads.isEmpty() && actionQueue.isEmpty() && !loadingDownload;
   }
 
   /**
@@ -399,17 +403,32 @@ public final class DownloadManager {
     logd("Released");
   }
 
-  private void addDownloadForAction(DownloadAction action) {
-    for (int i = 0; i < downloads.size(); i++) {
-      Download download = downloads.get(i);
-      if (download.addAction(action)) {
-        logd("Action is added to existing download", download);
+  private void setManualStopReason(@Nullable String id, int manualStopReason) {
+    if (id != null) {
+      Download download = getDownload(id);
+      if (download != null) {
+        logd("download manual stop reason is set to : " + manualStopReason, download);
+        download.setManualStopReason(manualStopReason);
         return;
       }
+    } else {
+      this.manualStopReason = manualStopReason;
+      for (int i = 0; i < downloads.size(); i++) {
+        downloads.get(i).setManualStopReason(manualStopReason);
+      }
     }
-    Download download = new Download(this, action, notMetRequirements, manualStopReason);
-    downloads.add(download);
-    logd("Download is added", download);
+    fileIOHandler.post(
+        () -> {
+          try {
+            if (id != null) {
+              downloadIndex.setManualStopReason(id, manualStopReason);
+            } else {
+              downloadIndex.setManualStopReason(manualStopReason);
+            }
+          } catch (DatabaseIOException e) {
+            Log.e(TAG, "setManualStopReason failed", e);
+          }
+        });
   }
 
   private void maybeNotifyListenersIdle() {
@@ -422,33 +441,44 @@ public final class DownloadManager {
     }
   }
 
-  private void onDownloadStateChange(Download download) {
+  private void onDownloadStateChange(Download download, DownloadState downloadState) {
     if (released) {
       return;
     }
     logd("Download state is changed", download);
-    DownloadState downloadState = download.getDownloadState();
+    updateDownloadIndex(downloadState);
     for (Listener listener : listeners) {
       listener.onDownloadStateChanged(this, downloadState);
     }
     if (download.isFinished()) {
       downloads.remove(download);
-      saveActions();
     }
   }
 
   private void onRequirementsStateChanged(@Requirements.RequirementFlags int notMetRequirements) {
-    this.notMetRequirements = notMetRequirements;
-    logdFlags("Not met requirements are changed", notMetRequirements);
     Requirements requirements = requirementsWatcher.getRequirements();
     for (Listener listener : listeners) {
       listener.onRequirementsStateChanged(DownloadManager.this, requirements, notMetRequirements);
     }
+    setNotMetRequirements(notMetRequirements);
+  }
+
+  private void setNotMetRequirements(@Requirements.RequirementFlags int notMetRequirements) {
+    this.notMetRequirements = notMetRequirements;
+    logdFlags("Not met requirements are changed", notMetRequirements);
     for (int i = 0; i < downloads.size(); i++) {
       downloads.get(i).setNotMetRequirements(notMetRequirements);
     }
   }
 
+  @Requirements.RequirementFlags
+  private int watchRequirements(Requirements requirements) {
+    RequirementsWatcher.Listener listener =
+        (requirementsWatcher, notMetRequirements) -> onRequirementsStateChanged(notMetRequirements);
+    requirementsWatcher = new RequirementsWatcher(context, listener, requirements);
+    return requirementsWatcher.start();
+  }
+
   @Nullable
   private Download getDownload(String id) {
     for (int i = 0; i < downloads.size(); i++) {
@@ -460,34 +490,85 @@ public final class DownloadManager {
     return null;
   }
 
-  private void loadActions() {
+  private void processActionQueue() {
+    if (loadingDownload || actionQueue.isEmpty()) {
+      return;
+    }
+    DownloadAction action = actionQueue.remove();
+    Download download = getDownload(action.id);
+    if (download != null) {
+      download.addAction(action);
+      logd("Action is added to existing download", download);
+      return;
+    }
+    loadDownload(action);
+  }
+
+  private void loadDownload(DownloadAction action) {
+    loadingDownload = true;
     fileIOHandler.post(
         () -> {
-          DownloadAction[] loadedActions;
+          DownloadState downloadState = null;
           try {
-            loadedActions = actionFile.load();
-            logd("Action file is loaded.");
-          } catch (Throwable e) {
-            Log.e(TAG, "Action file loading failed.", e);
-            loadedActions = new DownloadAction[0];
+            downloadState = downloadIndex.getDownloadState(action.id);
+          } catch (DatabaseIOException e) {
+            Log.e(TAG, "loadDownload failed", e);
           }
-          final DownloadAction[] actions = loadedActions;
+          DownloadState finalDownloadState = downloadState;
+          handler.post(
+              () -> {
+                loadingDownload = false;
+                if (released) {
+                  return;
+                }
+                DownloadState state;
+                if (finalDownloadState == null) {
+                  state = new DownloadState(action);
+                  logd("Download state is created for " + action.id);
+                } else {
+                  state = finalDownloadState.mergeAction(action);
+                  logd("Download state is loaded for " + action.id);
+                }
+                addDownloadForState(state);
+                processActionQueue();
+              });
+        });
+  }
+
+  private void loadDownloads() {
+    fileIOHandler.post(
+        () -> {
+          DownloadState[] loadedStates;
+          try {
+            DownloadStateCursor cursor =
+                downloadIndex.getDownloadStates(
+                    STATE_QUEUED,
+                    STATE_STOPPED,
+                    STATE_DOWNLOADING,
+                    STATE_REMOVING,
+                    STATE_RESTARTING);
+            loadedStates = new DownloadState[cursor.getCount()];
+            for (int i = 0, length = loadedStates.length; i < length; i++) {
+              cursor.moveToNext();
+              loadedStates[i] = cursor.getDownloadState();
+            }
+            logd("Download states are loaded.");
+          } catch (Throwable e) {
+            Log.e(TAG, "Download state loading failed.", e);
+            loadedStates = new DownloadState[0];
+          }
+          final DownloadState[] states = loadedStates;
           handler.post(
               () -> {
                 if (released) {
                   return;
                 }
-                for (DownloadAction action : actions) {
-                  addDownloadForAction(action);
-                }
-                if (!actionQueue.isEmpty()) {
-                  while (!actionQueue.isEmpty()) {
-                    addDownloadForAction(actionQueue.remove());
-                  }
-                  saveActions();
+                for (DownloadState downloadState : states) {
+                  addDownloadForState(downloadState);
                 }
                 logd("Downloads are created.");
                 initialized = true;
+                processActionQueue();
                 for (Listener listener : listeners) {
                   listener.onInitialized(DownloadManager.this);
                 }
@@ -498,22 +579,26 @@ public final class DownloadManager {
         });
   }
 
-  private void saveActions() {
-    if (released) {
-      return;
-    }
-    ArrayList<DownloadAction> actions = new ArrayList<>(downloads.size());
-    for (int i = 0; i < downloads.size(); i++) {
-      downloads.get(i).addActions(actions);
-    }
-    final DownloadAction[] actionsArray = actions.toArray(new DownloadAction[0]);
+  private void addDownloadForState(DownloadState downloadState) {
+    Download download = new Download(this, downloadState, notMetRequirements, manualStopReason);
+    downloads.add(download);
+    logd("Download is added", download);
+  }
+
+  private void updateDownloadIndex(DownloadState downloadState) {
     fileIOHandler.post(
         () -> {
+          if (released) {
+            return;
+          }
           try {
-            actionFile.store(actionsArray);
-            logd("Actions persisted.");
-          } catch (IOException e) {
-            Log.e(TAG, "Persisting actions failed.", e);
+            if (downloadState.state == DownloadState.STATE_REMOVED) {
+              downloadIndex.removeDownloadState(downloadState.id);
+            } else {
+              downloadIndex.putDownloadState(downloadState);
+            }
+          } catch (DatabaseIOException e) {
+            Log.e(TAG, "updateDownloadIndex failed", e);
           }
         });
   }
@@ -536,20 +621,6 @@ public final class DownloadManager {
     }
   }
 
-  @Requirements.RequirementFlags
-  private int watchRequirements(Requirements requirements) {
-    RequirementsWatcher.Listener listener =
-        (requirementsWatcher, notMetRequirements) -> onRequirementsStateChanged(notMetRequirements);
-    requirementsWatcher = new RequirementsWatcher(context, listener, requirements);
-    @Requirements.RequirementFlags int notMetRequirements = requirementsWatcher.start();
-    if (notMetRequirements == 0) {
-      startDownloads();
-    } else {
-      stopDownloads();
-    }
-    return notMetRequirements;
-  }
-
   @StartThreadResults
   private int startDownloadThread(Download download, DownloadAction action) {
     if (!initialized || released) {
@@ -634,13 +705,13 @@ public final class DownloadManager {
 
     private Download(
         DownloadManager downloadManager,
-        DownloadAction action,
+        DownloadState downloadState,
         @Requirements.RequirementFlags int notMetRequirements,
         int manualStopReason) {
       this.downloadManager = downloadManager;
+      this.downloadState = downloadState;
       this.notMetRequirements = notMetRequirements;
       this.manualStopReason = manualStopReason;
-      downloadState = new DownloadState(action);
 
       initialize(downloadState.state);
     }
@@ -649,17 +720,17 @@ public final class DownloadManager {
       return downloadState.id;
     }
 
-    public boolean addAction(DownloadAction newAction) {
-      if (!getId().equals(newAction.id)) {
-        return false;
+    public void addAction(DownloadAction newAction) {
+      Assertions.checkArgument(getId().equals(newAction.id));
+      if (!downloadState.type.equals(newAction.type)) {
+        String format = "Action type (%s) doesn't match existing download type (%s)";
+        Log.e(TAG, String.format(format, newAction.type, downloadState.type));
       }
-      Assertions.checkState(downloadState.type.equals(newAction.type));
       downloadState = downloadState.mergeAction(newAction);
       initialize(downloadState.state);
-      return true;
     }
 
-    public DownloadState getDownloadState() {
+    public DownloadState getUpdatedDownloadState() {
       float downloadPercentage = C.PERCENTAGE_UNSET;
       long downloadedBytes = 0;
       long totalBytes = C.LENGTH_UNSET;
@@ -721,6 +792,7 @@ public final class DownloadManager {
     }
 
     private void updateStopState() {
+      DownloadState oldDownloadState = downloadState;
       if (canStart()) {
         if (state == STATE_STOPPED) {
           startOrQueue();
@@ -731,6 +803,9 @@ public final class DownloadManager {
           setState(STATE_STOPPED);
         }
       }
+      if (oldDownloadState == downloadState) {
+        downloadManager.onDownloadStateChange(this, getUpdatedDownloadState());
+      }
     }
 
     private void initialize(int initialState) {
@@ -745,7 +820,7 @@ public final class DownloadManager {
         setState(STATE_STOPPED);
       }
       if (state == initialState) {
-        downloadManager.onDownloadStateChange(this);
+        downloadManager.onDownloadStateChange(this, getUpdatedDownloadState());
       }
     }
 
@@ -770,20 +845,18 @@ public final class DownloadManager {
         return DownloadAction.createRemoveAction(
             downloadState.type, downloadState.uri, downloadState.cacheKey);
       }
-      return getDownloadAction(downloadState);
-    }
-
-    private void addActions(List<DownloadAction> actions) {
-      actions.add(getAction());
-      if (state == STATE_RESTARTING) {
-        actions.add(getDownloadAction(downloadState));
-      }
+      return DownloadAction.createDownloadAction(
+          downloadState.type,
+          downloadState.uri,
+          Arrays.asList(downloadState.streamKeys),
+          downloadState.cacheKey,
+          downloadState.customMetadata);
     }
 
     private void setState(@DownloadState.State int newState) {
       if (state != newState) {
         state = newState;
-        downloadManager.onDownloadStateChange(this);
+        downloadManager.onDownloadStateChange(this, getUpdatedDownloadState());
       }
     }
 
@@ -808,14 +881,6 @@ public final class DownloadManager {
       }
     }
 
-    private static DownloadAction getDownloadAction(DownloadState downloadState) {
-      return DownloadAction.createDownloadAction(
-          downloadState.type,
-          downloadState.uri,
-          Arrays.asList(downloadState.streamKeys),
-          downloadState.cacheKey,
-          downloadState.customMetadata);
-    }
   }
 
   private class DownloadThread extends Thread {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index ba1238d158..91f1bac32d 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -25,10 +25,10 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.offline.DownloadState.State;
 import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.testutil.DummyMainThread;
+import com.google.android.exoplayer2.testutil.DummyMainThread.TestRunnable;
 import com.google.android.exoplayer2.testutil.RobolectricUtil;
 import com.google.android.exoplayer2.testutil.TestDownloadManagerListener;
-import com.google.android.exoplayer2.util.Util;
-import java.io.File;
+import com.google.android.exoplayer2.testutil.TestUtil;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -64,7 +64,7 @@ public class DownloadManagerTest {
   private Uri uri2;
   private Uri uri3;
   private DummyMainThread dummyMainThread;
-  private File actionFile;
+  private DefaultDownloadIndex downloadIndex;
   private TestDownloadManagerListener downloadManagerListener;
   private FakeDownloaderFactory downloaderFactory;
   private DownloadManager downloadManager;
@@ -77,7 +77,7 @@ public class DownloadManagerTest {
     uri2 = Uri.parse("http://abc.com/media2");
     uri3 = Uri.parse("http://abc.com/media3");
     dummyMainThread = new DummyMainThread();
-    actionFile = Util.createTempFile(ApplicationProvider.getApplicationContext(), "ExoPlayerTest");
+    downloadIndex = new DefaultDownloadIndex(TestUtil.getTestDatabaseProvider());
     downloaderFactory = new FakeDownloaderFactory();
     setUpDownloadManager(100);
   }
@@ -85,7 +85,6 @@ public class DownloadManagerTest {
   @After
   public void tearDown() throws Exception {
     releaseDownloadManager();
-    actionFile.delete();
     dummyMainThread.release();
   }
 
@@ -359,6 +358,7 @@ public class DownloadManagerTest {
     TaskWrapper task2 = new DownloadRunner(uri2).postDownloadAction().getTask();
     TaskWrapper task3 = new DownloadRunner(uri3).postRemoveAction().getTask();
 
+    task3.assertRemoving();
     DownloadState[] states = downloadManager.getAllDownloadStates();
 
     assertThat(states).hasLength(3);
@@ -471,7 +471,7 @@ public class DownloadManagerTest {
             downloadManager =
                 new DownloadManager(
                     ApplicationProvider.getApplicationContext(),
-                    actionFile,
+                    downloadIndex,
                     downloaderFactory,
                     maxActiveDownloadTasks,
                     MIN_RETRY_COUNT,
@@ -494,8 +494,8 @@ public class DownloadManagerTest {
     }
   }
 
-  private void runOnMainThread(final Runnable r) {
-    dummyMainThread.runOnMainThread(r);
+  private void runOnMainThread(final TestRunnable r) {
+    dummyMainThread.runTestOnMainThread(r);
   }
 
   private final class DownloadRunner {
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
index d1d9c0f488..35dcb77906 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
@@ -27,6 +27,7 @@ import android.os.ConditionVariable;
 import androidx.annotation.Nullable;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.android.exoplayer2.offline.DefaultDownloadIndex;
 import com.google.android.exoplayer2.offline.DefaultDownloaderFactory;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadManager;
@@ -69,7 +70,7 @@ public class DownloadManagerDashTest {
   private StreamKey fakeStreamKey1;
   private StreamKey fakeStreamKey2;
   private TestDownloadManagerListener downloadManagerListener;
-  private File actionFile;
+  private DefaultDownloadIndex downloadIndex;
   private DummyMainThread dummyMainThread;
 
   @Before
@@ -95,7 +96,7 @@ public class DownloadManagerDashTest {
 
     fakeStreamKey1 = new StreamKey(0, 0, 0);
     fakeStreamKey2 = new StreamKey(0, 1, 0);
-    actionFile = new File(tempFolder, "actionFile");
+    downloadIndex = new DefaultDownloadIndex(TestUtil.getTestDatabaseProvider());
     createDownloadManager();
   }
 
@@ -136,8 +137,6 @@ public class DownloadManagerDashTest {
           downloadManager.release();
         });
 
-    assertThat(actionFile.exists()).isTrue();
-    assertThat(actionFile.length()).isGreaterThan(0L);
     assertCacheEmpty(cache);
 
     // Revert fakeDataSet to normal.
@@ -239,13 +238,13 @@ public class DownloadManagerDashTest {
   }
 
   private void createDownloadManager() {
-    dummyMainThread.runOnMainThread(
+    dummyMainThread.runTestOnMainThread(
         () -> {
           Factory fakeDataSourceFactory = new FakeDataSource.Factory().setFakeDataSet(fakeDataSet);
           downloadManager =
               new DownloadManager(
                   ApplicationProvider.getApplicationContext(),
-                  actionFile,
+                  downloadIndex,
                   new DefaultDownloaderFactory(
                       new DownloaderConstructorHelper(cache, fakeDataSourceFactory)),
                   /* maxSimultaneousDownloads= */ 1,
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
index 7533f3a8cc..30e511780f 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
@@ -26,6 +26,7 @@ import android.net.Uri;
 import androidx.annotation.Nullable;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.android.exoplayer2.offline.DefaultDownloadIndex;
 import com.google.android.exoplayer2.offline.DefaultDownloaderFactory;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadManager;
@@ -107,19 +108,14 @@ public class DownloadServiceDashTest {
     fakeStreamKey1 = new StreamKey(0, 0, 0);
     fakeStreamKey2 = new StreamKey(0, 1, 0);
 
-    dummyMainThread.runOnMainThread(
+    dummyMainThread.runTestOnMainThread(
         () -> {
-          File actionFile;
-          try {
-            actionFile = Util.createTempFile(context, "ExoPlayerTest");
-          } catch (IOException e) {
-            throw new RuntimeException(e);
-          }
-          actionFile.delete();
+          DefaultDownloadIndex downloadIndex =
+              new DefaultDownloadIndex(TestUtil.getTestDatabaseProvider());
           final DownloadManager dashDownloadManager =
               new DownloadManager(
                   ApplicationProvider.getApplicationContext(),
-                  actionFile,
+                  downloadIndex,
                   new DefaultDownloaderFactory(
                       new DownloaderConstructorHelper(cache, fakeDataSourceFactory)),
                   /* maxSimultaneousDownloads= */ 1,
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/DummyMainThread.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/DummyMainThread.java
index c10cadbb04..63a761a5cf 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/DummyMainThread.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/DummyMainThread.java
@@ -27,6 +27,11 @@ import java.util.concurrent.atomic.AtomicReference;
 /** Helper class to simulate main/UI thread in tests. */
 public final class DummyMainThread {
 
+  /** {@link Runnable} variant which can throw a checked exception. */
+  public interface TestRunnable {
+    void run() throws Exception;
+  }
+
   /** Default timeout value used for {@link #runOnMainThread(Runnable)}. */
   public static final int TIMEOUT_MS = 10000;
 
@@ -57,8 +62,33 @@ public final class DummyMainThread {
    * @param runnable The {@link Runnable} to run.
    */
   public void runOnMainThread(int timeoutMs, final Runnable runnable) {
+    runTestOnMainThread(timeoutMs, runnable::run);
+  }
+
+  /**
+   * Runs the provided {@link TestRunnable} on the main thread, blocking until execution completes
+   * or until {@link #TIMEOUT_MS} milliseconds have passed.
+   *
+   * @param runnable The {@link TestRunnable} to run.
+   */
+  public void runTestOnMainThread(final TestRunnable runnable) {
+    runTestOnMainThread(TIMEOUT_MS, runnable);
+  }
+
+  /**
+   * Runs the provided {@link TestRunnable} on the main thread, blocking until execution completes
+   * or until timeout milliseconds have passed.
+   *
+   * @param timeoutMs The maximum time to wait in milliseconds.
+   * @param runnable The {@link TestRunnable} to run.
+   */
+  public void runTestOnMainThread(int timeoutMs, final TestRunnable runnable) {
     if (Looper.myLooper() == handler.getLooper()) {
-      runnable.run();
+      try {
+        runnable.run();
+      } catch (Exception e) {
+        Util.sneakyThrow(e);
+      }
     } else {
       ConditionVariable finishedCondition = new ConditionVariable();
       AtomicReference<Throwable> thrown = new AtomicReference<>();

From c04f5b9c5d8378e184cd01116daf9b150621516e Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Tue, 26 Mar 2019 12:51:41 +0000
Subject: [PATCH 669/832] Add DownloadManager.removeDownload method

PiperOrigin-RevId: 240330799
---
 .../exoplayer2/offline/DownloadManager.java   | 114 +++++++++++++-----
 .../exoplayer2/offline/DownloadService.java   |  48 +++++++-
 .../exoplayer2/offline/DownloadState.java     |  20 +++
 3 files changed, 153 insertions(+), 29 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 3e0f712a76..f0d31e9259 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -138,7 +138,7 @@ public final class DownloadManager {
   private final HandlerThread fileIOThread;
   private final Handler fileIOHandler;
   private final CopyOnWriteArraySet<Listener> listeners;
-  private final ArrayDeque<DownloadAction> actionQueue;
+  private final ArrayDeque<DownloadUpdater> dowloadUpdateQueue;
 
   private boolean initialized;
   private boolean released;
@@ -230,7 +230,7 @@ public final class DownloadManager {
     fileIOHandler = new Handler(fileIOThread.getLooper());
 
     listeners = new CopyOnWriteArraySet<>();
-    actionQueue = new ArrayDeque<>();
+    dowloadUpdateQueue = new ArrayDeque<>();
 
     setNotMetRequirements(watchRequirements(requirements));
     loadDownloads();
@@ -348,9 +348,56 @@ public final class DownloadManager {
    */
   public void handleAction(DownloadAction action) {
     Assertions.checkState(!released);
-    actionQueue.add(action);
+    dowloadUpdateQueue.add(
+        new DownloadUpdater(action.id) {
+          @Override
+          void onExisting(Download download) {
+            download.addAction(action);
+            logd("Action is added to existing download", download);
+          }
+
+          @Override
+          DownloadState onLoad(@Nullable DownloadState downloadState) {
+            DownloadState state;
+            if (downloadState == null) {
+              state = new DownloadState(action);
+              logd("Download state is created for " + id);
+            } else {
+              state = downloadState.mergeAction(action);
+              logd("Download state is loaded for " + id);
+            }
+            return state;
+          }
+        });
     if (initialized) {
-      processActionQueue();
+      processDownloadUpdateQueue();
+    }
+  }
+
+  /**
+   * Cancels the download with the {@code id} and removes all downloaded data.
+   *
+   * @param id The unique content id of the download to be started.
+   */
+  public void removeDownload(String id) {
+    Assertions.checkState(!released);
+    dowloadUpdateQueue.add(
+        new DownloadUpdater(id) {
+          @Override
+          void onExisting(Download download) {
+            download.remove();
+          }
+
+          @Override
+          DownloadState onLoad(@Nullable DownloadState downloadState) {
+            if (downloadState != null) {
+              downloadState = downloadState.setRemoveState();
+            }
+            return downloadState;
+          }
+        });
+    if (initialized) {
+      processDownloadUpdateQueue();
     }
   }
 
@@ -379,7 +426,10 @@ public final class DownloadManager {
   /** Returns whether there are no active downloads. */
   public boolean isIdle() {
     Assertions.checkState(!released);
-    return initialized && activeDownloads.isEmpty() && actionQueue.isEmpty() && !loadingDownload;
+    return initialized
+        && activeDownloads.isEmpty()
+        && dowloadUpdateQueue.isEmpty()
+        && !loadingDownload;
   }
 
   /**
@@ -490,27 +540,26 @@ public final class DownloadManager {
     return null;
   }
 
-  private void processActionQueue() {
-    if (loadingDownload || actionQueue.isEmpty()) {
+  private void processDownloadUpdateQueue() {
+    if (loadingDownload || dowloadUpdateQueue.isEmpty()) {
       return;
     }
-    DownloadAction action = actionQueue.remove();
-    Download download = getDownload(action.id);
+    DownloadUpdater downloadUpdater = dowloadUpdateQueue.remove();
+    Download download = getDownload(downloadUpdater.id);
     if (download != null) {
-      download.addAction(action);
-      logd("Action is added to existing download", download);
-      return;
+      downloadUpdater.onExisting(download);
+    } else {
+      loadDownload(downloadUpdater);
     }
-    loadDownload(action);
   }
 
-  private void loadDownload(DownloadAction action) {
+  private void loadDownload(DownloadUpdater callback) {
     loadingDownload = true;
     fileIOHandler.post(
         () -> {
           DownloadState downloadState = null;
           try {
-            downloadState = downloadIndex.getDownloadState(action.id);
+            downloadState = downloadIndex.getDownloadState(callback.id);
           } catch (DatabaseIOException e) {
             Log.e(TAG, "loadDownload failed", e);
           }
@@ -518,19 +567,13 @@ public final class DownloadManager {
           handler.post(
               () -> {
                 loadingDownload = false;
-                if (released) {
-                  return;
+                if (!released) {
+                  DownloadState state = callback.onLoad(finalDownloadState);
+                  if (state != null) {
+                    addDownloadForState(state);
+                  }
+                  processDownloadUpdateQueue();
                 }
-                DownloadState state;
-                if (finalDownloadState == null) {
-                  state = new DownloadState(action);
-                  logd("Download state is created for " + action.id);
-                } else {
-                  state = finalDownloadState.mergeAction(action);
-                  logd("Download state is loaded for " + action.id);
-                }
-                addDownloadForState(state);
-                processActionQueue();
               });
         });
   }
@@ -568,7 +611,7 @@ public final class DownloadManager {
                 }
                 logd("Downloads are created.");
                 initialized = true;
-                processActionQueue();
+                processDownloadUpdateQueue();
                 for (Listener listener : listeners) {
                   listener.onInitialized(DownloadManager.this);
                 }
@@ -730,6 +773,10 @@ public final class DownloadManager {
       initialize(downloadState.state);
     }
 
+    public void remove() {
+      initialize(STATE_REMOVING);
+    }
+
     public DownloadState getUpdatedDownloadState() {
       float downloadPercentage = C.PERCENTAGE_UNSET;
       long downloadedBytes = 0;
@@ -948,4 +995,15 @@ public final class DownloadManager {
     }
   }
 
+  private abstract static class DownloadUpdater {
+    final String id;
+
+    private DownloadUpdater(String id) {
+      this.id = id;
+    }
+
+    abstract void onExisting(Download download);
+
+    abstract DownloadState onLoad(@Nullable DownloadState downloadState);
+  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index b95e88cba8..4b2799af34 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -51,6 +51,10 @@ public abstract class DownloadService extends Service {
   public static final String ACTION_START =
       "com.google.android.exoplayer.downloadService.action.START";
 
+  /** Removes one download. */
+  public static final String ACTION_REMOVE =
+      "com.google.android.exoplayer.downloadService.action.REMOVE";
+
   /** Like {@link #ACTION_INIT}, but with {@link #KEY_FOREGROUND} implicitly set to true. */
   private static final String ACTION_RESTART =
       "com.google.android.exoplayer.downloadService.action.RESTART";
@@ -58,7 +62,10 @@ public abstract class DownloadService extends Service {
   /** Key for the {@link DownloadAction} in an {@link #ACTION_ADD} intent. */
   public static final String KEY_DOWNLOAD_ACTION = "download_action";
 
-  /** Key for content id in an {@link #ACTION_STOP} or {@link #ACTION_START} intent. */
+  /**
+   * Key for content id in an {@link #ACTION_STOP}, {@link #ACTION_START} or {@link #ACTION_REMOVE}
+   * intent.
+   */
   public static final String KEY_CONTENT_ID = "content_id";
 
   /** Key for manual stop reason in an {@link #ACTION_STOP} intent. */
@@ -213,6 +220,19 @@ public abstract class DownloadService extends Service {
     return getIntent(context, clazz, ACTION_START).putExtra(KEY_CONTENT_ID, id);
   }
 
+  /**
+   * Builds an {@link Intent} for removing the download with the {@code id}.
+   *
+   * @param context A {@link Context}.
+   * @param clazz The concrete download service being targeted by the intent.
+   * @param id The content id.
+   * @return Created Intent.
+   */
+  public static Intent buildRemoveDownloadIntent(
+      Context context, Class<? extends DownloadService> clazz, String id) {
+    return getIntent(context, clazz, ACTION_REMOVE).putExtra(KEY_CONTENT_ID, id);
+  }
+
   /**
    * Starts the service, adding an action to be executed.
    *
@@ -234,6 +254,24 @@ public abstract class DownloadService extends Service {
     }
   }
 
+  /**
+   * Starts the service to remove a download.
+   *
+   * @param context A {@link Context}.
+   * @param clazz The concrete download service to be started.
+   * @param id The content id.
+   * @param foreground Whether the service is started in the foreground.
+   */
+  public static void startWithRemoveDownload(
+      Context context, Class<? extends DownloadService> clazz, String id, boolean foreground) {
+    Intent intent = buildRemoveDownloadIntent(context, clazz, id);
+    if (foreground) {
+      Util.startForegroundService(context, intent);
+    } else {
+      context.startService(intent);
+    }
+  }
+
   /**
    * Starts the service without adding a new action. If there are any not finished actions and the
    * requirements are met, the service resumes executing actions. Otherwise it stops immediately.
@@ -328,6 +366,14 @@ public abstract class DownloadService extends Service {
           downloadManager.startDownload(startDownloadId);
         }
         break;
+      case ACTION_REMOVE:
+        String id3 = intent.getStringExtra(KEY_CONTENT_ID);
+        if (id3 == null) {
+          Log.e(TAG, "Ignoring REMOVE action with no id");
+        } else {
+          downloadManager.removeDownload(id3);
+        }
+        break;
       default:
         Log.e(TAG, "Ignoring unrecognized action: " + intentAction);
         break;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
index 26f2fd8d73..5961fb8545 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
@@ -245,6 +245,26 @@ public final class DownloadState {
         action.data);
   }
 
+  /** Returns a duplicate {@link DownloadState} in {@link #STATE_REMOVING}. */
+  public DownloadState setRemoveState() {
+    return new DownloadState(
+        id,
+        type,
+        uri,
+        cacheKey,
+        getNextState(state, manualStopReason != 0 || notMetRequirements != 0, true),
+        /* downloadPercentage= */ C.PERCENTAGE_UNSET,
+        downloadedBytes,
+        /* totalBytes= */ C.LENGTH_UNSET,
+        FAILURE_REASON_NONE,
+        notMetRequirements,
+        manualStopReason,
+        startTimeMs,
+        /* updateTimeMs= */ System.currentTimeMillis(),
+        streamKeys,
+        customMetadata);
+  }
+
   private static int getNextState(int currentState, boolean isStopped, boolean remove) {
     int nextState;
     if (remove) {

From 07e3509dd9e4fbf2077a8cf3222efe68b73d00c2 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 26 Mar 2019 13:11:55 +0000
Subject: [PATCH 670/832] Support providing all keys via EXT-X-SESSION-KEY tags

PiperOrigin-RevId: 240333415
---
 .../android/exoplayer2/drm/DrmInitData.java   | 20 +++++
 .../google/android/exoplayer2/util/Util.java  | 19 +++++
 .../exoplayer2/source/hls/HlsMediaPeriod.java | 83 ++++++++++++++++---
 .../exoplayer2/source/hls/HlsMediaSource.java | 22 ++++-
 .../source/hls/HlsSampleStreamWrapper.java    | 41 ++++++---
 .../hls/playlist/HlsMasterPlaylist.java       | 17 +++-
 .../hls/playlist/HlsPlaylistParser.java       | 67 ++++++++-------
 .../source/hls/HlsMediaPeriodTest.java        |  6 +-
 .../playlist/HlsMediaPlaylistParserTest.java  |  6 +-
 9 files changed, 217 insertions(+), 64 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
index 60701be63c..4fde9f05d3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.drm;
 import android.os.Parcel;
 import android.os.Parcelable;
 import androidx.annotation.Nullable;
+import android.text.TextUtils;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 import com.google.android.exoplayer2.util.Assertions;
@@ -183,6 +184,25 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
     return new DrmInitData(schemeType, false, schemeDatas);
   }
 
+  /**
+   * Returns an instance containing the {@link #schemeDatas} from both this and {@code other}. The
+   * {@link #schemeType} of the instances being merged must either match, or at least one scheme
+   * type must be {@code null}.
+   *
+   * @param drmInitData The instance to merge.
+   * @return The merged result.
+   */
+  public DrmInitData merge(DrmInitData drmInitData) {
+    Assertions.checkState(
+        schemeType == null
+            || drmInitData.schemeType == null
+            || TextUtils.equals(schemeType, drmInitData.schemeType));
+    String mergedSchemeType = schemeType != null ? this.schemeType : drmInitData.schemeType;
+    SchemeData[] mergedSchemeDatas =
+        Util.nullSafeArrayConcatenation(schemeDatas, drmInitData.schemeDatas);
+    return new DrmInitData(mergedSchemeType, mergedSchemeDatas);
+  }
+
   @Override
   public int hashCode() {
     if (hashCode == 0) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
index d0f6766e34..854d63ae04 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
@@ -314,6 +314,25 @@ public final class Util {
     return Arrays.copyOf(input, length);
   }
 
+  /**
+   * Concatenates two non-null type arrays.
+   *
+   * @param first The first array.
+   * @param second The second array.
+   * @return The concatenated result.
+   */
+  @SuppressWarnings({"nullness:assignment.type.incompatible"})
+  public static <T> T[] nullSafeArrayConcatenation(T[] first, T[] second) {
+    T[] concatenation = Arrays.copyOf(first, first.length + second.length);
+    System.arraycopy(
+        /* src= */ second,
+        /* srcPos= */ 0,
+        /* dest= */ concatenation,
+        /* destPos= */ first.length,
+        /* length= */ second.length);
+    return concatenation;
+  }
+
   /**
    * Creates a {@link Handler} with the specified {@link Handler.Callback} on the current {@link
    * Looper} thread. The method accepts partially initialized objects as callback under the
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
index c6df726c2c..78551e6079 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
@@ -16,9 +16,11 @@
 package com.google.android.exoplayer2.source.hls;
 
 import androidx.annotation.Nullable;
+import android.text.TextUtils;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.SeekParameters;
+import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.source.CompositeSequenceableLoaderFactory;
@@ -43,9 +45,11 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.IdentityHashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * A {@link MediaPeriod} that loads an HLS stream.
@@ -64,6 +68,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
   private final TimestampAdjusterProvider timestampAdjusterProvider;
   private final CompositeSequenceableLoaderFactory compositeSequenceableLoaderFactory;
   private final boolean allowChunklessPreparation;
+  private final boolean useSessionKeys;
 
   private @Nullable Callback callback;
   private int pendingPrepareCount;
@@ -90,6 +95,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
    * @param compositeSequenceableLoaderFactory A factory to create composite {@link
    *     SequenceableLoader}s for when this media source loads data from multiple streams.
    * @param allowChunklessPreparation Whether chunkless preparation is allowed.
+   * @param useSessionKeys Whether to use #EXT-X-SESSION-KEY tags.
    */
   public HlsMediaPeriod(
       HlsExtractorFactory extractorFactory,
@@ -100,7 +106,8 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
       EventDispatcher eventDispatcher,
       Allocator allocator,
       CompositeSequenceableLoaderFactory compositeSequenceableLoaderFactory,
-      boolean allowChunklessPreparation) {
+      boolean allowChunklessPreparation,
+      boolean useSessionKeys) {
     this.extractorFactory = extractorFactory;
     this.playlistTracker = playlistTracker;
     this.dataSourceFactory = dataSourceFactory;
@@ -110,6 +117,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
     this.allocator = allocator;
     this.compositeSequenceableLoaderFactory = compositeSequenceableLoaderFactory;
     this.allowChunklessPreparation = allowChunklessPreparation;
+    this.useSessionKeys = useSessionKeys;
     compositeSequenceableLoader =
         compositeSequenceableLoaderFactory.createCompositeSequenceableLoader();
     streamWrapperIndices = new IdentityHashMap<>();
@@ -427,7 +435,12 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
   // Internal methods.
 
   private void buildAndPrepareSampleStreamWrappers(long positionUs) {
-    HlsMasterPlaylist masterPlaylist = playlistTracker.getMasterPlaylist();
+    HlsMasterPlaylist masterPlaylist = Assertions.checkNotNull(playlistTracker.getMasterPlaylist());
+    Map<String, DrmInitData> overridingDrmInitData =
+        useSessionKeys
+            ? deriveOverridingDrmInitData(masterPlaylist.sessionKeyDrmInitData)
+            : Collections.emptyMap();
+
     boolean hasVariants = !masterPlaylist.variants.isEmpty();
     List<HlsUrl> audioRenditions = masterPlaylist.audios;
     List<HlsUrl> subtitleRenditions = masterPlaylist.subtitles;
@@ -438,20 +451,33 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
 
     if (hasVariants) {
       buildAndPrepareMainSampleStreamWrapper(
-          masterPlaylist, positionUs, sampleStreamWrappers, manifestUrlIndicesPerWrapper);
+          masterPlaylist,
+          positionUs,
+          sampleStreamWrappers,
+          manifestUrlIndicesPerWrapper,
+          overridingDrmInitData);
     }
 
     // TODO: Build video stream wrappers here.
 
     buildAndPrepareAudioSampleStreamWrappers(
-        positionUs, audioRenditions, sampleStreamWrappers, manifestUrlIndicesPerWrapper);
+        positionUs,
+        audioRenditions,
+        sampleStreamWrappers,
+        manifestUrlIndicesPerWrapper,
+        overridingDrmInitData);
 
     // Subtitle stream wrappers. We can always use master playlist information to prepare these.
     for (int i = 0; i < subtitleRenditions.size(); i++) {
       HlsUrl url = subtitleRenditions.get(i);
       HlsSampleStreamWrapper sampleStreamWrapper =
           buildSampleStreamWrapper(
-              C.TRACK_TYPE_TEXT, new HlsUrl[] {url}, null, Collections.emptyList(), positionUs);
+              C.TRACK_TYPE_TEXT,
+              new HlsUrl[] {url},
+              null,
+              Collections.emptyList(),
+              overridingDrmInitData,
+              positionUs);
       manifestUrlIndicesPerWrapper.add(new int[] {i});
       sampleStreamWrappers.add(sampleStreamWrapper);
       sampleStreamWrapper.prepareWithMasterPlaylistInfo(
@@ -495,12 +521,15 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
    *     which downloading should start. Ignored otherwise.
    * @param sampleStreamWrappers List to which the built main sample stream wrapper should be added.
    * @param manifestUrlIndicesPerWrapper List to which the selected variant indices should be added.
+   * @param overridingDrmInitData Overriding {@link DrmInitData}, keyed by protection scheme type
+   *     (i.e. {@link DrmInitData#schemeType}).
    */
   private void buildAndPrepareMainSampleStreamWrapper(
       HlsMasterPlaylist masterPlaylist,
       long positionUs,
       List<HlsSampleStreamWrapper> sampleStreamWrappers,
-      List<int[]> manifestUrlIndicesPerWrapper) {
+      List<int[]> manifestUrlIndicesPerWrapper,
+      Map<String, DrmInitData> overridingDrmInitData) {
     int[] variantTypes = new int[masterPlaylist.variants.size()];
     int videoVariantCount = 0;
     int audioVariantCount = 0;
@@ -549,6 +578,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
             selectedVariants,
             masterPlaylist.muxedAudioFormat,
             masterPlaylist.muxedCaptionFormats,
+            overridingDrmInitData,
             positionUs);
     sampleStreamWrappers.add(sampleStreamWrapper);
     manifestUrlIndicesPerWrapper.add(selectedVariantIndices);
@@ -616,8 +646,8 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
       long positionUs,
       List<HlsUrl> audioRenditions,
       List<HlsSampleStreamWrapper> sampleStreamWrappers,
-      List<int[]> manifestUrlsIndicesPerWrapper) {
-
+      List<int[]> manifestUrlsIndicesPerWrapper,
+      Map<String, DrmInitData> overridingDrmInitData) {
     ArrayList<HlsUrl> scratchRenditionList =
         new ArrayList<>(/* initialCapacity= */ audioRenditions.size());
     ArrayList<Integer> scratchIndicesList =
@@ -651,6 +681,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
               scratchRenditionList.toArray(new HlsUrl[0]),
               /* muxedAudioFormat= */ null,
               /* muxedCaptionFormats= */ Collections.emptyList(),
+              overridingDrmInitData,
               positionUs);
       manifestUrlsIndicesPerWrapper.add(Util.toArray(scratchIndicesList));
       sampleStreamWrappers.add(sampleStreamWrapper);
@@ -666,8 +697,13 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
     }
   }
 
-  private HlsSampleStreamWrapper buildSampleStreamWrapper(int trackType, HlsUrl[] variants,
-      Format muxedAudioFormat, List<Format> muxedCaptionFormats, long positionUs) {
+  private HlsSampleStreamWrapper buildSampleStreamWrapper(
+      int trackType,
+      HlsUrl[] variants,
+      Format muxedAudioFormat,
+      List<Format> muxedCaptionFormats,
+      Map<String, DrmInitData> overridingDrmInitData,
+      long positionUs) {
     HlsChunkSource defaultChunkSource =
         new HlsChunkSource(
             extractorFactory,
@@ -681,6 +717,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
         trackType,
         /* callback= */ this,
         defaultChunkSource,
+        overridingDrmInitData,
         allocator,
         positionUs,
         muxedAudioFormat,
@@ -688,6 +725,32 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
         eventDispatcher);
   }
 
+  private static Map<String, DrmInitData> deriveOverridingDrmInitData(
+      List<DrmInitData> sessionKeyDrmInitData) {
+    ArrayList<DrmInitData> mutableSessionKeyDrmInitData = new ArrayList<>(sessionKeyDrmInitData);
+    HashMap<String, DrmInitData> drmInitDataBySchemeType = new HashMap<>();
+    for (int i = 0; i < mutableSessionKeyDrmInitData.size(); i++) {
+      DrmInitData drmInitData = sessionKeyDrmInitData.get(i);
+      String scheme = drmInitData.schemeType;
+      // Merge any subsequent drmInitData instances that have the same scheme type. This is valid
+      // due to the assumptions documented on HlsMediaSource.Builder.setUseSessionKeys, and is
+      // necessary to get data for different CDNs (e.g. Widevine and PlayReady) into a single
+      // drmInitData.
+      int j = i + 1;
+      while (j < mutableSessionKeyDrmInitData.size()) {
+        DrmInitData nextDrmInitData = mutableSessionKeyDrmInitData.get(j);
+        if (TextUtils.equals(nextDrmInitData.schemeType, scheme)) {
+          drmInitData = drmInitData.merge(nextDrmInitData);
+          mutableSessionKeyDrmInitData.remove(j);
+        } else {
+          j++;
+        }
+      }
+      drmInitDataBySchemeType.put(scheme, drmInitData);
+    }
+    return drmInitDataBySchemeType;
+  }
+
   private static Format deriveVideoFormat(Format variantFormat) {
     String codecs = Util.getCodecsOfType(variantFormat.codecs, C.TRACK_TYPE_VIDEO);
     String sampleMimeType = MimeTypes.getMediaMimeType(codecs);
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
index 114a64f99f..b6b874b293 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
@@ -67,6 +67,7 @@ public final class HlsMediaSource extends BaseMediaSource
     private CompositeSequenceableLoaderFactory compositeSequenceableLoaderFactory;
     private LoadErrorHandlingPolicy loadErrorHandlingPolicy;
     private boolean allowChunklessPreparation;
+    private boolean useSessionKeys;
     private boolean isCreateCalled;
     @Nullable private Object tag;
 
@@ -236,6 +237,20 @@ public final class HlsMediaSource extends BaseMediaSource
       return this;
     }
 
+    /**
+     * Sets whether to use #EXT-X-SESSION-KEY tags provided in the master playlist. If enabled, it's
+     * assumed that any single session key declared in the master playlist can be used to obtain all
+     * of the keys required for playback. For media where this is not true, this option should not
+     * be enabled.
+     *
+     * @param useSessionKeys Whether to use #EXT-X-SESSION-KEY tags.
+     * @return This factory, for convenience.
+     */
+    public Factory setUseSessionKeys(boolean useSessionKeys) {
+      this.useSessionKeys = useSessionKeys;
+      return this;
+    }
+
     /**
      * Returns a new {@link HlsMediaSource} using the current parameters.
      *
@@ -257,6 +272,7 @@ public final class HlsMediaSource extends BaseMediaSource
           playlistTrackerFactory.createTracker(
               hlsDataSourceFactory, loadErrorHandlingPolicy, playlistParserFactory),
           allowChunklessPreparation,
+          useSessionKeys,
           tag);
     }
 
@@ -289,6 +305,7 @@ public final class HlsMediaSource extends BaseMediaSource
   private final CompositeSequenceableLoaderFactory compositeSequenceableLoaderFactory;
   private final LoadErrorHandlingPolicy loadErrorHandlingPolicy;
   private final boolean allowChunklessPreparation;
+  private final boolean useSessionKeys;
   private final HlsPlaylistTracker playlistTracker;
   private final @Nullable Object tag;
 
@@ -302,6 +319,7 @@ public final class HlsMediaSource extends BaseMediaSource
       LoadErrorHandlingPolicy loadErrorHandlingPolicy,
       HlsPlaylistTracker playlistTracker,
       boolean allowChunklessPreparation,
+      boolean useSessionKeys,
       @Nullable Object tag) {
     this.manifestUri = manifestUri;
     this.dataSourceFactory = dataSourceFactory;
@@ -310,6 +328,7 @@ public final class HlsMediaSource extends BaseMediaSource
     this.loadErrorHandlingPolicy = loadErrorHandlingPolicy;
     this.playlistTracker = playlistTracker;
     this.allowChunklessPreparation = allowChunklessPreparation;
+    this.useSessionKeys = useSessionKeys;
     this.tag = tag;
   }
 
@@ -343,7 +362,8 @@ public final class HlsMediaSource extends BaseMediaSource
         eventDispatcher,
         allocator,
         compositeSequenceableLoaderFactory,
-        allowChunklessPreparation);
+        allowChunklessPreparation,
+        useSessionKeys);
   }
 
   @Override
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
index c5e0c02925..dc72458747 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
@@ -21,6 +21,7 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.FormatHolder;
 import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
+import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.extractor.DummyTrackOutput;
 import com.google.android.exoplayer2.extractor.ExtractorOutput;
 import com.google.android.exoplayer2.extractor.SeekMap;
@@ -52,6 +53,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Loads {@link HlsMediaChunk}s obtained from a {@link HlsChunkSource}, and provides
@@ -102,6 +104,7 @@ import java.util.List;
   private final Runnable onTracksEndedRunnable;
   private final Handler handler;
   private final ArrayList<HlsSampleStream> hlsSampleStreams;
+  private final Map<String, DrmInitData> overridingDrmInitData;
 
   private SampleQueue[] sampleQueues;
   private int[] sampleQueueTrackIds;
@@ -144,6 +147,10 @@ import java.util.List;
    * @param trackType The type of the track. One of the {@link C} {@code TRACK_TYPE_*} constants.
    * @param callback A callback for the wrapper.
    * @param chunkSource A {@link HlsChunkSource} from which chunks to load are obtained.
+   * @param overridingDrmInitData Overriding {@link DrmInitData}, keyed by protection scheme type
+   *     (i.e. {@link DrmInitData#schemeType}). If the stream has {@link DrmInitData} and uses a
+   *     protection scheme type for which overriding {@link DrmInitData} is provided, then the
+   *     stream's {@link DrmInitData} will be overridden.
    * @param allocator An {@link Allocator} from which to obtain media buffer allocations.
    * @param positionUs The position from which to start loading media.
    * @param muxedAudioFormat Optional muxed audio {@link Format} as defined by the master playlist.
@@ -154,6 +161,7 @@ import java.util.List;
       int trackType,
       Callback callback,
       HlsChunkSource chunkSource,
+      Map<String, DrmInitData> overridingDrmInitData,
       Allocator allocator,
       long positionUs,
       Format muxedAudioFormat,
@@ -162,6 +170,7 @@ import java.util.List;
     this.trackType = trackType;
     this.callback = callback;
     this.chunkSource = chunkSource;
+    this.overridingDrmInitData = overridingDrmInitData;
     this.allocator = allocator;
     this.muxedAudioFormat = muxedAudioFormat;
     this.loadErrorHandlingPolicy = loadErrorHandlingPolicy;
@@ -484,18 +493,28 @@ import java.util.List;
     int result =
         sampleQueues[sampleQueueIndex].read(
             formatHolder, buffer, requireFormat, loadingFinished, lastSeekPositionUs);
-    if (result == C.RESULT_FORMAT_READ && sampleQueueIndex == primarySampleQueueIndex) {
-      // Fill in primary sample format with information from the track format.
-      int chunkUid = sampleQueues[sampleQueueIndex].peekSourceId();
-      int chunkIndex = 0;
-      while (chunkIndex < mediaChunks.size() && mediaChunks.get(chunkIndex).uid != chunkUid) {
-        chunkIndex++;
+    if (result == C.RESULT_FORMAT_READ) {
+      Format format = formatHolder.format;
+      if (sampleQueueIndex == primarySampleQueueIndex) {
+        // Fill in primary sample format with information from the track format.
+        int chunkUid = sampleQueues[sampleQueueIndex].peekSourceId();
+        int chunkIndex = 0;
+        while (chunkIndex < mediaChunks.size() && mediaChunks.get(chunkIndex).uid != chunkUid) {
+          chunkIndex++;
+        }
+        Format trackFormat =
+            chunkIndex < mediaChunks.size()
+                ? mediaChunks.get(chunkIndex).trackFormat
+                : upstreamTrackFormat;
+        format = format.copyWithManifestFormatInfo(trackFormat);
       }
-      Format trackFormat =
-          chunkIndex < mediaChunks.size()
-              ? mediaChunks.get(chunkIndex).trackFormat
-              : upstreamTrackFormat;
-      formatHolder.format = formatHolder.format.copyWithManifestFormatInfo(trackFormat);
+      if (format.drmInitData != null) {
+        DrmInitData drmInitData = overridingDrmInitData.get(format.drmInitData.schemeType);
+        if (drmInitData != null) {
+          format = format.copyWithDrmInitData(drmInitData);
+        }
+      }
+      formatHolder.format = format;
     }
     return result;
   }
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
index 0e7f07cd7c..5ebfc48e4d 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2.source.hls.playlist;
 
 import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.util.MimeTypes;
 import java.util.ArrayList;
@@ -37,7 +38,8 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
           /* muxedAudioFormat= */ null,
           /* muxedCaptionFormats= */ Collections.emptyList(),
           /* hasIndependentSegments= */ false,
-          /* variableDefinitions= */ Collections.emptyMap());
+          /* variableDefinitions= */ Collections.emptyMap(),
+          /* sessionKeyDrmInitData= */ Collections.emptyList());
 
   public static final int GROUP_INDEX_VARIANT = 0;
   public static final int GROUP_INDEX_AUDIO = 1;
@@ -122,6 +124,8 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
   public final List<Format> muxedCaptionFormats;
   /** Contains variable definitions, as defined by the #EXT-X-DEFINE tag. */
   public final Map<String, String> variableDefinitions;
+  /** DRM initialization data derived from #EXT-X-SESSION-KEY tags. */
+  public final List<DrmInitData> sessionKeyDrmInitData;
 
   /**
    * @param baseUri See {@link #baseUri}.
@@ -133,6 +137,7 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
    * @param muxedCaptionFormats See {@link #muxedCaptionFormats}.
    * @param hasIndependentSegments See {@link #hasIndependentSegments}.
    * @param variableDefinitions See {@link #variableDefinitions}.
+   * @param sessionKeyDrmInitData See {@link #sessionKeyDrmInitData}.
    */
   public HlsMasterPlaylist(
       String baseUri,
@@ -143,7 +148,8 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
       Format muxedAudioFormat,
       List<Format> muxedCaptionFormats,
       boolean hasIndependentSegments,
-      Map<String, String> variableDefinitions) {
+      Map<String, String> variableDefinitions,
+      List<DrmInitData> sessionKeyDrmInitData) {
     super(baseUri, tags, hasIndependentSegments);
     this.variants = Collections.unmodifiableList(variants);
     this.audios = Collections.unmodifiableList(audios);
@@ -152,6 +158,7 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
     this.muxedCaptionFormats = muxedCaptionFormats != null
         ? Collections.unmodifiableList(muxedCaptionFormats) : null;
     this.variableDefinitions = Collections.unmodifiableMap(variableDefinitions);
+    this.sessionKeyDrmInitData = Collections.unmodifiableList(sessionKeyDrmInitData);
   }
 
   @Override
@@ -165,7 +172,8 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
         muxedAudioFormat,
         muxedCaptionFormats,
         hasIndependentSegments,
-        variableDefinitions);
+        variableDefinitions,
+        sessionKeyDrmInitData);
   }
 
   /**
@@ -186,7 +194,8 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
         /* muxedAudioFormat= */ null,
         /* muxedCaptionFormats= */ null,
         /* hasIndependentSegments= */ false,
-        /* variableDefinitions= */ Collections.emptyMap());
+        /* variableDefinitions= */ Collections.emptyMap(),
+        /* sessionKeyDrmInitData= */ Collections.emptyList());
   }
 
   private static List<HlsUrl> copyRenditionsList(
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
index fd49e10bea..215d80c5c0 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
@@ -34,7 +34,6 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -73,6 +72,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
   private static final String TAG_START = "#EXT-X-START";
   private static final String TAG_ENDLIST = "#EXT-X-ENDLIST";
   private static final String TAG_KEY = "#EXT-X-KEY";
+  private static final String TAG_SESSION_KEY = "#EXT-X-SESSION-KEY";
   private static final String TAG_BYTERANGE = "#EXT-X-BYTERANGE";
   private static final String TAG_GAP = "#EXT-X-GAP";
 
@@ -253,6 +253,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
     ArrayList<HlsMasterPlaylist.HlsUrl> audios = new ArrayList<>();
     ArrayList<HlsMasterPlaylist.HlsUrl> subtitles = new ArrayList<>();
     ArrayList<String> mediaTags = new ArrayList<>();
+    ArrayList<DrmInitData> sessionKeyDrmInitData = new ArrayList<>();
     ArrayList<String> tags = new ArrayList<>();
     Format muxedAudioFormat = null;
     List<Format> muxedCaptionFormats = null;
@@ -278,6 +279,15 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
         // Media tags are parsed at the end to include codec information from #EXT-X-STREAM-INF
         // tags.
         mediaTags.add(line);
+      } else if (line.startsWith(TAG_SESSION_KEY)) {
+        String keyFormat =
+            parseOptionalStringAttr(line, REGEX_KEYFORMAT, KEYFORMAT_IDENTITY, variableDefinitions);
+        SchemeData schemeData = parseDrmSchemeData(line, keyFormat, variableDefinitions);
+        if (schemeData != null) {
+          String method = parseStringAttr(line, REGEX_METHOD, variableDefinitions);
+          String scheme = parseEncryptionScheme(method);
+          sessionKeyDrmInitData.add(new DrmInitData(scheme, schemeData));
+        }
       } else if (line.startsWith(TAG_STREAM_INF)) {
         noClosedCaptions |= line.contains(ATTR_CLOSED_CAPTIONS_NONE);
         int bitrate = parseIntAttr(line, REGEX_BANDWIDTH);
@@ -423,6 +433,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
     if (noClosedCaptions) {
       muxedCaptionFormats = Collections.emptyList();
     }
+
     return new HlsMasterPlaylist(
         baseUri,
         tags,
@@ -432,7 +443,8 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
         muxedAudioFormat,
         muxedCaptionFormats,
         hasIndependentSegmentsTag,
-        variableDefinitions);
+        variableDefinitions,
+        sessionKeyDrmInitData);
   }
 
   private static HlsMediaPlaylist parseMediaPlaylist(
@@ -557,17 +569,9 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
             }
           } else {
             if (encryptionScheme == null) {
-              encryptionScheme =
-                  METHOD_SAMPLE_AES_CENC.equals(method) || METHOD_SAMPLE_AES_CTR.equals(method)
-                      ? C.CENC_TYPE_cenc
-                      : C.CENC_TYPE_cbcs;
-            }
-            SchemeData schemeData;
-            if (KEYFORMAT_PLAYREADY.equals(keyFormat)) {
-              schemeData = parsePlayReadySchemeData(line, variableDefinitions);
-            } else {
-              schemeData = parseWidevineSchemeData(line, keyFormat, variableDefinitions);
+              encryptionScheme = parseEncryptionScheme(method);
             }
+            SchemeData schemeData = parseDrmSchemeData(line, keyFormat, variableDefinitions);
             if (schemeData != null) {
               cachedDrmInitData = null;
               currentSchemeDatas.put(keyFormat, schemeData);
@@ -713,40 +717,35 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
         : Format.NO_VALUE;
   }
 
-  private static @Nullable SchemeData parsePlayReadySchemeData(
-      String line, Map<String, String> variableDefinitions) throws ParserException {
-    String keyFormatVersions =
-        parseOptionalStringAttr(line, REGEX_KEYFORMATVERSIONS, "1", variableDefinitions);
-    if (!"1".equals(keyFormatVersions)) {
-      // Not supported.
-      return null;
-    }
-    String uriString = parseStringAttr(line, REGEX_URI, variableDefinitions);
-    byte[] data = Base64.decode(uriString.substring(uriString.indexOf(',')), Base64.DEFAULT);
-    byte[] psshData = PsshAtomUtil.buildPsshAtom(C.PLAYREADY_UUID, data);
-    return new SchemeData(C.PLAYREADY_UUID, MimeTypes.VIDEO_MP4, psshData);
-  }
-
-  private static @Nullable SchemeData parseWidevineSchemeData(
+  @Nullable
+  private static SchemeData parseDrmSchemeData(
       String line, String keyFormat, Map<String, String> variableDefinitions)
       throws ParserException {
+    String keyFormatVersions =
+        parseOptionalStringAttr(line, REGEX_KEYFORMATVERSIONS, "1", variableDefinitions);
     if (KEYFORMAT_WIDEVINE_PSSH_BINARY.equals(keyFormat)) {
       String uriString = parseStringAttr(line, REGEX_URI, variableDefinitions);
       return new SchemeData(
           C.WIDEVINE_UUID,
           MimeTypes.VIDEO_MP4,
           Base64.decode(uriString.substring(uriString.indexOf(',')), Base64.DEFAULT));
-    }
-    if (KEYFORMAT_WIDEVINE_PSSH_JSON.equals(keyFormat)) {
-      try {
-        return new SchemeData(C.WIDEVINE_UUID, "hls", line.getBytes(C.UTF8_NAME));
-      } catch (UnsupportedEncodingException e) {
-        throw new ParserException(e);
-      }
+    } else if (KEYFORMAT_WIDEVINE_PSSH_JSON.equals(keyFormat)) {
+      return new SchemeData(C.WIDEVINE_UUID, "hls", Util.getUtf8Bytes(line));
+    } else if (KEYFORMAT_PLAYREADY.equals(keyFormat) && "1".equals(keyFormatVersions)) {
+      String uriString = parseStringAttr(line, REGEX_URI, variableDefinitions);
+      byte[] data = Base64.decode(uriString.substring(uriString.indexOf(',')), Base64.DEFAULT);
+      byte[] psshData = PsshAtomUtil.buildPsshAtom(C.PLAYREADY_UUID, data);
+      return new SchemeData(C.PLAYREADY_UUID, MimeTypes.VIDEO_MP4, psshData);
     }
     return null;
   }
 
+  private static String parseEncryptionScheme(String method) {
+    return METHOD_SAMPLE_AES_CENC.equals(method) || METHOD_SAMPLE_AES_CTR.equals(method)
+        ? C.CENC_TYPE_cenc
+        : C.CENC_TYPE_cbcs;
+  }
+
   private static int parseIntAttr(String line, Pattern pattern) throws ParserException {
     return Integer.parseInt(parseStringAttr(line, pattern, Collections.emptyMap()));
   }
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
index a3e2af53b6..35d0c53bbf 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
@@ -88,7 +88,8 @@ public final class HlsMediaPeriodTest {
                       /* mediaTimeOffsetMs= */ 0),
               mock(Allocator.class),
               mock(CompositeSequenceableLoaderFactory.class),
-              /* allowChunklessPreparation =*/ true);
+              /* allowChunklessPreparation =*/ true,
+              /* useSessionKeys= */ false);
         };
 
     MediaPeriodAsserts.assertGetStreamKeysAndManifestFilterIntegration(
@@ -110,7 +111,8 @@ public final class HlsMediaPeriodTest {
         muxedAudioFormat,
         muxedCaptionFormats,
         /* hasIndependentSegments= */ true,
-        /* variableDefinitions= */ Collections.emptyMap());
+        /* variableDefinitions= */ Collections.emptyMap(),
+        /* sessionKeyDrmInitData= */ Collections.emptyList());
   }
 
   private static HlsUrl createMuxedVideoAudioVariantHlsUrl(int bitrate) {
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java
index 83d9731dca..384408a0af 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java
@@ -456,7 +456,8 @@ public class HlsMediaPlaylistParserTest {
             /* muxedAudioFormat= */ null,
             /* muxedCaptionFormats= */ null,
             /* hasIndependentSegments= */ true,
-            /* variableDefinitions */ Collections.emptyMap());
+            /* variableDefinitions= */ Collections.emptyMap(),
+            /* sessionKeyDrmInitData= */ Collections.emptyList());
     HlsMediaPlaylist playlistWithInheritance =
         (HlsMediaPlaylist) new HlsPlaylistParser(masterPlaylist).parse(playlistUri, inputStream);
     assertThat(playlistWithInheritance.hasIndependentSegments).isTrue();
@@ -515,7 +516,8 @@ public class HlsMediaPlaylistParserTest {
             /* muxedAudioFormat= */ null,
             /* muxedCaptionFormats= */ Collections.emptyList(),
             /* hasIndependentSegments= */ false,
-            variableDefinitions);
+            variableDefinitions,
+            /* sessionKeyDrmInitData= */ Collections.emptyList());
     HlsMediaPlaylist playlist =
         (HlsMediaPlaylist) new HlsPlaylistParser(masterPlaylist).parse(playlistUri, inputStream);
     for (int i = 1; i <= 4; i++) {

From 9220b18bdc4494f01b18958d963d49439581d9b2 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Tue, 26 Mar 2019 14:37:43 +0000
Subject: [PATCH 671/832] Fix parameter order in
 JobDispatcherScheduler.schedule()

Issue: #5613
PiperOrigin-RevId: 240344666
---
 .../ext/jobdispatcher/JobDispatcherScheduler.java         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java b/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java
index 677d3c2ebd..c676091d32 100644
--- a/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java
+++ b/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java
@@ -78,8 +78,8 @@ public final class JobDispatcherScheduler implements Scheduler {
   }
 
   @Override
-  public boolean schedule(Requirements requirements, String serviceAction, String servicePackage) {
-    Job job = buildJob(jobDispatcher, requirements, jobTag, serviceAction, servicePackage);
+  public boolean schedule(Requirements requirements, String servicePackage, String serviceAction) {
+    Job job = buildJob(jobDispatcher, requirements, jobTag, servicePackage, serviceAction);
     int result = jobDispatcher.schedule(job);
     logd("Scheduling job: " + jobTag + " result: " + result);
     return result == FirebaseJobDispatcher.SCHEDULE_RESULT_SUCCESS;
@@ -96,8 +96,8 @@ public final class JobDispatcherScheduler implements Scheduler {
       FirebaseJobDispatcher dispatcher,
       Requirements requirements,
       String tag,
-      String serviceAction,
-      String servicePackage) {
+      String servicePackage,
+      String serviceAction) {
     Job.Builder builder =
         dispatcher
             .newJobBuilder()

From 30d66f50315ec0ac972b1cccadccfd0b26e48695 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 26 Mar 2019 15:06:19 +0000
Subject: [PATCH 672/832] Rollback of
 https://github.com/google/ExoPlayer/commit/be69d5b747ca1f12129ac061cbb259ec45470ef8

Issue: #5596

This arguably made a worse problem than it solved, and also I think subtly broken HLS
downloads by changing which renditions HlsMasterPlaylist.copy would retain in some
cases. Reverting as a mini step toward removing smart logic from the HLS playlist parser.

*** Original commit ***

Expand check for muxed audio media tags to include uris that match variants

Issue:#5313

***

PiperOrigin-RevId: 240348969
---
 .../hls/playlist/HlsPlaylistParser.java       | 16 +---------------
 .../playlist/HlsMasterPlaylistParserTest.java | 19 -------------------
 2 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
index 215d80c5c0..8d6c76e544 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
@@ -377,7 +377,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
                   selectionFlags,
                   roleFlags,
                   language);
-          if (isMediaTagMuxed(variants, uri)) {
+          if (uri == null) {
             muxedAudioFormat = format;
           } else {
             audios.add(new HlsMasterPlaylist.HlsUrl(uri, format, name));
@@ -817,20 +817,6 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
     return Pattern.compile(attribute + "=(" + BOOLEAN_FALSE + "|" + BOOLEAN_TRUE + ")");
   }
 
-  private static boolean isMediaTagMuxed(
-      List<HlsMasterPlaylist.HlsUrl> variants, String mediaTagUri) {
-    if (mediaTagUri == null) {
-      return true;
-    }
-    // The URI attribute is defined, but it may match the uri of a variant.
-    for (int i = 0; i < variants.size(); i++) {
-      if (mediaTagUri.equals(variants.get(i).url)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
   private static class LineIterator {
 
     private final BufferedReader reader;
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
index 59924bf1a5..dadf396190 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
@@ -146,17 +146,6 @@ public class HlsMasterPlaylistParserTest {
           + "#EXT-X-STREAM-INF:BANDWIDTH=65000,CODECS=\"{$codecs}\"\n"
           + "http://example.com/{$tricky}\n";
 
-  private static final String PLAYLIST_WITH_MULTIPLE_MUXED_MEDIA_TAGS =
-      "#EXTM3U\n"
-          + "#EXT-X-VERSION:3\n"
-          + "#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"a\",NAME=\"audio_0\",DEFAULT=YES,URI=\"0/0.m3u8\"\n"
-          + "#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"b\",NAME=\"audio_0\",DEFAULT=YES,URI=\"1/1.m3u8\"\n"
-          + "#EXT-X-STREAM-INF:BANDWIDTH=140800,CODECS=\"mp4a.40.2\",AUDIO=\"a\"\n"
-          + "0/0.m3u8\n"
-          + "\n"
-          + "#EXT-X-STREAM-INF:BANDWIDTH=281600,CODECS=\"mp4a.40.2\",AUDIO=\"b\"\n"
-          + "1/1.m3u8\n";
-
   @Test
   public void testParseMasterPlaylist() throws IOException {
     HlsMasterPlaylist masterPlaylist = parseMasterPlaylist(PLAYLIST_URI, PLAYLIST_SIMPLE);
@@ -305,14 +294,6 @@ public class HlsMasterPlaylistParserTest {
     assertThat(variant.url).isEqualTo("http://example.com/This/{$nested}/reference/shouldnt/work");
   }
 
-  @Test
-  public void testMultipleMuxedMediaTags() throws IOException {
-    HlsMasterPlaylist playlistWithMultipleMuxedMediaTags =
-        parseMasterPlaylist(PLAYLIST_URI, PLAYLIST_WITH_MULTIPLE_MUXED_MEDIA_TAGS);
-    assertThat(playlistWithMultipleMuxedMediaTags.variants).hasSize(2);
-    assertThat(playlistWithMultipleMuxedMediaTags.audios).isEmpty();
-  }
-
   private static HlsMasterPlaylist parseMasterPlaylist(String uri, String playlistString)
       throws IOException {
     Uri playlistUri = Uri.parse(uri);

From 709a712a5f1e1897c056ec0b1112e34d6fd679b8 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Tue, 26 Mar 2019 16:31:15 +0000
Subject: [PATCH 673/832] DownloadAction custom id

PiperOrigin-RevId: 240363716
---
 .../exoplayer2/offline/DownloadAction.java    | 36 +++++++++++++++++--
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
index cf22e56c5b..97a2e3962b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
@@ -87,7 +87,29 @@ public final class DownloadAction {
       List<StreamKey> keys,
       @Nullable String customCacheKey,
       @Nullable byte[] data) {
-    return new DownloadAction(type, uri, /* isRemoveAction= */ false, keys, customCacheKey, data);
+    return createDownloadAction(
+        generateId(uri, customCacheKey), type, uri, keys, customCacheKey, data);
+  }
+
+  /**
+   * Creates a DASH download action.
+   *
+   * @param id The content id.
+   * @param type The type of the action.
+   * @param uri The URI of the media to be downloaded.
+   * @param keys Keys of streams to be downloaded. If empty, all streams will be downloaded.
+   * @param customCacheKey A custom key for cache indexing, or null.
+   * @param data Optional custom data for this action. If {@code null} an empty array will be used.
+   */
+  public static DownloadAction createDownloadAction(
+      String id,
+      String type,
+      Uri uri,
+      List<StreamKey> keys,
+      @Nullable String customCacheKey,
+      @Nullable byte[] data) {
+    return new DownloadAction(
+        id, type, uri, /* isRemoveAction= */ false, keys, customCacheKey, data);
   }
 
   /**
@@ -100,6 +122,7 @@ public final class DownloadAction {
   public static DownloadAction createRemoveAction(
       String type, Uri uri, @Nullable String customCacheKey) {
     return new DownloadAction(
+        generateId(uri, customCacheKey),
         type,
         uri,
         /* isRemoveAction= */ true,
@@ -127,6 +150,7 @@ public final class DownloadAction {
   public final byte[] data;
 
   /**
+   * @param id The content id.
    * @param type The type of the action.
    * @param uri The uri being downloaded or removed.
    * @param isRemoveAction Whether this is a remove action. If false, this is a download action.
@@ -136,13 +160,14 @@ public final class DownloadAction {
    * @param data Custom data for this action. Null if this action is a remove action.
    */
   private DownloadAction(
+      String id,
       String type,
       Uri uri,
       boolean isRemoveAction,
       List<StreamKey> keys,
       @Nullable String customCacheKey,
       @Nullable byte[] data) {
-    this.id = customCacheKey != null ? customCacheKey : uri.toString();
+    this.id = id;
     this.type = type;
     this.uri = uri;
     this.isRemoveAction = isRemoveAction;
@@ -272,7 +297,12 @@ public final class DownloadAction {
       customCacheKey = input.readBoolean() ? input.readUTF() : null;
     }
 
-    return new DownloadAction(type, uri, isRemoveAction, keys, customCacheKey, data);
+    return new DownloadAction(
+        generateId(uri, customCacheKey), type, uri, isRemoveAction, keys, customCacheKey, data);
+  }
+
+  private static String generateId(Uri uri, @Nullable String customCacheKey) {
+    return customCacheKey != null ? customCacheKey : uri.toString();
   }
 
   private static StreamKey readKey(String type, int version, DataInputStream input)

From ae5e5f7efc41d94261a35e3ffad428270c09bc87 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Tue, 26 Mar 2019 17:31:28 +0000
Subject: [PATCH 674/832] Stop using remove DownloadActions in DownloadManager

PiperOrigin-RevId: 240376409
---
 .../exoplayer2/offline/DownloadManager.java   | 56 +++++++++----------
 .../offline/DownloadManagerTest.java          |  2 -
 2 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index f0d31e9259..e6fb10aa21 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -665,7 +665,7 @@ public final class DownloadManager {
   }
 
   @StartThreadResults
-  private int startDownloadThread(Download download, DownloadAction action) {
+  private int startDownloadThread(Download download) {
     if (!initialized || released) {
       return START_THREAD_NOT_ALLOWED;
     }
@@ -675,15 +675,13 @@ public final class DownloadManager {
       }
       return START_THREAD_WAIT_REMOVAL_TO_FINISH;
     }
-    if (!action.isRemoveAction) {
+    if (!download.isInRemoveState()) {
       if (simultaneousDownloads == maxSimultaneousDownloads) {
         return START_THREAD_TOO_MANY_DOWNLOADS;
       }
       simultaneousDownloads++;
     }
-    Downloader downloader = downloaderFactory.createDownloader(action);
-    DownloadThread downloadThread = new DownloadThread(download, downloader, action.isRemoveAction);
-    activeDownloads.put(download, downloadThread);
+    activeDownloads.put(download, new DownloadThread(download));
     logd("Download is started", download);
     return START_THREAD_SUCCEEDED;
   }
@@ -823,8 +821,8 @@ public final class DownloadManager {
     public void start() {
       if (state == STATE_QUEUED || state == STATE_DOWNLOADING) {
         startOrQueue();
-      } else if (state == STATE_REMOVING || state == STATE_RESTARTING) {
-        downloadManager.startDownloadThread(this, getAction());
+      } else if (isInRemoveState()) {
+        downloadManager.startDownloadThread(this);
       }
     }
 
@@ -838,6 +836,20 @@ public final class DownloadManager {
       updateStopState();
     }
 
+    public DownloadAction getAction() {
+      Assertions.checkState(state != STATE_REMOVED);
+      return DownloadAction.createDownloadAction(
+          downloadState.type,
+          downloadState.uri,
+          Arrays.asList(downloadState.streamKeys),
+          downloadState.cacheKey,
+          downloadState.customMetadata);
+    }
+
+    public boolean isInRemoveState() {
+      return state == STATE_REMOVING || state == STATE_RESTARTING;
+    }
+
     private void updateStopState() {
       DownloadState oldDownloadState = downloadState;
       if (canStart()) {
@@ -859,8 +871,8 @@ public final class DownloadManager {
       // Don't notify listeners with initial state until we make sure we don't switch to
       // another state immediately.
       state = initialState;
-      if (state == STATE_REMOVING || state == STATE_RESTARTING) {
-        downloadManager.startDownloadThread(this, getAction());
+      if (isInRemoveState()) {
+        downloadManager.startDownloadThread(this);
       } else if (canStart()) {
         startOrQueue();
       } else {
@@ -876,8 +888,8 @@ public final class DownloadManager {
     }
 
     private void startOrQueue() {
-      Assertions.checkState(!(state == STATE_REMOVING || state == STATE_RESTARTING));
-      @StartThreadResults int result = downloadManager.startDownloadThread(this, getAction());
+      Assertions.checkState(!isInRemoveState());
+      @StartThreadResults int result = downloadManager.startDownloadThread(this);
       Assertions.checkState(result != START_THREAD_WAIT_REMOVAL_TO_FINISH);
       if (result == START_THREAD_SUCCEEDED || result == START_THREAD_WAIT_DOWNLOAD_CANCELLATION) {
         setState(STATE_DOWNLOADING);
@@ -886,20 +898,6 @@ public final class DownloadManager {
       }
     }
 
-    private DownloadAction getAction() {
-      Assertions.checkState(state != STATE_REMOVED);
-      if (state == STATE_REMOVING || state == STATE_RESTARTING) {
-        return DownloadAction.createRemoveAction(
-            downloadState.type, downloadState.uri, downloadState.cacheKey);
-      }
-      return DownloadAction.createDownloadAction(
-          downloadState.type,
-          downloadState.uri,
-          Arrays.asList(downloadState.streamKeys),
-          downloadState.cacheKey,
-          downloadState.customMetadata);
-    }
-
     private void setState(@DownloadState.State int newState) {
       if (state != newState) {
         state = newState;
@@ -912,7 +910,7 @@ public final class DownloadManager {
         return;
       }
       if (isCanceled) {
-        downloadManager.startDownloadThread(this, getAction());
+        downloadManager.startDownloadThread(this);
       } else if (state == STATE_RESTARTING) {
         initialize(STATE_QUEUED);
       } else if (state == STATE_REMOVING) {
@@ -937,10 +935,10 @@ public final class DownloadManager {
     private final boolean isRemoveThread;
     private volatile boolean isCanceled;
 
-    private DownloadThread(Download download, Downloader downloader, boolean isRemoveThread) {
+    private DownloadThread(Download download) {
       this.download = download;
-      this.downloader = downloader;
-      this.isRemoveThread = isRemoveThread;
+      this.downloader = downloaderFactory.createDownloader(download.getAction());
+      this.isRemoveThread = download.isInRemoveState();
       start();
     }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index 91f1bac32d..c6e4867454 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -702,7 +702,6 @@ public class DownloadManagerTest {
     public void download() throws InterruptedException, IOException {
       // It's ok to update this directly as no other thread will update it.
       startCount++;
-      assertThat(action.isRemoveAction).isFalse();
       started.countDown();
       block();
       if (enableDownloadIOException) {
@@ -721,7 +720,6 @@ public class DownloadManagerTest {
     public void remove() throws InterruptedException {
       // It's ok to update this directly as no other thread will update it.
       startCount++;
-      assertThat(action.isRemoveAction).isTrue();
       started.countDown();
       block();
     }

From e3a8429ee299c2aea275e587c6286b0bdf894745 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 26 Mar 2019 20:49:36 +0000
Subject: [PATCH 675/832] More faithfully parse content of HLS master playlists

- Split HlsUrl into Rendition and Variant
- Add Rendition/Variant specific information to the new types

Issue: #5596
PiperOrigin-RevId: 240419763
---
 .../exoplayer2/source/hls/HlsMediaPeriod.java |   7 +-
 .../source/hls/offline/HlsDownloader.java     |   3 +-
 .../playlist/DefaultHlsPlaylistTracker.java   |   3 +-
 .../hls/playlist/HlsMasterPlaylist.java       | 134 ++++++++++++------
 .../hls/playlist/HlsPlaylistParser.java       |  45 ++++--
 .../source/hls/HlsMediaPeriodTest.java        |  61 ++++----
 .../playlist/HlsMasterPlaylistParserTest.java |   8 +-
 7 files changed, 170 insertions(+), 91 deletions(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
index 78551e6079..e76cf26db7 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
@@ -32,6 +32,7 @@ import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.HlsUrl;
+import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.Rendition;
 import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylistTracker;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.upstream.Allocator;
@@ -442,8 +443,8 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
             : Collections.emptyMap();
 
     boolean hasVariants = !masterPlaylist.variants.isEmpty();
-    List<HlsUrl> audioRenditions = masterPlaylist.audios;
-    List<HlsUrl> subtitleRenditions = masterPlaylist.subtitles;
+    List<Rendition> audioRenditions = masterPlaylist.audios;
+    List<Rendition> subtitleRenditions = masterPlaylist.subtitles;
 
     pendingPrepareCount = 0;
     ArrayList<HlsSampleStreamWrapper> sampleStreamWrappers = new ArrayList<>();
@@ -644,7 +645,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
 
   private void buildAndPrepareAudioSampleStreamWrappers(
       long positionUs,
-      List<HlsUrl> audioRenditions,
+      List<Rendition> audioRenditions,
       List<HlsSampleStreamWrapper> sampleStreamWrappers,
       List<int[]> manifestUrlsIndicesPerWrapper,
       Map<String, DrmInitData> overridingDrmInitData) {
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java
index a0f64f298e..803f914686 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java
@@ -119,7 +119,8 @@ public final class HlsDownloader extends SegmentDownloader<HlsPlaylist> {
     return segments;
   }
 
-  private void addMediaPlaylistDataSpecs(String baseUri, List<HlsUrl> urls, List<DataSpec> out) {
+  private void addMediaPlaylistDataSpecs(
+      String baseUri, List<? extends HlsUrl> urls, List<DataSpec> out) {
     for (int i = 0; i < urls.size(); i++) {
       Uri playlistUri = UriUtil.resolveToUri(baseUri, urls.get(i).url);
       out.add(SegmentDownloader.getCompressibleDataSpec(playlistUri));
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
index f0032ef475..93f617003d 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
@@ -24,6 +24,7 @@ import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.source.MediaSourceEventListener.EventDispatcher;
 import com.google.android.exoplayer2.source.hls.HlsDataSourceFactory;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.HlsUrl;
+import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.Variant;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist.Segment;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.LoadErrorHandlingPolicy;
@@ -298,7 +299,7 @@ public final class DefaultHlsPlaylistTracker
   // Internal methods.
 
   private boolean maybeSelectNewPrimaryUrl() {
-    List<HlsUrl> variants = masterPlaylist.variants;
+    List<Variant> variants = masterPlaylist.variants;
     int variantsSize = variants.size();
     long currentTimeMs = SystemClock.elapsedRealtime();
     for (int i = 0; i < variantsSize; i++) {
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
index 5ebfc48e4d..f485778bb5 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.source.hls.playlist;
 
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.offline.StreamKey;
@@ -45,10 +46,8 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
   public static final int GROUP_INDEX_AUDIO = 1;
   public static final int GROUP_INDEX_SUBTITLE = 2;
 
-  /**
-   * Represents a url in an HLS master playlist.
-   */
-  public static final class HlsUrl {
+  /** Represents a url in an HLS master playlist. */
+  public abstract static class HlsUrl {
 
     /**
      * The http url from which the media playlist can be obtained.
@@ -58,19 +57,61 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
      * Format information associated with the HLS url.
      */
     public final Format format;
-    /**
-     * Value of the NAME attribute as defined by the #EXT-X-MEDIA tag, or empty if the HLS url is
-     * not associated with any name.
-     */
-    public final String name;
 
     /**
-     * Creates an HLS url from a given http url.
-     *
-     * @param url The url.
-     * @return An HLS url.
+     * @param url See {@link #url}.
+     * @param format See {@link #format}.
      */
-    public static HlsUrl createMediaPlaylistHlsUrl(String url) {
+    public HlsUrl(String url, Format format) {
+      this.url = url;
+      this.format = format;
+    }
+  }
+
+  /** A variant in a master playlist. */
+  public static final class Variant extends HlsUrl {
+
+    /** The video rendition group referenced by this variant, or {@code null}. */
+    @Nullable public final String videoGroupId;
+
+    /** The audio rendition group referenced by this variant, or {@code null}. */
+    @Nullable public final String audioGroupId;
+
+    /** The subtitle rendition group referenced by this variant, or {@code null}. */
+    @Nullable public final String subtitleGroupId;
+
+    /** The caption rendition group referenced by this variant, or {@code null}. */
+    @Nullable public final String captionGroupId;
+
+    /**
+     * @param url See {@link #url}.
+     * @param format See {@link #format}.
+     * @param videoGroupId See {@link #videoGroupId}.
+     * @param audioGroupId See {@link #audioGroupId}.
+     * @param subtitleGroupId See {@link #subtitleGroupId}.
+     * @param captionGroupId See {@link #captionGroupId}.
+     */
+    public Variant(
+        String url,
+        Format format,
+        @Nullable String videoGroupId,
+        @Nullable String audioGroupId,
+        @Nullable String subtitleGroupId,
+        @Nullable String captionGroupId) {
+      super(url, format);
+      this.videoGroupId = videoGroupId;
+      this.audioGroupId = audioGroupId;
+      this.subtitleGroupId = subtitleGroupId;
+      this.captionGroupId = captionGroupId;
+    }
+
+    /**
+     * Creates a variant for a given media playlist url.
+     *
+     * @param url The media playlist url.
+     * @return The variant instance.
+     */
+    public static Variant createMediaPlaylistVariantUrl(String url) {
       Format format =
           Format.createContainerFormat(
               "0",
@@ -82,34 +123,45 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
               /* selectionFlags= */ 0,
               /* roleFlags= */ 0,
               /* language= */ null);
-      return new HlsUrl(url, format, /* name= */ "");
+      return new Variant(
+          url,
+          format,
+          /* videoGroupId= */ null,
+          /* audioGroupId= */ null,
+          /* subtitleGroupId= */ null,
+          /* captionGroupId= */ null);
     }
+  }
+
+  /** A rendition in a master playlist. */
+  public static final class Rendition extends HlsUrl {
+
+    /** The group to which this rendition belongs. */
+    public final String groupId;
+
+    /** The name of the rendition. */
+    public final String name;
 
     /**
      * @param url See {@link #url}.
      * @param format See {@link #format}.
+     * @param groupId See {@link #groupId}.
      * @param name See {@link #name}.
      */
-    public HlsUrl(String url, Format format, String name) {
-      this.url = url;
-      this.format = format;
+    public Rendition(String url, Format format, String groupId, String name) {
+      super(url, format);
+      this.groupId = groupId;
       this.name = name;
     }
 
   }
 
-  /**
-   * The list of variants declared by the playlist.
-   */
-  public final List<HlsUrl> variants;
-  /**
-   * The list of demuxed audios declared by the playlist.
-   */
-  public final List<HlsUrl> audios;
-  /**
-   * The list of subtitles declared by the playlist.
-   */
-  public final List<HlsUrl> subtitles;
+  /** The list of variants declared by the playlist. */
+  public final List<Variant> variants;
+  /** The list of demuxed audios declared by the playlist. */
+  public final List<Rendition> audios;
+  /** The list of subtitles declared by the playlist. */
+  public final List<Rendition> subtitles;
 
   /**
    * The format of the audio muxed in the variants. May be null if the playlist does not declare any
@@ -142,9 +194,9 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
   public HlsMasterPlaylist(
       String baseUri,
       List<String> tags,
-      List<HlsUrl> variants,
-      List<HlsUrl> audios,
-      List<HlsUrl> subtitles,
+      List<Variant> variants,
+      List<Rendition> audios,
+      List<Rendition> subtitles,
       Format muxedAudioFormat,
       List<Format> muxedCaptionFormats,
       boolean hasIndependentSegments,
@@ -183,14 +235,14 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
    * @return A master playlist with a single variant for the provided url.
    */
   public static HlsMasterPlaylist createSingleVariantMasterPlaylist(String variantUrl) {
-    List<HlsUrl> variant = Collections.singletonList(HlsUrl.createMediaPlaylistHlsUrl(variantUrl));
-    List<HlsUrl> emptyList = Collections.emptyList();
+    List<Variant> variant =
+        Collections.singletonList(Variant.createMediaPlaylistVariantUrl(variantUrl));
     return new HlsMasterPlaylist(
         null,
         Collections.emptyList(),
         variant,
-        emptyList,
-        emptyList,
+        Collections.emptyList(),
+        Collections.emptyList(),
         /* muxedAudioFormat= */ null,
         /* muxedCaptionFormats= */ null,
         /* hasIndependentSegments= */ false,
@@ -198,11 +250,11 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
         /* sessionKeyDrmInitData= */ Collections.emptyList());
   }
 
-  private static List<HlsUrl> copyRenditionsList(
-      List<HlsUrl> renditions, int groupIndex, List<StreamKey> streamKeys) {
-    List<HlsUrl> copiedRenditions = new ArrayList<>(streamKeys.size());
+  private static <T extends HlsUrl> List<T> copyRenditionsList(
+      List<T> renditions, int groupIndex, List<StreamKey> streamKeys) {
+    List<T> copiedRenditions = new ArrayList<>(streamKeys.size());
     for (int i = 0; i < renditions.size(); i++) {
-      HlsUrl rendition = renditions.get(i);
+      T rendition = renditions.get(i);
       for (int j = 0; j < streamKeys.size(); j++) {
         StreamKey streamKey = streamKeys.get(j);
         if (streamKey.groupIndex == groupIndex && streamKey.trackIndex == i) {
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
index 8d6c76e544..f0ce24f19c 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
@@ -26,6 +26,8 @@ import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil;
 import com.google.android.exoplayer2.source.UnrecognizedInputFormatException;
+import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.Rendition;
+import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.Variant;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist.Segment;
 import com.google.android.exoplayer2.upstream.ParsingLoadable;
 import com.google.android.exoplayer2.util.MimeTypes;
@@ -100,7 +102,10 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
 
   private static final Pattern REGEX_AVERAGE_BANDWIDTH =
       Pattern.compile("AVERAGE-BANDWIDTH=(\\d+)\\b");
+  private static final Pattern REGEX_VIDEO = Pattern.compile("VIDEO=\"(.+?)\"");
   private static final Pattern REGEX_AUDIO = Pattern.compile("AUDIO=\"(.+?)\"");
+  private static final Pattern REGEX_SUBTITLES = Pattern.compile("SUBTITLES=\"(.+?)\"");
+  private static final Pattern REGEX_CLOSED_CAPTIONS = Pattern.compile("CLOSED-CAPTIONS=\"(.+?)\"");
   private static final Pattern REGEX_BANDWIDTH = Pattern.compile("[^-]BANDWIDTH=(\\d+)\\b");
   private static final Pattern REGEX_CHANNELS = Pattern.compile("CHANNELS=\"(.+?)\"");
   private static final Pattern REGEX_CODECS = Pattern.compile("CODECS=\"(.+?)\"");
@@ -249,9 +254,9 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
     HashSet<String> variantUrls = new HashSet<>();
     HashMap<String, String> audioGroupIdToCodecs = new HashMap<>();
     HashMap<String, String> variableDefinitions = new HashMap<>();
-    ArrayList<HlsMasterPlaylist.HlsUrl> variants = new ArrayList<>();
-    ArrayList<HlsMasterPlaylist.HlsUrl> audios = new ArrayList<>();
-    ArrayList<HlsMasterPlaylist.HlsUrl> subtitles = new ArrayList<>();
+    ArrayList<Variant> variants = new ArrayList<>();
+    ArrayList<Rendition> audios = new ArrayList<>();
+    ArrayList<Rendition> subtitles = new ArrayList<>();
     ArrayList<String> mediaTags = new ArrayList<>();
     ArrayList<DrmInitData> sessionKeyDrmInitData = new ArrayList<>();
     ArrayList<String> tags = new ArrayList<>();
@@ -321,7 +326,12 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
         if (frameRateString != null) {
           frameRate = Float.parseFloat(frameRateString);
         }
+        String videoGroupId = parseOptionalStringAttr(line, REGEX_VIDEO, variableDefinitions);
         String audioGroupId = parseOptionalStringAttr(line, REGEX_AUDIO, variableDefinitions);
+        String subtitlesGroupId =
+            parseOptionalStringAttr(line, REGEX_SUBTITLES, variableDefinitions);
+        String closedCaptionsGroupId =
+            parseOptionalStringAttr(line, REGEX_CLOSED_CAPTIONS, variableDefinitions);
         if (audioGroupId != null && codecs != null) {
           audioGroupIdToCodecs.put(audioGroupId, Util.getCodecsOfType(codecs, C.TRACK_TYPE_AUDIO));
         }
@@ -343,20 +353,27 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
                   /* initializationData= */ null,
                   /* selectionFlags= */ 0,
                   /* roleFlags= */ 0);
-          variants.add(new HlsMasterPlaylist.HlsUrl(line, format, /* name= */ ""));
+          variants.add(
+              new Variant(
+                  line,
+                  format,
+                  videoGroupId,
+                  audioGroupId,
+                  subtitlesGroupId,
+                  closedCaptionsGroupId));
         }
       }
     }
 
     for (int i = 0; i < mediaTags.size(); i++) {
       line = mediaTags.get(i);
+      String groupId = parseStringAttr(line, REGEX_GROUP_ID, variableDefinitions);
+      String name = parseStringAttr(line, REGEX_NAME, variableDefinitions);
+      String uri = parseOptionalStringAttr(line, REGEX_URI, variableDefinitions);
+      String language = parseOptionalStringAttr(line, REGEX_LANGUAGE, variableDefinitions);
       @C.SelectionFlags int selectionFlags = parseSelectionFlags(line);
       @C.RoleFlags int roleFlags = parseRoleFlags(line, variableDefinitions);
-      String uri = parseOptionalStringAttr(line, REGEX_URI, variableDefinitions);
-      String name = parseStringAttr(line, REGEX_NAME, variableDefinitions);
-      String language = parseOptionalStringAttr(line, REGEX_LANGUAGE, variableDefinitions);
-      String groupId = parseOptionalStringAttr(line, REGEX_GROUP_ID, variableDefinitions);
-      String id = groupId + ":" + name;
+      String formatId = groupId + ":" + name;
       Format format;
       switch (parseStringAttr(line, REGEX_TYPE, variableDefinitions)) {
         case TYPE_AUDIO:
@@ -365,7 +382,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
           String sampleMimeType = codecs != null ? MimeTypes.getMediaMimeType(codecs) : null;
           format =
               Format.createAudioContainerFormat(
-                  /* id= */ id,
+                  /* id= */ formatId,
                   /* label= */ name,
                   /* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
                   sampleMimeType,
@@ -380,13 +397,13 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
           if (uri == null) {
             muxedAudioFormat = format;
           } else {
-            audios.add(new HlsMasterPlaylist.HlsUrl(uri, format, name));
+            audios.add(new Rendition(uri, format, groupId, name));
           }
           break;
         case TYPE_SUBTITLES:
           format =
               Format.createTextContainerFormat(
-                  /* id= */ id,
+                  /* id= */ formatId,
                   /* label= */ name,
                   /* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
                   /* sampleMimeType= */ MimeTypes.TEXT_VTT,
@@ -395,7 +412,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
                   selectionFlags,
                   roleFlags,
                   language);
-          subtitles.add(new HlsMasterPlaylist.HlsUrl(uri, format, name));
+          subtitles.add(new Rendition(uri, format, groupId, name));
           break;
         case TYPE_CLOSED_CAPTIONS:
           String instreamId = parseStringAttr(line, REGEX_INSTREAM_ID, variableDefinitions);
@@ -413,7 +430,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
           }
           muxedCaptionFormats.add(
               Format.createTextContainerFormat(
-                  /* id= */ id,
+                  /* id= */ formatId,
                   /* label= */ name,
                   /* containerMimeType= */ null,
                   /* sampleMimeType= */ mimeType,
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
index 35d0c53bbf..c3e311be89 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
@@ -25,7 +25,8 @@ import com.google.android.exoplayer2.source.CompositeSequenceableLoaderFactory;
 import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 import com.google.android.exoplayer2.source.MediaSourceEventListener.EventDispatcher;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist;
-import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.HlsUrl;
+import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.Rendition;
+import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.Variant;
 import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylist;
 import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylistTracker;
 import com.google.android.exoplayer2.testutil.MediaPeriodAsserts;
@@ -53,19 +54,19 @@ public final class HlsMediaPeriodTest {
     HlsMasterPlaylist testMasterPlaylist =
         createMasterPlaylist(
             /* variants= */ Arrays.asList(
-                createAudioOnlyVariantHlsUrl(/* bitrate= */ 10000),
-                createMuxedVideoAudioVariantHlsUrl(/* bitrate= */ 200000),
-                createAudioOnlyVariantHlsUrl(/* bitrate= */ 300000),
-                createMuxedVideoAudioVariantHlsUrl(/* bitrate= */ 400000),
-                createMuxedVideoAudioVariantHlsUrl(/* bitrate= */ 600000)),
+                createAudioOnlyVariant(/* bitrate= */ 10000),
+                createMuxedVideoAudioVariant(/* bitrate= */ 200000),
+                createAudioOnlyVariant(/* bitrate= */ 300000),
+                createMuxedVideoAudioVariant(/* bitrate= */ 400000),
+                createMuxedVideoAudioVariant(/* bitrate= */ 600000)),
             /* audios= */ Arrays.asList(
-                createAudioHlsUrl(/* language= */ "spa"),
-                createAudioHlsUrl(/* language= */ "ger"),
-                createAudioHlsUrl(/* language= */ "tur")),
+                createAudioRendition(/* language= */ "spa"),
+                createAudioRendition(/* language= */ "ger"),
+                createAudioRendition(/* language= */ "tur")),
             /* subtitles= */ Arrays.asList(
-                createSubtitleHlsUrl(/* language= */ "spa"),
-                createSubtitleHlsUrl(/* language= */ "ger"),
-                createSubtitleHlsUrl(/* language= */ "tur")),
+                createSubtitleRendition(/* language= */ "spa"),
+                createSubtitleRendition(/* language= */ "ger"),
+                createSubtitleRendition(/* language= */ "tur")),
             /* muxedAudioFormat= */ createAudioFormat("eng"),
             /* muxedCaptionFormats= */ Arrays.asList(
                 createSubtitleFormat("eng"), createSubtitleFormat("gsw")));
@@ -97,9 +98,9 @@ public final class HlsMediaPeriodTest {
   }
 
   private static HlsMasterPlaylist createMasterPlaylist(
-      List<HlsUrl> variants,
-      List<HlsUrl> audios,
-      List<HlsUrl> subtitles,
+      List<Variant> variants,
+      List<Rendition> audios,
+      List<Rendition> subtitles,
       Format muxedAudioFormat,
       List<Format> muxedCaptionFormats) {
     return new HlsMasterPlaylist(
@@ -115,8 +116,8 @@ public final class HlsMediaPeriodTest {
         /* sessionKeyDrmInitData= */ Collections.emptyList());
   }
 
-  private static HlsUrl createMuxedVideoAudioVariantHlsUrl(int bitrate) {
-    return new HlsUrl(
+  private static Variant createMuxedVideoAudioVariant(int bitrate) {
+    return createVariant(
         "http://url",
         Format.createVideoContainerFormat(
             /* id= */ null,
@@ -130,12 +131,11 @@ public final class HlsMediaPeriodTest {
             /* frameRate= */ Format.NO_VALUE,
             /* initializationData= */ null,
             /* selectionFlags= */ 0,
-            /* roleFlags= */ 0),
-        /* name= */ "");
+            /* roleFlags= */ 0));
   }
 
-  private static HlsUrl createAudioOnlyVariantHlsUrl(int bitrate) {
-    return new HlsUrl(
+  private static Variant createAudioOnlyVariant(int bitrate) {
+    return createVariant(
         "http://url",
         Format.createVideoContainerFormat(
             /* id= */ null,
@@ -149,16 +149,23 @@ public final class HlsMediaPeriodTest {
             /* frameRate= */ Format.NO_VALUE,
             /* initializationData= */ null,
             /* selectionFlags= */ 0,
-            /* roleFlags= */ 0),
-        /* name= */ "");
+            /* roleFlags= */ 0));
   }
 
-  private static HlsUrl createAudioHlsUrl(String language) {
-    return new HlsUrl("http://url", createAudioFormat(language), /* name= */ "");
+  private static Rendition createAudioRendition(String language) {
+    return createRendition("http://url", createAudioFormat(language), "", "");
   }
 
-  private static HlsUrl createSubtitleHlsUrl(String language) {
-    return new HlsUrl("http://url", createSubtitleFormat(language), /* name= */ "");
+  private static Rendition createSubtitleRendition(String language) {
+    return createRendition("http://url", createSubtitleFormat(language), "", "");
+  }
+
+  private static Variant createVariant(String url, Format format) {
+    return new Variant(url, format, null, null, null, null);
+  }
+
+  private static Rendition createRendition(String url, Format format, String groupId, String name) {
+    return new Rendition(url, format, groupId, name);
   }
 
   private static Format createAudioFormat(String language) {
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
index dadf396190..92f578951b 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
@@ -95,7 +95,7 @@ public class HlsMasterPlaylistParserTest {
 
   private static final String PLAYLIST_WITHOUT_CC =
       " #EXTM3U \n"
-          + "#EXT-X-MEDIA:TYPE=CLOSED-CAPTIONS,"
+          + "#EXT-X-MEDIA:TYPE=CLOSED-CAPTIONS,GROUP-ID=\"cc1\","
           + "LANGUAGE=\"es\",NAME=\"Eng\",INSTREAM-ID=\"SERVICE4\"\n"
           + "#EXT-X-STREAM-INF:BANDWIDTH=1280000,"
           + "CODECS=\"mp4a.40.2,avc1.66.30\",RESOLUTION=304x128,"
@@ -150,7 +150,7 @@ public class HlsMasterPlaylistParserTest {
   public void testParseMasterPlaylist() throws IOException {
     HlsMasterPlaylist masterPlaylist = parseMasterPlaylist(PLAYLIST_URI, PLAYLIST_SIMPLE);
 
-    List<HlsMasterPlaylist.HlsUrl> variants = masterPlaylist.variants;
+    List<HlsMasterPlaylist.Variant> variants = masterPlaylist.variants;
     assertThat(variants).hasSize(5);
     assertThat(masterPlaylist.muxedCaptionFormats).isNull();
 
@@ -191,7 +191,7 @@ public class HlsMasterPlaylistParserTest {
     HlsMasterPlaylist masterPlaylist =
         parseMasterPlaylist(PLAYLIST_URI, PLAYLIST_WITH_AVG_BANDWIDTH);
 
-    List<HlsMasterPlaylist.HlsUrl> variants = masterPlaylist.variants;
+    List<HlsMasterPlaylist.Variant> variants = masterPlaylist.variants;
 
     assertThat(variants.get(0).format.bitrate).isEqualTo(1280000);
     assertThat(variants.get(1).format.bitrate).isEqualTo(1270000);
@@ -221,7 +221,7 @@ public class HlsMasterPlaylistParserTest {
   public void testPlaylistWithChannelsAttribute() throws IOException {
     HlsMasterPlaylist playlist =
         parseMasterPlaylist(PLAYLIST_URI, PLAYLIST_WITH_CHANNELS_ATTRIBUTE);
-    List<HlsMasterPlaylist.HlsUrl> audios = playlist.audios;
+    List<HlsMasterPlaylist.Rendition> audios = playlist.audios;
     assertThat(audios).hasSize(3);
     assertThat(audios.get(0).format.channelCount).isEqualTo(6);
     assertThat(audios.get(1).format.channelCount).isEqualTo(2);

From 9d99f92146edb950835e2995138246bf245d8ca5 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 26 Mar 2019 22:27:40 +0000
Subject: [PATCH 676/832] Improve DownloadService action documentation

PiperOrigin-RevId: 240440477
---
 .../exoplayer2/offline/DownloadService.java   | 153 ++++++++++++------
 1 file changed, 102 insertions(+), 51 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index 4b2799af34..7aad1c6664 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -36,51 +36,95 @@ import java.util.HashMap;
 /** A {@link Service} for downloading media. */
 public abstract class DownloadService extends Service {
 
-  /** Starts a download service without adding a new {@link DownloadAction}. */
+  /**
+   * Starts a download service without adding a new {@link DownloadAction}. Extras:
+   *
+   * <ul>
+   *   <li>{@link #KEY_FOREGROUND} - See {@link #KEY_FOREGROUND}.
+   * </ul>
+   */
   public static final String ACTION_INIT =
       "com.google.android.exoplayer.downloadService.action.INIT";
 
-  /** Starts a download service, adding a new {@link DownloadAction} to be executed. */
-  public static final String ACTION_ADD = "com.google.android.exoplayer.downloadService.action.ADD";
-
-  /** Stops one or all downloads. */
-  public static final String ACTION_STOP =
-      "com.google.android.exoplayer.downloadService.action.STOP";
-
-  /** Starts one or all downloads. */
-  public static final String ACTION_START =
-      "com.google.android.exoplayer.downloadService.action.START";
-
-  /** Removes one download. */
-  public static final String ACTION_REMOVE =
-      "com.google.android.exoplayer.downloadService.action.REMOVE";
-
   /** Like {@link #ACTION_INIT}, but with {@link #KEY_FOREGROUND} implicitly set to true. */
   private static final String ACTION_RESTART =
       "com.google.android.exoplayer.downloadService.action.RESTART";
 
-  /** Key for the {@link DownloadAction} in an {@link #ACTION_ADD} intent. */
+  /**
+   * Adds a new download. Extras:
+   *
+   * <ul>
+   *   <li>{@link #KEY_DOWNLOAD_ACTION} - The {@code byte[]} representation of the {@link
+   *       DownloadAction} that defines the download to be added. The required representation can be
+   *       obtained by calling {@link DownloadAction#toByteArray()}.
+   *   <li>{@link #KEY_FOREGROUND} - See {@link #KEY_FOREGROUND}.
+   * </ul>
+   */
+  public static final String ACTION_ADD = "com.google.android.exoplayer.downloadService.action.ADD";
+
+  /**
+   * Starts one or all of the current downloads. Extras:
+   *
+   * <ul>
+   *   <li>{@link #KEY_CONTENT_ID} - The content id of a single download to start. If omitted, all
+   *       of the current downloads will be started.
+   *   <li>{@link #KEY_FOREGROUND} - See {@link #KEY_FOREGROUND}.
+   * </ul>
+   */
+  public static final String ACTION_START =
+      "com.google.android.exoplayer.downloadService.action.START";
+
+  /**
+   * Stops one or all of the current downloads. Extras:
+   *
+   * <ul>
+   *   <li>{@link #KEY_CONTENT_ID} - The content id of a single download to stop. If omitted, all of
+   *       the current downloads will be stopped.
+   *   <li>{@link #KEY_STOP_REASON} - An application provided reason for stopping the download or
+   *       downloads. Must not be {@link DownloadState#MANUAL_STOP_REASON_NONE}. If omitted, the
+   *       stop reason will be {@link DownloadState#MANUAL_STOP_REASON_UNDEFINED}.
+   *   <li>{@link #KEY_FOREGROUND} - See {@link #KEY_FOREGROUND}.
+   * </ul>
+   */
+  public static final String ACTION_STOP =
+      "com.google.android.exoplayer.downloadService.action.STOP";
+
+  /**
+   * Removes an existing download. Extras:
+   *
+   * <ul>
+   *   <li>{@link #KEY_CONTENT_ID} - The content id of a download to remove.
+   *   <li>{@link #KEY_FOREGROUND} - See {@link #KEY_FOREGROUND}.
+   * </ul>
+   */
+  public static final String ACTION_REMOVE =
+      "com.google.android.exoplayer.downloadService.action.REMOVE";
+
+  /**
+   * Key for the {@code byte[]} representation of the {@link DownloadAction} in {@link #ACTION_ADD}
+   * intents.
+   */
   public static final String KEY_DOWNLOAD_ACTION = "download_action";
 
   /**
-   * Key for content id in an {@link #ACTION_STOP}, {@link #ACTION_START} or {@link #ACTION_REMOVE}
-   * intent.
+   * Key for the content id in {@link #ACTION_START}, {@link #ACTION_STOP} and {@link
+   * #ACTION_REMOVE} intents.
    */
   public static final String KEY_CONTENT_ID = "content_id";
 
-  /** Key for manual stop reason in an {@link #ACTION_STOP} intent. */
+  /** Key for the stop reason in {@link #ACTION_STOP} intents. */
   public static final String KEY_STOP_REASON = "stop_reason";
 
-  /** Invalid foreground notification id which can be used to run the service in the background. */
-  public static final int FOREGROUND_NOTIFICATION_ID_NONE = 0;
-
   /**
-   * Key for a boolean flag in any intent to indicate whether the service was started in the
-   * foreground. If set, the service is guaranteed to call {@link #startForeground(int,
-   * Notification)}.
+   * Key for a boolean extra that can be set on any intent to indicate whether the service was
+   * started in the foreground. If set, the service is guaranteed to call {@link
+   * #startForeground(int, Notification)}.
    */
   public static final String KEY_FOREGROUND = "foreground";
 
+  /** Invalid foreground notification id that can be used to run the service in the background. */
+  public static final int FOREGROUND_NOTIFICATION_ID_NONE = 0;
+
   /** Default foreground notification update interval in milliseconds. */
   public static final long DEFAULT_FOREGROUND_NOTIFICATION_UPDATE_INTERVAL = 1000;
 
@@ -121,7 +165,7 @@ public abstract class DownloadService extends Service {
   }
 
   /**
-   * Creates a DownloadService which will run in the foreground. {@link
+   * Creates a DownloadService that will run in the foreground. {@link
    * #getForegroundNotification(DownloadState[])} should be overridden in the subclass.
    *
    * @param foregroundNotificationId The notification id for the foreground notification, must not
@@ -139,7 +183,7 @@ public abstract class DownloadService extends Service {
   }
 
   /**
-   * Creates a DownloadService which will run in the foreground. {@link
+   * Creates a DownloadService that will run in the foreground. {@link
    * #getForegroundNotification(DownloadState[])} should be overridden in the subclass.
    *
    * @param foregroundNotificationId The notification id for the foreground notification. Must not
@@ -340,42 +384,47 @@ public abstract class DownloadService extends Service {
       case ACTION_ADD:
         byte[] actionData = intent.getByteArrayExtra(KEY_DOWNLOAD_ACTION);
         if (actionData == null) {
-          Log.e(TAG, "Ignoring ADD action with no action data");
+          Log.e(TAG, "Ignored ADD action: Missing download_action extra");
         } else {
+          DownloadAction downloadAction = null;
           try {
-            downloadManager.handleAction(DownloadAction.fromByteArray(actionData));
+            downloadAction = DownloadAction.fromByteArray(actionData);
           } catch (IOException e) {
-            Log.e(TAG, "Failed to handle ADD action", e);
+            Log.e(TAG, "Ignored ADD action: Failed to deserialize download_action extra", e);
+          }
+          if (downloadAction != null) {
+            downloadManager.handleAction(downloadAction);
           }
         }
         break;
-      case ACTION_STOP:
-        String stopDownloadId = intent.getStringExtra(KEY_CONTENT_ID);
-        int stopReason = intent.getIntExtra(KEY_STOP_REASON, 0);
-        if (stopDownloadId == null) {
-          downloadManager.stopDownloads(stopReason);
-        } else {
-          downloadManager.stopDownload(stopDownloadId, stopReason);
-        }
-        break;
       case ACTION_START:
-        String startDownloadId = intent.getStringExtra(KEY_CONTENT_ID);
-        if (startDownloadId == null) {
+        String contentId = intent.getStringExtra(KEY_CONTENT_ID);
+        if (contentId == null) {
           downloadManager.startDownloads();
         } else {
-          downloadManager.startDownload(startDownloadId);
+          downloadManager.startDownload(contentId);
+        }
+        break;
+      case ACTION_STOP:
+        contentId = intent.getStringExtra(KEY_CONTENT_ID);
+        int stopReason =
+            intent.getIntExtra(KEY_STOP_REASON, DownloadState.MANUAL_STOP_REASON_UNDEFINED);
+        if (contentId == null) {
+          downloadManager.stopDownloads(stopReason);
+        } else {
+          downloadManager.stopDownload(contentId, stopReason);
         }
         break;
       case ACTION_REMOVE:
-        String id3 = intent.getStringExtra(KEY_CONTENT_ID);
-        if (id3 == null) {
-          Log.e(TAG, "Ignoring REMOVE action with no id");
+        contentId = intent.getStringExtra(KEY_CONTENT_ID);
+        if (contentId == null) {
+          Log.e(TAG, "Ignored REMOVE action: Missing content_id extra");
         } else {
-          downloadManager.removeDownload(id3);
+          downloadManager.removeDownload(contentId);
         }
         break;
       default:
-        Log.e(TAG, "Ignoring unrecognized action: " + intentAction);
+        Log.e(TAG, "Ignored unrecognized action: " + intentAction);
         break;
     }
 
@@ -402,7 +451,9 @@ public abstract class DownloadService extends Service {
     }
   }
 
-  /** DownloadService isn't designed to be bound. */
+  /**
+   * Throws {@link UnsupportedOperationException} because this service is not designed to be bound.
+   */
   @Nullable
   @Override
   public final IBinder onBind(Intent intent) {
@@ -445,9 +496,9 @@ public abstract class DownloadService extends Service {
   }
 
   /**
-   * Called when the state of a download changes.
+   * Called when the state of a download changes. The default implementation is a no-op.
    *
-   * @param downloadState The state of the download.
+   * @param downloadState The new state of the download.
    */
   protected void onDownloadStateChanged(DownloadState downloadState) {
     // Do nothing.

From d4f5c9c721d5bba4a35c8c979633d2b7ddeb6148 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Tue, 26 Mar 2019 22:45:03 +0000
Subject: [PATCH 677/832] Remove DownloadHelper.getRemoveAction

PiperOrigin-RevId: 240444051
---
 .../android/exoplayer2/demo/DownloadTracker.java      | 11 ++++++-----
 .../android/exoplayer2/offline/DownloadHelper.java    |  9 ---------
 .../exoplayer2/offline/DownloadHelperTest.java        | 11 -----------
 3 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index 46e700c812..73e881208d 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -106,10 +106,10 @@ public class DownloadTracker implements DownloadManager.Listener {
       Uri uri,
       String extension,
       RenderersFactory renderersFactory) {
-    if (isDownloaded(uri)) {
-      DownloadAction removeAction =
-          getDownloadHelper(uri, extension, renderersFactory).getRemoveAction();
-      startServiceWithAction(removeAction);
+    DownloadState downloadState = downloadStates.get(uri);
+    if (downloadState != null) {
+      DownloadService.startWithRemoveDownload(
+          context, DemoDownloadService.class, downloadState.id, /* foreground= */ false);
     } else {
       if (startDownloadDialogHelper != null) {
         startDownloadDialogHelper.release();
@@ -153,7 +153,8 @@ public class DownloadTracker implements DownloadManager.Listener {
   }
 
   private void startServiceWithAction(DownloadAction action) {
-    DownloadService.startWithAction(context, DemoDownloadService.class, action, false);
+    DownloadService.startWithAction(
+        context, DemoDownloadService.class, action, /* foreground= */ false);
   }
 
   private DownloadHelper getDownloadHelper(
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index ae22200329..dccc15f020 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -606,15 +606,6 @@ public final class DownloadHelper {
     return DownloadAction.createDownloadAction(downloadType, uri, streamKeys, cacheKey, data);
   }
 
-  /**
-   * Builds a {@link DownloadAction} for removing the media. May be called in any state.
-   *
-   * @return The built {@link DownloadAction}.
-   */
-  public DownloadAction getRemoveAction() {
-    return DownloadAction.createRemoveAction(downloadType, uri, cacheKey);
-  }
-
   // Initialization of array of Lists.
   @SuppressWarnings("unchecked")
   private void onMediaPrepared() {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
index a78b229043..8fd3bebef6 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
@@ -26,7 +26,6 @@ import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.offline.DownloadHelper.Callback;
 import com.google.android.exoplayer2.source.MediaPeriod;
-import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 import com.google.android.exoplayer2.source.MediaSourceEventListener.EventDispatcher;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
@@ -411,16 +410,6 @@ public class DownloadHelperTest {
             new StreamKey(/* periodIndex= */ 1, /* groupIndex= */ 1, /* trackIndex= */ 0));
   }
 
-  @Test
-  public void getRemoveAction_returnsRemoveAction() {
-    DownloadAction removeAction = downloadHelper.getRemoveAction();
-
-    assertThat(removeAction.type).isEqualTo(TEST_DOWNLOAD_TYPE);
-    assertThat(removeAction.uri).isEqualTo(testUri);
-    assertThat(removeAction.customCacheKey).isEqualTo(TEST_CACHE_KEY);
-    assertThat(removeAction.isRemoveAction).isTrue();
-  }
-
   private static void prepareDownloadHelper(DownloadHelper downloadHelper) throws Exception {
     AtomicReference<Exception> prepareException = new AtomicReference<>(null);
     ConditionVariable preparedCondition = new ConditionVariable();

From facd32e65ebbb0dd65d5f45ea4247360c8ad53c8 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 27 Mar 2019 14:53:14 +0000
Subject: [PATCH 678/832] Remove DownloadAction.createRemoveAction

PiperOrigin-RevId: 240557315
---
 .../exoplayer2/offline/ActionFile.java        |  13 +-
 .../exoplayer2/offline/DownloadAction.java    |  80 ++++-------
 .../exoplayer2/offline/DownloadManager.java   |  25 ++--
 .../exoplayer2/offline/DownloadService.java   |  11 +-
 .../exoplayer2/offline/DownloadState.java     |  27 ++--
 .../offline/DownloadActionTest.java           | 120 +++++++---------
 .../offline/DownloadHelperTest.java           |   1 -
 .../offline/DownloadIndexUtilTest.java        |   5 -
 .../offline/DownloadManagerTest.java          | 130 +++++-------------
 .../exoplayer2/offline/DownloadStateTest.java |  49 -------
 .../dash/offline/DashDownloadTestData.java    |   3 +-
 .../dash/offline/DownloadManagerDashTest.java |  28 ++--
 .../dash/offline/DownloadServiceDashTest.java |  40 +++---
 .../testutil/TestDownloadManagerListener.java |  37 +++++
 14 files changed, 215 insertions(+), 354 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
index a62fb02ff5..a81d7ffdc2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.offline;
 
+import com.google.android.exoplayer2.offline.DownloadAction.UnsupportedActionException;
 import com.google.android.exoplayer2.util.AtomicFile;
 import com.google.android.exoplayer2.util.Util;
 import java.io.DataInputStream;
@@ -22,12 +23,14 @@ import java.io.DataOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
 
 /**
  * Stores and loads {@link DownloadAction}s to/from a file.
  */
 public final class ActionFile {
 
+  private static final String TAG = "ActionFile";
   /* package */ static final int VERSION = 0;
 
   private final AtomicFile atomicFile;
@@ -58,11 +61,15 @@ public final class ActionFile {
         throw new IOException("Unsupported action file version: " + version);
       }
       int actionCount = dataInputStream.readInt();
-      DownloadAction[] actions = new DownloadAction[actionCount];
+      ArrayList<DownloadAction> actions = new ArrayList<>();
       for (int i = 0; i < actionCount; i++) {
-        actions[i] = DownloadAction.deserializeFromStream(dataInputStream);
+        try {
+          actions.add(DownloadAction.deserializeFromStream(dataInputStream));
+        } catch (UnsupportedActionException e) {
+          // remove DownloadAction is not supported. Ignore the exception and continue loading rest.
+        }
       }
-      return actions;
+      return actions.toArray(new DownloadAction[0]);
     } finally {
       Util.closeQuietly(inputStream);
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
index 97a2e3962b..daba0b0d54 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.offline;
 
 import android.net.Uri;
 import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -31,9 +30,12 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-/** Contains the necessary parameters for a download or remove action. */
+/** Contains the necessary parameters for a download action. */
 public final class DownloadAction {
 
+  /** Thrown when the encoded action data belongs to an unsupported DownloadAction type. */
+  public static class UnsupportedActionException extends IOException {}
+
   /** Type for progressive downloads. */
   public static final String TYPE_PROGRESSIVE = "progressive";
   /** Type for DASH downloads. */
@@ -51,6 +53,8 @@ public final class DownloadAction {
    * @param data The action data to deserialize.
    * @return The deserialized action.
    * @throws IOException If the data could not be deserialized.
+   * @throws UnsupportedActionException If the data belongs to an unsupported {@link DownloadAction}
+   *     type. Input read position is set to the end of the data.
    */
   public static DownloadAction fromByteArray(byte[] data) throws IOException {
     ByteArrayInputStream input = new ByteArrayInputStream(data);
@@ -67,6 +71,8 @@ public final class DownloadAction {
    * @return The deserialized action.
    * @throws IOException If there is an IO error reading from {@code input}, or if the data could
    *     not be deserialized.
+   * @throws UnsupportedActionException If the data belongs to an unsupported {@link DownloadAction}
+   *     type. Input read position is set to the end of the data.
    */
   public static DownloadAction deserializeFromStream(InputStream input) throws IOException {
     return readFromStream(new DataInputStream(input));
@@ -108,41 +114,16 @@ public final class DownloadAction {
       List<StreamKey> keys,
       @Nullable String customCacheKey,
       @Nullable byte[] data) {
-    return new DownloadAction(
-        id, type, uri, /* isRemoveAction= */ false, keys, customCacheKey, data);
-  }
-
-  /**
-   * Creates a DASH remove action.
-   *
-   * @param type The type of the action.
-   * @param uri The URI of the media to be removed.
-   * @param customCacheKey A custom key for cache indexing, or null.
-   */
-  public static DownloadAction createRemoveAction(
-      String type, Uri uri, @Nullable String customCacheKey) {
-    return new DownloadAction(
-        generateId(uri, customCacheKey),
-        type,
-        uri,
-        /* isRemoveAction= */ true,
-        Collections.emptyList(),
-        customCacheKey,
-        /* data= */ null);
+    return new DownloadAction(id, type, uri, keys, customCacheKey, data);
   }
 
   /** The unique content id. */
   public final String id;
   /** The type of the action. */
   public final String type;
-  /** The uri being downloaded or removed. */
+  /** The uri being downloaded. */
   public final Uri uri;
-  /** Whether this is a remove action. If false, this is a download action. */
-  public final boolean isRemoveAction;
-  /**
-   * Keys of streams to be downloaded. If empty, all streams will be downloaded. Empty if this
-   * action is a remove action.
-   */
+  /** Keys of streams to be downloaded. If empty, all streams will be downloaded. */
   public final List<StreamKey> keys;
   /** A custom key for cache indexing, or null. */
   @Nullable public final String customCacheKey;
@@ -152,37 +133,26 @@ public final class DownloadAction {
   /**
    * @param id The content id.
    * @param type The type of the action.
-   * @param uri The uri being downloaded or removed.
-   * @param isRemoveAction Whether this is a remove action. If false, this is a download action.
-   * @param keys Keys of streams to be downloaded. If empty, all streams will be downloaded. Empty
-   *     if this action is a remove action.
+   * @param uri The uri being downloaded.
+   * @param keys Keys of streams to be downloaded. If empty, all streams will be downloaded.
    * @param customCacheKey A custom key for cache indexing, or null.
-   * @param data Custom data for this action. Null if this action is a remove action.
+   * @param data Custom data for this action.
    */
   private DownloadAction(
       String id,
       String type,
       Uri uri,
-      boolean isRemoveAction,
       List<StreamKey> keys,
       @Nullable String customCacheKey,
       @Nullable byte[] data) {
     this.id = id;
     this.type = type;
     this.uri = uri;
-    this.isRemoveAction = isRemoveAction;
     this.customCacheKey = customCacheKey;
-    if (isRemoveAction) {
-      Assertions.checkArgument(keys.isEmpty());
-      Assertions.checkArgument(data == null);
-      this.keys = Collections.emptyList();
-      this.data = Util.EMPTY_BYTE_ARRAY;
-    } else {
-      ArrayList<StreamKey> mutableKeys = new ArrayList<>(keys);
-      Collections.sort(mutableKeys);
-      this.keys = Collections.unmodifiableList(mutableKeys);
-      this.data = data != null ? Arrays.copyOf(data, data.length) : Util.EMPTY_BYTE_ARRAY;
-    }
+    ArrayList<StreamKey> mutableKeys = new ArrayList<>(keys);
+    Collections.sort(mutableKeys);
+    this.keys = Collections.unmodifiableList(mutableKeys);
+    this.data = data != null ? Arrays.copyOf(data, data.length) : Util.EMPTY_BYTE_ARRAY;
   }
 
   /** Serializes itself into a byte array. */
@@ -211,7 +181,6 @@ public final class DownloadAction {
     return id.equals(that.id)
         && type.equals(that.type)
         && uri.equals(that.uri)
-        && isRemoveAction == that.isRemoveAction
         && keys.equals(that.keys)
         && Util.areEqual(customCacheKey, that.customCacheKey)
         && Arrays.equals(data, that.data);
@@ -222,7 +191,6 @@ public final class DownloadAction {
     int result = type.hashCode();
     result = 31 * result + id.hashCode();
     result = 31 * result + uri.hashCode();
-    result = 31 * result + (isRemoveAction ? 1 : 0);
     result = 31 * result + keys.hashCode();
     result = 31 * result + (customCacheKey != null ? customCacheKey.hashCode() : 0);
     result = 31 * result + Arrays.hashCode(data);
@@ -242,7 +210,7 @@ public final class DownloadAction {
     dataOutputStream.writeUTF(type);
     dataOutputStream.writeInt(VERSION);
     dataOutputStream.writeUTF(uri.toString());
-    dataOutputStream.writeBoolean(isRemoveAction);
+    dataOutputStream.writeBoolean(false);
     dataOutputStream.writeInt(data.length);
     dataOutputStream.write(data);
     dataOutputStream.writeInt(keys.size());
@@ -271,10 +239,6 @@ public final class DownloadAction {
     if (dataLength != 0) {
       data = new byte[dataLength];
       input.readFully(data);
-      if (isRemoveAction) {
-        // Remove actions are no longer permitted to have data.
-        data = null;
-      }
     } else {
       data = null;
     }
@@ -297,8 +261,12 @@ public final class DownloadAction {
       customCacheKey = input.readBoolean() ? input.readUTF() : null;
     }
 
+    if (isRemoveAction) {
+      // Remove actions are not supported anymore.
+      throw new UnsupportedActionException();
+    }
     return new DownloadAction(
-        generateId(uri, customCacheKey), type, uri, isRemoveAction, keys, customCacheKey, data);
+        generateId(uri, customCacheKey), type, uri, keys, customCacheKey, data);
   }
 
   private static String generateId(Uri uri, @Nullable String customCacheKey) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index e6fb10aa21..904a842ad6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -342,11 +342,11 @@ public final class DownloadManager {
   }
 
   /**
-   * Handles the given action.
+   * Adds a download defined by the given action.
    *
-   * @param action The action to be executed.
+   * @param action The download action.
    */
-  public void handleAction(DownloadAction action) {
+  public void addDownload(DownloadAction action) {
     Assertions.checkState(!released);
     dowloadUpdateQueue.add(
         new DownloadUpdater(action.id) {
@@ -392,6 +392,8 @@ public final class DownloadManager {
           DownloadState onLoad(@Nullable DownloadState downloadState) {
             if (downloadState != null) {
               downloadState = downloadState.setRemoveState();
+            } else {
+              logd("Can't remove download. No download with id: " + id);
             }
             return downloadState;
           }
@@ -541,15 +543,14 @@ public final class DownloadManager {
   }
 
   private void processDownloadUpdateQueue() {
-    if (loadingDownload || dowloadUpdateQueue.isEmpty()) {
-      return;
-    }
-    DownloadUpdater downloadUpdater = dowloadUpdateQueue.remove();
-    Download download = getDownload(downloadUpdater.id);
-    if (download != null) {
-      downloadUpdater.onExisting(download);
-    } else {
-      loadDownload(downloadUpdater);
+    while (!loadingDownload && !dowloadUpdateQueue.isEmpty()) {
+      DownloadUpdater downloadUpdater = dowloadUpdateQueue.remove();
+      Download download = getDownload(downloadUpdater.id);
+      if (download != null) {
+        downloadUpdater.onExisting(download);
+      } else {
+        loadDownload(downloadUpdater);
+      }
     }
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index 7aad1c6664..b561624725 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -270,11 +270,14 @@ public abstract class DownloadService extends Service {
    * @param context A {@link Context}.
    * @param clazz The concrete download service being targeted by the intent.
    * @param id The content id.
+   * @param foreground Whether this intent will be used to start the service in the foreground.
    * @return Created Intent.
    */
   public static Intent buildRemoveDownloadIntent(
-      Context context, Class<? extends DownloadService> clazz, String id) {
-    return getIntent(context, clazz, ACTION_REMOVE).putExtra(KEY_CONTENT_ID, id);
+      Context context, Class<? extends DownloadService> clazz, String id, boolean foreground) {
+    return getIntent(context, clazz, ACTION_REMOVE)
+        .putExtra(KEY_CONTENT_ID, id)
+        .putExtra(KEY_FOREGROUND, foreground);
   }
 
   /**
@@ -308,7 +311,7 @@ public abstract class DownloadService extends Service {
    */
   public static void startWithRemoveDownload(
       Context context, Class<? extends DownloadService> clazz, String id, boolean foreground) {
-    Intent intent = buildRemoveDownloadIntent(context, clazz, id);
+    Intent intent = buildRemoveDownloadIntent(context, clazz, id, foreground);
     if (foreground) {
       Util.startForegroundService(context, intent);
     } else {
@@ -393,7 +396,7 @@ public abstract class DownloadService extends Service {
             Log.e(TAG, "Ignored ADD action: Failed to deserialize download_action extra", e);
           }
           if (downloadAction != null) {
-            downloadManager.handleAction(downloadAction);
+            downloadManager.addDownload(downloadAction);
           }
         }
         break;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
index 5961fb8545..bb8be6b945 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
@@ -166,7 +166,7 @@ public final class DownloadState {
         action.type,
         action.uri,
         action.customCacheKey,
-        /* state= */ action.isRemoveAction ? STATE_REMOVING : STATE_QUEUED,
+        /* state= */ STATE_QUEUED,
         /* downloadPercentage= */ C.PERCENTAGE_UNSET,
         /* downloadedBytes= */ 0,
         /* totalBytes= */ C.LENGTH_UNSET,
@@ -231,8 +231,7 @@ public final class DownloadState {
         type,
         action.uri,
         action.customCacheKey,
-        getNextState(
-            state, manualStopReason != 0 || notMetRequirements != 0, action.isRemoveAction),
+        getNextState(state, manualStopReason != 0 || notMetRequirements != 0),
         /* downloadPercentage= */ C.PERCENTAGE_UNSET,
         downloadedBytes,
         /* totalBytes= */ C.LENGTH_UNSET,
@@ -252,7 +251,7 @@ public final class DownloadState {
         type,
         uri,
         cacheKey,
-        getNextState(state, manualStopReason != 0 || notMetRequirements != 0, true),
+        STATE_REMOVING,
         /* downloadPercentage= */ C.PERCENTAGE_UNSET,
         downloadedBytes,
         /* totalBytes= */ C.LENGTH_UNSET,
@@ -265,25 +264,19 @@ public final class DownloadState {
         customMetadata);
   }
 
-  private static int getNextState(int currentState, boolean isStopped, boolean remove) {
-    int nextState;
-    if (remove) {
-      nextState = STATE_REMOVING;
+  private static int getNextState(int currentState, boolean isStopped) {
+    if (currentState == STATE_REMOVING || currentState == STATE_RESTARTING) {
+      return STATE_RESTARTING;
+    } else if (isStopped) {
+      return STATE_STOPPED;
     } else {
-      if (currentState == STATE_REMOVING || currentState == STATE_RESTARTING) {
-        nextState = STATE_RESTARTING;
-      } else if (isStopped) {
-        nextState = STATE_STOPPED;
-      } else {
-        nextState = STATE_QUEUED;
-      }
+      return STATE_QUEUED;
     }
-    return nextState;
   }
 
   private static StreamKey[] mergeStreamKeys(DownloadState downloadState, DownloadAction action) {
     StreamKey[] streamKeys = downloadState.streamKeys;
-    if (!action.isRemoveAction && streamKeys.length > 0) {
+    if (streamKeys.length > 0) {
       if (action.keys.isEmpty()) {
         streamKeys = new StreamKey[0];
       } else {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
index 571d76125c..eb40d2a1a1 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
@@ -20,10 +20,13 @@ import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_HLS;
 import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_PROGRESSIVE;
 import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_SS;
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
 
 import android.net.Uri;
+import androidx.annotation.Nullable;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.android.exoplayer2.offline.DownloadAction.UnsupportedActionException;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -53,92 +56,73 @@ public class DownloadActionTest {
     data = TestUtil.buildTestData(32);
   }
 
-  @Test
-  public void testDownloadActionIsNotRemoveAction() {
-    DownloadAction action = createDownloadAction(uri1);
-    assertThat(action.isRemoveAction).isFalse();
-  }
-
-  @Test
-  public void testRemoveActionIsRemoveAction() {
-    DownloadAction action2 = createRemoveAction(uri1);
-    assertThat(action2.isRemoveAction).isTrue();
-  }
-
   @Test
   public void testSameUri_hasSameId() {
-    DownloadAction action1 = createDownloadAction(uri1);
-    DownloadAction action2 = createDownloadAction(uri1);
+    DownloadAction action1 = createAction(uri1);
+    DownloadAction action2 = createAction(uri1);
     assertThat(action1.id.equals(action2.id)).isTrue();
   }
 
   @Test
   public void testSameUriDifferentAction_hasSameId() {
-    DownloadAction action1 = createDownloadAction(uri1);
-    DownloadAction action2 = createRemoveAction(uri1);
+    DownloadAction action1 = createAction(uri1);
+    DownloadAction action2 = createAction(uri1);
     assertThat(action1.id.equals(action2.id)).isTrue();
   }
 
   @Test
   public void testDifferentUri_IsNotSameMedia() {
-    DownloadAction action1 = createDownloadAction(uri1);
-    DownloadAction action2 = createDownloadAction(uri2);
+    DownloadAction action1 = createAction(uri1);
+    DownloadAction action2 = createAction(uri2);
     assertThat(action1.id.equals(action2.id)).isFalse();
   }
 
   @Test
   public void testSameCacheKeyDifferentUri_hasSameId() {
-    DownloadAction action1 = DownloadAction.createRemoveAction(TYPE_DASH, uri1, "key123");
-    DownloadAction action2 = DownloadAction.createRemoveAction(TYPE_DASH, uri2, "key123");
+    DownloadAction action1 = createAction(uri1, "key123");
+    DownloadAction action2 = createAction(uri2, "key123");
     assertThat(action1.id.equals(action2.id)).isTrue();
   }
 
   @Test
   public void testDifferentCacheKeyDifferentUri_hasDifferentId() {
-    DownloadAction action1 = DownloadAction.createRemoveAction(TYPE_DASH, uri1, "key123");
-    DownloadAction action2 = DownloadAction.createRemoveAction(TYPE_DASH, uri2, "key456");
+    DownloadAction action1 = createAction(uri1, "key123");
+    DownloadAction action2 = createAction(uri2, "key456");
     assertThat(action1.id.equals(action2.id)).isFalse();
   }
 
   @SuppressWarnings("EqualsWithItself")
   @Test
   public void testEquals() {
-    DownloadAction action1 = createRemoveAction(uri1);
+    DownloadAction action1 = createAction(uri1);
     assertThat(action1.equals(action1)).isTrue();
 
-    DownloadAction action2 = createRemoveAction(uri1);
-    DownloadAction action3 = createRemoveAction(uri1);
+    DownloadAction action2 = createAction(uri1);
+    DownloadAction action3 = createAction(uri1);
     assertEqual(action2, action3);
 
-    DownloadAction action4 = createRemoveAction(uri1);
-    DownloadAction action5 = createDownloadAction(uri1);
-    assertNotEqual(action4, action5);
-
-    DownloadAction action6 = createDownloadAction(uri1);
-    DownloadAction action7 = createDownloadAction(uri1, new StreamKey(0, 0, 0));
+    DownloadAction action6 = createAction(uri1);
+    DownloadAction action7 = createAction(uri1, new StreamKey(0, 0, 0));
     assertNotEqual(action6, action7);
 
-    DownloadAction action8 = createDownloadAction(uri1, new StreamKey(0, 1, 1));
-    DownloadAction action9 = createDownloadAction(uri1, new StreamKey(0, 0, 0));
+    DownloadAction action8 = createAction(uri1, new StreamKey(0, 1, 1));
+    DownloadAction action9 = createAction(uri1, new StreamKey(0, 0, 0));
     assertNotEqual(action8, action9);
 
-    DownloadAction action10 = createRemoveAction(uri1);
-    DownloadAction action11 = createRemoveAction(uri2);
+    DownloadAction action10 = createAction(uri1);
+    DownloadAction action11 = createAction(uri2);
     assertNotEqual(action10, action11);
 
-    DownloadAction action12 =
-        createDownloadAction(uri1, new StreamKey(0, 0, 0), new StreamKey(0, 1, 1));
-    DownloadAction action13 =
-        createDownloadAction(uri1, new StreamKey(0, 1, 1), new StreamKey(0, 0, 0));
+    DownloadAction action12 = createAction(uri1, new StreamKey(0, 0, 0), new StreamKey(0, 1, 1));
+    DownloadAction action13 = createAction(uri1, new StreamKey(0, 1, 1), new StreamKey(0, 0, 0));
     assertEqual(action12, action13);
 
-    DownloadAction action14 = createDownloadAction(uri1, new StreamKey(0, 0, 0));
-    DownloadAction action15 =
-        createDownloadAction(uri1, new StreamKey(0, 1, 1), new StreamKey(0, 0, 0));
+    DownloadAction action14 = createAction(uri1, new StreamKey(0, 0, 0));
+    DownloadAction action15 = createAction(uri1, new StreamKey(0, 1, 1), new StreamKey(0, 0, 0));
     assertNotEqual(action14, action15);
 
-    DownloadAction action16 = createDownloadAction(uri1);
-    DownloadAction action17 = createDownloadAction(uri1);
+    DownloadAction action16 = createAction(uri1);
+    DownloadAction action17 = createAction(uri1);
     assertEqual(action16, action17);
   }
 
@@ -151,8 +135,7 @@ public class DownloadActionTest {
             toList(new StreamKey(0, 1, 2), new StreamKey(3, 4, 5)),
             "key123",
             data));
-    assertStreamSerializationRoundTrip(
-        DownloadAction.createRemoveAction(TYPE_DASH, uri1, "key123"));
+    assertStreamSerializationRoundTrip(createAction(uri1, "key123"));
   }
 
   @Test
@@ -164,7 +147,7 @@ public class DownloadActionTest {
             toList(new StreamKey(0, 1, 2), new StreamKey(3, 4, 5)),
             "key123",
             data));
-    assertArraySerializationRoundTrip(DownloadAction.createRemoveAction(TYPE_DASH, uri1, "key123"));
+    assertArraySerializationRoundTrip(createAction(uri1, "key123"));
   }
 
   @Test
@@ -173,9 +156,7 @@ public class DownloadActionTest {
         "progressive-download-v0",
         DownloadAction.createDownloadAction(
             TYPE_PROGRESSIVE, uri1, Collections.emptyList(), "key123", data));
-    assertDeserialization(
-        "progressive-remove-v0",
-        DownloadAction.createRemoveAction(TYPE_PROGRESSIVE, uri1, "key123"));
+    assertUnsupportedAction("progressive-remove-v0");
   }
 
   @Test
@@ -188,9 +169,7 @@ public class DownloadActionTest {
             toList(new StreamKey(0, 1, 2), new StreamKey(3, 4, 5)),
             /* customCacheKey= */ null,
             data));
-    assertDeserialization(
-        "dash-remove-v0",
-        DownloadAction.createRemoveAction(TYPE_DASH, uri1, /* customCacheKey= */ null));
+    assertUnsupportedAction("dash-remove-v0");
   }
 
   @Test
@@ -203,9 +182,7 @@ public class DownloadActionTest {
             toList(new StreamKey(0, 1), new StreamKey(2, 3)),
             /* customCacheKey= */ null,
             data));
-    assertDeserialization(
-        "hls-remove-v0",
-        DownloadAction.createRemoveAction(TYPE_HLS, uri1, /* customCacheKey= */ null));
+    assertUnsupportedAction("hls-remove-v0");
   }
 
   @Test
@@ -218,9 +195,7 @@ public class DownloadActionTest {
             toList(new StreamKey(0, 1, 2), new StreamKey(3, 4, 5)),
             /* customCacheKey= */ null,
             data));
-    assertDeserialization(
-        "hls-remove-v1",
-        DownloadAction.createRemoveAction(TYPE_HLS, uri1, /* customCacheKey= */ null));
+    assertUnsupportedAction("hls-remove-v1");
   }
 
   @Test
@@ -233,9 +208,7 @@ public class DownloadActionTest {
             toList(new StreamKey(0, 1), new StreamKey(2, 3)),
             /* customCacheKey= */ null,
             data));
-    assertDeserialization(
-        "ss-remove-v0",
-        DownloadAction.createRemoveAction(TYPE_SS, uri1, /* customCacheKey= */ null));
+    assertUnsupportedAction("ss-remove-v0");
   }
 
   @Test
@@ -248,18 +221,17 @@ public class DownloadActionTest {
             toList(new StreamKey(0, 1, 2), new StreamKey(3, 4, 5)),
             /* customCacheKey= */ null,
             data));
-    assertDeserialization(
-        "ss-remove-v1",
-        DownloadAction.createRemoveAction(TYPE_SS, uri1, /* customCacheKey= */ null));
+    assertUnsupportedAction("ss-remove-v1");
   }
 
-  private DownloadAction createDownloadAction(Uri uri, StreamKey... keys) {
+  private DownloadAction createAction(Uri uri, StreamKey... keys) {
     return DownloadAction.createDownloadAction(
         TYPE_DASH, uri, toList(keys), /* customCacheKey= */ null, data);
   }
 
-  private DownloadAction createRemoveAction(Uri uri) {
-    return DownloadAction.createRemoveAction(TYPE_DASH, uri, /* customCacheKey= */ null);
+  private DownloadAction createAction(Uri uri, @Nullable String customCacheKey) {
+    return DownloadAction.createDownloadAction(
+        DownloadAction.TYPE_DASH, uri, Collections.emptyList(), customCacheKey, /* data= */ null);
   }
 
   private static void assertNotEqual(DownloadAction action1, DownloadAction action2) {
@@ -298,6 +270,18 @@ public class DownloadActionTest {
     assertEqual(deserializedAction, expectedAction);
   }
 
+  private static void assertUnsupportedAction(String fileName) throws IOException {
+    InputStream input =
+        TestUtil.getInputStream(
+            ApplicationProvider.getApplicationContext(), "download-actions/" + fileName);
+    try {
+      DownloadAction.deserializeFromStream(input);
+      fail();
+    } catch (UnsupportedActionException e) {
+      // Expected exception.
+    }
+  }
+
   private static List<StreamKey> toList(StreamKey... keys) {
     ArrayList<StreamKey> keysList = new ArrayList<>();
     Collections.addAll(keysList, keys);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
index 8fd3bebef6..ae4816a80d 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
@@ -397,7 +397,6 @@ public class DownloadHelperTest {
     assertThat(downloadAction.type).isEqualTo(TEST_DOWNLOAD_TYPE);
     assertThat(downloadAction.uri).isEqualTo(testUri);
     assertThat(downloadAction.customCacheKey).isEqualTo(TEST_CACHE_KEY);
-    assertThat(downloadAction.isRemoveAction).isFalse();
     assertThat(downloadAction.data).isEqualTo(data);
     assertThat(downloadAction.keys)
         .containsExactly(
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
index f22024d87c..2237f5feb2 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
@@ -127,16 +127,11 @@ public class DownloadIndexUtilTest {
             /* customCacheKey= */ "key234",
             new byte[] {5, 4, 3, 2, 1});
     actionFile.store(action1, action2);
-    DownloadAction action3 =
-        DownloadAction.createRemoveAction(
-            TYPE_DASH, Uri.parse("https://www.test.com/download3"), /* customCacheKey= */ "key345");
-    actionFile.store(action1, action2, action3);
 
     DownloadIndexUtil.upgradeActionFile(actionFile, downloadIndex, /* downloadIdProvider= */ null);
 
     assertDownloadIndexContainsAction(action1, DownloadState.STATE_QUEUED);
     assertDownloadIndexContainsAction(action2, DownloadState.STATE_QUEUED);
-    assertDownloadIndexContainsAction(action3, DownloadState.STATE_REMOVING);
   }
 
   private void assertDownloadIndexContainsAction(DownloadAction action, int state)
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index c6e4867454..4bdd1390c6 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -16,7 +16,6 @@
 package com.google.android.exoplayer2.offline;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.fail;
 
 import android.net.Uri;
 import androidx.test.core.app.ApplicationProvider;
@@ -33,7 +32,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Locale;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import org.junit.After;
@@ -101,21 +99,6 @@ public class DownloadManagerTest {
     assertThat(exceptionThrown).isTrue();
   }
 
-  @Test
-  public void downloadRunner_handleActionReturnsDifferentTaskId_throwsException() {
-    DownloadRunner runner = new DownloadRunner(uri1).postDownloadAction();
-    TaskWrapper task = runner.getTask();
-    runner.setTask(new TaskWrapper(task.taskId + 10000));
-    boolean exceptionThrown = false;
-    try {
-      runner.postDownloadAction();
-      // can't put fail() here as it would be caught in the catch below.
-    } catch (Throwable e) {
-      exceptionThrown = true;
-    }
-    assertThat(exceptionThrown).isTrue();
-  }
-
   @Test
   public void multipleActionsForTheSameContent_executedOnTheSameTask() {
     // Two download actions on first task
@@ -150,11 +133,11 @@ public class DownloadManagerTest {
   @Test
   public void postRemoveAction_removes() throws Throwable {
     DownloadRunner runner = new DownloadRunner(uri1);
-    TaskWrapper task = runner.postRemoveAction().getTask();
+    TaskWrapper task = runner.postDownloadAction().postRemoveAction().getTask();
     task.assertRemoving();
-    runner.getDownloader(0).unblock().assertReleased().assertStartCount(1);
+    runner.getDownloader(1).unblock().assertReleased().assertStartCount(1);
     task.assertRemoved();
-    runner.assertCreatedDownloaderCount(1);
+    runner.assertCreatedDownloaderCount(2);
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
@@ -224,29 +207,29 @@ public class DownloadManagerTest {
   @Test
   public void downloadNotCancelRemove() throws Throwable {
     DownloadRunner runner = new DownloadRunner(uri1);
-    FakeDownloader downloader1 = runner.getDownloader(0);
+    FakeDownloader downloader1 = runner.getDownloader(1);
 
-    runner.postRemoveAction();
+    runner.postDownloadAction().postRemoveAction();
     downloader1.assertStarted();
     runner.postDownloadAction();
 
     downloader1.unblock().assertNotCanceled();
-    runner.getDownloader(1).unblock().assertNotCanceled();
+    runner.getDownloader(2).unblock().assertNotCanceled();
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
   @Test
   public void secondSameRemoveActionIgnored() throws Throwable {
     DownloadRunner runner = new DownloadRunner(uri1);
-    FakeDownloader downloader1 = runner.getDownloader(0);
+    FakeDownloader downloader1 = runner.getDownloader(1);
 
-    runner.postRemoveAction();
+    runner.postDownloadAction().postRemoveAction();
     downloader1.assertStarted();
     runner.postRemoveAction();
 
     downloader1.unblock().assertNotCanceled();
     runner.getTask().assertRemoved();
-    runner.assertCreatedDownloaderCount(1);
+    runner.assertCreatedDownloaderCount(2);
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
@@ -316,7 +299,7 @@ public class DownloadManagerTest {
       throws Throwable {
     setUpDownloadManager(1);
     DownloadRunner runner1 = new DownloadRunner(uri1).postDownloadAction();
-    DownloadRunner runner2 = new DownloadRunner(uri2).postRemoveAction();
+    DownloadRunner runner2 = new DownloadRunner(uri2).postDownloadAction().postRemoveAction();
     FakeDownloader downloader1 = runner1.getDownloader(0);
     FakeDownloader downloader2 = runner2.getDownloader(0);
 
@@ -334,7 +317,8 @@ public class DownloadManagerTest {
   public void downloadActionFollowingRemove_ifMaxDownloadIs1_isNotStarted() throws Throwable {
     setUpDownloadManager(1);
     DownloadRunner runner1 = new DownloadRunner(uri1).postDownloadAction();
-    DownloadRunner runner2 = new DownloadRunner(uri2).postRemoveAction().postDownloadAction();
+    DownloadRunner runner2 = new DownloadRunner(uri2).postDownloadAction().postRemoveAction();
+    runner2.postDownloadAction();
     FakeDownloader downloader1 = runner1.getDownloader(0);
     FakeDownloader downloader2 = runner2.getDownloader(0);
     FakeDownloader downloader3 = runner2.getDownloader(1);
@@ -356,7 +340,7 @@ public class DownloadManagerTest {
   public void getTasks_returnTasks() {
     TaskWrapper task1 = new DownloadRunner(uri1).postDownloadAction().getTask();
     TaskWrapper task2 = new DownloadRunner(uri2).postDownloadAction().getTask();
-    TaskWrapper task3 = new DownloadRunner(uri3).postRemoveAction().getTask();
+    TaskWrapper task3 = new DownloadRunner(uri3).postDownloadAction().postRemoveAction().getTask();
 
     task3.assertRemoving();
     DownloadState[] states = downloadManager.getAllDownloadStates();
@@ -374,7 +358,7 @@ public class DownloadManagerTest {
     DownloadRunner runner3 = new DownloadRunner(uri3);
 
     runner1.postDownloadAction().getTask().assertDownloading();
-    runner2.postRemoveAction().getTask().assertRemoving();
+    runner2.postDownloadAction().postRemoveAction().getTask().assertRemoving();
     runner2.postDownloadAction();
 
     runOnMainThread(() -> downloadManager.stopDownloads());
@@ -382,10 +366,10 @@ public class DownloadManagerTest {
     runner1.getTask().assertStopped();
 
     // remove actions aren't stopped.
-    runner2.getDownloader(0).unblock().assertReleased();
+    runner2.getDownloader(1).unblock().assertReleased();
     runner2.getTask().assertStopped();
     // Although remove2 is finished, download2 doesn't start.
-    runner2.getDownloader(1).assertDoesNotStart();
+    runner2.getDownloader(2).assertDoesNotStart();
 
     // When a new remove action is added, it cancels stopped download actions with the same media.
     runner1.postRemoveAction();
@@ -397,7 +381,7 @@ public class DownloadManagerTest {
 
     runOnMainThread(() -> downloadManager.startDownloads());
 
-    runner2.getDownloader(1).assertStarted().unblock();
+    runner2.getDownloader(2).assertStarted().unblock();
     runner3.getDownloader(0).assertStarted().unblock();
 
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
@@ -446,14 +430,14 @@ public class DownloadManagerTest {
     DownloadRunner runner3 = new DownloadRunner(uri3);
 
     runner1.postDownloadAction().getTask().assertDownloading();
-    runner2.postRemoveAction().getTask().assertRemoving();
+    runner2.postDownloadAction().postRemoveAction().getTask().assertRemoving();
 
     runOnMainThread(() -> downloadManager.stopDownload(runner1.getTask().taskId));
 
     runner1.getTask().assertStopped();
 
     // Other downloads aren't affected.
-    runner2.getDownloader(0).unblock().assertReleased();
+    runner2.getDownloader(1).unblock().assertReleased();
 
     // New download actions can be added and they start.
     runner3.postDownloadAction().getDownloader(0).assertStarted().unblock();
@@ -501,33 +485,36 @@ public class DownloadManagerTest {
   private final class DownloadRunner {
 
     private final Uri uri;
+    private final String id;
     private final ArrayList<FakeDownloader> downloaders;
     private int createdDownloaderCount = 0;
     private FakeDownloader downloader;
-    private TaskWrapper taskWrapper;
+    private final TaskWrapper taskWrapper;
 
     private DownloadRunner(Uri uri) {
       this.uri = uri;
+      id = uri.toString();
       downloaders = new ArrayList<>();
       downloader = addDownloader();
       downloaderFactory.registerDownloadRunner(this);
+      taskWrapper = new TaskWrapper(id);
     }
 
     private DownloadRunner postRemoveAction() {
-      return postAction(createRemoveAction(uri));
+      runOnMainThread(() -> downloadManager.removeDownload(id));
+      return this;
     }
 
     private DownloadRunner postDownloadAction(StreamKey... keys) {
-      return postAction(createDownloadAction(uri, keys));
-    }
-
-    private DownloadRunner postAction(DownloadAction action) {
-      runOnMainThread(() -> downloadManager.handleAction(action));
-      if (taskWrapper == null) {
-        taskWrapper = new TaskWrapper(action.id);
-      } else {
-        assertThat(action.id).isEqualTo(taskWrapper.taskId);
-      }
+      DownloadAction downloadAction =
+          DownloadAction.createDownloadAction(
+              id,
+              DownloadAction.TYPE_PROGRESSIVE,
+              uri,
+              Arrays.asList(keys),
+              /* customCacheKey= */ null,
+              /* data= */ null);
+      runOnMainThread(() -> downloadManager.addDownload(downloadAction));
       return this;
     }
 
@@ -554,10 +541,6 @@ public class DownloadManagerTest {
       return taskWrapper;
     }
 
-    public void setTask(TaskWrapper taskWrapper) {
-      this.taskWrapper = taskWrapper;
-    }
-
     private void assertCreatedDownloaderCount(int count) {
       assertThat(createdDownloaderCount).isEqualTo(count);
     }
@@ -599,35 +582,8 @@ public class DownloadManagerTest {
     }
 
     private TaskWrapper assertState(@State int expectedState) {
-      ArrayList<Integer> receivedStates = new ArrayList<>();
-      while (true) {
-        Integer state = null;
-        try {
-          state = downloadManagerListener.pollStateChange(taskId, ASSERT_TRUE_TIMEOUT);
-        } catch (InterruptedException e) {
-          fail(e.getMessage());
-        }
-        if (state != null) {
-          if (expectedState == state) {
-            return this;
-          }
-          receivedStates.add(state);
-        } else {
-          StringBuilder sb = new StringBuilder();
-          for (int i = 0; i < receivedStates.size(); i++) {
-            if (i > 0) {
-              sb.append(',');
-            }
-            sb.append(DownloadState.getStateString(receivedStates.get(i)));
-          }
-          fail(
-              String.format(
-                  Locale.US,
-                  "expected:<%s> but was:<%s>",
-                  DownloadState.getStateString(expectedState),
-                  sb));
-        }
-      }
+      downloadManagerListener.assertState(taskId, expectedState, ASSERT_TRUE_TIMEOUT);
+      return this;
     }
 
     @Override
@@ -647,20 +603,6 @@ public class DownloadManagerTest {
     }
   }
 
-  private static DownloadAction createDownloadAction(Uri uri, StreamKey... keys) {
-    return DownloadAction.createDownloadAction(
-        DownloadAction.TYPE_PROGRESSIVE,
-        uri,
-        Arrays.asList(keys),
-        /* customCacheKey= */ null,
-        /* data= */ null);
-  }
-
-  private static DownloadAction createRemoveAction(Uri uri) {
-    return DownloadAction.createRemoveAction(
-        DownloadAction.TYPE_PROGRESSIVE, uri, /* customCacheKey= */ null);
-  }
-
   private static final class FakeDownloaderFactory implements DownloaderFactory {
 
     private final HashMap<Uri, DownloadRunner> downloaders;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
index 5d2af47781..cedbd8a8c4 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
@@ -118,20 +118,6 @@ public class DownloadStateTest {
     assertEqual(mergedDownloadState, expectedDownloadState);
   }
 
-  @Test
-  public void mergeAction_queuedDownloadRemoveAction_stateBecomesRemoving() {
-    DownloadAction downloadAction = createRemoveAction();
-    DownloadStateBuilder downloadStateBuilder =
-        new DownloadStateBuilder(downloadAction).setState(DownloadState.STATE_QUEUED);
-    DownloadState downloadState = downloadStateBuilder.build();
-
-    DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);
-
-    DownloadState expectedDownloadState =
-        downloadStateBuilder.setState(DownloadState.STATE_REMOVING).build();
-    assertEqual(mergedDownloadState, expectedDownloadState);
-  }
-
   @Test
   public void mergeAction_removingDownloadDownloadAction_stateBecomesRestarting() {
     DownloadAction downloadAction = createDownloadAction();
@@ -179,22 +165,6 @@ public class DownloadStateTest {
     assertEqual(mergedDownloadState, downloadState);
   }
 
-  @Test
-  public void mergeAction_stoppedDownloadRemoveAction_stateBecomesRemoving() {
-    DownloadAction downloadAction = createRemoveAction();
-    DownloadStateBuilder downloadStateBuilder =
-        new DownloadStateBuilder(downloadAction)
-            .setState(DownloadState.STATE_STOPPED)
-            .setManualStopReason(DownloadState.MANUAL_STOP_REASON_UNDEFINED);
-    DownloadState downloadState = downloadStateBuilder.build();
-
-    DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);
-
-    DownloadState expectedDownloadState =
-        downloadStateBuilder.setState(DownloadState.STATE_REMOVING).build();
-    assertEqual(mergedDownloadState, expectedDownloadState);
-  }
-
   @Test
   public void mergeAction_manualStopReasonSetButNotInStoppedState_stateBecomesStopped() {
     DownloadAction downloadAction = createDownloadAction();
@@ -227,20 +197,6 @@ public class DownloadStateTest {
     assertEqual(mergedDownloadState, expectedDownloadState);
   }
 
-  @Test
-  public void mergeAction_restartingDownloadRemoveAction_stateBecomesRemoving() {
-    DownloadAction downloadAction = createRemoveAction();
-    DownloadStateBuilder downloadStateBuilder =
-        new DownloadStateBuilder(downloadAction).setState(DownloadState.STATE_RESTARTING);
-    DownloadState downloadState = downloadStateBuilder.build();
-
-    DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);
-
-    DownloadState expectedDownloadState =
-        downloadStateBuilder.setState(DownloadState.STATE_REMOVING).build();
-    assertEqual(mergedDownloadState, expectedDownloadState);
-  }
-
   @Test
   public void mergeAction_returnsMergedKeys() {
     StreamKey streamKey1 = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
@@ -340,9 +296,4 @@ public class DownloadStateTest {
         /* customCacheKey= */ null,
         /* data= */ null);
   }
-
-  private DownloadAction createRemoveAction() {
-    return DownloadAction.createRemoveAction(
-        DownloadAction.TYPE_DASH, testUri, /* customCacheKey= */ null);
-  }
 }
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadTestData.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadTestData.java
index a215347f15..71f7c9a187 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadTestData.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadTestData.java
@@ -22,7 +22,8 @@ import java.nio.charset.Charset;
 /** Data for DASH downloading tests. */
 /* package */ interface DashDownloadTestData {
 
-  Uri TEST_MPD_URI = Uri.parse("test.mpd");
+  String TEST_ID = "test.mpd";
+  Uri TEST_MPD_URI = Uri.parse(TEST_ID);
 
   byte[] TEST_MPD =
       ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
index 35dcb77906..1e970e42c3 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.source.dash.offline;
 
+import static com.google.android.exoplayer2.source.dash.offline.DashDownloadTestData.TEST_ID;
 import static com.google.android.exoplayer2.source.dash.offline.DashDownloadTestData.TEST_MPD;
 import static com.google.android.exoplayer2.source.dash.offline.DashDownloadTestData.TEST_MPD_URI;
 import static com.google.android.exoplayer2.testutil.CacheAsserts.assertCacheEmpty;
@@ -22,9 +23,7 @@ import static com.google.android.exoplayer2.testutil.CacheAsserts.assertCachedDa
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
-import android.net.Uri;
 import android.os.ConditionVariable;
-import androidx.annotation.Nullable;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.offline.DefaultDownloadIndex;
@@ -230,11 +229,16 @@ public class DownloadManagerDashTest {
   }
 
   private void handleDownloadAction(StreamKey... keys) {
-    downloadManager.handleAction(newAction(TEST_MPD_URI, false, null, keys));
+    ArrayList<StreamKey> keysList = new ArrayList<>();
+    Collections.addAll(keysList, keys);
+    DownloadAction action =
+        DownloadAction.createDownloadAction(
+            DownloadAction.TYPE_DASH, TEST_MPD_URI, keysList, /* customCacheKey= */ null, null);
+    downloadManager.addDownload(action);
   }
 
   private void handleRemoveAction() {
-    downloadManager.handleAction(newAction(TEST_MPD_URI, true, null));
+    downloadManager.removeDownload(TEST_ID);
   }
 
   private void createDownloadManager() {
@@ -257,20 +261,4 @@ public class DownloadManagerDashTest {
         });
   }
 
-  private static DownloadAction newAction(
-      Uri uri, boolean isRemoveAction, @Nullable byte[] data, StreamKey... keys) {
-    ArrayList<StreamKey> keysList = new ArrayList<>();
-    Collections.addAll(keysList, keys);
-    DownloadAction result;
-    if (isRemoveAction) {
-      result =
-          DownloadAction.createRemoveAction(
-              DownloadAction.TYPE_DASH, uri, /* customCacheKey= */ null);
-    } else {
-      result =
-          DownloadAction.createDownloadAction(
-              DownloadAction.TYPE_DASH, uri, keysList, /* customCacheKey= */ null, data);
-    }
-    return result;
-  }
 }
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
index 30e511780f..123a02d18a 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.source.dash.offline;
 
+import static com.google.android.exoplayer2.source.dash.offline.DashDownloadTestData.TEST_ID;
 import static com.google.android.exoplayer2.source.dash.offline.DashDownloadTestData.TEST_MPD;
 import static com.google.android.exoplayer2.source.dash.offline.DashDownloadTestData.TEST_MPD_URI;
 import static com.google.android.exoplayer2.testutil.CacheAsserts.assertCacheEmpty;
@@ -22,7 +23,6 @@ import static com.google.android.exoplayer2.testutil.CacheAsserts.assertCachedDa
 
 import android.content.Context;
 import android.content.Intent;
-import android.net.Uri;
 import androidx.annotation.Nullable;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -187,37 +187,29 @@ public class DownloadServiceDashTest {
     assertCacheEmpty(cache);
   }
 
-  private void removeAll() throws Throwable {
-    callDownloadServiceOnStart(newAction(TEST_MPD_URI, true, null));
-  }
-
-  private void downloadKeys(StreamKey... keys) {
-    callDownloadServiceOnStart(newAction(TEST_MPD_URI, false, null, keys));
-  }
-
-  private void callDownloadServiceOnStart(final DownloadAction action) {
+  private void removeAll() {
     dummyMainThread.runOnMainThread(
         () -> {
           Intent startIntent =
-              DownloadService.buildAddActionIntent(context, DownloadService.class, action, false);
+              DownloadService.buildRemoveDownloadIntent(
+                  context, DownloadService.class, TEST_ID, /* foreground= */ false);
           dashDownloadService.onStartCommand(startIntent, 0, 0);
         });
   }
 
-  private static DownloadAction newAction(
-      Uri uri, boolean isRemoveAction, @Nullable byte[] data, StreamKey... keys) {
+  private void downloadKeys(StreamKey... keys) {
     ArrayList<StreamKey> keysList = new ArrayList<>();
     Collections.addAll(keysList, keys);
-    DownloadAction result;
-    if (isRemoveAction) {
-      result =
-          DownloadAction.createRemoveAction(
-              DownloadAction.TYPE_DASH, uri, /* customCacheKey= */ null);
-    } else {
-      result =
-          DownloadAction.createDownloadAction(
-              DownloadAction.TYPE_DASH, uri, keysList, /* customCacheKey= */ null, data);
-    }
-    return result;
+    DownloadAction action =
+        DownloadAction.createDownloadAction(
+            DownloadAction.TYPE_DASH, TEST_MPD_URI, keysList, /* customCacheKey= */ null, null);
+    dummyMainThread.runOnMainThread(
+        () -> {
+          Intent startIntent =
+              DownloadService.buildAddActionIntent(
+                  context, DownloadService.class, action, /* foreground= */ false);
+          dashDownloadService.onStartCommand(startIntent, 0, 0);
+        });
   }
+
 }
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
index 8216b881f3..86b67e27c7 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
@@ -16,11 +16,15 @@
 package com.google.android.exoplayer2.testutil;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
 
 import android.os.ConditionVariable;
 import com.google.android.exoplayer2.offline.DownloadManager;
 import com.google.android.exoplayer2.offline.DownloadState;
+import com.google.android.exoplayer2.offline.DownloadState.State;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -115,4 +119,37 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
       return actionStates.get(taskId);
     }
   }
+
+  public void assertState(String taskId, @State int expectedState, int timeoutMs) {
+    ArrayList<Integer> receivedStates = new ArrayList<>();
+    while (true) {
+      Integer state = null;
+      try {
+        state = pollStateChange(taskId, timeoutMs);
+      } catch (InterruptedException e) {
+        fail(e.getMessage());
+      }
+      if (state != null) {
+        if (expectedState == state) {
+          return;
+        }
+        receivedStates.add(state);
+      } else {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < receivedStates.size(); i++) {
+          if (i > 0) {
+            sb.append(',');
+          }
+          sb.append(DownloadState.getStateString(receivedStates.get(i)));
+        }
+        fail(
+            String.format(
+                Locale.US,
+                "for download (%s) expected:<%s> but was:<%s>",
+                taskId,
+                DownloadState.getStateString(expectedState),
+                sb));
+      }
+    }
+  }
 }

From 6e6df6a2f014956b8c8b2e877e3e6335e2d2ec5b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 27 Mar 2019 15:42:31 +0000
Subject: [PATCH 679/832] Improve DownloadService notification documentation

The one functional change here is to require subclasses to implement getForegroundNotification. It seems easier and less error prone to
force developers to implement it than it does to document the cases
in which they need to override it (which is most cases).

PiperOrigin-RevId: 240566737
---
 .../exoplayer2/offline/DownloadService.java   | 98 ++++++++++---------
 .../exoplayer2/util/NotificationUtil.java     | 32 +++---
 .../dash/offline/DownloadServiceDashTest.java |  7 ++
 3 files changed, 73 insertions(+), 64 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index b561624725..aa85227839 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -136,9 +136,9 @@ public abstract class DownloadService extends Service {
   private static final HashMap<Class<? extends DownloadService>, DownloadManagerHelper>
       downloadManagerListeners = new HashMap<>();
 
-  private final @Nullable ForegroundNotificationUpdater foregroundNotificationUpdater;
-  private final @Nullable String channelId;
-  private final @StringRes int channelName;
+  @Nullable private final ForegroundNotificationUpdater foregroundNotificationUpdater;
+  @Nullable private final String channelId;
+  @StringRes private final int channelNameResourceId;
 
   private DownloadManager downloadManager;
   private int lastStartId;
@@ -148,30 +148,29 @@ public abstract class DownloadService extends Service {
   /**
    * Creates a DownloadService.
    *
-   * <p>If {@code foregroundNotificationId} is {@link #FOREGROUND_NOTIFICATION_ID_NONE} (value
-   * {@value #FOREGROUND_NOTIFICATION_ID_NONE}) then the service runs in the background. No
-   * foreground notification is displayed and {@link #getScheduler()} isn't called.
+   * <p>If {@code foregroundNotificationId} is {@link #FOREGROUND_NOTIFICATION_ID_NONE} then the
+   * service will only ever run in the background. No foreground notification will be displayed and
+   * {@link #getScheduler()} will not be called.
    *
-   * <p>If {@code foregroundNotificationId} isn't {@link #FOREGROUND_NOTIFICATION_ID_NONE} (value
-   * {@value #FOREGROUND_NOTIFICATION_ID_NONE}) the service runs in the foreground with {@link
-   * #DEFAULT_FOREGROUND_NOTIFICATION_UPDATE_INTERVAL}. In that case {@link
-   * #getForegroundNotification(DownloadState[])} should be overridden in the subclass.
+   * <p>If {@code foregroundNotificationId} is not {@link #FOREGROUND_NOTIFICATION_ID_NONE} then the
+   * service will run in the foreground. The foreground notification will be updated at least as
+   * often as the interval specified by {@link #DEFAULT_FOREGROUND_NOTIFICATION_UPDATE_INTERVAL}.
    *
    * @param foregroundNotificationId The notification id for the foreground notification, or {@link
-   *     #FOREGROUND_NOTIFICATION_ID_NONE} (value {@value #FOREGROUND_NOTIFICATION_ID_NONE})
+   *     #FOREGROUND_NOTIFICATION_ID_NONE} if the service should only ever run in the background.
    */
   protected DownloadService(int foregroundNotificationId) {
     this(foregroundNotificationId, DEFAULT_FOREGROUND_NOTIFICATION_UPDATE_INTERVAL);
   }
 
   /**
-   * Creates a DownloadService that will run in the foreground. {@link
-   * #getForegroundNotification(DownloadState[])} should be overridden in the subclass.
+   * Creates a DownloadService.
    *
-   * @param foregroundNotificationId The notification id for the foreground notification, must not
-   *     be 0.
-   * @param foregroundNotificationUpdateInterval The maximum interval to update foreground
-   *     notification, in milliseconds.
+   * @param foregroundNotificationId The notification id for the foreground notification, or {@link
+   *     #FOREGROUND_NOTIFICATION_ID_NONE} if the service should only ever run in the background.
+   * @param foregroundNotificationUpdateInterval The maximum interval between updates to the
+   *     foreground notification, in milliseconds. Ignored if {@code foregroundNotificationId} is
+   *     {@link #FOREGROUND_NOTIFICATION_ID_NONE}.
    */
   protected DownloadService(
       int foregroundNotificationId, long foregroundNotificationUpdateInterval) {
@@ -179,36 +178,42 @@ public abstract class DownloadService extends Service {
         foregroundNotificationId,
         foregroundNotificationUpdateInterval,
         /* channelId= */ null,
-        /* channelName= */ 0);
+        /* channelNameResourceId= */ 0);
   }
 
   /**
-   * Creates a DownloadService that will run in the foreground. {@link
-   * #getForegroundNotification(DownloadState[])} should be overridden in the subclass.
+   * Creates a DownloadService.
    *
-   * @param foregroundNotificationId The notification id for the foreground notification. Must not
-   *     be 0.
+   * @param foregroundNotificationId The notification id for the foreground notification, or {@link
+   *     #FOREGROUND_NOTIFICATION_ID_NONE} if the service should only ever run in the background.
    * @param foregroundNotificationUpdateInterval The maximum interval between updates to the
-   *     foreground notification, in milliseconds.
+   *     foreground notification, in milliseconds. Ignored if {@code foregroundNotificationId} is
+   *     {@link #FOREGROUND_NOTIFICATION_ID_NONE}.
    * @param channelId An id for a low priority notification channel to create, or {@code null} if
    *     the app will take care of creating a notification channel if needed. If specified, must be
-   *     unique per package and the value may be truncated if it is too long.
-   * @param channelName A string resource identifier for the user visible name of the channel, if
-   *     {@code channelId} is specified. The recommended maximum length is 40 characters; the value
-   *     may be truncated if it is too long.
+   *     unique per package. The value may be truncated if it's too long. Ignored if {@code
+   *     foregroundNotificationId} is {@link #FOREGROUND_NOTIFICATION_ID_NONE}.
+   * @param channelNameResourceId A string resource identifier for the user visible name of the
+   *     channel, if {@code channelId} is specified. The recommended maximum length is 40
+   *     characters. The value may be truncated if it is too long. Ignored if {@code
+   *     foregroundNotificationId} is {@link #FOREGROUND_NOTIFICATION_ID_NONE}.
    */
   protected DownloadService(
       int foregroundNotificationId,
       long foregroundNotificationUpdateInterval,
       @Nullable String channelId,
-      @StringRes int channelName) {
-    foregroundNotificationUpdater =
-        foregroundNotificationId == 0
-            ? null
-            : new ForegroundNotificationUpdater(
-                foregroundNotificationId, foregroundNotificationUpdateInterval);
-    this.channelId = channelId;
-    this.channelName = channelName;
+      @StringRes int channelNameResourceId) {
+    if (foregroundNotificationId == FOREGROUND_NOTIFICATION_ID_NONE) {
+      this.foregroundNotificationUpdater = null;
+      this.channelId = null;
+      this.channelNameResourceId = 0;
+    } else {
+      this.foregroundNotificationUpdater =
+          new ForegroundNotificationUpdater(
+              foregroundNotificationId, foregroundNotificationUpdateInterval);
+      this.channelId = channelId;
+      this.channelNameResourceId = channelNameResourceId;
+    }
   }
 
   /**
@@ -350,7 +355,7 @@ public abstract class DownloadService extends Service {
     logd("onCreate");
     if (channelId != null) {
       NotificationUtil.createNotificationChannel(
-          this, channelId, channelName, NotificationUtil.IMPORTANCE_LOW);
+          this, channelId, channelNameResourceId, NotificationUtil.IMPORTANCE_LOW);
     }
     Class<? extends DownloadService> clazz = getClass();
     DownloadManagerHelper downloadManagerHelper = downloadManagerListeners.get(clazz);
@@ -477,26 +482,23 @@ public abstract class DownloadService extends Service {
   protected abstract @Nullable Scheduler getScheduler();
 
   /**
-   * Should be overridden in the subclass if the service will be run in the foreground.
-   *
-   * <p>Returns a notification to be displayed when this service running in the foreground.
-   *
-   * <p>This method is called when there is a download state change and periodically while there are
-   * active downloads. The periodic update interval can be set using {@link #DownloadService(int,
-   * long)}.
+   * Returns a notification to be displayed when this service running in the foreground. This method
+   * is called when there is a download state change and periodically while there are active
+   * downloads. The periodic update interval can be set using {@link #DownloadService(int, long)}.
    *
    * <p>On API level 26 and above, this method may also be called just before the service stops,
    * with an empty {@code downloadStates} array. The returned notification is used to satisfy system
    * requirements for foreground services.
    *
+   * <p>Download services that do not wish to run in the foreground should be created by setting the
+   * {@code foregroundNotificationId} constructor argument to {@link
+   * #FOREGROUND_NOTIFICATION_ID_NONE}. This method will not be called in this case, meaning it can
+   * be implemented to throw {@link UnsupportedOperationException}.
+   *
    * @param downloadStates The states of all current downloads.
    * @return The foreground notification to display.
    */
-  protected Notification getForegroundNotification(DownloadState[] downloadStates) {
-    throw new IllegalStateException(
-        getClass().getName()
-            + " is started in the foreground but getForegroundNotification() is not implemented.");
-  }
+  protected abstract Notification getForegroundNotification(DownloadState[] downloadStates);
 
   /**
    * Called when the state of a download changes. The default implementation is a no-op.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/NotificationUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/util/NotificationUtil.java
index e1c98c6575..4cd03f566d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/NotificationUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/NotificationUtil.java
@@ -28,7 +28,7 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-/** Utility methods for displaying {@link android.app.Notification}s. */
+/** Utility methods for displaying {@link Notification Notifications}. */
 @SuppressLint("InlinedApi")
 public final class NotificationUtil {
 
@@ -66,25 +66,25 @@ public final class NotificationUtil {
    * NotificationChannel} and {@link
    * NotificationManager#createNotificationChannel(NotificationChannel)} for details.
    *
-   * @param context A {@link Context} to retrieve {@link NotificationManager}.
-   * @param id The id of the channel. Must be unique per package. The value may be truncated if it
-   *     is too long.
-   * @param name A string resource identifier for the user visible name of the channel. You can
-   *     rename this channel when the system locale changes by listening for the {@link
-   *     Intent#ACTION_LOCALE_CHANGED} broadcast. The recommended maximum length is 40 characters;
-   *     the value may be truncated if it is too long.
+   * @param context A {@link Context}.
+   * @param id The id of the channel. Must be unique per package. The value may be truncated if it's
+   *     too long.
+   * @param nameResourceId A string resource identifier for the user visible name of the channel.
+   *     You can rename this channel when the system locale changes by listening for the {@link
+   *     Intent#ACTION_LOCALE_CHANGED} broadcast. The recommended maximum length is 40 characters.
+   *     The value may be truncated if it is too long.
    * @param importance The importance of the channel. This controls how interruptive notifications
    *     posted to this channel are. One of {@link #IMPORTANCE_UNSPECIFIED}, {@link
    *     #IMPORTANCE_NONE}, {@link #IMPORTANCE_MIN}, {@link #IMPORTANCE_LOW}, {@link
    *     #IMPORTANCE_DEFAULT} and {@link #IMPORTANCE_HIGH}.
    */
   public static void createNotificationChannel(
-      Context context, String id, @StringRes int name, @Importance int importance) {
+      Context context, String id, @StringRes int nameResourceId, @Importance int importance) {
     if (Util.SDK_INT >= 26) {
       NotificationManager notificationManager =
           (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
       NotificationChannel channel =
-          new NotificationChannel(id, context.getString(name), importance);
+          new NotificationChannel(id, context.getString(nameResourceId), importance);
       notificationManager.createNotificationChannel(channel);
     }
   }
@@ -92,13 +92,13 @@ public final class NotificationUtil {
   /**
    * Post a notification to be shown in the status bar. If a notification with the same id has
    * already been posted by your application and has not yet been canceled, it will be replaced by
-   * the updated information. If {@code notification} is null, then cancels a previously shown
-   * notification.
+   * the updated information. If {@code notification} is {@code null} then any notification
+   * previously shown with the specified id will be cancelled.
    *
-   * @param context A {@link Context} to retrieve {@link NotificationManager}.
-   * @param id An identifier for this notification unique within your application.
-   * @param notification A {@link Notification} object describing what to show the user. If null,
-   *     then cancels a previously shown notification.
+   * @param context A {@link Context}.
+   * @param id The notification id.
+   * @param notification The {@link Notification} to post, or {@code null} to cancel a previously
+   *     shown notification.
    */
   public static void setNotification(Context context, int id, @Nullable Notification notification) {
     NotificationManager notificationManager =
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
index 123a02d18a..fa560eb644 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
@@ -21,6 +21,7 @@ import static com.google.android.exoplayer2.source.dash.offline.DashDownloadTest
 import static com.google.android.exoplayer2.testutil.CacheAsserts.assertCacheEmpty;
 import static com.google.android.exoplayer2.testutil.CacheAsserts.assertCachedData;
 
+import android.app.Notification;
 import android.content.Context;
 import android.content.Intent;
 import androidx.annotation.Nullable;
@@ -31,6 +32,7 @@ import com.google.android.exoplayer2.offline.DefaultDownloaderFactory;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadManager;
 import com.google.android.exoplayer2.offline.DownloadService;
+import com.google.android.exoplayer2.offline.DownloadState;
 import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.scheduler.Requirements;
@@ -137,6 +139,11 @@ public class DownloadServiceDashTest {
                 protected Scheduler getScheduler() {
                   return null;
                 }
+
+                @Override
+                protected Notification getForegroundNotification(DownloadState[] downloadStates) {
+                  throw new UnsupportedOperationException();
+                }
               };
           dashDownloadService.onCreate();
         });

From 65bab95f72bfbe2c36d44c4f4cb8f66e4432de82 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 27 Mar 2019 20:01:06 +0000
Subject: [PATCH 680/832] Add video and closed caption renditions to
 HlsMasterPlaylist

Still skipping any renditions that have a null URL, which means that
closedCaptions in particular is always empty. This restriction will
be removed in a subsequent change, which will also remove muxedAudioFormat
and muxedAudioCaptions from HlsMasterPlaylist and instead derive them
from the Variant and Rendition information in HlsMediaPeriod.

Issue: #5596
Issue: #2600
PiperOrigin-RevId: 240623500
---
 .../exoplayer2/source/hls/HlsMediaPeriod.java |   3 +
 .../hls/playlist/HlsMasterPlaylist.java       |  63 +++++++---
 .../hls/playlist/HlsPlaylistParser.java       | 119 +++++++++++++-----
 .../source/hls/HlsMediaPeriodTest.java        |   2 +
 .../playlist/HlsMediaPlaylistParserTest.java  |   4 +
 5 files changed, 144 insertions(+), 47 deletions(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
index e76cf26db7..406f4ed9fc 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
@@ -157,6 +157,9 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
     return trackGroups;
   }
 
+  // TODO: When the master playlist does not de-duplicate variants by URL and allows Renditions with
+  // null URLs, this method must be updated to calculate stream keys that are compatible with those
+  // that may already be persisted for offline.
   @Override
   public List<StreamKey> getStreamKeys(List<TrackSelection> trackSelections) {
     // See HlsMasterPlaylist.copy for interpretation of StreamKeys.
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
index f485778bb5..a37ebe6054 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
@@ -34,14 +34,17 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
           /* baseUri= */ "",
           /* tags= */ Collections.emptyList(),
           /* variants= */ Collections.emptyList(),
+          /* videos= */ Collections.emptyList(),
           /* audios= */ Collections.emptyList(),
           /* subtitles= */ Collections.emptyList(),
+          /* closedCaptions= */ Collections.emptyList(),
           /* muxedAudioFormat= */ null,
           /* muxedCaptionFormats= */ Collections.emptyList(),
           /* hasIndependentSegments= */ false,
           /* variableDefinitions= */ Collections.emptyMap(),
           /* sessionKeyDrmInitData= */ Collections.emptyList());
 
+  // These constants must not be changed because they are persisted in offline stream keys.
   public static final int GROUP_INDEX_VARIANT = 0;
   public static final int GROUP_INDEX_AUDIO = 1;
   public static final int GROUP_INDEX_SUBTITLE = 2;
@@ -156,12 +159,16 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
 
   }
 
-  /** The list of variants declared by the playlist. */
+  /** The variants declared by the playlist. */
   public final List<Variant> variants;
-  /** The list of demuxed audios declared by the playlist. */
+  /** The video renditions declared by the playlist. */
+  public final List<Rendition> videos;
+  /** The audio renditions declared by the playlist. */
   public final List<Rendition> audios;
-  /** The list of subtitles declared by the playlist. */
+  /** The subtitle renditions declared by the playlist. */
   public final List<Rendition> subtitles;
+  /** The closed caption renditions declared by the playlist. */
+  public final List<Rendition> closedCaptions;
 
   /**
    * The format of the audio muxed in the variants. May be null if the playlist does not declare any
@@ -183,8 +190,10 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
    * @param baseUri See {@link #baseUri}.
    * @param tags See {@link #tags}.
    * @param variants See {@link #variants}.
+   * @param videos See {@link #videos}.
    * @param audios See {@link #audios}.
    * @param subtitles See {@link #subtitles}.
+   * @param closedCaptions See {@link #closedCaptions}.
    * @param muxedAudioFormat See {@link #muxedAudioFormat}.
    * @param muxedCaptionFormats See {@link #muxedCaptionFormats}.
    * @param hasIndependentSegments See {@link #hasIndependentSegments}.
@@ -195,8 +204,10 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
       String baseUri,
       List<String> tags,
       List<Variant> variants,
+      List<Rendition> videos,
       List<Rendition> audios,
       List<Rendition> subtitles,
+      List<Rendition> closedCaptions,
       Format muxedAudioFormat,
       List<Format> muxedCaptionFormats,
       boolean hasIndependentSegments,
@@ -204,8 +215,10 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
       List<DrmInitData> sessionKeyDrmInitData) {
     super(baseUri, tags, hasIndependentSegments);
     this.variants = Collections.unmodifiableList(variants);
+    this.videos = Collections.unmodifiableList(videos);
     this.audios = Collections.unmodifiableList(audios);
     this.subtitles = Collections.unmodifiableList(subtitles);
+    this.closedCaptions = Collections.unmodifiableList(closedCaptions);
     this.muxedAudioFormat = muxedAudioFormat;
     this.muxedCaptionFormats = muxedCaptionFormats != null
         ? Collections.unmodifiableList(muxedCaptionFormats) : null;
@@ -218,9 +231,13 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
     return new HlsMasterPlaylist(
         baseUri,
         tags,
-        copyRenditionsList(variants, GROUP_INDEX_VARIANT, streamKeys),
-        copyRenditionsList(audios, GROUP_INDEX_AUDIO, streamKeys),
-        copyRenditionsList(subtitles, GROUP_INDEX_SUBTITLE, streamKeys),
+        copyStreams(variants, GROUP_INDEX_VARIANT, streamKeys),
+        // TODO: Allow stream keys to specify video renditions to be retained.
+        /* videos= */ Collections.emptyList(),
+        copyStreams(audios, GROUP_INDEX_AUDIO, streamKeys),
+        copyStreams(subtitles, GROUP_INDEX_SUBTITLE, streamKeys),
+        // TODO: Update to retain all closed captions.
+        /* closedCaptions= */ Collections.emptyList(),
         muxedAudioFormat,
         muxedCaptionFormats,
         hasIndependentSegments,
@@ -238,11 +255,13 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
     List<Variant> variant =
         Collections.singletonList(Variant.createMediaPlaylistVariantUrl(variantUrl));
     return new HlsMasterPlaylist(
-        null,
-        Collections.emptyList(),
+        /* baseUri= */ null,
+        /* tags= */ Collections.emptyList(),
         variant,
-        Collections.emptyList(),
-        Collections.emptyList(),
+        /* videos= */ Collections.emptyList(),
+        /* audios= */ Collections.emptyList(),
+        /* subtitles= */ Collections.emptyList(),
+        /* closedCaptions= */ Collections.emptyList(),
         /* muxedAudioFormat= */ null,
         /* muxedCaptionFormats= */ null,
         /* hasIndependentSegments= */ false,
@@ -250,20 +269,30 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
         /* sessionKeyDrmInitData= */ Collections.emptyList());
   }
 
-  private static <T extends HlsUrl> List<T> copyRenditionsList(
-      List<T> renditions, int groupIndex, List<StreamKey> streamKeys) {
-    List<T> copiedRenditions = new ArrayList<>(streamKeys.size());
-    for (int i = 0; i < renditions.size(); i++) {
-      T rendition = renditions.get(i);
+  private static <T extends HlsUrl> List<T> copyStreams(
+      List<T> streams, int groupIndex, List<StreamKey> streamKeys) {
+    List<T> copiedStreams = new ArrayList<>(streamKeys.size());
+    // TODO:
+    // 1. When variants with the same URL are not de-duplicated, duplicates must not increment
+    //    trackIndex so as to avoid breaking stream keys that have been persisted for offline. All
+    //    duplicates should be copied if the first variant is copied, or discarded otherwise.
+    // 2. When renditions with null URLs are permitted, they must not increment trackIndex so as to
+    //    avoid breaking stream keys that have been persisted for offline. All renitions with null
+    //    URLs should be copied. They may become unreachable if all variants that reference them are
+    //    removed, but this is OK.
+    // 3. Renditions with URLs matching copied variants should always themselves be copied, even if
+    //    the corresponding stream key is omitted. Else we're throwing away information for no gain.
+    for (int i = 0; i < streams.size(); i++) {
+      T stream = streams.get(i);
       for (int j = 0; j < streamKeys.size(); j++) {
         StreamKey streamKey = streamKeys.get(j);
         if (streamKey.groupIndex == groupIndex && streamKey.trackIndex == i) {
-          copiedRenditions.add(rendition);
+          copiedStreams.add(stream);
           break;
         }
       }
     }
-    return copiedRenditions;
+    return copiedStreams;
   }
 
 }
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
index f0ce24f19c..1a22dd1636 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
@@ -252,11 +252,13 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
   private static HlsMasterPlaylist parseMasterPlaylist(LineIterator iterator, String baseUri)
       throws IOException {
     HashSet<String> variantUrls = new HashSet<>();
-    HashMap<String, String> audioGroupIdToCodecs = new HashMap<>();
     HashMap<String, String> variableDefinitions = new HashMap<>();
     ArrayList<Variant> variants = new ArrayList<>();
+    ArrayList<Variant> deduplicatedVariants = new ArrayList<>();
+    ArrayList<Rendition> videos = new ArrayList<>();
     ArrayList<Rendition> audios = new ArrayList<>();
     ArrayList<Rendition> subtitles = new ArrayList<>();
+    ArrayList<Rendition> closedCaptions = new ArrayList<>();
     ArrayList<String> mediaTags = new ArrayList<>();
     ArrayList<DrmInitData> sessionKeyDrmInitData = new ArrayList<>();
     ArrayList<String> tags = new ArrayList<>();
@@ -332,35 +334,30 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
             parseOptionalStringAttr(line, REGEX_SUBTITLES, variableDefinitions);
         String closedCaptionsGroupId =
             parseOptionalStringAttr(line, REGEX_CLOSED_CAPTIONS, variableDefinitions);
-        if (audioGroupId != null && codecs != null) {
-          audioGroupIdToCodecs.put(audioGroupId, Util.getCodecsOfType(codecs, C.TRACK_TYPE_AUDIO));
-        }
         line =
             replaceVariableReferences(
                 iterator.next(), variableDefinitions); // #EXT-X-STREAM-INF's URI.
+        Format format =
+            Format.createVideoContainerFormat(
+                /* id= */ Integer.toString(variants.size()),
+                /* label= */ null,
+                /* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
+                /* sampleMimeType= */ null,
+                codecs,
+                bitrate,
+                width,
+                height,
+                frameRate,
+                /* initializationData= */ null,
+                /* selectionFlags= */ 0,
+                /* roleFlags= */ 0);
+        Variant variant =
+            new Variant(
+                line, format, videoGroupId, audioGroupId, subtitlesGroupId, closedCaptionsGroupId);
+        variants.add(variant);
+        // TODO: Don't deduplicate variants by URL.
         if (variantUrls.add(line)) {
-          Format format =
-              Format.createVideoContainerFormat(
-                  /* id= */ Integer.toString(variants.size()),
-                  /* label= */ null,
-                  /* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
-                  /* sampleMimeType= */ null,
-                  codecs,
-                  bitrate,
-                  width,
-                  height,
-                  frameRate,
-                  /* initializationData= */ null,
-                  /* selectionFlags= */ 0,
-                  /* roleFlags= */ 0);
-          variants.add(
-              new Variant(
-                  line,
-                  format,
-                  videoGroupId,
-                  audioGroupId,
-                  subtitlesGroupId,
-                  closedCaptionsGroupId));
+          deduplicatedVariants.add(variant);
         }
       }
     }
@@ -376,10 +373,48 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
       String formatId = groupId + ":" + name;
       Format format;
       switch (parseStringAttr(line, REGEX_TYPE, variableDefinitions)) {
-        case TYPE_AUDIO:
-          String codecs = audioGroupIdToCodecs.get(groupId);
-          int channelCount = parseChannelsAttribute(line, variableDefinitions);
+        case TYPE_VIDEO:
+          Variant variant = getVariantWithVideoGroup(variants, groupId);
+          String codecs = null;
+          int width = Format.NO_VALUE;
+          int height = Format.NO_VALUE;
+          float frameRate = Format.NO_VALUE;
+          if (variant != null) {
+            Format variantFormat = variant.format;
+            codecs = Util.getCodecsOfType(variantFormat.codecs, C.TRACK_TYPE_VIDEO);
+            width = variantFormat.width;
+            height = variantFormat.height;
+            frameRate = variantFormat.frameRate;
+          }
           String sampleMimeType = codecs != null ? MimeTypes.getMediaMimeType(codecs) : null;
+          format =
+              Format.createVideoContainerFormat(
+                  /* id= */ formatId,
+                  /* label= */ name,
+                  /* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
+                  sampleMimeType,
+                  codecs,
+                  /* bitrate= */ Format.NO_VALUE,
+                  width,
+                  height,
+                  frameRate,
+                  /* initializationData= */ null,
+                  selectionFlags,
+                  roleFlags);
+          if (uri == null) {
+            // TODO: Remove this case and add a Rendition with a null uri to videos.
+          } else {
+            videos.add(new Rendition(uri, format, groupId, name));
+          }
+          break;
+        case TYPE_AUDIO:
+          variant = getVariantWithAudioGroup(variants, groupId);
+          codecs =
+              variant != null
+                  ? Util.getCodecsOfType(variant.format.codecs, C.TRACK_TYPE_AUDIO)
+                  : null;
+          sampleMimeType = codecs != null ? MimeTypes.getMediaMimeType(codecs) : null;
+          int channelCount = parseChannelsAttribute(line, variableDefinitions);
           format =
               Format.createAudioContainerFormat(
                   /* id= */ formatId,
@@ -395,6 +430,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
                   roleFlags,
                   language);
           if (uri == null) {
+            // TODO: Remove muxedAudioFormat and add a Rendition with a null uri to audios.
             muxedAudioFormat = format;
           } else {
             audios.add(new Rendition(uri, format, groupId, name));
@@ -440,6 +476,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
                   roleFlags,
                   language,
                   accessibilityChannel));
+          // TODO: Remove muxedCaptionFormats and add a Rendition with a null uri to closedCaptions.
           break;
         default:
           // Do nothing.
@@ -454,9 +491,11 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
     return new HlsMasterPlaylist(
         baseUri,
         tags,
-        variants,
+        deduplicatedVariants,
+        videos,
         audios,
         subtitles,
+        closedCaptions,
         muxedAudioFormat,
         muxedCaptionFormats,
         hasIndependentSegmentsTag,
@@ -464,6 +503,26 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
         sessionKeyDrmInitData);
   }
 
+  private static Variant getVariantWithAudioGroup(ArrayList<Variant> variants, String groupId) {
+    for (int i = 0; i < variants.size(); i++) {
+      Variant variant = variants.get(i);
+      if (groupId.equals(variant.audioGroupId)) {
+        return variant;
+      }
+    }
+    return null;
+  }
+
+  private static Variant getVariantWithVideoGroup(ArrayList<Variant> variants, String groupId) {
+    for (int i = 0; i < variants.size(); i++) {
+      Variant variant = variants.get(i);
+      if (groupId.equals(variant.videoGroupId)) {
+        return variant;
+      }
+    }
+    return null;
+  }
+
   private static HlsMediaPlaylist parseMediaPlaylist(
       HlsMasterPlaylist masterPlaylist, LineIterator iterator, String baseUri) throws IOException {
     @HlsMediaPlaylist.PlaylistType int playlistType = HlsMediaPlaylist.PLAYLIST_TYPE_UNKNOWN;
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
index c3e311be89..dcf44bc2ae 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
@@ -107,8 +107,10 @@ public final class HlsMediaPeriodTest {
         "http://baseUri",
         /* tags= */ Collections.emptyList(),
         variants,
+        /* videos= */ Collections.emptyList(),
         audios,
         subtitles,
+        /* closedCaptions= */ Collections.emptyList(),
         muxedAudioFormat,
         muxedCaptionFormats,
         /* hasIndependentSegments= */ true,
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java
index 384408a0af..80cc6b23cd 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java
@@ -451,8 +451,10 @@ public class HlsMediaPlaylistParserTest {
             /* baseUri= */ "https://example.com/",
             /* tags= */ Collections.emptyList(),
             /* variants= */ Collections.emptyList(),
+            /* videos= */ Collections.emptyList(),
             /* audios= */ Collections.emptyList(),
             /* subtitles= */ Collections.emptyList(),
+            /* closedCaptions= */ Collections.emptyList(),
             /* muxedAudioFormat= */ null,
             /* muxedCaptionFormats= */ null,
             /* hasIndependentSegments= */ true,
@@ -511,8 +513,10 @@ public class HlsMediaPlaylistParserTest {
             /* baseUri= */ "",
             /* tags= */ Collections.emptyList(),
             /* variants= */ Collections.emptyList(),
+            /* videos= */ Collections.emptyList(),
             /* audios= */ Collections.emptyList(),
             /* subtitles= */ Collections.emptyList(),
+            /* closedCaptions= */ Collections.emptyList(),
             /* muxedAudioFormat= */ null,
             /* muxedCaptionFormats= */ Collections.emptyList(),
             /* hasIndependentSegments= */ false,

From 0810fe9159fe4d11e18b8513007c6415aed85533 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 27 Mar 2019 20:08:24 +0000
Subject: [PATCH 681/832] Remove "variant" terminology from HlsChunkSource

HlsChunkSource may also be downloading segments from demuxed
renditions, which are not variants.

PiperOrigin-RevId: 240625139
---
 .../exoplayer2/source/hls/HlsChunkSource.java | 100 +++++++++---------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
index b37433a618..40b2001f34 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
@@ -96,7 +96,7 @@ import java.util.Map;
   private final DataSource mediaDataSource;
   private final DataSource encryptionDataSource;
   private final TimestampAdjusterProvider timestampAdjusterProvider;
-  private final HlsUrl[] variants;
+  private final HlsUrl[] hlsUrls;
   private final HlsPlaylistTracker playlistTracker;
   private final TrackGroup trackGroup;
   private final List<Format> muxedCaptionFormats;
@@ -119,7 +119,8 @@ import java.util.Map;
    * @param extractorFactory An {@link HlsExtractorFactory} from which to obtain the extractors for
    *     media chunks.
    * @param playlistTracker The {@link HlsPlaylistTracker} from which to obtain media playlists.
-   * @param variants The available variants.
+   * @param hlsUrls The {@link HlsUrl} instances corresponding to media playlists from which this
+   *     chunk source can obtain media.
    * @param dataSourceFactory An {@link HlsDataSourceFactory} to create {@link DataSource}s for the
    *     chunks.
    * @param mediaTransferListener The transfer listener which should be informed of any media data
@@ -133,22 +134,22 @@ import java.util.Map;
   public HlsChunkSource(
       HlsExtractorFactory extractorFactory,
       HlsPlaylistTracker playlistTracker,
-      HlsUrl[] variants,
+      HlsUrl[] hlsUrls,
       HlsDataSourceFactory dataSourceFactory,
       @Nullable TransferListener mediaTransferListener,
       TimestampAdjusterProvider timestampAdjusterProvider,
       List<Format> muxedCaptionFormats) {
     this.extractorFactory = extractorFactory;
     this.playlistTracker = playlistTracker;
-    this.variants = variants;
+    this.hlsUrls = hlsUrls;
     this.timestampAdjusterProvider = timestampAdjusterProvider;
     this.muxedCaptionFormats = muxedCaptionFormats;
     keyCache = new FullSegmentEncryptionKeyCache();
     liveEdgeInPeriodTimeUs = C.TIME_UNSET;
-    Format[] variantFormats = new Format[variants.length];
-    int[] initialTrackSelection = new int[variants.length];
-    for (int i = 0; i < variants.length; i++) {
-      variantFormats[i] = variants[i].format;
+    Format[] trackFormats = new Format[hlsUrls.length];
+    int[] initialTrackSelection = new int[hlsUrls.length];
+    for (int i = 0; i < hlsUrls.length; i++) {
+      trackFormats[i] = hlsUrls[i].format;
       initialTrackSelection[i] = i;
     }
     mediaDataSource = dataSourceFactory.createDataSource(C.DATA_TYPE_MEDIA);
@@ -156,7 +157,7 @@ import java.util.Map;
       mediaDataSource.addTransferListener(mediaTransferListener);
     }
     encryptionDataSource = dataSourceFactory.createDataSource(C.DATA_TYPE_DRM);
-    trackGroup = new TrackGroup(variantFormats);
+    trackGroup = new TrackGroup(trackFormats);
     trackSelection = new InitializationTrackSelection(trackGroup, initialTrackSelection);
   }
 
@@ -234,12 +235,11 @@ import java.util.Map;
   public void getNextChunk(
       long playbackPositionUs, long loadPositionUs, List<HlsMediaChunk> queue, HlsChunkHolder out) {
     HlsMediaChunk previous = queue.isEmpty() ? null : queue.get(queue.size() - 1);
-    int oldVariantIndex = previous == null ? C.INDEX_UNSET
-        : trackGroup.indexOf(previous.trackFormat);
+    int oldTrackIndex = previous == null ? C.INDEX_UNSET : trackGroup.indexOf(previous.trackFormat);
     long bufferedDurationUs = loadPositionUs - playbackPositionUs;
     long timeToLiveEdgeUs = resolveTimeToLiveEdgeUs(playbackPositionUs);
     if (previous != null && !independentSegments) {
-      // Unless segments are known to be independent, switching variant requires downloading
+      // Unless segments are known to be independent, switching tracks requires downloading
       // overlapping segments. Hence we subtract the previous segment's duration from the buffered
       // duration.
       // This may affect the live-streaming adaptive track selection logic, when we compare the
@@ -252,23 +252,23 @@ import java.util.Map;
       }
     }
 
-    // Select the variant.
+    // Select the track.
     MediaChunkIterator[] mediaChunkIterators = createMediaChunkIterators(previous, loadPositionUs);
     trackSelection.updateSelectedTrack(
         playbackPositionUs, bufferedDurationUs, timeToLiveEdgeUs, queue, mediaChunkIterators);
-    int selectedVariantIndex = trackSelection.getSelectedIndexInTrackGroup();
+    int selectedTrackIndex = trackSelection.getSelectedIndexInTrackGroup();
 
-    boolean switchingVariant = oldVariantIndex != selectedVariantIndex;
-    HlsUrl selectedUrl = variants[selectedVariantIndex];
-    if (!playlistTracker.isSnapshotValid(selectedUrl)) {
-      out.playlist = selectedUrl;
-      seenExpectedPlaylistError &= expectedPlaylistUrl == selectedUrl;
-      expectedPlaylistUrl = selectedUrl;
+    boolean switchingTrack = oldTrackIndex != selectedTrackIndex;
+    HlsUrl selectedHlsUrl = hlsUrls[selectedTrackIndex];
+    if (!playlistTracker.isSnapshotValid(selectedHlsUrl)) {
+      out.playlist = selectedHlsUrl;
+      seenExpectedPlaylistError &= expectedPlaylistUrl == selectedHlsUrl;
+      expectedPlaylistUrl = selectedHlsUrl;
       // Retry when playlist is refreshed.
       return;
     }
     HlsMediaPlaylist mediaPlaylist =
-        playlistTracker.getPlaylistSnapshot(selectedUrl, /* isForPlayback= */ true);
+        playlistTracker.getPlaylistSnapshot(selectedHlsUrl, /* isForPlayback= */ true);
     independentSegments = mediaPlaylist.hasIndependentSegments;
 
     updateLiveEdgeTimeUs(mediaPlaylist);
@@ -278,14 +278,15 @@ import java.util.Map;
         mediaPlaylist.startTimeUs - playlistTracker.getInitialStartTimeUs();
     long chunkMediaSequence =
         getChunkMediaSequence(
-            previous, switchingVariant, mediaPlaylist, startOfPlaylistInPeriodUs, loadPositionUs);
+            previous, switchingTrack, mediaPlaylist, startOfPlaylistInPeriodUs, loadPositionUs);
     if (chunkMediaSequence < mediaPlaylist.mediaSequence) {
-      if (previous != null && switchingVariant) {
+      if (previous != null && switchingTrack) {
         // We try getting the next chunk without adapting in case that's the reason for falling
         // behind the live window.
-        selectedVariantIndex = oldVariantIndex;
-        selectedUrl = variants[selectedVariantIndex];
-        mediaPlaylist = playlistTracker.getPlaylistSnapshot(selectedUrl, /* isForPlayback= */ true);
+        selectedTrackIndex = oldTrackIndex;
+        selectedHlsUrl = hlsUrls[selectedTrackIndex];
+        mediaPlaylist =
+            playlistTracker.getPlaylistSnapshot(selectedHlsUrl, /* isForPlayback= */ true);
         startOfPlaylistInPeriodUs =
             mediaPlaylist.startTimeUs - playlistTracker.getInitialStartTimeUs();
         chunkMediaSequence = previous.getNextChunkIndex();
@@ -300,9 +301,9 @@ import java.util.Map;
       if (mediaPlaylist.hasEndTag) {
         out.endOfStream = true;
       } else /* Live */ {
-        out.playlist = selectedUrl;
-        seenExpectedPlaylistError &= expectedPlaylistUrl == selectedUrl;
-        expectedPlaylistUrl = selectedUrl;
+        out.playlist = selectedHlsUrl;
+        seenExpectedPlaylistError &= expectedPlaylistUrl == selectedHlsUrl;
+        expectedPlaylistUrl = selectedHlsUrl;
       }
       return;
     }
@@ -315,12 +316,12 @@ import java.util.Map;
 
     // Check if the segment or its initialization segment are fully encrypted.
     Uri initSegmentKeyUri = getFullEncryptionKeyUri(mediaPlaylist, segment.initializationSegment);
-    out.chunk = maybeCreateEncryptionChunkFor(initSegmentKeyUri, selectedVariantIndex);
+    out.chunk = maybeCreateEncryptionChunkFor(initSegmentKeyUri, selectedTrackIndex);
     if (out.chunk != null) {
       return;
     }
     Uri mediaSegmentKeyUri = getFullEncryptionKeyUri(mediaPlaylist, segment);
-    out.chunk = maybeCreateEncryptionChunkFor(mediaSegmentKeyUri, selectedVariantIndex);
+    out.chunk = maybeCreateEncryptionChunkFor(mediaSegmentKeyUri, selectedTrackIndex);
     if (out.chunk != null) {
       return;
     }
@@ -332,7 +333,7 @@ import java.util.Map;
             startOfPlaylistInPeriodUs,
             mediaPlaylist,
             segmentIndexInPlaylist,
-            selectedUrl,
+            selectedHlsUrl,
             muxedCaptionFormats,
             trackSelection.getSelectionReason(),
             trackSelection.getSelectionData(),
@@ -374,13 +375,13 @@ import java.util.Map;
   /**
    * Called when a playlist load encounters an error.
    *
-   * @param url The url of the playlist whose load encountered an error.
+   * @param hlsUrl The {@link HlsUrl} of the playlist whose load encountered an error.
    * @param blacklistDurationMs The duration for which the playlist should be blacklisted. Or {@link
    *     C#TIME_UNSET} if the playlist should not be blacklisted.
    * @return True if blacklisting did not encounter errors. False otherwise.
    */
-  public boolean onPlaylistError(HlsUrl url, long blacklistDurationMs) {
-    int trackGroupIndex = trackGroup.indexOf(url.format);
+  public boolean onPlaylistError(HlsUrl hlsUrl, long blacklistDurationMs) {
+    int trackGroupIndex = trackGroup.indexOf(hlsUrl.format);
     if (trackGroupIndex == C.INDEX_UNSET) {
       return true;
     }
@@ -388,7 +389,7 @@ import java.util.Map;
     if (trackSelectionIndex == C.INDEX_UNSET) {
       return true;
     }
-    seenExpectedPlaylistError |= expectedPlaylistUrl == url;
+    seenExpectedPlaylistError |= expectedPlaylistUrl == hlsUrl;
     return blacklistDurationMs == C.TIME_UNSET
         || trackSelection.blacklist(trackSelectionIndex, blacklistDurationMs);
   }
@@ -402,24 +403,23 @@ import java.util.Map;
    */
   public MediaChunkIterator[] createMediaChunkIterators(
       @Nullable HlsMediaChunk previous, long loadPositionUs) {
-    int oldVariantIndex =
-        previous == null ? C.INDEX_UNSET : trackGroup.indexOf(previous.trackFormat);
+    int oldTrackIndex = previous == null ? C.INDEX_UNSET : trackGroup.indexOf(previous.trackFormat);
     MediaChunkIterator[] chunkIterators = new MediaChunkIterator[trackSelection.length()];
     for (int i = 0; i < chunkIterators.length; i++) {
-      int variantIndex = trackSelection.getIndexInTrackGroup(i);
-      HlsUrl variantUrl = variants[variantIndex];
-      if (!playlistTracker.isSnapshotValid(variantUrl)) {
+      int trackIndex = trackSelection.getIndexInTrackGroup(i);
+      HlsUrl hlsUrl = hlsUrls[trackIndex];
+      if (!playlistTracker.isSnapshotValid(hlsUrl)) {
         chunkIterators[i] = MediaChunkIterator.EMPTY;
         continue;
       }
       HlsMediaPlaylist playlist =
-          playlistTracker.getPlaylistSnapshot(variantUrl, /* isForPlayback= */ false);
+          playlistTracker.getPlaylistSnapshot(hlsUrl, /* isForPlayback= */ false);
       long startOfPlaylistInPeriodUs =
           playlist.startTimeUs - playlistTracker.getInitialStartTimeUs();
-      boolean switchingVariant = variantIndex != oldVariantIndex;
+      boolean switchingTrack = trackIndex != oldTrackIndex;
       long chunkMediaSequence =
           getChunkMediaSequence(
-              previous, switchingVariant, playlist, startOfPlaylistInPeriodUs, loadPositionUs);
+              previous, switchingTrack, playlist, startOfPlaylistInPeriodUs, loadPositionUs);
       if (chunkMediaSequence < playlist.mediaSequence) {
         chunkIterators[i] = MediaChunkIterator.EMPTY;
         continue;
@@ -437,8 +437,8 @@ import java.util.Map;
    * Returns the media sequence number of the segment to load next in {@code mediaPlaylist}.
    *
    * @param previous The last (at least partially) loaded segment.
-   * @param switchingVariant Whether the segment to load is not preceded by a segment in the same
-   *     variant.
+   * @param switchingTrack Whether the segment to load is not preceded by a segment in the same
+   *     track.
    * @param mediaPlaylist The media playlist to which the segment to load belongs.
    * @param startOfPlaylistInPeriodUs The start of {@code mediaPlaylist} relative to the period
    *     start in microseconds.
@@ -447,11 +447,11 @@ import java.util.Map;
    */
   private long getChunkMediaSequence(
       @Nullable HlsMediaChunk previous,
-      boolean switchingVariant,
+      boolean switchingTrack,
       HlsMediaPlaylist mediaPlaylist,
       long startOfPlaylistInPeriodUs,
       long loadPositionUs) {
-    if (previous == null || switchingVariant) {
+    if (previous == null || switchingTrack) {
       long endOfPlaylistInPeriodUs = startOfPlaylistInPeriodUs + mediaPlaylist.durationUs;
       long targetPositionInPeriodUs =
           (previous == null || independentSegments) ? loadPositionUs : previous.startTimeUs;
@@ -487,7 +487,7 @@ import java.util.Map;
   }
 
   @Nullable
-  private Chunk maybeCreateEncryptionChunkFor(@Nullable Uri keyUri, int selectedVariantIndex) {
+  private Chunk maybeCreateEncryptionChunkFor(@Nullable Uri keyUri, int selectedTrackIndex) {
     if (keyUri == null) {
       return null;
     }
@@ -502,7 +502,7 @@ import java.util.Map;
     return new EncryptionKeyChunk(
         encryptionDataSource,
         dataSpec,
-        variants[selectedVariantIndex].format,
+        hlsUrls[selectedTrackIndex].format,
         trackSelection.getSelectionReason(),
         trackSelection.getSelectionData(),
         scratchSpace);

From 62f719f3ee0a2fb883f775fd73dc8159f665dd4a Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 28 Mar 2019 10:20:33 +0000
Subject: [PATCH 682/832] Remove some long-deprecated DefaultDrmSessionManager
 constructors

PiperOrigin-RevId: 240742207
---
 .../drm/DefaultDrmSessionManager.java         | 128 ------------------
 1 file changed, 128 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
index e7828c0fed..3820836e49 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
@@ -47,10 +47,6 @@ import java.util.UUID;
 public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSessionManager<T>,
     ProvisioningManager<T> {
 
-  /** @deprecated Use {@link DefaultDrmSessionEventListener}. */
-  @Deprecated
-  public interface EventListener extends DefaultDrmSessionEventListener {}
-
   /**
    * Signals that the {@link DrmInitData} passed to {@link #acquireSession} does not contain does
    * not contain scheme data for the required UUID.
@@ -110,25 +106,6 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
 
   /* package */ volatile @Nullable MediaDrmHandler mediaDrmHandler;
 
-  /**
-   * @deprecated Use {@link #newWidevineInstance(MediaDrmCallback, HashMap)} and {@link
-   *     #addListener(Handler, DefaultDrmSessionEventListener)}.
-   */
-  @Deprecated
-  public static DefaultDrmSessionManager<FrameworkMediaCrypto> newWidevineInstance(
-      MediaDrmCallback callback,
-      @Nullable HashMap<String, String> optionalKeyRequestParameters,
-      @Nullable Handler eventHandler,
-      @Nullable DefaultDrmSessionEventListener eventListener)
-      throws UnsupportedDrmException {
-    DefaultDrmSessionManager<FrameworkMediaCrypto> drmSessionManager =
-        newWidevineInstance(callback, optionalKeyRequestParameters);
-    if (eventHandler != null && eventListener != null) {
-      drmSessionManager.addListener(eventHandler, eventListener);
-    }
-    return drmSessionManager;
-  }
-
   /**
    * Instantiates a new instance using the Widevine scheme.
    *
@@ -143,25 +120,6 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
     return newFrameworkInstance(C.WIDEVINE_UUID, callback, optionalKeyRequestParameters);
   }
 
-  /**
-   * @deprecated Use {@link #newPlayReadyInstance(MediaDrmCallback, String)} and {@link
-   *     #addListener(Handler, DefaultDrmSessionEventListener)}.
-   */
-  @Deprecated
-  public static DefaultDrmSessionManager<FrameworkMediaCrypto> newPlayReadyInstance(
-      MediaDrmCallback callback,
-      @Nullable String customData,
-      @Nullable Handler eventHandler,
-      @Nullable DefaultDrmSessionEventListener eventListener)
-      throws UnsupportedDrmException {
-    DefaultDrmSessionManager<FrameworkMediaCrypto> drmSessionManager =
-        newPlayReadyInstance(callback, customData);
-    if (eventHandler != null && eventListener != null) {
-      drmSessionManager.addListener(eventHandler, eventListener);
-    }
-    return drmSessionManager;
-  }
-
   /**
    * Instantiates a new instance using the PlayReady scheme.
    *
@@ -184,26 +142,6 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
     return newFrameworkInstance(C.PLAYREADY_UUID, callback, optionalKeyRequestParameters);
   }
 
-  /**
-   * @deprecated Use {@link #newFrameworkInstance(UUID, MediaDrmCallback, HashMap)} and {@link
-   *     #addListener(Handler, DefaultDrmSessionEventListener)}.
-   */
-  @Deprecated
-  public static DefaultDrmSessionManager<FrameworkMediaCrypto> newFrameworkInstance(
-      UUID uuid,
-      MediaDrmCallback callback,
-      @Nullable HashMap<String, String> optionalKeyRequestParameters,
-      @Nullable Handler eventHandler,
-      @Nullable DefaultDrmSessionEventListener eventListener)
-      throws UnsupportedDrmException {
-    DefaultDrmSessionManager<FrameworkMediaCrypto> drmSessionManager =
-        newFrameworkInstance(uuid, callback, optionalKeyRequestParameters);
-    if (eventHandler != null && eventListener != null) {
-      drmSessionManager.addListener(eventHandler, eventListener);
-    }
-    return drmSessionManager;
-  }
-
   /**
    * Instantiates a new instance.
    *
@@ -227,25 +165,6 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
         INITIAL_DRM_REQUEST_RETRY_COUNT);
   }
 
-  /**
-   * @deprecated Use {@link #DefaultDrmSessionManager(UUID, ExoMediaDrm, MediaDrmCallback, HashMap)}
-   *     and {@link #addListener(Handler, DefaultDrmSessionEventListener)}.
-   */
-  @Deprecated
-  @SuppressWarnings("method.invocation.invalid")
-  public DefaultDrmSessionManager(
-      UUID uuid,
-      ExoMediaDrm<T> mediaDrm,
-      MediaDrmCallback callback,
-      @Nullable HashMap<String, String> optionalKeyRequestParameters,
-      @Nullable Handler eventHandler,
-      @Nullable DefaultDrmSessionEventListener eventListener) {
-    this(uuid, mediaDrm, callback, optionalKeyRequestParameters);
-    if (eventHandler != null && eventListener != null) {
-      addListener(eventHandler, eventListener);
-    }
-  }
-
   /**
    * @param uuid The UUID of the drm scheme.
    * @param mediaDrm An underlying {@link ExoMediaDrm} for use by the manager.
@@ -267,26 +186,6 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
         INITIAL_DRM_REQUEST_RETRY_COUNT);
   }
 
-  /**
-   * @deprecated Use {@link #DefaultDrmSessionManager(UUID, ExoMediaDrm, MediaDrmCallback, HashMap,
-   *     boolean)} and {@link #addListener(Handler, DefaultDrmSessionEventListener)}.
-   */
-  @Deprecated
-  @SuppressWarnings("method.invocation.invalid")
-  public DefaultDrmSessionManager(
-      UUID uuid,
-      ExoMediaDrm<T> mediaDrm,
-      MediaDrmCallback callback,
-      @Nullable HashMap<String, String> optionalKeyRequestParameters,
-      @Nullable Handler eventHandler,
-      @Nullable DefaultDrmSessionEventListener eventListener,
-      boolean multiSession) {
-    this(uuid, mediaDrm, callback, optionalKeyRequestParameters, multiSession);
-    if (eventHandler != null && eventListener != null) {
-      addListener(eventHandler, eventListener);
-    }
-  }
-
   /**
    * @param uuid The UUID of the drm scheme.
    * @param mediaDrm An underlying {@link ExoMediaDrm} for use by the manager.
@@ -311,33 +210,6 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
         INITIAL_DRM_REQUEST_RETRY_COUNT);
   }
 
-  /**
-   * @deprecated Use {@link #DefaultDrmSessionManager(UUID, ExoMediaDrm, MediaDrmCallback, HashMap,
-   *     boolean, int)} and {@link #addListener(Handler, DefaultDrmSessionEventListener)}.
-   */
-  @Deprecated
-  @SuppressWarnings("method.invocation.invalid")
-  public DefaultDrmSessionManager(
-      UUID uuid,
-      ExoMediaDrm<T> mediaDrm,
-      MediaDrmCallback callback,
-      @Nullable HashMap<String, String> optionalKeyRequestParameters,
-      @Nullable Handler eventHandler,
-      @Nullable DefaultDrmSessionEventListener eventListener,
-      boolean multiSession,
-      int initialDrmRequestRetryCount) {
-    this(
-        uuid,
-        mediaDrm,
-        callback,
-        optionalKeyRequestParameters,
-        multiSession,
-        initialDrmRequestRetryCount);
-    if (eventHandler != null && eventListener != null) {
-      addListener(eventHandler, eventListener);
-    }
-  }
-
   /**
    * @param uuid The UUID of the drm scheme.
    * @param mediaDrm An underlying {@link ExoMediaDrm} for use by the manager.

From b1a13f96513b01a3b81816ca7b07d7305f47418d Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Thu, 28 Mar 2019 10:32:42 +0000
Subject: [PATCH 683/832] Create internal methods that will run on internal
 thread

This is the first of a series of cls that will convert DownloadManager
threading model as public methods post actions on an internal thread
which then do the work.

PiperOrigin-RevId: 240743400
---
 .../exoplayer2/offline/DownloadManager.java   | 188 ++++++++++--------
 1 file changed, 103 insertions(+), 85 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 904a842ad6..bca328f5e1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -237,23 +237,40 @@ public final class DownloadManager {
     logd("Created");
   }
 
+  /** Returns whether the manager has completed initialization. */
+  public boolean isInitialized() {
+    Assertions.checkState(!released);
+    return initialized;
+  }
+
+  /** Returns whether there are no active downloads. */
+  public boolean isIdle() {
+    Assertions.checkState(!released);
+    return initialized
+        && activeDownloads.isEmpty()
+        && dowloadUpdateQueue.isEmpty()
+        && !loadingDownload;
+  }
+
   /** Returns the used {@link DownloadIndex}. */
   public DownloadIndex getDownloadIndex() {
     return downloadIndex;
   }
 
-  /**
-   * Sets the requirements needed to be met to start downloads.
-   *
-   * @param requirements Need to be met to start downloads.
-   */
-  public void setRequirements(Requirements requirements) {
+  /** Returns the number of downloads. */
+  public int getDownloadCount() {
     Assertions.checkState(!released);
-    if (requirements.equals(requirementsWatcher.getRequirements())) {
-      return;
+    return downloads.size();
+  }
+
+  /** Returns the states of all current downloads. */
+  public DownloadState[] getAllDownloadStates() {
+    Assertions.checkState(!released);
+    DownloadState[] states = new DownloadState[downloads.size()];
+    for (int i = 0; i < states.length; i++) {
+      states[i] = downloads.get(i).getUpdatedDownloadState();
     }
-    requirementsWatcher.stop();
-    onRequirementsStateChanged(watchRequirements(requirements));
+    return states;
   }
 
   /** Returns the requirements needed to be met to start downloads. */
@@ -279,6 +296,16 @@ public final class DownloadManager {
     listeners.remove(listener);
   }
 
+  /**
+   * Sets the requirements needed to be met to start downloads.
+   *
+   * @param requirements Need to be met to start downloads.
+   */
+  public void setRequirements(Requirements requirements) {
+    Assertions.checkState(!released);
+    setRequirementsInternal(requirements);
+  }
+
   /**
    * Clears manual stop reason of all downloads. Downloads are started if the requirements are met.
    */
@@ -348,30 +375,7 @@ public final class DownloadManager {
    */
   public void addDownload(DownloadAction action) {
     Assertions.checkState(!released);
-    dowloadUpdateQueue.add(
-        new DownloadUpdater(action.id) {
-          @Override
-          void onExisting(Download download) {
-            download.addAction(action);
-            logd("Action is added to existing download", download);
-          }
-
-          @Override
-          DownloadState onLoad(@Nullable DownloadState downloadState) {
-            DownloadState state;
-            if (downloadState == null) {
-              state = new DownloadState(action);
-              logd("Download state is created for " + id);
-            } else {
-              state = downloadState.mergeAction(action);
-              logd("Download state is loaded for " + id);
-            }
-            return state;
-          }
-        });
-    if (initialized) {
-      processDownloadUpdateQueue();
-    }
+    addDownloadInternal(action);
   }
 
   /**
@@ -381,57 +385,7 @@ public final class DownloadManager {
    */
   public void removeDownload(String id) {
     Assertions.checkState(!released);
-    dowloadUpdateQueue.add(
-        new DownloadUpdater(id) {
-          @Override
-          void onExisting(Download download) {
-            download.remove();
-          }
-
-          @Override
-          DownloadState onLoad(@Nullable DownloadState downloadState) {
-            if (downloadState != null) {
-              downloadState = downloadState.setRemoveState();
-            } else {
-              logd("Can't remove download. No download with id: " + id);
-            }
-            return downloadState;
-          }
-        });
-    if (initialized) {
-      processDownloadUpdateQueue();
-    }
-  }
-
-  /** Returns the number of downloads. */
-  public int getDownloadCount() {
-    Assertions.checkState(!released);
-    return downloads.size();
-  }
-
-  /** Returns the states of all current downloads. */
-  public DownloadState[] getAllDownloadStates() {
-    Assertions.checkState(!released);
-    DownloadState[] states = new DownloadState[downloads.size()];
-    for (int i = 0; i < states.length; i++) {
-      states[i] = downloads.get(i).getUpdatedDownloadState();
-    }
-    return states;
-  }
-
-  /** Returns whether the manager has completed initialization. */
-  public boolean isInitialized() {
-    Assertions.checkState(!released);
-    return initialized;
-  }
-
-  /** Returns whether there are no active downloads. */
-  public boolean isIdle() {
-    Assertions.checkState(!released);
-    return initialized
-        && activeDownloads.isEmpty()
-        && dowloadUpdateQueue.isEmpty()
-        && !loadingDownload;
+    removeDownloadInternal(id);
   }
 
   /**
@@ -443,6 +397,12 @@ public final class DownloadManager {
     if (released) {
       return;
     }
+    releaseInternal();
+  }
+
+  // Methods that run on internal thread.
+
+  private void releaseInternal() {
     released = true;
     stopAllDownloadThreads();
     if (requirementsWatcher != null) {
@@ -455,6 +415,14 @@ public final class DownloadManager {
     logd("Released");
   }
 
+  private void setRequirementsInternal(Requirements requirements) {
+    if (requirements.equals(requirementsWatcher.getRequirements())) {
+      return;
+    }
+    requirementsWatcher.stop();
+    onRequirementsStateChanged(watchRequirements(requirements));
+  }
+
   private void setManualStopReason(@Nullable String id, int manualStopReason) {
     if (id != null) {
       Download download = getDownload(id);
@@ -483,6 +451,56 @@ public final class DownloadManager {
         });
   }
 
+  private void addDownloadInternal(DownloadAction action) {
+    dowloadUpdateQueue.add(
+        new DownloadUpdater(action.id) {
+          @Override
+          void onExisting(Download download) {
+            download.addAction(action);
+            logd("Action is added to existing download", download);
+          }
+
+          @Override
+          DownloadState onLoad(@Nullable DownloadState downloadState) {
+            DownloadState state;
+            if (downloadState == null) {
+              state = new DownloadState(action);
+              logd("Download state is created for " + id);
+            } else {
+              state = downloadState.mergeAction(action);
+              logd("Download state is loaded for " + id);
+            }
+            return state;
+          }
+        });
+    if (initialized) {
+      processDownloadUpdateQueue();
+    }
+  }
+
+  private void removeDownloadInternal(String id) {
+    dowloadUpdateQueue.add(
+        new DownloadUpdater(id) {
+          @Override
+          void onExisting(Download download) {
+            download.remove();
+          }
+
+          @Override
+          DownloadState onLoad(@Nullable DownloadState downloadState) {
+            if (downloadState != null) {
+              downloadState = downloadState.setRemoveState();
+            } else {
+              logd("Can't remove download. No download with id: " + id);
+            }
+            return downloadState;
+          }
+        });
+    if (initialized) {
+      processDownloadUpdateQueue();
+    }
+  }
+
   private void maybeNotifyListenersIdle() {
     if (!isIdle()) {
       return;

From bb48dc99169d18467e00f3aa46f84faf85e82133 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 28 Mar 2019 14:23:20 +0000
Subject: [PATCH 684/832] Close cursor in DownloadManager.

Not closing the cursor crashes the demo app when in run in StrictMode.

PiperOrigin-RevId: 240768493
---
 .../google/android/exoplayer2/offline/DownloadManager.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index bca328f5e1..cc124489ec 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -601,8 +601,9 @@ public final class DownloadManager {
     fileIOHandler.post(
         () -> {
           DownloadState[] loadedStates;
+          DownloadStateCursor cursor = null;
           try {
-            DownloadStateCursor cursor =
+            cursor =
                 downloadIndex.getDownloadStates(
                     STATE_QUEUED,
                     STATE_STOPPED,
@@ -618,6 +619,10 @@ public final class DownloadManager {
           } catch (Throwable e) {
             Log.e(TAG, "Download state loading failed.", e);
             loadedStates = new DownloadState[0];
+          } finally {
+            if (cursor != null) {
+              cursor.close();
+            }
           }
           final DownloadState[] states = loadedStates;
           handler.post(

From e8cf67c0cdf17fe0ee2c96b76b12e84a31962d5b Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 28 Mar 2019 14:58:49 +0000
Subject: [PATCH 685/832] Allow simplified custom adaptive track selection
 factories.

Custom factories currently need to copy most of the code in the
AdaptiveTrackSelection.Factory to make use of the same functionality.
Simplify this by allowing to overwrite the factory.

PiperOrigin-RevId: 240773271
---
 .../AdaptiveTrackSelection.java               | 53 ++++++++++---------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
index 93c31f899f..bbf57c5602 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
@@ -36,10 +36,8 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
  */
 public class AdaptiveTrackSelection extends BaseTrackSelection {
 
-  /**
-   * Factory for {@link AdaptiveTrackSelection} instances.
-   */
-  public static final class Factory implements TrackSelection.Factory {
+  /** Factory for {@link AdaptiveTrackSelection} instances. */
+  public static class Factory implements TrackSelection.Factory {
 
     private final @Nullable BandwidthMeter bandwidthMeter;
     private final int minDurationForQualityIncreaseMs;
@@ -215,7 +213,8 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
      *
      * @param trackBitrateEstimator A {@link TrackBitrateEstimator}.
      */
-    public void experimental_setTrackBitrateEstimator(TrackBitrateEstimator trackBitrateEstimator) {
+    public final void experimental_setTrackBitrateEstimator(
+        TrackBitrateEstimator trackBitrateEstimator) {
       this.trackBitrateEstimator = trackBitrateEstimator;
     }
 
@@ -224,13 +223,16 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
      *
      * <p>This method is experimental, and will be renamed or removed in a future release.
      */
-    public void experimental_enableBlockFixedTrackSelectionBandwidth() {
+    public final void experimental_enableBlockFixedTrackSelectionBandwidth() {
       this.blockFixedTrackSelectionBandwidth = true;
     }
 
     @Override
-    public @NullableType TrackSelection[] createTrackSelections(
+    public final @NullableType TrackSelection[] createTrackSelections(
         @NullableType Definition[] definitions, BandwidthMeter bandwidthMeter) {
+      if (this.bandwidthMeter != null) {
+        bandwidthMeter = this.bandwidthMeter;
+      }
       TrackSelection[] selections = new TrackSelection[definitions.length];
       List<AdaptiveTrackSelection> adaptiveSelections = new ArrayList<>();
       int totalFixedBandwidth = 0;
@@ -242,6 +244,7 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
         if (definition.tracks.length > 1) {
           AdaptiveTrackSelection adaptiveSelection =
               createAdaptiveTrackSelection(definition.group, bandwidthMeter, definition.tracks);
+          adaptiveSelection.experimental_setTrackBitrateEstimator(trackBitrateEstimator);
           adaptiveSelections.add(adaptiveSelection);
           selections[i] = adaptiveSelection;
         } else {
@@ -279,24 +282,26 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
       return selections;
     }
 
-    private AdaptiveTrackSelection createAdaptiveTrackSelection(
+    /**
+     * Creates a single adaptive selection for the given group, bandwidth meter and tracks.
+     *
+     * @param group The {@link TrackGroup}.
+     * @param bandwidthMeter A {@link BandwidthMeter} which can be used to select tracks.
+     * @param tracks The indices of the selected tracks in the track group.
+     * @return An {@link AdaptiveTrackSelection} for the specified tracks.
+     */
+    protected AdaptiveTrackSelection createAdaptiveTrackSelection(
         TrackGroup group, BandwidthMeter bandwidthMeter, int[] tracks) {
-      if (this.bandwidthMeter != null) {
-        bandwidthMeter = this.bandwidthMeter;
-      }
-      AdaptiveTrackSelection adaptiveTrackSelection =
-          new AdaptiveTrackSelection(
-              group,
-              tracks,
-              new DefaultBandwidthProvider(bandwidthMeter, bandwidthFraction),
-              minDurationForQualityIncreaseMs,
-              maxDurationForQualityDecreaseMs,
-              minDurationToRetainAfterDiscardMs,
-              bufferedFractionToLiveEdgeForQualityIncrease,
-              minTimeBetweenBufferReevaluationMs,
-              clock);
-      adaptiveTrackSelection.experimental_setTrackBitrateEstimator(trackBitrateEstimator);
-      return adaptiveTrackSelection;
+      return new AdaptiveTrackSelection(
+          group,
+          tracks,
+          new DefaultBandwidthProvider(bandwidthMeter, bandwidthFraction),
+          minDurationForQualityIncreaseMs,
+          maxDurationForQualityDecreaseMs,
+          minDurationToRetainAfterDiscardMs,
+          bufferedFractionToLiveEdgeForQualityIncrease,
+          minTimeBetweenBufferReevaluationMs,
+          clock);
     }
   }
 

From 28ea31cd4c0e973b34c312478ed84241a90a38d2 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 28 Mar 2019 15:12:58 +0000
Subject: [PATCH 686/832] Use Closeable interface for DownloadStateCursor to
 simplify closing.

PiperOrigin-RevId: 240775823
---
 .../exoplayer2/demo/DownloadTracker.java      |  4 +---
 .../exoplayer2/offline/DownloadManager.java   | 20 +++++++------------
 .../offline/DownloadStateCursor.java          | 10 ++++++----
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index 73e881208d..b484c1e92f 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -140,13 +140,11 @@ public class DownloadTracker implements DownloadManager.Listener {
   // Internal methods
 
   private void loadDownloads() {
-    try {
-      DownloadStateCursor loadedDownloadStates = downloadIndex.getDownloadStates();
+    try (DownloadStateCursor loadedDownloadStates = downloadIndex.getDownloadStates()) {
       while (loadedDownloadStates.moveToNext()) {
         DownloadState downloadState = loadedDownloadStates.getDownloadState();
         downloadStates.put(downloadState.uri, downloadState);
       }
-      loadedDownloadStates.close();
     } catch (IOException e) {
       Log.w(TAG, "Failed to query download states", e);
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index cc124489ec..5f4a0eae61 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -601,15 +601,13 @@ public final class DownloadManager {
     fileIOHandler.post(
         () -> {
           DownloadState[] loadedStates;
-          DownloadStateCursor cursor = null;
-          try {
-            cursor =
-                downloadIndex.getDownloadStates(
-                    STATE_QUEUED,
-                    STATE_STOPPED,
-                    STATE_DOWNLOADING,
-                    STATE_REMOVING,
-                    STATE_RESTARTING);
+          try (DownloadStateCursor cursor =
+              downloadIndex.getDownloadStates(
+                  STATE_QUEUED,
+                  STATE_STOPPED,
+                  STATE_DOWNLOADING,
+                  STATE_REMOVING,
+                  STATE_RESTARTING)) {
             loadedStates = new DownloadState[cursor.getCount()];
             for (int i = 0, length = loadedStates.length; i < length; i++) {
               cursor.moveToNext();
@@ -619,10 +617,6 @@ public final class DownloadManager {
           } catch (Throwable e) {
             Log.e(TAG, "Download state loading failed.", e);
             loadedStates = new DownloadState[0];
-          } finally {
-            if (cursor != null) {
-              cursor.close();
-            }
           }
           final DownloadState[] states = loadedStates;
           handler.post(
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadStateCursor.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadStateCursor.java
index 06511c8930..3f9201c0e9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadStateCursor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadStateCursor.java
@@ -15,8 +15,10 @@
  */
 package com.google.android.exoplayer2.offline;
 
+import java.io.Closeable;
+
 /** Provides random read-write access to the result set returned by a database query. */
-public interface DownloadStateCursor {
+public interface DownloadStateCursor extends Closeable {
 
   /** Returns the DownloadState at the current position. */
   DownloadState getDownloadState();
@@ -119,9 +121,9 @@ public interface DownloadStateCursor {
     return getPosition() == getCount();
   }
 
-  /** Closes the Cursor, releasing all of its resources and making it completely invalid. */
-  void close();
-
   /** Returns whether the cursor is closed */
   boolean isClosed();
+
+  @Override
+  void close();
 }

From 32924e3f178cd76dbf0ccbe1202618d10701fffb Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 28 Mar 2019 17:30:25 +0000
Subject: [PATCH 687/832] Use role flags in DefaultTrackNameProvider.

Also make combination of language and role flags the default over the label,
as it's more readable and auto-translated into other languages.

PiperOrigin-RevId: 240801070
---
 .../ui/DefaultTrackNameProvider.java          | 49 ++++++++++++++-----
 library/ui/src/main/res/values/strings.xml    |  8 +++
 2 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTrackNameProvider.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTrackNameProvider.java
index 7034ba73f5..a3d20eadb7 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTrackNameProvider.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTrackNameProvider.java
@@ -39,15 +39,17 @@ public class DefaultTrackNameProvider implements TrackNameProvider {
     String trackName;
     int trackType = inferPrimaryTrackType(format);
     if (trackType == C.TRACK_TYPE_VIDEO) {
-      trackName = joinWithSeparator(buildResolutionString(format), buildBitrateString(format));
+      trackName =
+          joinWithSeparator(
+              buildRoleString(format), buildResolutionString(format), buildBitrateString(format));
     } else if (trackType == C.TRACK_TYPE_AUDIO) {
       trackName =
           joinWithSeparator(
-              buildLabelString(format),
+              buildLanguageOrLabelString(format),
               buildAudioChannelString(format),
               buildBitrateString(format));
     } else {
-      trackName = buildLabelString(format);
+      trackName = buildLanguageOrLabelString(format);
     }
     return trackName.length() == 0 ? resources.getString(R.string.exo_track_unknown) : trackName;
   }
@@ -87,22 +89,43 @@ public class DefaultTrackNameProvider implements TrackNameProvider {
     }
   }
 
-  private String buildLabelString(Format format) {
-    if (!TextUtils.isEmpty(format.label)) {
-      return format.label;
-    }
-    // Fall back to using the language.
-    String language = format.language;
-    return TextUtils.isEmpty(language) || C.LANGUAGE_UNDETERMINED.equals(language)
-        ? ""
-        : buildLanguageString(language);
+  private String buildLanguageOrLabelString(Format format) {
+    String languageAndRole =
+        joinWithSeparator(buildLanguageString(format), buildRoleString(format));
+    return TextUtils.isEmpty(languageAndRole) ? buildLabelString(format) : languageAndRole;
   }
 
-  private String buildLanguageString(String language) {
+  private String buildLabelString(Format format) {
+    return TextUtils.isEmpty(format.label) ? "" : format.label;
+  }
+
+  private String buildLanguageString(Format format) {
+    String language = format.language;
+    if (TextUtils.isEmpty(language) || C.LANGUAGE_UNDETERMINED.equals(language)) {
+      return "";
+    }
     Locale locale = Util.SDK_INT >= 21 ? Locale.forLanguageTag(language) : new Locale(language);
     return locale.getDisplayName();
   }
 
+  private String buildRoleString(Format format) {
+    String roles = "";
+    if ((format.roleFlags & C.ROLE_FLAG_ALTERNATE) != 0) {
+      roles = resources.getString(R.string.exo_track_role_alternate);
+    }
+    if ((format.roleFlags & C.ROLE_FLAG_SUPPLEMENTARY) != 0) {
+      roles = joinWithSeparator(roles, resources.getString(R.string.exo_track_role_supplementary));
+    }
+    if ((format.roleFlags & C.ROLE_FLAG_COMMENTARY) != 0) {
+      roles = joinWithSeparator(roles, resources.getString(R.string.exo_track_role_commentary));
+    }
+    if ((format.roleFlags & (C.ROLE_FLAG_CAPTION | C.ROLE_FLAG_DESCRIBES_MUSIC_AND_SOUND)) != 0) {
+      roles =
+          joinWithSeparator(roles, resources.getString(R.string.exo_track_role_closed_captions));
+    }
+    return roles;
+  }
+
   private String joinWithSeparator(String... items) {
     String itemList = "";
     for (String item : items) {
diff --git a/library/ui/src/main/res/values/strings.xml b/library/ui/src/main/res/values/strings.xml
index 036a0e0495..bbb4aca8d5 100644
--- a/library/ui/src/main/res/values/strings.xml
+++ b/library/ui/src/main/res/values/strings.xml
@@ -76,6 +76,14 @@
   <string name="exo_track_surround_5_point_1">5.1 surround sound</string>
   <!-- Describes a 7.1 (https://en.wikipedia.org/wiki/7.1_surround_sound) audio track. [CHAR LIMIT=40] -->
   <string name="exo_track_surround_7_point_1">7.1 surround sound</string>
+  <!-- Describes an alternate track, e.g. a video recorded from a different viewpoint. [CHAR LIMIT=40] -->
+  <string name="exo_track_role_alternate">Alternate</string>
+  <!-- Describes a supplementary track. [CHAR LIMIT=40] -->
+  <string name="exo_track_role_supplementary">Supplementary</string>
+  <!-- Describes a track containing commentary. [CHAR LIMIT=40] -->
+  <string name="exo_track_role_commentary">Commentary</string>
+  <!-- Describes a track with closed captions. [CHAR LIMIT=40] -->
+  <string name="exo_track_role_closed_captions">CC</string>
   <!-- Describes the bitrate of a media track in Megabits (https://en.wikipedia.org/wiki/Megabit) per second. [CHAR LIMIT=20] -->
   <string name="exo_track_bitrate"><xliff:g id="bitrate" example="5.2">%1$.2f</xliff:g> Mbps</string>
   <!-- Defines a way of appending an item to a list of items. For example appending "banana" to "apple, pear" to get "apple, pear, banana". Note: the command separator will appear between all consecutive list items, so do not use an equivalent of 'and'. [CHAR LIMIT=40] -->

From 2623b4b3820251409d0bf17f8fe64923864087dd Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 29 Mar 2019 13:13:24 +0000
Subject: [PATCH 688/832] Pre-resolve HlsUrl urls

This is to make it possible to use equality of HlsUrl.url fields
to determine whether two HlsUrls point at the same media playlist.
This doesn't work currently because it's possible to mix absolute
and relative urls, which will not be equal until after the relative
url is resolved against the playlist baseUrl.

Issue: #5596
Issue: #2600
PiperOrigin-RevId: 240966503
---
 .../source/hls/offline/HlsDownloader.java       | 17 +++++++----------
 .../hls/playlist/DefaultHlsPlaylistTracker.java |  3 +--
 .../source/hls/playlist/HlsMasterPlaylist.java  | 17 ++++++++---------
 .../source/hls/playlist/HlsPlaylistParser.java  |  7 +++++--
 .../source/hls/playlist/HlsPlaylistTracker.java |  8 ++++----
 .../source/hls/HlsMediaPeriodTest.java          | 15 +++++++--------
 .../playlist/HlsMasterPlaylistParserTest.java   | 14 ++++++++------
 7 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java
index 803f914686..630170e358 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java
@@ -78,16 +78,15 @@ public final class HlsDownloader extends SegmentDownloader<HlsPlaylist> {
   @Override
   protected List<Segment> getSegments(
       DataSource dataSource, HlsPlaylist playlist, boolean allowIncompleteList) throws IOException {
-    String baseUri = playlist.baseUri;
-
     ArrayList<DataSpec> mediaPlaylistDataSpecs = new ArrayList<>();
     if (playlist instanceof HlsMasterPlaylist) {
       HlsMasterPlaylist masterPlaylist = (HlsMasterPlaylist) playlist;
-      addMediaPlaylistDataSpecs(baseUri, masterPlaylist.variants, mediaPlaylistDataSpecs);
-      addMediaPlaylistDataSpecs(baseUri, masterPlaylist.audios, mediaPlaylistDataSpecs);
-      addMediaPlaylistDataSpecs(baseUri, masterPlaylist.subtitles, mediaPlaylistDataSpecs);
+      addMediaPlaylistDataSpecs(masterPlaylist.variants, mediaPlaylistDataSpecs);
+      addMediaPlaylistDataSpecs(masterPlaylist.audios, mediaPlaylistDataSpecs);
+      addMediaPlaylistDataSpecs(masterPlaylist.subtitles, mediaPlaylistDataSpecs);
     } else {
-      mediaPlaylistDataSpecs.add(SegmentDownloader.getCompressibleDataSpec(Uri.parse(baseUri)));
+      mediaPlaylistDataSpecs.add(
+          SegmentDownloader.getCompressibleDataSpec(Uri.parse(playlist.baseUri)));
     }
 
     ArrayList<Segment> segments = new ArrayList<>();
@@ -119,11 +118,9 @@ public final class HlsDownloader extends SegmentDownloader<HlsPlaylist> {
     return segments;
   }
 
-  private void addMediaPlaylistDataSpecs(
-      String baseUri, List<? extends HlsUrl> urls, List<DataSpec> out) {
+  private void addMediaPlaylistDataSpecs(List<? extends HlsUrl> urls, List<DataSpec> out) {
     for (int i = 0; i < urls.size(); i++) {
-      Uri playlistUri = UriUtil.resolveToUri(baseUri, urls.get(i).url);
-      out.add(SegmentDownloader.getCompressibleDataSpec(playlistUri));
+      out.add(SegmentDownloader.getCompressibleDataSpec(urls.get(i).url));
     }
   }
 
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
index 93f617003d..b7b5f8c48e 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
@@ -32,7 +32,6 @@ import com.google.android.exoplayer2.upstream.Loader;
 import com.google.android.exoplayer2.upstream.Loader.LoadErrorAction;
 import com.google.android.exoplayer2.upstream.ParsingLoadable;
 import com.google.android.exoplayer2.util.Assertions;
-import com.google.android.exoplayer2.util.UriUtil;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.IdentityHashMap;
@@ -454,7 +453,7 @@ public final class DefaultHlsPlaylistTracker
       mediaPlaylistLoadable =
           new ParsingLoadable<>(
               dataSourceFactory.createDataSource(C.DATA_TYPE_MANIFEST),
-              UriUtil.resolveToUri(masterPlaylist.baseUri, playlistUrl.url),
+              playlistUrl.url,
               C.DATA_TYPE_MANIFEST,
               mediaPlaylistParser);
     }
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
index a37ebe6054..b76d2b010d 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.source.hls.playlist;
 
+import android.net.Uri;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.drm.DrmInitData;
@@ -52,10 +53,8 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
   /** Represents a url in an HLS master playlist. */
   public abstract static class HlsUrl {
 
-    /**
-     * The http url from which the media playlist can be obtained.
-     */
-    public final String url;
+    /** The http url from which the media playlist can be obtained. */
+    public final Uri url;
     /**
      * Format information associated with the HLS url.
      */
@@ -65,7 +64,7 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
      * @param url See {@link #url}.
      * @param format See {@link #format}.
      */
-    public HlsUrl(String url, Format format) {
+    public HlsUrl(Uri url, Format format) {
       this.url = url;
       this.format = format;
     }
@@ -95,7 +94,7 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
      * @param captionGroupId See {@link #captionGroupId}.
      */
     public Variant(
-        String url,
+        Uri url,
         Format format,
         @Nullable String videoGroupId,
         @Nullable String audioGroupId,
@@ -114,7 +113,7 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
      * @param url The media playlist url.
      * @return The variant instance.
      */
-    public static Variant createMediaPlaylistVariantUrl(String url) {
+    public static Variant createMediaPlaylistVariantUrl(Uri url) {
       Format format =
           Format.createContainerFormat(
               "0",
@@ -151,7 +150,7 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
      * @param groupId See {@link #groupId}.
      * @param name See {@link #name}.
      */
-    public Rendition(String url, Format format, String groupId, String name) {
+    public Rendition(Uri url, Format format, String groupId, String name) {
       super(url, format);
       this.groupId = groupId;
       this.name = name;
@@ -253,7 +252,7 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
    */
   public static HlsMasterPlaylist createSingleVariantMasterPlaylist(String variantUrl) {
     List<Variant> variant =
-        Collections.singletonList(Variant.createMediaPlaylistVariantUrl(variantUrl));
+        Collections.singletonList(Variant.createMediaPlaylistVariantUrl(Uri.parse(variantUrl)));
     return new HlsMasterPlaylist(
         /* baseUri= */ null,
         /* tags= */ Collections.emptyList(),
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
index 1a22dd1636..96df95cc74 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
@@ -31,6 +31,7 @@ import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.Varia
 import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist.Segment;
 import com.google.android.exoplayer2.upstream.ParsingLoadable;
 import com.google.android.exoplayer2.util.MimeTypes;
+import com.google.android.exoplayer2.util.UriUtil;
 import com.google.android.exoplayer2.util.Util;
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -337,6 +338,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
         line =
             replaceVariableReferences(
                 iterator.next(), variableDefinitions); // #EXT-X-STREAM-INF's URI.
+        Uri uri = UriUtil.resolveToUri(baseUri, line);
         Format format =
             Format.createVideoContainerFormat(
                 /* id= */ Integer.toString(variants.size()),
@@ -353,7 +355,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
                 /* roleFlags= */ 0);
         Variant variant =
             new Variant(
-                line, format, videoGroupId, audioGroupId, subtitlesGroupId, closedCaptionsGroupId);
+                uri, format, videoGroupId, audioGroupId, subtitlesGroupId, closedCaptionsGroupId);
         variants.add(variant);
         // TODO: Don't deduplicate variants by URL.
         if (variantUrls.add(line)) {
@@ -366,7 +368,8 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
       line = mediaTags.get(i);
       String groupId = parseStringAttr(line, REGEX_GROUP_ID, variableDefinitions);
       String name = parseStringAttr(line, REGEX_NAME, variableDefinitions);
-      String uri = parseOptionalStringAttr(line, REGEX_URI, variableDefinitions);
+      String referenceUri = parseOptionalStringAttr(line, REGEX_URI, variableDefinitions);
+      Uri uri = referenceUri == null ? null : UriUtil.resolveToUri(baseUri, referenceUri);
       String language = parseOptionalStringAttr(line, REGEX_LANGUAGE, variableDefinitions);
       @C.SelectionFlags int selectionFlags = parseSelectionFlags(line);
       @C.RoleFlags int roleFlags = parseRoleFlags(line, variableDefinitions);
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java
index 12df8f310e..20cfebc7c5 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java
@@ -88,14 +88,14 @@ public interface HlsPlaylistTracker {
   final class PlaylistStuckException extends IOException {
 
     /** The url of the stuck playlist. */
-    public final String url;
+    public final Uri url;
 
     /**
      * Creates an instance.
      *
      * @param url See {@link #url}.
      */
-    public PlaylistStuckException(String url) {
+    public PlaylistStuckException(Uri url) {
       this.url = url;
     }
   }
@@ -104,14 +104,14 @@ public interface HlsPlaylistTracker {
   final class PlaylistResetException extends IOException {
 
     /** The url of the reset playlist. */
-    public final String url;
+    public final Uri url;
 
     /**
      * Creates an instance.
      *
      * @param url See {@link #url}.
      */
-    public PlaylistResetException(String url) {
+    public PlaylistResetException(Uri url) {
       this.url = url;
     }
   }
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
index dcf44bc2ae..5988391213 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
@@ -19,6 +19,7 @@ import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import android.net.Uri;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.CompositeSequenceableLoaderFactory;
@@ -120,7 +121,6 @@ public final class HlsMediaPeriodTest {
 
   private static Variant createMuxedVideoAudioVariant(int bitrate) {
     return createVariant(
-        "http://url",
         Format.createVideoContainerFormat(
             /* id= */ null,
             /* label= */ null,
@@ -138,7 +138,6 @@ public final class HlsMediaPeriodTest {
 
   private static Variant createAudioOnlyVariant(int bitrate) {
     return createVariant(
-        "http://url",
         Format.createVideoContainerFormat(
             /* id= */ null,
             /* label= */ null,
@@ -155,19 +154,19 @@ public final class HlsMediaPeriodTest {
   }
 
   private static Rendition createAudioRendition(String language) {
-    return createRendition("http://url", createAudioFormat(language), "", "");
+    return createRendition(createAudioFormat(language), "", "");
   }
 
   private static Rendition createSubtitleRendition(String language) {
-    return createRendition("http://url", createSubtitleFormat(language), "", "");
+    return createRendition(createSubtitleFormat(language), "", "");
   }
 
-  private static Variant createVariant(String url, Format format) {
-    return new Variant(url, format, null, null, null, null);
+  private static Variant createVariant(Format format) {
+    return new Variant(Uri.parse("https://variant"), format, null, null, null, null);
   }
 
-  private static Rendition createRendition(String url, Format format, String groupId, String name) {
-    return new Rendition(url, format, groupId, name);
+  private static Rendition createRendition(Format format, String groupId, String name) {
+    return new Rendition(Uri.parse("https://rendition"), format, groupId, name);
   }
 
   private static Format createAudioFormat(String language) {
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
index 92f578951b..6d31305f03 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
@@ -158,32 +158,33 @@ public class HlsMasterPlaylistParserTest {
     assertThat(variants.get(0).format.codecs).isEqualTo("mp4a.40.2,avc1.66.30");
     assertThat(variants.get(0).format.width).isEqualTo(304);
     assertThat(variants.get(0).format.height).isEqualTo(128);
-    assertThat(variants.get(0).url).isEqualTo("http://example.com/low.m3u8");
+    assertThat(variants.get(0).url).isEqualTo(Uri.parse("http://example.com/low.m3u8"));
 
     assertThat(variants.get(1).format.bitrate).isEqualTo(1280000);
     assertThat(variants.get(1).format.codecs).isEqualTo("mp4a.40.2 , avc1.66.30 ");
-    assertThat(variants.get(1).url).isEqualTo("http://example.com/spaces_in_codecs.m3u8");
+    assertThat(variants.get(1).url)
+        .isEqualTo(Uri.parse("http://example.com/spaces_in_codecs.m3u8"));
 
     assertThat(variants.get(2).format.bitrate).isEqualTo(2560000);
     assertThat(variants.get(2).format.codecs).isNull();
     assertThat(variants.get(2).format.width).isEqualTo(384);
     assertThat(variants.get(2).format.height).isEqualTo(160);
     assertThat(variants.get(2).format.frameRate).isEqualTo(25.0f);
-    assertThat(variants.get(2).url).isEqualTo("http://example.com/mid.m3u8");
+    assertThat(variants.get(2).url).isEqualTo(Uri.parse("http://example.com/mid.m3u8"));
 
     assertThat(variants.get(3).format.bitrate).isEqualTo(7680000);
     assertThat(variants.get(3).format.codecs).isNull();
     assertThat(variants.get(3).format.width).isEqualTo(Format.NO_VALUE);
     assertThat(variants.get(3).format.height).isEqualTo(Format.NO_VALUE);
     assertThat(variants.get(3).format.frameRate).isEqualTo(29.997f);
-    assertThat(variants.get(3).url).isEqualTo("http://example.com/hi.m3u8");
+    assertThat(variants.get(3).url).isEqualTo(Uri.parse("http://example.com/hi.m3u8"));
 
     assertThat(variants.get(4).format.bitrate).isEqualTo(65000);
     assertThat(variants.get(4).format.codecs).isEqualTo("mp4a.40.5");
     assertThat(variants.get(4).format.width).isEqualTo(Format.NO_VALUE);
     assertThat(variants.get(4).format.height).isEqualTo(Format.NO_VALUE);
     assertThat(variants.get(4).format.frameRate).isEqualTo((float) Format.NO_VALUE);
-    assertThat(variants.get(4).url).isEqualTo("http://example.com/audio-only.m3u8");
+    assertThat(variants.get(4).url).isEqualTo(Uri.parse("http://example.com/audio-only.m3u8"));
   }
 
   @Test
@@ -291,7 +292,8 @@ public class HlsMasterPlaylistParserTest {
         parseMasterPlaylist(PLAYLIST_URI, PLAYLIST_WITH_VARIABLE_SUBSTITUTION);
     HlsMasterPlaylist.HlsUrl variant = playlistWithSubstitutions.variants.get(0);
     assertThat(variant.format.codecs).isEqualTo("mp4a.40.5");
-    assertThat(variant.url).isEqualTo("http://example.com/This/{$nested}/reference/shouldnt/work");
+    assertThat(variant.url)
+        .isEqualTo(Uri.parse("http://example.com/This/{$nested}/reference/shouldnt/work"));
   }
 
   private static HlsMasterPlaylist parseMasterPlaylist(String uri, String playlistString)

From 99f89132c219b52b991b4614322fa7af6208c906 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 29 Mar 2019 13:48:17 +0000
Subject: [PATCH 689/832] Remove HlsUrl and introduce
 HlsMasterPlaylist.mediaPlaylistUrls

- This removes the need for Variant and Rendition to have a common
  base class, allowing the url field to be marked as @Nullable in
  Rendition but not in Variant.
- The addition of mediaPlaylistUrls is needed for the new StreamKey
  indexing for HLS. It's also convenient in a couple of places (e.g.
  HlsDownloader), where a list of all media playlist URLs is needed.
- Lots of places where HlsUrl was passed only needed the actual
  URL (not the Format, which is the other piece of HlsUrl). Passing
  just the URL is a little simpler, and resolves some of the naming
  confusion.

Issue: #5596
Issue: #2600
PiperOrigin-RevId: 240970466
---
 .../exoplayer2/source/hls/HlsChunkSource.java |  88 +++++++-------
 .../exoplayer2/source/hls/HlsMediaChunk.java  |  26 ++--
 .../exoplayer2/source/hls/HlsMediaPeriod.java |  61 ++++++----
 .../source/hls/HlsSampleStreamWrapper.java    |  16 ++-
 .../source/hls/offline/HlsDownloader.java     |  11 +-
 .../playlist/DefaultHlsPlaylistTracker.java   | 112 ++++++++++--------
 .../hls/playlist/HlsMasterPlaylist.java       |  78 ++++++++----
 .../hls/playlist/HlsPlaylistTracker.java      |  36 +++---
 .../playlist/HlsMasterPlaylistParserTest.java |   2 +-
 9 files changed, 238 insertions(+), 192 deletions(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
index 40b2001f34..92756f19cf 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
@@ -27,7 +27,6 @@ import com.google.android.exoplayer2.source.chunk.Chunk;
 import com.google.android.exoplayer2.source.chunk.DataChunk;
 import com.google.android.exoplayer2.source.chunk.MediaChunk;
 import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
-import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.HlsUrl;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist.Segment;
 import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylistTracker;
@@ -70,10 +69,8 @@ import java.util.Map;
      */
     public boolean endOfStream;
 
-    /**
-     * Indicates that the chunk source is waiting for the referred playlist to be refreshed.
-     */
-    public HlsUrl playlist;
+    /** Indicates that the chunk source is waiting for the referred playlist to be refreshed. */
+    public Uri playlistUrl;
 
     /**
      * Clears the holder.
@@ -81,7 +78,7 @@ import java.util.Map;
     public void clear() {
       chunk = null;
       endOfStream = false;
-      playlist = null;
+      playlistUrl = null;
     }
 
   }
@@ -96,7 +93,8 @@ import java.util.Map;
   private final DataSource mediaDataSource;
   private final DataSource encryptionDataSource;
   private final TimestampAdjusterProvider timestampAdjusterProvider;
-  private final HlsUrl[] hlsUrls;
+  private final Uri[] playlistUrls;
+  private final Format[] playlistFormats;
   private final HlsPlaylistTracker playlistTracker;
   private final TrackGroup trackGroup;
   private final List<Format> muxedCaptionFormats;
@@ -105,7 +103,7 @@ import java.util.Map;
   private boolean isTimestampMaster;
   private byte[] scratchSpace;
   private IOException fatalError;
-  private HlsUrl expectedPlaylistUrl;
+  private Uri expectedPlaylistUrl;
   private boolean independentSegments;
 
   // Note: The track group in the selection is typically *not* equal to trackGroup. This is due to
@@ -119,8 +117,9 @@ import java.util.Map;
    * @param extractorFactory An {@link HlsExtractorFactory} from which to obtain the extractors for
    *     media chunks.
    * @param playlistTracker The {@link HlsPlaylistTracker} from which to obtain media playlists.
-   * @param hlsUrls The {@link HlsUrl} instances corresponding to media playlists from which this
-   *     chunk source can obtain media.
+   * @param playlistUrls The {@link Uri}s of the media playlists that can be adapted between by this
+   *     chunk source.
+   * @param playlistFormats The {@link Format Formats} corresponding to the media playlists.
    * @param dataSourceFactory An {@link HlsDataSourceFactory} to create {@link DataSource}s for the
    *     chunks.
    * @param mediaTransferListener The transfer listener which should be informed of any media data
@@ -134,30 +133,30 @@ import java.util.Map;
   public HlsChunkSource(
       HlsExtractorFactory extractorFactory,
       HlsPlaylistTracker playlistTracker,
-      HlsUrl[] hlsUrls,
+      Uri[] playlistUrls,
+      Format[] playlistFormats,
       HlsDataSourceFactory dataSourceFactory,
       @Nullable TransferListener mediaTransferListener,
       TimestampAdjusterProvider timestampAdjusterProvider,
       List<Format> muxedCaptionFormats) {
     this.extractorFactory = extractorFactory;
     this.playlistTracker = playlistTracker;
-    this.hlsUrls = hlsUrls;
+    this.playlistUrls = playlistUrls;
+    this.playlistFormats = playlistFormats;
     this.timestampAdjusterProvider = timestampAdjusterProvider;
     this.muxedCaptionFormats = muxedCaptionFormats;
     keyCache = new FullSegmentEncryptionKeyCache();
     liveEdgeInPeriodTimeUs = C.TIME_UNSET;
-    Format[] trackFormats = new Format[hlsUrls.length];
-    int[] initialTrackSelection = new int[hlsUrls.length];
-    for (int i = 0; i < hlsUrls.length; i++) {
-      trackFormats[i] = hlsUrls[i].format;
-      initialTrackSelection[i] = i;
-    }
     mediaDataSource = dataSourceFactory.createDataSource(C.DATA_TYPE_MEDIA);
     if (mediaTransferListener != null) {
       mediaDataSource.addTransferListener(mediaTransferListener);
     }
     encryptionDataSource = dataSourceFactory.createDataSource(C.DATA_TYPE_DRM);
-    trackGroup = new TrackGroup(trackFormats);
+    trackGroup = new TrackGroup(playlistFormats);
+    int[] initialTrackSelection = new int[playlistUrls.length];
+    for (int i = 0; i < playlistUrls.length; i++) {
+      initialTrackSelection[i] = i;
+    }
     trackSelection = new InitializationTrackSelection(trackGroup, initialTrackSelection);
   }
 
@@ -221,8 +220,8 @@ import java.util.Map;
    *
    * <p>If a chunk is available then {@link HlsChunkHolder#chunk} is set. If the end of the stream
    * has been reached then {@link HlsChunkHolder#endOfStream} is set. If a chunk is not available
-   * but the end of the stream has not been reached, {@link HlsChunkHolder#playlist} is set to
-   * contain the {@link HlsUrl} that refers to the playlist that needs refreshing.
+   * but the end of the stream has not been reached, {@link HlsChunkHolder#playlistUrl} is set to
+   * contain the {@link Uri} that refers to the playlist that needs refreshing.
    *
    * @param playbackPositionUs The current playback position relative to the period start in
    *     microseconds. If playback of the period to which this chunk source belongs has not yet
@@ -259,16 +258,16 @@ import java.util.Map;
     int selectedTrackIndex = trackSelection.getSelectedIndexInTrackGroup();
 
     boolean switchingTrack = oldTrackIndex != selectedTrackIndex;
-    HlsUrl selectedHlsUrl = hlsUrls[selectedTrackIndex];
-    if (!playlistTracker.isSnapshotValid(selectedHlsUrl)) {
-      out.playlist = selectedHlsUrl;
-      seenExpectedPlaylistError &= expectedPlaylistUrl == selectedHlsUrl;
-      expectedPlaylistUrl = selectedHlsUrl;
+    Uri selectedPlaylistUrl = playlistUrls[selectedTrackIndex];
+    if (!playlistTracker.isSnapshotValid(selectedPlaylistUrl)) {
+      out.playlistUrl = selectedPlaylistUrl;
+      seenExpectedPlaylistError &= selectedPlaylistUrl.equals(expectedPlaylistUrl);
+      expectedPlaylistUrl = selectedPlaylistUrl;
       // Retry when playlist is refreshed.
       return;
     }
     HlsMediaPlaylist mediaPlaylist =
-        playlistTracker.getPlaylistSnapshot(selectedHlsUrl, /* isForPlayback= */ true);
+        playlistTracker.getPlaylistSnapshot(selectedPlaylistUrl, /* isForPlayback= */ true);
     independentSegments = mediaPlaylist.hasIndependentSegments;
 
     updateLiveEdgeTimeUs(mediaPlaylist);
@@ -284,9 +283,9 @@ import java.util.Map;
         // We try getting the next chunk without adapting in case that's the reason for falling
         // behind the live window.
         selectedTrackIndex = oldTrackIndex;
-        selectedHlsUrl = hlsUrls[selectedTrackIndex];
+        selectedPlaylistUrl = playlistUrls[selectedTrackIndex];
         mediaPlaylist =
-            playlistTracker.getPlaylistSnapshot(selectedHlsUrl, /* isForPlayback= */ true);
+            playlistTracker.getPlaylistSnapshot(selectedPlaylistUrl, /* isForPlayback= */ true);
         startOfPlaylistInPeriodUs =
             mediaPlaylist.startTimeUs - playlistTracker.getInitialStartTimeUs();
         chunkMediaSequence = previous.getNextChunkIndex();
@@ -301,9 +300,9 @@ import java.util.Map;
       if (mediaPlaylist.hasEndTag) {
         out.endOfStream = true;
       } else /* Live */ {
-        out.playlist = selectedHlsUrl;
-        seenExpectedPlaylistError &= expectedPlaylistUrl == selectedHlsUrl;
-        expectedPlaylistUrl = selectedHlsUrl;
+        out.playlistUrl = selectedPlaylistUrl;
+        seenExpectedPlaylistError &= selectedPlaylistUrl.equals(expectedPlaylistUrl);
+        expectedPlaylistUrl = selectedPlaylistUrl;
       }
       return;
     }
@@ -330,10 +329,11 @@ import java.util.Map;
         HlsMediaChunk.createInstance(
             extractorFactory,
             mediaDataSource,
+            playlistFormats[selectedTrackIndex],
             startOfPlaylistInPeriodUs,
             mediaPlaylist,
             segmentIndexInPlaylist,
-            selectedHlsUrl,
+            selectedPlaylistUrl,
             muxedCaptionFormats,
             trackSelection.getSelectionReason(),
             trackSelection.getSelectionData(),
@@ -375,13 +375,19 @@ import java.util.Map;
   /**
    * Called when a playlist load encounters an error.
    *
-   * @param hlsUrl The {@link HlsUrl} of the playlist whose load encountered an error.
+   * @param playlistUrl The {@link Uri} of the playlist whose load encountered an error.
    * @param blacklistDurationMs The duration for which the playlist should be blacklisted. Or {@link
    *     C#TIME_UNSET} if the playlist should not be blacklisted.
    * @return True if blacklisting did not encounter errors. False otherwise.
    */
-  public boolean onPlaylistError(HlsUrl hlsUrl, long blacklistDurationMs) {
-    int trackGroupIndex = trackGroup.indexOf(hlsUrl.format);
+  public boolean onPlaylistError(Uri playlistUrl, long blacklistDurationMs) {
+    int trackGroupIndex = C.INDEX_UNSET;
+    for (int i = 0; i < playlistUrls.length; i++) {
+      if (playlistUrls[i].equals(playlistUrl)) {
+        trackGroupIndex = i;
+        break;
+      }
+    }
     if (trackGroupIndex == C.INDEX_UNSET) {
       return true;
     }
@@ -389,7 +395,7 @@ import java.util.Map;
     if (trackSelectionIndex == C.INDEX_UNSET) {
       return true;
     }
-    seenExpectedPlaylistError |= expectedPlaylistUrl == hlsUrl;
+    seenExpectedPlaylistError |= playlistUrl.equals(expectedPlaylistUrl);
     return blacklistDurationMs == C.TIME_UNSET
         || trackSelection.blacklist(trackSelectionIndex, blacklistDurationMs);
   }
@@ -407,13 +413,13 @@ import java.util.Map;
     MediaChunkIterator[] chunkIterators = new MediaChunkIterator[trackSelection.length()];
     for (int i = 0; i < chunkIterators.length; i++) {
       int trackIndex = trackSelection.getIndexInTrackGroup(i);
-      HlsUrl hlsUrl = hlsUrls[trackIndex];
-      if (!playlistTracker.isSnapshotValid(hlsUrl)) {
+      Uri playlistUrl = playlistUrls[trackIndex];
+      if (!playlistTracker.isSnapshotValid(playlistUrl)) {
         chunkIterators[i] = MediaChunkIterator.EMPTY;
         continue;
       }
       HlsMediaPlaylist playlist =
-          playlistTracker.getPlaylistSnapshot(hlsUrl, /* isForPlayback= */ false);
+          playlistTracker.getPlaylistSnapshot(playlistUrl, /* isForPlayback= */ false);
       long startOfPlaylistInPeriodUs =
           playlist.startTimeUs - playlistTracker.getInitialStartTimeUs();
       boolean switchingTrack = trackIndex != oldTrackIndex;
@@ -502,7 +508,7 @@ import java.util.Map;
     return new EncryptionKeyChunk(
         encryptionDataSource,
         dataSpec,
-        hlsUrls[selectedTrackIndex].format,
+        playlistFormats[selectedTrackIndex],
         trackSelection.getSelectionReason(),
         trackSelection.getSelectionData(),
         scratchSpace);
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
index 330d2976c5..01da98be68 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
@@ -27,7 +27,6 @@ import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.id3.Id3Decoder;
 import com.google.android.exoplayer2.metadata.id3.PrivFrame;
 import com.google.android.exoplayer2.source.chunk.MediaChunk;
-import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.HlsUrl;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DataSpec;
@@ -52,9 +51,10 @@ import java.util.concurrent.atomic.AtomicInteger;
    * @param extractorFactory A {@link HlsExtractorFactory} from which the HLS media chunk extractor
    *     is obtained.
    * @param dataSource The source from which the data should be loaded.
+   * @param format The chunk format.
    * @param startOfPlaylistInPeriodUs The position of the playlist in the period in microseconds.
    * @param mediaPlaylist The media playlist from which this chunk was obtained.
-   * @param hlsUrl The url of the playlist from which this chunk was obtained.
+   * @param playlistUrl The url of the playlist from which this chunk was obtained.
    * @param muxedCaptionFormats List of muxed caption {@link Format}s. Null if no closed caption
    *     information is available in the master playlist.
    * @param trackSelectionReason See {@link #trackSelectionReason}.
@@ -70,10 +70,11 @@ import java.util.concurrent.atomic.AtomicInteger;
   public static HlsMediaChunk createInstance(
       HlsExtractorFactory extractorFactory,
       DataSource dataSource,
+      Format format,
       long startOfPlaylistInPeriodUs,
       HlsMediaPlaylist mediaPlaylist,
       int segmentIndexInPlaylist,
-      HlsUrl hlsUrl,
+      Uri playlistUrl,
       @Nullable List<Format> muxedCaptionFormats,
       int trackSelectionReason,
       @Nullable Object trackSelectionData,
@@ -126,7 +127,8 @@ import java.util.concurrent.atomic.AtomicInteger;
     if (previousChunk != null) {
       id3Decoder = previousChunk.id3Decoder;
       scratchId3Data = previousChunk.scratchId3Data;
-      shouldSpliceIn = previousChunk.hlsUrl != hlsUrl || !previousChunk.loadCompleted;
+      shouldSpliceIn =
+          !playlistUrl.equals(previousChunk.playlistUrl) || !previousChunk.loadCompleted;
       previousExtractor =
           previousChunk.isExtractorReusable
                   && previousChunk.discontinuitySequenceNumber == discontinuitySequenceNumber
@@ -143,11 +145,12 @@ import java.util.concurrent.atomic.AtomicInteger;
         extractorFactory,
         mediaDataSource,
         dataSpec,
+        format,
         mediaSegmentEncrypted,
         initDataSource,
         initDataSpec,
         initSegmentEncrypted,
-        hlsUrl,
+        playlistUrl,
         muxedCaptionFormats,
         trackSelectionReason,
         trackSelectionData,
@@ -180,10 +183,8 @@ import java.util.concurrent.atomic.AtomicInteger;
    */
   public final int discontinuitySequenceNumber;
 
-  /**
-   * The url of the playlist from which this chunk was obtained.
-   */
-  public final HlsUrl hlsUrl;
+  /** The url of the playlist from which this chunk was obtained. */
+  public final Uri playlistUrl;
 
   @Nullable private final DataSource initDataSource;
   @Nullable private final DataSpec initDataSpec;
@@ -214,11 +215,12 @@ import java.util.concurrent.atomic.AtomicInteger;
       HlsExtractorFactory extractorFactory,
       DataSource mediaDataSource,
       DataSpec dataSpec,
+      Format format,
       boolean mediaSegmentEncrypted,
       DataSource initDataSource,
       @Nullable DataSpec initDataSpec,
       boolean initSegmentEncrypted,
-      HlsUrl hlsUrl,
+      Uri playlistUrl,
       @Nullable List<Format> muxedCaptionFormats,
       int trackSelectionReason,
       Object trackSelectionData,
@@ -237,7 +239,7 @@ import java.util.concurrent.atomic.AtomicInteger;
     super(
         mediaDataSource,
         dataSpec,
-        hlsUrl.format,
+        format,
         trackSelectionReason,
         trackSelectionData,
         startTimeUs,
@@ -248,7 +250,7 @@ import java.util.concurrent.atomic.AtomicInteger;
     this.initDataSource = initDataSource;
     this.initDataSpec = initDataSpec;
     this.initSegmentEncrypted = initSegmentEncrypted;
-    this.hlsUrl = hlsUrl;
+    this.playlistUrl = playlistUrl;
     this.isMasterTimestampSource = isMasterTimestampSource;
     this.timestampAdjuster = timestampAdjuster;
     this.hasGapTag = hasGapTag;
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
index 406f4ed9fc..ef233bb566 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.source.hls;
 
+import android.net.Uri;
 import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import com.google.android.exoplayer2.C;
@@ -31,8 +32,8 @@ import com.google.android.exoplayer2.source.SequenceableLoader;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist;
-import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.HlsUrl;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.Rendition;
+import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.Variant;
 import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylistTracker;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.upstream.Allocator;
@@ -410,7 +411,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
   }
 
   @Override
-  public void onPlaylistRefreshRequired(HlsUrl url) {
+  public void onPlaylistRefreshRequired(Uri url) {
     playlistTracker.refreshPlaylist(url);
   }
 
@@ -427,7 +428,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
   }
 
   @Override
-  public boolean onPlaylistError(HlsUrl url, long blacklistDurationMs) {
+  public boolean onPlaylistError(Uri url, long blacklistDurationMs) {
     boolean noBlacklistingFailure = true;
     for (HlsSampleStreamWrapper streamWrapper : sampleStreamWrappers) {
       noBlacklistingFailure &= streamWrapper.onPlaylistError(url, blacklistDurationMs);
@@ -473,11 +474,12 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
 
     // Subtitle stream wrappers. We can always use master playlist information to prepare these.
     for (int i = 0; i < subtitleRenditions.size(); i++) {
-      HlsUrl url = subtitleRenditions.get(i);
+      Rendition subtitleRendition = subtitleRenditions.get(i);
       HlsSampleStreamWrapper sampleStreamWrapper =
           buildSampleStreamWrapper(
               C.TRACK_TYPE_TEXT,
-              new HlsUrl[] {url},
+              new Uri[] {subtitleRendition.url},
+              new Format[] {subtitleRendition.format},
               null,
               Collections.emptyList(),
               overridingDrmInitData,
@@ -485,7 +487,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
       manifestUrlIndicesPerWrapper.add(new int[] {i});
       sampleStreamWrappers.add(sampleStreamWrapper);
       sampleStreamWrapper.prepareWithMasterPlaylistInfo(
-          new TrackGroupArray(new TrackGroup(url.format)), 0, TrackGroupArray.EMPTY);
+          new TrackGroupArray(new TrackGroup(subtitleRendition.format)), 0, TrackGroupArray.EMPTY);
     }
 
     this.sampleStreamWrappers = sampleStreamWrappers.toArray(new HlsSampleStreamWrapper[0]);
@@ -538,7 +540,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
     int videoVariantCount = 0;
     int audioVariantCount = 0;
     for (int i = 0; i < masterPlaylist.variants.size(); i++) {
-      HlsUrl variant = masterPlaylist.variants.get(i);
+      Variant variant = masterPlaylist.variants.get(i);
       Format format = variant.format;
       if (format.height > 0 || Util.getCodecsOfType(format.codecs, C.TRACK_TYPE_VIDEO) != null) {
         variantTypes[i] = C.TRACK_TYPE_VIDEO;
@@ -565,21 +567,25 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
       useNonAudioVariantsOnly = true;
       selectedVariantsCount = variantTypes.length - audioVariantCount;
     }
-    HlsUrl[] selectedVariants = new HlsUrl[selectedVariantsCount];
+    Uri[] selectedPlaylistUrls = new Uri[selectedVariantsCount];
+    Format[] selectedPlaylistFormats = new Format[selectedVariantsCount];
     int[] selectedVariantIndices = new int[selectedVariantsCount];
     int outIndex = 0;
     for (int i = 0; i < masterPlaylist.variants.size(); i++) {
       if ((!useVideoVariantsOnly || variantTypes[i] == C.TRACK_TYPE_VIDEO)
           && (!useNonAudioVariantsOnly || variantTypes[i] != C.TRACK_TYPE_AUDIO)) {
-        selectedVariants[outIndex] = masterPlaylist.variants.get(i);
+        Variant variant = masterPlaylist.variants.get(i);
+        selectedPlaylistUrls[outIndex] = variant.url;
+        selectedPlaylistFormats[outIndex] = variant.format;
         selectedVariantIndices[outIndex++] = i;
       }
     }
-    String codecs = selectedVariants[0].format.codecs;
+    String codecs = selectedPlaylistFormats[0].codecs;
     HlsSampleStreamWrapper sampleStreamWrapper =
         buildSampleStreamWrapper(
             C.TRACK_TYPE_DEFAULT,
-            selectedVariants,
+            selectedPlaylistUrls,
+            selectedPlaylistFormats,
             masterPlaylist.muxedAudioFormat,
             masterPlaylist.muxedCaptionFormats,
             overridingDrmInitData,
@@ -593,7 +599,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
       if (variantsContainVideoCodecs) {
         Format[] videoFormats = new Format[selectedVariantsCount];
         for (int i = 0; i < videoFormats.length; i++) {
-          videoFormats[i] = deriveVideoFormat(selectedVariants[i].format);
+          videoFormats[i] = deriveVideoFormat(selectedPlaylistFormats[i]);
         }
         muxedTrackGroups.add(new TrackGroup(videoFormats));
 
@@ -602,7 +608,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
           muxedTrackGroups.add(
               new TrackGroup(
                   deriveAudioFormat(
-                      selectedVariants[0].format,
+                      selectedPlaylistFormats[0],
                       masterPlaylist.muxedAudioFormat,
                       /* isPrimaryTrackInVariant= */ false)));
         }
@@ -616,10 +622,9 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
         // Variants only contain audio.
         Format[] audioFormats = new Format[selectedVariantsCount];
         for (int i = 0; i < audioFormats.length; i++) {
-          Format variantFormat = selectedVariants[i].format;
           audioFormats[i] =
               deriveAudioFormat(
-                  variantFormat,
+                  /* variantFormat= */ selectedPlaylistFormats[i],
                   masterPlaylist.muxedAudioFormat,
                   /* isPrimaryTrackInVariant= */ true);
         }
@@ -652,7 +657,9 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
       List<HlsSampleStreamWrapper> sampleStreamWrappers,
       List<int[]> manifestUrlsIndicesPerWrapper,
       Map<String, DrmInitData> overridingDrmInitData) {
-    ArrayList<HlsUrl> scratchRenditionList =
+    ArrayList<Uri> scratchPlaylistUrls =
+        new ArrayList<>(/* initialCapacity= */ audioRenditions.size());
+    ArrayList<Format> scratchPlaylistFormats =
         new ArrayList<>(/* initialCapacity= */ audioRenditions.size());
     ArrayList<Integer> scratchIndicesList =
         new ArrayList<>(/* initialCapacity= */ audioRenditions.size());
@@ -667,14 +674,16 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
       }
 
       boolean renditionsHaveCodecs = true;
-      scratchRenditionList.clear();
+      scratchPlaylistUrls.clear();
+      scratchPlaylistFormats.clear();
       scratchIndicesList.clear();
       // Group all renditions with matching name.
       for (int renditionIndex = 0; renditionIndex < audioRenditions.size(); renditionIndex++) {
         if (Util.areEqual(name, audioRenditions.get(renditionIndex).name)) {
-          HlsUrl rendition = audioRenditions.get(renditionIndex);
+          Rendition rendition = audioRenditions.get(renditionIndex);
           scratchIndicesList.add(renditionIndex);
-          scratchRenditionList.add(rendition);
+          scratchPlaylistUrls.add(rendition.url);
+          scratchPlaylistFormats.add(rendition.format);
           renditionsHaveCodecs &= rendition.format.codecs != null;
         }
       }
@@ -682,7 +691,8 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
       HlsSampleStreamWrapper sampleStreamWrapper =
           buildSampleStreamWrapper(
               C.TRACK_TYPE_AUDIO,
-              scratchRenditionList.toArray(new HlsUrl[0]),
+              scratchPlaylistUrls.toArray(new Uri[0]),
+              scratchPlaylistFormats.toArray(new Format[0]),
               /* muxedAudioFormat= */ null,
               /* muxedCaptionFormats= */ Collections.emptyList(),
               overridingDrmInitData,
@@ -691,10 +701,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
       sampleStreamWrappers.add(sampleStreamWrapper);
 
       if (allowChunklessPreparation && renditionsHaveCodecs) {
-        Format[] renditionFormats = new Format[scratchRenditionList.size()];
-        for (int i = 0; i < renditionFormats.length; i++) {
-          renditionFormats[i] = scratchRenditionList.get(i).format;
-        }
+        Format[] renditionFormats = scratchPlaylistFormats.toArray(new Format[0]);
         sampleStreamWrapper.prepareWithMasterPlaylistInfo(
             new TrackGroupArray(new TrackGroup(renditionFormats)), 0, TrackGroupArray.EMPTY);
       }
@@ -703,7 +710,8 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
 
   private HlsSampleStreamWrapper buildSampleStreamWrapper(
       int trackType,
-      HlsUrl[] variants,
+      Uri[] playlistUrls,
+      Format[] playlistFormats,
       Format muxedAudioFormat,
       List<Format> muxedCaptionFormats,
       Map<String, DrmInitData> overridingDrmInitData,
@@ -712,7 +720,8 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
         new HlsChunkSource(
             extractorFactory,
             playlistTracker,
-            variants,
+            playlistUrls,
+            playlistFormats,
             dataSourceFactory,
             mediaTransferListener,
             timestampAdjusterProvider,
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
index dc72458747..855b7f6a23 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.source.hls;
 
+import android.net.Uri;
 import android.os.Handler;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
@@ -37,8 +38,6 @@ import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.source.chunk.Chunk;
 import com.google.android.exoplayer2.source.chunk.MediaChunkIterator;
-import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist;
-import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.HlsUrl;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.upstream.LoadErrorHandlingPolicy;
@@ -79,8 +78,7 @@ import java.util.Map;
      * Called to schedule a {@link #continueLoading(long)} call when the playlist referred by the
      * given url changes.
      */
-    void onPlaylistRefreshRequired(HlsMasterPlaylist.HlsUrl playlistUrl);
-
+    void onPlaylistRefreshRequired(Uri playlistUrl);
   }
 
   private static final String TAG = "HlsSampleStreamWrapper";
@@ -451,8 +449,8 @@ import java.util.Map;
     chunkSource.setIsTimestampMaster(isTimestampMaster);
   }
 
-  public boolean onPlaylistError(HlsUrl url, long blacklistDurationMs) {
-    return chunkSource.onPlaylistError(url, blacklistDurationMs);
+  public boolean onPlaylistError(Uri playlistUrl, long blacklistDurationMs) {
+    return chunkSource.onPlaylistError(playlistUrl, blacklistDurationMs);
   }
 
   // SampleStream implementation.
@@ -590,7 +588,7 @@ import java.util.Map;
     chunkSource.getNextChunk(positionUs, loadPositionUs, chunkQueue, nextChunkHolder);
     boolean endOfStream = nextChunkHolder.endOfStream;
     Chunk loadable = nextChunkHolder.chunk;
-    HlsMasterPlaylist.HlsUrl playlistToLoad = nextChunkHolder.playlist;
+    Uri playlistUrlToLoad = nextChunkHolder.playlistUrl;
     nextChunkHolder.clear();
 
     if (endOfStream) {
@@ -600,8 +598,8 @@ import java.util.Map;
     }
 
     if (loadable == null) {
-      if (playlistToLoad != null) {
-        callback.onPlaylistRefreshRequired(playlistToLoad);
+      if (playlistUrlToLoad != null) {
+        callback.onPlaylistRefreshRequired(playlistUrlToLoad);
       }
       return false;
     }
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java
index 630170e358..8e744f9a77 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java
@@ -21,7 +21,6 @@ import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
 import com.google.android.exoplayer2.offline.SegmentDownloader;
 import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist;
-import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.HlsUrl;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist;
 import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylist;
 import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylistParser;
@@ -81,9 +80,7 @@ public final class HlsDownloader extends SegmentDownloader<HlsPlaylist> {
     ArrayList<DataSpec> mediaPlaylistDataSpecs = new ArrayList<>();
     if (playlist instanceof HlsMasterPlaylist) {
       HlsMasterPlaylist masterPlaylist = (HlsMasterPlaylist) playlist;
-      addMediaPlaylistDataSpecs(masterPlaylist.variants, mediaPlaylistDataSpecs);
-      addMediaPlaylistDataSpecs(masterPlaylist.audios, mediaPlaylistDataSpecs);
-      addMediaPlaylistDataSpecs(masterPlaylist.subtitles, mediaPlaylistDataSpecs);
+      addMediaPlaylistDataSpecs(masterPlaylist.mediaPlaylistUrls, mediaPlaylistDataSpecs);
     } else {
       mediaPlaylistDataSpecs.add(
           SegmentDownloader.getCompressibleDataSpec(Uri.parse(playlist.baseUri)));
@@ -118,9 +115,9 @@ public final class HlsDownloader extends SegmentDownloader<HlsPlaylist> {
     return segments;
   }
 
-  private void addMediaPlaylistDataSpecs(List<? extends HlsUrl> urls, List<DataSpec> out) {
-    for (int i = 0; i < urls.size(); i++) {
-      out.add(SegmentDownloader.getCompressibleDataSpec(urls.get(i).url));
+  private void addMediaPlaylistDataSpecs(List<Uri> mediaPlaylistUrls, List<DataSpec> out) {
+    for (int i = 0; i < mediaPlaylistUrls.size(); i++) {
+      out.add(SegmentDownloader.getCompressibleDataSpec(mediaPlaylistUrls.get(i)));
     }
   }
 
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
index b7b5f8c48e..38b041d765 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
@@ -23,7 +23,6 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.source.MediaSourceEventListener.EventDispatcher;
 import com.google.android.exoplayer2.source.hls.HlsDataSourceFactory;
-import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.HlsUrl;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.Variant;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist.Segment;
 import com.google.android.exoplayer2.upstream.DataSource;
@@ -53,18 +52,18 @@ public final class DefaultHlsPlaylistTracker
   private final HlsDataSourceFactory dataSourceFactory;
   private final HlsPlaylistParserFactory playlistParserFactory;
   private final LoadErrorHandlingPolicy loadErrorHandlingPolicy;
-  private final IdentityHashMap<HlsUrl, MediaPlaylistBundle> playlistBundles;
+  private final IdentityHashMap<Uri, MediaPlaylistBundle> playlistBundles;
   private final List<PlaylistEventListener> listeners;
   private final double playlistStuckTargetDurationCoefficient;
 
-  private @Nullable ParsingLoadable.Parser<HlsPlaylist> mediaPlaylistParser;
-  private @Nullable EventDispatcher eventDispatcher;
-  private @Nullable Loader initialPlaylistLoader;
-  private @Nullable Handler playlistRefreshHandler;
-  private @Nullable PrimaryPlaylistListener primaryPlaylistListener;
-  private @Nullable HlsMasterPlaylist masterPlaylist;
-  private @Nullable HlsUrl primaryHlsUrl;
-  private @Nullable HlsMediaPlaylist primaryUrlSnapshot;
+  @Nullable private ParsingLoadable.Parser<HlsPlaylist> mediaPlaylistParser;
+  @Nullable private EventDispatcher eventDispatcher;
+  @Nullable private Loader initialPlaylistLoader;
+  @Nullable private Handler playlistRefreshHandler;
+  @Nullable private PrimaryPlaylistListener primaryPlaylistListener;
+  @Nullable private HlsMasterPlaylist masterPlaylist;
+  @Nullable private Uri primaryMediaPlaylistUrl;
+  @Nullable private HlsMediaPlaylist primaryMediaPlaylistSnapshot;
   private boolean isLive;
   private long initialStartTimeUs;
 
@@ -95,7 +94,7 @@ public final class DefaultHlsPlaylistTracker
    * @param playlistStuckTargetDurationCoefficient A coefficient to apply to the target duration of
    *     media playlists in order to determine that a non-changing playlist is stuck. Once a
    *     playlist is deemed stuck, a {@link PlaylistStuckException} is thrown via {@link
-   *     #maybeThrowPlaylistRefreshError(HlsUrl)}.
+   *     #maybeThrowPlaylistRefreshError(Uri)}.
    */
   public DefaultHlsPlaylistTracker(
       HlsDataSourceFactory dataSourceFactory,
@@ -142,8 +141,8 @@ public final class DefaultHlsPlaylistTracker
 
   @Override
   public void stop() {
-    primaryHlsUrl = null;
-    primaryUrlSnapshot = null;
+    primaryMediaPlaylistUrl = null;
+    primaryMediaPlaylistSnapshot = null;
     masterPlaylist = null;
     initialStartTimeUs = C.TIME_UNSET;
     initialPlaylistLoader.release();
@@ -172,7 +171,7 @@ public final class DefaultHlsPlaylistTracker
   }
 
   @Override
-  public HlsMediaPlaylist getPlaylistSnapshot(HlsUrl url, boolean isForPlayback) {
+  public HlsMediaPlaylist getPlaylistSnapshot(Uri url, boolean isForPlayback) {
     HlsMediaPlaylist snapshot = playlistBundles.get(url).getPlaylistSnapshot();
     if (snapshot != null && isForPlayback) {
       maybeSetPrimaryUrl(url);
@@ -186,7 +185,7 @@ public final class DefaultHlsPlaylistTracker
   }
 
   @Override
-  public boolean isSnapshotValid(HlsUrl url) {
+  public boolean isSnapshotValid(Uri url) {
     return playlistBundles.get(url).isSnapshotValid();
   }
 
@@ -195,18 +194,18 @@ public final class DefaultHlsPlaylistTracker
     if (initialPlaylistLoader != null) {
       initialPlaylistLoader.maybeThrowError();
     }
-    if (primaryHlsUrl != null) {
-      maybeThrowPlaylistRefreshError(primaryHlsUrl);
+    if (primaryMediaPlaylistUrl != null) {
+      maybeThrowPlaylistRefreshError(primaryMediaPlaylistUrl);
     }
   }
 
   @Override
-  public void maybeThrowPlaylistRefreshError(HlsUrl url) throws IOException {
+  public void maybeThrowPlaylistRefreshError(Uri url) throws IOException {
     playlistBundles.get(url).maybeThrowPlaylistRefreshError();
   }
 
   @Override
-  public void refreshPlaylist(HlsUrl url) {
+  public void refreshPlaylist(Uri url) {
     playlistBundles.get(url).loadPlaylist();
   }
 
@@ -230,13 +229,9 @@ public final class DefaultHlsPlaylistTracker
     }
     this.masterPlaylist = masterPlaylist;
     mediaPlaylistParser = playlistParserFactory.createPlaylistParser(masterPlaylist);
-    primaryHlsUrl = masterPlaylist.variants.get(0);
-    ArrayList<HlsUrl> urls = new ArrayList<>();
-    urls.addAll(masterPlaylist.variants);
-    urls.addAll(masterPlaylist.audios);
-    urls.addAll(masterPlaylist.subtitles);
-    createBundles(urls);
-    MediaPlaylistBundle primaryBundle = playlistBundles.get(primaryHlsUrl);
+    primaryMediaPlaylistUrl = masterPlaylist.variants.get(0).url;
+    createBundles(masterPlaylist.mediaPlaylistUrls);
+    MediaPlaylistBundle primaryBundle = playlistBundles.get(primaryMediaPlaylistUrl);
     if (isMediaPlaylist) {
       // We don't need to load the playlist again. We can use the same result.
       primaryBundle.processLoadedPlaylist((HlsMediaPlaylist) result, loadDurationMs);
@@ -302,9 +297,9 @@ public final class DefaultHlsPlaylistTracker
     int variantsSize = variants.size();
     long currentTimeMs = SystemClock.elapsedRealtime();
     for (int i = 0; i < variantsSize; i++) {
-      MediaPlaylistBundle bundle = playlistBundles.get(variants.get(i));
+      MediaPlaylistBundle bundle = playlistBundles.get(variants.get(i).url);
       if (currentTimeMs > bundle.blacklistUntilMs) {
-        primaryHlsUrl = bundle.playlistUrl;
+        primaryMediaPlaylistUrl = bundle.playlistUrl;
         bundle.loadPlaylist();
         return true;
       }
@@ -312,22 +307,33 @@ public final class DefaultHlsPlaylistTracker
     return false;
   }
 
-  private void maybeSetPrimaryUrl(HlsUrl url) {
-    if (url == primaryHlsUrl
-        || !masterPlaylist.variants.contains(url)
-        || (primaryUrlSnapshot != null && primaryUrlSnapshot.hasEndTag)) {
-      // Ignore if the primary url is unchanged, if the url is not a variant url, or if the last
-      // primary snapshot contains an end tag.
+  private void maybeSetPrimaryUrl(Uri url) {
+    if (url.equals(primaryMediaPlaylistUrl)
+        || !isVariantUrl(url)
+        || (primaryMediaPlaylistSnapshot != null && primaryMediaPlaylistSnapshot.hasEndTag)) {
+      // Ignore if the primary media playlist URL is unchanged, if the media playlist is not
+      // referenced directly by a variant, or it the last primary snapshot contains an end tag.
       return;
     }
-    primaryHlsUrl = url;
-    playlistBundles.get(primaryHlsUrl).loadPlaylist();
+    primaryMediaPlaylistUrl = url;
+    playlistBundles.get(primaryMediaPlaylistUrl).loadPlaylist();
   }
 
-  private void createBundles(List<HlsUrl> urls) {
+  /** Returns whether any of the variants in the master playlist have the specified playlist URL. */
+  private boolean isVariantUrl(Uri playlistUrl) {
+    List<Variant> variants = masterPlaylist.variants;
+    for (int i = 0; i < variants.size(); i++) {
+      if (playlistUrl.equals(variants.get(i).url)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  private void createBundles(List<Uri> urls) {
     int listSize = urls.size();
     for (int i = 0; i < listSize; i++) {
-      HlsUrl url = urls.get(i);
+      Uri url = urls.get(i);
       MediaPlaylistBundle bundle = new MediaPlaylistBundle(url);
       playlistBundles.put(url, bundle);
     }
@@ -339,14 +345,14 @@ public final class DefaultHlsPlaylistTracker
    * @param url The url of the playlist.
    * @param newSnapshot The new snapshot.
    */
-  private void onPlaylistUpdated(HlsUrl url, HlsMediaPlaylist newSnapshot) {
-    if (url == primaryHlsUrl) {
-      if (primaryUrlSnapshot == null) {
+  private void onPlaylistUpdated(Uri url, HlsMediaPlaylist newSnapshot) {
+    if (url.equals(primaryMediaPlaylistUrl)) {
+      if (primaryMediaPlaylistSnapshot == null) {
         // This is the first primary url snapshot.
         isLive = !newSnapshot.hasEndTag;
         initialStartTimeUs = newSnapshot.startTimeUs;
       }
-      primaryUrlSnapshot = newSnapshot;
+      primaryMediaPlaylistSnapshot = newSnapshot;
       primaryPlaylistListener.onPrimaryPlaylistRefreshed(newSnapshot);
     }
     int listenersSize = listeners.size();
@@ -355,7 +361,7 @@ public final class DefaultHlsPlaylistTracker
     }
   }
 
-  private boolean notifyPlaylistError(HlsUrl playlistUrl, long blacklistDurationMs) {
+  private boolean notifyPlaylistError(Uri playlistUrl, long blacklistDurationMs) {
     int listenersSize = listeners.size();
     boolean anyBlacklistingFailed = false;
     for (int i = 0; i < listenersSize; i++) {
@@ -388,7 +394,7 @@ public final class DefaultHlsPlaylistTracker
       return loadedPlaylist.startTimeUs;
     }
     long primarySnapshotStartTimeUs =
-        primaryUrlSnapshot != null ? primaryUrlSnapshot.startTimeUs : 0;
+        primaryMediaPlaylistSnapshot != null ? primaryMediaPlaylistSnapshot.startTimeUs : 0;
     if (oldPlaylist == null) {
       return primarySnapshotStartTimeUs;
     }
@@ -411,7 +417,9 @@ public final class DefaultHlsPlaylistTracker
     }
     // TODO: Improve cross-playlist discontinuity adjustment.
     int primaryUrlDiscontinuitySequence =
-        primaryUrlSnapshot != null ? primaryUrlSnapshot.discontinuitySequence : 0;
+        primaryMediaPlaylistSnapshot != null
+            ? primaryMediaPlaylistSnapshot.discontinuitySequence
+            : 0;
     if (oldPlaylist == null) {
       return primaryUrlDiscontinuitySequence;
     }
@@ -435,7 +443,7 @@ public final class DefaultHlsPlaylistTracker
   private final class MediaPlaylistBundle
       implements Loader.Callback<ParsingLoadable<HlsPlaylist>>, Runnable {
 
-    private final HlsUrl playlistUrl;
+    private final Uri playlistUrl;
     private final Loader mediaPlaylistLoader;
     private final ParsingLoadable<HlsPlaylist> mediaPlaylistLoadable;
 
@@ -447,13 +455,13 @@ public final class DefaultHlsPlaylistTracker
     private boolean loadPending;
     private IOException playlistError;
 
-    public MediaPlaylistBundle(HlsUrl playlistUrl) {
+    public MediaPlaylistBundle(Uri playlistUrl) {
       this.playlistUrl = playlistUrl;
       mediaPlaylistLoader = new Loader("DefaultHlsPlaylistTracker:MediaPlaylist");
       mediaPlaylistLoadable =
           new ParsingLoadable<>(
               dataSourceFactory.createDataSource(C.DATA_TYPE_MANIFEST),
-              playlistUrl.url,
+              playlistUrl,
               C.DATA_TYPE_MANIFEST,
               mediaPlaylistParser);
     }
@@ -620,13 +628,13 @@ public final class DefaultHlsPlaylistTracker
           // TODO: Allow customization of playlist resets handling.
           // The media sequence jumped backwards. The server has probably reset. We do not try
           // blacklisting in this case.
-          playlistError = new PlaylistResetException(playlistUrl.url);
+          playlistError = new PlaylistResetException(playlistUrl);
           notifyPlaylistError(playlistUrl, C.TIME_UNSET);
         } else if (currentTimeMs - lastSnapshotChangeMs
             > C.usToMs(playlistSnapshot.targetDurationUs)
                 * playlistStuckTargetDurationCoefficient) {
           // TODO: Allow customization of stuck playlists handling.
-          playlistError = new PlaylistStuckException(playlistUrl.url);
+          playlistError = new PlaylistStuckException(playlistUrl);
           long blacklistDurationMs =
               loadErrorHandlingPolicy.getBlacklistDurationMsFor(
                   C.DATA_TYPE_MANIFEST, loadDurationMs, playlistError, /* errorCount= */ 1);
@@ -647,7 +655,7 @@ public final class DefaultHlsPlaylistTracker
       // Schedule a load if this is the primary playlist and it doesn't have an end tag. Else the
       // next load will be scheduled when refreshPlaylist is called, or when this playlist becomes
       // the primary.
-      if (playlistUrl == primaryHlsUrl && !playlistSnapshot.hasEndTag) {
+      if (playlistUrl.equals(primaryMediaPlaylistUrl) && !playlistSnapshot.hasEndTag) {
         loadPlaylist();
       }
     }
@@ -661,7 +669,7 @@ public final class DefaultHlsPlaylistTracker
      */
     private boolean blacklistPlaylist(long blacklistDurationMs) {
       blacklistUntilMs = SystemClock.elapsedRealtime() + blacklistDurationMs;
-      return primaryHlsUrl == playlistUrl && !maybeSelectNewPrimaryUrl();
+      return playlistUrl.equals(primaryMediaPlaylistUrl) && !maybeSelectNewPrimaryUrl();
     }
   }
 }
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
index b76d2b010d..52624f1730 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
@@ -50,29 +50,15 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
   public static final int GROUP_INDEX_AUDIO = 1;
   public static final int GROUP_INDEX_SUBTITLE = 2;
 
-  /** Represents a url in an HLS master playlist. */
-  public abstract static class HlsUrl {
+  /** A variant (i.e. an #EXT-X-STREAM-INF tag) in a master playlist. */
+  public static final class Variant {
 
-    /** The http url from which the media playlist can be obtained. */
+    /** The variant's url. */
     public final Uri url;
-    /**
-     * Format information associated with the HLS url.
-     */
+
+    /** Format information associated with this variant. */
     public final Format format;
 
-    /**
-     * @param url See {@link #url}.
-     * @param format See {@link #format}.
-     */
-    public HlsUrl(Uri url, Format format) {
-      this.url = url;
-      this.format = format;
-    }
-  }
-
-  /** A variant in a master playlist. */
-  public static final class Variant extends HlsUrl {
-
     /** The video rendition group referenced by this variant, or {@code null}. */
     @Nullable public final String videoGroupId;
 
@@ -100,7 +86,8 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
         @Nullable String audioGroupId,
         @Nullable String subtitleGroupId,
         @Nullable String captionGroupId) {
-      super(url, format);
+      this.url = url;
+      this.format = format;
       this.videoGroupId = videoGroupId;
       this.audioGroupId = audioGroupId;
       this.subtitleGroupId = subtitleGroupId;
@@ -135,8 +122,14 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
     }
   }
 
-  /** A rendition in a master playlist. */
-  public static final class Rendition extends HlsUrl {
+  /** A rendition (i.e. an #EXT-X-MEDIA tag) in a master playlist. */
+  public static final class Rendition {
+
+    /** The rendition's url, or null if the tag does not have a URI attribute. */
+    @Nullable public final Uri url;
+
+    /** Format information associated with this rendition. */
+    public final Format format;
 
     /** The group to which this rendition belongs. */
     public final String groupId;
@@ -150,14 +143,17 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
      * @param groupId See {@link #groupId}.
      * @param name See {@link #name}.
      */
-    public Rendition(Uri url, Format format, String groupId, String name) {
-      super(url, format);
+    public Rendition(@Nullable Uri url, Format format, String groupId, String name) {
+      this.url = url;
+      this.format = format;
       this.groupId = groupId;
       this.name = name;
     }
 
   }
 
+  /** All of the media playlist URLs referenced by the playlist. */
+  public final List<Uri> mediaPlaylistUrls;
   /** The variants declared by the playlist. */
   public final List<Variant> variants;
   /** The video renditions declared by the playlist. */
@@ -213,6 +209,9 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
       Map<String, String> variableDefinitions,
       List<DrmInitData> sessionKeyDrmInitData) {
     super(baseUri, tags, hasIndependentSegments);
+    this.mediaPlaylistUrls =
+        Collections.unmodifiableList(
+            getMediaPlaylistUrls(variants, videos, audios, subtitles, closedCaptions));
     this.variants = Collections.unmodifiableList(variants);
     this.videos = Collections.unmodifiableList(videos);
     this.audios = Collections.unmodifiableList(audios);
@@ -268,7 +267,36 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
         /* sessionKeyDrmInitData= */ Collections.emptyList());
   }
 
-  private static <T extends HlsUrl> List<T> copyStreams(
+  private static List<Uri> getMediaPlaylistUrls(
+      List<Variant> variants,
+      List<Rendition> videos,
+      List<Rendition> audios,
+      List<Rendition> subtitles,
+      List<Rendition> closedCaptions) {
+    ArrayList<Uri> mediaPlaylistUrls = new ArrayList<>();
+    for (int i = 0; i < variants.size(); i++) {
+      Uri uri = variants.get(i).url;
+      if (!mediaPlaylistUrls.contains(uri)) {
+        mediaPlaylistUrls.add(uri);
+      }
+    }
+    addMediaPlaylistUrls(videos, mediaPlaylistUrls);
+    addMediaPlaylistUrls(audios, mediaPlaylistUrls);
+    addMediaPlaylistUrls(subtitles, mediaPlaylistUrls);
+    addMediaPlaylistUrls(closedCaptions, mediaPlaylistUrls);
+    return mediaPlaylistUrls;
+  }
+
+  private static void addMediaPlaylistUrls(List<Rendition> renditions, List<Uri> out) {
+    for (int i = 0; i < renditions.size(); i++) {
+      Uri uri = renditions.get(i).url;
+      if (uri != null && !out.contains(uri)) {
+        out.add(uri);
+      }
+    }
+  }
+
+  private static <T> List<T> copyStreams(
       List<T> streams, int groupIndex, List<StreamKey> streamKeys) {
     List<T> copiedStreams = new ArrayList<>(streamKeys.size());
     // TODO:
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java
index 20cfebc7c5..96c9660db0 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java
@@ -20,7 +20,6 @@ import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.source.MediaSourceEventListener.EventDispatcher;
 import com.google.android.exoplayer2.source.hls.HlsDataSourceFactory;
-import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.HlsUrl;
 import com.google.android.exoplayer2.upstream.LoadErrorHandlingPolicy;
 import java.io.IOException;
 
@@ -81,7 +80,7 @@ public interface HlsPlaylistTracker {
      *     {@link C#TIME_UNSET} if the playlist should not be blacklisted.
      * @return True if blacklisting did not encounter errors. False otherwise.
      */
-    boolean onPlaylistError(HlsUrl url, long blacklistDurationMs);
+    boolean onPlaylistError(Uri url, long blacklistDurationMs);
   }
 
   /** Thrown when a playlist is considered to be stuck due to a server side error. */
@@ -164,16 +163,16 @@ public interface HlsPlaylistTracker {
 
   /**
    * Returns the most recent snapshot available of the playlist referenced by the provided {@link
-   * HlsUrl}.
+   * Uri}.
    *
-   * @param url The {@link HlsUrl} corresponding to the requested media playlist.
+   * @param url The {@link Uri} corresponding to the requested media playlist.
    * @param isForPlayback Whether the caller might use the snapshot to request media segments for
    *     playback. If true, the primary playlist may be updated to the one requested.
-   * @return The most recent snapshot of the playlist referenced by the provided {@link HlsUrl}. May
-   *     be null if no snapshot has been loaded yet.
+   * @return The most recent snapshot of the playlist referenced by the provided {@link Uri}. May be
+   *     null if no snapshot has been loaded yet.
    */
   @Nullable
-  HlsMediaPlaylist getPlaylistSnapshot(HlsUrl url, boolean isForPlayback);
+  HlsMediaPlaylist getPlaylistSnapshot(Uri url, boolean isForPlayback);
 
   /**
    * Returns the start time of the first loaded primary playlist, or {@link C#TIME_UNSET} if no
@@ -182,15 +181,14 @@ public interface HlsPlaylistTracker {
   long getInitialStartTimeUs();
 
   /**
-   * Returns whether the snapshot of the playlist referenced by the provided {@link HlsUrl} is
-   * valid, meaning all the segments referenced by the playlist are expected to be available. If the
+   * Returns whether the snapshot of the playlist referenced by the provided {@link Uri} is valid,
+   * meaning all the segments referenced by the playlist are expected to be available. If the
    * playlist is not valid then some of the segments may no longer be available.
    *
-   * @param url The {@link HlsUrl}.
-   * @return Whether the snapshot of the playlist referenced by the provided {@link HlsUrl} is
-   *     valid.
+   * @param url The {@link Uri}.
+   * @return Whether the snapshot of the playlist referenced by the provided {@link Uri} is valid.
    */
-  boolean isSnapshotValid(HlsUrl url);
+  boolean isSnapshotValid(Uri url);
 
   /**
    * If the tracker is having trouble refreshing the master playlist or the primary playlist, this
@@ -201,13 +199,13 @@ public interface HlsPlaylistTracker {
   void maybeThrowPrimaryPlaylistRefreshError() throws IOException;
 
   /**
-   * If the playlist is having trouble refreshing the playlist referenced by the given {@link
-   * HlsUrl}, this method throws the underlying error.
+   * If the playlist is having trouble refreshing the playlist referenced by the given {@link Uri},
+   * this method throws the underlying error.
    *
-   * @param url The {@link HlsUrl}.
+   * @param url The {@link Uri}.
    * @throws IOException The underyling error.
    */
-  void maybeThrowPlaylistRefreshError(HlsUrl url) throws IOException;
+  void maybeThrowPlaylistRefreshError(Uri url) throws IOException;
 
   /**
    * Requests a playlist refresh and whitelists it.
@@ -215,9 +213,9 @@ public interface HlsPlaylistTracker {
    * <p>The playlist tracker may choose the delay the playlist refresh. The request is discarded if
    * a refresh was already pending.
    *
-   * @param url The {@link HlsUrl} of the playlist to be refreshed.
+   * @param url The {@link Uri} of the playlist to be refreshed.
    */
-  void refreshPlaylist(HlsUrl url);
+  void refreshPlaylist(Uri url);
 
   /**
    * Returns whether the tracked playlists describe a live stream.
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
index 6d31305f03..97d330cdaa 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
@@ -290,7 +290,7 @@ public class HlsMasterPlaylistParserTest {
   public void testVariableSubstitution() throws IOException {
     HlsMasterPlaylist playlistWithSubstitutions =
         parseMasterPlaylist(PLAYLIST_URI, PLAYLIST_WITH_VARIABLE_SUBSTITUTION);
-    HlsMasterPlaylist.HlsUrl variant = playlistWithSubstitutions.variants.get(0);
+    HlsMasterPlaylist.Variant variant = playlistWithSubstitutions.variants.get(0);
     assertThat(variant.format.codecs).isEqualTo("mp4a.40.5");
     assertThat(variant.url)
         .isEqualTo(Uri.parse("http://example.com/This/{$nested}/reference/shouldnt/work"));

From 5db33deef4aaff76ec22c41390e738e63a5ae6c7 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 29 Mar 2019 16:10:03 +0000
Subject: [PATCH 690/832] HLS: Fix playlist tracker bundle lookup

As of https://github.com/google/ExoPlayer/commit/99f89132c219b52b991b4614322fa7af6208c906 an identity check isn't sufficient for the lookup.

PiperOrigin-RevId: 240989848
---
 .../source/hls/playlist/DefaultHlsPlaylistTracker.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
index 38b041d765..0064338ca8 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
@@ -33,7 +33,7 @@ import com.google.android.exoplayer2.upstream.ParsingLoadable;
 import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.IdentityHashMap;
+import java.util.HashMap;
 import java.util.List;
 
 /** Default implementation for {@link HlsPlaylistTracker}. */
@@ -52,7 +52,7 @@ public final class DefaultHlsPlaylistTracker
   private final HlsDataSourceFactory dataSourceFactory;
   private final HlsPlaylistParserFactory playlistParserFactory;
   private final LoadErrorHandlingPolicy loadErrorHandlingPolicy;
-  private final IdentityHashMap<Uri, MediaPlaylistBundle> playlistBundles;
+  private final HashMap<Uri, MediaPlaylistBundle> playlistBundles;
   private final List<PlaylistEventListener> listeners;
   private final double playlistStuckTargetDurationCoefficient;
 
@@ -106,7 +106,7 @@ public final class DefaultHlsPlaylistTracker
     this.loadErrorHandlingPolicy = loadErrorHandlingPolicy;
     this.playlistStuckTargetDurationCoefficient = playlistStuckTargetDurationCoefficient;
     listeners = new ArrayList<>();
-    playlistBundles = new IdentityHashMap<>();
+    playlistBundles = new HashMap<>();
     initialStartTimeUs = C.TIME_UNSET;
   }
 

From 592b5eafee3613646f0a8e6bfffd3eec6beef5a4 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Sun, 31 Mar 2019 23:40:58 +0100
Subject: [PATCH 691/832] Support multiple CC channels in DASH

Issue: #5656
PiperOrigin-RevId: 241235377
---
 RELEASENOTES.md                               |   5 +-
 .../source/dash/DashChunkSource.java          |  10 +-
 .../source/dash/DashMediaPeriod.java          | 185 ++++++++++++------
 .../source/dash/DefaultDashChunkSource.java   |  26 +--
 4 files changed, 148 insertions(+), 78 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 989d67a49a..2f49762ada 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -5,7 +5,10 @@
 * Update to Mockito 2
 * Add new `ExoPlaybackException` types for remote exceptions and out-of-memory
   errors.
-* DASH: Parse role and accessibility descriptors into `Format.roleFlags`.
+* DASH:
+  * Parse role and accessibility descriptors into `Format.roleFlags`.
+  * Support multiple CEA-608 channels muxed into FMP4 representations
+    ([#5656](https://github.com/google/ExoPlayer/issues/5656)).
 * HLS:
   * Work around lack of LA_URL attribute in PlayReady key request init data.
   * Prevent unnecessary reloads of initialization segments.
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashChunkSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashChunkSource.java
index f808d7c1b6..40d4e468bd 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashChunkSource.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashChunkSource.java
@@ -17,12 +17,14 @@ package com.google.android.exoplayer2.source.dash;
 
 import android.os.SystemClock;
 import androidx.annotation.Nullable;
+import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.chunk.ChunkSource;
 import com.google.android.exoplayer2.source.dash.PlayerEmsgHandler.PlayerTrackEmsgHandler;
 import com.google.android.exoplayer2.source.dash.manifest.DashManifest;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.upstream.LoaderErrorThrower;
 import com.google.android.exoplayer2.upstream.TransferListener;
+import java.util.List;
 
 /**
  * An {@link ChunkSource} for DASH streams.
@@ -41,10 +43,8 @@ public interface DashChunkSource extends ChunkSource {
      * @param elapsedRealtimeOffsetMs If known, an estimate of the instantaneous difference between
      *     server-side unix time and {@link SystemClock#elapsedRealtime()} in milliseconds,
      *     specified as the server's unix time minus the local elapsed time. If unknown, set to 0.
-     * @param enableEventMessageTrack Whether the chunks generated by the source may output an event
-     *     message track.
-     * @param enableCea608Track Whether the chunks generated by the source may output a CEA-608
-     *     track.
+     * @param enableEventMessageTrack Whether to output an event message track.
+     * @param closedCaptionFormats The {@link Format Formats} of closed caption tracks to be output.
      * @param transferListener The transfer listener which should be informed of any data transfers.
      *     May be null if no listener is available.
      * @return The created {@link DashChunkSource}.
@@ -58,7 +58,7 @@ public interface DashChunkSource extends ChunkSource {
         int type,
         long elapsedRealtimeOffsetMs,
         boolean enableEventMessageTrack,
-        boolean enableCea608Track,
+        List<Format> closedCaptionFormats,
         @Nullable PlayerTrackEmsgHandler playerEmsgHandler,
         @Nullable TransferListener transferListener);
   }
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java
index a2a7208d99..431a0a4bd9 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java
@@ -56,6 +56,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.IdentityHashMap;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /** A DASH {@link MediaPeriod}. */
 /* package */ final class DashMediaPeriod
@@ -63,6 +65,8 @@ import java.util.List;
         SequenceableLoader.Callback<ChunkSampleStream<DashChunkSource>>,
         ChunkSampleStream.ReleaseCallback<DashChunkSource> {
 
+  private static final Pattern CEA608_SERVICE_DESCRIPTOR_REGEX = Pattern.compile("CC([1-4])=(.+)");
+
   /* package */ final int id;
   private final DashChunkSource.Factory chunkSourceFactory;
   private final @Nullable TransferListener transferListener;
@@ -457,18 +461,28 @@ import java.util.List;
 
     int primaryGroupCount = groupedAdaptationSetIndices.length;
     boolean[] primaryGroupHasEventMessageTrackFlags = new boolean[primaryGroupCount];
-    boolean[] primaryGroupHasCea608TrackFlags = new boolean[primaryGroupCount];
-    int totalEmbeddedTrackGroupCount = identifyEmbeddedTracks(primaryGroupCount, adaptationSets,
-        groupedAdaptationSetIndices, primaryGroupHasEventMessageTrackFlags,
-        primaryGroupHasCea608TrackFlags);
+    Format[][] primaryGroupCea608TrackFormats = new Format[primaryGroupCount][];
+    int totalEmbeddedTrackGroupCount =
+        identifyEmbeddedTracks(
+            primaryGroupCount,
+            adaptationSets,
+            groupedAdaptationSetIndices,
+            primaryGroupHasEventMessageTrackFlags,
+            primaryGroupCea608TrackFormats);
 
     int totalGroupCount = primaryGroupCount + totalEmbeddedTrackGroupCount + eventStreams.size();
     TrackGroup[] trackGroups = new TrackGroup[totalGroupCount];
     TrackGroupInfo[] trackGroupInfos = new TrackGroupInfo[totalGroupCount];
 
-    int trackGroupCount = buildPrimaryAndEmbeddedTrackGroupInfos(adaptationSets,
-        groupedAdaptationSetIndices, primaryGroupCount, primaryGroupHasEventMessageTrackFlags,
-        primaryGroupHasCea608TrackFlags, trackGroups, trackGroupInfos);
+    int trackGroupCount =
+        buildPrimaryAndEmbeddedTrackGroupInfos(
+            adaptationSets,
+            groupedAdaptationSetIndices,
+            primaryGroupCount,
+            primaryGroupHasEventMessageTrackFlags,
+            primaryGroupCea608TrackFormats,
+            trackGroups,
+            trackGroupInfos);
 
     buildManifestEventTrackGroupInfos(eventStreams, trackGroups, trackGroupInfos, trackGroupCount);
 
@@ -524,39 +538,46 @@ import java.util.List;
 
   /**
    * Iterates through list of primary track groups and identifies embedded tracks.
-   * <p>
+   *
    * @param primaryGroupCount The number of primary track groups.
    * @param adaptationSets The list of {@link AdaptationSet} of the current DASH period.
-   * @param groupedAdaptationSetIndices The indices of {@link AdaptationSet} that belongs to
-   *     the same primary group, grouped in primary track groups order.
-   * @param primaryGroupHasEventMessageTrackFlags An output array containing boolean flag, each
-   *     indicates whether the corresponding primary track group contains an embedded event message
-   *     track.
-   * @param primaryGroupHasCea608TrackFlags An output array containing boolean flag, each
-   *     indicates whether the corresponding primary track group contains an embedded Cea608 track.
-   * @return Total number of embedded tracks.
+   * @param groupedAdaptationSetIndices The indices of {@link AdaptationSet} that belongs to the
+   *     same primary group, grouped in primary track groups order.
+   * @param primaryGroupHasEventMessageTrackFlags An output array to be filled with flags indicating
+   *     whether each of the primary track groups contains an embedded event message track.
+   * @param primaryGroupCea608TrackFormats An output array to be filled with track formats for
+   *     CEA-608 tracks embedded in each of the primary track groups.
+   * @return Total number of embedded track groups.
    */
-  private static int identifyEmbeddedTracks(int primaryGroupCount,
-      List<AdaptationSet> adaptationSets, int[][] groupedAdaptationSetIndices,
-      boolean[] primaryGroupHasEventMessageTrackFlags, boolean[] primaryGroupHasCea608TrackFlags) {
-    int numEmbeddedTrack = 0;
+  private static int identifyEmbeddedTracks(
+      int primaryGroupCount,
+      List<AdaptationSet> adaptationSets,
+      int[][] groupedAdaptationSetIndices,
+      boolean[] primaryGroupHasEventMessageTrackFlags,
+      Format[][] primaryGroupCea608TrackFormats) {
+    int numEmbeddedTrackGroups = 0;
     for (int i = 0; i < primaryGroupCount; i++) {
       if (hasEventMessageTrack(adaptationSets, groupedAdaptationSetIndices[i])) {
         primaryGroupHasEventMessageTrackFlags[i] = true;
-        numEmbeddedTrack++;
+        numEmbeddedTrackGroups++;
       }
-      if (hasCea608Track(adaptationSets, groupedAdaptationSetIndices[i])) {
-        primaryGroupHasCea608TrackFlags[i] = true;
-        numEmbeddedTrack++;
+      primaryGroupCea608TrackFormats[i] =
+          getCea608TrackFormats(adaptationSets, groupedAdaptationSetIndices[i]);
+      if (primaryGroupCea608TrackFormats[i].length != 0) {
+        numEmbeddedTrackGroups++;
       }
     }
-    return numEmbeddedTrack;
+    return numEmbeddedTrackGroups;
   }
 
-  private static int buildPrimaryAndEmbeddedTrackGroupInfos(List<AdaptationSet> adaptationSets,
-      int[][] groupedAdaptationSetIndices, int primaryGroupCount,
-      boolean[] primaryGroupHasEventMessageTrackFlags, boolean[] primaryGroupHasCea608TrackFlags,
-      TrackGroup[] trackGroups, TrackGroupInfo[] trackGroupInfos) {
+  private static int buildPrimaryAndEmbeddedTrackGroupInfos(
+      List<AdaptationSet> adaptationSets,
+      int[][] groupedAdaptationSetIndices,
+      int primaryGroupCount,
+      boolean[] primaryGroupHasEventMessageTrackFlags,
+      Format[][] primaryGroupCea608TrackFormats,
+      TrackGroup[] trackGroups,
+      TrackGroupInfo[] trackGroupInfos) {
     int trackGroupCount = 0;
     for (int i = 0; i < primaryGroupCount; i++) {
       int[] adaptationSetIndices = groupedAdaptationSetIndices[i];
@@ -574,7 +595,7 @@ import java.util.List;
       int eventMessageTrackGroupIndex =
           primaryGroupHasEventMessageTrackFlags[i] ? trackGroupCount++ : C.INDEX_UNSET;
       int cea608TrackGroupIndex =
-          primaryGroupHasCea608TrackFlags[i] ? trackGroupCount++ : C.INDEX_UNSET;
+          primaryGroupCea608TrackFormats[i].length != 0 ? trackGroupCount++ : C.INDEX_UNSET;
 
       trackGroups[primaryTrackGroupIndex] = new TrackGroup(formats);
       trackGroupInfos[primaryTrackGroupIndex] =
@@ -592,9 +613,7 @@ import java.util.List;
             TrackGroupInfo.embeddedEmsgTrack(adaptationSetIndices, primaryTrackGroupIndex);
       }
       if (cea608TrackGroupIndex != C.INDEX_UNSET) {
-        Format format = Format.createTextSampleFormat(firstAdaptationSet.id + ":cea608",
-            MimeTypes.APPLICATION_CEA608, 0, null);
-        trackGroups[cea608TrackGroupIndex] = new TrackGroup(format);
+        trackGroups[cea608TrackGroupIndex] = new TrackGroup(primaryGroupCea608TrackFormats[i]);
         trackGroupInfos[cea608TrackGroupIndex] =
             TrackGroupInfo.embeddedCea608Track(adaptationSetIndices, primaryTrackGroupIndex);
       }
@@ -616,25 +635,39 @@ import java.util.List;
   private ChunkSampleStream<DashChunkSource> buildSampleStream(TrackGroupInfo trackGroupInfo,
       TrackSelection selection, long positionUs) {
     int embeddedTrackCount = 0;
-    int[] embeddedTrackTypes = new int[2];
-    Format[] embeddedTrackFormats = new Format[2];
     boolean enableEventMessageTrack =
         trackGroupInfo.embeddedEventMessageTrackGroupIndex != C.INDEX_UNSET;
+    TrackGroup embeddedEventMessageTrackGroup = null;
     if (enableEventMessageTrack) {
-      embeddedTrackFormats[embeddedTrackCount] =
-          trackGroups.get(trackGroupInfo.embeddedEventMessageTrackGroupIndex).getFormat(0);
-      embeddedTrackTypes[embeddedTrackCount++] = C.TRACK_TYPE_METADATA;
+      embeddedEventMessageTrackGroup =
+          trackGroups.get(trackGroupInfo.embeddedEventMessageTrackGroupIndex);
+      embeddedTrackCount++;
     }
-    boolean enableCea608Track = trackGroupInfo.embeddedCea608TrackGroupIndex != C.INDEX_UNSET;
-    if (enableCea608Track) {
-      embeddedTrackFormats[embeddedTrackCount] =
-          trackGroups.get(trackGroupInfo.embeddedCea608TrackGroupIndex).getFormat(0);
-      embeddedTrackTypes[embeddedTrackCount++] = C.TRACK_TYPE_TEXT;
+    boolean enableCea608Tracks = trackGroupInfo.embeddedCea608TrackGroupIndex != C.INDEX_UNSET;
+    TrackGroup embeddedCea608TrackGroup = null;
+    if (enableCea608Tracks) {
+      embeddedCea608TrackGroup = trackGroups.get(trackGroupInfo.embeddedCea608TrackGroupIndex);
+      embeddedTrackCount += embeddedCea608TrackGroup.length;
     }
-    if (embeddedTrackCount < embeddedTrackTypes.length) {
-      embeddedTrackFormats = Arrays.copyOf(embeddedTrackFormats, embeddedTrackCount);
-      embeddedTrackTypes = Arrays.copyOf(embeddedTrackTypes, embeddedTrackCount);
+
+    Format[] embeddedTrackFormats = new Format[embeddedTrackCount];
+    int[] embeddedTrackTypes = new int[embeddedTrackCount];
+    embeddedTrackCount = 0;
+    if (enableEventMessageTrack) {
+      embeddedTrackFormats[embeddedTrackCount] = embeddedEventMessageTrackGroup.getFormat(0);
+      embeddedTrackTypes[embeddedTrackCount] = C.TRACK_TYPE_METADATA;
+      embeddedTrackCount++;
     }
+    List<Format> embeddedCea608TrackFormats = new ArrayList<>();
+    if (enableCea608Tracks) {
+      for (int i = 0; i < embeddedCea608TrackGroup.length; i++) {
+        embeddedTrackFormats[embeddedTrackCount] = embeddedCea608TrackGroup.getFormat(i);
+        embeddedTrackTypes[embeddedTrackCount] = C.TRACK_TYPE_TEXT;
+        embeddedCea608TrackFormats.add(embeddedTrackFormats[embeddedTrackCount]);
+        embeddedTrackCount++;
+      }
+    }
+
     PlayerTrackEmsgHandler trackPlayerEmsgHandler =
         manifest.dynamic && enableEventMessageTrack
             ? playerEmsgHandler.newPlayerTrackEmsgHandler()
@@ -649,7 +682,7 @@ import java.util.List;
             trackGroupInfo.trackType,
             elapsedRealtimeOffsetMs,
             enableEventMessageTrack,
-            enableCea608Track,
+            embeddedCea608TrackFormats,
             trackPlayerEmsgHandler,
             transferListener);
     ChunkSampleStream<DashChunkSource> stream =
@@ -694,18 +727,60 @@ import java.util.List;
     return false;
   }
 
-  private static boolean hasCea608Track(List<AdaptationSet> adaptationSets,
-      int[] adaptationSetIndices) {
+  private static Format[] getCea608TrackFormats(
+      List<AdaptationSet> adaptationSets, int[] adaptationSetIndices) {
     for (int i : adaptationSetIndices) {
+      AdaptationSet adaptationSet = adaptationSets.get(i);
       List<Descriptor> descriptors = adaptationSets.get(i).accessibilityDescriptors;
       for (int j = 0; j < descriptors.size(); j++) {
         Descriptor descriptor = descriptors.get(j);
         if ("urn:scte:dash:cc:cea-608:2015".equals(descriptor.schemeIdUri)) {
-          return true;
+          String value = descriptor.value;
+          if (value == null) {
+            // There are embedded CEA-608 tracks, but service information is not declared.
+            return new Format[] {buildCea608TrackFormat(adaptationSet.id)};
+          }
+          String[] services = Util.split(value, ";");
+          Format[] formats = new Format[services.length];
+          for (int k = 0; k < services.length; k++) {
+            Matcher matcher = CEA608_SERVICE_DESCRIPTOR_REGEX.matcher(services[k]);
+            if (!matcher.matches()) {
+              // If we can't parse service information for all services, assume a single track.
+              return new Format[] {buildCea608TrackFormat(adaptationSet.id)};
+            }
+            formats[k] =
+                buildCea608TrackFormat(
+                    adaptationSet.id,
+                    /* language= */ matcher.group(2),
+                    /* accessibilityChannel= */ Integer.parseInt(matcher.group(1)));
+          }
+          return formats;
         }
       }
     }
-    return false;
+    return new Format[0];
+  }
+
+  private static Format buildCea608TrackFormat(int adaptationSetId) {
+    return buildCea608TrackFormat(
+        adaptationSetId, /* language= */ null, /* accessibilityChannel= */ Format.NO_VALUE);
+  }
+
+  private static Format buildCea608TrackFormat(
+      int adaptationSetId, String language, int accessibilityChannel) {
+    return Format.createTextSampleFormat(
+        adaptationSetId
+            + ":cea608"
+            + (accessibilityChannel != Format.NO_VALUE ? ":" + accessibilityChannel : ""),
+        MimeTypes.APPLICATION_CEA608,
+        /* codecs= */ null,
+        /* bitrate= */ Format.NO_VALUE,
+        /* selectionFlags= */ 0,
+        language,
+        accessibilityChannel,
+        /* drmInitData= */ null,
+        Format.OFFSET_SAMPLE_RELATIVE,
+        /* initializationData= */ null);
   }
 
   @SuppressWarnings("unchecked")
@@ -761,7 +836,7 @@ import java.util.List;
           primaryTrackGroupIndex,
           embeddedEventMessageTrackGroupIndex,
           embeddedCea608TrackGroupIndex,
-          -1);
+          /* eventStreamGroupIndex= */ -1);
     }
 
     public static TrackGroupInfo embeddedEmsgTrack(int[] adaptationSetIndices,
@@ -773,7 +848,7 @@ import java.util.List;
           primaryTrackGroupIndex,
           C.INDEX_UNSET,
           C.INDEX_UNSET,
-          -1);
+          /* eventStreamGroupIndex= */ -1);
     }
 
     public static TrackGroupInfo embeddedCea608Track(int[] adaptationSetIndices,
@@ -785,7 +860,7 @@ import java.util.List;
           primaryTrackGroupIndex,
           C.INDEX_UNSET,
           C.INDEX_UNSET,
-          -1);
+          /* eventStreamGroupIndex= */ -1);
     }
 
     public static TrackGroupInfo mpdEventTrack(int eventStreamIndex) {
@@ -793,7 +868,7 @@ import java.util.List;
           C.TRACK_TYPE_METADATA,
           CATEGORY_MANIFEST_EVENTS,
           new int[0],
-          -1,
+          /* primaryTrackGroupIndex= */ -1,
           C.INDEX_UNSET,
           C.INDEX_UNSET,
           eventStreamIndex);
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
index 6282195d67..057f0262d0 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
@@ -54,7 +54,6 @@ import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -86,7 +85,7 @@ public class DefaultDashChunkSource implements DashChunkSource {
         int trackType,
         long elapsedRealtimeOffsetMs,
         boolean enableEventMessageTrack,
-        boolean enableCea608Track,
+        List<Format> closedCaptionFormats,
         @Nullable PlayerTrackEmsgHandler playerEmsgHandler,
         @Nullable TransferListener transferListener) {
       DataSource dataSource = dataSourceFactory.createDataSource();
@@ -104,7 +103,7 @@ public class DefaultDashChunkSource implements DashChunkSource {
           elapsedRealtimeOffsetMs,
           maxSegmentsPerLoad,
           enableEventMessageTrack,
-          enableCea608Track,
+          closedCaptionFormats,
           playerEmsgHandler);
     }
 
@@ -141,9 +140,8 @@ public class DefaultDashChunkSource implements DashChunkSource {
    * @param maxSegmentsPerLoad The maximum number of segments to combine into a single request. Note
    *     that segments will only be combined if their {@link Uri}s are the same and if their data
    *     ranges are adjacent.
-   * @param enableEventMessageTrack Whether the chunks generated by the source may output an event
-   *     message track.
-   * @param enableCea608Track Whether the chunks generated by the source may output a CEA-608 track.
+   * @param enableEventMessageTrack Whether to output an event message track.
+   * @param closedCaptionFormats The {@link Format Formats} of closed caption tracks to be output.
    * @param playerTrackEmsgHandler The {@link PlayerTrackEmsgHandler} instance to handle emsg
    *     messages targeting the player. Maybe null if this is not necessary.
    */
@@ -158,7 +156,7 @@ public class DefaultDashChunkSource implements DashChunkSource {
       long elapsedRealtimeOffsetMs,
       int maxSegmentsPerLoad,
       boolean enableEventMessageTrack,
-      boolean enableCea608Track,
+      List<Format> closedCaptionFormats,
       @Nullable PlayerTrackEmsgHandler playerTrackEmsgHandler) {
     this.manifestLoaderErrorThrower = manifestLoaderErrorThrower;
     this.manifest = manifest;
@@ -184,7 +182,7 @@ public class DefaultDashChunkSource implements DashChunkSource {
               trackType,
               representation,
               enableEventMessageTrack,
-              enableCea608Track,
+              closedCaptionFormats,
               playerTrackEmsgHandler);
     }
   }
@@ -629,7 +627,7 @@ public class DefaultDashChunkSource implements DashChunkSource {
         int trackType,
         Representation representation,
         boolean enableEventMessageTrack,
-        boolean enableCea608Track,
+        List<Format> closedCaptionFormats,
         TrackOutput playerEmsgTrackOutput) {
       this(
           periodDurationUs,
@@ -638,7 +636,7 @@ public class DefaultDashChunkSource implements DashChunkSource {
               trackType,
               representation,
               enableEventMessageTrack,
-              enableCea608Track,
+              closedCaptionFormats,
               playerEmsgTrackOutput),
           /* segmentNumShift= */ 0,
           representation.getIndex());
@@ -783,7 +781,7 @@ public class DefaultDashChunkSource implements DashChunkSource {
         int trackType,
         Representation representation,
         boolean enableEventMessageTrack,
-        boolean enableCea608Track,
+        List<Format> closedCaptionFormats,
         TrackOutput playerEmsgTrackOutput) {
       String containerMimeType = representation.format.containerMimeType;
       if (mimeTypeIsRawText(containerMimeType)) {
@@ -799,12 +797,6 @@ public class DefaultDashChunkSource implements DashChunkSource {
         if (enableEventMessageTrack) {
           flags |= FragmentedMp4Extractor.FLAG_ENABLE_EMSG_TRACK;
         }
-        // TODO: Use caption format information from the manifest if available.
-        List<Format> closedCaptionFormats =
-            enableCea608Track
-                ? Collections.singletonList(
-                    Format.createTextSampleFormat(null, MimeTypes.APPLICATION_CEA608, 0, null))
-                : Collections.emptyList();
         extractor =
             new FragmentedMp4Extractor(
                 flags, null, null, null, closedCaptionFormats, playerEmsgTrackOutput);

From 129a64c477398517ac0bc4b21dfbf63066224123 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Mon, 1 Apr 2019 14:22:24 +0100
Subject: [PATCH 692/832] Use getItemIds to get the actual size of the Cast
 media queue

Issue:#4964
PiperOrigin-RevId: 241311763
---
 RELEASENOTES.md                               |   2 +
 .../exoplayer2/ext/cast/CastPlayer.java       |   4 +-
 .../exoplayer2/ext/cast/CastTimeline.java     |  85 +++++++----
 .../ext/cast/CastTimelineTracker.java         |  83 +++++++----
 .../exoplayer2/ext/cast/CastUtils.java        |   8 +-
 .../ext/cast/CastTimelineTrackerTest.java     | 136 +++++++++---------
 6 files changed, 195 insertions(+), 123 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 2f49762ada..ac68a029c2 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -3,6 +3,8 @@
 ### dev-v2 (not yet released) ###
 
 * Update to Mockito 2
+* Cast extension: Work around Cast framework returning a limited-size queue
+  items list ([#4964](https://github.com/google/ExoPlayer/issues/4964)).
 * Add new `ExoPlaybackException` types for remote exceptions and out-of-memory
   errors.
 * DASH:
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
index 0fdce79087..14bb433d2b 100644
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
@@ -574,7 +574,9 @@ public final class CastPlayer extends BasePlayer {
     CastTimeline oldTimeline = currentTimeline;
     MediaStatus status = getMediaStatus();
     currentTimeline =
-        status != null ? timelineTracker.getCastTimeline(status) : CastTimeline.EMPTY_CAST_TIMELINE;
+        status != null
+            ? timelineTracker.getCastTimeline(remoteMediaClient)
+            : CastTimeline.EMPTY_CAST_TIMELINE;
     return !oldTimeline.equals(currentTimeline);
   }
 
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java
index 649f579c81..800c19047b 100644
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java
@@ -16,23 +16,65 @@
 package com.google.android.exoplayer2.ext.cast;
 
 import androidx.annotation.Nullable;
+import android.util.SparseArray;
 import android.util.SparseIntArray;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Timeline;
-import com.google.android.gms.cast.MediaInfo;
-import com.google.android.gms.cast.MediaQueueItem;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
 
 /**
  * A {@link Timeline} for Cast media queues.
  */
 /* package */ final class CastTimeline extends Timeline {
 
+  /** Holds {@link Timeline} related data for a Cast media item. */
+  public static final class ItemData {
+
+    /** Holds no media information. */
+    public static final ItemData EMPTY = new ItemData();
+
+    /** The duration of the item in microseconds, or {@link C#TIME_UNSET} if unknown. */
+    public final long durationUs;
+    /**
+     * The default start position of the item in microseconds, or {@link C#TIME_UNSET} if unknown.
+     */
+    public final long defaultPositionUs;
+
+    private ItemData() {
+      this(/* durationUs= */ C.TIME_UNSET, /* defaultPositionUs */ C.TIME_UNSET);
+    }
+
+    /**
+     * Creates an instance.
+     *
+     * @param durationUs See {@link #durationsUs}.
+     * @param defaultPositionUs See {@link #defaultPositionUs}.
+     */
+    public ItemData(long durationUs, long defaultPositionUs) {
+      this.durationUs = durationUs;
+      this.defaultPositionUs = defaultPositionUs;
+    }
+
+    /** Returns an instance with the given {@link #durationsUs}. */
+    public ItemData copyWithDurationUs(long durationUs) {
+      if (durationUs == this.durationUs) {
+        return this;
+      }
+      return new ItemData(durationUs, defaultPositionUs);
+    }
+
+    /** Returns an instance with the given {@link #defaultPositionsUs}. */
+    public ItemData copyWithDefaultPositionUs(long defaultPositionUs) {
+      if (defaultPositionUs == this.defaultPositionUs) {
+        return this;
+      }
+      return new ItemData(durationUs, defaultPositionUs);
+    }
+  }
+
+  /** {@link Timeline} for a cast queue that has no items. */
   public static final CastTimeline EMPTY_CAST_TIMELINE =
-      new CastTimeline(Collections.emptyList(), Collections.emptyMap());
+      new CastTimeline(new int[0], new SparseArray<>());
 
   private final SparseIntArray idsToIndex;
   private final int[] ids;
@@ -40,28 +82,23 @@ import java.util.Map;
   private final long[] defaultPositionsUs;
 
   /**
-   * @param items A list of cast media queue items to represent.
-   * @param contentIdToDurationUsMap A map of content id to duration in microseconds.
+   * Creates a Cast timeline from the given data.
+   *
+   * @param itemIds The ids of the items in the timeline.
+   * @param itemIdToData Maps item ids to {@link ItemData}.
    */
-  public CastTimeline(List<MediaQueueItem> items, Map<String, Long> contentIdToDurationUsMap) {
-    int itemCount = items.size();
-    int index = 0;
+  public CastTimeline(int[] itemIds, SparseArray<ItemData> itemIdToData) {
+    int itemCount = itemIds.length;
     idsToIndex = new SparseIntArray(itemCount);
-    ids = new int[itemCount];
+    ids = Arrays.copyOf(itemIds, itemCount);
     durationsUs = new long[itemCount];
     defaultPositionsUs = new long[itemCount];
-    for (MediaQueueItem item : items) {
-      int itemId = item.getItemId();
-      ids[index] = itemId;
-      idsToIndex.put(itemId, index);
-      MediaInfo mediaInfo = item.getMedia();
-      String contentId = mediaInfo.getContentId();
-      durationsUs[index] =
-          contentIdToDurationUsMap.containsKey(contentId)
-              ? contentIdToDurationUsMap.get(contentId)
-              : CastUtils.getStreamDurationUs(mediaInfo);
-      defaultPositionsUs[index] = (long) (item.getStartTime() * C.MICROS_PER_SECOND);
-      index++;
+    for (int i = 0; i < ids.length; i++) {
+      int id = ids[i];
+      idsToIndex.put(id, i);
+      ItemData data = itemIdToData.get(id, ItemData.EMPTY);
+      durationsUs[i] = data.durationUs;
+      defaultPositionsUs[i] = data.defaultPositionUs;
     }
   }
 
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimelineTracker.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimelineTracker.java
index 412bfb476d..40c93a115a 100644
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimelineTracker.java
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimelineTracker.java
@@ -15,53 +15,84 @@
  */
 package com.google.android.exoplayer2.ext.cast;
 
-import com.google.android.gms.cast.MediaInfo;
+import android.util.SparseArray;
+import com.google.android.exoplayer2.C;
 import com.google.android.gms.cast.MediaQueueItem;
 import com.google.android.gms.cast.MediaStatus;
-import java.util.HashMap;
+import com.google.android.gms.cast.framework.media.RemoteMediaClient;
 import java.util.HashSet;
-import java.util.List;
 
 /**
- * Creates {@link CastTimeline}s from cast receiver app media status.
+ * Creates {@link CastTimeline CastTimelines} from cast receiver app status updates.
  *
  * <p>This class keeps track of the duration reported by the current item to fill any missing
  * durations in the media queue items [See internal: b/65152553].
  */
 /* package */ final class CastTimelineTracker {
 
-  private final HashMap<String, Long> contentIdToDurationUsMap;
-  private final HashSet<String> scratchContentIdSet;
+  private final SparseArray<CastTimeline.ItemData> itemIdToData;
 
   public CastTimelineTracker() {
-    contentIdToDurationUsMap = new HashMap<>();
-    scratchContentIdSet = new HashSet<>();
+    itemIdToData = new SparseArray<>();
   }
 
   /**
-   * Returns a {@link CastTimeline} that represent the given {@code status}.
+   * Returns a {@link CastTimeline} that represents the state of the given {@code
+   * remoteMediaClient}.
    *
-   * @param status The Cast media status.
-   * @return A {@link CastTimeline} that represent the given {@code status}.
+   * <p>Returned timelines may contain values obtained from {@code remoteMediaClient} in previous
+   * invocations of this method.
+   *
+   * @param remoteMediaClient The Cast media client.
+   * @return A {@link CastTimeline} that represents the given {@code remoteMediaClient} status.
    */
-  public CastTimeline getCastTimeline(MediaStatus status) {
-    MediaInfo mediaInfo = status.getMediaInfo();
-    List<MediaQueueItem> items = status.getQueueItems();
-    removeUnusedDurationEntries(items);
-
-    if (mediaInfo != null) {
-      String contentId = mediaInfo.getContentId();
-      long durationUs = CastUtils.getStreamDurationUs(mediaInfo);
-      contentIdToDurationUsMap.put(contentId, durationUs);
+  public CastTimeline getCastTimeline(RemoteMediaClient remoteMediaClient) {
+    int[] itemIds = remoteMediaClient.getMediaQueue().getItemIds();
+    if (itemIds.length > 0) {
+      // Only remove unused items when there is something in the queue to avoid removing all entries
+      // if the remote media client clears the queue temporarily. See [Internal ref: b/128825216].
+      removeUnusedItemDataEntries(itemIds);
     }
-    return new CastTimeline(items, contentIdToDurationUsMap);
+
+    // TODO: Reset state when the app instance changes [Internal ref: b/129672468].
+    MediaStatus mediaStatus = remoteMediaClient.getMediaStatus();
+    if (mediaStatus == null) {
+      return CastTimeline.EMPTY_CAST_TIMELINE;
+    }
+
+    int currentItemId = mediaStatus.getCurrentItemId();
+    long durationUs = CastUtils.getStreamDurationUs(mediaStatus.getMediaInfo());
+    itemIdToData.put(
+        currentItemId,
+        itemIdToData
+            .get(currentItemId, CastTimeline.ItemData.EMPTY)
+            .copyWithDurationUs(durationUs));
+
+    for (MediaQueueItem item : mediaStatus.getQueueItems()) {
+      int itemId = item.getItemId();
+      itemIdToData.put(
+          itemId,
+          itemIdToData
+              .get(itemId, CastTimeline.ItemData.EMPTY)
+              .copyWithDefaultPositionUs((long) (item.getStartTime() * C.MICROS_PER_SECOND)));
+    }
+
+    return new CastTimeline(itemIds, itemIdToData);
   }
 
-  private void removeUnusedDurationEntries(List<MediaQueueItem> items) {
-    scratchContentIdSet.clear();
-    for (MediaQueueItem item : items) {
-      scratchContentIdSet.add(item.getMedia().getContentId());
+  private void removeUnusedItemDataEntries(int[] itemIds) {
+    HashSet<Integer> scratchItemIds = new HashSet<>(/* initialCapacity= */ itemIds.length * 2);
+    for (int id : itemIds) {
+      scratchItemIds.add(id);
+    }
+
+    int index = 0;
+    while (index < itemIdToData.size()) {
+      if (!scratchItemIds.contains(itemIdToData.keyAt(index))) {
+        itemIdToData.removeAt(index);
+      } else {
+        index++;
+      }
     }
-    contentIdToDurationUsMap.keySet().retainAll(scratchContentIdSet);
   }
 }
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastUtils.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastUtils.java
index 3633526f42..d1660c3306 100644
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastUtils.java
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastUtils.java
@@ -31,11 +31,13 @@ import com.google.android.gms.cast.MediaTrack;
    * unknown or not applicable.
    *
    * @param mediaInfo The media info to get the duration from.
-   * @return The duration in microseconds.
+   * @return The duration in microseconds, or {@link C#TIME_UNSET} if unknown or not applicable.
    */
   public static long getStreamDurationUs(MediaInfo mediaInfo) {
-    long durationMs =
-        mediaInfo != null ? mediaInfo.getStreamDuration() : MediaInfo.UNKNOWN_DURATION;
+    if (mediaInfo == null) {
+      return C.TIME_UNSET;
+    }
+    long durationMs = mediaInfo.getStreamDuration();
     return durationMs != MediaInfo.UNKNOWN_DURATION ? C.msToUs(durationMs) : C.TIME_UNSET;
   }
 
diff --git a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTimelineTrackerTest.java b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTimelineTrackerTest.java
index 23c58d4884..69b25e4456 100644
--- a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTimelineTrackerTest.java
+++ b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTimelineTrackerTest.java
@@ -20,9 +20,10 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.TimelineAsserts;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.gms.cast.MediaInfo;
-import com.google.android.gms.cast.MediaQueueItem;
 import com.google.android.gms.cast.MediaStatus;
-import java.util.ArrayList;
+import com.google.android.gms.cast.framework.media.MediaQueue;
+import com.google.android.gms.cast.framework.media.RemoteMediaClient;
+import java.util.Collections;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
@@ -31,7 +32,6 @@ import org.mockito.Mockito;
 @RunWith(AndroidJUnit4.class)
 public class CastTimelineTrackerTest {
 
-  private static final long DURATION_1_MS = 1000;
   private static final long DURATION_2_MS = 2000;
   private static final long DURATION_3_MS = 3000;
   private static final long DURATION_4_MS = 4000;
@@ -39,91 +39,89 @@ public class CastTimelineTrackerTest {
 
   /** Tests that duration of the current media info is correctly propagated to the timeline. */
   @Test
-  public void testGetCastTimeline() {
-    MediaInfo mediaInfo;
-    MediaStatus status =
-        mockMediaStatus(
-            new int[] {1, 2, 3},
-            new String[] {"contentId1", "contentId2", "contentId3"},
-            new long[] {DURATION_1_MS, MediaInfo.UNKNOWN_DURATION, MediaInfo.UNKNOWN_DURATION});
-
+  public void testGetCastTimelinePersistsDuration() {
     CastTimelineTracker tracker = new CastTimelineTracker();
-    mediaInfo = getMediaInfo("contentId1", DURATION_1_MS);
-    Mockito.when(status.getMediaInfo()).thenReturn(mediaInfo);
-    TimelineAsserts.assertPeriodDurations(
-        tracker.getCastTimeline(status), C.msToUs(DURATION_1_MS), C.TIME_UNSET, C.TIME_UNSET);
 
-    mediaInfo = getMediaInfo("contentId3", DURATION_3_MS);
-    Mockito.when(status.getMediaInfo()).thenReturn(mediaInfo);
+    RemoteMediaClient remoteMediaClient =
+        mockRemoteMediaClient(
+            /* itemIds= */ new int[] {1, 2, 3, 4, 5},
+            /* currentItemId= */ 2,
+            /* currentDurationMs= */ DURATION_2_MS);
     TimelineAsserts.assertPeriodDurations(
-        tracker.getCastTimeline(status),
-        C.msToUs(DURATION_1_MS),
+        tracker.getCastTimeline(remoteMediaClient),
         C.TIME_UNSET,
-        C.msToUs(DURATION_3_MS));
+        C.msToUs(DURATION_2_MS),
+        C.TIME_UNSET,
+        C.TIME_UNSET,
+        C.TIME_UNSET);
 
-    mediaInfo = getMediaInfo("contentId2", DURATION_2_MS);
-    Mockito.when(status.getMediaInfo()).thenReturn(mediaInfo);
+    remoteMediaClient =
+        mockRemoteMediaClient(
+            /* itemIds= */ new int[] {1, 2, 3},
+            /* currentItemId= */ 3,
+            /* currentDurationMs= */ DURATION_3_MS);
     TimelineAsserts.assertPeriodDurations(
-        tracker.getCastTimeline(status),
-        C.msToUs(DURATION_1_MS),
+        tracker.getCastTimeline(remoteMediaClient),
+        C.TIME_UNSET,
         C.msToUs(DURATION_2_MS),
         C.msToUs(DURATION_3_MS));
 
-    MediaStatus newStatus =
-        mockMediaStatus(
-            new int[] {4, 1, 5, 3},
-            new String[] {"contentId4", "contentId1", "contentId5", "contentId3"},
-            new long[] {
-              MediaInfo.UNKNOWN_DURATION,
-              MediaInfo.UNKNOWN_DURATION,
-              DURATION_5_MS,
-              MediaInfo.UNKNOWN_DURATION
-            });
-    mediaInfo = getMediaInfo("contentId5", DURATION_5_MS);
-    Mockito.when(newStatus.getMediaInfo()).thenReturn(mediaInfo);
+    remoteMediaClient =
+        mockRemoteMediaClient(
+            /* itemIds= */ new int[] {1, 3},
+            /* currentItemId= */ 3,
+            /* currentDurationMs= */ DURATION_3_MS);
     TimelineAsserts.assertPeriodDurations(
-        tracker.getCastTimeline(newStatus),
-        C.TIME_UNSET,
-        C.msToUs(DURATION_1_MS),
-        C.msToUs(DURATION_5_MS),
-        C.msToUs(DURATION_3_MS));
+        tracker.getCastTimeline(remoteMediaClient), C.TIME_UNSET, C.msToUs(DURATION_3_MS));
 
-    mediaInfo = getMediaInfo("contentId3", DURATION_3_MS);
-    Mockito.when(newStatus.getMediaInfo()).thenReturn(mediaInfo);
+    remoteMediaClient =
+        mockRemoteMediaClient(
+            /* itemIds= */ new int[] {1, 2, 3, 4, 5},
+            /* currentItemId= */ 4,
+            /* currentDurationMs= */ DURATION_4_MS);
     TimelineAsserts.assertPeriodDurations(
-        tracker.getCastTimeline(newStatus),
+        tracker.getCastTimeline(remoteMediaClient),
         C.TIME_UNSET,
-        C.msToUs(DURATION_1_MS),
-        C.msToUs(DURATION_5_MS),
-        C.msToUs(DURATION_3_MS));
-
-    mediaInfo = getMediaInfo("contentId4", DURATION_4_MS);
-    Mockito.when(newStatus.getMediaInfo()).thenReturn(mediaInfo);
-    TimelineAsserts.assertPeriodDurations(
-        tracker.getCastTimeline(newStatus),
+        C.TIME_UNSET,
+        C.msToUs(DURATION_3_MS),
         C.msToUs(DURATION_4_MS),
-        C.msToUs(DURATION_1_MS),
-        C.msToUs(DURATION_5_MS),
-        C.msToUs(DURATION_3_MS));
+        C.TIME_UNSET);
+
+    remoteMediaClient =
+        mockRemoteMediaClient(
+            /* itemIds= */ new int[] {1, 2, 3, 4, 5},
+            /* currentItemId= */ 5,
+            /* currentDurationMs= */ DURATION_5_MS);
+    TimelineAsserts.assertPeriodDurations(
+        tracker.getCastTimeline(remoteMediaClient),
+        C.TIME_UNSET,
+        C.TIME_UNSET,
+        C.msToUs(DURATION_3_MS),
+        C.msToUs(DURATION_4_MS),
+        C.msToUs(DURATION_5_MS));
   }
 
-  private static MediaStatus mockMediaStatus(
-      int[] itemIds, String[] contentIds, long[] durationsMs) {
-    ArrayList<MediaQueueItem> items = new ArrayList<>();
-    for (int i = 0; i < contentIds.length; i++) {
-      MediaInfo mediaInfo = getMediaInfo(contentIds[i], durationsMs[i]);
-      MediaQueueItem item = Mockito.mock(MediaQueueItem.class);
-      Mockito.when(item.getMedia()).thenReturn(mediaInfo);
-      Mockito.when(item.getItemId()).thenReturn(itemIds[i]);
-      items.add(item);
-    }
+  private static RemoteMediaClient mockRemoteMediaClient(
+      int[] itemIds, int currentItemId, long currentDurationMs) {
+    RemoteMediaClient remoteMediaClient = Mockito.mock(RemoteMediaClient.class);
     MediaStatus status = Mockito.mock(MediaStatus.class);
-    Mockito.when(status.getQueueItems()).thenReturn(items);
-    return status;
+    Mockito.when(status.getQueueItems()).thenReturn(Collections.emptyList());
+    Mockito.when(remoteMediaClient.getMediaStatus()).thenReturn(status);
+    Mockito.when(status.getMediaInfo()).thenReturn(getMediaInfo(currentDurationMs));
+    Mockito.when(status.getCurrentItemId()).thenReturn(currentItemId);
+    MediaQueue mediaQueue = mockMediaQueue(itemIds);
+    Mockito.when(remoteMediaClient.getMediaQueue()).thenReturn(mediaQueue);
+    return remoteMediaClient;
   }
 
-  private static MediaInfo getMediaInfo(String contentId, long durationMs) {
-    return new MediaInfo.Builder(contentId)
+  private static MediaQueue mockMediaQueue(int[] itemIds) {
+    MediaQueue mediaQueue = Mockito.mock(MediaQueue.class);
+    Mockito.when(mediaQueue.getItemIds()).thenReturn(itemIds);
+    return mediaQueue;
+  }
+
+  private static MediaInfo getMediaInfo(long durationMs) {
+    return new MediaInfo.Builder(/*contentId= */ "")
         .setStreamDuration(durationMs)
         .setContentType(MimeTypes.APPLICATION_MP4)
         .setStreamType(MediaInfo.STREAM_TYPE_NONE)

From 5fd4fddfacd5af99fb39c47f220e85742deefb6b Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 1 Apr 2019 15:45:02 +0100
Subject: [PATCH 693/832] Use system Locale language to select audio track.

If no track matches the preferred language or no preferred language is provided,
use the system Locale language as the next decision criterion.

PiperOrigin-RevId: 241322703
---
 RELEASENOTES.md                               |  1 +
 .../trackselection/DefaultTrackSelector.java  | 81 +++++++++++++------
 .../google/android/exoplayer2/util/Util.java  | 48 ++++++++++-
 3 files changed, 102 insertions(+), 28 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index ac68a029c2..2b85f2e7c4 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -90,6 +90,7 @@
 * Prevent seeking when ICY metadata is present to prevent playback problems
   ([#5658](https://github.com/google/ExoPlayer/issues/5658)).
 * Use full BCP 47 language tags in `Format`.
+* Select audio track based on system language if no preference is provided.
 
 ### 2.9.6 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
index 5fc839cd32..f25f1a979c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -2073,23 +2073,23 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           if (languageScore > 0
               || (params.selectUndeterminedTextLanguage && formatHasNoLanguage(format))) {
             if (isDefault) {
-              trackScore = 13;
+              trackScore = 17;
             } else if (!isForced) {
               // Prefer non-forced to forced if a preferred text language has been specified. Where
               // both are provided the non-forced track will usually contain the forced subtitles as
               // a subset.
-              trackScore = 10;
+              trackScore = 13;
             } else {
-              trackScore = 7;
+              trackScore = 9;
             }
             trackScore += languageScore;
           } else if (isDefault) {
-            trackScore = 6;
+            trackScore = 8;
           } else if (isForced) {
             int preferredAudioLanguageScore =
                 getFormatLanguageScore(format, params.preferredAudioLanguage);
             if (preferredAudioLanguageScore > 0) {
-              trackScore = 3 + preferredAudioLanguageScore;
+              trackScore = 4 + preferredAudioLanguageScore;
             } else {
               trackScore = 1 + getFormatLanguageScore(format, selectedAudioLanguage);
             }
@@ -2293,21 +2293,32 @@ public class DefaultTrackSelector extends MappingTrackSelector {
   }
 
   /**
-   * Returns a score for how well a language specified in a {@link Format} fits a given language.
+   * Returns a score for how well a language specified in a {@link Format} matches a given language.
    *
    * @param format The {@link Format}.
    * @param language The language, or null.
-   * @return A score of 0 if the languages don't fit, a score of 1 if the languages fit partly and a
-   *     score of 2 if the languages fit fully.
+   * @return A score of 3 if the languages match fully, a score of 2 if the languages match partly,
+   *     a score of 1 if the languages don't match but belong to the same main language, and a score
+   *     of 0 if the languages don't match at all.
    */
   protected static int getFormatLanguageScore(Format format, @Nullable String language) {
-    if (language == null) {
+    if (format.language == null || language == null) {
       return 0;
     }
-    if (TextUtils.equals(language, format.language)) {
+    if (TextUtils.equals(format.language, language)) {
+      return 3;
+    }
+    // Partial match where one language is a subset of the other (e.g. "zho-hans" and "zho-hans-hk")
+    if (format.language.startsWith(language) || language.startsWith(format.language)) {
       return 2;
     }
-    return format.language != null && format.language.startsWith(language) ? 1 : 0;
+    // Partial match where only the main language tag is the same (e.g. "fra-fr" and "fra-ca")
+    if (format.language.length() >= 3
+        && language.length() >= 3
+        && format.language.substring(0, 3).equals(language.substring(0, 3))) {
+      return 1;
+    }
+    return 0;
   }
 
   private static List<Integer> getViewportFilteredTrackIndices(TrackGroup group, int viewportWidth,
@@ -2385,18 +2396,20 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     public final boolean isWithinConstraints;
 
     private final Parameters parameters;
-    private final int withinRendererCapabilitiesScore;
-    private final int matchLanguageScore;
-    private final int defaultSelectionFlagScore;
+    private final boolean isWithinRendererCapabilities;
+    private final int preferredLanguageScore;
+    private final int localeLanguageMatchIndex;
+    private final int localeLanguageScore;
+    private final boolean isDefaultSelectionFlag;
     private final int channelCount;
     private final int sampleRate;
     private final int bitrate;
 
     public AudioTrackScore(Format format, Parameters parameters, int formatSupport) {
       this.parameters = parameters;
-      withinRendererCapabilitiesScore = isSupported(formatSupport, false) ? 1 : 0;
-      matchLanguageScore = getFormatLanguageScore(format, parameters.preferredAudioLanguage);
-      defaultSelectionFlagScore = (format.selectionFlags & C.SELECTION_FLAG_DEFAULT) != 0 ? 1 : 0;
+      isWithinRendererCapabilities = isSupported(formatSupport, false);
+      preferredLanguageScore = getFormatLanguageScore(format, parameters.preferredAudioLanguage);
+      isDefaultSelectionFlag = (format.selectionFlags & C.SELECTION_FLAG_DEFAULT) != 0;
       channelCount = format.channelCount;
       sampleRate = format.sampleRate;
       bitrate = format.bitrate;
@@ -2404,6 +2417,19 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           (format.bitrate == Format.NO_VALUE || format.bitrate <= parameters.maxAudioBitrate)
               && (format.channelCount == Format.NO_VALUE
                   || format.channelCount <= parameters.maxAudioChannelCount);
+      String[] localeLanguages = Util.getSystemLanguageCodes();
+      int bestMatchIndex = Integer.MAX_VALUE;
+      int bestMatchScore = 0;
+      for (int i = 0; i < localeLanguages.length; i++) {
+        int score = getFormatLanguageScore(format, localeLanguages[i]);
+        if (score > 0) {
+          bestMatchIndex = i;
+          bestMatchScore = score;
+          break;
+        }
+      }
+      localeLanguageMatchIndex = bestMatchIndex;
+      localeLanguageScore = bestMatchScore;
     }
 
     /**
@@ -2415,12 +2441,11 @@ public class DefaultTrackSelector extends MappingTrackSelector {
      */
     @Override
     public int compareTo(@NonNull AudioTrackScore other) {
-      if (this.withinRendererCapabilitiesScore != other.withinRendererCapabilitiesScore) {
-        return compareInts(this.withinRendererCapabilitiesScore,
-            other.withinRendererCapabilitiesScore);
+      if (this.isWithinRendererCapabilities != other.isWithinRendererCapabilities) {
+        return this.isWithinRendererCapabilities ? 1 : -1;
       }
-      if (this.matchLanguageScore != other.matchLanguageScore) {
-        return compareInts(this.matchLanguageScore, other.matchLanguageScore);
+      if (this.preferredLanguageScore != other.preferredLanguageScore) {
+        return compareInts(this.preferredLanguageScore, other.preferredLanguageScore);
       }
       if (this.isWithinConstraints != other.isWithinConstraints) {
         return this.isWithinConstraints ? 1 : -1;
@@ -2431,12 +2456,18 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           return bitrateComparison > 0 ? -1 : 1;
         }
       }
-      if (this.defaultSelectionFlagScore != other.defaultSelectionFlagScore) {
-        return compareInts(this.defaultSelectionFlagScore, other.defaultSelectionFlagScore);
+      if (this.isDefaultSelectionFlag != other.isDefaultSelectionFlag) {
+        return this.isDefaultSelectionFlag ? 1 : -1;
+      }
+      if (this.localeLanguageMatchIndex != other.localeLanguageMatchIndex) {
+        return -compareInts(this.localeLanguageMatchIndex, other.localeLanguageMatchIndex);
+      }
+      if (this.localeLanguageScore != other.localeLanguageScore) {
+        return compareInts(this.localeLanguageScore, other.localeLanguageScore);
       }
       // If the formats are within constraints and renderer capabilities then prefer higher values
       // of channel count, sample rate and bit rate in that order. Otherwise, prefer lower values.
-      int resultSign = isWithinConstraints && withinRendererCapabilitiesScore == 1 ? 1 : -1;
+      int resultSign = isWithinConstraints && isWithinRendererCapabilities ? 1 : -1;
       if (this.channelCount != other.channelCount) {
         return resultSign * compareInts(this.channelCount, other.channelCount);
       }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
index 854d63ae04..c05486bedf 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
@@ -29,6 +29,7 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.graphics.Point;
 import android.media.AudioFormat;
 import android.net.ConnectivityManager;
@@ -445,18 +446,18 @@ public final class Util {
    * @return The all-lowercase normalized code, or null if the input was null, or {@code
    *     language.toLowerCase()} if the language could not be normalized.
    */
-  public static @Nullable String normalizeLanguageCode(@Nullable String language) {
+  public static @PolyNull String normalizeLanguageCode(@PolyNull String language) {
     if (language == null) {
       return null;
     }
     try {
-      Locale locale = Util.SDK_INT >= 21 ? Locale.forLanguageTag(language) : new Locale(language);
+      Locale locale = getLocaleForLanguageTag(language);
       int localeLanguageLength = locale.getLanguage().length();
       String normLanguage = locale.getISO3Language();
       if (normLanguage.isEmpty()) {
         return toLowerInvariant(language);
       }
-      String normTag = Util.SDK_INT >= 21 ? locale.toLanguageTag() : locale.toString();
+      String normTag = getLocaleLanguageTag(locale);
       return toLowerInvariant(normLanguage + normTag.substring(localeLanguageLength));
     } catch (MissingResourceException e) {
       return toLowerInvariant(language);
@@ -1753,6 +1754,18 @@ public final class Util {
     return toUpperInvariant(Locale.getDefault().getCountry());
   }
 
+  /**
+   * Returns a non-empty array of normalized IETF BCP 47 language tags for the system languages
+   * ordered by preference.
+   */
+  public static String[] getSystemLanguageCodes() {
+    String[] systemLocales = getSystemLocales();
+    for (int i = 0; i < systemLocales.length; i++) {
+      systemLocales[i] = normalizeLanguageCode(systemLocales[i]);
+    }
+    return systemLocales;
+  }
+
   /**
    * Uncompresses the data in {@code input}.
    *
@@ -1936,6 +1949,35 @@ public final class Util {
     display.getSize(outSize);
   }
 
+  private static String[] getSystemLocales() {
+    return SDK_INT >= 24
+        ? getSystemLocalesV24()
+        : new String[] {getLocaleLanguageTag(Resources.getSystem().getConfiguration().locale)};
+  }
+
+  @TargetApi(24)
+  private static String[] getSystemLocalesV24() {
+    return Util.split(Resources.getSystem().getConfiguration().getLocales().toLanguageTags(), ",");
+  }
+
+  private static Locale getLocaleForLanguageTag(String languageTag) {
+    return Util.SDK_INT >= 21 ? getLocaleForLanguageTagV21(languageTag) : new Locale(languageTag);
+  }
+
+  @TargetApi(21)
+  private static Locale getLocaleForLanguageTagV21(String languageTag) {
+    return Locale.forLanguageTag(languageTag);
+  }
+
+  private static String getLocaleLanguageTag(Locale locale) {
+    return SDK_INT >= 21 ? getLocaleLanguageTagV21(locale) : locale.toString();
+  }
+
+  @TargetApi(21)
+  private static String getLocaleLanguageTagV21(Locale locale) {
+    return locale.toLanguageTag();
+  }
+
   private static @C.NetworkType int getMobileNetworkType(NetworkInfo networkInfo) {
     switch (networkInfo.getSubtype()) {
       case TelephonyManager.NETWORK_TYPE_EDGE:

From e612511afc2cf99b0979ac358edf9d523bca1ab6 Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Mon, 1 Apr 2019 16:26:29 +0100
Subject: [PATCH 694/832] take byte offset into account when unsynchronizing an
 id3 frame

Issue #5673

PiperOrigin-RevId: 241328598
---
 RELEASENOTES.md                                             | 3 ++-
 .../google/android/exoplayer2/metadata/id3/Id3Decoder.java  | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 2b85f2e7c4..0d982d340e 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -90,7 +90,8 @@
 * Prevent seeking when ICY metadata is present to prevent playback problems
   ([#5658](https://github.com/google/ExoPlayer/issues/5658)).
 * Use full BCP 47 language tags in `Format`.
-* Select audio track based on system language if no preference is provided.
+* Take byte offset into account when unsynchronizing an id3 frame
+  ([#5673](https://github.com/google/ExoPlayer/issues/5673)).
 
 ### 2.9.6 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java
index 4bc864935f..fff0828b3a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java
@@ -713,9 +713,11 @@ public final class Id3Decoder implements MetadataDecoder {
    */
   private static int removeUnsynchronization(ParsableByteArray data, int length) {
     byte[] bytes = data.data;
-    for (int i = data.getPosition(); i + 1 < length; i++) {
+    int startPosition = data.getPosition();
+    for (int i = startPosition; i + 1 < startPosition + length; i++) {
       if ((bytes[i] & 0xFF) == 0xFF && bytes[i + 1] == 0x00) {
-        System.arraycopy(bytes, i + 2, bytes, i + 1, length - i - 2);
+        int relativePosition = i - startPosition;
+        System.arraycopy(bytes, i + 2, bytes, i + 1, length - relativePosition - 2);
         length--;
       }
     }

From e8b0d489eb8c67a5846142d34f1b54a3984f2b67 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 1 Apr 2019 19:05:13 +0100
Subject: [PATCH 695/832] Rename Lib Opus in ExoV2 to avoid the namespace
 collision between ExoV1 and ExoV2's version of libopusJNI.so

PiperOrigin-RevId: 241359424
---
 .../com/google/android/exoplayer2/ext/opus/OpusLibrary.java   | 2 +-
 extensions/opus/src/main/jni/Android.mk                       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusLibrary.java b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusLibrary.java
index 4cb3ce3190..285be96388 100644
--- a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusLibrary.java
+++ b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusLibrary.java
@@ -27,7 +27,7 @@ public final class OpusLibrary {
     ExoPlayerLibraryInfo.registerModule("goog.exo.opus");
   }
 
-  private static final LibraryLoader LOADER = new LibraryLoader("opusJNI");
+  private static final LibraryLoader LOADER = new LibraryLoader("opusV2JNI");
 
   private OpusLibrary() {}
 
diff --git a/extensions/opus/src/main/jni/Android.mk b/extensions/opus/src/main/jni/Android.mk
index 9d1e4fe726..0b06d9ecd8 100644
--- a/extensions/opus/src/main/jni/Android.mk
+++ b/extensions/opus/src/main/jni/Android.mk
@@ -21,10 +21,10 @@ include $(CLEAR_VARS)
 LOCAL_PATH := $(WORKING_DIR)
 include libopus.mk
 
-# build libopusJNI.so
+# build libopusV2JNI.so
 include $(CLEAR_VARS)
 LOCAL_PATH := $(WORKING_DIR)
-LOCAL_MODULE := libopusJNI
+LOCAL_MODULE := libopusV2JNI
 LOCAL_ARM_MODE := arm
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := opus_jni.cc

From 2dc07fc4614244788f515be17d0cc919ed2829c7 Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Mon, 1 Apr 2019 19:08:17 +0100
Subject: [PATCH 696/832] assert userAgent is not empty when constructing a
 DefaultHttpDataSourceFactory

Issue: #5706
PiperOrigin-RevId: 241360166
---
 .../exoplayer2/upstream/DefaultHttpDataSourceFactory.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceFactory.java
index ef1a3aa7a7..371343857f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceFactory.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.upstream;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.upstream.HttpDataSource.BaseFactory;
 import com.google.android.exoplayer2.upstream.HttpDataSource.Factory;
+import com.google.android.exoplayer2.util.Assertions;
 
 /** A {@link Factory} that produces {@link DefaultHttpDataSource} instances. */
 public final class DefaultHttpDataSourceFactory extends BaseFactory {
@@ -93,7 +94,7 @@ public final class DefaultHttpDataSourceFactory extends BaseFactory {
       int connectTimeoutMillis,
       int readTimeoutMillis,
       boolean allowCrossProtocolRedirects) {
-    this.userAgent = userAgent;
+    this.userAgent = Assertions.checkNotEmpty(userAgent);
     this.listener = listener;
     this.connectTimeoutMillis = connectTimeoutMillis;
     this.readTimeoutMillis = readTimeoutMillis;

From 9dc22c3086590bd36f67ec2c6ced0b1d2f7b4865 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 1 Apr 2019 20:55:48 +0100
Subject: [PATCH 697/832] Enable HDMV DTS stream detection if a flag is set

Issue: #5330
PiperOrigin-RevId: 241381723
---
 RELEASENOTES.md                                    |  4 ++++
 .../ts/DefaultTsPayloadReaderFactory.java          | 14 +++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 0d982d340e..924c38b1ba 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -18,6 +18,10 @@
   * Support encrypted initialization segments
     ([#5441](https://github.com/google/ExoPlayer/issues/5441)).
   * Parse `EXT-X-MEDIA` `CHARACTERISTICS` attribute into `Format.roleFlags`.
+* MPEG-TS: enable HDMV DTS stream detection only if a flag is set. By default
+  (if the flag is not set), the 0x82 elementary stream type is now treated as an
+  SCTE subtitle track
+  ([#5330](https://github.com/google/ExoPlayer/issues/5330)).
 * `ExtractorMediaSource` renamed to `ProgressiveMediaSource`.
 * Support for playing spherical videos on Daydream.
 * Improve decoder re-use between playbacks. TODO: Write and link a blog post
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java
index 4ddac6f761..15c37430bc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java
@@ -38,7 +38,8 @@ public final class DefaultTsPayloadReaderFactory implements TsPayloadReader.Fact
    * Flags controlling elementary stream readers' behavior. Possible flag values are {@link
    * #FLAG_ALLOW_NON_IDR_KEYFRAMES}, {@link #FLAG_IGNORE_AAC_STREAM}, {@link
    * #FLAG_IGNORE_H264_STREAM}, {@link #FLAG_DETECT_ACCESS_UNITS}, {@link
-   * #FLAG_IGNORE_SPLICE_INFO_STREAM} and {@link #FLAG_OVERRIDE_CAPTION_DESCRIPTORS}.
+   * #FLAG_IGNORE_SPLICE_INFO_STREAM}, {@link #FLAG_OVERRIDE_CAPTION_DESCRIPTORS} and {@link
+   * #FLAG_ENABLE_HDMV_DTS_AUDIO_STREAMS}.
    */
   @Documented
   @Retention(RetentionPolicy.SOURCE)
@@ -51,7 +52,7 @@ public final class DefaultTsPayloadReaderFactory implements TsPayloadReader.Fact
         FLAG_DETECT_ACCESS_UNITS,
         FLAG_IGNORE_SPLICE_INFO_STREAM,
         FLAG_OVERRIDE_CAPTION_DESCRIPTORS,
-        FLAG_IGNORE_HDMV_DTS_STREAM
+        FLAG_ENABLE_HDMV_DTS_AUDIO_STREAMS
       })
   public @interface Flags {}
 
@@ -88,11 +89,10 @@ public final class DefaultTsPayloadReaderFactory implements TsPayloadReader.Fact
    */
   public static final int FLAG_OVERRIDE_CAPTION_DESCRIPTORS = 1 << 5;
   /**
-   * Prevents the creation of {@link DtsReader} instances when receiving {@link
-   * TsExtractor#TS_STREAM_TYPE_HDMV_DTS} as stream type. Enabling this flag prevents a stream type
-   * collision between HDMV DTS audio and SCTE-35 subtitles.
+   * Sets whether HDMV DTS audio streams will be handled. If this flag is set, SCTE subtitles will
+   * not be detected, as they share the same elementary stream type as HDMV DTS.
    */
-  public static final int FLAG_IGNORE_HDMV_DTS_STREAM = 1 << 6;
+  public static final int FLAG_ENABLE_HDMV_DTS_AUDIO_STREAMS = 1 << 6;
 
   private static final int DESCRIPTOR_TAG_CAPTION_SERVICE = 0x86;
 
@@ -152,7 +152,7 @@ public final class DefaultTsPayloadReaderFactory implements TsPayloadReader.Fact
       case TsExtractor.TS_STREAM_TYPE_AC4:
         return new PesReader(new Ac4Reader(esInfo.language));
       case TsExtractor.TS_STREAM_TYPE_HDMV_DTS:
-        if (isSet(FLAG_IGNORE_HDMV_DTS_STREAM)) {
+        if (!isSet(FLAG_ENABLE_HDMV_DTS_AUDIO_STREAMS)) {
           return null;
         }
         // Fall through.

From 42b641221c9cb72c5058769bf84d7e7583fd50ea Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 2 Apr 2019 11:37:57 +0100
Subject: [PATCH 698/832] Provide flag to disable throwing of cache
 initialization exceptions

PiperOrigin-RevId: 241497141
---
 .../exoplayer2/upstream/cache/SimpleCache.java      | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index b7440e531c..0e4be169b6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -62,6 +62,7 @@ public final class SimpleCache implements Cache {
   private static final HashSet<File> lockedCacheDirs = new HashSet<>();
 
   private static boolean cacheFolderLockingDisabled;
+  private static boolean cacheInitializationExceptionsDisabled;
 
   private final File cacheDir;
   private final CacheEvictor evictor;
@@ -100,6 +101,16 @@ public final class SimpleCache implements Cache {
     lockedCacheDirs.clear();
   }
 
+  /**
+   * Disables throwing of cache initialization exceptions.
+   *
+   * @deprecated Don't use this. Provided for problematic upgrade cases only.
+   */
+  @Deprecated
+  public static void disableCacheInitializationExceptions() {
+    cacheInitializationExceptionsDisabled = true;
+  }
+
   /**
    * Deletes all content belonging to a cache instance.
    *
@@ -272,7 +283,7 @@ public final class SimpleCache implements Cache {
    * @throws CacheException If an error occurred during initialization.
    */
   public synchronized void checkInitialization() throws CacheException {
-    if (initializationException != null) {
+    if (!cacheInitializationExceptionsDisabled && initializationException != null) {
       throw initializationException;
     }
   }

From 9aacef47ad1690bf4660133aab172c7fe136e03c Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 2 Apr 2019 15:23:38 +0100
Subject: [PATCH 699/832] Allow TrackSelectionDialog to indicate whether it has
 any content

PiperOrigin-RevId: 241523313
---
 .../exoplayer2/demo/DownloadTracker.java      |  38 +++--
 .../exoplayer2/demo/PlayerActivity.java       |  13 +-
 .../exoplayer2/demo/TrackSelectionDialog.java | 151 ++++++++++++------
 3 files changed, 131 insertions(+), 71 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index b484c1e92f..16f3f1b809 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -197,7 +197,6 @@ public class DownloadTracker implements DownloadManager.Listener {
       if (trackSelectionDialog != null) {
         trackSelectionDialog.dismiss();
       }
-      startDownloadDialogHelper = null;
     }
 
     // DownloadHelper.Callback implementation.
@@ -206,21 +205,26 @@ public class DownloadTracker implements DownloadManager.Listener {
     public void onPrepared(DownloadHelper helper) {
       if (helper.getPeriodCount() == 0) {
         Log.d(TAG, "No periods found. Downloading entire stream.");
-        DownloadAction downloadAction = downloadHelper.getDownloadAction(Util.getUtf8Bytes(name));
-        startServiceWithAction(downloadAction);
+        startDownload();
         downloadHelper.release();
         return;
       }
       mappedTrackInfo = downloadHelper.getMappedTrackInfo(/* periodIndex= */ 0);
-      trackSelectionDialog = new TrackSelectionDialog();
-      trackSelectionDialog.init(
-          /* titleId= */ R.string.exo_download_description,
-          mappedTrackInfo,
-          /* initialSelection= */ DownloadHelper.DEFAULT_TRACK_SELECTOR_PARAMETERS,
-          /* allowAdaptiveSelections =*/ false,
-          /* allowMultipleOverrides= */ true,
-          /* onClickListener= */ this,
-          /* onDismissListener= */ this);
+      if (!TrackSelectionDialog.willHaveContent(mappedTrackInfo)) {
+        Log.d(TAG, "No dialog content. Downloading entire stream.");
+        startDownload();
+        downloadHelper.release();
+        return;
+      }
+      trackSelectionDialog =
+          TrackSelectionDialog.createForMappedTrackInfoAndParameters(
+              /* titleId= */ R.string.exo_download_description,
+              mappedTrackInfo,
+              /* initialParameters= */ DownloadHelper.DEFAULT_TRACK_SELECTOR_PARAMETERS,
+              /* allowAdaptiveSelections =*/ false,
+              /* allowMultipleOverrides= */ true,
+              /* onClickListener= */ this,
+              /* onDismissListener= */ this);
       trackSelectionDialog.show(fragmentManager, /* tag= */ null);
     }
 
@@ -248,8 +252,7 @@ public class DownloadTracker implements DownloadManager.Listener {
           }
         }
       }
-      DownloadAction downloadAction = downloadHelper.getDownloadAction(Util.getUtf8Bytes(name));
-      startServiceWithAction(downloadAction);
+      startDownload();
     }
 
     // DialogInterface.OnDismissListener implementation.
@@ -259,5 +262,12 @@ public class DownloadTracker implements DownloadManager.Listener {
       trackSelectionDialog = null;
       downloadHelper.release();
     }
+
+    // Internal methods.
+
+    private void startDownload() {
+      DownloadAction downloadAction = downloadHelper.getDownloadAction(Util.getUtf8Bytes(name));
+      startServiceWithAction(downloadAction);
+    }
   }
 }
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 2c252714b4..11df14e3dd 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
@@ -199,6 +199,7 @@ public class PlayerActivity extends AppCompatActivity
 
   @Override
   public void onNewIntent(Intent intent) {
+    super.onNewIntent(intent);
     releasePlayer();
     releaseAdsLoader();
     clearStartPosition();
@@ -294,13 +295,15 @@ public class PlayerActivity extends AppCompatActivity
 
   @Override
   public void onClick(View view) {
-    if (view == selectTracksButton && !isShowingTrackSelectionDialog) {
+    if (view == selectTracksButton
+        && !isShowingTrackSelectionDialog
+        && TrackSelectionDialog.willHaveContent(trackSelector)) {
       isShowingTrackSelectionDialog = true;
-      TrackSelectionDialog newDialog =
+      TrackSelectionDialog trackSelectionDialog =
           TrackSelectionDialog.createForTrackSelector(
               trackSelector,
-              /* onDismissListener= */ dialog -> isShowingTrackSelectionDialog = false);
-      newDialog.show(getSupportFragmentManager(), /* tag= */ null);
+              /* onDismissListener= */ dismissedDialog -> isShowingTrackSelectionDialog = false);
+      trackSelectionDialog.show(getSupportFragmentManager(), /* tag= */ null);
     }
   }
 
@@ -599,7 +602,7 @@ public class PlayerActivity extends AppCompatActivity
 
   private void updateButtonVisibility() {
     selectTracksButton.setEnabled(
-        player != null && trackSelector.getCurrentMappedTrackInfo() != null);
+        player != null && TrackSelectionDialog.willHaveContent(trackSelector));
   }
 
   private void showControls() {
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
index e66be8c6f0..a7dd1a0df8 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
@@ -47,22 +47,40 @@ import java.util.List;
 public final class TrackSelectionDialog extends DialogFragment {
 
   private final SparseArray<TrackSelectionViewFragment> tabFragments;
-  private final List<CharSequence> tabTitles;
+  private final ArrayList<Integer> tabTrackTypes;
 
   private int titleId;
-  private MappedTrackInfo mappedTrackInfo;
-  private DefaultTrackSelector.Parameters initialSelection;
-  private boolean allowAdaptiveSelections;
-  private boolean allowMultipleOverrides;
   private DialogInterface.OnClickListener onClickListener;
   private DialogInterface.OnDismissListener onDismissListener;
 
   /**
-   * Creates and initializes a dialog with a {@link DefaultTrackSelector} and automatically updates
-   * the track selector's parameters when tracks are selected.
+   * Returns whether a track selection dialog will have content to display if initialized with the
+   * specified {@link DefaultTrackSelector} in its current state.
+   */
+  public static boolean willHaveContent(DefaultTrackSelector trackSelector) {
+    MappedTrackInfo mappedTrackInfo = trackSelector.getCurrentMappedTrackInfo();
+    return mappedTrackInfo != null && willHaveContent(mappedTrackInfo);
+  }
+
+  /**
+   * Returns whether a track selection dialog will have content to display if initialized with the
+   * specified {@link MappedTrackInfo}.
+   */
+  public static boolean willHaveContent(MappedTrackInfo mappedTrackInfo) {
+    for (int i = 0; i < mappedTrackInfo.getRendererCount(); i++) {
+      if (showTabForRenderer(mappedTrackInfo, i)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Creates a dialog for a given {@link DefaultTrackSelector}, whose parameters will be
+   * automatically updated when tracks are selected.
    *
-   * @param trackSelector A {@link DefaultTrackSelector}.
-   * @param onDismissListener {@link DialogInterface.OnDismissListener} called when the dialog is
+   * @param trackSelector The {@link DefaultTrackSelector}.
+   * @param onDismissListener A {@link DialogInterface.OnDismissListener} to call when the dialog is
    *     dismissed.
    */
   public static TrackSelectionDialog createForTrackSelector(
@@ -74,7 +92,7 @@ public final class TrackSelectionDialog extends DialogFragment {
     trackSelectionDialog.init(
         /* titleId= */ R.string.track_selection_title,
         mappedTrackInfo,
-        /* initialSelection = */ parameters,
+        /* initialParameters = */ parameters,
         /* allowAdaptiveSelections =*/ true,
         /* allowMultipleOverrides= */ false,
         /* onClickListener= */ (dialog, which) -> {
@@ -100,20 +118,12 @@ public final class TrackSelectionDialog extends DialogFragment {
     return trackSelectionDialog;
   }
 
-  /** Creates the dialog. */
-  public TrackSelectionDialog() {
-    tabFragments = new SparseArray<>();
-    tabTitles = new ArrayList<>();
-    // Retain instance across activity re-creation to prevent losing access to init data.
-    setRetainInstance(true);
-  }
-
   /**
-   * Initializes the dialog.
+   * Creates a dialog for given {@link MappedTrackInfo} and {@link DefaultTrackSelector.Parameters}.
    *
    * @param titleId The resource id of the dialog title.
    * @param mappedTrackInfo The {@link MappedTrackInfo} to display.
-   * @param initialSelection The {@link DefaultTrackSelector.Parameters} describing the initial
+   * @param initialParameters The {@link DefaultTrackSelector.Parameters} describing the initial
    *     track selection.
    * @param allowAdaptiveSelections Whether adaptive selections (consisting of more than one track)
    *     can be made.
@@ -122,21 +132,60 @@ public final class TrackSelectionDialog extends DialogFragment {
    * @param onDismissListener {@link DialogInterface.OnDismissListener} called when the dialog is
    *     dismissed.
    */
-  public void init(
+  public static TrackSelectionDialog createForMappedTrackInfoAndParameters(
       int titleId,
       MappedTrackInfo mappedTrackInfo,
-      DefaultTrackSelector.Parameters initialSelection,
+      DefaultTrackSelector.Parameters initialParameters,
+      boolean allowAdaptiveSelections,
+      boolean allowMultipleOverrides,
+      DialogInterface.OnClickListener onClickListener,
+      DialogInterface.OnDismissListener onDismissListener) {
+    TrackSelectionDialog trackSelectionDialog = new TrackSelectionDialog();
+    trackSelectionDialog.init(
+        titleId,
+        mappedTrackInfo,
+        initialParameters,
+        allowAdaptiveSelections,
+        allowMultipleOverrides,
+        onClickListener,
+        onDismissListener);
+    return trackSelectionDialog;
+  }
+
+  public TrackSelectionDialog() {
+    tabFragments = new SparseArray<>();
+    tabTrackTypes = new ArrayList<>();
+    // Retain instance across activity re-creation to prevent losing access to init data.
+    setRetainInstance(true);
+  }
+
+  private void init(
+      int titleId,
+      MappedTrackInfo mappedTrackInfo,
+      DefaultTrackSelector.Parameters initialParameters,
       boolean allowAdaptiveSelections,
       boolean allowMultipleOverrides,
       DialogInterface.OnClickListener onClickListener,
       DialogInterface.OnDismissListener onDismissListener) {
     this.titleId = titleId;
-    this.mappedTrackInfo = mappedTrackInfo;
-    this.initialSelection = initialSelection;
-    this.allowAdaptiveSelections = allowAdaptiveSelections;
-    this.allowMultipleOverrides = allowMultipleOverrides;
     this.onClickListener = onClickListener;
     this.onDismissListener = onDismissListener;
+    for (int i = 0; i < mappedTrackInfo.getRendererCount(); i++) {
+      if (showTabForRenderer(mappedTrackInfo, i)) {
+        int trackType = mappedTrackInfo.getRendererType(/* rendererIndex= */ i);
+        TrackGroupArray trackGroupArray = mappedTrackInfo.getTrackGroups(i);
+        TrackSelectionViewFragment tabFragment = new TrackSelectionViewFragment();
+        tabFragment.init(
+            mappedTrackInfo,
+            /* rendererIndex= */ i,
+            initialParameters.getRendererDisabled(/* rendererIndex= */ i),
+            initialParameters.getSelectionOverride(/* rendererIndex= */ i, trackGroupArray),
+            allowAdaptiveSelections,
+            allowMultipleOverrides);
+        tabFragments.put(i, tabFragment);
+        tabTrackTypes.add(trackType);
+      }
+    }
   }
 
   /**
@@ -183,27 +232,7 @@ public final class TrackSelectionDialog extends DialogFragment {
   @Override
   public View onCreateView(
       LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-    for (int i = 0; i < mappedTrackInfo.getRendererCount(); i++) {
-      TrackGroupArray trackGroupArray = mappedTrackInfo.getTrackGroups(i);
-      if (trackGroupArray.length == 0) {
-        continue;
-      }
-      String trackTypeString =
-          getTrackTypeString(mappedTrackInfo.getRendererType(/* rendererIndex= */ i));
-      if (trackTypeString == null) {
-        continue;
-      }
-      TrackSelectionViewFragment tabFragment = new TrackSelectionViewFragment();
-      tabFragment.init(
-          mappedTrackInfo,
-          /* rendererIndex= */ i,
-          initialSelection.getRendererDisabled(/* rendererIndex= */ i),
-          initialSelection.getSelectionOverride(/* rendererIndex= */ i, trackGroupArray),
-          allowAdaptiveSelections,
-          allowMultipleOverrides);
-      tabFragments.put(i, tabFragment);
-      tabTitles.add(trackTypeString);
-    }
+
     View dialogView = inflater.inflate(R.layout.track_selection_dialog, container, false);
     TabLayout tabLayout = dialogView.findViewById(R.id.track_selection_dialog_tab_layout);
     ViewPager viewPager = dialogView.findViewById(R.id.track_selection_dialog_view_pager);
@@ -221,9 +250,27 @@ public final class TrackSelectionDialog extends DialogFragment {
     return dialogView;
   }
 
-  @Nullable
-  private String getTrackTypeString(int trackType) {
-    Resources resources = getResources();
+  private static boolean showTabForRenderer(MappedTrackInfo mappedTrackInfo, int rendererIndex) {
+    TrackGroupArray trackGroupArray = mappedTrackInfo.getTrackGroups(rendererIndex);
+    if (trackGroupArray.length == 0) {
+      return false;
+    }
+    int trackType = mappedTrackInfo.getRendererType(rendererIndex);
+    return isSupportedTrackType(trackType);
+  }
+
+  private static boolean isSupportedTrackType(int trackType) {
+    switch (trackType) {
+      case C.TRACK_TYPE_VIDEO:
+      case C.TRACK_TYPE_AUDIO:
+      case C.TRACK_TYPE_TEXT:
+        return true;
+      default:
+        return false;
+    }
+  }
+
+  private static String getTrackTypeString(Resources resources, int trackType) {
     switch (trackType) {
       case C.TRACK_TYPE_VIDEO:
         return resources.getString(R.string.exo_track_selection_title_video);
@@ -232,7 +279,7 @@ public final class TrackSelectionDialog extends DialogFragment {
       case C.TRACK_TYPE_TEXT:
         return resources.getString(R.string.exo_track_selection_title_text);
       default:
-        return null;
+        throw new IllegalArgumentException();
     }
   }
 
@@ -255,7 +302,7 @@ public final class TrackSelectionDialog extends DialogFragment {
     @Nullable
     @Override
     public CharSequence getPageTitle(int position) {
-      return tabTitles.get(position);
+      return getTrackTypeString(getResources(), tabTrackTypes.get(position));
     }
   }
 

From d5b19694faca3ecb73c40601760ddcac564f4615 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Tue, 2 Apr 2019 15:34:18 +0100
Subject: [PATCH 700/832] Add percentage field to CacheUtil.CachingCounters

PiperOrigin-RevId: 241524766
---
 .../exoplayer2/offline/ProgressiveDownloader.java  |  5 +----
 .../exoplayer2/upstream/cache/CacheUtil.java       | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
index e712f9ddc3..8cf5820fa6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
@@ -103,10 +103,7 @@ public final class ProgressiveDownloader implements Downloader {
 
   @Override
   public float getDownloadPercentage() {
-    long contentLength = cachingCounters.contentLength;
-    return contentLength == C.LENGTH_UNSET
-        ? C.PERCENTAGE_UNSET
-        : ((cachingCounters.totalCachedBytes() * 100f) / contentLength);
+    return cachingCounters.percentage;
   }
 
   @Override
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
index e41fa98eeb..96561260ed 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
@@ -42,6 +42,8 @@ public final class CacheUtil {
     public volatile long newlyCachedBytes;
     /** The length of the content being cached in bytes, or {@link C#LENGTH_UNSET} if unknown. */
     public volatile long contentLength = C.LENGTH_UNSET;
+    /** The percentage of cached data, or {@link C#PERCENTAGE_UNSET} if unavailable. */
+    public volatile float percentage;
 
     /**
      * Returns the sum of {@link #alreadyCachedBytes} and {@link #newlyCachedBytes}.
@@ -49,6 +51,16 @@ public final class CacheUtil {
     public long totalCachedBytes() {
       return alreadyCachedBytes + newlyCachedBytes;
     }
+
+    /** Updates {@link #percentage} value using other values. */
+    public void updatePercentage() {
+      // Take local snapshot of the volatile field
+      long contentLength = this.contentLength;
+      percentage =
+          contentLength == C.LENGTH_UNSET
+              ? C.PERCENTAGE_UNSET
+              : ((totalCachedBytes() * 100f) / contentLength);
+    }
   }
 
   /** Default buffer size to be used while caching. */
@@ -105,6 +117,7 @@ public final class CacheUtil {
       start += blockLength;
       left -= left == C.LENGTH_UNSET ? 0 : blockLength;
     }
+    counters.updatePercentage();
   }
 
   /**
@@ -293,6 +306,7 @@ public final class CacheUtil {
           }
           totalRead += read;
           counters.newlyCachedBytes += read;
+          counters.updatePercentage();
         }
         return totalRead;
       } catch (PriorityTaskManager.PriorityTooLowException exception) {

From 9b064fb9d5aaba215e6beafc3e3b5e09f301f88a Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Tue, 2 Apr 2019 17:30:24 +0100
Subject: [PATCH 701/832] Use CachingCounters in SegmentDownloader

PiperOrigin-RevId: 241543543
---
 .../exoplayer2/offline/SegmentDownloader.java | 44 ++++++++++---------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
index e0c906469f..c865df7dd9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
@@ -70,11 +70,10 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
   private final PriorityTaskManager priorityTaskManager;
   private final ArrayList<StreamKey> streamKeys;
   private final AtomicBoolean isCanceled;
+  private final CacheUtil.CachingCounters counters;
 
   private volatile int totalSegments;
   private volatile int downloadedSegments;
-  private volatile long downloadedBytes;
-  private volatile long totalBytes;
 
   /**
    * @param manifestUri The {@link Uri} of the manifest to be downloaded.
@@ -92,8 +91,8 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
     this.cacheKeyFactory = constructorHelper.getCacheKeyFactory();
     this.priorityTaskManager = constructorHelper.getPriorityTaskManager();
     totalSegments = C.LENGTH_UNSET;
-    totalBytes = C.LENGTH_UNSET;
     isCanceled = new AtomicBoolean();
+    counters = new CachingCounters();
   }
 
   /**
@@ -130,7 +129,8 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
               true);
           downloadedSegments++;
         } finally {
-          downloadedBytes += cachingCounters.newlyCachedBytes;
+          counters.newlyCachedBytes += cachingCounters.newlyCachedBytes;
+          updatePercentage();
         }
       }
     } finally {
@@ -145,27 +145,17 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
 
   @Override
   public final long getDownloadedBytes() {
-    return downloadedBytes;
+    return counters.totalCachedBytes();
   }
 
   @Override
   public long getTotalBytes() {
-    return totalBytes;
+    return counters.contentLength;
   }
 
   @Override
   public final float getDownloadPercentage() {
-    // Take local snapshot of the volatile fields
-    long totalBytes = this.totalBytes;
-    if (totalBytes != C.LENGTH_UNSET) {
-      return totalBytes == 0 ? 100f : (downloadedBytes * 100f) / totalBytes;
-    }
-    int totalSegments = this.totalSegments;
-    int downloadedSegments = this.downloadedSegments;
-    if (totalSegments == C.LENGTH_UNSET || downloadedSegments == C.LENGTH_UNSET) {
-      return C.PERCENTAGE_UNSET;
-    }
-    return totalSegments == 0 ? 100f : (downloadedSegments * 100f) / totalSegments;
+    return counters.percentage;
   }
 
   @Override
@@ -225,12 +215,13 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
     CachingCounters cachingCounters = new CachingCounters();
     totalSegments = segments.size();
     downloadedSegments = 0;
-    downloadedBytes = 0;
+    counters.alreadyCachedBytes = 0;
+    counters.newlyCachedBytes = 0;
     long totalBytes = 0;
     for (int i = segments.size() - 1; i >= 0; i--) {
       Segment segment = segments.get(i);
       CacheUtil.getCached(segment.dataSpec, cache, cacheKeyFactory, cachingCounters);
-      downloadedBytes += cachingCounters.alreadyCachedBytes;
+      counters.alreadyCachedBytes += cachingCounters.alreadyCachedBytes;
       if (cachingCounters.contentLength != C.LENGTH_UNSET) {
         if (cachingCounters.alreadyCachedBytes == cachingCounters.contentLength) {
           // The segment is fully downloaded.
@@ -244,10 +235,23 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
         totalBytes = C.LENGTH_UNSET;
       }
     }
-    this.totalBytes = totalBytes;
+    counters.contentLength = totalBytes;
+    updatePercentage();
     return segments;
   }
 
+  private void updatePercentage() {
+    counters.updatePercentage();
+    if (counters.percentage == C.PERCENTAGE_UNSET) {
+      int totalSegments = this.totalSegments;
+      int downloadedSegments = this.downloadedSegments;
+      if (totalSegments != C.LENGTH_UNSET && downloadedSegments != C.LENGTH_UNSET) {
+        counters.percentage =
+            totalSegments == 0 ? 100f : (downloadedSegments * 100f) / totalSegments;
+      }
+    }
+  }
+
   private void removeDataSpec(DataSpec dataSpec) {
     CacheUtil.remove(dataSpec, cache, cacheKeyFactory);
   }

From 7c265dfb3a1d485ab794823f3e2a7344b20b5a47 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 2 Apr 2019 17:36:52 +0100
Subject: [PATCH 702/832] Detect external surround sound on Amazon devices

PiperOrigin-RevId: 241544595
---
 .../exoplayer2/audio/AudioCapabilities.java   | 40 +++++++-
 .../audio/AudioCapabilitiesReceiver.java      | 97 +++++++++++++------
 2 files changed, 106 insertions(+), 31 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java
index e7495acd89..25c0e70ae5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java
@@ -22,7 +22,10 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.media.AudioFormat;
 import android.media.AudioManager;
+import android.net.Uri;
+import android.provider.Settings.Global;
 import androidx.annotation.Nullable;
+import com.google.android.exoplayer2.util.Util;
 import java.util.Arrays;
 
 /** Represents the set of audio formats that a device is capable of playing. */
@@ -35,6 +38,17 @@ public final class AudioCapabilities {
   public static final AudioCapabilities DEFAULT_AUDIO_CAPABILITIES =
       new AudioCapabilities(new int[] {AudioFormat.ENCODING_PCM_16BIT}, DEFAULT_MAX_CHANNEL_COUNT);
 
+  /** Audio capabilities when the device specifies external surround sound. */
+  private static final AudioCapabilities EXTERNAL_SURROUND_SOUND_CAPABILITIES =
+      new AudioCapabilities(
+          new int[] {
+            AudioFormat.ENCODING_PCM_16BIT, AudioFormat.ENCODING_AC3, AudioFormat.ENCODING_E_AC3
+          },
+          DEFAULT_MAX_CHANNEL_COUNT);
+
+  /** Global settings key for devices that can specify external surround sound. */
+  private static final String EXTERNAL_SURROUND_SOUND_KEY = "external_surround_sound_enabled";
+
   /**
    * Returns the current audio capabilities for the device.
    *
@@ -43,12 +57,18 @@ public final class AudioCapabilities {
    */
   @SuppressWarnings("InlinedApi")
   public static AudioCapabilities getCapabilities(Context context) {
-    return getCapabilities(
-        context.registerReceiver(null, new IntentFilter(AudioManager.ACTION_HDMI_AUDIO_PLUG)));
+    Intent intent =
+        context.registerReceiver(
+            /* receiver= */ null, new IntentFilter(AudioManager.ACTION_HDMI_AUDIO_PLUG));
+    return getCapabilities(context, intent);
   }
 
   @SuppressLint("InlinedApi")
-  /* package */ static AudioCapabilities getCapabilities(@Nullable Intent intent) {
+  /* package */ static AudioCapabilities getCapabilities(Context context, @Nullable Intent intent) {
+    if (deviceMaySetExternalSurroundSoundGlobalSetting()
+        && Global.getInt(context.getContentResolver(), EXTERNAL_SURROUND_SOUND_KEY, 0) == 1) {
+      return EXTERNAL_SURROUND_SOUND_CAPABILITIES;
+    }
     if (intent == null || intent.getIntExtra(AudioManager.EXTRA_AUDIO_PLUG_STATE, 0) == 0) {
       return DEFAULT_AUDIO_CAPABILITIES;
     }
@@ -58,6 +78,17 @@ public final class AudioCapabilities {
             AudioManager.EXTRA_MAX_CHANNEL_COUNT, /* defaultValue= */ DEFAULT_MAX_CHANNEL_COUNT));
   }
 
+  /**
+   * Returns the global settings {@link Uri} used by the device to specify external surround sound,
+   * or null if the device does not support this functionality.
+   */
+  @Nullable
+  /* package */ static Uri getExternalSurroundSoundGlobalSettingUri() {
+    return deviceMaySetExternalSurroundSoundGlobalSetting()
+        ? Global.getUriFor(EXTERNAL_SURROUND_SOUND_KEY)
+        : null;
+  }
+
   private final int[] supportedEncodings;
   private final int maxChannelCount;
 
@@ -124,4 +155,7 @@ public final class AudioCapabilities {
         + ", supportedEncodings=" + Arrays.toString(supportedEncodings) + "]";
   }
 
+  private static boolean deviceMaySetExternalSurroundSoundGlobalSetting() {
+    return Util.SDK_INT >= 17 && "Amazon".equals(Util.MANUFACTURER);
+  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java
index ed7a6f91d3..fe84c49656 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java
@@ -16,10 +16,13 @@
 package com.google.android.exoplayer2.audio;
 
 import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.database.ContentObserver;
 import android.media.AudioManager;
+import android.net.Uri;
 import android.os.Handler;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Assertions;
@@ -46,31 +49,30 @@ public final class AudioCapabilitiesReceiver {
   }
 
   private final Context context;
-  private final @Nullable Handler handler;
   private final Listener listener;
-  private final @Nullable BroadcastReceiver receiver;
+  private final Handler handler;
+  @Nullable private final BroadcastReceiver receiver;
+  @Nullable private final ExternalSurroundSoundSettingObserver externalSurroundSoundSettingObserver;
 
   /* package */ @Nullable AudioCapabilities audioCapabilities;
+  private boolean registered;
 
   /**
    * @param context A context for registering the receiver.
    * @param listener The listener to notify when audio capabilities change.
    */
   public AudioCapabilitiesReceiver(Context context, Listener listener) {
-    this(context, /* handler= */ null, listener);
-  }
-
-  /**
-   * @param context A context for registering the receiver.
-   * @param handler The handler to which {@link Listener} events will be posted. If null, listener
-   *     methods are invoked on the main thread.
-   * @param listener The listener to notify when audio capabilities change.
-   */
-  public AudioCapabilitiesReceiver(Context context, @Nullable Handler handler, Listener listener) {
-    this.context = Assertions.checkNotNull(context);
-    this.handler = handler;
+    context = context.getApplicationContext();
+    this.context = context;
     this.listener = Assertions.checkNotNull(listener);
-    this.receiver = Util.SDK_INT >= 21 ? new HdmiAudioPlugBroadcastReceiver() : null;
+    handler = new Handler(Util.getLooper());
+    receiver = Util.SDK_INT >= 21 ? new HdmiAudioPlugBroadcastReceiver() : null;
+    Uri externalSurroundSoundUri = AudioCapabilities.getExternalSurroundSoundGlobalSettingUri();
+    externalSurroundSoundSettingObserver =
+        externalSurroundSoundUri != null
+            ? new ExternalSurroundSoundSettingObserver(
+                handler, context.getContentResolver(), externalSurroundSoundUri)
+            : null;
   }
 
   /**
@@ -82,18 +84,21 @@ public final class AudioCapabilitiesReceiver {
    */
   @SuppressWarnings("InlinedApi")
   public AudioCapabilities register() {
+    if (registered) {
+      return Assertions.checkNotNull(audioCapabilities);
+    }
+    registered = true;
+    if (externalSurroundSoundSettingObserver != null) {
+      externalSurroundSoundSettingObserver.register();
+    }
     Intent stickyIntent = null;
     if (receiver != null) {
       IntentFilter intentFilter = new IntentFilter(AudioManager.ACTION_HDMI_AUDIO_PLUG);
-      if (handler != null) {
-        stickyIntent =
-            context.registerReceiver(
-                receiver, intentFilter, /* broadcastPermission= */ null, handler);
-      } else {
-        stickyIntent = context.registerReceiver(receiver, intentFilter);
-      }
+      stickyIntent =
+          context.registerReceiver(
+              receiver, intentFilter, /* broadcastPermission= */ null, handler);
     }
-    audioCapabilities = AudioCapabilities.getCapabilities(stickyIntent);
+    audioCapabilities = AudioCapabilities.getCapabilities(context, stickyIntent);
     return audioCapabilities;
   }
 
@@ -102,9 +107,24 @@ public final class AudioCapabilitiesReceiver {
    * changes occur.
    */
   public void unregister() {
+    if (!registered) {
+      return;
+    }
+    audioCapabilities = null;
     if (receiver != null) {
       context.unregisterReceiver(receiver);
     }
+    if (externalSurroundSoundSettingObserver != null) {
+      externalSurroundSoundSettingObserver.unregister();
+    }
+    registered = false;
+  }
+
+  private void onNewAudioCapabilities(AudioCapabilities newAudioCapabilities) {
+    if (registered && !newAudioCapabilities.equals(audioCapabilities)) {
+      audioCapabilities = newAudioCapabilities;
+      listener.onAudioCapabilitiesChanged(newAudioCapabilities);
+    }
   }
 
   private final class HdmiAudioPlugBroadcastReceiver extends BroadcastReceiver {
@@ -112,14 +132,35 @@ public final class AudioCapabilitiesReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
       if (!isInitialStickyBroadcast()) {
-        AudioCapabilities newAudioCapabilities = AudioCapabilities.getCapabilities(intent);
-        if (!newAudioCapabilities.equals(audioCapabilities)) {
-          audioCapabilities = newAudioCapabilities;
-          listener.onAudioCapabilitiesChanged(newAudioCapabilities);
-        }
+        onNewAudioCapabilities(AudioCapabilities.getCapabilities(context, intent));
       }
     }
+  }
 
+  private final class ExternalSurroundSoundSettingObserver extends ContentObserver {
+
+    private final ContentResolver resolver;
+    private final Uri settingUri;
+
+    public ExternalSurroundSoundSettingObserver(
+        Handler handler, ContentResolver resolver, Uri settingUri) {
+      super(handler);
+      this.resolver = resolver;
+      this.settingUri = settingUri;
+    }
+
+    public void register() {
+      resolver.registerContentObserver(settingUri, /* notifyForDescendants= */ false, this);
+    }
+
+    public void unregister() {
+      resolver.unregisterContentObserver(this);
+    }
+
+    @Override
+    public void onChange(boolean selfChange) {
+      onNewAudioCapabilities(AudioCapabilities.getCapabilities(context));
+    }
   }
 
 }

From ee7bf4b0ee5729e2f6200cc60b610def02af6497 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 2 Apr 2019 17:42:06 +0100
Subject: [PATCH 703/832] Make callback Handler instantiation consistent

Most of our components that have Handler instances for calling
back to application code instantiate the Handler using Util.getLooper
in the constructor. This makes the two components that do
something else consistent with that model.

PiperOrigin-RevId: 241545575
---
 .../android/exoplayer2/offline/DownloadHelper.java   |  9 +++------
 .../exoplayer2/scheduler/RequirementsWatcher.java    | 12 +++++-------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index dccc15f020..ccaec105ca 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.offline;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.HandlerThread;
-import android.os.Looper;
 import android.os.Message;
 import androidx.annotation.Nullable;
 import android.util.Pair;
@@ -315,10 +314,10 @@ public final class DownloadHelper {
   private final DefaultTrackSelector trackSelector;
   private final RendererCapabilities[] rendererCapabilities;
   private final SparseIntArray scratchSet;
+  private final Handler callbackHandler;
 
   private boolean isPreparedWithMedia;
   private @MonotonicNonNull Callback callback;
-  private @MonotonicNonNull Handler callbackHandler;
   private @MonotonicNonNull MediaPreparer mediaPreparer;
   private TrackGroupArray @MonotonicNonNull [] trackGroupArrays;
   private MappedTrackInfo @MonotonicNonNull [] mappedTrackInfos;
@@ -354,20 +353,18 @@ public final class DownloadHelper {
     this.scratchSet = new SparseIntArray();
     trackSelector.setParameters(trackSelectorParameters);
     trackSelector.init(/* listener= */ () -> {}, new DummyBandwidthMeter());
+    callbackHandler = new Handler(Util.getLooper());
   }
 
   /**
    * Initializes the helper for starting a download.
    *
-   * @param callback A callback to be notified when preparation completes or fails. The callback
-   *     will be invoked on the calling thread unless that thread does not have an associated {@link
-   *     Looper}, in which case it will be called on the application's main thread.
+   * @param callback A callback to be notified when preparation completes or fails.
    * @throws IllegalStateException If the download helper has already been prepared.
    */
   public void prepare(Callback callback) {
     Assertions.checkState(this.callback == null);
     this.callback = callback;
-    callbackHandler = new Handler(Util.getLooper());
     if (mediaSource != null) {
       mediaPreparer = new MediaPreparer(mediaSource, /* downloadHelper= */ this);
     } else {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
index 710dee6e11..98bc7b4242 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
@@ -28,7 +28,6 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.PowerManager;
 import androidx.annotation.RequiresApi;
-import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
 
@@ -59,11 +58,12 @@ public final class RequirementsWatcher {
   private final Context context;
   private final Listener listener;
   private final Requirements requirements;
+  private final Handler handler;
+
   private DeviceStatusChangeReceiver receiver;
 
   @Requirements.RequirementFlags private int notMetRequirements;
   private CapabilityValidatedCallback networkCallback;
-  private Handler handler;
 
   /**
    * @param context Any context.
@@ -71,9 +71,10 @@ public final class RequirementsWatcher {
    * @param requirements The requirements to watch.
    */
   public RequirementsWatcher(Context context, Listener listener, Requirements requirements) {
-    this.requirements = requirements;
-    this.listener = listener;
     this.context = context.getApplicationContext();
+    this.listener = listener;
+    this.requirements = requirements;
+    handler = new Handler(Util.getLooper());
     logd(this + " created");
   }
 
@@ -85,9 +86,6 @@ public final class RequirementsWatcher {
    */
   @Requirements.RequirementFlags
   public int start() {
-    Assertions.checkNotNull(Looper.myLooper());
-    handler = new Handler();
-
     notMetRequirements = requirements.getNotMetRequirements(context);
 
     IntentFilter filter = new IntentFilter();

From 8480a4b44d37f442282c141a5ce5ffd12a076f08 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 3 Apr 2019 01:24:07 +0100
Subject: [PATCH 704/832] Add Downloader.getCounters method

PiperOrigin-RevId: 241636860
---
 .../com/google/android/exoplayer2/offline/Downloader.java   | 4 ++++
 .../android/exoplayer2/offline/ProgressiveDownloader.java   | 5 +++++
 .../android/exoplayer2/offline/SegmentDownloader.java       | 5 +++++
 .../android/exoplayer2/offline/DownloadManagerTest.java     | 6 ++++++
 4 files changed, 20 insertions(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java
index b050e9770d..39f562ac19 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2.offline;
 
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
 import java.io.IOException;
 
 /**
@@ -47,6 +48,9 @@ public interface Downloader {
    */
   float getDownloadPercentage();
 
+  /** Returns a {@link CachingCounters} which holds download counters. */
+  CachingCounters getCounters();
+
   /**
    * Removes the media.
    *
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
index 8cf5820fa6..9794b19b62 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
@@ -106,6 +106,11 @@ public final class ProgressiveDownloader implements Downloader {
     return cachingCounters.percentage;
   }
 
+  @Override
+  public CachingCounters getCounters() {
+    return cachingCounters;
+  }
+
   @Override
   public void remove() {
     CacheUtil.remove(dataSpec, cache, cacheKeyFactory);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
index c865df7dd9..4dbae47775 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
@@ -158,6 +158,11 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
     return counters.percentage;
   }
 
+  @Override
+  public CachingCounters getCounters() {
+    return counters;
+  }
+
   @Override
   public final void remove() throws InterruptedException {
     try {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index 4bdd1390c6..4046ff76e8 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -28,6 +28,7 @@ import com.google.android.exoplayer2.testutil.DummyMainThread.TestRunnable;
 import com.google.android.exoplayer2.testutil.RobolectricUtil;
 import com.google.android.exoplayer2.testutil.TestDownloadManagerListener;
 import com.google.android.exoplayer2.testutil.TestUtil;
+import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -747,6 +748,11 @@ public class DownloadManagerTest {
       return C.PERCENTAGE_UNSET;
     }
 
+    @Override
+    public CachingCounters getCounters() {
+      return null;
+    }
+
     private void assertDoesNotStart() throws InterruptedException {
       Thread.sleep(ASSERT_FALSE_TIME);
       assertThat(started.getCount()).isEqualTo(1);

From 399aa706a7e570e8ed7ca93b54beaae6ee3dac91 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 3 Apr 2019 04:29:19 +0100
Subject: [PATCH 705/832] Remove usages of the widget package and migrate to
 new packages.

PiperOrigin-RevId: 241656157
---
 demos/cast/src/main/res/layout/main_activity.xml                | 2 +-
 .../google/android/exoplayer2/demo/TrackSelectionDialog.java    | 2 +-
 demos/main/src/main/res/layout/track_selection_dialog.xml       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/demos/cast/src/main/res/layout/main_activity.xml b/demos/cast/src/main/res/layout/main_activity.xml
index 71dbcdcd9c..2597a2d3a1 100644
--- a/demos/cast/src/main/res/layout/main_activity.xml
+++ b/demos/cast/src/main/res/layout/main_activity.xml
@@ -38,7 +38,7 @@
         android:scrollbars="vertical"
         android:fadeScrollbars="false"/>
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/add_sample_button"
+    <android.support.design.floatingactionbutton.FloatingActionButton android:id="@+id/add_sample_button"
         android:src="@drawable/ic_plus"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
index a7dd1a0df8..cf50cb4f58 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
@@ -20,7 +20,7 @@ import android.content.DialogInterface;
 import android.content.res.Resources;
 import android.os.Bundle;
 import androidx.annotation.Nullable;
-import com.google.android.material.tabs.TabLayout;
+import android.support.design.tabs.TabLayout;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
diff --git a/demos/main/src/main/res/layout/track_selection_dialog.xml b/demos/main/src/main/res/layout/track_selection_dialog.xml
index 7f6c45e131..ae7d95ea9c 100644
--- a/demos/main/src/main/res/layout/track_selection_dialog.xml
+++ b/demos/main/src/main/res/layout/track_selection_dialog.xml
@@ -25,7 +25,7 @@
       android:layout_height="0dp"
       android:layout_weight="1">
 
-    <com.google.android.material.tabs.TabLayout
+    <android.support.design.tabs.TabLayout
         android:id="@+id/track_selection_dialog_tab_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

From 95f65e5258007057b1c5cb893c9fb6aa47798f7d Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 3 Apr 2019 11:19:50 +0100
Subject: [PATCH 706/832] Add abstract superclass for Crypto resources

Necessary for implementing scheme-independant resource management.

Example: A media source needs to have ownership of a crypto resource
while samples are in buffer (but not yet in the renderer).
PiperOrigin-RevId: 241698575
---
 .../exoplayer2/drm/CryptoResource.java        | 70 +++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/drm/CryptoResource.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/CryptoResource.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/CryptoResource.java
new file mode 100644
index 0000000000..3e4701ac08
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/CryptoResource.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.drm;
+
+/**
+ * A reference-counted resource used in the decryption of media samples.
+ *
+ * @param <T> The reference type with which to make {@link Owner#onLastReferenceReleased} calls.
+ */
+public abstract class CryptoResource<T extends CryptoResource<T>> {
+
+  /**
+   * Implemented by the class in charge of managing a {@link CryptoResource resource's} lifecycle.
+   */
+  public interface Owner<T extends CryptoResource<T>> {
+
+    /**
+     * Called when the last reference to a {@link CryptoResource} is {@link #releaseReference()
+     * released}.
+     */
+    void onLastReferenceReleased(CryptoResource<T> resource);
+  }
+
+  // TODO: Consider adding a handler on which the owner should be called.
+  private final CryptoResource.Owner<T> owner;
+  private int referenceCount;
+
+  /**
+   * Creates a new instance with no incoming references.
+   *
+   * @param owner The owner of this instance.
+   */
+  public CryptoResource(Owner<T> owner) {
+    this.owner = owner;
+    referenceCount = 0;
+  }
+
+  /** Increases by one the incoming reference count for this resource. */
+  public void acquireReference() {
+    referenceCount++;
+  }
+
+  /**
+   * Decreases by one the incoming reference count for this resource, and notifies the owner if said
+   * count reached zero as a result of this operation.
+   *
+   * <p>Must only be called as releasing counter-part of {@link #acquireReference()}.
+   */
+  @SuppressWarnings("unchecked")
+  public synchronized void releaseReference() {
+    if (--referenceCount == 0) {
+      owner.onLastReferenceReleased(this);
+    } else if (referenceCount < 0) {
+      throw new IllegalStateException("Illegal release of resource.");
+    }
+  }
+}

From b10f4023f09193f2e68ff76b29ef061f4aefe0a1 Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Wed, 3 Apr 2019 18:46:57 +0100
Subject: [PATCH 707/832] handle meta atom as a full box when parsing mp4

Issues: #5698, #5694
PiperOrigin-RevId: 241762106
---
 RELEASENOTES.md                               |  3 ++
 .../extractor/mp4/Mp4Extractor.java           | 29 +++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 924c38b1ba..ae2901d2be 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -96,6 +96,9 @@
 * Use full BCP 47 language tags in `Format`.
 * Take byte offset into account when unsynchronizing an id3 frame
   ([#5673](https://github.com/google/ExoPlayer/issues/5673)).
+* Handle meta atom as a full box when parsing mp4
+  ([#5698](https://github.com/google/ExoPlayer/issues/5698),
+  [#5694](https://github.com/google/ExoPlayer/issues/5694)).
 
 ### 2.9.6 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
index 60613cf818..75966bff66 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
@@ -309,6 +309,9 @@ public final class Mp4Extractor implements Extractor, SeekMap {
       if (atomSize == atomHeaderBytesRead) {
         processAtomEnded(endPosition);
       } else {
+        if (atomType == Atom.TYPE_meta) {
+          maybeSkipRemainingMetaAtomHeaderBytes(input);
+        }
         // Start reading the first child atom.
         enterReadingAtomHeaderState();
       }
@@ -643,6 +646,32 @@ public final class Mp4Extractor implements Extractor, SeekMap {
     }
   }
 
+  /**
+   * Possibly skips the version and flags fields (1+3 byte) of a full meta atom of the {@code
+   * input}.
+   *
+   * <p>Atoms of type {@link Atom#TYPE_meta} are defined to be full atoms which have four additional
+   * bytes for a version and a flags field (see 4.2 'Object Structure' in ISO/IEC 14496-12:2005).
+   * QuickTime do not have such a full box structure. Since some of these files are encoded wrongly,
+   * we can't rely on the file type though. Instead we must check the 8 bytes after the common
+   * header bytes ourselves.
+   */
+  private void maybeSkipRemainingMetaAtomHeaderBytes(ExtractorInput input)
+      throws IOException, InterruptedException {
+    scratch.reset(8);
+    // Peek the next 8 bytes which can be either
+    // (iso) [1 byte version + 3 bytes flags][4 byte size of next atom]
+    // (qt)  [4 byte size of next atom      ][4 byte hdlr atom type   ]
+    // In case of (iso) we need to skip the next 4 bytes.
+    input.peekFully(scratch.data, 0, 8);
+    scratch.skipBytes(4);
+    if (scratch.readInt() == Atom.TYPE_hdlr) {
+      input.resetPeekPosition();
+    } else {
+      input.skipFully(4);
+    }
+  }
+
   /**
    * For each sample of each track, calculates accumulated size of all samples which need to be read
    * before this sample can be used.

From 27884c70f88ea18a11678b4ec40f105e743ff5d2 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 3 Apr 2019 18:52:03 +0100
Subject: [PATCH 708/832] Make DownloadState counters mutable

PiperOrigin-RevId: 241763220
---
 .../offline/DefaultDownloadIndex.java         | 17 +++--
 .../exoplayer2/offline/DownloadManager.java   | 33 +++-------
 .../exoplayer2/offline/DownloadState.java     | 66 ++++++++++++-------
 .../offline/DownloadManagerTest.java          | 15 ++---
 .../offline/DownloadStateBuilder.java         | 22 +++----
 .../exoplayer2/offline/DownloadStateTest.java |  6 +-
 .../ui/DownloadNotificationHelper.java        |  7 +-
 7 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
index 10e01969bb..ae0817b27d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -26,6 +26,7 @@ import androidx.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.database.DatabaseIOException;
 import com.google.android.exoplayer2.database.DatabaseProvider;
 import com.google.android.exoplayer2.database.VersionTable;
+import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
 
@@ -199,9 +200,9 @@ public final class DefaultDownloadIndex implements DownloadIndex {
       values.put(COLUMN_URI, downloadState.uri.toString());
       values.put(COLUMN_CACHE_KEY, downloadState.cacheKey);
       values.put(COLUMN_STATE, downloadState.state);
-      values.put(COLUMN_DOWNLOAD_PERCENTAGE, downloadState.downloadPercentage);
-      values.put(COLUMN_DOWNLOADED_BYTES, downloadState.downloadedBytes);
-      values.put(COLUMN_TOTAL_BYTES, downloadState.totalBytes);
+      values.put(COLUMN_DOWNLOAD_PERCENTAGE, downloadState.getDownloadPercentage());
+      values.put(COLUMN_DOWNLOADED_BYTES, downloadState.getDownloadedBytes());
+      values.put(COLUMN_TOTAL_BYTES, downloadState.getTotalBytes());
       values.put(COLUMN_FAILURE_REASON, downloadState.failureReason);
       values.put(COLUMN_STOP_FLAGS, /*stopFlags*/ 0);
       values.put(COLUMN_NOT_MET_REQUIREMENTS, downloadState.notMetRequirements);
@@ -341,22 +342,24 @@ public final class DefaultDownloadIndex implements DownloadIndex {
   }
 
   private static DownloadState getDownloadStateForCurrentRow(Cursor cursor) {
+    CachingCounters cachingCounters = new CachingCounters();
+    cachingCounters.alreadyCachedBytes = cursor.getLong(COLUMN_INDEX_DOWNLOADED_BYTES);
+    cachingCounters.contentLength = cursor.getLong(COLUMN_INDEX_TOTAL_BYTES);
+    cachingCounters.percentage = cursor.getFloat(COLUMN_INDEX_DOWNLOAD_PERCENTAGE);
     return new DownloadState(
         cursor.getString(COLUMN_INDEX_ID),
         cursor.getString(COLUMN_INDEX_TYPE),
         Uri.parse(cursor.getString(COLUMN_INDEX_URI)),
         cursor.getString(COLUMN_INDEX_CACHE_KEY),
         cursor.getInt(COLUMN_INDEX_STATE),
-        cursor.getFloat(COLUMN_INDEX_DOWNLOAD_PERCENTAGE),
-        cursor.getLong(COLUMN_INDEX_DOWNLOADED_BYTES),
-        cursor.getLong(COLUMN_INDEX_TOTAL_BYTES),
         cursor.getInt(COLUMN_INDEX_FAILURE_REASON),
         cursor.getInt(COLUMN_INDEX_NOT_MET_REQUIREMENTS),
         cursor.getInt(COLUMN_INDEX_MANUAL_STOP_REASON),
         cursor.getLong(COLUMN_INDEX_START_TIME_MS),
         cursor.getLong(COLUMN_INDEX_UPDATE_TIME_MS),
         decodeStreamKeys(cursor.getString(COLUMN_INDEX_STREAM_KEYS)),
-        cursor.getBlob(COLUMN_INDEX_CUSTOM_METADATA));
+        cursor.getBlob(COLUMN_INDEX_CUSTOM_METADATA),
+        cachingCounters);
   }
 
   private static String encodeStreamKeys(StreamKey[] streamKeys) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 5f4a0eae61..28f6fe00e6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -40,6 +40,7 @@ import com.google.android.exoplayer2.database.DatabaseIOException;
 import com.google.android.exoplayer2.database.DatabaseProvider;
 import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.scheduler.RequirementsWatcher;
+import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
 import java.io.IOException;
@@ -699,7 +700,9 @@ public final class DownloadManager {
       }
       simultaneousDownloads++;
     }
-    activeDownloads.put(download, new DownloadThread(download));
+    DownloadThread downloadThread = new DownloadThread(download);
+    activeDownloads.put(download, downloadThread);
+    download.setCounters(downloadThread.downloader.getCounters());
     logd("Download is started", download);
     return START_THREAD_SUCCEEDED;
   }
@@ -744,15 +747,6 @@ public final class DownloadManager {
     maybeNotifyListenersIdle();
   }
 
-  @Nullable
-  private Downloader getDownloader(Download download) {
-    DownloadThread downloadThread = activeDownloads.get(download);
-    if (downloadThread != null) {
-      return downloadThread.downloader;
-    }
-    return null;
-  }
-
   private static final class Download {
     private final DownloadManager downloadManager;
 
@@ -794,15 +788,6 @@ public final class DownloadManager {
     }
 
     public DownloadState getUpdatedDownloadState() {
-      float downloadPercentage = C.PERCENTAGE_UNSET;
-      long downloadedBytes = 0;
-      long totalBytes = C.LENGTH_UNSET;
-      Downloader downloader = downloadManager.getDownloader(this);
-      if (downloader != null) {
-        downloadPercentage = downloader.getDownloadPercentage();
-        downloadedBytes = downloader.getDownloadedBytes();
-        totalBytes = downloader.getTotalBytes();
-      }
       downloadState =
           new DownloadState(
               downloadState.id,
@@ -810,16 +795,14 @@ public final class DownloadManager {
               downloadState.uri,
               downloadState.cacheKey,
               state,
-              downloadPercentage,
-              downloadedBytes,
-              totalBytes,
               state != STATE_FAILED ? FAILURE_REASON_NONE : failureReason,
               notMetRequirements,
               manualStopReason,
               downloadState.startTimeMs,
               /* updateTimeMs= */ System.currentTimeMillis(),
               downloadState.streamKeys,
-              downloadState.customMetadata);
+              downloadState.customMetadata,
+              downloadState.counters);
       return downloadState;
     }
 
@@ -868,6 +851,10 @@ public final class DownloadManager {
       return state == STATE_REMOVING || state == STATE_RESTARTING;
     }
 
+    public void setCounters(CachingCounters counters) {
+      downloadState.setCounters(counters);
+    }
+
     private void updateStopState() {
       DownloadState oldDownloadState = downloadState;
       if (canStart()) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
index bb8be6b945..1981bb19ae 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
@@ -21,6 +21,7 @@ import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.scheduler.Requirements.RequirementFlags;
+import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
 import com.google.android.exoplayer2.util.Assertions;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -127,12 +128,6 @@ public final class DownloadState {
   @Nullable public final String cacheKey;
   /** The state of the download. */
   @State public final int state;
-  /** The estimated download percentage, or {@link C#PERCENTAGE_UNSET} if unavailable. */
-  public final float downloadPercentage;
-  /** The total number of downloaded bytes. */
-  public final long downloadedBytes;
-  /** The total size of the media, or {@link C#LENGTH_UNSET} if unknown. */
-  public final long totalBytes;
   /** The first time when download entry is created. */
   public final long startTimeMs;
   /** The last update time. */
@@ -151,6 +146,8 @@ public final class DownloadState {
   /** The manual stop reason. */
   public final int manualStopReason;
 
+  /*package*/ CachingCounters counters;
+
   /**
    * Creates a {@link DownloadState} using a {@link DownloadAction}.
    *
@@ -167,16 +164,14 @@ public final class DownloadState {
         action.uri,
         action.customCacheKey,
         /* state= */ STATE_QUEUED,
-        /* downloadPercentage= */ C.PERCENTAGE_UNSET,
-        /* downloadedBytes= */ 0,
-        /* totalBytes= */ C.LENGTH_UNSET,
         FAILURE_REASON_NONE,
         /* notMetRequirements= */ 0,
         /* manualStopReason= */ 0,
         /* startTimeMs= */ currentTimeMs,
         /* updateTimeMs= */ currentTimeMs,
         action.keys.toArray(new StreamKey[0]),
-        action.data);
+        action.data,
+        new CachingCounters());
   }
 
   /* package */ DownloadState(
@@ -185,16 +180,15 @@ public final class DownloadState {
       Uri uri,
       @Nullable String cacheKey,
       @State int state,
-      float downloadPercentage,
-      long downloadedBytes,
-      long totalBytes,
       @FailureReason int failureReason,
       @RequirementFlags int notMetRequirements,
       int manualStopReason,
       long startTimeMs,
       long updateTimeMs,
       StreamKey[] streamKeys,
-      byte[] customMetadata) {
+      byte[] customMetadata,
+      CachingCounters counters) {
+    Assertions.checkNotNull(counters);
     Assertions.checkState((failureReason == FAILURE_REASON_NONE) == (state != STATE_FAILED));
     if (manualStopReason != 0 || notMetRequirements != 0) {
       Assertions.checkState(state != STATE_DOWNLOADING && state != STATE_QUEUED);
@@ -204,9 +198,6 @@ public final class DownloadState {
     this.uri = uri;
     this.cacheKey = cacheKey;
     this.state = state;
-    this.downloadPercentage = downloadPercentage;
-    this.downloadedBytes = downloadedBytes;
-    this.totalBytes = totalBytes;
     this.failureReason = failureReason;
     this.notMetRequirements = notMetRequirements;
     this.manualStopReason = manualStopReason;
@@ -214,6 +205,7 @@ public final class DownloadState {
     this.updateTimeMs = updateTimeMs;
     this.streamKeys = streamKeys;
     this.customMetadata = customMetadata;
+    this.counters = counters;
   }
 
   /**
@@ -232,16 +224,14 @@ public final class DownloadState {
         action.uri,
         action.customCacheKey,
         getNextState(state, manualStopReason != 0 || notMetRequirements != 0),
-        /* downloadPercentage= */ C.PERCENTAGE_UNSET,
-        downloadedBytes,
-        /* totalBytes= */ C.LENGTH_UNSET,
         FAILURE_REASON_NONE,
         notMetRequirements,
         manualStopReason,
         startTimeMs,
         /* updateTimeMs= */ System.currentTimeMillis(),
         mergeStreamKeys(this, action),
-        action.data);
+        action.data,
+        counters);
   }
 
   /** Returns a duplicate {@link DownloadState} in {@link #STATE_REMOVING}. */
@@ -252,16 +242,42 @@ public final class DownloadState {
         uri,
         cacheKey,
         STATE_REMOVING,
-        /* downloadPercentage= */ C.PERCENTAGE_UNSET,
-        downloadedBytes,
-        /* totalBytes= */ C.LENGTH_UNSET,
         FAILURE_REASON_NONE,
         notMetRequirements,
         manualStopReason,
         startTimeMs,
         /* updateTimeMs= */ System.currentTimeMillis(),
         streamKeys,
-        customMetadata);
+        customMetadata,
+        counters);
+  }
+
+  /** Returns the total number of downloaded bytes. */
+  public long getDownloadedBytes() {
+    return counters.totalCachedBytes();
+  }
+
+  /** Returns the total size of the media, or {@link C#LENGTH_UNSET} if unknown. */
+  public long getTotalBytes() {
+    return counters.contentLength;
+  }
+
+  /**
+   * Returns the estimated download percentage, or {@link C#PERCENTAGE_UNSET} if no estimate is
+   * available.
+   */
+  public float getDownloadPercentage() {
+    return counters.percentage;
+  }
+
+  /**
+   * Sets counters which are updated by a {@link Downloader}.
+   *
+   * @param counters An instance of {@link CachingCounters}.
+   */
+  protected void setCounters(CachingCounters counters) {
+    Assertions.checkNotNull(counters);
+    this.counters = counters;
   }
 
   private static int getNextState(int currentState, boolean isStopped) {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index 4046ff76e8..be1631304b 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat;
 import android.net.Uri;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.offline.DownloadState.State;
 import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.testutil.DummyMainThread;
@@ -631,13 +630,13 @@ public class DownloadManagerTest {
     private volatile boolean interrupted;
     private volatile boolean cancelled;
     private volatile boolean enableDownloadIOException;
-    private volatile int downloadedBytes;
     private volatile int startCount;
+    private CachingCounters counters;
 
     private FakeDownloader() {
       this.started = new CountDownLatch(1);
       this.blocker = new com.google.android.exoplayer2.util.ConditionVariable();
-      downloadedBytes = C.LENGTH_UNSET;
+      counters = new CachingCounters();
     }
 
     @SuppressWarnings({"NonAtomicOperationOnVolatileField", "NonAtomicVolatileUpdate"})
@@ -735,22 +734,22 @@ public class DownloadManagerTest {
 
     @Override
     public long getDownloadedBytes() {
-      return downloadedBytes;
+      return counters.newlyCachedBytes;
     }
 
     @Override
     public long getTotalBytes() {
-      return C.LENGTH_UNSET;
+      return counters.contentLength;
     }
 
     @Override
     public float getDownloadPercentage() {
-      return C.PERCENTAGE_UNSET;
+      return counters.percentage;
     }
 
     @Override
     public CachingCounters getCounters() {
-      return null;
+      return counters;
     }
 
     private void assertDoesNotStart() throws InterruptedException {
@@ -760,7 +759,7 @@ public class DownloadManagerTest {
 
     @SuppressWarnings({"NonAtomicOperationOnVolatileField", "NonAtomicVolatileUpdate"})
     private void increaseDownloadedByteCount() {
-      downloadedBytes++;
+      counters.newlyCachedBytes++;
     }
   }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
index cfed9a61ce..084071cf7a 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.offline;
 
 import android.net.Uri;
 import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
 
 /**
  * Builder for DownloadState.
@@ -27,14 +27,12 @@ import com.google.android.exoplayer2.C;
  * during test initialization.
  */
 class DownloadStateBuilder {
+  private final CachingCounters counters;
   private String id;
   private String type;
   private Uri uri;
   @Nullable private String cacheKey;
   private int state;
-  private float downloadPercentage;
-  private long downloadedBytes;
-  private long totalBytes;
   private int failureReason;
   private int notMetRequirements;
   private int manualStopReason;
@@ -69,14 +67,12 @@ class DownloadStateBuilder {
     this.uri = uri;
     this.cacheKey = cacheKey;
     this.state = DownloadState.STATE_QUEUED;
-    this.downloadPercentage = (float) C.PERCENTAGE_UNSET;
-    this.downloadedBytes = (long) 0;
-    this.totalBytes = (long) C.LENGTH_UNSET;
     this.failureReason = DownloadState.FAILURE_REASON_NONE;
     this.startTimeMs = (long) 0;
     this.updateTimeMs = (long) 0;
     this.streamKeys = streamKeys;
     this.customMetadata = customMetadata;
+    this.counters = new CachingCounters();
   }
 
   public DownloadStateBuilder setId(String id) {
@@ -110,17 +106,17 @@ class DownloadStateBuilder {
   }
 
   public DownloadStateBuilder setDownloadPercentage(float downloadPercentage) {
-    this.downloadPercentage = downloadPercentage;
+    counters.percentage = downloadPercentage;
     return this;
   }
 
   public DownloadStateBuilder setDownloadedBytes(long downloadedBytes) {
-    this.downloadedBytes = downloadedBytes;
+    counters.alreadyCachedBytes = downloadedBytes;
     return this;
   }
 
   public DownloadStateBuilder setTotalBytes(long totalBytes) {
-    this.totalBytes = totalBytes;
+    counters.contentLength = totalBytes;
     return this;
   }
 
@@ -166,15 +162,13 @@ class DownloadStateBuilder {
         uri,
         cacheKey,
         state,
-        downloadPercentage,
-        downloadedBytes,
-        totalBytes,
         failureReason,
         notMetRequirements,
         manualStopReason,
         startTimeMs,
         updateTimeMs,
         streamKeys,
-        customMetadata);
+        customMetadata,
+        counters);
   }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
index cedbd8a8c4..48bf894a60 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
@@ -270,9 +270,9 @@ public class DownloadStateTest {
   static void assertEqual(
       DownloadState downloadState, DownloadState that, boolean compareTimeFields) {
     assertThat(downloadState.state).isEqualTo(that.state);
-    assertThat(downloadState.downloadPercentage).isEqualTo(that.downloadPercentage);
-    assertThat(downloadState.downloadedBytes).isEqualTo(that.downloadedBytes);
-    assertThat(downloadState.totalBytes).isEqualTo(that.totalBytes);
+    assertThat(downloadState.getDownloadPercentage()).isEqualTo(that.getDownloadPercentage());
+    assertThat(downloadState.getDownloadedBytes()).isEqualTo(that.getDownloadedBytes());
+    assertThat(downloadState.getTotalBytes()).isEqualTo(that.getTotalBytes());
     if (compareTimeFields) {
       assertThat(downloadState.startTimeMs).isEqualTo(that.startTimeMs);
       assertThat(downloadState.updateTimeMs).isEqualTo(that.updateTimeMs);
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
index d68ab41733..ad50e26038 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
@@ -75,11 +75,12 @@ public final class DownloadNotificationHelper {
         continue;
       }
       haveDownloadTasks = true;
-      if (downloadState.downloadPercentage != C.PERCENTAGE_UNSET) {
+      float downloadPercentage = downloadState.getDownloadPercentage();
+      if (downloadPercentage != C.PERCENTAGE_UNSET) {
         allDownloadPercentagesUnknown = false;
-        totalPercentage += downloadState.downloadPercentage;
+        totalPercentage += downloadPercentage;
       }
-      haveDownloadedBytes |= downloadState.downloadedBytes > 0;
+      haveDownloadedBytes |= downloadState.getDownloadedBytes() > 0;
       downloadTaskCount++;
     }
 

From 9c0819001dc111dfc840ee28537e16625ee762f3 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 3 Apr 2019 19:26:17 +0100
Subject: [PATCH 709/832] Fix ExoPlayer's demo app gradle build

Broken by https://github.com/google/ExoPlayer/commit/399aa706a7e570e8ed7ca93b54beaae6ee3dac91.

PiperOrigin-RevId: 241770676
---
 .../google/android/exoplayer2/demo/TrackSelectionDialog.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
index cf50cb4f58..a7dd1a0df8 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
@@ -20,7 +20,7 @@ import android.content.DialogInterface;
 import android.content.res.Resources;
 import android.os.Bundle;
 import androidx.annotation.Nullable;
-import android.support.design.tabs.TabLayout;
+import com.google.android.material.tabs.TabLayout;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;

From 37bab0a98de45a9ad3bacf96cb83dc21a7b03c30 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 3 Apr 2019 19:41:22 +0100
Subject: [PATCH 710/832] Temporally make DataIndex accessing code run on main
 thread

This is the second cl of a series of cls that will convert DownloadManager
threading model as public methods post actions on an internal thread
which then do the work.

PiperOrigin-RevId: 241773765
---
 .../exoplayer2/offline/DownloadManager.java   | 269 ++++++------------
 1 file changed, 91 insertions(+), 178 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 28f6fe00e6..145a0b1275 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -29,9 +29,7 @@ import static com.google.android.exoplayer2.offline.DownloadState.STATE_RESTARTI
 import static com.google.android.exoplayer2.offline.DownloadState.STATE_STOPPED;
 
 import android.content.Context;
-import android.os.ConditionVariable;
 import android.os.Handler;
-import android.os.HandlerThread;
 import android.os.Looper;
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
@@ -46,7 +44,6 @@ import com.google.android.exoplayer2.util.Log;
 import java.io.IOException;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -135,11 +132,11 @@ public final class DownloadManager {
   private final DownloaderFactory downloaderFactory;
   private final ArrayList<Download> downloads;
   private final HashMap<Download, DownloadThread> activeDownloads;
-  private final Handler handler;
-  private final HandlerThread fileIOThread;
-  private final Handler fileIOHandler;
+  private final Handler mainHandler;
+  /*TODO
+  private final HandlerThread internalThread;
+  private final Handler internalHandler;*/
   private final CopyOnWriteArraySet<Listener> listeners;
-  private final ArrayDeque<DownloadUpdater> dowloadUpdateQueue;
 
   private boolean initialized;
   private boolean released;
@@ -147,7 +144,6 @@ public final class DownloadManager {
   private int manualStopReason;
   private RequirementsWatcher requirementsWatcher;
   private int simultaneousDownloads;
-  private boolean loadingDownload;
 
   /**
    * Constructs a {@link DownloadManager}.
@@ -224,14 +220,14 @@ public final class DownloadManager {
     if (looper == null) {
       looper = Looper.getMainLooper();
     }
-    handler = new Handler(looper);
+    mainHandler = new Handler(looper);
 
-    fileIOThread = new HandlerThread("DownloadManager file i/o");
-    fileIOThread.start();
-    fileIOHandler = new Handler(fileIOThread.getLooper());
+    /*TODO
+    internalThread = new HandlerThread("DownloadManager file i/o");
+    internalThread.start();
+    internalHandler = new Handler(internalThread.getLooper());*/
 
     listeners = new CopyOnWriteArraySet<>();
-    dowloadUpdateQueue = new ArrayDeque<>();
 
     setNotMetRequirements(watchRequirements(requirements));
     loadDownloads();
@@ -247,10 +243,7 @@ public final class DownloadManager {
   /** Returns whether there are no active downloads. */
   public boolean isIdle() {
     Assertions.checkState(!released);
-    return initialized
-        && activeDownloads.isEmpty()
-        && dowloadUpdateQueue.isEmpty()
-        && !loadingDownload;
+    return initialized && activeDownloads.isEmpty();
   }
 
   /** Returns the used {@link DownloadIndex}. */
@@ -398,6 +391,12 @@ public final class DownloadManager {
     if (released) {
       return;
     }
+    /*TODO call releaseInternal on internal thread.
+    final ConditionVariable fileIOFinishedCondition = new ConditionVariable();
+    internalHandler.post(fileIOFinishedCondition::open);
+    fileIOFinishedCondition.block();
+    internalThread.quit();
+    */
     releaseInternal();
   }
 
@@ -409,10 +408,6 @@ public final class DownloadManager {
     if (requirementsWatcher != null) {
       requirementsWatcher.stop();
     }
-    final ConditionVariable fileIOFinishedCondition = new ConditionVariable();
-    fileIOHandler.post(fileIOFinishedCondition::open);
-    fileIOFinishedCondition.block();
-    fileIOThread.quit();
     logd("Released");
   }
 
@@ -438,67 +433,46 @@ public final class DownloadManager {
         downloads.get(i).setManualStopReason(manualStopReason);
       }
     }
-    fileIOHandler.post(
-        () -> {
-          try {
-            if (id != null) {
-              downloadIndex.setManualStopReason(id, manualStopReason);
-            } else {
-              downloadIndex.setManualStopReason(manualStopReason);
-            }
-          } catch (DatabaseIOException e) {
-            Log.e(TAG, "setManualStopReason failed", e);
-          }
-        });
+    try {
+      if (id != null) {
+        downloadIndex.setManualStopReason(id, manualStopReason);
+      } else {
+        downloadIndex.setManualStopReason(manualStopReason);
+      }
+    } catch (DatabaseIOException e) {
+      Log.e(TAG, "setManualStopReason failed", e);
+    }
   }
 
   private void addDownloadInternal(DownloadAction action) {
-    dowloadUpdateQueue.add(
-        new DownloadUpdater(action.id) {
-          @Override
-          void onExisting(Download download) {
-            download.addAction(action);
-            logd("Action is added to existing download", download);
-          }
-
-          @Override
-          DownloadState onLoad(@Nullable DownloadState downloadState) {
-            DownloadState state;
-            if (downloadState == null) {
-              state = new DownloadState(action);
-              logd("Download state is created for " + id);
-            } else {
-              state = downloadState.mergeAction(action);
-              logd("Download state is loaded for " + id);
-            }
-            return state;
-          }
-        });
-    if (initialized) {
-      processDownloadUpdateQueue();
+    Download download = getDownload(action.id);
+    if (download != null) {
+      download.addAction(action);
+      logd("Action is added to existing download", download);
+    } else {
+      DownloadState downloadState = loadDownloadState(action.id);
+      if (downloadState == null) {
+        downloadState = new DownloadState(action);
+        logd("Download state is created for " + action.id);
+      } else {
+        downloadState = downloadState.mergeAction(action);
+        logd("Download state is loaded for " + action.id);
+      }
+      addDownloadForState(downloadState);
     }
   }
 
   private void removeDownloadInternal(String id) {
-    dowloadUpdateQueue.add(
-        new DownloadUpdater(id) {
-          @Override
-          void onExisting(Download download) {
-            download.remove();
-          }
-
-          @Override
-          DownloadState onLoad(@Nullable DownloadState downloadState) {
-            if (downloadState != null) {
-              downloadState = downloadState.setRemoveState();
-            } else {
-              logd("Can't remove download. No download with id: " + id);
-            }
-            return downloadState;
-          }
-        });
-    if (initialized) {
-      processDownloadUpdateQueue();
+    Download download = getDownload(id);
+    if (download != null) {
+      download.remove();
+    } else {
+      DownloadState downloadState = loadDownloadState(id);
+      if (downloadState != null) {
+        addDownloadForState(downloadState.setRemoveState());
+      } else {
+        logd("Can't remove download. No download with id: " + id);
+      }
     }
   }
 
@@ -561,84 +535,41 @@ public final class DownloadManager {
     return null;
   }
 
-  private void processDownloadUpdateQueue() {
-    while (!loadingDownload && !dowloadUpdateQueue.isEmpty()) {
-      DownloadUpdater downloadUpdater = dowloadUpdateQueue.remove();
-      Download download = getDownload(downloadUpdater.id);
-      if (download != null) {
-        downloadUpdater.onExisting(download);
-      } else {
-        loadDownload(downloadUpdater);
-      }
+  private DownloadState loadDownloadState(String id) {
+    try {
+      return downloadIndex.getDownloadState(id);
+    } catch (DatabaseIOException e) {
+      Log.e(TAG, "loadDownload failed", e);
     }
-  }
-
-  private void loadDownload(DownloadUpdater callback) {
-    loadingDownload = true;
-    fileIOHandler.post(
-        () -> {
-          DownloadState downloadState = null;
-          try {
-            downloadState = downloadIndex.getDownloadState(callback.id);
-          } catch (DatabaseIOException e) {
-            Log.e(TAG, "loadDownload failed", e);
-          }
-          DownloadState finalDownloadState = downloadState;
-          handler.post(
-              () -> {
-                loadingDownload = false;
-                if (!released) {
-                  DownloadState state = callback.onLoad(finalDownloadState);
-                  if (state != null) {
-                    addDownloadForState(state);
-                  }
-                  processDownloadUpdateQueue();
-                }
-              });
-        });
+    return null;
   }
 
   private void loadDownloads() {
-    fileIOHandler.post(
-        () -> {
-          DownloadState[] loadedStates;
-          try (DownloadStateCursor cursor =
-              downloadIndex.getDownloadStates(
-                  STATE_QUEUED,
-                  STATE_STOPPED,
-                  STATE_DOWNLOADING,
-                  STATE_REMOVING,
-                  STATE_RESTARTING)) {
-            loadedStates = new DownloadState[cursor.getCount()];
-            for (int i = 0, length = loadedStates.length; i < length; i++) {
-              cursor.moveToNext();
-              loadedStates[i] = cursor.getDownloadState();
-            }
-            logd("Download states are loaded.");
-          } catch (Throwable e) {
-            Log.e(TAG, "Download state loading failed.", e);
-            loadedStates = new DownloadState[0];
-          }
-          final DownloadState[] states = loadedStates;
-          handler.post(
-              () -> {
-                if (released) {
-                  return;
-                }
-                for (DownloadState downloadState : states) {
-                  addDownloadForState(downloadState);
-                }
-                logd("Downloads are created.");
-                initialized = true;
-                processDownloadUpdateQueue();
-                for (Listener listener : listeners) {
-                  listener.onInitialized(DownloadManager.this);
-                }
-                for (int i = 0; i < downloads.size(); i++) {
-                  downloads.get(i).start();
-                }
-              });
-        });
+    DownloadState[] loadedStates;
+    try (DownloadStateCursor cursor =
+        downloadIndex.getDownloadStates(
+            STATE_QUEUED, STATE_STOPPED, STATE_DOWNLOADING, STATE_REMOVING, STATE_RESTARTING)) {
+      loadedStates = new DownloadState[cursor.getCount()];
+      for (int i = 0, length = loadedStates.length; i < length; i++) {
+        cursor.moveToNext();
+        loadedStates[i] = cursor.getDownloadState();
+      }
+      logd("Download states are loaded.");
+    } catch (Throwable e) {
+      Log.e(TAG, "Download state loading failed.", e);
+      loadedStates = new DownloadState[0];
+    }
+    for (DownloadState downloadState : loadedStates) {
+      addDownloadForState(downloadState);
+    }
+    logd("Downloads are created.");
+    initialized = true;
+    for (Listener listener : listeners) {
+      listener.onInitialized(DownloadManager.this);
+    }
+    for (int i = 0; i < downloads.size(); i++) {
+      downloads.get(i).start();
+    }
   }
 
   private void addDownloadForState(DownloadState downloadState) {
@@ -648,21 +579,15 @@ public final class DownloadManager {
   }
 
   private void updateDownloadIndex(DownloadState downloadState) {
-    fileIOHandler.post(
-        () -> {
-          if (released) {
-            return;
-          }
-          try {
-            if (downloadState.state == DownloadState.STATE_REMOVED) {
-              downloadIndex.removeDownloadState(downloadState.id);
-            } else {
-              downloadIndex.putDownloadState(downloadState);
-            }
-          } catch (DatabaseIOException e) {
-            Log.e(TAG, "updateDownloadIndex failed", e);
-          }
-        });
+    try {
+      if (downloadState.state == DownloadState.STATE_REMOVED) {
+        downloadIndex.removeDownloadState(downloadState.id);
+      } else {
+        downloadIndex.putDownloadState(downloadState);
+      }
+    } catch (DatabaseIOException e) {
+      Log.e(TAG, "updateDownloadIndex failed", e);
+    }
   }
 
   private static void logd(String message) {
@@ -685,7 +610,7 @@ public final class DownloadManager {
 
   @StartThreadResults
   private int startDownloadThread(Download download) {
-    if (!initialized || released) {
+    if (released) {
       return START_THREAD_NOT_ALLOWED;
     }
     if (activeDownloads.containsKey(download)) {
@@ -990,23 +915,11 @@ public final class DownloadManager {
         error = e;
       }
       final Throwable finalError = error;
-      handler.post(() -> onDownloadThreadStopped(this, finalError));
+      mainHandler.post(() -> onDownloadThreadStopped(this, finalError));
     }
 
     private int getRetryDelayMillis(int errorCount) {
       return Math.min((errorCount - 1) * 1000, 5000);
     }
   }
-
-  private abstract static class DownloadUpdater {
-    final String id;
-
-    private DownloadUpdater(String id) {
-      this.id = id;
-    }
-
-    abstract void onExisting(Download download);
-
-    abstract DownloadState onLoad(@Nullable DownloadState downloadState);
-  }
 }

From 9471d61183fa5f1ddadeaf031cf890e777880a8f Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 3 Apr 2019 22:56:06 +0100
Subject: [PATCH 711/832] Fix ExoPlayer's demo app

PiperOrigin-RevId: 241811732
---
 demos/main/src/main/res/layout/track_selection_dialog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demos/main/src/main/res/layout/track_selection_dialog.xml b/demos/main/src/main/res/layout/track_selection_dialog.xml
index ae7d95ea9c..7f6c45e131 100644
--- a/demos/main/src/main/res/layout/track_selection_dialog.xml
+++ b/demos/main/src/main/res/layout/track_selection_dialog.xml
@@ -25,7 +25,7 @@
       android:layout_height="0dp"
       android:layout_weight="1">
 
-    <android.support.design.tabs.TabLayout
+    <com.google.android.material.tabs.TabLayout
         android:id="@+id/track_selection_dialog_tab_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

From d6244773eceb1591b09e2d776f42770e87adbbfd Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 5 Apr 2019 10:29:48 +0100
Subject: [PATCH 712/832] Add back missing libvpx build instructions

PiperOrigin-RevId: 242094027
---
 extensions/vp9/README.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/extensions/vp9/README.md b/extensions/vp9/README.md
index 6f46a4e6ad..110fad90cc 100644
--- a/extensions/vp9/README.md
+++ b/extensions/vp9/README.md
@@ -34,6 +34,22 @@ VP9_EXT_PATH="${EXOPLAYER_ROOT}/extensions/vp9/src/main"
 NDK_PATH="<path to Android NDK>"
 ```
 
+* Fetch libvpx:
+
+```
+cd "${VP9_EXT_PATH}/jni" && \
+git clone https://chromium.googlesource.com/webm/libvpx libvpx
+```
+
+* Checkout the appropriate branch of libvpx (the scripts and makefiles bundled
+  in this repo are known to work only at specific versions of the library - we
+  will update this periodically as newer versions of libvpx are released):
+
+```
+cd "${VP9_EXT_PATH}/jni/libvpx" && \
+git checkout tags/v1.7.0 -b v1.7.0
+```
+
 * Run a script that generates necessary configuration files for libvpx:
 
 ```
@@ -58,6 +74,10 @@ ${NDK_PATH}/ndk-build APP_ABI=all -j4
   * Android config scripts should be re-generated by running
     `generate_libvpx_android_configs.sh`
   * Clean and re-build the project.
+* If you want to use your own version of libvpx, place it in
+  `${VP9_EXT_PATH}/jni/libvpx`. Please note that
+  `generate_libvpx_android_configs.sh` and the makefiles may need to be modified
+  to work with arbitrary versions of libvpx.
 
 ## Using the extension ##
 

From 346c72c00e3af146f5f445fc18cad61eeec82e72 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 5 Apr 2019 11:12:56 +0100
Subject: [PATCH 713/832] Move PriorityTaskManager from DefaultLoadControl to
 SimpleExoPlayer.

The priority task manager only needs to listen to loading state changes and
is independent of the rest of DefaultLoadControl. This also fixes problems
where the player stops loading without consultin the LoadControl.

PiperOrigin-RevId: 242098374
---
 RELEASENOTES.md                               |  1 +
 .../exoplayer2/DefaultLoadControl.java        | 56 -------------------
 .../android/exoplayer2/ExoPlayerImpl.java     |  5 ++
 .../android/exoplayer2/SimpleExoPlayer.java   | 52 ++++++++++++++++-
 .../BufferSizeAdaptationBuilder.java          | 19 -------
 5 files changed, 57 insertions(+), 76 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index ae2901d2be..a853690e0f 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -99,6 +99,7 @@
 * Handle meta atom as a full box when parsing mp4
   ([#5698](https://github.com/google/ExoPlayer/issues/5698),
   [#5694](https://github.com/google/ExoPlayer/issues/5694)).
+* Move `PriorityTaskManager` from `DefaultLoadControl` to `SimpleExoPlayer`.
 
 ### 2.9.6 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java b/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
index f076043678..83cb5b723c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
@@ -20,7 +20,6 @@ import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.upstream.DefaultAllocator;
 import com.google.android.exoplayer2.util.Assertions;
-import com.google.android.exoplayer2.util.PriorityTaskManager;
 import com.google.android.exoplayer2.util.Util;
 
 /**
@@ -76,21 +75,18 @@ public class DefaultLoadControl implements LoadControl {
     private int bufferForPlaybackAfterRebufferMs;
     private int targetBufferBytes;
     private boolean prioritizeTimeOverSizeThresholds;
-    private PriorityTaskManager priorityTaskManager;
     private int backBufferDurationMs;
     private boolean retainBackBufferFromKeyframe;
     private boolean createDefaultLoadControlCalled;
 
     /** Constructs a new instance. */
     public Builder() {
-      allocator = null;
       minBufferMs = DEFAULT_MIN_BUFFER_MS;
       maxBufferMs = DEFAULT_MAX_BUFFER_MS;
       bufferForPlaybackMs = DEFAULT_BUFFER_FOR_PLAYBACK_MS;
       bufferForPlaybackAfterRebufferMs = DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS;
       targetBufferBytes = DEFAULT_TARGET_BUFFER_BYTES;
       prioritizeTimeOverSizeThresholds = DEFAULT_PRIORITIZE_TIME_OVER_SIZE_THRESHOLDS;
-      priorityTaskManager = null;
       backBufferDurationMs = DEFAULT_BACK_BUFFER_DURATION_MS;
       retainBackBufferFromKeyframe = DEFAULT_RETAIN_BACK_BUFFER_FROM_KEYFRAME;
     }
@@ -165,19 +161,6 @@ public class DefaultLoadControl implements LoadControl {
       return this;
     }
 
-    /**
-     * Sets the {@link PriorityTaskManager} to use.
-     *
-     * @param priorityTaskManager The {@link PriorityTaskManager} to use.
-     * @return This builder, for convenience.
-     * @throws IllegalStateException If {@link #createDefaultLoadControl()} has already been called.
-     */
-    public Builder setPriorityTaskManager(PriorityTaskManager priorityTaskManager) {
-      Assertions.checkState(!createDefaultLoadControlCalled);
-      this.priorityTaskManager = priorityTaskManager;
-      return this;
-    }
-
     /**
      * Sets the back buffer duration, and whether the back buffer is retained from the previous
      * keyframe.
@@ -210,7 +193,6 @@ public class DefaultLoadControl implements LoadControl {
           bufferForPlaybackAfterRebufferMs,
           targetBufferBytes,
           prioritizeTimeOverSizeThresholds,
-          priorityTaskManager,
           backBufferDurationMs,
           retainBackBufferFromKeyframe);
     }
@@ -224,7 +206,6 @@ public class DefaultLoadControl implements LoadControl {
   private final long bufferForPlaybackAfterRebufferUs;
   private final int targetBufferBytesOverwrite;
   private final boolean prioritizeTimeOverSizeThresholds;
-  private final PriorityTaskManager priorityTaskManager;
   private final long backBufferDurationUs;
   private final boolean retainBackBufferFromKeyframe;
 
@@ -253,7 +234,6 @@ public class DefaultLoadControl implements LoadControl {
 
   /** @deprecated Use {@link Builder} instead. */
   @Deprecated
-  @SuppressWarnings("deprecation")
   public DefaultLoadControl(
       DefaultAllocator allocator,
       int minBufferMs,
@@ -270,29 +250,6 @@ public class DefaultLoadControl implements LoadControl {
         bufferForPlaybackAfterRebufferMs,
         targetBufferBytes,
         prioritizeTimeOverSizeThresholds,
-        /* priorityTaskManager= */ null);
-  }
-
-  /** @deprecated Use {@link Builder} instead. */
-  @Deprecated
-  public DefaultLoadControl(
-      DefaultAllocator allocator,
-      int minBufferMs,
-      int maxBufferMs,
-      int bufferForPlaybackMs,
-      int bufferForPlaybackAfterRebufferMs,
-      int targetBufferBytes,
-      boolean prioritizeTimeOverSizeThresholds,
-      PriorityTaskManager priorityTaskManager) {
-    this(
-        allocator,
-        minBufferMs,
-        maxBufferMs,
-        bufferForPlaybackMs,
-        bufferForPlaybackAfterRebufferMs,
-        targetBufferBytes,
-        prioritizeTimeOverSizeThresholds,
-        priorityTaskManager,
         DEFAULT_BACK_BUFFER_DURATION_MS,
         DEFAULT_RETAIN_BACK_BUFFER_FROM_KEYFRAME);
   }
@@ -305,7 +262,6 @@ public class DefaultLoadControl implements LoadControl {
       int bufferForPlaybackAfterRebufferMs,
       int targetBufferBytes,
       boolean prioritizeTimeOverSizeThresholds,
-      PriorityTaskManager priorityTaskManager,
       int backBufferDurationMs,
       boolean retainBackBufferFromKeyframe) {
     assertGreaterOrEqual(bufferForPlaybackMs, 0, "bufferForPlaybackMs", "0");
@@ -327,7 +283,6 @@ public class DefaultLoadControl implements LoadControl {
     this.bufferForPlaybackAfterRebufferUs = C.msToUs(bufferForPlaybackAfterRebufferMs);
     this.targetBufferBytesOverwrite = targetBufferBytes;
     this.prioritizeTimeOverSizeThresholds = prioritizeTimeOverSizeThresholds;
-    this.priorityTaskManager = priorityTaskManager;
     this.backBufferDurationUs = C.msToUs(backBufferDurationMs);
     this.retainBackBufferFromKeyframe = retainBackBufferFromKeyframe;
   }
@@ -375,7 +330,6 @@ public class DefaultLoadControl implements LoadControl {
   @Override
   public boolean shouldContinueLoading(long bufferedDurationUs, float playbackSpeed) {
     boolean targetBufferSizeReached = allocator.getTotalBytesAllocated() >= targetBufferSize;
-    boolean wasBuffering = isBuffering;
     long minBufferUs = this.minBufferUs;
     if (playbackSpeed > 1) {
       // The playback speed is faster than real time, so scale up the minimum required media
@@ -389,13 +343,6 @@ public class DefaultLoadControl implements LoadControl {
     } else if (bufferedDurationUs >= maxBufferUs || targetBufferSizeReached) {
       isBuffering = false;
     } // Else don't change the buffering state
-    if (priorityTaskManager != null && isBuffering != wasBuffering) {
-      if (isBuffering) {
-        priorityTaskManager.add(C.PRIORITY_PLAYBACK);
-      } else {
-        priorityTaskManager.remove(C.PRIORITY_PLAYBACK);
-      }
-    }
     return isBuffering;
   }
 
@@ -431,9 +378,6 @@ public class DefaultLoadControl implements LoadControl {
 
   private void reset(boolean resetAllocator) {
     targetBufferSize = 0;
-    if (priorityTaskManager != null && isBuffering) {
-      priorityTaskManager.remove(C.PRIORITY_PLAYBACK);
-    }
     isBuffering = false;
     if (resetAllocator) {
       allocator.reset();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index d81eb16b83..2568d8ec40 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -401,6 +401,11 @@ import java.util.concurrent.CopyOnWriteArrayList;
     mediaSource = null;
     internalPlayer.release();
     eventHandler.removeCallbacksAndMessages(null);
+    playbackInfo =
+        getResetPlaybackInfo(
+            /* resetPosition= */ true,
+            /* resetState= */ true,
+            /* playbackState= */ Player.STATE_IDLE);
   }
 
   @Override
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index d6543810e5..8341f810a4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -48,8 +48,10 @@ import com.google.android.exoplayer2.text.TextOutput;
 import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 import com.google.android.exoplayer2.trackselection.TrackSelector;
 import com.google.android.exoplayer2.upstream.BandwidthMeter;
+import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Clock;
 import com.google.android.exoplayer2.util.Log;
+import com.google.android.exoplayer2.util.PriorityTaskManager;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
 import com.google.android.exoplayer2.video.VideoRendererEventListener;
@@ -113,6 +115,8 @@ public class SimpleExoPlayer extends BasePlayer
   @Nullable private VideoFrameMetadataListener videoFrameMetadataListener;
   @Nullable private CameraMotionListener cameraMotionListener;
   private boolean hasNotifiedFullWrongThreadWarning;
+  @Nullable private PriorityTaskManager priorityTaskManager;
+  private boolean isPriorityTaskManagerRegistered;
 
   /**
    * @param context A {@link Context}.
@@ -233,6 +237,7 @@ public class SimpleExoPlayer extends BasePlayer
         new ExoPlayerImpl(renderers, trackSelector, loadControl, bandwidthMeter, clock, looper);
     analyticsCollector = analyticsCollectorFactory.createAnalyticsCollector(player, clock);
     addListener(analyticsCollector);
+    addListener(componentListener);
     videoDebugListeners.add(analyticsCollector);
     videoListeners.add(analyticsCollector);
     audioDebugListeners.add(analyticsCollector);
@@ -538,6 +543,31 @@ public class SimpleExoPlayer extends BasePlayer
     analyticsCollector.removeListener(listener);
   }
 
+  /**
+   * Sets a {@link PriorityTaskManager}, or null to clear a previously set priority task manager.
+   *
+   * <p>The priority {@link C#PRIORITY_PLAYBACK} will be set while the player is loading.
+   *
+   * @param priorityTaskManager The {@link PriorityTaskManager}, or null to clear a previously set
+   *     priority task manager.
+   */
+  public void setPriorityTaskManager(@Nullable PriorityTaskManager priorityTaskManager) {
+    verifyApplicationThread();
+    if (Util.areEqual(this.priorityTaskManager, priorityTaskManager)) {
+      return;
+    }
+    if (isPriorityTaskManagerRegistered) {
+      Assertions.checkNotNull(this.priorityTaskManager).remove(C.PRIORITY_PLAYBACK);
+    }
+    if (priorityTaskManager != null && isLoading()) {
+      priorityTaskManager.add(C.PRIORITY_PLAYBACK);
+      isPriorityTaskManagerRegistered = true;
+    } else {
+      isPriorityTaskManagerRegistered = false;
+    }
+    this.priorityTaskManager = priorityTaskManager;
+  }
+
   /**
    * Sets the {@link PlaybackParams} governing audio playback.
    *
@@ -994,6 +1024,10 @@ public class SimpleExoPlayer extends BasePlayer
       mediaSource.removeEventListener(analyticsCollector);
       mediaSource = null;
     }
+    if (isPriorityTaskManagerRegistered) {
+      Assertions.checkNotNull(priorityTaskManager).remove(C.PRIORITY_PLAYBACK);
+      isPriorityTaskManagerRegistered = false;
+    }
     bandwidthMeter.removeEventListener(analyticsCollector);
     currentCues = Collections.emptyList();
   }
@@ -1211,7 +1245,8 @@ public class SimpleExoPlayer extends BasePlayer
           MetadataOutput,
           SurfaceHolder.Callback,
           TextureView.SurfaceTextureListener,
-          AudioFocusManager.PlayerControl {
+          AudioFocusManager.PlayerControl,
+          Player.EventListener {
 
     // VideoRendererEventListener implementation
 
@@ -1421,5 +1456,20 @@ public class SimpleExoPlayer extends BasePlayer
     public void executePlayerCommand(@AudioFocusManager.PlayerCommand int playerCommand) {
       updatePlayWhenReady(getPlayWhenReady(), playerCommand);
     }
+
+    // Player.EventListener implementation.
+
+    @Override
+    public void onLoadingChanged(boolean isLoading) {
+      if (priorityTaskManager != null) {
+        if (isLoading && !isPriorityTaskManagerRegistered) {
+          priorityTaskManager.add(C.PRIORITY_PLAYBACK);
+          isPriorityTaskManagerRegistered = true;
+        } else if (!isLoading && isPriorityTaskManagerRegistered) {
+          priorityTaskManager.remove(C.PRIORITY_PLAYBACK);
+          isPriorityTaskManagerRegistered = false;
+        }
+      }
+    }
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java
index 4b2a07a59a..9826c5b137 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BufferSizeAdaptationBuilder.java
@@ -29,7 +29,6 @@ import com.google.android.exoplayer2.upstream.BandwidthMeter;
 import com.google.android.exoplayer2.upstream.DefaultAllocator;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Clock;
-import com.google.android.exoplayer2.util.PriorityTaskManager;
 import java.util.List;
 import org.checkerframework.checker.nullness.compatqual.NullableType;
 
@@ -112,7 +111,6 @@ public final class BufferSizeAdaptationBuilder {
   private int hysteresisBufferMs;
   private float startUpBandwidthFraction;
   private int startUpMinBufferForQualityIncreaseMs;
-  @Nullable private PriorityTaskManager priorityTaskManager;
   private DynamicFormatFilter dynamicFormatFilter;
   private boolean buildCalled;
 
@@ -219,20 +217,6 @@ public final class BufferSizeAdaptationBuilder {
     return this;
   }
 
-  /**
-   * Sets the {@link PriorityTaskManager} to use.
-   *
-   * @param priorityTaskManager The {@link PriorityTaskManager}.
-   * @return This builder, for convenience.
-   * @throws IllegalStateException If {@link #buildPlayerComponents()} has already been called.
-   */
-  public BufferSizeAdaptationBuilder setPriorityTaskManager(
-      PriorityTaskManager priorityTaskManager) {
-    Assertions.checkState(!buildCalled);
-    this.priorityTaskManager = priorityTaskManager;
-    return this;
-  }
-
   /**
    * Sets the {@link DynamicFormatFilter} to use when updating the selected track.
    *
@@ -266,9 +250,6 @@ public final class BufferSizeAdaptationBuilder {
                 maxBufferMs,
                 bufferForPlaybackMs,
                 bufferForPlaybackAfterRebufferMs);
-    if (priorityTaskManager != null) {
-      loadControlBuilder.setPriorityTaskManager(priorityTaskManager);
-    }
     if (allocator != null) {
       loadControlBuilder.setAllocator(allocator);
     }

From be61715517a21b1114cf7deaed647aecd4bdd20d Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 5 Apr 2019 14:00:34 +0100
Subject: [PATCH 714/832] Fix Cast demo app

Broken in https://github.com/google/ExoPlayer/commit/399aa706a7e570e8ed7ca93b54beaae6ee3dac91

PiperOrigin-RevId: 242112068
---
 demos/cast/src/main/res/layout/main_activity.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demos/cast/src/main/res/layout/main_activity.xml b/demos/cast/src/main/res/layout/main_activity.xml
index 2597a2d3a1..71dbcdcd9c 100644
--- a/demos/cast/src/main/res/layout/main_activity.xml
+++ b/demos/cast/src/main/res/layout/main_activity.xml
@@ -38,7 +38,7 @@
         android:scrollbars="vertical"
         android:fadeScrollbars="false"/>
 
-    <android.support.design.floatingactionbutton.FloatingActionButton android:id="@+id/add_sample_button"
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/add_sample_button"
         android:src="@drawable/ic_plus"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

From 3169b140fc5cceba848fa1bd6a103645e873c115 Mon Sep 17 00:00:00 2001
From: vigneshv <vigneshv@google.com>
Date: Fri, 5 Apr 2019 20:21:33 +0100
Subject: [PATCH 715/832] vp9_extension: Use the vp9_codec_control macro

This is part of the public API and the underscored versions
weren't intended to be used outside the library.

Also updating the external instructions to checkout the version
of libvpx that supports this macro for this particular constant.

#codehealth

PiperOrigin-RevId: 242170926
---
 extensions/vp9/README.md               | 2 +-
 extensions/vp9/src/main/jni/vpx_jni.cc | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/extensions/vp9/README.md b/extensions/vp9/README.md
index 110fad90cc..e1d1eef3ab 100644
--- a/extensions/vp9/README.md
+++ b/extensions/vp9/README.md
@@ -47,7 +47,7 @@ git clone https://chromium.googlesource.com/webm/libvpx libvpx
 
 ```
 cd "${VP9_EXT_PATH}/jni/libvpx" && \
-git checkout tags/v1.7.0 -b v1.7.0
+git checkout tags/v1.8.0 -b v1.8.0
 ```
 
 * Run a script that generates necessary configuration files for libvpx:
diff --git a/extensions/vp9/src/main/jni/vpx_jni.cc b/extensions/vp9/src/main/jni/vpx_jni.cc
index 8036e78cbe..82c023afbc 100644
--- a/extensions/vp9/src/main/jni/vpx_jni.cc
+++ b/extensions/vp9/src/main/jni/vpx_jni.cc
@@ -448,15 +448,14 @@ DECODER_FUNC(jlong, vpxInit, jboolean disableLoopFilter,
     return 0;
   }
 #ifdef VPX_CTRL_VP9_DECODE_SET_ROW_MT
-  err = vpx_codec_control_(context->decoder, VP9D_SET_ROW_MT,
-                           enableRowMultiThreadMode);
+  err = vpx_codec_control(context->decoder, VP9D_SET_ROW_MT,
+                          enableRowMultiThreadMode);
   if (err) {
     LOGE("ERROR: Failed to enable row multi thread mode, error = %d.", err);
   }
 #endif
   if (disableLoopFilter) {
-    // TODO(b/71930387): Use vpx_codec_control(), not vpx_codec_control_().
-    err = vpx_codec_control_(context->decoder, VP9_SET_SKIP_LOOP_FILTER, true);
+    err = vpx_codec_control(context->decoder, VP9_SET_SKIP_LOOP_FILTER, true);
     if (err) {
       LOGE("ERROR: Failed to shut off libvpx loop filter, error = %d.", err);
     }

From c17c7221589b502a53ccdfcddaa38a46e9b1eecc Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Mon, 8 Apr 2019 12:00:48 +0100
Subject: [PATCH 716/832] Make DataIndex accessing code run on internal thread

This is the last cl of a series of cls that will convert DownloadManager
threading model as public methods post actions on an internal thread
which then do the work.

PiperOrigin-RevId: 242437229
---
 .../exoplayer2/offline/DownloadManager.java   | 231 ++++++++++--------
 1 file changed, 128 insertions(+), 103 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 145a0b1275..ad254aad72 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -29,7 +29,9 @@ import static com.google.android.exoplayer2.offline.DownloadState.STATE_RESTARTI
 import static com.google.android.exoplayer2.offline.DownloadState.STATE_STOPPED;
 
 import android.content.Context;
+import android.os.ConditionVariable;
 import android.os.Handler;
+import android.os.HandlerThread;
 import android.os.Looper;
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
@@ -111,8 +113,7 @@ public final class DownloadManager {
     START_THREAD_SUCCEEDED,
     START_THREAD_WAIT_REMOVAL_TO_FINISH,
     START_THREAD_WAIT_DOWNLOAD_CANCELLATION,
-    START_THREAD_TOO_MANY_DOWNLOADS,
-    START_THREAD_NOT_ALLOWED
+    START_THREAD_TOO_MANY_DOWNLOADS
   })
   private @interface StartThreadResults {}
 
@@ -120,7 +121,6 @@ public final class DownloadManager {
   private static final int START_THREAD_WAIT_REMOVAL_TO_FINISH = 1;
   private static final int START_THREAD_WAIT_DOWNLOAD_CANCELLATION = 2;
   private static final int START_THREAD_TOO_MANY_DOWNLOADS = 3;
-  private static final int START_THREAD_NOT_ALLOWED = 4;
 
   private static final String TAG = "DownloadManager";
   private static final boolean DEBUG = false;
@@ -130,19 +130,27 @@ public final class DownloadManager {
   private final Context context;
   private final DefaultDownloadIndex downloadIndex;
   private final DownloaderFactory downloaderFactory;
+  private final Handler mainHandler;
+  private final HandlerThread internalThread;
+  private final Handler internalHandler;
+
+  // Collections that are accessed on the main thread.
+  private final CopyOnWriteArraySet<Listener> listeners;
+  private final HashMap<String, DownloadState> downloadStates;
+
+  // Collections that are accessed on the internal thread.
   private final ArrayList<Download> downloads;
   private final HashMap<Download, DownloadThread> activeDownloads;
-  private final Handler mainHandler;
-  /*TODO
-  private final HandlerThread internalThread;
-  private final Handler internalHandler;*/
-  private final CopyOnWriteArraySet<Listener> listeners;
 
+  // Mutable fields that are accessed on the main thread.
+  private boolean idle;
   private boolean initialized;
   private boolean released;
+  private RequirementsWatcher requirementsWatcher;
+
+  // Mutable fields that are accessed on the internal thread.
   @Requirements.RequirementFlags private int notMetRequirements;
   private int manualStopReason;
-  private RequirementsWatcher requirementsWatcher;
   private int simultaneousDownloads;
 
   /**
@@ -214,6 +222,7 @@ public final class DownloadManager {
 
     manualStopReason = MANUAL_STOP_REASON_UNDEFINED;
     downloads = new ArrayList<>();
+    downloadStates = new HashMap<>();
     activeDownloads = new HashMap<>();
 
     Looper looper = Looper.myLooper();
@@ -222,15 +231,18 @@ public final class DownloadManager {
     }
     mainHandler = new Handler(looper);
 
-    /*TODO
     internalThread = new HandlerThread("DownloadManager file i/o");
     internalThread.start();
-    internalHandler = new Handler(internalThread.getLooper());*/
+    internalHandler = new Handler(internalThread.getLooper());
 
     listeners = new CopyOnWriteArraySet<>();
 
-    setNotMetRequirements(watchRequirements(requirements));
-    loadDownloads();
+    int notMetRequirements = watchRequirements(requirements);
+    runOnInternalThread(
+        () -> {
+          setNotMetRequirements(notMetRequirements);
+          loadDownloads();
+        });
     logd("Created");
   }
 
@@ -243,32 +255,30 @@ public final class DownloadManager {
   /** Returns whether there are no active downloads. */
   public boolean isIdle() {
     Assertions.checkState(!released);
-    return initialized && activeDownloads.isEmpty();
+    return idle;
   }
 
   /** Returns the used {@link DownloadIndex}. */
   public DownloadIndex getDownloadIndex() {
+    Assertions.checkState(!released);
     return downloadIndex;
   }
 
   /** Returns the number of downloads. */
   public int getDownloadCount() {
     Assertions.checkState(!released);
-    return downloads.size();
+    return downloadStates.size();
   }
 
   /** Returns the states of all current downloads. */
   public DownloadState[] getAllDownloadStates() {
     Assertions.checkState(!released);
-    DownloadState[] states = new DownloadState[downloads.size()];
-    for (int i = 0; i < states.length; i++) {
-      states[i] = downloads.get(i).getUpdatedDownloadState();
-    }
-    return states;
+    return downloadStates.values().toArray(new DownloadState[0]);
   }
 
   /** Returns the requirements needed to be met to start downloads. */
   public Requirements getRequirements() {
+    Assertions.checkState(!released);
     return requirementsWatcher.getRequirements();
   }
 
@@ -278,6 +288,7 @@ public final class DownloadManager {
    * @param listener The listener to be added.
    */
   public void addListener(Listener listener) {
+    Assertions.checkState(!released);
     listeners.add(listener);
   }
 
@@ -287,6 +298,7 @@ public final class DownloadManager {
    * @param listener The listener to be removed.
    */
   public void removeListener(Listener listener) {
+    Assertions.checkState(!released);
     listeners.remove(listener);
   }
 
@@ -296,8 +308,12 @@ public final class DownloadManager {
    * @param requirements Need to be met to start downloads.
    */
   public void setRequirements(Requirements requirements) {
-    Assertions.checkState(!released);
-    setRequirementsInternal(requirements);
+    if (requirements.equals(requirementsWatcher.getRequirements())) {
+      return;
+    }
+    requirementsWatcher.stop();
+    int notMetRequirements = watchRequirements(requirements);
+    onRequirementsStateChanged(notMetRequirements);
   }
 
   /**
@@ -305,7 +321,7 @@ public final class DownloadManager {
    */
   public void startDownloads() {
     logd("manual stop is cancelled");
-    setManualStopReason(/* id= */ null, MANUAL_STOP_REASON_NONE);
+    runOnInternalThread(() -> setManualStopReason(/* id= */ null, MANUAL_STOP_REASON_NONE));
   }
 
   /** Signals all downloads to stop. Call {@link #startDownloads()} to let them to be started. */
@@ -324,7 +340,7 @@ public final class DownloadManager {
   public void stopDownloads(int manualStopReason) {
     Assertions.checkArgument(manualStopReason != MANUAL_STOP_REASON_NONE);
     logd("downloads are stopped manually");
-    setManualStopReason(/* id= */ null, manualStopReason);
+    runOnInternalThread(() -> setManualStopReason(/* id= */ null, manualStopReason));
   }
 
   /**
@@ -334,7 +350,7 @@ public final class DownloadManager {
    * @param id The unique content id of the download to be started.
    */
   public void startDownload(String id) {
-    setManualStopReason(id, MANUAL_STOP_REASON_NONE);
+    runOnInternalThread(() -> setManualStopReason(id, MANUAL_STOP_REASON_NONE));
   }
 
   /**
@@ -344,7 +360,8 @@ public final class DownloadManager {
    * @param id The unique content id of the download to be stopped.
    */
   public void stopDownload(String id) {
-    stopDownload(id, /* manualStopReason= */ MANUAL_STOP_REASON_UNDEFINED);
+    runOnInternalThread(
+        () -> stopDownload(id, /* manualStopReason= */ MANUAL_STOP_REASON_UNDEFINED));
   }
 
   /**
@@ -359,7 +376,7 @@ public final class DownloadManager {
    */
   public void stopDownload(String id, int manualStopReason) {
     Assertions.checkArgument(manualStopReason != MANUAL_STOP_REASON_NONE);
-    setManualStopReason(id, manualStopReason);
+    runOnInternalThread(() -> setManualStopReason(id, manualStopReason));
   }
 
   /**
@@ -368,8 +385,7 @@ public final class DownloadManager {
    * @param action The download action.
    */
   public void addDownload(DownloadAction action) {
-    Assertions.checkState(!released);
-    addDownloadInternal(action);
+    runOnInternalThread(() -> addDownloadInternal(action));
   }
 
   /**
@@ -378,8 +394,7 @@ public final class DownloadManager {
    * @param id The unique content id of the download to be started.
    */
   public void removeDownload(String id) {
-    Assertions.checkState(!released);
-    removeDownloadInternal(id);
+    runOnInternalThread(() -> removeDownloadInternal(id));
   }
 
   /**
@@ -391,34 +406,70 @@ public final class DownloadManager {
     if (released) {
       return;
     }
-    /*TODO call releaseInternal on internal thread.
-    final ConditionVariable fileIOFinishedCondition = new ConditionVariable();
-    internalHandler.post(fileIOFinishedCondition::open);
-    fileIOFinishedCondition.block();
-    internalThread.quit();
-    */
-    releaseInternal();
-  }
-
-  // Methods that run on internal thread.
-
-  private void releaseInternal() {
     released = true;
-    stopAllDownloadThreads();
     if (requirementsWatcher != null) {
       requirementsWatcher.stop();
     }
+    ConditionVariable fileIOFinishedCondition = new ConditionVariable();
+    internalHandler.post(
+        () -> {
+          releaseInternal();
+          fileIOFinishedCondition.open();
+        });
+    fileIOFinishedCondition.block();
     logd("Released");
   }
 
-  private void setRequirementsInternal(Requirements requirements) {
-    if (requirements.equals(requirementsWatcher.getRequirements())) {
-      return;
-    }
-    requirementsWatcher.stop();
-    onRequirementsStateChanged(watchRequirements(requirements));
+  private void runOnInternalThread(Runnable runnable) {
+    Assertions.checkState(!released);
+    internalHandler.post(runnable);
   }
 
+  private void notifyListenersDownloadStateChange(DownloadState downloadState) {
+    if (isFinished(downloadState.state)) {
+      downloadStates.remove(downloadState.id);
+    } else {
+      downloadStates.put(downloadState.id, downloadState);
+    }
+    for (Listener listener : listeners) {
+      listener.onDownloadStateChanged(this, downloadState);
+    }
+  }
+
+  @Requirements.RequirementFlags
+  private int watchRequirements(Requirements requirements) {
+    RequirementsWatcher.Listener listener =
+        (requirementsWatcher, notMetRequirements) -> onRequirementsStateChanged(notMetRequirements);
+    requirementsWatcher = new RequirementsWatcher(context, listener, requirements);
+    return requirementsWatcher.start();
+  }
+
+  private void onRequirementsStateChanged(@Requirements.RequirementFlags int notMetRequirements) {
+    Requirements requirements = requirementsWatcher.getRequirements();
+    for (Listener listener : listeners) {
+      listener.onRequirementsStateChanged(this, requirements, notMetRequirements);
+    }
+    internalHandler.post(() -> setNotMetRequirements(notMetRequirements));
+  }
+
+  private void onInitialized() {
+    initialized = true;
+    for (Listener listener : listeners) {
+      listener.onInitialized(DownloadManager.this);
+    }
+  }
+
+  private void onIdleStateChange(boolean idle) {
+    if (!this.idle && idle) {
+      for (Listener listener : listeners) {
+        listener.onIdle(this);
+      }
+    }
+    this.idle = idle;
+  }
+
+  // Methods that run on internal thread.
+
   private void setManualStopReason(@Nullable String id, int manualStopReason) {
     if (id != null) {
       Download download = getDownload(id);
@@ -476,36 +527,14 @@ public final class DownloadManager {
     }
   }
 
-  private void maybeNotifyListenersIdle() {
-    if (!isIdle()) {
-      return;
-    }
-    logd("Notify idle state");
-    for (Listener listener : listeners) {
-      listener.onIdle(this);
-    }
-  }
-
   private void onDownloadStateChange(Download download, DownloadState downloadState) {
-    if (released) {
-      return;
-    }
     logd("Download state is changed", download);
     updateDownloadIndex(downloadState);
-    for (Listener listener : listeners) {
-      listener.onDownloadStateChanged(this, downloadState);
+    mainHandler.post(() -> notifyListenersDownloadStateChange(downloadState));
+    int index = downloads.indexOf(download);
+    if (isFinished(download.state)) {
+      downloads.remove(index);
     }
-    if (download.isFinished()) {
-      downloads.remove(download);
-    }
-  }
-
-  private void onRequirementsStateChanged(@Requirements.RequirementFlags int notMetRequirements) {
-    Requirements requirements = requirementsWatcher.getRequirements();
-    for (Listener listener : listeners) {
-      listener.onRequirementsStateChanged(DownloadManager.this, requirements, notMetRequirements);
-    }
-    setNotMetRequirements(notMetRequirements);
   }
 
   private void setNotMetRequirements(@Requirements.RequirementFlags int notMetRequirements) {
@@ -516,14 +545,6 @@ public final class DownloadManager {
     }
   }
 
-  @Requirements.RequirementFlags
-  private int watchRequirements(Requirements requirements) {
-    RequirementsWatcher.Listener listener =
-        (requirementsWatcher, notMetRequirements) -> onRequirementsStateChanged(notMetRequirements);
-    requirementsWatcher = new RequirementsWatcher(context, listener, requirements);
-    return requirementsWatcher.start();
-  }
-
   @Nullable
   private Download getDownload(String id) {
     for (int i = 0; i < downloads.size(); i++) {
@@ -563,19 +584,23 @@ public final class DownloadManager {
       addDownloadForState(downloadState);
     }
     logd("Downloads are created.");
-    initialized = true;
-    for (Listener listener : listeners) {
-      listener.onInitialized(DownloadManager.this);
-    }
+    mainHandler.post(this::onInitialized);
     for (int i = 0; i < downloads.size(); i++) {
       downloads.get(i).start();
     }
+    checkIfIdle();
+  }
+
+  private void checkIfIdle() {
+    boolean idle = activeDownloads.isEmpty();
+    mainHandler.post(() -> onIdleStateChange(idle));
   }
 
   private void addDownloadForState(DownloadState downloadState) {
     Download download = new Download(this, downloadState, notMetRequirements, manualStopReason);
     downloads.add(download);
     logd("Download is added", download);
+    download.initialize();
   }
 
   private void updateDownloadIndex(DownloadState downloadState) {
@@ -610,9 +635,6 @@ public final class DownloadManager {
 
   @StartThreadResults
   private int startDownloadThread(Download download) {
-    if (released) {
-      return START_THREAD_NOT_ALLOWED;
-    }
     if (activeDownloads.containsKey(download)) {
       if (stopDownloadThread(download)) {
         return START_THREAD_WAIT_DOWNLOAD_CANCELLATION;
@@ -628,6 +650,7 @@ public final class DownloadManager {
     DownloadThread downloadThread = new DownloadThread(download);
     activeDownloads.put(download, downloadThread);
     download.setCounters(downloadThread.downloader.getCounters());
+    checkIfIdle();
     logd("Download is started", download);
     return START_THREAD_SUCCEEDED;
   }
@@ -642,19 +665,18 @@ public final class DownloadManager {
     return false;
   }
 
-  private void stopAllDownloadThreads() {
+  private void releaseInternal() {
     for (Download download : activeDownloads.keySet()) {
       stopDownloadThread(download);
     }
+    internalThread.quit();
   }
 
   private void onDownloadThreadStopped(DownloadThread downloadThread, Throwable finalError) {
-    if (released) {
-      return;
-    }
     Download download = downloadThread.download;
     logd("Download is stopped", download);
     activeDownloads.remove(download);
+    checkIfIdle();
     boolean tryToStartDownloads = false;
     if (!downloadThread.isRemoveThread) {
       // If maxSimultaneousDownloads was hit, there might be a download waiting for a slot.
@@ -669,7 +691,10 @@ public final class DownloadManager {
         downloads.get(i).start();
       }
     }
-    maybeNotifyListenersIdle();
+  }
+
+  private static boolean isFinished(@DownloadState.State int state) {
+    return state == STATE_FAILED || state == STATE_COMPLETED || state == STATE_REMOVED;
   }
 
   private static final class Download {
@@ -690,7 +715,9 @@ public final class DownloadManager {
       this.downloadState = downloadState;
       this.notMetRequirements = notMetRequirements;
       this.manualStopReason = manualStopReason;
+    }
 
+    private void initialize() {
       initialize(downloadState.state);
     }
 
@@ -705,7 +732,7 @@ public final class DownloadManager {
         Log.e(TAG, String.format(format, newAction.type, downloadState.type));
       }
       downloadState = downloadState.mergeAction(newAction);
-      initialize(downloadState.state);
+      initialize();
     }
 
     public void remove() {
@@ -731,10 +758,6 @@ public final class DownloadManager {
       return downloadState;
     }
 
-    public boolean isFinished() {
-      return state == STATE_FAILED || state == STATE_COMPLETED || state == STATE_REMOVED;
-    }
-
     public boolean isIdle() {
       return state != STATE_DOWNLOADING && state != STATE_REMOVING && state != STATE_RESTARTING;
     }
@@ -855,7 +878,6 @@ public final class DownloadManager {
         }
       }
     }
-
   }
 
   private class DownloadThread extends Thread {
@@ -915,7 +937,10 @@ public final class DownloadManager {
         error = e;
       }
       final Throwable finalError = error;
-      mainHandler.post(() -> onDownloadThreadStopped(this, finalError));
+      internalHandler.post(
+          () -> {
+            onDownloadThreadStopped(this, finalError);
+          });
     }
 
     private int getRetryDelayMillis(int errorCount) {

From 925dd5aa122cc8f1c6cdbb026a0d8f7e463b0238 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 8 Apr 2019 12:21:23 +0100
Subject: [PATCH 717/832] Fix most remaining issues with DownloadManager
 threading

PiperOrigin-RevId: 242439330
---
 .../exoplayer2/offline/DownloadManager.java   | 316 +++++++++++-------
 1 file changed, 197 insertions(+), 119 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index ad254aad72..e164d617e0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -29,10 +29,10 @@ import static com.google.android.exoplayer2.offline.DownloadState.STATE_RESTARTI
 import static com.google.android.exoplayer2.offline.DownloadState.STATE_STOPPED;
 
 import android.content.Context;
-import android.os.ConditionVariable;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
+import android.os.Message;
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
@@ -43,12 +43,14 @@ import com.google.android.exoplayer2.scheduler.RequirementsWatcher;
 import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
+import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.concurrent.CopyOnWriteArraySet;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
@@ -108,6 +110,20 @@ public final class DownloadManager {
   public static final Requirements DEFAULT_REQUIREMENTS =
       new Requirements(Requirements.NETWORK_TYPE_ANY, false, false);
 
+  // Messages posted to the main handler.
+  private static final int MSG_INITIALIZED = 0;
+  private static final int MSG_PROCESSED = 1;
+  private static final int MSG_DOWNLOAD_STATE_CHANGED = 2;
+
+  // Messages posted to the background handler.
+  private static final int MSG_INITIALIZE = 0;
+  private static final int MSG_ADD_DOWNLOAD = 1;
+  private static final int MSG_REMOVE_DOWNLOAD = 2;
+  private static final int MSG_SET_MANUAL_STOP_REASON = 3;
+  private static final int MSG_SET_NOT_MET_REQUIREMENTS = 4;
+  private static final int MSG_DOWNLOAD_THREAD_STOPPED = 5;
+  private static final int MSG_RELEASE = 6;
+
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     START_THREAD_SUCCEEDED,
@@ -133,6 +149,8 @@ public final class DownloadManager {
   private final Handler mainHandler;
   private final HandlerThread internalThread;
   private final Handler internalHandler;
+  private final RequirementsWatcher.Listener requirementsListener;
+  private final Object releaseLock;
 
   // Collections that are accessed on the main thread.
   private final CopyOnWriteArraySet<Listener> listeners;
@@ -143,7 +161,8 @@ public final class DownloadManager {
   private final HashMap<Download, DownloadThread> activeDownloads;
 
   // Mutable fields that are accessed on the main thread.
-  private boolean idle;
+  private int pendingMessages;
+  private int activeDownloadCount;
   private boolean initialized;
   private boolean released;
   private RequirementsWatcher requirementsWatcher;
@@ -224,61 +243,52 @@ public final class DownloadManager {
     downloads = new ArrayList<>();
     downloadStates = new HashMap<>();
     activeDownloads = new HashMap<>();
+    listeners = new CopyOnWriteArraySet<>();
+    releaseLock = new Object();
 
-    Looper looper = Looper.myLooper();
-    if (looper == null) {
-      looper = Looper.getMainLooper();
-    }
-    mainHandler = new Handler(looper);
+    requirementsListener = this::onRequirementsStateChanged;
 
+    mainHandler = new Handler(Util.getLooper(), this::handleMainMessage);
     internalThread = new HandlerThread("DownloadManager file i/o");
     internalThread.start();
-    internalHandler = new Handler(internalThread.getLooper());
+    internalHandler = new Handler(internalThread.getLooper(), this::handleInternalMessage);
 
-    listeners = new CopyOnWriteArraySet<>();
+    requirementsWatcher = new RequirementsWatcher(context, requirementsListener, requirements);
+    int notMetRequirements = requirementsWatcher.start();
 
-    int notMetRequirements = watchRequirements(requirements);
-    runOnInternalThread(
-        () -> {
-          setNotMetRequirements(notMetRequirements);
-          loadDownloads();
-        });
-    logd("Created");
+    pendingMessages = 1;
+    internalHandler
+        .obtainMessage(MSG_INITIALIZE, notMetRequirements, /* unused */ 0)
+        .sendToTarget();
   }
 
   /** Returns whether the manager has completed initialization. */
   public boolean isInitialized() {
-    Assertions.checkState(!released);
     return initialized;
   }
 
   /** Returns whether there are no active downloads. */
   public boolean isIdle() {
-    Assertions.checkState(!released);
-    return idle;
+    return activeDownloadCount == 0 && pendingMessages == 0;
   }
 
   /** Returns the used {@link DownloadIndex}. */
   public DownloadIndex getDownloadIndex() {
-    Assertions.checkState(!released);
     return downloadIndex;
   }
 
   /** Returns the number of downloads. */
   public int getDownloadCount() {
-    Assertions.checkState(!released);
     return downloadStates.size();
   }
 
   /** Returns the states of all current downloads. */
   public DownloadState[] getAllDownloadStates() {
-    Assertions.checkState(!released);
     return downloadStates.values().toArray(new DownloadState[0]);
   }
 
   /** Returns the requirements needed to be met to start downloads. */
   public Requirements getRequirements() {
-    Assertions.checkState(!released);
     return requirementsWatcher.getRequirements();
   }
 
@@ -288,7 +298,6 @@ public final class DownloadManager {
    * @param listener The listener to be added.
    */
   public void addListener(Listener listener) {
-    Assertions.checkState(!released);
     listeners.add(listener);
   }
 
@@ -298,7 +307,6 @@ public final class DownloadManager {
    * @param listener The listener to be removed.
    */
   public void removeListener(Listener listener) {
-    Assertions.checkState(!released);
     listeners.remove(listener);
   }
 
@@ -312,25 +320,25 @@ public final class DownloadManager {
       return;
     }
     requirementsWatcher.stop();
-    int notMetRequirements = watchRequirements(requirements);
-    onRequirementsStateChanged(notMetRequirements);
+    requirementsWatcher = new RequirementsWatcher(context, requirementsListener, requirements);
+    int notMetRequirements = requirementsWatcher.start();
+    onRequirementsStateChanged(requirementsWatcher, notMetRequirements);
   }
 
   /**
    * Clears manual stop reason of all downloads. Downloads are started if the requirements are met.
    */
   public void startDownloads() {
-    logd("manual stop is cancelled");
-    runOnInternalThread(() -> setManualStopReason(/* id= */ null, MANUAL_STOP_REASON_NONE));
+    postSetManualStopReason(/* id= */ null, MANUAL_STOP_REASON_NONE);
   }
 
   /** Signals all downloads to stop. Call {@link #startDownloads()} to let them to be started. */
   public void stopDownloads() {
-    stopDownloads(/* manualStopReason= */ MANUAL_STOP_REASON_UNDEFINED);
+    stopDownloads(MANUAL_STOP_REASON_UNDEFINED);
   }
 
   /**
-   * Signals all downloads to stop. Call {@link #startDownloads()} to let them to be started.
+   * Sets a manual stop reason for all downloads.
    *
    * @param manualStopReason An application defined stop reason. Value {@value
    *     DownloadState#MANUAL_STOP_REASON_NONE} is not allowed and value {@value
@@ -339,8 +347,7 @@ public final class DownloadManager {
    */
   public void stopDownloads(int manualStopReason) {
     Assertions.checkArgument(manualStopReason != MANUAL_STOP_REASON_NONE);
-    logd("downloads are stopped manually");
-    runOnInternalThread(() -> setManualStopReason(/* id= */ null, manualStopReason));
+    postSetManualStopReason(/* id= */ null, manualStopReason);
   }
 
   /**
@@ -350,7 +357,7 @@ public final class DownloadManager {
    * @param id The unique content id of the download to be started.
    */
   public void startDownload(String id) {
-    runOnInternalThread(() -> setManualStopReason(id, MANUAL_STOP_REASON_NONE));
+    postSetManualStopReason(id, MANUAL_STOP_REASON_NONE);
   }
 
   /**
@@ -360,8 +367,7 @@ public final class DownloadManager {
    * @param id The unique content id of the download to be stopped.
    */
   public void stopDownload(String id) {
-    runOnInternalThread(
-        () -> stopDownload(id, /* manualStopReason= */ MANUAL_STOP_REASON_UNDEFINED));
+    stopDownload(id, MANUAL_STOP_REASON_UNDEFINED);
   }
 
   /**
@@ -376,7 +382,7 @@ public final class DownloadManager {
    */
   public void stopDownload(String id, int manualStopReason) {
     Assertions.checkArgument(manualStopReason != MANUAL_STOP_REASON_NONE);
-    runOnInternalThread(() -> setManualStopReason(id, manualStopReason));
+    postSetManualStopReason(id, manualStopReason);
   }
 
   /**
@@ -385,7 +391,8 @@ public final class DownloadManager {
    * @param action The download action.
    */
   public void addDownload(DownloadAction action) {
-    runOnInternalThread(() -> addDownloadInternal(action));
+    pendingMessages++;
+    internalHandler.obtainMessage(MSG_ADD_DOWNLOAD, action).sendToTarget();
   }
 
   /**
@@ -394,7 +401,8 @@ public final class DownloadManager {
    * @param id The unique content id of the download to be started.
    */
   public void removeDownload(String id) {
-    runOnInternalThread(() -> removeDownloadInternal(id));
+    pendingMessages++;
+    internalHandler.obtainMessage(MSG_REMOVE_DOWNLOAD, id).sendToTarget();
   }
 
   /**
@@ -403,29 +411,90 @@ public final class DownloadManager {
    * called.
    */
   public void release() {
-    if (released) {
-      return;
+    synchronized (releaseLock) {
+      if (released) {
+        return;
+      }
+      internalHandler.sendEmptyMessage(MSG_RELEASE);
+      boolean wasInterrupted = false;
+      while (!released) {
+        try {
+          releaseLock.wait();
+        } catch (InterruptedException e) {
+          wasInterrupted = true;
+        }
+      }
+      if (wasInterrupted) {
+        // Restore the interrupted status.
+        Thread.currentThread().interrupt();
+      }
+      mainHandler.removeCallbacksAndMessages(/* token= */ null);
+      // Reset state.
+      pendingMessages = 0;
+      activeDownloadCount = 0;
+      initialized = false;
+      downloadStates.clear();
     }
-    released = true;
-    if (requirementsWatcher != null) {
-      requirementsWatcher.stop();
-    }
-    ConditionVariable fileIOFinishedCondition = new ConditionVariable();
-    internalHandler.post(
-        () -> {
-          releaseInternal();
-          fileIOFinishedCondition.open();
-        });
-    fileIOFinishedCondition.block();
-    logd("Released");
   }
 
-  private void runOnInternalThread(Runnable runnable) {
-    Assertions.checkState(!released);
-    internalHandler.post(runnable);
+  private void postSetManualStopReason(@Nullable String id, int manualStopReason) {
+    pendingMessages++;
+    internalHandler
+        .obtainMessage(MSG_SET_MANUAL_STOP_REASON, manualStopReason, /* unused */ 0, id)
+        .sendToTarget();
   }
 
-  private void notifyListenersDownloadStateChange(DownloadState downloadState) {
+  private void onRequirementsStateChanged(
+      RequirementsWatcher requirementsWatcher,
+      @Requirements.RequirementFlags int notMetRequirements) {
+    Requirements requirements = requirementsWatcher.getRequirements();
+    for (Listener listener : listeners) {
+      listener.onRequirementsStateChanged(this, requirements, notMetRequirements);
+    }
+    pendingMessages++;
+    internalHandler
+        .obtainMessage(MSG_SET_NOT_MET_REQUIREMENTS, notMetRequirements, /* unused */ 0)
+        .sendToTarget();
+  }
+
+  // Main thread message handling.
+
+  @SuppressWarnings("unchecked")
+  private boolean handleMainMessage(Message message) {
+    switch (message.what) {
+      case MSG_INITIALIZED:
+        List<DownloadState> downloadStates = (List<DownloadState>) message.obj;
+        onInitialized(downloadStates);
+        break;
+      case MSG_DOWNLOAD_STATE_CHANGED:
+        DownloadState state = (DownloadState) message.obj;
+        onDownloadStateChanged(state);
+        break;
+      case MSG_PROCESSED:
+        int processedMessageCount = message.arg1;
+        int activeDownloadCount = message.arg2;
+        onMessageProcessed(processedMessageCount, activeDownloadCount);
+        break;
+      default:
+        throw new IllegalStateException();
+    }
+    return true;
+  }
+
+  // TODO: Merge these three events into a single MSG_STATE_CHANGE that can carry all updates. This
+  // allows updating idle at the same point as the downloads that can be queried changes.
+  private void onInitialized(List<DownloadState> downloadStates) {
+    initialized = true;
+    for (int i = 0; i < downloadStates.size(); i++) {
+      DownloadState downloadState = downloadStates.get(i);
+      this.downloadStates.put(downloadState.id, downloadState);
+    }
+    for (Listener listener : listeners) {
+      listener.onInitialized(DownloadManager.this);
+    }
+  }
+
+  private void onDownloadStateChanged(DownloadState downloadState) {
     if (isFinished(downloadState.state)) {
       downloadStates.remove(downloadState.id);
     } else {
@@ -436,41 +505,60 @@ public final class DownloadManager {
     }
   }
 
-  @Requirements.RequirementFlags
-  private int watchRequirements(Requirements requirements) {
-    RequirementsWatcher.Listener listener =
-        (requirementsWatcher, notMetRequirements) -> onRequirementsStateChanged(notMetRequirements);
-    requirementsWatcher = new RequirementsWatcher(context, listener, requirements);
-    return requirementsWatcher.start();
-  }
-
-  private void onRequirementsStateChanged(@Requirements.RequirementFlags int notMetRequirements) {
-    Requirements requirements = requirementsWatcher.getRequirements();
-    for (Listener listener : listeners) {
-      listener.onRequirementsStateChanged(this, requirements, notMetRequirements);
-    }
-    internalHandler.post(() -> setNotMetRequirements(notMetRequirements));
-  }
-
-  private void onInitialized() {
-    initialized = true;
-    for (Listener listener : listeners) {
-      listener.onInitialized(DownloadManager.this);
-    }
-  }
-
-  private void onIdleStateChange(boolean idle) {
-    if (!this.idle && idle) {
+  private void onMessageProcessed(int processedMessageCount, int activeDownloadCount) {
+    this.pendingMessages -= processedMessageCount;
+    this.activeDownloadCount = activeDownloadCount;
+    if (isIdle()) {
       for (Listener listener : listeners) {
         listener.onIdle(this);
       }
     }
-    this.idle = idle;
   }
 
-  // Methods that run on internal thread.
+  // Internal thread message handling.
 
-  private void setManualStopReason(@Nullable String id, int manualStopReason) {
+  private boolean handleInternalMessage(Message message) {
+    boolean processedExternalMessage = true;
+    switch (message.what) {
+      case MSG_INITIALIZE:
+        int notMetRequirements = message.arg1;
+        initializeInternal(notMetRequirements);
+        break;
+      case MSG_ADD_DOWNLOAD:
+        DownloadAction action = (DownloadAction) message.obj;
+        addDownloadInternal(action);
+        break;
+      case MSG_REMOVE_DOWNLOAD:
+        String id = (String) message.obj;
+        removeDownloadInternal(id);
+        break;
+      case MSG_SET_MANUAL_STOP_REASON:
+        id = (String) message.obj;
+        int manualStopReason = message.arg1;
+        setManualStopReasonInternal(id, manualStopReason);
+        break;
+      case MSG_SET_NOT_MET_REQUIREMENTS:
+        notMetRequirements = message.arg1;
+        setNotMetRequirementsInternal(notMetRequirements);
+        break;
+      case MSG_DOWNLOAD_THREAD_STOPPED:
+        DownloadThread downloadThread = (DownloadThread) message.obj;
+        onDownloadThreadStoppedInternal(downloadThread);
+        processedExternalMessage = false;
+        break;
+      case MSG_RELEASE:
+        releaseInternal();
+        return true; // Don't post back to mainHandler on release.
+      default:
+        throw new IllegalStateException();
+    }
+    mainHandler
+        .obtainMessage(MSG_PROCESSED, processedExternalMessage ? 1 : 0, activeDownloads.size())
+        .sendToTarget();
+    return true;
+  }
+
+  private void setManualStopReasonInternal(@Nullable String id, int manualStopReason) {
     if (id != null) {
       Download download = getDownload(id);
       if (download != null) {
@@ -530,14 +618,17 @@ public final class DownloadManager {
   private void onDownloadStateChange(Download download, DownloadState downloadState) {
     logd("Download state is changed", download);
     updateDownloadIndex(downloadState);
-    mainHandler.post(() -> notifyListenersDownloadStateChange(downloadState));
-    int index = downloads.indexOf(download);
     if (isFinished(download.state)) {
-      downloads.remove(index);
+      downloads.remove(download);
     }
+    mainHandler.obtainMessage(MSG_DOWNLOAD_STATE_CHANGED, downloadState).sendToTarget();
   }
 
-  private void setNotMetRequirements(@Requirements.RequirementFlags int notMetRequirements) {
+  private void setNotMetRequirementsInternal(
+      @Requirements.RequirementFlags int notMetRequirements) {
+    if (this.notMetRequirements == notMetRequirements) {
+      return;
+    }
     this.notMetRequirements = notMetRequirements;
     logdFlags("Not met requirements are changed", notMetRequirements);
     for (int i = 0; i < downloads.size(); i++) {
@@ -565,35 +656,28 @@ public final class DownloadManager {
     return null;
   }
 
-  private void loadDownloads() {
-    DownloadState[] loadedStates;
+  private void initializeInternal(int notMetRequirements) {
+    this.notMetRequirements = notMetRequirements;
+    ArrayList<DownloadState> loadedStates = new ArrayList<>();
     try (DownloadStateCursor cursor =
         downloadIndex.getDownloadStates(
             STATE_QUEUED, STATE_STOPPED, STATE_DOWNLOADING, STATE_REMOVING, STATE_RESTARTING)) {
-      loadedStates = new DownloadState[cursor.getCount()];
-      for (int i = 0, length = loadedStates.length; i < length; i++) {
-        cursor.moveToNext();
-        loadedStates[i] = cursor.getDownloadState();
+      while (cursor.moveToNext()) {
+        loadedStates.add(cursor.getDownloadState());
       }
       logd("Download states are loaded.");
     } catch (Throwable e) {
       Log.e(TAG, "Download state loading failed.", e);
-      loadedStates = new DownloadState[0];
+      loadedStates.clear();
     }
     for (DownloadState downloadState : loadedStates) {
       addDownloadForState(downloadState);
     }
     logd("Downloads are created.");
-    mainHandler.post(this::onInitialized);
+    mainHandler.obtainMessage(MSG_INITIALIZED, loadedStates).sendToTarget();
     for (int i = 0; i < downloads.size(); i++) {
       downloads.get(i).start();
     }
-    checkIfIdle();
-  }
-
-  private void checkIfIdle() {
-    boolean idle = activeDownloads.isEmpty();
-    mainHandler.post(() -> onIdleStateChange(idle));
   }
 
   private void addDownloadForState(DownloadState downloadState) {
@@ -650,7 +734,6 @@ public final class DownloadManager {
     DownloadThread downloadThread = new DownloadThread(download);
     activeDownloads.put(download, downloadThread);
     download.setCounters(downloadThread.downloader.getCounters());
-    checkIfIdle();
     logd("Download is started", download);
     return START_THREAD_SUCCEEDED;
   }
@@ -670,20 +753,23 @@ public final class DownloadManager {
       stopDownloadThread(download);
     }
     internalThread.quit();
+    synchronized (releaseLock) {
+      released = true;
+      releaseLock.notifyAll();
+    }
   }
 
-  private void onDownloadThreadStopped(DownloadThread downloadThread, Throwable finalError) {
+  private void onDownloadThreadStoppedInternal(DownloadThread downloadThread) {
     Download download = downloadThread.download;
     logd("Download is stopped", download);
     activeDownloads.remove(download);
-    checkIfIdle();
     boolean tryToStartDownloads = false;
     if (!downloadThread.isRemoveThread) {
       // If maxSimultaneousDownloads was hit, there might be a download waiting for a slot.
       tryToStartDownloads = simultaneousDownloads == maxSimultaneousDownloads;
       simultaneousDownloads--;
     }
-    download.onDownloadThreadStopped(downloadThread.isCanceled, finalError);
+    download.onDownloadThreadStopped(downloadThread.isCanceled, downloadThread.finalError);
     if (tryToStartDownloads) {
       for (int i = 0;
           simultaneousDownloads < maxSimultaneousDownloads && i < downloads.size();
@@ -726,11 +812,6 @@ public final class DownloadManager {
     }
 
     public void addAction(DownloadAction newAction) {
-      Assertions.checkArgument(getId().equals(newAction.id));
-      if (!downloadState.type.equals(newAction.type)) {
-        String format = "Action type (%s) doesn't match existing download type (%s)";
-        Log.e(TAG, String.format(format, newAction.type, downloadState.type));
-      }
       downloadState = downloadState.mergeAction(newAction);
       initialize();
     }
@@ -885,7 +966,9 @@ public final class DownloadManager {
     private final Download download;
     private final Downloader downloader;
     private final boolean isRemoveThread;
+
     private volatile boolean isCanceled;
+    private Throwable finalError;
 
     private DownloadThread(Download download) {
       this.download = download;
@@ -905,7 +988,6 @@ public final class DownloadManager {
     @Override
     public void run() {
       logd("Download started", download);
-      Throwable error = null;
       try {
         if (isRemoveThread) {
           downloader.remove();
@@ -934,13 +1016,9 @@ public final class DownloadManager {
           }
         }
       } catch (Throwable e) {
-        error = e;
+        finalError = e;
       }
-      final Throwable finalError = error;
-      internalHandler.post(
-          () -> {
-            onDownloadThreadStopped(this, finalError);
-          });
+      internalHandler.obtainMessage(MSG_DOWNLOAD_THREAD_STOPPED, this).sendToTarget();
     }
 
     private int getRetryDelayMillis(int errorCount) {

From 0daaba443c3347068db8ac7a868ed69928263093 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 8 Apr 2019 13:10:13 +0100
Subject: [PATCH 718/832] Get rid of DownloadState.STATE_REMOVED

It's a transient state whose only use is when passing a removed
download to onDownloadStateChanged. It's a bit strange to have it
as a proper state, since we end up asserting that it's an invalid
value in other places.

This change adds an explicit onDownloadRemoved, which allows
removal of the transient STATE_REMOVED, related assertions, and
uncertainty when dealing with an @State variable whether it's
necessary to handle it being STATE_REMOVED.

PiperOrigin-RevId: 242444128
---
 .../exoplayer2/demo/DownloadTracker.java      | 17 +++--
 .../offline/DefaultDownloadIndex.java         |  1 -
 .../exoplayer2/offline/DownloadManager.java   | 71 ++++++++++++-------
 .../exoplayer2/offline/DownloadService.java   | 23 ++++++
 .../exoplayer2/offline/DownloadState.java     | 10 +--
 .../offline/DownloadManagerTest.java          |  9 +--
 .../ui/DownloadNotificationHelper.java        |  3 +-
 .../testutil/TestDownloadManagerListener.java | 21 +++++-
 8 files changed, 107 insertions(+), 48 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index 16f3f1b809..077f0bffb1 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -124,13 +124,18 @@ public class DownloadTracker implements DownloadManager.Listener {
 
   @Override
   public void onDownloadStateChanged(DownloadManager downloadManager, DownloadState downloadState) {
-    boolean downloaded = isDownloaded(downloadState.uri);
-    if (downloadState.state == DownloadState.STATE_REMOVED) {
-      downloadStates.remove(downloadState.uri);
-    } else {
-      downloadStates.put(downloadState.uri, downloadState);
+    boolean downloadAdded = downloadStates.put(downloadState.uri, downloadState) == null;
+    if (downloadAdded) {
+      for (Listener listener : listeners) {
+        listener.onDownloadsChanged();
+      }
     }
-    if (downloaded != isDownloaded(downloadState.uri)) {
+  }
+
+  @Override
+  public void onDownloadRemoved(DownloadManager downloadManager, DownloadState downloadState) {
+    boolean downloadRemoved = downloadStates.remove(downloadState.uri) != null;
+    if (downloadRemoved) {
       for (Listener listener : listeners) {
         listener.onDownloadsChanged();
       }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
index ae0817b27d..273c9dc9b9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -192,7 +192,6 @@ public final class DefaultDownloadIndex implements DownloadIndex {
    */
   public void putDownloadState(DownloadState downloadState) throws DatabaseIOException {
     ensureInitialized();
-    Assertions.checkState(downloadState.state != DownloadState.STATE_REMOVED);
     try {
       ContentValues values = new ContentValues();
       values.put(COLUMN_ID, downloadState.id);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index e164d617e0..27370c37e2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -23,7 +23,6 @@ import static com.google.android.exoplayer2.offline.DownloadState.STATE_COMPLETE
 import static com.google.android.exoplayer2.offline.DownloadState.STATE_DOWNLOADING;
 import static com.google.android.exoplayer2.offline.DownloadState.STATE_FAILED;
 import static com.google.android.exoplayer2.offline.DownloadState.STATE_QUEUED;
-import static com.google.android.exoplayer2.offline.DownloadState.STATE_REMOVED;
 import static com.google.android.exoplayer2.offline.DownloadState.STATE_REMOVING;
 import static com.google.android.exoplayer2.offline.DownloadState.STATE_RESTARTING;
 import static com.google.android.exoplayer2.offline.DownloadState.STATE_STOPPED;
@@ -81,6 +80,14 @@ public final class DownloadManager {
     default void onDownloadStateChanged(
         DownloadManager downloadManager, DownloadState downloadState) {}
 
+    /**
+     * Called when a download is removed.
+     *
+     * @param downloadManager The reporting instance.
+     * @param downloadState The last state of the download before it was removed.
+     */
+    default void onDownloadRemoved(DownloadManager downloadManager, DownloadState downloadState) {}
+
     /**
      * Called when there is no active download left.
      *
@@ -114,6 +121,7 @@ public final class DownloadManager {
   private static final int MSG_INITIALIZED = 0;
   private static final int MSG_PROCESSED = 1;
   private static final int MSG_DOWNLOAD_STATE_CHANGED = 2;
+  private static final int MSG_DOWNLOAD_REMOVED = 3;
 
   // Messages posted to the background handler.
   private static final int MSG_INITIALIZE = 0;
@@ -470,6 +478,10 @@ public final class DownloadManager {
         DownloadState state = (DownloadState) message.obj;
         onDownloadStateChanged(state);
         break;
+      case MSG_DOWNLOAD_REMOVED:
+        state = (DownloadState) message.obj;
+        onDownloadRemoved(state);
+        break;
       case MSG_PROCESSED:
         int processedMessageCount = message.arg1;
         int activeDownloadCount = message.arg2;
@@ -495,7 +507,7 @@ public final class DownloadManager {
   }
 
   private void onDownloadStateChanged(DownloadState downloadState) {
-    if (isFinished(downloadState.state)) {
+    if (downloadState.state == STATE_COMPLETED || downloadState.state == STATE_FAILED) {
       downloadStates.remove(downloadState.id);
     } else {
       downloadStates.put(downloadState.id, downloadState);
@@ -505,6 +517,13 @@ public final class DownloadManager {
     }
   }
 
+  private void onDownloadRemoved(DownloadState downloadState) {
+    downloadStates.remove(downloadState.id);
+    for (Listener listener : listeners) {
+      listener.onDownloadRemoved(this, downloadState);
+    }
+  }
+
   private void onMessageProcessed(int processedMessageCount, int activeDownloadCount) {
     this.pendingMessages -= processedMessageCount;
     this.activeDownloadCount = activeDownloadCount;
@@ -615,15 +634,30 @@ public final class DownloadManager {
     }
   }
 
-  private void onDownloadStateChange(Download download, DownloadState downloadState) {
+  private void onDownloadStateChangedInternal(Download download, DownloadState downloadState) {
     logd("Download state is changed", download);
-    updateDownloadIndex(downloadState);
-    if (isFinished(download.state)) {
+    try {
+      downloadIndex.putDownloadState(downloadState);
+    } catch (DatabaseIOException e) {
+      Log.e(TAG, "Failed to update index", e);
+    }
+    if (download.state == STATE_COMPLETED || download.state == STATE_FAILED) {
       downloads.remove(download);
     }
     mainHandler.obtainMessage(MSG_DOWNLOAD_STATE_CHANGED, downloadState).sendToTarget();
   }
 
+  private void onDownloadRemovedInternal(Download download, DownloadState downloadState) {
+    logd("Download is removed", download);
+    try {
+      downloadIndex.removeDownloadState(downloadState.id);
+    } catch (DatabaseIOException e) {
+      Log.e(TAG, "Failed to remove from index", e);
+    }
+    downloads.remove(download);
+    mainHandler.obtainMessage(MSG_DOWNLOAD_REMOVED, downloadState).sendToTarget();
+  }
+
   private void setNotMetRequirementsInternal(
       @Requirements.RequirementFlags int notMetRequirements) {
     if (this.notMetRequirements == notMetRequirements) {
@@ -687,18 +721,6 @@ public final class DownloadManager {
     download.initialize();
   }
 
-  private void updateDownloadIndex(DownloadState downloadState) {
-    try {
-      if (downloadState.state == DownloadState.STATE_REMOVED) {
-        downloadIndex.removeDownloadState(downloadState.id);
-      } else {
-        downloadIndex.putDownloadState(downloadState);
-      }
-    } catch (DatabaseIOException e) {
-      Log.e(TAG, "updateDownloadIndex failed", e);
-    }
-  }
-
   private static void logd(String message) {
     if (DEBUG) {
       Log.d(TAG, message);
@@ -779,10 +801,6 @@ public final class DownloadManager {
     }
   }
 
-  private static boolean isFinished(@DownloadState.State int state) {
-    return state == STATE_FAILED || state == STATE_COMPLETED || state == STATE_REMOVED;
-  }
-
   private static final class Download {
     private final DownloadManager downloadManager;
 
@@ -867,7 +885,6 @@ public final class DownloadManager {
     }
 
     public DownloadAction getAction() {
-      Assertions.checkState(state != STATE_REMOVED);
       return DownloadAction.createDownloadAction(
           downloadState.type,
           downloadState.uri,
@@ -897,7 +914,7 @@ public final class DownloadManager {
         }
       }
       if (oldDownloadState == downloadState) {
-        downloadManager.onDownloadStateChange(this, getUpdatedDownloadState());
+        downloadManager.onDownloadStateChangedInternal(this, getUpdatedDownloadState());
       }
     }
 
@@ -913,7 +930,7 @@ public final class DownloadManager {
         setState(STATE_STOPPED);
       }
       if (state == initialState) {
-        downloadManager.onDownloadStateChange(this, getUpdatedDownloadState());
+        downloadManager.onDownloadStateChangedInternal(this, getUpdatedDownloadState());
       }
     }
 
@@ -935,7 +952,7 @@ public final class DownloadManager {
     private void setState(@DownloadState.State int newState) {
       if (state != newState) {
         state = newState;
-        downloadManager.onDownloadStateChange(this, getUpdatedDownloadState());
+        downloadManager.onDownloadStateChangedInternal(this, getUpdatedDownloadState());
       }
     }
 
@@ -945,10 +962,10 @@ public final class DownloadManager {
       }
       if (isCanceled) {
         downloadManager.startDownloadThread(this);
+      } else if (state == STATE_REMOVING) {
+        downloadManager.onDownloadRemovedInternal(this, getUpdatedDownloadState());
       } else if (state == STATE_RESTARTING) {
         initialize(STATE_QUEUED);
-      } else if (state == STATE_REMOVING) {
-        setState(STATE_REMOVED);
       } else { // STATE_DOWNLOADING
         if (error != null) {
           Log.e(TAG, "Download failed: " + downloadState.id, error);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index aa85227839..f10793c5f4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -509,6 +509,15 @@ public abstract class DownloadService extends Service {
     // Do nothing.
   }
 
+  /**
+   * Called when a download is removed. The default implementation is a no-op.
+   *
+   * @param downloadState The last state of the download before it was removed.
+   */
+  protected void onDownloadRemoved(DownloadState downloadState) {
+    // Do nothing.
+  }
+
   private void notifyDownloadStateChange(DownloadState downloadState) {
     onDownloadStateChanged(downloadState);
     if (foregroundNotificationUpdater != null) {
@@ -522,6 +531,13 @@ public abstract class DownloadService extends Service {
     }
   }
 
+  private void notifyDownloadRemoved(DownloadState downloadState) {
+    onDownloadRemoved(downloadState);
+    if (foregroundNotificationUpdater != null) {
+      foregroundNotificationUpdater.update();
+    }
+  }
+
   private void stop() {
     if (foregroundNotificationUpdater != null) {
       foregroundNotificationUpdater.stopPeriodicUpdates();
@@ -642,6 +658,13 @@ public abstract class DownloadService extends Service {
       }
     }
 
+    @Override
+    public void onDownloadRemoved(DownloadManager downloadManager, DownloadState downloadState) {
+      if (downloadService != null) {
+        downloadService.notifyDownloadRemoved(downloadState);
+      }
+    }
+
     @Override
     public final void onIdle(DownloadManager downloadManager) {
       if (downloadService != null) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
index 1981bb19ae..251bcc1a45 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
@@ -34,8 +34,8 @@ public final class DownloadState {
 
   /**
    * Download states. One of {@link #STATE_QUEUED}, {@link #STATE_STOPPED}, {@link
-   * #STATE_DOWNLOADING}, {@link #STATE_COMPLETED}, {@link #STATE_FAILED}, {@link #STATE_REMOVING},
-   * {@link #STATE_REMOVED} or {@link #STATE_RESTARTING}.
+   * #STATE_DOWNLOADING}, {@link #STATE_COMPLETED}, {@link #STATE_FAILED}, {@link #STATE_REMOVING}
+   * or {@link #STATE_RESTARTING}.
    */
   @Documented
   @Retention(RetentionPolicy.SOURCE)
@@ -46,10 +46,10 @@ public final class DownloadState {
     STATE_COMPLETED,
     STATE_FAILED,
     STATE_REMOVING,
-    STATE_REMOVED,
     STATE_RESTARTING
   })
   public @interface State {}
+  // Important: These constants are persisted into DownloadIndex. Do not change them.
   /** The download is waiting to be started. */
   public static final int STATE_QUEUED = 0;
   /** The download is stopped. */
@@ -62,8 +62,6 @@ public final class DownloadState {
   public static final int STATE_FAILED = 4;
   /** The download is being removed. */
   public static final int STATE_REMOVING = 5;
-  /** The download is removed. */
-  public static final int STATE_REMOVED = 6;
   /** The download will restart after all downloaded data is removed. */
   public static final int STATE_RESTARTING = 7;
 
@@ -97,8 +95,6 @@ public final class DownloadState {
         return "FAILED";
       case STATE_REMOVING:
         return "REMOVING";
-      case STATE_REMOVED:
-        return "REMOVED";
       case STATE_RESTARTING:
         return "RESTARTING";
       default:
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index be1631304b..a6bdc89a97 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -565,10 +565,6 @@ public class DownloadManagerTest {
       return assertState(DownloadState.STATE_REMOVING);
     }
 
-    private TaskWrapper assertRemoved() {
-      return assertState(DownloadState.STATE_REMOVED);
-    }
-
     private TaskWrapper assertFailed() {
       return assertState(DownloadState.STATE_FAILED);
     }
@@ -586,6 +582,11 @@ public class DownloadManagerTest {
       return this;
     }
 
+    private TaskWrapper assertRemoved() {
+      downloadManagerListener.assertRemoved(taskId, ASSERT_TRUE_TIMEOUT);
+      return this;
+    }
+
     @Override
     public boolean equals(Object o) {
       if (this == o) {
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
index ad50e26038..855ce3107c 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
@@ -65,8 +65,7 @@ public final class DownloadNotificationHelper {
     boolean haveRemoveTasks = false;
     for (DownloadState downloadState : downloadStates) {
       if (downloadState.state == DownloadState.STATE_REMOVING
-          || downloadState.state == DownloadState.STATE_RESTARTING
-          || downloadState.state == DownloadState.STATE_REMOVED) {
+          || downloadState.state == DownloadState.STATE_RESTARTING) {
         haveRemoveTasks = true;
         continue;
       }
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
index 86b67e27c7..c594da06de 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
@@ -34,6 +34,7 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
 
   private static final int TIMEOUT = 1000;
   private static final int INITIALIZATION_TIMEOUT = 10000;
+  private static final int STATE_REMOVED = -1;
 
   private final DownloadManager downloadManager;
   private final DummyMainThread dummyMainThread;
@@ -79,6 +80,11 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
     getStateQueue(downloadState.id).add(downloadState.state);
   }
 
+  @Override
+  public void onDownloadRemoved(DownloadManager downloadManager, DownloadState downloadState) {
+    getStateQueue(downloadState.id).add(STATE_REMOVED);
+  }
+
   @Override
   public synchronized void onIdle(DownloadManager downloadManager) {
     if (downloadFinishedCondition != null) {
@@ -120,7 +126,15 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
     }
   }
 
+  public void assertRemoved(String taskId, int timeoutMs) {
+    assertStateInternal(taskId, STATE_REMOVED, timeoutMs);
+  }
+
   public void assertState(String taskId, @State int expectedState, int timeoutMs) {
+    assertStateInternal(taskId, expectedState, timeoutMs);
+  }
+
+  private void assertStateInternal(String taskId, int expectedState, int timeoutMs) {
     ArrayList<Integer> receivedStates = new ArrayList<>();
     while (true) {
       Integer state = null;
@@ -140,7 +154,12 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
           if (i > 0) {
             sb.append(',');
           }
-          sb.append(DownloadState.getStateString(receivedStates.get(i)));
+          int receivedState = receivedStates.get(i);
+          String receivedStateString =
+              receivedState == STATE_REMOVED
+                  ? "REMOVED"
+                  : DownloadState.getStateString(receivedState);
+          sb.append(receivedStateString);
         }
         fail(
             String.format(

From 66e416b61537ab7af0891c4ecb0b1674eacd7be3 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 8 Apr 2019 13:20:03 +0100
Subject: [PATCH 719/832] Fix bug when caching from non-zero position

The position should be subtracted from the total content length
retrieved from the cache in this case, both for iteration and for
filling out counters.contentLength (for the latter, note not
doing it this way is inconsistent with what happens when dataSpec
length is set to a known value).

PiperOrigin-RevId: 242445034
---
 .../exoplayer2/upstream/cache/CacheUtil.java  | 79 +++++++++++--------
 .../upstream/cache/CacheUtilTest.java         | 18 +++++
 2 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
index 96561260ed..f715da118b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
@@ -95,17 +95,21 @@ public final class CacheUtil {
       @Nullable CacheKeyFactory cacheKeyFactory,
       CachingCounters counters) {
     String key = buildCacheKey(dataSpec, cacheKeyFactory);
-    long start = dataSpec.absoluteStreamPosition;
-    long left =
-        dataSpec.length != C.LENGTH_UNSET
-            ? dataSpec.length
-            : ContentMetadata.getContentLength(cache.getContentMetadata(key));
-    counters.contentLength = left;
+    long position = dataSpec.absoluteStreamPosition;
+    long bytesLeft;
+    if (dataSpec.length != C.LENGTH_UNSET) {
+      bytesLeft = dataSpec.length;
+    } else {
+      long contentLength = ContentMetadata.getContentLength(cache.getContentMetadata(key));
+      bytesLeft = contentLength == C.LENGTH_UNSET ? C.LENGTH_UNSET : contentLength - position;
+    }
+    counters.contentLength = bytesLeft;
     counters.alreadyCachedBytes = 0;
     counters.newlyCachedBytes = 0;
-    while (left != 0) {
+    while (bytesLeft != 0) {
       long blockLength =
-          cache.getCachedLength(key, start, left != C.LENGTH_UNSET ? left : Long.MAX_VALUE);
+          cache.getCachedLength(
+              key, position, bytesLeft != C.LENGTH_UNSET ? bytesLeft : Long.MAX_VALUE);
       if (blockLength > 0) {
         counters.alreadyCachedBytes += blockLength;
       } else {
@@ -114,8 +118,8 @@ public final class CacheUtil {
           return;
         }
       }
-      start += blockLength;
-      left -= left == C.LENGTH_UNSET ? 0 : blockLength;
+      position += blockLength;
+      bytesLeft -= bytesLeft == C.LENGTH_UNSET ? 0 : blockLength;
     }
     counters.updatePercentage();
   }
@@ -203,15 +207,19 @@ public final class CacheUtil {
     }
 
     String key = buildCacheKey(dataSpec, cacheKeyFactory);
-    long start = dataSpec.absoluteStreamPosition;
-    long left =
-        dataSpec.length != C.LENGTH_UNSET
-            ? dataSpec.length
-            : ContentMetadata.getContentLength(cache.getContentMetadata(key));
-    while (left != 0) {
+    long position = dataSpec.absoluteStreamPosition;
+    long bytesLeft;
+    if (dataSpec.length != C.LENGTH_UNSET) {
+      bytesLeft = dataSpec.length;
+    } else {
+      long contentLength = ContentMetadata.getContentLength(cache.getContentMetadata(key));
+      bytesLeft = contentLength == C.LENGTH_UNSET ? C.LENGTH_UNSET : contentLength - position;
+    }
+    while (bytesLeft != 0) {
       throwExceptionIfInterruptedOrCancelled(isCanceled);
       long blockLength =
-          cache.getCachedLength(key, start, left != C.LENGTH_UNSET ? left : Long.MAX_VALUE);
+          cache.getCachedLength(
+              key, position, bytesLeft != C.LENGTH_UNSET ? bytesLeft : Long.MAX_VALUE);
       if (blockLength > 0) {
         // Skip already cached data.
       } else {
@@ -220,7 +228,7 @@ public final class CacheUtil {
         long read =
             readAndDiscard(
                 dataSpec,
-                start,
+                position,
                 blockLength,
                 dataSource,
                 buffer,
@@ -230,14 +238,14 @@ public final class CacheUtil {
                 isCanceled);
         if (read < blockLength) {
           // Reached to the end of the data.
-          if (enableEOFException && left != C.LENGTH_UNSET) {
+          if (enableEOFException && bytesLeft != C.LENGTH_UNSET) {
             throw new EOFException();
           }
           break;
         }
       }
-      start += blockLength;
-      left -= left == C.LENGTH_UNSET ? 0 : blockLength;
+      position += blockLength;
+      bytesLeft -= bytesLeft == C.LENGTH_UNSET ? 0 : blockLength;
     }
   }
 
@@ -269,6 +277,7 @@ public final class CacheUtil {
       CachingCounters counters,
       AtomicBoolean isCanceled)
       throws IOException, InterruptedException {
+    long positionOffset = absoluteStreamPosition - dataSpec.absoluteStreamPosition;
     while (true) {
       if (priorityTaskManager != null) {
         // Wait for any other thread with higher priority to finish its job.
@@ -284,31 +293,35 @@ public final class CacheUtil {
                 dataSpec.httpMethod,
                 dataSpec.httpBody,
                 absoluteStreamPosition,
-                dataSpec.position + absoluteStreamPosition - dataSpec.absoluteStreamPosition,
+                /* position= */ dataSpec.position + positionOffset,
                 C.LENGTH_UNSET,
                 dataSpec.key,
                 dataSpec.flags);
         long resolvedLength = dataSource.open(dataSpec);
         if (counters.contentLength == C.LENGTH_UNSET && resolvedLength != C.LENGTH_UNSET) {
-          counters.contentLength = dataSpec.absoluteStreamPosition + resolvedLength;
+          counters.contentLength = positionOffset + resolvedLength;
         }
-        long totalRead = 0;
-        while (totalRead != length) {
+        long totalBytesRead = 0;
+        while (totalBytesRead != length) {
           throwExceptionIfInterruptedOrCancelled(isCanceled);
-          int read = dataSource.read(buffer, 0,
-              length != C.LENGTH_UNSET ? (int) Math.min(buffer.length, length - totalRead)
-                  : buffer.length);
-          if (read == C.RESULT_END_OF_INPUT) {
+          int bytesRead =
+              dataSource.read(
+                  buffer,
+                  0,
+                  length != C.LENGTH_UNSET
+                      ? (int) Math.min(buffer.length, length - totalBytesRead)
+                      : buffer.length);
+          if (bytesRead == C.RESULT_END_OF_INPUT) {
             if (counters.contentLength == C.LENGTH_UNSET) {
-              counters.contentLength = dataSpec.absoluteStreamPosition + totalRead;
+              counters.contentLength = positionOffset + totalBytesRead;
             }
             break;
           }
-          totalRead += read;
-          counters.newlyCachedBytes += read;
+          totalBytesRead += bytesRead;
+          counters.newlyCachedBytes += bytesRead;
           counters.updatePercentage();
         }
-        return totalRead;
+        return totalBytesRead;
       } catch (PriorityTaskManager.PriorityTooLowException exception) {
         // catch and try again
       } finally {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
index 6b58e25444..ba06862385 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
@@ -176,6 +176,24 @@ public final class CacheUtilTest {
     assertCounters(counters, 300, 0, 1000);
   }
 
+  @Test
+  public void testGetCachedFromNonZeroPosition() throws Exception {
+    mockCache.contentLength = 1000;
+    mockCache.spansAndGaps = new int[] {100, 100, 200};
+    CachingCounters counters = new CachingCounters();
+    CacheUtil.getCached(
+        new DataSpec(
+            Uri.parse("test"),
+            /* absoluteStreamPosition= */ 100,
+            /* length= */ C.LENGTH_UNSET,
+            /* key= */ null),
+        mockCache,
+        /* cacheKeyFactory= */ null,
+        counters);
+
+    assertCounters(counters, 200, 0, 900);
+  }
+
   @Test
   public void testCache() throws Exception {
     FakeDataSet fakeDataSet = new FakeDataSet().setRandomData("test_data", 100);

From 2d7b9d876f8b01b26eaa97cad1ff68c58ba3d1cc Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 8 Apr 2019 14:00:25 +0100
Subject: [PATCH 720/832] Allow ContainerMediaChunks to provide their own
 TrackOutputProvider.

Adding a protected method for that allows to supply a customized
TrackOutputProvider to the ExtractorWrapper used by the ContainerMediaChunk
(e.g. for logging purposes).

The alternative would be to provide a  TrackOutputProvider through the
ChunkSampleStream constructor, but the extra initialization taking place
in the ChunkSampleStream constructor would need to move somewhere else and
some methods of BaseMediaChunkOutput would need to move to the
TrackOutputProvider interface. This seems too much effort for niche
customization case.

PiperOrigin-RevId: 242448776
---
 .../source/chunk/ContainerMediaChunk.java         | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ContainerMediaChunk.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ContainerMediaChunk.java
index 10b823d444..ba7c0d0d5b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ContainerMediaChunk.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ContainerMediaChunk.java
@@ -121,7 +121,7 @@ public class ContainerMediaChunk extends BaseMediaChunk {
         BaseMediaChunkOutput output = getOutput();
         output.setSampleOffsetUs(sampleOffsetUs);
         extractorWrapper.init(
-            output,
+            getTrackOutputProvider(output),
             clippedStartTimeUs == C.TIME_UNSET
                 ? C.TIME_UNSET
                 : (clippedStartTimeUs - sampleOffsetUs),
@@ -144,4 +144,17 @@ public class ContainerMediaChunk extends BaseMediaChunk {
     loadCompleted = true;
   }
 
+  /**
+   * Returns the {@link ChunkExtractorWrapper.TrackOutputProvider} to be used by the wrapped
+   * extractor.
+   *
+   * @param baseMediaChunkOutput The {@link BaseMediaChunkOutput} most recently passed to {@link
+   *     #init(BaseMediaChunkOutput)}.
+   * @return A {@link ChunkExtractorWrapper.TrackOutputProvider} to be used by the wrapped
+   *     extractor.
+   */
+  protected ChunkExtractorWrapper.TrackOutputProvider getTrackOutputProvider(
+      BaseMediaChunkOutput baseMediaChunkOutput) {
+    return baseMediaChunkOutput;
+  }
 }

From a6d52d4ae723e3ee87bd3a4bc25412c16fc22c05 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 8 Apr 2019 14:07:03 +0100
Subject: [PATCH 721/832] Update initial bitrate estimates.

PiperOrigin-RevId: 242449883
---
 .../upstream/DefaultBandwidthMeter.java       | 351 +++++++++---------
 1 file changed, 176 insertions(+), 175 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
index f3792b3f27..76515a98e6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
@@ -56,19 +56,19 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
 
   /** Default initial Wifi bitrate estimate in bits per second. */
   public static final long[] DEFAULT_INITIAL_BITRATE_ESTIMATES_WIFI =
-      new long[] {5_700_000, 3_400_000, 1_900_000, 1_000_000, 400_000};
+      new long[] {5_400_000, 3_400_000, 1_900_000, 1_100_000, 400_000};
 
   /** Default initial 2G bitrate estimates in bits per second. */
   public static final long[] DEFAULT_INITIAL_BITRATE_ESTIMATES_2G =
-      new long[] {169_000, 129_000, 114_000, 102_000, 87_000};
+      new long[] {170_000, 139_000, 122_000, 107_000, 90_000};
 
   /** Default initial 3G bitrate estimates in bits per second. */
   public static final long[] DEFAULT_INITIAL_BITRATE_ESTIMATES_3G =
-      new long[] {2_100_000, 1_300_000, 950_000, 700_000, 400_000};
+      new long[] {2_100_000, 1_300_000, 960_000, 770_000, 450_000};
 
   /** Default initial 4G bitrate estimates in bits per second. */
   public static final long[] DEFAULT_INITIAL_BITRATE_ESTIMATES_4G =
-      new long[] {6_900_000, 4_300_000, 2_700_000, 1_600_000, 450_000};
+      new long[] {6_000_000, 3_400_000, 2_100_000, 1_400_000, 570_000};
 
   /**
    * Default initial bitrate estimate used when the device is offline or the network type cannot be
@@ -473,246 +473,247 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
 
   private static Map<String, int[]> createInitialBitrateCountryGroupAssignment() {
     HashMap<String, int[]> countryGroupAssignment = new HashMap<>();
-    countryGroupAssignment.put("AD", new int[] {1, 0, 0, 0});
-    countryGroupAssignment.put("AE", new int[] {1, 3, 4, 4});
-    countryGroupAssignment.put("AF", new int[] {4, 4, 3, 2});
-    countryGroupAssignment.put("AG", new int[] {3, 2, 1, 2});
-    countryGroupAssignment.put("AI", new int[] {1, 0, 0, 2});
-    countryGroupAssignment.put("AL", new int[] {1, 1, 1, 1});
-    countryGroupAssignment.put("AM", new int[] {2, 2, 4, 3});
-    countryGroupAssignment.put("AO", new int[] {2, 4, 2, 0});
-    countryGroupAssignment.put("AR", new int[] {2, 3, 2, 3});
-    countryGroupAssignment.put("AS", new int[] {3, 4, 4, 1});
-    countryGroupAssignment.put("AT", new int[] {0, 1, 0, 0});
-    countryGroupAssignment.put("AU", new int[] {0, 3, 0, 0});
-    countryGroupAssignment.put("AW", new int[] {1, 1, 0, 4});
-    countryGroupAssignment.put("AX", new int[] {0, 1, 0, 0});
+    countryGroupAssignment.put("AD", new int[] {1, 0, 0, 1});
+    countryGroupAssignment.put("AE", new int[] {1, 4, 4, 4});
+    countryGroupAssignment.put("AF", new int[] {4, 4, 3, 3});
+    countryGroupAssignment.put("AG", new int[] {3, 2, 1, 1});
+    countryGroupAssignment.put("AI", new int[] {1, 0, 1, 3});
+    countryGroupAssignment.put("AL", new int[] {1, 2, 1, 1});
+    countryGroupAssignment.put("AM", new int[] {2, 2, 3, 2});
+    countryGroupAssignment.put("AO", new int[] {3, 4, 2, 0});
+    countryGroupAssignment.put("AQ", new int[] {4, 2, 2, 2});
+    countryGroupAssignment.put("AR", new int[] {2, 3, 2, 2});
+    countryGroupAssignment.put("AS", new int[] {3, 3, 4, 1});
+    countryGroupAssignment.put("AT", new int[] {0, 2, 0, 0});
+    countryGroupAssignment.put("AU", new int[] {0, 1, 1, 1});
+    countryGroupAssignment.put("AW", new int[] {1, 1, 0, 2});
+    countryGroupAssignment.put("AX", new int[] {0, 2, 1, 0});
     countryGroupAssignment.put("AZ", new int[] {3, 3, 2, 2});
     countryGroupAssignment.put("BA", new int[] {1, 1, 1, 2});
     countryGroupAssignment.put("BB", new int[] {0, 1, 0, 0});
-    countryGroupAssignment.put("BD", new int[] {2, 1, 3, 2});
-    countryGroupAssignment.put("BE", new int[] {0, 0, 0, 0});
-    countryGroupAssignment.put("BF", new int[] {4, 4, 4, 1});
-    countryGroupAssignment.put("BG", new int[] {0, 0, 0, 1});
+    countryGroupAssignment.put("BD", new int[] {2, 2, 3, 2});
+    countryGroupAssignment.put("BE", new int[] {0, 0, 0, 1});
+    countryGroupAssignment.put("BF", new int[] {4, 4, 3, 1});
+    countryGroupAssignment.put("BG", new int[] {0, 1, 0, 0});
     countryGroupAssignment.put("BH", new int[] {2, 1, 3, 4});
     countryGroupAssignment.put("BI", new int[] {4, 3, 4, 4});
-    countryGroupAssignment.put("BJ", new int[] {4, 3, 4, 3});
-    countryGroupAssignment.put("BL", new int[] {1, 0, 1, 2});
+    countryGroupAssignment.put("BJ", new int[] {4, 3, 4, 4});
+    countryGroupAssignment.put("BL", new int[] {1, 0, 2, 3});
     countryGroupAssignment.put("BM", new int[] {1, 0, 0, 0});
-    countryGroupAssignment.put("BN", new int[] {4, 3, 3, 3});
-    countryGroupAssignment.put("BO", new int[] {2, 2, 1, 2});
-    countryGroupAssignment.put("BQ", new int[] {1, 1, 2, 4});
-    countryGroupAssignment.put("BR", new int[] {2, 3, 2, 2});
-    countryGroupAssignment.put("BS", new int[] {1, 1, 0, 2});
+    countryGroupAssignment.put("BN", new int[] {4, 2, 3, 3});
+    countryGroupAssignment.put("BO", new int[] {2, 2, 3, 2});
+    countryGroupAssignment.put("BQ", new int[] {1, 0, 3, 4});
+    countryGroupAssignment.put("BR", new int[] {2, 3, 3, 2});
+    countryGroupAssignment.put("BS", new int[] {2, 0, 1, 4});
     countryGroupAssignment.put("BT", new int[] {3, 0, 2, 1});
-    countryGroupAssignment.put("BW", new int[] {4, 4, 2, 3});
-    countryGroupAssignment.put("BY", new int[] {1, 1, 1, 1});
-    countryGroupAssignment.put("BZ", new int[] {2, 3, 3, 1});
-    countryGroupAssignment.put("CA", new int[] {0, 2, 2, 3});
-    countryGroupAssignment.put("CD", new int[] {4, 4, 2, 1});
-    countryGroupAssignment.put("CF", new int[] {4, 4, 3, 3});
+    countryGroupAssignment.put("BW", new int[] {4, 4, 1, 2});
+    countryGroupAssignment.put("BY", new int[] {0, 1, 1, 2});
+    countryGroupAssignment.put("BZ", new int[] {2, 2, 3, 1});
+    countryGroupAssignment.put("CA", new int[] {0, 3, 3, 3});
+    countryGroupAssignment.put("CD", new int[] {4, 4, 3, 2});
+    countryGroupAssignment.put("CF", new int[] {4, 3, 3, 4});
     countryGroupAssignment.put("CG", new int[] {4, 4, 4, 4});
-    countryGroupAssignment.put("CH", new int[] {0, 0, 0, 0});
-    countryGroupAssignment.put("CI", new int[] {4, 4, 4, 4});
-    countryGroupAssignment.put("CK", new int[] {2, 4, 2, 0});
+    countryGroupAssignment.put("CH", new int[] {0, 0, 1, 1});
+    countryGroupAssignment.put("CI", new int[] {3, 4, 3, 3});
+    countryGroupAssignment.put("CK", new int[] {2, 4, 1, 0});
     countryGroupAssignment.put("CL", new int[] {2, 2, 2, 3});
-    countryGroupAssignment.put("CM", new int[] {3, 4, 3, 1});
-    countryGroupAssignment.put("CN", new int[] {2, 0, 1, 2});
-    countryGroupAssignment.put("CO", new int[] {2, 3, 2, 1});
+    countryGroupAssignment.put("CM", new int[] {3, 4, 2, 1});
+    countryGroupAssignment.put("CN", new int[] {2, 2, 2, 3});
+    countryGroupAssignment.put("CO", new int[] {2, 3, 2, 2});
     countryGroupAssignment.put("CR", new int[] {2, 2, 4, 4});
-    countryGroupAssignment.put("CU", new int[] {4, 4, 4, 1});
-    countryGroupAssignment.put("CV", new int[] {2, 2, 2, 4});
-    countryGroupAssignment.put("CW", new int[] {1, 1, 0, 0});
-    countryGroupAssignment.put("CX", new int[] {1, 2, 2, 2});
-    countryGroupAssignment.put("CY", new int[] {1, 1, 0, 0});
+    countryGroupAssignment.put("CU", new int[] {4, 4, 3, 1});
+    countryGroupAssignment.put("CV", new int[] {2, 3, 2, 4});
+    countryGroupAssignment.put("CW", new int[] {1, 0, 0, 0});
+    countryGroupAssignment.put("CX", new int[] {2, 2, 2, 2});
+    countryGroupAssignment.put("CY", new int[] {1, 1, 1, 1});
     countryGroupAssignment.put("CZ", new int[] {0, 1, 0, 0});
     countryGroupAssignment.put("DE", new int[] {0, 2, 2, 2});
-    countryGroupAssignment.put("DJ", new int[] {3, 4, 4, 0});
+    countryGroupAssignment.put("DJ", new int[] {3, 3, 4, 0});
     countryGroupAssignment.put("DK", new int[] {0, 0, 0, 0});
-    countryGroupAssignment.put("DM", new int[] {2, 0, 3, 4});
+    countryGroupAssignment.put("DM", new int[] {1, 0, 0, 3});
     countryGroupAssignment.put("DO", new int[] {3, 3, 4, 4});
     countryGroupAssignment.put("DZ", new int[] {3, 3, 4, 4});
-    countryGroupAssignment.put("EC", new int[] {2, 3, 3, 1});
+    countryGroupAssignment.put("EC", new int[] {2, 4, 4, 2});
     countryGroupAssignment.put("EE", new int[] {0, 0, 0, 0});
-    countryGroupAssignment.put("EG", new int[] {3, 3, 1, 1});
-    countryGroupAssignment.put("EH", new int[] {2, 0, 2, 3});
+    countryGroupAssignment.put("EG", new int[] {3, 4, 2, 2});
+    countryGroupAssignment.put("EH", new int[] {2, 0, 3, 3});
     countryGroupAssignment.put("ER", new int[] {4, 2, 2, 2});
-    countryGroupAssignment.put("ES", new int[] {0, 0, 1, 1});
+    countryGroupAssignment.put("ES", new int[] {0, 1, 1, 1});
     countryGroupAssignment.put("ET", new int[] {4, 4, 4, 0});
     countryGroupAssignment.put("FI", new int[] {0, 0, 1, 0});
-    countryGroupAssignment.put("FJ", new int[] {3, 2, 3, 3});
-    countryGroupAssignment.put("FK", new int[] {3, 4, 2, 1});
+    countryGroupAssignment.put("FJ", new int[] {3, 1, 3, 3});
+    countryGroupAssignment.put("FK", new int[] {4, 2, 2, 3});
     countryGroupAssignment.put("FM", new int[] {4, 2, 4, 0});
-    countryGroupAssignment.put("FO", new int[] {0, 0, 0, 1});
-    countryGroupAssignment.put("FR", new int[] {1, 0, 2, 1});
+    countryGroupAssignment.put("FO", new int[] {0, 0, 0, 0});
+    countryGroupAssignment.put("FR", new int[] {1, 0, 3, 1});
     countryGroupAssignment.put("GA", new int[] {3, 3, 2, 1});
-    countryGroupAssignment.put("GB", new int[] {0, 1, 3, 2});
-    countryGroupAssignment.put("GD", new int[] {2, 0, 3, 0});
+    countryGroupAssignment.put("GB", new int[] {0, 1, 3, 3});
+    countryGroupAssignment.put("GD", new int[] {2, 0, 4, 4});
     countryGroupAssignment.put("GE", new int[] {1, 1, 0, 3});
     countryGroupAssignment.put("GF", new int[] {1, 2, 4, 4});
-    countryGroupAssignment.put("GG", new int[] {0, 1, 0, 0});
-    countryGroupAssignment.put("GH", new int[] {3, 2, 2, 2});
+    countryGroupAssignment.put("GG", new int[] {0, 0, 0, 0});
+    countryGroupAssignment.put("GH", new int[] {3, 3, 3, 2});
     countryGroupAssignment.put("GI", new int[] {0, 0, 0, 1});
-    countryGroupAssignment.put("GL", new int[] {2, 4, 1, 4});
-    countryGroupAssignment.put("GM", new int[] {4, 3, 3, 0});
-    countryGroupAssignment.put("GN", new int[] {4, 4, 3, 4});
+    countryGroupAssignment.put("GL", new int[] {2, 2, 3, 4});
+    countryGroupAssignment.put("GM", new int[] {4, 3, 3, 2});
+    countryGroupAssignment.put("GN", new int[] {4, 4, 4, 0});
     countryGroupAssignment.put("GP", new int[] {2, 2, 1, 3});
-    countryGroupAssignment.put("GQ", new int[] {4, 4, 3, 1});
+    countryGroupAssignment.put("GQ", new int[] {4, 3, 3, 0});
     countryGroupAssignment.put("GR", new int[] {1, 1, 0, 1});
-    countryGroupAssignment.put("GT", new int[] {3, 2, 3, 4});
-    countryGroupAssignment.put("GU", new int[] {1, 0, 4, 4});
+    countryGroupAssignment.put("GT", new int[] {3, 3, 3, 4});
+    countryGroupAssignment.put("GU", new int[] {1, 2, 4, 4});
     countryGroupAssignment.put("GW", new int[] {4, 4, 4, 0});
     countryGroupAssignment.put("GY", new int[] {3, 4, 1, 0});
-    countryGroupAssignment.put("HK", new int[] {0, 2, 3, 4});
+    countryGroupAssignment.put("HK", new int[] {0, 1, 4, 4});
     countryGroupAssignment.put("HN", new int[] {3, 3, 2, 2});
     countryGroupAssignment.put("HR", new int[] {1, 0, 0, 2});
-    countryGroupAssignment.put("HT", new int[] {3, 3, 3, 3});
+    countryGroupAssignment.put("HT", new int[] {3, 4, 4, 3});
     countryGroupAssignment.put("HU", new int[] {0, 0, 1, 0});
-    countryGroupAssignment.put("ID", new int[] {2, 3, 3, 4});
-    countryGroupAssignment.put("IE", new int[] {0, 0, 1, 1});
-    countryGroupAssignment.put("IL", new int[] {0, 1, 1, 3});
-    countryGroupAssignment.put("IM", new int[] {0, 1, 0, 1});
-    countryGroupAssignment.put("IN", new int[] {2, 3, 3, 4});
-    countryGroupAssignment.put("IO", new int[] {4, 2, 2, 2});
-    countryGroupAssignment.put("IQ", new int[] {3, 3, 4, 3});
-    countryGroupAssignment.put("IR", new int[] {3, 2, 4, 4});
+    countryGroupAssignment.put("ID", new int[] {3, 2, 3, 4});
+    countryGroupAssignment.put("IE", new int[] {0, 0, 3, 2});
+    countryGroupAssignment.put("IL", new int[] {0, 1, 2, 3});
+    countryGroupAssignment.put("IM", new int[] {0, 0, 0, 1});
+    countryGroupAssignment.put("IN", new int[] {2, 2, 4, 4});
+    countryGroupAssignment.put("IO", new int[] {4, 4, 2, 2});
+    countryGroupAssignment.put("IQ", new int[] {3, 3, 4, 4});
+    countryGroupAssignment.put("IR", new int[] {1, 0, 1, 0});
     countryGroupAssignment.put("IS", new int[] {0, 0, 0, 0});
-    countryGroupAssignment.put("IT", new int[] {1, 0, 1, 3});
-    countryGroupAssignment.put("JE", new int[] {0, 0, 0, 1});
-    countryGroupAssignment.put("JM", new int[] {3, 3, 3, 2});
+    countryGroupAssignment.put("IT", new int[] {1, 0, 1, 1});
+    countryGroupAssignment.put("JE", new int[] {1, 0, 0, 1});
+    countryGroupAssignment.put("JM", new int[] {3, 2, 2, 1});
     countryGroupAssignment.put("JO", new int[] {1, 1, 1, 2});
-    countryGroupAssignment.put("JP", new int[] {0, 1, 1, 2});
+    countryGroupAssignment.put("JP", new int[] {0, 2, 2, 2});
     countryGroupAssignment.put("KE", new int[] {3, 3, 3, 3});
-    countryGroupAssignment.put("KG", new int[] {2, 2, 3, 3});
-    countryGroupAssignment.put("KH", new int[] {1, 0, 4, 4});
+    countryGroupAssignment.put("KG", new int[] {1, 1, 2, 3});
+    countryGroupAssignment.put("KH", new int[] {2, 0, 4, 4});
     countryGroupAssignment.put("KI", new int[] {4, 4, 4, 4});
-    countryGroupAssignment.put("KM", new int[] {4, 4, 2, 2});
-    countryGroupAssignment.put("KN", new int[] {1, 0, 1, 3});
-    countryGroupAssignment.put("KP", new int[] {1, 2, 2, 2});
-    countryGroupAssignment.put("KR", new int[] {0, 4, 0, 2});
-    countryGroupAssignment.put("KW", new int[] {1, 2, 1, 2});
+    countryGroupAssignment.put("KM", new int[] {4, 4, 3, 3});
+    countryGroupAssignment.put("KN", new int[] {1, 0, 1, 4});
+    countryGroupAssignment.put("KP", new int[] {1, 2, 0, 2});
+    countryGroupAssignment.put("KR", new int[] {0, 3, 0, 2});
+    countryGroupAssignment.put("KW", new int[] {2, 2, 1, 2});
     countryGroupAssignment.put("KY", new int[] {1, 1, 0, 2});
-    countryGroupAssignment.put("KZ", new int[] {1, 2, 2, 3});
-    countryGroupAssignment.put("LA", new int[] {3, 2, 2, 2});
+    countryGroupAssignment.put("KZ", new int[] {1, 2, 2, 2});
+    countryGroupAssignment.put("LA", new int[] {2, 1, 1, 0});
     countryGroupAssignment.put("LB", new int[] {3, 2, 0, 0});
-    countryGroupAssignment.put("LC", new int[] {2, 2, 1, 0});
-    countryGroupAssignment.put("LI", new int[] {0, 0, 1, 2});
+    countryGroupAssignment.put("LC", new int[] {2, 1, 0, 0});
+    countryGroupAssignment.put("LI", new int[] {0, 0, 2, 2});
     countryGroupAssignment.put("LK", new int[] {1, 1, 2, 2});
-    countryGroupAssignment.put("LR", new int[] {3, 4, 3, 1});
+    countryGroupAssignment.put("LR", new int[] {3, 4, 4, 1});
     countryGroupAssignment.put("LS", new int[] {3, 3, 2, 0});
-    countryGroupAssignment.put("LT", new int[] {0, 0, 0, 1});
-    countryGroupAssignment.put("LU", new int[] {0, 0, 1, 0});
+    countryGroupAssignment.put("LT", new int[] {0, 0, 0, 0});
+    countryGroupAssignment.put("LU", new int[] {0, 1, 0, 0});
     countryGroupAssignment.put("LV", new int[] {0, 0, 0, 0});
-    countryGroupAssignment.put("LY", new int[] {4, 4, 4, 4});
+    countryGroupAssignment.put("LY", new int[] {4, 3, 4, 4});
     countryGroupAssignment.put("MA", new int[] {2, 1, 2, 2});
     countryGroupAssignment.put("MC", new int[] {1, 0, 1, 0});
     countryGroupAssignment.put("MD", new int[] {1, 1, 0, 0});
     countryGroupAssignment.put("ME", new int[] {1, 2, 2, 3});
-    countryGroupAssignment.put("MF", new int[] {1, 4, 3, 3});
-    countryGroupAssignment.put("MG", new int[] {3, 4, 1, 2});
+    countryGroupAssignment.put("MF", new int[] {1, 4, 2, 1});
+    countryGroupAssignment.put("MG", new int[] {3, 4, 1, 3});
     countryGroupAssignment.put("MH", new int[] {4, 0, 2, 3});
-    countryGroupAssignment.put("MK", new int[] {1, 0, 0, 1});
-    countryGroupAssignment.put("ML", new int[] {4, 4, 4, 4});
+    countryGroupAssignment.put("MK", new int[] {1, 0, 0, 0});
+    countryGroupAssignment.put("ML", new int[] {4, 4, 4, 3});
     countryGroupAssignment.put("MM", new int[] {2, 3, 1, 2});
-    countryGroupAssignment.put("MN", new int[] {2, 2, 2, 4});
-    countryGroupAssignment.put("MO", new int[] {0, 1, 4, 4});
-    countryGroupAssignment.put("MP", new int[] {0, 0, 4, 4});
+    countryGroupAssignment.put("MN", new int[] {2, 3, 2, 4});
+    countryGroupAssignment.put("MO", new int[] {0, 0, 4, 4});
+    countryGroupAssignment.put("MP", new int[] {0, 2, 4, 4});
     countryGroupAssignment.put("MQ", new int[] {1, 1, 1, 3});
-    countryGroupAssignment.put("MR", new int[] {4, 2, 4, 2});
-    countryGroupAssignment.put("MS", new int[] {1, 2, 1, 2});
-    countryGroupAssignment.put("MT", new int[] {0, 0, 0, 0});
-    countryGroupAssignment.put("MU", new int[] {2, 2, 4, 4});
-    countryGroupAssignment.put("MV", new int[] {4, 2, 0, 1});
-    countryGroupAssignment.put("MW", new int[] {3, 2, 1, 1});
-    countryGroupAssignment.put("MX", new int[] {2, 4, 3, 1});
-    countryGroupAssignment.put("MY", new int[] {2, 3, 3, 3});
-    countryGroupAssignment.put("MZ", new int[] {3, 3, 2, 4});
-    countryGroupAssignment.put("NA", new int[] {4, 2, 1, 1});
-    countryGroupAssignment.put("NC", new int[] {2, 1, 3, 3});
-    countryGroupAssignment.put("NE", new int[] {4, 4, 4, 4});
-    countryGroupAssignment.put("NF", new int[] {0, 2, 2, 2});
-    countryGroupAssignment.put("NG", new int[] {3, 4, 2, 2});
-    countryGroupAssignment.put("NI", new int[] {3, 4, 3, 3});
-    countryGroupAssignment.put("NL", new int[] {0, 1, 3, 2});
-    countryGroupAssignment.put("NO", new int[] {0, 0, 1, 0});
-    countryGroupAssignment.put("NP", new int[] {2, 3, 2, 2});
-    countryGroupAssignment.put("NR", new int[] {4, 3, 4, 1});
-    countryGroupAssignment.put("NU", new int[] {4, 2, 2, 2});
+    countryGroupAssignment.put("MR", new int[] {4, 4, 4, 4});
+    countryGroupAssignment.put("MS", new int[] {1, 4, 0, 3});
+    countryGroupAssignment.put("MT", new int[] {0, 1, 0, 0});
+    countryGroupAssignment.put("MU", new int[] {2, 2, 3, 4});
+    countryGroupAssignment.put("MV", new int[] {3, 2, 1, 1});
+    countryGroupAssignment.put("MW", new int[] {4, 2, 1, 1});
+    countryGroupAssignment.put("MX", new int[] {2, 4, 3, 2});
+    countryGroupAssignment.put("MY", new int[] {2, 2, 2, 3});
+    countryGroupAssignment.put("MZ", new int[] {3, 4, 2, 2});
+    countryGroupAssignment.put("NA", new int[] {3, 2, 2, 1});
+    countryGroupAssignment.put("NC", new int[] {2, 1, 3, 2});
+    countryGroupAssignment.put("NE", new int[] {4, 4, 4, 3});
+    countryGroupAssignment.put("NF", new int[] {1, 2, 2, 2});
+    countryGroupAssignment.put("NG", new int[] {3, 4, 3, 2});
+    countryGroupAssignment.put("NI", new int[] {3, 3, 3, 4});
+    countryGroupAssignment.put("NL", new int[] {0, 2, 4, 3});
+    countryGroupAssignment.put("NO", new int[] {0, 1, 0, 0});
+    countryGroupAssignment.put("NP", new int[] {3, 3, 2, 2});
+    countryGroupAssignment.put("NR", new int[] {4, 0, 4, 0});
+    countryGroupAssignment.put("NU", new int[] {2, 2, 2, 1});
     countryGroupAssignment.put("NZ", new int[] {0, 0, 0, 1});
     countryGroupAssignment.put("OM", new int[] {2, 2, 1, 3});
-    countryGroupAssignment.put("PA", new int[] {1, 3, 2, 3});
-    countryGroupAssignment.put("PE", new int[] {2, 2, 4, 4});
-    countryGroupAssignment.put("PF", new int[] {2, 2, 0, 1});
-    countryGroupAssignment.put("PG", new int[] {4, 4, 4, 4});
+    countryGroupAssignment.put("PA", new int[] {1, 3, 3, 4});
+    countryGroupAssignment.put("PE", new int[] {2, 3, 4, 4});
+    countryGroupAssignment.put("PF", new int[] {3, 1, 0, 1});
+    countryGroupAssignment.put("PG", new int[] {4, 3, 1, 1});
     countryGroupAssignment.put("PH", new int[] {3, 0, 4, 4});
     countryGroupAssignment.put("PK", new int[] {3, 3, 3, 3});
-    countryGroupAssignment.put("PL", new int[] {1, 0, 1, 3});
-    countryGroupAssignment.put("PM", new int[] {0, 2, 2, 3});
-    countryGroupAssignment.put("PR", new int[] {2, 3, 4, 3});
-    countryGroupAssignment.put("PS", new int[] {2, 3, 0, 4});
-    countryGroupAssignment.put("PT", new int[] {1, 1, 1, 1});
-    countryGroupAssignment.put("PW", new int[] {3, 2, 3, 0});
-    countryGroupAssignment.put("PY", new int[] {2, 1, 3, 3});
-    countryGroupAssignment.put("QA", new int[] {2, 3, 1, 2});
-    countryGroupAssignment.put("RE", new int[] {1, 1, 2, 2});
-    countryGroupAssignment.put("RO", new int[] {0, 1, 1, 3});
-    countryGroupAssignment.put("RS", new int[] {1, 1, 0, 0});
+    countryGroupAssignment.put("PL", new int[] {1, 1, 1, 3});
+    countryGroupAssignment.put("PM", new int[] {0, 2, 0, 0});
+    countryGroupAssignment.put("PR", new int[] {2, 1, 3, 3});
+    countryGroupAssignment.put("PS", new int[] {3, 3, 1, 4});
+    countryGroupAssignment.put("PT", new int[] {1, 1, 0, 1});
+    countryGroupAssignment.put("PW", new int[] {2, 2, 1, 1});
+    countryGroupAssignment.put("PY", new int[] {3, 1, 3, 3});
+    countryGroupAssignment.put("QA", new int[] {2, 3, 0, 1});
+    countryGroupAssignment.put("RE", new int[] {1, 0, 2, 2});
+    countryGroupAssignment.put("RO", new int[] {0, 1, 1, 2});
+    countryGroupAssignment.put("RS", new int[] {1, 2, 0, 0});
     countryGroupAssignment.put("RU", new int[] {0, 1, 1, 1});
-    countryGroupAssignment.put("RW", new int[] {3, 4, 3, 1});
-    countryGroupAssignment.put("SA", new int[] {3, 2, 2, 3});
+    countryGroupAssignment.put("RW", new int[] {3, 4, 2, 4});
+    countryGroupAssignment.put("SA", new int[] {2, 2, 1, 2});
     countryGroupAssignment.put("SB", new int[] {4, 4, 3, 0});
     countryGroupAssignment.put("SC", new int[] {4, 2, 0, 1});
-    countryGroupAssignment.put("SD", new int[] {3, 4, 4, 4});
-    countryGroupAssignment.put("SE", new int[] {0, 0, 0, 0});
+    countryGroupAssignment.put("SD", new int[] {4, 4, 4, 2});
+    countryGroupAssignment.put("SE", new int[] {0, 1, 0, 0});
     countryGroupAssignment.put("SG", new int[] {1, 2, 3, 3});
-    countryGroupAssignment.put("SH", new int[] {4, 2, 2, 2});
-    countryGroupAssignment.put("SI", new int[] {0, 1, 0, 0});
-    countryGroupAssignment.put("SJ", new int[] {3, 2, 0, 2});
+    countryGroupAssignment.put("SH", new int[] {4, 4, 2, 3});
+    countryGroupAssignment.put("SI", new int[] {0, 1, 0, 1});
+    countryGroupAssignment.put("SJ", new int[] {0, 0, 2, 0});
     countryGroupAssignment.put("SK", new int[] {0, 1, 0, 1});
     countryGroupAssignment.put("SL", new int[] {4, 3, 2, 4});
-    countryGroupAssignment.put("SM", new int[] {1, 0, 1, 1});
-    countryGroupAssignment.put("SN", new int[] {4, 4, 4, 2});
-    countryGroupAssignment.put("SO", new int[] {4, 4, 4, 3});
-    countryGroupAssignment.put("SR", new int[] {3, 2, 2, 3});
-    countryGroupAssignment.put("SS", new int[] {4, 3, 4, 2});
-    countryGroupAssignment.put("ST", new int[] {3, 2, 2, 2});
-    countryGroupAssignment.put("SV", new int[] {2, 3, 2, 3});
-    countryGroupAssignment.put("SX", new int[] {2, 4, 2, 0});
-    countryGroupAssignment.put("SY", new int[] {4, 4, 2, 0});
-    countryGroupAssignment.put("SZ", new int[] {3, 4, 1, 1});
-    countryGroupAssignment.put("TC", new int[] {2, 1, 2, 1});
+    countryGroupAssignment.put("SM", new int[] {0, 0, 1, 3});
+    countryGroupAssignment.put("SN", new int[] {4, 4, 4, 3});
+    countryGroupAssignment.put("SO", new int[] {4, 4, 4, 4});
+    countryGroupAssignment.put("SR", new int[] {3, 2, 2, 4});
+    countryGroupAssignment.put("SS", new int[] {4, 2, 4, 2});
+    countryGroupAssignment.put("ST", new int[] {3, 4, 2, 2});
+    countryGroupAssignment.put("SV", new int[] {2, 3, 3, 4});
+    countryGroupAssignment.put("SX", new int[] {2, 4, 1, 0});
+    countryGroupAssignment.put("SY", new int[] {4, 4, 1, 0});
+    countryGroupAssignment.put("SZ", new int[] {3, 4, 2, 3});
+    countryGroupAssignment.put("TC", new int[] {1, 1, 3, 1});
     countryGroupAssignment.put("TD", new int[] {4, 4, 4, 3});
-    countryGroupAssignment.put("TG", new int[] {3, 2, 2, 0});
+    countryGroupAssignment.put("TG", new int[] {3, 3, 1, 0});
     countryGroupAssignment.put("TH", new int[] {1, 3, 4, 4});
     countryGroupAssignment.put("TJ", new int[] {4, 4, 4, 4});
     countryGroupAssignment.put("TL", new int[] {4, 2, 4, 4});
-    countryGroupAssignment.put("TM", new int[] {4, 1, 3, 3});
-    countryGroupAssignment.put("TN", new int[] {2, 2, 1, 2});
-    countryGroupAssignment.put("TO", new int[] {2, 3, 3, 1});
-    countryGroupAssignment.put("TR", new int[] {1, 2, 0, 2});
-    countryGroupAssignment.put("TT", new int[] {2, 1, 1, 0});
+    countryGroupAssignment.put("TM", new int[] {4, 1, 2, 3});
+    countryGroupAssignment.put("TN", new int[] {2, 1, 1, 1});
+    countryGroupAssignment.put("TO", new int[] {3, 3, 3, 1});
+    countryGroupAssignment.put("TR", new int[] {1, 2, 0, 1});
+    countryGroupAssignment.put("TT", new int[] {2, 3, 1, 2});
     countryGroupAssignment.put("TV", new int[] {4, 2, 2, 4});
     countryGroupAssignment.put("TW", new int[] {0, 0, 0, 1});
-    countryGroupAssignment.put("TZ", new int[] {3, 3, 3, 2});
-    countryGroupAssignment.put("UA", new int[] {0, 2, 1, 3});
-    countryGroupAssignment.put("UG", new int[] {4, 3, 2, 2});
+    countryGroupAssignment.put("TZ", new int[] {3, 3, 4, 3});
+    countryGroupAssignment.put("UA", new int[] {0, 2, 1, 2});
+    countryGroupAssignment.put("UG", new int[] {4, 3, 2, 3});
     countryGroupAssignment.put("US", new int[] {0, 1, 3, 3});
-    countryGroupAssignment.put("UY", new int[] {2, 1, 2, 2});
-    countryGroupAssignment.put("UZ", new int[] {4, 3, 2, 4});
+    countryGroupAssignment.put("UY", new int[] {2, 2, 2, 2});
+    countryGroupAssignment.put("UZ", new int[] {3, 2, 2, 2});
     countryGroupAssignment.put("VA", new int[] {1, 2, 2, 2});
-    countryGroupAssignment.put("VC", new int[] {2, 0, 3, 2});
-    countryGroupAssignment.put("VE", new int[] {3, 4, 4, 3});
-    countryGroupAssignment.put("VG", new int[] {3, 1, 3, 4});
+    countryGroupAssignment.put("VC", new int[] {2, 1, 0, 0});
+    countryGroupAssignment.put("VE", new int[] {4, 4, 4, 3});
+    countryGroupAssignment.put("VG", new int[] {2, 1, 1, 2});
     countryGroupAssignment.put("VI", new int[] {1, 0, 2, 4});
     countryGroupAssignment.put("VN", new int[] {0, 2, 4, 4});
-    countryGroupAssignment.put("VU", new int[] {4, 1, 3, 2});
-    countryGroupAssignment.put("WS", new int[] {3, 2, 3, 0});
+    countryGroupAssignment.put("VU", new int[] {4, 1, 3, 1});
+    countryGroupAssignment.put("WS", new int[] {3, 2, 3, 1});
     countryGroupAssignment.put("XK", new int[] {1, 2, 1, 0});
     countryGroupAssignment.put("YE", new int[] {4, 4, 4, 2});
-    countryGroupAssignment.put("YT", new int[] {3, 1, 1, 2});
-    countryGroupAssignment.put("ZA", new int[] {2, 3, 1, 2});
-    countryGroupAssignment.put("ZM", new int[] {3, 3, 3, 1});
-    countryGroupAssignment.put("ZW", new int[] {3, 3, 2, 1});
+    countryGroupAssignment.put("YT", new int[] {2, 0, 2, 3});
+    countryGroupAssignment.put("ZA", new int[] {2, 3, 2, 2});
+    countryGroupAssignment.put("ZM", new int[] {3, 3, 2, 1});
+    countryGroupAssignment.put("ZW", new int[] {3, 3, 3, 1});
     return Collections.unmodifiableMap(countryGroupAssignment);
   }
 }

From baf00406c029a9129d98127a1a137ad40e0870c0 Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Mon, 8 Apr 2019 14:34:57 +0100
Subject: [PATCH 722/832] Provide option to include next/prev button in lock
 screen/compact mode.

Issue: #5616
PiperOrigin-RevId: 242452686
---
 RELEASENOTES.md                               |  2 +
 .../ui/PlayerNotificationManager.java         | 48 +++++++++++++++++--
 2 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index a853690e0f..3783c6c63d 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -74,6 +74,8 @@
   `PlayerNotificationManager` has been fixed. Apps using
   `DownloadNotificationUtil` should switch to using
   `DownloadNotificationHelper`.
+* Provide flag to include next/prev buttons in compact mode of a notification
+  ([#5616](https://github.com/google/ExoPlayer/issues/5616)).
 * Move creation of dialogs for `TrackSelectionView`s to
   `TrackSelectionDialogBuilder` and add option to select multiple overrides.
 * MediaSessionConnector: Let apps intercept media button events
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
index 828b206f44..71271dae81 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
@@ -47,6 +47,7 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -74,6 +75,12 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
  *         <li>Corresponding setter: {@link #setUseNavigationActions(boolean)}
  *         <li>Default: {@code true}
  *       </ul>
+ *   <li><b>{@code useNavigationActionsInCompactView}</b> - Sets whether the navigation previous and
+ *       next actions should are displayed in compact view (including the lock screen notification).
+ *       <ul>
+ *         <li>Corresponding setter: {@link #setUseNavigationActionsInCompactView(boolean)}
+ *         <li>Default: {@code false}
+ *       </ul>
  *   <li><b>{@code usePlayPauseActions}</b> - Sets whether the play and pause actions are displayed.
  *       <ul>
  *         <li>Corresponding setter: {@link #setUsePlayPauseActions(boolean)}
@@ -362,6 +369,7 @@ public class PlayerNotificationManager {
   @Nullable private NotificationListener notificationListener;
   @Nullable private MediaSessionCompat.Token mediaSessionToken;
   private boolean useNavigationActions;
+  private boolean useNavigationActionsInCompactView;
   private boolean usePlayPauseActions;
   private boolean useStopAction;
   private long fastForwardMs;
@@ -687,6 +695,23 @@ public class PlayerNotificationManager {
     }
   }
 
+  /**
+   * Sets whether navigation actions should be displayed in compact view.
+   *
+   * <p>If {@link #useNavigationActions} is set to {@code false} navigation actions are displayed
+   * neither in compact nor in full view mode of the notification.
+   *
+   * @param useNavigationActionsInCompactView Whether the navigation actions should be displayed in
+   *     compact view.
+   */
+  public final void setUseNavigationActionsInCompactView(
+      boolean useNavigationActionsInCompactView) {
+    if (this.useNavigationActionsInCompactView != useNavigationActionsInCompactView) {
+      this.useNavigationActionsInCompactView = useNavigationActionsInCompactView;
+      invalidate();
+    }
+  }
+
   /**
    * Sets whether the play and pause actions should be used.
    *
@@ -1096,9 +1121,26 @@ public class PlayerNotificationManager {
   protected int[] getActionIndicesForCompactView(List<String> actionNames, Player player) {
     int pauseActionIndex = actionNames.indexOf(ACTION_PAUSE);
     int playActionIndex = actionNames.indexOf(ACTION_PLAY);
-    return pauseActionIndex != -1
-        ? new int[] {pauseActionIndex}
-        : (playActionIndex != -1 ? new int[] {playActionIndex} : new int[0]);
+    int skipPreviousActionIndex =
+        useNavigationActionsInCompactView ? actionNames.indexOf(ACTION_PREVIOUS) : -1;
+    int skipNextActionIndex =
+        useNavigationActionsInCompactView ? actionNames.indexOf(ACTION_NEXT) : -1;
+
+    int[] actionIndices = new int[3];
+    int actionCounter = 0;
+    if (skipPreviousActionIndex != -1) {
+      actionIndices[actionCounter++] = skipPreviousActionIndex;
+    }
+    boolean playWhenReady = player.getPlayWhenReady();
+    if (pauseActionIndex != -1 && playWhenReady) {
+      actionIndices[actionCounter++] = pauseActionIndex;
+    } else if (playActionIndex != -1 && !playWhenReady) {
+      actionIndices[actionCounter++] = playActionIndex;
+    }
+    if (skipNextActionIndex != -1) {
+      actionIndices[actionCounter++] = skipNextActionIndex;
+    }
+    return Arrays.copyOf(actionIndices, actionCounter);
   }
 
   /** Returns whether the generated notification should be ongoing. */

From 401e20d9c8caf5f96e4ff2651cd14f46f1c35517 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 8 Apr 2019 14:46:02 +0100
Subject: [PATCH 723/832] Signal fallback via renderer constructor

Remove MediaCodecSelector.DEFAULT_WITH_FALLBACK, as codec selectors
will need to be able to return a list of decoder infos even when not
using fallback in a later change. Instead signal that fallback should
be used via a renderer constructor.

Fallback is always disabled for audio.

PiperOrigin-RevId: 242454172
---
 RELEASENOTES.md                               |  3 ++
 .../audio/MediaCodecAudioRenderer.java        |  1 +
 .../mediacodec/MediaCodecRenderer.java        | 17 +++++-
 .../mediacodec/MediaCodecSelector.java        | 27 ----------
 .../video/MediaCodecVideoRenderer.java        | 54 +++++++++++++++++--
 5 files changed, 70 insertions(+), 32 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 3783c6c63d..8ef7be083d 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -102,6 +102,9 @@
   ([#5698](https://github.com/google/ExoPlayer/issues/5698),
   [#5694](https://github.com/google/ExoPlayer/issues/5694)).
 * Move `PriorityTaskManager` from `DefaultLoadControl` to `SimpleExoPlayer`.
+* Remove `MediaCodecSelector.DEFAULT_WITH_FALLBACK`. Apps should instead signal
+  that fallback should be used by passing `true` as the `enableDecoderFallback`
+  parameter when instantiating the video renderer.
 
 ### 2.9.6 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
index 3d46496eed..0982bc8862 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
@@ -250,6 +250,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
         mediaCodecSelector,
         drmSessionManager,
         playClearSamplesWithoutKeys,
+        /* enableDecoderFallback= */ false,
         /* assumedMinimumCodecOperatingRate= */ 44100);
     this.context = context.getApplicationContext();
     this.audioSink = audioSink;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index 3040fc74bb..bbf1134b7f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -53,6 +53,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.nio.ByteBuffer;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -289,6 +290,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   private final MediaCodecSelector mediaCodecSelector;
   @Nullable private final DrmSessionManager<FrameworkMediaCrypto> drmSessionManager;
   private final boolean playClearSamplesWithoutKeys;
+  private final boolean enableDecoderFallback;
   private final float assumedMinimumCodecOperatingRate;
   private final DecoderInputBuffer buffer;
   private final DecoderInputBuffer flagsOnlyBuffer;
@@ -354,6 +356,9 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
    *     begin in parallel with key acquisition. This parameter specifies whether the renderer is
    *     permitted to play clear regions of encrypted media files before {@code drmSessionManager}
    *     has obtained the keys necessary to decrypt encrypted regions of the media.
+   * @param enableDecoderFallback Whether to enable fallback to lower-priority decoders if decoder
+   *     initialization fails. This may result in using a decoder that is less efficient or slower
+   *     than the primary decoder.
    * @param assumedMinimumCodecOperatingRate A codec operating rate that all codecs instantiated by
    *     this renderer are assumed to meet implicitly (i.e. without the operating rate being set
    *     explicitly using {@link MediaFormat#KEY_OPERATING_RATE}).
@@ -363,11 +368,13 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
       MediaCodecSelector mediaCodecSelector,
       @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
       boolean playClearSamplesWithoutKeys,
+      boolean enableDecoderFallback,
       float assumedMinimumCodecOperatingRate) {
     super(trackType);
     this.mediaCodecSelector = Assertions.checkNotNull(mediaCodecSelector);
     this.drmSessionManager = drmSessionManager;
     this.playClearSamplesWithoutKeys = playClearSamplesWithoutKeys;
+    this.enableDecoderFallback = enableDecoderFallback;
     this.assumedMinimumCodecOperatingRate = assumedMinimumCodecOperatingRate;
     buffer = new DecoderInputBuffer(DecoderInputBuffer.BUFFER_REPLACEMENT_MODE_DISABLED);
     flagsOnlyBuffer = DecoderInputBuffer.newFlagsOnlyInstance();
@@ -735,8 +742,14 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
       throws DecoderInitializationException {
     if (availableCodecInfos == null) {
       try {
-        availableCodecInfos =
-            new ArrayDeque<>(getAvailableCodecInfos(mediaCryptoRequiresSecureDecoder));
+        List<MediaCodecInfo> allAvailableCodecInfos =
+            getAvailableCodecInfos(mediaCryptoRequiresSecureDecoder);
+        if (enableDecoderFallback) {
+          availableCodecInfos = new ArrayDeque<>(allAvailableCodecInfos);
+        } else {
+          availableCodecInfos =
+              new ArrayDeque<>(Collections.singletonList(allAvailableCodecInfos.get(0)));
+        }
         preferredDecoderInitializationException = null;
       } catch (DecoderQueryException e) {
         throw new DecoderInitializationException(
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecSelector.java
index 496d015b58..a5cbb77342 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecSelector.java
@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.mediacodec;
 import android.media.MediaCodec;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.mediacodec.MediaCodecUtil.DecoderQueryException;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -31,32 +30,6 @@ public interface MediaCodecSelector {
    * the given format.
    */
   MediaCodecSelector DEFAULT =
-      new MediaCodecSelector() {
-        @Override
-        public List<MediaCodecInfo> getDecoderInfos(String mimeType, boolean requiresSecureDecoder)
-            throws DecoderQueryException {
-          List<MediaCodecInfo> decoderInfos =
-              MediaCodecUtil.getDecoderInfos(mimeType, requiresSecureDecoder);
-          return decoderInfos.isEmpty()
-              ? Collections.emptyList()
-              : Collections.singletonList(decoderInfos.get(0));
-        }
-
-        @Override
-        public @Nullable MediaCodecInfo getPassthroughDecoderInfo() throws DecoderQueryException {
-          return MediaCodecUtil.getPassthroughDecoderInfo();
-        }
-      };
-
-  /**
-   * A {@link MediaCodecSelector} that returns a list of decoders in priority order, allowing
-   * fallback to less preferred decoders if initialization fails.
-   *
-   * <p>Note: if a hardware-accelerated video decoder fails to initialize, this selector may provide
-   * a software video decoder to use as a fallback. Using software decoding can be inefficient, and
-   * the decoder may be too slow to keep up with the playback position.
-   */
-  MediaCodecSelector DEFAULT_WITH_FALLBACK =
       new MediaCodecSelector() {
         @Override
         public List<MediaCodecInfo> getDecoderInfos(String mimeType, boolean requiresSecureDecoder)
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index 9c16fa6380..f26bc29aec 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -210,16 +210,64 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
    * @param maxDroppedFramesToNotify The maximum number of frames that can be dropped between
    *     invocations of {@link VideoRendererEventListener#onDroppedFrames(int, long)}.
    */
-  public MediaCodecVideoRenderer(Context context, MediaCodecSelector mediaCodecSelector,
+  public MediaCodecVideoRenderer(
+      Context context,
+      MediaCodecSelector mediaCodecSelector,
       long allowedJoiningTimeMs,
       @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
-      boolean playClearSamplesWithoutKeys, @Nullable Handler eventHandler,
-      @Nullable VideoRendererEventListener eventListener, int maxDroppedFramesToNotify) {
+      boolean playClearSamplesWithoutKeys,
+      @Nullable Handler eventHandler,
+      @Nullable VideoRendererEventListener eventListener,
+      int maxDroppedFramesToNotify) {
+    this(
+        context,
+        mediaCodecSelector,
+        allowedJoiningTimeMs,
+        drmSessionManager,
+        playClearSamplesWithoutKeys,
+        /* enableDecoderFallback= */ false,
+        eventHandler,
+        eventListener,
+        maxDroppedFramesToNotify);
+  }
+
+  /**
+   * @param context A context.
+   * @param mediaCodecSelector A decoder selector.
+   * @param allowedJoiningTimeMs The maximum duration in milliseconds for which this video renderer
+   *     can attempt to seamlessly join an ongoing playback.
+   * @param drmSessionManager For use with encrypted content. May be null if support for encrypted
+   *     content is not required.
+   * @param playClearSamplesWithoutKeys Encrypted media may contain clear (un-encrypted) regions.
+   *     For example a media file may start with a short clear region so as to allow playback to
+   *     begin in parallel with key acquisition. This parameter specifies whether the renderer is
+   *     permitted to play clear regions of encrypted media files before {@code drmSessionManager}
+   *     has obtained the keys necessary to decrypt encrypted regions of the media.
+   * @param enableDecoderFallback Whether to enable fallback to lower-priority decoders if decoder
+   *     initialization fails. This may result in using a decoder that is slower/less efficient than
+   *     the primary decoder.
+   * @param eventHandler A handler to use when delivering events to {@code eventListener}. May be
+   *     null if delivery of events is not required.
+   * @param eventListener A listener of events. May be null if delivery of events is not required.
+   * @param maxDroppedFramesToNotify The maximum number of frames that can be dropped between
+   *     invocations of {@link VideoRendererEventListener#onDroppedFrames(int, long)}.
+   */
+  public MediaCodecVideoRenderer(
+      Context context,
+      MediaCodecSelector mediaCodecSelector,
+      long allowedJoiningTimeMs,
+      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
+      boolean playClearSamplesWithoutKeys,
+      boolean enableDecoderFallback,
+      @Nullable Handler eventHandler,
+      @Nullable VideoRendererEventListener eventListener,
+      int maxDroppedFramesToNotify) {
     super(
         C.TRACK_TYPE_VIDEO,
         mediaCodecSelector,
         drmSessionManager,
         playClearSamplesWithoutKeys,
+        enableDecoderFallback,
         /* assumedMinimumCodecOperatingRate= */ 30);
     this.allowedJoiningTimeMs = allowedJoiningTimeMs;
     this.maxDroppedFramesToNotify = maxDroppedFramesToNotify;

From 47601980d95d7748c053cfd9bb6abcd6e8240591 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 8 Apr 2019 15:15:11 +0100
Subject: [PATCH 724/832] Use DownloadAction.id properly

- Fix ID being dropped when DownloadAction is serialized and
  de-serialized as it's passed to DownloadService
- Properly set DownloadAction.id when building an action from
  a DownloadState
- Make ID a required constructor argument. Else it's too easy
  to not propagate it by accident.

PiperOrigin-RevId: 242457831
---
 .../exoplayer2/offline/DownloadAction.java    | 30 +++++--------------
 .../exoplayer2/offline/DownloadHelper.java    |  6 ++--
 .../exoplayer2/offline/DownloadManager.java   |  1 +
 .../exoplayer2/offline/ActionFileTest.java    |  2 +-
 .../offline/DefaultDownloaderFactoryTest.java |  1 +
 .../offline/DownloadActionTest.java           | 27 ++++++++++-------
 .../offline/DownloadIndexUtilTest.java        |  5 ++++
 .../exoplayer2/offline/DownloadStateTest.java |  3 ++
 .../dash/offline/DashDownloaderTest.java      |  1 +
 .../dash/offline/DownloadManagerDashTest.java |  7 ++++-
 .../dash/offline/DownloadServiceDashTest.java |  7 ++++-
 .../source/hls/offline/HlsDownloaderTest.java |  1 +
 .../offline/SsDownloaderTest.java             |  1 +
 13 files changed, 54 insertions(+), 38 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
index daba0b0d54..0998ef1865 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
@@ -45,7 +45,7 @@ public final class DownloadAction {
   /** Type for SmoothStreaming downloads. */
   public static final String TYPE_SS = "ss";
 
-  private static final int VERSION = 2;
+  private static final int VERSION = 3;
 
   /**
    * Deserializes an action from the {@code data}.
@@ -78,25 +78,6 @@ public final class DownloadAction {
     return readFromStream(new DataInputStream(input));
   }
 
-  /**
-   * Creates a DASH download action.
-   *
-   * @param type The type of the action.
-   * @param uri The URI of the media to be downloaded.
-   * @param keys Keys of streams to be downloaded. If empty, all streams will be downloaded.
-   * @param customCacheKey A custom key for cache indexing, or null.
-   * @param data Optional custom data for this action. If {@code null} an empty array will be used.
-   */
-  public static DownloadAction createDownloadAction(
-      String type,
-      Uri uri,
-      List<StreamKey> keys,
-      @Nullable String customCacheKey,
-      @Nullable byte[] data) {
-    return createDownloadAction(
-        generateId(uri, customCacheKey), type, uri, keys, customCacheKey, data);
-  }
-
   /**
    * Creates a DASH download action.
    *
@@ -224,6 +205,7 @@ public final class DownloadAction {
     if (customCacheKey != null) {
       dataOutputStream.writeUTF(customCacheKey);
     }
+    dataOutputStream.writeUTF(id);
     dataOutputStream.flush();
   }
 
@@ -261,15 +243,17 @@ public final class DownloadAction {
       customCacheKey = input.readBoolean() ? input.readUTF() : null;
     }
 
+    // Serialized version 0, 1 and 2 did not contain an id.
+    String id = version < 3 ? generateId(uri, customCacheKey) : input.readUTF();
+
     if (isRemoveAction) {
       // Remove actions are not supported anymore.
       throw new UnsupportedActionException();
     }
-    return new DownloadAction(
-        generateId(uri, customCacheKey), type, uri, keys, customCacheKey, data);
+    return new DownloadAction(id, type, uri, keys, customCacheKey, data);
   }
 
-  private static String generateId(Uri uri, @Nullable String customCacheKey) {
+  /* package */ static String generateId(Uri uri, @Nullable String customCacheKey) {
     return customCacheKey != null ? customCacheKey : uri.toString();
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index ccaec105ca..72893f17b0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -584,9 +584,10 @@ public final class DownloadHelper {
    * @return The built {@link DownloadAction}.
    */
   public DownloadAction getDownloadAction(@Nullable byte[] data) {
+    String downloadId = uri.toString();
     if (mediaSource == null) {
       return DownloadAction.createDownloadAction(
-          downloadType, uri, /* keys= */ Collections.emptyList(), cacheKey, data);
+          downloadId, downloadType, uri, /* keys= */ Collections.emptyList(), cacheKey, data);
     }
     assertPreparedWithMedia();
     List<StreamKey> streamKeys = new ArrayList<>();
@@ -600,7 +601,8 @@ public final class DownloadHelper {
       }
       streamKeys.addAll(mediaPreparer.mediaPeriods[periodIndex].getStreamKeys(allSelections));
     }
-    return DownloadAction.createDownloadAction(downloadType, uri, streamKeys, cacheKey, data);
+    return DownloadAction.createDownloadAction(
+        downloadId, downloadType, uri, streamKeys, cacheKey, data);
   }
 
   // Initialization of array of Lists.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 27370c37e2..463697d15f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -886,6 +886,7 @@ public final class DownloadManager {
 
     public DownloadAction getAction() {
       return DownloadAction.createDownloadAction(
+          downloadState.id,
           downloadState.type,
           downloadState.uri,
           Arrays.asList(downloadState.streamKeys),
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
index 4f82bdb09c..9d1a6093fc 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
@@ -171,6 +171,6 @@ public class ActionFileTest {
 
   private static DownloadAction buildAction(String type, Uri uri, byte[] data) {
     return DownloadAction.createDownloadAction(
-        type, uri, /* keys= */ Collections.emptyList(), /* customCacheKey= */ null, data);
+        "id", type, uri, /* keys= */ Collections.emptyList(), /* customCacheKey= */ null, data);
   }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactoryTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactoryTest.java
index 21152c3341..c13e69aa01 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactoryTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactoryTest.java
@@ -39,6 +39,7 @@ public final class DefaultDownloaderFactoryTest {
     Downloader downloader =
         factory.createDownloader(
             DownloadAction.createDownloadAction(
+                "id",
                 DownloadAction.TYPE_PROGRESSIVE,
                 Uri.parse("https://www.test.com/download"),
                 /* keys= */ Collections.emptyList(),
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
index eb40d2a1a1..2bc6d0809e 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
@@ -84,13 +84,6 @@ public class DownloadActionTest {
     assertThat(action1.id.equals(action2.id)).isTrue();
   }
 
-  @Test
-  public void testDifferentCacheKeyDifferentUri_hasDifferentId() {
-    DownloadAction action1 = createAction(uri1, "key123");
-    DownloadAction action2 = createAction(uri2, "key456");
-    assertThat(action1.id.equals(action2.id)).isFalse();
-  }
-
   @SuppressWarnings("EqualsWithItself")
   @Test
   public void testEquals() {
@@ -130,6 +123,7 @@ public class DownloadActionTest {
   public void testSerializerWriteRead() throws Exception {
     assertStreamSerializationRoundTrip(
         DownloadAction.createDownloadAction(
+            "id",
             TYPE_DASH,
             uri1,
             toList(new StreamKey(0, 1, 2), new StreamKey(3, 4, 5)),
@@ -142,6 +136,7 @@ public class DownloadActionTest {
   public void testArraySerialization() throws Exception {
     assertArraySerializationRoundTrip(
         DownloadAction.createDownloadAction(
+            "id",
             TYPE_DASH,
             uri1,
             toList(new StreamKey(0, 1, 2), new StreamKey(3, 4, 5)),
@@ -152,10 +147,12 @@ public class DownloadActionTest {
 
   @Test
   public void testSerializerProgressiveVersion0() throws Exception {
+    String customCacheKey = "key123";
+    String expectedId = DownloadAction.generateId(uri1, customCacheKey);
     assertDeserialization(
         "progressive-download-v0",
         DownloadAction.createDownloadAction(
-            TYPE_PROGRESSIVE, uri1, Collections.emptyList(), "key123", data));
+            expectedId, TYPE_PROGRESSIVE, uri1, Collections.emptyList(), customCacheKey, data));
     assertUnsupportedAction("progressive-remove-v0");
   }
 
@@ -164,6 +161,7 @@ public class DownloadActionTest {
     assertDeserialization(
         "dash-download-v0",
         DownloadAction.createDownloadAction(
+            uri1.toString(),
             TYPE_DASH,
             uri1,
             toList(new StreamKey(0, 1, 2), new StreamKey(3, 4, 5)),
@@ -177,6 +175,7 @@ public class DownloadActionTest {
     assertDeserialization(
         "hls-download-v0",
         DownloadAction.createDownloadAction(
+            uri1.toString(),
             TYPE_HLS,
             uri1,
             toList(new StreamKey(0, 1), new StreamKey(2, 3)),
@@ -190,6 +189,7 @@ public class DownloadActionTest {
     assertDeserialization(
         "hls-download-v1",
         DownloadAction.createDownloadAction(
+            uri1.toString(),
             TYPE_HLS,
             uri1,
             toList(new StreamKey(0, 1, 2), new StreamKey(3, 4, 5)),
@@ -203,6 +203,7 @@ public class DownloadActionTest {
     assertDeserialization(
         "ss-download-v0",
         DownloadAction.createDownloadAction(
+            uri1.toString(),
             TYPE_SS,
             uri1,
             toList(new StreamKey(0, 1), new StreamKey(2, 3)),
@@ -216,6 +217,7 @@ public class DownloadActionTest {
     assertDeserialization(
         "ss-download-v1",
         DownloadAction.createDownloadAction(
+            uri1.toString(),
             TYPE_SS,
             uri1,
             toList(new StreamKey(0, 1, 2), new StreamKey(3, 4, 5)),
@@ -226,12 +228,17 @@ public class DownloadActionTest {
 
   private DownloadAction createAction(Uri uri, StreamKey... keys) {
     return DownloadAction.createDownloadAction(
-        TYPE_DASH, uri, toList(keys), /* customCacheKey= */ null, data);
+        uri.toString(), TYPE_DASH, uri, toList(keys), /* customCacheKey= */ null, data);
   }
 
   private DownloadAction createAction(Uri uri, @Nullable String customCacheKey) {
     return DownloadAction.createDownloadAction(
-        DownloadAction.TYPE_DASH, uri, Collections.emptyList(), customCacheKey, /* data= */ null);
+        "id",
+        DownloadAction.TYPE_DASH,
+        uri,
+        Collections.emptyList(),
+        customCacheKey,
+        /* data= */ null);
   }
 
   private static void assertNotEqual(DownloadAction action1, DownloadAction action2) {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
index 2237f5feb2..3f4b3f7798 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
@@ -58,6 +58,7 @@ public class DownloadIndexUtilTest {
     byte[] data = new byte[] {1, 2, 3, 4};
     DownloadAction action =
         DownloadAction.createDownloadAction(
+            "id",
             TYPE_DASH,
             Uri.parse("https://www.test.com/download"),
             asList(
@@ -79,6 +80,7 @@ public class DownloadIndexUtilTest {
         new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 1, /* trackIndex= */ 2);
     DownloadAction action1 =
         DownloadAction.createDownloadAction(
+            "id",
             TYPE_DASH,
             Uri.parse("https://www.test.com/download1"),
             asList(streamKey1),
@@ -86,6 +88,7 @@ public class DownloadIndexUtilTest {
             new byte[] {1, 2, 3, 4});
     DownloadAction action2 =
         DownloadAction.createDownloadAction(
+            "id",
             TYPE_DASH,
             Uri.parse("https://www.test.com/download2"),
             asList(streamKey2),
@@ -114,6 +117,7 @@ public class DownloadIndexUtilTest {
         new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 1, /* trackIndex= */ 2);
     DownloadAction action1 =
         DownloadAction.createDownloadAction(
+            "id1",
             TYPE_DASH,
             Uri.parse("https://www.test.com/download1"),
             asList(streamKey1),
@@ -121,6 +125,7 @@ public class DownloadIndexUtilTest {
             new byte[] {1, 2, 3, 4});
     DownloadAction action2 =
         DownloadAction.createDownloadAction(
+            "id2",
             TYPE_DASH,
             Uri.parse("https://www.test.com/download2"),
             asList(streamKey2),
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
index 48bf894a60..a073f44cbe 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
@@ -100,6 +100,7 @@ public class DownloadStateTest {
   public void mergeAction_actionHaveDifferentData_downloadStateDataIsUpdated() {
     DownloadAction downloadAction =
         DownloadAction.createDownloadAction(
+            "id",
             DownloadAction.TYPE_DASH,
             testUri,
             Collections.emptyList(),
@@ -246,6 +247,7 @@ public class DownloadStateTest {
       StreamKey[] keys1, StreamKey[] keys2, StreamKey[] expectedKeys) {
     DownloadAction downloadAction =
         DownloadAction.createDownloadAction(
+            "id",
             DownloadAction.TYPE_DASH,
             testUri,
             Arrays.asList(keys2),
@@ -290,6 +292,7 @@ public class DownloadStateTest {
 
   private DownloadAction createDownloadAction() {
     return DownloadAction.createDownloadAction(
+        "id",
         DownloadAction.TYPE_DASH,
         testUri,
         Collections.emptyList(),
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
index fb7a19ba34..dc112c631d 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
@@ -85,6 +85,7 @@ public class DashDownloaderTest {
     Downloader downloader =
         factory.createDownloader(
             DownloadAction.createDownloadAction(
+                "id",
                 DownloadAction.TYPE_DASH,
                 Uri.parse("https://www.test.com/download"),
                 Collections.singletonList(new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0)),
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
index 1e970e42c3..201b41c9b0 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
@@ -233,7 +233,12 @@ public class DownloadManagerDashTest {
     Collections.addAll(keysList, keys);
     DownloadAction action =
         DownloadAction.createDownloadAction(
-            DownloadAction.TYPE_DASH, TEST_MPD_URI, keysList, /* customCacheKey= */ null, null);
+            TEST_ID,
+            DownloadAction.TYPE_DASH,
+            TEST_MPD_URI,
+            keysList,
+            /* customCacheKey= */ null,
+            null);
     downloadManager.addDownload(action);
   }
 
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
index fa560eb644..c06e6aee20 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
@@ -209,7 +209,12 @@ public class DownloadServiceDashTest {
     Collections.addAll(keysList, keys);
     DownloadAction action =
         DownloadAction.createDownloadAction(
-            DownloadAction.TYPE_DASH, TEST_MPD_URI, keysList, /* customCacheKey= */ null, null);
+            TEST_ID,
+            DownloadAction.TYPE_DASH,
+            TEST_MPD_URI,
+            keysList,
+            /* customCacheKey= */ null,
+            null);
     dummyMainThread.runOnMainThread(
         () -> {
           Intent startIntent =
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
index 728f2d1dcd..e591146ca3 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
@@ -102,6 +102,7 @@ public class HlsDownloaderTest {
     Downloader downloader =
         factory.createDownloader(
             DownloadAction.createDownloadAction(
+                "id",
                 DownloadAction.TYPE_HLS,
                 Uri.parse("https://www.test.com/download"),
                 Collections.singletonList(new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0)),
diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java
index e0304c1864..510fa522f0 100644
--- a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java
+++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java
@@ -45,6 +45,7 @@ public final class SsDownloaderTest {
     Downloader downloader =
         factory.createDownloader(
             DownloadAction.createDownloadAction(
+                "id",
                 DownloadAction.TYPE_SS,
                 Uri.parse("https://www.test.com/download"),
                 Collections.singletonList(new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0)),

From 8b766ba4b8a8ac1eeaf853877372efbab87e95d4 Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Mon, 8 Apr 2019 15:31:36 +0100
Subject: [PATCH 725/832] Use FLAG_UPDATE_CURRENT for PendingIntents of
 playback commands.

ISSUE: #5734
PiperOrigin-RevId: 242459668
---
 .../google/android/exoplayer2/ui/PlayerNotificationManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
index 71271dae81..1dbd696b12 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
@@ -1265,7 +1265,7 @@ public class PlayerNotificationManager {
     Intent intent = new Intent(action).setPackage(context.getPackageName());
     intent.putExtra(EXTRA_INSTANCE_ID, instanceId);
     return PendingIntent.getBroadcast(
-        context, instanceId, intent, PendingIntent.FLAG_CANCEL_CURRENT);
+        context, instanceId, intent, PendingIntent.FLAG_UPDATE_CURRENT);
   }
 
   @SuppressWarnings("nullness:argument.type.incompatible")

From a0c21461aaa8823a101f753bc465e4696a4578a1 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 8 Apr 2019 15:40:49 +0100
Subject: [PATCH 726/832] Ensure getAllDownloadStates order is stable

HashMap.values does not guarantee a stable order, but our tests
assert that the order is stable. It's probably a nice property
that the order is the same as that in which downloads are added,
so this change makes the order stable, with that order.

A future change will likely improve the way this works, by
changing the internal thread "downloads" variable to have type
ArrayList<Download>, at which point the internal thread can just
pass a read-only copy of its list to the main thread whenever a
state changes.

PiperOrigin-RevId: 242460725
---
 .../exoplayer2/offline/DownloadManager.java   | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 463697d15f..9c9c75d71f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -162,7 +162,7 @@ public final class DownloadManager {
 
   // Collections that are accessed on the main thread.
   private final CopyOnWriteArraySet<Listener> listeners;
-  private final HashMap<String, DownloadState> downloadStates;
+  private final ArrayList<DownloadState> downloadStates;
 
   // Collections that are accessed on the internal thread.
   private final ArrayList<Download> downloads;
@@ -249,7 +249,7 @@ public final class DownloadManager {
 
     manualStopReason = MANUAL_STOP_REASON_UNDEFINED;
     downloads = new ArrayList<>();
-    downloadStates = new HashMap<>();
+    downloadStates = new ArrayList<>();
     activeDownloads = new HashMap<>();
     listeners = new CopyOnWriteArraySet<>();
     releaseLock = new Object();
@@ -292,7 +292,7 @@ public final class DownloadManager {
 
   /** Returns the states of all current downloads. */
   public DownloadState[] getAllDownloadStates() {
-    return downloadStates.values().toArray(new DownloadState[0]);
+    return downloadStates.toArray(new DownloadState[0]);
   }
 
   /** Returns the requirements needed to be met to start downloads. */
@@ -497,20 +497,22 @@ public final class DownloadManager {
   // allows updating idle at the same point as the downloads that can be queried changes.
   private void onInitialized(List<DownloadState> downloadStates) {
     initialized = true;
-    for (int i = 0; i < downloadStates.size(); i++) {
-      DownloadState downloadState = downloadStates.get(i);
-      this.downloadStates.put(downloadState.id, downloadState);
-    }
+    this.downloadStates.addAll(downloadStates);
     for (Listener listener : listeners) {
       listener.onInitialized(DownloadManager.this);
     }
   }
 
   private void onDownloadStateChanged(DownloadState downloadState) {
+    int downloadStateIndex = getDownloadStateIndex(downloadState.id);
     if (downloadState.state == STATE_COMPLETED || downloadState.state == STATE_FAILED) {
-      downloadStates.remove(downloadState.id);
+      if (downloadStateIndex != C.INDEX_UNSET) {
+        downloadStates.remove(downloadStateIndex);
+      }
+    } else if (downloadStateIndex != C.INDEX_UNSET) {
+      downloadStates.set(downloadStateIndex, downloadState);
     } else {
-      downloadStates.put(downloadState.id, downloadState);
+      downloadStates.add(downloadState);
     }
     for (Listener listener : listeners) {
       listener.onDownloadStateChanged(this, downloadState);
@@ -518,7 +520,7 @@ public final class DownloadManager {
   }
 
   private void onDownloadRemoved(DownloadState downloadState) {
-    downloadStates.remove(downloadState.id);
+    downloadStates.remove(getDownloadStateIndex(downloadState.id));
     for (Listener listener : listeners) {
       listener.onDownloadRemoved(this, downloadState);
     }
@@ -534,6 +536,15 @@ public final class DownloadManager {
     }
   }
 
+  private int getDownloadStateIndex(String id) {
+    for (int i = 0; i < downloadStates.size(); i++) {
+      if (downloadStates.get(i).id.equals(id)) {
+        return i;
+      }
+    }
+    return C.INDEX_UNSET;
+  }
+
   // Internal thread message handling.
 
   private boolean handleInternalMessage(Message message) {

From e7d717b96c8530fb7d78b09304e44e262a050859 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 8 Apr 2019 15:41:20 +0100
Subject: [PATCH 727/832] Sanitize naming of keys variable.

PiperOrigin-RevId: 242460786
---
 .../offline/DefaultDownloaderFactory.java     |  2 +-
 .../exoplayer2/offline/DownloadAction.java    | 48 ++++++++-----------
 .../exoplayer2/offline/DownloadState.java     |  6 +--
 .../offline/DownloadHelperTest.java           |  2 +-
 .../offline/DownloadIndexUtilTest.java        |  3 +-
 .../offline/DownloadManagerTest.java          |  2 +-
 .../offline/DownloadStateBuilder.java         |  2 +-
 7 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java
index db8090c22e..03421dfdff 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java
@@ -99,7 +99,7 @@ public class DefaultDownloaderFactory implements DownloaderFactory {
     }
     try {
       // TODO: Support customCacheKey in DASH/HLS/SS, for completeness.
-      return constructor.newInstance(action.uri, action.getKeys(), downloaderConstructorHelper);
+      return constructor.newInstance(action.uri, action.streamKeys, downloaderConstructorHelper);
     } catch (Exception e) {
       throw new RuntimeException("Failed to instantiate downloader for: " + action.type, e);
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
index 0998ef1865..32f36d051d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
@@ -48,7 +48,7 @@ public final class DownloadAction {
   private static final int VERSION = 3;
 
   /**
-   * Deserializes an action from the {@code data}.
+   * Deserializes a download action from the {@code data}.
    *
    * @param data The action data to deserialize.
    * @return The deserialized action.
@@ -62,10 +62,7 @@ public final class DownloadAction {
   }
 
   /**
-   * Deserializes one action that was serialized with {@link #serializeToStream(OutputStream)} from
-   * the {@code input}.
-   *
-   * <p>The caller is responsible for closing the given {@link InputStream}.
+   * Deserializes a single download action from {@code input}.
    *
    * @param input The stream from which to read.
    * @return The deserialized action.
@@ -104,35 +101,35 @@ public final class DownloadAction {
   public final String type;
   /** The uri being downloaded. */
   public final Uri uri;
-  /** Keys of streams to be downloaded. If empty, all streams will be downloaded. */
-  public final List<StreamKey> keys;
-  /** A custom key for cache indexing, or null. */
+  /** Stream keys to be downloaded. If empty, all streams will be downloaded. */
+  public final List<StreamKey> streamKeys;
+  /** Custom key for cache indexing, or null. */
   @Nullable public final String customCacheKey;
-  /** Custom data for this action. May be empty. */
+  /** Application defined data associated with the download. May be empty. */
   public final byte[] data;
 
   /**
-   * @param id The content id.
-   * @param type The type of the action.
-   * @param uri The uri being downloaded.
-   * @param keys Keys of streams to be downloaded. If empty, all streams will be downloaded.
-   * @param customCacheKey A custom key for cache indexing, or null.
-   * @param data Custom data for this action.
+   * @param id See {@link #id}.
+   * @param type See {@link #type}.
+   * @param uri See {@link #uri}.
+   * @param streamKeys See {@link #streamKeys}.
+   * @param customCacheKey See {@link #customCacheKey}.
+   * @param data See {@link #data}.
    */
   private DownloadAction(
       String id,
       String type,
       Uri uri,
-      List<StreamKey> keys,
+      List<StreamKey> streamKeys,
       @Nullable String customCacheKey,
       @Nullable byte[] data) {
     this.id = id;
     this.type = type;
     this.uri = uri;
     this.customCacheKey = customCacheKey;
-    ArrayList<StreamKey> mutableKeys = new ArrayList<>(keys);
+    ArrayList<StreamKey> mutableKeys = new ArrayList<>(streamKeys);
     Collections.sort(mutableKeys);
-    this.keys = Collections.unmodifiableList(mutableKeys);
+    this.streamKeys = Collections.unmodifiableList(mutableKeys);
     this.data = data != null ? Arrays.copyOf(data, data.length) : Util.EMPTY_BYTE_ARRAY;
   }
 
@@ -148,11 +145,6 @@ public final class DownloadAction {
     return output.toByteArray();
   }
 
-  /** Returns keys of streams to be downloaded. */
-  public List<StreamKey> getKeys() {
-    return keys;
-  }
-
   @Override
   public boolean equals(@Nullable Object o) {
     if (!(o instanceof DownloadAction)) {
@@ -162,7 +154,7 @@ public final class DownloadAction {
     return id.equals(that.id)
         && type.equals(that.type)
         && uri.equals(that.uri)
-        && keys.equals(that.keys)
+        && streamKeys.equals(that.streamKeys)
         && Util.areEqual(customCacheKey, that.customCacheKey)
         && Arrays.equals(data, that.data);
   }
@@ -172,7 +164,7 @@ public final class DownloadAction {
     int result = type.hashCode();
     result = 31 * result + id.hashCode();
     result = 31 * result + uri.hashCode();
-    result = 31 * result + keys.hashCode();
+    result = 31 * result + streamKeys.hashCode();
     result = 31 * result + (customCacheKey != null ? customCacheKey.hashCode() : 0);
     result = 31 * result + Arrays.hashCode(data);
     return result;
@@ -194,9 +186,9 @@ public final class DownloadAction {
     dataOutputStream.writeBoolean(false);
     dataOutputStream.writeInt(data.length);
     dataOutputStream.write(data);
-    dataOutputStream.writeInt(keys.size());
-    for (int i = 0; i < keys.size(); i++) {
-      StreamKey key = keys.get(i);
+    dataOutputStream.writeInt(streamKeys.size());
+    for (int i = 0; i < streamKeys.size(); i++) {
+      StreamKey key = streamKeys.get(i);
       dataOutputStream.writeInt(key.periodIndex);
       dataOutputStream.writeInt(key.groupIndex);
       dataOutputStream.writeInt(key.trackIndex);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
index 251bcc1a45..c98f1dcf39 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
@@ -165,7 +165,7 @@ public final class DownloadState {
         /* manualStopReason= */ 0,
         /* startTimeMs= */ currentTimeMs,
         /* updateTimeMs= */ currentTimeMs,
-        action.keys.toArray(new StreamKey[0]),
+        action.streamKeys.toArray(new StreamKey[0]),
         action.data,
         new CachingCounters());
   }
@@ -289,10 +289,10 @@ public final class DownloadState {
   private static StreamKey[] mergeStreamKeys(DownloadState downloadState, DownloadAction action) {
     StreamKey[] streamKeys = downloadState.streamKeys;
     if (streamKeys.length > 0) {
-      if (action.keys.isEmpty()) {
+      if (action.streamKeys.isEmpty()) {
         streamKeys = new StreamKey[0];
       } else {
-        HashSet<StreamKey> keys = new HashSet<>(action.keys);
+        HashSet<StreamKey> keys = new HashSet<>(action.streamKeys);
         Collections.addAll(keys, downloadState.streamKeys);
         streamKeys = keys.toArray(new StreamKey[0]);
       }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
index ae4816a80d..737bcec183 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
@@ -398,7 +398,7 @@ public class DownloadHelperTest {
     assertThat(downloadAction.uri).isEqualTo(testUri);
     assertThat(downloadAction.customCacheKey).isEqualTo(TEST_CACHE_KEY);
     assertThat(downloadAction.data).isEqualTo(data);
-    assertThat(downloadAction.keys)
+    assertThat(downloadAction.streamKeys)
         .containsExactly(
             new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 0, /* trackIndex= */ 0),
             new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 0, /* trackIndex= */ 1),
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
index 3f4b3f7798..b752d83bf0 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
@@ -147,7 +147,8 @@ public class DownloadIndexUtilTest {
     assertThat(downloadState.cacheKey).isEqualTo(action.customCacheKey);
     assertThat(downloadState.customMetadata).isEqualTo(action.data);
     assertThat(downloadState.uri).isEqualTo(action.uri);
-    assertThat(Arrays.asList(downloadState.streamKeys)).containsExactlyElementsIn(action.keys);
+    assertThat(Arrays.asList(downloadState.streamKeys))
+        .containsExactlyElementsIn(action.streamKeys);
     assertThat(downloadState.state).isEqualTo(state);
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index a6bdc89a97..2c1dd233d3 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -249,7 +249,7 @@ public class DownloadManagerTest {
 
     FakeDownloader downloader2 = runner.getDownloader(1);
     downloader2.assertStarted();
-    assertThat(downloader2.action.keys).containsExactly(streamKey1, streamKey2);
+    assertThat(downloader2.action.streamKeys).containsExactly(streamKey1, streamKey2);
     downloader2.unblock();
 
     runner.getTask().assertCompleted();
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
index 084071cf7a..d536fd8176 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
@@ -52,7 +52,7 @@ class DownloadStateBuilder {
         action.uri,
         action.customCacheKey,
         action.data,
-        action.keys.toArray(new StreamKey[0]));
+        action.streamKeys.toArray(new StreamKey[0]));
   }
 
   DownloadStateBuilder(

From 9a03e73b7a6f0d80f48e5f3b5d35d839192db502 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 8 Apr 2019 16:13:46 +0100
Subject: [PATCH 728/832] Remove ActionFile serialization, which is no longer
 used

PiperOrigin-RevId: 242465135
---
 .../exoplayer2/offline/ActionFile.java        |  27 +---
 ...action_file_for_download_index_upgrade.exi | Bin 0 -> 161 bytes
 .../offline/action_file_incomplete_header.exi | Bin 0 -> 4 bytes
 .../assets/offline/action_file_no_data.exi    |   0
 .../assets/offline/action_file_one_action.exi | Bin 0 -> 69 bytes
 .../offline/action_file_two_actions.exi       | Bin 0 -> 146 bytes
 .../action_file_unsupported_version.exi       | Bin 0 -> 69 bytes
 .../offline/action_file_zero_actions.exi      | Bin 0 -> 8 bytes
 .../exoplayer2/offline/ActionFileTest.java    | 121 ++++++------------
 .../offline/DownloadIndexUtilTest.java        |  36 ++++--
 10 files changed, 63 insertions(+), 121 deletions(-)
 create mode 100644 library/core/src/test/assets/offline/action_file_for_download_index_upgrade.exi
 create mode 100644 library/core/src/test/assets/offline/action_file_incomplete_header.exi
 create mode 100644 library/core/src/test/assets/offline/action_file_no_data.exi
 create mode 100644 library/core/src/test/assets/offline/action_file_one_action.exi
 create mode 100644 library/core/src/test/assets/offline/action_file_two_actions.exi
 create mode 100644 library/core/src/test/assets/offline/action_file_unsupported_version.exi
 create mode 100644 library/core/src/test/assets/offline/action_file_zero_actions.exi

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
index a81d7ffdc2..1203758e71 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
@@ -19,7 +19,6 @@ import com.google.android.exoplayer2.offline.DownloadAction.UnsupportedActionExc
 import com.google.android.exoplayer2.util.AtomicFile;
 import com.google.android.exoplayer2.util.Util;
 import java.io.DataInputStream;
-import java.io.DataOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -30,8 +29,7 @@ import java.util.ArrayList;
  */
 public final class ActionFile {
 
-  private static final String TAG = "ActionFile";
-  /* package */ static final int VERSION = 0;
+  private static final int VERSION = 0;
 
   private final AtomicFile atomicFile;
 
@@ -75,29 +73,6 @@ public final class ActionFile {
     }
   }
 
-  /**
-   * Stores {@link DownloadAction}s to file.
-   *
-   * @param downloadActions DownloadActions to store to file.
-   * @throws IOException If there is an error during storing.
-   */
-  public void store(DownloadAction... downloadActions) throws IOException {
-    DataOutputStream output = null;
-    try {
-      output = new DataOutputStream(atomicFile.startWrite());
-      output.writeInt(VERSION);
-      output.writeInt(downloadActions.length);
-      for (DownloadAction action : downloadActions) {
-        action.serializeToStream(output);
-      }
-      atomicFile.endWrite(output);
-      // Avoid calling close twice.
-      output = null;
-    } finally {
-      Util.closeQuietly(output);
-    }
-  }
-
   /** Returns whether the file or its backup exists. */
   public boolean exists() {
     return atomicFile.exists();
diff --git a/library/core/src/test/assets/offline/action_file_for_download_index_upgrade.exi b/library/core/src/test/assets/offline/action_file_for_download_index_upgrade.exi
new file mode 100644
index 0000000000000000000000000000000000000000..888ba4af4467a3d7a0077afad8ea24bbd48f8be0
GIT binary patch
literal 161
zcma)!-3h=T41{CUj?obmwNKqfsvz{of`WAWCY_)MAD4vO0enJGDYim0!d!a4+iL9?
y!}Q#`+3IOi9oJD~a{R9ZN<}UR$vdG1OnZKu55K!S#XxH%k&74>I~};phvfwW>mC#U

literal 0
HcmV?d00001

diff --git a/library/core/src/test/assets/offline/action_file_incomplete_header.exi b/library/core/src/test/assets/offline/action_file_incomplete_header.exi
new file mode 100644
index 0000000000000000000000000000000000000000..593f4708db84ac8fd0f5cc47c634f38c013fe9e4
GIT binary patch
literal 4
LcmZQzU|;|M00aO5

literal 0
HcmV?d00001

diff --git a/library/core/src/test/assets/offline/action_file_no_data.exi b/library/core/src/test/assets/offline/action_file_no_data.exi
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/library/core/src/test/assets/offline/action_file_one_action.exi b/library/core/src/test/assets/offline/action_file_one_action.exi
new file mode 100644
index 0000000000000000000000000000000000000000..a196d8a32200cc757d0dd6e541bdf6f62c3d33b0
GIT binary patch
literal 69
zcmZQz00Tw_?t-HH^rF<_;>@yCpb!&-Kt@SPft9{~NosM4p<ZcGCP<-x-r~C5meZfK
Psn3ybZ+ZOTBv>~9J|`1=

literal 0
HcmV?d00001

diff --git a/library/core/src/test/assets/offline/action_file_two_actions.exi b/library/core/src/test/assets/offline/action_file_two_actions.exi
new file mode 100644
index 0000000000000000000000000000000000000000..35c9b35e1ee54b5ef04a1f11ed94e9c16ed7017c
GIT binary patch
literal 146
zcmZQz00Sll?t-HH^rF<_;>@yCpb!&-Kt@SPft9{~NosM4p<ZcGCP<-x-r~C5meZfK
zsn3ybZ+ZOTBv?0o%|<ZI3Wu+y>@q)ks6a`pW|dL*DcgNoe2-b#&8HMhi=683@Sp^2
F7y#d!EZqPA

literal 0
HcmV?d00001

diff --git a/library/core/src/test/assets/offline/action_file_unsupported_version.exi b/library/core/src/test/assets/offline/action_file_unsupported_version.exi
new file mode 100644
index 0000000000000000000000000000000000000000..25e0dee842c29f0a3715408b7bfd8a91f7e4bc33
GIT binary patch
literal 69
zcmZQzU|?hbVeW#W{Pd#K;^NG*RG<J8gFr?}Nr9EVeo1O^iJ@L;Q6^B7K|pVD-EPb2
SPukSy$hWsV{%{f`$N&I7X%l?_

literal 0
HcmV?d00001

diff --git a/library/core/src/test/assets/offline/action_file_zero_actions.exi b/library/core/src/test/assets/offline/action_file_zero_actions.exi
new file mode 100644
index 0000000000000000000000000000000000000000..1b1cb4d44c57c2d7a5122870fa6ac3e62ff7e94e
GIT binary patch
literal 8
KcmZQzfB*mh2mk>9

literal 0
HcmV?d00001

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
index 9d1a6093fc..0d38337dfb 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
@@ -22,7 +22,6 @@ import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.util.Util;
-import java.io.DataOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -38,22 +37,16 @@ import org.junit.runner.RunWith;
 public class ActionFileTest {
 
   private File tempFile;
-  private DownloadAction action1;
-  private DownloadAction action2;
+  private DownloadAction expectedAction1;
+  private DownloadAction expectedAction2;
 
   @Before
   public void setUp() throws Exception {
     tempFile = Util.createTempFile(ApplicationProvider.getApplicationContext(), "ExoPlayerTest");
-    action1 =
-        buildAction(
-            DownloadAction.TYPE_PROGRESSIVE,
-            Uri.parse("http://test1.uri"),
-            TestUtil.buildTestData(16));
-    action2 =
-        buildAction(
-            DownloadAction.TYPE_PROGRESSIVE,
-            Uri.parse("http://test2.uri"),
-            TestUtil.buildTestData(32));
+    expectedAction1 =
+        buildExpectedAction(Uri.parse("http://test1.uri"), TestUtil.buildTestData(16));
+    expectedAction2 =
+        buildExpectedAction(Uri.parse("http://test2.uri"), TestUtil.buildTestData(32));
   }
 
   @After
@@ -63,8 +56,9 @@ public class ActionFileTest {
 
   @Test
   public void testLoadNoDataThrowsIOException() throws Exception {
+    ActionFile actionFile = getActionFile("offline/action_file_no_data.exi");
     try {
-      loadActions(new Object[] {});
+      actionFile.load();
       Assert.fail();
     } catch (IOException e) {
       // Expected exception.
@@ -73,8 +67,9 @@ public class ActionFileTest {
 
   @Test
   public void testLoadIncompleteHeaderThrowsIOException() throws Exception {
+    ActionFile actionFile = getActionFile("offline/action_file_incomplete_header.exi");
     try {
-      loadActions(new Object[] {ActionFile.VERSION});
+      actionFile.load();
       Assert.fail();
     } catch (IOException e) {
       // Expected exception.
@@ -82,95 +77,59 @@ public class ActionFileTest {
   }
 
   @Test
-  public void testLoadCompleteHeaderZeroAction() throws Exception {
-    DownloadAction[] actions = loadActions(new Object[] {ActionFile.VERSION, 0});
+  public void testLoadZeroActions() throws Exception {
+    ActionFile actionFile = getActionFile("offline/action_file_zero_actions.exi");
+    DownloadAction[] actions = actionFile.load();
     assertThat(actions).isNotNull();
     assertThat(actions).hasLength(0);
   }
 
   @Test
-  public void testLoadAction() throws Exception {
-    DownloadAction[] actions =
-        loadActions(
-            new Object[] {
-              ActionFile.VERSION,
-              1, // Action count
-              action1
-            });
-    assertThat(actions).isNotNull();
+  public void testLoadOneAction() throws Exception {
+    ActionFile actionFile = getActionFile("offline/action_file_one_action.exi");
+    DownloadAction[] actions = actionFile.load();
     assertThat(actions).hasLength(1);
-    assertThat(actions[0]).isEqualTo(action1);
+    assertThat(actions[0]).isEqualTo(expectedAction1);
   }
 
   @Test
-  public void testLoadActions() throws Exception {
-    DownloadAction[] actions =
-        loadActions(
-            new Object[] {
-              ActionFile.VERSION,
-              2, // Action count
-              action1,
-              action2,
-            });
-    assertThat(actions).isNotNull();
+  public void testLoadTwoActions() throws Exception {
+    ActionFile actionFile = getActionFile("offline/action_file_two_actions.exi");
+    DownloadAction[] actions = actionFile.load();
     assertThat(actions).hasLength(2);
-    assertThat(actions[0]).isEqualTo(action1);
-    assertThat(actions[1]).isEqualTo(action2);
+    assertThat(actions[0]).isEqualTo(expectedAction1);
+    assertThat(actions[1]).isEqualTo(expectedAction2);
   }
 
   @Test
-  public void testLoadNotSupportedVersion() throws Exception {
+  public void testLoadUnsupportedVersion() throws Exception {
+    ActionFile actionFile = getActionFile("offline/action_file_unsupported_version.exi");
     try {
-      loadActions(
-          new Object[] {
-            ActionFile.VERSION + 1,
-            1, // Action count
-            action1,
-          });
+      actionFile.load();
       Assert.fail();
     } catch (IOException e) {
       // Expected exception.
     }
   }
 
-  @Test
-  public void testStoreAndLoadNoActions() throws Exception {
-    doTestSerializationRoundTrip();
-  }
-
-  @Test
-  public void testStoreAndLoadActions() throws Exception {
-    doTestSerializationRoundTrip(action1, action2);
-  }
-
-  private void doTestSerializationRoundTrip(DownloadAction... actions) throws IOException {
-    ActionFile actionFile = new ActionFile(tempFile);
-    actionFile.store(actions);
-    assertThat(actionFile.load()).isEqualTo(actions);
-  }
-
-  // TODO: Remove this method and add assets for invalid and legacy serialized action files.
-  private DownloadAction[] loadActions(Object[] values) throws IOException {
-    FileOutputStream fileOutputStream = new FileOutputStream(tempFile);
-    DataOutputStream dataOutputStream = new DataOutputStream(fileOutputStream);
-    try {
-      for (Object value : values) {
-        if (value instanceof Integer) {
-          dataOutputStream.writeInt((Integer) value);
-        } else if (value instanceof DownloadAction) {
-          ((DownloadAction) value).serializeToStream(dataOutputStream);
-        } else {
-          throw new IllegalArgumentException();
-        }
-      }
-    } finally {
-      dataOutputStream.close();
+  private ActionFile getActionFile(String fileName) throws IOException {
+    // Copy the test data from the asset to where the ActionFile expects it to be.
+    byte[] actionFileBytes =
+        TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), fileName);
+    try (FileOutputStream output = new FileOutputStream(tempFile)) {
+      output.write(actionFileBytes);
     }
-    return new ActionFile(tempFile).load();
+    // Load the action file.
+    return new ActionFile(tempFile);
   }
 
-  private static DownloadAction buildAction(String type, Uri uri, byte[] data) {
+  private static DownloadAction buildExpectedAction(Uri uri, byte[] data) {
     return DownloadAction.createDownloadAction(
-        "id", type, uri, /* keys= */ Collections.emptyList(), /* customCacheKey= */ null, data);
+        /* id= */ uri.toString(),
+        DownloadAction.TYPE_PROGRESSIVE,
+        uri,
+        /* keys= */ Collections.emptyList(),
+        /* customCacheKey= */ null,
+        data);
   }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
index b752d83bf0..17f3d38ba1 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
@@ -22,8 +22,10 @@ import android.net.Uri;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.database.ExoDatabaseProvider;
+import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.util.Util;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
@@ -110,39 +112,45 @@ public class DownloadIndexUtilTest {
 
   @Test
   public void upgradeActionFile_createsDownloadStates() throws IOException {
-    ActionFile actionFile = new ActionFile(tempFile);
-    StreamKey streamKey1 =
+    // Copy the test asset to a file.
+    byte[] actionFileBytes =
+        TestUtil.getByteArray(
+            ApplicationProvider.getApplicationContext(),
+            "offline/action_file_for_download_index_upgrade.exi");
+    try (FileOutputStream output = new FileOutputStream(tempFile)) {
+      output.write(actionFileBytes);
+    }
+
+    StreamKey expectedStreamKey1 =
         new StreamKey(/* periodIndex= */ 3, /* groupIndex= */ 4, /* trackIndex= */ 5);
-    StreamKey streamKey2 =
+    StreamKey expectedStreamKey2 =
         new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 1, /* trackIndex= */ 2);
-    DownloadAction action1 =
+    DownloadAction expectedAction1 =
         DownloadAction.createDownloadAction(
-            "id1",
+            "key123",
             TYPE_DASH,
             Uri.parse("https://www.test.com/download1"),
-            asList(streamKey1),
+            asList(expectedStreamKey1),
             /* customCacheKey= */ "key123",
             new byte[] {1, 2, 3, 4});
-    DownloadAction action2 =
+    DownloadAction expectedAction2 =
         DownloadAction.createDownloadAction(
-            "id2",
+            "key234",
             TYPE_DASH,
             Uri.parse("https://www.test.com/download2"),
-            asList(streamKey2),
+            asList(expectedStreamKey2),
             /* customCacheKey= */ "key234",
             new byte[] {5, 4, 3, 2, 1});
-    actionFile.store(action1, action2);
 
+    ActionFile actionFile = new ActionFile(tempFile);
     DownloadIndexUtil.upgradeActionFile(actionFile, downloadIndex, /* downloadIdProvider= */ null);
-
-    assertDownloadIndexContainsAction(action1, DownloadState.STATE_QUEUED);
-    assertDownloadIndexContainsAction(action2, DownloadState.STATE_QUEUED);
+    assertDownloadIndexContainsAction(expectedAction1, DownloadState.STATE_QUEUED);
+    assertDownloadIndexContainsAction(expectedAction2, DownloadState.STATE_QUEUED);
   }
 
   private void assertDownloadIndexContainsAction(DownloadAction action, int state)
       throws IOException {
     DownloadState downloadState = downloadIndex.getDownloadState(action.id);
-    assertThat(downloadState).isNotNull();
     assertThat(downloadState.type).isEqualTo(action.type);
     assertThat(downloadState.cacheKey).isEqualTo(action.customCacheKey);
     assertThat(downloadState.customMetadata).isEqualTo(action.data);

From 73acdcf1e295af3fa83c7fde3d1cd6678996b446 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Mon, 8 Apr 2019 17:28:18 +0100
Subject: [PATCH 729/832] Add a flag to enable the preemptive 608 track in HLS

By passing false, users can disable the preemptive 608 track.

Issue:#5736
PiperOrigin-RevId: 242476274
---
 .../hls/DefaultHlsExtractorFactory.java       | 33 +++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
index 8de2e425f8..5cfbb960d5 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
@@ -54,10 +54,15 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
   public static final String WEBVTT_FILE_EXTENSION = ".webvtt";
 
   @DefaultTsPayloadReaderFactory.Flags private final int payloadReaderFactoryFlags;
+  private final boolean exposeCea608WhenMissingDeclarations;
 
-  /** Creates a factory for HLS segment extractors. */
+  /**
+   * Equivalent to {@link #DefaultHlsExtractorFactory(int, boolean) new
+   * DefaultHlsExtractorFactory(payloadReaderFactoryFlags = 0, exposeCea608WhenMissingDeclarations =
+   * true)}
+   */
   public DefaultHlsExtractorFactory() {
-    this(/* payloadReaderFactoryFlags= */ 0);
+    this(/* payloadReaderFactoryFlags= */ 0, /* exposeCea608WhenMissingDeclarations */ true);
   }
 
   /**
@@ -66,9 +71,14 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
    * @param payloadReaderFactoryFlags Flags to add when constructing any {@link
    *     DefaultTsPayloadReaderFactory} instances. Other flags may be added on top of {@code
    *     payloadReaderFactoryFlags} when creating {@link DefaultTsPayloadReaderFactory}.
+   * @param exposeCea608WhenMissingDeclarations Whether created {@link TsExtractor} instances should
+   *     expose a CEA-608 track should the master playlist contain no Closed Captions declarations.
+   *     If the master playlist contains any Closed Captions declarations, this flag is ignored.
    */
-  public DefaultHlsExtractorFactory(int payloadReaderFactoryFlags) {
+  public DefaultHlsExtractorFactory(
+      int payloadReaderFactoryFlags, boolean exposeCea608WhenMissingDeclarations) {
     this.payloadReaderFactoryFlags = payloadReaderFactoryFlags;
+    this.exposeCea608WhenMissingDeclarations = exposeCea608WhenMissingDeclarations;
   }
 
   @Override
@@ -161,7 +171,11 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
     if (!(extractorByFileExtension instanceof TsExtractor)) {
       TsExtractor tsExtractor =
           createTsExtractor(
-              payloadReaderFactoryFlags, format, muxedCaptionFormats, timestampAdjuster);
+              payloadReaderFactoryFlags,
+              exposeCea608WhenMissingDeclarations,
+              format,
+              muxedCaptionFormats,
+              timestampAdjuster);
       if (sniffQuietly(tsExtractor, extractorInput)) {
         return buildResult(tsExtractor);
       }
@@ -207,12 +221,17 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
     } else {
       // For any other file extension, we assume TS format.
       return createTsExtractor(
-          payloadReaderFactoryFlags, format, muxedCaptionFormats, timestampAdjuster);
+          payloadReaderFactoryFlags,
+          exposeCea608WhenMissingDeclarations,
+          format,
+          muxedCaptionFormats,
+          timestampAdjuster);
     }
   }
 
   private static TsExtractor createTsExtractor(
       @DefaultTsPayloadReaderFactory.Flags int userProvidedPayloadReaderFactoryFlags,
+      boolean exposeCea608WhenMissingDeclarations,
       Format format,
       List<Format> muxedCaptionFormats,
       TimestampAdjuster timestampAdjuster) {
@@ -223,7 +242,7 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
     if (muxedCaptionFormats != null) {
       // The playlist declares closed caption renditions, we should ignore descriptors.
       payloadReaderFactoryFlags |= DefaultTsPayloadReaderFactory.FLAG_OVERRIDE_CAPTION_DESCRIPTORS;
-    } else {
+    } else if (exposeCea608WhenMissingDeclarations) {
       // The playlist does not provide any closed caption information. We preemptively declare a
       // closed caption track on channel 0.
       muxedCaptionFormats =
@@ -233,6 +252,8 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
                   MimeTypes.APPLICATION_CEA608,
                   /* selectionFlags= */ 0,
                   /* language= */ null));
+    } else {
+      muxedCaptionFormats = Collections.emptyList();
     }
     String codecs = format.codecs;
     if (!TextUtils.isEmpty(codecs)) {

From 18dcad9b8d825ed1afe56985b3ea065376c20989 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 9 Apr 2019 00:26:07 +0100
Subject: [PATCH 730/832] Simplify DownloadState to contain its DownloadAction

This makes sense now that DownloadAction is only for downloading,
and not also for removal.

PiperOrigin-RevId: 242561575
---
 .../exoplayer2/demo/DemoDownloadService.java  |   4 +-
 .../exoplayer2/demo/DownloadTracker.java      |  23 ++--
 .../offline/DefaultDownloadIndex.java         | 120 +++++++++---------
 .../exoplayer2/offline/DownloadAction.java    |  28 ++++
 .../exoplayer2/offline/DownloadIndexUtil.java |   2 +-
 .../exoplayer2/offline/DownloadManager.java   |  38 ++----
 .../exoplayer2/offline/DownloadState.java     |  84 +++---------
 .../offline/DownloadIndexUtilTest.java        |  17 +--
 .../offline/DownloadManagerTest.java          |   2 +-
 .../offline/DownloadStateBuilder.java         |  28 ++--
 .../exoplayer2/offline/DownloadStateTest.java |  29 ++---
 .../testutil/TestDownloadManagerListener.java |   8 +-
 12 files changed, 161 insertions(+), 222 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
index 91e2aa5bcc..ae60337c76 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
@@ -74,13 +74,13 @@ public class DemoDownloadService extends DownloadService {
           notificationHelper.buildDownloadCompletedNotification(
               R.drawable.ic_download_done,
               /* contentIntent= */ null,
-              Util.fromUtf8Bytes(downloadState.customMetadata));
+              Util.fromUtf8Bytes(downloadState.action.data));
     } else if (downloadState.state == DownloadState.STATE_FAILED) {
       notification =
           notificationHelper.buildDownloadFailedNotification(
               R.drawable.ic_download_done,
               /* contentIntent= */ null,
-              Util.fromUtf8Bytes(downloadState.customMetadata));
+              Util.fromUtf8Bytes(downloadState.action.data));
     } else {
       return;
     }
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index 077f0bffb1..a51c60f8b6 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -37,7 +37,6 @@ import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -96,7 +95,7 @@ public class DownloadTracker implements DownloadManager.Listener {
   public List<StreamKey> getOfflineStreamKeys(Uri uri) {
     DownloadState downloadState = downloadStates.get(uri);
     return downloadState != null && downloadState.state != DownloadState.STATE_FAILED
-        ? Arrays.asList(downloadState.streamKeys)
+        ? downloadState.action.streamKeys
         : Collections.emptyList();
   }
 
@@ -109,7 +108,7 @@ public class DownloadTracker implements DownloadManager.Listener {
     DownloadState downloadState = downloadStates.get(uri);
     if (downloadState != null) {
       DownloadService.startWithRemoveDownload(
-          context, DemoDownloadService.class, downloadState.id, /* foreground= */ false);
+          context, DemoDownloadService.class, downloadState.action.id, /* foreground= */ false);
     } else {
       if (startDownloadDialogHelper != null) {
         startDownloadDialogHelper.release();
@@ -124,21 +123,17 @@ public class DownloadTracker implements DownloadManager.Listener {
 
   @Override
   public void onDownloadStateChanged(DownloadManager downloadManager, DownloadState downloadState) {
-    boolean downloadAdded = downloadStates.put(downloadState.uri, downloadState) == null;
-    if (downloadAdded) {
-      for (Listener listener : listeners) {
-        listener.onDownloadsChanged();
-      }
+    downloadStates.put(downloadState.action.uri, downloadState);
+    for (Listener listener : listeners) {
+      listener.onDownloadsChanged();
     }
   }
 
   @Override
   public void onDownloadRemoved(DownloadManager downloadManager, DownloadState downloadState) {
-    boolean downloadRemoved = downloadStates.remove(downloadState.uri) != null;
-    if (downloadRemoved) {
-      for (Listener listener : listeners) {
-        listener.onDownloadsChanged();
-      }
+    downloadStates.remove(downloadState.action.uri);
+    for (Listener listener : listeners) {
+      listener.onDownloadsChanged();
     }
   }
 
@@ -148,7 +143,7 @@ public class DownloadTracker implements DownloadManager.Listener {
     try (DownloadStateCursor loadedDownloadStates = downloadIndex.getDownloadStates()) {
       while (loadedDownloadStates.moveToNext()) {
         DownloadState downloadState = loadedDownloadStates.getDownloadState();
-        downloadStates.put(downloadState.uri, downloadState);
+        downloadStates.put(downloadState.action.uri, downloadState);
       }
     } catch (IOException e) {
       Log.w(TAG, "Failed to query download states", e);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
index 273c9dc9b9..32e7c3a66f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -29,6 +29,8 @@ import com.google.android.exoplayer2.database.VersionTable;
 import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * A {@link DownloadIndex} which uses SQLite to persist {@link DownloadState}s.
@@ -38,8 +40,7 @@ import com.google.android.exoplayer2.util.Util;
  */
 public final class DefaultDownloadIndex implements DownloadIndex {
 
-  @VisibleForTesting
-  /* package */ static final String TABLE_NAME = DatabaseProvider.TABLE_PREFIX + "Downloads";
+  private static final String TABLE_NAME = DatabaseProvider.TABLE_PREFIX + "Downloads";
 
   // TODO: Support multiple instances. Probably using the underlying cache UID.
   @VisibleForTesting /* package */ static final String INSTANCE_UID = "singleton";
@@ -48,7 +49,9 @@ public final class DefaultDownloadIndex implements DownloadIndex {
   private static final String COLUMN_ID = "id";
   private static final String COLUMN_TYPE = "title";
   private static final String COLUMN_URI = "subtitle";
-  private static final String COLUMN_CACHE_KEY = "cache_key";
+  private static final String COLUMN_STREAM_KEYS = "stream_keys";
+  private static final String COLUMN_CUSTOM_CACHE_KEY = "cache_key";
+  private static final String COLUMN_DATA = "custom_metadata";
   private static final String COLUMN_STATE = "state";
   private static final String COLUMN_DOWNLOAD_PERCENTAGE = "download_percentage";
   private static final String COLUMN_DOWNLOADED_BYTES = "downloaded_bytes";
@@ -58,8 +61,6 @@ public final class DefaultDownloadIndex implements DownloadIndex {
   private static final String COLUMN_MANUAL_STOP_REASON = "manual_stop_reason";
   private static final String COLUMN_START_TIME_MS = "start_time_ms";
   private static final String COLUMN_UPDATE_TIME_MS = "update_time_ms";
-  private static final String COLUMN_STREAM_KEYS = "stream_keys";
-  private static final String COLUMN_CUSTOM_METADATA = "custom_metadata";
 
   @SuppressWarnings("DeprecatedIsStillUsed")
   @Deprecated
@@ -68,18 +69,18 @@ public final class DefaultDownloadIndex implements DownloadIndex {
   private static final int COLUMN_INDEX_ID = 0;
   private static final int COLUMN_INDEX_TYPE = 1;
   private static final int COLUMN_INDEX_URI = 2;
-  private static final int COLUMN_INDEX_CACHE_KEY = 3;
-  private static final int COLUMN_INDEX_STATE = 4;
-  private static final int COLUMN_INDEX_DOWNLOAD_PERCENTAGE = 5;
-  private static final int COLUMN_INDEX_DOWNLOADED_BYTES = 6;
-  private static final int COLUMN_INDEX_TOTAL_BYTES = 7;
-  private static final int COLUMN_INDEX_FAILURE_REASON = 8;
-  private static final int COLUMN_INDEX_NOT_MET_REQUIREMENTS = 9;
-  private static final int COLUMN_INDEX_MANUAL_STOP_REASON = 10;
-  private static final int COLUMN_INDEX_START_TIME_MS = 11;
-  private static final int COLUMN_INDEX_UPDATE_TIME_MS = 12;
-  private static final int COLUMN_INDEX_STREAM_KEYS = 13;
-  private static final int COLUMN_INDEX_CUSTOM_METADATA = 14;
+  private static final int COLUMN_INDEX_STREAM_KEYS = 3;
+  private static final int COLUMN_INDEX_CUSTOM_CACHE_KEY = 4;
+  private static final int COLUMN_INDEX_DATA = 5;
+  private static final int COLUMN_INDEX_STATE = 6;
+  private static final int COLUMN_INDEX_DOWNLOAD_PERCENTAGE = 7;
+  private static final int COLUMN_INDEX_DOWNLOADED_BYTES = 8;
+  private static final int COLUMN_INDEX_TOTAL_BYTES = 9;
+  private static final int COLUMN_INDEX_FAILURE_REASON = 10;
+  private static final int COLUMN_INDEX_NOT_MET_REQUIREMENTS = 11;
+  private static final int COLUMN_INDEX_MANUAL_STOP_REASON = 12;
+  private static final int COLUMN_INDEX_START_TIME_MS = 13;
+  private static final int COLUMN_INDEX_UPDATE_TIME_MS = 14;
 
   private static final String WHERE_ID_EQUALS = COLUMN_ID + " = ?";
   private static final String WHERE_STATE_TERMINAL =
@@ -90,7 +91,9 @@ public final class DefaultDownloadIndex implements DownloadIndex {
         COLUMN_ID,
         COLUMN_TYPE,
         COLUMN_URI,
-        COLUMN_CACHE_KEY,
+        COLUMN_STREAM_KEYS,
+        COLUMN_CUSTOM_CACHE_KEY,
+        COLUMN_DATA,
         COLUMN_STATE,
         COLUMN_DOWNLOAD_PERCENTAGE,
         COLUMN_DOWNLOADED_BYTES,
@@ -99,9 +102,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
         COLUMN_NOT_MET_REQUIREMENTS,
         COLUMN_MANUAL_STOP_REASON,
         COLUMN_START_TIME_MS,
-        COLUMN_UPDATE_TIME_MS,
-        COLUMN_STREAM_KEYS,
-        COLUMN_CUSTOM_METADATA
+        COLUMN_UPDATE_TIME_MS
       };
 
   private static final String SQL_DROP_TABLE_IF_EXISTS = "DROP TABLE IF EXISTS " + TABLE_NAME;
@@ -115,7 +116,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
           + " TEXT NOT NULL,"
           + COLUMN_URI
           + " TEXT NOT NULL,"
-          + COLUMN_CACHE_KEY
+          + COLUMN_CUSTOM_CACHE_KEY
           + " TEXT,"
           + COLUMN_STATE
           + " INTEGER NOT NULL,"
@@ -139,7 +140,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
           + " INTEGER NOT NULL,"
           + COLUMN_STREAM_KEYS
           + " TEXT NOT NULL,"
-          + COLUMN_CUSTOM_METADATA
+          + COLUMN_DATA
           + " BLOB NOT NULL)";
 
   private static final String TRUE = "1";
@@ -168,9 +169,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
         return null;
       }
       cursor.moveToNext();
-      DownloadState downloadState = getDownloadStateForCurrentRow(cursor);
-      Assertions.checkState(id.equals(downloadState.id));
-      return downloadState;
+      return getDownloadStateForCurrentRow(cursor);
     } catch (SQLiteException e) {
       throw new DatabaseIOException(e);
     }
@@ -192,24 +191,24 @@ public final class DefaultDownloadIndex implements DownloadIndex {
    */
   public void putDownloadState(DownloadState downloadState) throws DatabaseIOException {
     ensureInitialized();
+    ContentValues values = new ContentValues();
+    values.put(COLUMN_ID, downloadState.action.id);
+    values.put(COLUMN_TYPE, downloadState.action.type);
+    values.put(COLUMN_URI, downloadState.action.uri.toString());
+    values.put(COLUMN_STREAM_KEYS, encodeStreamKeys(downloadState.action.streamKeys));
+    values.put(COLUMN_CUSTOM_CACHE_KEY, downloadState.action.customCacheKey);
+    values.put(COLUMN_DATA, downloadState.action.data);
+    values.put(COLUMN_STATE, downloadState.state);
+    values.put(COLUMN_DOWNLOAD_PERCENTAGE, downloadState.getDownloadPercentage());
+    values.put(COLUMN_DOWNLOADED_BYTES, downloadState.getDownloadedBytes());
+    values.put(COLUMN_TOTAL_BYTES, downloadState.getTotalBytes());
+    values.put(COLUMN_FAILURE_REASON, downloadState.failureReason);
+    values.put(COLUMN_STOP_FLAGS, 0);
+    values.put(COLUMN_NOT_MET_REQUIREMENTS, downloadState.notMetRequirements);
+    values.put(COLUMN_MANUAL_STOP_REASON, downloadState.manualStopReason);
+    values.put(COLUMN_START_TIME_MS, downloadState.startTimeMs);
+    values.put(COLUMN_UPDATE_TIME_MS, downloadState.updateTimeMs);
     try {
-      ContentValues values = new ContentValues();
-      values.put(COLUMN_ID, downloadState.id);
-      values.put(COLUMN_TYPE, downloadState.type);
-      values.put(COLUMN_URI, downloadState.uri.toString());
-      values.put(COLUMN_CACHE_KEY, downloadState.cacheKey);
-      values.put(COLUMN_STATE, downloadState.state);
-      values.put(COLUMN_DOWNLOAD_PERCENTAGE, downloadState.getDownloadPercentage());
-      values.put(COLUMN_DOWNLOADED_BYTES, downloadState.getDownloadedBytes());
-      values.put(COLUMN_TOTAL_BYTES, downloadState.getTotalBytes());
-      values.put(COLUMN_FAILURE_REASON, downloadState.failureReason);
-      values.put(COLUMN_STOP_FLAGS, /*stopFlags*/ 0);
-      values.put(COLUMN_NOT_MET_REQUIREMENTS, downloadState.notMetRequirements);
-      values.put(COLUMN_MANUAL_STOP_REASON, downloadState.manualStopReason);
-      values.put(COLUMN_START_TIME_MS, downloadState.startTimeMs);
-      values.put(COLUMN_UPDATE_TIME_MS, downloadState.updateTimeMs);
-      values.put(COLUMN_STREAM_KEYS, encodeStreamKeys(downloadState.streamKeys));
-      values.put(COLUMN_CUSTOM_METADATA, downloadState.customMetadata);
       SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
       writableDatabase.replaceOrThrow(TABLE_NAME, /* nullColumnHack= */ null, values);
     } catch (SQLiteException e) {
@@ -341,29 +340,33 @@ public final class DefaultDownloadIndex implements DownloadIndex {
   }
 
   private static DownloadState getDownloadStateForCurrentRow(Cursor cursor) {
+    DownloadAction action =
+        DownloadAction.createDownloadAction(
+            cursor.getString(COLUMN_INDEX_ID),
+            cursor.getString(COLUMN_INDEX_TYPE),
+            Uri.parse(cursor.getString(COLUMN_INDEX_URI)),
+            decodeStreamKeys(cursor.getString(COLUMN_INDEX_STREAM_KEYS)),
+            cursor.getString(COLUMN_INDEX_CUSTOM_CACHE_KEY),
+            cursor.getBlob(COLUMN_INDEX_DATA));
     CachingCounters cachingCounters = new CachingCounters();
     cachingCounters.alreadyCachedBytes = cursor.getLong(COLUMN_INDEX_DOWNLOADED_BYTES);
     cachingCounters.contentLength = cursor.getLong(COLUMN_INDEX_TOTAL_BYTES);
     cachingCounters.percentage = cursor.getFloat(COLUMN_INDEX_DOWNLOAD_PERCENTAGE);
     return new DownloadState(
-        cursor.getString(COLUMN_INDEX_ID),
-        cursor.getString(COLUMN_INDEX_TYPE),
-        Uri.parse(cursor.getString(COLUMN_INDEX_URI)),
-        cursor.getString(COLUMN_INDEX_CACHE_KEY),
+        action,
         cursor.getInt(COLUMN_INDEX_STATE),
         cursor.getInt(COLUMN_INDEX_FAILURE_REASON),
         cursor.getInt(COLUMN_INDEX_NOT_MET_REQUIREMENTS),
         cursor.getInt(COLUMN_INDEX_MANUAL_STOP_REASON),
         cursor.getLong(COLUMN_INDEX_START_TIME_MS),
         cursor.getLong(COLUMN_INDEX_UPDATE_TIME_MS),
-        decodeStreamKeys(cursor.getString(COLUMN_INDEX_STREAM_KEYS)),
-        cursor.getBlob(COLUMN_INDEX_CUSTOM_METADATA),
         cachingCounters);
   }
 
-  private static String encodeStreamKeys(StreamKey[] streamKeys) {
+  private static String encodeStreamKeys(List<StreamKey> streamKeys) {
     StringBuilder stringBuilder = new StringBuilder();
-    for (StreamKey streamKey : streamKeys) {
+    for (int i = 0; i < streamKeys.size(); i++) {
+      StreamKey streamKey = streamKeys.get(i);
       stringBuilder
           .append(streamKey.periodIndex)
           .append('.')
@@ -378,21 +381,20 @@ public final class DefaultDownloadIndex implements DownloadIndex {
     return stringBuilder.toString();
   }
 
-  private static StreamKey[] decodeStreamKeys(String encodedStreamKeys) {
+  private static List<StreamKey> decodeStreamKeys(String encodedStreamKeys) {
+    ArrayList<StreamKey> streamKeys = new ArrayList<>();
     if (encodedStreamKeys.isEmpty()) {
-      return new StreamKey[0];
+      return streamKeys;
     }
     String[] streamKeysStrings = Util.split(encodedStreamKeys, ",");
-    int streamKeysCount = streamKeysStrings.length;
-    StreamKey[] streamKeys = new StreamKey[streamKeysCount];
-    for (int i = 0; i < streamKeysCount; i++) {
-      String[] indices = Util.split(streamKeysStrings[i], "\\.");
+    for (String streamKeysString : streamKeysStrings) {
+      String[] indices = Util.split(streamKeysString, "\\.");
       Assertions.checkState(indices.length == 3);
-      streamKeys[i] =
+      streamKeys.add(
           new StreamKey(
               Integer.parseInt(indices[0]),
               Integer.parseInt(indices[1]),
-              Integer.parseInt(indices[2]));
+              Integer.parseInt(indices[2])));
     }
     return streamKeys;
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
index 32f36d051d..c0e1ab66ab 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.offline;
 
 import android.net.Uri;
 import androidx.annotation.Nullable;
+import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -133,6 +134,33 @@ public final class DownloadAction {
     this.data = data != null ? Arrays.copyOf(data, data.length) : Util.EMPTY_BYTE_ARRAY;
   }
 
+  /**
+   * Returns the result of merging {@code newAction} into this action.
+   *
+   * @param newAction The new action.
+   * @return The merged result.
+   */
+  public DownloadAction copyWithMergedAction(DownloadAction newAction) {
+    Assertions.checkState(id.equals(newAction.id));
+    Assertions.checkState(type.equals(newAction.type));
+
+    List<StreamKey> mergedKeys;
+    if (streamKeys.isEmpty() || newAction.streamKeys.isEmpty()) {
+      // If either streamKeys is empty then all streams should be downloaded.
+      mergedKeys = Collections.emptyList();
+    } else {
+      mergedKeys = new ArrayList<>(streamKeys);
+      for (int i = 0; i < newAction.streamKeys.size(); i++) {
+        StreamKey newKey = newAction.streamKeys.get(i);
+        if (!mergedKeys.contains(newKey)) {
+          mergedKeys.add(newKey);
+        }
+      }
+    }
+    return new DownloadAction(
+        id, type, newAction.uri, mergedKeys, newAction.customCacheKey, newAction.data);
+  }
+
   /** Serializes itself into a byte array. */
   public byte[] toByteArray() {
     ByteArrayOutputStream output = new ByteArrayOutputStream();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
index 524e71e9e2..4cbf35f523 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
@@ -76,7 +76,7 @@ public final class DownloadIndexUtil {
       throws IOException {
     DownloadState downloadState = downloadIndex.getDownloadState(id != null ? id : action.id);
     if (downloadState != null) {
-      downloadState = downloadState.mergeAction(action);
+      downloadState = downloadState.copyWithMergedAction(action);
     } else {
       downloadState = new DownloadState(action);
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 9c9c75d71f..57cea6a54e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -47,7 +47,6 @@ import java.io.IOException;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArraySet;
@@ -504,7 +503,7 @@ public final class DownloadManager {
   }
 
   private void onDownloadStateChanged(DownloadState downloadState) {
-    int downloadStateIndex = getDownloadStateIndex(downloadState.id);
+    int downloadStateIndex = getDownloadStateIndex(downloadState.action.id);
     if (downloadState.state == STATE_COMPLETED || downloadState.state == STATE_FAILED) {
       if (downloadStateIndex != C.INDEX_UNSET) {
         downloadStates.remove(downloadStateIndex);
@@ -520,7 +519,7 @@ public final class DownloadManager {
   }
 
   private void onDownloadRemoved(DownloadState downloadState) {
-    downloadStates.remove(getDownloadStateIndex(downloadState.id));
+    downloadStates.remove(getDownloadStateIndex(downloadState.action.id));
     for (Listener listener : listeners) {
       listener.onDownloadRemoved(this, downloadState);
     }
@@ -538,7 +537,7 @@ public final class DownloadManager {
 
   private int getDownloadStateIndex(String id) {
     for (int i = 0; i < downloadStates.size(); i++) {
-      if (downloadStates.get(i).id.equals(id)) {
+      if (downloadStates.get(i).action.id.equals(id)) {
         return i;
       }
     }
@@ -624,7 +623,7 @@ public final class DownloadManager {
         downloadState = new DownloadState(action);
         logd("Download state is created for " + action.id);
       } else {
-        downloadState = downloadState.mergeAction(action);
+        downloadState = downloadState.copyWithMergedAction(action);
         logd("Download state is loaded for " + action.id);
       }
       addDownloadForState(downloadState);
@@ -638,7 +637,7 @@ public final class DownloadManager {
     } else {
       DownloadState downloadState = loadDownloadState(id);
       if (downloadState != null) {
-        addDownloadForState(downloadState.setRemoveState());
+        addDownloadForState(downloadState.copyWithState(STATE_REMOVING));
       } else {
         logd("Can't remove download. No download with id: " + id);
       }
@@ -661,7 +660,7 @@ public final class DownloadManager {
   private void onDownloadRemovedInternal(Download download, DownloadState downloadState) {
     logd("Download is removed", download);
     try {
-      downloadIndex.removeDownloadState(downloadState.id);
+      downloadIndex.removeDownloadState(downloadState.action.id);
     } catch (DatabaseIOException e) {
       Log.e(TAG, "Failed to remove from index", e);
     }
@@ -837,11 +836,11 @@ public final class DownloadManager {
     }
 
     public String getId() {
-      return downloadState.id;
+      return downloadState.action.id;
     }
 
     public void addAction(DownloadAction newAction) {
-      downloadState = downloadState.mergeAction(newAction);
+      downloadState = downloadState.copyWithMergedAction(newAction);
       initialize();
     }
 
@@ -852,18 +851,13 @@ public final class DownloadManager {
     public DownloadState getUpdatedDownloadState() {
       downloadState =
           new DownloadState(
-              downloadState.id,
-              downloadState.type,
-              downloadState.uri,
-              downloadState.cacheKey,
+              downloadState.action,
               state,
               state != STATE_FAILED ? FAILURE_REASON_NONE : failureReason,
               notMetRequirements,
               manualStopReason,
               downloadState.startTimeMs,
               /* updateTimeMs= */ System.currentTimeMillis(),
-              downloadState.streamKeys,
-              downloadState.customMetadata,
               downloadState.counters);
       return downloadState;
     }
@@ -895,16 +889,6 @@ public final class DownloadManager {
       updateStopState();
     }
 
-    public DownloadAction getAction() {
-      return DownloadAction.createDownloadAction(
-          downloadState.id,
-          downloadState.type,
-          downloadState.uri,
-          Arrays.asList(downloadState.streamKeys),
-          downloadState.cacheKey,
-          downloadState.customMetadata);
-    }
-
     public boolean isInRemoveState() {
       return state == STATE_REMOVING || state == STATE_RESTARTING;
     }
@@ -980,7 +964,7 @@ public final class DownloadManager {
         initialize(STATE_QUEUED);
       } else { // STATE_DOWNLOADING
         if (error != null) {
-          Log.e(TAG, "Download failed: " + downloadState.id, error);
+          Log.e(TAG, "Download failed: " + downloadState.action.id, error);
           failureReason = FAILURE_REASON_UNKNOWN;
           setState(STATE_FAILED);
         } else {
@@ -1001,7 +985,7 @@ public final class DownloadManager {
 
     private DownloadThread(Download download) {
       this.download = download;
-      this.downloader = downloaderFactory.createDownloader(download.getAction());
+      this.downloader = downloaderFactory.createDownloader(download.downloadState.action);
       this.isRemoveThread = download.isInRemoveState();
       start();
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
index c98f1dcf39..5e7a54b7e7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
@@ -15,9 +15,7 @@
  */
 package com.google.android.exoplayer2.offline;
 
-import android.net.Uri;
 import androidx.annotation.IntDef;
-import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.scheduler.Requirements.RequirementFlags;
@@ -26,8 +24,6 @@ import com.google.android.exoplayer2.util.Assertions;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import java.util.Collections;
-import java.util.HashSet;
 
 /** Represents state of a download. */
 public final class DownloadState {
@@ -114,24 +110,15 @@ public final class DownloadState {
     }
   }
 
-  /** The unique content id. */
-  public final String id;
-  /** The type of the content. */
-  public final String type;
-  /** The Uri of the content. */
-  public final Uri uri;
-  /** A custom key for cache indexing. */
-  @Nullable public final String cacheKey;
+  /** The download action. */
+  public final DownloadAction action;
+
   /** The state of the download. */
   @State public final int state;
   /** The first time when download entry is created. */
   public final long startTimeMs;
   /** The last update time. */
   public final long updateTimeMs;
-  /** Keys of streams to be downloaded. If empty, all streams will be downloaded. */
-  public final StreamKey[] streamKeys;
-  /** Optional custom data. */
-  public final byte[] customMetadata;
   /**
    * If {@link #state} is {@link #STATE_FAILED} then this is the cause, otherwise {@link
    * #FAILURE_REASON_NONE}.
@@ -155,52 +142,37 @@ public final class DownloadState {
 
   private DownloadState(DownloadAction action, long currentTimeMs) {
     this(
-        action.id,
-        action.type,
-        action.uri,
-        action.customCacheKey,
+        action,
         /* state= */ STATE_QUEUED,
         FAILURE_REASON_NONE,
         /* notMetRequirements= */ 0,
         /* manualStopReason= */ 0,
         /* startTimeMs= */ currentTimeMs,
         /* updateTimeMs= */ currentTimeMs,
-        action.streamKeys.toArray(new StreamKey[0]),
-        action.data,
         new CachingCounters());
   }
 
   /* package */ DownloadState(
-      String id,
-      String type,
-      Uri uri,
-      @Nullable String cacheKey,
+      DownloadAction action,
       @State int state,
       @FailureReason int failureReason,
       @RequirementFlags int notMetRequirements,
       int manualStopReason,
       long startTimeMs,
       long updateTimeMs,
-      StreamKey[] streamKeys,
-      byte[] customMetadata,
       CachingCounters counters) {
     Assertions.checkNotNull(counters);
     Assertions.checkState((failureReason == FAILURE_REASON_NONE) == (state != STATE_FAILED));
     if (manualStopReason != 0 || notMetRequirements != 0) {
       Assertions.checkState(state != STATE_DOWNLOADING && state != STATE_QUEUED);
     }
-    this.id = id;
-    this.type = type;
-    this.uri = uri;
-    this.cacheKey = cacheKey;
+    this.action = action;
     this.state = state;
     this.failureReason = failureReason;
     this.notMetRequirements = notMetRequirements;
     this.manualStopReason = manualStopReason;
     this.startTimeMs = startTimeMs;
     this.updateTimeMs = updateTimeMs;
-    this.streamKeys = streamKeys;
-    this.customMetadata = customMetadata;
     this.counters = counters;
   }
 
@@ -208,43 +180,35 @@ public final class DownloadState {
    * Merges the given {@link DownloadAction} and creates a new {@link DownloadState}. The action
    * must have the same id and type.
    *
-   * @param action The {@link DownloadAction} to be merged.
+   * @param newAction The {@link DownloadAction} to be merged.
    * @return A new {@link DownloadState}.
    */
-  public DownloadState mergeAction(DownloadAction action) {
-    Assertions.checkArgument(action.id.equals(id));
-    Assertions.checkArgument(action.type.equals(type));
+  public DownloadState copyWithMergedAction(DownloadAction newAction) {
     return new DownloadState(
-        id,
-        type,
-        action.uri,
-        action.customCacheKey,
+        action.copyWithMergedAction(newAction),
         getNextState(state, manualStopReason != 0 || notMetRequirements != 0),
         FAILURE_REASON_NONE,
         notMetRequirements,
         manualStopReason,
         startTimeMs,
         /* updateTimeMs= */ System.currentTimeMillis(),
-        mergeStreamKeys(this, action),
-        action.data,
         counters);
   }
 
-  /** Returns a duplicate {@link DownloadState} in {@link #STATE_REMOVING}. */
-  public DownloadState setRemoveState() {
+  /**
+   * Returns a copy with the specified state, clearing {@link #failureReason}.
+   *
+   * @param state The {@link State}.
+   */
+  public DownloadState copyWithState(@State int state) {
     return new DownloadState(
-        id,
-        type,
-        uri,
-        cacheKey,
-        STATE_REMOVING,
+        action,
+        state,
         FAILURE_REASON_NONE,
         notMetRequirements,
         manualStopReason,
         startTimeMs,
         /* updateTimeMs= */ System.currentTimeMillis(),
-        streamKeys,
-        customMetadata,
         counters);
   }
 
@@ -285,18 +249,4 @@ public final class DownloadState {
       return STATE_QUEUED;
     }
   }
-
-  private static StreamKey[] mergeStreamKeys(DownloadState downloadState, DownloadAction action) {
-    StreamKey[] streamKeys = downloadState.streamKeys;
-    if (streamKeys.length > 0) {
-      if (action.streamKeys.isEmpty()) {
-        streamKeys = new StreamKey[0];
-      } else {
-        HashSet<StreamKey> keys = new HashSet<>(action.streamKeys);
-        Collections.addAll(keys, downloadState.streamKeys);
-        streamKeys = keys.toArray(new StreamKey[0]);
-      }
-    }
-    return streamKeys;
-  }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
index 17f3d38ba1..d321ba00d1 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
@@ -102,11 +102,11 @@ public class DownloadIndexUtilTest {
 
     DownloadState downloadState = downloadIndex.getDownloadState(action2.id);
     assertThat(downloadState).isNotNull();
-    assertThat(downloadState.type).isEqualTo(action2.type);
-    assertThat(downloadState.cacheKey).isEqualTo(action2.customCacheKey);
-    assertThat(downloadState.customMetadata).isEqualTo(action2.data);
-    assertThat(downloadState.uri).isEqualTo(action2.uri);
-    assertThat(Arrays.asList(downloadState.streamKeys)).containsExactly(streamKey1, streamKey2);
+    assertThat(downloadState.action.type).isEqualTo(action2.type);
+    assertThat(downloadState.action.customCacheKey).isEqualTo(action2.customCacheKey);
+    assertThat(downloadState.action.data).isEqualTo(action2.data);
+    assertThat(downloadState.action.uri).isEqualTo(action2.uri);
+    assertThat(downloadState.action.streamKeys).containsExactly(streamKey1, streamKey2);
     assertThat(downloadState.state).isEqualTo(DownloadState.STATE_QUEUED);
   }
 
@@ -151,12 +151,7 @@ public class DownloadIndexUtilTest {
   private void assertDownloadIndexContainsAction(DownloadAction action, int state)
       throws IOException {
     DownloadState downloadState = downloadIndex.getDownloadState(action.id);
-    assertThat(downloadState.type).isEqualTo(action.type);
-    assertThat(downloadState.cacheKey).isEqualTo(action.customCacheKey);
-    assertThat(downloadState.customMetadata).isEqualTo(action.data);
-    assertThat(downloadState.uri).isEqualTo(action.uri);
-    assertThat(Arrays.asList(downloadState.streamKeys))
-        .containsExactlyElementsIn(action.streamKeys);
+    assertThat(downloadState.action).isEqualTo(action);
     assertThat(downloadState.state).isEqualTo(state);
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index 2c1dd233d3..e25b2913e3 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -347,7 +347,7 @@ public class DownloadManagerTest {
 
     assertThat(states).hasLength(3);
     String[] taskIds = {task1.taskId, task2.taskId, task3.taskId};
-    String[] stateTaskIds = {states[0].id, states[1].id, states[2].id};
+    String[] stateTaskIds = {states[0].action.id, states[1].action.id, states[2].action.id};
     assertThat(stateTaskIds).isEqualTo(taskIds);
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
index d536fd8176..6a41494a6f 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
@@ -18,6 +18,9 @@ package com.google.android.exoplayer2.offline;
 import android.net.Uri;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * Builder for DownloadState.
@@ -38,21 +41,15 @@ class DownloadStateBuilder {
   private int manualStopReason;
   private long startTimeMs;
   private long updateTimeMs;
-  private StreamKey[] streamKeys;
+  private List<StreamKey> streamKeys;
   private byte[] customMetadata;
 
   DownloadStateBuilder(String id) {
-    this(id, "type", Uri.parse("uri"), /* cacheKey= */ null, new byte[0], new StreamKey[0]);
+    this(id, "type", Uri.parse("uri"), /* cacheKey= */ null, new byte[0], Collections.emptyList());
   }
 
   DownloadStateBuilder(DownloadAction action) {
-    this(
-        action.id,
-        action.type,
-        action.uri,
-        action.customCacheKey,
-        action.data,
-        action.streamKeys.toArray(new StreamKey[0]));
+    this(action.id, action.type, action.uri, action.customCacheKey, action.data, action.streamKeys);
   }
 
   DownloadStateBuilder(
@@ -61,7 +58,7 @@ class DownloadStateBuilder {
       Uri uri,
       String cacheKey,
       byte[] customMetadata,
-      StreamKey[] streamKeys) {
+      List<StreamKey> streamKeys) {
     this.id = id;
     this.type = type;
     this.uri = uri;
@@ -146,7 +143,7 @@ class DownloadStateBuilder {
   }
 
   public DownloadStateBuilder setStreamKeys(StreamKey... streamKeys) {
-    this.streamKeys = streamKeys;
+    this.streamKeys = Arrays.asList(streamKeys);
     return this;
   }
 
@@ -156,19 +153,16 @@ class DownloadStateBuilder {
   }
 
   public DownloadState build() {
+    DownloadAction action =
+        DownloadAction.createDownloadAction(id, type, uri, streamKeys, cacheKey, customMetadata);
     return new DownloadState(
-        id,
-        type,
-        uri,
-        cacheKey,
+        action,
         state,
         failureReason,
         notMetRequirements,
         manualStopReason,
         startTimeMs,
         updateTimeMs,
-        streamKeys,
-        customMetadata,
         counters);
   }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
index a073f44cbe..4028677bb2 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
@@ -47,7 +47,7 @@ public class DownloadStateTest {
             .build();
 
     try {
-      downloadState.mergeAction(downloadAction);
+      downloadState.copyWithMergedAction(downloadAction);
       fail();
     } catch (Exception e) {
       // Expected.
@@ -64,7 +64,7 @@ public class DownloadStateTest {
             .build();
 
     try {
-      downloadState.mergeAction(downloadAction);
+      downloadState.copyWithMergedAction(downloadAction);
       fail();
     } catch (Exception e) {
       // Expected.
@@ -78,7 +78,7 @@ public class DownloadStateTest {
         new DownloadStateBuilder(downloadAction).setState(DownloadState.STATE_QUEUED);
     DownloadState downloadState = downloadStateBuilder.build();
 
-    downloadState.mergeAction(downloadAction);
+    downloadState.copyWithMergedAction(downloadAction);
   }
 
   @Test
@@ -90,7 +90,7 @@ public class DownloadStateTest {
             .setState(DownloadState.STATE_QUEUED);
     DownloadState downloadState = downloadStateBuilder.build();
 
-    DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);
+    DownloadState mergedDownloadState = downloadState.copyWithMergedAction(downloadAction);
 
     DownloadState expectedDownloadState = downloadStateBuilder.setUri(downloadAction.uri).build();
     assertEqual(mergedDownloadState, expectedDownloadState);
@@ -112,7 +112,7 @@ public class DownloadStateTest {
             .setCustomMetadata(new byte[0]);
     DownloadState downloadState = downloadStateBuilder.build();
 
-    DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);
+    DownloadState mergedDownloadState = downloadState.copyWithMergedAction(downloadAction);
 
     DownloadState expectedDownloadState =
         downloadStateBuilder.setCustomMetadata(downloadAction.data).build();
@@ -126,7 +126,7 @@ public class DownloadStateTest {
         new DownloadStateBuilder(downloadAction).setState(DownloadState.STATE_REMOVING);
     DownloadState downloadState = downloadStateBuilder.build();
 
-    DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);
+    DownloadState mergedDownloadState = downloadState.copyWithMergedAction(downloadAction);
 
     DownloadState expectedDownloadState =
         downloadStateBuilder.setState(DownloadState.STATE_RESTARTING).build();
@@ -142,7 +142,7 @@ public class DownloadStateTest {
             .setFailureReason(DownloadState.FAILURE_REASON_UNKNOWN);
     DownloadState downloadState = downloadStateBuilder.build();
 
-    DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);
+    DownloadState mergedDownloadState = downloadState.copyWithMergedAction(downloadAction);
 
     DownloadState expectedDownloadState =
         downloadStateBuilder
@@ -161,7 +161,7 @@ public class DownloadStateTest {
             .setManualStopReason(DownloadState.MANUAL_STOP_REASON_UNDEFINED);
     DownloadState downloadState = downloadStateBuilder.build();
 
-    DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);
+    DownloadState mergedDownloadState = downloadState.copyWithMergedAction(downloadAction);
 
     assertEqual(mergedDownloadState, downloadState);
   }
@@ -175,7 +175,7 @@ public class DownloadStateTest {
             .setManualStopReason(DownloadState.MANUAL_STOP_REASON_UNDEFINED);
     DownloadState downloadState = downloadStateBuilder.build();
 
-    DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);
+    DownloadState mergedDownloadState = downloadState.copyWithMergedAction(downloadAction);
 
     DownloadState expectedDownloadState =
         downloadStateBuilder.setState(DownloadState.STATE_STOPPED).build();
@@ -191,7 +191,7 @@ public class DownloadStateTest {
             .setNotMetRequirements(0x12345678);
     DownloadState downloadState = downloadStateBuilder.build();
 
-    DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);
+    DownloadState mergedDownloadState = downloadState.copyWithMergedAction(downloadAction);
 
     DownloadState expectedDownloadState =
         downloadStateBuilder.setState(DownloadState.STATE_STOPPED).build();
@@ -259,7 +259,7 @@ public class DownloadStateTest {
             .setStreamKeys(keys1);
     DownloadState downloadState = downloadStateBuilder.build();
 
-    DownloadState mergedDownloadState = downloadState.mergeAction(downloadAction);
+    DownloadState mergedDownloadState = downloadState.copyWithMergedAction(downloadAction);
 
     DownloadState expectedDownloadState = downloadStateBuilder.setStreamKeys(expectedKeys).build();
     assertEqual(mergedDownloadState, expectedDownloadState);
@@ -271,6 +271,7 @@ public class DownloadStateTest {
 
   static void assertEqual(
       DownloadState downloadState, DownloadState that, boolean compareTimeFields) {
+    assertThat(downloadState.action).isEqualTo(that.action);
     assertThat(downloadState.state).isEqualTo(that.state);
     assertThat(downloadState.getDownloadPercentage()).isEqualTo(that.getDownloadPercentage());
     assertThat(downloadState.getDownloadedBytes()).isEqualTo(that.getDownloadedBytes());
@@ -282,12 +283,6 @@ public class DownloadStateTest {
     assertThat(downloadState.failureReason).isEqualTo(that.failureReason);
     assertThat(downloadState.manualStopReason).isEqualTo(that.manualStopReason);
     assertThat(downloadState.notMetRequirements).isEqualTo(that.notMetRequirements);
-    assertThat(downloadState.id).isEqualTo(that.id);
-    assertThat(downloadState.type).isEqualTo(that.type);
-    assertThat(downloadState.uri).isEqualTo(that.uri);
-    assertThat(downloadState.cacheKey).isEqualTo(that.cacheKey);
-    assertThat(Arrays.asList(downloadState.streamKeys)).containsExactlyElementsIn(that.streamKeys);
-    assertThat(downloadState.customMetadata).isEqualTo(that.customMetadata);
   }
 
   private DownloadAction createDownloadAction() {
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
index c594da06de..907e104643 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
@@ -57,10 +57,6 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
     return getStateQueue(taskId).poll(timeoutMs, TimeUnit.MILLISECONDS);
   }
 
-  public void clearDownloadError() {
-    this.failureReason = DownloadState.FAILURE_REASON_NONE;
-  }
-
   @Override
   public void onInitialized(DownloadManager downloadManager) {
     initializedCondition.open();
@@ -77,12 +73,12 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
     if (downloadState.state == DownloadState.STATE_FAILED) {
       failureReason = downloadState.failureReason;
     }
-    getStateQueue(downloadState.id).add(downloadState.state);
+    getStateQueue(downloadState.action.id).add(downloadState.state);
   }
 
   @Override
   public void onDownloadRemoved(DownloadManager downloadManager, DownloadState downloadState) {
-    getStateQueue(downloadState.id).add(STATE_REMOVED);
+    getStateQueue(downloadState.action.id).add(STATE_REMOVED);
   }
 
   @Override

From 14d40b0faf3f6e0313eed4bcd0d1cb11f4b6ed05 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 9 Apr 2019 10:46:17 +0100
Subject: [PATCH 731/832] Fix test which is relying on wrong Robolectric
 behavior.

Robolectric calls messages posted to the main thread immediately inline. This
will change in the upcoming release and will break tests implicitly relying
on that behavior.

Update ConcatenatingMediaSourceTest to actually wait for the posted message.

PiperOrigin-RevId: 242631531
---
 .../source/ConcatenatingMediaSourceTest.java  | 114 +++++++++++++-----
 1 file changed, 81 insertions(+), 33 deletions(-)

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
index 685801abdf..2c4ca7c334 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.source;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
 
 import android.os.ConditionVariable;
 import android.os.Handler;
@@ -417,60 +416,101 @@ public final class ConcatenatingMediaSourceTest {
 
   @Test
   public void testCustomCallbackBeforePreparationAddSingle() {
-    Runnable runnable = mock(Runnable.class);
+    ConditionVariable runnableInvoked = new ConditionVariable();
 
-    mediaSource.addMediaSource(createFakeMediaSource(), new Handler(), runnable);
-    verify(runnable).run();
+    DummyMainThread dummyMainThread = new DummyMainThread();
+    dummyMainThread.runOnMainThread(
+        () ->
+            mediaSource.addMediaSource(
+                createFakeMediaSource(), new Handler(), runnableInvoked::open));
+    runnableInvoked.block(MediaSourceTestRunner.TIMEOUT_MS);
+    dummyMainThread.release();
+
+    assertThat(runnableInvoked.block(0)).isTrue();
   }
 
   @Test
   public void testCustomCallbackBeforePreparationAddMultiple() {
-    Runnable runnable = mock(Runnable.class);
+    ConditionVariable runnableInvoked = new ConditionVariable();
 
-    mediaSource.addMediaSources(
-        Arrays.asList(new MediaSource[] {createFakeMediaSource(), createFakeMediaSource()}),
-        new Handler(),
-        runnable);
-    verify(runnable).run();
+    DummyMainThread dummyMainThread = new DummyMainThread();
+    dummyMainThread.runOnMainThread(
+        () ->
+            mediaSource.addMediaSources(
+                Arrays.asList(new MediaSource[] {createFakeMediaSource(), createFakeMediaSource()}),
+                new Handler(),
+                runnableInvoked::open));
+    runnableInvoked.block(MediaSourceTestRunner.TIMEOUT_MS);
+    dummyMainThread.release();
+
+    assertThat(runnableInvoked.block(0)).isTrue();
   }
 
   @Test
   public void testCustomCallbackBeforePreparationAddSingleWithIndex() {
-    Runnable runnable = mock(Runnable.class);
+    ConditionVariable runnableInvoked = new ConditionVariable();
 
-    mediaSource.addMediaSource(/* index */ 0, createFakeMediaSource(), new Handler(), runnable);
-    verify(runnable).run();
+    DummyMainThread dummyMainThread = new DummyMainThread();
+    dummyMainThread.runOnMainThread(
+        () ->
+            mediaSource.addMediaSource(
+                /* index */ 0, createFakeMediaSource(), new Handler(), runnableInvoked::open));
+    runnableInvoked.block(MediaSourceTestRunner.TIMEOUT_MS);
+    dummyMainThread.release();
+
+    assertThat(runnableInvoked.block(0)).isTrue();
   }
 
   @Test
   public void testCustomCallbackBeforePreparationAddMultipleWithIndex() {
-    Runnable runnable = mock(Runnable.class);
+    ConditionVariable runnableInvoked = new ConditionVariable();
 
-    mediaSource.addMediaSources(
-        /* index */ 0,
-        Arrays.asList(new MediaSource[] {createFakeMediaSource(), createFakeMediaSource()}),
-        new Handler(),
-        runnable);
-    verify(runnable).run();
+    DummyMainThread dummyMainThread = new DummyMainThread();
+    dummyMainThread.runOnMainThread(
+        () ->
+            mediaSource.addMediaSources(
+                /* index */ 0,
+                Arrays.asList(new MediaSource[] {createFakeMediaSource(), createFakeMediaSource()}),
+                new Handler(),
+                runnableInvoked::open));
+    runnableInvoked.block(MediaSourceTestRunner.TIMEOUT_MS);
+    dummyMainThread.release();
+
+    assertThat(runnableInvoked.block(0)).isTrue();
   }
 
   @Test
   public void testCustomCallbackBeforePreparationRemove() {
-    Runnable runnable = mock(Runnable.class);
+    ConditionVariable runnableInvoked = new ConditionVariable();
 
-    mediaSource.addMediaSource(createFakeMediaSource());
-    mediaSource.removeMediaSource(/* index */ 0, new Handler(), runnable);
-    verify(runnable).run();
+    DummyMainThread dummyMainThread = new DummyMainThread();
+    dummyMainThread.runOnMainThread(
+        () -> {
+          mediaSource.addMediaSource(createFakeMediaSource());
+          mediaSource.removeMediaSource(/* index */ 0, new Handler(), runnableInvoked::open);
+        });
+    runnableInvoked.block(MediaSourceTestRunner.TIMEOUT_MS);
+    dummyMainThread.release();
+
+    assertThat(runnableInvoked.block(0)).isTrue();
   }
 
   @Test
   public void testCustomCallbackBeforePreparationMove() {
-    Runnable runnable = mock(Runnable.class);
+    ConditionVariable runnableInvoked = new ConditionVariable();
 
-    mediaSource.addMediaSources(
-        Arrays.asList(new MediaSource[] {createFakeMediaSource(), createFakeMediaSource()}));
-    mediaSource.moveMediaSource(/* fromIndex */ 1, /* toIndex */ 0, new Handler(), runnable);
-    verify(runnable).run();
+    DummyMainThread dummyMainThread = new DummyMainThread();
+    dummyMainThread.runOnMainThread(
+        () -> {
+          mediaSource.addMediaSources(
+              Arrays.asList(new MediaSource[] {createFakeMediaSource(), createFakeMediaSource()}));
+          mediaSource.moveMediaSource(
+              /* fromIndex */ 1, /* toIndex */ 0, new Handler(), runnableInvoked::open);
+        });
+    runnableInvoked.block(MediaSourceTestRunner.TIMEOUT_MS);
+    dummyMainThread.release();
+
+    assertThat(runnableInvoked.block(0)).isTrue();
   }
 
   @Test
@@ -997,11 +1037,19 @@ public final class ConcatenatingMediaSourceTest {
 
   @Test
   public void testCustomCallbackBeforePreparationSetShuffleOrder() throws Exception {
-    Runnable runnable = mock(Runnable.class);
-    mediaSource.setShuffleOrder(
-        new ShuffleOrder.UnshuffledShuffleOrder(/* length= */ 0), new Handler(), runnable);
+    ConditionVariable runnableInvoked = new ConditionVariable();
 
-    verify(runnable).run();
+    DummyMainThread dummyMainThread = new DummyMainThread();
+    dummyMainThread.runOnMainThread(
+        () ->
+            mediaSource.setShuffleOrder(
+                new ShuffleOrder.UnshuffledShuffleOrder(/* length= */ 0),
+                new Handler(),
+                runnableInvoked::open));
+    runnableInvoked.block(MediaSourceTestRunner.TIMEOUT_MS);
+    dummyMainThread.release();
+
+    assertThat(runnableInvoked.block(0)).isTrue();
   }
 
   @Test

From d3b63a97ad731a66c4629083fa97bfbe774fb654 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 9 Apr 2019 13:06:06 +0100
Subject: [PATCH 732/832] Remove DownloadAction serialization

Implement Parcelable instead, which is a more intented way of
passing structured data via Intents.

PiperOrigin-RevId: 242646441
---
 .../exoplayer2/demo/DemoApplication.java      |   3 +-
 .../exoplayer2/offline/ActionFile.java        | 101 ++++++--
 .../offline/DefaultDownloadIndex.java         |   2 +-
 .../exoplayer2/offline/DownloadAction.java    | 222 +++++-------------
 .../exoplayer2/offline/DownloadHelper.java    |   7 +-
 .../exoplayer2/offline/DownloadIndexUtil.java |  45 ++--
 .../exoplayer2/offline/DownloadService.java   |  22 +-
 .../android/exoplayer2/offline/StreamKey.java |  38 ++-
 .../exoplayer2/offline/ActionFileTest.java    |   4 +-
 .../offline/DefaultDownloaderFactoryTest.java |   4 +-
 .../offline/DownloadActionTest.java           | 219 ++---------------
 .../offline/DownloadIndexUtilTest.java        |  18 +-
 .../offline/DownloadManagerTest.java          |   2 +-
 .../offline/DownloadStateBuilder.java         |   3 +-
 .../exoplayer2/offline/DownloadStateTest.java |   6 +-
 .../exoplayer2/offline/StreamKeyTest.java     |  41 ++++
 .../dash/offline/DashDownloaderTest.java      |   2 +-
 .../dash/offline/DownloadManagerDashTest.java |   2 +-
 .../dash/offline/DownloadServiceDashTest.java |   2 +-
 .../source/hls/offline/HlsDownloaderTest.java |   2 +-
 .../offline/SsDownloaderTest.java             |   2 +-
 21 files changed, 302 insertions(+), 445 deletions(-)
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/offline/StreamKeyTest.java

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
index 380aa98bde..705ae2eeef 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
@@ -136,7 +136,8 @@ public class DemoApplication extends Application {
     ActionFile actionFile = new ActionFile(new File(getDownloadDirectory(), file));
     if (actionFile.exists()) {
       try {
-        DownloadIndexUtil.upgradeActionFile(actionFile, downloadIndex, null);
+        DownloadIndexUtil.mergeActionFile(
+            actionFile, /* downloadIdProvider= */ null, downloadIndex);
       } catch (IOException e) {
         Log.e(TAG, "Upgrading action file failed", e);
       }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
index 1203758e71..d715583921 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
@@ -15,6 +15,8 @@
  */
 package com.google.android.exoplayer2.offline;
 
+import android.net.Uri;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.offline.DownloadAction.UnsupportedActionException;
 import com.google.android.exoplayer2.util.AtomicFile;
 import com.google.android.exoplayer2.util.Util;
@@ -23,10 +25,9 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.List;
 
-/**
- * Stores and loads {@link DownloadAction}s to/from a file.
- */
+/** Loads {@link DownloadAction DownloadActions} from legacy action files. */
 public final class ActionFile {
 
   private static final int VERSION = 0;
@@ -34,17 +35,28 @@ public final class ActionFile {
   private final AtomicFile atomicFile;
 
   /**
-   * @param actionFile File to be used to store and load {@link DownloadAction}s.
+   * @param actionFile The file from which {@link DownloadAction DownloadActions} will be loaded.
    */
   public ActionFile(File actionFile) {
     atomicFile = new AtomicFile(actionFile);
   }
 
+  /** Returns whether the file or its backup exists. */
+  public boolean exists() {
+    return atomicFile.exists();
+  }
+
+  /** Deletes the action file and its backup. */
+  public void delete() {
+    atomicFile.delete();
+  }
+
   /**
-   * Loads {@link DownloadAction}s from file.
+   * Loads {@link DownloadAction DownloadActions} from the file.
    *
-   * @return Loaded DownloadActions. If the action file doesn't exists returns an empty array.
-   * @throws IOException If there is an error during loading.
+   * @return The loaded {@link DownloadAction DownloadActions}, or an empty array if the file does
+   *     not exist.
+   * @throws IOException If there is an error reading the file.
    */
   public DownloadAction[] load() throws IOException {
     if (!exists()) {
@@ -62,7 +74,7 @@ public final class ActionFile {
       ArrayList<DownloadAction> actions = new ArrayList<>();
       for (int i = 0; i < actionCount; i++) {
         try {
-          actions.add(DownloadAction.deserializeFromStream(dataInputStream));
+          actions.add(readDownloadAction(dataInputStream));
         } catch (UnsupportedActionException e) {
           // remove DownloadAction is not supported. Ignore the exception and continue loading rest.
         }
@@ -73,13 +85,74 @@ public final class ActionFile {
     }
   }
 
-  /** Returns whether the file or its backup exists. */
-  public boolean exists() {
-    return atomicFile.exists();
+  private static DownloadAction readDownloadAction(DataInputStream input) throws IOException {
+    String type = input.readUTF();
+    int version = input.readInt();
+
+    Uri uri = Uri.parse(input.readUTF());
+    boolean isRemoveAction = input.readBoolean();
+
+    int dataLength = input.readInt();
+    byte[] data;
+    if (dataLength != 0) {
+      data = new byte[dataLength];
+      input.readFully(data);
+    } else {
+      data = null;
+    }
+
+    // Serialized version 0 progressive actions did not contain keys.
+    boolean isLegacyProgressive = version == 0 && DownloadAction.TYPE_PROGRESSIVE.equals(type);
+    List<StreamKey> keys = new ArrayList<>();
+    if (!isLegacyProgressive) {
+      int keyCount = input.readInt();
+      for (int i = 0; i < keyCount; i++) {
+        keys.add(readKey(type, version, input));
+      }
+    }
+
+    // Serialized version 0 and 1 DASH/HLS/SS actions did not contain a custom cache key.
+    boolean isLegacySegmented =
+        version < 2
+            && (DownloadAction.TYPE_DASH.equals(type)
+                || DownloadAction.TYPE_HLS.equals(type)
+                || DownloadAction.TYPE_SS.equals(type));
+    String customCacheKey = null;
+    if (!isLegacySegmented) {
+      customCacheKey = input.readBoolean() ? input.readUTF() : null;
+    }
+
+    // Serialized version 0, 1 and 2 did not contain an id. We need to generate one.
+    String id = version < 3 ? generateDownloadActionId(uri, customCacheKey) : input.readUTF();
+
+    if (isRemoveAction) {
+      // Remove actions are not supported anymore.
+      throw new UnsupportedActionException();
+    }
+    return new DownloadAction(id, type, uri, keys, customCacheKey, data);
   }
 
-  /** Delete the action file and its backup. */
-  public void delete() {
-    atomicFile.delete();
+  private static StreamKey readKey(String type, int version, DataInputStream input)
+      throws IOException {
+    int periodIndex;
+    int groupIndex;
+    int trackIndex;
+
+    // Serialized version 0 HLS/SS actions did not contain a period index.
+    if ((DownloadAction.TYPE_HLS.equals(type) || DownloadAction.TYPE_SS.equals(type))
+        && version == 0) {
+      periodIndex = 0;
+      groupIndex = input.readInt();
+      trackIndex = input.readInt();
+    } else {
+      periodIndex = input.readInt();
+      groupIndex = input.readInt();
+      trackIndex = input.readInt();
+    }
+    return new StreamKey(periodIndex, groupIndex, trackIndex);
+  }
+
+  private static String generateDownloadActionId(Uri uri, @Nullable String customCacheKey) {
+    return customCacheKey != null ? customCacheKey : uri.toString();
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
index 32e7c3a66f..16e5c37b3d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -341,7 +341,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
 
   private static DownloadState getDownloadStateForCurrentRow(Cursor cursor) {
     DownloadAction action =
-        DownloadAction.createDownloadAction(
+        new DownloadAction(
             cursor.getString(COLUMN_INDEX_ID),
             cursor.getString(COLUMN_INDEX_TYPE),
             Uri.parse(cursor.getString(COLUMN_INDEX_URI)),
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
index c0e1ab66ab..6e11ec9042 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
@@ -15,24 +15,22 @@
  */
 package com.google.android.exoplayer2.offline;
 
+import static com.google.android.exoplayer2.util.Util.castNonNull;
+
 import android.net.Uri;
+import android.os.Parcel;
+import android.os.Parcelable;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
 /** Contains the necessary parameters for a download action. */
-public final class DownloadAction {
+public final class DownloadAction implements Parcelable {
 
   /** Thrown when the encoded action data belongs to an unsupported DownloadAction type. */
   public static class UnsupportedActionException extends IOException {}
@@ -46,56 +44,6 @@ public final class DownloadAction {
   /** Type for SmoothStreaming downloads. */
   public static final String TYPE_SS = "ss";
 
-  private static final int VERSION = 3;
-
-  /**
-   * Deserializes a download action from the {@code data}.
-   *
-   * @param data The action data to deserialize.
-   * @return The deserialized action.
-   * @throws IOException If the data could not be deserialized.
-   * @throws UnsupportedActionException If the data belongs to an unsupported {@link DownloadAction}
-   *     type. Input read position is set to the end of the data.
-   */
-  public static DownloadAction fromByteArray(byte[] data) throws IOException {
-    ByteArrayInputStream input = new ByteArrayInputStream(data);
-    return deserializeFromStream(input);
-  }
-
-  /**
-   * Deserializes a single download action from {@code input}.
-   *
-   * @param input The stream from which to read.
-   * @return The deserialized action.
-   * @throws IOException If there is an IO error reading from {@code input}, or if the data could
-   *     not be deserialized.
-   * @throws UnsupportedActionException If the data belongs to an unsupported {@link DownloadAction}
-   *     type. Input read position is set to the end of the data.
-   */
-  public static DownloadAction deserializeFromStream(InputStream input) throws IOException {
-    return readFromStream(new DataInputStream(input));
-  }
-
-  /**
-   * Creates a DASH download action.
-   *
-   * @param id The content id.
-   * @param type The type of the action.
-   * @param uri The URI of the media to be downloaded.
-   * @param keys Keys of streams to be downloaded. If empty, all streams will be downloaded.
-   * @param customCacheKey A custom key for cache indexing, or null.
-   * @param data Optional custom data for this action. If {@code null} an empty array will be used.
-   */
-  public static DownloadAction createDownloadAction(
-      String id,
-      String type,
-      Uri uri,
-      List<StreamKey> keys,
-      @Nullable String customCacheKey,
-      @Nullable byte[] data) {
-    return new DownloadAction(id, type, uri, keys, customCacheKey, data);
-  }
-
   /** The unique content id. */
   public final String id;
   /** The type of the action. */
@@ -117,7 +65,7 @@ public final class DownloadAction {
    * @param customCacheKey See {@link #customCacheKey}.
    * @param data See {@link #data}.
    */
-  private DownloadAction(
+  public DownloadAction(
       String id,
       String type,
       Uri uri,
@@ -127,13 +75,38 @@ public final class DownloadAction {
     this.id = id;
     this.type = type;
     this.uri = uri;
-    this.customCacheKey = customCacheKey;
     ArrayList<StreamKey> mutableKeys = new ArrayList<>(streamKeys);
     Collections.sort(mutableKeys);
     this.streamKeys = Collections.unmodifiableList(mutableKeys);
+    this.customCacheKey = customCacheKey;
     this.data = data != null ? Arrays.copyOf(data, data.length) : Util.EMPTY_BYTE_ARRAY;
   }
 
+  /* package */ DownloadAction(Parcel in) {
+    id = castNonNull(in.readString());
+    type = castNonNull(in.readString());
+    uri = Uri.parse(castNonNull(in.readString()));
+    int streamKeyCount = in.readInt();
+    ArrayList<StreamKey> mutableStreamKeys = new ArrayList<>(streamKeyCount);
+    for (int i = 0; i < streamKeyCount; i++) {
+      mutableStreamKeys.add(in.readParcelable(StreamKey.class.getClassLoader()));
+    }
+    streamKeys = Collections.unmodifiableList(mutableStreamKeys);
+    customCacheKey = in.readString();
+    data = new byte[in.readInt()];
+    in.readByteArray(data);
+  }
+
+  /**
+   * Returns a copy with the specified ID.
+   *
+   * @param id The ID of the copy.
+   * @return The copy with the specified ID.
+   */
+  public DownloadAction copyWithId(String id) {
+    return new DownloadAction(id, type, uri, streamKeys, customCacheKey, data);
+  }
+
   /**
    * Returns the result of merging {@code newAction} into this action.
    *
@@ -143,7 +116,6 @@ public final class DownloadAction {
   public DownloadAction copyWithMergedAction(DownloadAction newAction) {
     Assertions.checkState(id.equals(newAction.id));
     Assertions.checkState(type.equals(newAction.type));
-
     List<StreamKey> mergedKeys;
     if (streamKeys.isEmpty() || newAction.streamKeys.isEmpty()) {
       // If either streamKeys is empty then all streams should be downloaded.
@@ -161,18 +133,6 @@ public final class DownloadAction {
         id, type, newAction.uri, mergedKeys, newAction.customCacheKey, newAction.data);
   }
 
-  /** Serializes itself into a byte array. */
-  public byte[] toByteArray() {
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    try {
-      serializeToStream(output);
-    } catch (IOException e) {
-      // ByteArrayOutputStream shouldn't throw IOException.
-      throw new IllegalStateException();
-    }
-    return output.toByteArray();
-  }
-
   @Override
   public boolean equals(@Nullable Object o) {
     if (!(o instanceof DownloadAction)) {
@@ -191,6 +151,7 @@ public final class DownloadAction {
   public final int hashCode() {
     int result = type.hashCode();
     result = 31 * result + id.hashCode();
+    result = 31 * result + type.hashCode();
     result = 31 * result + uri.hashCode();
     result = 31 * result + streamKeys.hashCode();
     result = 31 * result + (customCacheKey != null ? customCacheKey.hashCode() : 0);
@@ -198,101 +159,38 @@ public final class DownloadAction {
     return result;
   }
 
-  // Serialization.
+  // Parcelable implementation.
 
-  /**
-   * Serializes this action into an {@link OutputStream}.
-   *
-   * @param output The stream to write to.
-   */
-  public final void serializeToStream(OutputStream output) throws IOException {
-    // Don't close the stream as it closes the underlying stream too.
-    DataOutputStream dataOutputStream = new DataOutputStream(output);
-    dataOutputStream.writeUTF(type);
-    dataOutputStream.writeInt(VERSION);
-    dataOutputStream.writeUTF(uri.toString());
-    dataOutputStream.writeBoolean(false);
-    dataOutputStream.writeInt(data.length);
-    dataOutputStream.write(data);
-    dataOutputStream.writeInt(streamKeys.size());
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  @Override
+  public void writeToParcel(Parcel dest, int flags) {
+    dest.writeString(id);
+    dest.writeString(type);
+    dest.writeString(uri.toString());
+    dest.writeInt(streamKeys.size());
     for (int i = 0; i < streamKeys.size(); i++) {
-      StreamKey key = streamKeys.get(i);
-      dataOutputStream.writeInt(key.periodIndex);
-      dataOutputStream.writeInt(key.groupIndex);
-      dataOutputStream.writeInt(key.trackIndex);
+      dest.writeParcelable(streamKeys.get(i), /* parcelableFlags= */ 0);
     }
-    dataOutputStream.writeBoolean(customCacheKey != null);
-    if (customCacheKey != null) {
-      dataOutputStream.writeUTF(customCacheKey);
-    }
-    dataOutputStream.writeUTF(id);
-    dataOutputStream.flush();
+    dest.writeString(customCacheKey);
+    dest.writeInt(data.length);
+    dest.writeByteArray(data);
   }
 
-  private static DownloadAction readFromStream(DataInputStream input) throws IOException {
-    String type = input.readUTF();
-    int version = input.readInt();
+  public static final Parcelable.Creator<DownloadAction> CREATOR =
+      new Parcelable.Creator<DownloadAction>() {
 
-    Uri uri = Uri.parse(input.readUTF());
-    boolean isRemoveAction = input.readBoolean();
+        @Override
+        public DownloadAction createFromParcel(Parcel in) {
+          return new DownloadAction(in);
+        }
 
-    int dataLength = input.readInt();
-    byte[] data;
-    if (dataLength != 0) {
-      data = new byte[dataLength];
-      input.readFully(data);
-    } else {
-      data = null;
-    }
-
-    // Serialized version 0 progressive actions did not contain keys.
-    boolean isLegacyProgressive = version == 0 && TYPE_PROGRESSIVE.equals(type);
-    List<StreamKey> keys = new ArrayList<>();
-    if (!isLegacyProgressive) {
-      int keyCount = input.readInt();
-      for (int i = 0; i < keyCount; i++) {
-        keys.add(readKey(type, version, input));
-      }
-    }
-
-    // Serialized version 0 and 1 DASH/HLS/SS actions did not contain a custom cache key.
-    boolean isLegacySegmented =
-        version < 2 && (TYPE_DASH.equals(type) || TYPE_HLS.equals(type) || TYPE_SS.equals(type));
-    String customCacheKey = null;
-    if (!isLegacySegmented) {
-      customCacheKey = input.readBoolean() ? input.readUTF() : null;
-    }
-
-    // Serialized version 0, 1 and 2 did not contain an id.
-    String id = version < 3 ? generateId(uri, customCacheKey) : input.readUTF();
-
-    if (isRemoveAction) {
-      // Remove actions are not supported anymore.
-      throw new UnsupportedActionException();
-    }
-    return new DownloadAction(id, type, uri, keys, customCacheKey, data);
-  }
-
-  /* package */ static String generateId(Uri uri, @Nullable String customCacheKey) {
-    return customCacheKey != null ? customCacheKey : uri.toString();
-  }
-
-  private static StreamKey readKey(String type, int version, DataInputStream input)
-      throws IOException {
-    int periodIndex;
-    int groupIndex;
-    int trackIndex;
-
-    // Serialized version 0 HLS/SS actions did not contain a period index.
-    if ((TYPE_HLS.equals(type) || TYPE_SS.equals(type)) && version == 0) {
-      periodIndex = 0;
-      groupIndex = input.readInt();
-      trackIndex = input.readInt();
-    } else {
-      periodIndex = input.readInt();
-      groupIndex = input.readInt();
-      trackIndex = input.readInt();
-    }
-    return new StreamKey(periodIndex, groupIndex, trackIndex);
-  }
+        @Override
+        public DownloadAction[] newArray(int size) {
+          return new DownloadAction[size];
+        }
+      };
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index 72893f17b0..39dd944552 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -586,8 +586,8 @@ public final class DownloadHelper {
   public DownloadAction getDownloadAction(@Nullable byte[] data) {
     String downloadId = uri.toString();
     if (mediaSource == null) {
-      return DownloadAction.createDownloadAction(
-          downloadId, downloadType, uri, /* keys= */ Collections.emptyList(), cacheKey, data);
+      return new DownloadAction(
+          downloadId, downloadType, uri, /* streamKeys= */ Collections.emptyList(), cacheKey, data);
     }
     assertPreparedWithMedia();
     List<StreamKey> streamKeys = new ArrayList<>();
@@ -601,8 +601,7 @@ public final class DownloadHelper {
       }
       streamKeys.addAll(mediaPreparer.mediaPeriods[periodIndex].getStreamKeys(allSelections));
     }
-    return DownloadAction.createDownloadAction(
-        downloadId, downloadType, uri, streamKeys, cacheKey, data);
+    return new DownloadAction(downloadId, downloadType, uri, streamKeys, cacheKey, data);
   }
 
   // Initialization of array of Lists.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
index 4cbf35f523..02e95eaf4d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
@@ -36,45 +36,40 @@ public final class DownloadIndexUtil {
   private DownloadIndexUtil() {}
 
   /**
-   * Upgrades an {@link ActionFile} to {@link DownloadIndex}.
+   * Merges {@link DownloadAction DownloadActions} contained in an {@link ActionFile} into a {@link
+   * DownloadIndex}.
    *
-   * <p>This method shouldn't be called while {@link DownloadIndex} is used by {@link
+   * <p>This method must not be called while the {@link DownloadIndex} is being used by a {@link
    * DownloadManager}.
    *
-   * @param actionFile The action file to upgrade.
-   * @param downloadIndex Actions are converted to {@link DownloadState}s and stored in this index.
-   * @param downloadIdProvider A nullable custom download id provider.
-   * @throws IOException If there is an error during loading actions.
+   * @param actionFile The action file.
+   * @param downloadIdProvider A custom download id provider, or {@code null}.
+   * @param downloadIndex The index into which the action will be merged.
+   * @throws IOException If an error occurs loading or merging the actions.
    */
-  public static void upgradeActionFile(
+  public static void mergeActionFile(
       ActionFile actionFile,
-      DefaultDownloadIndex downloadIndex,
-      @Nullable DownloadIdProvider downloadIdProvider)
+      @Nullable DownloadIdProvider downloadIdProvider,
+      DefaultDownloadIndex downloadIndex)
       throws IOException {
-    if (downloadIdProvider == null) {
-      downloadIdProvider = downloadAction -> downloadAction.id;
-    }
     for (DownloadAction action : actionFile.load()) {
-      addAction(downloadIndex, downloadIdProvider.getId(action), action);
+      if (downloadIdProvider != null) {
+        action = action.copyWithId(downloadIdProvider.getId(action));
+      }
+      mergeAction(action, downloadIndex);
     }
   }
 
   /**
-   * Converts a {@link DownloadAction} to {@link DownloadState} and stored in the given {@link
-   * DownloadIndex}.
+   * Merges a {@link DownloadAction} into a {@link DownloadIndexUtil}.
    *
-   * <p>This method shouldn't be called while {@link DownloadIndex} is used by {@link
-   * DownloadManager}.
-   *
-   * @param downloadIndex The action is converted to {@link DownloadState} and stored in this index.
-   * @param id A nullable custom download id which overwrites {@link DownloadAction#id}.
-   * @param action The action to be stored in {@link DownloadIndex}.
-   * @throws IOException If an error occurs storing the state in the {@link DownloadIndex}.
+   * @param action The action to be merged.
+   * @param downloadIndex The index into which the action will be merged.
+   * @throws IOException If an error occurs merging the action.
    */
-  public static void addAction(
-      DefaultDownloadIndex downloadIndex, @Nullable String id, DownloadAction action)
+  /* package */ static void mergeAction(DownloadAction action, DefaultDownloadIndex downloadIndex)
       throws IOException {
-    DownloadState downloadState = downloadIndex.getDownloadState(id != null ? id : action.id);
+    DownloadState downloadState = downloadIndex.getDownloadState(action.id);
     if (downloadState != null) {
       downloadState = downloadState.copyWithMergedAction(action);
     } else {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index f10793c5f4..5370ba4182 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -30,7 +30,6 @@ import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.NotificationUtil;
 import com.google.android.exoplayer2.util.Util;
-import java.io.IOException;
 import java.util.HashMap;
 
 /** A {@link Service} for downloading media. */
@@ -54,9 +53,8 @@ public abstract class DownloadService extends Service {
    * Adds a new download. Extras:
    *
    * <ul>
-   *   <li>{@link #KEY_DOWNLOAD_ACTION} - The {@code byte[]} representation of the {@link
-   *       DownloadAction} that defines the download to be added. The required representation can be
-   *       obtained by calling {@link DownloadAction#toByteArray()}.
+   *   <li>{@link #KEY_DOWNLOAD_ACTION} - A {@link DownloadAction} defining the download to be
+   *       added.
    *   <li>{@link #KEY_FOREGROUND} - See {@link #KEY_FOREGROUND}.
    * </ul>
    */
@@ -231,7 +229,7 @@ public abstract class DownloadService extends Service {
       DownloadAction downloadAction,
       boolean foreground) {
     return getIntent(context, clazz, ACTION_ADD)
-        .putExtra(KEY_DOWNLOAD_ACTION, downloadAction.toByteArray())
+        .putExtra(KEY_DOWNLOAD_ACTION, downloadAction)
         .putExtra(KEY_FOREGROUND, foreground);
   }
 
@@ -390,19 +388,11 @@ public abstract class DownloadService extends Service {
         // Do nothing.
         break;
       case ACTION_ADD:
-        byte[] actionData = intent.getByteArrayExtra(KEY_DOWNLOAD_ACTION);
-        if (actionData == null) {
+        DownloadAction downloadAction = intent.getParcelableExtra(KEY_DOWNLOAD_ACTION);
+        if (downloadAction == null) {
           Log.e(TAG, "Ignored ADD action: Missing download_action extra");
         } else {
-          DownloadAction downloadAction = null;
-          try {
-            downloadAction = DownloadAction.fromByteArray(actionData);
-          } catch (IOException e) {
-            Log.e(TAG, "Ignored ADD action: Failed to deserialize download_action extra", e);
-          }
-          if (downloadAction != null) {
-            downloadManager.addDownload(downloadAction);
-          }
+          downloadManager.addDownload(downloadAction);
         }
         break;
       case ACTION_START:
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/StreamKey.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/StreamKey.java
index 4d1de5f32d..977be9a198 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/StreamKey.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/StreamKey.java
@@ -15,6 +15,8 @@
  */
 package com.google.android.exoplayer2.offline;
 
+import android.os.Parcel;
+import android.os.Parcelable;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -25,7 +27,7 @@ import androidx.annotation.Nullable;
  * within the group. The interpretation of these indices depends on the type of media for which the
  * stream key is used.
  */
-public final class StreamKey implements Comparable<StreamKey> {
+public final class StreamKey implements Comparable<StreamKey>, Parcelable {
 
   /** The period index. */
   public final int periodIndex;
@@ -53,6 +55,12 @@ public final class StreamKey implements Comparable<StreamKey> {
     this.trackIndex = trackIndex;
   }
 
+  /* package */ StreamKey(Parcel in) {
+    periodIndex = in.readInt();
+    groupIndex = in.readInt();
+    trackIndex = in.readInt();
+  }
+
   @Override
   public String toString() {
     return periodIndex + "." + groupIndex + "." + trackIndex;
@@ -94,4 +102,32 @@ public final class StreamKey implements Comparable<StreamKey> {
     }
     return result;
   }
+
+  // Parcelable implementation.
+
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  @Override
+  public void writeToParcel(Parcel dest, int flags) {
+    dest.writeInt(periodIndex);
+    dest.writeInt(groupIndex);
+    dest.writeInt(trackIndex);
+  }
+
+  public static final Parcelable.Creator<StreamKey> CREATOR =
+      new Parcelable.Creator<StreamKey>() {
+
+        @Override
+        public StreamKey createFromParcel(Parcel in) {
+          return new StreamKey(in);
+        }
+
+        @Override
+        public StreamKey[] newArray(int size) {
+          return new StreamKey[size];
+        }
+      };
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
index 0d38337dfb..3273fef71f 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
@@ -124,11 +124,11 @@ public class ActionFileTest {
   }
 
   private static DownloadAction buildExpectedAction(Uri uri, byte[] data) {
-    return DownloadAction.createDownloadAction(
+    return new DownloadAction(
         /* id= */ uri.toString(),
         DownloadAction.TYPE_PROGRESSIVE,
         uri,
-        /* keys= */ Collections.emptyList(),
+        /* streamKeys= */ Collections.emptyList(),
         /* customCacheKey= */ null,
         data);
   }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactoryTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactoryTest.java
index c13e69aa01..08a0edd5d6 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactoryTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactoryTest.java
@@ -38,11 +38,11 @@ public final class DefaultDownloaderFactoryTest {
 
     Downloader downloader =
         factory.createDownloader(
-            DownloadAction.createDownloadAction(
+            new DownloadAction(
                 "id",
                 DownloadAction.TYPE_PROGRESSIVE,
                 Uri.parse("https://www.test.com/download"),
-                /* keys= */ Collections.emptyList(),
+                /* streamKeys= */ Collections.emptyList(),
                 /* customCacheKey= */ null,
                 /* data= */ null));
     assertThat(downloader).isInstanceOf(ProgressiveDownloader.class);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
index 2bc6d0809e..0dd00307b9 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
@@ -16,24 +16,11 @@
 package com.google.android.exoplayer2.offline;
 
 import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_DASH;
-import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_HLS;
-import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_PROGRESSIVE;
-import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_SS;
 import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.fail;
 
 import android.net.Uri;
-import androidx.annotation.Nullable;
-import androidx.test.core.app.ApplicationProvider;
+import android.os.Parcel;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.google.android.exoplayer2.offline.DownloadAction.UnsupportedActionException;
-import com.google.android.exoplayer2.testutil.TestUtil;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -47,41 +34,34 @@ public class DownloadActionTest {
 
   private Uri uri1;
   private Uri uri2;
-  private byte[] data;
 
   @Before
   public void setUp() {
     uri1 = Uri.parse("http://test/1.uri");
     uri2 = Uri.parse("http://test/2.uri");
-    data = TestUtil.buildTestData(32);
   }
 
   @Test
-  public void testSameUri_hasSameId() {
-    DownloadAction action1 = createAction(uri1);
-    DownloadAction action2 = createAction(uri1);
-    assertThat(action1.id.equals(action2.id)).isTrue();
-  }
+  public void testParcelable() {
+    ArrayList<StreamKey> streamKeys = new ArrayList<>();
+    streamKeys.add(new StreamKey(1, 2, 3));
+    streamKeys.add(new StreamKey(4, 5, 6));
+    DownloadAction actionToParcel =
+        new DownloadAction(
+            "id",
+            "type",
+            Uri.parse("https://abc.def/ghi"),
+            streamKeys,
+            "key",
+            new byte[] {1, 2, 3, 4, 5});
+    Parcel parcel = Parcel.obtain();
+    actionToParcel.writeToParcel(parcel, 0);
+    parcel.setDataPosition(0);
 
-  @Test
-  public void testSameUriDifferentAction_hasSameId() {
-    DownloadAction action1 = createAction(uri1);
-    DownloadAction action2 = createAction(uri1);
-    assertThat(action1.id.equals(action2.id)).isTrue();
-  }
+    DownloadAction actionFromParcel = DownloadAction.CREATOR.createFromParcel(parcel);
+    assertThat(actionFromParcel).isEqualTo(actionToParcel);
 
-  @Test
-  public void testDifferentUri_IsNotSameMedia() {
-    DownloadAction action1 = createAction(uri1);
-    DownloadAction action2 = createAction(uri2);
-    assertThat(action1.id.equals(action2.id)).isFalse();
-  }
-
-  @Test
-  public void testSameCacheKeyDifferentUri_hasSameId() {
-    DownloadAction action1 = createAction(uri1, "key123");
-    DownloadAction action2 = createAction(uri2, "key123");
-    assertThat(action1.id.equals(action2.id)).isTrue();
+    parcel.recycle();
   }
 
   @SuppressWarnings("EqualsWithItself")
@@ -119,128 +99,6 @@ public class DownloadActionTest {
     assertEqual(action16, action17);
   }
 
-  @Test
-  public void testSerializerWriteRead() throws Exception {
-    assertStreamSerializationRoundTrip(
-        DownloadAction.createDownloadAction(
-            "id",
-            TYPE_DASH,
-            uri1,
-            toList(new StreamKey(0, 1, 2), new StreamKey(3, 4, 5)),
-            "key123",
-            data));
-    assertStreamSerializationRoundTrip(createAction(uri1, "key123"));
-  }
-
-  @Test
-  public void testArraySerialization() throws Exception {
-    assertArraySerializationRoundTrip(
-        DownloadAction.createDownloadAction(
-            "id",
-            TYPE_DASH,
-            uri1,
-            toList(new StreamKey(0, 1, 2), new StreamKey(3, 4, 5)),
-            "key123",
-            data));
-    assertArraySerializationRoundTrip(createAction(uri1, "key123"));
-  }
-
-  @Test
-  public void testSerializerProgressiveVersion0() throws Exception {
-    String customCacheKey = "key123";
-    String expectedId = DownloadAction.generateId(uri1, customCacheKey);
-    assertDeserialization(
-        "progressive-download-v0",
-        DownloadAction.createDownloadAction(
-            expectedId, TYPE_PROGRESSIVE, uri1, Collections.emptyList(), customCacheKey, data));
-    assertUnsupportedAction("progressive-remove-v0");
-  }
-
-  @Test
-  public void testSerializerDashVersion0() throws Exception {
-    assertDeserialization(
-        "dash-download-v0",
-        DownloadAction.createDownloadAction(
-            uri1.toString(),
-            TYPE_DASH,
-            uri1,
-            toList(new StreamKey(0, 1, 2), new StreamKey(3, 4, 5)),
-            /* customCacheKey= */ null,
-            data));
-    assertUnsupportedAction("dash-remove-v0");
-  }
-
-  @Test
-  public void testSerializerHlsVersion0() throws Exception {
-    assertDeserialization(
-        "hls-download-v0",
-        DownloadAction.createDownloadAction(
-            uri1.toString(),
-            TYPE_HLS,
-            uri1,
-            toList(new StreamKey(0, 1), new StreamKey(2, 3)),
-            /* customCacheKey= */ null,
-            data));
-    assertUnsupportedAction("hls-remove-v0");
-  }
-
-  @Test
-  public void testSerializerHlsVersion1() throws Exception {
-    assertDeserialization(
-        "hls-download-v1",
-        DownloadAction.createDownloadAction(
-            uri1.toString(),
-            TYPE_HLS,
-            uri1,
-            toList(new StreamKey(0, 1, 2), new StreamKey(3, 4, 5)),
-            /* customCacheKey= */ null,
-            data));
-    assertUnsupportedAction("hls-remove-v1");
-  }
-
-  @Test
-  public void testSerializerSsVersion0() throws Exception {
-    assertDeserialization(
-        "ss-download-v0",
-        DownloadAction.createDownloadAction(
-            uri1.toString(),
-            TYPE_SS,
-            uri1,
-            toList(new StreamKey(0, 1), new StreamKey(2, 3)),
-            /* customCacheKey= */ null,
-            data));
-    assertUnsupportedAction("ss-remove-v0");
-  }
-
-  @Test
-  public void testSerializerSsVersion1() throws Exception {
-    assertDeserialization(
-        "ss-download-v1",
-        DownloadAction.createDownloadAction(
-            uri1.toString(),
-            TYPE_SS,
-            uri1,
-            toList(new StreamKey(0, 1, 2), new StreamKey(3, 4, 5)),
-            /* customCacheKey= */ null,
-            data));
-    assertUnsupportedAction("ss-remove-v1");
-  }
-
-  private DownloadAction createAction(Uri uri, StreamKey... keys) {
-    return DownloadAction.createDownloadAction(
-        uri.toString(), TYPE_DASH, uri, toList(keys), /* customCacheKey= */ null, data);
-  }
-
-  private DownloadAction createAction(Uri uri, @Nullable String customCacheKey) {
-    return DownloadAction.createDownloadAction(
-        "id",
-        DownloadAction.TYPE_DASH,
-        uri,
-        Collections.emptyList(),
-        customCacheKey,
-        /* data= */ null);
-  }
-
   private static void assertNotEqual(DownloadAction action1, DownloadAction action2) {
     assertThat(action1).isNotEqualTo(action2);
     assertThat(action2).isNotEqualTo(action1);
@@ -251,42 +109,9 @@ public class DownloadActionTest {
     assertThat(action2).isEqualTo(action1);
   }
 
-  private static void assertStreamSerializationRoundTrip(DownloadAction action) throws IOException {
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    DataOutputStream output = new DataOutputStream(out);
-    action.serializeToStream(output);
-
-    ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-    DataInputStream input = new DataInputStream(in);
-    DownloadAction deserializedAction = DownloadAction.deserializeFromStream(input);
-
-    assertEqual(action, deserializedAction);
-  }
-
-  private static void assertArraySerializationRoundTrip(DownloadAction action) throws IOException {
-    assertEqual(action, DownloadAction.fromByteArray(action.toByteArray()));
-  }
-
-  private static void assertDeserialization(String fileName, DownloadAction expectedAction)
-      throws IOException {
-    InputStream input =
-        TestUtil.getInputStream(
-            ApplicationProvider.getApplicationContext(), "download-actions/" + fileName);
-    DownloadAction deserializedAction = DownloadAction.deserializeFromStream(input);
-
-    assertEqual(deserializedAction, expectedAction);
-  }
-
-  private static void assertUnsupportedAction(String fileName) throws IOException {
-    InputStream input =
-        TestUtil.getInputStream(
-            ApplicationProvider.getApplicationContext(), "download-actions/" + fileName);
-    try {
-      DownloadAction.deserializeFromStream(input);
-      fail();
-    } catch (UnsupportedActionException e) {
-      // Expected exception.
-    }
+  private static DownloadAction createAction(Uri uri, StreamKey... keys) {
+    return new DownloadAction(
+        uri.toString(), TYPE_DASH, uri, toList(keys), /* customCacheKey= */ null, /* data= */ null);
   }
 
   private static List<StreamKey> toList(StreamKey... keys) {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
index d321ba00d1..619d36f5ab 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
@@ -59,7 +59,7 @@ public class DownloadIndexUtilTest {
   public void addAction_nonExistingDownloadState_createsNewDownloadState() throws IOException {
     byte[] data = new byte[] {1, 2, 3, 4};
     DownloadAction action =
-        DownloadAction.createDownloadAction(
+        new DownloadAction(
             "id",
             TYPE_DASH,
             Uri.parse("https://www.test.com/download"),
@@ -69,7 +69,7 @@ public class DownloadIndexUtilTest {
             /* customCacheKey= */ "key123",
             data);
 
-    DownloadIndexUtil.addAction(downloadIndex, action.id, action);
+    DownloadIndexUtil.mergeAction(action, downloadIndex);
 
     assertDownloadIndexContainsAction(action, DownloadState.STATE_QUEUED);
   }
@@ -81,7 +81,7 @@ public class DownloadIndexUtilTest {
     StreamKey streamKey2 =
         new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 1, /* trackIndex= */ 2);
     DownloadAction action1 =
-        DownloadAction.createDownloadAction(
+        new DownloadAction(
             "id",
             TYPE_DASH,
             Uri.parse("https://www.test.com/download1"),
@@ -89,16 +89,16 @@ public class DownloadIndexUtilTest {
             /* customCacheKey= */ "key123",
             new byte[] {1, 2, 3, 4});
     DownloadAction action2 =
-        DownloadAction.createDownloadAction(
+        new DownloadAction(
             "id",
             TYPE_DASH,
             Uri.parse("https://www.test.com/download2"),
             asList(streamKey2),
             /* customCacheKey= */ "key123",
             new byte[] {5, 4, 3, 2, 1});
-    DownloadIndexUtil.addAction(downloadIndex, action1.id, action1);
+    DownloadIndexUtil.mergeAction(action1, downloadIndex);
 
-    DownloadIndexUtil.addAction(downloadIndex, action2.id, action2);
+    DownloadIndexUtil.mergeAction(action2, downloadIndex);
 
     DownloadState downloadState = downloadIndex.getDownloadState(action2.id);
     assertThat(downloadState).isNotNull();
@@ -126,7 +126,7 @@ public class DownloadIndexUtilTest {
     StreamKey expectedStreamKey2 =
         new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 1, /* trackIndex= */ 2);
     DownloadAction expectedAction1 =
-        DownloadAction.createDownloadAction(
+        new DownloadAction(
             "key123",
             TYPE_DASH,
             Uri.parse("https://www.test.com/download1"),
@@ -134,7 +134,7 @@ public class DownloadIndexUtilTest {
             /* customCacheKey= */ "key123",
             new byte[] {1, 2, 3, 4});
     DownloadAction expectedAction2 =
-        DownloadAction.createDownloadAction(
+        new DownloadAction(
             "key234",
             TYPE_DASH,
             Uri.parse("https://www.test.com/download2"),
@@ -143,7 +143,7 @@ public class DownloadIndexUtilTest {
             new byte[] {5, 4, 3, 2, 1});
 
     ActionFile actionFile = new ActionFile(tempFile);
-    DownloadIndexUtil.upgradeActionFile(actionFile, downloadIndex, /* downloadIdProvider= */ null);
+    DownloadIndexUtil.mergeActionFile(actionFile, /* downloadIdProvider= */ null, downloadIndex);
     assertDownloadIndexContainsAction(expectedAction1, DownloadState.STATE_QUEUED);
     assertDownloadIndexContainsAction(expectedAction2, DownloadState.STATE_QUEUED);
   }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index e25b2913e3..905b3a25fa 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -507,7 +507,7 @@ public class DownloadManagerTest {
 
     private DownloadRunner postDownloadAction(StreamKey... keys) {
       DownloadAction downloadAction =
-          DownloadAction.createDownloadAction(
+          new DownloadAction(
               id,
               DownloadAction.TYPE_PROGRESSIVE,
               uri,
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
index 6a41494a6f..7b1c8d7423 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
@@ -153,8 +153,7 @@ class DownloadStateBuilder {
   }
 
   public DownloadState build() {
-    DownloadAction action =
-        DownloadAction.createDownloadAction(id, type, uri, streamKeys, cacheKey, customMetadata);
+    DownloadAction action = new DownloadAction(id, type, uri, streamKeys, cacheKey, customMetadata);
     return new DownloadState(
         action,
         state,
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
index 4028677bb2..2f07fa0f6c 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
@@ -99,7 +99,7 @@ public class DownloadStateTest {
   @Test
   public void mergeAction_actionHaveDifferentData_downloadStateDataIsUpdated() {
     DownloadAction downloadAction =
-        DownloadAction.createDownloadAction(
+        new DownloadAction(
             "id",
             DownloadAction.TYPE_DASH,
             testUri,
@@ -246,7 +246,7 @@ public class DownloadStateTest {
   private void doTestMergeActionReturnsMergedKeys(
       StreamKey[] keys1, StreamKey[] keys2, StreamKey[] expectedKeys) {
     DownloadAction downloadAction =
-        DownloadAction.createDownloadAction(
+        new DownloadAction(
             "id",
             DownloadAction.TYPE_DASH,
             testUri,
@@ -286,7 +286,7 @@ public class DownloadStateTest {
   }
 
   private DownloadAction createDownloadAction() {
-    return DownloadAction.createDownloadAction(
+    return new DownloadAction(
         "id",
         DownloadAction.TYPE_DASH,
         testUri,
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/StreamKeyTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/StreamKeyTest.java
new file mode 100644
index 0000000000..a18c278913
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/StreamKeyTest.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.offline;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.os.Parcel;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/** Unit tests for {@link StreamKey}. */
+@RunWith(AndroidJUnit4.class)
+public class StreamKeyTest {
+
+  @Test
+  public void testParcelable() {
+    StreamKey streamKeyToParcel = new StreamKey(1, 2, 3);
+    Parcel parcel = Parcel.obtain();
+    streamKeyToParcel.writeToParcel(parcel, 0);
+    parcel.setDataPosition(0);
+
+    StreamKey streamKeyFromParcel = StreamKey.CREATOR.createFromParcel(parcel);
+    assertThat(streamKeyFromParcel).isEqualTo(streamKeyToParcel);
+
+    parcel.recycle();
+  }
+}
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
index dc112c631d..2b11b0affd 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
@@ -84,7 +84,7 @@ public class DashDownloaderTest {
 
     Downloader downloader =
         factory.createDownloader(
-            DownloadAction.createDownloadAction(
+            new DownloadAction(
                 "id",
                 DownloadAction.TYPE_DASH,
                 Uri.parse("https://www.test.com/download"),
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
index 201b41c9b0..35ca34999f 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
@@ -232,7 +232,7 @@ public class DownloadManagerDashTest {
     ArrayList<StreamKey> keysList = new ArrayList<>();
     Collections.addAll(keysList, keys);
     DownloadAction action =
-        DownloadAction.createDownloadAction(
+        new DownloadAction(
             TEST_ID,
             DownloadAction.TYPE_DASH,
             TEST_MPD_URI,
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
index c06e6aee20..50d044ff10 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
@@ -208,7 +208,7 @@ public class DownloadServiceDashTest {
     ArrayList<StreamKey> keysList = new ArrayList<>();
     Collections.addAll(keysList, keys);
     DownloadAction action =
-        DownloadAction.createDownloadAction(
+        new DownloadAction(
             TEST_ID,
             DownloadAction.TYPE_DASH,
             TEST_MPD_URI,
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
index e591146ca3..b5b4e47385 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
@@ -101,7 +101,7 @@ public class HlsDownloaderTest {
 
     Downloader downloader =
         factory.createDownloader(
-            DownloadAction.createDownloadAction(
+            new DownloadAction(
                 "id",
                 DownloadAction.TYPE_HLS,
                 Uri.parse("https://www.test.com/download"),
diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java
index 510fa522f0..b130f02bc3 100644
--- a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java
+++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java
@@ -44,7 +44,7 @@ public final class SsDownloaderTest {
 
     Downloader downloader =
         factory.createDownloader(
-            DownloadAction.createDownloadAction(
+            new DownloadAction(
                 "id",
                 DownloadAction.TYPE_SS,
                 Uri.parse("https://www.test.com/download"),

From 9779b34885eeb9df3d50afc2fc18ac33c243e39d Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Tue, 9 Apr 2019 17:56:55 +0100
Subject: [PATCH 733/832] Fix Parcelable.Creator#newArray implementations

PiperOrigin-RevId: 242686312
---
 .../android/exoplayer2/metadata/Metadata.java | 22 +++++++++----------
 .../android/exoplayer2/video/ColorInfo.java   | 22 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java
index ff2463dfa7..dd06e1a2cf 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java
@@ -122,16 +122,16 @@ public final class Metadata implements Parcelable {
     }
   }
 
-  public static final Parcelable.Creator<Metadata> CREATOR = new Parcelable.Creator<Metadata>() {
-    @Override
-    public Metadata createFromParcel(Parcel in) {
-      return new Metadata(in);
-    }
-
-    @Override
-    public Metadata[] newArray(int size) {
-      return new Metadata[0];
-    }
-  };
+  public static final Parcelable.Creator<Metadata> CREATOR =
+      new Parcelable.Creator<Metadata>() {
+        @Override
+        public Metadata createFromParcel(Parcel in) {
+          return new Metadata(in);
+        }
 
+        @Override
+        public Metadata[] newArray(int size) {
+          return new Metadata[size];
+        }
+      };
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/ColorInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/video/ColorInfo.java
index a6c62b16f6..1b3943caf7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/ColorInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/ColorInfo.java
@@ -135,16 +135,16 @@ public final class ColorInfo implements Parcelable {
     }
   }
 
-  public static final Parcelable.Creator<ColorInfo> CREATOR = new Parcelable.Creator<ColorInfo>() {
-    @Override
-    public ColorInfo createFromParcel(Parcel in) {
-      return new ColorInfo(in);
-    }
-
-    @Override
-    public ColorInfo[] newArray(int size) {
-      return new ColorInfo[0];
-    }
-  };
+  public static final Parcelable.Creator<ColorInfo> CREATOR =
+      new Parcelable.Creator<ColorInfo>() {
+        @Override
+        public ColorInfo createFromParcel(Parcel in) {
+          return new ColorInfo(in);
+        }
 
+        @Override
+        public ColorInfo[] newArray(int size) {
+          return new ColorInfo[size];
+        }
+      };
 }

From 9e6f9ee9dd090aac086f246e59c736e6155c1353 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 9 Apr 2019 18:12:07 +0100
Subject: [PATCH 734/832] Remove DataSpec self-links.

We usually avoid linking to the same page. Replacing all {@link DataSpec}
with just "data spec" accordingly.

PiperOrigin-RevId: 242689537
---
 .../android/exoplayer2/upstream/DataSpec.java | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java
index 6a4ed43155..a98f773c9d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java
@@ -119,14 +119,14 @@ public final class DataSpec {
   public final long length;
   /**
    * A key that uniquely identifies the original stream. Used for cache indexing. May be null if the
-   * {@link DataSpec} is not intended to be used in conjunction with a cache.
+   * data spec is not intended to be used in conjunction with a cache.
    */
   public final @Nullable String key;
   /** Request {@link Flags flags}. */
   public final @Flags int flags;
 
   /**
-   * Construct a {@link DataSpec} for the given uri and with {@link #key} set to null.
+   * Construct a data spec for the given uri and with {@link #key} set to null.
    *
    * @param uri {@link #uri}.
    */
@@ -135,7 +135,7 @@ public final class DataSpec {
   }
 
   /**
-   * Construct a {@link DataSpec} for the given uri and with {@link #key} set to null.
+   * Construct a data spec for the given uri and with {@link #key} set to null.
    *
    * @param uri {@link #uri}.
    * @param flags {@link #flags}.
@@ -145,7 +145,7 @@ public final class DataSpec {
   }
 
   /**
-   * Construct a {@link DataSpec} where {@link #position} equals {@link #absoluteStreamPosition}.
+   * Construct a data spec where {@link #position} equals {@link #absoluteStreamPosition}.
    *
    * @param uri {@link #uri}.
    * @param absoluteStreamPosition {@link #absoluteStreamPosition}, equal to {@link #position}.
@@ -157,7 +157,7 @@ public final class DataSpec {
   }
 
   /**
-   * Construct a {@link DataSpec} where {@link #position} equals {@link #absoluteStreamPosition}.
+   * Construct a data spec where {@link #position} equals {@link #absoluteStreamPosition}.
    *
    * @param uri {@link #uri}.
    * @param absoluteStreamPosition {@link #absoluteStreamPosition}, equal to {@link #position}.
@@ -171,8 +171,7 @@ public final class DataSpec {
   }
 
   /**
-   * Construct a {@link DataSpec} where {@link #position} may differ from
-   * {@link #absoluteStreamPosition}.
+   * Construct a data spec where {@link #position} may differ from {@link #absoluteStreamPosition}.
    *
    * @param uri {@link #uri}.
    * @param absoluteStreamPosition {@link #absoluteStreamPosition}.
@@ -192,7 +191,7 @@ public final class DataSpec {
   }
 
   /**
-   * Construct a {@link DataSpec} by inferring the {@link #httpMethod} based on the {@code postBody}
+   * Construct a data spec by inferring the {@link #httpMethod} based on the {@code postBody}
    * parameter. If postBody is non-null, then httpMethod is set to {@link #HTTP_METHOD_POST}. If
    * postBody is null, then httpMethod is set to {@link #HTTP_METHOD_GET}.
    *
@@ -225,8 +224,7 @@ public final class DataSpec {
   }
 
   /**
-   * Construct a {@link DataSpec} where {@link #position} may differ from {@link
-   * #absoluteStreamPosition}.
+   * Construct a data spec where {@link #position} may differ from {@link #absoluteStreamPosition}.
    *
    * @param uri {@link #uri}.
    * @param httpMethod {@link #httpMethod}.
@@ -317,22 +315,22 @@ public final class DataSpec {
   }
 
   /**
-   * Returns a {@link DataSpec} that represents a subrange of the data defined by this DataSpec. The
+   * Returns a data spec that represents a subrange of the data defined by this DataSpec. The
    * subrange includes data from the offset up to the end of this DataSpec.
    *
    * @param offset The offset of the subrange.
-   * @return A {@link DataSpec} that represents a subrange of the data defined by this DataSpec.
+   * @return A data spec that represents a subrange of the data defined by this DataSpec.
    */
   public DataSpec subrange(long offset) {
     return subrange(offset, length == C.LENGTH_UNSET ? C.LENGTH_UNSET : length - offset);
   }
 
   /**
-   * Returns a {@link DataSpec} that represents a subrange of the data defined by this DataSpec.
+   * Returns a data spec that represents a subrange of the data defined by this DataSpec.
    *
    * @param offset The offset of the subrange.
    * @param length The length of the subrange.
-   * @return A {@link DataSpec} that represents a subrange of the data defined by this DataSpec.
+   * @return A data spec that represents a subrange of the data defined by this DataSpec.
    */
   public DataSpec subrange(long offset, long length) {
     if (offset == 0 && this.length == length) {
@@ -351,10 +349,10 @@ public final class DataSpec {
   }
 
   /**
-   * Returns a copy of this {@link DataSpec} with the specified Uri.
+   * Returns a copy of this data spec with the specified Uri.
    *
    * @param uri The new source {@link Uri}.
-   * @return The copied {@link DataSpec} with the specified Uri.
+   * @return The copied data spec with the specified Uri.
    */
   public DataSpec withUri(Uri uri) {
     return new DataSpec(

From 3f565c33befdbd260958b0a0eb1e2d9468efaf82 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 9 Apr 2019 20:03:32 +0100
Subject: [PATCH 735/832] Simplify offline Requirements

- Remove NETWORK_TYPE_NOT_ROAMING and NETWORK_TYPE_METERED
  because JobScheduler doesn't support them, and they're
  probably not useful to many people (data when roaming is
  normally enabled/disabled at the OS level, and restricting
  to *only* metered networks seems niche)
- Convert network requirements proper flags
- Stop persisting requirements in DownloadIndex. The direction
  we're headed to solve the manager start/stop problem is
  going to involve state in DownloadManager determining whether
  downloads actually start, and if we're doing that then it's
  no worse to do it for this as well

PiperOrigin-RevId: 242713196
---
 .../jobdispatcher/JobDispatcherScheduler.java |  16 +-
 .../offline/DefaultDownloadIndex.java         |  18 +-
 .../exoplayer2/offline/DownloadIndexUtil.java |   2 +-
 .../exoplayer2/offline/DownloadManager.java   |  10 +-
 .../exoplayer2/offline/DownloadState.java     |  24 +-
 .../scheduler/PlatformScheduler.java          |  33 +--
 .../exoplayer2/scheduler/Requirements.java    | 205 ++++++------------
 .../scheduler/RequirementsWatcher.java        |   2 +-
 .../offline/DefaultDownloadIndexTest.java     |   1 -
 .../offline/DownloadStateBuilder.java         |   7 -
 .../exoplayer2/offline/DownloadStateTest.java |  44 ++--
 11 files changed, 111 insertions(+), 251 deletions(-)

diff --git a/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java b/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java
index c676091d32..790f5ca4e5 100644
--- a/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java
+++ b/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java
@@ -104,18 +104,10 @@ public final class JobDispatcherScheduler implements Scheduler {
             .setService(JobDispatcherSchedulerService.class) // the JobService that will be called
             .setTag(tag);
 
-    switch (requirements.getRequiredNetworkType()) {
-      case Requirements.NETWORK_TYPE_NONE:
-        // do nothing.
-        break;
-      case Requirements.NETWORK_TYPE_ANY:
-        builder.addConstraint(Constraint.ON_ANY_NETWORK);
-        break;
-      case Requirements.NETWORK_TYPE_UNMETERED:
-        builder.addConstraint(Constraint.ON_UNMETERED_NETWORK);
-        break;
-      default:
-        throw new UnsupportedOperationException();
+    if (requirements.isUnmeteredNetworkRequired()) {
+      builder.addConstraint(Constraint.ON_UNMETERED_NETWORK);
+    } else if (requirements.isNetworkRequired()) {
+      builder.addConstraint(Constraint.ON_ANY_NETWORK);
     }
 
     if (requirements.isIdleRequired()) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
index 16e5c37b3d..82d34e983f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -57,15 +57,20 @@ public final class DefaultDownloadIndex implements DownloadIndex {
   private static final String COLUMN_DOWNLOADED_BYTES = "downloaded_bytes";
   private static final String COLUMN_TOTAL_BYTES = "total_bytes";
   private static final String COLUMN_FAILURE_REASON = "failure_reason";
-  private static final String COLUMN_NOT_MET_REQUIREMENTS = "not_met_requirements";
   private static final String COLUMN_MANUAL_STOP_REASON = "manual_stop_reason";
   private static final String COLUMN_START_TIME_MS = "start_time_ms";
   private static final String COLUMN_UPDATE_TIME_MS = "update_time_ms";
 
+  /** @deprecated No longer used. */
   @SuppressWarnings("DeprecatedIsStillUsed")
   @Deprecated
   private static final String COLUMN_STOP_FLAGS = "stop_flags";
 
+  /** @deprecated No longer used. */
+  @SuppressWarnings("DeprecatedIsStillUsed")
+  @Deprecated
+  private static final String COLUMN_NOT_MET_REQUIREMENTS = "not_met_requirements";
+
   private static final int COLUMN_INDEX_ID = 0;
   private static final int COLUMN_INDEX_TYPE = 1;
   private static final int COLUMN_INDEX_URI = 2;
@@ -77,10 +82,9 @@ public final class DefaultDownloadIndex implements DownloadIndex {
   private static final int COLUMN_INDEX_DOWNLOADED_BYTES = 8;
   private static final int COLUMN_INDEX_TOTAL_BYTES = 9;
   private static final int COLUMN_INDEX_FAILURE_REASON = 10;
-  private static final int COLUMN_INDEX_NOT_MET_REQUIREMENTS = 11;
-  private static final int COLUMN_INDEX_MANUAL_STOP_REASON = 12;
-  private static final int COLUMN_INDEX_START_TIME_MS = 13;
-  private static final int COLUMN_INDEX_UPDATE_TIME_MS = 14;
+  private static final int COLUMN_INDEX_MANUAL_STOP_REASON = 11;
+  private static final int COLUMN_INDEX_START_TIME_MS = 12;
+  private static final int COLUMN_INDEX_UPDATE_TIME_MS = 13;
 
   private static final String WHERE_ID_EQUALS = COLUMN_ID + " = ?";
   private static final String WHERE_STATE_TERMINAL =
@@ -99,7 +103,6 @@ public final class DefaultDownloadIndex implements DownloadIndex {
         COLUMN_DOWNLOADED_BYTES,
         COLUMN_TOTAL_BYTES,
         COLUMN_FAILURE_REASON,
-        COLUMN_NOT_MET_REQUIREMENTS,
         COLUMN_MANUAL_STOP_REASON,
         COLUMN_START_TIME_MS,
         COLUMN_UPDATE_TIME_MS
@@ -204,7 +207,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
     values.put(COLUMN_TOTAL_BYTES, downloadState.getTotalBytes());
     values.put(COLUMN_FAILURE_REASON, downloadState.failureReason);
     values.put(COLUMN_STOP_FLAGS, 0);
-    values.put(COLUMN_NOT_MET_REQUIREMENTS, downloadState.notMetRequirements);
+    values.put(COLUMN_NOT_MET_REQUIREMENTS, 0);
     values.put(COLUMN_MANUAL_STOP_REASON, downloadState.manualStopReason);
     values.put(COLUMN_START_TIME_MS, downloadState.startTimeMs);
     values.put(COLUMN_UPDATE_TIME_MS, downloadState.updateTimeMs);
@@ -356,7 +359,6 @@ public final class DefaultDownloadIndex implements DownloadIndex {
         action,
         cursor.getInt(COLUMN_INDEX_STATE),
         cursor.getInt(COLUMN_INDEX_FAILURE_REASON),
-        cursor.getInt(COLUMN_INDEX_NOT_MET_REQUIREMENTS),
         cursor.getInt(COLUMN_INDEX_MANUAL_STOP_REASON),
         cursor.getLong(COLUMN_INDEX_START_TIME_MS),
         cursor.getLong(COLUMN_INDEX_UPDATE_TIME_MS),
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
index 02e95eaf4d..179a2a87f9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
@@ -71,7 +71,7 @@ public final class DownloadIndexUtil {
       throws IOException {
     DownloadState downloadState = downloadIndex.getDownloadState(action.id);
     if (downloadState != null) {
-      downloadState = downloadState.copyWithMergedAction(action);
+      downloadState = downloadState.copyWithMergedAction(action, /* canStart= */ true);
     } else {
       downloadState = new DownloadState(action);
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 57cea6a54e..05a13f7df0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -113,8 +113,7 @@ public final class DownloadManager {
   /** The default minimum number of times a download must be retried before failing. */
   public static final int DEFAULT_MIN_RETRY_COUNT = 5;
   /** The default requirement is that the device has network connectivity. */
-  public static final Requirements DEFAULT_REQUIREMENTS =
-      new Requirements(Requirements.NETWORK_TYPE_ANY, false, false);
+  public static final Requirements DEFAULT_REQUIREMENTS = new Requirements(Requirements.NETWORK);
 
   // Messages posted to the main handler.
   private static final int MSG_INITIALIZED = 0;
@@ -623,7 +622,8 @@ public final class DownloadManager {
         downloadState = new DownloadState(action);
         logd("Download state is created for " + action.id);
       } else {
-        downloadState = downloadState.copyWithMergedAction(action);
+        downloadState =
+            downloadState.copyWithMergedAction(action, /* canStart= */ notMetRequirements == 0);
         logd("Download state is loaded for " + action.id);
       }
       addDownloadForState(downloadState);
@@ -840,7 +840,8 @@ public final class DownloadManager {
     }
 
     public void addAction(DownloadAction newAction) {
-      downloadState = downloadState.copyWithMergedAction(newAction);
+      downloadState =
+          downloadState.copyWithMergedAction(newAction, /* canStart= */ notMetRequirements == 0);
       initialize();
     }
 
@@ -854,7 +855,6 @@ public final class DownloadManager {
               downloadState.action,
               state,
               state != STATE_FAILED ? FAILURE_REASON_NONE : failureReason,
-              notMetRequirements,
               manualStopReason,
               downloadState.startTimeMs,
               /* updateTimeMs= */ System.currentTimeMillis(),
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
index 5e7a54b7e7..7a6bcd0753 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
@@ -17,8 +17,6 @@ package com.google.android.exoplayer2.offline;
 
 import androidx.annotation.IntDef;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.scheduler.Requirements;
-import com.google.android.exoplayer2.scheduler.Requirements.RequirementFlags;
 import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
 import com.google.android.exoplayer2.util.Assertions;
 import java.lang.annotation.Documented;
@@ -124,8 +122,6 @@ public final class DownloadState {
    * #FAILURE_REASON_NONE}.
    */
   @FailureReason public final int failureReason;
-  /** Not met requirements to download. */
-  @Requirements.RequirementFlags public final int notMetRequirements;
   /** The manual stop reason. */
   public final int manualStopReason;
 
@@ -145,7 +141,6 @@ public final class DownloadState {
         action,
         /* state= */ STATE_QUEUED,
         FAILURE_REASON_NONE,
-        /* notMetRequirements= */ 0,
         /* manualStopReason= */ 0,
         /* startTimeMs= */ currentTimeMs,
         /* updateTimeMs= */ currentTimeMs,
@@ -156,20 +151,18 @@ public final class DownloadState {
       DownloadAction action,
       @State int state,
       @FailureReason int failureReason,
-      @RequirementFlags int notMetRequirements,
       int manualStopReason,
       long startTimeMs,
       long updateTimeMs,
       CachingCounters counters) {
     Assertions.checkNotNull(counters);
     Assertions.checkState((failureReason == FAILURE_REASON_NONE) == (state != STATE_FAILED));
-    if (manualStopReason != 0 || notMetRequirements != 0) {
+    if (manualStopReason != 0) {
       Assertions.checkState(state != STATE_DOWNLOADING && state != STATE_QUEUED);
     }
     this.action = action;
     this.state = state;
     this.failureReason = failureReason;
-    this.notMetRequirements = notMetRequirements;
     this.manualStopReason = manualStopReason;
     this.startTimeMs = startTimeMs;
     this.updateTimeMs = updateTimeMs;
@@ -181,14 +174,14 @@ public final class DownloadState {
    * must have the same id and type.
    *
    * @param newAction The {@link DownloadAction} to be merged.
+   * @param canStart Whether the download is eligible to be started.
    * @return A new {@link DownloadState}.
    */
-  public DownloadState copyWithMergedAction(DownloadAction newAction) {
+  public DownloadState copyWithMergedAction(DownloadAction newAction, boolean canStart) {
     return new DownloadState(
         action.copyWithMergedAction(newAction),
-        getNextState(state, manualStopReason != 0 || notMetRequirements != 0),
+        getNextState(state, canStart && manualStopReason == 0),
         FAILURE_REASON_NONE,
-        notMetRequirements,
         manualStopReason,
         startTimeMs,
         /* updateTimeMs= */ System.currentTimeMillis(),
@@ -205,7 +198,6 @@ public final class DownloadState {
         action,
         state,
         FAILURE_REASON_NONE,
-        notMetRequirements,
         manualStopReason,
         startTimeMs,
         /* updateTimeMs= */ System.currentTimeMillis(),
@@ -240,13 +232,13 @@ public final class DownloadState {
     this.counters = counters;
   }
 
-  private static int getNextState(int currentState, boolean isStopped) {
+  private static int getNextState(int currentState, boolean canStart) {
     if (currentState == STATE_REMOVING || currentState == STATE_RESTARTING) {
       return STATE_RESTARTING;
-    } else if (isStopped) {
-      return STATE_STOPPED;
-    } else {
+    } else if (canStart) {
       return STATE_QUEUED;
+    } else {
+      return STATE_STOPPED;
     }
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java
index ec0bfe150f..fc8e8b61a5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java
@@ -93,36 +93,11 @@ public final class PlatformScheduler implements Scheduler {
       String servicePackage) {
     JobInfo.Builder builder = new JobInfo.Builder(jobId, jobServiceComponentName);
 
-    int networkType;
-    switch (requirements.getRequiredNetworkType()) {
-      case Requirements.NETWORK_TYPE_NONE:
-        networkType = JobInfo.NETWORK_TYPE_NONE;
-        break;
-      case Requirements.NETWORK_TYPE_ANY:
-        networkType = JobInfo.NETWORK_TYPE_ANY;
-        break;
-      case Requirements.NETWORK_TYPE_UNMETERED:
-        networkType = JobInfo.NETWORK_TYPE_UNMETERED;
-        break;
-      case Requirements.NETWORK_TYPE_NOT_ROAMING:
-        if (Util.SDK_INT >= 24) {
-          networkType = JobInfo.NETWORK_TYPE_NOT_ROAMING;
-        } else {
-          throw new UnsupportedOperationException();
-        }
-        break;
-      case Requirements.NETWORK_TYPE_METERED:
-        if (Util.SDK_INT >= 26) {
-          networkType = JobInfo.NETWORK_TYPE_METERED;
-        } else {
-          throw new UnsupportedOperationException();
-        }
-        break;
-      default:
-        throw new UnsupportedOperationException();
+    if (requirements.isUnmeteredNetworkRequired()) {
+      builder.setRequiredNetworkType(JobInfo.NETWORK_TYPE_UNMETERED);
+    } else if (requirements.isNetworkRequired()) {
+      builder.setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY);
     }
-
-    builder.setRequiredNetworkType(networkType);
     builder.setRequiresDeviceIdle(requirements.isIdleRequired());
     builder.setRequiresCharging(requirements.isChargingRequired());
     builder.setPersisted(true);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
index 0aa8a63339..28aa37ee2a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
@@ -25,7 +25,6 @@ import android.net.NetworkInfo;
 import android.os.BatteryManager;
 import android.os.PowerManager;
 import androidx.annotation.IntDef;
-import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
 import java.lang.annotation.Documented;
@@ -38,112 +37,60 @@ import java.lang.annotation.RetentionPolicy;
 public final class Requirements {
 
   /**
-   * Network types. One of {@link #NETWORK_TYPE_NONE}, {@link #NETWORK_TYPE_ANY}, {@link
-   * #NETWORK_TYPE_UNMETERED}, {@link #NETWORK_TYPE_NOT_ROAMING} or {@link #NETWORK_TYPE_METERED}.
-   */
-  @Documented
-  @Retention(RetentionPolicy.SOURCE)
-  @IntDef({
-    NETWORK_TYPE_NONE,
-    NETWORK_TYPE_ANY,
-    NETWORK_TYPE_UNMETERED,
-    NETWORK_TYPE_NOT_ROAMING,
-    NETWORK_TYPE_METERED,
-  })
-  public @interface NetworkType {}
-
-  /**
-   * Requirement flags.
-   *
-   * <p>Combination of the following values is possible:
-   *
-   * <ul>
-   *   <li>Only one of {@link #NETWORK_TYPE_ANY}, {@link #NETWORK_TYPE_UNMETERED}, {@link
-   *       #NETWORK_TYPE_NOT_ROAMING} or {@link #NETWORK_TYPE_METERED}.
-   *   <li>{@link #DEVICE_IDLE}
-   *   <li>{@link #DEVICE_CHARGING}
-   *       <ul>
+   * Requirement flags. Possible flag values are {@link #NETWORK}, {@link #NETWORK_UNMETERED},
+   * {@link #DEVICE_IDLE} and {@link #DEVICE_CHARGING}.
    */
   @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef(
       flag = true,
-      value = {
-        NETWORK_TYPE_ANY,
-        NETWORK_TYPE_UNMETERED,
-        NETWORK_TYPE_NOT_ROAMING,
-        NETWORK_TYPE_METERED,
-        DEVICE_IDLE,
-        DEVICE_CHARGING
-      })
+      value = {NETWORK, NETWORK_UNMETERED, DEVICE_IDLE, DEVICE_CHARGING})
   public @interface RequirementFlags {}
 
-  /** This job doesn't require network connectivity. */
-  public static final int NETWORK_TYPE_NONE = 0;
-  /** This job requires network connectivity. */
-  public static final int NETWORK_TYPE_ANY = 1;
-  /** This job requires network connectivity that is unmetered. */
-  public static final int NETWORK_TYPE_UNMETERED = 1 << 1;
-  /** This job requires network connectivity that is not roaming. */
-  public static final int NETWORK_TYPE_NOT_ROAMING = 1 << 2;
-  /** This job requires metered connectivity such as most cellular data networks. */
-  public static final int NETWORK_TYPE_METERED = 1 << 3;
-  /** This job requires the device to be idle. */
-  public static final int DEVICE_IDLE = 1 << 4;
-  /** This job requires the device to be charging. */
-  public static final int DEVICE_CHARGING = 1 << 5;
-
-  private static final int NETWORK_TYPE_MASK = 0b1111;
+  /** Requirement that the device has network connectivity. */
+  public static final int NETWORK = 1;
+  /** Requirement that the device has a network connection that is unmetered. */
+  public static final int NETWORK_UNMETERED = 1 << 1;
+  /** Requirement that the device is idle. */
+  public static final int DEVICE_IDLE = 1 << 2;
+  /** Requirement that the device is charging. */
+  public static final int DEVICE_CHARGING = 1 << 3;
 
   private static final String TAG = "Requirements";
 
-  private static final String[] NETWORK_TYPE_STRINGS;
-
-  static {
-    if (Scheduler.DEBUG) {
-      NETWORK_TYPE_STRINGS =
-          new String[] {
-            "NETWORK_TYPE_NONE",
-            "NETWORK_TYPE_ANY",
-            "NETWORK_TYPE_UNMETERED",
-            "NETWORK_TYPE_NOT_ROAMING",
-            "NETWORK_TYPE_METERED"
-          };
-    } else {
-      NETWORK_TYPE_STRINGS = null;
-    }
-  }
-
   @RequirementFlags private final int requirements;
 
-  /**
-   * @param networkType Required network type.
-   * @param charging Whether the device should be charging.
-   * @param idle Whether the device should be idle.
-   */
-  public Requirements(@NetworkType int networkType, boolean charging, boolean idle) {
-    this(networkType | (charging ? DEVICE_CHARGING : 0) | (idle ? DEVICE_IDLE : 0));
-  }
-
   /** @param requirements A combination of requirement flags. */
   public Requirements(@RequirementFlags int requirements) {
+    if ((requirements & NETWORK_UNMETERED) != 0) {
+      // Make sure network requirement flags are consistent.
+      requirements |= NETWORK;
+    }
     this.requirements = requirements;
-    int networkType = getRequiredNetworkType();
-    // Check if only one network type is specified.
-    Assertions.checkState((networkType & (networkType - 1)) == 0);
   }
 
-  /** Returns required network type. */
-  public int getRequiredNetworkType() {
-    return requirements & NETWORK_TYPE_MASK;
+  /** Returns the requirements. */
+  @RequirementFlags
+  public int getRequirements() {
+    return requirements;
   }
 
-  /** Returns whether the device should be charging. */
+  /** Returns whether network connectivity is required. */
+  public boolean isNetworkRequired() {
+    return (requirements & NETWORK) != 0;
+  }
+
+  /** Returns whether un-metered network connectivity is required. */
+  public boolean isUnmeteredNetworkRequired() {
+    return (requirements & NETWORK_UNMETERED) != 0;
+  }
+
+  /** Returns whether the device is required to be charging. */
   public boolean isChargingRequired() {
     return (requirements & DEVICE_CHARGING) != 0;
   }
 
-  /** Returns whether the device should be idle. */
+  /** Returns whether the device is required to be idle. */
   public boolean isIdleRequired() {
     return (requirements & DEVICE_IDLE) != 0;
   }
@@ -159,62 +106,47 @@ public final class Requirements {
   }
 
   /**
-   * Returns {@link RequirementFlags} that are not met, or 0.
+   * Returns requirements that are not met, or 0.
    *
    * @param context Any context.
-   * @return RequirementFlags that are not met, or 0.
+   * @return The requirements that are not met, or 0.
    */
   @RequirementFlags
   public int getNotMetRequirements(Context context) {
-    return (!checkNetworkRequirements(context) ? getRequiredNetworkType() : 0)
-        | (!checkChargingRequirement(context) ? DEVICE_CHARGING : 0)
-        | (!checkIdleRequirement(context) ? DEVICE_IDLE : 0);
-  }
-
-  /** Returns the requirement flags. */
-  @RequirementFlags
-  public int getRequirements() {
-    return requirements;
-  }
-
-  private boolean checkNetworkRequirements(Context context) {
-    int networkRequirement = getRequiredNetworkType();
-    if (networkRequirement == NETWORK_TYPE_NONE) {
-      return true;
+    @RequirementFlags int notMetRequirements = getNotMetNetworkRequirements(context);
+    if (isChargingRequired() && !isDeviceCharging(context)) {
+      notMetRequirements |= DEVICE_CHARGING;
     }
+    if (isIdleRequired() && !isDeviceIdle(context)) {
+      notMetRequirements |= DEVICE_IDLE;
+    }
+    return notMetRequirements;
+  }
+
+  @RequirementFlags
+  private int getNotMetNetworkRequirements(Context context) {
+    if (!isNetworkRequired()) {
+      return 0;
+    }
+
     ConnectivityManager connectivityManager =
         (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
     NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
-    if (networkInfo == null || !networkInfo.isConnected()) {
-      logd("No network info or no connection.");
-      return false;
+    if (networkInfo == null
+        || !networkInfo.isConnected()
+        || !isInternetConnectivityValidated(connectivityManager)) {
+      logd("No network info, connection or connectivity.");
+      return requirements & (NETWORK | NETWORK_UNMETERED);
     }
-    if (!checkInternetConnectivity(connectivityManager)) {
-      return false;
+
+    if (isUnmeteredNetworkRequired() && connectivityManager.isActiveNetworkMetered()) {
+      return NETWORK_UNMETERED;
     }
-    if (networkRequirement == NETWORK_TYPE_ANY) {
-      return true;
-    }
-    if (networkRequirement == NETWORK_TYPE_NOT_ROAMING) {
-      boolean roaming = networkInfo.isRoaming();
-      logd("Roaming: " + roaming);
-      return !roaming;
-    }
-    boolean activeNetworkMetered = connectivityManager.isActiveNetworkMetered();
-    logd("Metered network: " + activeNetworkMetered);
-    if (networkRequirement == NETWORK_TYPE_UNMETERED) {
-      return !activeNetworkMetered;
-    }
-    if (networkRequirement == NETWORK_TYPE_METERED) {
-      return activeNetworkMetered;
-    }
-    throw new IllegalStateException();
+
+    return 0;
   }
 
-  private boolean checkChargingRequirement(Context context) {
-    if (!isChargingRequired()) {
-      return true;
-    }
+  private boolean isDeviceCharging(Context context) {
     Intent batteryStatus =
         context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
     if (batteryStatus == null) {
@@ -225,17 +157,14 @@ public final class Requirements {
         || status == BatteryManager.BATTERY_STATUS_FULL;
   }
 
-  private boolean checkIdleRequirement(Context context) {
-    if (!isIdleRequired()) {
-      return true;
-    }
+  private boolean isDeviceIdle(Context context) {
     PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
     return Util.SDK_INT >= 23
         ? powerManager.isDeviceIdleMode()
         : Util.SDK_INT >= 20 ? !powerManager.isInteractive() : !powerManager.isScreenOn();
   }
 
-  private static boolean checkInternetConnectivity(ConnectivityManager connectivityManager) {
+  private static boolean isInternetConnectivityValidated(ConnectivityManager connectivityManager) {
     if (Util.SDK_INT < 23) {
       // TODO Check internet connectivity using http://clients3.google.com/generate_204 on API
       // levels prior to 23.
@@ -261,18 +190,6 @@ public final class Requirements {
     }
   }
 
-  @Override
-  public String toString() {
-    if (!Scheduler.DEBUG) {
-      return super.toString();
-    }
-    return "requirements{"
-        + NETWORK_TYPE_STRINGS[getRequiredNetworkType()]
-        + (isChargingRequired() ? ",charging" : "")
-        + (isIdleRequired() ? ",idle" : "")
-        + '}';
-  }
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
index 98bc7b4242..d2ad357ff6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
@@ -89,7 +89,7 @@ public final class RequirementsWatcher {
     notMetRequirements = requirements.getNotMetRequirements(context);
 
     IntentFilter filter = new IntentFilter();
-    if (requirements.getRequiredNetworkType() != Requirements.NETWORK_TYPE_NONE) {
+    if (requirements.isNetworkRequired()) {
       if (Util.SDK_INT >= 23) {
         registerNetworkCallbackV23();
       } else {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
index c537eb1152..c80120900f 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
@@ -81,7 +81,6 @@ public class DefaultDownloadIndexTest {
             .setDownloadedBytes(200)
             .setTotalBytes(400)
             .setFailureReason(DownloadState.FAILURE_REASON_UNKNOWN)
-            .setNotMetRequirements(0x87654321)
             .setManualStopReason(0x12345678)
             .setStartTimeMs(10)
             .setUpdateTimeMs(20)
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
index 7b1c8d7423..f94740374a 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
@@ -37,7 +37,6 @@ class DownloadStateBuilder {
   @Nullable private String cacheKey;
   private int state;
   private int failureReason;
-  private int notMetRequirements;
   private int manualStopReason;
   private long startTimeMs;
   private long updateTimeMs;
@@ -122,11 +121,6 @@ class DownloadStateBuilder {
     return this;
   }
 
-  public DownloadStateBuilder setNotMetRequirements(int notMetRequirements) {
-    this.notMetRequirements = notMetRequirements;
-    return this;
-  }
-
   public DownloadStateBuilder setManualStopReason(int manualStopReason) {
     this.manualStopReason = manualStopReason;
     return this;
@@ -158,7 +152,6 @@ class DownloadStateBuilder {
         action,
         state,
         failureReason,
-        notMetRequirements,
         manualStopReason,
         startTimeMs,
         updateTimeMs,
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
index 2f07fa0f6c..fd9104b596 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
@@ -47,7 +47,7 @@ public class DownloadStateTest {
             .build();
 
     try {
-      downloadState.copyWithMergedAction(downloadAction);
+      downloadState.copyWithMergedAction(downloadAction, /* canStart= */ true);
       fail();
     } catch (Exception e) {
       // Expected.
@@ -64,7 +64,7 @@ public class DownloadStateTest {
             .build();
 
     try {
-      downloadState.copyWithMergedAction(downloadAction);
+      downloadState.copyWithMergedAction(downloadAction, /* canStart= */ true);
       fail();
     } catch (Exception e) {
       // Expected.
@@ -78,7 +78,7 @@ public class DownloadStateTest {
         new DownloadStateBuilder(downloadAction).setState(DownloadState.STATE_QUEUED);
     DownloadState downloadState = downloadStateBuilder.build();
 
-    downloadState.copyWithMergedAction(downloadAction);
+    downloadState.copyWithMergedAction(downloadAction, /* canStart= */ true);
   }
 
   @Test
@@ -90,7 +90,8 @@ public class DownloadStateTest {
             .setState(DownloadState.STATE_QUEUED);
     DownloadState downloadState = downloadStateBuilder.build();
 
-    DownloadState mergedDownloadState = downloadState.copyWithMergedAction(downloadAction);
+    DownloadState mergedDownloadState =
+        downloadState.copyWithMergedAction(downloadAction, /* canStart= */ true);
 
     DownloadState expectedDownloadState = downloadStateBuilder.setUri(downloadAction.uri).build();
     assertEqual(mergedDownloadState, expectedDownloadState);
@@ -112,7 +113,8 @@ public class DownloadStateTest {
             .setCustomMetadata(new byte[0]);
     DownloadState downloadState = downloadStateBuilder.build();
 
-    DownloadState mergedDownloadState = downloadState.copyWithMergedAction(downloadAction);
+    DownloadState mergedDownloadState =
+        downloadState.copyWithMergedAction(downloadAction, /* canStart= */ true);
 
     DownloadState expectedDownloadState =
         downloadStateBuilder.setCustomMetadata(downloadAction.data).build();
@@ -126,7 +128,8 @@ public class DownloadStateTest {
         new DownloadStateBuilder(downloadAction).setState(DownloadState.STATE_REMOVING);
     DownloadState downloadState = downloadStateBuilder.build();
 
-    DownloadState mergedDownloadState = downloadState.copyWithMergedAction(downloadAction);
+    DownloadState mergedDownloadState =
+        downloadState.copyWithMergedAction(downloadAction, /* canStart= */ true);
 
     DownloadState expectedDownloadState =
         downloadStateBuilder.setState(DownloadState.STATE_RESTARTING).build();
@@ -142,7 +145,8 @@ public class DownloadStateTest {
             .setFailureReason(DownloadState.FAILURE_REASON_UNKNOWN);
     DownloadState downloadState = downloadStateBuilder.build();
 
-    DownloadState mergedDownloadState = downloadState.copyWithMergedAction(downloadAction);
+    DownloadState mergedDownloadState =
+        downloadState.copyWithMergedAction(downloadAction, /* canStart= */ true);
 
     DownloadState expectedDownloadState =
         downloadStateBuilder
@@ -161,7 +165,8 @@ public class DownloadStateTest {
             .setManualStopReason(DownloadState.MANUAL_STOP_REASON_UNDEFINED);
     DownloadState downloadState = downloadStateBuilder.build();
 
-    DownloadState mergedDownloadState = downloadState.copyWithMergedAction(downloadAction);
+    DownloadState mergedDownloadState =
+        downloadState.copyWithMergedAction(downloadAction, /* canStart= */ true);
 
     assertEqual(mergedDownloadState, downloadState);
   }
@@ -175,23 +180,8 @@ public class DownloadStateTest {
             .setManualStopReason(DownloadState.MANUAL_STOP_REASON_UNDEFINED);
     DownloadState downloadState = downloadStateBuilder.build();
 
-    DownloadState mergedDownloadState = downloadState.copyWithMergedAction(downloadAction);
-
-    DownloadState expectedDownloadState =
-        downloadStateBuilder.setState(DownloadState.STATE_STOPPED).build();
-    assertEqual(mergedDownloadState, expectedDownloadState);
-  }
-
-  @Test
-  public void mergeAction_notMetRequirementsSetButNotInStoppedState_stateBecomesStopped() {
-    DownloadAction downloadAction = createDownloadAction();
-    DownloadStateBuilder downloadStateBuilder =
-        new DownloadStateBuilder(downloadAction)
-            .setState(DownloadState.STATE_COMPLETED)
-            .setNotMetRequirements(0x12345678);
-    DownloadState downloadState = downloadStateBuilder.build();
-
-    DownloadState mergedDownloadState = downloadState.copyWithMergedAction(downloadAction);
+    DownloadState mergedDownloadState =
+        downloadState.copyWithMergedAction(downloadAction, /* canStart= */ true);
 
     DownloadState expectedDownloadState =
         downloadStateBuilder.setState(DownloadState.STATE_STOPPED).build();
@@ -259,7 +249,8 @@ public class DownloadStateTest {
             .setStreamKeys(keys1);
     DownloadState downloadState = downloadStateBuilder.build();
 
-    DownloadState mergedDownloadState = downloadState.copyWithMergedAction(downloadAction);
+    DownloadState mergedDownloadState =
+        downloadState.copyWithMergedAction(downloadAction, /* canStart= */ true);
 
     DownloadState expectedDownloadState = downloadStateBuilder.setStreamKeys(expectedKeys).build();
     assertEqual(mergedDownloadState, expectedDownloadState);
@@ -282,7 +273,6 @@ public class DownloadStateTest {
     }
     assertThat(downloadState.failureReason).isEqualTo(that.failureReason);
     assertThat(downloadState.manualStopReason).isEqualTo(that.manualStopReason);
-    assertThat(downloadState.notMetRequirements).isEqualTo(that.notMetRequirements);
   }
 
   private DownloadAction createDownloadAction() {

From f0cd144baf8705e601e87e67cbb76d73fc36ba9e Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 10 Apr 2019 10:16:08 +0100
Subject: [PATCH 736/832] Update UI translations.

We have new strings for track role types.

PiperOrigin-RevId: 242829944
---
 library/ui/src/main/res/values-af/strings.xml        | 4 ++++
 library/ui/src/main/res/values-am/strings.xml        | 4 ++++
 library/ui/src/main/res/values-ar/strings.xml        | 4 ++++
 library/ui/src/main/res/values-az/strings.xml        | 4 ++++
 library/ui/src/main/res/values-b+sr+Latn/strings.xml | 4 ++++
 library/ui/src/main/res/values-be/strings.xml        | 4 ++++
 library/ui/src/main/res/values-bg/strings.xml        | 4 ++++
 library/ui/src/main/res/values-bn/strings.xml        | 4 ++++
 library/ui/src/main/res/values-bs/strings.xml        | 4 ++++
 library/ui/src/main/res/values-ca/strings.xml        | 4 ++++
 library/ui/src/main/res/values-cs/strings.xml        | 4 ++++
 library/ui/src/main/res/values-da/strings.xml        | 4 ++++
 library/ui/src/main/res/values-de/strings.xml        | 4 ++++
 library/ui/src/main/res/values-el/strings.xml        | 4 ++++
 library/ui/src/main/res/values-en-rAU/strings.xml    | 4 ++++
 library/ui/src/main/res/values-en-rGB/strings.xml    | 4 ++++
 library/ui/src/main/res/values-en-rIN/strings.xml    | 4 ++++
 library/ui/src/main/res/values-es-rUS/strings.xml    | 4 ++++
 library/ui/src/main/res/values-es/strings.xml        | 4 ++++
 library/ui/src/main/res/values-et/strings.xml        | 4 ++++
 library/ui/src/main/res/values-eu/strings.xml        | 4 ++++
 library/ui/src/main/res/values-fa/strings.xml        | 4 ++++
 library/ui/src/main/res/values-fi/strings.xml        | 4 ++++
 library/ui/src/main/res/values-fr-rCA/strings.xml    | 4 ++++
 library/ui/src/main/res/values-fr/strings.xml        | 4 ++++
 library/ui/src/main/res/values-gl/strings.xml        | 4 ++++
 library/ui/src/main/res/values-gu/strings.xml        | 4 ++++
 library/ui/src/main/res/values-hi/strings.xml        | 4 ++++
 library/ui/src/main/res/values-hr/strings.xml        | 4 ++++
 library/ui/src/main/res/values-hu/strings.xml        | 4 ++++
 library/ui/src/main/res/values-hy/strings.xml        | 4 ++++
 library/ui/src/main/res/values-in/strings.xml        | 4 ++++
 library/ui/src/main/res/values-is/strings.xml        | 4 ++++
 library/ui/src/main/res/values-it/strings.xml        | 4 ++++
 library/ui/src/main/res/values-iw/strings.xml        | 4 ++++
 library/ui/src/main/res/values-ja/strings.xml        | 4 ++++
 library/ui/src/main/res/values-ka/strings.xml        | 4 ++++
 library/ui/src/main/res/values-kk/strings.xml        | 4 ++++
 library/ui/src/main/res/values-km/strings.xml        | 4 ++++
 library/ui/src/main/res/values-kn/strings.xml        | 4 ++++
 library/ui/src/main/res/values-ko/strings.xml        | 4 ++++
 library/ui/src/main/res/values-ky/strings.xml        | 4 ++++
 library/ui/src/main/res/values-lo/strings.xml        | 4 ++++
 library/ui/src/main/res/values-lt/strings.xml        | 4 ++++
 library/ui/src/main/res/values-lv/strings.xml        | 4 ++++
 library/ui/src/main/res/values-mk/strings.xml        | 4 ++++
 library/ui/src/main/res/values-ml/strings.xml        | 4 ++++
 library/ui/src/main/res/values-mn/strings.xml        | 4 ++++
 library/ui/src/main/res/values-mr/strings.xml        | 4 ++++
 library/ui/src/main/res/values-ms/strings.xml        | 4 ++++
 library/ui/src/main/res/values-my/strings.xml        | 4 ++++
 library/ui/src/main/res/values-nb/strings.xml        | 4 ++++
 library/ui/src/main/res/values-ne/strings.xml        | 4 ++++
 library/ui/src/main/res/values-nl/strings.xml        | 4 ++++
 library/ui/src/main/res/values-pa/strings.xml        | 4 ++++
 library/ui/src/main/res/values-pl/strings.xml        | 4 ++++
 library/ui/src/main/res/values-pt-rPT/strings.xml    | 4 ++++
 library/ui/src/main/res/values-pt/strings.xml        | 4 ++++
 library/ui/src/main/res/values-ro/strings.xml        | 4 ++++
 library/ui/src/main/res/values-ru/strings.xml        | 4 ++++
 library/ui/src/main/res/values-si/strings.xml        | 4 ++++
 library/ui/src/main/res/values-sk/strings.xml        | 4 ++++
 library/ui/src/main/res/values-sl/strings.xml        | 4 ++++
 library/ui/src/main/res/values-sq/strings.xml        | 4 ++++
 library/ui/src/main/res/values-sr/strings.xml        | 4 ++++
 library/ui/src/main/res/values-sv/strings.xml        | 4 ++++
 library/ui/src/main/res/values-sw/strings.xml        | 4 ++++
 library/ui/src/main/res/values-ta/strings.xml        | 6 +++++-
 library/ui/src/main/res/values-te/strings.xml        | 4 ++++
 library/ui/src/main/res/values-th/strings.xml        | 4 ++++
 library/ui/src/main/res/values-tl/strings.xml        | 4 ++++
 library/ui/src/main/res/values-tr/strings.xml        | 4 ++++
 library/ui/src/main/res/values-uk/strings.xml        | 4 ++++
 library/ui/src/main/res/values-ur/strings.xml        | 4 ++++
 library/ui/src/main/res/values-uz/strings.xml        | 4 ++++
 library/ui/src/main/res/values-vi/strings.xml        | 4 ++++
 library/ui/src/main/res/values-zh-rCN/strings.xml    | 4 ++++
 library/ui/src/main/res/values-zh-rHK/strings.xml    | 4 ++++
 library/ui/src/main/res/values-zh-rTW/strings.xml    | 4 ++++
 library/ui/src/main/res/values-zu/strings.xml        | 4 ++++
 80 files changed, 321 insertions(+), 1 deletion(-)

diff --git a/library/ui/src/main/res/values-af/strings.xml b/library/ui/src/main/res/values-af/strings.xml
index 729d3b9609..9e0fc245fc 100644
--- a/library/ui/src/main/res/values-af/strings.xml
+++ b/library/ui/src/main/res/values-af/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Omringklank</string>
   <string name="exo_track_surround_5_point_1">5.1-omringklank</string>
   <string name="exo_track_surround_7_point_1">7.1-omringklank</string>
+  <string name="exo_track_role_alternate">Afwisselend</string>
+  <string name="exo_track_role_supplementary">Aanvullend</string>
+  <string name="exo_track_role_commentary">Kommentaar</string>
+  <string name="exo_track_role_closed_captions">Onderskrifte</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-am/strings.xml b/library/ui/src/main/res/values-am/strings.xml
index bae3776e35..f56a6c06bf 100644
--- a/library/ui/src/main/res/values-am/strings.xml
+++ b/library/ui/src/main/res/values-am/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">የዙሪያ ድምፅ</string>
   <string name="exo_track_surround_5_point_1">5.1 የዙሪያ ድምፅ</string>
   <string name="exo_track_surround_7_point_1">7.1 የዙሪያ ድምፅ</string>
+  <string name="exo_track_role_alternate">ተለዋጭ</string>
+  <string name="exo_track_role_supplementary">ተጨማሪ</string>
+  <string name="exo_track_role_commentary">ጥናታዊ</string>
+  <string name="exo_track_role_closed_captions">የተዘጉ የመግለጫ ጽሑፎች</string>
   <string name="exo_track_bitrate">%1$.2f ሜብስ</string>
   <string name="exo_item_list">%1$s፣ %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ar/strings.xml b/library/ui/src/main/res/values-ar/strings.xml
index c78aac1e65..91063e1a54 100644
--- a/library/ui/src/main/res/values-ar/strings.xml
+++ b/library/ui/src/main/res/values-ar/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">صوت مجسّم</string>
   <string name="exo_track_surround_5_point_1">صوت مجسّم 5.1</string>
   <string name="exo_track_surround_7_point_1">صوت مجسّم 7.1</string>
+  <string name="exo_track_role_alternate">بديل</string>
+  <string name="exo_track_role_supplementary">تكميلي</string>
+  <string name="exo_track_role_commentary">التعليقات</string>
+  <string name="exo_track_role_closed_captions">الترجمة والشرح</string>
   <string name="exo_track_bitrate">%1$.2f ميغابت في الثانية</string>
   <string name="exo_item_list">%1$s، %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-az/strings.xml b/library/ui/src/main/res/values-az/strings.xml
index c2f208e54e..0f5fbe3f4d 100644
--- a/library/ui/src/main/res/values-az/strings.xml
+++ b/library/ui/src/main/res/values-az/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Yüksək səs</string>
   <string name="exo_track_surround_5_point_1">5.1 yüksək səs</string>
   <string name="exo_track_surround_7_point_1">7.1 yüksək səs</string>
+  <string name="exo_track_role_alternate">Alternativ</string>
+  <string name="exo_track_role_supplementary">Əlavə</string>
+  <string name="exo_track_role_commentary">Şərh</string>
+  <string name="exo_track_role_closed_captions">Nüsxəni alan</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-b+sr+Latn/strings.xml b/library/ui/src/main/res/values-b+sr+Latn/strings.xml
index 6e90860a9c..16300747f7 100644
--- a/library/ui/src/main/res/values-b+sr+Latn/strings.xml
+++ b/library/ui/src/main/res/values-b+sr+Latn/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Zvučni sistem</string>
   <string name="exo_track_surround_5_point_1">Zvučni sistem 5.1</string>
   <string name="exo_track_surround_7_point_1">Zvučni sistem 7.1</string>
+  <string name="exo_track_role_alternate">Alternativno</string>
+  <string name="exo_track_role_supplementary">Dodatno</string>
+  <string name="exo_track_role_commentary">Komentar</string>
+  <string name="exo_track_role_closed_captions">Titl</string>
   <string name="exo_track_bitrate">%1$.2f Mb/s</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-be/strings.xml b/library/ui/src/main/res/values-be/strings.xml
index f0b28d9b2e..6a33be2a8f 100644
--- a/library/ui/src/main/res/values-be/strings.xml
+++ b/library/ui/src/main/res/values-be/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Аб\'ёмны гук</string>
   <string name="exo_track_surround_5_point_1">Аб\'ёмны гук 5.1</string>
   <string name="exo_track_surround_7_point_1">Аб\'ёмны гук 7.1</string>
+  <string name="exo_track_role_alternate">Альтэрнатыўны запіс</string>
+  <string name="exo_track_role_supplementary">Дадатковы запіс</string>
+  <string name="exo_track_role_commentary">Каментарыі</string>
+  <string name="exo_track_role_closed_captions">Цітры</string>
   <string name="exo_track_bitrate">%1$.2f Мбіт/с</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-bg/strings.xml b/library/ui/src/main/res/values-bg/strings.xml
index fd2b21efce..511a5e4f19 100644
--- a/library/ui/src/main/res/values-bg/strings.xml
+++ b/library/ui/src/main/res/values-bg/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Обемен звук</string>
   <string name="exo_track_surround_5_point_1">5,1-канален обемен звук</string>
   <string name="exo_track_surround_7_point_1">7,1-канален обемен звук</string>
+  <string name="exo_track_role_alternate">Алтернативен запис</string>
+  <string name="exo_track_role_supplementary">Допълнителен запис</string>
+  <string name="exo_track_role_commentary">Коментар</string>
+  <string name="exo_track_role_closed_captions">Субтитри</string>
   <string name="exo_track_bitrate">%1$.2f Мб/сек</string>
   <string name="exo_item_list">%1$s – %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-bn/strings.xml b/library/ui/src/main/res/values-bn/strings.xml
index c58d70a063..cca445feca 100644
--- a/library/ui/src/main/res/values-bn/strings.xml
+++ b/library/ui/src/main/res/values-bn/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">সারাউন্ড সাউন্ড</string>
   <string name="exo_track_surround_5_point_1">5.1 সারাউন্ড সাউন্ড</string>
   <string name="exo_track_surround_7_point_1">7.1 সারাউন্ড সাউন্ড</string>
+  <string name="exo_track_role_alternate">বিকল্প</string>
+  <string name="exo_track_role_supplementary">অতিরিক্ত</string>
+  <string name="exo_track_role_commentary">ধারাভাষ্য</string>
+  <string name="exo_track_role_closed_captions">CC</string>
   <string name="exo_track_bitrate">%1$.2f এমবিপিএস</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-bs/strings.xml b/library/ui/src/main/res/values-bs/strings.xml
index fce36435fd..24fb7b2b3b 100644
--- a/library/ui/src/main/res/values-bs/strings.xml
+++ b/library/ui/src/main/res/values-bs/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Prostorno ozvučenje</string>
   <string name="exo_track_surround_5_point_1">Prostorno ozvučenje 5.1</string>
   <string name="exo_track_surround_7_point_1">Prostorno ozvučenje 7.1</string>
+  <string name="exo_track_role_alternate">Alternativni zapis</string>
+  <string name="exo_track_role_supplementary">Dodatni zapis</string>
+  <string name="exo_track_role_commentary">Komentari</string>
+  <string name="exo_track_role_closed_captions">Titlovi</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ca/strings.xml b/library/ui/src/main/res/values-ca/strings.xml
index 2875ccfe83..3b48eab3b8 100644
--- a/library/ui/src/main/res/values-ca/strings.xml
+++ b/library/ui/src/main/res/values-ca/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">So envoltant</string>
   <string name="exo_track_surround_5_point_1">So envoltant 5.1</string>
   <string name="exo_track_surround_7_point_1">So envoltant 7.1</string>
+  <string name="exo_track_role_alternate">Alternativa</string>
+  <string name="exo_track_role_supplementary">Complementària</string>
+  <string name="exo_track_role_commentary">Comentaris</string>
+  <string name="exo_track_role_closed_captions">Subtítols</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-cs/strings.xml b/library/ui/src/main/res/values-cs/strings.xml
index 7964068543..8c73c01d74 100644
--- a/library/ui/src/main/res/values-cs/strings.xml
+++ b/library/ui/src/main/res/values-cs/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Prostorový zvuk</string>
   <string name="exo_track_surround_5_point_1">Prostorový zvuk 5.1</string>
   <string name="exo_track_surround_7_point_1">Prostorový zvuk 7.1</string>
+  <string name="exo_track_role_alternate">Alternativní</string>
+  <string name="exo_track_role_supplementary">Dodatkové</string>
+  <string name="exo_track_role_commentary">Komentář</string>
+  <string name="exo_track_role_closed_captions">Titulky</string>
   <string name="exo_track_bitrate">%1$.2f Mb/s</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-da/strings.xml b/library/ui/src/main/res/values-da/strings.xml
index 03409e1cdd..19b0f09446 100644
--- a/library/ui/src/main/res/values-da/strings.xml
+++ b/library/ui/src/main/res/values-da/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Surroundsound</string>
   <string name="exo_track_surround_5_point_1">5.1 surround sound</string>
   <string name="exo_track_surround_7_point_1">7.1 surroundsound</string>
+  <string name="exo_track_role_alternate">Alternativt spor</string>
+  <string name="exo_track_role_supplementary">Supplerende spor</string>
+  <string name="exo_track_role_commentary">Kommentarspor</string>
+  <string name="exo_track_role_closed_captions">Undertekster</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-de/strings.xml b/library/ui/src/main/res/values-de/strings.xml
index a096211b00..1bb620dd2b 100644
--- a/library/ui/src/main/res/values-de/strings.xml
+++ b/library/ui/src/main/res/values-de/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Surround-Sound</string>
   <string name="exo_track_surround_5_point_1">5.1-Surround-Sound</string>
   <string name="exo_track_surround_7_point_1">7.1-Surround-Sound</string>
+  <string name="exo_track_role_alternate">Alternativer Track</string>
+  <string name="exo_track_role_supplementary">Zusatzinhalte</string>
+  <string name="exo_track_role_commentary">Kommentare</string>
+  <string name="exo_track_role_closed_captions">Untertitel</string>
   <string name="exo_track_bitrate">%1$.2f Mbit/s</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-el/strings.xml b/library/ui/src/main/res/values-el/strings.xml
index 598d1c45dc..1ddbe4a5fa 100644
--- a/library/ui/src/main/res/values-el/strings.xml
+++ b/library/ui/src/main/res/values-el/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Περιφερειακός ήχος</string>
   <string name="exo_track_surround_5_point_1">Περιφερειακός ήχος 5.1</string>
   <string name="exo_track_surround_7_point_1">Περιφερειακός ήχος 7.1</string>
+  <string name="exo_track_role_alternate">Εναλλακτικό</string>
+  <string name="exo_track_role_supplementary">Συμπληρωματικό</string>
+  <string name="exo_track_role_commentary">Σχολιασμός</string>
+  <string name="exo_track_role_closed_captions">Υπότιτλοι</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-en-rAU/strings.xml b/library/ui/src/main/res/values-en-rAU/strings.xml
index e2ae4ec65a..cf25e2ada0 100644
--- a/library/ui/src/main/res/values-en-rAU/strings.xml
+++ b/library/ui/src/main/res/values-en-rAU/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Surround sound</string>
   <string name="exo_track_surround_5_point_1">5.1 surround sound</string>
   <string name="exo_track_surround_7_point_1">7.1 surround sound</string>
+  <string name="exo_track_role_alternate">Alternative</string>
+  <string name="exo_track_role_supplementary">Supplementary</string>
+  <string name="exo_track_role_commentary">Commentary</string>
+  <string name="exo_track_role_closed_captions">CC</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-en-rGB/strings.xml b/library/ui/src/main/res/values-en-rGB/strings.xml
index e2ae4ec65a..cf25e2ada0 100644
--- a/library/ui/src/main/res/values-en-rGB/strings.xml
+++ b/library/ui/src/main/res/values-en-rGB/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Surround sound</string>
   <string name="exo_track_surround_5_point_1">5.1 surround sound</string>
   <string name="exo_track_surround_7_point_1">7.1 surround sound</string>
+  <string name="exo_track_role_alternate">Alternative</string>
+  <string name="exo_track_role_supplementary">Supplementary</string>
+  <string name="exo_track_role_commentary">Commentary</string>
+  <string name="exo_track_role_closed_captions">CC</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-en-rIN/strings.xml b/library/ui/src/main/res/values-en-rIN/strings.xml
index e2ae4ec65a..cf25e2ada0 100644
--- a/library/ui/src/main/res/values-en-rIN/strings.xml
+++ b/library/ui/src/main/res/values-en-rIN/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Surround sound</string>
   <string name="exo_track_surround_5_point_1">5.1 surround sound</string>
   <string name="exo_track_surround_7_point_1">7.1 surround sound</string>
+  <string name="exo_track_role_alternate">Alternative</string>
+  <string name="exo_track_role_supplementary">Supplementary</string>
+  <string name="exo_track_role_commentary">Commentary</string>
+  <string name="exo_track_role_closed_captions">CC</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-es-rUS/strings.xml b/library/ui/src/main/res/values-es-rUS/strings.xml
index 1bfc2513ba..ceeb0b8497 100644
--- a/library/ui/src/main/res/values-es-rUS/strings.xml
+++ b/library/ui/src/main/res/values-es-rUS/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Sonido envolvente</string>
   <string name="exo_track_surround_5_point_1">Sonido envolvente 5.1</string>
   <string name="exo_track_surround_7_point_1">Sonido envolvente 7.1</string>
+  <string name="exo_track_role_alternate">Alternativa</string>
+  <string name="exo_track_role_supplementary">Complementaria</string>
+  <string name="exo_track_role_commentary">Comentarios</string>
+  <string name="exo_track_role_closed_captions">CC</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-es/strings.xml b/library/ui/src/main/res/values-es/strings.xml
index d424331765..0118da57be 100644
--- a/library/ui/src/main/res/values-es/strings.xml
+++ b/library/ui/src/main/res/values-es/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Sonido envolvente</string>
   <string name="exo_track_surround_5_point_1">Sonido envolvente 5.1</string>
   <string name="exo_track_surround_7_point_1">Sonido envolvente 7.1</string>
+  <string name="exo_track_role_alternate">Alternativa</string>
+  <string name="exo_track_role_supplementary">Complementaria</string>
+  <string name="exo_track_role_commentary">Comentarios</string>
+  <string name="exo_track_role_closed_captions">CC</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-et/strings.xml b/library/ui/src/main/res/values-et/strings.xml
index 38ee173bec..99ca9548ed 100644
--- a/library/ui/src/main/res/values-et/strings.xml
+++ b/library/ui/src/main/res/values-et/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Ruumiline heli</string>
   <string name="exo_track_surround_5_point_1">Ruumiline heli 5.1</string>
   <string name="exo_track_surround_7_point_1">Ruumiline heli 7.1</string>
+  <string name="exo_track_role_alternate">Alternatiiv</string>
+  <string name="exo_track_role_supplementary">Lisalugu</string>
+  <string name="exo_track_role_commentary">Kommentaar</string>
+  <string name="exo_track_role_closed_captions">Subtiitrid</string>
   <string name="exo_track_bitrate">%1$.2f Mbit/s</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-eu/strings.xml b/library/ui/src/main/res/values-eu/strings.xml
index 8bc5f0670c..4d992fee0f 100644
--- a/library/ui/src/main/res/values-eu/strings.xml
+++ b/library/ui/src/main/res/values-eu/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Soinu inguratzailea</string>
   <string name="exo_track_surround_5_point_1">5.1 soinu inguratzailea</string>
   <string name="exo_track_surround_7_point_1">7.1 soinu inguratzailea</string>
+  <string name="exo_track_role_alternate">Ordezkoa</string>
+  <string name="exo_track_role_supplementary">Osagarria</string>
+  <string name="exo_track_role_commentary">Iruzkinak</string>
+  <string name="exo_track_role_closed_captions">Azpitituluak</string>
   <string name="exo_track_bitrate">%1$.2f Mb/s</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-fa/strings.xml b/library/ui/src/main/res/values-fa/strings.xml
index bef2aebcfe..fed94b5569 100644
--- a/library/ui/src/main/res/values-fa/strings.xml
+++ b/library/ui/src/main/res/values-fa/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">صدای فراگیر</string>
   <string name="exo_track_surround_5_point_1">صدای فراگیر ۵.۱</string>
   <string name="exo_track_surround_7_point_1">صدای فراگیر ۷٫۱</string>
+  <string name="exo_track_role_alternate">بدیل</string>
+  <string name="exo_track_role_supplementary">تکمیلی</string>
+  <string name="exo_track_role_commentary">شرح و نقد</string>
+  <string name="exo_track_role_closed_captions">زیرنویس ناشنوایان</string>
   <string name="exo_track_bitrate">%1$.2f مگابیت در ثانیه</string>
   <string name="exo_item_list">%1$s،‏ %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-fi/strings.xml b/library/ui/src/main/res/values-fi/strings.xml
index 3280dff99b..0dc2f9d346 100644
--- a/library/ui/src/main/res/values-fi/strings.xml
+++ b/library/ui/src/main/res/values-fi/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Surround-ääni</string>
   <string name="exo_track_surround_5_point_1">5.1-surround-ääni</string>
   <string name="exo_track_surround_7_point_1">7.1-surround-ääni</string>
+  <string name="exo_track_role_alternate">Vaihtoehtoinen</string>
+  <string name="exo_track_role_supplementary">Lisämateriaali</string>
+  <string name="exo_track_role_commentary">Kommenttiraita</string>
+  <string name="exo_track_role_closed_captions">Tekstitykset</string>
   <string name="exo_track_bitrate">%1$.2f Mt/s</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-fr-rCA/strings.xml b/library/ui/src/main/res/values-fr-rCA/strings.xml
index ce125f7d06..0f3534924f 100644
--- a/library/ui/src/main/res/values-fr-rCA/strings.xml
+++ b/library/ui/src/main/res/values-fr-rCA/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Son ambiophonique</string>
   <string name="exo_track_surround_5_point_1">Son ambiophonique 5.1</string>
   <string name="exo_track_surround_7_point_1">Son ambiophonique 7.1</string>
+  <string name="exo_track_role_alternate">Autre version</string>
+  <string name="exo_track_role_supplementary">Supplémentaire</string>
+  <string name="exo_track_role_commentary">Commentaires</string>
+  <string name="exo_track_role_closed_captions">Sous-titres codés</string>
   <string name="exo_track_bitrate">%1$.2f Mb/s</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-fr/strings.xml b/library/ui/src/main/res/values-fr/strings.xml
index b143832ca1..46c07f531e 100644
--- a/library/ui/src/main/res/values-fr/strings.xml
+++ b/library/ui/src/main/res/values-fr/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Son surround</string>
   <string name="exo_track_surround_5_point_1">Son surround 5.1</string>
   <string name="exo_track_surround_7_point_1">Son surround 7.1</string>
+  <string name="exo_track_role_alternate">Piste alternative</string>
+  <string name="exo_track_role_supplementary">Piste supplémentaire</string>
+  <string name="exo_track_role_commentary">Commentaires</string>
+  <string name="exo_track_role_closed_captions">Sous-titres</string>
   <string name="exo_track_bitrate">%1$.2f Mbit/s</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-gl/strings.xml b/library/ui/src/main/res/values-gl/strings.xml
index c321d28bec..e6689353f1 100644
--- a/library/ui/src/main/res/values-gl/strings.xml
+++ b/library/ui/src/main/res/values-gl/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Son envolvente</string>
   <string name="exo_track_surround_5_point_1">Son envolvente 5.1</string>
   <string name="exo_track_surround_7_point_1">Son envolvente 7.1</string>
+  <string name="exo_track_role_alternate">Alternativa</string>
+  <string name="exo_track_role_supplementary">Complementaria</string>
+  <string name="exo_track_role_commentary">Comentarios</string>
+  <string name="exo_track_role_closed_captions">Subtítulos</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-gu/strings.xml b/library/ui/src/main/res/values-gu/strings.xml
index a362329138..488eb39f6a 100644
--- a/library/ui/src/main/res/values-gu/strings.xml
+++ b/library/ui/src/main/res/values-gu/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">સરાઉન્ડ સાઉન્ડ</string>
   <string name="exo_track_surround_5_point_1">5.1 સરાઉન્ડ સાઉન્ડ</string>
   <string name="exo_track_surround_7_point_1">7.1 સરાઉન્ડ સાઉન્ડ</string>
+  <string name="exo_track_role_alternate">વૈકલ્પિક</string>
+  <string name="exo_track_role_supplementary">પૂરક</string>
+  <string name="exo_track_role_commentary">કોમેન્ટ્રી</string>
+  <string name="exo_track_role_closed_captions">CC</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-hi/strings.xml b/library/ui/src/main/res/values-hi/strings.xml
index 373c0f4303..da606cd166 100644
--- a/library/ui/src/main/res/values-hi/strings.xml
+++ b/library/ui/src/main/res/values-hi/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">सराउंड साउंड</string>
   <string name="exo_track_surround_5_point_1">5.1 सराउंड साउंड</string>
   <string name="exo_track_surround_7_point_1">7.1 सराउंड साउंड</string>
+  <string name="exo_track_role_alternate">वैकल्पिक</string>
+  <string name="exo_track_role_supplementary">अतिरिक्त</string>
+  <string name="exo_track_role_commentary">कमेंट्री</string>
+  <string name="exo_track_role_closed_captions">सबटाइटल</string>
   <string name="exo_track_bitrate">%1$.2f एमबीपीएस</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-hr/strings.xml b/library/ui/src/main/res/values-hr/strings.xml
index 9958f9b4dc..4fa1942986 100644
--- a/library/ui/src/main/res/values-hr/strings.xml
+++ b/library/ui/src/main/res/values-hr/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Okružujući zvuk</string>
   <string name="exo_track_surround_5_point_1">5.1-kanalni okružujući zvuk</string>
   <string name="exo_track_surround_7_point_1">7.1-kanalni okružujući zvuk</string>
+  <string name="exo_track_role_alternate">Alternativna verzija</string>
+  <string name="exo_track_role_supplementary">Dopunska verzija</string>
+  <string name="exo_track_role_commentary">Verzija s komentarima</string>
+  <string name="exo_track_role_closed_captions">Verzija s titlovima</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-hu/strings.xml b/library/ui/src/main/res/values-hu/strings.xml
index f517ef6212..baf77650e0 100644
--- a/library/ui/src/main/res/values-hu/strings.xml
+++ b/library/ui/src/main/res/values-hu/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Térhatású hangzás</string>
   <string name="exo_track_surround_5_point_1">5.1-es térhatású hangzás</string>
   <string name="exo_track_surround_7_point_1">7.1-es térhatású hangzás</string>
+  <string name="exo_track_role_alternate">Alternatív</string>
+  <string name="exo_track_role_supplementary">Kiegészítő</string>
+  <string name="exo_track_role_commentary">Kommentár</string>
+  <string name="exo_track_role_closed_captions">Felirat</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-hy/strings.xml b/library/ui/src/main/res/values-hy/strings.xml
index d3060b06c4..11a9124f54 100644
--- a/library/ui/src/main/res/values-hy/strings.xml
+++ b/library/ui/src/main/res/values-hy/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Ծավալային ձայն</string>
   <string name="exo_track_surround_5_point_1">5․1 ծավալային ձայն</string>
   <string name="exo_track_surround_7_point_1">7․1 ծավալային ձայն</string>
+  <string name="exo_track_role_alternate">Այլընտրանքային</string>
+  <string name="exo_track_role_supplementary">Լրացուցիչ</string>
+  <string name="exo_track_role_commentary">Մեկնաբանություններ</string>
+  <string name="exo_track_role_closed_captions">Ենթագրեր</string>
   <string name="exo_track_bitrate">%1$.2f մբ/վ</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-in/strings.xml b/library/ui/src/main/res/values-in/strings.xml
index 06c55fc020..7410576e81 100644
--- a/library/ui/src/main/res/values-in/strings.xml
+++ b/library/ui/src/main/res/values-in/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Suara surround</string>
   <string name="exo_track_surround_5_point_1">5.1 surround sound</string>
   <string name="exo_track_surround_7_point_1">7.1 surround sound</string>
+  <string name="exo_track_role_alternate">Alternatif</string>
+  <string name="exo_track_role_supplementary">Tambahan</string>
+  <string name="exo_track_role_commentary">Komentar</string>
+  <string name="exo_track_role_closed_captions">CC</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-is/strings.xml b/library/ui/src/main/res/values-is/strings.xml
index 4a0b84db2f..bdb27a6648 100644
--- a/library/ui/src/main/res/values-is/strings.xml
+++ b/library/ui/src/main/res/values-is/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Víðóma hljóð</string>
   <string name="exo_track_surround_5_point_1">5.1 víðóma hljóð</string>
   <string name="exo_track_surround_7_point_1">7.1 víðóma hljóð</string>
+  <string name="exo_track_role_alternate">Annað</string>
+  <string name="exo_track_role_supplementary">Auka</string>
+  <string name="exo_track_role_commentary">Lýsingar</string>
+  <string name="exo_track_role_closed_captions">Skjátextar</string>
   <string name="exo_track_bitrate">%1$.2f Mb/sek.</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-it/strings.xml b/library/ui/src/main/res/values-it/strings.xml
index 84da9905b2..ffa05821e9 100644
--- a/library/ui/src/main/res/values-it/strings.xml
+++ b/library/ui/src/main/res/values-it/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Audio surround</string>
   <string name="exo_track_surround_5_point_1">Audio surround 5.1</string>
   <string name="exo_track_surround_7_point_1">Audio surround 7.1</string>
+  <string name="exo_track_role_alternate">Versione alternativa</string>
+  <string name="exo_track_role_supplementary">Contenuti supplementari</string>
+  <string name="exo_track_role_commentary">Commenti</string>
+  <string name="exo_track_role_closed_captions">Sottotitoli</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-iw/strings.xml b/library/ui/src/main/res/values-iw/strings.xml
index b2e1171017..695196c5be 100644
--- a/library/ui/src/main/res/values-iw/strings.xml
+++ b/library/ui/src/main/res/values-iw/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">סראונד</string>
   <string name="exo_track_surround_5_point_1">סראונד 5.1</string>
   <string name="exo_track_surround_7_point_1">סראונד 7.1</string>
+  <string name="exo_track_role_alternate">חלופי</string>
+  <string name="exo_track_role_supplementary">משלים</string>
+  <string name="exo_track_role_commentary">פרשנות</string>
+  <string name="exo_track_role_closed_captions">כתוביות</string>
   <string name="exo_track_bitrate">%1$.2f מגה סיביות לשנייה</string>
   <string name="exo_item_list">%1$s‏, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ja/strings.xml b/library/ui/src/main/res/values-ja/strings.xml
index e159292348..aef5a12a96 100644
--- a/library/ui/src/main/res/values-ja/strings.xml
+++ b/library/ui/src/main/res/values-ja/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">サラウンド サウンド</string>
   <string name="exo_track_surround_5_point_1">5.1 サラウンド サウンド</string>
   <string name="exo_track_surround_7_point_1">7.1 サラウンド サウンド</string>
+  <string name="exo_track_role_alternate">代替</string>
+  <string name="exo_track_role_supplementary">補足</string>
+  <string name="exo_track_role_commentary">解説</string>
+  <string name="exo_track_role_closed_captions">字幕</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s、%2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ka/strings.xml b/library/ui/src/main/res/values-ka/strings.xml
index ff879c5dd8..f7b8272bcc 100644
--- a/library/ui/src/main/res/values-ka/strings.xml
+++ b/library/ui/src/main/res/values-ka/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">მოცულობითი ხმა</string>
   <string name="exo_track_surround_5_point_1">5.1 მოცულობითი ხმა</string>
   <string name="exo_track_surround_7_point_1">7.1 მოცულობითი ხმა</string>
+  <string name="exo_track_role_alternate">ალტერნატიული</string>
+  <string name="exo_track_role_supplementary">დამატებითი</string>
+  <string name="exo_track_role_commentary">კომენტარი</string>
+  <string name="exo_track_role_closed_captions">დახურული სუბტიტრები</string>
   <string name="exo_track_bitrate">%1$.2f მბიტ/წმ</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-kk/strings.xml b/library/ui/src/main/res/values-kk/strings.xml
index f634579932..92119d1fe5 100644
--- a/library/ui/src/main/res/values-kk/strings.xml
+++ b/library/ui/src/main/res/values-kk/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Көлемді дыбыс</string>
   <string name="exo_track_surround_5_point_1">5.1 көлемді дыбыс жүйесі</string>
   <string name="exo_track_surround_7_point_1">7.1 көлемді дыбыс жүйесі</string>
+  <string name="exo_track_role_alternate">Балама</string>
+  <string name="exo_track_role_supplementary">Қосымша</string>
+  <string name="exo_track_role_commentary">Түсіндірме</string>
+  <string name="exo_track_role_closed_captions">Субтитр</string>
   <string name="exo_track_bitrate">%1$.2f МБ/сек</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-km/strings.xml b/library/ui/src/main/res/values-km/strings.xml
index 17476b16d1..62728de026 100644
--- a/library/ui/src/main/res/values-km/strings.xml
+++ b/library/ui/src/main/res/values-km/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">សំឡេង​រងំ</string>
   <string name="exo_track_surround_5_point_1">សំឡេង​រងំ​ខ្នាត 5.1</string>
   <string name="exo_track_surround_7_point_1">សំឡេង​រងំ​ខ្នាត 7.1</string>
+  <string name="exo_track_role_alternate">ជំនួស</string>
+  <string name="exo_track_role_supplementary">បំពេញបន្ថែម</string>
+  <string name="exo_track_role_commentary">ការអត្ថាធិប្បាយ</string>
+  <string name="exo_track_role_closed_captions">អក្សររត់</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-kn/strings.xml b/library/ui/src/main/res/values-kn/strings.xml
index cb46a4f0d8..6e6bfcb165 100644
--- a/library/ui/src/main/res/values-kn/strings.xml
+++ b/library/ui/src/main/res/values-kn/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">ಸರೌಂಡ್ ಶಬ್ದ</string>
   <string name="exo_track_surround_5_point_1">5.1 ಸರೌಂಡ್ ಶಬ್ದ</string>
   <string name="exo_track_surround_7_point_1">7.1 ಸರೌಂಡ್ ಶಬ್ದ</string>
+  <string name="exo_track_role_alternate">ಪರ್ಯಾಯ</string>
+  <string name="exo_track_role_supplementary">ಪೂರಕ</string>
+  <string name="exo_track_role_commentary">ವ್ಯಾಖ್ಯಾನ</string>
+  <string name="exo_track_role_closed_captions">CC</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ko/strings.xml b/library/ui/src/main/res/values-ko/strings.xml
index a4096711f2..230660ad6a 100644
--- a/library/ui/src/main/res/values-ko/strings.xml
+++ b/library/ui/src/main/res/values-ko/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">서라운드 사운드</string>
   <string name="exo_track_surround_5_point_1">5.1 서라운드 사운드</string>
   <string name="exo_track_surround_7_point_1">7.1 서라운드 사운드</string>
+  <string name="exo_track_role_alternate">대체</string>
+  <string name="exo_track_role_supplementary">추가</string>
+  <string name="exo_track_role_commentary">논평</string>
+  <string name="exo_track_role_closed_captions">자막</string>
   <string name="exo_track_bitrate">%1$.2fMbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ky/strings.xml b/library/ui/src/main/res/values-ky/strings.xml
index c85b70f108..57b8bbb5f5 100644
--- a/library/ui/src/main/res/values-ky/strings.xml
+++ b/library/ui/src/main/res/values-ky/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Көлөмдүү добуш</string>
   <string name="exo_track_surround_5_point_1">5.1 көлөмдүү добуш</string>
   <string name="exo_track_surround_7_point_1">7.1 көлөмдүү добуш</string>
+  <string name="exo_track_role_alternate">Альтернативдүү трек</string>
+  <string name="exo_track_role_supplementary">Кошумча трек</string>
+  <string name="exo_track_role_commentary">Пикир</string>
+  <string name="exo_track_role_closed_captions">Коштомо жазуулар</string>
   <string name="exo_track_bitrate">%1$.2f Мб/сек.</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-lo/strings.xml b/library/ui/src/main/res/values-lo/strings.xml
index a32fabf213..d7996610b2 100644
--- a/library/ui/src/main/res/values-lo/strings.xml
+++ b/library/ui/src/main/res/values-lo/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">ສຽງຮອບທິດທາງ</string>
   <string name="exo_track_surround_5_point_1">ສຽງຮອບທິດທາງ 5.1</string>
   <string name="exo_track_surround_7_point_1">ສຽງຮອບທິດທາງ 7.1</string>
+  <string name="exo_track_role_alternate">ສຳຮອງ</string>
+  <string name="exo_track_role_supplementary">ສ່ວນເສີມ</string>
+  <string name="exo_track_role_commentary">ຄຳເຫັນ</string>
+  <string name="exo_track_role_closed_captions">ຄຳບັນຍາຍ</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-lt/strings.xml b/library/ui/src/main/res/values-lt/strings.xml
index 12710e41fd..3e9a63dc99 100644
--- a/library/ui/src/main/res/values-lt/strings.xml
+++ b/library/ui/src/main/res/values-lt/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Erdvinis garsas</string>
   <string name="exo_track_surround_5_point_1">5.1 erdvinis garsas</string>
   <string name="exo_track_surround_7_point_1">7.1 erdvinis garsas</string>
+  <string name="exo_track_role_alternate">Alternatyvus</string>
+  <string name="exo_track_role_supplementary">Papildomas</string>
+  <string name="exo_track_role_commentary">Komentaras</string>
+  <string name="exo_track_role_closed_captions">Subtitrai</string>
   <string name="exo_track_bitrate">%1$.2f Mb/s</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-lv/strings.xml b/library/ui/src/main/res/values-lv/strings.xml
index a55570112f..59b541808a 100644
--- a/library/ui/src/main/res/values-lv/strings.xml
+++ b/library/ui/src/main/res/values-lv/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Ieskaujošā skaņa</string>
   <string name="exo_track_surround_5_point_1">5.1 ieskaujošā skaņa</string>
   <string name="exo_track_surround_7_point_1">7.1 ieskaujošā skaņa</string>
+  <string name="exo_track_role_alternate">Cits</string>
+  <string name="exo_track_role_supplementary">Papildu</string>
+  <string name="exo_track_role_commentary">Komentāri</string>
+  <string name="exo_track_role_closed_captions">Slēgtie paraksti</string>
   <string name="exo_track_bitrate">%1$.2f Mb/s</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-mk/strings.xml b/library/ui/src/main/res/values-mk/strings.xml
index f4382aaeae..08a54d7240 100644
--- a/library/ui/src/main/res/values-mk/strings.xml
+++ b/library/ui/src/main/res/values-mk/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Опкружувачки звук</string>
   <string name="exo_track_surround_5_point_1">5.1 опкружувачки звук</string>
   <string name="exo_track_surround_7_point_1">7.1 опкружувачки звук</string>
+  <string name="exo_track_role_alternate">Алтернативна</string>
+  <string name="exo_track_role_supplementary">Дополнителна</string>
+  <string name="exo_track_role_commentary">Коментар</string>
+  <string name="exo_track_role_closed_captions">Титлови</string>
   <string name="exo_track_bitrate">%1$.2f Mб/с</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ml/strings.xml b/library/ui/src/main/res/values-ml/strings.xml
index 9f2c3a702d..6e79db0903 100644
--- a/library/ui/src/main/res/values-ml/strings.xml
+++ b/library/ui/src/main/res/values-ml/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">സറൗണ്ട് സൗണ്ട്</string>
   <string name="exo_track_surround_5_point_1">5.1 സറൗണ്ട് സൗണ്ട്</string>
   <string name="exo_track_surround_7_point_1">7.1 സറൗണ്ട് സൗണ്ട്</string>
+  <string name="exo_track_role_alternate">ഇതര ട്രാക്ക്</string>
+  <string name="exo_track_role_supplementary">സപ്ലിമെന്ററി</string>
+  <string name="exo_track_role_commentary">വിവരണം</string>
+  <string name="exo_track_role_closed_captions">CC</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-mn/strings.xml b/library/ui/src/main/res/values-mn/strings.xml
index 9d8fb29408..383d102520 100644
--- a/library/ui/src/main/res/values-mn/strings.xml
+++ b/library/ui/src/main/res/values-mn/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Орчин тойрны дуу</string>
   <string name="exo_track_surround_5_point_1">5.1 орчин тойрны дуу</string>
   <string name="exo_track_surround_7_point_1">7.1 орчин тойрны дуу</string>
+  <string name="exo_track_role_alternate">Хувилбар</string>
+  <string name="exo_track_role_supplementary">Нэмэлт</string>
+  <string name="exo_track_role_commentary">Тайлбар</string>
+  <string name="exo_track_role_closed_captions">Хаалттай тайлбар</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-mr/strings.xml b/library/ui/src/main/res/values-mr/strings.xml
index d1ee83be30..a0900ab851 100644
--- a/library/ui/src/main/res/values-mr/strings.xml
+++ b/library/ui/src/main/res/values-mr/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">सराउंड साउंड</string>
   <string name="exo_track_surround_5_point_1">५.१ सराउंड साउंड</string>
   <string name="exo_track_surround_7_point_1">७.१ सराउंड साउंड</string>
+  <string name="exo_track_role_alternate">पर्यायी</string>
+  <string name="exo_track_role_supplementary">साहाय्यक</string>
+  <string name="exo_track_role_commentary">समालोचन</string>
+  <string name="exo_track_role_closed_captions">सबटायटल</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ms/strings.xml b/library/ui/src/main/res/values-ms/strings.xml
index 3b3fc3109f..6dab5be8de 100644
--- a/library/ui/src/main/res/values-ms/strings.xml
+++ b/library/ui/src/main/res/values-ms/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Bunyi keliling</string>
   <string name="exo_track_surround_5_point_1">Bunyi keliling 5.1</string>
   <string name="exo_track_surround_7_point_1">Bunyi keliling 7.1</string>
+  <string name="exo_track_role_alternate">Alternatif</string>
+  <string name="exo_track_role_supplementary">Tambahan</string>
+  <string name="exo_track_role_commentary">Ulasan</string>
+  <string name="exo_track_role_closed_captions">SK</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-my/strings.xml b/library/ui/src/main/res/values-my/strings.xml
index 68c1f27056..b30b76d516 100644
--- a/library/ui/src/main/res/values-my/strings.xml
+++ b/library/ui/src/main/res/values-my/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">ပတ်လည် အသံစနစ်</string>
   <string name="exo_track_surround_5_point_1">5.1 ပတ်လည် အသံစနစ်</string>
   <string name="exo_track_surround_7_point_1">7.1 ပတ်လည် အသံစနစ်</string>
+  <string name="exo_track_role_alternate">အရန်</string>
+  <string name="exo_track_role_supplementary">နောက်ဆက်တွဲ</string>
+  <string name="exo_track_role_commentary">ထင်မြင်သုံးသပ်ချက်</string>
+  <string name="exo_track_role_closed_captions">CC</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s၊ %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-nb/strings.xml b/library/ui/src/main/res/values-nb/strings.xml
index e24dcbf959..f2847dd829 100644
--- a/library/ui/src/main/res/values-nb/strings.xml
+++ b/library/ui/src/main/res/values-nb/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Surround-lyd</string>
   <string name="exo_track_surround_5_point_1">5.1 surround-lyd</string>
   <string name="exo_track_surround_7_point_1">7.1 surround-lyd</string>
+  <string name="exo_track_role_alternate">Alternativt spor</string>
+  <string name="exo_track_role_supplementary">Tilleggsspor</string>
+  <string name="exo_track_role_commentary">Kommentarer</string>
+  <string name="exo_track_role_closed_captions">Teksting</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ne/strings.xml b/library/ui/src/main/res/values-ne/strings.xml
index 6ae86f84d2..ff56480df1 100644
--- a/library/ui/src/main/res/values-ne/strings.xml
+++ b/library/ui/src/main/res/values-ne/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">सराउन्ड साउन्ड</string>
   <string name="exo_track_surround_5_point_1">5.1 सराउन्ड साउन्ड</string>
   <string name="exo_track_surround_7_point_1">7.1 सराउन्ड साउन्ड</string>
+  <string name="exo_track_role_alternate">वैकल्पिक</string>
+  <string name="exo_track_role_supplementary">पूरक</string>
+  <string name="exo_track_role_commentary">टिप्पणी</string>
+  <string name="exo_track_role_closed_captions">उपशीर्षकहरू</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-nl/strings.xml b/library/ui/src/main/res/values-nl/strings.xml
index 18dd96ed9e..3fbf113f1e 100644
--- a/library/ui/src/main/res/values-nl/strings.xml
+++ b/library/ui/src/main/res/values-nl/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Surround sound</string>
   <string name="exo_track_surround_5_point_1">5.1 surroundgeluid</string>
   <string name="exo_track_surround_7_point_1">7.1 surroundgeluid</string>
+  <string name="exo_track_role_alternate">Alternatief</string>
+  <string name="exo_track_role_supplementary">Aanvullend</string>
+  <string name="exo_track_role_commentary">Commentaar</string>
+  <string name="exo_track_role_closed_captions">CC</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-pa/strings.xml b/library/ui/src/main/res/values-pa/strings.xml
index 7a03e89faf..9f25759878 100644
--- a/library/ui/src/main/res/values-pa/strings.xml
+++ b/library/ui/src/main/res/values-pa/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">ਸਰਾਊਂਡ ਸਾਊਂਡ</string>
   <string name="exo_track_surround_5_point_1">5.1 ਸਰਾਊਂਡ ਸਾਊਂਡ</string>
   <string name="exo_track_surround_7_point_1">7.1 ਸਰਾਊਂਡ ਸਾਊਂਡ</string>
+  <string name="exo_track_role_alternate">ਵਟਾਵਾਂ</string>
+  <string name="exo_track_role_supplementary">ਪੂਰਕ</string>
+  <string name="exo_track_role_commentary">ਕਮੈਂਟਰੀ</string>
+  <string name="exo_track_role_closed_captions">ਬੰਦ ਸੁੁਰਖੀਆਂ</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-pl/strings.xml b/library/ui/src/main/res/values-pl/strings.xml
index 66eb7d81c7..8df3b62b0c 100644
--- a/library/ui/src/main/res/values-pl/strings.xml
+++ b/library/ui/src/main/res/values-pl/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Dźwięk przestrzenny</string>
   <string name="exo_track_surround_5_point_1">System dźwięku przestrzennego 5.1</string>
   <string name="exo_track_surround_7_point_1">System dźwięku przestrzennego 7.1</string>
+  <string name="exo_track_role_alternate">Wersja alternatywna</string>
+  <string name="exo_track_role_supplementary">Materiały dodatkowe</string>
+  <string name="exo_track_role_commentary">Komentarz</string>
+  <string name="exo_track_role_closed_captions">Napisy</string>
   <string name="exo_track_bitrate">%1$.2f Mb/s</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-pt-rPT/strings.xml b/library/ui/src/main/res/values-pt-rPT/strings.xml
index 5d199683d9..188e18f6b5 100644
--- a/library/ui/src/main/res/values-pt-rPT/strings.xml
+++ b/library/ui/src/main/res/values-pt-rPT/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Som surround</string>
   <string name="exo_track_surround_5_point_1">Som surround 5.1</string>
   <string name="exo_track_surround_7_point_1">Som surround 7.1</string>
+  <string name="exo_track_role_alternate">Alternativa</string>
+  <string name="exo_track_role_supplementary">Suplementar</string>
+  <string name="exo_track_role_commentary">Comentário</string>
+  <string name="exo_track_role_closed_captions">Legendas</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-pt/strings.xml b/library/ui/src/main/res/values-pt/strings.xml
index 151d235554..9e83387a76 100644
--- a/library/ui/src/main/res/values-pt/strings.xml
+++ b/library/ui/src/main/res/values-pt/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Sistema surround</string>
   <string name="exo_track_surround_5_point_1">Sistema surround 5.1</string>
   <string name="exo_track_surround_7_point_1">Sistema surround 7.1</string>
+  <string name="exo_track_role_alternate">Alternativa</string>
+  <string name="exo_track_role_supplementary">Complementar</string>
+  <string name="exo_track_role_commentary">Comentários</string>
+  <string name="exo_track_role_closed_captions">CC</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ro/strings.xml b/library/ui/src/main/res/values-ro/strings.xml
index 93f5129d13..9bb8cfc8ee 100644
--- a/library/ui/src/main/res/values-ro/strings.xml
+++ b/library/ui/src/main/res/values-ro/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Sunet surround</string>
   <string name="exo_track_surround_5_point_1">Sunet surround 5.1</string>
   <string name="exo_track_surround_7_point_1">Sunet surround 7.1</string>
+  <string name="exo_track_role_alternate">Alternativ</string>
+  <string name="exo_track_role_supplementary">Suplimentar</string>
+  <string name="exo_track_role_commentary">Comentarii</string>
+  <string name="exo_track_role_closed_captions">Subtitrări</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ru/strings.xml b/library/ui/src/main/res/values-ru/strings.xml
index 77d96f0bc0..e66a282da4 100644
--- a/library/ui/src/main/res/values-ru/strings.xml
+++ b/library/ui/src/main/res/values-ru/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Объемный звук</string>
   <string name="exo_track_surround_5_point_1">Система объемного звука 5.1</string>
   <string name="exo_track_surround_7_point_1">Система объемного звука 7.1</string>
+  <string name="exo_track_role_alternate">Другая запись</string>
+  <string name="exo_track_role_supplementary">Дополнительные материалы</string>
+  <string name="exo_track_role_commentary">Комментарии</string>
+  <string name="exo_track_role_closed_captions">Субтитры</string>
   <string name="exo_track_bitrate">%1$.2f Мбит/сек</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-si/strings.xml b/library/ui/src/main/res/values-si/strings.xml
index 30b63789db..b6bfb1848f 100644
--- a/library/ui/src/main/res/values-si/strings.xml
+++ b/library/ui/src/main/res/values-si/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">අවට ශබ්දය</string>
   <string name="exo_track_surround_5_point_1">5.1 අවට ශබ්දය</string>
   <string name="exo_track_surround_7_point_1">7.1 අවට ශබ්දය</string>
+  <string name="exo_track_role_alternate">විකල්ප</string>
+  <string name="exo_track_role_supplementary">පරිපූරක</string>
+  <string name="exo_track_role_commentary">වර්ණනා</string>
+  <string name="exo_track_role_closed_captions">සිරස්තල</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-sk/strings.xml b/library/ui/src/main/res/values-sk/strings.xml
index ae6c0fbb12..6d5ddaea28 100644
--- a/library/ui/src/main/res/values-sk/strings.xml
+++ b/library/ui/src/main/res/values-sk/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Priestorový zvuk</string>
   <string name="exo_track_surround_5_point_1">Priestorový zvuk 5.1</string>
   <string name="exo_track_surround_7_point_1">Priestorový zvuk 7.1</string>
+  <string name="exo_track_role_alternate">Alternatívna stopa</string>
+  <string name="exo_track_role_supplementary">Doplnková stopa</string>
+  <string name="exo_track_role_commentary">Komentár</string>
+  <string name="exo_track_role_closed_captions">Skryté titulky</string>
   <string name="exo_track_bitrate">%1$.2f MB/s</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-sl/strings.xml b/library/ui/src/main/res/values-sl/strings.xml
index 16d9a6af03..1e3adff704 100644
--- a/library/ui/src/main/res/values-sl/strings.xml
+++ b/library/ui/src/main/res/values-sl/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Prostorski zvok</string>
   <string name="exo_track_surround_5_point_1">Prostorski zvok 5.1</string>
   <string name="exo_track_surround_7_point_1">Prostorski zvok 7.1</string>
+  <string name="exo_track_role_alternate">Dodatni posnetek</string>
+  <string name="exo_track_role_supplementary">Dodatek</string>
+  <string name="exo_track_role_commentary">Komentar</string>
+  <string name="exo_track_role_closed_captions">Podnapisi</string>
   <string name="exo_track_bitrate">%1$.2f Mb/s</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-sq/strings.xml b/library/ui/src/main/res/values-sq/strings.xml
index fcef9643e8..d5b8903ed7 100644
--- a/library/ui/src/main/res/values-sq/strings.xml
+++ b/library/ui/src/main/res/values-sq/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Tingulli rrethues</string>
   <string name="exo_track_surround_5_point_1">Tingull rrethues 5.1</string>
   <string name="exo_track_surround_7_point_1">Tingull rrethues 7.1</string>
+  <string name="exo_track_role_alternate">Alternative</string>
+  <string name="exo_track_role_supplementary">Plotësuese</string>
+  <string name="exo_track_role_commentary">Komente</string>
+  <string name="exo_track_role_closed_captions">Titrat</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-sr/strings.xml b/library/ui/src/main/res/values-sr/strings.xml
index 19018f0bac..b45fd8ab03 100644
--- a/library/ui/src/main/res/values-sr/strings.xml
+++ b/library/ui/src/main/res/values-sr/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Звучни систем</string>
   <string name="exo_track_surround_5_point_1">Звучни систем 5.1</string>
   <string name="exo_track_surround_7_point_1">Звучни систем 7.1</string>
+  <string name="exo_track_role_alternate">Алтернативно</string>
+  <string name="exo_track_role_supplementary">Додатно</string>
+  <string name="exo_track_role_commentary">Коментар</string>
+  <string name="exo_track_role_closed_captions">Титл</string>
   <string name="exo_track_bitrate">%1$.2f Mb/s</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-sv/strings.xml b/library/ui/src/main/res/values-sv/strings.xml
index 1f3e7db320..7af95a4632 100644
--- a/library/ui/src/main/res/values-sv/strings.xml
+++ b/library/ui/src/main/res/values-sv/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Surroundljud</string>
   <string name="exo_track_surround_5_point_1">5.1-kanaligt surroundljud</string>
   <string name="exo_track_surround_7_point_1">7.1-kanaligt surroundljud</string>
+  <string name="exo_track_role_alternate">Alternativ</string>
+  <string name="exo_track_role_supplementary">Tillägg</string>
+  <string name="exo_track_role_commentary">Kommentar</string>
+  <string name="exo_track_role_closed_captions">Undertexter</string>
   <string name="exo_track_bitrate">%1$.2f Mbit/s</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-sw/strings.xml b/library/ui/src/main/res/values-sw/strings.xml
index b699116dd7..af58d417d6 100644
--- a/library/ui/src/main/res/values-sw/strings.xml
+++ b/library/ui/src/main/res/values-sw/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Sauti ya mzunguko</string>
   <string name="exo_track_surround_5_point_1">Sauti ya mzunguko ya 5.1</string>
   <string name="exo_track_surround_7_point_1">Sauti ya mzunguko ya 7.1</string>
+  <string name="exo_track_role_alternate">Mbadala</string>
+  <string name="exo_track_role_supplementary">Wa ziada</string>
+  <string name="exo_track_role_commentary">Uchambuzi</string>
+  <string name="exo_track_role_closed_captions">Manukuu</string>
   <string name="exo_track_bitrate">Mbps %1$.2f</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ta/strings.xml b/library/ui/src/main/res/values-ta/strings.xml
index 4608e1beba..2b2b9e13d6 100644
--- a/library/ui/src/main/res/values-ta/strings.xml
+++ b/library/ui/src/main/res/values-ta/strings.xml
@@ -10,7 +10,7 @@
   <string name="exo_controls_repeat_off_description">எதையும் மீண்டும் இயக்காதே</string>
   <string name="exo_controls_repeat_one_description">இதை மட்டும் மீண்டும் இயக்கு</string>
   <string name="exo_controls_repeat_all_description">அனைத்தையும் மீண்டும் இயக்கு</string>
-  <string name="exo_controls_shuffle_description">கலைத்துப் போடு</string>
+  <string name="exo_controls_shuffle_description">வரிசை மாற்றி இயக்கு</string>
   <string name="exo_controls_fullscreen_description">முழுத்திரைப் பயன்முறை</string>
   <string name="exo_controls_vr_description">VR பயன்முறை</string>
   <string name="exo_download_description">பதிவிறக்கும் பட்டன்</string>
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">சரவுண்ட் சவுண்ட்</string>
   <string name="exo_track_surround_5_point_1">5.1 சரவுண்ட் சவுண்ட்</string>
   <string name="exo_track_surround_7_point_1">7.1 சரவுண்ட் சவுண்ட்</string>
+  <string name="exo_track_role_alternate">மாற்று டிராக்</string>
+  <string name="exo_track_role_supplementary">துணை டிராக்</string>
+  <string name="exo_track_role_commentary">வர்ணனை</string>
+  <string name="exo_track_role_closed_captions">வசனம்</string>
   <string name="exo_track_bitrate">%1$.2f மெ.பை./வி</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-te/strings.xml b/library/ui/src/main/res/values-te/strings.xml
index 46271ddf33..ea344b0345 100644
--- a/library/ui/src/main/res/values-te/strings.xml
+++ b/library/ui/src/main/res/values-te/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">సరౌండ్ ధ్వని</string>
   <string name="exo_track_surround_5_point_1">5.1 సరౌండ్ ధ్వని</string>
   <string name="exo_track_surround_7_point_1">7.1 సరౌండ్ ధ్వని</string>
+  <string name="exo_track_role_alternate">ప్రత్యామ్నాయం</string>
+  <string name="exo_track_role_supplementary">అనుబంధితం</string>
+  <string name="exo_track_role_commentary">వ్యాఖ్యానం</string>
+  <string name="exo_track_role_closed_captions">CC</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-th/strings.xml b/library/ui/src/main/res/values-th/strings.xml
index 7827c99d93..3cd933ccf1 100644
--- a/library/ui/src/main/res/values-th/strings.xml
+++ b/library/ui/src/main/res/values-th/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">เสียงเซอร์ราวด์</string>
   <string name="exo_track_surround_5_point_1">ระบบเสียง 5.1 เซอร์ราวด์</string>
   <string name="exo_track_surround_7_point_1">7.1 เสียงเซอร์ราวด์</string>
+  <string name="exo_track_role_alternate">อื่นๆ</string>
+  <string name="exo_track_role_supplementary">แทร็กเสริม</string>
+  <string name="exo_track_role_commentary">ความคิดเห็น</string>
+  <string name="exo_track_role_closed_captions">คำบรรยาย</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-tl/strings.xml b/library/ui/src/main/res/values-tl/strings.xml
index 8ca6e90c07..21852c5011 100644
--- a/library/ui/src/main/res/values-tl/strings.xml
+++ b/library/ui/src/main/res/values-tl/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Surround sound</string>
   <string name="exo_track_surround_5_point_1">5.1 na surround sound</string>
   <string name="exo_track_surround_7_point_1">7.1 na surround sound</string>
+  <string name="exo_track_role_alternate">Alternatibo</string>
+  <string name="exo_track_role_supplementary">Karagdagan</string>
+  <string name="exo_track_role_commentary">Komentaryo</string>
+  <string name="exo_track_role_closed_captions">CC</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-tr/strings.xml b/library/ui/src/main/res/values-tr/strings.xml
index d47ca1e2aa..2fbf36514f 100644
--- a/library/ui/src/main/res/values-tr/strings.xml
+++ b/library/ui/src/main/res/values-tr/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Surround ses</string>
   <string name="exo_track_surround_5_point_1">5.1 surround ses</string>
   <string name="exo_track_surround_7_point_1">7.1 surround ses</string>
+  <string name="exo_track_role_alternate">Alternatif</string>
+  <string name="exo_track_role_supplementary">Ek kanal</string>
+  <string name="exo_track_role_commentary">Anlatım</string>
+  <string name="exo_track_role_closed_captions">Altyazı</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-uk/strings.xml b/library/ui/src/main/res/values-uk/strings.xml
index 5f3097a256..5d338b61af 100644
--- a/library/ui/src/main/res/values-uk/strings.xml
+++ b/library/ui/src/main/res/values-uk/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Об’ємний звук</string>
   <string name="exo_track_surround_5_point_1">Об’ємний звук у форматі 5.1</string>
   <string name="exo_track_surround_7_point_1">Об’ємний звук у форматі 7.1</string>
+  <string name="exo_track_role_alternate">Альтернативна</string>
+  <string name="exo_track_role_supplementary">Додаткова</string>
+  <string name="exo_track_role_commentary">Коментарі</string>
+  <string name="exo_track_role_closed_captions">Субтитри</string>
   <string name="exo_track_bitrate">%1$.2f Мбіт/с</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ur/strings.xml b/library/ui/src/main/res/values-ur/strings.xml
index ce77007e4d..aa98b0728e 100644
--- a/library/ui/src/main/res/values-ur/strings.xml
+++ b/library/ui/src/main/res/values-ur/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">محیط آواز</string>
   <string name="exo_track_surround_5_point_1">5.1 محیط آواز</string>
   <string name="exo_track_surround_7_point_1">7.1 محیط آواز</string>
+  <string name="exo_track_role_alternate">متبادل</string>
+  <string name="exo_track_role_supplementary">اضافی</string>
+  <string name="exo_track_role_commentary">تبصرہ</string>
+  <string name="exo_track_role_closed_captions">سب ٹائٹلز</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s، %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-uz/strings.xml b/library/ui/src/main/res/values-uz/strings.xml
index 9427fc4149..2dcf5a518d 100644
--- a/library/ui/src/main/res/values-uz/strings.xml
+++ b/library/ui/src/main/res/values-uz/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Qamrovli ovoz</string>
   <string name="exo_track_surround_5_point_1">5.1 qamrovli ovoz</string>
   <string name="exo_track_surround_7_point_1">7.1 qamrovli ovoz</string>
+  <string name="exo_track_role_alternate">Muqobil</string>
+  <string name="exo_track_role_supplementary">Qoʻshimcha</string>
+  <string name="exo_track_role_commentary">Sharh</string>
+  <string name="exo_track_role_closed_captions">Taglavhalar</string>
   <string name="exo_track_bitrate">%1$.2f Mbit/s</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-vi/strings.xml b/library/ui/src/main/res/values-vi/strings.xml
index ae6abb90f5..1cdb249ef0 100644
--- a/library/ui/src/main/res/values-vi/strings.xml
+++ b/library/ui/src/main/res/values-vi/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Âm thanh vòm</string>
   <string name="exo_track_surround_5_point_1">Âm thanh vòm 5.1</string>
   <string name="exo_track_surround_7_point_1">Âm thanh vòm 7.1</string>
+  <string name="exo_track_role_alternate">Thay thế</string>
+  <string name="exo_track_role_supplementary">Bổ sung</string>
+  <string name="exo_track_role_commentary">Bình luận</string>
+  <string name="exo_track_role_closed_captions">Phụ đề</string>
   <string name="exo_track_bitrate">%1$.2f Mb/giây</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-zh-rCN/strings.xml b/library/ui/src/main/res/values-zh-rCN/strings.xml
index cfb9a6fb11..fe21669ea4 100644
--- a/library/ui/src/main/res/values-zh-rCN/strings.xml
+++ b/library/ui/src/main/res/values-zh-rCN/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">环绕声</string>
   <string name="exo_track_surround_5_point_1">5.1 环绕声</string>
   <string name="exo_track_surround_7_point_1">7.1 环绕声</string>
+  <string name="exo_track_role_alternate">替用轨</string>
+  <string name="exo_track_role_supplementary">补充轨</string>
+  <string name="exo_track_role_commentary">旁白</string>
+  <string name="exo_track_role_closed_captions">字幕</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s，%2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-zh-rHK/strings.xml b/library/ui/src/main/res/values-zh-rHK/strings.xml
index be96b852f5..56e0a1a53b 100644
--- a/library/ui/src/main/res/values-zh-rHK/strings.xml
+++ b/library/ui/src/main/res/values-zh-rHK/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">環迴立體聲</string>
   <string name="exo_track_surround_5_point_1">5.1 環迴立體聲</string>
   <string name="exo_track_surround_7_point_1">7.1 環迴立體聲</string>
+  <string name="exo_track_role_alternate">其他</string>
+  <string name="exo_track_role_supplementary">附加</string>
+  <string name="exo_track_role_commentary">評論</string>
+  <string name="exo_track_role_closed_captions">字幕</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s、%2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-zh-rTW/strings.xml b/library/ui/src/main/res/values-zh-rTW/strings.xml
index c17c9e44ed..7b29f7924e 100644
--- a/library/ui/src/main/res/values-zh-rTW/strings.xml
+++ b/library/ui/src/main/res/values-zh-rTW/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">環繞音效</string>
   <string name="exo_track_surround_5_point_1">5.1 環繞音效</string>
   <string name="exo_track_surround_7_point_1">7.1 環繞音效</string>
+  <string name="exo_track_role_alternate">替用軌</string>
+  <string name="exo_track_role_supplementary">補充軌</string>
+  <string name="exo_track_role_commentary">旁白</string>
+  <string name="exo_track_role_closed_captions">CC</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s、%2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-zu/strings.xml b/library/ui/src/main/res/values-zu/strings.xml
index 70eccd3c36..83cf9b2e97 100644
--- a/library/ui/src/main/res/values-zu/strings.xml
+++ b/library/ui/src/main/res/values-zu/strings.xml
@@ -31,6 +31,10 @@
   <string name="exo_track_surround">Umsindo ozungelezile</string>
   <string name="exo_track_surround_5_point_1">Umsindo ozungelezile ongu-5.1</string>
   <string name="exo_track_surround_7_point_1">Umsindo ozungelezile ongu-7.1</string>
+  <string name="exo_track_role_alternate">Okunye</string>
+  <string name="exo_track_role_supplementary">Okungeziwe</string>
+  <string name="exo_track_role_commentary">Abahlaziyi</string>
+  <string name="exo_track_role_closed_captions">CC</string>
   <string name="exo_track_bitrate">%1$.2f Mbps</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>

From 8688bd2d8885c381853938325b800b26663a6821 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 10 Apr 2019 11:37:56 +0100
Subject: [PATCH 737/832] Rename DownloadState to Download

PiperOrigin-RevId: 242839480
---
 .../exoplayer2/demo/DemoDownloadService.java  |  16 +-
 .../exoplayer2/demo/DownloadTracker.java      |  40 +--
 .../offline/DefaultDownloadIndex.java         |  81 +++--
 .../{DownloadState.java => Download.java}     |  24 +-
 ...adStateCursor.java => DownloadCursor.java} |  32 +-
 .../exoplayer2/offline/DownloadIndex.java     |  21 +-
 .../exoplayer2/offline/DownloadIndexUtil.java |  10 +-
 .../exoplayer2/offline/DownloadManager.java   | 326 +++++++++---------
 .../exoplayer2/offline/DownloadService.java   |  48 ++-
 .../offline/DefaultDownloadIndexTest.java     | 256 +++++++-------
 ...StateBuilder.java => DownloadBuilder.java} |  62 ++--
 .../offline/DownloadIndexUtilTest.java        |  34 +-
 .../offline/DownloadManagerTest.java          |  16 +-
 ...wnloadStateTest.java => DownloadTest.java} | 173 +++++-----
 .../dash/offline/DownloadServiceDashTest.java |   4 +-
 .../ui/DownloadNotificationHelper.java        |  20 +-
 .../ui/DownloadNotificationUtil.java          |   8 +-
 .../testutil/TestDownloadManagerListener.java |  28 +-
 18 files changed, 574 insertions(+), 625 deletions(-)
 rename library/core/src/main/java/com/google/android/exoplayer2/offline/{DownloadState.java => Download.java} (92%)
 rename library/core/src/main/java/com/google/android/exoplayer2/offline/{DownloadStateCursor.java => DownloadCursor.java} (74%)
 rename library/core/src/test/java/com/google/android/exoplayer2/offline/{DownloadStateBuilder.java => DownloadBuilder.java} (64%)
 rename library/core/src/test/java/com/google/android/exoplayer2/offline/{DownloadStateTest.java => DownloadTest.java} (50%)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
index ae60337c76..fa4c2563d7 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
@@ -16,9 +16,9 @@
 package com.google.android.exoplayer2.demo;
 
 import android.app.Notification;
+import com.google.android.exoplayer2.offline.Download;
 import com.google.android.exoplayer2.offline.DownloadManager;
 import com.google.android.exoplayer2.offline.DownloadService;
-import com.google.android.exoplayer2.offline.DownloadState;
 import com.google.android.exoplayer2.scheduler.PlatformScheduler;
 import com.google.android.exoplayer2.ui.DownloadNotificationHelper;
 import com.google.android.exoplayer2.util.NotificationUtil;
@@ -61,26 +61,26 @@ public class DemoDownloadService extends DownloadService {
   }
 
   @Override
-  protected Notification getForegroundNotification(DownloadState[] downloadStates) {
+  protected Notification getForegroundNotification(Download[] downloads) {
     return notificationHelper.buildProgressNotification(
-        R.drawable.ic_download, /* contentIntent= */ null, /* message= */ null, downloadStates);
+        R.drawable.ic_download, /* contentIntent= */ null, /* message= */ null, downloads);
   }
 
   @Override
-  protected void onDownloadStateChanged(DownloadState downloadState) {
+  protected void onDownloadChanged(Download download) {
     Notification notification;
-    if (downloadState.state == DownloadState.STATE_COMPLETED) {
+    if (download.state == Download.STATE_COMPLETED) {
       notification =
           notificationHelper.buildDownloadCompletedNotification(
               R.drawable.ic_download_done,
               /* contentIntent= */ null,
-              Util.fromUtf8Bytes(downloadState.action.data));
-    } else if (downloadState.state == DownloadState.STATE_FAILED) {
+              Util.fromUtf8Bytes(download.action.data));
+    } else if (download.state == Download.STATE_FAILED) {
       notification =
           notificationHelper.buildDownloadFailedNotification(
               R.drawable.ic_download_done,
               /* contentIntent= */ null,
-              Util.fromUtf8Bytes(downloadState.action.data));
+              Util.fromUtf8Bytes(download.action.data));
     } else {
       return;
     }
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index a51c60f8b6..1783729c23 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -25,12 +25,12 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.offline.ActionFile;
 import com.google.android.exoplayer2.offline.DefaultDownloadIndex;
+import com.google.android.exoplayer2.offline.Download;
 import com.google.android.exoplayer2.offline.DownloadAction;
+import com.google.android.exoplayer2.offline.DownloadCursor;
 import com.google.android.exoplayer2.offline.DownloadHelper;
 import com.google.android.exoplayer2.offline.DownloadManager;
 import com.google.android.exoplayer2.offline.DownloadService;
-import com.google.android.exoplayer2.offline.DownloadState;
-import com.google.android.exoplayer2.offline.DownloadStateCursor;
 import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo;
 import com.google.android.exoplayer2.upstream.DataSource;
@@ -63,7 +63,7 @@ public class DownloadTracker implements DownloadManager.Listener {
   private final Context context;
   private final DataSource.Factory dataSourceFactory;
   private final CopyOnWriteArraySet<Listener> listeners;
-  private final HashMap<Uri, DownloadState> downloadStates;
+  private final HashMap<Uri, Download> downloads;
   private final DefaultDownloadIndex downloadIndex;
 
   @Nullable private StartDownloadDialogHelper startDownloadDialogHelper;
@@ -74,7 +74,7 @@ public class DownloadTracker implements DownloadManager.Listener {
     this.dataSourceFactory = dataSourceFactory;
     this.downloadIndex = downloadIndex;
     listeners = new CopyOnWriteArraySet<>();
-    downloadStates = new HashMap<>();
+    downloads = new HashMap<>();
     loadDownloads();
   }
 
@@ -87,15 +87,15 @@ public class DownloadTracker implements DownloadManager.Listener {
   }
 
   public boolean isDownloaded(Uri uri) {
-    DownloadState downloadState = downloadStates.get(uri);
-    return downloadState != null && downloadState.state != DownloadState.STATE_FAILED;
+    Download download = downloads.get(uri);
+    return download != null && download.state != Download.STATE_FAILED;
   }
 
   @SuppressWarnings("unchecked")
   public List<StreamKey> getOfflineStreamKeys(Uri uri) {
-    DownloadState downloadState = downloadStates.get(uri);
-    return downloadState != null && downloadState.state != DownloadState.STATE_FAILED
-        ? downloadState.action.streamKeys
+    Download download = downloads.get(uri);
+    return download != null && download.state != Download.STATE_FAILED
+        ? download.action.streamKeys
         : Collections.emptyList();
   }
 
@@ -105,10 +105,10 @@ public class DownloadTracker implements DownloadManager.Listener {
       Uri uri,
       String extension,
       RenderersFactory renderersFactory) {
-    DownloadState downloadState = downloadStates.get(uri);
-    if (downloadState != null) {
+    Download download = downloads.get(uri);
+    if (download != null) {
       DownloadService.startWithRemoveDownload(
-          context, DemoDownloadService.class, downloadState.action.id, /* foreground= */ false);
+          context, DemoDownloadService.class, download.action.id, /* foreground= */ false);
     } else {
       if (startDownloadDialogHelper != null) {
         startDownloadDialogHelper.release();
@@ -122,16 +122,16 @@ public class DownloadTracker implements DownloadManager.Listener {
   // DownloadManager.Listener
 
   @Override
-  public void onDownloadStateChanged(DownloadManager downloadManager, DownloadState downloadState) {
-    downloadStates.put(downloadState.action.uri, downloadState);
+  public void onDownloadChanged(DownloadManager downloadManager, Download download) {
+    downloads.put(download.action.uri, download);
     for (Listener listener : listeners) {
       listener.onDownloadsChanged();
     }
   }
 
   @Override
-  public void onDownloadRemoved(DownloadManager downloadManager, DownloadState downloadState) {
-    downloadStates.remove(downloadState.action.uri);
+  public void onDownloadRemoved(DownloadManager downloadManager, Download download) {
+    downloads.remove(download.action.uri);
     for (Listener listener : listeners) {
       listener.onDownloadsChanged();
     }
@@ -140,10 +140,10 @@ public class DownloadTracker implements DownloadManager.Listener {
   // Internal methods
 
   private void loadDownloads() {
-    try (DownloadStateCursor loadedDownloadStates = downloadIndex.getDownloadStates()) {
-      while (loadedDownloadStates.moveToNext()) {
-        DownloadState downloadState = loadedDownloadStates.getDownloadState();
-        downloadStates.put(downloadState.action.uri, downloadState);
+    try (DownloadCursor loadedDownloads = downloadIndex.getDownloads()) {
+      while (loadedDownloads.moveToNext()) {
+        Download download = loadedDownloads.getDownload();
+        downloads.put(download.action.uri, download);
       }
     } catch (IOException e) {
       Log.w(TAG, "Failed to query download states", e);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
index 82d34e983f..aae88828c3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -33,7 +33,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * A {@link DownloadIndex} which uses SQLite to persist {@link DownloadState}s.
+ * A {@link DownloadIndex} which uses SQLite to persist {@link Download}s.
  *
  * <p class="caution">Database access may take a long time, do not call methods of this class from
  * the application main thread.
@@ -88,7 +88,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
 
   private static final String WHERE_ID_EQUALS = COLUMN_ID + " = ?";
   private static final String WHERE_STATE_TERMINAL =
-      getStateQuery(DownloadState.STATE_COMPLETED, DownloadState.STATE_FAILED);
+      getStateQuery(Download.STATE_COMPLETED, Download.STATE_FAILED);
 
   private static final String[] COLUMNS =
       new String[] {
@@ -153,8 +153,8 @@ public final class DefaultDownloadIndex implements DownloadIndex {
   private boolean initialized;
 
   /**
-   * Creates a DefaultDownloadIndex which stores the {@link DownloadState}s on a SQLite database
-   * provided by {@code databaseProvider}.
+   * Creates a DefaultDownloadIndex which stores the {@link Download}s on a SQLite database provided
+   * by {@code databaseProvider}.
    *
    * @param databaseProvider A DatabaseProvider which provides the database which will be used to
    *     store DownloadStatus table.
@@ -165,52 +165,51 @@ public final class DefaultDownloadIndex implements DownloadIndex {
 
   @Override
   @Nullable
-  public DownloadState getDownloadState(String id) throws DatabaseIOException {
+  public Download getDownload(String id) throws DatabaseIOException {
     ensureInitialized();
     try (Cursor cursor = getCursor(WHERE_ID_EQUALS, new String[] {id})) {
       if (cursor.getCount() == 0) {
         return null;
       }
       cursor.moveToNext();
-      return getDownloadStateForCurrentRow(cursor);
+      return getDownloadForCurrentRow(cursor);
     } catch (SQLiteException e) {
       throw new DatabaseIOException(e);
     }
   }
 
   @Override
-  public DownloadStateCursor getDownloadStates(@DownloadState.State int... states)
-      throws DatabaseIOException {
+  public DownloadCursor getDownloads(@Download.State int... states) throws DatabaseIOException {
     ensureInitialized();
     Cursor cursor = getCursor(getStateQuery(states), /* selectionArgs= */ null);
-    return new DownloadStateCursorImpl(cursor);
+    return new DownloadCursorImpl(cursor);
   }
 
   /**
-   * Adds or replaces a {@link DownloadState}.
+   * Adds or replaces a {@link Download}.
    *
-   * @param downloadState The {@link DownloadState} to be added.
+   * @param download The {@link Download} to be added.
    * @throws DatabaseIOException If an error occurs setting the state.
    */
-  public void putDownloadState(DownloadState downloadState) throws DatabaseIOException {
+  public void putDownload(Download download) throws DatabaseIOException {
     ensureInitialized();
     ContentValues values = new ContentValues();
-    values.put(COLUMN_ID, downloadState.action.id);
-    values.put(COLUMN_TYPE, downloadState.action.type);
-    values.put(COLUMN_URI, downloadState.action.uri.toString());
-    values.put(COLUMN_STREAM_KEYS, encodeStreamKeys(downloadState.action.streamKeys));
-    values.put(COLUMN_CUSTOM_CACHE_KEY, downloadState.action.customCacheKey);
-    values.put(COLUMN_DATA, downloadState.action.data);
-    values.put(COLUMN_STATE, downloadState.state);
-    values.put(COLUMN_DOWNLOAD_PERCENTAGE, downloadState.getDownloadPercentage());
-    values.put(COLUMN_DOWNLOADED_BYTES, downloadState.getDownloadedBytes());
-    values.put(COLUMN_TOTAL_BYTES, downloadState.getTotalBytes());
-    values.put(COLUMN_FAILURE_REASON, downloadState.failureReason);
+    values.put(COLUMN_ID, download.action.id);
+    values.put(COLUMN_TYPE, download.action.type);
+    values.put(COLUMN_URI, download.action.uri.toString());
+    values.put(COLUMN_STREAM_KEYS, encodeStreamKeys(download.action.streamKeys));
+    values.put(COLUMN_CUSTOM_CACHE_KEY, download.action.customCacheKey);
+    values.put(COLUMN_DATA, download.action.data);
+    values.put(COLUMN_STATE, download.state);
+    values.put(COLUMN_DOWNLOAD_PERCENTAGE, download.getDownloadPercentage());
+    values.put(COLUMN_DOWNLOADED_BYTES, download.getDownloadedBytes());
+    values.put(COLUMN_TOTAL_BYTES, download.getTotalBytes());
+    values.put(COLUMN_FAILURE_REASON, download.failureReason);
     values.put(COLUMN_STOP_FLAGS, 0);
     values.put(COLUMN_NOT_MET_REQUIREMENTS, 0);
-    values.put(COLUMN_MANUAL_STOP_REASON, downloadState.manualStopReason);
-    values.put(COLUMN_START_TIME_MS, downloadState.startTimeMs);
-    values.put(COLUMN_UPDATE_TIME_MS, downloadState.updateTimeMs);
+    values.put(COLUMN_MANUAL_STOP_REASON, download.manualStopReason);
+    values.put(COLUMN_START_TIME_MS, download.startTimeMs);
+    values.put(COLUMN_UPDATE_TIME_MS, download.updateTimeMs);
     try {
       SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
       writableDatabase.replaceOrThrow(TABLE_NAME, /* nullColumnHack= */ null, values);
@@ -220,12 +219,12 @@ public final class DefaultDownloadIndex implements DownloadIndex {
   }
 
   /**
-   * Removes the {@link DownloadState} with the given {@code id}.
+   * Removes the {@link Download} with the given {@code id}.
    *
-   * @param id ID of a {@link DownloadState}.
+   * @param id ID of a {@link Download}.
    * @throws DatabaseIOException If an error occurs removing the state.
    */
-  public void removeDownloadState(String id) throws DatabaseIOException {
+  public void removeDownload(String id) throws DatabaseIOException {
     ensureInitialized();
     try {
       databaseProvider.getWritableDatabase().delete(TABLE_NAME, WHERE_ID_EQUALS, new String[] {id});
@@ -236,7 +235,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
 
   /**
    * Sets the manual stop reason of the downloads in a terminal state ({@link
-   * DownloadState#STATE_COMPLETED}, {@link DownloadState#STATE_FAILED}).
+   * Download#STATE_COMPLETED}, {@link Download#STATE_FAILED}).
    *
    * @param manualStopReason The manual stop reason.
    * @throws DatabaseIOException If an error occurs updating the state.
@@ -255,12 +254,12 @@ public final class DefaultDownloadIndex implements DownloadIndex {
 
   /**
    * Sets the manual stop reason of the download with the given {@code id} in a terminal state
-   * ({@link DownloadState#STATE_COMPLETED}, {@link DownloadState#STATE_FAILED}).
+   * ({@link Download#STATE_COMPLETED}, {@link Download#STATE_FAILED}).
    *
-   * <p>If there's no {@link DownloadState} with the given {@code id} or it isn't in a terminal
-   * state, then nothing happens.
+   * <p>If there's no {@link Download} with the given {@code id} or it isn't in a terminal state,
+   * then nothing happens.
    *
-   * @param id ID of a {@link DownloadState}.
+   * @param id ID of a {@link Download}.
    * @param manualStopReason The manual stop reason.
    * @throws DatabaseIOException If an error occurs updating the state.
    */
@@ -326,7 +325,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
     }
   }
 
-  private static String getStateQuery(@DownloadState.State int... states) {
+  private static String getStateQuery(@Download.State int... states) {
     if (states.length == 0) {
       return TRUE;
     }
@@ -342,7 +341,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
     return selectionBuilder.toString();
   }
 
-  private static DownloadState getDownloadStateForCurrentRow(Cursor cursor) {
+  private static Download getDownloadForCurrentRow(Cursor cursor) {
     DownloadAction action =
         new DownloadAction(
             cursor.getString(COLUMN_INDEX_ID),
@@ -355,7 +354,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
     cachingCounters.alreadyCachedBytes = cursor.getLong(COLUMN_INDEX_DOWNLOADED_BYTES);
     cachingCounters.contentLength = cursor.getLong(COLUMN_INDEX_TOTAL_BYTES);
     cachingCounters.percentage = cursor.getFloat(COLUMN_INDEX_DOWNLOAD_PERCENTAGE);
-    return new DownloadState(
+    return new Download(
         action,
         cursor.getInt(COLUMN_INDEX_STATE),
         cursor.getInt(COLUMN_INDEX_FAILURE_REASON),
@@ -401,17 +400,17 @@ public final class DefaultDownloadIndex implements DownloadIndex {
     return streamKeys;
   }
 
-  private static final class DownloadStateCursorImpl implements DownloadStateCursor {
+  private static final class DownloadCursorImpl implements DownloadCursor {
 
     private final Cursor cursor;
 
-    private DownloadStateCursorImpl(Cursor cursor) {
+    private DownloadCursorImpl(Cursor cursor) {
       this.cursor = cursor;
     }
 
     @Override
-    public DownloadState getDownloadState() {
-      return getDownloadStateForCurrentRow(cursor);
+    public Download getDownload() {
+      return getDownloadForCurrentRow(cursor);
     }
 
     @Override
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
similarity index 92%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
rename to library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
index 7a6bcd0753..c0e31ec39a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadState.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
@@ -24,7 +24,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
 /** Represents state of a download. */
-public final class DownloadState {
+public final class Download {
 
   /**
    * Download states. One of {@link #STATE_QUEUED}, {@link #STATE_STOPPED}, {@link
@@ -128,15 +128,15 @@ public final class DownloadState {
   /*package*/ CachingCounters counters;
 
   /**
-   * Creates a {@link DownloadState} using a {@link DownloadAction}.
+   * Creates a {@link Download} using a {@link DownloadAction}.
    *
    * @param action The {@link DownloadAction}.
    */
-  public DownloadState(DownloadAction action) {
+  public Download(DownloadAction action) {
     this(action, System.currentTimeMillis());
   }
 
-  private DownloadState(DownloadAction action, long currentTimeMs) {
+  private Download(DownloadAction action, long currentTimeMs) {
     this(
         action,
         /* state= */ STATE_QUEUED,
@@ -147,7 +147,7 @@ public final class DownloadState {
         new CachingCounters());
   }
 
-  /* package */ DownloadState(
+  /* package */ Download(
       DownloadAction action,
       @State int state,
       @FailureReason int failureReason,
@@ -170,15 +170,15 @@ public final class DownloadState {
   }
 
   /**
-   * Merges the given {@link DownloadAction} and creates a new {@link DownloadState}. The action
-   * must have the same id and type.
+   * Merges the given {@link DownloadAction} and creates a new {@link Download}. The action must
+   * have the same id and type.
    *
    * @param newAction The {@link DownloadAction} to be merged.
    * @param canStart Whether the download is eligible to be started.
-   * @return A new {@link DownloadState}.
+   * @return A new {@link Download}.
    */
-  public DownloadState copyWithMergedAction(DownloadAction newAction, boolean canStart) {
-    return new DownloadState(
+  public Download copyWithMergedAction(DownloadAction newAction, boolean canStart) {
+    return new Download(
         action.copyWithMergedAction(newAction),
         getNextState(state, canStart && manualStopReason == 0),
         FAILURE_REASON_NONE,
@@ -193,8 +193,8 @@ public final class DownloadState {
    *
    * @param state The {@link State}.
    */
-  public DownloadState copyWithState(@State int state) {
-    return new DownloadState(
+  public Download copyWithState(@State int state) {
+    return new Download(
         action,
         state,
         FAILURE_REASON_NONE,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadStateCursor.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadCursor.java
similarity index 74%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadStateCursor.java
rename to library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadCursor.java
index 3f9201c0e9..a1822fca97 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadStateCursor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadCursor.java
@@ -18,19 +18,19 @@ package com.google.android.exoplayer2.offline;
 import java.io.Closeable;
 
 /** Provides random read-write access to the result set returned by a database query. */
-public interface DownloadStateCursor extends Closeable {
+public interface DownloadCursor extends Closeable {
 
-  /** Returns the DownloadState at the current position. */
-  DownloadState getDownloadState();
+  /** Returns the download at the current position. */
+  Download getDownload();
 
-  /** Returns the numbers of DownloadStates in the cursor. */
+  /** Returns the numbers of downloads in the cursor. */
   int getCount();
 
   /**
-   * Returns the current position of the cursor in the DownloadState set. The value is zero-based.
-   * When the DownloadState set is first returned the cursor will be at positon -1, which is before
-   * the first DownloadState. After the last DownloadState is returned another call to next() will
-   * leave the cursor past the last entry, at a position of count().
+   * Returns the current position of the cursor in the download set. The value is zero-based. When
+   * the download set is first returned the cursor will be at positon -1, which is before the first
+   * download. After the last download is returned another call to next() will leave the cursor past
+   * the last entry, at a position of count().
    *
    * @return the current cursor position.
    */
@@ -49,7 +49,7 @@ public interface DownloadStateCursor extends Closeable {
   boolean moveToPosition(int position);
 
   /**
-   * Move the cursor to the first DownloadState.
+   * Move the cursor to the first download.
    *
    * <p>This method will return false if the cursor is empty.
    *
@@ -60,7 +60,7 @@ public interface DownloadStateCursor extends Closeable {
   }
 
   /**
-   * Move the cursor to the last DownloadState.
+   * Move the cursor to the last download.
    *
    * <p>This method will return false if the cursor is empty.
    *
@@ -71,7 +71,7 @@ public interface DownloadStateCursor extends Closeable {
   }
 
   /**
-   * Move the cursor to the next DownloadState.
+   * Move the cursor to the next download.
    *
    * <p>This method will return false if the cursor is already past the last entry in the result
    * set.
@@ -83,7 +83,7 @@ public interface DownloadStateCursor extends Closeable {
   }
 
   /**
-   * Move the cursor to the previous DownloadState.
+   * Move the cursor to the previous download.
    *
    * <p>This method will return false if the cursor is already before the first entry in the result
    * set.
@@ -94,18 +94,18 @@ public interface DownloadStateCursor extends Closeable {
     return moveToPosition(getPosition() - 1);
   }
 
-  /** Returns whether the cursor is pointing to the first DownloadState. */
+  /** Returns whether the cursor is pointing to the first download. */
   default boolean isFirst() {
     return getPosition() == 0 && getCount() != 0;
   }
 
-  /** Returns whether the cursor is pointing to the last DownloadState. */
+  /** Returns whether the cursor is pointing to the last download. */
   default boolean isLast() {
     int count = getCount();
     return getPosition() == (count - 1) && count != 0;
   }
 
-  /** Returns whether the cursor is pointing to the position before the first DownloadState. */
+  /** Returns whether the cursor is pointing to the position before the first download. */
   default boolean isBeforeFirst() {
     if (getCount() == 0) {
       return true;
@@ -113,7 +113,7 @@ public interface DownloadStateCursor extends Closeable {
     return getPosition() == -1;
   }
 
-  /** Returns whether the cursor is pointing to the position after the last DownloadState. */
+  /** Returns whether the cursor is pointing to the position after the last download. */
   default boolean isAfterLast() {
     if (getCount() == 0) {
       return true;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java
index a9a4c69954..90d0fa1b51 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java
@@ -18,27 +18,26 @@ package com.google.android.exoplayer2.offline;
 import androidx.annotation.Nullable;
 import java.io.IOException;
 
-/** Persists {@link DownloadState}s. */
+/** Persists {@link Download}s. */
 public interface DownloadIndex {
 
   /**
-   * Returns the {@link DownloadState} with the given {@code id}, or null.
+   * Returns the {@link Download} with the given {@code id}, or null.
    *
-   * @param id ID of a {@link DownloadState}.
-   * @return The {@link DownloadState} with the given {@code id}, or null if a download state with
-   *     this id doesn't exist.
+   * @param id ID of a {@link Download}.
+   * @return The {@link Download} with the given {@code id}, or null if a download state with this
+   *     id doesn't exist.
    * @throws IOException If an error occurs reading the state.
    */
   @Nullable
-  DownloadState getDownloadState(String id) throws IOException;
+  Download getDownload(String id) throws IOException;
 
   /**
-   * Returns a {@link DownloadStateCursor} to {@link DownloadState}s with the given {@code states}.
+   * Returns a {@link DownloadCursor} to {@link Download}s with the given {@code states}.
    *
-   * @param states Returns only the {@link DownloadState}s with this states. If empty, returns all.
-   * @return A cursor to {@link DownloadState}s with the given {@code states}.
+   * @param states Returns only the {@link Download}s with this states. If empty, returns all.
+   * @return A cursor to {@link Download}s with the given {@code states}.
    * @throws IOException If an error occurs reading the state.
    */
-  DownloadStateCursor getDownloadStates(@DownloadState.State int... states) throws IOException;
-
+  DownloadCursor getDownloads(@Download.State int... states) throws IOException;
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
index 179a2a87f9..2932902e68 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
@@ -69,12 +69,12 @@ public final class DownloadIndexUtil {
    */
   /* package */ static void mergeAction(DownloadAction action, DefaultDownloadIndex downloadIndex)
       throws IOException {
-    DownloadState downloadState = downloadIndex.getDownloadState(action.id);
-    if (downloadState != null) {
-      downloadState = downloadState.copyWithMergedAction(action, /* canStart= */ true);
+    Download download = downloadIndex.getDownload(action.id);
+    if (download != null) {
+      download = download.copyWithMergedAction(action, /* canStart= */ true);
     } else {
-      downloadState = new DownloadState(action);
+      download = new Download(action);
     }
-    downloadIndex.putDownloadState(downloadState);
+    downloadIndex.putDownload(download);
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 05a13f7df0..c16ff30d44 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -15,17 +15,17 @@
  */
 package com.google.android.exoplayer2.offline;
 
-import static com.google.android.exoplayer2.offline.DownloadState.FAILURE_REASON_NONE;
-import static com.google.android.exoplayer2.offline.DownloadState.FAILURE_REASON_UNKNOWN;
-import static com.google.android.exoplayer2.offline.DownloadState.MANUAL_STOP_REASON_NONE;
-import static com.google.android.exoplayer2.offline.DownloadState.MANUAL_STOP_REASON_UNDEFINED;
-import static com.google.android.exoplayer2.offline.DownloadState.STATE_COMPLETED;
-import static com.google.android.exoplayer2.offline.DownloadState.STATE_DOWNLOADING;
-import static com.google.android.exoplayer2.offline.DownloadState.STATE_FAILED;
-import static com.google.android.exoplayer2.offline.DownloadState.STATE_QUEUED;
-import static com.google.android.exoplayer2.offline.DownloadState.STATE_REMOVING;
-import static com.google.android.exoplayer2.offline.DownloadState.STATE_RESTARTING;
-import static com.google.android.exoplayer2.offline.DownloadState.STATE_STOPPED;
+import static com.google.android.exoplayer2.offline.Download.FAILURE_REASON_NONE;
+import static com.google.android.exoplayer2.offline.Download.FAILURE_REASON_UNKNOWN;
+import static com.google.android.exoplayer2.offline.Download.MANUAL_STOP_REASON_NONE;
+import static com.google.android.exoplayer2.offline.Download.MANUAL_STOP_REASON_UNDEFINED;
+import static com.google.android.exoplayer2.offline.Download.STATE_COMPLETED;
+import static com.google.android.exoplayer2.offline.Download.STATE_DOWNLOADING;
+import static com.google.android.exoplayer2.offline.Download.STATE_FAILED;
+import static com.google.android.exoplayer2.offline.Download.STATE_QUEUED;
+import static com.google.android.exoplayer2.offline.Download.STATE_REMOVING;
+import static com.google.android.exoplayer2.offline.Download.STATE_RESTARTING;
+import static com.google.android.exoplayer2.offline.Download.STATE_STOPPED;
 
 import android.content.Context;
 import android.os.Handler;
@@ -74,18 +74,17 @@ public final class DownloadManager {
      * Called when the state of a download changes.
      *
      * @param downloadManager The reporting instance.
-     * @param downloadState The state of the download.
+     * @param download The state of the download.
      */
-    default void onDownloadStateChanged(
-        DownloadManager downloadManager, DownloadState downloadState) {}
+    default void onDownloadChanged(DownloadManager downloadManager, Download download) {}
 
     /**
      * Called when a download is removed.
      *
      * @param downloadManager The reporting instance.
-     * @param downloadState The last state of the download before it was removed.
+     * @param download The last state of the download before it was removed.
      */
-    default void onDownloadRemoved(DownloadManager downloadManager, DownloadState downloadState) {}
+    default void onDownloadRemoved(DownloadManager downloadManager, Download download) {}
 
     /**
      * Called when there is no active download left.
@@ -160,11 +159,11 @@ public final class DownloadManager {
 
   // Collections that are accessed on the main thread.
   private final CopyOnWriteArraySet<Listener> listeners;
-  private final ArrayList<DownloadState> downloadStates;
+  private final ArrayList<Download> downloads;
 
   // Collections that are accessed on the internal thread.
-  private final ArrayList<Download> downloads;
-  private final HashMap<Download, DownloadThread> activeDownloads;
+  private final ArrayList<DownloadInternal> downloadInternals;
+  private final HashMap<DownloadInternal, DownloadThread> activeDownloads;
 
   // Mutable fields that are accessed on the main thread.
   private int pendingMessages;
@@ -246,8 +245,8 @@ public final class DownloadManager {
     this.minRetryCount = minRetryCount;
 
     manualStopReason = MANUAL_STOP_REASON_UNDEFINED;
+    downloadInternals = new ArrayList<>();
     downloads = new ArrayList<>();
-    downloadStates = new ArrayList<>();
     activeDownloads = new HashMap<>();
     listeners = new CopyOnWriteArraySet<>();
     releaseLock = new Object();
@@ -285,12 +284,12 @@ public final class DownloadManager {
 
   /** Returns the number of downloads. */
   public int getDownloadCount() {
-    return downloadStates.size();
+    return downloads.size();
   }
 
   /** Returns the states of all current downloads. */
-  public DownloadState[] getAllDownloadStates() {
-    return downloadStates.toArray(new DownloadState[0]);
+  public Download[] getAllDownloads() {
+    return downloads.toArray(new Download[0]);
   }
 
   /** Returns the requirements needed to be met to start downloads. */
@@ -347,9 +346,9 @@ public final class DownloadManager {
    * Sets a manual stop reason for all downloads.
    *
    * @param manualStopReason An application defined stop reason. Value {@value
-   *     DownloadState#MANUAL_STOP_REASON_NONE} is not allowed and value {@value
-   *     DownloadState#MANUAL_STOP_REASON_UNDEFINED} is reserved for {@link
-   *     DownloadState#MANUAL_STOP_REASON_UNDEFINED}.
+   *     Download#MANUAL_STOP_REASON_NONE} is not allowed and value {@value
+   *     Download#MANUAL_STOP_REASON_UNDEFINED} is reserved for {@link
+   *     Download#MANUAL_STOP_REASON_UNDEFINED}.
    */
   public void stopDownloads(int manualStopReason) {
     Assertions.checkArgument(manualStopReason != MANUAL_STOP_REASON_NONE);
@@ -382,9 +381,9 @@ public final class DownloadManager {
    *
    * @param id The unique content id of the download to be stopped.
    * @param manualStopReason An application defined stop reason. Value {@value
-   *     DownloadState#MANUAL_STOP_REASON_NONE} is not allowed and value {@value
-   *     DownloadState#MANUAL_STOP_REASON_UNDEFINED} is reserved for {@link
-   *     DownloadState#MANUAL_STOP_REASON_UNDEFINED}.
+   *     Download#MANUAL_STOP_REASON_NONE} is not allowed and value {@value
+   *     Download#MANUAL_STOP_REASON_UNDEFINED} is reserved for {@link
+   *     Download#MANUAL_STOP_REASON_UNDEFINED}.
    */
   public void stopDownload(String id, int manualStopReason) {
     Assertions.checkArgument(manualStopReason != MANUAL_STOP_REASON_NONE);
@@ -439,7 +438,7 @@ public final class DownloadManager {
       pendingMessages = 0;
       activeDownloadCount = 0;
       initialized = false;
-      downloadStates.clear();
+      downloads.clear();
     }
   }
 
@@ -469,15 +468,15 @@ public final class DownloadManager {
   private boolean handleMainMessage(Message message) {
     switch (message.what) {
       case MSG_INITIALIZED:
-        List<DownloadState> downloadStates = (List<DownloadState>) message.obj;
-        onInitialized(downloadStates);
+        List<Download> downloads = (List<Download>) message.obj;
+        onInitialized(downloads);
         break;
       case MSG_DOWNLOAD_STATE_CHANGED:
-        DownloadState state = (DownloadState) message.obj;
-        onDownloadStateChanged(state);
+        Download state = (Download) message.obj;
+        onDownloadChanged(state);
         break;
       case MSG_DOWNLOAD_REMOVED:
-        state = (DownloadState) message.obj;
+        state = (Download) message.obj;
         onDownloadRemoved(state);
         break;
       case MSG_PROCESSED:
@@ -493,34 +492,34 @@ public final class DownloadManager {
 
   // TODO: Merge these three events into a single MSG_STATE_CHANGE that can carry all updates. This
   // allows updating idle at the same point as the downloads that can be queried changes.
-  private void onInitialized(List<DownloadState> downloadStates) {
+  private void onInitialized(List<Download> downloads) {
     initialized = true;
-    this.downloadStates.addAll(downloadStates);
+    this.downloads.addAll(downloads);
     for (Listener listener : listeners) {
       listener.onInitialized(DownloadManager.this);
     }
   }
 
-  private void onDownloadStateChanged(DownloadState downloadState) {
-    int downloadStateIndex = getDownloadStateIndex(downloadState.action.id);
-    if (downloadState.state == STATE_COMPLETED || downloadState.state == STATE_FAILED) {
-      if (downloadStateIndex != C.INDEX_UNSET) {
-        downloadStates.remove(downloadStateIndex);
+  private void onDownloadChanged(Download download) {
+    int downloadIndex = getDownloadIndex(download.action.id);
+    if (download.state == STATE_COMPLETED || download.state == STATE_FAILED) {
+      if (downloadIndex != C.INDEX_UNSET) {
+        downloads.remove(downloadIndex);
       }
-    } else if (downloadStateIndex != C.INDEX_UNSET) {
-      downloadStates.set(downloadStateIndex, downloadState);
+    } else if (downloadIndex != C.INDEX_UNSET) {
+      downloads.set(downloadIndex, download);
     } else {
-      downloadStates.add(downloadState);
+      downloads.add(download);
     }
     for (Listener listener : listeners) {
-      listener.onDownloadStateChanged(this, downloadState);
+      listener.onDownloadChanged(this, download);
     }
   }
 
-  private void onDownloadRemoved(DownloadState downloadState) {
-    downloadStates.remove(getDownloadStateIndex(downloadState.action.id));
+  private void onDownloadRemoved(Download download) {
+    downloads.remove(getDownloadIndex(download.action.id));
     for (Listener listener : listeners) {
-      listener.onDownloadRemoved(this, downloadState);
+      listener.onDownloadRemoved(this, download);
     }
   }
 
@@ -534,9 +533,9 @@ public final class DownloadManager {
     }
   }
 
-  private int getDownloadStateIndex(String id) {
-    for (int i = 0; i < downloadStates.size(); i++) {
-      if (downloadStates.get(i).action.id.equals(id)) {
+  private int getDownloadIndex(String id) {
+    for (int i = 0; i < downloads.size(); i++) {
+      if (downloads.get(i).action.id.equals(id)) {
         return i;
       }
     }
@@ -588,16 +587,16 @@ public final class DownloadManager {
 
   private void setManualStopReasonInternal(@Nullable String id, int manualStopReason) {
     if (id != null) {
-      Download download = getDownload(id);
-      if (download != null) {
-        logd("download manual stop reason is set to : " + manualStopReason, download);
-        download.setManualStopReason(manualStopReason);
+      DownloadInternal downloadInternal = getDownload(id);
+      if (downloadInternal != null) {
+        logd("download manual stop reason is set to : " + manualStopReason, downloadInternal);
+        downloadInternal.setManualStopReason(manualStopReason);
         return;
       }
     } else {
       this.manualStopReason = manualStopReason;
-      for (int i = 0; i < downloads.size(); i++) {
-        downloads.get(i).setManualStopReason(manualStopReason);
+      for (int i = 0; i < downloadInternals.size(); i++) {
+        downloadInternals.get(i).setManualStopReason(manualStopReason);
       }
     }
     try {
@@ -612,60 +611,59 @@ public final class DownloadManager {
   }
 
   private void addDownloadInternal(DownloadAction action) {
-    Download download = getDownload(action.id);
-    if (download != null) {
-      download.addAction(action);
-      logd("Action is added to existing download", download);
+    DownloadInternal downloadInternal = getDownload(action.id);
+    if (downloadInternal != null) {
+      downloadInternal.addAction(action);
+      logd("Action is added to existing download", downloadInternal);
     } else {
-      DownloadState downloadState = loadDownloadState(action.id);
-      if (downloadState == null) {
-        downloadState = new DownloadState(action);
+      Download download = loadDownload(action.id);
+      if (download == null) {
+        download = new Download(action);
         logd("Download state is created for " + action.id);
       } else {
-        downloadState =
-            downloadState.copyWithMergedAction(action, /* canStart= */ notMetRequirements == 0);
+        download = download.copyWithMergedAction(action, /* canStart= */ notMetRequirements == 0);
         logd("Download state is loaded for " + action.id);
       }
-      addDownloadForState(downloadState);
+      addDownloadForState(download);
     }
   }
 
   private void removeDownloadInternal(String id) {
-    Download download = getDownload(id);
-    if (download != null) {
-      download.remove();
+    DownloadInternal downloadInternal = getDownload(id);
+    if (downloadInternal != null) {
+      downloadInternal.remove();
     } else {
-      DownloadState downloadState = loadDownloadState(id);
-      if (downloadState != null) {
-        addDownloadForState(downloadState.copyWithState(STATE_REMOVING));
+      Download download = loadDownload(id);
+      if (download != null) {
+        addDownloadForState(download.copyWithState(STATE_REMOVING));
       } else {
         logd("Can't remove download. No download with id: " + id);
       }
     }
   }
 
-  private void onDownloadStateChangedInternal(Download download, DownloadState downloadState) {
-    logd("Download state is changed", download);
+  private void onDownloadChangedInternal(DownloadInternal downloadInternal, Download download) {
+    logd("Download state is changed", downloadInternal);
     try {
-      downloadIndex.putDownloadState(downloadState);
+      downloadIndex.putDownload(download);
     } catch (DatabaseIOException e) {
       Log.e(TAG, "Failed to update index", e);
     }
-    if (download.state == STATE_COMPLETED || download.state == STATE_FAILED) {
-      downloads.remove(download);
+    if (downloadInternal.state == STATE_COMPLETED || downloadInternal.state == STATE_FAILED) {
+      downloadInternals.remove(downloadInternal);
     }
-    mainHandler.obtainMessage(MSG_DOWNLOAD_STATE_CHANGED, downloadState).sendToTarget();
+    mainHandler.obtainMessage(MSG_DOWNLOAD_STATE_CHANGED, download).sendToTarget();
   }
 
-  private void onDownloadRemovedInternal(Download download, DownloadState downloadState) {
-    logd("Download is removed", download);
+  private void onDownloadRemovedInternal(DownloadInternal downloadInternal, Download download) {
+    logd("Download is removed", downloadInternal);
     try {
-      downloadIndex.removeDownloadState(downloadState.action.id);
+      downloadIndex.removeDownload(download.action.id);
     } catch (DatabaseIOException e) {
       Log.e(TAG, "Failed to remove from index", e);
     }
-    downloads.remove(download);
-    mainHandler.obtainMessage(MSG_DOWNLOAD_REMOVED, downloadState).sendToTarget();
+    downloadInternals.remove(downloadInternal);
+    mainHandler.obtainMessage(MSG_DOWNLOAD_REMOVED, download).sendToTarget();
   }
 
   private void setNotMetRequirementsInternal(
@@ -675,25 +673,25 @@ public final class DownloadManager {
     }
     this.notMetRequirements = notMetRequirements;
     logdFlags("Not met requirements are changed", notMetRequirements);
-    for (int i = 0; i < downloads.size(); i++) {
-      downloads.get(i).setNotMetRequirements(notMetRequirements);
+    for (int i = 0; i < downloadInternals.size(); i++) {
+      downloadInternals.get(i).setNotMetRequirements(notMetRequirements);
     }
   }
 
   @Nullable
-  private Download getDownload(String id) {
-    for (int i = 0; i < downloads.size(); i++) {
-      Download download = downloads.get(i);
-      if (download.getId().equals(id)) {
-        return download;
+  private DownloadInternal getDownload(String id) {
+    for (int i = 0; i < downloadInternals.size(); i++) {
+      DownloadInternal downloadInternal = downloadInternals.get(i);
+      if (downloadInternal.getId().equals(id)) {
+        return downloadInternal;
       }
     }
     return null;
   }
 
-  private DownloadState loadDownloadState(String id) {
+  private Download loadDownload(String id) {
     try {
-      return downloadIndex.getDownloadState(id);
+      return downloadIndex.getDownload(id);
     } catch (DatabaseIOException e) {
       Log.e(TAG, "loadDownload failed", e);
     }
@@ -702,33 +700,34 @@ public final class DownloadManager {
 
   private void initializeInternal(int notMetRequirements) {
     this.notMetRequirements = notMetRequirements;
-    ArrayList<DownloadState> loadedStates = new ArrayList<>();
-    try (DownloadStateCursor cursor =
-        downloadIndex.getDownloadStates(
+    ArrayList<Download> loadedStates = new ArrayList<>();
+    try (DownloadCursor cursor =
+        downloadIndex.getDownloads(
             STATE_QUEUED, STATE_STOPPED, STATE_DOWNLOADING, STATE_REMOVING, STATE_RESTARTING)) {
       while (cursor.moveToNext()) {
-        loadedStates.add(cursor.getDownloadState());
+        loadedStates.add(cursor.getDownload());
       }
       logd("Download states are loaded.");
     } catch (Throwable e) {
       Log.e(TAG, "Download state loading failed.", e);
       loadedStates.clear();
     }
-    for (DownloadState downloadState : loadedStates) {
-      addDownloadForState(downloadState);
+    for (Download download : loadedStates) {
+      addDownloadForState(download);
     }
     logd("Downloads are created.");
     mainHandler.obtainMessage(MSG_INITIALIZED, loadedStates).sendToTarget();
-    for (int i = 0; i < downloads.size(); i++) {
-      downloads.get(i).start();
+    for (int i = 0; i < downloadInternals.size(); i++) {
+      downloadInternals.get(i).start();
     }
   }
 
-  private void addDownloadForState(DownloadState downloadState) {
-    Download download = new Download(this, downloadState, notMetRequirements, manualStopReason);
-    downloads.add(download);
-    logd("Download is added", download);
-    download.initialize();
+  private void addDownloadForState(Download download) {
+    DownloadInternal downloadInternal =
+        new DownloadInternal(this, download, notMetRequirements, manualStopReason);
+    downloadInternals.add(downloadInternal);
+    logd("Download is added", downloadInternal);
+    downloadInternal.initialize();
   }
 
   private static void logd(String message) {
@@ -737,9 +736,9 @@ public final class DownloadManager {
     }
   }
 
-  private static void logd(String message, Download download) {
+  private static void logd(String message, DownloadInternal downloadInternal) {
     if (DEBUG) {
-      logd(message + ": " + download);
+      logd(message + ": " + downloadInternal);
     }
   }
 
@@ -750,39 +749,39 @@ public final class DownloadManager {
   }
 
   @StartThreadResults
-  private int startDownloadThread(Download download) {
-    if (activeDownloads.containsKey(download)) {
-      if (stopDownloadThread(download)) {
+  private int startDownloadThread(DownloadInternal downloadInternal) {
+    if (activeDownloads.containsKey(downloadInternal)) {
+      if (stopDownloadThread(downloadInternal)) {
         return START_THREAD_WAIT_DOWNLOAD_CANCELLATION;
       }
       return START_THREAD_WAIT_REMOVAL_TO_FINISH;
     }
-    if (!download.isInRemoveState()) {
+    if (!downloadInternal.isInRemoveState()) {
       if (simultaneousDownloads == maxSimultaneousDownloads) {
         return START_THREAD_TOO_MANY_DOWNLOADS;
       }
       simultaneousDownloads++;
     }
-    DownloadThread downloadThread = new DownloadThread(download);
-    activeDownloads.put(download, downloadThread);
-    download.setCounters(downloadThread.downloader.getCounters());
-    logd("Download is started", download);
+    DownloadThread downloadThread = new DownloadThread(downloadInternal);
+    activeDownloads.put(downloadInternal, downloadThread);
+    downloadInternal.setCounters(downloadThread.downloader.getCounters());
+    logd("Download is started", downloadInternal);
     return START_THREAD_SUCCEEDED;
   }
 
-  private boolean stopDownloadThread(Download download) {
-    DownloadThread downloadThread = activeDownloads.get(download);
+  private boolean stopDownloadThread(DownloadInternal downloadInternal) {
+    DownloadThread downloadThread = activeDownloads.get(downloadInternal);
     if (downloadThread != null && !downloadThread.isRemoveThread) {
       downloadThread.cancel();
-      logd("Download is cancelled", download);
+      logd("Download is cancelled", downloadInternal);
       return true;
     }
     return false;
   }
 
   private void releaseInternal() {
-    for (Download download : activeDownloads.keySet()) {
-      stopDownloadThread(download);
+    for (DownloadInternal downloadInternal : activeDownloads.keySet()) {
+      stopDownloadThread(downloadInternal);
     }
     internalThread.quit();
     synchronized (releaseLock) {
@@ -792,56 +791,55 @@ public final class DownloadManager {
   }
 
   private void onDownloadThreadStoppedInternal(DownloadThread downloadThread) {
-    Download download = downloadThread.download;
-    logd("Download is stopped", download);
-    activeDownloads.remove(download);
+    DownloadInternal downloadInternal = downloadThread.downloadInternal;
+    logd("Download is stopped", downloadInternal);
+    activeDownloads.remove(downloadInternal);
     boolean tryToStartDownloads = false;
     if (!downloadThread.isRemoveThread) {
       // If maxSimultaneousDownloads was hit, there might be a download waiting for a slot.
       tryToStartDownloads = simultaneousDownloads == maxSimultaneousDownloads;
       simultaneousDownloads--;
     }
-    download.onDownloadThreadStopped(downloadThread.isCanceled, downloadThread.finalError);
+    downloadInternal.onDownloadThreadStopped(downloadThread.isCanceled, downloadThread.finalError);
     if (tryToStartDownloads) {
       for (int i = 0;
-          simultaneousDownloads < maxSimultaneousDownloads && i < downloads.size();
+          simultaneousDownloads < maxSimultaneousDownloads && i < downloadInternals.size();
           i++) {
-        downloads.get(i).start();
+        downloadInternals.get(i).start();
       }
     }
   }
 
-  private static final class Download {
+  private static final class DownloadInternal {
     private final DownloadManager downloadManager;
 
-    private DownloadState downloadState;
-    @DownloadState.State private int state;
-    @MonotonicNonNull @DownloadState.FailureReason private int failureReason;
+    private Download download;
+    @Download.State private int state;
+    @MonotonicNonNull @Download.FailureReason private int failureReason;
     @Requirements.RequirementFlags private int notMetRequirements;
     private int manualStopReason;
 
-    private Download(
+    private DownloadInternal(
         DownloadManager downloadManager,
-        DownloadState downloadState,
+        Download download,
         @Requirements.RequirementFlags int notMetRequirements,
         int manualStopReason) {
       this.downloadManager = downloadManager;
-      this.downloadState = downloadState;
+      this.download = download;
       this.notMetRequirements = notMetRequirements;
       this.manualStopReason = manualStopReason;
     }
 
     private void initialize() {
-      initialize(downloadState.state);
+      initialize(download.state);
     }
 
     public String getId() {
-      return downloadState.action.id;
+      return download.action.id;
     }
 
     public void addAction(DownloadAction newAction) {
-      downloadState =
-          downloadState.copyWithMergedAction(newAction, /* canStart= */ notMetRequirements == 0);
+      download = download.copyWithMergedAction(newAction, /* canStart= */ notMetRequirements == 0);
       initialize();
     }
 
@@ -849,17 +847,17 @@ public final class DownloadManager {
       initialize(STATE_REMOVING);
     }
 
-    public DownloadState getUpdatedDownloadState() {
-      downloadState =
-          new DownloadState(
-              downloadState.action,
+    public Download getUpdatedDownload() {
+      download =
+          new Download(
+              download.action,
               state,
               state != STATE_FAILED ? FAILURE_REASON_NONE : failureReason,
               manualStopReason,
-              downloadState.startTimeMs,
+              download.startTimeMs,
               /* updateTimeMs= */ System.currentTimeMillis(),
-              downloadState.counters);
-      return downloadState;
+              download.counters);
+      return download;
     }
 
     public boolean isIdle() {
@@ -868,7 +866,7 @@ public final class DownloadManager {
 
     @Override
     public String toString() {
-      return getId() + ' ' + DownloadState.getStateString(state);
+      return getId() + ' ' + Download.getStateString(state);
     }
 
     public void start() {
@@ -894,11 +892,11 @@ public final class DownloadManager {
     }
 
     public void setCounters(CachingCounters counters) {
-      downloadState.setCounters(counters);
+      download.setCounters(counters);
     }
 
     private void updateStopState() {
-      DownloadState oldDownloadState = downloadState;
+      Download oldDownload = download;
       if (canStart()) {
         if (state == STATE_STOPPED) {
           startOrQueue();
@@ -909,8 +907,8 @@ public final class DownloadManager {
           setState(STATE_STOPPED);
         }
       }
-      if (oldDownloadState == downloadState) {
-        downloadManager.onDownloadStateChangedInternal(this, getUpdatedDownloadState());
+      if (oldDownload == download) {
+        downloadManager.onDownloadChangedInternal(this, getUpdatedDownload());
       }
     }
 
@@ -926,7 +924,7 @@ public final class DownloadManager {
         setState(STATE_STOPPED);
       }
       if (state == initialState) {
-        downloadManager.onDownloadStateChangedInternal(this, getUpdatedDownloadState());
+        downloadManager.onDownloadChangedInternal(this, getUpdatedDownload());
       }
     }
 
@@ -945,10 +943,10 @@ public final class DownloadManager {
       }
     }
 
-    private void setState(@DownloadState.State int newState) {
+    private void setState(@Download.State int newState) {
       if (state != newState) {
         state = newState;
-        downloadManager.onDownloadStateChangedInternal(this, getUpdatedDownloadState());
+        downloadManager.onDownloadChangedInternal(this, getUpdatedDownload());
       }
     }
 
@@ -959,12 +957,12 @@ public final class DownloadManager {
       if (isCanceled) {
         downloadManager.startDownloadThread(this);
       } else if (state == STATE_REMOVING) {
-        downloadManager.onDownloadRemovedInternal(this, getUpdatedDownloadState());
+        downloadManager.onDownloadRemovedInternal(this, getUpdatedDownload());
       } else if (state == STATE_RESTARTING) {
         initialize(STATE_QUEUED);
       } else { // STATE_DOWNLOADING
         if (error != null) {
-          Log.e(TAG, "Download failed: " + downloadState.action.id, error);
+          Log.e(TAG, "Download failed: " + download.action.id, error);
           failureReason = FAILURE_REASON_UNKNOWN;
           setState(STATE_FAILED);
         } else {
@@ -976,17 +974,17 @@ public final class DownloadManager {
 
   private class DownloadThread extends Thread {
 
-    private final Download download;
+    private final DownloadInternal downloadInternal;
     private final Downloader downloader;
     private final boolean isRemoveThread;
 
     private volatile boolean isCanceled;
     private Throwable finalError;
 
-    private DownloadThread(Download download) {
-      this.download = download;
-      this.downloader = downloaderFactory.createDownloader(download.downloadState.action);
-      this.isRemoveThread = download.isInRemoveState();
+    private DownloadThread(DownloadInternal downloadInternal) {
+      this.downloadInternal = downloadInternal;
+      this.downloader = downloaderFactory.createDownloader(downloadInternal.download.action);
+      this.isRemoveThread = downloadInternal.isInRemoveState();
       start();
     }
 
@@ -1000,7 +998,7 @@ public final class DownloadManager {
 
     @Override
     public void run() {
-      logd("Download started", download);
+      logd("Download started", downloadInternal);
       try {
         if (isRemoveThread) {
           downloader.remove();
@@ -1015,14 +1013,14 @@ public final class DownloadManager {
               if (!isCanceled) {
                 long downloadedBytes = downloader.getDownloadedBytes();
                 if (downloadedBytes != errorPosition) {
-                  logd("Reset error count. downloadedBytes = " + downloadedBytes, download);
+                  logd("Reset error count. downloadedBytes = " + downloadedBytes, downloadInternal);
                   errorPosition = downloadedBytes;
                   errorCount = 0;
                 }
                 if (++errorCount > minRetryCount) {
                   throw e;
                 }
-                logd("Download error. Retry " + errorCount, download);
+                logd("Download error. Retry " + errorCount, downloadInternal);
                 Thread.sleep(getRetryDelayMillis(errorCount));
               }
             }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index 5370ba4182..34540659ca 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -79,8 +79,8 @@ public abstract class DownloadService extends Service {
    *   <li>{@link #KEY_CONTENT_ID} - The content id of a single download to stop. If omitted, all of
    *       the current downloads will be stopped.
    *   <li>{@link #KEY_STOP_REASON} - An application provided reason for stopping the download or
-   *       downloads. Must not be {@link DownloadState#MANUAL_STOP_REASON_NONE}. If omitted, the
-   *       stop reason will be {@link DownloadState#MANUAL_STOP_REASON_UNDEFINED}.
+   *       downloads. Must not be {@link Download#MANUAL_STOP_REASON_NONE}. If omitted, the stop
+   *       reason will be {@link Download#MANUAL_STOP_REASON_UNDEFINED}.
    *   <li>{@link #KEY_FOREGROUND} - See {@link #KEY_FOREGROUND}.
    * </ul>
    */
@@ -405,8 +405,7 @@ public abstract class DownloadService extends Service {
         break;
       case ACTION_STOP:
         contentId = intent.getStringExtra(KEY_CONTENT_ID);
-        int stopReason =
-            intent.getIntExtra(KEY_STOP_REASON, DownloadState.MANUAL_STOP_REASON_UNDEFINED);
+        int stopReason = intent.getIntExtra(KEY_STOP_REASON, Download.MANUAL_STOP_REASON_UNDEFINED);
         if (contentId == null) {
           downloadManager.stopDownloads(stopReason);
         } else {
@@ -477,7 +476,7 @@ public abstract class DownloadService extends Service {
    * downloads. The periodic update interval can be set using {@link #DownloadService(int, long)}.
    *
    * <p>On API level 26 and above, this method may also be called just before the service stops,
-   * with an empty {@code downloadStates} array. The returned notification is used to satisfy system
+   * with an empty {@code downloads} array. The returned notification is used to satisfy system
    * requirements for foreground services.
    *
    * <p>Download services that do not wish to run in the foreground should be created by setting the
@@ -485,35 +484,35 @@ public abstract class DownloadService extends Service {
    * #FOREGROUND_NOTIFICATION_ID_NONE}. This method will not be called in this case, meaning it can
    * be implemented to throw {@link UnsupportedOperationException}.
    *
-   * @param downloadStates The states of all current downloads.
+   * @param downloads The states of all current downloads.
    * @return The foreground notification to display.
    */
-  protected abstract Notification getForegroundNotification(DownloadState[] downloadStates);
+  protected abstract Notification getForegroundNotification(Download[] downloads);
 
   /**
    * Called when the state of a download changes. The default implementation is a no-op.
    *
-   * @param downloadState The new state of the download.
+   * @param download The new state of the download.
    */
-  protected void onDownloadStateChanged(DownloadState downloadState) {
+  protected void onDownloadChanged(Download download) {
     // Do nothing.
   }
 
   /**
    * Called when a download is removed. The default implementation is a no-op.
    *
-   * @param downloadState The last state of the download before it was removed.
+   * @param download The last state of the download before it was removed.
    */
-  protected void onDownloadRemoved(DownloadState downloadState) {
+  protected void onDownloadRemoved(Download download) {
     // Do nothing.
   }
 
-  private void notifyDownloadStateChange(DownloadState downloadState) {
-    onDownloadStateChanged(downloadState);
+  private void notifyDownloadChange(Download download) {
+    onDownloadChanged(download);
     if (foregroundNotificationUpdater != null) {
-      if (downloadState.state == DownloadState.STATE_DOWNLOADING
-          || downloadState.state == DownloadState.STATE_REMOVING
-          || downloadState.state == DownloadState.STATE_RESTARTING) {
+      if (download.state == Download.STATE_DOWNLOADING
+          || download.state == Download.STATE_REMOVING
+          || download.state == Download.STATE_RESTARTING) {
         foregroundNotificationUpdater.startPeriodicUpdates();
       } else {
         foregroundNotificationUpdater.update();
@@ -521,8 +520,8 @@ public abstract class DownloadService extends Service {
     }
   }
 
-  private void notifyDownloadRemoved(DownloadState downloadState) {
-    onDownloadRemoved(downloadState);
+  private void notifyDownloadRemoved(Download download) {
+    onDownloadRemoved(download);
     if (foregroundNotificationUpdater != null) {
       foregroundNotificationUpdater.update();
     }
@@ -582,8 +581,8 @@ public abstract class DownloadService extends Service {
     }
 
     public void update() {
-      DownloadState[] downloadStates = downloadManager.getAllDownloadStates();
-      startForeground(notificationId, getForegroundNotification(downloadStates));
+      Download[] downloads = downloadManager.getAllDownloads();
+      startForeground(notificationId, getForegroundNotification(downloads));
       notificationDisplayed = true;
       if (periodicUpdatesStarted) {
         handler.removeCallbacks(this);
@@ -641,17 +640,16 @@ public abstract class DownloadService extends Service {
     }
 
     @Override
-    public void onDownloadStateChanged(
-        DownloadManager downloadManager, DownloadState downloadState) {
+    public void onDownloadChanged(DownloadManager downloadManager, Download download) {
       if (downloadService != null) {
-        downloadService.notifyDownloadStateChange(downloadState);
+        downloadService.notifyDownloadChange(download);
       }
     }
 
     @Override
-    public void onDownloadRemoved(DownloadManager downloadManager, DownloadState downloadState) {
+    public void onDownloadRemoved(DownloadManager downloadManager, Download download) {
       if (downloadService != null) {
-        downloadService.notifyDownloadRemoved(downloadState);
+        downloadService.notifyDownloadRemoved(download);
       }
     }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
index c80120900f..85871363db 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
@@ -48,39 +48,37 @@ public class DefaultDownloadIndexTest {
   }
 
   @Test
-  public void getDownloadState_nonExistingId_returnsNull() throws DatabaseIOException {
-    assertThat(downloadIndex.getDownloadState("non existing id")).isNull();
+  public void getDownload_nonExistingId_returnsNull() throws DatabaseIOException {
+    assertThat(downloadIndex.getDownload("non existing id")).isNull();
   }
 
   @Test
-  public void addAndGetDownloadState_nonExistingId_returnsTheSameDownloadState()
-      throws DatabaseIOException {
+  public void addAndGetDownload_nonExistingId_returnsTheSameDownload() throws DatabaseIOException {
     String id = "id";
-    DownloadState downloadState = new DownloadStateBuilder(id).build();
+    Download download = new DownloadBuilder(id).build();
 
-    downloadIndex.putDownloadState(downloadState);
-    DownloadState readDownloadState = downloadIndex.getDownloadState(id);
+    downloadIndex.putDownload(download);
+    Download readDownload = downloadIndex.getDownload(id);
 
-    DownloadStateTest.assertEqual(readDownloadState, downloadState);
+    DownloadTest.assertEqual(readDownload, download);
   }
 
   @Test
-  public void addAndGetDownloadState_existingId_returnsUpdatedDownloadState()
-      throws DatabaseIOException {
+  public void addAndGetDownload_existingId_returnsUpdatedDownload() throws DatabaseIOException {
     String id = "id";
-    DownloadStateBuilder downloadStateBuilder = new DownloadStateBuilder(id);
-    downloadIndex.putDownloadState(downloadStateBuilder.build());
+    DownloadBuilder downloadBuilder = new DownloadBuilder(id);
+    downloadIndex.putDownload(downloadBuilder.build());
 
-    DownloadState downloadState =
-        downloadStateBuilder
+    Download download =
+        downloadBuilder
             .setType("different type")
             .setUri("different uri")
             .setCacheKey("different cacheKey")
-            .setState(DownloadState.STATE_FAILED)
+            .setState(Download.STATE_FAILED)
             .setDownloadPercentage(50)
             .setDownloadedBytes(200)
             .setTotalBytes(400)
-            .setFailureReason(DownloadState.FAILURE_REASON_UNKNOWN)
+            .setFailureReason(Download.FAILURE_REASON_UNKNOWN)
             .setManualStopReason(0x12345678)
             .setStartTimeMs(10)
             .setUpdateTimeMs(20)
@@ -89,108 +87,94 @@ public class DefaultDownloadIndexTest {
                 new StreamKey(/* periodIndex= */ 3, /* groupIndex= */ 4, /* trackIndex= */ 5))
             .setCustomMetadata(new byte[] {0, 1, 2, 3, 7, 8, 9, 10})
             .build();
-    downloadIndex.putDownloadState(downloadState);
-    DownloadState readDownloadState = downloadIndex.getDownloadState(id);
+    downloadIndex.putDownload(download);
+    Download readDownload = downloadIndex.getDownload(id);
 
-    assertThat(readDownloadState).isNotNull();
-    DownloadStateTest.assertEqual(readDownloadState, downloadState);
+    assertThat(readDownload).isNotNull();
+    DownloadTest.assertEqual(readDownload, download);
   }
 
   @Test
-  public void releaseAndRecreateDownloadIndex_returnsTheSameDownloadState()
-      throws DatabaseIOException {
+  public void releaseAndRecreateDownloadIndex_returnsTheSameDownload() throws DatabaseIOException {
     String id = "id";
-    DownloadState downloadState = new DownloadStateBuilder(id).build();
-    downloadIndex.putDownloadState(downloadState);
+    Download download = new DownloadBuilder(id).build();
+    downloadIndex.putDownload(download);
 
     downloadIndex = new DefaultDownloadIndex(databaseProvider);
-    DownloadState readDownloadState = downloadIndex.getDownloadState(id);
-    assertThat(readDownloadState).isNotNull();
-    DownloadStateTest.assertEqual(readDownloadState, downloadState);
+    Download readDownload = downloadIndex.getDownload(id);
+    assertThat(readDownload).isNotNull();
+    DownloadTest.assertEqual(readDownload, download);
   }
 
   @Test
-  public void removeDownloadState_nonExistingId_doesNotFail() throws DatabaseIOException {
-    downloadIndex.removeDownloadState("non existing id");
+  public void removeDownload_nonExistingId_doesNotFail() throws DatabaseIOException {
+    downloadIndex.removeDownload("non existing id");
   }
 
   @Test
-  public void removeDownloadState_existingId_getDownloadStateReturnsNull()
-      throws DatabaseIOException {
+  public void removeDownload_existingId_getDownloadReturnsNull() throws DatabaseIOException {
     String id = "id";
-    DownloadState downloadState = new DownloadStateBuilder(id).build();
-    downloadIndex.putDownloadState(downloadState);
-    downloadIndex.removeDownloadState(id);
+    Download download = new DownloadBuilder(id).build();
+    downloadIndex.putDownload(download);
+    downloadIndex.removeDownload(id);
 
-    DownloadState readDownloadState = downloadIndex.getDownloadState(id);
-    assertThat(readDownloadState).isNull();
+    Download readDownload = downloadIndex.getDownload(id);
+    assertThat(readDownload).isNull();
   }
 
   @Test
-  public void getDownloadStates_emptyDownloadIndex_returnsEmptyArray() throws DatabaseIOException {
-    assertThat(downloadIndex.getDownloadStates().getCount()).isEqualTo(0);
+  public void getDownloads_emptyDownloadIndex_returnsEmptyArray() throws DatabaseIOException {
+    assertThat(downloadIndex.getDownloads().getCount()).isEqualTo(0);
   }
 
   @Test
-  public void getDownloadStates_noState_returnsAllDownloadStatusSortedByStartTime()
+  public void getDownloads_noState_returnsAllDownloadStatusSortedByStartTime()
       throws DatabaseIOException {
-    DownloadState downloadState1 = new DownloadStateBuilder("id1").setStartTimeMs(1).build();
-    downloadIndex.putDownloadState(downloadState1);
-    DownloadState downloadState2 = new DownloadStateBuilder("id2").setStartTimeMs(0).build();
-    downloadIndex.putDownloadState(downloadState2);
+    Download download1 = new DownloadBuilder("id1").setStartTimeMs(1).build();
+    downloadIndex.putDownload(download1);
+    Download download2 = new DownloadBuilder("id2").setStartTimeMs(0).build();
+    downloadIndex.putDownload(download2);
 
-    DownloadStateCursor cursor = downloadIndex.getDownloadStates();
-
-    assertThat(cursor.getCount()).isEqualTo(2);
-    cursor.moveToNext();
-    DownloadStateTest.assertEqual(cursor.getDownloadState(), downloadState2);
-    cursor.moveToNext();
-    DownloadStateTest.assertEqual(cursor.getDownloadState(), downloadState1);
-    cursor.close();
+    try (DownloadCursor cursor = downloadIndex.getDownloads()) {
+      assertThat(cursor.getCount()).isEqualTo(2);
+      cursor.moveToNext();
+      DownloadTest.assertEqual(cursor.getDownload(), download2);
+      cursor.moveToNext();
+      DownloadTest.assertEqual(cursor.getDownload(), download1);
+    }
   }
 
   @Test
-  public void getDownloadStates_withStates_returnsAllDownloadStatusWithTheSameStates()
+  public void getDownloads_withStates_returnsAllDownloadStatusWithTheSameStates()
       throws DatabaseIOException {
-    DownloadState downloadState1 =
-        new DownloadStateBuilder("id1")
-            .setStartTimeMs(0)
-            .setState(DownloadState.STATE_REMOVING)
-            .build();
-    downloadIndex.putDownloadState(downloadState1);
-    DownloadState downloadState2 =
-        new DownloadStateBuilder("id2")
-            .setStartTimeMs(1)
-            .setState(DownloadState.STATE_STOPPED)
-            .build();
-    downloadIndex.putDownloadState(downloadState2);
-    DownloadState downloadState3 =
-        new DownloadStateBuilder("id3")
-            .setStartTimeMs(2)
-            .setState(DownloadState.STATE_COMPLETED)
-            .build();
-    downloadIndex.putDownloadState(downloadState3);
+    Download download1 =
+        new DownloadBuilder("id1").setStartTimeMs(0).setState(Download.STATE_REMOVING).build();
+    downloadIndex.putDownload(download1);
+    Download download2 =
+        new DownloadBuilder("id2").setStartTimeMs(1).setState(Download.STATE_STOPPED).build();
+    downloadIndex.putDownload(download2);
+    Download download3 =
+        new DownloadBuilder("id3").setStartTimeMs(2).setState(Download.STATE_COMPLETED).build();
+    downloadIndex.putDownload(download3);
 
-    DownloadStateCursor cursor =
-        downloadIndex.getDownloadStates(
-            DownloadState.STATE_REMOVING, DownloadState.STATE_COMPLETED);
-
-    assertThat(cursor.getCount()).isEqualTo(2);
-    cursor.moveToNext();
-    DownloadStateTest.assertEqual(cursor.getDownloadState(), downloadState1);
-    cursor.moveToNext();
-    DownloadStateTest.assertEqual(cursor.getDownloadState(), downloadState3);
-    cursor.close();
+    try (DownloadCursor cursor =
+        downloadIndex.getDownloads(Download.STATE_REMOVING, Download.STATE_COMPLETED)) {
+      assertThat(cursor.getCount()).isEqualTo(2);
+      cursor.moveToNext();
+      DownloadTest.assertEqual(cursor.getDownload(), download1);
+      cursor.moveToNext();
+      DownloadTest.assertEqual(cursor.getDownload(), download3);
+    }
   }
 
   @Test
-  public void putDownloadState_setsVersion() throws DatabaseIOException {
+  public void putDownload_setsVersion() throws DatabaseIOException {
     SQLiteDatabase readableDatabase = databaseProvider.getReadableDatabase();
     assertThat(
             VersionTable.getVersion(readableDatabase, VersionTable.FEATURE_OFFLINE, INSTANCE_UID))
         .isEqualTo(VersionTable.VERSION_UNSET);
 
-    downloadIndex.putDownloadState(new DownloadStateBuilder("id1").build());
+    downloadIndex.putDownload(new DownloadBuilder("id1").build());
 
     assertThat(
             VersionTable.getVersion(readableDatabase, VersionTable.FEATURE_OFFLINE, INSTANCE_UID))
@@ -199,9 +183,9 @@ public class DefaultDownloadIndexTest {
 
   @Test
   public void downloadIndex_versionDowngradeWipesData() throws DatabaseIOException {
-    DownloadState downloadState1 = new DownloadStateBuilder("id1").build();
-    downloadIndex.putDownloadState(downloadState1);
-    DownloadStateCursor cursor = downloadIndex.getDownloadStates();
+    Download download1 = new DownloadBuilder("id1").build();
+    downloadIndex.putDownload(download1);
+    DownloadCursor cursor = downloadIndex.getDownloads();
     assertThat(cursor.getCount()).isEqualTo(1);
     cursor.close();
 
@@ -211,7 +195,7 @@ public class DefaultDownloadIndexTest {
 
     downloadIndex = new DefaultDownloadIndex(databaseProvider);
 
-    cursor = downloadIndex.getDownloadStates();
+    cursor = downloadIndex.getDownloads();
     assertThat(cursor.getCount()).isEqualTo(0);
     cursor.close();
     assertThat(
@@ -222,105 +206,97 @@ public class DefaultDownloadIndexTest {
   @Test
   public void setManualStopReason_setReasonToNone() throws Exception {
     String id = "id";
-    DownloadStateBuilder downloadStateBuilder =
-        new DownloadStateBuilder(id)
-            .setState(DownloadState.STATE_COMPLETED)
-            .setManualStopReason(0x12345678);
-    DownloadState downloadState = downloadStateBuilder.build();
-    downloadIndex.putDownloadState(downloadState);
+    DownloadBuilder downloadBuilder =
+        new DownloadBuilder(id).setState(Download.STATE_COMPLETED).setManualStopReason(0x12345678);
+    Download download = downloadBuilder.build();
+    downloadIndex.putDownload(download);
 
-    downloadIndex.setManualStopReason(DownloadState.MANUAL_STOP_REASON_NONE);
+    downloadIndex.setManualStopReason(Download.MANUAL_STOP_REASON_NONE);
 
-    DownloadState readDownloadState = downloadIndex.getDownloadState(id);
-    DownloadState expectedDownloadState =
-        downloadStateBuilder.setManualStopReason(DownloadState.MANUAL_STOP_REASON_NONE).build();
-    DownloadStateTest.assertEqual(readDownloadState, expectedDownloadState);
+    Download readDownload = downloadIndex.getDownload(id);
+    Download expectedDownload =
+        downloadBuilder.setManualStopReason(Download.MANUAL_STOP_REASON_NONE).build();
+    DownloadTest.assertEqual(readDownload, expectedDownload);
   }
 
   @Test
   public void setManualStopReason_setReason() throws Exception {
     String id = "id";
-    DownloadStateBuilder downloadStateBuilder =
-        new DownloadStateBuilder(id)
-            .setState(DownloadState.STATE_FAILED)
-            .setFailureReason(DownloadState.FAILURE_REASON_UNKNOWN);
-    DownloadState downloadState = downloadStateBuilder.build();
-    downloadIndex.putDownloadState(downloadState);
+    DownloadBuilder downloadBuilder =
+        new DownloadBuilder(id)
+            .setState(Download.STATE_FAILED)
+            .setFailureReason(Download.FAILURE_REASON_UNKNOWN);
+    Download download = downloadBuilder.build();
+    downloadIndex.putDownload(download);
     int manualStopReason = 0x12345678;
 
     downloadIndex.setManualStopReason(manualStopReason);
 
-    DownloadState readDownloadState = downloadIndex.getDownloadState(id);
-    DownloadState expectedDownloadState =
-        downloadStateBuilder.setManualStopReason(manualStopReason).build();
-    DownloadStateTest.assertEqual(readDownloadState, expectedDownloadState);
+    Download readDownload = downloadIndex.getDownload(id);
+    Download expectedDownload = downloadBuilder.setManualStopReason(manualStopReason).build();
+    DownloadTest.assertEqual(readDownload, expectedDownload);
   }
 
   @Test
   public void setManualStopReason_notTerminalState_doesNotSetManualStopReason() throws Exception {
     String id = "id";
-    DownloadStateBuilder downloadStateBuilder =
-        new DownloadStateBuilder(id).setState(DownloadState.STATE_DOWNLOADING);
-    DownloadState downloadState = downloadStateBuilder.build();
-    downloadIndex.putDownloadState(downloadState);
+    DownloadBuilder downloadBuilder = new DownloadBuilder(id).setState(Download.STATE_DOWNLOADING);
+    Download download = downloadBuilder.build();
+    downloadIndex.putDownload(download);
     int notMetRequirements = 0x12345678;
 
     downloadIndex.setManualStopReason(notMetRequirements);
 
-    DownloadState readDownloadState = downloadIndex.getDownloadState(id);
-    DownloadStateTest.assertEqual(readDownloadState, downloadState);
+    Download readDownload = downloadIndex.getDownload(id);
+    DownloadTest.assertEqual(readDownload, download);
   }
 
   @Test
   public void setSingleDownloadManualStopReason_setReasonToNone() throws Exception {
     String id = "id";
-    DownloadStateBuilder downloadStateBuilder =
-        new DownloadStateBuilder(id)
-            .setState(DownloadState.STATE_COMPLETED)
-            .setManualStopReason(0x12345678);
-    DownloadState downloadState = downloadStateBuilder.build();
-    downloadIndex.putDownloadState(downloadState);
+    DownloadBuilder downloadBuilder =
+        new DownloadBuilder(id).setState(Download.STATE_COMPLETED).setManualStopReason(0x12345678);
+    Download download = downloadBuilder.build();
+    downloadIndex.putDownload(download);
 
-    downloadIndex.setManualStopReason(id, DownloadState.MANUAL_STOP_REASON_NONE);
+    downloadIndex.setManualStopReason(id, Download.MANUAL_STOP_REASON_NONE);
 
-    DownloadState readDownloadState = downloadIndex.getDownloadState(id);
-    DownloadState expectedDownloadState =
-        downloadStateBuilder.setManualStopReason(DownloadState.MANUAL_STOP_REASON_NONE).build();
-    DownloadStateTest.assertEqual(readDownloadState, expectedDownloadState);
+    Download readDownload = downloadIndex.getDownload(id);
+    Download expectedDownload =
+        downloadBuilder.setManualStopReason(Download.MANUAL_STOP_REASON_NONE).build();
+    DownloadTest.assertEqual(readDownload, expectedDownload);
   }
 
   @Test
   public void setSingleDownloadManualStopReason_setReason() throws Exception {
     String id = "id";
-    DownloadStateBuilder downloadStateBuilder =
-        new DownloadStateBuilder(id)
-            .setState(DownloadState.STATE_FAILED)
-            .setFailureReason(DownloadState.FAILURE_REASON_UNKNOWN);
-    DownloadState downloadState = downloadStateBuilder.build();
-    downloadIndex.putDownloadState(downloadState);
+    DownloadBuilder downloadBuilder =
+        new DownloadBuilder(id)
+            .setState(Download.STATE_FAILED)
+            .setFailureReason(Download.FAILURE_REASON_UNKNOWN);
+    Download download = downloadBuilder.build();
+    downloadIndex.putDownload(download);
     int manualStopReason = 0x12345678;
 
     downloadIndex.setManualStopReason(id, manualStopReason);
 
-    DownloadState readDownloadState = downloadIndex.getDownloadState(id);
-    DownloadState expectedDownloadState =
-        downloadStateBuilder.setManualStopReason(manualStopReason).build();
-    DownloadStateTest.assertEqual(readDownloadState, expectedDownloadState);
+    Download readDownload = downloadIndex.getDownload(id);
+    Download expectedDownload = downloadBuilder.setManualStopReason(manualStopReason).build();
+    DownloadTest.assertEqual(readDownload, expectedDownload);
   }
 
   @Test
   public void setSingleDownloadManualStopReason_notTerminalState_doesNotSetManualStopReason()
       throws Exception {
     String id = "id";
-    DownloadStateBuilder downloadStateBuilder =
-        new DownloadStateBuilder(id).setState(DownloadState.STATE_DOWNLOADING);
-    DownloadState downloadState = downloadStateBuilder.build();
-    downloadIndex.putDownloadState(downloadState);
+    DownloadBuilder downloadBuilder = new DownloadBuilder(id).setState(Download.STATE_DOWNLOADING);
+    Download download = downloadBuilder.build();
+    downloadIndex.putDownload(download);
     int notMetRequirements = 0x12345678;
 
     downloadIndex.setManualStopReason(id, notMetRequirements);
 
-    DownloadState readDownloadState = downloadIndex.getDownloadState(id);
-    DownloadStateTest.assertEqual(readDownloadState, downloadState);
+    Download readDownload = downloadIndex.getDownload(id);
+    DownloadTest.assertEqual(readDownload, download);
   }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadBuilder.java
similarity index 64%
rename from library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
rename to library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadBuilder.java
index f94740374a..dbcdb52792 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateBuilder.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadBuilder.java
@@ -23,13 +23,13 @@ import java.util.Collections;
 import java.util.List;
 
 /**
- * Builder for DownloadState.
+ * Builder for {@link Download}.
  *
- * <p>Defines default values for each field (except {@code id}) to facilitate DownloadState creation
- * for tests. Tests must avoid depending on the default values but explicitly set tested parameters
- * during test initialization.
+ * <p>Defines default values for each field (except {@code id}) to facilitate {@link Download}
+ * creation for tests. Tests must avoid depending on the default values but explicitly set tested
+ * parameters during test initialization.
  */
-class DownloadStateBuilder {
+class DownloadBuilder {
   private final CachingCounters counters;
   private String id;
   private String type;
@@ -43,15 +43,15 @@ class DownloadStateBuilder {
   private List<StreamKey> streamKeys;
   private byte[] customMetadata;
 
-  DownloadStateBuilder(String id) {
+  DownloadBuilder(String id) {
     this(id, "type", Uri.parse("uri"), /* cacheKey= */ null, new byte[0], Collections.emptyList());
   }
 
-  DownloadStateBuilder(DownloadAction action) {
+  DownloadBuilder(DownloadAction action) {
     this(action.id, action.type, action.uri, action.customCacheKey, action.data, action.streamKeys);
   }
 
-  DownloadStateBuilder(
+  DownloadBuilder(
       String id,
       String type,
       Uri uri,
@@ -62,8 +62,8 @@ class DownloadStateBuilder {
     this.type = type;
     this.uri = uri;
     this.cacheKey = cacheKey;
-    this.state = DownloadState.STATE_QUEUED;
-    this.failureReason = DownloadState.FAILURE_REASON_NONE;
+    this.state = Download.STATE_QUEUED;
+    this.failureReason = Download.FAILURE_REASON_NONE;
     this.startTimeMs = (long) 0;
     this.updateTimeMs = (long) 0;
     this.streamKeys = streamKeys;
@@ -71,90 +71,84 @@ class DownloadStateBuilder {
     this.counters = new CachingCounters();
   }
 
-  public DownloadStateBuilder setId(String id) {
+  public DownloadBuilder setId(String id) {
     this.id = id;
     return this;
   }
 
-  public DownloadStateBuilder setType(String type) {
+  public DownloadBuilder setType(String type) {
     this.type = type;
     return this;
   }
 
-  public DownloadStateBuilder setUri(String uri) {
+  public DownloadBuilder setUri(String uri) {
     this.uri = Uri.parse(uri);
     return this;
   }
 
-  public DownloadStateBuilder setUri(Uri uri) {
+  public DownloadBuilder setUri(Uri uri) {
     this.uri = uri;
     return this;
   }
 
-  public DownloadStateBuilder setCacheKey(@Nullable String cacheKey) {
+  public DownloadBuilder setCacheKey(@Nullable String cacheKey) {
     this.cacheKey = cacheKey;
     return this;
   }
 
-  public DownloadStateBuilder setState(int state) {
+  public DownloadBuilder setState(int state) {
     this.state = state;
     return this;
   }
 
-  public DownloadStateBuilder setDownloadPercentage(float downloadPercentage) {
+  public DownloadBuilder setDownloadPercentage(float downloadPercentage) {
     counters.percentage = downloadPercentage;
     return this;
   }
 
-  public DownloadStateBuilder setDownloadedBytes(long downloadedBytes) {
+  public DownloadBuilder setDownloadedBytes(long downloadedBytes) {
     counters.alreadyCachedBytes = downloadedBytes;
     return this;
   }
 
-  public DownloadStateBuilder setTotalBytes(long totalBytes) {
+  public DownloadBuilder setTotalBytes(long totalBytes) {
     counters.contentLength = totalBytes;
     return this;
   }
 
-  public DownloadStateBuilder setFailureReason(int failureReason) {
+  public DownloadBuilder setFailureReason(int failureReason) {
     this.failureReason = failureReason;
     return this;
   }
 
-  public DownloadStateBuilder setManualStopReason(int manualStopReason) {
+  public DownloadBuilder setManualStopReason(int manualStopReason) {
     this.manualStopReason = manualStopReason;
     return this;
   }
 
-  public DownloadStateBuilder setStartTimeMs(long startTimeMs) {
+  public DownloadBuilder setStartTimeMs(long startTimeMs) {
     this.startTimeMs = startTimeMs;
     return this;
   }
 
-  public DownloadStateBuilder setUpdateTimeMs(long updateTimeMs) {
+  public DownloadBuilder setUpdateTimeMs(long updateTimeMs) {
     this.updateTimeMs = updateTimeMs;
     return this;
   }
 
-  public DownloadStateBuilder setStreamKeys(StreamKey... streamKeys) {
+  public DownloadBuilder setStreamKeys(StreamKey... streamKeys) {
     this.streamKeys = Arrays.asList(streamKeys);
     return this;
   }
 
-  public DownloadStateBuilder setCustomMetadata(byte[] customMetadata) {
+  public DownloadBuilder setCustomMetadata(byte[] customMetadata) {
     this.customMetadata = customMetadata;
     return this;
   }
 
-  public DownloadState build() {
+  public Download build() {
     DownloadAction action = new DownloadAction(id, type, uri, streamKeys, cacheKey, customMetadata);
-    return new DownloadState(
-        action,
-        state,
-        failureReason,
-        manualStopReason,
-        startTimeMs,
-        updateTimeMs,
-        counters);
+    return new Download(
+        action, state, failureReason, manualStopReason, startTimeMs, updateTimeMs, counters);
   }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
index 619d36f5ab..e272a7574b 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
@@ -56,7 +56,7 @@ public class DownloadIndexUtilTest {
   }
 
   @Test
-  public void addAction_nonExistingDownloadState_createsNewDownloadState() throws IOException {
+  public void addAction_nonExistingDownload_createsNewDownload() throws IOException {
     byte[] data = new byte[] {1, 2, 3, 4};
     DownloadAction action =
         new DownloadAction(
@@ -71,11 +71,11 @@ public class DownloadIndexUtilTest {
 
     DownloadIndexUtil.mergeAction(action, downloadIndex);
 
-    assertDownloadIndexContainsAction(action, DownloadState.STATE_QUEUED);
+    assertDownloadIndexContainsAction(action, Download.STATE_QUEUED);
   }
 
   @Test
-  public void addAction_existingDownloadState_createsMergedDownloadState() throws IOException {
+  public void addAction_existingDownload_createsMergedDownload() throws IOException {
     StreamKey streamKey1 =
         new StreamKey(/* periodIndex= */ 3, /* groupIndex= */ 4, /* trackIndex= */ 5);
     StreamKey streamKey2 =
@@ -100,18 +100,18 @@ public class DownloadIndexUtilTest {
 
     DownloadIndexUtil.mergeAction(action2, downloadIndex);
 
-    DownloadState downloadState = downloadIndex.getDownloadState(action2.id);
-    assertThat(downloadState).isNotNull();
-    assertThat(downloadState.action.type).isEqualTo(action2.type);
-    assertThat(downloadState.action.customCacheKey).isEqualTo(action2.customCacheKey);
-    assertThat(downloadState.action.data).isEqualTo(action2.data);
-    assertThat(downloadState.action.uri).isEqualTo(action2.uri);
-    assertThat(downloadState.action.streamKeys).containsExactly(streamKey1, streamKey2);
-    assertThat(downloadState.state).isEqualTo(DownloadState.STATE_QUEUED);
+    Download download = downloadIndex.getDownload(action2.id);
+    assertThat(download).isNotNull();
+    assertThat(download.action.type).isEqualTo(action2.type);
+    assertThat(download.action.customCacheKey).isEqualTo(action2.customCacheKey);
+    assertThat(download.action.data).isEqualTo(action2.data);
+    assertThat(download.action.uri).isEqualTo(action2.uri);
+    assertThat(download.action.streamKeys).containsExactly(streamKey1, streamKey2);
+    assertThat(download.state).isEqualTo(Download.STATE_QUEUED);
   }
 
   @Test
-  public void upgradeActionFile_createsDownloadStates() throws IOException {
+  public void upgradeActionFile_createsDownloads() throws IOException {
     // Copy the test asset to a file.
     byte[] actionFileBytes =
         TestUtil.getByteArray(
@@ -144,15 +144,15 @@ public class DownloadIndexUtilTest {
 
     ActionFile actionFile = new ActionFile(tempFile);
     DownloadIndexUtil.mergeActionFile(actionFile, /* downloadIdProvider= */ null, downloadIndex);
-    assertDownloadIndexContainsAction(expectedAction1, DownloadState.STATE_QUEUED);
-    assertDownloadIndexContainsAction(expectedAction2, DownloadState.STATE_QUEUED);
+    assertDownloadIndexContainsAction(expectedAction1, Download.STATE_QUEUED);
+    assertDownloadIndexContainsAction(expectedAction2, Download.STATE_QUEUED);
   }
 
   private void assertDownloadIndexContainsAction(DownloadAction action, int state)
       throws IOException {
-    DownloadState downloadState = downloadIndex.getDownloadState(action.id);
-    assertThat(downloadState.action).isEqualTo(action);
-    assertThat(downloadState.state).isEqualTo(state);
+    Download download = downloadIndex.getDownload(action.id);
+    assertThat(download.action).isEqualTo(action);
+    assertThat(download.state).isEqualTo(state);
   }
 
   @SuppressWarnings("unchecked")
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index 905b3a25fa..18a9d1e313 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
 import android.net.Uri;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.google.android.exoplayer2.offline.DownloadState.State;
+import com.google.android.exoplayer2.offline.Download.State;
 import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.testutil.DummyMainThread;
 import com.google.android.exoplayer2.testutil.DummyMainThread.TestRunnable;
@@ -343,7 +343,7 @@ public class DownloadManagerTest {
     TaskWrapper task3 = new DownloadRunner(uri3).postDownloadAction().postRemoveAction().getTask();
 
     task3.assertRemoving();
-    DownloadState[] states = downloadManager.getAllDownloadStates();
+    Download[] states = downloadManager.getAllDownloads();
 
     assertThat(states).hasLength(3);
     String[] taskIds = {task1.taskId, task2.taskId, task3.taskId};
@@ -554,27 +554,27 @@ public class DownloadManagerTest {
     }
 
     private TaskWrapper assertDownloading() {
-      return assertState(DownloadState.STATE_DOWNLOADING);
+      return assertState(Download.STATE_DOWNLOADING);
     }
 
     private TaskWrapper assertCompleted() {
-      return assertState(DownloadState.STATE_COMPLETED);
+      return assertState(Download.STATE_COMPLETED);
     }
 
     private TaskWrapper assertRemoving() {
-      return assertState(DownloadState.STATE_REMOVING);
+      return assertState(Download.STATE_REMOVING);
     }
 
     private TaskWrapper assertFailed() {
-      return assertState(DownloadState.STATE_FAILED);
+      return assertState(Download.STATE_FAILED);
     }
 
     private TaskWrapper assertQueued() {
-      return assertState(DownloadState.STATE_QUEUED);
+      return assertState(Download.STATE_QUEUED);
     }
 
     private TaskWrapper assertStopped() {
-      return assertState(DownloadState.STATE_STOPPED);
+      return assertState(Download.STATE_STOPPED);
     }
 
     private TaskWrapper assertState(@State int expectedState) {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadTest.java
similarity index 50%
rename from library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadTest.java
index fd9104b596..9797ca0a47 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadStateTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadTest.java
@@ -26,9 +26,9 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-/** Unit tests for {@link DownloadState}. */
+/** Unit tests for {@link Download}. */
 @RunWith(AndroidJUnit4.class)
-public class DownloadStateTest {
+public class DownloadTest {
 
   private Uri testUri;
 
@@ -40,14 +40,14 @@ public class DownloadStateTest {
   @Test
   public void mergeAction_actionHaveDifferentType_throwsException() {
     DownloadAction downloadAction = createDownloadAction();
-    DownloadState downloadState =
-        new DownloadStateBuilder(downloadAction)
+    Download download =
+        new DownloadBuilder(downloadAction)
             .setType(downloadAction.type + "_different")
-            .setState(DownloadState.STATE_QUEUED)
+            .setState(Download.STATE_QUEUED)
             .build();
 
     try {
-      downloadState.copyWithMergedAction(downloadAction, /* canStart= */ true);
+      download.copyWithMergedAction(downloadAction, /* canStart= */ true);
       fail();
     } catch (Exception e) {
       // Expected.
@@ -57,14 +57,14 @@ public class DownloadStateTest {
   @Test
   public void mergeAction_actionHaveDifferentId_throwsException() {
     DownloadAction downloadAction = createDownloadAction();
-    DownloadState downloadState =
-        new DownloadStateBuilder(downloadAction)
+    Download download =
+        new DownloadBuilder(downloadAction)
             .setId(downloadAction.id + "_different")
-            .setState(DownloadState.STATE_QUEUED)
+            .setState(Download.STATE_QUEUED)
             .build();
 
     try {
-      downloadState.copyWithMergedAction(downloadAction, /* canStart= */ true);
+      download.copyWithMergedAction(downloadAction, /* canStart= */ true);
       fail();
     } catch (Exception e) {
       // Expected.
@@ -74,31 +74,30 @@ public class DownloadStateTest {
   @Test
   public void mergeAction_actionsWithSameIdAndType_doesNotFail() {
     DownloadAction downloadAction = createDownloadAction();
-    DownloadStateBuilder downloadStateBuilder =
-        new DownloadStateBuilder(downloadAction).setState(DownloadState.STATE_QUEUED);
-    DownloadState downloadState = downloadStateBuilder.build();
+    DownloadBuilder downloadBuilder =
+        new DownloadBuilder(downloadAction).setState(Download.STATE_QUEUED);
+    Download download = downloadBuilder.build();
 
-    downloadState.copyWithMergedAction(downloadAction, /* canStart= */ true);
+    download.copyWithMergedAction(downloadAction, /* canStart= */ true);
   }
 
   @Test
-  public void mergeAction_actionHaveDifferentUri_downloadStateUriIsUpdated() {
+  public void mergeAction_actionHaveDifferentUri_downloadUriIsUpdated() {
     DownloadAction downloadAction = createDownloadAction();
-    DownloadStateBuilder downloadStateBuilder =
-        new DownloadStateBuilder(downloadAction)
+    DownloadBuilder downloadBuilder =
+        new DownloadBuilder(downloadAction)
             .setUri(downloadAction.uri + "_different")
-            .setState(DownloadState.STATE_QUEUED);
-    DownloadState downloadState = downloadStateBuilder.build();
+            .setState(Download.STATE_QUEUED);
+    Download download = downloadBuilder.build();
 
-    DownloadState mergedDownloadState =
-        downloadState.copyWithMergedAction(downloadAction, /* canStart= */ true);
+    Download mergedDownload = download.copyWithMergedAction(downloadAction, /* canStart= */ true);
 
-    DownloadState expectedDownloadState = downloadStateBuilder.setUri(downloadAction.uri).build();
-    assertEqual(mergedDownloadState, expectedDownloadState);
+    Download expectedDownload = downloadBuilder.setUri(downloadAction.uri).build();
+    assertEqual(mergedDownload, expectedDownload);
   }
 
   @Test
-  public void mergeAction_actionHaveDifferentData_downloadStateDataIsUpdated() {
+  public void mergeAction_actionHaveDifferentData_downloadDataIsUpdated() {
     DownloadAction downloadAction =
         new DownloadAction(
             "id",
@@ -107,85 +106,77 @@ public class DownloadStateTest {
             Collections.emptyList(),
             /* customCacheKey= */ null,
             /* data= */ new byte[] {1, 2, 3, 4});
-    DownloadStateBuilder downloadStateBuilder =
-        new DownloadStateBuilder(downloadAction)
-            .setState(DownloadState.STATE_QUEUED)
+    DownloadBuilder downloadBuilder =
+        new DownloadBuilder(downloadAction)
+            .setState(Download.STATE_QUEUED)
             .setCustomMetadata(new byte[0]);
-    DownloadState downloadState = downloadStateBuilder.build();
+    Download download = downloadBuilder.build();
 
-    DownloadState mergedDownloadState =
-        downloadState.copyWithMergedAction(downloadAction, /* canStart= */ true);
+    Download mergedDownload = download.copyWithMergedAction(downloadAction, /* canStart= */ true);
 
-    DownloadState expectedDownloadState =
-        downloadStateBuilder.setCustomMetadata(downloadAction.data).build();
-    assertEqual(mergedDownloadState, expectedDownloadState);
+    Download expectedDownload = downloadBuilder.setCustomMetadata(downloadAction.data).build();
+    assertEqual(mergedDownload, expectedDownload);
   }
 
   @Test
   public void mergeAction_removingDownloadDownloadAction_stateBecomesRestarting() {
     DownloadAction downloadAction = createDownloadAction();
-    DownloadStateBuilder downloadStateBuilder =
-        new DownloadStateBuilder(downloadAction).setState(DownloadState.STATE_REMOVING);
-    DownloadState downloadState = downloadStateBuilder.build();
+    DownloadBuilder downloadBuilder =
+        new DownloadBuilder(downloadAction).setState(Download.STATE_REMOVING);
+    Download download = downloadBuilder.build();
 
-    DownloadState mergedDownloadState =
-        downloadState.copyWithMergedAction(downloadAction, /* canStart= */ true);
+    Download mergedDownload = download.copyWithMergedAction(downloadAction, /* canStart= */ true);
 
-    DownloadState expectedDownloadState =
-        downloadStateBuilder.setState(DownloadState.STATE_RESTARTING).build();
-    assertEqual(mergedDownloadState, expectedDownloadState);
+    Download expectedDownload = downloadBuilder.setState(Download.STATE_RESTARTING).build();
+    assertEqual(mergedDownload, expectedDownload);
   }
 
   @Test
   public void mergeAction_failedDownloadDownloadAction_stateBecomesQueued() {
     DownloadAction downloadAction = createDownloadAction();
-    DownloadStateBuilder downloadStateBuilder =
-        new DownloadStateBuilder(downloadAction)
-            .setState(DownloadState.STATE_FAILED)
-            .setFailureReason(DownloadState.FAILURE_REASON_UNKNOWN);
-    DownloadState downloadState = downloadStateBuilder.build();
+    DownloadBuilder downloadBuilder =
+        new DownloadBuilder(downloadAction)
+            .setState(Download.STATE_FAILED)
+            .setFailureReason(Download.FAILURE_REASON_UNKNOWN);
+    Download download = downloadBuilder.build();
 
-    DownloadState mergedDownloadState =
-        downloadState.copyWithMergedAction(downloadAction, /* canStart= */ true);
+    Download mergedDownload = download.copyWithMergedAction(downloadAction, /* canStart= */ true);
 
-    DownloadState expectedDownloadState =
-        downloadStateBuilder
-            .setState(DownloadState.STATE_QUEUED)
-            .setFailureReason(DownloadState.FAILURE_REASON_NONE)
+    Download expectedDownload =
+        downloadBuilder
+            .setState(Download.STATE_QUEUED)
+            .setFailureReason(Download.FAILURE_REASON_NONE)
             .build();
-    assertEqual(mergedDownloadState, expectedDownloadState);
+    assertEqual(mergedDownload, expectedDownload);
   }
 
   @Test
   public void mergeAction_stoppedDownloadDownloadAction_stateStaysStopped() {
     DownloadAction downloadAction = createDownloadAction();
-    DownloadStateBuilder downloadStateBuilder =
-        new DownloadStateBuilder(downloadAction)
-            .setState(DownloadState.STATE_STOPPED)
-            .setManualStopReason(DownloadState.MANUAL_STOP_REASON_UNDEFINED);
-    DownloadState downloadState = downloadStateBuilder.build();
+    DownloadBuilder downloadBuilder =
+        new DownloadBuilder(downloadAction)
+            .setState(Download.STATE_STOPPED)
+            .setManualStopReason(Download.MANUAL_STOP_REASON_UNDEFINED);
+    Download download = downloadBuilder.build();
 
-    DownloadState mergedDownloadState =
-        downloadState.copyWithMergedAction(downloadAction, /* canStart= */ true);
+    Download mergedDownload = download.copyWithMergedAction(downloadAction, /* canStart= */ true);
 
-    assertEqual(mergedDownloadState, downloadState);
+    assertEqual(mergedDownload, download);
   }
 
   @Test
   public void mergeAction_manualStopReasonSetButNotInStoppedState_stateBecomesStopped() {
     DownloadAction downloadAction = createDownloadAction();
-    DownloadStateBuilder downloadStateBuilder =
-        new DownloadStateBuilder(downloadAction)
-            .setState(DownloadState.STATE_COMPLETED)
-            .setManualStopReason(DownloadState.MANUAL_STOP_REASON_UNDEFINED);
-    DownloadState downloadState = downloadStateBuilder.build();
+    DownloadBuilder downloadBuilder =
+        new DownloadBuilder(downloadAction)
+            .setState(Download.STATE_COMPLETED)
+            .setManualStopReason(Download.MANUAL_STOP_REASON_UNDEFINED);
+    Download download = downloadBuilder.build();
 
-    DownloadState mergedDownloadState =
-        downloadState.copyWithMergedAction(downloadAction, /* canStart= */ true);
+    Download mergedDownload = download.copyWithMergedAction(downloadAction, /* canStart= */ true);
 
-    DownloadState expectedDownloadState =
-        downloadStateBuilder.setState(DownloadState.STATE_STOPPED).build();
-    assertEqual(mergedDownloadState, expectedDownloadState);
+    Download expectedDownload = downloadBuilder.setState(Download.STATE_STOPPED).build();
+    assertEqual(mergedDownload, expectedDownload);
   }
 
   @Test
@@ -243,36 +234,32 @@ public class DownloadStateTest {
             Arrays.asList(keys2),
             /* customCacheKey= */ null,
             /* data= */ null);
-    DownloadStateBuilder downloadStateBuilder =
-        new DownloadStateBuilder(downloadAction)
-            .setState(DownloadState.STATE_QUEUED)
-            .setStreamKeys(keys1);
-    DownloadState downloadState = downloadStateBuilder.build();
+    DownloadBuilder downloadBuilder =
+        new DownloadBuilder(downloadAction).setState(Download.STATE_QUEUED).setStreamKeys(keys1);
+    Download download = downloadBuilder.build();
 
-    DownloadState mergedDownloadState =
-        downloadState.copyWithMergedAction(downloadAction, /* canStart= */ true);
+    Download mergedDownload = download.copyWithMergedAction(downloadAction, /* canStart= */ true);
 
-    DownloadState expectedDownloadState = downloadStateBuilder.setStreamKeys(expectedKeys).build();
-    assertEqual(mergedDownloadState, expectedDownloadState);
+    Download expectedDownload = downloadBuilder.setStreamKeys(expectedKeys).build();
+    assertEqual(mergedDownload, expectedDownload);
   }
 
-  static void assertEqual(DownloadState downloadState, DownloadState expected) {
-    assertEqual(downloadState, expected, false);
+  static void assertEqual(Download download, Download expected) {
+    assertEqual(download, expected, false);
   }
 
-  static void assertEqual(
-      DownloadState downloadState, DownloadState that, boolean compareTimeFields) {
-    assertThat(downloadState.action).isEqualTo(that.action);
-    assertThat(downloadState.state).isEqualTo(that.state);
-    assertThat(downloadState.getDownloadPercentage()).isEqualTo(that.getDownloadPercentage());
-    assertThat(downloadState.getDownloadedBytes()).isEqualTo(that.getDownloadedBytes());
-    assertThat(downloadState.getTotalBytes()).isEqualTo(that.getTotalBytes());
+  static void assertEqual(Download download, Download that, boolean compareTimeFields) {
+    assertThat(download.action).isEqualTo(that.action);
+    assertThat(download.state).isEqualTo(that.state);
+    assertThat(download.getDownloadPercentage()).isEqualTo(that.getDownloadPercentage());
+    assertThat(download.getDownloadedBytes()).isEqualTo(that.getDownloadedBytes());
+    assertThat(download.getTotalBytes()).isEqualTo(that.getTotalBytes());
     if (compareTimeFields) {
-      assertThat(downloadState.startTimeMs).isEqualTo(that.startTimeMs);
-      assertThat(downloadState.updateTimeMs).isEqualTo(that.updateTimeMs);
+      assertThat(download.startTimeMs).isEqualTo(that.startTimeMs);
+      assertThat(download.updateTimeMs).isEqualTo(that.updateTimeMs);
     }
-    assertThat(downloadState.failureReason).isEqualTo(that.failureReason);
-    assertThat(downloadState.manualStopReason).isEqualTo(that.manualStopReason);
+    assertThat(download.failureReason).isEqualTo(that.failureReason);
+    assertThat(download.manualStopReason).isEqualTo(that.manualStopReason);
   }
 
   private DownloadAction createDownloadAction() {
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
index 50d044ff10..a3349e507d 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
@@ -29,10 +29,10 @@ import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.offline.DefaultDownloadIndex;
 import com.google.android.exoplayer2.offline.DefaultDownloaderFactory;
+import com.google.android.exoplayer2.offline.Download;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadManager;
 import com.google.android.exoplayer2.offline.DownloadService;
-import com.google.android.exoplayer2.offline.DownloadState;
 import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.scheduler.Requirements;
@@ -141,7 +141,7 @@ public class DownloadServiceDashTest {
                 }
 
                 @Override
-                protected Notification getForegroundNotification(DownloadState[] downloadStates) {
+                protected Notification getForegroundNotification(Download[] downloads) {
                   throw new UnsupportedOperationException();
                 }
               };
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
index 855ce3107c..775dea253f 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
@@ -23,7 +23,7 @@ import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.core.app.NotificationCompat;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.offline.DownloadState;
+import com.google.android.exoplayer2.offline.Download;
 
 /** Helper for creating download notifications. */
 public final class DownloadNotificationHelper {
@@ -49,37 +49,37 @@ public final class DownloadNotificationHelper {
    * @param smallIcon A small icon for the notification.
    * @param contentIntent An optional content intent to send when the notification is clicked.
    * @param message An optional message to display on the notification.
-   * @param downloadStates The download states.
+   * @param downloads The download states.
    * @return The notification.
    */
   public Notification buildProgressNotification(
       @DrawableRes int smallIcon,
       @Nullable PendingIntent contentIntent,
       @Nullable String message,
-      DownloadState[] downloadStates) {
+      Download[] downloads) {
     float totalPercentage = 0;
     int downloadTaskCount = 0;
     boolean allDownloadPercentagesUnknown = true;
     boolean haveDownloadedBytes = false;
     boolean haveDownloadTasks = false;
     boolean haveRemoveTasks = false;
-    for (DownloadState downloadState : downloadStates) {
-      if (downloadState.state == DownloadState.STATE_REMOVING
-          || downloadState.state == DownloadState.STATE_RESTARTING) {
+    for (Download download : downloads) {
+      if (download.state == Download.STATE_REMOVING
+          || download.state == Download.STATE_RESTARTING) {
         haveRemoveTasks = true;
         continue;
       }
-      if (downloadState.state != DownloadState.STATE_DOWNLOADING
-          && downloadState.state != DownloadState.STATE_COMPLETED) {
+      if (download.state != Download.STATE_DOWNLOADING
+          && download.state != Download.STATE_COMPLETED) {
         continue;
       }
       haveDownloadTasks = true;
-      float downloadPercentage = downloadState.getDownloadPercentage();
+      float downloadPercentage = download.getDownloadPercentage();
       if (downloadPercentage != C.PERCENTAGE_UNSET) {
         allDownloadPercentagesUnknown = false;
         totalPercentage += downloadPercentage;
       }
-      haveDownloadedBytes |= downloadState.getDownloadedBytes() > 0;
+      haveDownloadedBytes |= download.getDownloadedBytes() > 0;
       downloadTaskCount++;
     }
 
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java
index f66352d7f7..5d4833f386 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java
@@ -20,7 +20,7 @@ import android.app.PendingIntent;
 import android.content.Context;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.offline.DownloadState;
+import com.google.android.exoplayer2.offline.Download;
 import com.google.android.exoplayer2.util.Util;
 
 /**
@@ -40,7 +40,7 @@ public final class DownloadNotificationUtil {
    * @param channelId The id of the notification channel to use.
    * @param contentIntent An optional content intent to send when the notification is clicked.
    * @param message An optional message to display on the notification.
-   * @param downloadStates The download states.
+   * @param downloads The download states.
    * @return The notification.
    */
   public static Notification buildProgressNotification(
@@ -49,9 +49,9 @@ public final class DownloadNotificationUtil {
       String channelId,
       @Nullable PendingIntent contentIntent,
       @Nullable String message,
-      DownloadState[] downloadStates) {
+      Download[] downloads) {
     return new DownloadNotificationHelper(context, channelId)
-        .buildProgressNotification(smallIcon, contentIntent, message, downloadStates);
+        .buildProgressNotification(smallIcon, contentIntent, message, downloads);
   }
 
   /**
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
index 907e104643..867888e91c 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
@@ -19,9 +19,9 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import android.os.ConditionVariable;
+import com.google.android.exoplayer2.offline.Download;
+import com.google.android.exoplayer2.offline.Download.State;
 import com.google.android.exoplayer2.offline.DownloadManager;
-import com.google.android.exoplayer2.offline.DownloadState;
-import com.google.android.exoplayer2.offline.DownloadState.State;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Locale;
@@ -42,7 +42,7 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
   private final ConditionVariable initializedCondition;
 
   private CountDownLatch downloadFinishedCondition;
-  @DownloadState.FailureReason private int failureReason;
+  @Download.FailureReason private int failureReason;
 
   public TestDownloadManagerListener(
       DownloadManager downloadManager, DummyMainThread dummyMainThread) {
@@ -69,16 +69,16 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
   }
 
   @Override
-  public void onDownloadStateChanged(DownloadManager downloadManager, DownloadState downloadState) {
-    if (downloadState.state == DownloadState.STATE_FAILED) {
-      failureReason = downloadState.failureReason;
+  public void onDownloadChanged(DownloadManager downloadManager, Download download) {
+    if (download.state == Download.STATE_FAILED) {
+      failureReason = download.failureReason;
     }
-    getStateQueue(downloadState.action.id).add(downloadState.state);
+    getStateQueue(download.action.id).add(download.state);
   }
 
   @Override
-  public void onDownloadRemoved(DownloadManager downloadManager, DownloadState downloadState) {
-    getStateQueue(downloadState.action.id).add(STATE_REMOVED);
+  public void onDownloadRemoved(DownloadManager downloadManager, Download download) {
+    getStateQueue(download.action.id).add(STATE_REMOVED);
   }
 
   @Override
@@ -94,8 +94,8 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
    */
   public void blockUntilTasksCompleteAndThrowAnyDownloadError() throws Throwable {
     blockUntilTasksComplete();
-    if (failureReason != DownloadState.FAILURE_REASON_NONE) {
-      throw new Exception("Failure reason: " + DownloadState.getFailureString(failureReason));
+    if (failureReason != Download.FAILURE_REASON_NONE) {
+      throw new Exception("Failure reason: " + Download.getFailureString(failureReason));
     }
   }
 
@@ -152,9 +152,7 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
           }
           int receivedState = receivedStates.get(i);
           String receivedStateString =
-              receivedState == STATE_REMOVED
-                  ? "REMOVED"
-                  : DownloadState.getStateString(receivedState);
+              receivedState == STATE_REMOVED ? "REMOVED" : Download.getStateString(receivedState);
           sb.append(receivedStateString);
         }
         fail(
@@ -162,7 +160,7 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
                 Locale.US,
                 "for download (%s) expected:<%s> but was:<%s>",
                 taskId,
-                DownloadState.getStateString(expectedState),
+                Download.getStateString(expectedState),
                 sb));
       }
     }

From 30beb9b30054e076d75eb7aad75727c284d97270 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 10 Apr 2019 13:32:52 +0100
Subject: [PATCH 738/832] Add DownloadAction merge tests

PiperOrigin-RevId: 242851294
---
 .../exoplayer2/offline/DownloadAction.java    |  16 +-
 .../offline/DownloadActionTest.java           | 154 ++++++++++++++++--
 2 files changed, 150 insertions(+), 20 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
index 6e11ec9042..63916ff1a2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
@@ -29,7 +29,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-/** Contains the necessary parameters for a download action. */
+/** Defines content to be downloaded. */
 public final class DownloadAction implements Parcelable {
 
   /** Thrown when the encoded action data belongs to an unsupported DownloadAction type. */
@@ -108,14 +108,20 @@ public final class DownloadAction implements Parcelable {
   }
 
   /**
-   * Returns the result of merging {@code newAction} into this action.
+   * Returns the result of merging {@code newAction} into this action. The actions must have the
+   * same {@link #id} and {@link #type}.
    *
-   * @param newAction The new action.
+   * <p>If the actions have different {@link #uri}, {@link #customCacheKey} and {@link #data}
+   * values, then those from the action being merged are included in the result.
+   *
+   * @param newAction The action being merged.
    * @return The merged result.
+   * @throws IllegalArgumentException If the actions do not have the same {@link #id} and {@link
+   *     #type}.
    */
   public DownloadAction copyWithMergedAction(DownloadAction newAction) {
-    Assertions.checkState(id.equals(newAction.id));
-    Assertions.checkState(type.equals(newAction.type));
+    Assertions.checkArgument(id.equals(newAction.id));
+    Assertions.checkArgument(type.equals(newAction.type));
     List<StreamKey> mergedKeys;
     if (streamKeys.isEmpty() || newAction.streamKeys.isEmpty()) {
       // If either streamKeys is empty then all streams should be downloaded.
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
index 0dd00307b9..0c753e8fef 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
@@ -16,7 +16,9 @@
 package com.google.android.exoplayer2.offline;
 
 import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_DASH;
+import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_HLS;
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
 
 import android.net.Uri;
 import android.os.Parcel;
@@ -41,6 +43,128 @@ public class DownloadActionTest {
     uri2 = Uri.parse("http://test/2.uri");
   }
 
+  @Test
+  public void testMergeActions_withDifferentIds_fails() {
+    DownloadAction action1 =
+        new DownloadAction(
+            "id1",
+            TYPE_DASH,
+            uri1,
+            /* streamKeys= */ Collections.emptyList(),
+            /* customCacheKey= */ null,
+            /* data= */ null);
+    DownloadAction action2 =
+        new DownloadAction(
+            "id2",
+            TYPE_DASH,
+            uri2,
+            /* streamKeys= */ Collections.emptyList(),
+            /* customCacheKey= */ null,
+            /* data= */ null);
+    try {
+      action1.copyWithMergedAction(action2);
+      fail();
+    } catch (IllegalArgumentException e) {
+      // Expected.
+    }
+  }
+
+  @Test
+  public void testMergeActions_withDifferentTypes_fails() {
+    DownloadAction action1 =
+        new DownloadAction(
+            "id1",
+            TYPE_DASH,
+            uri1,
+            /* streamKeys= */ Collections.emptyList(),
+            /* customCacheKey= */ null,
+            /* data= */ null);
+    DownloadAction action2 =
+        new DownloadAction(
+            "id1",
+            TYPE_HLS,
+            uri1,
+            /* streamKeys= */ Collections.emptyList(),
+            /* customCacheKey= */ null,
+            /* data= */ null);
+    try {
+      action1.copyWithMergedAction(action2);
+      fail();
+    } catch (IllegalArgumentException e) {
+      // Expected.
+    }
+  }
+
+  @Test
+  public void testMergeAction_withSameAction() {
+    DownloadAction action1 = createAction(uri1, new StreamKey(0, 0, 0));
+
+    DownloadAction mergedAction = action1.copyWithMergedAction(action1);
+    assertEqual(action1, mergedAction);
+  }
+
+  @Test
+  public void testMergeActions_withEmptyStreamKeys() {
+    DownloadAction action1 = createAction(uri1, new StreamKey(0, 0, 0));
+    DownloadAction action2 = createAction(uri1);
+
+    // If either of the actions have empty streamKeys, the merge should have empty streamKeys.
+    DownloadAction mergedAction = action1.copyWithMergedAction(action2);
+    assertThat(mergedAction.streamKeys).isEmpty();
+
+    mergedAction = action2.copyWithMergedAction(action1);
+    assertThat(mergedAction.streamKeys).isEmpty();
+  }
+
+  @Test
+  public void testMergeActions_withOverlappingStreamKeys() {
+    StreamKey streamKey1 = new StreamKey(0, 1, 2);
+    StreamKey streamKey2 = new StreamKey(3, 4, 5);
+    StreamKey streamKey3 = new StreamKey(6, 7, 8);
+    DownloadAction action1 = createAction(uri1, streamKey1, streamKey2);
+    DownloadAction action2 = createAction(uri1, streamKey2, streamKey3);
+
+    // Merged streamKeys should be in their original order without duplicates.
+    DownloadAction mergedAction = action1.copyWithMergedAction(action2);
+    assertThat(mergedAction.streamKeys).containsExactly(streamKey1, streamKey2, streamKey3);
+
+    mergedAction = action2.copyWithMergedAction(action1);
+    assertThat(mergedAction.streamKeys).containsExactly(streamKey2, streamKey3, streamKey1);
+  }
+
+  @Test
+  public void testMergeActions_withDifferentFields() {
+    byte[] data1 = new byte[] {0, 1, 2};
+    byte[] data2 = new byte[] {3, 4, 5};
+    DownloadAction action1 =
+        new DownloadAction(
+            "id1",
+            TYPE_DASH,
+            uri1,
+            /* streamKeys= */ Collections.emptyList(),
+            "key1",
+            /* data= */ data1);
+    DownloadAction action2 =
+        new DownloadAction(
+            "id1",
+            TYPE_DASH,
+            uri2,
+            /* streamKeys= */ Collections.emptyList(),
+            "key2",
+            /* data= */ data2);
+
+    // uri, customCacheKey and data should be from the action being merged.
+    DownloadAction mergedAction = action1.copyWithMergedAction(action2);
+    assertThat(mergedAction.uri).isEqualTo(uri2);
+    assertThat(mergedAction.customCacheKey).isEqualTo("key2");
+    assertThat(mergedAction.data).isEqualTo(data2);
+
+    mergedAction = action2.copyWithMergedAction(action1);
+    assertThat(mergedAction.uri).isEqualTo(uri1);
+    assertThat(mergedAction.customCacheKey).isEqualTo("key1");
+    assertThat(mergedAction.data).isEqualTo(data1);
+  }
+
   @Test
   public void testParcelable() {
     ArrayList<StreamKey> streamKeys = new ArrayList<>();
@@ -74,29 +198,29 @@ public class DownloadActionTest {
     DownloadAction action3 = createAction(uri1);
     assertEqual(action2, action3);
 
-    DownloadAction action6 = createAction(uri1);
+    DownloadAction action4 = createAction(uri1);
+    DownloadAction action5 = createAction(uri1, new StreamKey(0, 0, 0));
+    assertNotEqual(action4, action5);
+
+    DownloadAction action6 = createAction(uri1, new StreamKey(0, 1, 1));
     DownloadAction action7 = createAction(uri1, new StreamKey(0, 0, 0));
     assertNotEqual(action6, action7);
 
-    DownloadAction action8 = createAction(uri1, new StreamKey(0, 1, 1));
-    DownloadAction action9 = createAction(uri1, new StreamKey(0, 0, 0));
+    DownloadAction action8 = createAction(uri1);
+    DownloadAction action9 = createAction(uri2);
     assertNotEqual(action8, action9);
 
-    DownloadAction action10 = createAction(uri1);
-    DownloadAction action11 = createAction(uri2);
-    assertNotEqual(action10, action11);
+    DownloadAction action10 = createAction(uri1, new StreamKey(0, 0, 0), new StreamKey(0, 1, 1));
+    DownloadAction action11 = createAction(uri1, new StreamKey(0, 1, 1), new StreamKey(0, 0, 0));
+    assertEqual(action10, action11);
 
-    DownloadAction action12 = createAction(uri1, new StreamKey(0, 0, 0), new StreamKey(0, 1, 1));
+    DownloadAction action12 = createAction(uri1, new StreamKey(0, 0, 0));
     DownloadAction action13 = createAction(uri1, new StreamKey(0, 1, 1), new StreamKey(0, 0, 0));
-    assertEqual(action12, action13);
+    assertNotEqual(action12, action13);
 
-    DownloadAction action14 = createAction(uri1, new StreamKey(0, 0, 0));
-    DownloadAction action15 = createAction(uri1, new StreamKey(0, 1, 1), new StreamKey(0, 0, 0));
-    assertNotEqual(action14, action15);
-
-    DownloadAction action16 = createAction(uri1);
-    DownloadAction action17 = createAction(uri1);
-    assertEqual(action16, action17);
+    DownloadAction action14 = createAction(uri1);
+    DownloadAction action15 = createAction(uri1);
+    assertEqual(action14, action15);
   }
 
   private static void assertNotEqual(DownloadAction action1, DownloadAction action2) {

From c830c8dc634d643271cd6e2c13b15e6598339098 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 10 Apr 2019 13:47:25 +0100
Subject: [PATCH 739/832] Use LoadErrorHandlingPolicy.getRetryDelayMsFor for
 DASH/SS manifest loads.

Both manifest loads currently use the default retry delay although a
LoadErrorHandlingPolicy is provided to the MediaSource.

PiperOrigin-RevId: 242852672
---
 .../exoplayer2/source/dash/DashMediaSource.java      | 12 +++++++++---
 .../source/smoothstreaming/SsMediaSource.java        |  7 ++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
index 732ca61b62..5284f8b936 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
@@ -812,7 +812,8 @@ public final class DashMediaSource extends BaseMediaSource {
       ParsingLoadable<DashManifest> loadable,
       long elapsedRealtimeMs,
       long loadDurationMs,
-      IOException error) {
+      IOException error,
+      int errorCount) {
     boolean isFatal = error instanceof ParserException;
     manifestEventDispatcher.loadError(
         loadable.dataSpec,
@@ -824,7 +825,12 @@ public final class DashMediaSource extends BaseMediaSource {
         loadable.bytesLoaded(),
         error,
         isFatal);
-    return isFatal ? Loader.DONT_RETRY_FATAL : Loader.RETRY;
+    return isFatal
+        ? Loader.DONT_RETRY_FATAL
+        : Loader.createRetryAction(
+            /* resetErrorCount= */ false,
+            loadErrorHandlingPolicy.getRetryDelayMsFor(
+                C.DATA_TYPE_MANIFEST, loadDurationMs, error, errorCount));
   }
 
   /* package */ void onUtcTimestampLoadCompleted(ParsingLoadable<Long> loadable,
@@ -1296,7 +1302,7 @@ public final class DashMediaSource extends BaseMediaSource {
         long loadDurationMs,
         IOException error,
         int errorCount) {
-      return onManifestLoadError(loadable, elapsedRealtimeMs, loadDurationMs, error);
+      return onManifestLoadError(loadable, elapsedRealtimeMs, loadDurationMs, error, errorCount);
     }
 
   }
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
index 867b17ac35..1291b846ba 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
@@ -639,7 +639,12 @@ public final class SsMediaSource extends BaseMediaSource
         loadable.bytesLoaded(),
         error,
         isFatal);
-    return isFatal ? Loader.DONT_RETRY_FATAL : Loader.RETRY;
+    return isFatal
+        ? Loader.DONT_RETRY_FATAL
+        : Loader.createRetryAction(
+            /* resetErrorCount= */ false,
+            loadErrorHandlingPolicy.getRetryDelayMsFor(
+                C.DATA_TYPE_MANIFEST, loadDurationMs, error, errorCount));
   }
 
   // Internal methods

From 68993f233d9c9acd43a20066f411ff3af6515bae Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 10 Apr 2019 15:49:01 +0100
Subject: [PATCH 740/832] Improve DownloadNotificationHelper

- Remove completed downloads from progress notification.
- Treat restarting as a downloading, When there are both
remove and download tasks ongoing, we prefer to show a
download notification to a remove one. A restarting task
encapsulates is basically a (remove+download) task. Given
our preference, we should treat it as a download rather
than as a removal.

PiperOrigin-RevId: 242867228
---
 .../android/exoplayer2/ui/DownloadNotificationHelper.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
index 775dea253f..278cfeca59 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
@@ -64,13 +64,12 @@ public final class DownloadNotificationHelper {
     boolean haveDownloadTasks = false;
     boolean haveRemoveTasks = false;
     for (Download download : downloads) {
-      if (download.state == Download.STATE_REMOVING
-          || download.state == Download.STATE_RESTARTING) {
+      if (download.state == Download.STATE_REMOVING) {
         haveRemoveTasks = true;
         continue;
       }
-      if (download.state != Download.STATE_DOWNLOADING
-          && download.state != Download.STATE_COMPLETED) {
+      if (download.state != Download.STATE_RESTARTING
+          && download.state != Download.STATE_DOWNLOADING) {
         continue;
       }
       haveDownloadTasks = true;

From 9779d71a1d7f6d9e009b8816d820a1c8d07935c7 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 10 Apr 2019 18:15:27 +0100
Subject: [PATCH 741/832] Fix stopping downloads

- Changed startDownloads/stopDownloads back to their previous behavior
  of starting and stopping all downloads at the manager level.
- Made setManualStopReason methods for the new case of setting a manual
  stop reason or some or all downloads.
- Added plumbing to specify an initial manual stop reason when adding a
  new download, without also overwriting the manual stop reasons of all
  other preexisting downloads. Using the value is left as a TODO pending
  a bit of further cleanup that'll make it easier.

PiperOrigin-RevId: 242891688
---
 .../android/exoplayer2/offline/Download.java  |   8 +-
 .../exoplayer2/offline/DownloadManager.java   | 202 ++++++++----------
 .../exoplayer2/offline/DownloadService.java   | 136 +++++++-----
 .../offline/DownloadManagerTest.java          |  28 +--
 .../exoplayer2/offline/DownloadTest.java      |   4 +-
 5 files changed, 198 insertions(+), 180 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
index c0e31ec39a..811df3b0d4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
@@ -46,7 +46,7 @@ public final class Download {
   // Important: These constants are persisted into DownloadIndex. Do not change them.
   /** The download is waiting to be started. */
   public static final int STATE_QUEUED = 0;
-  /** The download is stopped. */
+  /** The download is manually stopped for the reason specified by {@link #manualStopReason}. */
   public static final int STATE_STOPPED = 1;
   /** The download is currently started. */
   public static final int STATE_DOWNLOADING = 2;
@@ -71,8 +71,6 @@ public final class Download {
 
   /** The download isn't manually stopped. */
   public static final int MANUAL_STOP_REASON_NONE = 0;
-  /** The download is manually stopped but a reason isn't specified. */
-  public static final int MANUAL_STOP_REASON_UNDEFINED = Integer.MAX_VALUE;
 
   /** Returns the state string for the given state value. */
   public static String getStateString(@State int state) {
@@ -122,7 +120,7 @@ public final class Download {
    * #FAILURE_REASON_NONE}.
    */
   @FailureReason public final int failureReason;
-  /** The manual stop reason. */
+  /** The reason the download is manually stopped, or {@link #MANUAL_STOP_REASON_NONE}. */
   public final int manualStopReason;
 
   /*package*/ CachingCounters counters;
@@ -232,7 +230,7 @@ public final class Download {
     this.counters = counters;
   }
 
-  private static int getNextState(int currentState, boolean canStart) {
+  private static int getNextState(@State int currentState, boolean canStart) {
     if (currentState == STATE_REMOVING || currentState == STATE_RESTARTING) {
       return STATE_RESTARTING;
     } else if (canStart) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index c16ff30d44..c16d0fc8e6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.offline;
 import static com.google.android.exoplayer2.offline.Download.FAILURE_REASON_NONE;
 import static com.google.android.exoplayer2.offline.Download.FAILURE_REASON_UNKNOWN;
 import static com.google.android.exoplayer2.offline.Download.MANUAL_STOP_REASON_NONE;
-import static com.google.android.exoplayer2.offline.Download.MANUAL_STOP_REASON_UNDEFINED;
 import static com.google.android.exoplayer2.offline.Download.STATE_COMPLETED;
 import static com.google.android.exoplayer2.offline.Download.STATE_DOWNLOADING;
 import static com.google.android.exoplayer2.offline.Download.STATE_FAILED;
@@ -53,7 +52,11 @@ import java.util.concurrent.CopyOnWriteArraySet;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 /**
- * Manages multiple stream download and remove requests.
+ * Manages downloads.
+ *
+ * <p>Normally a download manager should be accessed via a {@link DownloadService}. When a download
+ * manager is used directly instead, downloads will be initially stopped and so must be started by
+ * calling {@link #startDownloads()}.
  *
  * <p>A download manager instance must be accessed only from the thread that created it, unless that
  * thread does not have a {@link Looper}. In that case, it must be accessed only from the
@@ -122,12 +125,13 @@ public final class DownloadManager {
 
   // Messages posted to the background handler.
   private static final int MSG_INITIALIZE = 0;
-  private static final int MSG_ADD_DOWNLOAD = 1;
-  private static final int MSG_REMOVE_DOWNLOAD = 2;
+  private static final int MSG_SET_DOWNLOADS_STARTED = 1;
+  private static final int MSG_SET_NOT_MET_REQUIREMENTS = 2;
   private static final int MSG_SET_MANUAL_STOP_REASON = 3;
-  private static final int MSG_SET_NOT_MET_REQUIREMENTS = 4;
-  private static final int MSG_DOWNLOAD_THREAD_STOPPED = 5;
-  private static final int MSG_RELEASE = 6;
+  private static final int MSG_ADD_DOWNLOAD = 4;
+  private static final int MSG_REMOVE_DOWNLOAD = 5;
+  private static final int MSG_DOWNLOAD_THREAD_STOPPED = 6;
+  private static final int MSG_RELEASE = 7;
 
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
@@ -174,7 +178,7 @@ public final class DownloadManager {
 
   // Mutable fields that are accessed on the internal thread.
   @Requirements.RequirementFlags private int notMetRequirements;
-  private int manualStopReason;
+  private boolean downloadsStarted;
   private int simultaneousDownloads;
 
   /**
@@ -244,7 +248,6 @@ public final class DownloadManager {
     this.maxSimultaneousDownloads = maxSimultaneousDownloads;
     this.minRetryCount = minRetryCount;
 
-    manualStopReason = MANUAL_STOP_REASON_UNDEFINED;
     downloadInternals = new ArrayList<>();
     downloads = new ArrayList<>();
     activeDownloads = new HashMap<>();
@@ -331,63 +334,37 @@ public final class DownloadManager {
   }
 
   /**
-   * Clears manual stop reason of all downloads. Downloads are started if the requirements are met.
+   * Starts all downloads except those that are manually stopped (i.e. have a non-zero {@link
+   * Download#manualStopReason}).
    */
   public void startDownloads() {
-    postSetManualStopReason(/* id= */ null, MANUAL_STOP_REASON_NONE);
+    pendingMessages++;
+    internalHandler
+        .obtainMessage(MSG_SET_DOWNLOADS_STARTED, /* downloadsStarted */ 1, /* unused */ 0)
+        .sendToTarget();
   }
 
-  /** Signals all downloads to stop. Call {@link #startDownloads()} to let them to be started. */
+  /** Stops all downloads. */
   public void stopDownloads() {
-    stopDownloads(MANUAL_STOP_REASON_UNDEFINED);
+    pendingMessages++;
+    internalHandler
+        .obtainMessage(MSG_SET_DOWNLOADS_STARTED, /* downloadsStarted */ 0, /* unused */ 0)
+        .sendToTarget();
   }
 
   /**
-   * Sets a manual stop reason for all downloads.
+   * Sets the manual stop reason for one or all downloads. To clear the manual stop reason, pass
+   * {@link Download#MANUAL_STOP_REASON_NONE}.
    *
-   * @param manualStopReason An application defined stop reason. Value {@value
-   *     Download#MANUAL_STOP_REASON_NONE} is not allowed and value {@value
-   *     Download#MANUAL_STOP_REASON_UNDEFINED} is reserved for {@link
-   *     Download#MANUAL_STOP_REASON_UNDEFINED}.
+   * @param id The content id of the download to update, or {@code null} to set the manual stop
+   *     reason for all downloads.
+   * @param manualStopReason The manual stop reason, or {@link Download#MANUAL_STOP_REASON_NONE}.
    */
-  public void stopDownloads(int manualStopReason) {
-    Assertions.checkArgument(manualStopReason != MANUAL_STOP_REASON_NONE);
-    postSetManualStopReason(/* id= */ null, manualStopReason);
-  }
-
-  /**
-   * Clears manual stop reason of the download with the {@code id}. Download is started if the
-   * requirements are met.
-   *
-   * @param id The unique content id of the download to be started.
-   */
-  public void startDownload(String id) {
-    postSetManualStopReason(id, MANUAL_STOP_REASON_NONE);
-  }
-
-  /**
-   * Signals the download with the {@code id} to stop. Call {@link #startDownload(String)} to let it
-   * to be started.
-   *
-   * @param id The unique content id of the download to be stopped.
-   */
-  public void stopDownload(String id) {
-    stopDownload(id, MANUAL_STOP_REASON_UNDEFINED);
-  }
-
-  /**
-   * Signals the download with the {@code id} to stop. Call {@link #startDownload(String)} to let it
-   * to be started.
-   *
-   * @param id The unique content id of the download to be stopped.
-   * @param manualStopReason An application defined stop reason. Value {@value
-   *     Download#MANUAL_STOP_REASON_NONE} is not allowed and value {@value
-   *     Download#MANUAL_STOP_REASON_UNDEFINED} is reserved for {@link
-   *     Download#MANUAL_STOP_REASON_UNDEFINED}.
-   */
-  public void stopDownload(String id, int manualStopReason) {
-    Assertions.checkArgument(manualStopReason != MANUAL_STOP_REASON_NONE);
-    postSetManualStopReason(id, manualStopReason);
+  public void setManualStopReason(@Nullable String id, int manualStopReason) {
+    pendingMessages++;
+    internalHandler
+        .obtainMessage(MSG_SET_MANUAL_STOP_REASON, manualStopReason, /* unused */ 0, id)
+        .sendToTarget();
   }
 
   /**
@@ -396,8 +373,21 @@ public final class DownloadManager {
    * @param action The download action.
    */
   public void addDownload(DownloadAction action) {
+    addDownload(action, Download.MANUAL_STOP_REASON_NONE);
+  }
+
+  /**
+   * Adds a download defined by the given action and with the specified manual stop reason.
+   *
+   * @param action The download action.
+   * @param manualStopReason An initial manual stop reason for the download, or {@link
+   *     Download#MANUAL_STOP_REASON_NONE} if the download should be started.
+   */
+  public void addDownload(DownloadAction action, int manualStopReason) {
     pendingMessages++;
-    internalHandler.obtainMessage(MSG_ADD_DOWNLOAD, action).sendToTarget();
+    internalHandler
+        .obtainMessage(MSG_ADD_DOWNLOAD, manualStopReason, /* unused */ 0, action)
+        .sendToTarget();
   }
 
   /**
@@ -442,13 +432,6 @@ public final class DownloadManager {
     }
   }
 
-  private void postSetManualStopReason(@Nullable String id, int manualStopReason) {
-    pendingMessages++;
-    internalHandler
-        .obtainMessage(MSG_SET_MANUAL_STOP_REASON, manualStopReason, /* unused */ 0, id)
-        .sendToTarget();
-  }
-
   private void onRequirementsStateChanged(
       RequirementsWatcher requirementsWatcher,
       @Requirements.RequirementFlags int notMetRequirements) {
@@ -551,27 +534,32 @@ public final class DownloadManager {
         int notMetRequirements = message.arg1;
         initializeInternal(notMetRequirements);
         break;
-      case MSG_ADD_DOWNLOAD:
-        DownloadAction action = (DownloadAction) message.obj;
-        addDownloadInternal(action);
-        break;
-      case MSG_REMOVE_DOWNLOAD:
-        String id = (String) message.obj;
-        removeDownloadInternal(id);
-        break;
-      case MSG_SET_MANUAL_STOP_REASON:
-        id = (String) message.obj;
-        int manualStopReason = message.arg1;
-        setManualStopReasonInternal(id, manualStopReason);
+      case MSG_SET_DOWNLOADS_STARTED:
+        boolean downloadsStarted = message.arg1 != 0;
+        setDownloadsStartedInternal(downloadsStarted);
         break;
       case MSG_SET_NOT_MET_REQUIREMENTS:
         notMetRequirements = message.arg1;
         setNotMetRequirementsInternal(notMetRequirements);
         break;
+      case MSG_SET_MANUAL_STOP_REASON:
+        String id = (String) message.obj;
+        int manualStopReason = message.arg1;
+        setManualStopReasonInternal(id, manualStopReason);
+        break;
+      case MSG_ADD_DOWNLOAD:
+        DownloadAction action = (DownloadAction) message.obj;
+        manualStopReason = message.arg1;
+        addDownloadInternal(action, manualStopReason);
+        break;
+      case MSG_REMOVE_DOWNLOAD:
+        id = (String) message.obj;
+        removeDownloadInternal(id);
+        break;
       case MSG_DOWNLOAD_THREAD_STOPPED:
         DownloadThread downloadThread = (DownloadThread) message.obj;
         onDownloadThreadStoppedInternal(downloadThread);
-        processedExternalMessage = false;
+        processedExternalMessage = false; // This message is posted internally.
         break;
       case MSG_RELEASE:
         releaseInternal();
@@ -594,7 +582,6 @@ public final class DownloadManager {
         return;
       }
     } else {
-      this.manualStopReason = manualStopReason;
       for (int i = 0; i < downloadInternals.size(); i++) {
         downloadInternals.get(i).setManualStopReason(manualStopReason);
       }
@@ -610,7 +597,8 @@ public final class DownloadManager {
     }
   }
 
-  private void addDownloadInternal(DownloadAction action) {
+  // TODO: Use manualStopReason.
+  private void addDownloadInternal(DownloadAction action, int manualStopReason) {
     DownloadInternal downloadInternal = getDownload(action.id);
     if (downloadInternal != null) {
       downloadInternal.addAction(action);
@@ -621,7 +609,7 @@ public final class DownloadManager {
         download = new Download(action);
         logd("Download state is created for " + action.id);
       } else {
-        download = download.copyWithMergedAction(action, /* canStart= */ notMetRequirements == 0);
+        download = download.copyWithMergedAction(action, /* canStart= */ canStartDownloads());
         logd("Download state is loaded for " + action.id);
       }
       addDownloadForState(download);
@@ -666,6 +654,16 @@ public final class DownloadManager {
     mainHandler.obtainMessage(MSG_DOWNLOAD_REMOVED, download).sendToTarget();
   }
 
+  private void setDownloadsStartedInternal(boolean downloadsStarted) {
+    if (this.downloadsStarted == downloadsStarted) {
+      return;
+    }
+    this.downloadsStarted = downloadsStarted;
+    for (int i = 0; i < downloadInternals.size(); i++) {
+      downloadInternals.get(i).updateStopState();
+    }
+  }
+
   private void setNotMetRequirementsInternal(
       @Requirements.RequirementFlags int notMetRequirements) {
     if (this.notMetRequirements == notMetRequirements) {
@@ -674,7 +672,7 @@ public final class DownloadManager {
     this.notMetRequirements = notMetRequirements;
     logdFlags("Not met requirements are changed", notMetRequirements);
     for (int i = 0; i < downloadInternals.size(); i++) {
-      downloadInternals.get(i).setNotMetRequirements(notMetRequirements);
+      downloadInternals.get(i).updateStopState();
     }
   }
 
@@ -682,7 +680,7 @@ public final class DownloadManager {
   private DownloadInternal getDownload(String id) {
     for (int i = 0; i < downloadInternals.size(); i++) {
       DownloadInternal downloadInternal = downloadInternals.get(i);
-      if (downloadInternal.getId().equals(id)) {
+      if (downloadInternal.download.action.id.equals(id)) {
         return downloadInternal;
       }
     }
@@ -723,13 +721,16 @@ public final class DownloadManager {
   }
 
   private void addDownloadForState(Download download) {
-    DownloadInternal downloadInternal =
-        new DownloadInternal(this, download, notMetRequirements, manualStopReason);
+    DownloadInternal downloadInternal = new DownloadInternal(this, download);
     downloadInternals.add(downloadInternal);
     logd("Download is added", downloadInternal);
     downloadInternal.initialize();
   }
 
+  private boolean canStartDownloads() {
+    return downloadsStarted && notMetRequirements == 0;
+  }
+
   private static void logd(String message) {
     if (DEBUG) {
       Log.d(TAG, message);
@@ -814,32 +815,24 @@ public final class DownloadManager {
     private final DownloadManager downloadManager;
 
     private Download download;
-    @Download.State private int state;
     @MonotonicNonNull @Download.FailureReason private int failureReason;
-    @Requirements.RequirementFlags private int notMetRequirements;
+
+    // TODO: Get rid of these and use download directly.
+    @Download.State private int state;
     private int manualStopReason;
 
-    private DownloadInternal(
-        DownloadManager downloadManager,
-        Download download,
-        @Requirements.RequirementFlags int notMetRequirements,
-        int manualStopReason) {
+    private DownloadInternal(DownloadManager downloadManager, Download download) {
       this.downloadManager = downloadManager;
       this.download = download;
-      this.notMetRequirements = notMetRequirements;
-      this.manualStopReason = manualStopReason;
+      manualStopReason = download.manualStopReason;
     }
 
     private void initialize() {
       initialize(download.state);
     }
 
-    public String getId() {
-      return download.action.id;
-    }
-
     public void addAction(DownloadAction newAction) {
-      download = download.copyWithMergedAction(newAction, /* canStart= */ notMetRequirements == 0);
+      download = download.copyWithMergedAction(newAction, downloadManager.canStartDownloads());
       initialize();
     }
 
@@ -866,7 +859,7 @@ public final class DownloadManager {
 
     @Override
     public String toString() {
-      return getId() + ' ' + Download.getStateString(state);
+      return download.action.id + ' ' + Download.getStateString(state);
     }
 
     public void start() {
@@ -877,11 +870,6 @@ public final class DownloadManager {
       }
     }
 
-    public void setNotMetRequirements(@Requirements.RequirementFlags int notMetRequirements) {
-      this.notMetRequirements = notMetRequirements;
-      updateStopState();
-    }
-
     public void setManualStopReason(int manualStopReason) {
       this.manualStopReason = manualStopReason;
       updateStopState();
@@ -913,8 +901,8 @@ public final class DownloadManager {
     }
 
     private void initialize(int initialState) {
-      // Don't notify listeners with initial state until we make sure we don't switch to
-      // another state immediately.
+      // Don't notify listeners with initial state until we make sure we don't switch to another
+      // state immediately.
       state = initialState;
       if (isInRemoveState()) {
         downloadManager.startDownloadThread(this);
@@ -929,7 +917,7 @@ public final class DownloadManager {
     }
 
     private boolean canStart() {
-      return manualStopReason == MANUAL_STOP_REASON_NONE && notMetRequirements == 0;
+      return downloadManager.canStartDownloads() && manualStopReason == MANUAL_STOP_REASON_NONE;
     }
 
     private void startOrQueue() {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index 34540659ca..52d2aa21d3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -15,6 +15,8 @@
  */
 package com.google.android.exoplayer2.offline;
 
+import static com.google.android.exoplayer2.offline.Download.MANUAL_STOP_REASON_NONE;
+
 import android.app.Notification;
 import android.app.Service;
 import android.content.Context;
@@ -55,17 +57,18 @@ public abstract class DownloadService extends Service {
    * <ul>
    *   <li>{@link #KEY_DOWNLOAD_ACTION} - A {@link DownloadAction} defining the download to be
    *       added.
+   *   <li>{@link #KEY_MANUAL_STOP_REASON} - An initial manual stop reason for the download. If
+   *       omitted {@link Download#MANUAL_STOP_REASON_NONE} is used.
    *   <li>{@link #KEY_FOREGROUND} - See {@link #KEY_FOREGROUND}.
    * </ul>
    */
   public static final String ACTION_ADD = "com.google.android.exoplayer.downloadService.action.ADD";
 
   /**
-   * Starts one or all of the current downloads. Extras:
+   * Starts all downloads except those that are manually stopped (i.e. have a non-zero {@link
+   * Download#manualStopReason}). Extras:
    *
    * <ul>
-   *   <li>{@link #KEY_CONTENT_ID} - The content id of a single download to start. If omitted, all
-   *       of the current downloads will be started.
    *   <li>{@link #KEY_FOREGROUND} - See {@link #KEY_FOREGROUND}.
    * </ul>
    */
@@ -73,20 +76,31 @@ public abstract class DownloadService extends Service {
       "com.google.android.exoplayer.downloadService.action.START";
 
   /**
-   * Stops one or all of the current downloads. Extras:
+   * Stops all downloads. Extras:
    *
    * <ul>
-   *   <li>{@link #KEY_CONTENT_ID} - The content id of a single download to stop. If omitted, all of
-   *       the current downloads will be stopped.
-   *   <li>{@link #KEY_STOP_REASON} - An application provided reason for stopping the download or
-   *       downloads. Must not be {@link Download#MANUAL_STOP_REASON_NONE}. If omitted, the stop
-   *       reason will be {@link Download#MANUAL_STOP_REASON_UNDEFINED}.
    *   <li>{@link #KEY_FOREGROUND} - See {@link #KEY_FOREGROUND}.
    * </ul>
    */
   public static final String ACTION_STOP =
       "com.google.android.exoplayer.downloadService.action.STOP";
 
+  /**
+   * Sets the manual stop reason for one or all downloads. To clear the manual stop reason, pass
+   * {@link Download#MANUAL_STOP_REASON_NONE}. Extras:
+   *
+   * <ul>
+   *   <li>{@link #KEY_CONTENT_ID} - The content id of a single download to update with the manual
+   *       stop reason. If omitted, all downloads will be updated.
+   *   <li>{@link #KEY_MANUAL_STOP_REASON} - An application provided reason for stopping the
+   *       download or downloads, or {@link Download#MANUAL_STOP_REASON_NONE} to clear the manual
+   *       stop reason.
+   *   <li>{@link #KEY_FOREGROUND} - See {@link #KEY_FOREGROUND}.
+   * </ul>
+   */
+  public static final String ACTION_SET_MANUAL_STOP_REASON =
+      "com.google.android.exoplayer.downloadService.action.SET_MANUAL_STOP_REASON";
+
   /**
    * Removes an existing download. Extras:
    *
@@ -110,8 +124,11 @@ public abstract class DownloadService extends Service {
    */
   public static final String KEY_CONTENT_ID = "content_id";
 
-  /** Key for the stop reason in {@link #ACTION_STOP} intents. */
-  public static final String KEY_STOP_REASON = "stop_reason";
+  /**
+   * Key for the manual stop reason in {@link #ACTION_SET_MANUAL_STOP_REASON} and {@link
+   * #ACTION_ADD} intents.
+   */
+  public static final String KEY_MANUAL_STOP_REASON = "manual_stop_reason";
 
   /**
    * Key for a boolean extra that can be set on any intent to indicate whether the service was
@@ -228,43 +245,31 @@ public abstract class DownloadService extends Service {
       Class<? extends DownloadService> clazz,
       DownloadAction downloadAction,
       boolean foreground) {
-    return getIntent(context, clazz, ACTION_ADD)
-        .putExtra(KEY_DOWNLOAD_ACTION, downloadAction)
-        .putExtra(KEY_FOREGROUND, foreground);
+    return buildAddActionIntent(
+        context, clazz, downloadAction, MANUAL_STOP_REASON_NONE, foreground);
   }
 
   /**
-   * Builds an {@link Intent} for stopping the download with the {@code id}. If {@code id} is null,
-   * stops all downloads.
+   * Builds an {@link Intent} for adding an action to be executed by the service.
    *
    * @param context A {@link Context}.
    * @param clazz The concrete download service being targeted by the intent.
-   * @param id The content id, or null if all downloads should be stopped.
-   * @param manualStopReason An application defined stop reason.
+   * @param downloadAction The action to be executed.
+   * @param manualStopReason An initial manual stop reason for the download, or {@link
+   *     Download#MANUAL_STOP_REASON_NONE} if the download should be started.
+   * @param foreground Whether this intent will be used to start the service in the foreground.
    * @return Created Intent.
    */
-  public static Intent buildStopDownloadIntent(
+  public static Intent buildAddActionIntent(
       Context context,
       Class<? extends DownloadService> clazz,
-      @Nullable String id,
-      int manualStopReason) {
-    return getIntent(context, clazz, ACTION_STOP)
-        .putExtra(KEY_CONTENT_ID, id)
-        .putExtra(KEY_STOP_REASON, manualStopReason);
-  }
-
-  /**
-   * Builds an {@link Intent} for starting the download with the {@code id}. If {@code id} is null,
-   * starts all downloads.
-   *
-   * @param context A {@link Context}.
-   * @param clazz The concrete download service being targeted by the intent.
-   * @param id The content id, or null if all downloads should be started.
-   * @return Created Intent.
-   */
-  public static Intent buildStartDownloadIntent(
-      Context context, Class<? extends DownloadService> clazz, @Nullable String id) {
-    return getIntent(context, clazz, ACTION_START).putExtra(KEY_CONTENT_ID, id);
+      DownloadAction downloadAction,
+      int manualStopReason,
+      boolean foreground) {
+    return getIntent(context, clazz, ACTION_ADD)
+        .putExtra(KEY_DOWNLOAD_ACTION, downloadAction)
+        .putExtra(KEY_MANUAL_STOP_REASON, manualStopReason)
+        .putExtra(KEY_FOREGROUND, foreground);
   }
 
   /**
@@ -283,6 +288,26 @@ public abstract class DownloadService extends Service {
         .putExtra(KEY_FOREGROUND, foreground);
   }
 
+  /**
+   * Builds an {@link Intent} for setting the manual stop reason for one or all downloads. To clear
+   * the manual stop reason, pass {@link Download#MANUAL_STOP_REASON_NONE}.
+   *
+   * @param context A {@link Context}.
+   * @param clazz The concrete download service being targeted by the intent.
+   * @param id The content id, or {@code null} to set the manual stop reason for all downloads.
+   * @param manualStopReason An application defined stop reason.
+   * @return Created Intent.
+   */
+  public static Intent buildSetManualStopReasonIntent(
+      Context context,
+      Class<? extends DownloadService> clazz,
+      @Nullable String id,
+      int manualStopReason) {
+    return getIntent(context, clazz, ACTION_STOP)
+        .putExtra(KEY_CONTENT_ID, id)
+        .putExtra(KEY_MANUAL_STOP_REASON, manualStopReason);
+  }
+
   /**
    * Starts the service, adding an action to be executed.
    *
@@ -358,9 +383,11 @@ public abstract class DownloadService extends Service {
     Class<? extends DownloadService> clazz = getClass();
     DownloadManagerHelper downloadManagerHelper = downloadManagerListeners.get(clazz);
     if (downloadManagerHelper == null) {
+      DownloadManager downloadManager = getDownloadManager();
+      downloadManager.startDownloads();
       downloadManagerHelper =
           new DownloadManagerHelper(
-              getApplicationContext(), getDownloadManager(), getScheduler(), clazz);
+              getApplicationContext(), downloadManager, getScheduler(), clazz);
       downloadManagerListeners.put(clazz, downloadManagerHelper);
     }
     downloadManager = downloadManagerHelper.downloadManager;
@@ -390,32 +417,33 @@ public abstract class DownloadService extends Service {
       case ACTION_ADD:
         DownloadAction downloadAction = intent.getParcelableExtra(KEY_DOWNLOAD_ACTION);
         if (downloadAction == null) {
-          Log.e(TAG, "Ignored ADD action: Missing download_action extra");
+          Log.e(TAG, "Ignored ADD: Missing download_action extra");
         } else {
-          downloadManager.addDownload(downloadAction);
+          int manualStopReason =
+              intent.getIntExtra(KEY_MANUAL_STOP_REASON, Download.MANUAL_STOP_REASON_NONE);
+          downloadManager.addDownload(downloadAction, manualStopReason);
         }
         break;
       case ACTION_START:
-        String contentId = intent.getStringExtra(KEY_CONTENT_ID);
-        if (contentId == null) {
-          downloadManager.startDownloads();
-        } else {
-          downloadManager.startDownload(contentId);
-        }
+        downloadManager.startDownloads();
         break;
       case ACTION_STOP:
-        contentId = intent.getStringExtra(KEY_CONTENT_ID);
-        int stopReason = intent.getIntExtra(KEY_STOP_REASON, Download.MANUAL_STOP_REASON_UNDEFINED);
-        if (contentId == null) {
-          downloadManager.stopDownloads(stopReason);
+        downloadManager.stopDownloads();
+        break;
+      case ACTION_SET_MANUAL_STOP_REASON:
+        if (!intent.hasExtra(KEY_MANUAL_STOP_REASON)) {
+          Log.e(TAG, "Ignored SET_MANUAL_STOP_REASON: Missing manual_stop_reason extra");
         } else {
-          downloadManager.stopDownload(contentId, stopReason);
+          String contentId = intent.getStringExtra(KEY_CONTENT_ID);
+          int manualStopReason =
+              intent.getIntExtra(KEY_MANUAL_STOP_REASON, Download.MANUAL_STOP_REASON_NONE);
+          downloadManager.setManualStopReason(contentId, manualStopReason);
         }
         break;
       case ACTION_REMOVE:
-        contentId = intent.getStringExtra(KEY_CONTENT_ID);
+        String contentId = intent.getStringExtra(KEY_CONTENT_ID);
         if (contentId == null) {
-          Log.e(TAG, "Ignored REMOVE action: Missing content_id extra");
+          Log.e(TAG, "Ignored REMOVE: Missing content_id extra");
         } else {
           downloadManager.removeDownload(contentId);
         }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index 18a9d1e313..306e505947 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -47,14 +47,16 @@ import org.robolectric.shadows.ShadowLog;
 @Config(shadows = {RobolectricUtil.CustomLooper.class, RobolectricUtil.CustomMessageQueue.class})
 public class DownloadManagerTest {
 
-  /* Used to check if condition becomes true in this time interval. */
+  /** Used to check if condition becomes true in this time interval. */
   private static final int ASSERT_TRUE_TIMEOUT = 10000;
-  /* Used to check if condition stays false for this time interval. */
+  /** Used to check if condition stays false for this time interval. */
   private static final int ASSERT_FALSE_TIME = 1000;
-  /* Maximum retry delay in DownloadManager. */
+  /** Maximum retry delay in DownloadManager. */
   private static final int MAX_RETRY_DELAY = 5000;
-  /* Maximum number of times a downloader can be restarted before doing a released check. */
+  /** Maximum number of times a downloader can be restarted before doing a released check. */
   private static final int MAX_STARTS_BEFORE_RELEASED = 1;
+  /** A manual stop reason. */
+  private static final int APP_STOP_REASON = 1;
   /** The minimum number of times a task must be retried before failing. */
   private static final int MIN_RETRY_COUNT = 3;
 
@@ -388,17 +390,18 @@ public class DownloadManagerTest {
   }
 
   @Test
-  public void stopAndResumeSingleDownload() throws Throwable {
+  public void manuallyStopAndResumeSingleDownload() throws Throwable {
     DownloadRunner runner = new DownloadRunner(uri1).postDownloadAction();
     TaskWrapper task = runner.getTask();
 
     task.assertDownloading();
 
-    runOnMainThread(() -> downloadManager.stopDownload(task.taskId));
+    runOnMainThread(() -> downloadManager.setManualStopReason(task.taskId, APP_STOP_REASON));
 
     task.assertStopped();
 
-    runOnMainThread(() -> downloadManager.startDownload(task.taskId));
+    runOnMainThread(
+        () -> downloadManager.setManualStopReason(task.taskId, Download.MANUAL_STOP_REASON_NONE));
 
     runner.getDownloader(1).assertStarted().unblock();
 
@@ -406,13 +409,13 @@ public class DownloadManagerTest {
   }
 
   @Test
-  public void stoppedDownloadCanBeCancelled() throws Throwable {
+  public void manuallyStoppedDownloadCanBeCancelled() throws Throwable {
     DownloadRunner runner = new DownloadRunner(uri1).postDownloadAction();
     TaskWrapper task = runner.getTask();
 
     task.assertDownloading();
 
-    runOnMainThread(() -> downloadManager.stopDownload(task.taskId));
+    runOnMainThread(() -> downloadManager.setManualStopReason(task.taskId, APP_STOP_REASON));
 
     task.assertStopped();
 
@@ -424,7 +427,7 @@ public class DownloadManagerTest {
   }
 
   @Test
-  public void stoppedSingleDownload_doesNotAffectOthers() throws Throwable {
+  public void manuallyStoppedSingleDownload_doesNotAffectOthers() throws Throwable {
     DownloadRunner runner1 = new DownloadRunner(uri1);
     DownloadRunner runner2 = new DownloadRunner(uri2);
     DownloadRunner runner3 = new DownloadRunner(uri3);
@@ -432,7 +435,8 @@ public class DownloadManagerTest {
     runner1.postDownloadAction().getTask().assertDownloading();
     runner2.postDownloadAction().postRemoveAction().getTask().assertRemoving();
 
-    runOnMainThread(() -> downloadManager.stopDownload(runner1.getTask().taskId));
+    runOnMainThread(
+        () -> downloadManager.setManualStopReason(runner1.getTask().taskId, APP_STOP_REASON));
 
     runner1.getTask().assertStopped();
 
@@ -460,9 +464,9 @@ public class DownloadManagerTest {
                     maxActiveDownloadTasks,
                     MIN_RETRY_COUNT,
                     new Requirements(0));
+            downloadManager.startDownloads();
             downloadManagerListener =
                 new TestDownloadManagerListener(downloadManager, dummyMainThread);
-            downloadManager.startDownloads();
           });
       downloadManagerListener.waitUntilInitialized();
     } catch (Throwable throwable) {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadTest.java
index 9797ca0a47..54b8a8cbb4 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadTest.java
@@ -156,7 +156,7 @@ public class DownloadTest {
     DownloadBuilder downloadBuilder =
         new DownloadBuilder(downloadAction)
             .setState(Download.STATE_STOPPED)
-            .setManualStopReason(Download.MANUAL_STOP_REASON_UNDEFINED);
+            .setManualStopReason(/* manualStopReason= */ 1);
     Download download = downloadBuilder.build();
 
     Download mergedDownload = download.copyWithMergedAction(downloadAction, /* canStart= */ true);
@@ -170,7 +170,7 @@ public class DownloadTest {
     DownloadBuilder downloadBuilder =
         new DownloadBuilder(downloadAction)
             .setState(Download.STATE_COMPLETED)
-            .setManualStopReason(Download.MANUAL_STOP_REASON_UNDEFINED);
+            .setManualStopReason(/* manualStopReason= */ 1);
     Download download = downloadBuilder.build();
 
     Download mergedDownload = download.copyWithMergedAction(downloadAction, /* canStart= */ true);

From 112117a1ac016db57e78f66e56b228d4d01ff537 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 10 Apr 2019 18:15:45 +0100
Subject: [PATCH 742/832] Reorder DownloadManager methods

Put methods into a more sensible order (the same order as
in the switch statement, which is a more natural order with
e.g. initialize coming first and release coming last).

PiperOrigin-RevId: 242891742
---
 .../exoplayer2/offline/DownloadManager.java   | 236 +++++++++---------
 1 file changed, 118 insertions(+), 118 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index c16d0fc8e6..fe1772e829 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -573,6 +573,52 @@ public final class DownloadManager {
     return true;
   }
 
+  private void initializeInternal(int notMetRequirements) {
+    this.notMetRequirements = notMetRequirements;
+    ArrayList<Download> loadedStates = new ArrayList<>();
+    try (DownloadCursor cursor =
+        downloadIndex.getDownloads(
+            STATE_QUEUED, STATE_STOPPED, STATE_DOWNLOADING, STATE_REMOVING, STATE_RESTARTING)) {
+      while (cursor.moveToNext()) {
+        loadedStates.add(cursor.getDownload());
+      }
+      logd("Download states are loaded.");
+    } catch (Throwable e) {
+      Log.e(TAG, "Download state loading failed.", e);
+      loadedStates.clear();
+    }
+    for (Download download : loadedStates) {
+      addDownloadForState(download);
+    }
+    logd("Downloads are created.");
+    mainHandler.obtainMessage(MSG_INITIALIZED, loadedStates).sendToTarget();
+    for (int i = 0; i < downloadInternals.size(); i++) {
+      downloadInternals.get(i).start();
+    }
+  }
+
+  private void setDownloadsStartedInternal(boolean downloadsStarted) {
+    if (this.downloadsStarted == downloadsStarted) {
+      return;
+    }
+    this.downloadsStarted = downloadsStarted;
+    for (int i = 0; i < downloadInternals.size(); i++) {
+      downloadInternals.get(i).updateStopState();
+    }
+  }
+
+  private void setNotMetRequirementsInternal(
+      @Requirements.RequirementFlags int notMetRequirements) {
+    if (this.notMetRequirements == notMetRequirements) {
+      return;
+    }
+    this.notMetRequirements = notMetRequirements;
+    logdFlags("Not met requirements are changed", notMetRequirements);
+    for (int i = 0; i < downloadInternals.size(); i++) {
+      downloadInternals.get(i).updateStopState();
+    }
+  }
+
   private void setManualStopReasonInternal(@Nullable String id, int manualStopReason) {
     if (id != null) {
       DownloadInternal downloadInternal = getDownload(id);
@@ -630,6 +676,37 @@ public final class DownloadManager {
     }
   }
 
+  private void onDownloadThreadStoppedInternal(DownloadThread downloadThread) {
+    DownloadInternal downloadInternal = downloadThread.downloadInternal;
+    logd("Download is stopped", downloadInternal);
+    activeDownloads.remove(downloadInternal);
+    boolean tryToStartDownloads = false;
+    if (!downloadThread.isRemoveThread) {
+      // If maxSimultaneousDownloads was hit, there might be a download waiting for a slot.
+      tryToStartDownloads = simultaneousDownloads == maxSimultaneousDownloads;
+      simultaneousDownloads--;
+    }
+    downloadInternal.onDownloadThreadStopped(downloadThread.isCanceled, downloadThread.finalError);
+    if (tryToStartDownloads) {
+      for (int i = 0;
+          simultaneousDownloads < maxSimultaneousDownloads && i < downloadInternals.size();
+          i++) {
+        downloadInternals.get(i).start();
+      }
+    }
+  }
+
+  private void releaseInternal() {
+    for (DownloadInternal downloadInternal : activeDownloads.keySet()) {
+      stopDownloadThread(downloadInternal);
+    }
+    internalThread.quit();
+    synchronized (releaseLock) {
+      released = true;
+      releaseLock.notifyAll();
+    }
+  }
+
   private void onDownloadChangedInternal(DownloadInternal downloadInternal, Download download) {
     logd("Download state is changed", downloadInternal);
     try {
@@ -654,101 +731,6 @@ public final class DownloadManager {
     mainHandler.obtainMessage(MSG_DOWNLOAD_REMOVED, download).sendToTarget();
   }
 
-  private void setDownloadsStartedInternal(boolean downloadsStarted) {
-    if (this.downloadsStarted == downloadsStarted) {
-      return;
-    }
-    this.downloadsStarted = downloadsStarted;
-    for (int i = 0; i < downloadInternals.size(); i++) {
-      downloadInternals.get(i).updateStopState();
-    }
-  }
-
-  private void setNotMetRequirementsInternal(
-      @Requirements.RequirementFlags int notMetRequirements) {
-    if (this.notMetRequirements == notMetRequirements) {
-      return;
-    }
-    this.notMetRequirements = notMetRequirements;
-    logdFlags("Not met requirements are changed", notMetRequirements);
-    for (int i = 0; i < downloadInternals.size(); i++) {
-      downloadInternals.get(i).updateStopState();
-    }
-  }
-
-  @Nullable
-  private DownloadInternal getDownload(String id) {
-    for (int i = 0; i < downloadInternals.size(); i++) {
-      DownloadInternal downloadInternal = downloadInternals.get(i);
-      if (downloadInternal.download.action.id.equals(id)) {
-        return downloadInternal;
-      }
-    }
-    return null;
-  }
-
-  private Download loadDownload(String id) {
-    try {
-      return downloadIndex.getDownload(id);
-    } catch (DatabaseIOException e) {
-      Log.e(TAG, "loadDownload failed", e);
-    }
-    return null;
-  }
-
-  private void initializeInternal(int notMetRequirements) {
-    this.notMetRequirements = notMetRequirements;
-    ArrayList<Download> loadedStates = new ArrayList<>();
-    try (DownloadCursor cursor =
-        downloadIndex.getDownloads(
-            STATE_QUEUED, STATE_STOPPED, STATE_DOWNLOADING, STATE_REMOVING, STATE_RESTARTING)) {
-      while (cursor.moveToNext()) {
-        loadedStates.add(cursor.getDownload());
-      }
-      logd("Download states are loaded.");
-    } catch (Throwable e) {
-      Log.e(TAG, "Download state loading failed.", e);
-      loadedStates.clear();
-    }
-    for (Download download : loadedStates) {
-      addDownloadForState(download);
-    }
-    logd("Downloads are created.");
-    mainHandler.obtainMessage(MSG_INITIALIZED, loadedStates).sendToTarget();
-    for (int i = 0; i < downloadInternals.size(); i++) {
-      downloadInternals.get(i).start();
-    }
-  }
-
-  private void addDownloadForState(Download download) {
-    DownloadInternal downloadInternal = new DownloadInternal(this, download);
-    downloadInternals.add(downloadInternal);
-    logd("Download is added", downloadInternal);
-    downloadInternal.initialize();
-  }
-
-  private boolean canStartDownloads() {
-    return downloadsStarted && notMetRequirements == 0;
-  }
-
-  private static void logd(String message) {
-    if (DEBUG) {
-      Log.d(TAG, message);
-    }
-  }
-
-  private static void logd(String message, DownloadInternal downloadInternal) {
-    if (DEBUG) {
-      logd(message + ": " + downloadInternal);
-    }
-  }
-
-  private static void logdFlags(String message, int flags) {
-    if (DEBUG) {
-      logd(message + ": " + Integer.toBinaryString(flags));
-    }
-  }
-
   @StartThreadResults
   private int startDownloadThread(DownloadInternal downloadInternal) {
     if (activeDownloads.containsKey(downloadInternal)) {
@@ -780,34 +762,52 @@ public final class DownloadManager {
     return false;
   }
 
-  private void releaseInternal() {
-    for (DownloadInternal downloadInternal : activeDownloads.keySet()) {
-      stopDownloadThread(downloadInternal);
+  @Nullable
+  private DownloadInternal getDownload(String id) {
+    for (int i = 0; i < downloadInternals.size(); i++) {
+      DownloadInternal downloadInternal = downloadInternals.get(i);
+      if (downloadInternal.download.action.id.equals(id)) {
+        return downloadInternal;
+      }
     }
-    internalThread.quit();
-    synchronized (releaseLock) {
-      released = true;
-      releaseLock.notifyAll();
+    return null;
+  }
+
+  private Download loadDownload(String id) {
+    try {
+      return downloadIndex.getDownload(id);
+    } catch (DatabaseIOException e) {
+      Log.e(TAG, "loadDownload failed", e);
+    }
+    return null;
+  }
+
+  private void addDownloadForState(Download download) {
+    DownloadInternal downloadInternal = new DownloadInternal(this, download);
+    downloadInternals.add(downloadInternal);
+    logd("Download is added", downloadInternal);
+    downloadInternal.initialize();
+  }
+
+  private boolean canStartDownloads() {
+    return downloadsStarted && notMetRequirements == 0;
+  }
+
+  private static void logd(String message) {
+    if (DEBUG) {
+      Log.d(TAG, message);
     }
   }
 
-  private void onDownloadThreadStoppedInternal(DownloadThread downloadThread) {
-    DownloadInternal downloadInternal = downloadThread.downloadInternal;
-    logd("Download is stopped", downloadInternal);
-    activeDownloads.remove(downloadInternal);
-    boolean tryToStartDownloads = false;
-    if (!downloadThread.isRemoveThread) {
-      // If maxSimultaneousDownloads was hit, there might be a download waiting for a slot.
-      tryToStartDownloads = simultaneousDownloads == maxSimultaneousDownloads;
-      simultaneousDownloads--;
+  private static void logd(String message, DownloadInternal downloadInternal) {
+    if (DEBUG) {
+      logd(message + ": " + downloadInternal);
     }
-    downloadInternal.onDownloadThreadStopped(downloadThread.isCanceled, downloadThread.finalError);
-    if (tryToStartDownloads) {
-      for (int i = 0;
-          simultaneousDownloads < maxSimultaneousDownloads && i < downloadInternals.size();
-          i++) {
-        downloadInternals.get(i).start();
-      }
+  }
+
+  private static void logdFlags(String message, int flags) {
+    if (DEBUG) {
+      logd(message + ": " + Integer.toBinaryString(flags));
     }
   }
 

From b84c51434f7750924b6d7a6a5ef9bcd13c818812 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 11 Apr 2019 17:36:03 +0100
Subject: [PATCH 743/832] Deprecate ActionFile and simplify upgrading

PiperOrigin-RevId: 243085292
---
 .../exoplayer2/demo/DemoApplication.java      | 22 ++++---
 .../exoplayer2/demo/DownloadTracker.java      |  5 --
 .../exoplayer2/offline/ActionFile.java        | 10 +++-
 ...exUtil.java => ActionFileUpgradeUtil.java} | 59 ++++++++++++-------
 ...st.java => ActionFileUpgradeUtilTest.java} | 14 ++---
 5 files changed, 63 insertions(+), 47 deletions(-)
 rename library/core/src/main/java/com/google/android/exoplayer2/offline/{DownloadIndexUtil.java => ActionFileUpgradeUtil.java} (50%)
 rename library/core/src/test/java/com/google/android/exoplayer2/offline/{DownloadIndexUtilTest.java => ActionFileUpgradeUtilTest.java} (93%)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
index 705ae2eeef..f24915f601 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
@@ -19,10 +19,9 @@ import android.app.Application;
 import com.google.android.exoplayer2.DefaultRenderersFactory;
 import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.database.ExoDatabaseProvider;
-import com.google.android.exoplayer2.offline.ActionFile;
+import com.google.android.exoplayer2.offline.ActionFileUpgradeUtil;
 import com.google.android.exoplayer2.offline.DefaultDownloadIndex;
 import com.google.android.exoplayer2.offline.DefaultDownloaderFactory;
-import com.google.android.exoplayer2.offline.DownloadIndexUtil;
 import com.google.android.exoplayer2.offline.DownloadManager;
 import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
 import com.google.android.exoplayer2.upstream.DataSource;
@@ -132,16 +131,15 @@ public class DemoApplication extends Application {
     }
   }
 
-  private void upgradeActionFile(String file, DefaultDownloadIndex downloadIndex) {
-    ActionFile actionFile = new ActionFile(new File(getDownloadDirectory(), file));
-    if (actionFile.exists()) {
-      try {
-        DownloadIndexUtil.mergeActionFile(
-            actionFile, /* downloadIdProvider= */ null, downloadIndex);
-      } catch (IOException e) {
-        Log.e(TAG, "Upgrading action file failed", e);
-      }
-      actionFile.delete();
+  private void upgradeActionFile(String fileName, DefaultDownloadIndex downloadIndex) {
+    try {
+      ActionFileUpgradeUtil.upgradeAndDelete(
+          new File(getDownloadDirectory(), fileName),
+          /* downloadIdProvider= */ null,
+          downloadIndex,
+          /* deleteOnFailure= */ true);
+    } catch (IOException e) {
+      Log.e(TAG, "Failed to upgrade action file: " + fileName, e);
     }
   }
 
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index 1783729c23..1f421005ca 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -23,7 +23,6 @@ import androidx.fragment.app.FragmentManager;
 import android.widget.Toast;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.RenderersFactory;
-import com.google.android.exoplayer2.offline.ActionFile;
 import com.google.android.exoplayer2.offline.DefaultDownloadIndex;
 import com.google.android.exoplayer2.offline.Download;
 import com.google.android.exoplayer2.offline.DownloadAction;
@@ -44,10 +43,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
 
 /**
  * Tracks media that has been downloaded.
- *
- * <p>Tracked downloads are persisted using an {@link ActionFile}, however in a real application
- * it's expected that state will be stored directly in the application's media database, so that it
- * can be queried efficiently together with other information about the media.
  */
 public class DownloadTracker implements DownloadManager.Listener {
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
index d715583921..0efbece154 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
@@ -27,8 +27,14 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-/** Loads {@link DownloadAction DownloadActions} from legacy action files. */
-public final class ActionFile {
+/**
+ * Loads {@link DownloadAction DownloadActions} from legacy action files.
+ *
+ * @deprecated Legacy action files should be merged into download indices using {@link
+ *     ActionFileUpgradeUtil}.
+ */
+@Deprecated
+/* package */ final class ActionFile {
 
   private static final int VERSION = 0;
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java
similarity index 50%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
rename to library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java
index 2932902e68..2c638e2aa0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndexUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java
@@ -16,52 +16,69 @@
 package com.google.android.exoplayer2.offline;
 
 import androidx.annotation.Nullable;
+import java.io.File;
 import java.io.IOException;
 
-/** {@link DownloadIndex} related utility methods. */
-public final class DownloadIndexUtil {
+/** Utility class for upgrading legacy action files into {@link DefaultDownloadIndex}. */
+public final class ActionFileUpgradeUtil {
 
-  /** An interface to provide custom download ids during ActionFile upgrade. */
+  /** Provides download IDs during action file upgrade. */
   public interface DownloadIdProvider {
 
     /**
-     * Returns a custom download id for given action.
+     * Returns a download id for given action.
      *
-     * @param downloadAction The action which is an id requested for.
-     * @return A custom download id for given action.
+     * @param downloadAction The action for which an ID is required.
+     * @return A corresponding download ID.
      */
     String getId(DownloadAction downloadAction);
   }
 
-  private DownloadIndexUtil() {}
+  private ActionFileUpgradeUtil() {}
 
   /**
-   * Merges {@link DownloadAction DownloadActions} contained in an {@link ActionFile} into a {@link
-   * DownloadIndex}.
+   * Merges {@link DownloadAction DownloadActions} contained in a legacy action file into a {@link
+   * DefaultDownloadIndex}, deleting the action file if the merge is successful or if {@code
+   * deleteOnFailure} is {@code true}.
    *
-   * <p>This method must not be called while the {@link DownloadIndex} is being used by a {@link
-   * DownloadManager}.
+   * <p>This method must not be called while the {@link DefaultDownloadIndex} is being used by a
+   * {@link DownloadManager}.
    *
-   * @param actionFile The action file.
-   * @param downloadIdProvider A custom download id provider, or {@code null}.
+   * @param actionFilePath The action file path.
+   * @param downloadIdProvider A download ID provider, or {@code null}. If {@code null} then ID of
+   *     each download will be its custom cache key if one is specified, or else its URL.
    * @param downloadIndex The index into which the action will be merged.
+   * @param deleteOnFailure Whether to delete the action file if the merge fails.
    * @throws IOException If an error occurs loading or merging the actions.
    */
-  public static void mergeActionFile(
-      ActionFile actionFile,
+  @SuppressWarnings("deprecation")
+  public static void upgradeAndDelete(
+      File actionFilePath,
       @Nullable DownloadIdProvider downloadIdProvider,
-      DefaultDownloadIndex downloadIndex)
+      DefaultDownloadIndex downloadIndex,
+      boolean deleteOnFailure)
       throws IOException {
-    for (DownloadAction action : actionFile.load()) {
-      if (downloadIdProvider != null) {
-        action = action.copyWithId(downloadIdProvider.getId(action));
+    ActionFile actionFile = new ActionFile(actionFilePath);
+    if (actionFile.exists()) {
+      boolean success = false;
+      try {
+        for (DownloadAction action : actionFile.load()) {
+          if (downloadIdProvider != null) {
+            action = action.copyWithId(downloadIdProvider.getId(action));
+          }
+          mergeAction(action, downloadIndex);
+        }
+        success = true;
+      } finally {
+        if (success || deleteOnFailure) {
+          actionFile.delete();
+        }
       }
-      mergeAction(action, downloadIndex);
     }
   }
 
   /**
-   * Merges a {@link DownloadAction} into a {@link DownloadIndexUtil}.
+   * Merges a {@link DownloadAction} into a {@link DefaultDownloadIndex}.
    *
    * @param action The action to be merged.
    * @param downloadIndex The index into which the action will be merged.
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java
similarity index 93%
rename from library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java
index e272a7574b..6ae5a2e11c 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadIndexUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java
@@ -34,9 +34,9 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-/** Unit tests for {@link DownloadIndexUtil}. */
+/** Unit tests for {@link ActionFileUpgradeUtil}. */
 @RunWith(AndroidJUnit4.class)
-public class DownloadIndexUtilTest {
+public class ActionFileUpgradeUtilTest {
 
   private File tempFile;
   private ExoDatabaseProvider databaseProvider;
@@ -69,7 +69,7 @@ public class DownloadIndexUtilTest {
             /* customCacheKey= */ "key123",
             data);
 
-    DownloadIndexUtil.mergeAction(action, downloadIndex);
+    ActionFileUpgradeUtil.mergeAction(action, downloadIndex);
 
     assertDownloadIndexContainsAction(action, Download.STATE_QUEUED);
   }
@@ -96,9 +96,9 @@ public class DownloadIndexUtilTest {
             asList(streamKey2),
             /* customCacheKey= */ "key123",
             new byte[] {5, 4, 3, 2, 1});
-    DownloadIndexUtil.mergeAction(action1, downloadIndex);
+    ActionFileUpgradeUtil.mergeAction(action1, downloadIndex);
 
-    DownloadIndexUtil.mergeAction(action2, downloadIndex);
+    ActionFileUpgradeUtil.mergeAction(action2, downloadIndex);
 
     Download download = downloadIndex.getDownload(action2.id);
     assertThat(download).isNotNull();
@@ -142,8 +142,8 @@ public class DownloadIndexUtilTest {
             /* customCacheKey= */ "key234",
             new byte[] {5, 4, 3, 2, 1});
 
-    ActionFile actionFile = new ActionFile(tempFile);
-    DownloadIndexUtil.mergeActionFile(actionFile, /* downloadIdProvider= */ null, downloadIndex);
+    ActionFileUpgradeUtil.upgradeAndDelete(
+        tempFile, /* downloadIdProvider= */ null, downloadIndex, /* deleteOnFailure= */ true);
     assertDownloadIndexContainsAction(expectedAction1, Download.STATE_QUEUED);
     assertDownloadIndexContainsAction(expectedAction2, Download.STATE_QUEUED);
   }

From 53934c13b2800cdcc49c7f3df5005b0a9b3d7943 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 12 Apr 2019 02:12:55 +0100
Subject: [PATCH 744/832] Select non-primary tunneling decoder

Issue: #3100
Issue: #5547
PiperOrigin-RevId: 243181217
---
 RELEASENOTES.md                               |  11 +-
 .../audio/MediaCodecAudioRenderer.java        |  11 +-
 .../mediacodec/MediaCodecRenderer.java        |   6 +-
 .../mediacodec/MediaCodecSelector.java        |  10 +-
 .../exoplayer2/mediacodec/MediaCodecUtil.java | 187 ++++++++++++------
 .../video/MediaCodecVideoRenderer.java        |  33 +++-
 .../playbacktests/gts/DashStreamingTest.java  |  19 +-
 .../playbacktests/gts/DashTestRunner.java     |   3 +-
 .../gts/EnumerateDecodersTest.java            |  12 +-
 9 files changed, 202 insertions(+), 90 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 8ef7be083d..742b245699 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -61,6 +61,14 @@
     present or newly absent.
   * Add support for reading AC-4 streams
     ([#5303](https://github.com/google/ExoPlayer/pull/5303)).
+* Video:
+  * Remove `MediaCodecSelector.DEFAULT_WITH_FALLBACK`. Apps should instead
+    signal that fallback should be used by passing `true` as the
+    `enableDecoderFallback` parameter when instantiating the video renderer.
+  * Support video tunneling when the decoder is not listed first for the MIME
+    type ([#3100](https://github.com/google/ExoPlayer/issues/3100)).
+  * Query `MediaCodecList.ALL_CODECS` when selecting a tunneling decoder
+    ([#5547](https://github.com/google/ExoPlayer/issues/5547)).
 * Add support for SHOUTcast ICY metadata
   ([#3735](https://github.com/google/ExoPlayer/issues/3735)).
 * CEA-608: Improved conformance to the specification
@@ -102,9 +110,6 @@
   ([#5698](https://github.com/google/ExoPlayer/issues/5698),
   [#5694](https://github.com/google/ExoPlayer/issues/5694)).
 * Move `PriorityTaskManager` from `DefaultLoadControl` to `SimpleExoPlayer`.
-* Remove `MediaCodecSelector.DEFAULT_WITH_FALLBACK`. Apps should instead signal
-  that fallback should be used by passing `true` as the `enableDecoderFallback`
-  parameter when instantiating the video renderer.
 
 ### 2.9.6 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
index 0982bc8862..07769e7d85 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
@@ -289,11 +289,15 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
       }
     }
     List<MediaCodecInfo> decoderInfos =
-        mediaCodecSelector.getDecoderInfos(format.sampleMimeType, requiresSecureDecryption);
+        mediaCodecSelector.getDecoderInfos(
+            format.sampleMimeType, requiresSecureDecryption, /* requiresTunnelingDecoder= */ false);
     if (decoderInfos.isEmpty()) {
       return requiresSecureDecryption
               && !mediaCodecSelector
-                  .getDecoderInfos(format.sampleMimeType, /* requiresSecureDecoder= */ false)
+                  .getDecoderInfos(
+                      format.sampleMimeType,
+                      /* requiresSecureDecoder= */ false,
+                      /* requiresTunnelingDecoder= */ false)
                   .isEmpty()
           ? FORMAT_UNSUPPORTED_DRM
           : FORMAT_UNSUPPORTED_SUBTYPE;
@@ -322,7 +326,8 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
         return Collections.singletonList(passthroughDecoderInfo);
       }
     }
-    return super.getDecoderInfos(mediaCodecSelector, format, requiresSecureDecoder);
+    return mediaCodecSelector.getDecoderInfos(
+        format.sampleMimeType, requiresSecureDecoder, /* requiresTunnelingDecoder= */ false);
   }
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index bbf1134b7f..f7855810d4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -441,11 +441,9 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
    * @return A list of {@link MediaCodecInfo}s corresponding to decoders. May be empty.
    * @throws DecoderQueryException Thrown if there was an error querying decoders.
    */
-  protected List<MediaCodecInfo> getDecoderInfos(
+  protected abstract List<MediaCodecInfo> getDecoderInfos(
       MediaCodecSelector mediaCodecSelector, Format format, boolean requiresSecureDecoder)
-      throws DecoderQueryException {
-    return mediaCodecSelector.getDecoderInfos(format.sampleMimeType, requiresSecureDecoder);
-  }
+      throws DecoderQueryException;
 
   /**
    * Configures a newly created {@link MediaCodec}.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecSelector.java
index a5cbb77342..41cb4ee04a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecSelector.java
@@ -32,9 +32,11 @@ public interface MediaCodecSelector {
   MediaCodecSelector DEFAULT =
       new MediaCodecSelector() {
         @Override
-        public List<MediaCodecInfo> getDecoderInfos(String mimeType, boolean requiresSecureDecoder)
+        public List<MediaCodecInfo> getDecoderInfos(
+            String mimeType, boolean requiresSecureDecoder, boolean requiresTunnelingDecoder)
             throws DecoderQueryException {
-          return MediaCodecUtil.getDecoderInfos(mimeType, requiresSecureDecoder);
+          return MediaCodecUtil.getDecoderInfos(
+              mimeType, requiresSecureDecoder, requiresTunnelingDecoder);
         }
 
         @Override
@@ -48,10 +50,12 @@ public interface MediaCodecSelector {
    *
    * @param mimeType The MIME type for which a decoder is required.
    * @param requiresSecureDecoder Whether a secure decoder is required.
+   * @param requiresTunnelingDecoder Whether a tunneling decoder is required.
    * @return A list of {@link MediaCodecInfo}s corresponding to decoders. May be empty.
    * @throws DecoderQueryException Thrown if there was an error querying decoders.
    */
-  List<MediaCodecInfo> getDecoderInfos(String mimeType, boolean requiresSecureDecoder)
+  List<MediaCodecInfo> getDecoderInfos(
+      String mimeType, boolean requiresSecureDecoder, boolean requiresTunnelingDecoder)
       throws DecoderQueryException;
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
index 5a3179f110..3211f7ea8e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
@@ -87,17 +87,19 @@ public final class MediaCodecUtil {
 
   /**
    * Optional call to warm the codec cache for a given mime type.
-   * <p>
-   * Calling this method may speed up subsequent calls to {@link #getDecoderInfo(String, boolean)}
-   * and {@link #getDecoderInfos(String, boolean)}.
+   *
+   * <p>Calling this method may speed up subsequent calls to {@link #getDecoderInfo(String, boolean,
+   * boolean)} and {@link #getDecoderInfos(String, boolean, boolean)}.
    *
    * @param mimeType The mime type.
    * @param secure Whether the decoder is required to support secure decryption. Always pass false
    *     unless secure decryption really is required.
+   * @param tunneling Whether the decoder is required to support tunneling. Always pass false unless
+   *     tunneling really is required.
    */
-  public static void warmDecoderInfoCache(String mimeType, boolean secure) {
+  public static void warmDecoderInfoCache(String mimeType, boolean secure, boolean tunneling) {
     try {
-      getDecoderInfos(mimeType, secure);
+      getDecoderInfos(mimeType, secure, tunneling);
     } catch (DecoderQueryException e) {
       // Codec warming is best effort, so we can swallow the exception.
       Log.e(TAG, "Codec warming failed", e);
@@ -112,7 +114,8 @@ public final class MediaCodecUtil {
    */
   @Nullable
   public static MediaCodecInfo getPassthroughDecoderInfo() throws DecoderQueryException {
-    MediaCodecInfo decoderInfo = getDecoderInfo(MimeTypes.AUDIO_RAW, /* secure= */ false);
+    MediaCodecInfo decoderInfo =
+        getDecoderInfo(MimeTypes.AUDIO_RAW, /* secure= */ false, /* tunneling= */ false);
     return decoderInfo == null ? null : MediaCodecInfo.newPassthroughInstance(decoderInfo.name);
   }
 
@@ -122,13 +125,15 @@ public final class MediaCodecUtil {
    * @param mimeType The MIME type.
    * @param secure Whether the decoder is required to support secure decryption. Always pass false
    *     unless secure decryption really is required.
+   * @param tunneling Whether the decoder is required to support tunneling. Always pass false unless
+   *     tunneling really is required.
    * @return A {@link MediaCodecInfo} describing the decoder, or null if no suitable decoder exists.
    * @throws DecoderQueryException If there was an error querying the available decoders.
    */
   @Nullable
-  public static MediaCodecInfo getDecoderInfo(String mimeType, boolean secure)
+  public static MediaCodecInfo getDecoderInfo(String mimeType, boolean secure, boolean tunneling)
       throws DecoderQueryException {
-    List<MediaCodecInfo> decoderInfos = getDecoderInfos(mimeType, secure);
+    List<MediaCodecInfo> decoderInfos = getDecoderInfos(mimeType, secure, tunneling);
     return decoderInfos.isEmpty() ? null : decoderInfos.get(0);
   }
 
@@ -139,19 +144,23 @@ public final class MediaCodecUtil {
    * @param mimeType The MIME type.
    * @param secure Whether the decoder is required to support secure decryption. Always pass false
    *     unless secure decryption really is required.
+   * @param tunneling Whether the decoder is required to support tunneling. Always pass false unless
+   *     tunneling really is required.
    * @return A list of all {@link MediaCodecInfo}s for the given mime type, in the order given by
    *     {@link MediaCodecList}.
    * @throws DecoderQueryException If there was an error querying the available decoders.
    */
-  public static synchronized List<MediaCodecInfo> getDecoderInfos(String mimeType, boolean secure)
-      throws DecoderQueryException {
-    CodecKey key = new CodecKey(mimeType, secure);
+  public static synchronized List<MediaCodecInfo> getDecoderInfos(
+      String mimeType, boolean secure, boolean tunneling) throws DecoderQueryException {
+    CodecKey key = new CodecKey(mimeType, secure, tunneling);
     List<MediaCodecInfo> cachedDecoderInfos = decoderInfosCache.get(key);
     if (cachedDecoderInfos != null) {
       return cachedDecoderInfos;
     }
-    MediaCodecListCompat mediaCodecList = Util.SDK_INT >= 21
-        ? new MediaCodecListCompatV21(secure) : new MediaCodecListCompatV16();
+    MediaCodecListCompat mediaCodecList =
+        Util.SDK_INT >= 21
+            ? new MediaCodecListCompatV21(secure, tunneling)
+            : new MediaCodecListCompatV16();
     ArrayList<MediaCodecInfo> decoderInfos = getDecoderInfosInternal(key, mediaCodecList, mimeType);
     if (secure && decoderInfos.isEmpty() && 21 <= Util.SDK_INT && Util.SDK_INT <= 23) {
       // Some devices don't list secure decoders on API level 21 [Internal: b/18678462]. Try the
@@ -165,7 +174,7 @@ public final class MediaCodecUtil {
     }
     if (MimeTypes.AUDIO_E_AC3_JOC.equals(mimeType)) {
       // E-AC3 decoders can decode JOC streams, but in 2-D rather than 3-D.
-      CodecKey eac3Key = new CodecKey(MimeTypes.AUDIO_E_AC3, key.secure);
+      CodecKey eac3Key = new CodecKey(MimeTypes.AUDIO_E_AC3, key.secure, key.tunneling);
       ArrayList<MediaCodecInfo> eac3DecoderInfos =
           getDecoderInfosInternal(eac3Key, mediaCodecList, mimeType);
       decoderInfos.addAll(eac3DecoderInfos);
@@ -184,7 +193,8 @@ public final class MediaCodecUtil {
   public static int maxH264DecodableFrameSize() throws DecoderQueryException {
     if (maxH264DecodableFrameSize == -1) {
       int result = 0;
-      MediaCodecInfo decoderInfo = getDecoderInfo(MimeTypes.VIDEO_H264, false);
+      MediaCodecInfo decoderInfo =
+          getDecoderInfo(MimeTypes.VIDEO_H264, /* secure= */ false, /* tunneling= */ false);
       if (decoderInfo != null) {
         for (CodecProfileLevel profileLevel : decoderInfo.getProfileLevels()) {
           result = Math.max(avcLevelToMaxFrameSize(profileLevel.level), result);
@@ -202,12 +212,12 @@ public final class MediaCodecUtil {
    * Returns profile and level (as defined by {@link CodecProfileLevel}) corresponding to the given
    * codec description string (as defined by RFC 6381).
    *
-   * @param codec A codec description string, as defined by RFC 6381.
+   * @param codec A codec description string, as defined by RFC 6381, or {@code null} if not known.
    * @return A pair (profile constant, level constant) if {@code codec} is well-formed and
    *     recognized, or null otherwise
    */
   @Nullable
-  public static Pair<Integer, Integer> getCodecProfileAndLevel(String codec) {
+  public static Pair<Integer, Integer> getCodecProfileAndLevel(@Nullable String codec) {
     if (codec == null) {
       return null;
     }
@@ -254,36 +264,58 @@ public final class MediaCodecUtil {
       // Note: MediaCodecList is sorted by the framework such that the best decoders come first.
       for (int i = 0; i < numberOfCodecs; i++) {
         android.media.MediaCodecInfo codecInfo = mediaCodecList.getCodecInfoAt(i);
-        String codecName = codecInfo.getName();
-        String codecSupportedType =
-            getCodecSupportedType(codecInfo, codecName, secureDecodersExplicit, requestedMimeType);
-        if (codecSupportedType != null) {
-          try {
-            CodecCapabilities capabilities = codecInfo.getCapabilitiesForType(codecSupportedType);
-            boolean secure = mediaCodecList.isSecurePlaybackSupported(mimeType, capabilities);
-            boolean forceDisableAdaptive = codecNeedsDisableAdaptationWorkaround(codecName);
-            if ((secureDecodersExplicit && key.secure == secure)
-                || (!secureDecodersExplicit && !key.secure)) {
-              decoderInfos.add(
-                  MediaCodecInfo.newInstance(
-                      codecName, mimeType, capabilities, forceDisableAdaptive, false));
-            } else if (!secureDecodersExplicit && secure) {
-              decoderInfos.add(
-                  MediaCodecInfo.newInstance(
-                      codecName + ".secure", mimeType, capabilities, forceDisableAdaptive, true));
-              // It only makes sense to have one synthesized secure decoder, return immediately.
-              return decoderInfos;
-            }
-          } catch (Exception e) {
-            if (Util.SDK_INT <= 23 && !decoderInfos.isEmpty()) {
-              // Suppress error querying secondary codec capabilities up to API level 23.
-              Log.e(TAG, "Skipping codec " + codecName + " (failed to query capabilities)");
-            } else {
-              // Rethrow error querying primary codec capabilities, or secondary codec
-              // capabilities if API level is greater than 23.
-              Log.e(TAG, "Failed to query codec " + codecName + " (" + codecSupportedType + ")");
-              throw e;
-            }
+        String name = codecInfo.getName();
+        String supportedType =
+            getCodecSupportedType(codecInfo, name, secureDecodersExplicit, requestedMimeType);
+        if (supportedType == null) {
+          continue;
+        }
+        try {
+          CodecCapabilities capabilities = codecInfo.getCapabilitiesForType(supportedType);
+          boolean tunnelingSupported =
+              mediaCodecList.isFeatureSupported(
+                  CodecCapabilities.FEATURE_TunneledPlayback, supportedType, capabilities);
+          boolean tunnelingRequired =
+              mediaCodecList.isFeatureRequired(
+                  CodecCapabilities.FEATURE_TunneledPlayback, supportedType, capabilities);
+          if ((!key.tunneling && tunnelingRequired) || (key.tunneling && !tunnelingSupported)) {
+            continue;
+          }
+          boolean secureSupported =
+              mediaCodecList.isFeatureSupported(
+                  CodecCapabilities.FEATURE_SecurePlayback, supportedType, capabilities);
+          boolean secureRequired =
+              mediaCodecList.isFeatureRequired(
+                  CodecCapabilities.FEATURE_SecurePlayback, supportedType, capabilities);
+          if ((!key.secure && secureRequired) || (key.secure && !secureSupported)) {
+            continue;
+          }
+          boolean forceDisableAdaptive = codecNeedsDisableAdaptationWorkaround(name);
+          if ((secureDecodersExplicit && key.secure == secureSupported)
+              || (!secureDecodersExplicit && !key.secure)) {
+            decoderInfos.add(
+                MediaCodecInfo.newInstance(
+                    name, mimeType, capabilities, forceDisableAdaptive, /* forceSecure= */ false));
+          } else if (!secureDecodersExplicit && secureSupported) {
+            decoderInfos.add(
+                MediaCodecInfo.newInstance(
+                    name + ".secure",
+                    mimeType,
+                    capabilities,
+                    forceDisableAdaptive,
+                    /* forceSecure= */ true));
+            // It only makes sense to have one synthesized secure decoder, return immediately.
+            return decoderInfos;
+          }
+        } catch (Exception e) {
+          if (Util.SDK_INT <= 23 && !decoderInfos.isEmpty()) {
+            // Suppress error querying secondary codec capabilities up to API level 23.
+            Log.e(TAG, "Skipping codec " + name + " (failed to query capabilities)");
+          } else {
+            // Rethrow error querying primary codec capabilities, or secondary codec
+            // capabilities if API level is greater than 23.
+            Log.e(TAG, "Failed to query codec " + name + " (" + supportedType + ")");
+            throw e;
           }
         }
       }
@@ -364,7 +396,8 @@ public final class MediaCodecUtil {
 
     // Work around https://github.com/google/ExoPlayer/issues/1528 and
     // https://github.com/google/ExoPlayer/issues/3171.
-    if (Util.SDK_INT < 18 && "OMX.MTK.AUDIO.DECODER.AAC".equals(name)
+    if (Util.SDK_INT < 18
+        && "OMX.MTK.AUDIO.DECODER.AAC".equals(name)
         && ("a70".equals(Util.DEVICE)
             || ("Xiaomi".equals(Util.MANUFACTURER) && Util.DEVICE.startsWith("HM")))) {
       return false;
@@ -417,9 +450,12 @@ public final class MediaCodecUtil {
     // Work around https://github.com/google/ExoPlayer/issues/548.
     // VP8 decoder on Samsung Galaxy S3/S4/S4 Mini/Tab 3/Note 2 does not render video.
     if (Util.SDK_INT <= 19
-        && "OMX.SEC.vp8.dec".equals(name) && "samsung".equals(Util.MANUFACTURER)
-        && (Util.DEVICE.startsWith("d2") || Util.DEVICE.startsWith("serrano")
-            || Util.DEVICE.startsWith("jflte") || Util.DEVICE.startsWith("santos")
+        && "OMX.SEC.vp8.dec".equals(name)
+        && "samsung".equals(Util.MANUFACTURER)
+        && (Util.DEVICE.startsWith("d2")
+            || Util.DEVICE.startsWith("serrano")
+            || Util.DEVICE.startsWith("jflte")
+            || Util.DEVICE.startsWith("santos")
             || Util.DEVICE.startsWith("t0"))) {
       return false;
     }
@@ -659,12 +695,11 @@ public final class MediaCodecUtil {
      */
     boolean secureDecodersExplicit();
 
-    /**
-     * Whether secure playback is supported for the given {@link CodecCapabilities}, which should
-     * have been obtained from a {@link android.media.MediaCodecInfo} obtained from this list.
-     */
-    boolean isSecurePlaybackSupported(String mimeType, CodecCapabilities capabilities);
+    /** Whether the specified {@link CodecCapabilities} {@code feature} is supported. */
+    boolean isFeatureSupported(String feature, String mimeType, CodecCapabilities capabilities);
 
+    /** Whether the specified {@link CodecCapabilities} {@code feature} is required. */
+    boolean isFeatureRequired(String feature, String mimeType, CodecCapabilities capabilities);
   }
 
   @TargetApi(21)
@@ -674,8 +709,11 @@ public final class MediaCodecUtil {
 
     private android.media.MediaCodecInfo[] mediaCodecInfos;
 
-    public MediaCodecListCompatV21(boolean includeSecure) {
-      codecKind = includeSecure ? MediaCodecList.ALL_CODECS : MediaCodecList.REGULAR_CODECS;
+    public MediaCodecListCompatV21(boolean includeSecure, boolean includeTunneling) {
+      codecKind =
+          includeSecure || includeTunneling
+              ? MediaCodecList.ALL_CODECS
+              : MediaCodecList.REGULAR_CODECS;
     }
 
     @Override
@@ -696,8 +734,15 @@ public final class MediaCodecUtil {
     }
 
     @Override
-    public boolean isSecurePlaybackSupported(String mimeType, CodecCapabilities capabilities) {
-      return capabilities.isFeatureSupported(CodecCapabilities.FEATURE_SecurePlayback);
+    public boolean isFeatureSupported(
+        String feature, String mimeType, CodecCapabilities capabilities) {
+      return capabilities.isFeatureSupported(feature);
+    }
+
+    @Override
+    public boolean isFeatureRequired(
+        String feature, String mimeType, CodecCapabilities capabilities) {
+      return capabilities.isFeatureRequired(feature);
     }
 
     private void ensureMediaCodecInfosInitialized() {
@@ -727,10 +772,18 @@ public final class MediaCodecUtil {
     }
 
     @Override
-    public boolean isSecurePlaybackSupported(String mimeType, CodecCapabilities capabilities) {
+    public boolean isFeatureSupported(
+        String feature, String mimeType, CodecCapabilities capabilities) {
       // Secure decoders weren't explicitly listed prior to API level 21. We assume that a secure
       // H264 decoder exists.
-      return MimeTypes.VIDEO_H264.equals(mimeType);
+      return CodecCapabilities.FEATURE_SecurePlayback.equals(feature)
+          && MimeTypes.VIDEO_H264.equals(mimeType);
+    }
+
+    @Override
+    public boolean isFeatureRequired(
+        String feature, String mimeType, CodecCapabilities capabilities) {
+      return false;
     }
 
   }
@@ -739,10 +792,12 @@ public final class MediaCodecUtil {
 
     public final String mimeType;
     public final boolean secure;
+    public final boolean tunneling;
 
-    public CodecKey(String mimeType, boolean secure) {
+    public CodecKey(String mimeType, boolean secure, boolean tunneling) {
       this.mimeType = mimeType;
       this.secure = secure;
+      this.tunneling = tunneling;
     }
 
     @Override
@@ -751,6 +806,7 @@ public final class MediaCodecUtil {
       int result = 1;
       result = prime * result + ((mimeType == null) ? 0 : mimeType.hashCode());
       result = prime * result + (secure ? 1231 : 1237);
+      result = prime * result + (tunneling ? 1231 : 1237);
       return result;
     }
 
@@ -763,7 +819,9 @@ public final class MediaCodecUtil {
         return false;
       }
       CodecKey other = (CodecKey) obj;
-      return TextUtils.equals(mimeType, other.mimeType) && secure == other.secure;
+      return TextUtils.equals(mimeType, other.mimeType)
+          && secure == other.secure
+          && tunneling == other.tunneling;
     }
 
   }
@@ -901,5 +959,4 @@ public final class MediaCodecUtil {
     MP4A_AUDIO_OBJECT_TYPE_TO_PROFILE.put(39, CodecProfileLevel.AACObjectELD);
     MP4A_AUDIO_OBJECT_TYPE_TO_PROFILE.put(42, CodecProfileLevel.AACObjectXHE);
   }
-
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index f26bc29aec..193fbddfec 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -52,6 +52,7 @@ import com.google.android.exoplayer2.util.TraceUtil;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.video.VideoRendererEventListener.EventDispatcher;
 import java.nio.ByteBuffer;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -304,11 +305,14 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
       }
     }
     List<MediaCodecInfo> decoderInfos =
-        mediaCodecSelector.getDecoderInfos(format.sampleMimeType, requiresSecureDecryption);
+        getDecoderInfos(mediaCodecSelector, format, requiresSecureDecryption);
     if (decoderInfos.isEmpty()) {
       return requiresSecureDecryption
               && !mediaCodecSelector
-                  .getDecoderInfos(format.sampleMimeType, /* requiresSecureDecoder= */ false)
+                  .getDecoderInfos(
+                      format.sampleMimeType,
+                      /* requiresSecureDecoder= */ false,
+                      /* requiresTunnelingDecoder= */ false)
                   .isEmpty()
           ? FORMAT_UNSUPPORTED_DRM
           : FORMAT_UNSUPPORTED_SUBTYPE;
@@ -323,11 +327,34 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
         decoderInfo.isSeamlessAdaptationSupported(format)
             ? ADAPTIVE_SEAMLESS
             : ADAPTIVE_NOT_SEAMLESS;
-    int tunnelingSupport = decoderInfo.tunneling ? TUNNELING_SUPPORTED : TUNNELING_NOT_SUPPORTED;
+    int tunnelingSupport = TUNNELING_NOT_SUPPORTED;
+    if (isFormatSupported) {
+      List<MediaCodecInfo> tunnelingDecoderInfos =
+          mediaCodecSelector.getDecoderInfos(
+              format.sampleMimeType,
+              requiresSecureDecryption,
+              /* requiresTunnelingDecoder= */ true);
+      if (!tunnelingDecoderInfos.isEmpty()) {
+        MediaCodecInfo tunnelingDecoderInfo = tunnelingDecoderInfos.get(0);
+        if (tunnelingDecoderInfo.isFormatSupported(format)
+            && tunnelingDecoderInfo.isSeamlessAdaptationSupported(format)) {
+          tunnelingSupport = TUNNELING_SUPPORTED;
+        }
+      }
+    }
     int formatSupport = isFormatSupported ? FORMAT_HANDLED : FORMAT_EXCEEDS_CAPABILITIES;
     return adaptiveSupport | tunnelingSupport | formatSupport;
   }
 
+  @Override
+  protected List<MediaCodecInfo> getDecoderInfos(
+      MediaCodecSelector mediaCodecSelector, Format format, boolean requiresSecureDecoder)
+      throws DecoderQueryException {
+    List<MediaCodecInfo> decoderInfos =
+        mediaCodecSelector.getDecoderInfos(format.sampleMimeType, requiresSecureDecoder, tunneling);
+    return Collections.unmodifiableList(decoderInfos);
+  }
+
   @Override
   protected void onEnabled(boolean joining) throws ExoPlaybackException {
     super.onEnabled(joining);
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java
index e2988b88b6..598138126b 100644
--- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java
+++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java
@@ -628,7 +628,9 @@ public final class DashStreamingTest {
 
   @Test
   public void testDecoderInfoH264() throws DecoderQueryException {
-    MediaCodecInfo decoderInfo = MediaCodecUtil.getDecoderInfo(MimeTypes.VIDEO_H264, false);
+    MediaCodecInfo decoderInfo =
+        MediaCodecUtil.getDecoderInfo(
+            MimeTypes.VIDEO_H264, /* secure= */ false, /* tunneling= */ false);
     assertThat(decoderInfo).isNotNull();
     assertThat(Util.SDK_INT < 21 || decoderInfo.adaptive).isTrue();
   }
@@ -639,7 +641,11 @@ public final class DashStreamingTest {
       // Pass.
       return;
     }
-    assertThat(MediaCodecUtil.getDecoderInfo(MimeTypes.VIDEO_H265, false).adaptive).isTrue();
+    assertThat(
+            MediaCodecUtil.getDecoderInfo(
+                    MimeTypes.VIDEO_H265, /* secure= */ false, /* tunneling= */ false)
+                .adaptive)
+        .isTrue();
   }
 
   @Test
@@ -648,13 +654,18 @@ public final class DashStreamingTest {
       // Pass.
       return;
     }
-    assertThat(MediaCodecUtil.getDecoderInfo(MimeTypes.VIDEO_VP9, false).adaptive).isTrue();
+    assertThat(
+            MediaCodecUtil.getDecoderInfo(
+                    MimeTypes.VIDEO_VP9, /* secure= */ false, /* tunneling= */ false)
+                .adaptive)
+        .isTrue();
   }
 
   // Internal.
 
   private static boolean shouldSkipAdaptiveTest(String mimeType) throws DecoderQueryException {
-    MediaCodecInfo decoderInfo = MediaCodecUtil.getDecoderInfo(mimeType, false);
+    MediaCodecInfo decoderInfo =
+        MediaCodecUtil.getDecoderInfo(mimeType, /* secure= */ false, /* tunneling= */ false);
     return decoderInfo == null || !decoderInfo.adaptive;
   }
 
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
index a3d4a112b7..b2a49a31fe 100644
--- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
+++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
@@ -106,7 +106,8 @@ public final class DashTestRunner {
     if (Util.SDK_INT >= 18) {
       try {
         // Force L3 if secure decoder is not available.
-        if (MediaCodecUtil.getDecoderInfo(mimeType, true) == null) {
+        if (MediaCodecUtil.getDecoderInfo(mimeType, /* secure= */ true, /* tunneling= */ false)
+            == null) {
           return false;
         }
         MediaDrm mediaDrm = MediaDrmBuilder.build();
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/EnumerateDecodersTest.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/EnumerateDecodersTest.java
index d40a705414..d256db8c30 100644
--- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/EnumerateDecodersTest.java
+++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/EnumerateDecodersTest.java
@@ -82,12 +82,16 @@ public class EnumerateDecodersTest {
   }
 
   private void enumerateDecoders(String mimeType) throws DecoderQueryException {
-    logDecoderInfos(mimeType, /* secure= */ false);
-    logDecoderInfos(mimeType, /* secure= */ true);
+    logDecoderInfos(mimeType, /* secure= */ false, /* tunneling= */ false);
+    logDecoderInfos(mimeType, /* secure= */ true, /* tunneling= */ false);
+    logDecoderInfos(mimeType, /* secure= */ false, /* tunneling= */ true);
+    logDecoderInfos(mimeType, /* secure= */ true, /* tunneling= */ true);
   }
 
-  private void logDecoderInfos(String mimeType, boolean secure) throws DecoderQueryException {
-    List<MediaCodecInfo> mediaCodecInfos = MediaCodecUtil.getDecoderInfos(mimeType, secure);
+  private void logDecoderInfos(String mimeType, boolean secure, boolean tunneling)
+      throws DecoderQueryException {
+    List<MediaCodecInfo> mediaCodecInfos =
+        MediaCodecUtil.getDecoderInfos(mimeType, secure, tunneling);
     for (MediaCodecInfo mediaCodecInfo : mediaCodecInfos) {
       CodecCapabilities capabilities = Assertions.checkNotNull(mediaCodecInfo.capabilities);
       metricsLogger.logMetric(

From 9cfac7ea077e9c54b2ddbeb0498dd0ac9b01a73b Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 12 Apr 2019 11:40:39 +0100
Subject: [PATCH 745/832] Rename CryptoResource to DecryptionResource

PiperOrigin-RevId: 243237265
---
 ...ryptoResource.java => DecryptionResource.java} | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
 rename library/core/src/main/java/com/google/android/exoplayer2/drm/{CryptoResource.java => DecryptionResource.java} (78%)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/CryptoResource.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DecryptionResource.java
similarity index 78%
rename from library/core/src/main/java/com/google/android/exoplayer2/drm/CryptoResource.java
rename to library/core/src/main/java/com/google/android/exoplayer2/drm/DecryptionResource.java
index 3e4701ac08..34d3c3985c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/CryptoResource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DecryptionResource.java
@@ -20,22 +20,23 @@ package com.google.android.exoplayer2.drm;
  *
  * @param <T> The reference type with which to make {@link Owner#onLastReferenceReleased} calls.
  */
-public abstract class CryptoResource<T extends CryptoResource<T>> {
+public abstract class DecryptionResource<T extends DecryptionResource<T>> {
 
   /**
-   * Implemented by the class in charge of managing a {@link CryptoResource resource's} lifecycle.
+   * Implemented by the class in charge of managing a {@link DecryptionResource resource's}
+   * lifecycle.
    */
-  public interface Owner<T extends CryptoResource<T>> {
+  public interface Owner<T extends DecryptionResource<T>> {
 
     /**
-     * Called when the last reference to a {@link CryptoResource} is {@link #releaseReference()
+     * Called when the last reference to a {@link DecryptionResource} is {@link #releaseReference()
      * released}.
      */
-    void onLastReferenceReleased(CryptoResource<T> resource);
+    void onLastReferenceReleased(DecryptionResource<T> resource);
   }
 
   // TODO: Consider adding a handler on which the owner should be called.
-  private final CryptoResource.Owner<T> owner;
+  private final DecryptionResource.Owner<T> owner;
   private int referenceCount;
 
   /**
@@ -43,7 +44,7 @@ public abstract class CryptoResource<T extends CryptoResource<T>> {
    *
    * @param owner The owner of this instance.
    */
-  public CryptoResource(Owner<T> owner) {
+  public DecryptionResource(Owner<T> owner) {
     this.owner = owner;
     referenceCount = 0;
   }

From 936bc244b64f8c9f7ad11f07858b36275ad8d6d1 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 12 Apr 2019 11:53:38 +0100
Subject: [PATCH 746/832] Add an HLS metadata entry sublcass to populate HLS
 track formats

Include information to facilitate adaptive track selection in HLS.

PiperOrigin-RevId: 243238232
---
 RELEASENOTES.md                               |   1 +
 .../source/hls/HlsTrackMetadataEntry.java     | 240 ++++++++++++++++++
 2 files changed, 241 insertions(+)
 create mode 100644 library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsTrackMetadataEntry.java

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 742b245699..ff5e827f14 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -18,6 +18,7 @@
   * Support encrypted initialization segments
     ([#5441](https://github.com/google/ExoPlayer/issues/5441)).
   * Parse `EXT-X-MEDIA` `CHARACTERISTICS` attribute into `Format.roleFlags`.
+  * Add metadata entry for HLS tracks to expose master playlist information.
 * MPEG-TS: enable HDMV DTS stream detection only if a flag is set. By default
   (if the flag is not set), the 0x82 elementary stream type is now treated as an
   SCTE subtitle track
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsTrackMetadataEntry.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsTrackMetadataEntry.java
new file mode 100644
index 0000000000..14268313eb
--- /dev/null
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsTrackMetadataEntry.java
@@ -0,0 +1,240 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.source.hls;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import androidx.annotation.Nullable;
+import android.text.TextUtils;
+import com.google.android.exoplayer2.metadata.Metadata;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/** Holds metadata associated to an HLS media track. */
+public final class HlsTrackMetadataEntry implements Metadata.Entry {
+
+  /** Holds attributes defined in an EXT-X-STREAM-INF tag. */
+  public static final class VariantInfo implements Parcelable {
+
+    /** The bitrate as declared by the EXT-X-STREAM-INF tag. */
+    public final long bitrate;
+
+    /**
+     * The VIDEO value as defined in the EXT-X-STREAM-INF tag, or null if the VIDEO attribute is not
+     * present.
+     */
+    @Nullable public final String videoGroupId;
+
+    /**
+     * The AUDIO value as defined in the EXT-X-STREAM-INF tag, or null if the AUDIO attribute is not
+     * present.
+     */
+    @Nullable public final String audioGroupId;
+
+    /**
+     * The SUBTITLES value as defined in the EXT-X-STREAM-INF tag, or null if the SUBTITLES
+     * attribute is not present.
+     */
+    @Nullable public final String subtitleGroupId;
+
+    /**
+     * The CLOSED-CAPTIONS value as defined in the EXT-X-STREAM-INF tag, or null if the
+     * CLOSED-CAPTIONS attribute is not present.
+     */
+    @Nullable public final String captionGroupId;
+
+    /**
+     * Creates an instance.
+     *
+     * @param bitrate See {@link #bitrate}.
+     * @param videoGroupId See {@link #videoGroupId}.
+     * @param audioGroupId See {@link #audioGroupId}.
+     * @param subtitleGroupId See {@link #subtitleGroupId}.
+     * @param captionGroupId See {@link #captionGroupId}.
+     */
+    public VariantInfo(
+        long bitrate,
+        @Nullable String videoGroupId,
+        @Nullable String audioGroupId,
+        @Nullable String subtitleGroupId,
+        @Nullable String captionGroupId) {
+      this.bitrate = bitrate;
+      this.videoGroupId = videoGroupId;
+      this.audioGroupId = audioGroupId;
+      this.subtitleGroupId = subtitleGroupId;
+      this.captionGroupId = captionGroupId;
+    }
+
+    /* package */ VariantInfo(Parcel in) {
+      bitrate = in.readLong();
+      videoGroupId = in.readString();
+      audioGroupId = in.readString();
+      subtitleGroupId = in.readString();
+      captionGroupId = in.readString();
+    }
+
+    @Override
+    public boolean equals(@Nullable Object other) {
+      if (this == other) {
+        return true;
+      }
+      if (other == null || getClass() != other.getClass()) {
+        return false;
+      }
+      VariantInfo that = (VariantInfo) other;
+      return bitrate == that.bitrate
+          && TextUtils.equals(videoGroupId, that.videoGroupId)
+          && TextUtils.equals(audioGroupId, that.audioGroupId)
+          && TextUtils.equals(subtitleGroupId, that.subtitleGroupId)
+          && TextUtils.equals(captionGroupId, that.captionGroupId);
+    }
+
+    @Override
+    public int hashCode() {
+      int result = (int) (bitrate ^ (bitrate >>> 32));
+      result = 31 * result + (videoGroupId != null ? videoGroupId.hashCode() : 0);
+      result = 31 * result + (audioGroupId != null ? audioGroupId.hashCode() : 0);
+      result = 31 * result + (subtitleGroupId != null ? subtitleGroupId.hashCode() : 0);
+      result = 31 * result + (captionGroupId != null ? captionGroupId.hashCode() : 0);
+      return result;
+    }
+
+    // Parcelable implementation.
+
+    @Override
+    public int describeContents() {
+      return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+      dest.writeLong(bitrate);
+      dest.writeString(videoGroupId);
+      dest.writeString(audioGroupId);
+      dest.writeString(subtitleGroupId);
+      dest.writeString(captionGroupId);
+    }
+
+    public static final Parcelable.Creator<VariantInfo> CREATOR =
+        new Parcelable.Creator<VariantInfo>() {
+          @Override
+          public VariantInfo createFromParcel(Parcel in) {
+            return new VariantInfo(in);
+          }
+
+          @Override
+          public VariantInfo[] newArray(int size) {
+            return new VariantInfo[size];
+          }
+        };
+  }
+
+  /**
+   * The GROUP-ID value of this track, if the track is derived from an EXT-X-MEDIA tag. Null if the
+   * track is not derived from an EXT-X-MEDIA TAG.
+   */
+  @Nullable public final String groupId;
+  /**
+   * The NAME value of this track, if the track is derived from an EXT-X-MEDIA tag. Null if the
+   * track is not derived from an EXT-X-MEDIA TAG.
+   */
+  @Nullable public final String name;
+  /**
+   * The EXT-X-STREAM-INF tags attributes associated with this track. This field is non-applicable
+   * (and therefore empty) if this track is derived from an EXT-X-MEDIA tag.
+   */
+  public final List<VariantInfo> variantInfos;
+
+  /**
+   * Creates an instance.
+   *
+   * @param groupId See {@link #groupId}.
+   * @param name See {@link #name}.
+   * @param variantInfos See {@link #variantInfos}.
+   */
+  public HlsTrackMetadataEntry(
+      @Nullable String groupId, @Nullable String name, List<VariantInfo> variantInfos) {
+    this.groupId = groupId;
+    this.name = name;
+    this.variantInfos = Collections.unmodifiableList(new ArrayList<>(variantInfos));
+  }
+
+  /* package */ HlsTrackMetadataEntry(Parcel in) {
+    groupId = in.readString();
+    name = in.readString();
+    int variantInfoSize = in.readInt();
+    ArrayList<VariantInfo> variantInfos = new ArrayList<>(variantInfoSize);
+    for (int i = 0; i < variantInfoSize; i++) {
+      variantInfos.add(in.readParcelable(VariantInfo.class.getClassLoader()));
+    }
+    this.variantInfos = Collections.unmodifiableList(variantInfos);
+  }
+
+  @Override
+  public boolean equals(@Nullable Object other) {
+    if (this == other) {
+      return true;
+    }
+    if (other == null || getClass() != other.getClass()) {
+      return false;
+    }
+
+    HlsTrackMetadataEntry that = (HlsTrackMetadataEntry) other;
+    return TextUtils.equals(groupId, that.groupId)
+        && TextUtils.equals(name, that.name)
+        && variantInfos.equals(that.variantInfos);
+  }
+
+  @Override
+  public int hashCode() {
+    int result = groupId != null ? groupId.hashCode() : 0;
+    result = 31 * result + (name != null ? name.hashCode() : 0);
+    result = 31 * result + variantInfos.hashCode();
+    return result;
+  }
+
+  // Parcelable implementation.
+
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  @Override
+  public void writeToParcel(Parcel dest, int flags) {
+    dest.writeString(groupId);
+    dest.writeString(name);
+    int variantInfosSize = variantInfos.size();
+    dest.writeInt(variantInfosSize);
+    for (int i = 0; i < variantInfosSize; i++) {
+      dest.writeParcelable(variantInfos.get(i), /* parcelableFlags= */ 0);
+    }
+  }
+
+  public static final Parcelable.Creator<HlsTrackMetadataEntry> CREATOR =
+      new Parcelable.Creator<HlsTrackMetadataEntry>() {
+        @Override
+        public HlsTrackMetadataEntry createFromParcel(Parcel in) {
+          return new HlsTrackMetadataEntry(in);
+        }
+
+        @Override
+        public HlsTrackMetadataEntry[] newArray(int size) {
+          return new HlsTrackMetadataEntry[size];
+        }
+      };
+}

From bd841b18f22ee5d184c22fb98d21d0a76d0ad4bb Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 12 Apr 2019 12:58:40 +0100
Subject: [PATCH 747/832] Add DecryptionResource to FormatHolder

PiperOrigin-RevId: 243243975
---
 .../google/android/exoplayer2/FormatHolder.java    | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/FormatHolder.java b/library/core/src/main/java/com/google/android/exoplayer2/FormatHolder.java
index fcee2241e8..5da8d0f9f5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/FormatHolder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/FormatHolder.java
@@ -16,12 +16,24 @@
 package com.google.android.exoplayer2;
 
 import androidx.annotation.Nullable;
+import com.google.android.exoplayer2.drm.DecryptionResource;
 
 /**
  * Holds a {@link Format}.
  */
 public final class FormatHolder {
 
+  /**
+   * Whether the object expected to populate {@link #format} is also expected to populate {@link
+   * #decryptionResource}.
+   */
+  // TODO: Remove once all Renderers and MediaSources have migrated to the new DRM model [Internal
+  // ref: b/129764794].
+  public boolean decryptionResourceIsProvided;
+
+  /** An accompanying context for decrypting samples in the format. */
+  @Nullable public DecryptionResource<?> decryptionResource;
+
   /** The held {@link Format}. */
-  public @Nullable Format format;
+  @Nullable public Format format;
 }

From f623a9dea0afbca26a28e4a1f91998575d774864 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 12 Apr 2019 13:09:14 +0100
Subject: [PATCH 748/832] Reduce use of DownloadInternal in DownloadManager

The only state DownloadInternal holds is duplicate of state contained
in Download, but can confusingly be temporarily out of sync. This is
error prone because it's easy to use the wrong variable (e.g.
download.state vs state). DownloadInternals methods are called into
and call out into DownloadManager, which makes some code paths that
are quite hard to follow.

It's possible to simplify DownloadManager quite a lot by removing the
duplicated state in DownloadInternal, at which point DownloadInternal's
methods flatten into DownloadManager, which can just hold an internal
list of Downloads directly.

This is a first step, which makes it clear that DownloadThready only
needs its immutable DownloadAction + an isRemove flag.

PiperOrigin-RevId: 243245288
---
 .../android/exoplayer2/offline/Download.java  | 14 +---
 .../exoplayer2/offline/DownloadAction.java    |  5 ++
 .../exoplayer2/offline/DownloadManager.java   | 75 +++++++++++--------
 .../testutil/TestDownloadManagerListener.java |  2 +-
 4 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
index 811df3b0d4..911d823f07 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
@@ -46,7 +46,7 @@ public final class Download {
   // Important: These constants are persisted into DownloadIndex. Do not change them.
   /** The download is waiting to be started. */
   public static final int STATE_QUEUED = 0;
-  /** The download is manually stopped for the reason specified by {@link #manualStopReason}. */
+  /** The download is stopped for a specified {@link #manualStopReason}. */
   public static final int STATE_STOPPED = 1;
   /** The download is currently started. */
   public static final int STATE_DOWNLOADING = 2;
@@ -94,18 +94,6 @@ public final class Download {
     }
   }
 
-  /** Returns the failure string for the given failure reason value. */
-  public static String getFailureString(@FailureReason int failureReason) {
-    switch (failureReason) {
-      case FAILURE_REASON_NONE:
-        return "NO_REASON";
-      case FAILURE_REASON_UNKNOWN:
-        return "UNKNOWN_REASON";
-      default:
-        throw new IllegalStateException();
-    }
-  }
-
   /** The download action. */
   public final DownloadAction action;
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
index 63916ff1a2..08e6c2aafe 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
@@ -139,6 +139,11 @@ public final class DownloadAction implements Parcelable {
         id, type, newAction.uri, mergedKeys, newAction.customCacheKey, newAction.data);
   }
 
+  @Override
+  public String toString() {
+    return type + ":" + id;
+  }
+
   @Override
   public boolean equals(@Nullable Object o) {
     if (!(o instanceof DownloadAction)) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index fe1772e829..dbc953b8c4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -167,7 +167,7 @@ public final class DownloadManager {
 
   // Collections that are accessed on the internal thread.
   private final ArrayList<DownloadInternal> downloadInternals;
-  private final HashMap<DownloadInternal, DownloadThread> activeDownloads;
+  private final HashMap<String, DownloadThread> downloadThreads;
 
   // Mutable fields that are accessed on the main thread.
   private int pendingMessages;
@@ -250,7 +250,7 @@ public final class DownloadManager {
 
     downloadInternals = new ArrayList<>();
     downloads = new ArrayList<>();
-    activeDownloads = new HashMap<>();
+    downloadThreads = new HashMap<>();
     listeners = new CopyOnWriteArraySet<>();
     releaseLock = new Object();
 
@@ -568,7 +568,7 @@ public final class DownloadManager {
         throw new IllegalStateException();
     }
     mainHandler
-        .obtainMessage(MSG_PROCESSED, processedExternalMessage ? 1 : 0, activeDownloads.size())
+        .obtainMessage(MSG_PROCESSED, processedExternalMessage ? 1 : 0, downloadThreads.size())
         .sendToTarget();
     return true;
   }
@@ -677,16 +677,17 @@ public final class DownloadManager {
   }
 
   private void onDownloadThreadStoppedInternal(DownloadThread downloadThread) {
-    DownloadInternal downloadInternal = downloadThread.downloadInternal;
-    logd("Download is stopped", downloadInternal);
-    activeDownloads.remove(downloadInternal);
+    logd("Download is stopped", downloadThread.action);
+    String downloadId = downloadThread.action.id;
+    downloadThreads.remove(downloadId);
     boolean tryToStartDownloads = false;
-    if (!downloadThread.isRemoveThread) {
+    if (!downloadThread.isRemove) {
       // If maxSimultaneousDownloads was hit, there might be a download waiting for a slot.
       tryToStartDownloads = simultaneousDownloads == maxSimultaneousDownloads;
       simultaneousDownloads--;
     }
-    downloadInternal.onDownloadThreadStopped(downloadThread.isCanceled, downloadThread.finalError);
+    getDownload(downloadId)
+        .onDownloadThreadStopped(downloadThread.isCanceled, downloadThread.finalError);
     if (tryToStartDownloads) {
       for (int i = 0;
           simultaneousDownloads < maxSimultaneousDownloads && i < downloadInternals.size();
@@ -697,8 +698,8 @@ public final class DownloadManager {
   }
 
   private void releaseInternal() {
-    for (DownloadInternal downloadInternal : activeDownloads.keySet()) {
-      stopDownloadThread(downloadInternal);
+    for (String downloadId : downloadThreads.keySet()) {
+      stopDownloadThreadInternal(downloadId);
     }
     internalThread.quit();
     synchronized (releaseLock) {
@@ -733,30 +734,34 @@ public final class DownloadManager {
 
   @StartThreadResults
   private int startDownloadThread(DownloadInternal downloadInternal) {
-    if (activeDownloads.containsKey(downloadInternal)) {
-      if (stopDownloadThread(downloadInternal)) {
+    DownloadAction action = downloadInternal.download.action;
+    String downloadId = action.id;
+    if (downloadThreads.containsKey(downloadId)) {
+      if (stopDownloadThreadInternal(downloadId)) {
         return START_THREAD_WAIT_DOWNLOAD_CANCELLATION;
       }
       return START_THREAD_WAIT_REMOVAL_TO_FINISH;
     }
-    if (!downloadInternal.isInRemoveState()) {
+    boolean isRemove = downloadInternal.isInRemoveState();
+    if (!isRemove) {
       if (simultaneousDownloads == maxSimultaneousDownloads) {
         return START_THREAD_TOO_MANY_DOWNLOADS;
       }
       simultaneousDownloads++;
     }
-    DownloadThread downloadThread = new DownloadThread(downloadInternal);
-    activeDownloads.put(downloadInternal, downloadThread);
+    DownloadThread downloadThread = new DownloadThread(action, isRemove);
+    downloadThreads.put(downloadId, downloadThread);
     downloadInternal.setCounters(downloadThread.downloader.getCounters());
+    downloadThread.start();
     logd("Download is started", downloadInternal);
     return START_THREAD_SUCCEEDED;
   }
 
-  private boolean stopDownloadThread(DownloadInternal downloadInternal) {
-    DownloadThread downloadThread = activeDownloads.get(downloadInternal);
-    if (downloadThread != null && !downloadThread.isRemoveThread) {
+  private boolean stopDownloadThreadInternal(String downloadId) {
+    DownloadThread downloadThread = downloadThreads.get(downloadId);
+    if (downloadThread != null && !downloadThread.isRemove) {
       downloadThread.cancel();
-      logd("Download is cancelled", downloadInternal);
+      logd("Download is cancelled", downloadThread.action);
       return true;
     }
     return false;
@@ -800,8 +805,12 @@ public final class DownloadManager {
   }
 
   private static void logd(String message, DownloadInternal downloadInternal) {
+    logd(message, downloadInternal.download.action);
+  }
+
+  private static void logd(String message, DownloadAction action) {
     if (DEBUG) {
-      logd(message + ": " + downloadInternal);
+      logd(message + ": " + action);
     }
   }
 
@@ -812,14 +821,15 @@ public final class DownloadManager {
   }
 
   private static final class DownloadInternal {
+
     private final DownloadManager downloadManager;
 
     private Download download;
-    @MonotonicNonNull @Download.FailureReason private int failureReason;
 
     // TODO: Get rid of these and use download directly.
     @Download.State private int state;
     private int manualStopReason;
+    @MonotonicNonNull @Download.FailureReason private int failureReason;
 
     private DownloadInternal(DownloadManager downloadManager, Download download) {
       this.downloadManager = downloadManager;
@@ -891,7 +901,7 @@ public final class DownloadManager {
         }
       } else {
         if (state == STATE_DOWNLOADING || state == STATE_QUEUED) {
-          downloadManager.stopDownloadThread(this);
+          downloadManager.stopDownloadThreadInternal(download.action.id);
           setState(STATE_STOPPED);
         }
       }
@@ -962,18 +972,17 @@ public final class DownloadManager {
 
   private class DownloadThread extends Thread {
 
-    private final DownloadInternal downloadInternal;
+    private final DownloadAction action;
+    private final boolean isRemove;
     private final Downloader downloader;
-    private final boolean isRemoveThread;
 
     private volatile boolean isCanceled;
     private Throwable finalError;
 
-    private DownloadThread(DownloadInternal downloadInternal) {
-      this.downloadInternal = downloadInternal;
-      this.downloader = downloaderFactory.createDownloader(downloadInternal.download.action);
-      this.isRemoveThread = downloadInternal.isInRemoveState();
-      start();
+    private DownloadThread(DownloadAction action, boolean isRemove) {
+      this.action = action;
+      this.isRemove = isRemove;
+      downloader = downloaderFactory.createDownloader(action);
     }
 
     public void cancel() {
@@ -986,9 +995,9 @@ public final class DownloadManager {
 
     @Override
     public void run() {
-      logd("Download started", downloadInternal);
+      logd("Download started", action);
       try {
-        if (isRemoveThread) {
+        if (isRemove) {
           downloader.remove();
         } else {
           int errorCount = 0;
@@ -1001,14 +1010,14 @@ public final class DownloadManager {
               if (!isCanceled) {
                 long downloadedBytes = downloader.getDownloadedBytes();
                 if (downloadedBytes != errorPosition) {
-                  logd("Reset error count. downloadedBytes = " + downloadedBytes, downloadInternal);
+                  logd("Reset error count. downloadedBytes = " + downloadedBytes, action);
                   errorPosition = downloadedBytes;
                   errorCount = 0;
                 }
                 if (++errorCount > minRetryCount) {
                   throw e;
                 }
-                logd("Download error. Retry " + errorCount, downloadInternal);
+                logd("Download error. Retry " + errorCount, action);
                 Thread.sleep(getRetryDelayMillis(errorCount));
               }
             }
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
index 867888e91c..1677243f27 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
@@ -95,7 +95,7 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
   public void blockUntilTasksCompleteAndThrowAnyDownloadError() throws Throwable {
     blockUntilTasksComplete();
     if (failureReason != Download.FAILURE_REASON_NONE) {
-      throw new Exception("Failure reason: " + Download.getFailureString(failureReason));
+      throw new Exception("Failure reason: " + failureReason);
     }
   }
 

From a588717b4648b1d365376d842b184c7e0a480137 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 12 Apr 2019 14:00:41 +0100
Subject: [PATCH 749/832] Move download state transitions into DownloadManager

Non-trivial download state transitions are currently split across
DownloadManager and Download. These transitions are part of the
same state machine, so it's clearer if they're all in the same place
(i.e. DownloadManager, since this is the component that transitions
downloads between states).

PiperOrigin-RevId: 243249915
---
 .../offline/ActionFileUpgradeUtil.java        |  14 +-
 .../android/exoplayer2/offline/Download.java  |  75 +----
 .../exoplayer2/offline/DownloadManager.java   |  57 +++-
 .../offline/ActionFileUpgradeUtilTest.java    | 112 +++----
 .../offline/DefaultDownloadIndexTest.java     |  38 ++-
 .../offline/DownloadManagerTest.java          |  86 ++++++
 .../exoplayer2/offline/DownloadTest.java      | 274 ------------------
 7 files changed, 244 insertions(+), 412 deletions(-)
 delete mode 100644 library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadTest.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java
index 2c638e2aa0..e30d202649 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java
@@ -15,6 +15,8 @@
  */
 package com.google.android.exoplayer2.offline;
 
+import static com.google.android.exoplayer2.offline.Download.STATE_QUEUED;
+
 import androidx.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
@@ -88,9 +90,17 @@ public final class ActionFileUpgradeUtil {
       throws IOException {
     Download download = downloadIndex.getDownload(action.id);
     if (download != null) {
-      download = download.copyWithMergedAction(action, /* canStart= */ true);
+      download = DownloadManager.mergeAction(download, action, download.manualStopReason);
     } else {
-      download = new Download(action);
+      long nowMs = System.currentTimeMillis();
+      download =
+          new Download(
+              action,
+              STATE_QUEUED,
+              Download.FAILURE_REASON_NONE,
+              Download.MANUAL_STOP_REASON_NONE,
+              /* startTimeMs= */ nowMs,
+              /* updateTimeMs= */ nowMs);
     }
     downloadIndex.putDownload(download);
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
index 911d823f07..a28679ea04 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
@@ -111,25 +111,22 @@ public final class Download {
   /** The reason the download is manually stopped, or {@link #MANUAL_STOP_REASON_NONE}. */
   public final int manualStopReason;
 
-  /*package*/ CachingCounters counters;
+  /* package */ CachingCounters counters;
 
-  /**
-   * Creates a {@link Download} using a {@link DownloadAction}.
-   *
-   * @param action The {@link DownloadAction}.
-   */
-  public Download(DownloadAction action) {
-    this(action, System.currentTimeMillis());
-  }
-
-  private Download(DownloadAction action, long currentTimeMs) {
+  /* package */ Download(
+      DownloadAction action,
+      @State int state,
+      @FailureReason int failureReason,
+      int manualStopReason,
+      long startTimeMs,
+      long updateTimeMs) {
     this(
         action,
-        /* state= */ STATE_QUEUED,
-        FAILURE_REASON_NONE,
-        /* manualStopReason= */ 0,
-        /* startTimeMs= */ currentTimeMs,
-        /* updateTimeMs= */ currentTimeMs,
+        state,
+        failureReason,
+        manualStopReason,
+        startTimeMs,
+        updateTimeMs,
         new CachingCounters());
   }
 
@@ -155,39 +152,9 @@ public final class Download {
     this.counters = counters;
   }
 
-  /**
-   * Merges the given {@link DownloadAction} and creates a new {@link Download}. The action must
-   * have the same id and type.
-   *
-   * @param newAction The {@link DownloadAction} to be merged.
-   * @param canStart Whether the download is eligible to be started.
-   * @return A new {@link Download}.
-   */
-  public Download copyWithMergedAction(DownloadAction newAction, boolean canStart) {
-    return new Download(
-        action.copyWithMergedAction(newAction),
-        getNextState(state, canStart && manualStopReason == 0),
-        FAILURE_REASON_NONE,
-        manualStopReason,
-        startTimeMs,
-        /* updateTimeMs= */ System.currentTimeMillis(),
-        counters);
-  }
-
-  /**
-   * Returns a copy with the specified state, clearing {@link #failureReason}.
-   *
-   * @param state The {@link State}.
-   */
-  public Download copyWithState(@State int state) {
-    return new Download(
-        action,
-        state,
-        FAILURE_REASON_NONE,
-        manualStopReason,
-        startTimeMs,
-        /* updateTimeMs= */ System.currentTimeMillis(),
-        counters);
+  /** Returns whether the download is completed or failed. These are terminal states. */
+  public boolean isTerminalState() {
+    return state == STATE_COMPLETED || state == STATE_FAILED;
   }
 
   /** Returns the total number of downloaded bytes. */
@@ -217,14 +184,4 @@ public final class Download {
     Assertions.checkNotNull(counters);
     this.counters = counters;
   }
-
-  private static int getNextState(@State int currentState, boolean canStart) {
-    if (currentState == STATE_REMOVING || currentState == STATE_RESTARTING) {
-      return STATE_RESTARTING;
-    } else if (canStart) {
-      return STATE_QUEUED;
-    } else {
-      return STATE_STOPPED;
-    }
-  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index dbc953b8c4..1a69feadfc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -66,6 +66,7 @@ public final class DownloadManager {
 
   /** Listener for {@link DownloadManager} events. */
   public interface Listener {
+
     /**
      * Called when all actions have been restored.
      *
@@ -485,7 +486,7 @@ public final class DownloadManager {
 
   private void onDownloadChanged(Download download) {
     int downloadIndex = getDownloadIndex(download.action.id);
-    if (download.state == STATE_COMPLETED || download.state == STATE_FAILED) {
+    if (download.isTerminalState()) {
       if (downloadIndex != C.INDEX_UNSET) {
         downloads.remove(downloadIndex);
       }
@@ -643,19 +644,26 @@ public final class DownloadManager {
     }
   }
 
-  // TODO: Use manualStopReason.
   private void addDownloadInternal(DownloadAction action, int manualStopReason) {
     DownloadInternal downloadInternal = getDownload(action.id);
     if (downloadInternal != null) {
-      downloadInternal.addAction(action);
+      downloadInternal.addAction(action, manualStopReason);
       logd("Action is added to existing download", downloadInternal);
     } else {
       Download download = loadDownload(action.id);
       if (download == null) {
-        download = new Download(action);
+        long nowMs = System.currentTimeMillis();
+        download =
+            new Download(
+                action,
+                manualStopReason != Download.MANUAL_STOP_REASON_NONE ? STATE_STOPPED : STATE_QUEUED,
+                Download.FAILURE_REASON_NONE,
+                manualStopReason,
+                /* startTimeMs= */ nowMs,
+                /* updateTimeMs= */ nowMs);
         logd("Download state is created for " + action.id);
       } else {
-        download = download.copyWithMergedAction(action, /* canStart= */ canStartDownloads());
+        download = mergeAction(download, action, manualStopReason);
         logd("Download state is loaded for " + action.id);
       }
       addDownloadForState(download);
@@ -669,7 +677,7 @@ public final class DownloadManager {
     } else {
       Download download = loadDownload(id);
       if (download != null) {
-        addDownloadForState(download.copyWithState(STATE_REMOVING));
+        addDownloadForState(copyWithState(download, STATE_REMOVING));
       } else {
         logd("Can't remove download. No download with id: " + id);
       }
@@ -798,6 +806,39 @@ public final class DownloadManager {
     return downloadsStarted && notMetRequirements == 0;
   }
 
+  /* package */ static Download mergeAction(
+      Download download, DownloadAction action, int manualStopReason) {
+    @Download.State int state = download.state;
+    if (state == STATE_REMOVING || state == STATE_RESTARTING) {
+      state = STATE_RESTARTING;
+    } else if (manualStopReason != MANUAL_STOP_REASON_NONE) {
+      state = STATE_STOPPED;
+    } else {
+      state = STATE_QUEUED;
+    }
+    long nowMs = System.currentTimeMillis();
+    long startTimeMs = download.isTerminalState() ? nowMs : download.startTimeMs;
+    return new Download(
+        download.action.copyWithMergedAction(action),
+        state,
+        FAILURE_REASON_NONE,
+        manualStopReason,
+        startTimeMs,
+        /* updateTimeMs= */ nowMs,
+        download.counters);
+  }
+
+  private static Download copyWithState(Download download, @Download.State int state) {
+    return new Download(
+        download.action,
+        state,
+        FAILURE_REASON_NONE,
+        download.manualStopReason,
+        download.startTimeMs,
+        /* updateTimeMs= */ System.currentTimeMillis(),
+        download.counters);
+  }
+
   private static void logd(String message) {
     if (DEBUG) {
       Log.d(TAG, message);
@@ -841,8 +882,8 @@ public final class DownloadManager {
       initialize(download.state);
     }
 
-    public void addAction(DownloadAction newAction) {
-      download = download.copyWithMergedAction(newAction, downloadManager.canStartDownloads());
+    public void addAction(DownloadAction newAction, int manualStopReason) {
+      download = mergeAction(download, newAction, manualStopReason);
       initialize();
     }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java
index 6ae5a2e11c..bef5443bf6 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java
@@ -56,62 +56,7 @@ public class ActionFileUpgradeUtilTest {
   }
 
   @Test
-  public void addAction_nonExistingDownload_createsNewDownload() throws IOException {
-    byte[] data = new byte[] {1, 2, 3, 4};
-    DownloadAction action =
-        new DownloadAction(
-            "id",
-            TYPE_DASH,
-            Uri.parse("https://www.test.com/download"),
-            asList(
-                new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 1, /* trackIndex= */ 2),
-                new StreamKey(/* periodIndex= */ 3, /* groupIndex= */ 4, /* trackIndex= */ 5)),
-            /* customCacheKey= */ "key123",
-            data);
-
-    ActionFileUpgradeUtil.mergeAction(action, downloadIndex);
-
-    assertDownloadIndexContainsAction(action, Download.STATE_QUEUED);
-  }
-
-  @Test
-  public void addAction_existingDownload_createsMergedDownload() throws IOException {
-    StreamKey streamKey1 =
-        new StreamKey(/* periodIndex= */ 3, /* groupIndex= */ 4, /* trackIndex= */ 5);
-    StreamKey streamKey2 =
-        new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 1, /* trackIndex= */ 2);
-    DownloadAction action1 =
-        new DownloadAction(
-            "id",
-            TYPE_DASH,
-            Uri.parse("https://www.test.com/download1"),
-            asList(streamKey1),
-            /* customCacheKey= */ "key123",
-            new byte[] {1, 2, 3, 4});
-    DownloadAction action2 =
-        new DownloadAction(
-            "id",
-            TYPE_DASH,
-            Uri.parse("https://www.test.com/download2"),
-            asList(streamKey2),
-            /* customCacheKey= */ "key123",
-            new byte[] {5, 4, 3, 2, 1});
-    ActionFileUpgradeUtil.mergeAction(action1, downloadIndex);
-
-    ActionFileUpgradeUtil.mergeAction(action2, downloadIndex);
-
-    Download download = downloadIndex.getDownload(action2.id);
-    assertThat(download).isNotNull();
-    assertThat(download.action.type).isEqualTo(action2.type);
-    assertThat(download.action.customCacheKey).isEqualTo(action2.customCacheKey);
-    assertThat(download.action.data).isEqualTo(action2.data);
-    assertThat(download.action.uri).isEqualTo(action2.uri);
-    assertThat(download.action.streamKeys).containsExactly(streamKey1, streamKey2);
-    assertThat(download.state).isEqualTo(Download.STATE_QUEUED);
-  }
-
-  @Test
-  public void upgradeActionFile_createsDownloads() throws IOException {
+  public void upgradeAndDelete_createsDownloads() throws IOException {
     // Copy the test asset to a file.
     byte[] actionFileBytes =
         TestUtil.getByteArray(
@@ -144,10 +89,65 @@ public class ActionFileUpgradeUtilTest {
 
     ActionFileUpgradeUtil.upgradeAndDelete(
         tempFile, /* downloadIdProvider= */ null, downloadIndex, /* deleteOnFailure= */ true);
+
     assertDownloadIndexContainsAction(expectedAction1, Download.STATE_QUEUED);
     assertDownloadIndexContainsAction(expectedAction2, Download.STATE_QUEUED);
   }
 
+  @Test
+  public void mergeAction_nonExistingDownload_createsNewDownload() throws IOException {
+    byte[] data = new byte[] {1, 2, 3, 4};
+    DownloadAction action =
+        new DownloadAction(
+            "id",
+            TYPE_DASH,
+            Uri.parse("https://www.test.com/download"),
+            asList(
+                new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 1, /* trackIndex= */ 2),
+                new StreamKey(/* periodIndex= */ 3, /* groupIndex= */ 4, /* trackIndex= */ 5)),
+            /* customCacheKey= */ "key123",
+            data);
+
+    ActionFileUpgradeUtil.mergeAction(action, downloadIndex);
+
+    assertDownloadIndexContainsAction(action, Download.STATE_QUEUED);
+  }
+
+  @Test
+  public void mergeAction_existingDownload_createsMergedDownload() throws IOException {
+    StreamKey streamKey1 =
+        new StreamKey(/* periodIndex= */ 3, /* groupIndex= */ 4, /* trackIndex= */ 5);
+    StreamKey streamKey2 =
+        new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 1, /* trackIndex= */ 2);
+    DownloadAction action1 =
+        new DownloadAction(
+            "id",
+            TYPE_DASH,
+            Uri.parse("https://www.test.com/download1"),
+            asList(streamKey1),
+            /* customCacheKey= */ "key123",
+            new byte[] {1, 2, 3, 4});
+    DownloadAction action2 =
+        new DownloadAction(
+            "id",
+            TYPE_DASH,
+            Uri.parse("https://www.test.com/download2"),
+            asList(streamKey2),
+            /* customCacheKey= */ "key123",
+            new byte[] {5, 4, 3, 2, 1});
+    ActionFileUpgradeUtil.mergeAction(action1, downloadIndex);
+    ActionFileUpgradeUtil.mergeAction(action2, downloadIndex);
+
+    Download download = downloadIndex.getDownload(action2.id);
+    assertThat(download).isNotNull();
+    assertThat(download.action.type).isEqualTo(action2.type);
+    assertThat(download.action.customCacheKey).isEqualTo(action2.customCacheKey);
+    assertThat(download.action.data).isEqualTo(action2.data);
+    assertThat(download.action.uri).isEqualTo(action2.uri);
+    assertThat(download.action.streamKeys).containsExactly(streamKey1, streamKey2);
+    assertThat(download.state).isEqualTo(Download.STATE_QUEUED);
+  }
+
   private void assertDownloadIndexContainsAction(DownloadAction action, int state)
       throws IOException {
     Download download = downloadIndex.getDownload(action.id);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
index 85871363db..4778729f23 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
@@ -60,7 +60,7 @@ public class DefaultDownloadIndexTest {
     downloadIndex.putDownload(download);
     Download readDownload = downloadIndex.getDownload(id);
 
-    DownloadTest.assertEqual(readDownload, download);
+    assertEqual(readDownload, download);
   }
 
   @Test
@@ -91,7 +91,7 @@ public class DefaultDownloadIndexTest {
     Download readDownload = downloadIndex.getDownload(id);
 
     assertThat(readDownload).isNotNull();
-    DownloadTest.assertEqual(readDownload, download);
+    assertEqual(readDownload, download);
   }
 
   @Test
@@ -103,7 +103,7 @@ public class DefaultDownloadIndexTest {
     downloadIndex = new DefaultDownloadIndex(databaseProvider);
     Download readDownload = downloadIndex.getDownload(id);
     assertThat(readDownload).isNotNull();
-    DownloadTest.assertEqual(readDownload, download);
+    assertEqual(readDownload, download);
   }
 
   @Test
@@ -138,9 +138,9 @@ public class DefaultDownloadIndexTest {
     try (DownloadCursor cursor = downloadIndex.getDownloads()) {
       assertThat(cursor.getCount()).isEqualTo(2);
       cursor.moveToNext();
-      DownloadTest.assertEqual(cursor.getDownload(), download2);
+      assertEqual(cursor.getDownload(), download2);
       cursor.moveToNext();
-      DownloadTest.assertEqual(cursor.getDownload(), download1);
+      assertEqual(cursor.getDownload(), download1);
     }
   }
 
@@ -161,9 +161,9 @@ public class DefaultDownloadIndexTest {
         downloadIndex.getDownloads(Download.STATE_REMOVING, Download.STATE_COMPLETED)) {
       assertThat(cursor.getCount()).isEqualTo(2);
       cursor.moveToNext();
-      DownloadTest.assertEqual(cursor.getDownload(), download1);
+      assertEqual(cursor.getDownload(), download1);
       cursor.moveToNext();
-      DownloadTest.assertEqual(cursor.getDownload(), download3);
+      assertEqual(cursor.getDownload(), download3);
     }
   }
 
@@ -216,7 +216,7 @@ public class DefaultDownloadIndexTest {
     Download readDownload = downloadIndex.getDownload(id);
     Download expectedDownload =
         downloadBuilder.setManualStopReason(Download.MANUAL_STOP_REASON_NONE).build();
-    DownloadTest.assertEqual(readDownload, expectedDownload);
+    assertEqual(readDownload, expectedDownload);
   }
 
   @Test
@@ -234,7 +234,7 @@ public class DefaultDownloadIndexTest {
 
     Download readDownload = downloadIndex.getDownload(id);
     Download expectedDownload = downloadBuilder.setManualStopReason(manualStopReason).build();
-    DownloadTest.assertEqual(readDownload, expectedDownload);
+    assertEqual(readDownload, expectedDownload);
   }
 
   @Test
@@ -248,7 +248,7 @@ public class DefaultDownloadIndexTest {
     downloadIndex.setManualStopReason(notMetRequirements);
 
     Download readDownload = downloadIndex.getDownload(id);
-    DownloadTest.assertEqual(readDownload, download);
+    assertEqual(readDownload, download);
   }
 
   @Test
@@ -264,7 +264,7 @@ public class DefaultDownloadIndexTest {
     Download readDownload = downloadIndex.getDownload(id);
     Download expectedDownload =
         downloadBuilder.setManualStopReason(Download.MANUAL_STOP_REASON_NONE).build();
-    DownloadTest.assertEqual(readDownload, expectedDownload);
+    assertEqual(readDownload, expectedDownload);
   }
 
   @Test
@@ -282,7 +282,7 @@ public class DefaultDownloadIndexTest {
 
     Download readDownload = downloadIndex.getDownload(id);
     Download expectedDownload = downloadBuilder.setManualStopReason(manualStopReason).build();
-    DownloadTest.assertEqual(readDownload, expectedDownload);
+    assertEqual(readDownload, expectedDownload);
   }
 
   @Test
@@ -297,6 +297,18 @@ public class DefaultDownloadIndexTest {
     downloadIndex.setManualStopReason(id, notMetRequirements);
 
     Download readDownload = downloadIndex.getDownload(id);
-    DownloadTest.assertEqual(readDownload, download);
+    assertEqual(readDownload, download);
+  }
+
+  private static void assertEqual(Download download, Download that) {
+    assertThat(download.action).isEqualTo(that.action);
+    assertThat(download.state).isEqualTo(that.state);
+    assertThat(download.startTimeMs).isEqualTo(that.startTimeMs);
+    assertThat(download.updateTimeMs).isEqualTo(that.updateTimeMs);
+    assertThat(download.failureReason).isEqualTo(that.failureReason);
+    assertThat(download.manualStopReason).isEqualTo(that.manualStopReason);
+    assertThat(download.getDownloadPercentage()).isEqualTo(that.getDownloadPercentage());
+    assertThat(download.getDownloadedBytes()).isEqualTo(that.getDownloadedBytes());
+    assertThat(download.getTotalBytes()).isEqualTo(that.getTotalBytes());
   }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index 306e505947..1412f7e247 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -31,6 +31,7 @@ import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -449,6 +450,71 @@ public class DownloadManagerTest {
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
+  @Test
+  public void mergeAction_removingDownload_becomesRestarting() {
+    DownloadAction downloadAction = createDownloadAction();
+    DownloadBuilder downloadBuilder =
+        new DownloadBuilder(downloadAction).setState(Download.STATE_REMOVING);
+    Download download = downloadBuilder.build();
+
+    Download mergedDownload =
+        DownloadManager.mergeAction(download, downloadAction, download.manualStopReason);
+
+    Download expectedDownload = downloadBuilder.setState(Download.STATE_RESTARTING).build();
+    assertEqualIgnoringTimeFields(mergedDownload, expectedDownload);
+  }
+
+  @Test
+  public void mergeAction_failedDownload_becomesQueued() {
+    DownloadAction downloadAction = createDownloadAction();
+    DownloadBuilder downloadBuilder =
+        new DownloadBuilder(downloadAction)
+            .setState(Download.STATE_FAILED)
+            .setFailureReason(Download.FAILURE_REASON_UNKNOWN);
+    Download download = downloadBuilder.build();
+
+    Download mergedDownload =
+        DownloadManager.mergeAction(download, downloadAction, download.manualStopReason);
+
+    Download expectedDownload =
+        downloadBuilder
+            .setState(Download.STATE_QUEUED)
+            .setFailureReason(Download.FAILURE_REASON_NONE)
+            .build();
+    assertEqualIgnoringTimeFields(mergedDownload, expectedDownload);
+  }
+
+  @Test
+  public void mergeAction_stoppedDownload_staysStopped() {
+    DownloadAction downloadAction = createDownloadAction();
+    DownloadBuilder downloadBuilder =
+        new DownloadBuilder(downloadAction)
+            .setState(Download.STATE_STOPPED)
+            .setManualStopReason(/* manualStopReason= */ 1);
+    Download download = downloadBuilder.build();
+
+    Download mergedDownload =
+        DownloadManager.mergeAction(download, downloadAction, download.manualStopReason);
+
+    assertEqualIgnoringTimeFields(mergedDownload, download);
+  }
+
+  @Test
+  public void mergeAction_manualStopReasonSetButNotStopped_becomesStopped() {
+    DownloadAction downloadAction = createDownloadAction();
+    DownloadBuilder downloadBuilder =
+        new DownloadBuilder(downloadAction)
+            .setState(Download.STATE_COMPLETED)
+            .setManualStopReason(/* manualStopReason= */ 1);
+    Download download = downloadBuilder.build();
+
+    Download mergedDownload =
+        DownloadManager.mergeAction(download, downloadAction, download.manualStopReason);
+
+    Download expectedDownload = downloadBuilder.setState(Download.STATE_STOPPED).build();
+    assertEqualIgnoringTimeFields(mergedDownload, expectedDownload);
+  }
+
   private void setUpDownloadManager(final int maxActiveDownloadTasks) throws Exception {
     if (downloadManager != null) {
       releaseDownloadManager();
@@ -486,6 +552,26 @@ public class DownloadManagerTest {
     dummyMainThread.runTestOnMainThread(r);
   }
 
+  private static void assertEqualIgnoringTimeFields(Download download, Download that) {
+    assertThat(download.action).isEqualTo(that.action);
+    assertThat(download.state).isEqualTo(that.state);
+    assertThat(download.failureReason).isEqualTo(that.failureReason);
+    assertThat(download.manualStopReason).isEqualTo(that.manualStopReason);
+    assertThat(download.getDownloadPercentage()).isEqualTo(that.getDownloadPercentage());
+    assertThat(download.getDownloadedBytes()).isEqualTo(that.getDownloadedBytes());
+    assertThat(download.getTotalBytes()).isEqualTo(that.getTotalBytes());
+  }
+
+  private static DownloadAction createDownloadAction() {
+    return new DownloadAction(
+        "id",
+        DownloadAction.TYPE_DASH,
+        Uri.parse("https://www.test.com/download"),
+        Collections.emptyList(),
+        /* customCacheKey= */ null,
+        /* data= */ null);
+  }
+
   private final class DownloadRunner {
 
     private final Uri uri;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadTest.java
deleted file mode 100644
index 54b8a8cbb4..0000000000
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadTest.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.offline;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.fail;
-
-import android.net.Uri;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import java.util.Arrays;
-import java.util.Collections;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/** Unit tests for {@link Download}. */
-@RunWith(AndroidJUnit4.class)
-public class DownloadTest {
-
-  private Uri testUri;
-
-  @Before
-  public void setUp() throws Exception {
-    testUri = Uri.parse("https://www.test.com/download1");
-  }
-
-  @Test
-  public void mergeAction_actionHaveDifferentType_throwsException() {
-    DownloadAction downloadAction = createDownloadAction();
-    Download download =
-        new DownloadBuilder(downloadAction)
-            .setType(downloadAction.type + "_different")
-            .setState(Download.STATE_QUEUED)
-            .build();
-
-    try {
-      download.copyWithMergedAction(downloadAction, /* canStart= */ true);
-      fail();
-    } catch (Exception e) {
-      // Expected.
-    }
-  }
-
-  @Test
-  public void mergeAction_actionHaveDifferentId_throwsException() {
-    DownloadAction downloadAction = createDownloadAction();
-    Download download =
-        new DownloadBuilder(downloadAction)
-            .setId(downloadAction.id + "_different")
-            .setState(Download.STATE_QUEUED)
-            .build();
-
-    try {
-      download.copyWithMergedAction(downloadAction, /* canStart= */ true);
-      fail();
-    } catch (Exception e) {
-      // Expected.
-    }
-  }
-
-  @Test
-  public void mergeAction_actionsWithSameIdAndType_doesNotFail() {
-    DownloadAction downloadAction = createDownloadAction();
-    DownloadBuilder downloadBuilder =
-        new DownloadBuilder(downloadAction).setState(Download.STATE_QUEUED);
-    Download download = downloadBuilder.build();
-
-    download.copyWithMergedAction(downloadAction, /* canStart= */ true);
-  }
-
-  @Test
-  public void mergeAction_actionHaveDifferentUri_downloadUriIsUpdated() {
-    DownloadAction downloadAction = createDownloadAction();
-    DownloadBuilder downloadBuilder =
-        new DownloadBuilder(downloadAction)
-            .setUri(downloadAction.uri + "_different")
-            .setState(Download.STATE_QUEUED);
-    Download download = downloadBuilder.build();
-
-    Download mergedDownload = download.copyWithMergedAction(downloadAction, /* canStart= */ true);
-
-    Download expectedDownload = downloadBuilder.setUri(downloadAction.uri).build();
-    assertEqual(mergedDownload, expectedDownload);
-  }
-
-  @Test
-  public void mergeAction_actionHaveDifferentData_downloadDataIsUpdated() {
-    DownloadAction downloadAction =
-        new DownloadAction(
-            "id",
-            DownloadAction.TYPE_DASH,
-            testUri,
-            Collections.emptyList(),
-            /* customCacheKey= */ null,
-            /* data= */ new byte[] {1, 2, 3, 4});
-    DownloadBuilder downloadBuilder =
-        new DownloadBuilder(downloadAction)
-            .setState(Download.STATE_QUEUED)
-            .setCustomMetadata(new byte[0]);
-    Download download = downloadBuilder.build();
-
-    Download mergedDownload = download.copyWithMergedAction(downloadAction, /* canStart= */ true);
-
-    Download expectedDownload = downloadBuilder.setCustomMetadata(downloadAction.data).build();
-    assertEqual(mergedDownload, expectedDownload);
-  }
-
-  @Test
-  public void mergeAction_removingDownloadDownloadAction_stateBecomesRestarting() {
-    DownloadAction downloadAction = createDownloadAction();
-    DownloadBuilder downloadBuilder =
-        new DownloadBuilder(downloadAction).setState(Download.STATE_REMOVING);
-    Download download = downloadBuilder.build();
-
-    Download mergedDownload = download.copyWithMergedAction(downloadAction, /* canStart= */ true);
-
-    Download expectedDownload = downloadBuilder.setState(Download.STATE_RESTARTING).build();
-    assertEqual(mergedDownload, expectedDownload);
-  }
-
-  @Test
-  public void mergeAction_failedDownloadDownloadAction_stateBecomesQueued() {
-    DownloadAction downloadAction = createDownloadAction();
-    DownloadBuilder downloadBuilder =
-        new DownloadBuilder(downloadAction)
-            .setState(Download.STATE_FAILED)
-            .setFailureReason(Download.FAILURE_REASON_UNKNOWN);
-    Download download = downloadBuilder.build();
-
-    Download mergedDownload = download.copyWithMergedAction(downloadAction, /* canStart= */ true);
-
-    Download expectedDownload =
-        downloadBuilder
-            .setState(Download.STATE_QUEUED)
-            .setFailureReason(Download.FAILURE_REASON_NONE)
-            .build();
-    assertEqual(mergedDownload, expectedDownload);
-  }
-
-  @Test
-  public void mergeAction_stoppedDownloadDownloadAction_stateStaysStopped() {
-    DownloadAction downloadAction = createDownloadAction();
-    DownloadBuilder downloadBuilder =
-        new DownloadBuilder(downloadAction)
-            .setState(Download.STATE_STOPPED)
-            .setManualStopReason(/* manualStopReason= */ 1);
-    Download download = downloadBuilder.build();
-
-    Download mergedDownload = download.copyWithMergedAction(downloadAction, /* canStart= */ true);
-
-    assertEqual(mergedDownload, download);
-  }
-
-  @Test
-  public void mergeAction_manualStopReasonSetButNotInStoppedState_stateBecomesStopped() {
-    DownloadAction downloadAction = createDownloadAction();
-    DownloadBuilder downloadBuilder =
-        new DownloadBuilder(downloadAction)
-            .setState(Download.STATE_COMPLETED)
-            .setManualStopReason(/* manualStopReason= */ 1);
-    Download download = downloadBuilder.build();
-
-    Download mergedDownload = download.copyWithMergedAction(downloadAction, /* canStart= */ true);
-
-    Download expectedDownload = downloadBuilder.setState(Download.STATE_STOPPED).build();
-    assertEqual(mergedDownload, expectedDownload);
-  }
-
-  @Test
-  public void mergeAction_returnsMergedKeys() {
-    StreamKey streamKey1 = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
-    StreamKey streamKey2 = new StreamKey(/* groupIndex= */ 1, /* trackIndex= */ 1);
-    StreamKey[] keys1 = new StreamKey[] {streamKey1};
-    StreamKey[] keys2 = new StreamKey[] {streamKey2};
-    StreamKey[] expectedKeys = new StreamKey[] {streamKey1, streamKey2};
-
-    doTestMergeActionReturnsMergedKeys(keys1, keys2, expectedKeys);
-  }
-
-  @Test
-  public void mergeAction_returnsUniqueKeys() {
-    StreamKey streamKey1 = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
-    StreamKey streamKey1Copy = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
-    StreamKey streamKey2 = new StreamKey(/* groupIndex= */ 1, /* trackIndex= */ 1);
-    StreamKey[] keys1 = new StreamKey[] {streamKey1};
-    StreamKey[] keys2 = new StreamKey[] {streamKey2, streamKey1Copy};
-    StreamKey[] expectedKeys = new StreamKey[] {streamKey1, streamKey2};
-
-    doTestMergeActionReturnsMergedKeys(keys1, keys2, expectedKeys);
-  }
-
-  @Test
-  public void mergeAction_ifFirstActionKeysEmpty_returnsEmptyKeys() {
-    StreamKey streamKey1 = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
-    StreamKey streamKey2 = new StreamKey(/* groupIndex= */ 1, /* trackIndex= */ 1);
-    StreamKey[] keys1 = new StreamKey[] {};
-    StreamKey[] keys2 = new StreamKey[] {streamKey2, streamKey1};
-    StreamKey[] expectedKeys = new StreamKey[] {};
-
-    doTestMergeActionReturnsMergedKeys(keys1, keys2, expectedKeys);
-  }
-
-  @Test
-  public void mergeAction_ifNotFirstActionKeysEmpty_returnsEmptyKeys() {
-    StreamKey streamKey1 = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
-    StreamKey streamKey2 = new StreamKey(/* groupIndex= */ 1, /* trackIndex= */ 1);
-    StreamKey[] keys1 = new StreamKey[] {streamKey2, streamKey1};
-    StreamKey[] keys2 = new StreamKey[] {};
-    StreamKey[] expectedKeys = new StreamKey[] {};
-
-    doTestMergeActionReturnsMergedKeys(keys1, keys2, expectedKeys);
-  }
-
-  private void doTestMergeActionReturnsMergedKeys(
-      StreamKey[] keys1, StreamKey[] keys2, StreamKey[] expectedKeys) {
-    DownloadAction downloadAction =
-        new DownloadAction(
-            "id",
-            DownloadAction.TYPE_DASH,
-            testUri,
-            Arrays.asList(keys2),
-            /* customCacheKey= */ null,
-            /* data= */ null);
-    DownloadBuilder downloadBuilder =
-        new DownloadBuilder(downloadAction).setState(Download.STATE_QUEUED).setStreamKeys(keys1);
-    Download download = downloadBuilder.build();
-
-    Download mergedDownload = download.copyWithMergedAction(downloadAction, /* canStart= */ true);
-
-    Download expectedDownload = downloadBuilder.setStreamKeys(expectedKeys).build();
-    assertEqual(mergedDownload, expectedDownload);
-  }
-
-  static void assertEqual(Download download, Download expected) {
-    assertEqual(download, expected, false);
-  }
-
-  static void assertEqual(Download download, Download that, boolean compareTimeFields) {
-    assertThat(download.action).isEqualTo(that.action);
-    assertThat(download.state).isEqualTo(that.state);
-    assertThat(download.getDownloadPercentage()).isEqualTo(that.getDownloadPercentage());
-    assertThat(download.getDownloadedBytes()).isEqualTo(that.getDownloadedBytes());
-    assertThat(download.getTotalBytes()).isEqualTo(that.getTotalBytes());
-    if (compareTimeFields) {
-      assertThat(download.startTimeMs).isEqualTo(that.startTimeMs);
-      assertThat(download.updateTimeMs).isEqualTo(that.updateTimeMs);
-    }
-    assertThat(download.failureReason).isEqualTo(that.failureReason);
-    assertThat(download.manualStopReason).isEqualTo(that.manualStopReason);
-  }
-
-  private DownloadAction createDownloadAction() {
-    return new DownloadAction(
-        "id",
-        DownloadAction.TYPE_DASH,
-        testUri,
-        Collections.emptyList(),
-        /* customCacheKey= */ null,
-        /* data= */ null);
-  }
-}

From c1e25f7768a1bcc3730cf51487c9f7c941137709 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 12 Apr 2019 14:13:26 +0100
Subject: [PATCH 750/832] Add check for retryDelayMs==C.TIME_UNSET in DASH and
 SS manifest onLoadError.

If the returned retry delay is unset, we should use a DONT_RETRY_FATAL action
instead and dispatch the event with the "canceled" flag.

PiperOrigin-RevId: 243251554
---
 .../source/dash/DashMediaSource.java           | 17 +++++++++--------
 .../source/smoothstreaming/SsMediaSource.java  | 18 +++++++++---------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
index 5284f8b936..cdc32553f3 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
@@ -814,7 +814,13 @@ public final class DashMediaSource extends BaseMediaSource {
       long loadDurationMs,
       IOException error,
       int errorCount) {
-    boolean isFatal = error instanceof ParserException;
+    long retryDelayMs =
+        loadErrorHandlingPolicy.getRetryDelayMsFor(
+            C.DATA_TYPE_MANIFEST, loadDurationMs, error, errorCount);
+    LoadErrorAction loadErrorAction =
+        retryDelayMs == C.TIME_UNSET
+            ? Loader.DONT_RETRY_FATAL
+            : Loader.createRetryAction(/* resetErrorCount= */ false, retryDelayMs);
     manifestEventDispatcher.loadError(
         loadable.dataSpec,
         loadable.getUri(),
@@ -824,13 +830,8 @@ public final class DashMediaSource extends BaseMediaSource {
         loadDurationMs,
         loadable.bytesLoaded(),
         error,
-        isFatal);
-    return isFatal
-        ? Loader.DONT_RETRY_FATAL
-        : Loader.createRetryAction(
-            /* resetErrorCount= */ false,
-            loadErrorHandlingPolicy.getRetryDelayMsFor(
-                C.DATA_TYPE_MANIFEST, loadDurationMs, error, errorCount));
+        !loadErrorAction.isRetry());
+    return loadErrorAction;
   }
 
   /* package */ void onUtcTimestampLoadCompleted(ParsingLoadable<Long> loadable,
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
index 1291b846ba..09820f092d 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
@@ -21,7 +21,6 @@ import android.os.SystemClock;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
-import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.offline.FilteringManifestParser;
 import com.google.android.exoplayer2.offline.StreamKey;
@@ -628,7 +627,13 @@ public final class SsMediaSource extends BaseMediaSource
       long loadDurationMs,
       IOException error,
       int errorCount) {
-    boolean isFatal = error instanceof ParserException;
+    long retryDelayMs =
+        loadErrorHandlingPolicy.getRetryDelayMsFor(
+            C.DATA_TYPE_MANIFEST, loadDurationMs, error, errorCount);
+    LoadErrorAction loadErrorAction =
+        retryDelayMs == C.TIME_UNSET
+            ? Loader.DONT_RETRY_FATAL
+            : Loader.createRetryAction(/* resetErrorCount= */ false, retryDelayMs);
     manifestEventDispatcher.loadError(
         loadable.dataSpec,
         loadable.getUri(),
@@ -638,13 +643,8 @@ public final class SsMediaSource extends BaseMediaSource
         loadDurationMs,
         loadable.bytesLoaded(),
         error,
-        isFatal);
-    return isFatal
-        ? Loader.DONT_RETRY_FATAL
-        : Loader.createRetryAction(
-            /* resetErrorCount= */ false,
-            loadErrorHandlingPolicy.getRetryDelayMsFor(
-                C.DATA_TYPE_MANIFEST, loadDurationMs, error, errorCount));
+        !loadErrorAction.isRetry());
+    return loadErrorAction;
   }
 
   // Internal methods

From b2c29da6b39668605c8c3da556b298480d4edd19 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 12 Apr 2019 15:07:07 +0100
Subject: [PATCH 751/832] Finalize DownloadManager interface

- Rename getAllDownloads to getCurrentDownloads to make it clear
  that it doesn't include completed and failed downloads
- Change getDownloadCount to isWaitingForRequirements, which is
  what it's used for. Added TODO to make it returns the right thing

PiperOrigin-RevId: 243257856
---
 .../exoplayer2/offline/DownloadManager.java   | 54 +++++++++++--------
 .../exoplayer2/offline/DownloadService.java   |  4 +-
 .../offline/DownloadManagerTest.java          |  8 +--
 3 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 1a69feadfc..d199ede291 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -276,29 +276,22 @@ public final class DownloadManager {
     return initialized;
   }
 
-  /** Returns whether there are no active downloads. */
+  /**
+   * Returns whether the manager is currently idle. The manager is idle if all downloads are in a
+   * terminal state (i.e. completed or failed), or if no progress can be made (e.g. because the
+   * download requirements are not met).
+   */
   public boolean isIdle() {
     return activeDownloadCount == 0 && pendingMessages == 0;
   }
 
-  /** Returns the used {@link DownloadIndex}. */
-  public DownloadIndex getDownloadIndex() {
-    return downloadIndex;
-  }
-
-  /** Returns the number of downloads. */
-  public int getDownloadCount() {
-    return downloads.size();
-  }
-
-  /** Returns the states of all current downloads. */
-  public Download[] getAllDownloads() {
-    return downloads.toArray(new Download[0]);
-  }
-
-  /** Returns the requirements needed to be met to start downloads. */
-  public Requirements getRequirements() {
-    return requirementsWatcher.getRequirements();
+  /**
+   * Returns whether this manager has one or more downloads that are not progressing for the sole
+   * reason that the {@link #getRequirements() Requirements} are not met.
+   */
+  public boolean isWaitingForRequirements() {
+    // TODO: Fix this to return the right thing.
+    return !downloads.isEmpty();
   }
 
   /**
@@ -319,6 +312,11 @@ public final class DownloadManager {
     listeners.remove(listener);
   }
 
+  /** Returns the requirements needed to be met to start downloads. */
+  public Requirements getRequirements() {
+    return requirementsWatcher.getRequirements();
+  }
+
   /**
    * Sets the requirements needed to be met to start downloads.
    *
@@ -334,6 +332,20 @@ public final class DownloadManager {
     onRequirementsStateChanged(requirementsWatcher, notMetRequirements);
   }
 
+  /** Returns the used {@link DownloadIndex}. */
+  public DownloadIndex getDownloadIndex() {
+    return downloadIndex;
+  }
+
+  /**
+   * Returns current downloads. Downloads that are in terminal states (i.e. completed or failed) are
+   * not included. To query all downloads including those in terminal states, use {@link
+   * #getDownloadIndex()} instead.
+   */
+  public Download[] getCurrentDownloads() {
+    return downloads.toArray(new Download[0]);
+  }
+
   /**
    * Starts all downloads except those that are manually stopped (i.e. have a non-zero {@link
    * Download#manualStopReason}).
@@ -537,7 +549,7 @@ public final class DownloadManager {
         break;
       case MSG_SET_DOWNLOADS_STARTED:
         boolean downloadsStarted = message.arg1 != 0;
-        setDownloadsStartedInternal(downloadsStarted);
+        setDownloadsStarted(downloadsStarted);
         break;
       case MSG_SET_NOT_MET_REQUIREMENTS:
         notMetRequirements = message.arg1;
@@ -598,7 +610,7 @@ public final class DownloadManager {
     }
   }
 
-  private void setDownloadsStartedInternal(boolean downloadsStarted) {
+  private void setDownloadsStarted(boolean downloadsStarted) {
     if (this.downloadsStarted == downloadsStarted) {
       return;
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index 52d2aa21d3..955a08ffe4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -469,7 +469,7 @@ public abstract class DownloadService extends Service {
   public void onDestroy() {
     logd("onDestroy");
     DownloadManagerHelper downloadManagerHelper = downloadManagerListeners.get(getClass());
-    boolean unschedule = downloadManager.getDownloadCount() <= 0;
+    boolean unschedule = !downloadManager.isWaitingForRequirements();
     downloadManagerHelper.detachService(this, unschedule);
     if (foregroundNotificationUpdater != null) {
       foregroundNotificationUpdater.stopPeriodicUpdates();
@@ -609,7 +609,7 @@ public abstract class DownloadService extends Service {
     }
 
     public void update() {
-      Download[] downloads = downloadManager.getAllDownloads();
+      Download[] downloads = downloadManager.getCurrentDownloads();
       startForeground(notificationId, getForegroundNotification(downloads));
       notificationDisplayed = true;
       if (periodicUpdatesStarted) {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index 1412f7e247..a89f235e87 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -346,12 +346,12 @@ public class DownloadManagerTest {
     TaskWrapper task3 = new DownloadRunner(uri3).postDownloadAction().postRemoveAction().getTask();
 
     task3.assertRemoving();
-    Download[] states = downloadManager.getAllDownloads();
+    Download[] downloads = downloadManager.getCurrentDownloads();
 
-    assertThat(states).hasLength(3);
+    assertThat(downloads).hasLength(3);
     String[] taskIds = {task1.taskId, task2.taskId, task3.taskId};
-    String[] stateTaskIds = {states[0].action.id, states[1].action.id, states[2].action.id};
-    assertThat(stateTaskIds).isEqualTo(taskIds);
+    String[] downloadIds = {downloads[0].action.id, downloads[1].action.id, downloads[2].action.id};
+    assertThat(downloadIds).isEqualTo(taskIds);
   }
 
   @Test

From 97acc681d10036c0b90573c5ba7d701c45f1e979 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 12 Apr 2019 19:49:19 +0100
Subject: [PATCH 752/832] Add HlsMetadataEntries to HlsMasterPlaylist's
 variants and renditions

PiperOrigin-RevId: 243304549
---
 .../hls/playlist/HlsMasterPlaylist.java       |  5 ++
 .../hls/playlist/HlsPlaylistParser.java       | 81 ++++++++++++-------
 2 files changed, 59 insertions(+), 27 deletions(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
index 52624f1730..0e86df8c2f 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
@@ -120,6 +120,11 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
           /* subtitleGroupId= */ null,
           /* captionGroupId= */ null);
     }
+
+    /** Returns a copy of this instance with the given {@link Format}. */
+    public Variant copyWithFormat(Format format) {
+      return new Variant(url, format, videoGroupId, audioGroupId, subtitleGroupId, captionGroupId);
+    }
   }
 
   /** A rendition (i.e. an #EXT-X-MEDIA tag) in a master playlist. */
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
index 96df95cc74..42b27f259f 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
@@ -25,11 +25,15 @@ import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil;
+import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.source.UnrecognizedInputFormatException;
+import com.google.android.exoplayer2.source.hls.HlsTrackMetadataEntry;
+import com.google.android.exoplayer2.source.hls.HlsTrackMetadataEntry.VariantInfo;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.Rendition;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.Variant;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist.Segment;
 import com.google.android.exoplayer2.upstream.ParsingLoadable;
+import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.UriUtil;
 import com.google.android.exoplayer2.util.Util;
@@ -252,10 +256,9 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
 
   private static HlsMasterPlaylist parseMasterPlaylist(LineIterator iterator, String baseUri)
       throws IOException {
-    HashSet<String> variantUrls = new HashSet<>();
+    HashMap<Uri, ArrayList<VariantInfo>> urlToVariantInfos = new HashMap<>();
     HashMap<String, String> variableDefinitions = new HashMap<>();
     ArrayList<Variant> variants = new ArrayList<>();
-    ArrayList<Variant> deduplicatedVariants = new ArrayList<>();
     ArrayList<Rendition> videos = new ArrayList<>();
     ArrayList<Rendition> audios = new ArrayList<>();
     ArrayList<Rendition> subtitles = new ArrayList<>();
@@ -357,10 +360,30 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
             new Variant(
                 uri, format, videoGroupId, audioGroupId, subtitlesGroupId, closedCaptionsGroupId);
         variants.add(variant);
-        // TODO: Don't deduplicate variants by URL.
-        if (variantUrls.add(line)) {
-          deduplicatedVariants.add(variant);
+        ArrayList<VariantInfo> variantInfosForUrl = urlToVariantInfos.get(uri);
+        if (variantInfosForUrl == null) {
+          variantInfosForUrl = new ArrayList<>();
+          urlToVariantInfos.put(uri, variantInfosForUrl);
         }
+        variantInfosForUrl.add(
+            new VariantInfo(
+                bitrate, videoGroupId, audioGroupId, subtitlesGroupId, closedCaptionsGroupId));
+      }
+    }
+
+    // TODO: Don't deduplicate variants by URL.
+    ArrayList<Variant> deduplicatedVariants = new ArrayList<>();
+    HashSet<Uri> urlsInDeduplicatedVariants = new HashSet<>();
+    for (int i = 0; i < variants.size(); i++) {
+      Variant variant = variants.get(i);
+      if (urlsInDeduplicatedVariants.add(variant.url)) {
+        Assertions.checkState(variant.format.metadata == null);
+        HlsTrackMetadataEntry hlsMetadataEntry =
+            new HlsTrackMetadataEntry(
+                /* groupId= */ null, /* name= */ null, urlToVariantInfos.get(variant.url));
+        deduplicatedVariants.add(
+            variant.copyWithFormat(
+                variant.format.copyWithMetadata(new Metadata(hlsMetadataEntry))));
       }
     }
 
@@ -375,6 +398,8 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
       @C.RoleFlags int roleFlags = parseRoleFlags(line, variableDefinitions);
       String formatId = groupId + ":" + name;
       Format format;
+      Metadata metadata =
+          new Metadata(new HlsTrackMetadataEntry(groupId, name, Collections.emptyList()));
       switch (parseStringAttr(line, REGEX_TYPE, variableDefinitions)) {
         case TYPE_VIDEO:
           Variant variant = getVariantWithVideoGroup(variants, groupId);
@@ -392,18 +417,19 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
           String sampleMimeType = codecs != null ? MimeTypes.getMediaMimeType(codecs) : null;
           format =
               Format.createVideoContainerFormat(
-                  /* id= */ formatId,
-                  /* label= */ name,
-                  /* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
-                  sampleMimeType,
-                  codecs,
-                  /* bitrate= */ Format.NO_VALUE,
-                  width,
-                  height,
-                  frameRate,
-                  /* initializationData= */ null,
-                  selectionFlags,
-                  roleFlags);
+                      /* id= */ formatId,
+                      /* label= */ name,
+                      /* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
+                      sampleMimeType,
+                      codecs,
+                      /* bitrate= */ Format.NO_VALUE,
+                      width,
+                      height,
+                      frameRate,
+                      /* initializationData= */ null,
+                      selectionFlags,
+                      roleFlags)
+                  .copyWithMetadata(metadata);
           if (uri == null) {
             // TODO: Remove this case and add a Rendition with a null uri to videos.
           } else {
@@ -436,21 +462,22 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
             // TODO: Remove muxedAudioFormat and add a Rendition with a null uri to audios.
             muxedAudioFormat = format;
           } else {
-            audios.add(new Rendition(uri, format, groupId, name));
+            audios.add(new Rendition(uri, format.copyWithMetadata(metadata), groupId, name));
           }
           break;
         case TYPE_SUBTITLES:
           format =
               Format.createTextContainerFormat(
-                  /* id= */ formatId,
-                  /* label= */ name,
-                  /* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
-                  /* sampleMimeType= */ MimeTypes.TEXT_VTT,
-                  /* codecs= */ null,
-                  /* bitrate= */ Format.NO_VALUE,
-                  selectionFlags,
-                  roleFlags,
-                  language);
+                      /* id= */ formatId,
+                      /* label= */ name,
+                      /* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
+                      /* sampleMimeType= */ MimeTypes.TEXT_VTT,
+                      /* codecs= */ null,
+                      /* bitrate= */ Format.NO_VALUE,
+                      selectionFlags,
+                      roleFlags,
+                      language)
+                  .copyWithMetadata(metadata);
           subtitles.add(new Rendition(uri, format, groupId, name));
           break;
         case TYPE_CLOSED_CAPTIONS:

From 2e3eac25b79453d9a0c4ca86c1b32fccf55d949b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Sat, 13 Apr 2019 01:44:55 +0100
Subject: [PATCH 753/832] Cleanly detach DownloadThreads on release

- Make a best effort to avoid posting MSG_DOWNLOAD_THREAD_STOPPED
  if the internal thread has already quit. Doing so is harmless,
  but causes an error in Logcat. We used to generate this warning
  quite a bit in ExoPlayerImplInternal as well, and we got quite
  a few issues filed about it, so best to avoid it if possible.
- Null out the back reference DownloadThread holds to its manager
  on release. This avoids a potential issue where a download thread
  can prevent GC of its manager if it doesn't cancel quickly.
  There's similar logic (with a similar comment) in Loader.LoadTask.

PiperOrigin-RevId: 243365143
---
 .../exoplayer2/offline/DownloadManager.java   | 43 ++++++++++++++-----
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index d199ede291..65db8a5d9b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -718,9 +718,11 @@ public final class DownloadManager {
   }
 
   private void releaseInternal() {
-    for (String downloadId : downloadThreads.keySet()) {
-      stopDownloadThreadInternal(downloadId);
+    for (DownloadThread downloadThread : downloadThreads.values()) {
+      downloadThread.cancel(/* released= */ true);
     }
+    downloadThreads.clear();
+    downloadInternals.clear();
     internalThread.quit();
     synchronized (releaseLock) {
       released = true;
@@ -769,7 +771,9 @@ public final class DownloadManager {
       }
       simultaneousDownloads++;
     }
-    DownloadThread downloadThread = new DownloadThread(action, isRemove);
+    Downloader downloader = downloaderFactory.createDownloader(action);
+    DownloadThread downloadThread =
+        new DownloadThread(action, downloader, isRemove, minRetryCount, internalHandler);
     downloadThreads.put(downloadId, downloadThread);
     downloadInternal.setCounters(downloadThread.downloader.getCounters());
     downloadThread.start();
@@ -780,7 +784,7 @@ public final class DownloadManager {
   private boolean stopDownloadThreadInternal(String downloadId) {
     DownloadThread downloadThread = downloadThreads.get(downloadId);
     if (downloadThread != null && !downloadThread.isRemove) {
-      downloadThread.cancel();
+      downloadThread.cancel(/* released= */ false);
       logd("Download is cancelled", downloadThread.action);
       return true;
     }
@@ -1023,22 +1027,38 @@ public final class DownloadManager {
     }
   }
 
-  private class DownloadThread extends Thread {
+  private static class DownloadThread extends Thread {
 
     private final DownloadAction action;
-    private final boolean isRemove;
     private final Downloader downloader;
+    private final boolean isRemove;
+    private final int minRetryCount;
 
+    private volatile Handler onStoppedHandler;
     private volatile boolean isCanceled;
     private Throwable finalError;
 
-    private DownloadThread(DownloadAction action, boolean isRemove) {
+    private DownloadThread(
+        DownloadAction action,
+        Downloader downloader,
+        boolean isRemove,
+        int minRetryCount,
+        Handler onStoppedHandler) {
       this.action = action;
       this.isRemove = isRemove;
-      downloader = downloaderFactory.createDownloader(action);
+      this.downloader = downloader;
+      this.minRetryCount = minRetryCount;
+      this.onStoppedHandler = onStoppedHandler;
     }
 
-    public void cancel() {
+    public void cancel(boolean released) {
+      if (released) {
+        // Download threads are GC roots for as long as they're running. The time taken for
+        // cancellation to complete depends on the implementation of the downloader being used. We
+        // null the handler reference here so that it doesn't prevent garbage collection of the
+        // download manager whilst cancellation is ongoing.
+        onStoppedHandler = null;
+      }
       isCanceled = true;
       downloader.cancel();
       interrupt();
@@ -1079,7 +1099,10 @@ public final class DownloadManager {
       } catch (Throwable e) {
         finalError = e;
       }
-      internalHandler.obtainMessage(MSG_DOWNLOAD_THREAD_STOPPED, this).sendToTarget();
+      Handler onStoppedHandler = this.onStoppedHandler;
+      if (onStoppedHandler != null) {
+        onStoppedHandler.obtainMessage(MSG_DOWNLOAD_THREAD_STOPPED, this).sendToTarget();
+      }
     }
 
     private int getRetryDelayMillis(int errorCount) {

From 1bf1790edc9428f1b77591f0911f60e97abdf3d5 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Mon, 15 Apr 2019 11:00:12 +0100
Subject: [PATCH 754/832] Extract factory method for FragmentedMp4Extractor in
 DefaultHlsExtractorFactory

PiperOrigin-RevId: 243582468
---
 library/dash/src/main/proguard-rules.txt      |  1 +
 .../hls/DefaultHlsExtractorFactory.java       | 27 ++++++++++---------
 library/hls/src/main/proguard-rules.txt       |  1 +
 .../src/main/proguard-rules.txt               |  1 +
 4 files changed, 18 insertions(+), 12 deletions(-)
 create mode 120000 library/dash/src/main/proguard-rules.txt
 create mode 120000 library/hls/src/main/proguard-rules.txt
 create mode 120000 library/smoothstreaming/src/main/proguard-rules.txt

diff --git a/library/dash/src/main/proguard-rules.txt b/library/dash/src/main/proguard-rules.txt
new file mode 120000
index 0000000000..499fb08b36
--- /dev/null
+++ b/library/dash/src/main/proguard-rules.txt
@@ -0,0 +1 @@
+../../proguard-rules.txt
\ No newline at end of file
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
index 5cfbb960d5..9fde54a705 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2.source.hls;
 
 import android.net.Uri;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.drm.DrmInitData;
@@ -157,12 +158,7 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
 
     if (!(extractorByFileExtension instanceof FragmentedMp4Extractor)) {
       FragmentedMp4Extractor fragmentedMp4Extractor =
-          new FragmentedMp4Extractor(
-              /* flags= */ 0,
-              timestampAdjuster,
-              /* sideloadedTrack= */ null,
-              drmInitData,
-              muxedCaptionFormats != null ? muxedCaptionFormats : Collections.emptyList());
+          createFragmentedMp4Extractor(timestampAdjuster, drmInitData, muxedCaptionFormats);
       if (sniffQuietly(fragmentedMp4Extractor, extractorInput)) {
         return buildResult(fragmentedMp4Extractor);
       }
@@ -212,12 +208,7 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
         || lastPathSegment.startsWith(M4_FILE_EXTENSION_PREFIX, lastPathSegment.length() - 4)
         || lastPathSegment.startsWith(MP4_FILE_EXTENSION_PREFIX, lastPathSegment.length() - 5)
         || lastPathSegment.startsWith(CMF_FILE_EXTENSION_PREFIX, lastPathSegment.length() - 5)) {
-      return new FragmentedMp4Extractor(
-          /* flags= */ 0,
-          timestampAdjuster,
-          /* sideloadedTrack= */ null,
-          drmInitData,
-          muxedCaptionFormats != null ? muxedCaptionFormats : Collections.emptyList());
+      return createFragmentedMp4Extractor(timestampAdjuster, drmInitData, muxedCaptionFormats);
     } else {
       // For any other file extension, we assume TS format.
       return createTsExtractor(
@@ -274,6 +265,18 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
         new DefaultTsPayloadReaderFactory(payloadReaderFactoryFlags, muxedCaptionFormats));
   }
 
+  private static FragmentedMp4Extractor createFragmentedMp4Extractor(
+      TimestampAdjuster timestampAdjuster,
+      DrmInitData drmInitData,
+      @Nullable List<Format> muxedCaptionFormats) {
+    return new FragmentedMp4Extractor(
+        /* flags= */ 0,
+        timestampAdjuster,
+        /* sideloadedTrack= */ null,
+        drmInitData,
+        muxedCaptionFormats != null ? muxedCaptionFormats : Collections.emptyList());
+  }
+
   private static Result buildResultForSameExtractorType(
       Extractor previousExtractor, Format format, TimestampAdjuster timestampAdjuster) {
     if (previousExtractor instanceof WebvttExtractor) {
diff --git a/library/hls/src/main/proguard-rules.txt b/library/hls/src/main/proguard-rules.txt
new file mode 120000
index 0000000000..499fb08b36
--- /dev/null
+++ b/library/hls/src/main/proguard-rules.txt
@@ -0,0 +1 @@
+../../proguard-rules.txt
\ No newline at end of file
diff --git a/library/smoothstreaming/src/main/proguard-rules.txt b/library/smoothstreaming/src/main/proguard-rules.txt
new file mode 120000
index 0000000000..499fb08b36
--- /dev/null
+++ b/library/smoothstreaming/src/main/proguard-rules.txt
@@ -0,0 +1 @@
+../../proguard-rules.txt
\ No newline at end of file

From 75238e5e4f8813961902893c50d0d41c13eaa239 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 15 Apr 2019 11:51:43 +0100
Subject: [PATCH 755/832] Remove duplications from handleSourceInfoRefreshed.

handleSourceInfoRefreshed checks for various conditions which may trigger a
change in position. In all cases, we need to resolve the new position for ads,
and if the corresponding MediaPeriods already exist, perform the seek to the new
position.

This change simplified the code by
 1. Moving all conditions in a single if-else structure which just determines
    the new playback position. This makes it easier to read and to follow.
 2. Doing the subsequent seek and position update in one final step to remove
    duplicated code.

As a side effect, it also improves some edge cases. For example when skipping
an ad to an already prebuffered period, we now properly update the existing
prebuffered period.

PiperOrigin-RevId: 243588014
---
 .../exoplayer2/ExoPlayerImplInternal.java     | 142 ++++++------------
 1 file changed, 50 insertions(+), 92 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index e61c689233..a7ee6eb86e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -1262,6 +1262,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
       // Stale event.
       return;
     }
+    playbackInfoUpdate.incrementPendingOperationAcks(pendingPrepareCount);
+    pendingPrepareCount = 0;
 
     Timeline oldTimeline = playbackInfo.timeline;
     Timeline timeline = sourceRefreshInfo.timeline;
@@ -1270,119 +1272,75 @@ import java.util.concurrent.atomic.AtomicBoolean;
     playbackInfo = playbackInfo.copyWithTimeline(timeline, manifest);
     resolvePendingMessagePositions();
 
-    if (pendingPrepareCount > 0) {
-      playbackInfoUpdate.incrementPendingOperationAcks(pendingPrepareCount);
-      pendingPrepareCount = 0;
-      if (pendingInitialSeekPosition != null) {
-        Pair<Object, Long> periodPosition =
-            resolveSeekPosition(pendingInitialSeekPosition, /* trySubsequentPeriods= */ true);
-        pendingInitialSeekPosition = null;
-        if (periodPosition == null) {
-          // The seek position was valid for the timeline that it was performed into, but the
-          // timeline has changed and a suitable seek position could not be resolved in the new one.
-          handleSourceInfoRefreshEndedPlayback();
-        } else {
-          Object periodUid = periodPosition.first;
-          long positionUs = periodPosition.second;
-          MediaPeriodId periodId = queue.resolveMediaPeriodIdForAds(periodUid, positionUs);
-          playbackInfo =
-              playbackInfo.resetToNewPosition(
-                  periodId, periodId.isAd() ? 0 : positionUs, /* contentPositionUs= */ positionUs);
-        }
-      } else if (playbackInfo.startPositionUs == C.TIME_UNSET) {
-        if (timeline.isEmpty()) {
-          handleSourceInfoRefreshEndedPlayback();
-        } else {
-          Pair<Object, Long> defaultPosition =
-              getPeriodPosition(
-                  timeline, timeline.getFirstWindowIndex(shuffleModeEnabled), C.TIME_UNSET);
-          Object periodUid = defaultPosition.first;
-          long startPositionUs = defaultPosition.second;
-          MediaPeriodId periodId = queue.resolveMediaPeriodIdForAds(periodUid, startPositionUs);
-          playbackInfo =
-              playbackInfo.resetToNewPosition(
-                  periodId,
-                  periodId.isAd() ? 0 : startPositionUs,
-                  /* contentPositionUs= */ startPositionUs);
-        }
+    MediaPeriodId newPeriodId = playbackInfo.periodId;
+    long oldContentPositionUs =
+        playbackInfo.periodId.isAd() ? playbackInfo.contentPositionUs : playbackInfo.positionUs;
+    long newContentPositionUs = oldContentPositionUs;
+    if (pendingInitialSeekPosition != null) {
+      // Resolve initial seek position.
+      Pair<Object, Long> periodPosition =
+          resolveSeekPosition(pendingInitialSeekPosition, /* trySubsequentPeriods= */ true);
+      pendingInitialSeekPosition = null;
+      if (periodPosition == null) {
+        // The seek position was valid for the timeline that it was performed into, but the
+        // timeline has changed and a suitable seek position could not be resolved in the new one.
+        handleSourceInfoRefreshEndedPlayback();
+        return;
       }
-      return;
-    }
-
-    if (oldTimeline.isEmpty()) {
-      // If the old timeline is empty, the period queue is also empty.
-      if (!timeline.isEmpty()) {
-        Pair<Object, Long> defaultPosition =
-            getPeriodPosition(
-                timeline, timeline.getFirstWindowIndex(shuffleModeEnabled), C.TIME_UNSET);
-        Object periodUid = defaultPosition.first;
-        long startPositionUs = defaultPosition.second;
-        MediaPeriodId periodId = queue.resolveMediaPeriodIdForAds(periodUid, startPositionUs);
-        playbackInfo =
-            playbackInfo.resetToNewPosition(
-                periodId,
-                /* startPositionUs= */ periodId.isAd() ? 0 : startPositionUs,
-                /* contentPositionUs= */ startPositionUs);
-      }
-      return;
-    }
-    MediaPeriodHolder periodHolder = queue.getFrontPeriod();
-    long contentPositionUs = playbackInfo.contentPositionUs;
-    Object playingPeriodUid =
-        periodHolder == null ? playbackInfo.periodId.periodUid : periodHolder.uid;
-    int periodIndex = timeline.getIndexOfPeriod(playingPeriodUid);
-    if (periodIndex == C.INDEX_UNSET) {
-      // We didn't find the current period in the new timeline. Attempt to resolve a subsequent
-      // period whose window we can restart from.
-      Object newPeriodUid = resolveSubsequentPeriod(playingPeriodUid, oldTimeline, timeline);
+      newContentPositionUs = periodPosition.second;
+      newPeriodId = queue.resolveMediaPeriodIdForAds(periodPosition.first, newContentPositionUs);
+    } else if (oldContentPositionUs == C.TIME_UNSET && !timeline.isEmpty()) {
+      // Resolve unset start position to default position.
+      Pair<Object, Long> defaultPosition =
+          getPeriodPosition(
+              timeline, timeline.getFirstWindowIndex(shuffleModeEnabled), C.TIME_UNSET);
+      newContentPositionUs = defaultPosition.second;
+      newPeriodId = queue.resolveMediaPeriodIdForAds(defaultPosition.first, newContentPositionUs);
+    } else if (timeline.getIndexOfPeriod(newPeriodId.periodUid) == C.INDEX_UNSET) {
+      // The current period isn't in the new timeline. Attempt to resolve a subsequent period whose
+      // window we can restart from.
+      Object newPeriodUid = resolveSubsequentPeriod(newPeriodId.periodUid, oldTimeline, timeline);
       if (newPeriodUid == null) {
         // We failed to resolve a suitable restart position.
         handleSourceInfoRefreshEndedPlayback();
         return;
       }
-      // We resolved a subsequent period. Seek to the default position in the corresponding window.
+      // We resolved a subsequent period. Start at the default position in the corresponding window.
       Pair<Object, Long> defaultPosition =
           getPeriodPosition(
               timeline, timeline.getPeriodByUid(newPeriodUid, period).windowIndex, C.TIME_UNSET);
-      newPeriodUid = defaultPosition.first;
-      contentPositionUs = defaultPosition.second;
-      MediaPeriodId periodId = queue.resolveMediaPeriodIdForAds(newPeriodUid, contentPositionUs);
+      newContentPositionUs = defaultPosition.second;
+      newPeriodId = queue.resolveMediaPeriodIdForAds(defaultPosition.first, newContentPositionUs);
+    } else if (newPeriodId.isAd()) {
+      // Recheck if the current ad still needs to be played.
+      newPeriodId = queue.resolveMediaPeriodIdForAds(newPeriodId.periodUid, newContentPositionUs);
+    }
+
+    if (playbackInfo.periodId.equals(newPeriodId) && oldContentPositionUs == newContentPositionUs) {
+      // We can keep the current playing period. Update the rest of the queued periods.
+      if (!queue.updateQueuedPeriods(rendererPositionUs, getMaxRendererReadPositionUs())) {
+        seekToCurrentPosition(/* sendDiscontinuity= */ false);
+      }
+      handleLoadingMediaPeriodChanged(/* loadingTrackSelectionChanged= */ false);
+    } else {
+      // Something changed. Seek to new start position.
+      MediaPeriodHolder periodHolder = queue.getFrontPeriod();
       if (periodHolder != null) {
         // Update the new playing media period info if it already exists.
         while (periodHolder.getNext() != null) {
           periodHolder = periodHolder.getNext();
-          if (periodHolder.info.id.equals(periodId)) {
+          if (periodHolder.info.id.equals(newPeriodId)) {
             periodHolder.info = queue.getUpdatedMediaPeriodInfo(periodHolder.info);
           }
         }
       }
       // Actually do the seek.
-      long seekPositionUs = seekToPeriodPosition(periodId, periodId.isAd() ? 0 : contentPositionUs);
+      long newPositionUs = newPeriodId.isAd() ? 0 : newContentPositionUs;
+      long seekedToPositionUs = seekToPeriodPosition(newPeriodId, newPositionUs);
       playbackInfo =
           playbackInfo.copyWithNewPosition(
-              periodId, seekPositionUs, contentPositionUs, getTotalBufferedDurationUs());
-      return;
+              newPeriodId, seekedToPositionUs, newContentPositionUs, getTotalBufferedDurationUs());
     }
-
-    MediaPeriodId playingPeriodId = playbackInfo.periodId;
-    if (playingPeriodId.isAd()) {
-      MediaPeriodId periodId =
-          queue.resolveMediaPeriodIdForAds(playingPeriodUid, contentPositionUs);
-      if (!periodId.equals(playingPeriodId)) {
-        // The previously playing ad should no longer be played, so skip it.
-        long seekPositionUs =
-            seekToPeriodPosition(periodId, periodId.isAd() ? 0 : contentPositionUs);
-        playbackInfo =
-            playbackInfo.copyWithNewPosition(
-                periodId, seekPositionUs, contentPositionUs, getTotalBufferedDurationUs());
-        return;
-      }
-    }
-
-    if (!queue.updateQueuedPeriods(rendererPositionUs, getMaxRendererReadPositionUs())) {
-      seekToCurrentPosition(/* sendDiscontinuity= */ false);
-    }
-    handleLoadingMediaPeriodChanged(/* loadingTrackSelectionChanged= */ false);
   }
 
   private long getMaxRendererReadPositionUs() {

From 1ee51518ae032569f4b333006bf8076c3b4a3efc Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 15 Apr 2019 12:33:54 +0100
Subject: [PATCH 756/832] Use new exoplayer.dev domain everywhere.

The old domain automatically forwards to the new one. For consistency, change
all doc and code references regardless.

Also adds GitHub CNAME config file which configures our page for the custom
domain.

PiperOrigin-RevId: 243592110
---
 .github/ISSUE_TEMPLATE/bug.md                                 | 4 ++--
 .github/ISSUE_TEMPLATE/content_not_playing.md                 | 4 ++--
 .github/ISSUE_TEMPLATE/question.md                            | 2 +-
 README.md                                                     | 4 ++--
 extensions/cast/README.md                                     | 2 +-
 extensions/cronet/README.md                                   | 4 ++--
 extensions/ffmpeg/README.md                                   | 4 ++--
 extensions/flac/README.md                                     | 2 +-
 extensions/gvr/README.md                                      | 2 +-
 extensions/ima/README.md                                      | 4 ++--
 extensions/leanback/README.md                                 | 2 +-
 extensions/mediasession/README.md                             | 2 +-
 extensions/okhttp/README.md                                   | 4 ++--
 extensions/opus/README.md                                     | 2 +-
 extensions/rtmp/README.md                                     | 4 ++--
 extensions/vp9/README.md                                      | 2 +-
 library/all/README.md                                         | 2 +-
 library/core/README.md                                        | 2 +-
 .../java/com/google/android/exoplayer2/SimpleExoPlayer.java   | 2 +-
 library/dash/README.md                                        | 2 +-
 library/hls/README.md                                         | 2 +-
 library/smoothstreaming/README.md                             | 2 +-
 library/ui/README.md                                          | 2 +-
 23 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index f2cc754221..690069ffa8 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -10,11 +10,11 @@ Before filing a bug:
 -----------------------
 - Search existing issues, including issues that are closed.
 - Consult our FAQs, supported devices and supported formats pages. These can be
-  found at https://google.github.io/ExoPlayer/.
+  found at https://exoplayer.dev/.
 - Rule out issues in your own code. A good way to do this is to try and
   reproduce the issue in the ExoPlayer demo app. Information about the ExoPlayer
   demo app can be found here:
-  http://google.github.io/ExoPlayer/demo-application.html.
+  http://exoplayer.dev/demo-application.html.
 
 When reporting a bug:
 -----------------------
diff --git a/.github/ISSUE_TEMPLATE/content_not_playing.md b/.github/ISSUE_TEMPLATE/content_not_playing.md
index a8265c4bd6..f326e7cd46 100644
--- a/.github/ISSUE_TEMPLATE/content_not_playing.md
+++ b/.github/ISSUE_TEMPLATE/content_not_playing.md
@@ -10,10 +10,10 @@ Before filing a content issue:
 ------------------------------
 - Search existing issues, including issues that are closed.
 - Consult our supported formats page, which can be found at
-  https://google.github.io/ExoPlayer/supported-formats.html.
+  https://exoplayer.dev/supported-formats.html.
 - Try playing your content in the ExoPlayer demo app. Information about the
   ExoPlayer demo app can be found here:
-  http://google.github.io/ExoPlayer/demo-application.html.
+  http://exoplayer.dev/demo-application.html.
 
 When reporting a content issue:
 -----------------------------
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 57202f17dd..3ed569862f 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -13,7 +13,7 @@ Before filing a question:
 - Search existing issues, including issues that are closed. It’s often the
   quickest way to get an answer!
 - Consult our FAQs, developer guide and the class reference of ExoPlayer. These
-  can be found at https://google.github.io/ExoPlayer/.
+  can be found at https://exoplayer.dev/.
 
 When filing a question:
 -----------------------
diff --git a/README.md b/README.md
index cedafe0ad9..a369b077f4 100644
--- a/README.md
+++ b/README.md
@@ -15,8 +15,8 @@ and extend, and can be updated through Play Store application updates.
 * Follow our [developer blog][] to keep up to date with the latest ExoPlayer
   developments!
 
-[developer guide]: https://google.github.io/ExoPlayer/guide.html
-[class reference]: https://google.github.io/ExoPlayer/doc/reference
+[developer guide]: https://exoplayer.dev/guide.html
+[class reference]: https://exoplayer.dev/doc/reference
 [release notes]: https://github.com/google/ExoPlayer/blob/release-v2/RELEASENOTES.md
 [developer blog]: https://medium.com/google-exoplayer
 
diff --git a/extensions/cast/README.md b/extensions/cast/README.md
index cc72c5f9bc..1c0d7ac56f 100644
--- a/extensions/cast/README.md
+++ b/extensions/cast/README.md
@@ -5,7 +5,7 @@
 The cast extension is a [Player][] implementation that controls playback on a
 Cast receiver app.
 
-[Player]: https://google.github.io/ExoPlayer/doc/reference/index.html?com/google/android/exoplayer2/Player.html
+[Player]: https://exoplayer.dev/doc/reference/index.html?com/google/android/exoplayer2/Player.html
 
 ## Getting the extension ##
 
diff --git a/extensions/cronet/README.md b/extensions/cronet/README.md
index f1f6d68c81..dc64b862b6 100644
--- a/extensions/cronet/README.md
+++ b/extensions/cronet/README.md
@@ -2,7 +2,7 @@
 
 The Cronet extension is an [HttpDataSource][] implementation using [Cronet][].
 
-[HttpDataSource]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer2/upstream/HttpDataSource.html
+[HttpDataSource]: https://exoplayer.dev/doc/reference/com/google/android/exoplayer2/upstream/HttpDataSource.html
 [Cronet]: https://chromium.googlesource.com/chromium/src/+/master/components/cronet?autodive=0%2F%2F
 
 ## Getting the extension ##
@@ -52,4 +52,4 @@ respectively.
 * [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.cronet.*`
   belong to this module.
 
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/extensions/ffmpeg/README.md b/extensions/ffmpeg/README.md
index 52dacf8166..5b68f1e352 100644
--- a/extensions/ffmpeg/README.md
+++ b/extensions/ffmpeg/README.md
@@ -147,11 +147,11 @@ then implement your own logic to use the renderer for a given track.
 [top level README]: https://github.com/google/ExoPlayer/blob/release-v2/README.md
 [Android NDK]: https://developer.android.com/tools/sdk/ndk/index.html
 [#2781]: https://github.com/google/ExoPlayer/issues/2781
-[Supported formats]: https://google.github.io/ExoPlayer/supported-formats.html#ffmpeg-extension
+[Supported formats]: https://exoplayer.dev/supported-formats.html#ffmpeg-extension
 
 ## Links ##
 
 * [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.ffmpeg.*`
   belong to this module.
 
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/extensions/flac/README.md b/extensions/flac/README.md
index 54701eea1d..78035f4d87 100644
--- a/extensions/flac/README.md
+++ b/extensions/flac/README.md
@@ -95,4 +95,4 @@ player, then implement your own logic to use the renderer for a given track.
 * [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.flac.*`
   belong to this module.
 
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/extensions/gvr/README.md b/extensions/gvr/README.md
index 5dab885436..1874ff77d7 100644
--- a/extensions/gvr/README.md
+++ b/extensions/gvr/README.md
@@ -37,4 +37,4 @@ locally. Instructions for doing this can be found in ExoPlayer's
 * [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.gvr.*`
   belong to this module.
 
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/extensions/ima/README.md b/extensions/ima/README.md
index e13cd85590..4ed6a5428a 100644
--- a/extensions/ima/README.md
+++ b/extensions/ima/README.md
@@ -5,7 +5,7 @@ The IMA extension is an [AdsLoader][] implementation wrapping the
 alongside content.
 
 [IMA]: https://developers.google.com/interactive-media-ads/docs/sdks/android/
-[AdsLoader]: https://google.github.io/ExoPlayer/doc/reference/index.html?com/google/android/exoplayer2/source/ads/AdsLoader.html
+[AdsLoader]: https://exoplayer.dev/doc/reference/index.html?com/google/android/exoplayer2/source/ads/AdsLoader.html
 
 ## Getting the extension ##
 
@@ -61,4 +61,4 @@ playback.
 * [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.ima.*`
   belong to this module.
 
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/extensions/leanback/README.md b/extensions/leanback/README.md
index 4eba6552e1..b6eb085247 100644
--- a/extensions/leanback/README.md
+++ b/extensions/leanback/README.md
@@ -28,4 +28,4 @@ locally. Instructions for doing this can be found in ExoPlayer's
 * [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.leanback.*`
   belong to this module.
 
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/extensions/mediasession/README.md b/extensions/mediasession/README.md
index bd6b59c0c1..64b55a8036 100644
--- a/extensions/mediasession/README.md
+++ b/extensions/mediasession/README.md
@@ -29,4 +29,4 @@ locally. Instructions for doing this can be found in ExoPlayer's
 * [Javadoc][]: Classes matching
   `com.google.android.exoplayer2.ext.mediasession.*` belong to this module.
 
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/extensions/okhttp/README.md b/extensions/okhttp/README.md
index 73297b54a9..2f9893fe3b 100644
--- a/extensions/okhttp/README.md
+++ b/extensions/okhttp/README.md
@@ -3,7 +3,7 @@
 The OkHttp extension is an [HttpDataSource][] implementation using Square's
 [OkHttp][].
 
-[HttpDataSource]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer2/upstream/HttpDataSource.html
+[HttpDataSource]: https://exoplayer.dev/doc/reference/com/google/android/exoplayer2/upstream/HttpDataSource.html
 [OkHttp]: https://square.github.io/okhttp/
 
 ## License note ##
@@ -61,4 +61,4 @@ respectively.
 * [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.okhttp.*`
   belong to this module.
 
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/extensions/opus/README.md b/extensions/opus/README.md
index 15c3e5413d..95c6807275 100644
--- a/extensions/opus/README.md
+++ b/extensions/opus/README.md
@@ -98,4 +98,4 @@ player, then implement your own logic to use the renderer for a given track.
 * [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.opus.*`
   belong to this module.
 
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/extensions/rtmp/README.md b/extensions/rtmp/README.md
index 3863dff965..a34341692b 100644
--- a/extensions/rtmp/README.md
+++ b/extensions/rtmp/README.md
@@ -3,7 +3,7 @@
 The RTMP extension is a [DataSource][] implementation for playing [RTMP][]
 streams using [LibRtmp Client for Android][].
 
-[DataSource]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer2/upstream/DataSource.html
+[DataSource]: https://exoplayer.dev/doc/reference/com/google/android/exoplayer2/upstream/DataSource.html
 [RTMP]: https://en.wikipedia.org/wiki/Real-Time_Messaging_Protocol
 [LibRtmp Client for Android]: https://github.com/ant-media/LibRtmp-Client-for-Android
 
@@ -53,4 +53,4 @@ doesn't need to handle any other protocols, you can update any `DataSource`s and
 * [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.rtmp.*`
   belong to this module.
 
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/extensions/vp9/README.md b/extensions/vp9/README.md
index e1d1eef3ab..0de29eea32 100644
--- a/extensions/vp9/README.md
+++ b/extensions/vp9/README.md
@@ -119,4 +119,4 @@ type `LibvpxVideoRenderer.MSG_SET_OUTPUT_BUFFER_RENDERER` with the
 * [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.vp9.*`
   belong to this module.
 
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/library/all/README.md b/library/all/README.md
index 8746e3afc6..43f942116e 100644
--- a/library/all/README.md
+++ b/library/all/README.md
@@ -10,4 +10,4 @@ individually. See ExoPlayer's [top level README][] for more information.
 
 * [Javadoc][]: Note that this Javadoc is combined with that of other modules.
 
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/library/core/README.md b/library/core/README.md
index f31ffed131..7fa89dda8d 100644
--- a/library/core/README.md
+++ b/library/core/README.md
@@ -6,4 +6,4 @@ The core of the ExoPlayer library.
 
 * [Javadoc][]: Note that this Javadoc is combined with that of other modules.
 
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index 8341f810a4..910404a875 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -1231,7 +1231,7 @@ public class SimpleExoPlayer extends BasePlayer
       Log.w(
           TAG,
           "Player is accessed on the wrong thread. See "
-              + "https://google.github.io/ExoPlayer/faqs.html#"
+              + "https://exoplayer.dev/faqs.html#"
               + "what-do-player-is-accessed-on-the-wrong-thread-warnings-mean",
           hasNotifiedFullWrongThreadWarning ? null : new IllegalStateException());
       hasNotifiedFullWrongThreadWarning = true;
diff --git a/library/dash/README.md b/library/dash/README.md
index 394a38a332..7831033b99 100644
--- a/library/dash/README.md
+++ b/library/dash/README.md
@@ -9,4 +9,4 @@ play DASH content, instantiate a `DashMediaSource` and pass it to
 * [Javadoc][]: Classes matching `com.google.android.exoplayer2.source.dash.*`
   belong to this module.
 
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/library/hls/README.md b/library/hls/README.md
index 6f7e9d08d9..1dd1b7a62e 100644
--- a/library/hls/README.md
+++ b/library/hls/README.md
@@ -8,4 +8,4 @@ instantiate a `HlsMediaSource` and pass it to `ExoPlayer.prepare`.
 * [Javadoc][]: Classes matching `com.google.android.exoplayer2.source.hls.*`
   belong to this module.
 
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/library/smoothstreaming/README.md b/library/smoothstreaming/README.md
index 69265e8702..4fa24543d6 100644
--- a/library/smoothstreaming/README.md
+++ b/library/smoothstreaming/README.md
@@ -9,4 +9,4 @@ instantiate a `SsMediaSource` and pass it to `ExoPlayer.prepare`.
   `com.google.android.exoplayer2.source.smoothstreaming.*` belong to this
   module.
 
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/library/ui/README.md b/library/ui/README.md
index 34e93e43af..341ea2fb16 100644
--- a/library/ui/README.md
+++ b/library/ui/README.md
@@ -7,4 +7,4 @@ Provides UI components and resources for use with ExoPlayer.
 * [Javadoc][]: Classes matching `com.google.android.exoplayer2.ui.*`
   belong to this module.
 
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html

From 18dd3fdb46acd1b51bb8eb74aa751da03eff901e Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 15 Apr 2019 12:40:30 +0100
Subject: [PATCH 757/832] Bump release to 2.10.0 and update release notes

PiperOrigin-RevId: 243592790
---
 RELEASENOTES.md                               | 155 +++++++++---------
 constants.gradle                              |   4 +-
 .../exoplayer2/ExoPlayerLibraryInfo.java      |   6 +-
 3 files changed, 80 insertions(+), 85 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index ff5e827f14..8e56547ba0 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,44 +2,28 @@
 
 ### dev-v2 (not yet released) ###
 
-* Update to Mockito 2
-* Cast extension: Work around Cast framework returning a limited-size queue
-  items list ([#4964](https://github.com/google/ExoPlayer/issues/4964)).
-* Add new `ExoPlaybackException` types for remote exceptions and out-of-memory
-  errors.
-* DASH:
-  * Parse role and accessibility descriptors into `Format.roleFlags`.
-  * Support multiple CEA-608 channels muxed into FMP4 representations
-    ([#5656](https://github.com/google/ExoPlayer/issues/5656)).
-* HLS:
-  * Work around lack of LA_URL attribute in PlayReady key request init data.
-  * Prevent unnecessary reloads of initialization segments.
-  * Form an adaptive track group out of audio renditions with matching name.
-  * Support encrypted initialization segments
-    ([#5441](https://github.com/google/ExoPlayer/issues/5441)).
-  * Parse `EXT-X-MEDIA` `CHARACTERISTICS` attribute into `Format.roleFlags`.
-  * Add metadata entry for HLS tracks to expose master playlist information.
-* MPEG-TS: enable HDMV DTS stream detection only if a flag is set. By default
-  (if the flag is not set), the 0x82 elementary stream type is now treated as an
-  SCTE subtitle track
-  ([#5330](https://github.com/google/ExoPlayer/issues/5330)).
-* `ExtractorMediaSource` renamed to `ProgressiveMediaSource`.
-* Support for playing spherical videos on Daydream.
-* Improve decoder re-use between playbacks. TODO: Write and link a blog post
-  here ([#2826](https://github.com/google/ExoPlayer/issues/2826)).
-* Track selection:
-  * Add options for controlling audio track selections to `DefaultTrackSelector`
-    ([#3314](https://github.com/google/ExoPlayer/issues/3314)).
-  * Update `TrackSelection.Factory` interface to support creating all track
-    selections together.
-  * Allow to specify a selection reason for a `SelectionOverride`.
-* Do not retry failed loads whose error is `FileNotFoundException`.
-* Support Dolby Vision extraction in MP4 and fMP4.
+### 2.10.0 ###
+
+* Core library:
+  * Improve decoder re-use between playbacks. TODO: Write and link a blog post
+    here ([#2826](https://github.com/google/ExoPlayer/issues/2826)).
+  * Rename `ExtractorMediaSource` to `ProgressiveMediaSource`.
+  * Fix issue where using `ProgressiveMediaSource.Factory` would mean that
+    `DefaultExtractorsFactory` would be kept by proguard. Custom
+    `ExtractorsFactory` instances must now be passed via the
+    `ProgressiveMediaSource.Factory` constructor, and `setExtractorsFactory` is
+    deprecated.
+  * Move `PriorityTaskManager` from `DefaultLoadControl` to `SimpleExoPlayer`.
+  * Add new `ExoPlaybackException` types for remote exceptions and out-of-memory
+    errors.
+  * Use full BCP 47 language tags in `Format`.
+  * Do not retry failed loads whose error is `FileNotFoundException`.
+  * Fix issue where not resetting the position for a new `MediaSource` in calls
+    to `ExoPlayer.prepare` causes an `IndexOutOfBoundsException`
+    ([#5520](https://github.com/google/ExoPlayer/issues/5520)).
 * Offline:
-  * Speed up removal of segmented downloads
-    ([#5136](https://github.com/google/ExoPlayer/issues/5136)).
-  * Add `setStreamKeys` method to factories of DASH, SmoothStreaming and HLS
-    media sources to simplify filtering by downloaded streams.
+  * Improve offline support. `DownloadManager` now tracks all offline content,
+    not just tasks in progress. TODO: Write and link a blog post here.
 * Caching:
   * Improve performance of `SimpleCache`
     ([#4253](https://github.com/google/ExoPlayer/issues/4253)).
@@ -47,13 +31,38 @@
     this behavior (`DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH`) has been
     replaced with an opt out flag
     (`DataSpec.FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN`).
-* DownloadManager:
-  * Create only one task for all DownloadActions for the same content.
-  * Rename TaskState to DownloadState.
-  * Add new states to DownloadState.
-  * Replace DownloadState.action with DownloadAction fields.
-* DRM: Fix black flicker when keys rotate in DRM protected content
-  ([#3561](https://github.com/google/ExoPlayer/issues/3561)).
+* Extractors:
+  * MP3: Add support for SHOUTcast ICY metadata
+    ([#3735](https://github.com/google/ExoPlayer/issues/3735)).
+  * MP4/FMP4: Add support for Dolby Vision.
+  * MP4: Fix issue handling meta atoms in some streams
+    ([#5698](https://github.com/google/ExoPlayer/issues/5698),
+    [#5694](https://github.com/google/ExoPlayer/issues/5694)).
+  * MP3: Fix ID3 frame unsychronization
+    ([#5673](https://github.com/google/ExoPlayer/issues/5673)).
+  * MPEG-TS: Enable HDMV DTS stream detection only if a flag is set. By default
+    (i.e. if the flag is not set), the 0x82 elementary stream type is now
+    treated as an SCTE subtitle track
+    ([#5330](https://github.com/google/ExoPlayer/issues/5330)).
+* Track selection:
+  * Add options for controlling audio track selections to `DefaultTrackSelector`
+    ([#3314](https://github.com/google/ExoPlayer/issues/3314)).
+  * Update `TrackSelection.Factory` interface to support creating all track
+    selections together.
+  * Allow to specify a selection reason for a `SelectionOverride`.
+* UI:
+  * Update `DefaultTimeBar` based on duration of media and add parameter to set
+    the minimum update interval to control the smoothness of the updates
+    ([#5040](https://github.com/google/ExoPlayer/issues/5040)).
+  * Fix issues with flickering notifications on KitKat when using
+    `PlayerNotificationManager` and `DownloadNotificationUtil`. For the latter,
+    applications should switch to using `DownloadNotificationHelper`.
+  * Add option to include navigation actions in the compact mode of
+    notifications created using `PlayerNotificationManager`.
+  * Change signature of `PlayerNotificationManager.NotificationListener` to
+    better fit service requirements.
+  * Move creation of dialogs for `TrackSelectionView`s to
+    `TrackSelectionDialogBuilder` and add option to select multiple overrides.
 * Audio:
   * Allow `AudioProcessor`s to be drained of pending output after they are
     reconfigured.
@@ -70,47 +79,33 @@
     type ([#3100](https://github.com/google/ExoPlayer/issues/3100)).
   * Query `MediaCodecList.ALL_CODECS` when selecting a tunneling decoder
     ([#5547](https://github.com/google/ExoPlayer/issues/5547)).
-* Add support for SHOUTcast ICY metadata
-  ([#3735](https://github.com/google/ExoPlayer/issues/3735)).
+* DRM: Fix black flicker when keys rotate in DRM protected content
+  ([#3561](https://github.com/google/ExoPlayer/issues/3561)).
 * CEA-608: Improved conformance to the specification
   ([#3860](https://github.com/google/ExoPlayer/issues/3860)).
+* DASH:
+  * Parse role and accessibility descriptors into `Format.roleFlags`.
+  * Support multiple CEA-608 channels muxed into FMP4 representations
+    ([#5656](https://github.com/google/ExoPlayer/issues/5656)).
+* HLS:
+  * Work around lack of LA_URL attribute in PlayReady key request init data.
+  * Prevent unnecessary reloads of initialization segments.
+  * Form an adaptive track group out of audio renditions with matching name.
+  * Support encrypted initialization segments
+    ([#5441](https://github.com/google/ExoPlayer/issues/5441)).
+  * Parse `EXT-X-MEDIA` `CHARACTERISTICS` attribute into `Format.roleFlags`.
+  * Add metadata entry for HLS tracks to expose master playlist information.
+* Support for playing spherical videos on Daydream.
+* Cast extension: Work around Cast framework returning a limited-size queue
+  items list ([#4964](https://github.com/google/ExoPlayer/issues/4964)).
 * VP9 extension: Remove RGB output mode and libyuv dependency, and switch to
   surface YUV output as the default. Remove constructor parameters `scaleToFit`
   and `useSurfaceYuvOutput`.
-* Change signature of `PlayerNotificationManager.NotificationListener` to better
-  fit service requirements. Remove ability to set a custom stop action.
-* Fix issues with flickering notifications on KitKat.
-  `PlayerNotificationManager` has been fixed. Apps using
-  `DownloadNotificationUtil` should switch to using
-  `DownloadNotificationHelper`.
-* Provide flag to include next/prev buttons in compact mode of a notification
-  ([#5616](https://github.com/google/ExoPlayer/issues/5616)).
-* Move creation of dialogs for `TrackSelectionView`s to
-  `TrackSelectionDialogBuilder` and add option to select multiple overrides.
-* MediaSessionConnector: Let apps intercept media button events
-  ([#5179](https://github.com/google/ExoPlayer/issues/5179)).
-* Fix issue with `TimelineQueueNavigator` not publishing the queue in shuffled
-  order when in shuffle mode.
-* Fix issue where not resetting the position for a new `MediaSource` in calls to
-  `ExoPlayer.prepare` causes an `IndexOutOfBoundsException`
-  ([#5520](https://github.com/google/ExoPlayer/issues/5520)).
-* Update `DefaultTimeBar` based on duration of media and add parameter to set
-  the minimum update interval to control the smoothness of the updates
-  ([#5040](https://github.com/google/ExoPlayer/issues/5040)).
-* Fix issue where using `ProgressiveMediaSource.Factory` would mean that
-  `DefaultExtractorsFactory` would be kept by proguard. Custom
-  `ExtractorsFactory` instances must now be passed via the
-  `ProgressiveMediaSource.Factory` constructor, and `setExtractorsFactory` is
-  deprecated.
-* Prevent seeking when ICY metadata is present to prevent playback problems
-  ([#5658](https://github.com/google/ExoPlayer/issues/5658)).
-* Use full BCP 47 language tags in `Format`.
-* Take byte offset into account when unsynchronizing an id3 frame
-  ([#5673](https://github.com/google/ExoPlayer/issues/5673)).
-* Handle meta atom as a full box when parsing mp4
-  ([#5698](https://github.com/google/ExoPlayer/issues/5698),
-  [#5694](https://github.com/google/ExoPlayer/issues/5694)).
-* Move `PriorityTaskManager` from `DefaultLoadControl` to `SimpleExoPlayer`.
+* MediaSession extension:
+  * Let apps intercept media button events
+    ([#5179](https://github.com/google/ExoPlayer/issues/5179)).
+  * Fix issue with `TimelineQueueNavigator` not publishing the queue in shuffled
+    order when in shuffle mode.
 
 ### 2.9.6 ###
 
diff --git a/constants.gradle b/constants.gradle
index e164fb4446..5063c59141 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -13,8 +13,8 @@
 // limitations under the License.
 project.ext {
     // ExoPlayer version and version code.
-    releaseVersion = '2.9.6'
-    releaseVersionCode = 2009006
+    releaseVersion = '2.10.0'
+    releaseVersionCode = 2010000
     minSdkVersion = 16
     targetSdkVersion = 28
     compileSdkVersion = 28
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
index b389ec742f..72760db31b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
@@ -29,11 +29,11 @@ public final class ExoPlayerLibraryInfo {
 
   /** The version of the library expressed as a string, for example "1.2.3". */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION_INT) or vice versa.
-  public static final String VERSION = "2.9.6";
+  public static final String VERSION = "2.10.0";
 
   /** The version of the library expressed as {@code "ExoPlayerLib/" + VERSION}. */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
-  public static final String VERSION_SLASHY = "ExoPlayerLib/2.9.6";
+  public static final String VERSION_SLASHY = "ExoPlayerLib/2.10.0";
 
   /**
    * The version of the library expressed as an integer, for example 1002003.
@@ -43,7 +43,7 @@ public final class ExoPlayerLibraryInfo {
    * integer version 123045006 (123-045-006).
    */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
-  public static final int VERSION_INT = 2009006;
+  public static final int VERSION_INT = 2010000;
 
   /**
    * Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions}

From ba91501751af1112332ea29594ee44e35fc42c13 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Mon, 15 Apr 2019 16:03:41 +0100
Subject: [PATCH 758/832] Add DownloadService.invalidateForegroundNotification

ISSUE: #4563
PiperOrigin-RevId: 243616444
---
 .../exoplayer2/offline/DownloadService.java   | 49 ++++++++++++-------
 1 file changed, 32 insertions(+), 17 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index 955a08ffe4..4ed493e181 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -159,6 +159,7 @@ public abstract class DownloadService extends Service {
   private int lastStartId;
   private boolean startedInForeground;
   private boolean taskRemoved;
+  private boolean isDestroyed;
 
   /**
    * Creates a DownloadService.
@@ -468,6 +469,7 @@ public abstract class DownloadService extends Service {
   @Override
   public void onDestroy() {
     logd("onDestroy");
+    isDestroyed = true;
     DownloadManagerHelper downloadManagerHelper = downloadManagerListeners.get(getClass());
     boolean unschedule = !downloadManager.isWaitingForRequirements();
     downloadManagerHelper.detachService(this, unschedule);
@@ -517,6 +519,16 @@ public abstract class DownloadService extends Service {
    */
   protected abstract Notification getForegroundNotification(Download[] downloads);
 
+  /**
+   * Invalidates the current foreground notification and causes {@link
+   * #getForegroundNotification(Download[])} to be invoked again if the service isn't stopped.
+   */
+  protected final void invalidateForegroundNotification() {
+    if (foregroundNotificationUpdater != null && !isDestroyed) {
+      foregroundNotificationUpdater.invalidate();
+    }
+  }
+
   /**
    * Called when the state of a download changes. The default implementation is a no-op.
    *
@@ -543,7 +555,7 @@ public abstract class DownloadService extends Service {
           || download.state == Download.STATE_RESTARTING) {
         foregroundNotificationUpdater.startPeriodicUpdates();
       } else {
-        foregroundNotificationUpdater.update();
+        foregroundNotificationUpdater.invalidate();
       }
     }
   }
@@ -551,7 +563,7 @@ public abstract class DownloadService extends Service {
   private void notifyDownloadRemoved(Download download) {
     onDownloadRemoved(download);
     if (foregroundNotificationUpdater != null) {
-      foregroundNotificationUpdater.update();
+      foregroundNotificationUpdater.invalidate();
     }
   }
 
@@ -583,11 +595,12 @@ public abstract class DownloadService extends Service {
     return new Intent(context, clazz).setAction(action);
   }
 
-  private final class ForegroundNotificationUpdater implements Runnable {
+  private final class ForegroundNotificationUpdater {
 
     private final int notificationId;
     private final long updateInterval;
     private final Handler handler;
+    private final Runnable callback;
 
     private boolean periodicUpdatesStarted;
     private boolean notificationDisplayed;
@@ -596,6 +609,7 @@ public abstract class DownloadService extends Service {
       this.notificationId = notificationId;
       this.updateInterval = updateInterval;
       this.handler = new Handler(Looper.getMainLooper());
+      this.callback = this::update;
     }
 
     public void startPeriodicUpdates() {
@@ -605,17 +619,7 @@ public abstract class DownloadService extends Service {
 
     public void stopPeriodicUpdates() {
       periodicUpdatesStarted = false;
-      handler.removeCallbacks(this);
-    }
-
-    public void update() {
-      Download[] downloads = downloadManager.getCurrentDownloads();
-      startForeground(notificationId, getForegroundNotification(downloads));
-      notificationDisplayed = true;
-      if (periodicUpdatesStarted) {
-        handler.removeCallbacks(this);
-        handler.postDelayed(this, updateInterval);
-      }
+      handler.removeCallbacks(callback);
     }
 
     public void showNotificationIfNotAlready() {
@@ -624,9 +628,20 @@ public abstract class DownloadService extends Service {
       }
     }
 
-    @Override
-    public void run() {
-      update();
+    public void invalidate() {
+      if (notificationDisplayed) {
+        update();
+      }
+    }
+
+    private void update() {
+      Download[] downloads = downloadManager.getCurrentDownloads();
+      startForeground(notificationId, getForegroundNotification(downloads));
+      notificationDisplayed = true;
+      if (periodicUpdatesStarted) {
+        handler.removeCallbacks(callback);
+        handler.postDelayed(callback, updateInterval);
+      }
     }
   }
 

From e9a7d47f62a7e2ddc677912ba8d1afa3946a3e4f Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Mon, 15 Apr 2019 16:20:52 +0100
Subject: [PATCH 759/832] Move the RELEASENOTES entry for PlayReady's LA_URL
 workaround from HLS to DRM

PiperOrigin-RevId: 243618907
---
 RELEASENOTES.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 8e56547ba0..d108140f46 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -79,8 +79,10 @@
     type ([#3100](https://github.com/google/ExoPlayer/issues/3100)).
   * Query `MediaCodecList.ALL_CODECS` when selecting a tunneling decoder
     ([#5547](https://github.com/google/ExoPlayer/issues/5547)).
-* DRM: Fix black flicker when keys rotate in DRM protected content
+* DRM:
+  * Fix black flicker when keys rotate in DRM protected content
   ([#3561](https://github.com/google/ExoPlayer/issues/3561)).
+  * Work around lack of LA_URL attribute in PlayReady key request init data.
 * CEA-608: Improved conformance to the specification
   ([#3860](https://github.com/google/ExoPlayer/issues/3860)).
 * DASH:
@@ -88,7 +90,6 @@
   * Support multiple CEA-608 channels muxed into FMP4 representations
     ([#5656](https://github.com/google/ExoPlayer/issues/5656)).
 * HLS:
-  * Work around lack of LA_URL attribute in PlayReady key request init data.
   * Prevent unnecessary reloads of initialization segments.
   * Form an adaptive track group out of audio renditions with matching name.
   * Support encrypted initialization segments

From 9ddd39c1c06d57f233de731bd4153ec35283e3d7 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Mon, 15 Apr 2019 16:54:03 +0100
Subject: [PATCH 760/832] Add the HlsMetadataEntry from the Master playlist to
 the Hls tracks

PiperOrigin-RevId: 243624081
---
 .../com/google/android/exoplayer2/Format.java     | 12 ++++++++++++
 .../android/exoplayer2/metadata/Metadata.java     | 15 +++++++++++++++
 .../source/hls/HlsSampleStreamWrapper.java        |  1 +
 3 files changed, 28 insertions(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Format.java b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
index 8628ead4d6..dcb7a83dca 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Format.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
@@ -1059,12 +1059,18 @@ public final class Format implements Parcelable {
       @Nullable String label,
       @Nullable String sampleMimeType,
       @Nullable String codecs,
+      @Nullable Metadata metadata,
       int bitrate,
       int width,
       int height,
       int channelCount,
       @C.SelectionFlags int selectionFlags,
       @Nullable String language) {
+
+    if (this.metadata != null) {
+      metadata = this.metadata.copyWithAppendedEntriesFrom(metadata);
+    }
+
     return new Format(
         id,
         label,
@@ -1127,6 +1133,12 @@ public final class Format implements Parcelable {
         codecs = codecsOfType;
       }
     }
+
+    Metadata metadata =
+        this.metadata == null
+            ? manifestFormat.metadata
+            : this.metadata.copyWithAppendedEntriesFrom(manifestFormat.metadata);
+
     float frameRate = this.frameRate;
     if (frameRate == NO_VALUE && trackType == C.TRACK_TYPE_VIDEO) {
       frameRate = manifestFormat.frameRate;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java
index dd06e1a2cf..7b4f4c0836 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java
@@ -78,6 +78,21 @@ public final class Metadata implements Parcelable {
     return entries[index];
   }
 
+  /**
+   * Returns a copy of this metadata with the entries of the specified metadata appended. Returns
+   * this instance if {@code other} is null.
+   *
+   * @param other The metadata that holds the entries to append. If null, this methods returns this
+   *     instance.
+   * @return The metadata instance with the appended entries.
+   */
+  public Metadata copyWithAppendedEntriesFrom(@Nullable Metadata other) {
+    if (other == null) {
+      return this;
+    }
+    return copyWithAppendedEntries(other.entries);
+  }
+
   /**
    * Returns a copy of this metadata with the specified entries appended.
    *
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
index 855b7f6a23..65039b9364 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
@@ -1126,6 +1126,7 @@ import java.util.Map;
         playlistFormat.label,
         mimeType,
         codecs,
+        playlistFormat.metadata,
         bitrate,
         playlistFormat.width,
         playlistFormat.height,

From 7b84a1ead7fb487a957ca8d029c38ca57ff77ceb Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 15 Apr 2019 17:11:03 +0100
Subject: [PATCH 761/832] DownloadManager.getCurrentDownloads: Return list
 instead of array

- Allows enforcing immutability, which in a future CL will allow
  avoiding allocating a new array/list on every call.
- Also some left over doc cleanup from the DownloadState rename.

PiperOrigin-RevId: 243627352
---
 .../exoplayer2/demo/DemoDownloadService.java  |  3 ++-
 .../exoplayer2/demo/DownloadTracker.java      |  2 +-
 .../exoplayer2/offline/DownloadManager.java   | 19 ++++++++++---------
 .../exoplayer2/offline/DownloadService.java   | 19 ++++++++++---------
 .../offline/DownloadManagerTest.java          |  9 ++++++---
 .../dash/offline/DownloadServiceDashTest.java |  3 ++-
 .../ui/DownloadNotificationHelper.java        | 10 ++++++----
 .../ui/DownloadNotificationUtil.java          |  7 ++++---
 8 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
index fa4c2563d7..c90aba7b7e 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
@@ -23,6 +23,7 @@ import com.google.android.exoplayer2.scheduler.PlatformScheduler;
 import com.google.android.exoplayer2.ui.DownloadNotificationHelper;
 import com.google.android.exoplayer2.util.NotificationUtil;
 import com.google.android.exoplayer2.util.Util;
+import java.util.List;
 
 /** A service for downloading media. */
 public class DemoDownloadService extends DownloadService {
@@ -61,7 +62,7 @@ public class DemoDownloadService extends DownloadService {
   }
 
   @Override
-  protected Notification getForegroundNotification(Download[] downloads) {
+  protected Notification getForegroundNotification(List<Download> downloads) {
     return notificationHelper.buildProgressNotification(
         R.drawable.ic_download, /* contentIntent= */ null, /* message= */ null, downloads);
   }
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index 1f421005ca..e26db9cbe7 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -141,7 +141,7 @@ public class DownloadTracker implements DownloadManager.Listener {
         downloads.put(download.action.uri, download);
       }
     } catch (IOException e) {
-      Log.w(TAG, "Failed to query download states", e);
+      Log.w(TAG, "Failed to query downloads", e);
     }
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 65db8a5d9b..813376579b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -46,6 +46,7 @@ import java.io.IOException;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArraySet;
@@ -121,7 +122,7 @@ public final class DownloadManager {
   // Messages posted to the main handler.
   private static final int MSG_INITIALIZED = 0;
   private static final int MSG_PROCESSED = 1;
-  private static final int MSG_DOWNLOAD_STATE_CHANGED = 2;
+  private static final int MSG_DOWNLOAD_CHANGED = 2;
   private static final int MSG_DOWNLOAD_REMOVED = 3;
 
   // Messages posted to the background handler.
@@ -186,7 +187,7 @@ public final class DownloadManager {
    * Constructs a {@link DownloadManager}.
    *
    * @param context Any context.
-   * @param databaseProvider Used to create a {@link DownloadIndex} which holds download states.
+   * @param databaseProvider Provides the {@link DownloadIndex} that holds the downloads.
    * @param downloaderFactory A factory for creating {@link Downloader}s.
    */
   public DownloadManager(
@@ -204,7 +205,7 @@ public final class DownloadManager {
    * Constructs a {@link DownloadManager}.
    *
    * @param context Any context.
-   * @param databaseProvider Used to create a {@link DownloadIndex} which holds download states.
+   * @param databaseProvider Provides the {@link DownloadIndex} that holds the downloads.
    * @param downloaderFactory A factory for creating {@link Downloader}s.
    * @param maxSimultaneousDownloads The maximum number of simultaneous downloads.
    * @param minRetryCount The minimum number of times a download must be retried before failing.
@@ -230,7 +231,7 @@ public final class DownloadManager {
    * Constructs a {@link DownloadManager}.
    *
    * @param context Any context.
-   * @param downloadIndex The {@link DefaultDownloadIndex} which holds download states.
+   * @param downloadIndex The {@link DefaultDownloadIndex} that holds the downloads.
    * @param downloaderFactory A factory for creating {@link Downloader}s.
    * @param maxSimultaneousDownloads The maximum number of simultaneous downloads.
    * @param minRetryCount The minimum number of times a download must be retried before failing.
@@ -342,8 +343,8 @@ public final class DownloadManager {
    * not included. To query all downloads including those in terminal states, use {@link
    * #getDownloadIndex()} instead.
    */
-  public Download[] getCurrentDownloads() {
-    return downloads.toArray(new Download[0]);
+  public List<Download> getCurrentDownloads() {
+    return Collections.unmodifiableList(new ArrayList<>(downloads));
   }
 
   /**
@@ -467,7 +468,7 @@ public final class DownloadManager {
         List<Download> downloads = (List<Download>) message.obj;
         onInitialized(downloads);
         break;
-      case MSG_DOWNLOAD_STATE_CHANGED:
+      case MSG_DOWNLOAD_CHANGED:
         Download state = (Download) message.obj;
         onDownloadChanged(state);
         break;
@@ -595,7 +596,7 @@ public final class DownloadManager {
       while (cursor.moveToNext()) {
         loadedStates.add(cursor.getDownload());
       }
-      logd("Download states are loaded.");
+      logd("Downloads are loaded.");
     } catch (Throwable e) {
       Log.e(TAG, "Download state loading failed.", e);
       loadedStates.clear();
@@ -740,7 +741,7 @@ public final class DownloadManager {
     if (downloadInternal.state == STATE_COMPLETED || downloadInternal.state == STATE_FAILED) {
       downloadInternals.remove(downloadInternal);
     }
-    mainHandler.obtainMessage(MSG_DOWNLOAD_STATE_CHANGED, download).sendToTarget();
+    mainHandler.obtainMessage(MSG_DOWNLOAD_CHANGED, download).sendToTarget();
   }
 
   private void onDownloadRemovedInternal(DownloadInternal downloadInternal, Download download) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index 4ed493e181..1a07aa2f7c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -33,6 +33,7 @@ import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.NotificationUtil;
 import com.google.android.exoplayer2.util.Util;
 import java.util.HashMap;
+import java.util.List;
 
 /** A {@link Service} for downloading media. */
 public abstract class DownloadService extends Service {
@@ -514,14 +515,14 @@ public abstract class DownloadService extends Service {
    * #FOREGROUND_NOTIFICATION_ID_NONE}. This method will not be called in this case, meaning it can
    * be implemented to throw {@link UnsupportedOperationException}.
    *
-   * @param downloads The states of all current downloads.
+   * @param downloads The current downloads.
    * @return The foreground notification to display.
    */
-  protected abstract Notification getForegroundNotification(Download[] downloads);
+  protected abstract Notification getForegroundNotification(List<Download> downloads);
 
   /**
    * Invalidates the current foreground notification and causes {@link
-   * #getForegroundNotification(Download[])} to be invoked again if the service isn't stopped.
+   * #getForegroundNotification(List)} to be invoked again if the service isn't stopped.
    */
   protected final void invalidateForegroundNotification() {
     if (foregroundNotificationUpdater != null && !isDestroyed) {
@@ -600,7 +601,7 @@ public abstract class DownloadService extends Service {
     private final int notificationId;
     private final long updateInterval;
     private final Handler handler;
-    private final Runnable callback;
+    private final Runnable updateRunnable;
 
     private boolean periodicUpdatesStarted;
     private boolean notificationDisplayed;
@@ -609,7 +610,7 @@ public abstract class DownloadService extends Service {
       this.notificationId = notificationId;
       this.updateInterval = updateInterval;
       this.handler = new Handler(Looper.getMainLooper());
-      this.callback = this::update;
+      this.updateRunnable = this::update;
     }
 
     public void startPeriodicUpdates() {
@@ -619,7 +620,7 @@ public abstract class DownloadService extends Service {
 
     public void stopPeriodicUpdates() {
       periodicUpdatesStarted = false;
-      handler.removeCallbacks(callback);
+      handler.removeCallbacks(updateRunnable);
     }
 
     public void showNotificationIfNotAlready() {
@@ -635,12 +636,12 @@ public abstract class DownloadService extends Service {
     }
 
     private void update() {
-      Download[] downloads = downloadManager.getCurrentDownloads();
+      List<Download> downloads = downloadManager.getCurrentDownloads();
       startForeground(notificationId, getForegroundNotification(downloads));
       notificationDisplayed = true;
       if (periodicUpdatesStarted) {
-        handler.removeCallbacks(callback);
-        handler.postDelayed(callback, updateInterval);
+        handler.removeCallbacks(updateRunnable);
+        handler.postDelayed(updateRunnable, updateInterval);
       }
     }
   }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index a89f235e87..0496b62fb0 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -33,6 +33,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import org.junit.After;
@@ -346,11 +347,13 @@ public class DownloadManagerTest {
     TaskWrapper task3 = new DownloadRunner(uri3).postDownloadAction().postRemoveAction().getTask();
 
     task3.assertRemoving();
-    Download[] downloads = downloadManager.getCurrentDownloads();
+    List<Download> downloads = downloadManager.getCurrentDownloads();
 
-    assertThat(downloads).hasLength(3);
+    assertThat(downloads).hasSize(3);
     String[] taskIds = {task1.taskId, task2.taskId, task3.taskId};
-    String[] downloadIds = {downloads[0].action.id, downloads[1].action.id, downloads[2].action.id};
+    String[] downloadIds = {
+      downloads.get(0).action.id, downloads.get(1).action.id, downloads.get(2).action.id
+    };
     assertThat(downloadIds).isEqualTo(taskIds);
   }
 
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
index a3349e507d..44befd3e2c 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
@@ -52,6 +52,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -141,7 +142,7 @@ public class DownloadServiceDashTest {
                 }
 
                 @Override
-                protected Notification getForegroundNotification(Download[] downloads) {
+                protected Notification getForegroundNotification(List<Download> downloads) {
                   throw new UnsupportedOperationException();
                 }
               };
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
index 278cfeca59..b26b8eaac4 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
@@ -24,6 +24,7 @@ import androidx.annotation.StringRes;
 import androidx.core.app.NotificationCompat;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.offline.Download;
+import java.util.List;
 
 /** Helper for creating download notifications. */
 public final class DownloadNotificationHelper {
@@ -44,26 +45,27 @@ public final class DownloadNotificationHelper {
   }
 
   /**
-   * Returns a progress notification for the given download states.
+   * Returns a progress notification for the given downloads.
    *
    * @param smallIcon A small icon for the notification.
    * @param contentIntent An optional content intent to send when the notification is clicked.
    * @param message An optional message to display on the notification.
-   * @param downloads The download states.
+   * @param downloads The downloads.
    * @return The notification.
    */
   public Notification buildProgressNotification(
       @DrawableRes int smallIcon,
       @Nullable PendingIntent contentIntent,
       @Nullable String message,
-      Download[] downloads) {
+      List<Download> downloads) {
     float totalPercentage = 0;
     int downloadTaskCount = 0;
     boolean allDownloadPercentagesUnknown = true;
     boolean haveDownloadedBytes = false;
     boolean haveDownloadTasks = false;
     boolean haveRemoveTasks = false;
-    for (Download download : downloads) {
+    for (int i = 0; i < downloads.size(); i++) {
+      Download download = downloads.get(i);
       if (download.state == Download.STATE_REMOVING) {
         haveRemoveTasks = true;
         continue;
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java
index 5d4833f386..223a97f69c 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java
@@ -22,6 +22,7 @@ import androidx.annotation.DrawableRes;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.offline.Download;
 import com.google.android.exoplayer2.util.Util;
+import java.util.List;
 
 /**
  * @deprecated Using this class can cause notifications to flicker on devices with {@link
@@ -33,14 +34,14 @@ public final class DownloadNotificationUtil {
   private DownloadNotificationUtil() {}
 
   /**
-   * Returns a progress notification for the given download states.
+   * Returns a progress notification for the given downloads.
    *
    * @param context A context for accessing resources.
    * @param smallIcon A small icon for the notification.
    * @param channelId The id of the notification channel to use.
    * @param contentIntent An optional content intent to send when the notification is clicked.
    * @param message An optional message to display on the notification.
-   * @param downloads The download states.
+   * @param downloads The downloads.
    * @return The notification.
    */
   public static Notification buildProgressNotification(
@@ -49,7 +50,7 @@ public final class DownloadNotificationUtil {
       String channelId,
       @Nullable PendingIntent contentIntent,
       @Nullable String message,
-      Download[] downloads) {
+      List<Download> downloads) {
     return new DownloadNotificationHelper(context, channelId)
         .buildProgressNotification(smallIcon, contentIntent, message, downloads);
   }

From 68bd5da3cb1d01c69054c9698813fdc1e5521fff Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Mon, 15 Apr 2019 17:41:11 +0100
Subject: [PATCH 762/832] Fix DecryptionResource.Owner#onLastReferenceReleased
 type

PiperOrigin-RevId: 243632134
---
 .../exoplayer2/drm/DecryptionResource.java        | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DecryptionResource.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DecryptionResource.java
index 34d3c3985c..dbe5c93172 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DecryptionResource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DecryptionResource.java
@@ -19,6 +19,7 @@ package com.google.android.exoplayer2.drm;
  * A reference-counted resource used in the decryption of media samples.
  *
  * @param <T> The reference type with which to make {@link Owner#onLastReferenceReleased} calls.
+ *     Subclasses are expected to pass themselves.
  */
 public abstract class DecryptionResource<T extends DecryptionResource<T>> {
 
@@ -32,7 +33,7 @@ public abstract class DecryptionResource<T extends DecryptionResource<T>> {
      * Called when the last reference to a {@link DecryptionResource} is {@link #releaseReference()
      * released}.
      */
-    void onLastReferenceReleased(DecryptionResource<T> resource);
+    void onLastReferenceReleased(T resource);
   }
 
   // TODO: Consider adding a handler on which the owner should be called.
@@ -40,7 +41,7 @@ public abstract class DecryptionResource<T extends DecryptionResource<T>> {
   private int referenceCount;
 
   /**
-   * Creates a new instance with no incoming references.
+   * Creates a new instance with reference count zero.
    *
    * @param owner The owner of this instance.
    */
@@ -49,21 +50,21 @@ public abstract class DecryptionResource<T extends DecryptionResource<T>> {
     referenceCount = 0;
   }
 
-  /** Increases by one the incoming reference count for this resource. */
+  /** Increases by one the reference count for this resource. */
   public void acquireReference() {
     referenceCount++;
   }
 
   /**
-   * Decreases by one the incoming reference count for this resource, and notifies the owner if said
-   * count reached zero as a result of this operation.
+   * Decreases by one the reference count for this resource, and notifies the owner if said count
+   * reached zero as a result of this operation.
    *
    * <p>Must only be called as releasing counter-part of {@link #acquireReference()}.
    */
   @SuppressWarnings("unchecked")
-  public synchronized void releaseReference() {
+  public void releaseReference() {
     if (--referenceCount == 0) {
-      owner.onLastReferenceReleased(this);
+      owner.onLastReferenceReleased((T) this);
     } else if (referenceCount < 0) {
       throw new IllegalStateException("Illegal release of resource.");
     }

From 45348a97a954d4c13aeaf56b6c55e8ea01623ec7 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 15 Apr 2019 18:05:01 +0100
Subject: [PATCH 763/832] Fix Atom ConstantCaseForConstant suppression

PiperOrigin-RevId: 243636923
---
 .../exoplayer2/extractor/mp4/Atom.java        | 221 +++++++++++++++++-
 1 file changed, 220 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
index 0bc5f18eef..f66c1f5d2c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-@SuppressWarnings({"ConstantField", "ConstantCaseForConstants"})
+@SuppressWarnings("ConstantField")
 /* package */ abstract class Atom {
 
   /**
@@ -50,115 +50,334 @@ import java.util.List;
    */
   public static final int EXTENDS_TO_END_SIZE = 0;
 
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_ftyp = Util.getIntegerCodeForString("ftyp");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_avc1 = Util.getIntegerCodeForString("avc1");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_avc3 = Util.getIntegerCodeForString("avc3");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_avcC = Util.getIntegerCodeForString("avcC");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_hvc1 = Util.getIntegerCodeForString("hvc1");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_hev1 = Util.getIntegerCodeForString("hev1");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_hvcC = Util.getIntegerCodeForString("hvcC");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_vp08 = Util.getIntegerCodeForString("vp08");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_vp09 = Util.getIntegerCodeForString("vp09");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_vpcC = Util.getIntegerCodeForString("vpcC");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_av01 = Util.getIntegerCodeForString("av01");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_av1C = Util.getIntegerCodeForString("av1C");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_dvav = Util.getIntegerCodeForString("dvav");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_dva1 = Util.getIntegerCodeForString("dva1");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_dvhe = Util.getIntegerCodeForString("dvhe");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_dvh1 = Util.getIntegerCodeForString("dvh1");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_dvcC = Util.getIntegerCodeForString("dvcC");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_dvvC = Util.getIntegerCodeForString("dvvC");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_s263 = Util.getIntegerCodeForString("s263");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_d263 = Util.getIntegerCodeForString("d263");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_mdat = Util.getIntegerCodeForString("mdat");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_mp4a = Util.getIntegerCodeForString("mp4a");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE__mp3 = Util.getIntegerCodeForString(".mp3");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_wave = Util.getIntegerCodeForString("wave");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_lpcm = Util.getIntegerCodeForString("lpcm");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_sowt = Util.getIntegerCodeForString("sowt");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_ac_3 = Util.getIntegerCodeForString("ac-3");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_dac3 = Util.getIntegerCodeForString("dac3");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_ec_3 = Util.getIntegerCodeForString("ec-3");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_dec3 = Util.getIntegerCodeForString("dec3");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_ac_4 = Util.getIntegerCodeForString("ac-4");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_dac4 = Util.getIntegerCodeForString("dac4");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_dtsc = Util.getIntegerCodeForString("dtsc");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_dtsh = Util.getIntegerCodeForString("dtsh");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_dtsl = Util.getIntegerCodeForString("dtsl");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_dtse = Util.getIntegerCodeForString("dtse");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_ddts = Util.getIntegerCodeForString("ddts");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_tfdt = Util.getIntegerCodeForString("tfdt");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_tfhd = Util.getIntegerCodeForString("tfhd");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_trex = Util.getIntegerCodeForString("trex");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_trun = Util.getIntegerCodeForString("trun");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_sidx = Util.getIntegerCodeForString("sidx");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_moov = Util.getIntegerCodeForString("moov");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_mvhd = Util.getIntegerCodeForString("mvhd");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_trak = Util.getIntegerCodeForString("trak");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_mdia = Util.getIntegerCodeForString("mdia");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_minf = Util.getIntegerCodeForString("minf");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_stbl = Util.getIntegerCodeForString("stbl");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_esds = Util.getIntegerCodeForString("esds");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_moof = Util.getIntegerCodeForString("moof");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_traf = Util.getIntegerCodeForString("traf");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_mvex = Util.getIntegerCodeForString("mvex");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_mehd = Util.getIntegerCodeForString("mehd");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_tkhd = Util.getIntegerCodeForString("tkhd");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_edts = Util.getIntegerCodeForString("edts");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_elst = Util.getIntegerCodeForString("elst");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_mdhd = Util.getIntegerCodeForString("mdhd");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_hdlr = Util.getIntegerCodeForString("hdlr");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_stsd = Util.getIntegerCodeForString("stsd");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_pssh = Util.getIntegerCodeForString("pssh");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_sinf = Util.getIntegerCodeForString("sinf");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_schm = Util.getIntegerCodeForString("schm");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_schi = Util.getIntegerCodeForString("schi");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_tenc = Util.getIntegerCodeForString("tenc");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_encv = Util.getIntegerCodeForString("encv");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_enca = Util.getIntegerCodeForString("enca");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_frma = Util.getIntegerCodeForString("frma");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_saiz = Util.getIntegerCodeForString("saiz");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_saio = Util.getIntegerCodeForString("saio");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_sbgp = Util.getIntegerCodeForString("sbgp");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_sgpd = Util.getIntegerCodeForString("sgpd");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_uuid = Util.getIntegerCodeForString("uuid");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_senc = Util.getIntegerCodeForString("senc");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_pasp = Util.getIntegerCodeForString("pasp");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_TTML = Util.getIntegerCodeForString("TTML");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_vmhd = Util.getIntegerCodeForString("vmhd");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_mp4v = Util.getIntegerCodeForString("mp4v");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_stts = Util.getIntegerCodeForString("stts");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_stss = Util.getIntegerCodeForString("stss");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_ctts = Util.getIntegerCodeForString("ctts");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_stsc = Util.getIntegerCodeForString("stsc");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_stsz = Util.getIntegerCodeForString("stsz");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_stz2 = Util.getIntegerCodeForString("stz2");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_stco = Util.getIntegerCodeForString("stco");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_co64 = Util.getIntegerCodeForString("co64");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_tx3g = Util.getIntegerCodeForString("tx3g");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_wvtt = Util.getIntegerCodeForString("wvtt");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_stpp = Util.getIntegerCodeForString("stpp");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_c608 = Util.getIntegerCodeForString("c608");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_samr = Util.getIntegerCodeForString("samr");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_sawb = Util.getIntegerCodeForString("sawb");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_udta = Util.getIntegerCodeForString("udta");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_meta = Util.getIntegerCodeForString("meta");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_keys = Util.getIntegerCodeForString("keys");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_ilst = Util.getIntegerCodeForString("ilst");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_mean = Util.getIntegerCodeForString("mean");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_name = Util.getIntegerCodeForString("name");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_data = Util.getIntegerCodeForString("data");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_emsg = Util.getIntegerCodeForString("emsg");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_st3d = Util.getIntegerCodeForString("st3d");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_sv3d = Util.getIntegerCodeForString("sv3d");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_proj = Util.getIntegerCodeForString("proj");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_camm = Util.getIntegerCodeForString("camm");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_alac = Util.getIntegerCodeForString("alac");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_alaw = Util.getIntegerCodeForString("alaw");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_ulaw = Util.getIntegerCodeForString("ulaw");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_Opus = Util.getIntegerCodeForString("Opus");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_dOps = Util.getIntegerCodeForString("dOps");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_fLaC = Util.getIntegerCodeForString("fLaC");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_dfLa = Util.getIntegerCodeForString("dfLa");
 
   public final int type;

From 9c759a867b51d1fb4e95f7169646c71256679247 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 15 Apr 2019 18:09:22 +0100
Subject: [PATCH 764/832] Prepare SimpleCache for 2.10.0 release

- Expose constructors that take DatabaseProvider. Deprecate those
  that do not.
- Expose Cache.getUid. This will likely be used for naming of the
  tables accessed by DefaultDownloadIndex .

PiperOrigin-RevId: 243637786
---
 .../exoplayer2/demo/DemoApplication.java      | 14 +++-
 .../exoplayer2/upstream/cache/Cache.java      | 16 ++++
 .../upstream/cache/SimpleCache.java           | 82 +++++++++++--------
 3 files changed, 78 insertions(+), 34 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
index f24915f601..574f41cb3e 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.demo;
 import android.app.Application;
 import com.google.android.exoplayer2.DefaultRenderersFactory;
 import com.google.android.exoplayer2.RenderersFactory;
+import com.google.android.exoplayer2.database.DatabaseProvider;
 import com.google.android.exoplayer2.database.ExoDatabaseProvider;
 import com.google.android.exoplayer2.offline.ActionFileUpgradeUtil;
 import com.google.android.exoplayer2.offline.DefaultDownloadIndex;
@@ -52,6 +53,7 @@ public class DemoApplication extends Application {
 
   protected String userAgent;
 
+  private DatabaseProvider databaseProvider;
   private File downloadDirectory;
   private Cache downloadCache;
   private DownloadManager downloadManager;
@@ -105,14 +107,15 @@ public class DemoApplication extends Application {
   protected synchronized Cache getDownloadCache() {
     if (downloadCache == null) {
       File downloadContentDirectory = new File(getDownloadDirectory(), DOWNLOAD_CONTENT_DIRECTORY);
-      downloadCache = new SimpleCache(downloadContentDirectory, new NoOpCacheEvictor());
+      downloadCache =
+          new SimpleCache(downloadContentDirectory, new NoOpCacheEvictor(), getDatabaseProvider());
     }
     return downloadCache;
   }
 
   private synchronized void initDownloadManager() {
     if (downloadManager == null) {
-      DefaultDownloadIndex downloadIndex = new DefaultDownloadIndex(new ExoDatabaseProvider(this));
+      DefaultDownloadIndex downloadIndex = new DefaultDownloadIndex(getDatabaseProvider());
       upgradeActionFile(DOWNLOAD_TRACKER_ACTION_FILE, downloadIndex);
       upgradeActionFile(DOWNLOAD_ACTION_FILE, downloadIndex);
       DownloaderConstructorHelper downloaderConstructorHelper =
@@ -143,6 +146,13 @@ public class DemoApplication extends Application {
     }
   }
 
+  private DatabaseProvider getDatabaseProvider() {
+    if (databaseProvider == null) {
+      databaseProvider = new ExoDatabaseProvider(this);
+    }
+    return databaseProvider;
+  }
+
   private File getDownloadDirectory() {
     if (downloadDirectory == null) {
       downloadDirectory = getExternalFilesDir(null);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
index c673768a7a..91349e9284 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
@@ -82,6 +82,22 @@ public interface Cache {
     }
   }
 
+  /**
+   * Returned by {@link #getUid()} if initialization failed before the unique identifier was read or
+   * generated.
+   */
+  long UID_UNSET = -1;
+
+  /**
+   * Returns a non-negative unique identifier for the cache, or {@link #UID_UNSET} if initialization
+   * failed before the unique identifier was determined.
+   *
+   * <p>Implementations are expected to generate and store the unique identifier alongside the
+   * cached content. If the location of the cache is deleted or swapped, it is expected that a new
+   * unique identifier will be generated when the cache is recreated.
+   */
+  long getUid();
+
   /**
    * Releases the cache. This method must be called when the cache is no longer required. The cache
    * must not be used after calling this method.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index 0e4be169b6..14f659855b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -133,7 +133,7 @@ public final class SimpleCache implements Cache {
       // Make a best effort to read the cache UID and delete associated index data before deleting
       // cache directory itself.
       long uid = loadUid(files);
-      if (uid != -1) {
+      if (uid != UID_UNSET) {
         try {
           CacheFileMetadataIndex.delete(databaseProvider, uid);
         } catch (DatabaseIOException e) {
@@ -155,8 +155,11 @@ public final class SimpleCache implements Cache {
    * the directory cannot be used to store other files.
    *
    * @param cacheDir A dedicated cache directory.
-   * @param evictor The evictor to be used.
+   * @param evictor The evictor to be used. For download use cases where cache eviction should not
+   *     occur, use {@link NoOpCacheEvictor}.
+   * @deprecated Use a constructor that takes a {@link DatabaseProvider} for improved performance.
    */
+  @Deprecated
   public SimpleCache(File cacheDir, CacheEvictor evictor) {
     this(cacheDir, evictor, null, false);
   }
@@ -166,10 +169,13 @@ public final class SimpleCache implements Cache {
    * the directory cannot be used to store other files.
    *
    * @param cacheDir A dedicated cache directory.
-   * @param evictor The evictor to be used.
+   * @param evictor The evictor to be used. For download use cases where cache eviction should not
+   *     occur, use {@link NoOpCacheEvictor}.
    * @param secretKey If not null, cache keys will be stored encrypted on filesystem using AES/CBC.
    *     The key must be 16 bytes long.
+   * @deprecated Use a constructor that takes a {@link DatabaseProvider} for improved performance.
    */
+  @Deprecated
   public SimpleCache(File cacheDir, CacheEvictor evictor, @Nullable byte[] secretKey) {
     this(cacheDir, evictor, secretKey, secretKey != null);
   }
@@ -179,12 +185,15 @@ public final class SimpleCache implements Cache {
    * the directory cannot be used to store other files.
    *
    * @param cacheDir A dedicated cache directory.
-   * @param evictor The evictor to be used.
+   * @param evictor The evictor to be used. For download use cases where cache eviction should not
+   *     occur, use {@link NoOpCacheEvictor}.
    * @param secretKey If not null, cache keys will be stored encrypted on filesystem using AES/CBC.
    *     The key must be 16 bytes long.
    * @param encrypt Whether the index will be encrypted when written. Must be false if {@code
    *     secretKey} is null.
+   * @deprecated Use a constructor that takes a {@link DatabaseProvider} for improved performance.
    */
+  @Deprecated
   public SimpleCache(
       File cacheDir, CacheEvictor evictor, @Nullable byte[] secretKey, boolean encrypt) {
     this(
@@ -196,26 +205,45 @@ public final class SimpleCache implements Cache {
         /* preferLegacyIndex= */ true);
   }
 
-  // TODO: Make public and consider a constructor that takes DatabaseProvider but not legacy args.
+  /**
+   * Constructs the cache. The cache will delete any unrecognized files from the directory. Hence
+   * the directory cannot be used to store other files.
+   *
+   * @param cacheDir A dedicated cache directory.
+   * @param evictor The evictor to be used. For download use cases where cache eviction should not
+   *     occur, use {@link NoOpCacheEvictor}.
+   * @param databaseProvider Provides the database in which the cache index is stored.
+   */
+  public SimpleCache(File cacheDir, CacheEvictor evictor, DatabaseProvider databaseProvider) {
+    this(
+        cacheDir,
+        evictor,
+        databaseProvider,
+        /* legacyIndexSecretKey= */ null,
+        /* legacyIndexEncrypt= */ false,
+        /* preferLegacyIndex= */ false);
+  }
+
   /**
    * Constructs the cache. The cache will delete any unrecognized files from the cache directory.
    * Hence the directory cannot be used to store other files.
    *
    * @param cacheDir A dedicated cache directory.
-   * @param evictor The evictor to be used.
+   * @param evictor The evictor to be used. For download use cases where cache eviction should not
+   *     occur, use {@link NoOpCacheEvictor}.
    * @param databaseProvider Provides the database in which the cache index is stored, or {@code
-   *     null} to use a legacy index. Using the database index is highly recommended for performance
+   *     null} to use a legacy index. Using a database index is highly recommended for performance
    *     reasons.
    * @param legacyIndexSecretKey A 16 byte AES key for reading, and optionally writing, the legacy
    *     index. Not used by the database index, however should still be provided when using the
    *     database index in cases where upgrading from the legacy index may be necessary.
-   * @param legacyIndexEncrypt Whether to encrypt when writing to the legacy index. Must be false if
-   *     {@code legacyIndexSecretKey} is null. Not used by the database index.
+   * @param legacyIndexEncrypt Whether to encrypt when writing to the legacy index. Must be {@code
+   *     false} if {@code legacyIndexSecretKey} is {@code null}. Not used by the database index.
    * @param preferLegacyIndex Whether to use the legacy index even if a {@code databaseProvider} is
-   *     provided. Should be {@code false} in most cases. Setting this to {@code true} is only
+   *     provided. Should be {@code false} in nearly all cases. Setting this to {@code true} is only
    *     useful for downgrading from the database index back to the legacy index.
    */
-  /* package */ SimpleCache(
+  public SimpleCache(
       File cacheDir,
       CacheEvictor evictor,
       @Nullable DatabaseProvider databaseProvider,
@@ -236,15 +264,6 @@ public final class SimpleCache implements Cache {
             : null);
   }
 
-  /**
-   * Constructs the cache. The cache will delete any unrecognized files from the directory. Hence
-   * the directory cannot be used to store other files.
-   *
-   * @param cacheDir A dedicated cache directory.
-   * @param evictor The evictor to be used.
-   * @param contentIndex The content index to be used.
-   * @param fileIndex The file index to be used.
-   */
   /* package */ SimpleCache(
       File cacheDir,
       CacheEvictor evictor,
@@ -260,7 +279,7 @@ public final class SimpleCache implements Cache {
     this.fileIndex = fileIndex;
     listeners = new HashMap<>();
     random = new Random();
-    uid = -1;
+    uid = UID_UNSET;
 
     // Start cache initialization.
     final ConditionVariable conditionVariable = new ConditionVariable();
@@ -288,6 +307,11 @@ public final class SimpleCache implements Cache {
     }
   }
 
+  @Override
+  public synchronized long getUid() {
+    return uid;
+  }
+
   @Override
   public synchronized void release() {
     if (released) {
@@ -529,11 +553,6 @@ public final class SimpleCache implements Cache {
     return contentIndex.getContentMetadata(key);
   }
 
-  /** Returns the non-negative cache UID, or -1 if cache initialization failed. */
-  /* package */ synchronized long getUid() {
-    return uid;
-  }
-
   /**
    * Returns the cache {@link SimpleCacheSpan} corresponding to the provided lookup {@link
    * SimpleCacheSpan}.
@@ -584,15 +603,14 @@ public final class SimpleCache implements Cache {
     }
 
     uid = loadUid(files);
-    if (uid == -1) {
+    if (uid == UID_UNSET) {
       try {
         uid = createUid(cacheDir);
       } catch (IOException e) {
         String message = "Failed to create cache UID: " + cacheDir;
         Log.e(TAG, message, e);
-        // TODO: Reinstate this only when a database index is used [Internal ref: b/128933265].
-        // initializationException = new CacheException(message, e);
-        // return;
+        initializationException = new CacheException(message, e);
+        return;
       }
     }
 
@@ -756,7 +774,7 @@ public final class SimpleCache implements Cache {
    * Loads the cache UID from the files belonging to the root directory.
    *
    * @param files The files belonging to the root directory.
-   * @return The loaded UID, or -1 if a UID has not yet been created.
+   * @return The loaded UID, or {@link #UID_UNSET} if a UID has not yet been created.
    * @throws IOException If there is an error loading or generating the UID.
    */
   private static long loadUid(File[] files) {
@@ -772,7 +790,7 @@ public final class SimpleCache implements Cache {
         }
       }
     }
-    return -1;
+    return UID_UNSET;
   }
 
   @SuppressWarnings("TrulyRandom")

From 77b78b96dff4d117ef7dffe0ff3d77314eafce19 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 15 Apr 2019 23:09:15 +0100
Subject: [PATCH 765/832] DownloadTracker shouldn't depend on
 DefaultDownloadIndex

- It can work with any DownloadIndex
- Also simplify things to not require that it's registered
  as a DownloadManager listener by someone else

PiperOrigin-RevId: 243697352
---
 .../exoplayer2/demo/DemoApplication.java      |  3 +-
 .../exoplayer2/demo/DownloadTracker.java      | 54 +++++++++----------
 2 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
index 574f41cb3e..446184e56b 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
@@ -129,8 +129,7 @@ public class DemoApplication extends Application {
               DownloadManager.DEFAULT_MIN_RETRY_COUNT,
               DownloadManager.DEFAULT_REQUIREMENTS);
       downloadTracker =
-          new DownloadTracker(/* context= */ this, buildDataSourceFactory(), downloadIndex);
-      downloadManager.addListener(downloadTracker);
+          new DownloadTracker(/* context= */ this, buildDataSourceFactory(), downloadManager);
     }
   }
 
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index e26db9cbe7..156c7a0771 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -23,11 +23,11 @@ import androidx.fragment.app.FragmentManager;
 import android.widget.Toast;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.RenderersFactory;
-import com.google.android.exoplayer2.offline.DefaultDownloadIndex;
 import com.google.android.exoplayer2.offline.Download;
 import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadCursor;
 import com.google.android.exoplayer2.offline.DownloadHelper;
+import com.google.android.exoplayer2.offline.DownloadIndex;
 import com.google.android.exoplayer2.offline.DownloadManager;
 import com.google.android.exoplayer2.offline.DownloadService;
 import com.google.android.exoplayer2.offline.StreamKey;
@@ -41,10 +41,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-/**
- * Tracks media that has been downloaded.
- */
-public class DownloadTracker implements DownloadManager.Listener {
+/** Tracks media that has been downloaded. */
+public class DownloadTracker {
 
   /** Listens for changes in the tracked downloads. */
   public interface Listener {
@@ -59,17 +57,18 @@ public class DownloadTracker implements DownloadManager.Listener {
   private final DataSource.Factory dataSourceFactory;
   private final CopyOnWriteArraySet<Listener> listeners;
   private final HashMap<Uri, Download> downloads;
-  private final DefaultDownloadIndex downloadIndex;
+  private final DownloadIndex downloadIndex;
 
   @Nullable private StartDownloadDialogHelper startDownloadDialogHelper;
 
   public DownloadTracker(
-      Context context, DataSource.Factory dataSourceFactory, DefaultDownloadIndex downloadIndex) {
+      Context context, DataSource.Factory dataSourceFactory, DownloadManager downloadManager) {
     this.context = context.getApplicationContext();
     this.dataSourceFactory = dataSourceFactory;
-    this.downloadIndex = downloadIndex;
     listeners = new CopyOnWriteArraySet<>();
     downloads = new HashMap<>();
+    downloadIndex = downloadManager.getDownloadIndex();
+    downloadManager.addListener(new DownloadManagerListener());
     loadDownloads();
   }
 
@@ -114,26 +113,6 @@ public class DownloadTracker implements DownloadManager.Listener {
     }
   }
 
-  // DownloadManager.Listener
-
-  @Override
-  public void onDownloadChanged(DownloadManager downloadManager, Download download) {
-    downloads.put(download.action.uri, download);
-    for (Listener listener : listeners) {
-      listener.onDownloadsChanged();
-    }
-  }
-
-  @Override
-  public void onDownloadRemoved(DownloadManager downloadManager, Download download) {
-    downloads.remove(download.action.uri);
-    for (Listener listener : listeners) {
-      listener.onDownloadsChanged();
-    }
-  }
-
-  // Internal methods
-
   private void loadDownloads() {
     try (DownloadCursor loadedDownloads = downloadIndex.getDownloads()) {
       while (loadedDownloads.moveToNext()) {
@@ -167,6 +146,25 @@ public class DownloadTracker implements DownloadManager.Listener {
     }
   }
 
+  private class DownloadManagerListener implements DownloadManager.Listener {
+
+    @Override
+    public void onDownloadChanged(DownloadManager downloadManager, Download download) {
+      downloads.put(download.action.uri, download);
+      for (Listener listener : listeners) {
+        listener.onDownloadsChanged();
+      }
+    }
+
+    @Override
+    public void onDownloadRemoved(DownloadManager downloadManager, Download download) {
+      downloads.remove(download.action.uri);
+      for (Listener listener : listeners) {
+        listener.onDownloadsChanged();
+      }
+    }
+  }
+
   private final class StartDownloadDialogHelper
       implements DownloadHelper.Callback,
           DialogInterface.OnClickListener,

From c2c7c43a369d90303f9c61bd72b56eb8515c726b Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Tue, 16 Apr 2019 11:53:15 +0100
Subject: [PATCH 766/832] Remove redundant proguard files

PiperOrigin-RevId: 243781000
---
 library/dash/build.gradle                           | 1 -
 library/dash/proguard-rules.txt                     | 7 -------
 library/dash/src/main/proguard-rules.txt            | 1 -
 library/hls/build.gradle                            | 1 -
 library/hls/proguard-rules.txt                      | 7 -------
 library/hls/src/main/proguard-rules.txt             | 1 -
 library/smoothstreaming/build.gradle                | 1 -
 library/smoothstreaming/proguard-rules.txt          | 7 -------
 library/smoothstreaming/src/main/proguard-rules.txt | 1 -
 9 files changed, 27 deletions(-)
 delete mode 100644 library/dash/proguard-rules.txt
 delete mode 120000 library/dash/src/main/proguard-rules.txt
 delete mode 100644 library/hls/proguard-rules.txt
 delete mode 120000 library/hls/src/main/proguard-rules.txt
 delete mode 100644 library/smoothstreaming/proguard-rules.txt
 delete mode 120000 library/smoothstreaming/src/main/proguard-rules.txt

diff --git a/library/dash/build.gradle b/library/dash/build.gradle
index d7186749c2..c7e68f548a 100644
--- a/library/dash/build.gradle
+++ b/library/dash/build.gradle
@@ -25,7 +25,6 @@ android {
     defaultConfig {
         minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
-        consumerProguardFiles 'proguard-rules.txt'
     }
 
     buildTypes {
diff --git a/library/dash/proguard-rules.txt b/library/dash/proguard-rules.txt
deleted file mode 100644
index f8725fff4d..0000000000
--- a/library/dash/proguard-rules.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Proguard rules specific to the dash module.
-
-# Constructors accessed via reflection in SegmentDownloadAction
--dontnote com.google.android.exoplayer2.source.dash.offline.DashDownloadAction
--keepclassmembers class com.google.android.exoplayer2.source.dash.offline.DashDownloadAction {
-  static ** DESERIALIZER;
-}
diff --git a/library/dash/src/main/proguard-rules.txt b/library/dash/src/main/proguard-rules.txt
deleted file mode 120000
index 499fb08b36..0000000000
--- a/library/dash/src/main/proguard-rules.txt
+++ /dev/null
@@ -1 +0,0 @@
-../../proguard-rules.txt
\ No newline at end of file
diff --git a/library/hls/build.gradle b/library/hls/build.gradle
index abdceb1bb8..99619bf750 100644
--- a/library/hls/build.gradle
+++ b/library/hls/build.gradle
@@ -25,7 +25,6 @@ android {
     defaultConfig {
         minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
-        consumerProguardFiles 'proguard-rules.txt'
     }
 
     buildTypes {
diff --git a/library/hls/proguard-rules.txt b/library/hls/proguard-rules.txt
deleted file mode 100644
index 3b8d1bb4ac..0000000000
--- a/library/hls/proguard-rules.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Proguard rules specific to the hls module.
-
-# Constructors accessed via reflection in SegmentDownloadAction
--dontnote com.google.android.exoplayer2.source.hls.offline.HlsDownloadAction
--keepclassmembers class com.google.android.exoplayer2.source.hls.offline.HlsDownloadAction {
-  static ** DESERIALIZER;
-}
diff --git a/library/hls/src/main/proguard-rules.txt b/library/hls/src/main/proguard-rules.txt
deleted file mode 120000
index 499fb08b36..0000000000
--- a/library/hls/src/main/proguard-rules.txt
+++ /dev/null
@@ -1 +0,0 @@
-../../proguard-rules.txt
\ No newline at end of file
diff --git a/library/smoothstreaming/build.gradle b/library/smoothstreaming/build.gradle
index 9799f09e61..ba3b4ab65d 100644
--- a/library/smoothstreaming/build.gradle
+++ b/library/smoothstreaming/build.gradle
@@ -25,7 +25,6 @@ android {
     defaultConfig {
         minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
-        consumerProguardFiles 'proguard-rules.txt'
     }
 
     buildTypes {
diff --git a/library/smoothstreaming/proguard-rules.txt b/library/smoothstreaming/proguard-rules.txt
deleted file mode 100644
index d14244d783..0000000000
--- a/library/smoothstreaming/proguard-rules.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Proguard rules specific to the smoothstreaming module.
-
-# Constructors accessed via reflection in SegmentDownloadAction
--dontnote com.google.android.exoplayer2.source.smoothstreaming.offline.SsDownloadAction
--keepclassmembers class com.google.android.exoplayer2.source.smoothstreaming.offline.SsDownloadAction {
-  static ** DESERIALIZER;
-}
diff --git a/library/smoothstreaming/src/main/proguard-rules.txt b/library/smoothstreaming/src/main/proguard-rules.txt
deleted file mode 120000
index 499fb08b36..0000000000
--- a/library/smoothstreaming/src/main/proguard-rules.txt
+++ /dev/null
@@ -1 +0,0 @@
-../../proguard-rules.txt
\ No newline at end of file

From 9fc3ea79a122bc63ae9b1bdc5cade3584de563d6 Mon Sep 17 00:00:00 2001
From: borrelli <borrelli@google.com>
Date: Tue, 16 Apr 2019 14:54:40 +0100
Subject: [PATCH 767/832] Add ability to register/unregister custom
 CommandReceivers.

PiperOrigin-RevId: 243799572
---
 RELEASENOTES.md                               |  3 ++
 .../mediasession/MediaSessionConnector.java   | 32 +++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index d108140f46..d5cef0bb08 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,6 +2,9 @@
 
 ### dev-v2 (not yet released) ###
 
+* MediaSession extension:
+  * Allow handling of custom commands via `registerCustomCommandReceiver`.
+
 ### 2.10.0 ###
 
 * Core library:
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
index 617423a399..9a1f38c10b 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
@@ -364,6 +364,7 @@ public final class MediaSessionConnector {
   private final Looper looper;
   private final ComponentListener componentListener;
   private final ArrayList<CommandReceiver> commandReceivers;
+  private final ArrayList<CommandReceiver> customCommandReceivers;
 
   private ControlDispatcher controlDispatcher;
   private CustomActionProvider[] customActionProviders;
@@ -392,6 +393,7 @@ public final class MediaSessionConnector {
     looper = Util.getLooper();
     componentListener = new ComponentListener();
     commandReceivers = new ArrayList<>();
+    customCommandReceivers = new ArrayList<>();
     controlDispatcher = new DefaultControlDispatcher();
     customActionProviders = new CustomActionProvider[0];
     customActionMap = Collections.emptyMap();
@@ -697,6 +699,29 @@ public final class MediaSessionConnector {
     }
   }
 
+  /**
+   * Registers a custom command receiver for responding to commands delivered via {@link
+   * MediaSessionCompat.Callback#onCommand(String, Bundle, ResultReceiver)}.
+   *
+   * <p>Commands are only dispatched to this receiver when a player is connected.
+   *
+   * @param commandReceiver The command receiver to register.
+   */
+  public void registerCustomCommandReceiver(CommandReceiver commandReceiver) {
+    if (!customCommandReceivers.contains(commandReceiver)) {
+      customCommandReceivers.add(commandReceiver);
+    }
+  }
+
+  /**
+   * Unregisters a previously registered custom command receiver.
+   *
+   * @param commandReceiver The command receiver to unregister.
+   */
+  public void unregisterCustomCommandReceiver(CommandReceiver commandReceiver) {
+    customCommandReceivers.remove(commandReceiver);
+  }
+
   private void registerCommandReceiver(CommandReceiver commandReceiver) {
     if (!commandReceivers.contains(commandReceiver)) {
       commandReceivers.add(commandReceiver);
@@ -1113,6 +1138,13 @@ public final class MediaSessionConnector {
             return;
           }
         }
+        for (int i = 0; i < customCommandReceivers.size(); i++) {
+          if (customCommandReceivers
+              .get(i)
+              .onCommand(player, controlDispatcher, command, extras, cb)) {
+            return;
+          }
+        }
       }
     }
 

From 5856e75781c5f4edc209ffb29ddec90b81f598bd Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Tue, 16 Apr 2019 15:55:27 +0100
Subject: [PATCH 768/832] Rename DownloadAction to DownloadRequest

PiperOrigin-RevId: 243806888
---
 .../exoplayer2/demo/DemoDownloadService.java  |   4 +-
 .../exoplayer2/demo/DownloadTracker.java      |  22 +-
 .../exoplayer2/offline/ActionFile.java        |  44 ++--
 .../offline/ActionFileUpgradeUtil.java        |  36 +--
 .../offline/DefaultDownloadIndex.java         |  18 +-
 .../offline/DefaultDownloaderFactory.java     |  30 +--
 .../android/exoplayer2/offline/Download.java  |  12 +-
 .../exoplayer2/offline/DownloadHelper.java    |  26 +-
 .../exoplayer2/offline/DownloadManager.java   | 107 ++++----
 ...wnloadAction.java => DownloadRequest.java} |  58 ++---
 .../exoplayer2/offline/DownloadService.java   |  67 +++--
 .../exoplayer2/offline/DownloaderFactory.java |   6 +-
 .../exoplayer2/offline/ActionFileTest.java    |  21 +-
 .../offline/ActionFileUpgradeUtilTest.java    |  56 ++--
 .../offline/DefaultDownloadIndexTest.java     |   2 +-
 .../offline/DefaultDownloaderFactoryTest.java |   4 +-
 .../offline/DownloadActionTest.java           | 246 ------------------
 .../exoplayer2/offline/DownloadBuilder.java   |  15 +-
 .../offline/DownloadHelperTest.java           |  14 +-
 .../offline/DownloadManagerTest.java          | 185 ++++++-------
 .../offline/DownloadRequestTest.java          | 246 ++++++++++++++++++
 .../dash/offline/DashDownloaderTest.java      |   6 +-
 .../dash/offline/DownloadManagerDashTest.java |  34 +--
 .../dash/offline/DownloadServiceDashTest.java |  12 +-
 .../source/hls/offline/HlsDownloaderTest.java |   6 +-
 .../offline/SsDownloaderTest.java             |   6 +-
 .../testutil/TestDownloadManagerListener.java |  16 +-
 27 files changed, 650 insertions(+), 649 deletions(-)
 rename library/core/src/main/java/com/google/android/exoplayer2/offline/{DownloadAction.java => DownloadRequest.java} (74%)
 delete mode 100644 library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadRequestTest.java

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
index c90aba7b7e..3886ef5c44 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
@@ -75,13 +75,13 @@ public class DemoDownloadService extends DownloadService {
           notificationHelper.buildDownloadCompletedNotification(
               R.drawable.ic_download_done,
               /* contentIntent= */ null,
-              Util.fromUtf8Bytes(download.action.data));
+              Util.fromUtf8Bytes(download.request.data));
     } else if (download.state == Download.STATE_FAILED) {
       notification =
           notificationHelper.buildDownloadFailedNotification(
               R.drawable.ic_download_done,
               /* contentIntent= */ null,
-              Util.fromUtf8Bytes(download.action.data));
+              Util.fromUtf8Bytes(download.request.data));
     } else {
       return;
     }
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index 156c7a0771..34282fc389 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -24,11 +24,11 @@ import android.widget.Toast;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.offline.Download;
-import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadCursor;
 import com.google.android.exoplayer2.offline.DownloadHelper;
 import com.google.android.exoplayer2.offline.DownloadIndex;
 import com.google.android.exoplayer2.offline.DownloadManager;
+import com.google.android.exoplayer2.offline.DownloadRequest;
 import com.google.android.exoplayer2.offline.DownloadService;
 import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo;
@@ -89,7 +89,7 @@ public class DownloadTracker {
   public List<StreamKey> getOfflineStreamKeys(Uri uri) {
     Download download = downloads.get(uri);
     return download != null && download.state != Download.STATE_FAILED
-        ? download.action.streamKeys
+        ? download.request.streamKeys
         : Collections.emptyList();
   }
 
@@ -102,7 +102,7 @@ public class DownloadTracker {
     Download download = downloads.get(uri);
     if (download != null) {
       DownloadService.startWithRemoveDownload(
-          context, DemoDownloadService.class, download.action.id, /* foreground= */ false);
+          context, DemoDownloadService.class, download.request.id, /* foreground= */ false);
     } else {
       if (startDownloadDialogHelper != null) {
         startDownloadDialogHelper.release();
@@ -117,18 +117,13 @@ public class DownloadTracker {
     try (DownloadCursor loadedDownloads = downloadIndex.getDownloads()) {
       while (loadedDownloads.moveToNext()) {
         Download download = loadedDownloads.getDownload();
-        downloads.put(download.action.uri, download);
+        downloads.put(download.request.uri, download);
       }
     } catch (IOException e) {
       Log.w(TAG, "Failed to query downloads", e);
     }
   }
 
-  private void startServiceWithAction(DownloadAction action) {
-    DownloadService.startWithAction(
-        context, DemoDownloadService.class, action, /* foreground= */ false);
-  }
-
   private DownloadHelper getDownloadHelper(
       Uri uri, String extension, RenderersFactory renderersFactory) {
     int type = Util.inferContentType(uri, extension);
@@ -150,7 +145,7 @@ public class DownloadTracker {
 
     @Override
     public void onDownloadChanged(DownloadManager downloadManager, Download download) {
-      downloads.put(download.action.uri, download);
+      downloads.put(download.request.uri, download);
       for (Listener listener : listeners) {
         listener.onDownloadsChanged();
       }
@@ -158,7 +153,7 @@ public class DownloadTracker {
 
     @Override
     public void onDownloadRemoved(DownloadManager downloadManager, Download download) {
-      downloads.remove(download.action.uri);
+      downloads.remove(download.request.uri);
       for (Listener listener : listeners) {
         listener.onDownloadsChanged();
       }
@@ -259,8 +254,9 @@ public class DownloadTracker {
     // Internal methods.
 
     private void startDownload() {
-      DownloadAction downloadAction = downloadHelper.getDownloadAction(Util.getUtf8Bytes(name));
-      startServiceWithAction(downloadAction);
+      DownloadRequest downloadRequest = downloadHelper.getDownloadRequest(Util.getUtf8Bytes(name));
+      DownloadService.startWithNewDownload(
+          context, DemoDownloadService.class, downloadRequest, /* foreground= */ false);
     }
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
index 0efbece154..a053185435 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.offline;
 
 import android.net.Uri;
 import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.offline.DownloadAction.UnsupportedActionException;
+import com.google.android.exoplayer2.offline.DownloadRequest.UnsupportedRequestException;
 import com.google.android.exoplayer2.util.AtomicFile;
 import com.google.android.exoplayer2.util.Util;
 import java.io.DataInputStream;
@@ -28,7 +28,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Loads {@link DownloadAction DownloadActions} from legacy action files.
+ * Loads {@link DownloadRequest DownloadRequests} from legacy action files.
  *
  * @deprecated Legacy action files should be merged into download indices using {@link
  *     ActionFileUpgradeUtil}.
@@ -41,7 +41,7 @@ import java.util.List;
   private final AtomicFile atomicFile;
 
   /**
-   * @param actionFile The file from which {@link DownloadAction DownloadActions} will be loaded.
+   * @param actionFile The file from which {@link DownloadRequest DownloadRequests} will be loaded.
    */
   public ActionFile(File actionFile) {
     atomicFile = new AtomicFile(actionFile);
@@ -58,15 +58,15 @@ import java.util.List;
   }
 
   /**
-   * Loads {@link DownloadAction DownloadActions} from the file.
+   * Loads {@link DownloadRequest DownloadRequests} from the file.
    *
-   * @return The loaded {@link DownloadAction DownloadActions}, or an empty array if the file does
+   * @return The loaded {@link DownloadRequest DownloadRequests}, or an empty array if the file does
    *     not exist.
    * @throws IOException If there is an error reading the file.
    */
-  public DownloadAction[] load() throws IOException {
+  public DownloadRequest[] load() throws IOException {
     if (!exists()) {
-      return new DownloadAction[0];
+      return new DownloadRequest[0];
     }
     InputStream inputStream = null;
     try {
@@ -77,21 +77,21 @@ import java.util.List;
         throw new IOException("Unsupported action file version: " + version);
       }
       int actionCount = dataInputStream.readInt();
-      ArrayList<DownloadAction> actions = new ArrayList<>();
+      ArrayList<DownloadRequest> actions = new ArrayList<>();
       for (int i = 0; i < actionCount; i++) {
         try {
-          actions.add(readDownloadAction(dataInputStream));
-        } catch (UnsupportedActionException e) {
-          // remove DownloadAction is not supported. Ignore the exception and continue loading rest.
+          actions.add(readDownloadRequest(dataInputStream));
+        } catch (UnsupportedRequestException e) {
+          // remove DownloadRequest is not supported. Ignore and continue loading rest.
         }
       }
-      return actions.toArray(new DownloadAction[0]);
+      return actions.toArray(new DownloadRequest[0]);
     } finally {
       Util.closeQuietly(inputStream);
     }
   }
 
-  private static DownloadAction readDownloadAction(DataInputStream input) throws IOException {
+  private static DownloadRequest readDownloadRequest(DataInputStream input) throws IOException {
     String type = input.readUTF();
     int version = input.readInt();
 
@@ -108,7 +108,7 @@ import java.util.List;
     }
 
     // Serialized version 0 progressive actions did not contain keys.
-    boolean isLegacyProgressive = version == 0 && DownloadAction.TYPE_PROGRESSIVE.equals(type);
+    boolean isLegacyProgressive = version == 0 && DownloadRequest.TYPE_PROGRESSIVE.equals(type);
     List<StreamKey> keys = new ArrayList<>();
     if (!isLegacyProgressive) {
       int keyCount = input.readInt();
@@ -120,22 +120,22 @@ import java.util.List;
     // Serialized version 0 and 1 DASH/HLS/SS actions did not contain a custom cache key.
     boolean isLegacySegmented =
         version < 2
-            && (DownloadAction.TYPE_DASH.equals(type)
-                || DownloadAction.TYPE_HLS.equals(type)
-                || DownloadAction.TYPE_SS.equals(type));
+            && (DownloadRequest.TYPE_DASH.equals(type)
+                || DownloadRequest.TYPE_HLS.equals(type)
+                || DownloadRequest.TYPE_SS.equals(type));
     String customCacheKey = null;
     if (!isLegacySegmented) {
       customCacheKey = input.readBoolean() ? input.readUTF() : null;
     }
 
     // Serialized version 0, 1 and 2 did not contain an id. We need to generate one.
-    String id = version < 3 ? generateDownloadActionId(uri, customCacheKey) : input.readUTF();
+    String id = version < 3 ? generateDownloadId(uri, customCacheKey) : input.readUTF();
 
     if (isRemoveAction) {
       // Remove actions are not supported anymore.
-      throw new UnsupportedActionException();
+      throw new UnsupportedRequestException();
     }
-    return new DownloadAction(id, type, uri, keys, customCacheKey, data);
+    return new DownloadRequest(id, type, uri, keys, customCacheKey, data);
   }
 
   private static StreamKey readKey(String type, int version, DataInputStream input)
@@ -145,7 +145,7 @@ import java.util.List;
     int trackIndex;
 
     // Serialized version 0 HLS/SS actions did not contain a period index.
-    if ((DownloadAction.TYPE_HLS.equals(type) || DownloadAction.TYPE_SS.equals(type))
+    if ((DownloadRequest.TYPE_HLS.equals(type) || DownloadRequest.TYPE_SS.equals(type))
         && version == 0) {
       periodIndex = 0;
       groupIndex = input.readInt();
@@ -158,7 +158,7 @@ import java.util.List;
     return new StreamKey(periodIndex, groupIndex, trackIndex);
   }
 
-  private static String generateDownloadActionId(Uri uri, @Nullable String customCacheKey) {
+  private static String generateDownloadId(Uri uri, @Nullable String customCacheKey) {
     return customCacheKey != null ? customCacheKey : uri.toString();
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java
index e30d202649..0a37fe3a80 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java
@@ -28,18 +28,18 @@ public final class ActionFileUpgradeUtil {
   public interface DownloadIdProvider {
 
     /**
-     * Returns a download id for given action.
+     * Returns a download id for given request.
      *
-     * @param downloadAction The action for which an ID is required.
+     * @param downloadRequest The request for which an ID is required.
      * @return A corresponding download ID.
      */
-    String getId(DownloadAction downloadAction);
+    String getId(DownloadRequest downloadRequest);
   }
 
   private ActionFileUpgradeUtil() {}
 
   /**
-   * Merges {@link DownloadAction DownloadActions} contained in a legacy action file into a {@link
+   * Merges {@link DownloadRequest DownloadRequests} contained in a legacy action file into a {@link
    * DefaultDownloadIndex}, deleting the action file if the merge is successful or if {@code
    * deleteOnFailure} is {@code true}.
    *
@@ -49,9 +49,9 @@ public final class ActionFileUpgradeUtil {
    * @param actionFilePath The action file path.
    * @param downloadIdProvider A download ID provider, or {@code null}. If {@code null} then ID of
    *     each download will be its custom cache key if one is specified, or else its URL.
-   * @param downloadIndex The index into which the action will be merged.
+   * @param downloadIndex The index into which the requests will be merged.
    * @param deleteOnFailure Whether to delete the action file if the merge fails.
-   * @throws IOException If an error occurs loading or merging the actions.
+   * @throws IOException If an error occurs loading or merging the requests.
    */
   @SuppressWarnings("deprecation")
   public static void upgradeAndDelete(
@@ -64,11 +64,11 @@ public final class ActionFileUpgradeUtil {
     if (actionFile.exists()) {
       boolean success = false;
       try {
-        for (DownloadAction action : actionFile.load()) {
+        for (DownloadRequest request : actionFile.load()) {
           if (downloadIdProvider != null) {
-            action = action.copyWithId(downloadIdProvider.getId(action));
+            request = request.copyWithId(downloadIdProvider.getId(request));
           }
-          mergeAction(action, downloadIndex);
+          mergeRequest(request, downloadIndex);
         }
         success = true;
       } finally {
@@ -80,22 +80,22 @@ public final class ActionFileUpgradeUtil {
   }
 
   /**
-   * Merges a {@link DownloadAction} into a {@link DefaultDownloadIndex}.
+   * Merges a {@link DownloadRequest} into a {@link DefaultDownloadIndex}.
    *
-   * @param action The action to be merged.
-   * @param downloadIndex The index into which the action will be merged.
-   * @throws IOException If an error occurs merging the action.
+   * @param request The request to be merged.
+   * @param downloadIndex The index into which the request will be merged.
+   * @throws IOException If an error occurs merging the request.
    */
-  /* package */ static void mergeAction(DownloadAction action, DefaultDownloadIndex downloadIndex)
-      throws IOException {
-    Download download = downloadIndex.getDownload(action.id);
+  /* package */ static void mergeRequest(
+      DownloadRequest request, DefaultDownloadIndex downloadIndex) throws IOException {
+    Download download = downloadIndex.getDownload(request.id);
     if (download != null) {
-      download = DownloadManager.mergeAction(download, action, download.manualStopReason);
+      download = DownloadManager.mergeRequest(download, request, download.manualStopReason);
     } else {
       long nowMs = System.currentTimeMillis();
       download =
           new Download(
-              action,
+              request,
               STATE_QUEUED,
               Download.FAILURE_REASON_NONE,
               Download.MANUAL_STOP_REASON_NONE,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
index aae88828c3..d7ab4201a5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -194,12 +194,12 @@ public final class DefaultDownloadIndex implements DownloadIndex {
   public void putDownload(Download download) throws DatabaseIOException {
     ensureInitialized();
     ContentValues values = new ContentValues();
-    values.put(COLUMN_ID, download.action.id);
-    values.put(COLUMN_TYPE, download.action.type);
-    values.put(COLUMN_URI, download.action.uri.toString());
-    values.put(COLUMN_STREAM_KEYS, encodeStreamKeys(download.action.streamKeys));
-    values.put(COLUMN_CUSTOM_CACHE_KEY, download.action.customCacheKey);
-    values.put(COLUMN_DATA, download.action.data);
+    values.put(COLUMN_ID, download.request.id);
+    values.put(COLUMN_TYPE, download.request.type);
+    values.put(COLUMN_URI, download.request.uri.toString());
+    values.put(COLUMN_STREAM_KEYS, encodeStreamKeys(download.request.streamKeys));
+    values.put(COLUMN_CUSTOM_CACHE_KEY, download.request.customCacheKey);
+    values.put(COLUMN_DATA, download.request.data);
     values.put(COLUMN_STATE, download.state);
     values.put(COLUMN_DOWNLOAD_PERCENTAGE, download.getDownloadPercentage());
     values.put(COLUMN_DOWNLOADED_BYTES, download.getDownloadedBytes());
@@ -342,8 +342,8 @@ public final class DefaultDownloadIndex implements DownloadIndex {
   }
 
   private static Download getDownloadForCurrentRow(Cursor cursor) {
-    DownloadAction action =
-        new DownloadAction(
+    DownloadRequest request =
+        new DownloadRequest(
             cursor.getString(COLUMN_INDEX_ID),
             cursor.getString(COLUMN_INDEX_TYPE),
             Uri.parse(cursor.getString(COLUMN_INDEX_URI)),
@@ -355,7 +355,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
     cachingCounters.contentLength = cursor.getLong(COLUMN_INDEX_TOTAL_BYTES);
     cachingCounters.percentage = cursor.getFloat(COLUMN_INDEX_DOWNLOAD_PERCENTAGE);
     return new Download(
-        action,
+        request,
         cursor.getInt(COLUMN_INDEX_STATE),
         cursor.getInt(COLUMN_INDEX_FAILURE_REASON),
         cursor.getInt(COLUMN_INDEX_MANUAL_STOP_REASON),
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java
index 03421dfdff..9a4e5925ee 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java
@@ -76,32 +76,32 @@ public class DefaultDownloaderFactory implements DownloaderFactory {
   }
 
   @Override
-  public Downloader createDownloader(DownloadAction action) {
-    switch (action.type) {
-      case DownloadAction.TYPE_PROGRESSIVE:
+  public Downloader createDownloader(DownloadRequest request) {
+    switch (request.type) {
+      case DownloadRequest.TYPE_PROGRESSIVE:
         return new ProgressiveDownloader(
-            action.uri, action.customCacheKey, downloaderConstructorHelper);
-      case DownloadAction.TYPE_DASH:
-        return createDownloader(action, DASH_DOWNLOADER_CONSTRUCTOR);
-      case DownloadAction.TYPE_HLS:
-        return createDownloader(action, HLS_DOWNLOADER_CONSTRUCTOR);
-      case DownloadAction.TYPE_SS:
-        return createDownloader(action, SS_DOWNLOADER_CONSTRUCTOR);
+            request.uri, request.customCacheKey, downloaderConstructorHelper);
+      case DownloadRequest.TYPE_DASH:
+        return createDownloader(request, DASH_DOWNLOADER_CONSTRUCTOR);
+      case DownloadRequest.TYPE_HLS:
+        return createDownloader(request, HLS_DOWNLOADER_CONSTRUCTOR);
+      case DownloadRequest.TYPE_SS:
+        return createDownloader(request, SS_DOWNLOADER_CONSTRUCTOR);
       default:
-        throw new IllegalArgumentException("Unsupported type: " + action.type);
+        throw new IllegalArgumentException("Unsupported type: " + request.type);
     }
   }
 
   private Downloader createDownloader(
-      DownloadAction action, @Nullable Constructor<? extends Downloader> constructor) {
+      DownloadRequest request, @Nullable Constructor<? extends Downloader> constructor) {
     if (constructor == null) {
-      throw new IllegalStateException("Module missing for: " + action.type);
+      throw new IllegalStateException("Module missing for: " + request.type);
     }
     try {
       // TODO: Support customCacheKey in DASH/HLS/SS, for completeness.
-      return constructor.newInstance(action.uri, action.streamKeys, downloaderConstructorHelper);
+      return constructor.newInstance(request.uri, request.streamKeys, downloaderConstructorHelper);
     } catch (Exception e) {
-      throw new RuntimeException("Failed to instantiate downloader for: " + action.type, e);
+      throw new RuntimeException("Failed to instantiate downloader for: " + request.type, e);
     }
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
index a28679ea04..b29abde24b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
@@ -94,8 +94,8 @@ public final class Download {
     }
   }
 
-  /** The download action. */
-  public final DownloadAction action;
+  /** The download request. */
+  public final DownloadRequest request;
 
   /** The state of the download. */
   @State public final int state;
@@ -114,14 +114,14 @@ public final class Download {
   /* package */ CachingCounters counters;
 
   /* package */ Download(
-      DownloadAction action,
+      DownloadRequest request,
       @State int state,
       @FailureReason int failureReason,
       int manualStopReason,
       long startTimeMs,
       long updateTimeMs) {
     this(
-        action,
+        request,
         state,
         failureReason,
         manualStopReason,
@@ -131,7 +131,7 @@ public final class Download {
   }
 
   /* package */ Download(
-      DownloadAction action,
+      DownloadRequest request,
       @State int state,
       @FailureReason int failureReason,
       int manualStopReason,
@@ -143,7 +143,7 @@ public final class Download {
     if (manualStopReason != 0) {
       Assertions.checkState(state != STATE_DOWNLOADING && state != STATE_QUEUED);
     }
-    this.action = action;
+    this.request = request;
     this.state = state;
     this.failureReason = failureReason;
     this.manualStopReason = manualStopReason;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index 39dd944552..c9b0451f41 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -63,7 +63,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
  * A helper for initializing and removing downloads.
  *
  * <p>The helper extracts track information from the media, selects tracks for downloading, and
- * creates {@link DownloadAction download actions} based on the selected tracks.
+ * creates {@link DownloadRequest download requests} based on the selected tracks.
  *
  * <p>A typical usage of DownloadHelper follows these steps:
  *
@@ -74,7 +74,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
  *       #getTrackSelections(int, int)}, and make adjustments using {@link
  *       #clearTrackSelections(int)}, {@link #replaceTrackSelections(int, Parameters)} and {@link
  *       #addTrackSelection(int, Parameters)}.
- *   <li>Create a download action for the selected track using {@link #getDownloadAction(byte[])}.
+ *   <li>Create a download request for the selected track using {@link #getDownloadRequest(byte[])}.
  *   <li>Release the helper using {@link #release()}.
  * </ol>
  */
@@ -150,7 +150,7 @@ public final class DownloadHelper {
    */
   public static DownloadHelper forProgressive(Uri uri, @Nullable String cacheKey) {
     return new DownloadHelper(
-        DownloadAction.TYPE_PROGRESSIVE,
+        DownloadRequest.TYPE_PROGRESSIVE,
         uri,
         cacheKey,
         /* mediaSource= */ null,
@@ -199,7 +199,7 @@ public final class DownloadHelper {
       @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
       DefaultTrackSelector.Parameters trackSelectorParameters) {
     return new DownloadHelper(
-        DownloadAction.TYPE_DASH,
+        DownloadRequest.TYPE_DASH,
         uri,
         /* cacheKey= */ null,
         createMediaSource(
@@ -249,7 +249,7 @@ public final class DownloadHelper {
       @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
       DefaultTrackSelector.Parameters trackSelectorParameters) {
     return new DownloadHelper(
-        DownloadAction.TYPE_HLS,
+        DownloadRequest.TYPE_HLS,
         uri,
         /* cacheKey= */ null,
         createMediaSource(
@@ -299,7 +299,7 @@ public final class DownloadHelper {
       @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
       DefaultTrackSelector.Parameters trackSelectorParameters) {
     return new DownloadHelper(
-        DownloadAction.TYPE_SS,
+        DownloadRequest.TYPE_SS,
         uri,
         /* cacheKey= */ null,
         createMediaSource(uri, dataSourceFactory, SS_FACTORY_CONSTRUCTOR, SS_FACTORY_CREATE_METHOD),
@@ -327,7 +327,7 @@ public final class DownloadHelper {
   /**
    * Creates download helper.
    *
-   * @param downloadType A download type. This value will be used as {@link DownloadAction#type}.
+   * @param downloadType A download type. This value will be used as {@link DownloadRequest#type}.
    * @param uri A {@link Uri}.
    * @param cacheKey An optional cache key.
    * @param mediaSource A {@link MediaSource} for which tracks are selected, or null if no track
@@ -577,16 +577,16 @@ public final class DownloadHelper {
   }
 
   /**
-   * Builds a {@link DownloadAction} for downloading the selected tracks. Must not be called until
+   * Builds a {@link DownloadRequest} for downloading the selected tracks. Must not be called until
    * after preparation completes.
    *
-   * @param data Application provided data to store in {@link DownloadAction#data}.
-   * @return The built {@link DownloadAction}.
+   * @param data Application provided data to store in {@link DownloadRequest#data}.
+   * @return The built {@link DownloadRequest}.
    */
-  public DownloadAction getDownloadAction(@Nullable byte[] data) {
+  public DownloadRequest getDownloadRequest(@Nullable byte[] data) {
     String downloadId = uri.toString();
     if (mediaSource == null) {
-      return new DownloadAction(
+      return new DownloadRequest(
           downloadId, downloadType, uri, /* streamKeys= */ Collections.emptyList(), cacheKey, data);
     }
     assertPreparedWithMedia();
@@ -601,7 +601,7 @@ public final class DownloadHelper {
       }
       streamKeys.addAll(mediaPreparer.mediaPeriods[periodIndex].getStreamKeys(allSelections));
     }
-    return new DownloadAction(downloadId, downloadType, uri, streamKeys, cacheKey, data);
+    return new DownloadRequest(downloadId, downloadType, uri, streamKeys, cacheKey, data);
   }
 
   // Initialization of array of Lists.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 813376579b..03c33b6aad 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -69,7 +69,7 @@ public final class DownloadManager {
   public interface Listener {
 
     /**
-     * Called when all actions have been restored.
+     * Called when all downloads have been restored.
      *
      * @param downloadManager The reporting instance.
      */
@@ -382,25 +382,25 @@ public final class DownloadManager {
   }
 
   /**
-   * Adds a download defined by the given action.
+   * Adds a download defined by the given request.
    *
-   * @param action The download action.
+   * @param request The download request.
    */
-  public void addDownload(DownloadAction action) {
-    addDownload(action, Download.MANUAL_STOP_REASON_NONE);
+  public void addDownload(DownloadRequest request) {
+    addDownload(request, Download.MANUAL_STOP_REASON_NONE);
   }
 
   /**
-   * Adds a download defined by the given action and with the specified manual stop reason.
+   * Adds a download defined by the given request and with the specified manual stop reason.
    *
-   * @param action The download action.
+   * @param request The download request.
    * @param manualStopReason An initial manual stop reason for the download, or {@link
    *     Download#MANUAL_STOP_REASON_NONE} if the download should be started.
    */
-  public void addDownload(DownloadAction action, int manualStopReason) {
+  public void addDownload(DownloadRequest request, int manualStopReason) {
     pendingMessages++;
     internalHandler
-        .obtainMessage(MSG_ADD_DOWNLOAD, manualStopReason, /* unused */ 0, action)
+        .obtainMessage(MSG_ADD_DOWNLOAD, manualStopReason, /* unused */ 0, request)
         .sendToTarget();
   }
 
@@ -415,9 +415,8 @@ public final class DownloadManager {
   }
 
   /**
-   * Stops all of the downloads and releases resources. If the action file isn't up to date, waits
-   * for the changes to be written. The manager must not be accessed after this method has been
-   * called.
+   * Stops the downloads and releases resources. Waits until the downloads are persisted to the
+   * download index. The manager must not be accessed after this method has been called.
    */
   public void release() {
     synchronized (releaseLock) {
@@ -498,7 +497,7 @@ public final class DownloadManager {
   }
 
   private void onDownloadChanged(Download download) {
-    int downloadIndex = getDownloadIndex(download.action.id);
+    int downloadIndex = getDownloadIndex(download.request.id);
     if (download.isTerminalState()) {
       if (downloadIndex != C.INDEX_UNSET) {
         downloads.remove(downloadIndex);
@@ -514,7 +513,7 @@ public final class DownloadManager {
   }
 
   private void onDownloadRemoved(Download download) {
-    downloads.remove(getDownloadIndex(download.action.id));
+    downloads.remove(getDownloadIndex(download.request.id));
     for (Listener listener : listeners) {
       listener.onDownloadRemoved(this, download);
     }
@@ -532,7 +531,7 @@ public final class DownloadManager {
 
   private int getDownloadIndex(String id) {
     for (int i = 0; i < downloads.size(); i++) {
-      if (downloads.get(i).action.id.equals(id)) {
+      if (downloads.get(i).request.id.equals(id)) {
         return i;
       }
     }
@@ -562,9 +561,9 @@ public final class DownloadManager {
         setManualStopReasonInternal(id, manualStopReason);
         break;
       case MSG_ADD_DOWNLOAD:
-        DownloadAction action = (DownloadAction) message.obj;
+        DownloadRequest request = (DownloadRequest) message.obj;
         manualStopReason = message.arg1;
-        addDownloadInternal(action, manualStopReason);
+        addDownloadInternal(request, manualStopReason);
         break;
       case MSG_REMOVE_DOWNLOAD:
         id = (String) message.obj;
@@ -657,27 +656,27 @@ public final class DownloadManager {
     }
   }
 
-  private void addDownloadInternal(DownloadAction action, int manualStopReason) {
-    DownloadInternal downloadInternal = getDownload(action.id);
+  private void addDownloadInternal(DownloadRequest request, int manualStopReason) {
+    DownloadInternal downloadInternal = getDownload(request.id);
     if (downloadInternal != null) {
-      downloadInternal.addAction(action, manualStopReason);
-      logd("Action is added to existing download", downloadInternal);
+      downloadInternal.addRequest(request, manualStopReason);
+      logd("Request is added to existing download", downloadInternal);
     } else {
-      Download download = loadDownload(action.id);
+      Download download = loadDownload(request.id);
       if (download == null) {
         long nowMs = System.currentTimeMillis();
         download =
             new Download(
-                action,
+                request,
                 manualStopReason != Download.MANUAL_STOP_REASON_NONE ? STATE_STOPPED : STATE_QUEUED,
                 Download.FAILURE_REASON_NONE,
                 manualStopReason,
                 /* startTimeMs= */ nowMs,
                 /* updateTimeMs= */ nowMs);
-        logd("Download state is created for " + action.id);
+        logd("Download state is created for " + request.id);
       } else {
-        download = mergeAction(download, action, manualStopReason);
-        logd("Download state is loaded for " + action.id);
+        download = mergeRequest(download, request, manualStopReason);
+        logd("Download state is loaded for " + request.id);
       }
       addDownloadForState(download);
     }
@@ -698,8 +697,8 @@ public final class DownloadManager {
   }
 
   private void onDownloadThreadStoppedInternal(DownloadThread downloadThread) {
-    logd("Download is stopped", downloadThread.action);
-    String downloadId = downloadThread.action.id;
+    logd("Download is stopped", downloadThread.request);
+    String downloadId = downloadThread.request.id;
     downloadThreads.remove(downloadId);
     boolean tryToStartDownloads = false;
     if (!downloadThread.isRemove) {
@@ -747,7 +746,7 @@ public final class DownloadManager {
   private void onDownloadRemovedInternal(DownloadInternal downloadInternal, Download download) {
     logd("Download is removed", downloadInternal);
     try {
-      downloadIndex.removeDownload(download.action.id);
+      downloadIndex.removeDownload(download.request.id);
     } catch (DatabaseIOException e) {
       Log.e(TAG, "Failed to remove from index", e);
     }
@@ -757,8 +756,8 @@ public final class DownloadManager {
 
   @StartThreadResults
   private int startDownloadThread(DownloadInternal downloadInternal) {
-    DownloadAction action = downloadInternal.download.action;
-    String downloadId = action.id;
+    DownloadRequest request = downloadInternal.download.request;
+    String downloadId = request.id;
     if (downloadThreads.containsKey(downloadId)) {
       if (stopDownloadThreadInternal(downloadId)) {
         return START_THREAD_WAIT_DOWNLOAD_CANCELLATION;
@@ -772,9 +771,9 @@ public final class DownloadManager {
       }
       simultaneousDownloads++;
     }
-    Downloader downloader = downloaderFactory.createDownloader(action);
+    Downloader downloader = downloaderFactory.createDownloader(request);
     DownloadThread downloadThread =
-        new DownloadThread(action, downloader, isRemove, minRetryCount, internalHandler);
+        new DownloadThread(request, downloader, isRemove, minRetryCount, internalHandler);
     downloadThreads.put(downloadId, downloadThread);
     downloadInternal.setCounters(downloadThread.downloader.getCounters());
     downloadThread.start();
@@ -786,7 +785,7 @@ public final class DownloadManager {
     DownloadThread downloadThread = downloadThreads.get(downloadId);
     if (downloadThread != null && !downloadThread.isRemove) {
       downloadThread.cancel(/* released= */ false);
-      logd("Download is cancelled", downloadThread.action);
+      logd("Download is cancelled", downloadThread.request);
       return true;
     }
     return false;
@@ -796,7 +795,7 @@ public final class DownloadManager {
   private DownloadInternal getDownload(String id) {
     for (int i = 0; i < downloadInternals.size(); i++) {
       DownloadInternal downloadInternal = downloadInternals.get(i);
-      if (downloadInternal.download.action.id.equals(id)) {
+      if (downloadInternal.download.request.id.equals(id)) {
         return downloadInternal;
       }
     }
@@ -823,8 +822,8 @@ public final class DownloadManager {
     return downloadsStarted && notMetRequirements == 0;
   }
 
-  /* package */ static Download mergeAction(
-      Download download, DownloadAction action, int manualStopReason) {
+  /* package */ static Download mergeRequest(
+      Download download, DownloadRequest request, int manualStopReason) {
     @Download.State int state = download.state;
     if (state == STATE_REMOVING || state == STATE_RESTARTING) {
       state = STATE_RESTARTING;
@@ -836,7 +835,7 @@ public final class DownloadManager {
     long nowMs = System.currentTimeMillis();
     long startTimeMs = download.isTerminalState() ? nowMs : download.startTimeMs;
     return new Download(
-        download.action.copyWithMergedAction(action),
+        download.request.copyWithMergedRequest(request),
         state,
         FAILURE_REASON_NONE,
         manualStopReason,
@@ -847,7 +846,7 @@ public final class DownloadManager {
 
   private static Download copyWithState(Download download, @Download.State int state) {
     return new Download(
-        download.action,
+        download.request,
         state,
         FAILURE_REASON_NONE,
         download.manualStopReason,
@@ -863,12 +862,12 @@ public final class DownloadManager {
   }
 
   private static void logd(String message, DownloadInternal downloadInternal) {
-    logd(message, downloadInternal.download.action);
+    logd(message, downloadInternal.download.request);
   }
 
-  private static void logd(String message, DownloadAction action) {
+  private static void logd(String message, DownloadRequest request) {
     if (DEBUG) {
-      logd(message + ": " + action);
+      logd(message + ": " + request);
     }
   }
 
@@ -899,8 +898,8 @@ public final class DownloadManager {
       initialize(download.state);
     }
 
-    public void addAction(DownloadAction newAction, int manualStopReason) {
-      download = mergeAction(download, newAction, manualStopReason);
+    public void addRequest(DownloadRequest newRequest, int manualStopReason) {
+      download = mergeRequest(download, newRequest, manualStopReason);
       initialize();
     }
 
@@ -911,7 +910,7 @@ public final class DownloadManager {
     public Download getUpdatedDownload() {
       download =
           new Download(
-              download.action,
+              download.request,
               state,
               state != STATE_FAILED ? FAILURE_REASON_NONE : failureReason,
               manualStopReason,
@@ -927,7 +926,7 @@ public final class DownloadManager {
 
     @Override
     public String toString() {
-      return download.action.id + ' ' + Download.getStateString(state);
+      return download.request.id + ' ' + Download.getStateString(state);
     }
 
     public void start() {
@@ -959,7 +958,7 @@ public final class DownloadManager {
         }
       } else {
         if (state == STATE_DOWNLOADING || state == STATE_QUEUED) {
-          downloadManager.stopDownloadThreadInternal(download.action.id);
+          downloadManager.stopDownloadThreadInternal(download.request.id);
           setState(STATE_STOPPED);
         }
       }
@@ -1018,7 +1017,7 @@ public final class DownloadManager {
         initialize(STATE_QUEUED);
       } else { // STATE_DOWNLOADING
         if (error != null) {
-          Log.e(TAG, "Download failed: " + download.action.id, error);
+          Log.e(TAG, "Download failed: " + download.request.id, error);
           failureReason = FAILURE_REASON_UNKNOWN;
           setState(STATE_FAILED);
         } else {
@@ -1030,7 +1029,7 @@ public final class DownloadManager {
 
   private static class DownloadThread extends Thread {
 
-    private final DownloadAction action;
+    private final DownloadRequest request;
     private final Downloader downloader;
     private final boolean isRemove;
     private final int minRetryCount;
@@ -1040,12 +1039,12 @@ public final class DownloadManager {
     private Throwable finalError;
 
     private DownloadThread(
-        DownloadAction action,
+        DownloadRequest request,
         Downloader downloader,
         boolean isRemove,
         int minRetryCount,
         Handler onStoppedHandler) {
-      this.action = action;
+      this.request = request;
       this.isRemove = isRemove;
       this.downloader = downloader;
       this.minRetryCount = minRetryCount;
@@ -1069,7 +1068,7 @@ public final class DownloadManager {
 
     @Override
     public void run() {
-      logd("Download started", action);
+      logd("Download started", request);
       try {
         if (isRemove) {
           downloader.remove();
@@ -1084,14 +1083,14 @@ public final class DownloadManager {
               if (!isCanceled) {
                 long downloadedBytes = downloader.getDownloadedBytes();
                 if (downloadedBytes != errorPosition) {
-                  logd("Reset error count. downloadedBytes = " + downloadedBytes, action);
+                  logd("Reset error count. downloadedBytes = " + downloadedBytes, request);
                   errorPosition = downloadedBytes;
                   errorCount = 0;
                 }
                 if (++errorCount > minRetryCount) {
                   throw e;
                 }
-                logd("Download error. Retry " + errorCount, action);
+                logd("Download error. Retry " + errorCount, request);
                 Thread.sleep(getRetryDelayMillis(errorCount));
               }
             }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadRequest.java
similarity index 74%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
rename to library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadRequest.java
index 08e6c2aafe..5acefd6f93 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadRequest.java
@@ -30,10 +30,10 @@ import java.util.Collections;
 import java.util.List;
 
 /** Defines content to be downloaded. */
-public final class DownloadAction implements Parcelable {
+public final class DownloadRequest implements Parcelable {
 
-  /** Thrown when the encoded action data belongs to an unsupported DownloadAction type. */
-  public static class UnsupportedActionException extends IOException {}
+  /** Thrown when the encoded request data belongs to an unsupported request type. */
+  public static class UnsupportedRequestException extends IOException {}
 
   /** Type for progressive downloads. */
   public static final String TYPE_PROGRESSIVE = "progressive";
@@ -46,7 +46,7 @@ public final class DownloadAction implements Parcelable {
 
   /** The unique content id. */
   public final String id;
-  /** The type of the action. */
+  /** The type of the request. */
   public final String type;
   /** The uri being downloaded. */
   public final Uri uri;
@@ -65,7 +65,7 @@ public final class DownloadAction implements Parcelable {
    * @param customCacheKey See {@link #customCacheKey}.
    * @param data See {@link #data}.
    */
-  public DownloadAction(
+  public DownloadRequest(
       String id,
       String type,
       Uri uri,
@@ -82,7 +82,7 @@ public final class DownloadAction implements Parcelable {
     this.data = data != null ? Arrays.copyOf(data, data.length) : Util.EMPTY_BYTE_ARRAY;
   }
 
-  /* package */ DownloadAction(Parcel in) {
+  /* package */ DownloadRequest(Parcel in) {
     id = castNonNull(in.readString());
     type = castNonNull(in.readString());
     uri = Uri.parse(castNonNull(in.readString()));
@@ -103,40 +103,40 @@ public final class DownloadAction implements Parcelable {
    * @param id The ID of the copy.
    * @return The copy with the specified ID.
    */
-  public DownloadAction copyWithId(String id) {
-    return new DownloadAction(id, type, uri, streamKeys, customCacheKey, data);
+  public DownloadRequest copyWithId(String id) {
+    return new DownloadRequest(id, type, uri, streamKeys, customCacheKey, data);
   }
 
   /**
-   * Returns the result of merging {@code newAction} into this action. The actions must have the
+   * Returns the result of merging {@code newRequest} into this request. The requests must have the
    * same {@link #id} and {@link #type}.
    *
-   * <p>If the actions have different {@link #uri}, {@link #customCacheKey} and {@link #data}
-   * values, then those from the action being merged are included in the result.
+   * <p>If the requests have different {@link #uri}, {@link #customCacheKey} and {@link #data}
+   * values, then those from the request being merged are included in the result.
    *
-   * @param newAction The action being merged.
+   * @param newRequest The request being merged.
    * @return The merged result.
-   * @throws IllegalArgumentException If the actions do not have the same {@link #id} and {@link
+   * @throws IllegalArgumentException If the requests do not have the same {@link #id} and {@link
    *     #type}.
    */
-  public DownloadAction copyWithMergedAction(DownloadAction newAction) {
-    Assertions.checkArgument(id.equals(newAction.id));
-    Assertions.checkArgument(type.equals(newAction.type));
+  public DownloadRequest copyWithMergedRequest(DownloadRequest newRequest) {
+    Assertions.checkArgument(id.equals(newRequest.id));
+    Assertions.checkArgument(type.equals(newRequest.type));
     List<StreamKey> mergedKeys;
-    if (streamKeys.isEmpty() || newAction.streamKeys.isEmpty()) {
+    if (streamKeys.isEmpty() || newRequest.streamKeys.isEmpty()) {
       // If either streamKeys is empty then all streams should be downloaded.
       mergedKeys = Collections.emptyList();
     } else {
       mergedKeys = new ArrayList<>(streamKeys);
-      for (int i = 0; i < newAction.streamKeys.size(); i++) {
-        StreamKey newKey = newAction.streamKeys.get(i);
+      for (int i = 0; i < newRequest.streamKeys.size(); i++) {
+        StreamKey newKey = newRequest.streamKeys.get(i);
         if (!mergedKeys.contains(newKey)) {
           mergedKeys.add(newKey);
         }
       }
     }
-    return new DownloadAction(
-        id, type, newAction.uri, mergedKeys, newAction.customCacheKey, newAction.data);
+    return new DownloadRequest(
+        id, type, newRequest.uri, mergedKeys, newRequest.customCacheKey, newRequest.data);
   }
 
   @Override
@@ -146,10 +146,10 @@ public final class DownloadAction implements Parcelable {
 
   @Override
   public boolean equals(@Nullable Object o) {
-    if (!(o instanceof DownloadAction)) {
+    if (!(o instanceof DownloadRequest)) {
       return false;
     }
-    DownloadAction that = (DownloadAction) o;
+    DownloadRequest that = (DownloadRequest) o;
     return id.equals(that.id)
         && type.equals(that.type)
         && uri.equals(that.uri)
@@ -191,17 +191,17 @@ public final class DownloadAction implements Parcelable {
     dest.writeByteArray(data);
   }
 
-  public static final Parcelable.Creator<DownloadAction> CREATOR =
-      new Parcelable.Creator<DownloadAction>() {
+  public static final Parcelable.Creator<DownloadRequest> CREATOR =
+      new Parcelable.Creator<DownloadRequest>() {
 
         @Override
-        public DownloadAction createFromParcel(Parcel in) {
-          return new DownloadAction(in);
+        public DownloadRequest createFromParcel(Parcel in) {
+          return new DownloadRequest(in);
         }
 
         @Override
-        public DownloadAction[] newArray(int size) {
-          return new DownloadAction[size];
+        public DownloadRequest[] newArray(int size) {
+          return new DownloadRequest[size];
         }
       };
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index 1a07aa2f7c..c206a94d6d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -39,7 +39,7 @@ import java.util.List;
 public abstract class DownloadService extends Service {
 
   /**
-   * Starts a download service without adding a new {@link DownloadAction}. Extras:
+   * Starts a download service to resume any ongoing downloads. Extras:
    *
    * <ul>
    *   <li>{@link #KEY_FOREGROUND} - See {@link #KEY_FOREGROUND}.
@@ -56,7 +56,7 @@ public abstract class DownloadService extends Service {
    * Adds a new download. Extras:
    *
    * <ul>
-   *   <li>{@link #KEY_DOWNLOAD_ACTION} - A {@link DownloadAction} defining the download to be
+   *   <li>{@link #KEY_DOWNLOAD_REQUEST} - A {@link DownloadRequest} defining the download to be
    *       added.
    *   <li>{@link #KEY_MANUAL_STOP_REASON} - An initial manual stop reason for the download. If
    *       omitted {@link Download#MANUAL_STOP_REASON_NONE} is used.
@@ -103,7 +103,7 @@ public abstract class DownloadService extends Service {
       "com.google.android.exoplayer.downloadService.action.SET_MANUAL_STOP_REASON";
 
   /**
-   * Removes an existing download. Extras:
+   * Removes a download. Extras:
    *
    * <ul>
    *   <li>{@link #KEY_CONTENT_ID} - The content id of a download to remove.
@@ -113,11 +113,8 @@ public abstract class DownloadService extends Service {
   public static final String ACTION_REMOVE =
       "com.google.android.exoplayer.downloadService.action.REMOVE";
 
-  /**
-   * Key for the {@code byte[]} representation of the {@link DownloadAction} in {@link #ACTION_ADD}
-   * intents.
-   */
-  public static final String KEY_DOWNLOAD_ACTION = "download_action";
+  /** Key for the {@link DownloadRequest} in {@link #ACTION_ADD} intents. */
+  public static final String KEY_DOWNLOAD_REQUEST = "download_request";
 
   /**
    * Key for the content id in {@link #ACTION_START}, {@link #ACTION_STOP} and {@link
@@ -234,42 +231,42 @@ public abstract class DownloadService extends Service {
   }
 
   /**
-   * Builds an {@link Intent} for adding an action to be executed by the service.
+   * Builds an {@link Intent} for adding a new download.
    *
    * @param context A {@link Context}.
    * @param clazz The concrete download service being targeted by the intent.
-   * @param downloadAction The action to be executed.
+   * @param downloadRequest The request to be executed.
    * @param foreground Whether this intent will be used to start the service in the foreground.
    * @return Created Intent.
    */
-  public static Intent buildAddActionIntent(
+  public static Intent buildAddRequestIntent(
       Context context,
       Class<? extends DownloadService> clazz,
-      DownloadAction downloadAction,
+      DownloadRequest downloadRequest,
       boolean foreground) {
-    return buildAddActionIntent(
-        context, clazz, downloadAction, MANUAL_STOP_REASON_NONE, foreground);
+    return buildAddRequestIntent(
+        context, clazz, downloadRequest, MANUAL_STOP_REASON_NONE, foreground);
   }
 
   /**
-   * Builds an {@link Intent} for adding an action to be executed by the service.
+   * Builds an {@link Intent} for adding a new download.
    *
    * @param context A {@link Context}.
    * @param clazz The concrete download service being targeted by the intent.
-   * @param downloadAction The action to be executed.
+   * @param downloadRequest The request to be executed.
    * @param manualStopReason An initial manual stop reason for the download, or {@link
    *     Download#MANUAL_STOP_REASON_NONE} if the download should be started.
    * @param foreground Whether this intent will be used to start the service in the foreground.
    * @return Created Intent.
    */
-  public static Intent buildAddActionIntent(
+  public static Intent buildAddRequestIntent(
       Context context,
       Class<? extends DownloadService> clazz,
-      DownloadAction downloadAction,
+      DownloadRequest downloadRequest,
       int manualStopReason,
       boolean foreground) {
     return getIntent(context, clazz, ACTION_ADD)
-        .putExtra(KEY_DOWNLOAD_ACTION, downloadAction)
+        .putExtra(KEY_DOWNLOAD_REQUEST, downloadRequest)
         .putExtra(KEY_MANUAL_STOP_REASON, manualStopReason)
         .putExtra(KEY_FOREGROUND, foreground);
   }
@@ -311,19 +308,19 @@ public abstract class DownloadService extends Service {
   }
 
   /**
-   * Starts the service, adding an action to be executed.
+   * Starts the service, adding a new download.
    *
    * @param context A {@link Context}.
    * @param clazz The concrete download service to be started.
-   * @param downloadAction The action to be executed.
+   * @param downloadRequest The request to be executed.
    * @param foreground Whether the service is started in the foreground.
    */
-  public static void startWithAction(
+  public static void startWithNewDownload(
       Context context,
       Class<? extends DownloadService> clazz,
-      DownloadAction downloadAction,
+      DownloadRequest downloadRequest,
       boolean foreground) {
-    Intent intent = buildAddActionIntent(context, clazz, downloadAction, foreground);
+    Intent intent = buildAddRequestIntent(context, clazz, downloadRequest, foreground);
     if (foreground) {
       Util.startForegroundService(context, intent);
     } else {
@@ -350,8 +347,7 @@ public abstract class DownloadService extends Service {
   }
 
   /**
-   * Starts the service without adding a new action. If there are any not finished actions and the
-   * requirements are met, the service resumes executing actions. Otherwise it stops immediately.
+   * Starts a download service to resume any ongoing downloads.
    *
    * @param context A {@link Context}.
    * @param clazz The concrete download service to be started.
@@ -362,9 +358,9 @@ public abstract class DownloadService extends Service {
   }
 
   /**
-   * Starts the service in the foreground without adding a new action. If there are any not finished
-   * actions and the requirements are met, the service resumes executing actions. Otherwise it stops
-   * immediately.
+   * Starts the service in the foreground without adding a new download request. If there are any
+   * not finished downloads and the requirements are met, the service resumes downloading. Otherwise
+   * it stops immediately.
    *
    * @param context A {@link Context}.
    * @param clazz The concrete download service to be started.
@@ -417,13 +413,13 @@ public abstract class DownloadService extends Service {
         // Do nothing.
         break;
       case ACTION_ADD:
-        DownloadAction downloadAction = intent.getParcelableExtra(KEY_DOWNLOAD_ACTION);
-        if (downloadAction == null) {
-          Log.e(TAG, "Ignored ADD: Missing download_action extra");
+        DownloadRequest downloadRequest = intent.getParcelableExtra(KEY_DOWNLOAD_REQUEST);
+        if (downloadRequest == null) {
+          Log.e(TAG, "Ignored ADD: Missing " + KEY_DOWNLOAD_REQUEST + " extra");
         } else {
           int manualStopReason =
               intent.getIntExtra(KEY_MANUAL_STOP_REASON, Download.MANUAL_STOP_REASON_NONE);
-          downloadManager.addDownload(downloadAction, manualStopReason);
+          downloadManager.addDownload(downloadRequest, manualStopReason);
         }
         break;
       case ACTION_START:
@@ -434,7 +430,8 @@ public abstract class DownloadService extends Service {
         break;
       case ACTION_SET_MANUAL_STOP_REASON:
         if (!intent.hasExtra(KEY_MANUAL_STOP_REASON)) {
-          Log.e(TAG, "Ignored SET_MANUAL_STOP_REASON: Missing manual_stop_reason extra");
+          Log.e(
+              TAG, "Ignored SET_MANUAL_STOP_REASON: Missing " + KEY_MANUAL_STOP_REASON + " extra");
         } else {
           String contentId = intent.getStringExtra(KEY_CONTENT_ID);
           int manualStopReason =
@@ -445,7 +442,7 @@ public abstract class DownloadService extends Service {
       case ACTION_REMOVE:
         String contentId = intent.getStringExtra(KEY_CONTENT_ID);
         if (contentId == null) {
-          Log.e(TAG, "Ignored REMOVE: Missing content_id extra");
+          Log.e(TAG, "Ignored REMOVE: Missing " + KEY_CONTENT_ID + " extra");
         } else {
           downloadManager.removeDownload(contentId);
         }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderFactory.java
index a2699e560f..f98ca3eac3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderFactory.java
@@ -15,14 +15,14 @@
  */
 package com.google.android.exoplayer2.offline;
 
-/** Creates {@link Downloader Downloaders} for given {@link DownloadAction DownloadActions}. */
+/** Creates {@link Downloader Downloaders} for given {@link DownloadRequest DownloadRequests}. */
 public interface DownloaderFactory {
 
   /**
-   * Creates a {@link Downloader} to perform the given {@link DownloadAction}.
+   * Creates a {@link Downloader} to perform the given {@link DownloadRequest}.
    *
    * @param action The action.
    * @return The downloader.
    */
-  Downloader createDownloader(DownloadAction action);
+  Downloader createDownloader(DownloadRequest action);
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
index 3273fef71f..7abfa44886 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
@@ -33,20 +33,21 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 /** Unit tests for {@link ActionFile}. */
+@SuppressWarnings("deprecation")
 @RunWith(AndroidJUnit4.class)
 public class ActionFileTest {
 
   private File tempFile;
-  private DownloadAction expectedAction1;
-  private DownloadAction expectedAction2;
+  private DownloadRequest expectedAction1;
+  private DownloadRequest expectedAction2;
 
   @Before
   public void setUp() throws Exception {
     tempFile = Util.createTempFile(ApplicationProvider.getApplicationContext(), "ExoPlayerTest");
     expectedAction1 =
-        buildExpectedAction(Uri.parse("http://test1.uri"), TestUtil.buildTestData(16));
+        buildExpectedRequest(Uri.parse("http://test1.uri"), TestUtil.buildTestData(16));
     expectedAction2 =
-        buildExpectedAction(Uri.parse("http://test2.uri"), TestUtil.buildTestData(32));
+        buildExpectedRequest(Uri.parse("http://test2.uri"), TestUtil.buildTestData(32));
   }
 
   @After
@@ -79,7 +80,7 @@ public class ActionFileTest {
   @Test
   public void testLoadZeroActions() throws Exception {
     ActionFile actionFile = getActionFile("offline/action_file_zero_actions.exi");
-    DownloadAction[] actions = actionFile.load();
+    DownloadRequest[] actions = actionFile.load();
     assertThat(actions).isNotNull();
     assertThat(actions).hasLength(0);
   }
@@ -87,7 +88,7 @@ public class ActionFileTest {
   @Test
   public void testLoadOneAction() throws Exception {
     ActionFile actionFile = getActionFile("offline/action_file_one_action.exi");
-    DownloadAction[] actions = actionFile.load();
+    DownloadRequest[] actions = actionFile.load();
     assertThat(actions).hasLength(1);
     assertThat(actions[0]).isEqualTo(expectedAction1);
   }
@@ -95,7 +96,7 @@ public class ActionFileTest {
   @Test
   public void testLoadTwoActions() throws Exception {
     ActionFile actionFile = getActionFile("offline/action_file_two_actions.exi");
-    DownloadAction[] actions = actionFile.load();
+    DownloadRequest[] actions = actionFile.load();
     assertThat(actions).hasLength(2);
     assertThat(actions[0]).isEqualTo(expectedAction1);
     assertThat(actions[1]).isEqualTo(expectedAction2);
@@ -123,10 +124,10 @@ public class ActionFileTest {
     return new ActionFile(tempFile);
   }
 
-  private static DownloadAction buildExpectedAction(Uri uri, byte[] data) {
-    return new DownloadAction(
+  private static DownloadRequest buildExpectedRequest(Uri uri, byte[] data) {
+    return new DownloadRequest(
         /* id= */ uri.toString(),
-        DownloadAction.TYPE_PROGRESSIVE,
+        DownloadRequest.TYPE_PROGRESSIVE,
         uri,
         /* streamKeys= */ Collections.emptyList(),
         /* customCacheKey= */ null,
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java
index bef5443bf6..5153b53839 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.offline;
 
-import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_DASH;
+import static com.google.android.exoplayer2.offline.DownloadRequest.TYPE_DASH;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
@@ -70,16 +70,16 @@ public class ActionFileUpgradeUtilTest {
         new StreamKey(/* periodIndex= */ 3, /* groupIndex= */ 4, /* trackIndex= */ 5);
     StreamKey expectedStreamKey2 =
         new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 1, /* trackIndex= */ 2);
-    DownloadAction expectedAction1 =
-        new DownloadAction(
+    DownloadRequest expectedRequest1 =
+        new DownloadRequest(
             "key123",
             TYPE_DASH,
             Uri.parse("https://www.test.com/download1"),
             asList(expectedStreamKey1),
             /* customCacheKey= */ "key123",
             new byte[] {1, 2, 3, 4});
-    DownloadAction expectedAction2 =
-        new DownloadAction(
+    DownloadRequest expectedRequest2 =
+        new DownloadRequest(
             "key234",
             TYPE_DASH,
             Uri.parse("https://www.test.com/download2"),
@@ -90,15 +90,15 @@ public class ActionFileUpgradeUtilTest {
     ActionFileUpgradeUtil.upgradeAndDelete(
         tempFile, /* downloadIdProvider= */ null, downloadIndex, /* deleteOnFailure= */ true);
 
-    assertDownloadIndexContainsAction(expectedAction1, Download.STATE_QUEUED);
-    assertDownloadIndexContainsAction(expectedAction2, Download.STATE_QUEUED);
+    assertDownloadIndexContainsRequest(expectedRequest1, Download.STATE_QUEUED);
+    assertDownloadIndexContainsRequest(expectedRequest2, Download.STATE_QUEUED);
   }
 
   @Test
-  public void mergeAction_nonExistingDownload_createsNewDownload() throws IOException {
+  public void mergeRequest_nonExistingDownload_createsNewDownload() throws IOException {
     byte[] data = new byte[] {1, 2, 3, 4};
-    DownloadAction action =
-        new DownloadAction(
+    DownloadRequest request =
+        new DownloadRequest(
             "id",
             TYPE_DASH,
             Uri.parse("https://www.test.com/download"),
@@ -108,50 +108,50 @@ public class ActionFileUpgradeUtilTest {
             /* customCacheKey= */ "key123",
             data);
 
-    ActionFileUpgradeUtil.mergeAction(action, downloadIndex);
+    ActionFileUpgradeUtil.mergeRequest(request, downloadIndex);
 
-    assertDownloadIndexContainsAction(action, Download.STATE_QUEUED);
+    assertDownloadIndexContainsRequest(request, Download.STATE_QUEUED);
   }
 
   @Test
-  public void mergeAction_existingDownload_createsMergedDownload() throws IOException {
+  public void mergeRequest_existingDownload_createsMergedDownload() throws IOException {
     StreamKey streamKey1 =
         new StreamKey(/* periodIndex= */ 3, /* groupIndex= */ 4, /* trackIndex= */ 5);
     StreamKey streamKey2 =
         new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 1, /* trackIndex= */ 2);
-    DownloadAction action1 =
-        new DownloadAction(
+    DownloadRequest request1 =
+        new DownloadRequest(
             "id",
             TYPE_DASH,
             Uri.parse("https://www.test.com/download1"),
             asList(streamKey1),
             /* customCacheKey= */ "key123",
             new byte[] {1, 2, 3, 4});
-    DownloadAction action2 =
-        new DownloadAction(
+    DownloadRequest request2 =
+        new DownloadRequest(
             "id",
             TYPE_DASH,
             Uri.parse("https://www.test.com/download2"),
             asList(streamKey2),
             /* customCacheKey= */ "key123",
             new byte[] {5, 4, 3, 2, 1});
-    ActionFileUpgradeUtil.mergeAction(action1, downloadIndex);
-    ActionFileUpgradeUtil.mergeAction(action2, downloadIndex);
+    ActionFileUpgradeUtil.mergeRequest(request1, downloadIndex);
+    ActionFileUpgradeUtil.mergeRequest(request2, downloadIndex);
 
-    Download download = downloadIndex.getDownload(action2.id);
+    Download download = downloadIndex.getDownload(request2.id);
     assertThat(download).isNotNull();
-    assertThat(download.action.type).isEqualTo(action2.type);
-    assertThat(download.action.customCacheKey).isEqualTo(action2.customCacheKey);
-    assertThat(download.action.data).isEqualTo(action2.data);
-    assertThat(download.action.uri).isEqualTo(action2.uri);
-    assertThat(download.action.streamKeys).containsExactly(streamKey1, streamKey2);
+    assertThat(download.request.type).isEqualTo(request2.type);
+    assertThat(download.request.customCacheKey).isEqualTo(request2.customCacheKey);
+    assertThat(download.request.data).isEqualTo(request2.data);
+    assertThat(download.request.uri).isEqualTo(request2.uri);
+    assertThat(download.request.streamKeys).containsExactly(streamKey1, streamKey2);
     assertThat(download.state).isEqualTo(Download.STATE_QUEUED);
   }
 
-  private void assertDownloadIndexContainsAction(DownloadAction action, int state)
+  private void assertDownloadIndexContainsRequest(DownloadRequest request, int state)
       throws IOException {
-    Download download = downloadIndex.getDownload(action.id);
-    assertThat(download.action).isEqualTo(action);
+    Download download = downloadIndex.getDownload(request.id);
+    assertThat(download.request).isEqualTo(request);
     assertThat(download.state).isEqualTo(state);
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
index 4778729f23..5bd1f34ed4 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
@@ -301,7 +301,7 @@ public class DefaultDownloadIndexTest {
   }
 
   private static void assertEqual(Download download, Download that) {
-    assertThat(download.action).isEqualTo(that.action);
+    assertThat(download.request).isEqualTo(that.request);
     assertThat(download.state).isEqualTo(that.state);
     assertThat(download.startTimeMs).isEqualTo(that.startTimeMs);
     assertThat(download.updateTimeMs).isEqualTo(that.updateTimeMs);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactoryTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactoryTest.java
index 08a0edd5d6..c3d23c7d22 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactoryTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactoryTest.java
@@ -38,9 +38,9 @@ public final class DefaultDownloaderFactoryTest {
 
     Downloader downloader =
         factory.createDownloader(
-            new DownloadAction(
+            new DownloadRequest(
                 "id",
-                DownloadAction.TYPE_PROGRESSIVE,
+                DownloadRequest.TYPE_PROGRESSIVE,
                 Uri.parse("https://www.test.com/download"),
                 /* streamKeys= */ Collections.emptyList(),
                 /* customCacheKey= */ null,
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
deleted file mode 100644
index 0c753e8fef..0000000000
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadActionTest.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.offline;
-
-import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_DASH;
-import static com.google.android.exoplayer2.offline.DownloadAction.TYPE_HLS;
-import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.fail;
-
-import android.net.Uri;
-import android.os.Parcel;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/** Unit tests for {@link DownloadAction}. */
-@RunWith(AndroidJUnit4.class)
-public class DownloadActionTest {
-
-  private Uri uri1;
-  private Uri uri2;
-
-  @Before
-  public void setUp() {
-    uri1 = Uri.parse("http://test/1.uri");
-    uri2 = Uri.parse("http://test/2.uri");
-  }
-
-  @Test
-  public void testMergeActions_withDifferentIds_fails() {
-    DownloadAction action1 =
-        new DownloadAction(
-            "id1",
-            TYPE_DASH,
-            uri1,
-            /* streamKeys= */ Collections.emptyList(),
-            /* customCacheKey= */ null,
-            /* data= */ null);
-    DownloadAction action2 =
-        new DownloadAction(
-            "id2",
-            TYPE_DASH,
-            uri2,
-            /* streamKeys= */ Collections.emptyList(),
-            /* customCacheKey= */ null,
-            /* data= */ null);
-    try {
-      action1.copyWithMergedAction(action2);
-      fail();
-    } catch (IllegalArgumentException e) {
-      // Expected.
-    }
-  }
-
-  @Test
-  public void testMergeActions_withDifferentTypes_fails() {
-    DownloadAction action1 =
-        new DownloadAction(
-            "id1",
-            TYPE_DASH,
-            uri1,
-            /* streamKeys= */ Collections.emptyList(),
-            /* customCacheKey= */ null,
-            /* data= */ null);
-    DownloadAction action2 =
-        new DownloadAction(
-            "id1",
-            TYPE_HLS,
-            uri1,
-            /* streamKeys= */ Collections.emptyList(),
-            /* customCacheKey= */ null,
-            /* data= */ null);
-    try {
-      action1.copyWithMergedAction(action2);
-      fail();
-    } catch (IllegalArgumentException e) {
-      // Expected.
-    }
-  }
-
-  @Test
-  public void testMergeAction_withSameAction() {
-    DownloadAction action1 = createAction(uri1, new StreamKey(0, 0, 0));
-
-    DownloadAction mergedAction = action1.copyWithMergedAction(action1);
-    assertEqual(action1, mergedAction);
-  }
-
-  @Test
-  public void testMergeActions_withEmptyStreamKeys() {
-    DownloadAction action1 = createAction(uri1, new StreamKey(0, 0, 0));
-    DownloadAction action2 = createAction(uri1);
-
-    // If either of the actions have empty streamKeys, the merge should have empty streamKeys.
-    DownloadAction mergedAction = action1.copyWithMergedAction(action2);
-    assertThat(mergedAction.streamKeys).isEmpty();
-
-    mergedAction = action2.copyWithMergedAction(action1);
-    assertThat(mergedAction.streamKeys).isEmpty();
-  }
-
-  @Test
-  public void testMergeActions_withOverlappingStreamKeys() {
-    StreamKey streamKey1 = new StreamKey(0, 1, 2);
-    StreamKey streamKey2 = new StreamKey(3, 4, 5);
-    StreamKey streamKey3 = new StreamKey(6, 7, 8);
-    DownloadAction action1 = createAction(uri1, streamKey1, streamKey2);
-    DownloadAction action2 = createAction(uri1, streamKey2, streamKey3);
-
-    // Merged streamKeys should be in their original order without duplicates.
-    DownloadAction mergedAction = action1.copyWithMergedAction(action2);
-    assertThat(mergedAction.streamKeys).containsExactly(streamKey1, streamKey2, streamKey3);
-
-    mergedAction = action2.copyWithMergedAction(action1);
-    assertThat(mergedAction.streamKeys).containsExactly(streamKey2, streamKey3, streamKey1);
-  }
-
-  @Test
-  public void testMergeActions_withDifferentFields() {
-    byte[] data1 = new byte[] {0, 1, 2};
-    byte[] data2 = new byte[] {3, 4, 5};
-    DownloadAction action1 =
-        new DownloadAction(
-            "id1",
-            TYPE_DASH,
-            uri1,
-            /* streamKeys= */ Collections.emptyList(),
-            "key1",
-            /* data= */ data1);
-    DownloadAction action2 =
-        new DownloadAction(
-            "id1",
-            TYPE_DASH,
-            uri2,
-            /* streamKeys= */ Collections.emptyList(),
-            "key2",
-            /* data= */ data2);
-
-    // uri, customCacheKey and data should be from the action being merged.
-    DownloadAction mergedAction = action1.copyWithMergedAction(action2);
-    assertThat(mergedAction.uri).isEqualTo(uri2);
-    assertThat(mergedAction.customCacheKey).isEqualTo("key2");
-    assertThat(mergedAction.data).isEqualTo(data2);
-
-    mergedAction = action2.copyWithMergedAction(action1);
-    assertThat(mergedAction.uri).isEqualTo(uri1);
-    assertThat(mergedAction.customCacheKey).isEqualTo("key1");
-    assertThat(mergedAction.data).isEqualTo(data1);
-  }
-
-  @Test
-  public void testParcelable() {
-    ArrayList<StreamKey> streamKeys = new ArrayList<>();
-    streamKeys.add(new StreamKey(1, 2, 3));
-    streamKeys.add(new StreamKey(4, 5, 6));
-    DownloadAction actionToParcel =
-        new DownloadAction(
-            "id",
-            "type",
-            Uri.parse("https://abc.def/ghi"),
-            streamKeys,
-            "key",
-            new byte[] {1, 2, 3, 4, 5});
-    Parcel parcel = Parcel.obtain();
-    actionToParcel.writeToParcel(parcel, 0);
-    parcel.setDataPosition(0);
-
-    DownloadAction actionFromParcel = DownloadAction.CREATOR.createFromParcel(parcel);
-    assertThat(actionFromParcel).isEqualTo(actionToParcel);
-
-    parcel.recycle();
-  }
-
-  @SuppressWarnings("EqualsWithItself")
-  @Test
-  public void testEquals() {
-    DownloadAction action1 = createAction(uri1);
-    assertThat(action1.equals(action1)).isTrue();
-
-    DownloadAction action2 = createAction(uri1);
-    DownloadAction action3 = createAction(uri1);
-    assertEqual(action2, action3);
-
-    DownloadAction action4 = createAction(uri1);
-    DownloadAction action5 = createAction(uri1, new StreamKey(0, 0, 0));
-    assertNotEqual(action4, action5);
-
-    DownloadAction action6 = createAction(uri1, new StreamKey(0, 1, 1));
-    DownloadAction action7 = createAction(uri1, new StreamKey(0, 0, 0));
-    assertNotEqual(action6, action7);
-
-    DownloadAction action8 = createAction(uri1);
-    DownloadAction action9 = createAction(uri2);
-    assertNotEqual(action8, action9);
-
-    DownloadAction action10 = createAction(uri1, new StreamKey(0, 0, 0), new StreamKey(0, 1, 1));
-    DownloadAction action11 = createAction(uri1, new StreamKey(0, 1, 1), new StreamKey(0, 0, 0));
-    assertEqual(action10, action11);
-
-    DownloadAction action12 = createAction(uri1, new StreamKey(0, 0, 0));
-    DownloadAction action13 = createAction(uri1, new StreamKey(0, 1, 1), new StreamKey(0, 0, 0));
-    assertNotEqual(action12, action13);
-
-    DownloadAction action14 = createAction(uri1);
-    DownloadAction action15 = createAction(uri1);
-    assertEqual(action14, action15);
-  }
-
-  private static void assertNotEqual(DownloadAction action1, DownloadAction action2) {
-    assertThat(action1).isNotEqualTo(action2);
-    assertThat(action2).isNotEqualTo(action1);
-  }
-
-  private static void assertEqual(DownloadAction action1, DownloadAction action2) {
-    assertThat(action1).isEqualTo(action2);
-    assertThat(action2).isEqualTo(action1);
-  }
-
-  private static DownloadAction createAction(Uri uri, StreamKey... keys) {
-    return new DownloadAction(
-        uri.toString(), TYPE_DASH, uri, toList(keys), /* customCacheKey= */ null, /* data= */ null);
-  }
-
-  private static List<StreamKey> toList(StreamKey... keys) {
-    ArrayList<StreamKey> keysList = new ArrayList<>();
-    Collections.addAll(keysList, keys);
-    return keysList;
-  }
-}
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadBuilder.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadBuilder.java
index dbcdb52792..2e14caa5bd 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadBuilder.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadBuilder.java
@@ -47,8 +47,14 @@ class DownloadBuilder {
     this(id, "type", Uri.parse("uri"), /* cacheKey= */ null, new byte[0], Collections.emptyList());
   }
 
-  DownloadBuilder(DownloadAction action) {
-    this(action.id, action.type, action.uri, action.customCacheKey, action.data, action.streamKeys);
+  DownloadBuilder(DownloadRequest request) {
+    this(
+        request.id,
+        request.type,
+        request.uri,
+        request.customCacheKey,
+        request.data,
+        request.streamKeys);
   }
 
   DownloadBuilder(
@@ -147,8 +153,9 @@ class DownloadBuilder {
   }
 
   public Download build() {
-    DownloadAction action = new DownloadAction(id, type, uri, streamKeys, cacheKey, customMetadata);
+    DownloadRequest request =
+        new DownloadRequest(id, type, uri, streamKeys, cacheKey, customMetadata);
     return new Download(
-        action, state, failureReason, manualStopReason, startTimeMs, updateTimeMs, counters);
+        request, state, failureReason, manualStopReason, startTimeMs, updateTimeMs, counters);
   }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
index 737bcec183..f06e90dc48 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
@@ -379,7 +379,7 @@ public class DownloadHelperTest {
   }
 
   @Test
-  public void getDownloadAction_createsDownloadAction_withAllSelectedTracks() throws Exception {
+  public void getDownloadRequest_createsDownloadRequest_withAllSelectedTracks() throws Exception {
     prepareDownloadHelper(downloadHelper);
     // Ensure we have track groups with multiple indices, renderers with multiple track groups and
     // also renderers without any track groups.
@@ -392,13 +392,13 @@ public class DownloadHelperTest {
     byte[] data = new byte[10];
     Arrays.fill(data, (byte) 123);
 
-    DownloadAction downloadAction = downloadHelper.getDownloadAction(data);
+    DownloadRequest downloadRequest = downloadHelper.getDownloadRequest(data);
 
-    assertThat(downloadAction.type).isEqualTo(TEST_DOWNLOAD_TYPE);
-    assertThat(downloadAction.uri).isEqualTo(testUri);
-    assertThat(downloadAction.customCacheKey).isEqualTo(TEST_CACHE_KEY);
-    assertThat(downloadAction.data).isEqualTo(data);
-    assertThat(downloadAction.streamKeys)
+    assertThat(downloadRequest.type).isEqualTo(TEST_DOWNLOAD_TYPE);
+    assertThat(downloadRequest.uri).isEqualTo(testUri);
+    assertThat(downloadRequest.customCacheKey).isEqualTo(TEST_CACHE_KEY);
+    assertThat(downloadRequest.data).isEqualTo(data);
+    assertThat(downloadRequest.streamKeys)
         .containsExactly(
             new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 0, /* trackIndex= */ 0),
             new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 0, /* trackIndex= */ 1),
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index 0496b62fb0..f23248952c 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -104,29 +104,29 @@ public class DownloadManagerTest {
   }
 
   @Test
-  public void multipleActionsForTheSameContent_executedOnTheSameTask() {
-    // Two download actions on first task
-    new DownloadRunner(uri1).postDownloadAction().postDownloadAction();
-    // One download, one remove actions on second task
-    new DownloadRunner(uri2).postDownloadAction().postRemoveAction();
-    // Two remove actions on third task
-    new DownloadRunner(uri3).postRemoveAction().postRemoveAction();
+  public void multipleRequestsForTheSameContent_executedOnTheSameTask() {
+    // Two download requests on first task
+    new DownloadRunner(uri1).postDownloadRequest().postDownloadRequest();
+    // One download, one remove requests on second task
+    new DownloadRunner(uri2).postDownloadRequest().postRemoveRequest();
+    // Two remove requests on third task
+    new DownloadRunner(uri3).postRemoveRequest().postRemoveRequest();
   }
 
   @Test
-  public void actionsForDifferentContent_executedOnDifferentTasks() {
-    TaskWrapper task1 = new DownloadRunner(uri1).postDownloadAction().getTask();
-    TaskWrapper task2 = new DownloadRunner(uri2).postDownloadAction().getTask();
-    TaskWrapper task3 = new DownloadRunner(uri3).postRemoveAction().getTask();
+  public void requestsForDifferentContent_executedOnDifferentTasks() {
+    TaskWrapper task1 = new DownloadRunner(uri1).postDownloadRequest().getTask();
+    TaskWrapper task2 = new DownloadRunner(uri2).postDownloadRequest().getTask();
+    TaskWrapper task3 = new DownloadRunner(uri3).postRemoveRequest().getTask();
 
     assertThat(task1).isNoneOf(task2, task3);
     assertThat(task2).isNotEqualTo(task3);
   }
 
   @Test
-  public void postDownloadAction_downloads() throws Throwable {
+  public void postDownloadRequest_downloads() throws Throwable {
     DownloadRunner runner = new DownloadRunner(uri1);
-    TaskWrapper task = runner.postDownloadAction().getTask();
+    TaskWrapper task = runner.postDownloadRequest().getTask();
     task.assertDownloading();
     runner.getDownloader(0).unblock().assertReleased().assertStartCount(1);
     task.assertCompleted();
@@ -135,9 +135,9 @@ public class DownloadManagerTest {
   }
 
   @Test
-  public void postRemoveAction_removes() throws Throwable {
+  public void postRemoveRequest_removes() throws Throwable {
     DownloadRunner runner = new DownloadRunner(uri1);
-    TaskWrapper task = runner.postDownloadAction().postRemoveAction().getTask();
+    TaskWrapper task = runner.postDownloadRequest().postRemoveRequest().getTask();
     task.assertRemoving();
     runner.getDownloader(1).unblock().assertReleased().assertStartCount(1);
     task.assertRemoved();
@@ -148,7 +148,7 @@ public class DownloadManagerTest {
   @Test
   public void downloadFails_retriesThenTaskFails() throws Throwable {
     DownloadRunner runner = new DownloadRunner(uri1);
-    runner.postDownloadAction();
+    runner.postDownloadRequest();
     FakeDownloader downloader = runner.getDownloader(0);
 
     for (int i = 0; i <= MIN_RETRY_COUNT; i++) {
@@ -163,7 +163,7 @@ public class DownloadManagerTest {
   @Test
   public void downloadFails_retries() throws Throwable {
     DownloadRunner runner = new DownloadRunner(uri1);
-    runner.postDownloadAction();
+    runner.postDownloadRequest();
     FakeDownloader downloader = runner.getDownloader(0);
 
     for (int i = 0; i < MIN_RETRY_COUNT; i++) {
@@ -179,7 +179,7 @@ public class DownloadManagerTest {
   @Test
   public void downloadProgressOnRetry_retryCountResets() throws Throwable {
     DownloadRunner runner = new DownloadRunner(uri1);
-    runner.postDownloadAction();
+    runner.postDownloadRequest();
     FakeDownloader downloader = runner.getDownloader(0);
 
     int tooManyRetries = MIN_RETRY_COUNT + 10;
@@ -199,9 +199,9 @@ public class DownloadManagerTest {
     DownloadRunner runner = new DownloadRunner(uri1);
     FakeDownloader downloader1 = runner.getDownloader(0);
 
-    runner.postDownloadAction();
+    runner.postDownloadRequest();
     downloader1.assertStarted();
-    runner.postRemoveAction();
+    runner.postRemoveRequest();
 
     downloader1.assertCanceled().assertStartCount(1);
     runner.getDownloader(1).unblock().assertNotCanceled();
@@ -213,9 +213,9 @@ public class DownloadManagerTest {
     DownloadRunner runner = new DownloadRunner(uri1);
     FakeDownloader downloader1 = runner.getDownloader(1);
 
-    runner.postDownloadAction().postRemoveAction();
+    runner.postDownloadRequest().postRemoveRequest();
     downloader1.assertStarted();
-    runner.postDownloadAction();
+    runner.postDownloadRequest();
 
     downloader1.unblock().assertNotCanceled();
     runner.getDownloader(2).unblock().assertNotCanceled();
@@ -223,13 +223,13 @@ public class DownloadManagerTest {
   }
 
   @Test
-  public void secondSameRemoveActionIgnored() throws Throwable {
+  public void secondSameRemoveRequestIgnored() throws Throwable {
     DownloadRunner runner = new DownloadRunner(uri1);
     FakeDownloader downloader1 = runner.getDownloader(1);
 
-    runner.postDownloadAction().postRemoveAction();
+    runner.postDownloadRequest().postRemoveRequest();
     downloader1.assertStarted();
-    runner.postRemoveAction();
+    runner.postRemoveRequest();
 
     downloader1.unblock().assertNotCanceled();
     runner.getTask().assertRemoved();
@@ -238,22 +238,22 @@ public class DownloadManagerTest {
   }
 
   @Test
-  public void differentDownloadActionsMerged() throws Throwable {
+  public void differentDownloadRequestsMerged() throws Throwable {
     DownloadRunner runner = new DownloadRunner(uri1);
     FakeDownloader downloader1 = runner.getDownloader(0);
 
     StreamKey streamKey1 = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0);
     StreamKey streamKey2 = new StreamKey(/* groupIndex= */ 1, /* trackIndex= */ 1);
 
-    runner.postDownloadAction(streamKey1);
+    runner.postDownloadRequest(streamKey1);
     downloader1.assertStarted();
-    runner.postDownloadAction(streamKey2);
+    runner.postDownloadRequest(streamKey2);
 
     downloader1.assertCanceled();
 
     FakeDownloader downloader2 = runner.getDownloader(1);
     downloader2.assertStarted();
-    assertThat(downloader2.action.streamKeys).containsExactly(streamKey1, streamKey2);
+    assertThat(downloader2.request.streamKeys).containsExactly(streamKey1, streamKey2);
     downloader2.unblock();
 
     runner.getTask().assertCompleted();
@@ -262,9 +262,9 @@ public class DownloadManagerTest {
   }
 
   @Test
-  public void actionsForDifferentContent_executedInParallel() throws Throwable {
-    DownloadRunner runner1 = new DownloadRunner(uri1).postDownloadAction();
-    DownloadRunner runner2 = new DownloadRunner(uri2).postDownloadAction();
+  public void requestsForDifferentContent_executedInParallel() throws Throwable {
+    DownloadRunner runner1 = new DownloadRunner(uri1).postDownloadRequest();
+    DownloadRunner runner2 = new DownloadRunner(uri2).postDownloadRequest();
     FakeDownloader downloader1 = runner1.getDownloader(0);
     FakeDownloader downloader2 = runner2.getDownloader(0);
 
@@ -279,10 +279,10 @@ public class DownloadManagerTest {
   }
 
   @Test
-  public void actionsForDifferentContent_ifMaxDownloadIs1_executedSequentially() throws Throwable {
+  public void requestsForDifferentContent_ifMaxDownloadIs1_executedSequentially() throws Throwable {
     setUpDownloadManager(1);
-    DownloadRunner runner1 = new DownloadRunner(uri1).postDownloadAction();
-    DownloadRunner runner2 = new DownloadRunner(uri2).postDownloadAction();
+    DownloadRunner runner1 = new DownloadRunner(uri1).postDownloadRequest();
+    DownloadRunner runner2 = new DownloadRunner(uri2).postDownloadRequest();
     FakeDownloader downloader1 = runner1.getDownloader(0);
     FakeDownloader downloader2 = runner2.getDownloader(0);
 
@@ -299,11 +299,11 @@ public class DownloadManagerTest {
   }
 
   @Test
-  public void removeActionForDifferentContent_ifMaxDownloadIs1_executedInParallel()
+  public void removeRequestForDifferentContent_ifMaxDownloadIs1_executedInParallel()
       throws Throwable {
     setUpDownloadManager(1);
-    DownloadRunner runner1 = new DownloadRunner(uri1).postDownloadAction();
-    DownloadRunner runner2 = new DownloadRunner(uri2).postDownloadAction().postRemoveAction();
+    DownloadRunner runner1 = new DownloadRunner(uri1).postDownloadRequest();
+    DownloadRunner runner2 = new DownloadRunner(uri2).postDownloadRequest().postRemoveRequest();
     FakeDownloader downloader1 = runner1.getDownloader(0);
     FakeDownloader downloader2 = runner2.getDownloader(0);
 
@@ -318,11 +318,11 @@ public class DownloadManagerTest {
   }
 
   @Test
-  public void downloadActionFollowingRemove_ifMaxDownloadIs1_isNotStarted() throws Throwable {
+  public void downloadRequestFollowingRemove_ifMaxDownloadIs1_isNotStarted() throws Throwable {
     setUpDownloadManager(1);
-    DownloadRunner runner1 = new DownloadRunner(uri1).postDownloadAction();
-    DownloadRunner runner2 = new DownloadRunner(uri2).postDownloadAction().postRemoveAction();
-    runner2.postDownloadAction();
+    DownloadRunner runner1 = new DownloadRunner(uri1).postDownloadRequest();
+    DownloadRunner runner2 = new DownloadRunner(uri2).postDownloadRequest().postRemoveRequest();
+    runner2.postDownloadRequest();
     FakeDownloader downloader1 = runner1.getDownloader(0);
     FakeDownloader downloader2 = runner2.getDownloader(0);
     FakeDownloader downloader3 = runner2.getDownloader(1);
@@ -342,9 +342,10 @@ public class DownloadManagerTest {
 
   @Test
   public void getTasks_returnTasks() {
-    TaskWrapper task1 = new DownloadRunner(uri1).postDownloadAction().getTask();
-    TaskWrapper task2 = new DownloadRunner(uri2).postDownloadAction().getTask();
-    TaskWrapper task3 = new DownloadRunner(uri3).postDownloadAction().postRemoveAction().getTask();
+    TaskWrapper task1 = new DownloadRunner(uri1).postDownloadRequest().getTask();
+    TaskWrapper task2 = new DownloadRunner(uri2).postDownloadRequest().getTask();
+    TaskWrapper task3 =
+        new DownloadRunner(uri3).postDownloadRequest().postRemoveRequest().getTask();
 
     task3.assertRemoving();
     List<Download> downloads = downloadManager.getCurrentDownloads();
@@ -352,7 +353,7 @@ public class DownloadManagerTest {
     assertThat(downloads).hasSize(3);
     String[] taskIds = {task1.taskId, task2.taskId, task3.taskId};
     String[] downloadIds = {
-      downloads.get(0).action.id, downloads.get(1).action.id, downloads.get(2).action.id
+      downloads.get(0).request.id, downloads.get(1).request.id, downloads.get(2).request.id
     };
     assertThat(downloadIds).isEqualTo(taskIds);
   }
@@ -363,27 +364,27 @@ public class DownloadManagerTest {
     DownloadRunner runner2 = new DownloadRunner(uri2);
     DownloadRunner runner3 = new DownloadRunner(uri3);
 
-    runner1.postDownloadAction().getTask().assertDownloading();
-    runner2.postDownloadAction().postRemoveAction().getTask().assertRemoving();
-    runner2.postDownloadAction();
+    runner1.postDownloadRequest().getTask().assertDownloading();
+    runner2.postDownloadRequest().postRemoveRequest().getTask().assertRemoving();
+    runner2.postDownloadRequest();
 
     runOnMainThread(() -> downloadManager.stopDownloads());
 
     runner1.getTask().assertStopped();
 
-    // remove actions aren't stopped.
+    // remove requests aren't stopped.
     runner2.getDownloader(1).unblock().assertReleased();
     runner2.getTask().assertStopped();
     // Although remove2 is finished, download2 doesn't start.
     runner2.getDownloader(2).assertDoesNotStart();
 
-    // When a new remove action is added, it cancels stopped download actions with the same media.
-    runner1.postRemoveAction();
+    // When a new remove request is added, it cancels stopped download requests with the same media.
+    runner1.postRemoveRequest();
     runner1.getDownloader(1).assertStarted().unblock();
     runner1.getTask().assertRemoved();
 
-    // New download actions can be added but they don't start.
-    runner3.postDownloadAction().getDownloader(0).assertDoesNotStart();
+    // New download requests can be added but they don't start.
+    runner3.postDownloadRequest().getDownloader(0).assertDoesNotStart();
 
     runOnMainThread(() -> downloadManager.startDownloads());
 
@@ -395,7 +396,7 @@ public class DownloadManagerTest {
 
   @Test
   public void manuallyStopAndResumeSingleDownload() throws Throwable {
-    DownloadRunner runner = new DownloadRunner(uri1).postDownloadAction();
+    DownloadRunner runner = new DownloadRunner(uri1).postDownloadRequest();
     TaskWrapper task = runner.getTask();
 
     task.assertDownloading();
@@ -414,7 +415,7 @@ public class DownloadManagerTest {
 
   @Test
   public void manuallyStoppedDownloadCanBeCancelled() throws Throwable {
-    DownloadRunner runner = new DownloadRunner(uri1).postDownloadAction();
+    DownloadRunner runner = new DownloadRunner(uri1).postDownloadRequest();
     TaskWrapper task = runner.getTask();
 
     task.assertDownloading();
@@ -423,7 +424,7 @@ public class DownloadManagerTest {
 
     task.assertStopped();
 
-    runner.postRemoveAction();
+    runner.postRemoveRequest();
     runner.getDownloader(1).assertStarted().unblock();
     task.assertRemoved();
 
@@ -436,8 +437,8 @@ public class DownloadManagerTest {
     DownloadRunner runner2 = new DownloadRunner(uri2);
     DownloadRunner runner3 = new DownloadRunner(uri3);
 
-    runner1.postDownloadAction().getTask().assertDownloading();
-    runner2.postDownloadAction().postRemoveAction().getTask().assertRemoving();
+    runner1.postDownloadRequest().getTask().assertDownloading();
+    runner2.postDownloadRequest().postRemoveRequest().getTask().assertRemoving();
 
     runOnMainThread(
         () -> downloadManager.setManualStopReason(runner1.getTask().taskId, APP_STOP_REASON));
@@ -447,37 +448,37 @@ public class DownloadManagerTest {
     // Other downloads aren't affected.
     runner2.getDownloader(1).unblock().assertReleased();
 
-    // New download actions can be added and they start.
-    runner3.postDownloadAction().getDownloader(0).assertStarted().unblock();
+    // New download requests can be added and they start.
+    runner3.postDownloadRequest().getDownloader(0).assertStarted().unblock();
 
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
   @Test
-  public void mergeAction_removingDownload_becomesRestarting() {
-    DownloadAction downloadAction = createDownloadAction();
+  public void mergeRequest_removingDownload_becomesRestarting() {
+    DownloadRequest downloadRequest = createDownloadRequest();
     DownloadBuilder downloadBuilder =
-        new DownloadBuilder(downloadAction).setState(Download.STATE_REMOVING);
+        new DownloadBuilder(downloadRequest).setState(Download.STATE_REMOVING);
     Download download = downloadBuilder.build();
 
     Download mergedDownload =
-        DownloadManager.mergeAction(download, downloadAction, download.manualStopReason);
+        DownloadManager.mergeRequest(download, downloadRequest, download.manualStopReason);
 
     Download expectedDownload = downloadBuilder.setState(Download.STATE_RESTARTING).build();
     assertEqualIgnoringTimeFields(mergedDownload, expectedDownload);
   }
 
   @Test
-  public void mergeAction_failedDownload_becomesQueued() {
-    DownloadAction downloadAction = createDownloadAction();
+  public void mergeRequest_failedDownload_becomesQueued() {
+    DownloadRequest downloadRequest = createDownloadRequest();
     DownloadBuilder downloadBuilder =
-        new DownloadBuilder(downloadAction)
+        new DownloadBuilder(downloadRequest)
             .setState(Download.STATE_FAILED)
             .setFailureReason(Download.FAILURE_REASON_UNKNOWN);
     Download download = downloadBuilder.build();
 
     Download mergedDownload =
-        DownloadManager.mergeAction(download, downloadAction, download.manualStopReason);
+        DownloadManager.mergeRequest(download, downloadRequest, download.manualStopReason);
 
     Download expectedDownload =
         downloadBuilder
@@ -488,31 +489,31 @@ public class DownloadManagerTest {
   }
 
   @Test
-  public void mergeAction_stoppedDownload_staysStopped() {
-    DownloadAction downloadAction = createDownloadAction();
+  public void mergeRequest_stoppedDownload_staysStopped() {
+    DownloadRequest downloadRequest = createDownloadRequest();
     DownloadBuilder downloadBuilder =
-        new DownloadBuilder(downloadAction)
+        new DownloadBuilder(downloadRequest)
             .setState(Download.STATE_STOPPED)
             .setManualStopReason(/* manualStopReason= */ 1);
     Download download = downloadBuilder.build();
 
     Download mergedDownload =
-        DownloadManager.mergeAction(download, downloadAction, download.manualStopReason);
+        DownloadManager.mergeRequest(download, downloadRequest, download.manualStopReason);
 
     assertEqualIgnoringTimeFields(mergedDownload, download);
   }
 
   @Test
-  public void mergeAction_manualStopReasonSetButNotStopped_becomesStopped() {
-    DownloadAction downloadAction = createDownloadAction();
+  public void mergeRequest_manualStopReasonSetButNotStopped_becomesStopped() {
+    DownloadRequest downloadRequest = createDownloadRequest();
     DownloadBuilder downloadBuilder =
-        new DownloadBuilder(downloadAction)
+        new DownloadBuilder(downloadRequest)
             .setState(Download.STATE_COMPLETED)
             .setManualStopReason(/* manualStopReason= */ 1);
     Download download = downloadBuilder.build();
 
     Download mergedDownload =
-        DownloadManager.mergeAction(download, downloadAction, download.manualStopReason);
+        DownloadManager.mergeRequest(download, downloadRequest, download.manualStopReason);
 
     Download expectedDownload = downloadBuilder.setState(Download.STATE_STOPPED).build();
     assertEqualIgnoringTimeFields(mergedDownload, expectedDownload);
@@ -556,7 +557,7 @@ public class DownloadManagerTest {
   }
 
   private static void assertEqualIgnoringTimeFields(Download download, Download that) {
-    assertThat(download.action).isEqualTo(that.action);
+    assertThat(download.request).isEqualTo(that.request);
     assertThat(download.state).isEqualTo(that.state);
     assertThat(download.failureReason).isEqualTo(that.failureReason);
     assertThat(download.manualStopReason).isEqualTo(that.manualStopReason);
@@ -565,10 +566,10 @@ public class DownloadManagerTest {
     assertThat(download.getTotalBytes()).isEqualTo(that.getTotalBytes());
   }
 
-  private static DownloadAction createDownloadAction() {
-    return new DownloadAction(
+  private static DownloadRequest createDownloadRequest() {
+    return new DownloadRequest(
         "id",
-        DownloadAction.TYPE_DASH,
+        DownloadRequest.TYPE_DASH,
         Uri.parse("https://www.test.com/download"),
         Collections.emptyList(),
         /* customCacheKey= */ null,
@@ -593,21 +594,21 @@ public class DownloadManagerTest {
       taskWrapper = new TaskWrapper(id);
     }
 
-    private DownloadRunner postRemoveAction() {
+    private DownloadRunner postRemoveRequest() {
       runOnMainThread(() -> downloadManager.removeDownload(id));
       return this;
     }
 
-    private DownloadRunner postDownloadAction(StreamKey... keys) {
-      DownloadAction downloadAction =
-          new DownloadAction(
+    private DownloadRunner postDownloadRequest(StreamKey... keys) {
+      DownloadRequest downloadRequest =
+          new DownloadRequest(
               id,
-              DownloadAction.TYPE_PROGRESSIVE,
+              DownloadRequest.TYPE_PROGRESSIVE,
               uri,
               Arrays.asList(keys),
               /* customCacheKey= */ null,
               /* data= */ null);
-      runOnMainThread(() -> downloadManager.addDownload(downloadAction));
+      runOnMainThread(() -> downloadManager.addDownload(downloadRequest));
       return this;
     }
 
@@ -624,9 +625,9 @@ public class DownloadManagerTest {
       return downloaders.get(index);
     }
 
-    private synchronized Downloader createDownloader(DownloadAction action) {
+    private synchronized Downloader createDownloader(DownloadRequest request) {
       downloader = getDownloader(createdDownloaderCount++);
-      downloader.action = action;
+      downloader.request = request;
       return downloader;
     }
 
@@ -710,8 +711,8 @@ public class DownloadManagerTest {
     }
 
     @Override
-    public Downloader createDownloader(DownloadAction action) {
-      return downloaders.get(action.uri).createDownloader(action);
+    public Downloader createDownloader(DownloadRequest request) {
+      return downloaders.get(request.uri).createDownloader(request);
     }
   }
 
@@ -719,7 +720,7 @@ public class DownloadManagerTest {
 
     private final com.google.android.exoplayer2.util.ConditionVariable blocker;
 
-    private DownloadAction action;
+    private DownloadRequest request;
     private CountDownLatch started;
     private volatile boolean interrupted;
     private volatile boolean cancelled;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadRequestTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadRequestTest.java
new file mode 100644
index 0000000000..d298dd58b8
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadRequestTest.java
@@ -0,0 +1,246 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.offline;
+
+import static com.google.android.exoplayer2.offline.DownloadRequest.TYPE_DASH;
+import static com.google.android.exoplayer2.offline.DownloadRequest.TYPE_HLS;
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
+
+import android.net.Uri;
+import android.os.Parcel;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/** Unit tests for {@link DownloadRequest}. */
+@RunWith(AndroidJUnit4.class)
+public class DownloadRequestTest {
+
+  private Uri uri1;
+  private Uri uri2;
+
+  @Before
+  public void setUp() {
+    uri1 = Uri.parse("http://test/1.uri");
+    uri2 = Uri.parse("http://test/2.uri");
+  }
+
+  @Test
+  public void testMergeRequests_withDifferentIds_fails() {
+    DownloadRequest request1 =
+        new DownloadRequest(
+            "id1",
+            TYPE_DASH,
+            uri1,
+            /* streamKeys= */ Collections.emptyList(),
+            /* customCacheKey= */ null,
+            /* data= */ null);
+    DownloadRequest request2 =
+        new DownloadRequest(
+            "id2",
+            TYPE_DASH,
+            uri2,
+            /* streamKeys= */ Collections.emptyList(),
+            /* customCacheKey= */ null,
+            /* data= */ null);
+    try {
+      request1.copyWithMergedRequest(request2);
+      fail();
+    } catch (IllegalArgumentException e) {
+      // Expected.
+    }
+  }
+
+  @Test
+  public void testMergeRequests_withDifferentTypes_fails() {
+    DownloadRequest request1 =
+        new DownloadRequest(
+            "id1",
+            TYPE_DASH,
+            uri1,
+            /* streamKeys= */ Collections.emptyList(),
+            /* customCacheKey= */ null,
+            /* data= */ null);
+    DownloadRequest request2 =
+        new DownloadRequest(
+            "id1",
+            TYPE_HLS,
+            uri1,
+            /* streamKeys= */ Collections.emptyList(),
+            /* customCacheKey= */ null,
+            /* data= */ null);
+    try {
+      request1.copyWithMergedRequest(request2);
+      fail();
+    } catch (IllegalArgumentException e) {
+      // Expected.
+    }
+  }
+
+  @Test
+  public void testMergeRequest_withSameRequest() {
+    DownloadRequest request1 = createRequest(uri1, new StreamKey(0, 0, 0));
+
+    DownloadRequest mergedRequest = request1.copyWithMergedRequest(request1);
+    assertEqual(request1, mergedRequest);
+  }
+
+  @Test
+  public void testMergeRequests_withEmptyStreamKeys() {
+    DownloadRequest request1 = createRequest(uri1, new StreamKey(0, 0, 0));
+    DownloadRequest request2 = createRequest(uri1);
+
+    // If either of the requests have empty streamKeys, the merge should have empty streamKeys.
+    DownloadRequest mergedRequest = request1.copyWithMergedRequest(request2);
+    assertThat(mergedRequest.streamKeys).isEmpty();
+
+    mergedRequest = request2.copyWithMergedRequest(request1);
+    assertThat(mergedRequest.streamKeys).isEmpty();
+  }
+
+  @Test
+  public void testMergeRequests_withOverlappingStreamKeys() {
+    StreamKey streamKey1 = new StreamKey(0, 1, 2);
+    StreamKey streamKey2 = new StreamKey(3, 4, 5);
+    StreamKey streamKey3 = new StreamKey(6, 7, 8);
+    DownloadRequest request1 = createRequest(uri1, streamKey1, streamKey2);
+    DownloadRequest request2 = createRequest(uri1, streamKey2, streamKey3);
+
+    // Merged streamKeys should be in their original order without duplicates.
+    DownloadRequest mergedRequest = request1.copyWithMergedRequest(request2);
+    assertThat(mergedRequest.streamKeys).containsExactly(streamKey1, streamKey2, streamKey3);
+
+    mergedRequest = request2.copyWithMergedRequest(request1);
+    assertThat(mergedRequest.streamKeys).containsExactly(streamKey2, streamKey3, streamKey1);
+  }
+
+  @Test
+  public void testMergeRequests_withDifferentFields() {
+    byte[] data1 = new byte[] {0, 1, 2};
+    byte[] data2 = new byte[] {3, 4, 5};
+    DownloadRequest request1 =
+        new DownloadRequest(
+            "id1",
+            TYPE_DASH,
+            uri1,
+            /* streamKeys= */ Collections.emptyList(),
+            "key1",
+            /* data= */ data1);
+    DownloadRequest request2 =
+        new DownloadRequest(
+            "id1",
+            TYPE_DASH,
+            uri2,
+            /* streamKeys= */ Collections.emptyList(),
+            "key2",
+            /* data= */ data2);
+
+    // uri, customCacheKey and data should be from the request being merged.
+    DownloadRequest mergedRequest = request1.copyWithMergedRequest(request2);
+    assertThat(mergedRequest.uri).isEqualTo(uri2);
+    assertThat(mergedRequest.customCacheKey).isEqualTo("key2");
+    assertThat(mergedRequest.data).isEqualTo(data2);
+
+    mergedRequest = request2.copyWithMergedRequest(request1);
+    assertThat(mergedRequest.uri).isEqualTo(uri1);
+    assertThat(mergedRequest.customCacheKey).isEqualTo("key1");
+    assertThat(mergedRequest.data).isEqualTo(data1);
+  }
+
+  @Test
+  public void testParcelable() {
+    ArrayList<StreamKey> streamKeys = new ArrayList<>();
+    streamKeys.add(new StreamKey(1, 2, 3));
+    streamKeys.add(new StreamKey(4, 5, 6));
+    DownloadRequest requestToParcel =
+        new DownloadRequest(
+            "id",
+            "type",
+            Uri.parse("https://abc.def/ghi"),
+            streamKeys,
+            "key",
+            new byte[] {1, 2, 3, 4, 5});
+    Parcel parcel = Parcel.obtain();
+    requestToParcel.writeToParcel(parcel, 0);
+    parcel.setDataPosition(0);
+
+    DownloadRequest requestFromParcel = DownloadRequest.CREATOR.createFromParcel(parcel);
+    assertThat(requestFromParcel).isEqualTo(requestToParcel);
+
+    parcel.recycle();
+  }
+
+  @SuppressWarnings("EqualsWithItself")
+  @Test
+  public void testEquals() {
+    DownloadRequest request1 = createRequest(uri1);
+    assertThat(request1.equals(request1)).isTrue();
+
+    DownloadRequest request2 = createRequest(uri1);
+    DownloadRequest request3 = createRequest(uri1);
+    assertEqual(request2, request3);
+
+    DownloadRequest request4 = createRequest(uri1);
+    DownloadRequest request5 = createRequest(uri1, new StreamKey(0, 0, 0));
+    assertNotEqual(request4, request5);
+
+    DownloadRequest request6 = createRequest(uri1, new StreamKey(0, 1, 1));
+    DownloadRequest request7 = createRequest(uri1, new StreamKey(0, 0, 0));
+    assertNotEqual(request6, request7);
+
+    DownloadRequest request8 = createRequest(uri1);
+    DownloadRequest request9 = createRequest(uri2);
+    assertNotEqual(request8, request9);
+
+    DownloadRequest request10 = createRequest(uri1, new StreamKey(0, 0, 0), new StreamKey(0, 1, 1));
+    DownloadRequest request11 = createRequest(uri1, new StreamKey(0, 1, 1), new StreamKey(0, 0, 0));
+    assertEqual(request10, request11);
+
+    DownloadRequest request12 = createRequest(uri1, new StreamKey(0, 0, 0));
+    DownloadRequest request13 = createRequest(uri1, new StreamKey(0, 1, 1), new StreamKey(0, 0, 0));
+    assertNotEqual(request12, request13);
+
+    DownloadRequest request14 = createRequest(uri1);
+    DownloadRequest request15 = createRequest(uri1);
+    assertEqual(request14, request15);
+  }
+
+  private static void assertNotEqual(DownloadRequest request1, DownloadRequest request2) {
+    assertThat(request1).isNotEqualTo(request2);
+    assertThat(request2).isNotEqualTo(request1);
+  }
+
+  private static void assertEqual(DownloadRequest request1, DownloadRequest request2) {
+    assertThat(request1).isEqualTo(request2);
+    assertThat(request2).isEqualTo(request1);
+  }
+
+  private static DownloadRequest createRequest(Uri uri, StreamKey... keys) {
+    return new DownloadRequest(
+        uri.toString(), TYPE_DASH, uri, toList(keys), /* customCacheKey= */ null, /* data= */ null);
+  }
+
+  private static List<StreamKey> toList(StreamKey... keys) {
+    ArrayList<StreamKey> keysList = new ArrayList<>();
+    Collections.addAll(keysList, keys);
+    return keysList;
+  }
+}
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
index 2b11b0affd..9eacd28f8d 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
@@ -29,8 +29,8 @@ import android.net.Uri;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.offline.DefaultDownloaderFactory;
-import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadException;
+import com.google.android.exoplayer2.offline.DownloadRequest;
 import com.google.android.exoplayer2.offline.Downloader;
 import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
 import com.google.android.exoplayer2.offline.DownloaderFactory;
@@ -84,9 +84,9 @@ public class DashDownloaderTest {
 
     Downloader downloader =
         factory.createDownloader(
-            new DownloadAction(
+            new DownloadRequest(
                 "id",
-                DownloadAction.TYPE_DASH,
+                DownloadRequest.TYPE_DASH,
                 Uri.parse("https://www.test.com/download"),
                 Collections.singletonList(new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0)),
                 /* customCacheKey= */ null,
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
index 35ca34999f..76356cf3a8 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
@@ -28,8 +28,8 @@ import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.offline.DefaultDownloadIndex;
 import com.google.android.exoplayer2.offline.DefaultDownloaderFactory;
-import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadManager;
+import com.google.android.exoplayer2.offline.DownloadRequest;
 import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.scheduler.Requirements;
@@ -132,7 +132,7 @@ public class DownloadManagerDashTest {
     dummyMainThread.runOnMainThread(
         () -> {
           // Setup an Action and immediately release the DM.
-          handleDownloadAction(fakeStreamKey1, fakeStreamKey2);
+          handleDownloadRequest(fakeStreamKey1, fakeStreamKey2);
           downloadManager.release();
         });
 
@@ -149,29 +149,29 @@ public class DownloadManagerDashTest {
   }
 
   @Test
-  public void testHandleDownloadAction() throws Throwable {
-    handleDownloadAction(fakeStreamKey1, fakeStreamKey2);
+  public void testHandleDownloadRequest() throws Throwable {
+    handleDownloadRequest(fakeStreamKey1, fakeStreamKey2);
     blockUntilTasksCompleteAndThrowAnyDownloadError();
     assertCachedData(cache, fakeDataSet);
   }
 
   @Test
-  public void testHandleMultipleDownloadAction() throws Throwable {
-    handleDownloadAction(fakeStreamKey1);
-    handleDownloadAction(fakeStreamKey2);
+  public void testHandleMultipleDownloadRequest() throws Throwable {
+    handleDownloadRequest(fakeStreamKey1);
+    handleDownloadRequest(fakeStreamKey2);
     blockUntilTasksCompleteAndThrowAnyDownloadError();
     assertCachedData(cache, fakeDataSet);
   }
 
   @Test
-  public void testHandleInterferingDownloadAction() throws Throwable {
+  public void testHandleInterferingDownloadRequest() throws Throwable {
     fakeDataSet
         .newData("audio_segment_2")
-        .appendReadAction(() -> handleDownloadAction(fakeStreamKey2))
+        .appendReadAction(() -> handleDownloadRequest(fakeStreamKey2))
         .appendReadData(TestUtil.buildTestData(5))
         .endData();
 
-    handleDownloadAction(fakeStreamKey1);
+    handleDownloadRequest(fakeStreamKey1);
 
     blockUntilTasksCompleteAndThrowAnyDownloadError();
     assertCachedData(cache, fakeDataSet);
@@ -179,7 +179,7 @@ public class DownloadManagerDashTest {
 
   @Test
   public void testHandleRemoveAction() throws Throwable {
-    handleDownloadAction(fakeStreamKey1);
+    handleDownloadRequest(fakeStreamKey1);
 
     blockUntilTasksCompleteAndThrowAnyDownloadError();
 
@@ -194,7 +194,7 @@ public class DownloadManagerDashTest {
   @Ignore
   @Test
   public void testHandleRemoveActionBeforeDownloadFinish() throws Throwable {
-    handleDownloadAction(fakeStreamKey1);
+    handleDownloadRequest(fakeStreamKey1);
     handleRemoveAction();
 
     blockUntilTasksCompleteAndThrowAnyDownloadError();
@@ -213,7 +213,7 @@ public class DownloadManagerDashTest {
         .appendReadData(TestUtil.buildTestData(5))
         .endData();
 
-    handleDownloadAction(fakeStreamKey1);
+    handleDownloadRequest(fakeStreamKey1);
 
     assertThat(downloadInProgressCondition.block(ASSERT_TRUE_TIMEOUT)).isTrue();
 
@@ -228,13 +228,13 @@ public class DownloadManagerDashTest {
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
-  private void handleDownloadAction(StreamKey... keys) {
+  private void handleDownloadRequest(StreamKey... keys) {
     ArrayList<StreamKey> keysList = new ArrayList<>();
     Collections.addAll(keysList, keys);
-    DownloadAction action =
-        new DownloadAction(
+    DownloadRequest action =
+        new DownloadRequest(
             TEST_ID,
-            DownloadAction.TYPE_DASH,
+            DownloadRequest.TYPE_DASH,
             TEST_MPD_URI,
             keysList,
             /* customCacheKey= */ null,
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
index 44befd3e2c..a35b6d1ea4 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
@@ -30,8 +30,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.offline.DefaultDownloadIndex;
 import com.google.android.exoplayer2.offline.DefaultDownloaderFactory;
 import com.google.android.exoplayer2.offline.Download;
-import com.google.android.exoplayer2.offline.DownloadAction;
 import com.google.android.exoplayer2.offline.DownloadManager;
+import com.google.android.exoplayer2.offline.DownloadRequest;
 import com.google.android.exoplayer2.offline.DownloadService;
 import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
@@ -159,7 +159,7 @@ public class DownloadServiceDashTest {
 
   @Ignore // b/78877092
   @Test
-  public void testMultipleDownloadAction() throws Throwable {
+  public void testMultipleDownloadRequest() throws Throwable {
     downloadKeys(fakeStreamKey1);
     downloadKeys(fakeStreamKey2);
 
@@ -208,10 +208,10 @@ public class DownloadServiceDashTest {
   private void downloadKeys(StreamKey... keys) {
     ArrayList<StreamKey> keysList = new ArrayList<>();
     Collections.addAll(keysList, keys);
-    DownloadAction action =
-        new DownloadAction(
+    DownloadRequest action =
+        new DownloadRequest(
             TEST_ID,
-            DownloadAction.TYPE_DASH,
+            DownloadRequest.TYPE_DASH,
             TEST_MPD_URI,
             keysList,
             /* customCacheKey= */ null,
@@ -219,7 +219,7 @@ public class DownloadServiceDashTest {
     dummyMainThread.runOnMainThread(
         () -> {
           Intent startIntent =
-              DownloadService.buildAddActionIntent(
+              DownloadService.buildAddRequestIntent(
                   context, DownloadService.class, action, /* foreground= */ false);
           dashDownloadService.onStartCommand(startIntent, 0, 0);
         });
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
index b5b4e47385..b92953c3b5 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
@@ -38,7 +38,7 @@ import android.net.Uri;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.offline.DefaultDownloaderFactory;
-import com.google.android.exoplayer2.offline.DownloadAction;
+import com.google.android.exoplayer2.offline.DownloadRequest;
 import com.google.android.exoplayer2.offline.Downloader;
 import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
 import com.google.android.exoplayer2.offline.DownloaderFactory;
@@ -101,9 +101,9 @@ public class HlsDownloaderTest {
 
     Downloader downloader =
         factory.createDownloader(
-            new DownloadAction(
+            new DownloadRequest(
                 "id",
-                DownloadAction.TYPE_HLS,
+                DownloadRequest.TYPE_HLS,
                 Uri.parse("https://www.test.com/download"),
                 Collections.singletonList(new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0)),
                 /* customCacheKey= */ null,
diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java
index b130f02bc3..5560a724c8 100644
--- a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java
+++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java
@@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
 import android.net.Uri;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.offline.DefaultDownloaderFactory;
-import com.google.android.exoplayer2.offline.DownloadAction;
+import com.google.android.exoplayer2.offline.DownloadRequest;
 import com.google.android.exoplayer2.offline.Downloader;
 import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
 import com.google.android.exoplayer2.offline.DownloaderFactory;
@@ -44,9 +44,9 @@ public final class SsDownloaderTest {
 
     Downloader downloader =
         factory.createDownloader(
-            new DownloadAction(
+            new DownloadRequest(
                 "id",
-                DownloadAction.TYPE_SS,
+                DownloadRequest.TYPE_SS,
                 Uri.parse("https://www.test.com/download"),
                 Collections.singletonList(new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 0)),
                 /* customCacheKey= */ null,
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
index 1677243f27..b74e539fd6 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
@@ -38,7 +38,7 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
 
   private final DownloadManager downloadManager;
   private final DummyMainThread dummyMainThread;
-  private final HashMap<String, ArrayBlockingQueue<Integer>> actionStates;
+  private final HashMap<String, ArrayBlockingQueue<Integer>> downloadStates;
   private final ConditionVariable initializedCondition;
 
   private CountDownLatch downloadFinishedCondition;
@@ -48,7 +48,7 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
       DownloadManager downloadManager, DummyMainThread dummyMainThread) {
     this.downloadManager = downloadManager;
     this.dummyMainThread = dummyMainThread;
-    actionStates = new HashMap<>();
+    downloadStates = new HashMap<>();
     initializedCondition = new ConditionVariable();
     downloadManager.addListener(this);
   }
@@ -73,12 +73,12 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
     if (download.state == Download.STATE_FAILED) {
       failureReason = download.failureReason;
     }
-    getStateQueue(download.action.id).add(download.state);
+    getStateQueue(download.request.id).add(download.state);
   }
 
   @Override
   public void onDownloadRemoved(DownloadManager downloadManager, Download download) {
-    getStateQueue(download.action.id).add(STATE_REMOVED);
+    getStateQueue(download.request.id).add(STATE_REMOVED);
   }
 
   @Override
@@ -114,11 +114,11 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
   }
 
   private ArrayBlockingQueue<Integer> getStateQueue(String taskId) {
-    synchronized (actionStates) {
-      if (!actionStates.containsKey(taskId)) {
-        actionStates.put(taskId, new ArrayBlockingQueue<>(10));
+    synchronized (downloadStates) {
+      if (!downloadStates.containsKey(taskId)) {
+        downloadStates.put(taskId, new ArrayBlockingQueue<>(10));
       }
-      return actionStates.get(taskId);
+      return downloadStates.get(taskId);
     }
   }
 

From 0be4bee25f2fd89c8a8b1f9efd3eca351dcc769a Mon Sep 17 00:00:00 2001
From: borrelli <borrelli@google.com>
Date: Tue, 16 Apr 2019 15:57:24 +0100
Subject: [PATCH 769/832] Add "setCustomErrorMessage" override that allows
 including an extras bundle with a custom error.

PiperOrigin-RevId: 243807109
---
 RELEASENOTES.md                               |  1 +
 .../mediasession/MediaSessionConnector.java   | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index d5cef0bb08..1919d85766 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -4,6 +4,7 @@
 
 * MediaSession extension:
   * Allow handling of custom commands via `registerCustomCommandReceiver`.
+  * Add ability to include an extras `Bundle` when reporting a custom error.
 
 ### 2.10.0 ###
 
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
index 9a1f38c10b..35990573ad 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
@@ -373,6 +373,7 @@ public final class MediaSessionConnector {
   @Nullable private Player player;
   @Nullable private ErrorMessageProvider<? super ExoPlaybackException> errorMessageProvider;
   @Nullable private Pair<Integer, CharSequence> customError;
+  @Nullable private Bundle customErrorExtras;
   @Nullable private PlaybackPreparer playbackPreparer;
   @Nullable private QueueNavigator queueNavigator;
   @Nullable private QueueEditor queueEditor;
@@ -581,7 +582,20 @@ public final class MediaSessionConnector {
    * @param code The error code to report. Ignored when {@code message} is {@code null}.
    */
   public void setCustomErrorMessage(@Nullable CharSequence message, int code) {
+    setCustomErrorMessage(message, code, /* extras= */ null);
+  }
+
+  /**
+   * Sets a custom error on the session.
+   *
+   * @param message The error string to report or {@code null} to clear the error.
+   * @param code The error code to report. Ignored when {@code message} is {@code null}.
+   * @param extras Extras to include in reported {@link PlaybackStateCompat}.
+   */
+  public void setCustomErrorMessage(
+      @Nullable CharSequence message, int code, @Nullable Bundle extras) {
     customError = (message == null) ? null : new Pair<>(code, message);
+    customErrorExtras = (message == null) ? null : extras;
     invalidateMediaSessionPlaybackState();
   }
 
@@ -654,6 +668,7 @@ public final class MediaSessionConnector {
     customActionMap = Collections.unmodifiableMap(currentActions);
 
     int playbackState = player.getPlaybackState();
+    Bundle extras = new Bundle();
     ExoPlaybackException playbackError =
         playbackState == Player.STATE_IDLE ? player.getPlaybackError() : null;
     boolean reportError = playbackError != null || customError != null;
@@ -663,6 +678,9 @@ public final class MediaSessionConnector {
             : mapPlaybackState(player.getPlaybackState(), player.getPlayWhenReady());
     if (customError != null) {
       builder.setErrorMessage(customError.first, customError.second);
+      if (customErrorExtras != null) {
+        extras.putAll(customErrorExtras);
+      }
     } else if (playbackError != null && errorMessageProvider != null) {
       Pair<Integer, String> message = errorMessageProvider.getErrorMessage(playbackError);
       builder.setErrorMessage(message.first, message.second);
@@ -671,7 +689,6 @@ public final class MediaSessionConnector {
         queueNavigator != null
             ? queueNavigator.getActiveQueueItemId(player)
             : MediaSessionCompat.QueueItem.UNKNOWN_ID;
-    Bundle extras = new Bundle();
     extras.putFloat(EXTRAS_PITCH, player.getPlaybackParameters().pitch);
     builder
         .setActions(buildPrepareActions() | buildPlaybackActions(player))

From ee08e7dcac508af05c9cc9ab6663df34299264a7 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 16 Apr 2019 16:26:09 +0100
Subject: [PATCH 770/832] Fix key and accessibility scrubbing

Issue: #5767
PiperOrigin-RevId: 243811443
---
 .../android/exoplayer2/ui/DefaultTimeBar.java | 97 +++++++++++--------
 .../exoplayer2/ui/PlayerControlView.java      |  3 +
 .../google/android/exoplayer2/ui/TimeBar.java |  7 +-
 3 files changed, 62 insertions(+), 45 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
index 46cd54058c..328b5d6a49 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
@@ -433,7 +433,7 @@ public class DefaultTimeBar extends View implements TimeBar {
   public void setDuration(long duration) {
     this.duration = duration;
     if (scrubbing && duration == C.TIME_UNSET) {
-      stopScrubbing(true);
+      stopScrubbing(/* canceled= */ true);
     }
     update();
   }
@@ -463,7 +463,7 @@ public class DefaultTimeBar extends View implements TimeBar {
   public void setEnabled(boolean enabled) {
     super.setEnabled(enabled);
     if (scrubbing && !enabled) {
-      stopScrubbing(true);
+      stopScrubbing(/* canceled= */ true);
     }
   }
 
@@ -487,8 +487,7 @@ public class DefaultTimeBar extends View implements TimeBar {
       case MotionEvent.ACTION_DOWN:
         if (isInSeekBar(x, y)) {
           positionScrubber(x);
-          startScrubbing();
-          scrubPosition = getScrubberPosition();
+          startScrubbing(getScrubberPosition());
           update();
           invalidate();
           return true;
@@ -503,10 +502,7 @@ public class DefaultTimeBar extends View implements TimeBar {
             lastCoarseScrubXPosition = x;
             positionScrubber(x);
           }
-          scrubPosition = getScrubberPosition();
-          for (OnScrubListener listener : listeners) {
-            listener.onScrubMove(this, scrubPosition);
-          }
+          updateScrubbing(getScrubberPosition());
           update();
           invalidate();
           return true;
@@ -515,7 +511,7 @@ public class DefaultTimeBar extends View implements TimeBar {
       case MotionEvent.ACTION_UP:
       case MotionEvent.ACTION_CANCEL:
         if (scrubbing) {
-          stopScrubbing(event.getAction() == MotionEvent.ACTION_CANCEL);
+          stopScrubbing(/* canceled= */ event.getAction() == MotionEvent.ACTION_CANCEL);
           return true;
         }
         break;
@@ -543,8 +539,7 @@ public class DefaultTimeBar extends View implements TimeBar {
         case KeyEvent.KEYCODE_DPAD_CENTER:
         case KeyEvent.KEYCODE_ENTER:
           if (scrubbing) {
-            removeCallbacks(stopScrubbingRunnable);
-            stopScrubbingRunnable.run();
+            stopScrubbing(/* canceled= */ false);
             return true;
           }
           break;
@@ -555,6 +550,15 @@ public class DefaultTimeBar extends View implements TimeBar {
     return super.onKeyDown(keyCode, event);
   }
 
+  @Override
+  protected void onFocusChanged(
+      boolean gainFocus, int direction, @Nullable Rect previouslyFocusedRect) {
+    super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
+    if (scrubbing && !gainFocus) {
+      stopScrubbing(/* canceled= */ false);
+    }
+  }
+
   @Override
   protected void drawableStateChanged() {
     super.drawableStateChanged();
@@ -637,11 +641,11 @@ public class DefaultTimeBar extends View implements TimeBar {
     }
     if (action == AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD) {
       if (scrubIncrementally(-getPositionIncrement())) {
-        stopScrubbing(false);
+        stopScrubbing(/* canceled= */ false);
       }
     } else if (action == AccessibilityNodeInfo.ACTION_SCROLL_FORWARD) {
       if (scrubIncrementally(getPositionIncrement())) {
-        stopScrubbing(false);
+        stopScrubbing(/* canceled= */ false);
       }
     } else {
       return false;
@@ -652,7 +656,8 @@ public class DefaultTimeBar extends View implements TimeBar {
 
   // Internal methods.
 
-  private void startScrubbing() {
+  private void startScrubbing(long scrubPosition) {
+    this.scrubPosition = scrubPosition;
     scrubbing = true;
     setPressed(true);
     ViewParent parent = getParent();
@@ -660,11 +665,22 @@ public class DefaultTimeBar extends View implements TimeBar {
       parent.requestDisallowInterceptTouchEvent(true);
     }
     for (OnScrubListener listener : listeners) {
-      listener.onScrubStart(this, getScrubberPosition());
+      listener.onScrubStart(this, scrubPosition);
+    }
+  }
+
+  private void updateScrubbing(long scrubPosition) {
+    if (this.scrubPosition == scrubPosition) {
+      return;
+    }
+    this.scrubPosition = scrubPosition;
+    for (OnScrubListener listener : listeners) {
+      listener.onScrubMove(this, scrubPosition);
     }
   }
 
   private void stopScrubbing(boolean canceled) {
+    removeCallbacks(stopScrubbingRunnable);
     scrubbing = false;
     setPressed(false);
     ViewParent parent = getParent();
@@ -673,10 +689,34 @@ public class DefaultTimeBar extends View implements TimeBar {
     }
     invalidate();
     for (OnScrubListener listener : listeners) {
-      listener.onScrubStop(this, getScrubberPosition(), canceled);
+      listener.onScrubStop(this, scrubPosition, canceled);
     }
   }
 
+  /**
+   * Incrementally scrubs the position by {@code positionChange}.
+   *
+   * @param positionChange The change in the scrubber position, in milliseconds. May be negative.
+   * @return Returns whether the scrubber position changed.
+   */
+  private boolean scrubIncrementally(long positionChange) {
+    if (duration <= 0) {
+      return false;
+    }
+    long previousPosition = scrubbing ? scrubPosition : position;
+    long scrubPosition = Util.constrainValue(previousPosition + positionChange, 0, duration);
+    if (scrubPosition == previousPosition) {
+      return false;
+    }
+    if (!scrubbing) {
+      startScrubbing(scrubPosition);
+    } else {
+      updateScrubbing(scrubPosition);
+    }
+    update();
+    return true;
+  }
+
   private void update() {
     bufferedBar.set(progressBar);
     scrubberBar.set(progressBar);
@@ -793,31 +833,6 @@ public class DefaultTimeBar extends View implements TimeBar {
         ? (duration == C.TIME_UNSET ? 0 : (duration / keyCountIncrement)) : keyTimeIncrement;
   }
 
-  /**
-   * Incrementally scrubs the position by {@code positionChange}.
-   *
-   * @param positionChange The change in the scrubber position, in milliseconds. May be negative.
-   * @return Returns whether the scrubber position changed.
-   */
-  private boolean scrubIncrementally(long positionChange) {
-    if (duration <= 0) {
-      return false;
-    }
-    long scrubberPosition = getScrubberPosition();
-    scrubPosition = Util.constrainValue(scrubberPosition + positionChange, 0, duration);
-    if (scrubPosition == scrubberPosition) {
-      return false;
-    }
-    if (!scrubbing) {
-      startScrubbing();
-    }
-    for (OnScrubListener listener : listeners) {
-      listener.onScrubMove(this, scrubPosition);
-    }
-    update();
-    return true;
-  }
-
   private boolean setDrawableLayoutDirection(Drawable drawable) {
     return Util.SDK_INT >= 23 && setDrawableLayoutDirection(drawable, getLayoutDirection());
   }
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
index afd344432f..a5deb808c1 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
@@ -1109,6 +1109,9 @@ public class PlayerControlView extends FrameLayout {
     @Override
     public void onScrubStart(TimeBar timeBar, long position) {
       scrubbing = true;
+      if (positionView != null) {
+        positionView.setText(Util.getStringForTime(formatBuilder, formatter, position));
+      }
     }
 
     @Override
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TimeBar.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TimeBar.java
index 9ac3cba4fd..d62f2494d5 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TimeBar.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TimeBar.java
@@ -114,7 +114,7 @@ public interface TimeBar {
      * Called when the user starts moving the scrubber.
      *
      * @param timeBar The time bar.
-     * @param position The position of the scrubber, in milliseconds.
+     * @param position The scrub position in milliseconds.
      */
     void onScrubStart(TimeBar timeBar, long position);
 
@@ -122,7 +122,7 @@ public interface TimeBar {
      * Called when the user moves the scrubber.
      *
      * @param timeBar The time bar.
-     * @param position The position of the scrubber, in milliseconds.
+     * @param position The scrub position in milliseconds.
      */
     void onScrubMove(TimeBar timeBar, long position);
 
@@ -130,11 +130,10 @@ public interface TimeBar {
      * Called when the user stops moving the scrubber.
      *
      * @param timeBar The time bar.
-     * @param position The position of the scrubber, in milliseconds.
+     * @param position The scrub position in milliseconds.
      * @param canceled Whether scrubbing was canceled.
      */
     void onScrubStop(TimeBar timeBar, long position, boolean canceled);
-
   }
 
 }

From 8e7a2ba9587072c549b72189fa8aa115201a3d5a Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 16 Apr 2019 17:15:08 +0100
Subject: [PATCH 771/832] Don't reset masking position when prepare fails.

The removed condition only applies when prepare fails and no timeline was or
is known. We should keep a pending seek position in such a case. The internal
player does the same thing already.

PiperOrigin-RevId: 243819466
---
 .../main/java/com/google/android/exoplayer2/ExoPlayerImpl.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index 2568d8ec40..8e5a6d2a9b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -631,8 +631,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
             playbackInfo.resetToNewPosition(
                 playbackInfo.periodId, /* startPositionUs= */ 0, playbackInfo.contentPositionUs);
       }
-      if ((!this.playbackInfo.timeline.isEmpty() || hasPendingPrepare)
-          && playbackInfo.timeline.isEmpty()) {
+      if (!this.playbackInfo.timeline.isEmpty() && playbackInfo.timeline.isEmpty()) {
         // Update the masking variables, which are used when the timeline becomes empty.
         maskingPeriodIndex = 0;
         maskingWindowIndex = 0;

From e62da368d28f6fe2286fafa611397966fad6b83d Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 16 Apr 2019 17:16:00 +0100
Subject: [PATCH 772/832] Use player.retry in demo app instead of manual
 position tracking.

We currently do manual position tracking while the player is in error mode.
This is to allow an initial seek to the new position when trying to re-prepare.

Instead, we can just use our player.retry method and remove the tracking code.

PiperOrigin-RevId: 243819580
---
 .../android/exoplayer2/demo/PlayerActivity.java      | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

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 11df14e3dd..acb24adebe 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
@@ -311,7 +311,7 @@ public class PlayerActivity extends AppCompatActivity
 
   @Override
   public void preparePlayback() {
-    initializePlayer();
+    player.retry();
   }
 
   // PlaybackControlView.VisibilityListener implementation
@@ -641,22 +641,12 @@ public class PlayerActivity extends AppCompatActivity
       updateButtonVisibility();
     }
 
-    @Override
-    public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
-      if (player.getPlaybackError() != null) {
-        // The user has performed a seek whilst in the error state. Update the resume position so
-        // that if the user then retries, playback resumes from the position to which they seeked.
-        updateStartPosition();
-      }
-    }
-
     @Override
     public void onPlayerError(ExoPlaybackException e) {
       if (isBehindLiveWindow(e)) {
         clearStartPosition();
         initializePlayer();
       } else {
-        updateStartPosition();
         updateButtonVisibility();
         showControls();
       }

From 10f3b8db6ed5c920188c66eb87637ea4b16e1ad1 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 16 Apr 2019 17:27:11 +0100
Subject: [PATCH 773/832] Update release notes for 2.10 branch cut

PiperOrigin-RevId: 243821394
---
 RELEASENOTES.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 1919d85766..765244ac1a 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,10 +2,6 @@
 
 ### dev-v2 (not yet released) ###
 
-* MediaSession extension:
-  * Allow handling of custom commands via `registerCustomCommandReceiver`.
-  * Add ability to include an extras `Bundle` when reporting a custom error.
-
 ### 2.10.0 ###
 
 * Core library:
@@ -58,15 +54,17 @@
   * Update `DefaultTimeBar` based on duration of media and add parameter to set
     the minimum update interval to control the smoothness of the updates
     ([#5040](https://github.com/google/ExoPlayer/issues/5040)).
+  * Move creation of dialogs for `TrackSelectionView`s to
+    `TrackSelectionDialogBuilder` and add option to select multiple overrides.
+  * Change signature of `PlayerNotificationManager.NotificationListener` to
+    better fit service requirements.
+  * Add option to include navigation actions in the compact mode of
+    notifications created using `PlayerNotificationManager`.
   * Fix issues with flickering notifications on KitKat when using
     `PlayerNotificationManager` and `DownloadNotificationUtil`. For the latter,
     applications should switch to using `DownloadNotificationHelper`.
-  * Add option to include navigation actions in the compact mode of
-    notifications created using `PlayerNotificationManager`.
-  * Change signature of `PlayerNotificationManager.NotificationListener` to
-    better fit service requirements.
-  * Move creation of dialogs for `TrackSelectionView`s to
-    `TrackSelectionDialogBuilder` and add option to select multiple overrides.
+  * Fix accuracy of D-pad seeking in `DefaultTimeBar`
+    ([#5767](https://github.com/google/ExoPlayer/issues/5767)).
 * Audio:
   * Allow `AudioProcessor`s to be drained of pending output after they are
     reconfigured.
@@ -111,6 +109,8 @@
     ([#5179](https://github.com/google/ExoPlayer/issues/5179)).
   * Fix issue with `TimelineQueueNavigator` not publishing the queue in shuffled
     order when in shuffle mode.
+  * Allow handling of custom commands via `registerCustomCommandReceiver`.
+  * Add ability to include an extras `Bundle` when reporting a custom error.
 
 ### 2.9.6 ###
 

From dcb8417a3c6a18e636be07c44d21eddf98208639 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 17 Apr 2019 09:30:25 +0100
Subject: [PATCH 774/832] Assert customCacheKey is null for DASH, HLS and
 SmoothStreaming downloads

PiperOrigin-RevId: 243954989
---
 .../exoplayer2/offline/DownloadRequest.java     |   9 ++++++++-
 .../action_file_for_download_index_upgrade.exi  | Bin 161 -> 161 bytes
 .../offline/ActionFileUpgradeUtilTest.java      |  12 ++++++------
 .../exoplayer2/offline/DownloadRequestTest.java |   5 +++--
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadRequest.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadRequest.java
index 5acefd6f93..7ff43ceacd 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadRequest.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadRequest.java
@@ -52,7 +52,10 @@ public final class DownloadRequest implements Parcelable {
   public final Uri uri;
   /** Stream keys to be downloaded. If empty, all streams will be downloaded. */
   public final List<StreamKey> streamKeys;
-  /** Custom key for cache indexing, or null. */
+  /**
+   * Custom key for cache indexing, or null. Must be null for DASH, HLS and SmoothStreaming
+   * downloads.
+   */
   @Nullable public final String customCacheKey;
   /** Application defined data associated with the download. May be empty. */
   public final byte[] data;
@@ -72,6 +75,10 @@ public final class DownloadRequest implements Parcelable {
       List<StreamKey> streamKeys,
       @Nullable String customCacheKey,
       @Nullable byte[] data) {
+    if (TYPE_DASH.equals(type) || TYPE_HLS.equals(type) || TYPE_SS.equals(type)) {
+      Assertions.checkArgument(
+          customCacheKey == null, "customCacheKey must be null for type: " + type);
+    }
     this.id = id;
     this.type = type;
     this.uri = uri;
diff --git a/library/core/src/test/assets/offline/action_file_for_download_index_upgrade.exi b/library/core/src/test/assets/offline/action_file_for_download_index_upgrade.exi
index 888ba4af4467a3d7a0077afad8ea24bbd48f8be0..0bf49b133a1c91e9542671bad37539141a8f953d 100644
GIT binary patch
delta 33
ecmZ3;xR8;L0Ros9SV~fhOD6JpKxyTPwJHE<mIt^1

delta 33
ecmZ3;xR8;L0Ros9SW*&;GbZwRKxyTPwJHE+W(Rlx

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java
index 5153b53839..96b8ff21bc 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.offline;
 
-import static com.google.android.exoplayer2.offline.DownloadRequest.TYPE_DASH;
+import static com.google.android.exoplayer2.offline.DownloadRequest.TYPE_PROGRESSIVE;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
@@ -73,7 +73,7 @@ public class ActionFileUpgradeUtilTest {
     DownloadRequest expectedRequest1 =
         new DownloadRequest(
             "key123",
-            TYPE_DASH,
+            /* type= */ "test",
             Uri.parse("https://www.test.com/download1"),
             asList(expectedStreamKey1),
             /* customCacheKey= */ "key123",
@@ -81,7 +81,7 @@ public class ActionFileUpgradeUtilTest {
     DownloadRequest expectedRequest2 =
         new DownloadRequest(
             "key234",
-            TYPE_DASH,
+            /* type= */ "test",
             Uri.parse("https://www.test.com/download2"),
             asList(expectedStreamKey2),
             /* customCacheKey= */ "key234",
@@ -100,7 +100,7 @@ public class ActionFileUpgradeUtilTest {
     DownloadRequest request =
         new DownloadRequest(
             "id",
-            TYPE_DASH,
+            TYPE_PROGRESSIVE,
             Uri.parse("https://www.test.com/download"),
             asList(
                 new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 1, /* trackIndex= */ 2),
@@ -122,7 +122,7 @@ public class ActionFileUpgradeUtilTest {
     DownloadRequest request1 =
         new DownloadRequest(
             "id",
-            TYPE_DASH,
+            TYPE_PROGRESSIVE,
             Uri.parse("https://www.test.com/download1"),
             asList(streamKey1),
             /* customCacheKey= */ "key123",
@@ -130,7 +130,7 @@ public class ActionFileUpgradeUtilTest {
     DownloadRequest request2 =
         new DownloadRequest(
             "id",
-            TYPE_DASH,
+            TYPE_PROGRESSIVE,
             Uri.parse("https://www.test.com/download2"),
             asList(streamKey2),
             /* customCacheKey= */ "key123",
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadRequestTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadRequestTest.java
index d298dd58b8..a55b1e1283 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadRequestTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadRequestTest.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.offline;
 
 import static com.google.android.exoplayer2.offline.DownloadRequest.TYPE_DASH;
 import static com.google.android.exoplayer2.offline.DownloadRequest.TYPE_HLS;
+import static com.google.android.exoplayer2.offline.DownloadRequest.TYPE_PROGRESSIVE;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
@@ -139,7 +140,7 @@ public class DownloadRequestTest {
     DownloadRequest request1 =
         new DownloadRequest(
             "id1",
-            TYPE_DASH,
+            TYPE_PROGRESSIVE,
             uri1,
             /* streamKeys= */ Collections.emptyList(),
             "key1",
@@ -147,7 +148,7 @@ public class DownloadRequestTest {
     DownloadRequest request2 =
         new DownloadRequest(
             "id1",
-            TYPE_DASH,
+            TYPE_PROGRESSIVE,
             uri2,
             /* streamKeys= */ Collections.emptyList(),
             "key2",

From 6b0fd513788c7eee458f7d336905dcf779cfc808 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Wed, 17 Apr 2019 11:47:48 +0100
Subject: [PATCH 775/832] Reset playback info but not position/state in release

ImaAdsLoader gets the player position after the app releases
the player to support resuming ads at their current position
if the same ads loader is reused.

PiperOrigin-RevId: 243969916
---
 .../java/com/google/android/exoplayer2/ExoPlayerImpl.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index 8e5a6d2a9b..15deb8ea47 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -403,8 +403,8 @@ import java.util.concurrent.CopyOnWriteArrayList;
     eventHandler.removeCallbacksAndMessages(null);
     playbackInfo =
         getResetPlaybackInfo(
-            /* resetPosition= */ true,
-            /* resetState= */ true,
+            /* resetPosition= */ false,
+            /* resetState= */ false,
             /* playbackState= */ Player.STATE_IDLE);
   }
 

From 721e1dbfaf8c18c4a62badf5a6aa7518e999e152 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 17 Apr 2019 13:32:17 +0100
Subject: [PATCH 776/832] Add WritableDownloadIndex interface

One goal we forgot about a little bit was to allow applications
to provide their own index implementation. This requires the
writable side to also be defined by an interface.

PiperOrigin-RevId: 243979660
---
 .../offline/DefaultDownloadIndex.java         | 36 ++---------
 .../exoplayer2/offline/DownloadIndex.java     |  2 +-
 .../exoplayer2/offline/DownloadManager.java   | 15 +++--
 .../offline/WritableDownloadIndex.java        | 59 +++++++++++++++++++
 4 files changed, 72 insertions(+), 40 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/offline/WritableDownloadIndex.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
index d7ab4201a5..fc1518e5c3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -38,7 +38,7 @@ import java.util.List;
  * <p class="caution">Database access may take a long time, do not call methods of this class from
  * the application main thread.
  */
-public final class DefaultDownloadIndex implements DownloadIndex {
+public final class DefaultDownloadIndex implements WritableDownloadIndex {
 
   private static final String TABLE_NAME = DatabaseProvider.TABLE_PREFIX + "Downloads";
 
@@ -185,12 +185,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
     return new DownloadCursorImpl(cursor);
   }
 
-  /**
-   * Adds or replaces a {@link Download}.
-   *
-   * @param download The {@link Download} to be added.
-   * @throws DatabaseIOException If an error occurs setting the state.
-   */
+  @Override
   public void putDownload(Download download) throws DatabaseIOException {
     ensureInitialized();
     ContentValues values = new ContentValues();
@@ -218,12 +213,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
     }
   }
 
-  /**
-   * Removes the {@link Download} with the given {@code id}.
-   *
-   * @param id ID of a {@link Download}.
-   * @throws DatabaseIOException If an error occurs removing the state.
-   */
+  @Override
   public void removeDownload(String id) throws DatabaseIOException {
     ensureInitialized();
     try {
@@ -233,13 +223,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
     }
   }
 
-  /**
-   * Sets the manual stop reason of the downloads in a terminal state ({@link
-   * Download#STATE_COMPLETED}, {@link Download#STATE_FAILED}).
-   *
-   * @param manualStopReason The manual stop reason.
-   * @throws DatabaseIOException If an error occurs updating the state.
-   */
+  @Override
   public void setManualStopReason(int manualStopReason) throws DatabaseIOException {
     ensureInitialized();
     try {
@@ -252,17 +236,7 @@ public final class DefaultDownloadIndex implements DownloadIndex {
     }
   }
 
-  /**
-   * Sets the manual stop reason of the download with the given {@code id} in a terminal state
-   * ({@link Download#STATE_COMPLETED}, {@link Download#STATE_FAILED}).
-   *
-   * <p>If there's no {@link Download} with the given {@code id} or it isn't in a terminal state,
-   * then nothing happens.
-   *
-   * @param id ID of a {@link Download}.
-   * @param manualStopReason The manual stop reason.
-   * @throws DatabaseIOException If an error occurs updating the state.
-   */
+  @Override
   public void setManualStopReason(String id, int manualStopReason) throws DatabaseIOException {
     ensureInitialized();
     try {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java
index 90d0fa1b51..3de1b7b212 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java
@@ -18,7 +18,7 @@ package com.google.android.exoplayer2.offline;
 import androidx.annotation.Nullable;
 import java.io.IOException;
 
-/** Persists {@link Download}s. */
+/** An index of {@link Download Downloads}. */
 public interface DownloadIndex {
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 03c33b6aad..fdb3ca1840 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -34,7 +34,6 @@ import android.os.Message;
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.database.DatabaseIOException;
 import com.google.android.exoplayer2.database.DatabaseProvider;
 import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.scheduler.RequirementsWatcher;
@@ -155,7 +154,7 @@ public final class DownloadManager {
   private final int maxSimultaneousDownloads;
   private final int minRetryCount;
   private final Context context;
-  private final DefaultDownloadIndex downloadIndex;
+  private final WritableDownloadIndex downloadIndex;
   private final DownloaderFactory downloaderFactory;
   private final Handler mainHandler;
   private final HandlerThread internalThread;
@@ -231,7 +230,7 @@ public final class DownloadManager {
    * Constructs a {@link DownloadManager}.
    *
    * @param context Any context.
-   * @param downloadIndex The {@link DefaultDownloadIndex} that holds the downloads.
+   * @param downloadIndex The download index used to hold the download information.
    * @param downloaderFactory A factory for creating {@link Downloader}s.
    * @param maxSimultaneousDownloads The maximum number of simultaneous downloads.
    * @param minRetryCount The minimum number of times a download must be retried before failing.
@@ -239,7 +238,7 @@ public final class DownloadManager {
    */
   public DownloadManager(
       Context context,
-      DefaultDownloadIndex downloadIndex,
+      WritableDownloadIndex downloadIndex,
       DownloaderFactory downloaderFactory,
       int maxSimultaneousDownloads,
       int minRetryCount,
@@ -651,7 +650,7 @@ public final class DownloadManager {
       } else {
         downloadIndex.setManualStopReason(manualStopReason);
       }
-    } catch (DatabaseIOException e) {
+    } catch (IOException e) {
       Log.e(TAG, "setManualStopReason failed", e);
     }
   }
@@ -734,7 +733,7 @@ public final class DownloadManager {
     logd("Download state is changed", downloadInternal);
     try {
       downloadIndex.putDownload(download);
-    } catch (DatabaseIOException e) {
+    } catch (IOException e) {
       Log.e(TAG, "Failed to update index", e);
     }
     if (downloadInternal.state == STATE_COMPLETED || downloadInternal.state == STATE_FAILED) {
@@ -747,7 +746,7 @@ public final class DownloadManager {
     logd("Download is removed", downloadInternal);
     try {
       downloadIndex.removeDownload(download.request.id);
-    } catch (DatabaseIOException e) {
+    } catch (IOException e) {
       Log.e(TAG, "Failed to remove from index", e);
     }
     downloadInternals.remove(downloadInternal);
@@ -805,7 +804,7 @@ public final class DownloadManager {
   private Download loadDownload(String id) {
     try {
       return downloadIndex.getDownload(id);
-    } catch (DatabaseIOException e) {
+    } catch (IOException e) {
       Log.e(TAG, "loadDownload failed", e);
     }
     return null;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/WritableDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/WritableDownloadIndex.java
new file mode 100644
index 0000000000..24f4421bc4
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/WritableDownloadIndex.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.offline;
+
+import java.io.IOException;
+
+/** An writable index of {@link Download Downloads}. */
+public interface WritableDownloadIndex extends DownloadIndex {
+
+  /**
+   * Adds or replaces a {@link Download}.
+   *
+   * @param download The {@link Download} to be added.
+   * @throws throws IOException If an error occurs setting the state.
+   */
+  void putDownload(Download download) throws IOException;
+
+  /**
+   * Removes the {@link Download} with the given {@code id}.
+   *
+   * @param id ID of a {@link Download}.
+   * @throws throws IOException If an error occurs removing the state.
+   */
+  void removeDownload(String id) throws IOException;
+  /**
+   * Sets the manual stop reason of the downloads in a terminal state ({@link
+   * Download#STATE_COMPLETED}, {@link Download#STATE_FAILED}).
+   *
+   * @param manualStopReason The manual stop reason.
+   * @throws throws IOException If an error occurs updating the state.
+   */
+  void setManualStopReason(int manualStopReason) throws IOException;
+
+  /**
+   * Sets the manual stop reason of the download with the given {@code id} in a terminal state
+   * ({@link Download#STATE_COMPLETED}, {@link Download#STATE_FAILED}).
+   *
+   * <p>If there's no {@link Download} with the given {@code id} or it isn't in a terminal state,
+   * then nothing happens.
+   *
+   * @param id ID of a {@link Download}.
+   * @param manualStopReason The manual stop reason.
+   * @throws throws IOException If an error occurs updating the state.
+   */
+  void setManualStopReason(String id, int manualStopReason) throws IOException;
+}

From e15e6212f25d531c2f1403876e463dc645e4ab29 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 17 Apr 2019 14:45:18 +0100
Subject: [PATCH 777/832] Fix playback of badly clipped MP3 streams

Issue: #5772
PiperOrigin-RevId: 243987497
---
 RELEASENOTES.md                                  |  6 ++++--
 .../exoplayer2/extractor/mp3/Mp3Extractor.java   | 16 +++++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 765244ac1a..182701ec34 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -32,14 +32,16 @@
     replaced with an opt out flag
     (`DataSpec.FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN`).
 * Extractors:
-  * MP3: Add support for SHOUTcast ICY metadata
-    ([#3735](https://github.com/google/ExoPlayer/issues/3735)).
   * MP4/FMP4: Add support for Dolby Vision.
   * MP4: Fix issue handling meta atoms in some streams
     ([#5698](https://github.com/google/ExoPlayer/issues/5698),
     [#5694](https://github.com/google/ExoPlayer/issues/5694)).
+  * MP3: Add support for SHOUTcast ICY metadata
+    ([#3735](https://github.com/google/ExoPlayer/issues/3735)).
   * MP3: Fix ID3 frame unsychronization
     ([#5673](https://github.com/google/ExoPlayer/issues/5673)).
+  * MP3: Fix playback of badly clipped files
+    ([#5772](https://github.com/google/ExoPlayer/issues/5772)).  
   * MPEG-TS: Enable HDMV DTS stream detection only if a flag is set. By default
     (i.e. if the flag is not set), the 0x82 elementary stream type is now
     treated as an SCTE subtitle track
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java
index 4db715f53e..c65ad0bc67 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java
@@ -341,9 +341,19 @@ public final class Mp3Extractor implements Extractor {
    */
   private boolean peekEndOfStreamOrHeader(ExtractorInput extractorInput)
       throws IOException, InterruptedException {
-    return (seeker != null && extractorInput.getPeekPosition() == seeker.getDataEndPosition())
-        || !extractorInput.peekFully(
-            scratch.data, /* offset= */ 0, /* length= */ 4, /* allowEndOfInput= */ true);
+    if (seeker != null) {
+      long dataEndPosition = seeker.getDataEndPosition();
+      if (dataEndPosition != C.POSITION_UNSET
+          && extractorInput.getPeekPosition() > dataEndPosition - 4) {
+        return true;
+      }
+    }
+    try {
+      return !extractorInput.peekFully(
+          scratch.data, /* offset= */ 0, /* length= */ 4, /* allowEndOfInput= */ true);
+    } catch (EOFException e) {
+      return true;
+    }
   }
 
   /**

From c1246937dfac4fd047ae9ab48606b33aeee1ac34 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Wed, 17 Apr 2019 14:50:40 +0100
Subject: [PATCH 778/832] Upgrade IMA to 3.11.2

PiperOrigin-RevId: 243988105
---
 extensions/ima/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle
index c80fb26124..a91bbbd981 100644
--- a/extensions/ima/build.gradle
+++ b/extensions/ima/build.gradle
@@ -32,9 +32,9 @@ android {
 }
 
 dependencies {
-    api 'com.google.ads.interactivemedia.v3:interactivemedia:3.10.9'
+    api 'com.google.ads.interactivemedia.v3:interactivemedia:3.11.2'
     implementation project(modulePrefix + 'library-core')
-    implementation 'com.google.android.gms:play-services-ads:17.2.0'
+    implementation 'com.google.android.gms:play-services-ads-identifier:16.0.0'
     testImplementation project(modulePrefix + 'testutils-robolectric')
 }
 

From 2907f79e69633b7739ae7b48a225572abf54a7b7 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 17 Apr 2019 16:46:42 +0100
Subject: [PATCH 779/832] Don't start download if user explicitly deselects all
 tracks

PiperOrigin-RevId: 244003817
---
 .../android/exoplayer2/demo/DownloadTracker.java | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index 34282fc389..4a7a810314 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -240,7 +240,12 @@ public class DownloadTracker {
           }
         }
       }
-      startDownload();
+      DownloadRequest downloadRequest = buildDownloadRequest();
+      if (downloadRequest.streamKeys.isEmpty()) {
+        // All tracks were deselected in the dialog. Don't start the download.
+        return;
+      }
+      startDownload(downloadRequest);
     }
 
     // DialogInterface.OnDismissListener implementation.
@@ -254,9 +259,16 @@ public class DownloadTracker {
     // Internal methods.
 
     private void startDownload() {
-      DownloadRequest downloadRequest = downloadHelper.getDownloadRequest(Util.getUtf8Bytes(name));
+      startDownload(buildDownloadRequest());
+    }
+
+    private void startDownload(DownloadRequest downloadRequest) {
       DownloadService.startWithNewDownload(
           context, DemoDownloadService.class, downloadRequest, /* foreground= */ false);
     }
+
+    private DownloadRequest buildDownloadRequest() {
+      return downloadHelper.getDownloadRequest(Util.getUtf8Bytes(name));
+    }
   }
 }

From afd72839dceeaad8e99940a0710181782ab51f03 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 17 Apr 2019 16:59:11 +0100
Subject: [PATCH 780/832] Disable cache span touching for offline

Currently SimpleCache will touch cache spans whenever it reads
from them. With legacy SimpleCache setups this involves a potentially
expensive file rename. With new SimpleCache setups it involves
a more efficient but still non-free database write.

For offline use cases, and more generally any use case where the
eviction policy doesn't use last access timestamps, touching is
not useful. This change allows the evictor to specify whether it
needs cache spans to be touched or not. SimpleCache will only touch
spans if the evictor requires it.

Note: There is a potential change in behavior in cases where a
cache uses an evictor that doesn't need cache spans to be touched,
but then later switches to an evictor that does. The new evictor
may temporarily make sub-optimal eviction decisions as a result.
I think this is a very fair trade-off, since this scenario is
unlikely to occur much, if at all, in practice, and even if it
does occur the result isn't that bad.
PiperOrigin-RevId: 244005682
---
 .../exoplayer2/upstream/cache/Cache.java      | 11 ++++----
 .../upstream/cache/CacheEvictor.java          |  7 +++++
 .../upstream/cache/CacheFileMetadata.java     |  6 ++--
 .../cache/CacheFileMetadataIndex.java         | 18 ++++++------
 .../exoplayer2/upstream/cache/CacheSpan.java  | 15 +++++-----
 .../upstream/cache/CachedContent.java         | 18 ++++++------
 .../cache/LeastRecentlyUsedCacheEvictor.java  | 11 ++++++--
 .../upstream/cache/NoOpCacheEvictor.java      |  5 ++++
 .../upstream/cache/SimpleCache.java           | 27 ++++++++++--------
 .../upstream/cache/SimpleCacheSpan.java       | 28 +++++++++----------
 .../cache/CachedContentIndexTest.java         |  4 +--
 .../cache/CachedRegionTrackerTest.java        |  4 +--
 .../upstream/cache/SimpleCacheSpanTest.java   | 21 ++++++--------
 13 files changed, 96 insertions(+), 79 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
index 91349e9284..12905f908c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
@@ -49,19 +49,18 @@ public interface Cache {
     void onSpanRemoved(Cache cache, CacheSpan span);
 
     /**
-     * Called when an existing {@link CacheSpan} is accessed, causing it to be replaced. The new
+     * Called when an existing {@link CacheSpan} is touched, causing it to be replaced. The new
      * {@link CacheSpan} is guaranteed to represent the same data as the one it replaces, however
-     * {@link CacheSpan#file} and {@link CacheSpan#lastAccessTimestamp} may have changed.
-     * <p>
-     * Note that for span replacement, {@link #onSpanAdded(Cache, CacheSpan)} and
-     * {@link #onSpanRemoved(Cache, CacheSpan)} are not called in addition to this method.
+     * {@link CacheSpan#file} and {@link CacheSpan#lastTouchTimestamp} may have changed.
+     *
+     * <p>Note that for span replacement, {@link #onSpanAdded(Cache, CacheSpan)} and {@link
+     * #onSpanRemoved(Cache, CacheSpan)} are not called in addition to this method.
      *
      * @param cache The source of the event.
      * @param oldSpan The old {@link CacheSpan}, which has been removed from the cache.
      * @param newSpan The new {@link CacheSpan}, which has been added to the cache.
      */
     void onSpanTouched(Cache cache, CacheSpan oldSpan, CacheSpan newSpan);
-
   }
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheEvictor.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheEvictor.java
index dbec4b78fc..6ebfe01df4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheEvictor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheEvictor.java
@@ -23,6 +23,13 @@ import com.google.android.exoplayer2.C;
  */
 public interface CacheEvictor extends Cache.Listener {
 
+  /**
+   * Returns whether the evictor requires the {@link Cache} to touch {@link CacheSpan CacheSpans}
+   * when it accesses them. Implementations that do not use {@link CacheSpan#lastTouchTimestamp}
+   * should return {@code false}.
+   */
+  boolean requiresCacheSpanTouches();
+
   /**
    * Called when cache has been initialized.
    */
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadata.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadata.java
index 492b98a0de..7ac80325a5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadata.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadata.java
@@ -19,10 +19,10 @@ package com.google.android.exoplayer2.upstream.cache;
 /* package */ final class CacheFileMetadata {
 
   public final long length;
-  public final long lastAccessTimestamp;
+  public final long lastTouchTimestamp;
 
-  public CacheFileMetadata(long length, long lastAccessTimestamp) {
+  public CacheFileMetadata(long length, long lastTouchTimestamp) {
     this.length = length;
-    this.lastAccessTimestamp = lastAccessTimestamp;
+    this.lastTouchTimestamp = lastTouchTimestamp;
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
index 084c02b11b..027172e090 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
@@ -36,17 +36,17 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
   private static final String COLUMN_NAME = "name";
   private static final String COLUMN_LENGTH = "length";
-  private static final String COLUMN_LAST_ACCESS_TIMESTAMP = "last_access_timestamp";
+  private static final String COLUMN_LAST_TOUCH_TIMESTAMP = "last_touch_timestamp";
 
   private static final int COLUMN_INDEX_NAME = 0;
   private static final int COLUMN_INDEX_LENGTH = 1;
-  private static final int COLUMN_INDEX_LAST_ACCESS_TIMESTAMP = 2;
+  private static final int COLUMN_INDEX_LAST_TOUCH_TIMESTAMP = 2;
 
   private static final String WHERE_NAME_EQUALS = COLUMN_INDEX_NAME + " = ?";
 
   private static final String[] COLUMNS =
       new String[] {
-        COLUMN_NAME, COLUMN_LENGTH, COLUMN_LAST_ACCESS_TIMESTAMP,
+        COLUMN_NAME, COLUMN_LENGTH, COLUMN_LAST_TOUCH_TIMESTAMP,
       };
   private static final String TABLE_SCHEMA =
       "("
@@ -54,7 +54,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
           + " TEXT PRIMARY KEY NOT NULL,"
           + COLUMN_LENGTH
           + " INTEGER NOT NULL,"
-          + COLUMN_LAST_ACCESS_TIMESTAMP
+          + COLUMN_LAST_TOUCH_TIMESTAMP
           + " INTEGER NOT NULL)";
 
   private final DatabaseProvider databaseProvider;
@@ -141,8 +141,8 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
       while (cursor.moveToNext()) {
         String name = cursor.getString(COLUMN_INDEX_NAME);
         long length = cursor.getLong(COLUMN_INDEX_LENGTH);
-        long lastAccessTimestamp = cursor.getLong(COLUMN_INDEX_LAST_ACCESS_TIMESTAMP);
-        fileMetadata.put(name, new CacheFileMetadata(length, lastAccessTimestamp));
+        long lastTouchTimestamp = cursor.getLong(COLUMN_INDEX_LAST_TOUCH_TIMESTAMP);
+        fileMetadata.put(name, new CacheFileMetadata(length, lastTouchTimestamp));
       }
       return fileMetadata;
     } catch (SQLException e) {
@@ -155,17 +155,17 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
    *
    * @param name The name of the file.
    * @param length The file length.
-   * @param lastAccessTimestamp The file last access timestamp.
+   * @param lastTouchTimestamp The file last touch timestamp.
    * @throws DatabaseIOException If an error occurs setting the metadata.
    */
-  public void set(String name, long length, long lastAccessTimestamp) throws DatabaseIOException {
+  public void set(String name, long length, long lastTouchTimestamp) throws DatabaseIOException {
     Assertions.checkNotNull(tableName);
     try {
       SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
       ContentValues values = new ContentValues();
       values.put(COLUMN_NAME, name);
       values.put(COLUMN_LENGTH, length);
-      values.put(COLUMN_LAST_ACCESS_TIMESTAMP, lastAccessTimestamp);
+      values.put(COLUMN_LAST_TOUCH_TIMESTAMP, lastTouchTimestamp);
       writableDatabase.replaceOrThrow(tableName, /* nullColumnHack= */ null, values);
     } catch (SQLException e) {
       throw new DatabaseIOException(e);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java
index 7dbcd4a922..1e8cf1517d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java
@@ -45,13 +45,12 @@ public class CacheSpan implements Comparable<CacheSpan> {
    * The file corresponding to this {@link CacheSpan}, or null if {@link #isCached} is false.
    */
   public final @Nullable File file;
-  /**
-   * The last access timestamp, or {@link C#TIME_UNSET} if {@link #isCached} is false.
-   */
-  public final long lastAccessTimestamp;
+  /** The last touch timestamp, or {@link C#TIME_UNSET} if {@link #isCached} is false. */
+  public final long lastTouchTimestamp;
 
   /**
-   * Creates a hole CacheSpan which isn't cached, has no last access time and no file associated.
+   * Creates a hole CacheSpan which isn't cached, has no last touch timestamp and no file
+   * associated.
    *
    * @param key The cache key that uniquely identifies the original stream.
    * @param position The position of the {@link CacheSpan} in the original stream.
@@ -69,18 +68,18 @@ public class CacheSpan implements Comparable<CacheSpan> {
    * @param position The position of the {@link CacheSpan} in the original stream.
    * @param length The length of the {@link CacheSpan}, or {@link C#LENGTH_UNSET} if this is an
    *     open-ended hole.
-   * @param lastAccessTimestamp The last access timestamp, or {@link C#TIME_UNSET} if {@link
+   * @param lastTouchTimestamp The last touch timestamp, or {@link C#TIME_UNSET} if {@link
    *     #isCached} is false.
    * @param file The file corresponding to this {@link CacheSpan}, or null if it's a hole.
    */
   public CacheSpan(
-      String key, long position, long length, long lastAccessTimestamp, @Nullable File file) {
+      String key, long position, long length, long lastTouchTimestamp, @Nullable File file) {
     this.key = key;
     this.position = position;
     this.length = length;
     this.isCached = file != null;
     this.file = file;
-    this.lastAccessTimestamp = lastAccessTimestamp;
+    this.lastTouchTimestamp = lastTouchTimestamp;
   }
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java
index e244163bc8..7abb9b3896 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java
@@ -141,30 +141,30 @@ import java.util.TreeSet;
   }
 
   /**
-   * Sets the given span's last access timestamp. The passed span becomes invalid after this call.
+   * Sets the given span's last touch timestamp. The passed span becomes invalid after this call.
    *
    * @param cacheSpan Span to be copied and updated.
-   * @param lastAccessTimestamp The new last access timestamp.
+   * @param lastTouchTimestamp The new last touch timestamp.
    * @param updateFile Whether the span file should be renamed to have its timestamp match the new
-   *     last access time.
-   * @return A span with the updated last access timestamp.
+   *     last touch time.
+   * @return A span with the updated last touch timestamp.
    */
-  public SimpleCacheSpan setLastAccessTimestamp(
-      SimpleCacheSpan cacheSpan, long lastAccessTimestamp, boolean updateFile) {
+  public SimpleCacheSpan setLastTouchTimestamp(
+      SimpleCacheSpan cacheSpan, long lastTouchTimestamp, boolean updateFile) {
     Assertions.checkState(cachedSpans.remove(cacheSpan));
     File file = cacheSpan.file;
     if (updateFile) {
       File directory = file.getParentFile();
       long position = cacheSpan.position;
-      File newFile = SimpleCacheSpan.getCacheFile(directory, id, position, lastAccessTimestamp);
+      File newFile = SimpleCacheSpan.getCacheFile(directory, id, position, lastTouchTimestamp);
       if (file.renameTo(newFile)) {
         file = newFile;
       } else {
-        Log.w(TAG, "Failed to rename " + file + " to " + newFile + ".");
+        Log.w(TAG, "Failed to rename " + file + " to " + newFile);
       }
     }
     SimpleCacheSpan newCacheSpan =
-        cacheSpan.copyWithFileAndLastAccessTimestamp(file, lastAccessTimestamp);
+        cacheSpan.copyWithFileAndLastTouchTimestamp(file, lastTouchTimestamp);
     cachedSpans.add(newCacheSpan);
     return newCacheSpan;
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictor.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictor.java
index aa40c1d2fd..44a735f144 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictor.java
@@ -35,6 +35,11 @@ public final class LeastRecentlyUsedCacheEvictor implements CacheEvictor, Compar
     this.leastRecentlyUsed = new TreeSet<>(this);
   }
 
+  @Override
+  public boolean requiresCacheSpanTouches() {
+    return true;
+  }
+
   @Override
   public void onCacheInitialized() {
     // Do nothing.
@@ -68,12 +73,12 @@ public final class LeastRecentlyUsedCacheEvictor implements CacheEvictor, Compar
 
   @Override
   public int compare(CacheSpan lhs, CacheSpan rhs) {
-    long lastAccessTimestampDelta = lhs.lastAccessTimestamp - rhs.lastAccessTimestamp;
-    if (lastAccessTimestampDelta == 0) {
+    long lastTouchTimestampDelta = lhs.lastTouchTimestamp - rhs.lastTouchTimestamp;
+    if (lastTouchTimestampDelta == 0) {
       // Use the standard compareTo method as a tie-break.
       return lhs.compareTo(rhs);
     }
-    return lhs.lastAccessTimestamp < rhs.lastAccessTimestamp ? -1 : 1;
+    return lhs.lastTouchTimestamp < rhs.lastTouchTimestamp ? -1 : 1;
   }
 
   private void evictCache(Cache cache, long requiredSpace) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/NoOpCacheEvictor.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/NoOpCacheEvictor.java
index b0c8c7e087..da89dc1cb3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/NoOpCacheEvictor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/NoOpCacheEvictor.java
@@ -24,6 +24,11 @@ package com.google.android.exoplayer2.upstream.cache;
  */
 public final class NoOpCacheEvictor implements CacheEvictor {
 
+  @Override
+  public boolean requiresCacheSpanTouches() {
+    return false;
+  }
+
   @Override
   public void onCacheInitialized() {
     // Do nothing.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index 14f659855b..b31d3b66f3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -70,6 +70,7 @@ public final class SimpleCache implements Cache {
   @Nullable private final CacheFileMetadataIndex fileIndex;
   private final HashMap<String, ArrayList<Listener>> listeners;
   private final Random random;
+  private final boolean touchCacheSpans;
 
   private long uid;
   private long totalSpace;
@@ -279,6 +280,7 @@ public final class SimpleCache implements Cache {
     this.fileIndex = fileIndex;
     listeners = new HashMap<>();
     random = new Random();
+    touchCacheSpans = evictor.requiresCacheSpanTouches();
     uid = UID_UNSET;
 
     // Start cache initialization.
@@ -408,23 +410,26 @@ public final class SimpleCache implements Cache {
 
     // Read case.
     if (span.isCached) {
+      if (!touchCacheSpans) {
+        return span;
+      }
       String fileName = Assertions.checkNotNull(span.file).getName();
       long length = span.length;
-      long lastAccessTimestamp = System.currentTimeMillis();
+      long lastTouchTimestamp = System.currentTimeMillis();
       boolean updateFile = false;
       if (fileIndex != null) {
         try {
-          fileIndex.set(fileName, length, lastAccessTimestamp);
+          fileIndex.set(fileName, length, lastTouchTimestamp);
         } catch (IOException e) {
-          throw new CacheException(e);
+          Log.w(TAG, "Failed to update index with new touch timestamp.");
         }
       } else {
-        // Updating the file itself to incorporate the new last access timestamp is much slower than
+        // Updating the file itself to incorporate the new last touch timestamp is much slower than
         // updating the file index. Hence we only update the file if we don't have a file index.
         updateFile = true;
       }
       SimpleCacheSpan newSpan =
-          contentIndex.get(key).setLastAccessTimestamp(span, lastAccessTimestamp, updateFile);
+          contentIndex.get(key).setLastTouchTimestamp(span, lastTouchTimestamp, updateFile);
       notifySpanTouched(span, newSpan);
       return newSpan;
     }
@@ -459,8 +464,8 @@ public final class SimpleCache implements Cache {
     if (!fileDir.exists()) {
       fileDir.mkdir();
     }
-    long lastAccessTimestamp = System.currentTimeMillis();
-    return SimpleCacheSpan.getCacheFile(fileDir, cachedContent.id, position, lastAccessTimestamp);
+    long lastTouchTimestamp = System.currentTimeMillis();
+    return SimpleCacheSpan.getCacheFile(fileDir, cachedContent.id, position, lastTouchTimestamp);
   }
 
   @Override
@@ -488,7 +493,7 @@ public final class SimpleCache implements Cache {
     if (fileIndex != null) {
       String fileName = file.getName();
       try {
-        fileIndex.set(fileName, span.length, span.lastAccessTimestamp);
+        fileIndex.set(fileName, span.length, span.lastTouchTimestamp);
       } catch (IOException e) {
         throw new CacheException(e);
       }
@@ -674,14 +679,14 @@ public final class SimpleCache implements Cache {
           continue;
         }
         long length = C.LENGTH_UNSET;
-        long lastAccessTimestamp = C.TIME_UNSET;
+        long lastTouchTimestamp = C.TIME_UNSET;
         CacheFileMetadata metadata = fileMetadata != null ? fileMetadata.remove(fileName) : null;
         if (metadata != null) {
           length = metadata.length;
-          lastAccessTimestamp = metadata.lastAccessTimestamp;
+          lastTouchTimestamp = metadata.lastTouchTimestamp;
         }
         SimpleCacheSpan span =
-            SimpleCacheSpan.createCacheEntry(file, length, lastAccessTimestamp, contentIndex);
+            SimpleCacheSpan.createCacheEntry(file, length, lastTouchTimestamp, contentIndex);
         if (span != null) {
           addSpan(span);
         } else {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
index 7235830019..7d9f0c9ff1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
@@ -96,7 +96,7 @@ import java.util.regex.Pattern;
    */
   @Nullable
   public static SimpleCacheSpan createCacheEntry(File file, long length, CachedContentIndex index) {
-    return createCacheEntry(file, length, /* lastAccessTimestamp= */ C.TIME_UNSET, index);
+    return createCacheEntry(file, length, /* lastTouchTimestamp= */ C.TIME_UNSET, index);
   }
 
   /**
@@ -106,14 +106,14 @@ import java.util.regex.Pattern;
    * @param length The length of the cache file in bytes, or {@link C#LENGTH_UNSET} to query the
    *     underlying file system. Querying the underlying file system can be expensive, so callers
    *     that already know the length of the file should pass it explicitly.
-   * @param lastAccessTimestamp The last access timestamp, or {@link C#TIME_UNSET} to use the file
+   * @param lastTouchTimestamp The last touch timestamp, or {@link C#TIME_UNSET} to use the file
    *     timestamp.
    * @return The span, or null if the file name is not correctly formatted, or if the id is not
    *     present in the content index, or if the length is 0.
    */
   @Nullable
   public static SimpleCacheSpan createCacheEntry(
-      File file, long length, long lastAccessTimestamp, CachedContentIndex index) {
+      File file, long length, long lastTouchTimestamp, CachedContentIndex index) {
     String name = file.getName();
     if (!name.endsWith(SUFFIX)) {
       file = upgradeFile(file, index);
@@ -142,10 +142,10 @@ import java.util.regex.Pattern;
     }
 
     long position = Long.parseLong(matcher.group(2));
-    if (lastAccessTimestamp == C.TIME_UNSET) {
-      lastAccessTimestamp = Long.parseLong(matcher.group(3));
+    if (lastTouchTimestamp == C.TIME_UNSET) {
+      lastTouchTimestamp = Long.parseLong(matcher.group(3));
     }
-    return new SimpleCacheSpan(key, position, length, lastAccessTimestamp, file);
+    return new SimpleCacheSpan(key, position, length, lastTouchTimestamp, file);
   }
 
   /**
@@ -187,26 +187,26 @@ import java.util.regex.Pattern;
    * @param position The position of the {@link CacheSpan} in the original stream.
    * @param length The length of the {@link CacheSpan}, or {@link C#LENGTH_UNSET} if this is an
    *     open-ended hole.
-   * @param lastAccessTimestamp The last access timestamp, or {@link C#TIME_UNSET} if {@link
+   * @param lastTouchTimestamp The last touch timestamp, or {@link C#TIME_UNSET} if {@link
    *     #isCached} is false.
    * @param file The file corresponding to this {@link CacheSpan}, or null if it's a hole.
    */
   private SimpleCacheSpan(
-      String key, long position, long length, long lastAccessTimestamp, @Nullable File file) {
-    super(key, position, length, lastAccessTimestamp, file);
+      String key, long position, long length, long lastTouchTimestamp, @Nullable File file) {
+    super(key, position, length, lastTouchTimestamp, file);
   }
 
   /**
-   * Returns a copy of this CacheSpan with a new file and last access timestamp.
+   * Returns a copy of this CacheSpan with a new file and last touch timestamp.
    *
    * @param file The new file.
-   * @param lastAccessTimestamp The new last access time.
-   * @return A copy with the new file and last access timestamp.
+   * @param lastTouchTimestamp The new last touch time.
+   * @return A copy with the new file and last touch timestamp.
    * @throws IllegalStateException If called on a non-cached span (i.e. {@link #isCached} is false).
    */
-  public SimpleCacheSpan copyWithFileAndLastAccessTimestamp(File file, long lastAccessTimestamp) {
+  public SimpleCacheSpan copyWithFileAndLastTouchTimestamp(File file, long lastTouchTimestamp) {
     Assertions.checkState(isCached);
-    return new SimpleCacheSpan(key, position, length, lastAccessTimestamp, file);
+    return new SimpleCacheSpan(key, position, length, lastTouchTimestamp, file);
   }
 
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
index bebcf0ec12..cee5703ff8 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
@@ -108,7 +108,7 @@ public class CachedContentIndexTest {
             cachedContent1.id,
             /* offset= */ 10,
             cacheFileLength,
-            /* lastAccessTimestamp= */ 30);
+            /* lastTouchTimestamp= */ 30);
     SimpleCacheSpan span = SimpleCacheSpan.createCacheEntry(cacheSpanFile, cacheFileLength, index);
     assertThat(span).isNotNull();
     cachedContent1.addSpan(span);
@@ -293,7 +293,7 @@ public class CachedContentIndexTest {
             cachedContent.id,
             /* offset= */ 10,
             cacheFileLength,
-            /* lastAccessTimestamp= */ 30);
+            /* lastTouchTimestamp= */ 30);
     SimpleCacheSpan span = SimpleCacheSpan.createCacheEntry(cacheFile, cacheFileLength, index);
     cachedContent.addSpan(span);
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java
index 5efdf36191..b00ee73f0f 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java
@@ -134,8 +134,8 @@ public final class CachedRegionTrackerTest {
   }
 
   public static File createCacheSpanFile(
-      File cacheDir, int id, long offset, int length, long lastAccessTimestamp) throws IOException {
-    File cacheFile = SimpleCacheSpan.getCacheFile(cacheDir, id, offset, lastAccessTimestamp);
+      File cacheDir, int id, long offset, int length, long lastTouchTimestamp) throws IOException {
+    File cacheFile = SimpleCacheSpan.getCacheFile(cacheDir, id, offset, lastTouchTimestamp);
     createTestFile(cacheFile, length);
     return cacheFile;
   }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java
index 028937dc5a..39be9fbcd8 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java
@@ -38,9 +38,8 @@ import org.junit.runner.RunWith;
 public class SimpleCacheSpanTest {
 
   public static File createCacheSpanFile(
-      File cacheDir, int id, long offset, long length, long lastAccessTimestamp)
-      throws IOException {
-    File cacheFile = SimpleCacheSpan.getCacheFile(cacheDir, id, offset, lastAccessTimestamp);
+      File cacheDir, int id, long offset, long length, long lastTouchTimestamp) throws IOException {
+    File cacheFile = SimpleCacheSpan.getCacheFile(cacheDir, id, offset, lastTouchTimestamp);
     createTestFile(cacheFile, length);
     return cacheFile;
   }
@@ -117,7 +116,7 @@ public class SimpleCacheSpanTest {
       SimpleCacheSpan cacheSpan = SimpleCacheSpan.createCacheEntry(file, file.length(), index);
       if (cacheSpan != null) {
         assertThat(cacheSpan.key).isEqualTo(key);
-        cachedPositions.put(cacheSpan.position, cacheSpan.lastAccessTimestamp);
+        cachedPositions.put(cacheSpan.position, cacheSpan.lastTouchTimestamp);
       }
     }
 
@@ -140,12 +139,11 @@ public class SimpleCacheSpanTest {
     return file;
   }
 
-  private void assertCacheSpan(String key, long offset, long lastAccessTimestamp)
+  private void assertCacheSpan(String key, long offset, long lastTouchTimestamp)
       throws IOException {
     int id = index.assignIdForKey(key);
     long cacheFileLength = 1;
-    File cacheFile =
-        createCacheSpanFile(cacheDir, id, offset, cacheFileLength, lastAccessTimestamp);
+    File cacheFile = createCacheSpanFile(cacheDir, id, offset, cacheFileLength, lastTouchTimestamp);
     SimpleCacheSpan cacheSpan = SimpleCacheSpan.createCacheEntry(cacheFile, cacheFileLength, index);
     String message = cacheFile.toString();
     assertWithMessage(message).that(cacheSpan).isNotNull();
@@ -155,14 +153,13 @@ public class SimpleCacheSpanTest {
     assertWithMessage(message).that(cacheSpan.length).isEqualTo(1);
     assertWithMessage(message).that(cacheSpan.isCached).isTrue();
     assertWithMessage(message).that(cacheSpan.file).isEqualTo(cacheFile);
-    assertWithMessage(message).that(cacheSpan.lastAccessTimestamp).isEqualTo(lastAccessTimestamp);
+    assertWithMessage(message).that(cacheSpan.lastTouchTimestamp).isEqualTo(lastTouchTimestamp);
   }
 
-  private void assertNullCacheSpan(File parent, String key, long offset,
-      long lastAccessTimestamp) {
+  private void assertNullCacheSpan(File parent, String key, long offset, long lastTouchTimestamp) {
     long cacheFileLength = 0;
-    File cacheFile = SimpleCacheSpan.getCacheFile(parent, index.assignIdForKey(key), offset,
-        lastAccessTimestamp);
+    File cacheFile =
+        SimpleCacheSpan.getCacheFile(parent, index.assignIdForKey(key), offset, lastTouchTimestamp);
     CacheSpan cacheSpan = SimpleCacheSpan.createCacheEntry(cacheFile, cacheFileLength, index);
     assertWithMessage(cacheFile.toString()).that(cacheSpan).isNull();
   }

From 289a8ffe4ced9050e8ef3fedd0955c213a3ce99d Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 17 Apr 2019 17:20:18 +0100
Subject: [PATCH 781/832] Small javadoc fix for DownloadManager constructors

PiperOrigin-RevId: 244009343
---
 .../google/android/exoplayer2/offline/DownloadManager.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index fdb3ca1840..915f375027 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -186,7 +186,7 @@ public final class DownloadManager {
    * Constructs a {@link DownloadManager}.
    *
    * @param context Any context.
-   * @param databaseProvider Provides the {@link DownloadIndex} that holds the downloads.
+   * @param databaseProvider Provides the database that holds the downloads.
    * @param downloaderFactory A factory for creating {@link Downloader}s.
    */
   public DownloadManager(
@@ -204,7 +204,7 @@ public final class DownloadManager {
    * Constructs a {@link DownloadManager}.
    *
    * @param context Any context.
-   * @param databaseProvider Provides the {@link DownloadIndex} that holds the downloads.
+   * @param databaseProvider Provides the database that holds the downloads.
    * @param downloaderFactory A factory for creating {@link Downloader}s.
    * @param maxSimultaneousDownloads The maximum number of simultaneous downloads.
    * @param minRetryCount The minimum number of times a download must be retried before failing.

From 0748566482161e12d18e85751b2fea39fcdad37d Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 17 Apr 2019 20:45:03 +0100
Subject: [PATCH 782/832] Remove TODOs we're not going to do

1. customCacheKey for DASH/HLS/SS is now asserted against
   in DownloadRequest
2. Merging of event delivery in DownloadManager is very
   tricky to get right and probably not a good idea

PiperOrigin-RevId: 244048392
---
 .../android/exoplayer2/offline/DefaultDownloaderFactory.java    | 1 -
 .../com/google/android/exoplayer2/offline/DownloadManager.java  | 2 --
 2 files changed, 3 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java
index 9a4e5925ee..ca20c769dc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java
@@ -98,7 +98,6 @@ public class DefaultDownloaderFactory implements DownloaderFactory {
       throw new IllegalStateException("Module missing for: " + request.type);
     }
     try {
-      // TODO: Support customCacheKey in DASH/HLS/SS, for completeness.
       return constructor.newInstance(request.uri, request.streamKeys, downloaderConstructorHelper);
     } catch (Exception e) {
       throw new RuntimeException("Failed to instantiate downloader for: " + request.type, e);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 915f375027..df958f8691 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -485,8 +485,6 @@ public final class DownloadManager {
     return true;
   }
 
-  // TODO: Merge these three events into a single MSG_STATE_CHANGE that can carry all updates. This
-  // allows updating idle at the same point as the downloads that can be queried changes.
   private void onInitialized(List<Download> downloads) {
     initialized = true;
     this.downloads.addAll(downloads);

From 898bfbff6c9cf677e6c4d83205d31557608d98d9 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 18 Apr 2019 00:58:44 +0100
Subject: [PATCH 783/832] [libvpx] permalaunch number of buffers.

PiperOrigin-RevId: 244094942
---
 .../android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
index 952e15aad6..d5da9a011d 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
@@ -221,8 +221,8 @@ public class LibvpxVideoRenderer extends BaseRenderer {
         disableLoopFilter,
         /* enableRowMultiThreadMode= */ false,
         getRuntime().availableProcessors(),
-        /* numInputBuffers= */ 8,
-        /* numOutputBuffers= */ 8);
+        /* numInputBuffers= */ 4,
+        /* numOutputBuffers= */ 4);
   }
 
   /**

From c2bbf38ee8798246a0060897712a79154437d392 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 18 Apr 2019 08:35:07 +0100
Subject: [PATCH 784/832] Extend Bluetooth dead audio track workaround to Q

PiperOrigin-RevId: 244139959
---
 .../android/exoplayer2/audio/AudioTrackPositionTracker.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java
index 2ce9b8bdbe..e87e49d2da 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java
@@ -517,7 +517,7 @@ import java.lang.reflect.Method;
       rawPlaybackHeadPosition += passthroughWorkaroundPauseOffset;
     }
 
-    if (Util.SDK_INT <= 28) {
+    if (Util.SDK_INT <= 29) {
       if (rawPlaybackHeadPosition == 0
           && lastRawPlaybackHeadPosition > 0
           && state == PLAYSTATE_PLAYING) {

From be0acc3621759a5c900f19185bfda34931ba55e3 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 18 Apr 2019 13:17:04 +0100
Subject: [PATCH 785/832] Add test for HlsTrackMetadataEntry population in the
 HlsPlaylistParser

PiperOrigin-RevId: 244168713
---
 .../playlist/HlsMasterPlaylistParserTest.java | 103 ++++++++++++++++++
 1 file changed, 103 insertions(+)

diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
index 97d330cdaa..095739271e 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
@@ -23,10 +23,14 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ParserException;
+import com.google.android.exoplayer2.metadata.Metadata;
+import com.google.android.exoplayer2.source.hls.HlsTrackMetadataEntry;
 import com.google.android.exoplayer2.util.MimeTypes;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -146,6 +150,50 @@ public class HlsMasterPlaylistParserTest {
           + "#EXT-X-STREAM-INF:BANDWIDTH=65000,CODECS=\"{$codecs}\"\n"
           + "http://example.com/{$tricky}\n";
 
+  private static final String PLAYLIST_WITH_MATCHING_STREAM_INF_URLS =
+      "#EXTM3U\n"
+          + "#EXT-X-VERSION:6\n"
+          + "\n"
+          + "#EXT-X-STREAM-INF:BANDWIDTH=2227464,"
+          + "CLOSED-CAPTIONS=\"cc1\",AUDIO=\"aud1\",SUBTITLES=\"sub1\"\n"
+          + "v5/prog_index.m3u8\n"
+          + "#EXT-X-STREAM-INF:BANDWIDTH=6453202,"
+          + "CLOSED-CAPTIONS=\"cc1\",AUDIO=\"aud1\",SUBTITLES=\"sub1\"\n"
+          + "v8/prog_index.m3u8\n"
+          + "#EXT-X-STREAM-INF:BANDWIDTH=5054232,"
+          + "CLOSED-CAPTIONS=\"cc1\",AUDIO=\"aud1\",SUBTITLES=\"sub1\"\n"
+          + "v7/prog_index.m3u8\n"
+          + "\n"
+          + "#EXT-X-STREAM-INF:BANDWIDTH=2448841,"
+          + "CLOSED-CAPTIONS=\"cc1\",AUDIO=\"aud2\",SUBTITLES=\"sub1\"\n"
+          + "v5/prog_index.m3u8\n"
+          + "#EXT-X-STREAM-INF:BANDWIDTH=8399417,"
+          + "CLOSED-CAPTIONS=\"cc1\",AUDIO=\"aud2\",SUBTITLES=\"sub1\"\n"
+          + "v9/prog_index.m3u8\n"
+          + "#EXT-X-STREAM-INF:BANDWIDTH=5275609,"
+          + "CLOSED-CAPTIONS=\"cc1\",AUDIO=\"aud2\",SUBTITLES=\"sub1\"\n"
+          + "v7/prog_index.m3u8\n"
+          + "\n"
+          + "#EXT-X-STREAM-INF:BANDWIDTH=2256841,"
+          + "CLOSED-CAPTIONS=\"cc1\",AUDIO=\"aud3\",SUBTITLES=\"sub1\"\n"
+          + "v5/prog_index.m3u8\n"
+          + "#EXT-X-STREAM-INF:BANDWIDTH=8207417,"
+          + "CLOSED-CAPTIONS=\"cc1\",AUDIO=\"aud3\",SUBTITLES=\"sub1\"\n"
+          + "v9/prog_index.m3u8\n"
+          + "#EXT-X-STREAM-INF:BANDWIDTH=6482579,"
+          + "CLOSED-CAPTIONS=\"cc1\",AUDIO=\"aud3\",SUBTITLES=\"sub1\"\n"
+          + "v8/prog_index.m3u8\n"
+          + "\n"
+          + "#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"aud1\",NAME=\"English\",URI=\"a1/index.m3u8\"\n"
+          + "#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"aud2\",NAME=\"English\",URI=\"a2/index.m3u8\"\n"
+          + "#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"aud3\",NAME=\"English\",URI=\"a3/index.m3u8\"\n"
+          + "\n"
+          + "#EXT-X-MEDIA:TYPE=CLOSED-CAPTIONS,"
+          + "GROUP-ID=\"cc1\",NAME=\"English\",INSTREAM-ID=\"CC1\"\n"
+          + "\n"
+          + "#EXT-X-MEDIA:TYPE=SUBTITLES,"
+          + "GROUP-ID=\"sub1\",NAME=\"English\",URI=\"s1/en/prog_index.m3u8\"\n";
+
   @Test
   public void testParseMasterPlaylist() throws IOException {
     HlsMasterPlaylist masterPlaylist = parseMasterPlaylist(PLAYLIST_URI, PLAYLIST_SIMPLE);
@@ -296,6 +344,61 @@ public class HlsMasterPlaylistParserTest {
         .isEqualTo(Uri.parse("http://example.com/This/{$nested}/reference/shouldnt/work"));
   }
 
+  @Test
+  public void testHlsMetadata() throws IOException {
+    HlsMasterPlaylist playlist =
+        parseMasterPlaylist(PLAYLIST_URI, PLAYLIST_WITH_MATCHING_STREAM_INF_URLS);
+    assertThat(playlist.variants).hasSize(4);
+    assertThat(playlist.variants.get(0).format.metadata)
+        .isEqualTo(
+            createExtXStreamInfMetadata(
+                createVariantInfo(/* bitrate= */ 2227464, /* audioGroupId= */ "aud1"),
+                createVariantInfo(/* bitrate= */ 2448841, /* audioGroupId= */ "aud2"),
+                createVariantInfo(/* bitrate= */ 2256841, /* audioGroupId= */ "aud3")));
+    assertThat(playlist.variants.get(1).format.metadata)
+        .isEqualTo(
+            createExtXStreamInfMetadata(
+                createVariantInfo(/* bitrate= */ 6453202, /* audioGroupId= */ "aud1"),
+                createVariantInfo(/* bitrate= */ 6482579, /* audioGroupId= */ "aud3")));
+    assertThat(playlist.variants.get(2).format.metadata)
+        .isEqualTo(
+            createExtXStreamInfMetadata(
+                createVariantInfo(/* bitrate= */ 5054232, /* audioGroupId= */ "aud1"),
+                createVariantInfo(/* bitrate= */ 5275609, /* audioGroupId= */ "aud2")));
+    assertThat(playlist.variants.get(3).format.metadata)
+        .isEqualTo(
+            createExtXStreamInfMetadata(
+                createVariantInfo(/* bitrate= */ 8399417, /* audioGroupId= */ "aud2"),
+                createVariantInfo(/* bitrate= */ 8207417, /* audioGroupId= */ "aud3")));
+
+    assertThat(playlist.audios).hasSize(3);
+    assertThat(playlist.audios.get(0).format.metadata)
+        .isEqualTo(createExtXMediaMetadata(/* groupId= */ "aud1", /* name= */ "English"));
+    assertThat(playlist.audios.get(1).format.metadata)
+        .isEqualTo(createExtXMediaMetadata(/* groupId= */ "aud2", /* name= */ "English"));
+    assertThat(playlist.audios.get(2).format.metadata)
+        .isEqualTo(createExtXMediaMetadata(/* groupId= */ "aud3", /* name= */ "English"));
+  }
+
+  private static Metadata createExtXStreamInfMetadata(HlsTrackMetadataEntry.VariantInfo... infos) {
+    return new Metadata(
+        new HlsTrackMetadataEntry(/* groupId= */ null, /* name= */ null, Arrays.asList(infos)));
+  }
+
+  private static Metadata createExtXMediaMetadata(String groupId, String name) {
+    return new Metadata(new HlsTrackMetadataEntry(groupId, name, Collections.emptyList()));
+  }
+
+  private static HlsTrackMetadataEntry.VariantInfo createVariantInfo(
+      long bitrate, String audioGroupId) {
+    return new HlsTrackMetadataEntry.VariantInfo(
+        bitrate,
+        /* videoGroupId= */ null,
+        audioGroupId,
+        /* subtitleGroupId= */ "sub1",
+        /* captionGroupId= */ "cc1");
+  }
+
   private static HlsMasterPlaylist parseMasterPlaylist(String uri, String playlistString)
       throws IOException {
     Uri playlistUri = Uri.parse(uri);

From a501f8c2452eafafb4c792179fc342a71e3bcc03 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Thu, 18 Apr 2019 13:34:52 +0100
Subject: [PATCH 786/832] Fix flaky DownloadManagerDashTest

PiperOrigin-RevId: 244170179
---
 .../offline/DownloadManagerTest.java          |  2 +-
 .../dash/offline/DownloadManagerDashTest.java | 41 +++++++++++--------
 .../testutil/TestDownloadManagerListener.java |  9 +++-
 3 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index f23248952c..140347bd91 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -552,7 +552,7 @@ public class DownloadManagerTest {
     }
   }
 
-  private void runOnMainThread(final TestRunnable r) {
+  private void runOnMainThread(TestRunnable r) {
     dummyMainThread.runTestOnMainThread(r);
   }
 
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
index 76356cf3a8..0dce24bf1d 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
@@ -34,6 +34,7 @@ import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.testutil.DummyMainThread;
+import com.google.android.exoplayer2.testutil.DummyMainThread.TestRunnable;
 import com.google.android.exoplayer2.testutil.FakeDataSet;
 import com.google.android.exoplayer2.testutil.FakeDataSource;
 import com.google.android.exoplayer2.testutil.RobolectricUtil;
@@ -100,8 +101,8 @@ public class DownloadManagerDashTest {
   }
 
   @After
-  public void tearDown() throws Exception {
-    downloadManager.release();
+  public void tearDown() {
+    runOnMainThread(() -> downloadManager.release());
     Util.recursiveDelete(tempFolder);
     dummyMainThread.release();
   }
@@ -129,10 +130,11 @@ public class DownloadManagerDashTest {
 
     // Run DM accessing code on UI/main thread as it should be. Also not to block handling of loaded
     // actions.
-    dummyMainThread.runOnMainThread(
+    runOnMainThread(
         () -> {
           // Setup an Action and immediately release the DM.
-          handleDownloadRequest(fakeStreamKey1, fakeStreamKey2);
+          DownloadRequest request = getDownloadRequest(fakeStreamKey1, fakeStreamKey2);
+          downloadManager.addDownload(request);
           downloadManager.release();
         });
 
@@ -229,25 +231,28 @@ public class DownloadManagerDashTest {
   }
 
   private void handleDownloadRequest(StreamKey... keys) {
+    DownloadRequest request = getDownloadRequest(keys);
+    runOnMainThread(() -> downloadManager.addDownload(request));
+  }
+
+  private DownloadRequest getDownloadRequest(StreamKey... keys) {
     ArrayList<StreamKey> keysList = new ArrayList<>();
     Collections.addAll(keysList, keys);
-    DownloadRequest action =
-        new DownloadRequest(
-            TEST_ID,
-            DownloadRequest.TYPE_DASH,
-            TEST_MPD_URI,
-            keysList,
-            /* customCacheKey= */ null,
-            null);
-    downloadManager.addDownload(action);
+    return new DownloadRequest(
+        TEST_ID,
+        DownloadRequest.TYPE_DASH,
+        TEST_MPD_URI,
+        keysList,
+        /* customCacheKey= */ null,
+        null);
   }
 
   private void handleRemoveAction() {
-    downloadManager.removeDownload(TEST_ID);
+    runOnMainThread(() -> downloadManager.removeDownload(TEST_ID));
   }
 
   private void createDownloadManager() {
-    dummyMainThread.runTestOnMainThread(
+    runOnMainThread(
         () -> {
           Factory fakeDataSourceFactory = new FakeDataSource.Factory().setFakeDataSet(fakeDataSet);
           downloadManager =
@@ -261,9 +266,13 @@ public class DownloadManagerDashTest {
                   new Requirements(0));
 
           downloadManagerListener =
-              new TestDownloadManagerListener(downloadManager, dummyMainThread);
+              new TestDownloadManagerListener(
+                  downloadManager, dummyMainThread, /* timeout= */ 3000);
           downloadManager.startDownloads();
         });
   }
 
+  private void runOnMainThread(TestRunnable r) {
+    dummyMainThread.runTestOnMainThread(r);
+  }
 }
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
index b74e539fd6..9d6223b8b1 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
@@ -40,14 +40,21 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
   private final DummyMainThread dummyMainThread;
   private final HashMap<String, ArrayBlockingQueue<Integer>> downloadStates;
   private final ConditionVariable initializedCondition;
+  private final int timeout;
 
   private CountDownLatch downloadFinishedCondition;
   @Download.FailureReason private int failureReason;
 
   public TestDownloadManagerListener(
       DownloadManager downloadManager, DummyMainThread dummyMainThread) {
+    this(downloadManager, dummyMainThread, TIMEOUT);
+  }
+
+  public TestDownloadManagerListener(
+      DownloadManager downloadManager, DummyMainThread dummyMainThread, int timeout) {
     this.downloadManager = downloadManager;
     this.dummyMainThread = dummyMainThread;
+    this.timeout = timeout;
     downloadStates = new HashMap<>();
     initializedCondition = new ConditionVariable();
     downloadManager.addListener(this);
@@ -110,7 +117,7 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
             downloadFinishedCondition.countDown();
           }
         });
-    assertThat(downloadFinishedCondition.await(TIMEOUT, TimeUnit.MILLISECONDS)).isTrue();
+    assertThat(downloadFinishedCondition.await(timeout, TimeUnit.MILLISECONDS)).isTrue();
   }
 
   private ArrayBlockingQueue<Integer> getStateQueue(String taskId) {

From b6337adc4724236ef6b1d033b01feeb563437777 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 18 Apr 2019 14:41:45 +0100
Subject: [PATCH 787/832] Avoid selecting a forced text track that doesn't
 match the audio selection

Assuming there is no text language preference.

PiperOrigin-RevId: 244176667
---
 RELEASENOTES.md                               |  4 +-
 .../trackselection/DefaultTrackSelector.java  | 44 +++++++++----------
 .../DefaultTrackSelectorTest.java             | 36 +++++++--------
 3 files changed, 40 insertions(+), 44 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 182701ec34..015b348f68 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -41,7 +41,7 @@
   * MP3: Fix ID3 frame unsychronization
     ([#5673](https://github.com/google/ExoPlayer/issues/5673)).
   * MP3: Fix playback of badly clipped files
-    ([#5772](https://github.com/google/ExoPlayer/issues/5772)).  
+    ([#5772](https://github.com/google/ExoPlayer/issues/5772)).
   * MPEG-TS: Enable HDMV DTS stream detection only if a flag is set. By default
     (i.e. if the flag is not set), the 0x82 elementary stream type is now
     treated as an SCTE subtitle track
@@ -52,6 +52,8 @@
   * Update `TrackSelection.Factory` interface to support creating all track
     selections together.
   * Allow to specify a selection reason for a `SelectionOverride`.
+  * When no text language preference matches, only select forced text tracks
+    whose language matches the selected audio language.
 * UI:
   * Update `DefaultTimeBar` based on duration of media and add parameter to set
     the minimum update interval to control the smoothness of the updates
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
index f25f1a979c..3200e40495 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -2070,29 +2070,25 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           boolean isForced = (maskedSelectionFlags & C.SELECTION_FLAG_FORCED) != 0;
           int trackScore;
           int languageScore = getFormatLanguageScore(format, params.preferredTextLanguage);
-          if (languageScore > 0
-              || (params.selectUndeterminedTextLanguage && formatHasNoLanguage(format))) {
+          boolean trackHasNoLanguage = formatHasNoLanguage(format);
+          if (languageScore > 0 || (params.selectUndeterminedTextLanguage && trackHasNoLanguage)) {
             if (isDefault) {
-              trackScore = 17;
+              trackScore = 11;
             } else if (!isForced) {
               // Prefer non-forced to forced if a preferred text language has been specified. Where
               // both are provided the non-forced track will usually contain the forced subtitles as
               // a subset.
-              trackScore = 13;
+              trackScore = 7;
             } else {
-              trackScore = 9;
+              trackScore = 3;
             }
             trackScore += languageScore;
           } else if (isDefault) {
-            trackScore = 8;
-          } else if (isForced) {
-            int preferredAudioLanguageScore =
-                getFormatLanguageScore(format, params.preferredAudioLanguage);
-            if (preferredAudioLanguageScore > 0) {
-              trackScore = 4 + preferredAudioLanguageScore;
-            } else {
-              trackScore = 1 + getFormatLanguageScore(format, selectedAudioLanguage);
-            }
+            trackScore = 2;
+          } else if (isForced
+              && (getFormatLanguageScore(format, selectedAudioLanguage) > 0
+                  || (trackHasNoLanguage && stringDefinesNoLanguage(selectedAudioLanguage)))) {
+            trackScore = 1;
           } else {
             // Track should not be selected.
             continue;
@@ -2281,15 +2277,19 @@ public class DefaultTrackSelector extends MappingTrackSelector {
         && maskedSupport == RendererCapabilities.FORMAT_EXCEEDS_CAPABILITIES);
   }
 
-  /**
-   * Returns whether a {@link Format} does not define a language.
-   *
-   * @param format The {@link Format}.
-   * @return Whether the {@link Format} does not define a language.
-   */
+  /** Equivalent to {@link #stringDefinesNoLanguage stringDefinesNoLanguage(format.language)}. */
   protected static boolean formatHasNoLanguage(Format format) {
-    return TextUtils.isEmpty(format.language)
-        || TextUtils.equals(format.language, C.LANGUAGE_UNDETERMINED);
+    return stringDefinesNoLanguage(format.language);
+  }
+
+  /**
+   * Returns whether the given string does not define a language.
+   *
+   * @param language The string.
+   * @return Whether the given string does not define a language.
+   */
+  protected static boolean stringDefinesNoLanguage(@Nullable String language) {
+    return TextUtils.isEmpty(language) || TextUtils.equals(language, C.LANGUAGE_UNDETERMINED);
   }
 
   /**
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
index 3091e46456..83fe34db97 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
@@ -910,13 +910,8 @@ public final class DefaultTrackSelectorTest {
     result = trackSelector.selectTracks(textRendererCapabilities, trackGroups, periodId, TIMELINE);
     assertFixedSelection(result.selections.get(0), trackGroups, defaultOnly);
 
-    // With no language preference and no text track flagged as default, the first forced should be
+    // Default flags are disabled and no language preference is provided, so no text track is
     // selected.
-    trackGroups = wrapFormats(forcedOnly, noFlag);
-    result = trackSelector.selectTracks(textRendererCapabilities, trackGroups, periodId, TIMELINE);
-    assertFixedSelection(result.selections.get(0), trackGroups, forcedOnly);
-
-    // Default flags are disabled, so the first track flagged as forced should be selected.
     trackGroups = wrapFormats(defaultOnly, noFlag, forcedOnly, forcedDefault);
     trackSelector.setParameters(
         Parameters.DEFAULT
@@ -924,15 +919,7 @@ public final class DefaultTrackSelectorTest {
             .setDisabledTextTrackSelectionFlags(C.SELECTION_FLAG_DEFAULT)
             .build());
     result = trackSelector.selectTracks(textRendererCapabilities, trackGroups, periodId, TIMELINE);
-    assertFixedSelection(result.selections.get(0), trackGroups, forcedOnly);
-
-    // Default flags are disabled, but there is a text track flagged as forced whose language
-    // matches the preferred audio language.
-    trackGroups = wrapFormats(forcedDefault, forcedOnly, defaultOnly, noFlag, forcedOnlySpanish);
-    trackSelector.setParameters(
-        trackSelector.getParameters().buildUpon().setPreferredTextLanguage("spa").build());
-    result = trackSelector.selectTracks(textRendererCapabilities, trackGroups, periodId, TIMELINE);
-    assertFixedSelection(result.selections.get(0), trackGroups, forcedOnlySpanish);
+    assertNoSelection(result.selections.get(0));
 
     // All selection flags are disabled and there is no language preference, so nothing should be
     // selected.
@@ -977,6 +964,11 @@ public final class DefaultTrackSelectorTest {
         buildTextFormat(/* id= */ "forcedEnglish", /* language= */ "eng", C.SELECTION_FLAG_FORCED);
     Format forcedGerman =
         buildTextFormat(/* id= */ "forcedGerman", /* language= */ "deu", C.SELECTION_FLAG_FORCED);
+    Format forcedNoLanguage =
+        buildTextFormat(
+            /* id= */ "forcedNoLanguage",
+            /* language= */ C.LANGUAGE_UNDETERMINED,
+            C.SELECTION_FLAG_FORCED);
     Format audio = buildAudioFormat(/* id= */ "audio");
     Format germanAudio =
         buildAudioFormat(
@@ -994,16 +986,18 @@ public final class DefaultTrackSelectorTest {
           ALL_TEXT_FORMAT_SUPPORTED_RENDERER_CAPABILITIES
         };
 
-    // The audio declares no language. The first forced text track should be selected.
-    TrackGroupArray trackGroups = wrapFormats(audio, forcedEnglish, forcedGerman);
+    // Neither the audio nor the forced text track define a language. We select them both under the
+    // assumption that they have matching language.
+    TrackGroupArray trackGroups = wrapFormats(audio, forcedNoLanguage);
     TrackSelectorResult result =
         trackSelector.selectTracks(rendererCapabilities, trackGroups, periodId, TIMELINE);
-    assertFixedSelection(result.selections.get(1), trackGroups, forcedEnglish);
+    assertFixedSelection(result.selections.get(1), trackGroups, forcedNoLanguage);
 
-    // Ditto.
-    trackGroups = wrapFormats(audio, forcedGerman, forcedEnglish);
+    // No forced text track should be selected because none of the forced text tracks' languages
+    // matches the selected audio language.
+    trackGroups = wrapFormats(audio, forcedEnglish, forcedGerman);
     result = trackSelector.selectTracks(rendererCapabilities, trackGroups, periodId, TIMELINE);
-    assertFixedSelection(result.selections.get(1), trackGroups, forcedGerman);
+    assertNoSelection(result.selections.get(1));
 
     // The audio declares german. The german forced track should be selected.
     trackGroups = wrapFormats(germanAudio, forcedGerman, forcedEnglish);

From 6d8bd34590f88110041e3ff6ee085b3235b5eaaa Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Thu, 18 Apr 2019 17:04:31 +0100
Subject: [PATCH 788/832] Add missing DownloadService build*Intent and
 startWith* methods

PiperOrigin-RevId: 244196081
---
 demos/ima/build.gradle                        |   2 +-
 demos/main/build.gradle                       |   2 +-
 .../exoplayer2/demo/DownloadTracker.java      |   4 +-
 extensions/cast/build.gradle                  |   2 +-
 extensions/cronet/build.gradle                |   2 +-
 extensions/ffmpeg/build.gradle                |   2 +-
 extensions/flac/build.gradle                  |   2 +-
 extensions/gvr/build.gradle                   |   2 +-
 extensions/leanback/build.gradle              |   2 +-
 extensions/okhttp/build.gradle                |   2 +-
 extensions/rtmp/build.gradle                  |   2 +-
 extensions/vp9/build.gradle                   |   2 +-
 library/core/build.gradle                     |   2 +-
 .../exoplayer2/offline/DownloadService.java   | 127 ++++++++++++++----
 library/dash/build.gradle                     |   2 +-
 library/hls/build.gradle                      |   2 +-
 library/smoothstreaming/build.gradle          |   2 +-
 library/ui/build.gradle                       |   2 +-
 playbacktests/build.gradle                    |   2 +-
 testutils/build.gradle                        |   2 +-
 testutils_robolectric/build.gradle            |   2 +-
 21 files changed, 123 insertions(+), 46 deletions(-)

diff --git a/demos/ima/build.gradle b/demos/ima/build.gradle
index 1d2068e5f7..33161b4121 100644
--- a/demos/ima/build.gradle
+++ b/demos/ima/build.gradle
@@ -53,7 +53,7 @@ dependencies {
     implementation project(modulePrefix + 'library-hls')
     implementation project(modulePrefix + 'library-smoothstreaming')
     implementation project(modulePrefix + 'extension-ima')
-    implementation 'androidx.annotation:annotation:1.0.1'
+    implementation 'androidx.annotation:annotation:1.0.2'
 }
 
 apply plugin: 'com.google.android.gms.strict-version-matcher-plugin'
diff --git a/demos/main/build.gradle b/demos/main/build.gradle
index 84a8a4087c..7089d4d731 100644
--- a/demos/main/build.gradle
+++ b/demos/main/build.gradle
@@ -62,7 +62,7 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.annotation:annotation:1.0.1'
+    implementation 'androidx.annotation:annotation:1.0.2'
     implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
     implementation 'androidx.fragment:fragment:1.0.0'
     implementation 'com.google.android.material:material:1.0.0'
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index 4a7a810314..a860d96e43 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -101,7 +101,7 @@ public class DownloadTracker {
       RenderersFactory renderersFactory) {
     Download download = downloads.get(uri);
     if (download != null) {
-      DownloadService.startWithRemoveDownload(
+      DownloadService.sendRemoveDownload(
           context, DemoDownloadService.class, download.request.id, /* foreground= */ false);
     } else {
       if (startDownloadDialogHelper != null) {
@@ -263,7 +263,7 @@ public class DownloadTracker {
     }
 
     private void startDownload(DownloadRequest downloadRequest) {
-      DownloadService.startWithNewDownload(
+      DownloadService.sendNewDownload(
           context, DemoDownloadService.class, downloadRequest, /* foreground= */ false);
     }
 
diff --git a/extensions/cast/build.gradle b/extensions/cast/build.gradle
index 573426df2e..4dc463ff81 100644
--- a/extensions/cast/build.gradle
+++ b/extensions/cast/build.gradle
@@ -32,7 +32,7 @@ android {
 
 dependencies {
     api 'com.google.android.gms:play-services-cast-framework:16.1.2'
-    implementation 'androidx.annotation:annotation:1.0.1'
+    implementation 'androidx.annotation:annotation:1.0.2'
     implementation project(modulePrefix + 'library-core')
     implementation project(modulePrefix + 'library-ui')
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle
index baf925acbd..ad45f61d98 100644
--- a/extensions/cronet/build.gradle
+++ b/extensions/cronet/build.gradle
@@ -33,7 +33,7 @@ android {
 dependencies {
     api 'org.chromium.net:cronet-embedded:72.3626.96'
     implementation project(modulePrefix + 'library-core')
-    implementation 'androidx.annotation:annotation:1.0.1'
+    implementation 'androidx.annotation:annotation:1.0.2'
     testImplementation project(modulePrefix + 'library')
     testImplementation project(modulePrefix + 'testutils-robolectric')
 }
diff --git a/extensions/ffmpeg/build.gradle b/extensions/ffmpeg/build.gradle
index ee3358d21a..ffecdcd16f 100644
--- a/extensions/ffmpeg/build.gradle
+++ b/extensions/ffmpeg/build.gradle
@@ -38,7 +38,7 @@ android {
 
 dependencies {
     implementation project(modulePrefix + 'library-core')
-    implementation 'androidx.annotation:annotation:1.0.1'
+    implementation 'androidx.annotation:annotation:1.0.2'
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     testImplementation project(modulePrefix + 'testutils-robolectric')
 }
diff --git a/extensions/flac/build.gradle b/extensions/flac/build.gradle
index 9a247c3f8f..06a5888404 100644
--- a/extensions/flac/build.gradle
+++ b/extensions/flac/build.gradle
@@ -39,7 +39,7 @@ android {
 
 dependencies {
     implementation project(modulePrefix + 'library-core')
-    implementation 'androidx.annotation:annotation:1.0.1'
+    implementation 'androidx.annotation:annotation:1.0.2'
     androidTestImplementation project(modulePrefix + 'testutils')
     androidTestImplementation 'androidx.test:runner:' + androidXTestVersion
     testImplementation project(modulePrefix + 'testutils-robolectric')
diff --git a/extensions/gvr/build.gradle b/extensions/gvr/build.gradle
index 6c4bfa469a..50acd6c040 100644
--- a/extensions/gvr/build.gradle
+++ b/extensions/gvr/build.gradle
@@ -33,7 +33,7 @@ android {
 dependencies {
     implementation project(modulePrefix + 'library-core')
     implementation project(modulePrefix + 'library-ui')
-    implementation 'androidx.annotation:annotation:1.0.1'
+    implementation 'androidx.annotation:annotation:1.0.2'
     api 'com.google.vr:sdk-base:1.190.0'
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
 }
diff --git a/extensions/leanback/build.gradle b/extensions/leanback/build.gradle
index a86eedc2d4..c6f5a216ce 100644
--- a/extensions/leanback/build.gradle
+++ b/extensions/leanback/build.gradle
@@ -32,7 +32,7 @@ android {
 
 dependencies {
     implementation project(modulePrefix + 'library-core')
-    implementation 'androidx.annotation:annotation:1.0.1'
+    implementation 'androidx.annotation:annotation:1.0.2'
     implementation 'androidx.leanback:leanback:1.0.0'
 }
 
diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle
index eddd364370..db2e073c8a 100644
--- a/extensions/okhttp/build.gradle
+++ b/extensions/okhttp/build.gradle
@@ -33,7 +33,7 @@ android {
 
 dependencies {
     implementation project(modulePrefix + 'library-core')
-    implementation 'androidx.annotation:annotation:1.0.1'
+    implementation 'androidx.annotation:annotation:1.0.2'
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     api 'com.squareup.okhttp3:okhttp:3.12.1'
 }
diff --git a/extensions/rtmp/build.gradle b/extensions/rtmp/build.gradle
index e7c7fce164..ca734c3657 100644
--- a/extensions/rtmp/build.gradle
+++ b/extensions/rtmp/build.gradle
@@ -33,7 +33,7 @@ android {
 dependencies {
     implementation project(modulePrefix + 'library-core')
     implementation 'net.butterflytv.utils:rtmp-client:3.0.1'
-    implementation 'androidx.annotation:annotation:1.0.1'
+    implementation 'androidx.annotation:annotation:1.0.2'
     testImplementation project(modulePrefix + 'testutils-robolectric')
 }
 
diff --git a/extensions/vp9/build.gradle b/extensions/vp9/build.gradle
index 4b2ba26ca2..02b68b831d 100644
--- a/extensions/vp9/build.gradle
+++ b/extensions/vp9/build.gradle
@@ -39,7 +39,7 @@ android {
 
 dependencies {
     implementation project(modulePrefix + 'library-core')
-    implementation 'androidx.annotation:annotation:1.0.1'
+    implementation 'androidx.annotation:annotation:1.0.2'
     testImplementation project(modulePrefix + 'testutils-robolectric')
     androidTestImplementation 'androidx.test:runner:' + androidXTestVersion
     androidTestImplementation 'androidx.test.ext:junit:' + androidXTestVersion
diff --git a/library/core/build.gradle b/library/core/build.gradle
index deb9f24dce..68ff8cc977 100644
--- a/library/core/build.gradle
+++ b/library/core/build.gradle
@@ -58,7 +58,7 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.annotation:annotation:1.0.1'
+    implementation 'androidx.annotation:annotation:1.0.2'
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion
     androidTestImplementation 'androidx.test:runner:' + androidXTestVersion
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index c206a94d6d..6922d6a787 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -117,8 +117,8 @@ public abstract class DownloadService extends Service {
   public static final String KEY_DOWNLOAD_REQUEST = "download_request";
 
   /**
-   * Key for the content id in {@link #ACTION_START}, {@link #ACTION_STOP} and {@link
-   * #ACTION_REMOVE} intents.
+   * Key for the content id in {@link #ACTION_SET_MANUAL_STOP_REASON} and {@link #ACTION_REMOVE}
+   * intents.
    */
   public static final String KEY_CONTENT_ID = "content_id";
 
@@ -265,10 +265,9 @@ public abstract class DownloadService extends Service {
       DownloadRequest downloadRequest,
       int manualStopReason,
       boolean foreground) {
-    return getIntent(context, clazz, ACTION_ADD)
+    return getIntent(context, clazz, ACTION_ADD, foreground)
         .putExtra(KEY_DOWNLOAD_REQUEST, downloadRequest)
-        .putExtra(KEY_MANUAL_STOP_REASON, manualStopReason)
-        .putExtra(KEY_FOREGROUND, foreground);
+        .putExtra(KEY_MANUAL_STOP_REASON, manualStopReason);
   }
 
   /**
@@ -282,9 +281,7 @@ public abstract class DownloadService extends Service {
    */
   public static Intent buildRemoveDownloadIntent(
       Context context, Class<? extends DownloadService> clazz, String id, boolean foreground) {
-    return getIntent(context, clazz, ACTION_REMOVE)
-        .putExtra(KEY_CONTENT_ID, id)
-        .putExtra(KEY_FOREGROUND, foreground);
+    return getIntent(context, clazz, ACTION_REMOVE, foreground).putExtra(KEY_CONTENT_ID, id);
   }
 
   /**
@@ -295,55 +292,122 @@ public abstract class DownloadService extends Service {
    * @param clazz The concrete download service being targeted by the intent.
    * @param id The content id, or {@code null} to set the manual stop reason for all downloads.
    * @param manualStopReason An application defined stop reason.
+   * @param foreground Whether this intent will be used to start the service in the foreground.
    * @return Created Intent.
    */
   public static Intent buildSetManualStopReasonIntent(
       Context context,
       Class<? extends DownloadService> clazz,
       @Nullable String id,
-      int manualStopReason) {
-    return getIntent(context, clazz, ACTION_STOP)
+      int manualStopReason,
+      boolean foreground) {
+    return getIntent(context, clazz, ACTION_SET_MANUAL_STOP_REASON, foreground)
         .putExtra(KEY_CONTENT_ID, id)
         .putExtra(KEY_MANUAL_STOP_REASON, manualStopReason);
   }
 
   /**
-   * Starts the service, adding a new download.
+   * Builds an {@link Intent} for starting all downloads.
+   *
+   * @param context A {@link Context}.
+   * @param clazz The concrete download service being targeted by the intent.
+   * @param foreground Whether this intent will be used to start the service in the foreground.
+   * @return Created Intent.
+   */
+  public static Intent buildStartDownloadsIntent(
+      Context context, Class<? extends DownloadService> clazz, boolean foreground) {
+    return getIntent(context, clazz, ACTION_START, foreground);
+  }
+
+  /**
+   * Builds an {@link Intent} for stopping all downloads.
+   *
+   * @param context A {@link Context}.
+   * @param clazz The concrete download service being targeted by the intent.
+   * @param foreground Whether this intent will be used to start the service in the foreground.
+   * @return Created Intent.
+   */
+  public static Intent buildStopDownloadsIntent(
+      Context context, Class<? extends DownloadService> clazz, boolean foreground) {
+    return getIntent(context, clazz, ACTION_STOP, foreground);
+  }
+
+  /**
+   * Starts the service if not started already and adds a new download.
    *
    * @param context A {@link Context}.
    * @param clazz The concrete download service to be started.
    * @param downloadRequest The request to be executed.
    * @param foreground Whether the service is started in the foreground.
    */
-  public static void startWithNewDownload(
+  public static void sendNewDownload(
       Context context,
       Class<? extends DownloadService> clazz,
       DownloadRequest downloadRequest,
       boolean foreground) {
     Intent intent = buildAddRequestIntent(context, clazz, downloadRequest, foreground);
-    if (foreground) {
-      Util.startForegroundService(context, intent);
-    } else {
-      context.startService(intent);
-    }
+    startService(context, intent, foreground);
   }
 
   /**
-   * Starts the service to remove a download.
+   * Starts the service if not started already and removes a download.
    *
    * @param context A {@link Context}.
    * @param clazz The concrete download service to be started.
    * @param id The content id.
    * @param foreground Whether the service is started in the foreground.
    */
-  public static void startWithRemoveDownload(
+  public static void sendRemoveDownload(
       Context context, Class<? extends DownloadService> clazz, String id, boolean foreground) {
     Intent intent = buildRemoveDownloadIntent(context, clazz, id, foreground);
-    if (foreground) {
-      Util.startForegroundService(context, intent);
-    } else {
-      context.startService(intent);
-    }
+    startService(context, intent, foreground);
+  }
+
+  /**
+   * Starts the service if not started already and sets the manual stop reason for one or all
+   * downloads. To clear manual stop reason, pass {@link Download#MANUAL_STOP_REASON_NONE}.
+   *
+   * @param context A {@link Context}.
+   * @param clazz The concrete download service to be started.
+   * @param id The content id, or {@code null} to set the manual stop reason for all downloads.
+   * @param manualStopReason An application defined stop reason.
+   * @param foreground Whether the service is started in the foreground.
+   */
+  public static void sendManualStopReason(
+      Context context,
+      Class<? extends DownloadService> clazz,
+      @Nullable String id,
+      int manualStopReason,
+      boolean foreground) {
+    Intent intent =
+        buildSetManualStopReasonIntent(context, clazz, id, manualStopReason, foreground);
+    startService(context, intent, foreground);
+  }
+
+  /**
+   * Starts the service if not started already and starts all downloads.
+   *
+   * @param context A {@link Context}.
+   * @param clazz The concrete download service to be started.
+   * @param foreground Whether the service is started in the foreground.
+   */
+  public static void sendStartDownloads(
+      Context context, Class<? extends DownloadService> clazz, boolean foreground) {
+    Intent intent = buildStartDownloadsIntent(context, clazz, foreground);
+    startService(context, intent, foreground);
+  }
+
+  /**
+   * Starts the service if not started already and stops all downloads.
+   *
+   * @param context A {@link Context}.
+   * @param clazz The concrete download service to be started.
+   * @param foreground Whether the service is started in the foreground.
+   */
+  public static void sendStopDownloads(
+      Context context, Class<? extends DownloadService> clazz, boolean foreground) {
+    Intent intent = buildStopDownloadsIntent(context, clazz, foreground);
+    startService(context, intent, foreground);
   }
 
   /**
@@ -367,7 +431,7 @@ public abstract class DownloadService extends Service {
    * @see #start(Context, Class)
    */
   public static void startForeground(Context context, Class<? extends DownloadService> clazz) {
-    Intent intent = getIntent(context, clazz, ACTION_INIT).putExtra(KEY_FOREGROUND, true);
+    Intent intent = getIntent(context, clazz, ACTION_INIT, true);
     Util.startForegroundService(context, intent);
   }
 
@@ -588,11 +652,24 @@ public abstract class DownloadService extends Service {
     }
   }
 
+  private static Intent getIntent(
+      Context context, Class<? extends DownloadService> clazz, String action, boolean foreground) {
+    return getIntent(context, clazz, action).putExtra(KEY_FOREGROUND, foreground);
+  }
+
   private static Intent getIntent(
       Context context, Class<? extends DownloadService> clazz, String action) {
     return new Intent(context, clazz).setAction(action);
   }
 
+  private static void startService(Context context, Intent intent, boolean foreground) {
+    if (foreground) {
+      Util.startForegroundService(context, intent);
+    } else {
+      context.startService(intent);
+    }
+  }
+
   private final class ForegroundNotificationUpdater {
 
     private final int notificationId;
diff --git a/library/dash/build.gradle b/library/dash/build.gradle
index c7e68f548a..f6981a2220 100644
--- a/library/dash/build.gradle
+++ b/library/dash/build.gradle
@@ -41,7 +41,7 @@ android {
 dependencies {
     implementation project(modulePrefix + 'library-core')
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
-    implementation 'androidx.annotation:annotation:1.0.1'
+    implementation 'androidx.annotation:annotation:1.0.2'
     testImplementation project(modulePrefix + 'testutils-robolectric')
 }
 
diff --git a/library/hls/build.gradle b/library/hls/build.gradle
index 99619bf750..8e9696af70 100644
--- a/library/hls/build.gradle
+++ b/library/hls/build.gradle
@@ -39,7 +39,7 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.annotation:annotation:1.0.1'
+    implementation 'androidx.annotation:annotation:1.0.2'
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     implementation project(modulePrefix + 'library-core')
     testImplementation project(modulePrefix + 'testutils-robolectric')
diff --git a/library/smoothstreaming/build.gradle b/library/smoothstreaming/build.gradle
index ba3b4ab65d..a2e81fb304 100644
--- a/library/smoothstreaming/build.gradle
+++ b/library/smoothstreaming/build.gradle
@@ -41,7 +41,7 @@ android {
 dependencies {
     implementation project(modulePrefix + 'library-core')
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
-    implementation 'androidx.annotation:annotation:1.0.1'
+    implementation 'androidx.annotation:annotation:1.0.2'
     testImplementation project(modulePrefix + 'testutils-robolectric')
 }
 
diff --git a/library/ui/build.gradle b/library/ui/build.gradle
index 9c47f3684d..49446b25de 100644
--- a/library/ui/build.gradle
+++ b/library/ui/build.gradle
@@ -41,7 +41,7 @@ android {
 dependencies {
     implementation project(modulePrefix + 'library-core')
     implementation 'androidx.media:media:1.0.0'
-    implementation 'androidx.annotation:annotation:1.0.1'
+    implementation 'androidx.annotation:annotation:1.0.2'
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     testImplementation project(modulePrefix + 'testutils-robolectric')
 }
diff --git a/playbacktests/build.gradle b/playbacktests/build.gradle
index 0e1c8a1268..dd5cfa64a7 100644
--- a/playbacktests/build.gradle
+++ b/playbacktests/build.gradle
@@ -34,7 +34,7 @@ android {
 dependencies {
     androidTestImplementation 'androidx.test:rules:' + androidXTestVersion
     androidTestImplementation 'androidx.test:runner:' + androidXTestVersion
-    androidTestImplementation 'androidx.annotation:annotation:1.0.1'
+    androidTestImplementation 'androidx.annotation:annotation:1.0.2'
     androidTestImplementation project(modulePrefix + 'library-core')
     androidTestImplementation project(modulePrefix + 'library-dash')
     androidTestImplementation project(modulePrefix + 'library-hls')
diff --git a/testutils/build.gradle b/testutils/build.gradle
index ab78e6673f..bdc26d5c19 100644
--- a/testutils/build.gradle
+++ b/testutils/build.gradle
@@ -41,7 +41,7 @@ dependencies {
     api 'org.mockito:mockito-core:' + mockitoVersion
     api 'androidx.test.ext:junit:' + androidXTestVersion
     api 'androidx.test.ext:truth:' + androidXTestVersion
-    implementation 'androidx.annotation:annotation:1.0.1'
+    implementation 'androidx.annotation:annotation:1.0.2'
     implementation project(modulePrefix + 'library-core')
     implementation 'com.google.auto.value:auto-value-annotations:' + autoValueVersion
     annotationProcessor 'com.google.auto.value:auto-value:' + autoValueVersion
diff --git a/testutils_robolectric/build.gradle b/testutils_robolectric/build.gradle
index 44459ea272..a3859a9e48 100644
--- a/testutils_robolectric/build.gradle
+++ b/testutils_robolectric/build.gradle
@@ -41,5 +41,5 @@ dependencies {
     api 'org.robolectric:robolectric:' + robolectricVersion
     api project(modulePrefix + 'testutils')
     implementation project(modulePrefix + 'library-core')
-    implementation 'androidx.annotation:annotation:1.0.1'
+    implementation 'androidx.annotation:annotation:1.0.2'
 }

From 138da6d51900e831ee4bcaee885bb373655d7b90 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 18 Apr 2019 18:26:00 +0100
Subject: [PATCH 789/832] Rename manualStopReason to stopReason

PiperOrigin-RevId: 244210737
---
 .../offline/ActionFileUpgradeUtil.java        |  4 +-
 .../offline/DefaultDownloadIndex.java         | 20 ++--
 .../android/exoplayer2/offline/Download.java  | 20 ++--
 .../exoplayer2/offline/DownloadManager.java   | 93 +++++++++----------
 .../exoplayer2/offline/DownloadService.java   | 89 ++++++++----------
 .../offline/WritableDownloadIndex.java        | 16 ++--
 .../offline/DefaultDownloadIndexTest.java     | 47 +++++-----
 .../exoplayer2/offline/DownloadBuilder.java   |  8 +-
 .../offline/DownloadManagerTest.java          | 28 +++---
 9 files changed, 153 insertions(+), 172 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java
index 0a37fe3a80..51996ed284 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java
@@ -90,7 +90,7 @@ public final class ActionFileUpgradeUtil {
       DownloadRequest request, DefaultDownloadIndex downloadIndex) throws IOException {
     Download download = downloadIndex.getDownload(request.id);
     if (download != null) {
-      download = DownloadManager.mergeRequest(download, request, download.manualStopReason);
+      download = DownloadManager.mergeRequest(download, request, download.stopReason);
     } else {
       long nowMs = System.currentTimeMillis();
       download =
@@ -98,7 +98,7 @@ public final class ActionFileUpgradeUtil {
               request,
               STATE_QUEUED,
               Download.FAILURE_REASON_NONE,
-              Download.MANUAL_STOP_REASON_NONE,
+              Download.STOP_REASON_NONE,
               /* startTimeMs= */ nowMs,
               /* updateTimeMs= */ nowMs);
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
index fc1518e5c3..a2caff3ff1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -57,7 +57,7 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
   private static final String COLUMN_DOWNLOADED_BYTES = "downloaded_bytes";
   private static final String COLUMN_TOTAL_BYTES = "total_bytes";
   private static final String COLUMN_FAILURE_REASON = "failure_reason";
-  private static final String COLUMN_MANUAL_STOP_REASON = "manual_stop_reason";
+  private static final String COLUMN_STOP_REASON = "manual_stop_reason";
   private static final String COLUMN_START_TIME_MS = "start_time_ms";
   private static final String COLUMN_UPDATE_TIME_MS = "update_time_ms";
 
@@ -82,7 +82,7 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
   private static final int COLUMN_INDEX_DOWNLOADED_BYTES = 8;
   private static final int COLUMN_INDEX_TOTAL_BYTES = 9;
   private static final int COLUMN_INDEX_FAILURE_REASON = 10;
-  private static final int COLUMN_INDEX_MANUAL_STOP_REASON = 11;
+  private static final int COLUMN_INDEX_STOP_REASON = 11;
   private static final int COLUMN_INDEX_START_TIME_MS = 12;
   private static final int COLUMN_INDEX_UPDATE_TIME_MS = 13;
 
@@ -103,7 +103,7 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
         COLUMN_DOWNLOADED_BYTES,
         COLUMN_TOTAL_BYTES,
         COLUMN_FAILURE_REASON,
-        COLUMN_MANUAL_STOP_REASON,
+        COLUMN_STOP_REASON,
         COLUMN_START_TIME_MS,
         COLUMN_UPDATE_TIME_MS
       };
@@ -135,7 +135,7 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
           + " INTEGER NOT NULL,"
           + COLUMN_NOT_MET_REQUIREMENTS
           + " INTEGER NOT NULL,"
-          + COLUMN_MANUAL_STOP_REASON
+          + COLUMN_STOP_REASON
           + " INTEGER NOT NULL,"
           + COLUMN_START_TIME_MS
           + " INTEGER NOT NULL,"
@@ -202,7 +202,7 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
     values.put(COLUMN_FAILURE_REASON, download.failureReason);
     values.put(COLUMN_STOP_FLAGS, 0);
     values.put(COLUMN_NOT_MET_REQUIREMENTS, 0);
-    values.put(COLUMN_MANUAL_STOP_REASON, download.manualStopReason);
+    values.put(COLUMN_STOP_REASON, download.stopReason);
     values.put(COLUMN_START_TIME_MS, download.startTimeMs);
     values.put(COLUMN_UPDATE_TIME_MS, download.updateTimeMs);
     try {
@@ -224,11 +224,11 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
   }
 
   @Override
-  public void setManualStopReason(int manualStopReason) throws DatabaseIOException {
+  public void setStopReason(int stopReason) throws DatabaseIOException {
     ensureInitialized();
     try {
       ContentValues values = new ContentValues();
-      values.put(COLUMN_MANUAL_STOP_REASON, manualStopReason);
+      values.put(COLUMN_STOP_REASON, stopReason);
       SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
       writableDatabase.update(TABLE_NAME, values, WHERE_STATE_TERMINAL, /* whereArgs= */ null);
     } catch (SQLException e) {
@@ -237,11 +237,11 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
   }
 
   @Override
-  public void setManualStopReason(String id, int manualStopReason) throws DatabaseIOException {
+  public void setStopReason(String id, int stopReason) throws DatabaseIOException {
     ensureInitialized();
     try {
       ContentValues values = new ContentValues();
-      values.put(COLUMN_MANUAL_STOP_REASON, manualStopReason);
+      values.put(COLUMN_STOP_REASON, stopReason);
       SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
       writableDatabase.update(
           TABLE_NAME, values, WHERE_STATE_TERMINAL + " AND " + WHERE_ID_EQUALS, new String[] {id});
@@ -332,7 +332,7 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
         request,
         cursor.getInt(COLUMN_INDEX_STATE),
         cursor.getInt(COLUMN_INDEX_FAILURE_REASON),
-        cursor.getInt(COLUMN_INDEX_MANUAL_STOP_REASON),
+        cursor.getInt(COLUMN_INDEX_STOP_REASON),
         cursor.getLong(COLUMN_INDEX_START_TIME_MS),
         cursor.getLong(COLUMN_INDEX_UPDATE_TIME_MS),
         cachingCounters);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
index b29abde24b..343b9d6a49 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
@@ -46,7 +46,7 @@ public final class Download {
   // Important: These constants are persisted into DownloadIndex. Do not change them.
   /** The download is waiting to be started. */
   public static final int STATE_QUEUED = 0;
-  /** The download is stopped for a specified {@link #manualStopReason}. */
+  /** The download is stopped for a specified {@link #stopReason}. */
   public static final int STATE_STOPPED = 1;
   /** The download is currently started. */
   public static final int STATE_DOWNLOADING = 2;
@@ -69,8 +69,8 @@ public final class Download {
   /** The download is failed because of unknown reason. */
   public static final int FAILURE_REASON_UNKNOWN = 1;
 
-  /** The download isn't manually stopped. */
-  public static final int MANUAL_STOP_REASON_NONE = 0;
+  /** The download isn't stopped. */
+  public static final int STOP_REASON_NONE = 0;
 
   /** Returns the state string for the given state value. */
   public static String getStateString(@State int state) {
@@ -108,8 +108,8 @@ public final class Download {
    * #FAILURE_REASON_NONE}.
    */
   @FailureReason public final int failureReason;
-  /** The reason the download is manually stopped, or {@link #MANUAL_STOP_REASON_NONE}. */
-  public final int manualStopReason;
+  /** The reason the download is stopped, or {@link #STOP_REASON_NONE}. */
+  public final int stopReason;
 
   /* package */ CachingCounters counters;
 
@@ -117,14 +117,14 @@ public final class Download {
       DownloadRequest request,
       @State int state,
       @FailureReason int failureReason,
-      int manualStopReason,
+      int stopReason,
       long startTimeMs,
       long updateTimeMs) {
     this(
         request,
         state,
         failureReason,
-        manualStopReason,
+        stopReason,
         startTimeMs,
         updateTimeMs,
         new CachingCounters());
@@ -134,19 +134,19 @@ public final class Download {
       DownloadRequest request,
       @State int state,
       @FailureReason int failureReason,
-      int manualStopReason,
+      int stopReason,
       long startTimeMs,
       long updateTimeMs,
       CachingCounters counters) {
     Assertions.checkNotNull(counters);
     Assertions.checkState((failureReason == FAILURE_REASON_NONE) == (state != STATE_FAILED));
-    if (manualStopReason != 0) {
+    if (stopReason != 0) {
       Assertions.checkState(state != STATE_DOWNLOADING && state != STATE_QUEUED);
     }
     this.request = request;
     this.state = state;
     this.failureReason = failureReason;
-    this.manualStopReason = manualStopReason;
+    this.stopReason = stopReason;
     this.startTimeMs = startTimeMs;
     this.updateTimeMs = updateTimeMs;
     this.counters = counters;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index df958f8691..497e3476af 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.offline;
 
 import static com.google.android.exoplayer2.offline.Download.FAILURE_REASON_NONE;
 import static com.google.android.exoplayer2.offline.Download.FAILURE_REASON_UNKNOWN;
-import static com.google.android.exoplayer2.offline.Download.MANUAL_STOP_REASON_NONE;
 import static com.google.android.exoplayer2.offline.Download.STATE_COMPLETED;
 import static com.google.android.exoplayer2.offline.Download.STATE_DOWNLOADING;
 import static com.google.android.exoplayer2.offline.Download.STATE_FAILED;
@@ -25,6 +24,7 @@ import static com.google.android.exoplayer2.offline.Download.STATE_QUEUED;
 import static com.google.android.exoplayer2.offline.Download.STATE_REMOVING;
 import static com.google.android.exoplayer2.offline.Download.STATE_RESTARTING;
 import static com.google.android.exoplayer2.offline.Download.STATE_STOPPED;
+import static com.google.android.exoplayer2.offline.Download.STOP_REASON_NONE;
 
 import android.content.Context;
 import android.os.Handler;
@@ -128,7 +128,7 @@ public final class DownloadManager {
   private static final int MSG_INITIALIZE = 0;
   private static final int MSG_SET_DOWNLOADS_STARTED = 1;
   private static final int MSG_SET_NOT_MET_REQUIREMENTS = 2;
-  private static final int MSG_SET_MANUAL_STOP_REASON = 3;
+  private static final int MSG_SET_STOP_REASON = 3;
   private static final int MSG_ADD_DOWNLOAD = 4;
   private static final int MSG_REMOVE_DOWNLOAD = 5;
   private static final int MSG_DOWNLOAD_THREAD_STOPPED = 6;
@@ -346,10 +346,7 @@ public final class DownloadManager {
     return Collections.unmodifiableList(new ArrayList<>(downloads));
   }
 
-  /**
-   * Starts all downloads except those that are manually stopped (i.e. have a non-zero {@link
-   * Download#manualStopReason}).
-   */
+  /** Starts all downloads except those that have a non-zero {@link Download#stopReason}. */
   public void startDownloads() {
     pendingMessages++;
     internalHandler
@@ -366,17 +363,17 @@ public final class DownloadManager {
   }
 
   /**
-   * Sets the manual stop reason for one or all downloads. To clear the manual stop reason, pass
-   * {@link Download#MANUAL_STOP_REASON_NONE}.
+   * Sets the stop reason for one or all downloads. To clear the stop reason, pass {@link
+   * Download#STOP_REASON_NONE}.
    *
-   * @param id The content id of the download to update, or {@code null} to set the manual stop
-   *     reason for all downloads.
-   * @param manualStopReason The manual stop reason, or {@link Download#MANUAL_STOP_REASON_NONE}.
+   * @param id The content id of the download to update, or {@code null} to set the stop reason for
+   *     all downloads.
+   * @param stopReason The stop reason, or {@link Download#STOP_REASON_NONE}.
    */
-  public void setManualStopReason(@Nullable String id, int manualStopReason) {
+  public void setStopReason(@Nullable String id, int stopReason) {
     pendingMessages++;
     internalHandler
-        .obtainMessage(MSG_SET_MANUAL_STOP_REASON, manualStopReason, /* unused */ 0, id)
+        .obtainMessage(MSG_SET_STOP_REASON, stopReason, /* unused */ 0, id)
         .sendToTarget();
   }
 
@@ -386,20 +383,20 @@ public final class DownloadManager {
    * @param request The download request.
    */
   public void addDownload(DownloadRequest request) {
-    addDownload(request, Download.MANUAL_STOP_REASON_NONE);
+    addDownload(request, Download.STOP_REASON_NONE);
   }
 
   /**
-   * Adds a download defined by the given request and with the specified manual stop reason.
+   * Adds a download defined by the given request and with the specified stop reason.
    *
    * @param request The download request.
-   * @param manualStopReason An initial manual stop reason for the download, or {@link
-   *     Download#MANUAL_STOP_REASON_NONE} if the download should be started.
+   * @param stopReason An initial stop reason for the download, or {@link Download#STOP_REASON_NONE}
+   *     if the download should be started.
    */
-  public void addDownload(DownloadRequest request, int manualStopReason) {
+  public void addDownload(DownloadRequest request, int stopReason) {
     pendingMessages++;
     internalHandler
-        .obtainMessage(MSG_ADD_DOWNLOAD, manualStopReason, /* unused */ 0, request)
+        .obtainMessage(MSG_ADD_DOWNLOAD, stopReason, /* unused */ 0, request)
         .sendToTarget();
   }
 
@@ -552,15 +549,15 @@ public final class DownloadManager {
         notMetRequirements = message.arg1;
         setNotMetRequirementsInternal(notMetRequirements);
         break;
-      case MSG_SET_MANUAL_STOP_REASON:
+      case MSG_SET_STOP_REASON:
         String id = (String) message.obj;
-        int manualStopReason = message.arg1;
-        setManualStopReasonInternal(id, manualStopReason);
+        int stopReason = message.arg1;
+        setStopReasonInternal(id, stopReason);
         break;
       case MSG_ADD_DOWNLOAD:
         DownloadRequest request = (DownloadRequest) message.obj;
-        manualStopReason = message.arg1;
-        addDownloadInternal(request, manualStopReason);
+        stopReason = message.arg1;
+        addDownloadInternal(request, stopReason);
         break;
       case MSG_REMOVE_DOWNLOAD:
         id = (String) message.obj;
@@ -629,34 +626,34 @@ public final class DownloadManager {
     }
   }
 
-  private void setManualStopReasonInternal(@Nullable String id, int manualStopReason) {
+  private void setStopReasonInternal(@Nullable String id, int stopReason) {
     if (id != null) {
       DownloadInternal downloadInternal = getDownload(id);
       if (downloadInternal != null) {
-        logd("download manual stop reason is set to : " + manualStopReason, downloadInternal);
-        downloadInternal.setManualStopReason(manualStopReason);
+        logd("download stop reason is set to : " + stopReason, downloadInternal);
+        downloadInternal.setStopReason(stopReason);
         return;
       }
     } else {
       for (int i = 0; i < downloadInternals.size(); i++) {
-        downloadInternals.get(i).setManualStopReason(manualStopReason);
+        downloadInternals.get(i).setStopReason(stopReason);
       }
     }
     try {
       if (id != null) {
-        downloadIndex.setManualStopReason(id, manualStopReason);
+        downloadIndex.setStopReason(id, stopReason);
       } else {
-        downloadIndex.setManualStopReason(manualStopReason);
+        downloadIndex.setStopReason(stopReason);
       }
     } catch (IOException e) {
-      Log.e(TAG, "setManualStopReason failed", e);
+      Log.e(TAG, "setStopReason failed", e);
     }
   }
 
-  private void addDownloadInternal(DownloadRequest request, int manualStopReason) {
+  private void addDownloadInternal(DownloadRequest request, int stopReason) {
     DownloadInternal downloadInternal = getDownload(request.id);
     if (downloadInternal != null) {
-      downloadInternal.addRequest(request, manualStopReason);
+      downloadInternal.addRequest(request, stopReason);
       logd("Request is added to existing download", downloadInternal);
     } else {
       Download download = loadDownload(request.id);
@@ -665,14 +662,14 @@ public final class DownloadManager {
         download =
             new Download(
                 request,
-                manualStopReason != Download.MANUAL_STOP_REASON_NONE ? STATE_STOPPED : STATE_QUEUED,
+                stopReason != Download.STOP_REASON_NONE ? STATE_STOPPED : STATE_QUEUED,
                 Download.FAILURE_REASON_NONE,
-                manualStopReason,
+                stopReason,
                 /* startTimeMs= */ nowMs,
                 /* updateTimeMs= */ nowMs);
         logd("Download state is created for " + request.id);
       } else {
-        download = mergeRequest(download, request, manualStopReason);
+        download = mergeRequest(download, request, stopReason);
         logd("Download state is loaded for " + request.id);
       }
       addDownloadForState(download);
@@ -820,11 +817,11 @@ public final class DownloadManager {
   }
 
   /* package */ static Download mergeRequest(
-      Download download, DownloadRequest request, int manualStopReason) {
+      Download download, DownloadRequest request, int stopReason) {
     @Download.State int state = download.state;
     if (state == STATE_REMOVING || state == STATE_RESTARTING) {
       state = STATE_RESTARTING;
-    } else if (manualStopReason != MANUAL_STOP_REASON_NONE) {
+    } else if (stopReason != STOP_REASON_NONE) {
       state = STATE_STOPPED;
     } else {
       state = STATE_QUEUED;
@@ -835,7 +832,7 @@ public final class DownloadManager {
         download.request.copyWithMergedRequest(request),
         state,
         FAILURE_REASON_NONE,
-        manualStopReason,
+        stopReason,
         startTimeMs,
         /* updateTimeMs= */ nowMs,
         download.counters);
@@ -846,7 +843,7 @@ public final class DownloadManager {
         download.request,
         state,
         FAILURE_REASON_NONE,
-        download.manualStopReason,
+        download.stopReason,
         download.startTimeMs,
         /* updateTimeMs= */ System.currentTimeMillis(),
         download.counters);
@@ -882,21 +879,21 @@ public final class DownloadManager {
 
     // TODO: Get rid of these and use download directly.
     @Download.State private int state;
-    private int manualStopReason;
+    private int stopReason;
     @MonotonicNonNull @Download.FailureReason private int failureReason;
 
     private DownloadInternal(DownloadManager downloadManager, Download download) {
       this.downloadManager = downloadManager;
       this.download = download;
-      manualStopReason = download.manualStopReason;
+      stopReason = download.stopReason;
     }
 
     private void initialize() {
       initialize(download.state);
     }
 
-    public void addRequest(DownloadRequest newRequest, int manualStopReason) {
-      download = mergeRequest(download, newRequest, manualStopReason);
+    public void addRequest(DownloadRequest newRequest, int stopReason) {
+      download = mergeRequest(download, newRequest, stopReason);
       initialize();
     }
 
@@ -910,7 +907,7 @@ public final class DownloadManager {
               download.request,
               state,
               state != STATE_FAILED ? FAILURE_REASON_NONE : failureReason,
-              manualStopReason,
+              stopReason,
               download.startTimeMs,
               /* updateTimeMs= */ System.currentTimeMillis(),
               download.counters);
@@ -934,8 +931,8 @@ public final class DownloadManager {
       }
     }
 
-    public void setManualStopReason(int manualStopReason) {
-      this.manualStopReason = manualStopReason;
+    public void setStopReason(int stopReason) {
+      this.stopReason = stopReason;
       updateStopState();
     }
 
@@ -981,7 +978,7 @@ public final class DownloadManager {
     }
 
     private boolean canStart() {
-      return downloadManager.canStartDownloads() && manualStopReason == MANUAL_STOP_REASON_NONE;
+      return downloadManager.canStartDownloads() && stopReason == STOP_REASON_NONE;
     }
 
     private void startOrQueue() {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index 6922d6a787..fa74afacb3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.offline;
 
-import static com.google.android.exoplayer2.offline.Download.MANUAL_STOP_REASON_NONE;
+import static com.google.android.exoplayer2.offline.Download.STOP_REASON_NONE;
 
 import android.app.Notification;
 import android.app.Service;
@@ -58,16 +58,15 @@ public abstract class DownloadService extends Service {
    * <ul>
    *   <li>{@link #KEY_DOWNLOAD_REQUEST} - A {@link DownloadRequest} defining the download to be
    *       added.
-   *   <li>{@link #KEY_MANUAL_STOP_REASON} - An initial manual stop reason for the download. If
-   *       omitted {@link Download#MANUAL_STOP_REASON_NONE} is used.
+   *   <li>{@link #KEY_STOP_REASON} - An initial stop reason for the download. If omitted {@link
+   *       Download#STOP_REASON_NONE} is used.
    *   <li>{@link #KEY_FOREGROUND} - See {@link #KEY_FOREGROUND}.
    * </ul>
    */
   public static final String ACTION_ADD = "com.google.android.exoplayer.downloadService.action.ADD";
 
   /**
-   * Starts all downloads except those that are manually stopped (i.e. have a non-zero {@link
-   * Download#manualStopReason}). Extras:
+   * Starts all downloads except those that have a non-zero {@link Download#stopReason}. Extras:
    *
    * <ul>
    *   <li>{@link #KEY_FOREGROUND} - See {@link #KEY_FOREGROUND}.
@@ -87,19 +86,18 @@ public abstract class DownloadService extends Service {
       "com.google.android.exoplayer.downloadService.action.STOP";
 
   /**
-   * Sets the manual stop reason for one or all downloads. To clear the manual stop reason, pass
-   * {@link Download#MANUAL_STOP_REASON_NONE}. Extras:
+   * Sets the stop reason for one or all downloads. To clear the stop reason, pass {@link
+   * Download#STOP_REASON_NONE}. Extras:
    *
    * <ul>
    *   <li>{@link #KEY_CONTENT_ID} - The content id of a single download to update with the manual
    *       stop reason. If omitted, all downloads will be updated.
-   *   <li>{@link #KEY_MANUAL_STOP_REASON} - An application provided reason for stopping the
-   *       download or downloads, or {@link Download#MANUAL_STOP_REASON_NONE} to clear the manual
-   *       stop reason.
+   *   <li>{@link #KEY_STOP_REASON} - An application provided reason for stopping the download or
+   *       downloads, or {@link Download#STOP_REASON_NONE} to clear the manual stop reason.
    *   <li>{@link #KEY_FOREGROUND} - See {@link #KEY_FOREGROUND}.
    * </ul>
    */
-  public static final String ACTION_SET_MANUAL_STOP_REASON =
+  public static final String ACTION_SET_STOP_REASON =
       "com.google.android.exoplayer.downloadService.action.SET_MANUAL_STOP_REASON";
 
   /**
@@ -117,16 +115,12 @@ public abstract class DownloadService extends Service {
   public static final String KEY_DOWNLOAD_REQUEST = "download_request";
 
   /**
-   * Key for the content id in {@link #ACTION_SET_MANUAL_STOP_REASON} and {@link #ACTION_REMOVE}
-   * intents.
+   * Key for the content id in {@link #ACTION_SET_STOP_REASON} and {@link #ACTION_REMOVE} intents.
    */
   public static final String KEY_CONTENT_ID = "content_id";
 
-  /**
-   * Key for the manual stop reason in {@link #ACTION_SET_MANUAL_STOP_REASON} and {@link
-   * #ACTION_ADD} intents.
-   */
-  public static final String KEY_MANUAL_STOP_REASON = "manual_stop_reason";
+  /** Key for the stop reason in {@link #ACTION_SET_STOP_REASON} and {@link #ACTION_ADD} intents. */
+  public static final String KEY_STOP_REASON = "manual_stop_reason";
 
   /**
    * Key for a boolean extra that can be set on any intent to indicate whether the service was
@@ -244,8 +238,7 @@ public abstract class DownloadService extends Service {
       Class<? extends DownloadService> clazz,
       DownloadRequest downloadRequest,
       boolean foreground) {
-    return buildAddRequestIntent(
-        context, clazz, downloadRequest, MANUAL_STOP_REASON_NONE, foreground);
+    return buildAddRequestIntent(context, clazz, downloadRequest, STOP_REASON_NONE, foreground);
   }
 
   /**
@@ -254,8 +247,8 @@ public abstract class DownloadService extends Service {
    * @param context A {@link Context}.
    * @param clazz The concrete download service being targeted by the intent.
    * @param downloadRequest The request to be executed.
-   * @param manualStopReason An initial manual stop reason for the download, or {@link
-   *     Download#MANUAL_STOP_REASON_NONE} if the download should be started.
+   * @param stopReason An initial stop reason for the download, or {@link Download#STOP_REASON_NONE}
+   *     if the download should be started.
    * @param foreground Whether this intent will be used to start the service in the foreground.
    * @return Created Intent.
    */
@@ -263,11 +256,11 @@ public abstract class DownloadService extends Service {
       Context context,
       Class<? extends DownloadService> clazz,
       DownloadRequest downloadRequest,
-      int manualStopReason,
+      int stopReason,
       boolean foreground) {
     return getIntent(context, clazz, ACTION_ADD, foreground)
         .putExtra(KEY_DOWNLOAD_REQUEST, downloadRequest)
-        .putExtra(KEY_MANUAL_STOP_REASON, manualStopReason);
+        .putExtra(KEY_STOP_REASON, stopReason);
   }
 
   /**
@@ -285,25 +278,25 @@ public abstract class DownloadService extends Service {
   }
 
   /**
-   * Builds an {@link Intent} for setting the manual stop reason for one or all downloads. To clear
-   * the manual stop reason, pass {@link Download#MANUAL_STOP_REASON_NONE}.
+   * Builds an {@link Intent} for setting the stop reason for one or all downloads. To clear the
+   * stop reason, pass {@link Download#STOP_REASON_NONE}.
    *
    * @param context A {@link Context}.
    * @param clazz The concrete download service being targeted by the intent.
-   * @param id The content id, or {@code null} to set the manual stop reason for all downloads.
-   * @param manualStopReason An application defined stop reason.
+   * @param id The content id, or {@code null} to set the stop reason for all downloads.
+   * @param stopReason An application defined stop reason.
    * @param foreground Whether this intent will be used to start the service in the foreground.
    * @return Created Intent.
    */
-  public static Intent buildSetManualStopReasonIntent(
+  public static Intent buildSetStopReasonIntent(
       Context context,
       Class<? extends DownloadService> clazz,
       @Nullable String id,
-      int manualStopReason,
+      int stopReason,
       boolean foreground) {
-    return getIntent(context, clazz, ACTION_SET_MANUAL_STOP_REASON, foreground)
+    return getIntent(context, clazz, ACTION_SET_STOP_REASON, foreground)
         .putExtra(KEY_CONTENT_ID, id)
-        .putExtra(KEY_MANUAL_STOP_REASON, manualStopReason);
+        .putExtra(KEY_STOP_REASON, stopReason);
   }
 
   /**
@@ -364,23 +357,22 @@ public abstract class DownloadService extends Service {
   }
 
   /**
-   * Starts the service if not started already and sets the manual stop reason for one or all
-   * downloads. To clear manual stop reason, pass {@link Download#MANUAL_STOP_REASON_NONE}.
+   * Starts the service if not started already and sets the stop reason for one or all downloads. To
+   * clear stop reason, pass {@link Download#STOP_REASON_NONE}.
    *
    * @param context A {@link Context}.
    * @param clazz The concrete download service to be started.
-   * @param id The content id, or {@code null} to set the manual stop reason for all downloads.
-   * @param manualStopReason An application defined stop reason.
+   * @param id The content id, or {@code null} to set the stop reason for all downloads.
+   * @param stopReason An application defined stop reason.
    * @param foreground Whether the service is started in the foreground.
    */
-  public static void sendManualStopReason(
+  public static void sendStopReason(
       Context context,
       Class<? extends DownloadService> clazz,
       @Nullable String id,
-      int manualStopReason,
+      int stopReason,
       boolean foreground) {
-    Intent intent =
-        buildSetManualStopReasonIntent(context, clazz, id, manualStopReason, foreground);
+    Intent intent = buildSetStopReasonIntent(context, clazz, id, stopReason, foreground);
     startService(context, intent, foreground);
   }
 
@@ -481,9 +473,8 @@ public abstract class DownloadService extends Service {
         if (downloadRequest == null) {
           Log.e(TAG, "Ignored ADD: Missing " + KEY_DOWNLOAD_REQUEST + " extra");
         } else {
-          int manualStopReason =
-              intent.getIntExtra(KEY_MANUAL_STOP_REASON, Download.MANUAL_STOP_REASON_NONE);
-          downloadManager.addDownload(downloadRequest, manualStopReason);
+          int stopReason = intent.getIntExtra(KEY_STOP_REASON, Download.STOP_REASON_NONE);
+          downloadManager.addDownload(downloadRequest, stopReason);
         }
         break;
       case ACTION_START:
@@ -492,15 +483,13 @@ public abstract class DownloadService extends Service {
       case ACTION_STOP:
         downloadManager.stopDownloads();
         break;
-      case ACTION_SET_MANUAL_STOP_REASON:
-        if (!intent.hasExtra(KEY_MANUAL_STOP_REASON)) {
-          Log.e(
-              TAG, "Ignored SET_MANUAL_STOP_REASON: Missing " + KEY_MANUAL_STOP_REASON + " extra");
+      case ACTION_SET_STOP_REASON:
+        if (!intent.hasExtra(KEY_STOP_REASON)) {
+          Log.e(TAG, "Ignored SET_MANUAL_STOP_REASON: Missing " + KEY_STOP_REASON + " extra");
         } else {
           String contentId = intent.getStringExtra(KEY_CONTENT_ID);
-          int manualStopReason =
-              intent.getIntExtra(KEY_MANUAL_STOP_REASON, Download.MANUAL_STOP_REASON_NONE);
-          downloadManager.setManualStopReason(contentId, manualStopReason);
+          int stopReason = intent.getIntExtra(KEY_STOP_REASON, Download.STOP_REASON_NONE);
+          downloadManager.setStopReason(contentId, stopReason);
         }
         break;
       case ACTION_REMOVE:
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/WritableDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/WritableDownloadIndex.java
index 24f4421bc4..2306363cf5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/WritableDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/WritableDownloadIndex.java
@@ -36,24 +36,24 @@ public interface WritableDownloadIndex extends DownloadIndex {
    */
   void removeDownload(String id) throws IOException;
   /**
-   * Sets the manual stop reason of the downloads in a terminal state ({@link
-   * Download#STATE_COMPLETED}, {@link Download#STATE_FAILED}).
+   * Sets the stop reason of the downloads in a terminal state ({@link Download#STATE_COMPLETED},
+   * {@link Download#STATE_FAILED}).
    *
-   * @param manualStopReason The manual stop reason.
+   * @param stopReason The stop reason.
    * @throws throws IOException If an error occurs updating the state.
    */
-  void setManualStopReason(int manualStopReason) throws IOException;
+  void setStopReason(int stopReason) throws IOException;
 
   /**
-   * Sets the manual stop reason of the download with the given {@code id} in a terminal state
-   * ({@link Download#STATE_COMPLETED}, {@link Download#STATE_FAILED}).
+   * Sets the stop reason of the download with the given {@code id} in a terminal state ({@link
+   * Download#STATE_COMPLETED}, {@link Download#STATE_FAILED}).
    *
    * <p>If there's no {@link Download} with the given {@code id} or it isn't in a terminal state,
    * then nothing happens.
    *
    * @param id ID of a {@link Download}.
-   * @param manualStopReason The manual stop reason.
+   * @param stopReason The stop reason.
    * @throws throws IOException If an error occurs updating the state.
    */
-  void setManualStopReason(String id, int manualStopReason) throws IOException;
+  void setStopReason(String id, int stopReason) throws IOException;
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
index 5bd1f34ed4..a426a7488b 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
@@ -79,7 +79,7 @@ public class DefaultDownloadIndexTest {
             .setDownloadedBytes(200)
             .setTotalBytes(400)
             .setFailureReason(Download.FAILURE_REASON_UNKNOWN)
-            .setManualStopReason(0x12345678)
+            .setStopReason(0x12345678)
             .setStartTimeMs(10)
             .setUpdateTimeMs(20)
             .setStreamKeys(
@@ -204,23 +204,22 @@ public class DefaultDownloadIndexTest {
   }
 
   @Test
-  public void setManualStopReason_setReasonToNone() throws Exception {
+  public void setStopReason_setReasonToNone() throws Exception {
     String id = "id";
     DownloadBuilder downloadBuilder =
-        new DownloadBuilder(id).setState(Download.STATE_COMPLETED).setManualStopReason(0x12345678);
+        new DownloadBuilder(id).setState(Download.STATE_COMPLETED).setStopReason(0x12345678);
     Download download = downloadBuilder.build();
     downloadIndex.putDownload(download);
 
-    downloadIndex.setManualStopReason(Download.MANUAL_STOP_REASON_NONE);
+    downloadIndex.setStopReason(Download.STOP_REASON_NONE);
 
     Download readDownload = downloadIndex.getDownload(id);
-    Download expectedDownload =
-        downloadBuilder.setManualStopReason(Download.MANUAL_STOP_REASON_NONE).build();
+    Download expectedDownload = downloadBuilder.setStopReason(Download.STOP_REASON_NONE).build();
     assertEqual(readDownload, expectedDownload);
   }
 
   @Test
-  public void setManualStopReason_setReason() throws Exception {
+  public void setStopReason_setReason() throws Exception {
     String id = "id";
     DownloadBuilder downloadBuilder =
         new DownloadBuilder(id)
@@ -228,47 +227,46 @@ public class DefaultDownloadIndexTest {
             .setFailureReason(Download.FAILURE_REASON_UNKNOWN);
     Download download = downloadBuilder.build();
     downloadIndex.putDownload(download);
-    int manualStopReason = 0x12345678;
+    int stopReason = 0x12345678;
 
-    downloadIndex.setManualStopReason(manualStopReason);
+    downloadIndex.setStopReason(stopReason);
 
     Download readDownload = downloadIndex.getDownload(id);
-    Download expectedDownload = downloadBuilder.setManualStopReason(manualStopReason).build();
+    Download expectedDownload = downloadBuilder.setStopReason(stopReason).build();
     assertEqual(readDownload, expectedDownload);
   }
 
   @Test
-  public void setManualStopReason_notTerminalState_doesNotSetManualStopReason() throws Exception {
+  public void setStopReason_notTerminalState_doesNotSetStopReason() throws Exception {
     String id = "id";
     DownloadBuilder downloadBuilder = new DownloadBuilder(id).setState(Download.STATE_DOWNLOADING);
     Download download = downloadBuilder.build();
     downloadIndex.putDownload(download);
     int notMetRequirements = 0x12345678;
 
-    downloadIndex.setManualStopReason(notMetRequirements);
+    downloadIndex.setStopReason(notMetRequirements);
 
     Download readDownload = downloadIndex.getDownload(id);
     assertEqual(readDownload, download);
   }
 
   @Test
-  public void setSingleDownloadManualStopReason_setReasonToNone() throws Exception {
+  public void setSingleDownloadStopReason_setReasonToNone() throws Exception {
     String id = "id";
     DownloadBuilder downloadBuilder =
-        new DownloadBuilder(id).setState(Download.STATE_COMPLETED).setManualStopReason(0x12345678);
+        new DownloadBuilder(id).setState(Download.STATE_COMPLETED).setStopReason(0x12345678);
     Download download = downloadBuilder.build();
     downloadIndex.putDownload(download);
 
-    downloadIndex.setManualStopReason(id, Download.MANUAL_STOP_REASON_NONE);
+    downloadIndex.setStopReason(id, Download.STOP_REASON_NONE);
 
     Download readDownload = downloadIndex.getDownload(id);
-    Download expectedDownload =
-        downloadBuilder.setManualStopReason(Download.MANUAL_STOP_REASON_NONE).build();
+    Download expectedDownload = downloadBuilder.setStopReason(Download.STOP_REASON_NONE).build();
     assertEqual(readDownload, expectedDownload);
   }
 
   @Test
-  public void setSingleDownloadManualStopReason_setReason() throws Exception {
+  public void setSingleDownloadStopReason_setReason() throws Exception {
     String id = "id";
     DownloadBuilder downloadBuilder =
         new DownloadBuilder(id)
@@ -276,25 +274,24 @@ public class DefaultDownloadIndexTest {
             .setFailureReason(Download.FAILURE_REASON_UNKNOWN);
     Download download = downloadBuilder.build();
     downloadIndex.putDownload(download);
-    int manualStopReason = 0x12345678;
+    int stopReason = 0x12345678;
 
-    downloadIndex.setManualStopReason(id, manualStopReason);
+    downloadIndex.setStopReason(id, stopReason);
 
     Download readDownload = downloadIndex.getDownload(id);
-    Download expectedDownload = downloadBuilder.setManualStopReason(manualStopReason).build();
+    Download expectedDownload = downloadBuilder.setStopReason(stopReason).build();
     assertEqual(readDownload, expectedDownload);
   }
 
   @Test
-  public void setSingleDownloadManualStopReason_notTerminalState_doesNotSetManualStopReason()
-      throws Exception {
+  public void setSingleDownloadStopReason_notTerminalState_doesNotSetStopReason() throws Exception {
     String id = "id";
     DownloadBuilder downloadBuilder = new DownloadBuilder(id).setState(Download.STATE_DOWNLOADING);
     Download download = downloadBuilder.build();
     downloadIndex.putDownload(download);
     int notMetRequirements = 0x12345678;
 
-    downloadIndex.setManualStopReason(id, notMetRequirements);
+    downloadIndex.setStopReason(id, notMetRequirements);
 
     Download readDownload = downloadIndex.getDownload(id);
     assertEqual(readDownload, download);
@@ -306,7 +303,7 @@ public class DefaultDownloadIndexTest {
     assertThat(download.startTimeMs).isEqualTo(that.startTimeMs);
     assertThat(download.updateTimeMs).isEqualTo(that.updateTimeMs);
     assertThat(download.failureReason).isEqualTo(that.failureReason);
-    assertThat(download.manualStopReason).isEqualTo(that.manualStopReason);
+    assertThat(download.stopReason).isEqualTo(that.stopReason);
     assertThat(download.getDownloadPercentage()).isEqualTo(that.getDownloadPercentage());
     assertThat(download.getDownloadedBytes()).isEqualTo(that.getDownloadedBytes());
     assertThat(download.getTotalBytes()).isEqualTo(that.getTotalBytes());
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadBuilder.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadBuilder.java
index 2e14caa5bd..b5d84fa4bc 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadBuilder.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadBuilder.java
@@ -37,7 +37,7 @@ class DownloadBuilder {
   @Nullable private String cacheKey;
   private int state;
   private int failureReason;
-  private int manualStopReason;
+  private int stopReason;
   private long startTimeMs;
   private long updateTimeMs;
   private List<StreamKey> streamKeys;
@@ -127,8 +127,8 @@ class DownloadBuilder {
     return this;
   }
 
-  public DownloadBuilder setManualStopReason(int manualStopReason) {
-    this.manualStopReason = manualStopReason;
+  public DownloadBuilder setStopReason(int stopReason) {
+    this.stopReason = stopReason;
     return this;
   }
 
@@ -156,6 +156,6 @@ class DownloadBuilder {
     DownloadRequest request =
         new DownloadRequest(id, type, uri, streamKeys, cacheKey, customMetadata);
     return new Download(
-        request, state, failureReason, manualStopReason, startTimeMs, updateTimeMs, counters);
+        request, state, failureReason, stopReason, startTimeMs, updateTimeMs, counters);
   }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index 140347bd91..2909bfd779 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -57,7 +57,7 @@ public class DownloadManagerTest {
   private static final int MAX_RETRY_DELAY = 5000;
   /** Maximum number of times a downloader can be restarted before doing a released check. */
   private static final int MAX_STARTS_BEFORE_RELEASED = 1;
-  /** A manual stop reason. */
+  /** A stop reason. */
   private static final int APP_STOP_REASON = 1;
   /** The minimum number of times a task must be retried before failing. */
   private static final int MIN_RETRY_COUNT = 3;
@@ -401,12 +401,11 @@ public class DownloadManagerTest {
 
     task.assertDownloading();
 
-    runOnMainThread(() -> downloadManager.setManualStopReason(task.taskId, APP_STOP_REASON));
+    runOnMainThread(() -> downloadManager.setStopReason(task.taskId, APP_STOP_REASON));
 
     task.assertStopped();
 
-    runOnMainThread(
-        () -> downloadManager.setManualStopReason(task.taskId, Download.MANUAL_STOP_REASON_NONE));
+    runOnMainThread(() -> downloadManager.setStopReason(task.taskId, Download.STOP_REASON_NONE));
 
     runner.getDownloader(1).assertStarted().unblock();
 
@@ -420,7 +419,7 @@ public class DownloadManagerTest {
 
     task.assertDownloading();
 
-    runOnMainThread(() -> downloadManager.setManualStopReason(task.taskId, APP_STOP_REASON));
+    runOnMainThread(() -> downloadManager.setStopReason(task.taskId, APP_STOP_REASON));
 
     task.assertStopped();
 
@@ -440,8 +439,7 @@ public class DownloadManagerTest {
     runner1.postDownloadRequest().getTask().assertDownloading();
     runner2.postDownloadRequest().postRemoveRequest().getTask().assertRemoving();
 
-    runOnMainThread(
-        () -> downloadManager.setManualStopReason(runner1.getTask().taskId, APP_STOP_REASON));
+    runOnMainThread(() -> downloadManager.setStopReason(runner1.getTask().taskId, APP_STOP_REASON));
 
     runner1.getTask().assertStopped();
 
@@ -462,7 +460,7 @@ public class DownloadManagerTest {
     Download download = downloadBuilder.build();
 
     Download mergedDownload =
-        DownloadManager.mergeRequest(download, downloadRequest, download.manualStopReason);
+        DownloadManager.mergeRequest(download, downloadRequest, download.stopReason);
 
     Download expectedDownload = downloadBuilder.setState(Download.STATE_RESTARTING).build();
     assertEqualIgnoringTimeFields(mergedDownload, expectedDownload);
@@ -478,7 +476,7 @@ public class DownloadManagerTest {
     Download download = downloadBuilder.build();
 
     Download mergedDownload =
-        DownloadManager.mergeRequest(download, downloadRequest, download.manualStopReason);
+        DownloadManager.mergeRequest(download, downloadRequest, download.stopReason);
 
     Download expectedDownload =
         downloadBuilder
@@ -494,26 +492,26 @@ public class DownloadManagerTest {
     DownloadBuilder downloadBuilder =
         new DownloadBuilder(downloadRequest)
             .setState(Download.STATE_STOPPED)
-            .setManualStopReason(/* manualStopReason= */ 1);
+            .setStopReason(/* stopReason= */ 1);
     Download download = downloadBuilder.build();
 
     Download mergedDownload =
-        DownloadManager.mergeRequest(download, downloadRequest, download.manualStopReason);
+        DownloadManager.mergeRequest(download, downloadRequest, download.stopReason);
 
     assertEqualIgnoringTimeFields(mergedDownload, download);
   }
 
   @Test
-  public void mergeRequest_manualStopReasonSetButNotStopped_becomesStopped() {
+  public void mergeRequest_stopReasonSetButNotStopped_becomesStopped() {
     DownloadRequest downloadRequest = createDownloadRequest();
     DownloadBuilder downloadBuilder =
         new DownloadBuilder(downloadRequest)
             .setState(Download.STATE_COMPLETED)
-            .setManualStopReason(/* manualStopReason= */ 1);
+            .setStopReason(/* stopReason= */ 1);
     Download download = downloadBuilder.build();
 
     Download mergedDownload =
-        DownloadManager.mergeRequest(download, downloadRequest, download.manualStopReason);
+        DownloadManager.mergeRequest(download, downloadRequest, download.stopReason);
 
     Download expectedDownload = downloadBuilder.setState(Download.STATE_STOPPED).build();
     assertEqualIgnoringTimeFields(mergedDownload, expectedDownload);
@@ -560,7 +558,7 @@ public class DownloadManagerTest {
     assertThat(download.request).isEqualTo(that.request);
     assertThat(download.state).isEqualTo(that.state);
     assertThat(download.failureReason).isEqualTo(that.failureReason);
-    assertThat(download.manualStopReason).isEqualTo(that.manualStopReason);
+    assertThat(download.stopReason).isEqualTo(that.stopReason);
     assertThat(download.getDownloadPercentage()).isEqualTo(that.getDownloadPercentage());
     assertThat(download.getDownloadedBytes()).isEqualTo(that.getDownloadedBytes());
     assertThat(download.getTotalBytes()).isEqualTo(that.getTotalBytes());

From 8c624081201b418c51747af753e41880d14f1edf Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 18 Apr 2019 18:48:09 +0100
Subject: [PATCH 790/832] Rename start/stopDownloads to resume/pauseDownloads

PiperOrigin-RevId: 244216620
---
 .../exoplayer2/offline/DownloadManager.java   |  34 ++--
 .../exoplayer2/offline/DownloadService.java   | 146 ++++++++++--------
 .../offline/DownloadManagerTest.java          |   6 +-
 .../dash/offline/DownloadManagerDashTest.java |   2 +-
 .../dash/offline/DownloadServiceDashTest.java |   2 +-
 5 files changed, 105 insertions(+), 85 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 497e3476af..c34a5e233a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -55,8 +55,8 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
  * Manages downloads.
  *
  * <p>Normally a download manager should be accessed via a {@link DownloadService}. When a download
- * manager is used directly instead, downloads will be initially stopped and so must be started by
- * calling {@link #startDownloads()}.
+ * manager is used directly instead, downloads will be initially paused and so must be resumed by
+ * calling {@link #resumeDownloads()}.
  *
  * <p>A download manager instance must be accessed only from the thread that created it, unless that
  * thread does not have a {@link Looper}. In that case, it must be accessed only from the
@@ -126,7 +126,7 @@ public final class DownloadManager {
 
   // Messages posted to the background handler.
   private static final int MSG_INITIALIZE = 0;
-  private static final int MSG_SET_DOWNLOADS_STARTED = 1;
+  private static final int MSG_SET_DOWNLOADS_RESUMED = 1;
   private static final int MSG_SET_NOT_MET_REQUIREMENTS = 2;
   private static final int MSG_SET_STOP_REASON = 3;
   private static final int MSG_ADD_DOWNLOAD = 4;
@@ -179,7 +179,7 @@ public final class DownloadManager {
 
   // Mutable fields that are accessed on the internal thread.
   @Requirements.RequirementFlags private int notMetRequirements;
-  private boolean downloadsStarted;
+  private boolean downloadsResumed;
   private int simultaneousDownloads;
 
   /**
@@ -346,19 +346,19 @@ public final class DownloadManager {
     return Collections.unmodifiableList(new ArrayList<>(downloads));
   }
 
-  /** Starts all downloads except those that have a non-zero {@link Download#stopReason}. */
-  public void startDownloads() {
+  /** Resumes all downloads except those that have a non-zero {@link Download#stopReason}. */
+  public void resumeDownloads() {
     pendingMessages++;
     internalHandler
-        .obtainMessage(MSG_SET_DOWNLOADS_STARTED, /* downloadsStarted */ 1, /* unused */ 0)
+        .obtainMessage(MSG_SET_DOWNLOADS_RESUMED, /* downloadsResumed */ 1, /* unused */ 0)
         .sendToTarget();
   }
 
-  /** Stops all downloads. */
-  public void stopDownloads() {
+  /** Pauses all downloads. */
+  public void pauseDownloads() {
     pendingMessages++;
     internalHandler
-        .obtainMessage(MSG_SET_DOWNLOADS_STARTED, /* downloadsStarted */ 0, /* unused */ 0)
+        .obtainMessage(MSG_SET_DOWNLOADS_RESUMED, /* downloadsResumed */ 0, /* unused */ 0)
         .sendToTarget();
   }
 
@@ -541,9 +541,9 @@ public final class DownloadManager {
         int notMetRequirements = message.arg1;
         initializeInternal(notMetRequirements);
         break;
-      case MSG_SET_DOWNLOADS_STARTED:
-        boolean downloadsStarted = message.arg1 != 0;
-        setDownloadsStarted(downloadsStarted);
+      case MSG_SET_DOWNLOADS_RESUMED:
+        boolean downloadsResumed = message.arg1 != 0;
+        setDownloadsResumed(downloadsResumed);
         break;
       case MSG_SET_NOT_MET_REQUIREMENTS:
         notMetRequirements = message.arg1;
@@ -604,11 +604,11 @@ public final class DownloadManager {
     }
   }
 
-  private void setDownloadsStarted(boolean downloadsStarted) {
-    if (this.downloadsStarted == downloadsStarted) {
+  private void setDownloadsResumed(boolean downloadsResumed) {
+    if (this.downloadsResumed == downloadsResumed) {
       return;
     }
-    this.downloadsStarted = downloadsStarted;
+    this.downloadsResumed = downloadsResumed;
     for (int i = 0; i < downloadInternals.size(); i++) {
       downloadInternals.get(i).updateStopState();
     }
@@ -813,7 +813,7 @@ public final class DownloadManager {
   }
 
   private boolean canStartDownloads() {
-    return downloadsStarted && notMetRequirements == 0;
+    return downloadsResumed && notMetRequirements == 0;
   }
 
   /* package */ static Download mergeRequest(
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index fa74afacb3..9de6c748fb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -66,24 +66,24 @@ public abstract class DownloadService extends Service {
   public static final String ACTION_ADD = "com.google.android.exoplayer.downloadService.action.ADD";
 
   /**
-   * Starts all downloads except those that have a non-zero {@link Download#stopReason}. Extras:
+   * Resumes all downloads except those that have a non-zero {@link Download#stopReason}. Extras:
    *
    * <ul>
    *   <li>{@link #KEY_FOREGROUND} - See {@link #KEY_FOREGROUND}.
    * </ul>
    */
-  public static final String ACTION_START =
-      "com.google.android.exoplayer.downloadService.action.START";
+  public static final String ACTION_RESUME =
+      "com.google.android.exoplayer.downloadService.action.RESUME";
 
   /**
-   * Stops all downloads. Extras:
+   * Pauses all downloads. Extras:
    *
    * <ul>
    *   <li>{@link #KEY_FOREGROUND} - See {@link #KEY_FOREGROUND}.
    * </ul>
    */
-  public static final String ACTION_STOP =
-      "com.google.android.exoplayer.downloadService.action.STOP";
+  public static final String ACTION_PAUSE =
+      "com.google.android.exoplayer.downloadService.action.PAUSE";
 
   /**
    * Sets the stop reason for one or all downloads. To clear the stop reason, pass {@link
@@ -277,6 +277,32 @@ public abstract class DownloadService extends Service {
     return getIntent(context, clazz, ACTION_REMOVE, foreground).putExtra(KEY_CONTENT_ID, id);
   }
 
+  /**
+   * Builds an {@link Intent} for resuming all downloads.
+   *
+   * @param context A {@link Context}.
+   * @param clazz The concrete download service being targeted by the intent.
+   * @param foreground Whether this intent will be used to start the service in the foreground.
+   * @return Created Intent.
+   */
+  public static Intent buildResumeDownloadsIntent(
+      Context context, Class<? extends DownloadService> clazz, boolean foreground) {
+    return getIntent(context, clazz, ACTION_RESUME, foreground);
+  }
+
+  /**
+   * Builds an {@link Intent} to pause all downloads.
+   *
+   * @param context A {@link Context}.
+   * @param clazz The concrete download service being targeted by the intent.
+   * @param foreground Whether this intent will be used to start the service in the foreground.
+   * @return Created Intent.
+   */
+  public static Intent buildPauseDownloadsIntent(
+      Context context, Class<? extends DownloadService> clazz, boolean foreground) {
+    return getIntent(context, clazz, ACTION_PAUSE, foreground);
+  }
+
   /**
    * Builds an {@link Intent} for setting the stop reason for one or all downloads. To clear the
    * stop reason, pass {@link Download#STOP_REASON_NONE}.
@@ -299,32 +325,6 @@ public abstract class DownloadService extends Service {
         .putExtra(KEY_STOP_REASON, stopReason);
   }
 
-  /**
-   * Builds an {@link Intent} for starting all downloads.
-   *
-   * @param context A {@link Context}.
-   * @param clazz The concrete download service being targeted by the intent.
-   * @param foreground Whether this intent will be used to start the service in the foreground.
-   * @return Created Intent.
-   */
-  public static Intent buildStartDownloadsIntent(
-      Context context, Class<? extends DownloadService> clazz, boolean foreground) {
-    return getIntent(context, clazz, ACTION_START, foreground);
-  }
-
-  /**
-   * Builds an {@link Intent} for stopping all downloads.
-   *
-   * @param context A {@link Context}.
-   * @param clazz The concrete download service being targeted by the intent.
-   * @param foreground Whether this intent will be used to start the service in the foreground.
-   * @return Created Intent.
-   */
-  public static Intent buildStopDownloadsIntent(
-      Context context, Class<? extends DownloadService> clazz, boolean foreground) {
-    return getIntent(context, clazz, ACTION_STOP, foreground);
-  }
-
   /**
    * Starts the service if not started already and adds a new download.
    *
@@ -342,6 +342,26 @@ public abstract class DownloadService extends Service {
     startService(context, intent, foreground);
   }
 
+  /**
+   * Starts the service if not started already and adds a new download.
+   *
+   * @param context A {@link Context}.
+   * @param clazz The concrete download service to be started.
+   * @param downloadRequest The request to be executed.
+   * @param stopReason An initial stop reason for the download, or {@link Download#STOP_REASON_NONE}
+   *     if the download should be started.
+   * @param foreground Whether the service is started in the foreground.
+   */
+  public static void sendNewDownload(
+      Context context,
+      Class<? extends DownloadService> clazz,
+      DownloadRequest downloadRequest,
+      int stopReason,
+      boolean foreground) {
+    Intent intent = buildAddRequestIntent(context, clazz, downloadRequest, stopReason, foreground);
+    startService(context, intent, foreground);
+  }
+
   /**
    * Starts the service if not started already and removes a download.
    *
@@ -356,6 +376,32 @@ public abstract class DownloadService extends Service {
     startService(context, intent, foreground);
   }
 
+  /**
+   * Starts the service if not started already and resumes all downloads.
+   *
+   * @param context A {@link Context}.
+   * @param clazz The concrete download service to be started.
+   * @param foreground Whether the service is started in the foreground.
+   */
+  public static void sendResumeDownloads(
+      Context context, Class<? extends DownloadService> clazz, boolean foreground) {
+    Intent intent = buildResumeDownloadsIntent(context, clazz, foreground);
+    startService(context, intent, foreground);
+  }
+
+  /**
+   * Starts the service if not started already and pauses all downloads.
+   *
+   * @param context A {@link Context}.
+   * @param clazz The concrete download service to be started.
+   * @param foreground Whether the service is started in the foreground.
+   */
+  public static void sendPauseDownloads(
+      Context context, Class<? extends DownloadService> clazz, boolean foreground) {
+    Intent intent = buildPauseDownloadsIntent(context, clazz, foreground);
+    startService(context, intent, foreground);
+  }
+
   /**
    * Starts the service if not started already and sets the stop reason for one or all downloads. To
    * clear stop reason, pass {@link Download#STOP_REASON_NONE}.
@@ -376,32 +422,6 @@ public abstract class DownloadService extends Service {
     startService(context, intent, foreground);
   }
 
-  /**
-   * Starts the service if not started already and starts all downloads.
-   *
-   * @param context A {@link Context}.
-   * @param clazz The concrete download service to be started.
-   * @param foreground Whether the service is started in the foreground.
-   */
-  public static void sendStartDownloads(
-      Context context, Class<? extends DownloadService> clazz, boolean foreground) {
-    Intent intent = buildStartDownloadsIntent(context, clazz, foreground);
-    startService(context, intent, foreground);
-  }
-
-  /**
-   * Starts the service if not started already and stops all downloads.
-   *
-   * @param context A {@link Context}.
-   * @param clazz The concrete download service to be started.
-   * @param foreground Whether the service is started in the foreground.
-   */
-  public static void sendStopDownloads(
-      Context context, Class<? extends DownloadService> clazz, boolean foreground) {
-    Intent intent = buildStopDownloadsIntent(context, clazz, foreground);
-    startService(context, intent, foreground);
-  }
-
   /**
    * Starts a download service to resume any ongoing downloads.
    *
@@ -438,7 +458,7 @@ public abstract class DownloadService extends Service {
     DownloadManagerHelper downloadManagerHelper = downloadManagerListeners.get(clazz);
     if (downloadManagerHelper == null) {
       DownloadManager downloadManager = getDownloadManager();
-      downloadManager.startDownloads();
+      downloadManager.resumeDownloads();
       downloadManagerHelper =
           new DownloadManagerHelper(
               getApplicationContext(), downloadManager, getScheduler(), clazz);
@@ -477,11 +497,11 @@ public abstract class DownloadService extends Service {
           downloadManager.addDownload(downloadRequest, stopReason);
         }
         break;
-      case ACTION_START:
-        downloadManager.startDownloads();
+      case ACTION_RESUME:
+        downloadManager.resumeDownloads();
         break;
-      case ACTION_STOP:
-        downloadManager.stopDownloads();
+      case ACTION_PAUSE:
+        downloadManager.pauseDownloads();
         break;
       case ACTION_SET_STOP_REASON:
         if (!intent.hasExtra(KEY_STOP_REASON)) {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index 2909bfd779..b1864165b3 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -368,7 +368,7 @@ public class DownloadManagerTest {
     runner2.postDownloadRequest().postRemoveRequest().getTask().assertRemoving();
     runner2.postDownloadRequest();
 
-    runOnMainThread(() -> downloadManager.stopDownloads());
+    runOnMainThread(() -> downloadManager.pauseDownloads());
 
     runner1.getTask().assertStopped();
 
@@ -386,7 +386,7 @@ public class DownloadManagerTest {
     // New download requests can be added but they don't start.
     runner3.postDownloadRequest().getDownloader(0).assertDoesNotStart();
 
-    runOnMainThread(() -> downloadManager.startDownloads());
+    runOnMainThread(() -> downloadManager.resumeDownloads());
 
     runner2.getDownloader(2).assertStarted().unblock();
     runner3.getDownloader(0).assertStarted().unblock();
@@ -532,7 +532,7 @@ public class DownloadManagerTest {
                     maxActiveDownloadTasks,
                     MIN_RETRY_COUNT,
                     new Requirements(0));
-            downloadManager.startDownloads();
+            downloadManager.resumeDownloads();
             downloadManagerListener =
                 new TestDownloadManagerListener(downloadManager, dummyMainThread);
           });
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
index 0dce24bf1d..02af54836c 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
@@ -268,7 +268,7 @@ public class DownloadManagerDashTest {
           downloadManagerListener =
               new TestDownloadManagerListener(
                   downloadManager, dummyMainThread, /* timeout= */ 3000);
-          downloadManager.startDownloads();
+          downloadManager.resumeDownloads();
         });
   }
 
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
index a35b6d1ea4..b2b42c987e 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
@@ -126,7 +126,7 @@ public class DownloadServiceDashTest {
                   new Requirements(0));
           downloadManagerListener =
               new TestDownloadManagerListener(dashDownloadManager, dummyMainThread);
-          dashDownloadManager.startDownloads();
+          dashDownloadManager.resumeDownloads();
 
           dashDownloadService =
               new DownloadService(DownloadService.FOREGROUND_NOTIFICATION_ID_NONE) {

From 38c5350c2cfbb86264081db7d367584f80f32044 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 18 Apr 2019 19:19:38 +0100
Subject: [PATCH 791/832] Simplify DownloadManager constructors

PiperOrigin-RevId: 244223870
---
 .../exoplayer2/demo/DemoApplication.java      |   8 +-
 .../exoplayer2/offline/DownloadManager.java   | 105 +++++++-----------
 .../offline/DownloadManagerTest.java          |  12 +-
 .../dash/offline/DownloadManagerDashTest.java |   6 +-
 .../dash/offline/DownloadServiceDashTest.java |   6 +-
 5 files changed, 46 insertions(+), 91 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
index 446184e56b..2c9cd43d1e 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
@@ -49,7 +49,6 @@ public class DemoApplication extends Application {
   private static final String DOWNLOAD_ACTION_FILE = "actions";
   private static final String DOWNLOAD_TRACKER_ACTION_FILE = "tracked_actions";
   private static final String DOWNLOAD_CONTENT_DIRECTORY = "downloads";
-  private static final int MAX_SIMULTANEOUS_DOWNLOADS = 2;
 
   protected String userAgent;
 
@@ -122,12 +121,7 @@ public class DemoApplication extends Application {
           new DownloaderConstructorHelper(getDownloadCache(), buildHttpDataSourceFactory());
       downloadManager =
           new DownloadManager(
-              this,
-              downloadIndex,
-              new DefaultDownloaderFactory(downloaderConstructorHelper),
-              MAX_SIMULTANEOUS_DOWNLOADS,
-              DownloadManager.DEFAULT_MIN_RETRY_COUNT,
-              DownloadManager.DEFAULT_REQUIREMENTS);
+              this, downloadIndex, new DefaultDownloaderFactory(downloaderConstructorHelper));
       downloadTracker =
           new DownloadTracker(/* context= */ this, buildDataSourceFactory(), downloadManager);
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index c34a5e233a..f914c861f9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -34,7 +34,6 @@ import android.os.Message;
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.database.DatabaseProvider;
 import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.scheduler.RequirementsWatcher;
 import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
@@ -111,8 +110,8 @@ public final class DownloadManager {
         @Requirements.RequirementFlags int notMetRequirements) {}
   }
 
-  /** The default maximum number of simultaneous downloads. */
-  public static final int DEFAULT_MAX_SIMULTANEOUS_DOWNLOADS = 1;
+  /** The default maximum number of parallel downloads. */
+  public static final int DEFAULT_MAX_PARALLEL_DOWNLOADS = 3;
   /** The default minimum number of times a download must be retried before failing. */
   public static final int DEFAULT_MIN_RETRY_COUNT = 5;
   /** The default requirement is that the device has network connectivity. */
@@ -151,8 +150,6 @@ public final class DownloadManager {
   private static final String TAG = "DownloadManager";
   private static final boolean DEBUG = false;
 
-  private final int maxSimultaneousDownloads;
-  private final int minRetryCount;
   private final Context context;
   private final WritableDownloadIndex downloadIndex;
   private final DownloaderFactory downloaderFactory;
@@ -180,51 +177,11 @@ public final class DownloadManager {
   // Mutable fields that are accessed on the internal thread.
   @Requirements.RequirementFlags private int notMetRequirements;
   private boolean downloadsResumed;
-  private int simultaneousDownloads;
+  private int parallelDownloads;
 
-  /**
-   * Constructs a {@link DownloadManager}.
-   *
-   * @param context Any context.
-   * @param databaseProvider Provides the database that holds the downloads.
-   * @param downloaderFactory A factory for creating {@link Downloader}s.
-   */
-  public DownloadManager(
-      Context context, DatabaseProvider databaseProvider, DownloaderFactory downloaderFactory) {
-    this(
-        context,
-        databaseProvider,
-        downloaderFactory,
-        DEFAULT_MAX_SIMULTANEOUS_DOWNLOADS,
-        DEFAULT_MIN_RETRY_COUNT,
-        DEFAULT_REQUIREMENTS);
-  }
-
-  /**
-   * Constructs a {@link DownloadManager}.
-   *
-   * @param context Any context.
-   * @param databaseProvider Provides the database that holds the downloads.
-   * @param downloaderFactory A factory for creating {@link Downloader}s.
-   * @param maxSimultaneousDownloads The maximum number of simultaneous downloads.
-   * @param minRetryCount The minimum number of times a download must be retried before failing.
-   * @param requirements The requirements needed to be met to start downloads.
-   */
-  public DownloadManager(
-      Context context,
-      DatabaseProvider databaseProvider,
-      DownloaderFactory downloaderFactory,
-      int maxSimultaneousDownloads,
-      int minRetryCount,
-      Requirements requirements) {
-    this(
-        context,
-        new DefaultDownloadIndex(databaseProvider),
-        downloaderFactory,
-        maxSimultaneousDownloads,
-        minRetryCount,
-        requirements);
-  }
+  // TODO: Fix these to properly support changes at runtime.
+  private volatile int maxParallelDownloads;
+  private volatile int minRetryCount;
 
   /**
    * Constructs a {@link DownloadManager}.
@@ -232,22 +189,14 @@ public final class DownloadManager {
    * @param context Any context.
    * @param downloadIndex The download index used to hold the download information.
    * @param downloaderFactory A factory for creating {@link Downloader}s.
-   * @param maxSimultaneousDownloads The maximum number of simultaneous downloads.
-   * @param minRetryCount The minimum number of times a download must be retried before failing.
-   * @param requirements The requirements needed to be met to start downloads.
    */
   public DownloadManager(
-      Context context,
-      WritableDownloadIndex downloadIndex,
-      DownloaderFactory downloaderFactory,
-      int maxSimultaneousDownloads,
-      int minRetryCount,
-      Requirements requirements) {
+      Context context, WritableDownloadIndex downloadIndex, DownloaderFactory downloaderFactory) {
     this.context = context.getApplicationContext();
     this.downloadIndex = downloadIndex;
     this.downloaderFactory = downloaderFactory;
-    this.maxSimultaneousDownloads = maxSimultaneousDownloads;
-    this.minRetryCount = minRetryCount;
+    maxParallelDownloads = DEFAULT_MAX_PARALLEL_DOWNLOADS;
+    minRetryCount = DEFAULT_MIN_RETRY_COUNT;
 
     downloadInternals = new ArrayList<>();
     downloads = new ArrayList<>();
@@ -262,7 +211,8 @@ public final class DownloadManager {
     internalThread.start();
     internalHandler = new Handler(internalThread.getLooper(), this::handleInternalMessage);
 
-    requirementsWatcher = new RequirementsWatcher(context, requirementsListener, requirements);
+    requirementsWatcher =
+        new RequirementsWatcher(context, requirementsListener, DEFAULT_REQUIREMENTS);
     int notMetRequirements = requirementsWatcher.start();
 
     pendingMessages = 1;
@@ -332,6 +282,27 @@ public final class DownloadManager {
     onRequirementsStateChanged(requirementsWatcher, notMetRequirements);
   }
 
+  /**
+   * Sets the maximum number of parallel downloads.
+   *
+   * @param maxParallelDownloads The maximum number of parallel downloads.
+   */
+  // TODO: Fix to properly support changes at runtime.
+  public void setMaxParallelDownloads(int maxParallelDownloads) {
+    this.maxParallelDownloads = maxParallelDownloads;
+  }
+
+  /**
+   * Sets the minimum number of times that a download will be retried. A download will fail if the
+   * specified number of retries is exceeded without any progress being made.
+   *
+   * @param minRetryCount The minimum number of times that a download will be retried.
+   */
+  // TODO: Fix to properly support changes at runtime.
+  public void setMinRetryCount(int minRetryCount) {
+    this.minRetryCount = minRetryCount;
+  }
+
   /** Returns the used {@link DownloadIndex}. */
   public DownloadIndex getDownloadIndex() {
     return downloadIndex;
@@ -696,15 +667,15 @@ public final class DownloadManager {
     downloadThreads.remove(downloadId);
     boolean tryToStartDownloads = false;
     if (!downloadThread.isRemove) {
-      // If maxSimultaneousDownloads was hit, there might be a download waiting for a slot.
-      tryToStartDownloads = simultaneousDownloads == maxSimultaneousDownloads;
-      simultaneousDownloads--;
+      // If maxParallelDownloads was hit, there might be a download waiting for a slot.
+      tryToStartDownloads = parallelDownloads == maxParallelDownloads;
+      parallelDownloads--;
     }
     getDownload(downloadId)
         .onDownloadThreadStopped(downloadThread.isCanceled, downloadThread.finalError);
     if (tryToStartDownloads) {
       for (int i = 0;
-          simultaneousDownloads < maxSimultaneousDownloads && i < downloadInternals.size();
+          parallelDownloads < maxParallelDownloads && i < downloadInternals.size();
           i++) {
         downloadInternals.get(i).start();
       }
@@ -760,10 +731,10 @@ public final class DownloadManager {
     }
     boolean isRemove = downloadInternal.isInRemoveState();
     if (!isRemove) {
-      if (simultaneousDownloads == maxSimultaneousDownloads) {
+      if (parallelDownloads == maxParallelDownloads) {
         return START_THREAD_TOO_MANY_DOWNLOADS;
       }
-      simultaneousDownloads++;
+      parallelDownloads++;
     }
     Downloader downloader = downloaderFactory.createDownloader(request);
     DownloadThread downloadThread =
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index b1864165b3..17328248c6 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -517,7 +517,7 @@ public class DownloadManagerTest {
     assertEqualIgnoringTimeFields(mergedDownload, expectedDownload);
   }
 
-  private void setUpDownloadManager(final int maxActiveDownloadTasks) throws Exception {
+  private void setUpDownloadManager(final int maxParallelDownloads) throws Exception {
     if (downloadManager != null) {
       releaseDownloadManager();
     }
@@ -526,12 +526,10 @@ public class DownloadManagerTest {
           () -> {
             downloadManager =
                 new DownloadManager(
-                    ApplicationProvider.getApplicationContext(),
-                    downloadIndex,
-                    downloaderFactory,
-                    maxActiveDownloadTasks,
-                    MIN_RETRY_COUNT,
-                    new Requirements(0));
+                    ApplicationProvider.getApplicationContext(), downloadIndex, downloaderFactory);
+            downloadManager.setMaxParallelDownloads(maxParallelDownloads);
+            downloadManager.setMinRetryCount(MIN_RETRY_COUNT);
+            downloadManager.setRequirements(new Requirements(0));
             downloadManager.resumeDownloads();
             downloadManagerListener =
                 new TestDownloadManagerListener(downloadManager, dummyMainThread);
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
index 02af54836c..9fc9834e1d 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
@@ -32,7 +32,6 @@ import com.google.android.exoplayer2.offline.DownloadManager;
 import com.google.android.exoplayer2.offline.DownloadRequest;
 import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
-import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.testutil.DummyMainThread;
 import com.google.android.exoplayer2.testutil.DummyMainThread.TestRunnable;
 import com.google.android.exoplayer2.testutil.FakeDataSet;
@@ -260,10 +259,7 @@ public class DownloadManagerDashTest {
                   ApplicationProvider.getApplicationContext(),
                   downloadIndex,
                   new DefaultDownloaderFactory(
-                      new DownloaderConstructorHelper(cache, fakeDataSourceFactory)),
-                  /* maxSimultaneousDownloads= */ 1,
-                  /* minRetryCount= */ 3,
-                  new Requirements(0));
+                      new DownloaderConstructorHelper(cache, fakeDataSourceFactory)));
 
           downloadManagerListener =
               new TestDownloadManagerListener(
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
index b2b42c987e..57e7b8de5f 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
@@ -35,7 +35,6 @@ import com.google.android.exoplayer2.offline.DownloadRequest;
 import com.google.android.exoplayer2.offline.DownloadService;
 import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
-import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.scheduler.Scheduler;
 import com.google.android.exoplayer2.testutil.DummyMainThread;
 import com.google.android.exoplayer2.testutil.FakeDataSet;
@@ -120,10 +119,7 @@ public class DownloadServiceDashTest {
                   ApplicationProvider.getApplicationContext(),
                   downloadIndex,
                   new DefaultDownloaderFactory(
-                      new DownloaderConstructorHelper(cache, fakeDataSourceFactory)),
-                  /* maxSimultaneousDownloads= */ 1,
-                  /* minRetryCount= */ 3,
-                  new Requirements(0));
+                      new DownloaderConstructorHelper(cache, fakeDataSourceFactory)));
           downloadManagerListener =
               new TestDownloadManagerListener(dashDownloadManager, dummyMainThread);
           dashDownloadManager.resumeDownloads();

From 7d67047e9472efad1291d3a2522edd913a784628 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 18 Apr 2019 19:34:00 +0100
Subject: [PATCH 792/832] Support multiple DefaultDownloadIndex instances

PiperOrigin-RevId: 244226680
---
 .../offline/DefaultDownloadIndex.java         | 69 +++++++++++--------
 .../offline/DefaultDownloadIndexTest.java     | 14 ++--
 2 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
index a2caff3ff1..30297f19ce 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -23,6 +23,7 @@ import android.database.sqlite.SQLiteException;
 import android.net.Uri;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+import android.text.TextUtils;
 import com.google.android.exoplayer2.database.DatabaseIOException;
 import com.google.android.exoplayer2.database.DatabaseProvider;
 import com.google.android.exoplayer2.database.VersionTable;
@@ -32,18 +33,11 @@ import com.google.android.exoplayer2.util.Util;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * A {@link DownloadIndex} which uses SQLite to persist {@link Download}s.
- *
- * <p class="caution">Database access may take a long time, do not call methods of this class from
- * the application main thread.
- */
+/** A {@link DownloadIndex} that uses SQLite to persist {@link Download Downloads}. */
 public final class DefaultDownloadIndex implements WritableDownloadIndex {
 
-  private static final String TABLE_NAME = DatabaseProvider.TABLE_PREFIX + "Downloads";
+  private static final String TABLE_PREFIX = DatabaseProvider.TABLE_PREFIX + "Downloads";
 
-  // TODO: Support multiple instances. Probably using the underlying cache UID.
-  @VisibleForTesting /* package */ static final String INSTANCE_UID = "singleton";
   @VisibleForTesting /* package */ static final int TABLE_VERSION = 1;
 
   private static final String COLUMN_ID = "id";
@@ -108,11 +102,8 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
         COLUMN_UPDATE_TIME_MS
       };
 
-  private static final String SQL_DROP_TABLE_IF_EXISTS = "DROP TABLE IF EXISTS " + TABLE_NAME;
-  private static final String SQL_CREATE_TABLE =
-      "CREATE TABLE "
-          + TABLE_NAME
-          + " ("
+  private static final String TABLE_SCHEMA =
+      "("
           + COLUMN_ID
           + " TEXT PRIMARY KEY NOT NULL,"
           + COLUMN_TYPE
@@ -148,19 +139,42 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
 
   private static final String TRUE = "1";
 
+  private final String name;
+  private final String tableName;
   private final DatabaseProvider databaseProvider;
 
   private boolean initialized;
 
   /**
-   * Creates a DefaultDownloadIndex which stores the {@link Download}s on a SQLite database provided
-   * by {@code databaseProvider}.
+   * Creates an instance that stores the {@link Download Downloads} in an SQLite database provided
+   * by a {@link DatabaseProvider}.
    *
-   * @param databaseProvider A DatabaseProvider which provides the database which will be used to
-   *     store DownloadStatus table.
+   * <p>Equivalent to calling {@link #DefaultDownloadIndex(DatabaseProvider, String)} with {@code
+   * name=""}.
+   *
+   * <p>Applications that only have one download index may use this constructor. Applications that
+   * have multiple download indices should call {@link #DefaultDownloadIndex(DatabaseProvider,
+   * String)} to specify a unique name for each index.
+   *
+   * @param databaseProvider Provides the SQLite database in which downloads are persisted.
    */
   public DefaultDownloadIndex(DatabaseProvider databaseProvider) {
+    this(databaseProvider, "");
+  }
+
+  /**
+   * Creates an instance that stores the {@link Download Downloads} in an SQLite database provided
+   * by a {@link DatabaseProvider}.
+   *
+   * @param databaseProvider Provides the SQLite database in which downloads are persisted.
+   * @param name The name of the index. This name is incorporated into the names of the SQLite
+   *     tables in which downloads are persisted.
+   */
+  public DefaultDownloadIndex(DatabaseProvider databaseProvider, String name) {
+    // TODO: Remove this backward compatibility hack for launch.
+    this.name = TextUtils.isEmpty(name) ? "singleton" : name;
     this.databaseProvider = databaseProvider;
+    tableName = TABLE_PREFIX + name;
   }
 
   @Override
@@ -207,7 +221,7 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
     values.put(COLUMN_UPDATE_TIME_MS, download.updateTimeMs);
     try {
       SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
-      writableDatabase.replaceOrThrow(TABLE_NAME, /* nullColumnHack= */ null, values);
+      writableDatabase.replaceOrThrow(tableName, /* nullColumnHack= */ null, values);
     } catch (SQLiteException e) {
       throw new DatabaseIOException(e);
     }
@@ -217,7 +231,7 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
   public void removeDownload(String id) throws DatabaseIOException {
     ensureInitialized();
     try {
-      databaseProvider.getWritableDatabase().delete(TABLE_NAME, WHERE_ID_EQUALS, new String[] {id});
+      databaseProvider.getWritableDatabase().delete(tableName, WHERE_ID_EQUALS, new String[] {id});
     } catch (SQLiteException e) {
       throw new DatabaseIOException(e);
     }
@@ -230,7 +244,7 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
       ContentValues values = new ContentValues();
       values.put(COLUMN_STOP_REASON, stopReason);
       SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
-      writableDatabase.update(TABLE_NAME, values, WHERE_STATE_TERMINAL, /* whereArgs= */ null);
+      writableDatabase.update(tableName, values, WHERE_STATE_TERMINAL, /* whereArgs= */ null);
     } catch (SQLException e) {
       throw new DatabaseIOException(e);
     }
@@ -244,7 +258,7 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
       values.put(COLUMN_STOP_REASON, stopReason);
       SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
       writableDatabase.update(
-          TABLE_NAME, values, WHERE_STATE_TERMINAL + " AND " + WHERE_ID_EQUALS, new String[] {id});
+          tableName, values, WHERE_STATE_TERMINAL + " AND " + WHERE_ID_EQUALS, new String[] {id});
     } catch (SQLException e) {
       throw new DatabaseIOException(e);
     }
@@ -256,16 +270,15 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
     }
     try {
       SQLiteDatabase readableDatabase = databaseProvider.getReadableDatabase();
-      int version =
-          VersionTable.getVersion(readableDatabase, VersionTable.FEATURE_OFFLINE, INSTANCE_UID);
+      int version = VersionTable.getVersion(readableDatabase, VersionTable.FEATURE_OFFLINE, name);
       if (version == VersionTable.VERSION_UNSET || version > TABLE_VERSION) {
         SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
         writableDatabase.beginTransaction();
         try {
           VersionTable.setVersion(
-              writableDatabase, VersionTable.FEATURE_OFFLINE, INSTANCE_UID, TABLE_VERSION);
-          writableDatabase.execSQL(SQL_DROP_TABLE_IF_EXISTS);
-          writableDatabase.execSQL(SQL_CREATE_TABLE);
+              writableDatabase, VersionTable.FEATURE_OFFLINE, name, TABLE_VERSION);
+          writableDatabase.execSQL("DROP TABLE IF EXISTS " + tableName);
+          writableDatabase.execSQL("CREATE TABLE " + tableName + " " + TABLE_SCHEMA);
           writableDatabase.setTransactionSuccessful();
         } finally {
           writableDatabase.endTransaction();
@@ -287,7 +300,7 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
       return databaseProvider
           .getReadableDatabase()
           .query(
-              TABLE_NAME,
+              tableName,
               COLUMNS,
               selection,
               selectionArgs,
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
index a426a7488b..73c73b6647 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
@@ -15,7 +15,6 @@
  */
 package com.google.android.exoplayer2.offline;
 
-import static com.google.android.exoplayer2.offline.DefaultDownloadIndex.INSTANCE_UID;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.database.sqlite.SQLiteDatabase;
@@ -33,6 +32,8 @@ import org.junit.runner.RunWith;
 @RunWith(AndroidJUnit4.class)
 public class DefaultDownloadIndexTest {
 
+  private static final String EMPTY_NAME = "singleton";
+
   private ExoDatabaseProvider databaseProvider;
   private DefaultDownloadIndex downloadIndex;
 
@@ -170,14 +171,12 @@ public class DefaultDownloadIndexTest {
   @Test
   public void putDownload_setsVersion() throws DatabaseIOException {
     SQLiteDatabase readableDatabase = databaseProvider.getReadableDatabase();
-    assertThat(
-            VersionTable.getVersion(readableDatabase, VersionTable.FEATURE_OFFLINE, INSTANCE_UID))
+    assertThat(VersionTable.getVersion(readableDatabase, VersionTable.FEATURE_OFFLINE, EMPTY_NAME))
         .isEqualTo(VersionTable.VERSION_UNSET);
 
     downloadIndex.putDownload(new DownloadBuilder("id1").build());
 
-    assertThat(
-            VersionTable.getVersion(readableDatabase, VersionTable.FEATURE_OFFLINE, INSTANCE_UID))
+    assertThat(VersionTable.getVersion(readableDatabase, VersionTable.FEATURE_OFFLINE, EMPTY_NAME))
         .isEqualTo(DefaultDownloadIndex.TABLE_VERSION);
   }
 
@@ -191,15 +190,14 @@ public class DefaultDownloadIndexTest {
 
     SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
     VersionTable.setVersion(
-        writableDatabase, VersionTable.FEATURE_OFFLINE, INSTANCE_UID, Integer.MAX_VALUE);
+        writableDatabase, VersionTable.FEATURE_OFFLINE, EMPTY_NAME, Integer.MAX_VALUE);
 
     downloadIndex = new DefaultDownloadIndex(databaseProvider);
 
     cursor = downloadIndex.getDownloads();
     assertThat(cursor.getCount()).isEqualTo(0);
     cursor.close();
-    assertThat(
-            VersionTable.getVersion(writableDatabase, VersionTable.FEATURE_OFFLINE, INSTANCE_UID))
+    assertThat(VersionTable.getVersion(writableDatabase, VersionTable.FEATURE_OFFLINE, EMPTY_NAME))
         .isEqualTo(DefaultDownloadIndex.TABLE_VERSION);
   }
 

From 54a5d6912bfd516091279fcd23d8984709819485 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 18 Apr 2019 21:02:48 +0100
Subject: [PATCH 793/832] Improve progress reporting logic

- Listener based reporting of progress allows the content length
  to be persisted into the download index (and notified via a
  download state change) as soon as it's available.
- Moved contentLength back into Download proper. It should only
  ever change once, so I'm not sure it belongs in the mutable part
  of Download.
- Made a DownloadProgress class, for naming sanity.

PiperOrigin-RevId: 244242487
---
 .../offline/ActionFileUpgradeUtil.java        |   8 +-
 .../offline/DefaultDownloadIndex.java         |  29 ++-
 .../android/exoplayer2/offline/Download.java  |  67 +++---
 .../exoplayer2/offline/DownloadManager.java   | 107 ++++++---
 .../exoplayer2/offline/DownloadProgress.java  |  28 +++
 .../exoplayer2/offline/Downloader.java        |  48 ++--
 .../offline/ProgressiveDownloader.java        |  46 ++--
 .../exoplayer2/offline/SegmentDownloader.java | 208 +++++++++---------
 .../exoplayer2/upstream/cache/CacheUtil.java  | 137 ++++++------
 .../offline/DefaultDownloadIndexTest.java     |  14 +-
 .../exoplayer2/offline/DownloadBuilder.java   |  76 ++++---
 .../offline/DownloadManagerTest.java          |  44 ++--
 .../upstream/cache/CacheDataSourceTest.java   |   8 +-
 .../upstream/cache/CacheUtilTest.java         | 136 +++++++-----
 .../source/dash/offline/DashDownloader.java   |   4 +-
 .../dash/offline/DashDownloaderTest.java      |  46 ++--
 .../source/hls/offline/HlsDownloader.java     |   4 +-
 .../source/hls/offline/HlsDownloaderTest.java |  36 ++-
 .../smoothstreaming/offline/SsDownloader.java |   4 +-
 .../ui/DownloadNotificationHelper.java        |   4 +-
 .../playbacktests/gts/DashDownloadTest.java   |   2 +-
 21 files changed, 593 insertions(+), 463 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadProgress.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java
index 51996ed284..b601874f8d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.offline;
 import static com.google.android.exoplayer2.offline.Download.STATE_QUEUED;
 
 import androidx.annotation.Nullable;
+import com.google.android.exoplayer2.C;
 import java.io.File;
 import java.io.IOException;
 
@@ -97,10 +98,11 @@ public final class ActionFileUpgradeUtil {
           new Download(
               request,
               STATE_QUEUED,
-              Download.FAILURE_REASON_NONE,
-              Download.STOP_REASON_NONE,
               /* startTimeMs= */ nowMs,
-              /* updateTimeMs= */ nowMs);
+              /* updateTimeMs= */ nowMs,
+              /* contentLength= */ C.LENGTH_UNSET,
+              Download.STOP_REASON_NONE,
+              Download.FAILURE_REASON_NONE);
     }
     downloadIndex.putDownload(download);
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
index 30297f19ce..6838c24628 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -27,7 +27,6 @@ import android.text.TextUtils;
 import com.google.android.exoplayer2.database.DatabaseIOException;
 import com.google.android.exoplayer2.database.DatabaseProvider;
 import com.google.android.exoplayer2.database.VersionTable;
-import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
 import java.util.ArrayList;
@@ -210,15 +209,15 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
     values.put(COLUMN_CUSTOM_CACHE_KEY, download.request.customCacheKey);
     values.put(COLUMN_DATA, download.request.data);
     values.put(COLUMN_STATE, download.state);
-    values.put(COLUMN_DOWNLOAD_PERCENTAGE, download.getDownloadPercentage());
-    values.put(COLUMN_DOWNLOADED_BYTES, download.getDownloadedBytes());
-    values.put(COLUMN_TOTAL_BYTES, download.getTotalBytes());
-    values.put(COLUMN_FAILURE_REASON, download.failureReason);
-    values.put(COLUMN_STOP_FLAGS, 0);
-    values.put(COLUMN_NOT_MET_REQUIREMENTS, 0);
-    values.put(COLUMN_STOP_REASON, download.stopReason);
     values.put(COLUMN_START_TIME_MS, download.startTimeMs);
     values.put(COLUMN_UPDATE_TIME_MS, download.updateTimeMs);
+    values.put(COLUMN_TOTAL_BYTES, download.contentLength);
+    values.put(COLUMN_STOP_REASON, download.stopReason);
+    values.put(COLUMN_FAILURE_REASON, download.failureReason);
+    values.put(COLUMN_DOWNLOAD_PERCENTAGE, download.getPercentDownloaded());
+    values.put(COLUMN_DOWNLOADED_BYTES, download.getBytesDownloaded());
+    values.put(COLUMN_STOP_FLAGS, 0);
+    values.put(COLUMN_NOT_MET_REQUIREMENTS, 0);
     try {
       SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
       writableDatabase.replaceOrThrow(tableName, /* nullColumnHack= */ null, values);
@@ -337,18 +336,18 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
             decodeStreamKeys(cursor.getString(COLUMN_INDEX_STREAM_KEYS)),
             cursor.getString(COLUMN_INDEX_CUSTOM_CACHE_KEY),
             cursor.getBlob(COLUMN_INDEX_DATA));
-    CachingCounters cachingCounters = new CachingCounters();
-    cachingCounters.alreadyCachedBytes = cursor.getLong(COLUMN_INDEX_DOWNLOADED_BYTES);
-    cachingCounters.contentLength = cursor.getLong(COLUMN_INDEX_TOTAL_BYTES);
-    cachingCounters.percentage = cursor.getFloat(COLUMN_INDEX_DOWNLOAD_PERCENTAGE);
+    DownloadProgress downloadProgress = new DownloadProgress();
+    downloadProgress.bytesDownloaded = cursor.getLong(COLUMN_INDEX_DOWNLOADED_BYTES);
+    downloadProgress.percentDownloaded = cursor.getFloat(COLUMN_INDEX_DOWNLOAD_PERCENTAGE);
     return new Download(
         request,
         cursor.getInt(COLUMN_INDEX_STATE),
-        cursor.getInt(COLUMN_INDEX_FAILURE_REASON),
-        cursor.getInt(COLUMN_INDEX_STOP_REASON),
         cursor.getLong(COLUMN_INDEX_START_TIME_MS),
         cursor.getLong(COLUMN_INDEX_UPDATE_TIME_MS),
-        cachingCounters);
+        cursor.getLong(COLUMN_INDEX_TOTAL_BYTES),
+        cursor.getInt(COLUMN_INDEX_STOP_REASON),
+        cursor.getInt(COLUMN_INDEX_FAILURE_REASON),
+        downloadProgress);
   }
 
   private static String encodeStreamKeys(List<StreamKey> streamKeys) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
index 343b9d6a49..9f6b473208 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.offline;
 
 import androidx.annotation.IntDef;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
 import com.google.android.exoplayer2.util.Assertions;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -96,60 +95,65 @@ public final class Download {
 
   /** The download request. */
   public final DownloadRequest request;
-
   /** The state of the download. */
   @State public final int state;
   /** The first time when download entry is created. */
   public final long startTimeMs;
   /** The last update time. */
   public final long updateTimeMs;
+  /** The total size of the content in bytes, or {@link C#LENGTH_UNSET} if unknown. */
+  public final long contentLength;
+  /** The reason the download is stopped, or {@link #STOP_REASON_NONE}. */
+  public final int stopReason;
   /**
    * If {@link #state} is {@link #STATE_FAILED} then this is the cause, otherwise {@link
    * #FAILURE_REASON_NONE}.
    */
   @FailureReason public final int failureReason;
-  /** The reason the download is stopped, or {@link #STOP_REASON_NONE}. */
-  public final int stopReason;
 
-  /* package */ CachingCounters counters;
+  /* package */ final DownloadProgress progress;
 
-  /* package */ Download(
+  public Download(
       DownloadRequest request,
       @State int state,
-      @FailureReason int failureReason,
-      int stopReason,
       long startTimeMs,
-      long updateTimeMs) {
+      long updateTimeMs,
+      long contentLength,
+      int stopReason,
+      @FailureReason int failureReason) {
     this(
         request,
         state,
-        failureReason,
-        stopReason,
         startTimeMs,
         updateTimeMs,
-        new CachingCounters());
+        contentLength,
+        stopReason,
+        failureReason,
+        new DownloadProgress());
   }
 
-  /* package */ Download(
+  public Download(
       DownloadRequest request,
       @State int state,
-      @FailureReason int failureReason,
-      int stopReason,
       long startTimeMs,
       long updateTimeMs,
-      CachingCounters counters) {
-    Assertions.checkNotNull(counters);
+      long contentLength,
+      int stopReason,
+      @FailureReason int failureReason,
+      DownloadProgress progress) {
+    Assertions.checkNotNull(progress);
     Assertions.checkState((failureReason == FAILURE_REASON_NONE) == (state != STATE_FAILED));
     if (stopReason != 0) {
       Assertions.checkState(state != STATE_DOWNLOADING && state != STATE_QUEUED);
     }
     this.request = request;
     this.state = state;
-    this.failureReason = failureReason;
-    this.stopReason = stopReason;
     this.startTimeMs = startTimeMs;
     this.updateTimeMs = updateTimeMs;
-    this.counters = counters;
+    this.contentLength = contentLength;
+    this.stopReason = stopReason;
+    this.failureReason = failureReason;
+    this.progress = progress;
   }
 
   /** Returns whether the download is completed or failed. These are terminal states. */
@@ -158,30 +162,15 @@ public final class Download {
   }
 
   /** Returns the total number of downloaded bytes. */
-  public long getDownloadedBytes() {
-    return counters.totalCachedBytes();
-  }
-
-  /** Returns the total size of the media, or {@link C#LENGTH_UNSET} if unknown. */
-  public long getTotalBytes() {
-    return counters.contentLength;
+  public long getBytesDownloaded() {
+    return progress.bytesDownloaded;
   }
 
   /**
    * Returns the estimated download percentage, or {@link C#PERCENTAGE_UNSET} if no estimate is
    * available.
    */
-  public float getDownloadPercentage() {
-    return counters.percentage;
-  }
-
-  /**
-   * Sets counters which are updated by a {@link Downloader}.
-   *
-   * @param counters An instance of {@link CachingCounters}.
-   */
-  protected void setCounters(CachingCounters counters) {
-    Assertions.checkNotNull(counters);
-    this.counters = counters;
+  public float getPercentDownloaded() {
+    return progress.percentDownloaded;
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index f914c861f9..d4df5cd18b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -36,7 +36,6 @@ import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.scheduler.RequirementsWatcher;
-import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
@@ -131,7 +130,8 @@ public final class DownloadManager {
   private static final int MSG_ADD_DOWNLOAD = 4;
   private static final int MSG_REMOVE_DOWNLOAD = 5;
   private static final int MSG_DOWNLOAD_THREAD_STOPPED = 6;
-  private static final int MSG_RELEASE = 7;
+  private static final int MSG_CONTENT_LENGTH_CHANGED = 7;
+  private static final int MSG_RELEASE = 8;
 
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
@@ -539,6 +539,11 @@ public final class DownloadManager {
         onDownloadThreadStoppedInternal(downloadThread);
         processedExternalMessage = false; // This message is posted internally.
         break;
+      case MSG_CONTENT_LENGTH_CHANGED:
+        downloadThread = (DownloadThread) message.obj;
+        onDownloadThreadContentLengthChangedInternal(downloadThread);
+        processedExternalMessage = false; // This message is posted internally.
+        break;
       case MSG_RELEASE:
         releaseInternal();
         return true; // Don't post back to mainHandler on release.
@@ -634,10 +639,11 @@ public final class DownloadManager {
             new Download(
                 request,
                 stopReason != Download.STOP_REASON_NONE ? STATE_STOPPED : STATE_QUEUED,
-                Download.FAILURE_REASON_NONE,
-                stopReason,
                 /* startTimeMs= */ nowMs,
-                /* updateTimeMs= */ nowMs);
+                /* updateTimeMs= */ nowMs,
+                /* contentLength= */ C.LENGTH_UNSET,
+                stopReason,
+                Download.FAILURE_REASON_NONE);
         logd("Download state is created for " + request.id);
       } else {
         download = mergeRequest(download, request, stopReason);
@@ -682,6 +688,11 @@ public final class DownloadManager {
     }
   }
 
+  private void onDownloadThreadContentLengthChangedInternal(DownloadThread downloadThread) {
+    String downloadId = downloadThread.request.id;
+    getDownload(downloadId).setContentLength(downloadThread.contentLength);
+  }
+
   private void releaseInternal() {
     for (DownloadThread downloadThread : downloadThreads.values()) {
       downloadThread.cancel(/* released= */ true);
@@ -737,10 +748,11 @@ public final class DownloadManager {
       parallelDownloads++;
     }
     Downloader downloader = downloaderFactory.createDownloader(request);
+    DownloadProgress downloadProgress = downloadInternal.download.progress;
     DownloadThread downloadThread =
-        new DownloadThread(request, downloader, isRemove, minRetryCount, internalHandler);
+        new DownloadThread(
+            request, downloader, downloadProgress, isRemove, minRetryCount, internalHandler);
     downloadThreads.put(downloadId, downloadThread);
-    downloadInternal.setCounters(downloadThread.downloader.getCounters());
     downloadThread.start();
     logd("Download is started", downloadInternal);
     return START_THREAD_SUCCEEDED;
@@ -802,22 +814,23 @@ public final class DownloadManager {
     return new Download(
         download.request.copyWithMergedRequest(request),
         state,
-        FAILURE_REASON_NONE,
-        stopReason,
         startTimeMs,
         /* updateTimeMs= */ nowMs,
-        download.counters);
+        /* contentLength= */ C.LENGTH_UNSET,
+        stopReason,
+        FAILURE_REASON_NONE);
   }
 
   private static Download copyWithState(Download download, @Download.State int state) {
     return new Download(
         download.request,
         state,
-        FAILURE_REASON_NONE,
-        download.stopReason,
         download.startTimeMs,
         /* updateTimeMs= */ System.currentTimeMillis(),
-        download.counters);
+        download.contentLength,
+        download.stopReason,
+        FAILURE_REASON_NONE,
+        download.progress);
   }
 
   private static void logd(String message) {
@@ -850,13 +863,17 @@ public final class DownloadManager {
 
     // TODO: Get rid of these and use download directly.
     @Download.State private int state;
+    private long contentLength;
     private int stopReason;
     @MonotonicNonNull @Download.FailureReason private int failureReason;
 
     private DownloadInternal(DownloadManager downloadManager, Download download) {
       this.downloadManager = downloadManager;
       this.download = download;
+      state = download.state;
+      contentLength = download.contentLength;
       stopReason = download.stopReason;
+      failureReason = download.failureReason;
     }
 
     private void initialize() {
@@ -877,11 +894,12 @@ public final class DownloadManager {
           new Download(
               download.request,
               state,
-              state != STATE_FAILED ? FAILURE_REASON_NONE : failureReason,
-              stopReason,
               download.startTimeMs,
               /* updateTimeMs= */ System.currentTimeMillis(),
-              download.counters);
+              contentLength,
+              stopReason,
+              state != STATE_FAILED ? FAILURE_REASON_NONE : failureReason,
+              download.progress);
       return download;
     }
 
@@ -911,8 +929,12 @@ public final class DownloadManager {
       return state == STATE_REMOVING || state == STATE_RESTARTING;
     }
 
-    public void setCounters(CachingCounters counters) {
-      download.setCounters(counters);
+    public void setContentLength(long contentLength) {
+      if (this.contentLength == contentLength) {
+        return;
+      }
+      this.contentLength = contentLength;
+      downloadManager.onDownloadChangedInternal(this, getUpdatedDownload());
     }
 
     private void updateStopState() {
@@ -992,28 +1014,34 @@ public final class DownloadManager {
     }
   }
 
-  private static class DownloadThread extends Thread {
+  private static class DownloadThread extends Thread implements Downloader.ProgressListener {
 
     private final DownloadRequest request;
     private final Downloader downloader;
+    private final DownloadProgress downloadProgress;
     private final boolean isRemove;
     private final int minRetryCount;
 
-    private volatile Handler onStoppedHandler;
+    private volatile Handler updateHandler;
     private volatile boolean isCanceled;
     private Throwable finalError;
 
+    private long contentLength;
+
     private DownloadThread(
         DownloadRequest request,
         Downloader downloader,
+        DownloadProgress downloadProgress,
         boolean isRemove,
         int minRetryCount,
-        Handler onStoppedHandler) {
+        Handler updateHandler) {
       this.request = request;
-      this.isRemove = isRemove;
       this.downloader = downloader;
+      this.downloadProgress = downloadProgress;
+      this.isRemove = isRemove;
       this.minRetryCount = minRetryCount;
-      this.onStoppedHandler = onStoppedHandler;
+      this.updateHandler = updateHandler;
+      contentLength = C.LENGTH_UNSET;
     }
 
     public void cancel(boolean released) {
@@ -1022,7 +1050,7 @@ public final class DownloadManager {
         // cancellation to complete depends on the implementation of the downloader being used. We
         // null the handler reference here so that it doesn't prevent garbage collection of the
         // download manager whilst cancellation is ongoing.
-        onStoppedHandler = null;
+        updateHandler = null;
       }
       isCanceled = true;
       downloader.cancel();
@@ -1042,14 +1070,14 @@ public final class DownloadManager {
           long errorPosition = C.LENGTH_UNSET;
           while (!isCanceled) {
             try {
-              downloader.download();
+              downloader.download(/* progressListener= */ this);
               break;
             } catch (IOException e) {
               if (!isCanceled) {
-                long downloadedBytes = downloader.getDownloadedBytes();
-                if (downloadedBytes != errorPosition) {
-                  logd("Reset error count. downloadedBytes = " + downloadedBytes, request);
-                  errorPosition = downloadedBytes;
+                long bytesDownloaded = downloadProgress.bytesDownloaded;
+                if (bytesDownloaded != errorPosition) {
+                  logd("Reset error count. bytesDownloaded = " + bytesDownloaded, request);
+                  errorPosition = bytesDownloaded;
                   errorCount = 0;
                 }
                 if (++errorCount > minRetryCount) {
@@ -1064,13 +1092,26 @@ public final class DownloadManager {
       } catch (Throwable e) {
         finalError = e;
       }
-      Handler onStoppedHandler = this.onStoppedHandler;
-      if (onStoppedHandler != null) {
-        onStoppedHandler.obtainMessage(MSG_DOWNLOAD_THREAD_STOPPED, this).sendToTarget();
+      Handler updateHandler = this.updateHandler;
+      if (updateHandler != null) {
+        updateHandler.obtainMessage(MSG_DOWNLOAD_THREAD_STOPPED, this).sendToTarget();
       }
     }
 
-    private int getRetryDelayMillis(int errorCount) {
+    @Override
+    public void onProgress(long contentLength, long bytesDownloaded, float percentDownloaded) {
+      downloadProgress.bytesDownloaded = bytesDownloaded;
+      downloadProgress.percentDownloaded = percentDownloaded;
+      if (contentLength != this.contentLength) {
+        this.contentLength = contentLength;
+        Handler updateHandler = this.updateHandler;
+        if (updateHandler != null) {
+          updateHandler.obtainMessage(MSG_CONTENT_LENGTH_CHANGED, this).sendToTarget();
+        }
+      }
+    }
+
+    private static int getRetryDelayMillis(int errorCount) {
       return Math.min((errorCount - 1) * 1000, 5000);
     }
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadProgress.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadProgress.java
new file mode 100644
index 0000000000..9d946daa28
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadProgress.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.offline;
+
+import com.google.android.exoplayer2.C;
+
+/** Mutable {@link Download} progress. */
+public class DownloadProgress {
+
+  /** The number of bytes that have been downloaded. */
+  public long bytesDownloaded;
+
+  /** The percentage that has been downloaded, or {@link C#PERCENTAGE_UNSET} if unknown. */
+  public float percentDownloaded;
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java
index 39f562ac19..fa10d5842b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java
@@ -15,44 +15,44 @@
  */
 package com.google.android.exoplayer2.offline;
 
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
 import java.io.IOException;
 
-/**
- * An interface for stream downloaders.
- */
+/** Downloads and removes a piece of content. */
 public interface Downloader {
 
+  /** Receives progress updates during download operations. */
+  interface ProgressListener {
+
+    /**
+     * Called when progress is made during a download operation.
+     *
+     * @param contentLength The length of the content in bytes, or {@link C#LENGTH_UNSET} if
+     *     unknown.
+     * @param bytesDownloaded The number of bytes that have been downloaded.
+     * @param percentDownloaded The percentage of the content that has been downloaded, or {@link
+     *     C#PERCENTAGE_UNSET}.
+     */
+    void onProgress(long contentLength, long bytesDownloaded, float percentDownloaded);
+  }
+
   /**
-   * Downloads the media.
+   * Downloads the content.
    *
-   * @throws DownloadException Thrown if the media cannot be downloaded.
+   * @param progressListener A listener to receive progress updates, or {@code null}.
+   * @throws DownloadException Thrown if the content cannot be downloaded.
    * @throws InterruptedException If the thread has been interrupted.
    * @throws IOException Thrown when there is an io error while downloading.
    */
-  void download() throws InterruptedException, IOException;
+  void download(@Nullable ProgressListener progressListener)
+      throws InterruptedException, IOException;
 
-  /** Interrupts any current download operation and prevents future operations from running. */
+  /** Cancels the download operation and prevents future download operations from running. */
   void cancel();
 
-  /** Returns the total number of downloaded bytes. */
-  long getDownloadedBytes();
-
-  /** Returns the total size of the media, or {@link C#LENGTH_UNSET} if unknown. */
-  long getTotalBytes();
-
   /**
-   * Returns the estimated download percentage, or {@link C#PERCENTAGE_UNSET} if no estimate is
-   * available.
-   */
-  float getDownloadPercentage();
-
-  /** Returns a {@link CachingCounters} which holds download counters. */
-  CachingCounters getCounters();
-
-  /**
-   * Removes the media.
+   * Removes the content.
    *
    * @throws InterruptedException Thrown if the thread was interrupted.
    */
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
index 9794b19b62..17f4047bc0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
@@ -23,7 +23,6 @@ import com.google.android.exoplayer2.upstream.cache.Cache;
 import com.google.android.exoplayer2.upstream.cache.CacheDataSource;
 import com.google.android.exoplayer2.upstream.cache.CacheKeyFactory;
 import com.google.android.exoplayer2.upstream.cache.CacheUtil;
-import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
 import com.google.android.exoplayer2.util.PriorityTaskManager;
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -40,7 +39,6 @@ public final class ProgressiveDownloader implements Downloader {
   private final CacheDataSource dataSource;
   private final CacheKeyFactory cacheKeyFactory;
   private final PriorityTaskManager priorityTaskManager;
-  private final CacheUtil.CachingCounters cachingCounters;
   private final AtomicBoolean isCanceled;
 
   /**
@@ -62,12 +60,12 @@ public final class ProgressiveDownloader implements Downloader {
     this.dataSource = constructorHelper.createCacheDataSource();
     this.cacheKeyFactory = constructorHelper.getCacheKeyFactory();
     this.priorityTaskManager = constructorHelper.getPriorityTaskManager();
-    cachingCounters = new CachingCounters();
     isCanceled = new AtomicBoolean();
   }
 
   @Override
-  public void download() throws InterruptedException, IOException {
+  public void download(@Nullable ProgressListener progressListener)
+      throws InterruptedException, IOException {
     priorityTaskManager.add(C.PRIORITY_DOWNLOAD);
     try {
       CacheUtil.cache(
@@ -78,7 +76,7 @@ public final class ProgressiveDownloader implements Downloader {
           new byte[BUFFER_SIZE_BYTES],
           priorityTaskManager,
           C.PRIORITY_DOWNLOAD,
-          cachingCounters,
+          progressListener == null ? null : new ProgressForwarder(progressListener),
           isCanceled,
           /* enableEOFException= */ true);
     } finally {
@@ -91,28 +89,26 @@ public final class ProgressiveDownloader implements Downloader {
     isCanceled.set(true);
   }
 
-  @Override
-  public long getDownloadedBytes() {
-    return cachingCounters.totalCachedBytes();
-  }
-
-  @Override
-  public long getTotalBytes() {
-    return cachingCounters.contentLength;
-  }
-
-  @Override
-  public float getDownloadPercentage() {
-    return cachingCounters.percentage;
-  }
-
-  @Override
-  public CachingCounters getCounters() {
-    return cachingCounters;
-  }
-
   @Override
   public void remove() {
     CacheUtil.remove(dataSpec, cache, cacheKeyFactory);
   }
+
+  private static final class ProgressForwarder implements CacheUtil.ProgressListener {
+
+    private final ProgressListener progessListener;
+
+    public ProgressForwarder(ProgressListener progressListener) {
+      this.progessListener = progressListener;
+    }
+
+    @Override
+    public void onProgress(long contentLength, long bytesCached, long newBytesCached) {
+      float percentDownloaded =
+          contentLength == C.LENGTH_UNSET || contentLength == 0
+              ? C.PERCENTAGE_UNSET
+              : ((bytesCached * 100f) / contentLength);
+      progessListener.onProgress(contentLength, bytesCached, percentDownloaded);
+    }
+  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
index 4dbae47775..1643812ece 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
@@ -17,6 +17,8 @@ package com.google.android.exoplayer2.offline;
 
 import android.net.Uri;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import android.util.Pair;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DataSpec;
@@ -24,7 +26,6 @@ import com.google.android.exoplayer2.upstream.cache.Cache;
 import com.google.android.exoplayer2.upstream.cache.CacheDataSource;
 import com.google.android.exoplayer2.upstream.cache.CacheKeyFactory;
 import com.google.android.exoplayer2.upstream.cache.CacheUtil;
-import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
 import com.google.android.exoplayer2.util.PriorityTaskManager;
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
@@ -42,6 +43,7 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
 
   /** Smallest unit of content to be downloaded. */
   protected static class Segment implements Comparable<Segment> {
+
     /** The start time of the segment in microseconds. */
     public final long startTimeUs;
 
@@ -70,10 +72,6 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
   private final PriorityTaskManager priorityTaskManager;
   private final ArrayList<StreamKey> streamKeys;
   private final AtomicBoolean isCanceled;
-  private final CacheUtil.CachingCounters counters;
-
-  private volatile int totalSegments;
-  private volatile int downloadedSegments;
 
   /**
    * @param manifestUri The {@link Uri} of the manifest to be downloaded.
@@ -90,9 +88,7 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
     this.offlineDataSource = constructorHelper.createOfflineCacheDataSource();
     this.cacheKeyFactory = constructorHelper.getCacheKeyFactory();
     this.priorityTaskManager = constructorHelper.getPriorityTaskManager();
-    totalSegments = C.LENGTH_UNSET;
     isCanceled = new AtomicBoolean();
-    counters = new CachingCounters();
   }
 
   /**
@@ -102,35 +98,71 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
    * @throws IOException Thrown when there is an error downloading.
    * @throws InterruptedException If the thread has been interrupted.
    */
-  // downloadedSegments and downloadedBytes are only written from this method, and this method
-  // should not be called from more than one thread. Hence non-atomic updates are valid.
-  @SuppressWarnings("NonAtomicVolatileUpdate")
   @Override
-  public final void download() throws IOException, InterruptedException {
+  public final void download(@Nullable ProgressListener progressListener)
+      throws IOException, InterruptedException {
     priorityTaskManager.add(C.PRIORITY_DOWNLOAD);
-
     try {
-      List<Segment> segments = initDownload();
+      // Get the manifest and all of the segments.
+      M manifest = getManifest(dataSource, manifestDataSpec);
+      if (!streamKeys.isEmpty()) {
+        manifest = manifest.copy(streamKeys);
+      }
+      List<Segment> segments = getSegments(dataSource, manifest, /* allowIncompleteList= */ false);
+
+      // Scan the segments, removing any that are fully downloaded.
+      int totalSegments = segments.size();
+      int segmentsDownloaded = 0;
+      long contentLength = 0;
+      long bytesDownloaded = 0;
+      for (int i = segments.size() - 1; i >= 0; i--) {
+        Segment segment = segments.get(i);
+        Pair<Long, Long> segmentLengthAndBytesDownloaded =
+            CacheUtil.getCached(segment.dataSpec, cache, cacheKeyFactory);
+        long segmentLength = segmentLengthAndBytesDownloaded.first;
+        long segmentBytesDownloaded = segmentLengthAndBytesDownloaded.second;
+        bytesDownloaded += segmentBytesDownloaded;
+        if (segmentLength != C.LENGTH_UNSET) {
+          if (segmentLength == segmentBytesDownloaded) {
+            // The segment is fully downloaded.
+            segmentsDownloaded++;
+            segments.remove(i);
+          }
+          if (contentLength != C.LENGTH_UNSET) {
+            contentLength += segmentLength;
+          }
+        } else {
+          contentLength = C.LENGTH_UNSET;
+        }
+      }
       Collections.sort(segments);
+
+      // Download the segments.
+      ProgressNotifier progressNotifier = null;
+      if (progressListener != null) {
+        progressNotifier =
+            new ProgressNotifier(
+                progressListener,
+                contentLength,
+                totalSegments,
+                bytesDownloaded,
+                segmentsDownloaded);
+      }
       byte[] buffer = new byte[BUFFER_SIZE_BYTES];
-      CachingCounters cachingCounters = new CachingCounters();
       for (int i = 0; i < segments.size(); i++) {
-        try {
-          CacheUtil.cache(
-              segments.get(i).dataSpec,
-              cache,
-              cacheKeyFactory,
-              dataSource,
-              buffer,
-              priorityTaskManager,
-              C.PRIORITY_DOWNLOAD,
-              cachingCounters,
-              isCanceled,
-              true);
-          downloadedSegments++;
-        } finally {
-          counters.newlyCachedBytes += cachingCounters.newlyCachedBytes;
-          updatePercentage();
+        CacheUtil.cache(
+            segments.get(i).dataSpec,
+            cache,
+            cacheKeyFactory,
+            dataSource,
+            buffer,
+            priorityTaskManager,
+            C.PRIORITY_DOWNLOAD,
+            progressNotifier,
+            isCanceled,
+            true);
+        if (progressNotifier != null) {
+          progressNotifier.onSegmentDownloaded();
         }
       }
     } finally {
@@ -143,26 +175,6 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
     isCanceled.set(true);
   }
 
-  @Override
-  public final long getDownloadedBytes() {
-    return counters.totalCachedBytes();
-  }
-
-  @Override
-  public long getTotalBytes() {
-    return counters.contentLength;
-  }
-
-  @Override
-  public final float getDownloadPercentage() {
-    return counters.percentage;
-  }
-
-  @Override
-  public CachingCounters getCounters() {
-    return counters;
-  }
-
   @Override
   public final void remove() throws InterruptedException {
     try {
@@ -199,64 +211,15 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
    * @param allowIncompleteList Whether to continue in the case that a load error prevents all
    *     segments from being listed. If true then a partial segment list will be returned. If false
    *     an {@link IOException} will be thrown.
+   * @return The list of downloadable {@link Segment}s.
    * @throws InterruptedException Thrown if the thread was interrupted.
    * @throws IOException Thrown if {@code allowPartialIndex} is false and a load error occurs, or if
    *     the media is not in a form that allows for its segments to be listed.
-   * @return The list of downloadable {@link Segment}s.
    */
   protected abstract List<Segment> getSegments(
       DataSource dataSource, M manifest, boolean allowIncompleteList)
       throws InterruptedException, IOException;
 
-  /** Initializes the download, returning a list of {@link Segment}s that need to be downloaded. */
-  // Writes to downloadedSegments and downloadedBytes are safe. See the comment on download().
-  @SuppressWarnings("NonAtomicVolatileUpdate")
-  private List<Segment> initDownload() throws IOException, InterruptedException {
-    M manifest = getManifest(dataSource, manifestDataSpec);
-    if (!streamKeys.isEmpty()) {
-      manifest = manifest.copy(streamKeys);
-    }
-    List<Segment> segments = getSegments(dataSource, manifest, /* allowIncompleteList= */ false);
-    CachingCounters cachingCounters = new CachingCounters();
-    totalSegments = segments.size();
-    downloadedSegments = 0;
-    counters.alreadyCachedBytes = 0;
-    counters.newlyCachedBytes = 0;
-    long totalBytes = 0;
-    for (int i = segments.size() - 1; i >= 0; i--) {
-      Segment segment = segments.get(i);
-      CacheUtil.getCached(segment.dataSpec, cache, cacheKeyFactory, cachingCounters);
-      counters.alreadyCachedBytes += cachingCounters.alreadyCachedBytes;
-      if (cachingCounters.contentLength != C.LENGTH_UNSET) {
-        if (cachingCounters.alreadyCachedBytes == cachingCounters.contentLength) {
-          // The segment is fully downloaded.
-          downloadedSegments++;
-          segments.remove(i);
-        }
-        if (totalBytes != C.LENGTH_UNSET) {
-          totalBytes += cachingCounters.contentLength;
-        }
-      } else {
-        totalBytes = C.LENGTH_UNSET;
-      }
-    }
-    counters.contentLength = totalBytes;
-    updatePercentage();
-    return segments;
-  }
-
-  private void updatePercentage() {
-    counters.updatePercentage();
-    if (counters.percentage == C.PERCENTAGE_UNSET) {
-      int totalSegments = this.totalSegments;
-      int downloadedSegments = this.downloadedSegments;
-      if (totalSegments != C.LENGTH_UNSET && downloadedSegments != C.LENGTH_UNSET) {
-        counters.percentage =
-            totalSegments == 0 ? 100f : (downloadedSegments * 100f) / totalSegments;
-      }
-    }
-  }
-
   private void removeDataSpec(DataSpec dataSpec) {
     CacheUtil.remove(dataSpec, cache, cacheKeyFactory);
   }
@@ -269,4 +232,49 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
         /* key= */ null,
         /* flags= */ DataSpec.FLAG_ALLOW_GZIP);
   }
+
+  private static final class ProgressNotifier implements CacheUtil.ProgressListener {
+
+    private final ProgressListener progressListener;
+
+    private final long contentLength;
+    private final int totalSegments;
+
+    private long bytesDownloaded;
+    private int segmentsDownloaded;
+
+    public ProgressNotifier(
+        ProgressListener progressListener,
+        long contentLength,
+        int totalSegments,
+        long bytesDownloaded,
+        int segmentsDownloaded) {
+      this.progressListener = progressListener;
+      this.contentLength = contentLength;
+      this.totalSegments = totalSegments;
+      this.bytesDownloaded = bytesDownloaded;
+      this.segmentsDownloaded = segmentsDownloaded;
+    }
+
+    @Override
+    public void onProgress(long requestLength, long bytesCached, long newBytesCached) {
+      bytesDownloaded += newBytesCached;
+      progressListener.onProgress(contentLength, bytesDownloaded, getPercentDownloaded());
+    }
+
+    public void onSegmentDownloaded() {
+      segmentsDownloaded++;
+      progressListener.onProgress(contentLength, bytesDownloaded, getPercentDownloaded());
+    }
+
+    private float getPercentDownloaded() {
+      if (contentLength != C.LENGTH_UNSET && contentLength != 0) {
+        return (bytesDownloaded * 100f) / contentLength;
+      } else if (totalSegments != 0) {
+        return (segmentsDownloaded * 100f) / totalSegments;
+      } else {
+        return C.PERCENTAGE_UNSET;
+      }
+    }
+  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
index f715da118b..219d736835 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.upstream.cache;
 
 import android.net.Uri;
 import androidx.annotation.Nullable;
+import android.util.Pair;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DataSpec;
@@ -31,36 +32,21 @@ import java.util.concurrent.atomic.AtomicBoolean;
 /**
  * Caching related utility methods.
  */
-@SuppressWarnings({"NonAtomicVolatileUpdate", "NonAtomicOperationOnVolatileField"})
 public final class CacheUtil {
 
-  /** Counters used during caching. */
-  public static class CachingCounters {
-    /** The number of bytes already in the cache. */
-    public volatile long alreadyCachedBytes;
-    /** The number of newly cached bytes. */
-    public volatile long newlyCachedBytes;
-    /** The length of the content being cached in bytes, or {@link C#LENGTH_UNSET} if unknown. */
-    public volatile long contentLength = C.LENGTH_UNSET;
-    /** The percentage of cached data, or {@link C#PERCENTAGE_UNSET} if unavailable. */
-    public volatile float percentage;
+  /** Receives progress updates during cache operations. */
+  public interface ProgressListener {
 
     /**
-     * Returns the sum of {@link #alreadyCachedBytes} and {@link #newlyCachedBytes}.
+     * Called when progress is made during a cache operation.
+     *
+     * @param requestLength The length of the content being cached in bytes, or {@link
+     *     C#LENGTH_UNSET} if unknown.
+     * @param bytesCached The number of bytes that are cached.
+     * @param newBytesCached The number of bytes that have been newly cached since the last progress
+     *     update.
      */
-    public long totalCachedBytes() {
-      return alreadyCachedBytes + newlyCachedBytes;
-    }
-
-    /** Updates {@link #percentage} value using other values. */
-    public void updatePercentage() {
-      // Take local snapshot of the volatile field
-      long contentLength = this.contentLength;
-      percentage =
-          contentLength == C.LENGTH_UNSET
-              ? C.PERCENTAGE_UNSET
-              : ((totalCachedBytes() * 100f) / contentLength);
-    }
+    void onProgress(long requestLength, long bytesCached, long newBytesCached);
   }
 
   /** Default buffer size to be used while caching. */
@@ -80,48 +66,43 @@ public final class CacheUtil {
   }
 
   /**
-   * Sets a {@link CachingCounters} to contain the number of bytes already downloaded and the length
-   * for the content defined by a {@code dataSpec}. {@link CachingCounters#newlyCachedBytes} is
-   * reset to 0.
+   * Queries the cache to obtain the request length and the number of bytes already cached for a
+   * given {@link DataSpec}.
    *
    * @param dataSpec Defines the data to be checked.
    * @param cache A {@link Cache} which has the data.
    * @param cacheKeyFactory An optional factory for cache keys.
-   * @param counters The {@link CachingCounters} to update.
+   * @return A pair containing the request length and the number of bytes that are already cached.
    */
-  public static void getCached(
-      DataSpec dataSpec,
-      Cache cache,
-      @Nullable CacheKeyFactory cacheKeyFactory,
-      CachingCounters counters) {
+  public static Pair<Long, Long> getCached(
+      DataSpec dataSpec, Cache cache, @Nullable CacheKeyFactory cacheKeyFactory) {
     String key = buildCacheKey(dataSpec, cacheKeyFactory);
     long position = dataSpec.absoluteStreamPosition;
-    long bytesLeft;
+    long requestLength;
     if (dataSpec.length != C.LENGTH_UNSET) {
-      bytesLeft = dataSpec.length;
+      requestLength = dataSpec.length;
     } else {
       long contentLength = ContentMetadata.getContentLength(cache.getContentMetadata(key));
-      bytesLeft = contentLength == C.LENGTH_UNSET ? C.LENGTH_UNSET : contentLength - position;
+      requestLength = contentLength == C.LENGTH_UNSET ? C.LENGTH_UNSET : contentLength - position;
     }
-    counters.contentLength = bytesLeft;
-    counters.alreadyCachedBytes = 0;
-    counters.newlyCachedBytes = 0;
+    long bytesAlreadyCached = 0;
+    long bytesLeft = requestLength;
     while (bytesLeft != 0) {
       long blockLength =
           cache.getCachedLength(
               key, position, bytesLeft != C.LENGTH_UNSET ? bytesLeft : Long.MAX_VALUE);
       if (blockLength > 0) {
-        counters.alreadyCachedBytes += blockLength;
+        bytesAlreadyCached += blockLength;
       } else {
         blockLength = -blockLength;
         if (blockLength == Long.MAX_VALUE) {
-          return;
+          break;
         }
       }
       position += blockLength;
       bytesLeft -= bytesLeft == C.LENGTH_UNSET ? 0 : blockLength;
     }
-    counters.updatePercentage();
+    return Pair.create(requestLength, bytesAlreadyCached);
   }
 
   /**
@@ -132,7 +113,7 @@ public final class CacheUtil {
    * @param cache A {@link Cache} to store the data.
    * @param cacheKeyFactory An optional factory for cache keys.
    * @param upstream A {@link DataSource} for reading data not in the cache.
-   * @param counters If not null, updated during caching.
+   * @param progressListener A listener to receive progress updates, or {@code null}.
    * @param isCanceled An optional flag that will interrupt caching if set to true.
    * @throws IOException If an error occurs reading from the source.
    * @throws InterruptedException If the thread was interrupted directly or via {@code isCanceled}.
@@ -142,7 +123,7 @@ public final class CacheUtil {
       Cache cache,
       @Nullable CacheKeyFactory cacheKeyFactory,
       DataSource upstream,
-      @Nullable CachingCounters counters,
+      @Nullable ProgressListener progressListener,
       @Nullable AtomicBoolean isCanceled)
       throws IOException, InterruptedException {
     cache(
@@ -153,7 +134,7 @@ public final class CacheUtil {
         new byte[DEFAULT_BUFFER_SIZE_BYTES],
         /* priorityTaskManager= */ null,
         /* priority= */ 0,
-        counters,
+        progressListener,
         isCanceled,
         /* enableEOFException= */ false);
   }
@@ -176,7 +157,7 @@ public final class CacheUtil {
    * @param priorityTaskManager If not null it's used to check whether it is allowed to proceed with
    *     caching.
    * @param priority The priority of this task. Used with {@code priorityTaskManager}.
-   * @param counters If not null, updated during caching.
+   * @param progressListener A listener to receive progress updates, or {@code null}.
    * @param isCanceled An optional flag that will interrupt caching if set to true.
    * @param enableEOFException Whether to throw an {@link EOFException} if end of input has been
    *     reached unexpectedly.
@@ -191,19 +172,18 @@ public final class CacheUtil {
       byte[] buffer,
       PriorityTaskManager priorityTaskManager,
       int priority,
-      @Nullable CachingCounters counters,
+      @Nullable ProgressListener progressListener,
       @Nullable AtomicBoolean isCanceled,
       boolean enableEOFException)
       throws IOException, InterruptedException {
     Assertions.checkNotNull(dataSource);
     Assertions.checkNotNull(buffer);
 
-    if (counters != null) {
-      // Initialize the CachingCounter values.
-      getCached(dataSpec, cache, cacheKeyFactory, counters);
-    } else {
-      // Dummy CachingCounters. No need to initialize as they will not be visible to the caller.
-      counters = new CachingCounters();
+    ProgressNotifier progressNotifier = null;
+    if (progressListener != null) {
+      progressNotifier = new ProgressNotifier(progressListener);
+      Pair<Long, Long> lengthAndBytesAlreadyCached = getCached(dataSpec, cache, cacheKeyFactory);
+      progressNotifier.init(lengthAndBytesAlreadyCached.first, lengthAndBytesAlreadyCached.second);
     }
 
     String key = buildCacheKey(dataSpec, cacheKeyFactory);
@@ -234,7 +214,7 @@ public final class CacheUtil {
                 buffer,
                 priorityTaskManager,
                 priority,
-                counters,
+                progressNotifier,
                 isCanceled);
         if (read < blockLength) {
           // Reached to the end of the data.
@@ -261,7 +241,7 @@ public final class CacheUtil {
    * @param priorityTaskManager If not null it's used to check whether it is allowed to proceed with
    *     caching.
    * @param priority The priority of this task.
-   * @param counters Counters to be set during reading.
+   * @param progressNotifier A notifier through which to report progress updates, or {@code null}.
    * @param isCanceled An optional flag that will interrupt caching if set to true.
    * @return Number of read bytes, or 0 if no data is available because the end of the opened range
    *     has been reached.
@@ -274,7 +254,7 @@ public final class CacheUtil {
       byte[] buffer,
       PriorityTaskManager priorityTaskManager,
       int priority,
-      CachingCounters counters,
+      @Nullable ProgressNotifier progressNotifier,
       AtomicBoolean isCanceled)
       throws IOException, InterruptedException {
     long positionOffset = absoluteStreamPosition - dataSpec.absoluteStreamPosition;
@@ -298,8 +278,8 @@ public final class CacheUtil {
                 dataSpec.key,
                 dataSpec.flags);
         long resolvedLength = dataSource.open(dataSpec);
-        if (counters.contentLength == C.LENGTH_UNSET && resolvedLength != C.LENGTH_UNSET) {
-          counters.contentLength = positionOffset + resolvedLength;
+        if (progressNotifier != null && resolvedLength != C.LENGTH_UNSET) {
+          progressNotifier.onRequestLengthResolved(positionOffset + resolvedLength);
         }
         long totalBytesRead = 0;
         while (totalBytesRead != length) {
@@ -312,14 +292,15 @@ public final class CacheUtil {
                       ? (int) Math.min(buffer.length, length - totalBytesRead)
                       : buffer.length);
           if (bytesRead == C.RESULT_END_OF_INPUT) {
-            if (counters.contentLength == C.LENGTH_UNSET) {
-              counters.contentLength = positionOffset + totalBytesRead;
+            if (progressNotifier != null) {
+              progressNotifier.onRequestLengthResolved(positionOffset + totalBytesRead);
             }
             break;
           }
           totalBytesRead += bytesRead;
-          counters.newlyCachedBytes += bytesRead;
-          counters.updatePercentage();
+          if (progressNotifier != null) {
+            progressNotifier.onBytesCached(bytesRead);
+          }
         }
         return totalBytesRead;
       } catch (PriorityTaskManager.PriorityTooLowException exception) {
@@ -374,4 +355,34 @@ public final class CacheUtil {
 
   private CacheUtil() {}
 
+  private static final class ProgressNotifier {
+    /** The listener to notify when progress is made. */
+    private final ProgressListener listener;
+    /** The length of the content being cached in bytes, or {@link C#LENGTH_UNSET} if unknown. */
+    private long requestLength;
+    /** The number of bytes that are cached. */
+    private long bytesCached;
+
+    public ProgressNotifier(ProgressListener listener) {
+      this.listener = listener;
+    }
+
+    public void init(long requestLength, long bytesCached) {
+      this.requestLength = requestLength;
+      this.bytesCached = bytesCached;
+      listener.onProgress(requestLength, bytesCached, /* newBytesCached= */ 0);
+    }
+
+    public void onRequestLengthResolved(long requestLength) {
+      if (this.requestLength == C.LENGTH_UNSET && requestLength != C.LENGTH_UNSET) {
+        this.requestLength = requestLength;
+        listener.onProgress(requestLength, bytesCached, /* newBytesCached= */ 0);
+      }
+    }
+
+    public void onBytesCached(long newBytesCached) {
+      bytesCached += newBytesCached;
+      listener.onProgress(requestLength, bytesCached, newBytesCached);
+    }
+  }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
index 73c73b6647..f163e8d206 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
@@ -76,9 +76,9 @@ public class DefaultDownloadIndexTest {
             .setUri("different uri")
             .setCacheKey("different cacheKey")
             .setState(Download.STATE_FAILED)
-            .setDownloadPercentage(50)
-            .setDownloadedBytes(200)
-            .setTotalBytes(400)
+            .setPercentDownloaded(50)
+            .setBytesDownloaded(200)
+            .setContentLength(400)
             .setFailureReason(Download.FAILURE_REASON_UNKNOWN)
             .setStopReason(0x12345678)
             .setStartTimeMs(10)
@@ -300,10 +300,10 @@ public class DefaultDownloadIndexTest {
     assertThat(download.state).isEqualTo(that.state);
     assertThat(download.startTimeMs).isEqualTo(that.startTimeMs);
     assertThat(download.updateTimeMs).isEqualTo(that.updateTimeMs);
-    assertThat(download.failureReason).isEqualTo(that.failureReason);
+    assertThat(download.contentLength).isEqualTo(that.contentLength);
     assertThat(download.stopReason).isEqualTo(that.stopReason);
-    assertThat(download.getDownloadPercentage()).isEqualTo(that.getDownloadPercentage());
-    assertThat(download.getDownloadedBytes()).isEqualTo(that.getDownloadedBytes());
-    assertThat(download.getTotalBytes()).isEqualTo(that.getTotalBytes());
+    assertThat(download.failureReason).isEqualTo(that.failureReason);
+    assertThat(download.getPercentDownloaded()).isEqualTo(that.getPercentDownloaded());
+    assertThat(download.getBytesDownloaded()).isEqualTo(that.getBytesDownloaded());
   }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadBuilder.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadBuilder.java
index b5d84fa4bc..f901b00f53 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadBuilder.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadBuilder.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.offline;
 
 import android.net.Uri;
 import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
+import com.google.android.exoplayer2.C;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -29,52 +29,61 @@ import java.util.List;
  * creation for tests. Tests must avoid depending on the default values but explicitly set tested
  * parameters during test initialization.
  */
-class DownloadBuilder {
-  private final CachingCounters counters;
+/* package */ final class DownloadBuilder {
+
+  private final DownloadProgress progress;
+
   private String id;
   private String type;
   private Uri uri;
-  @Nullable private String cacheKey;
-  private int state;
-  private int failureReason;
-  private int stopReason;
-  private long startTimeMs;
-  private long updateTimeMs;
   private List<StreamKey> streamKeys;
+  @Nullable private String cacheKey;
   private byte[] customMetadata;
 
-  DownloadBuilder(String id) {
-    this(id, "type", Uri.parse("uri"), /* cacheKey= */ null, new byte[0], Collections.emptyList());
+  private int state;
+  private long startTimeMs;
+  private long updateTimeMs;
+  private long contentLength;
+  private int stopReason;
+  private int failureReason;
+
+  /* package */ DownloadBuilder(String id) {
+    this(
+        id,
+        "type",
+        Uri.parse("uri"),
+        /* streamKeys= */ Collections.emptyList(),
+        /* cacheKey= */ null,
+        new byte[0]);
   }
 
-  DownloadBuilder(DownloadRequest request) {
+  /* package */ DownloadBuilder(DownloadRequest request) {
     this(
         request.id,
         request.type,
         request.uri,
+        request.streamKeys,
         request.customCacheKey,
-        request.data,
-        request.streamKeys);
+        request.data);
   }
 
-  DownloadBuilder(
+  /* package */ DownloadBuilder(
       String id,
       String type,
       Uri uri,
+      List<StreamKey> streamKeys,
       String cacheKey,
-      byte[] customMetadata,
-      List<StreamKey> streamKeys) {
+      byte[] customMetadata) {
     this.id = id;
     this.type = type;
     this.uri = uri;
-    this.cacheKey = cacheKey;
-    this.state = Download.STATE_QUEUED;
-    this.failureReason = Download.FAILURE_REASON_NONE;
-    this.startTimeMs = (long) 0;
-    this.updateTimeMs = (long) 0;
     this.streamKeys = streamKeys;
+    this.cacheKey = cacheKey;
     this.customMetadata = customMetadata;
-    this.counters = new CachingCounters();
+    this.state = Download.STATE_QUEUED;
+    this.contentLength = C.LENGTH_UNSET;
+    this.failureReason = Download.FAILURE_REASON_NONE;
+    this.progress = new DownloadProgress();
   }
 
   public DownloadBuilder setId(String id) {
@@ -107,18 +116,18 @@ class DownloadBuilder {
     return this;
   }
 
-  public DownloadBuilder setDownloadPercentage(float downloadPercentage) {
-    counters.percentage = downloadPercentage;
+  public DownloadBuilder setPercentDownloaded(float percentDownloaded) {
+    progress.percentDownloaded = percentDownloaded;
     return this;
   }
 
-  public DownloadBuilder setDownloadedBytes(long downloadedBytes) {
-    counters.alreadyCachedBytes = downloadedBytes;
+  public DownloadBuilder setBytesDownloaded(long bytesDownloaded) {
+    progress.bytesDownloaded = bytesDownloaded;
     return this;
   }
 
-  public DownloadBuilder setTotalBytes(long totalBytes) {
-    counters.contentLength = totalBytes;
+  public DownloadBuilder setContentLength(long contentLength) {
+    this.contentLength = contentLength;
     return this;
   }
 
@@ -156,6 +165,13 @@ class DownloadBuilder {
     DownloadRequest request =
         new DownloadRequest(id, type, uri, streamKeys, cacheKey, customMetadata);
     return new Download(
-        request, state, failureReason, stopReason, startTimeMs, updateTimeMs, counters);
+        request,
+        state,
+        startTimeMs,
+        updateTimeMs,
+        contentLength,
+        stopReason,
+        failureReason,
+        progress);
   }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index 17328248c6..5798e9df8c 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
 import android.net.Uri;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.offline.Download.State;
 import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.testutil.DummyMainThread;
@@ -27,7 +28,6 @@ import com.google.android.exoplayer2.testutil.DummyMainThread.TestRunnable;
 import com.google.android.exoplayer2.testutil.RobolectricUtil;
 import com.google.android.exoplayer2.testutil.TestDownloadManagerListener;
 import com.google.android.exoplayer2.testutil.TestUtil;
-import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -184,7 +184,7 @@ public class DownloadManagerTest {
 
     int tooManyRetries = MIN_RETRY_COUNT + 10;
     for (int i = 0; i < tooManyRetries; i++) {
-      downloader.increaseDownloadedByteCount();
+      downloader.incrementBytesDownloaded();
       downloader.assertStarted(MAX_RETRY_DELAY).fail();
     }
     downloader.assertStarted(MAX_RETRY_DELAY).unblock();
@@ -555,11 +555,11 @@ public class DownloadManagerTest {
   private static void assertEqualIgnoringTimeFields(Download download, Download that) {
     assertThat(download.request).isEqualTo(that.request);
     assertThat(download.state).isEqualTo(that.state);
+    assertThat(download.contentLength).isEqualTo(that.contentLength);
     assertThat(download.failureReason).isEqualTo(that.failureReason);
     assertThat(download.stopReason).isEqualTo(that.stopReason);
-    assertThat(download.getDownloadPercentage()).isEqualTo(that.getDownloadPercentage());
-    assertThat(download.getDownloadedBytes()).isEqualTo(that.getDownloadedBytes());
-    assertThat(download.getTotalBytes()).isEqualTo(that.getTotalBytes());
+    assertThat(download.getPercentDownloaded()).isEqualTo(that.getPercentDownloaded());
+    assertThat(download.getBytesDownloaded()).isEqualTo(that.getBytesDownloaded());
   }
 
   private static DownloadRequest createDownloadRequest() {
@@ -722,21 +722,23 @@ public class DownloadManagerTest {
     private volatile boolean cancelled;
     private volatile boolean enableDownloadIOException;
     private volatile int startCount;
-    private CachingCounters counters;
+    private volatile int bytesDownloaded;
 
     private FakeDownloader() {
       this.started = new CountDownLatch(1);
       this.blocker = new com.google.android.exoplayer2.util.ConditionVariable();
-      counters = new CachingCounters();
     }
 
     @SuppressWarnings({"NonAtomicOperationOnVolatileField", "NonAtomicVolatileUpdate"})
     @Override
-    public void download() throws InterruptedException, IOException {
+    public void download(ProgressListener listener) throws InterruptedException, IOException {
       // It's ok to update this directly as no other thread will update it.
       startCount++;
       started.countDown();
       block();
+      if (bytesDownloaded > 0) {
+        listener.onProgress(C.LENGTH_UNSET, bytesDownloaded, C.PERCENTAGE_UNSET);
+      }
       if (enableDownloadIOException) {
         enableDownloadIOException = false;
         throw new IOException();
@@ -783,7 +785,7 @@ public class DownloadManagerTest {
       return this;
     }
 
-    private FakeDownloader assertStartCount(int count) throws InterruptedException {
+    private FakeDownloader assertStartCount(int count) {
       assertThat(startCount).isEqualTo(count);
       return this;
     }
@@ -823,34 +825,14 @@ public class DownloadManagerTest {
       return unblock();
     }
 
-    @Override
-    public long getDownloadedBytes() {
-      return counters.newlyCachedBytes;
-    }
-
-    @Override
-    public long getTotalBytes() {
-      return counters.contentLength;
-    }
-
-    @Override
-    public float getDownloadPercentage() {
-      return counters.percentage;
-    }
-
-    @Override
-    public CachingCounters getCounters() {
-      return counters;
-    }
-
     private void assertDoesNotStart() throws InterruptedException {
       Thread.sleep(ASSERT_FALSE_TIME);
       assertThat(started.getCount()).isEqualTo(1);
     }
 
     @SuppressWarnings({"NonAtomicOperationOnVolatileField", "NonAtomicVolatileUpdate"})
-    private void increaseDownloadedByteCount() {
-      counters.newlyCachedBytes++;
+    private void incrementBytesDownloaded() {
+      bytesDownloaded++;
     }
   }
 }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
index 4005edc3a6..956a5fc283 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
@@ -343,7 +343,7 @@ public final class CacheDataSourceTest {
         cache,
         /* cacheKeyFactory= */ null,
         upstream2,
-        /* counters= */ null,
+        /* progressListener= */ null,
         /* isCanceled= */ null);
 
     // Read the rest of the data.
@@ -392,7 +392,7 @@ public final class CacheDataSourceTest {
         cache,
         /* cacheKeyFactory= */ null,
         upstream2,
-        /* counters= */ null,
+        /* progressListener= */ null,
         /* isCanceled= */ null);
 
     // Read the rest of the data.
@@ -416,7 +416,7 @@ public final class CacheDataSourceTest {
         cache,
         /* cacheKeyFactory= */ null,
         upstream,
-        /* counters= */ null,
+        /* progressListener= */ null,
         /* isCanceled= */ null);
 
     // Create cache read-only CacheDataSource.
@@ -452,7 +452,7 @@ public final class CacheDataSourceTest {
         cache,
         /* cacheKeyFactory= */ null,
         upstream,
-        /* counters= */ null,
+        /* progressListener= */ null,
         /* isCanceled= */ null);
 
     // Create blocking CacheDataSource.
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
index ba06862385..9a449b2ebd 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
@@ -22,6 +22,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import android.net.Uri;
+import android.util.Pair;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
@@ -30,7 +31,6 @@ import com.google.android.exoplayer2.testutil.FakeDataSource;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.upstream.DataSpec;
 import com.google.android.exoplayer2.upstream.FileDataSource;
-import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
 import com.google.android.exoplayer2.util.Util;
 import java.io.EOFException;
 import java.io.File;
@@ -100,12 +100,12 @@ public final class CacheUtilTest {
   }
 
   @After
-  public void tearDown() throws Exception {
+  public void tearDown() {
     Util.recursiveDelete(tempFolder);
   }
 
   @Test
-  public void testGenerateKey() throws Exception {
+  public void testGenerateKey() {
     assertThat(CacheUtil.generateKey(Uri.EMPTY)).isNotNull();
 
     Uri testUri = Uri.parse("test");
@@ -120,7 +120,7 @@ public final class CacheUtilTest {
   }
 
   @Test
-  public void testDefaultCacheKeyFactory_buildCacheKey() throws Exception {
+  public void testDefaultCacheKeyFactory_buildCacheKey() {
     Uri testUri = Uri.parse("test");
     String key = "key";
     // If DataSpec.key is present, returns it.
@@ -136,62 +136,66 @@ public final class CacheUtilTest {
   }
 
   @Test
-  public void testGetCachedNoData() throws Exception {
-    CachingCounters counters = new CachingCounters();
-    CacheUtil.getCached(
-        new DataSpec(Uri.parse("test")), mockCache, /* cacheKeyFactory= */ null, counters);
+  public void testGetCachedNoData() {
+    Pair<Long, Long> contentLengthAndBytesCached =
+        CacheUtil.getCached(
+            new DataSpec(Uri.parse("test")), mockCache, /* cacheKeyFactory= */ null);
 
-    assertCounters(counters, 0, 0, C.LENGTH_UNSET);
+    assertThat(contentLengthAndBytesCached.first).isEqualTo(C.LENGTH_UNSET);
+    assertThat(contentLengthAndBytesCached.second).isEqualTo(0);
   }
 
   @Test
-  public void testGetCachedDataUnknownLength() throws Exception {
+  public void testGetCachedDataUnknownLength() {
     // Mock there is 100 bytes cached at the beginning
     mockCache.spansAndGaps = new int[] {100};
-    CachingCounters counters = new CachingCounters();
-    CacheUtil.getCached(
-        new DataSpec(Uri.parse("test")), mockCache, /* cacheKeyFactory= */ null, counters);
+    Pair<Long, Long> contentLengthAndBytesCached =
+        CacheUtil.getCached(
+            new DataSpec(Uri.parse("test")), mockCache, /* cacheKeyFactory= */ null);
 
-    assertCounters(counters, 100, 0, C.LENGTH_UNSET);
+    assertThat(contentLengthAndBytesCached.first).isEqualTo(C.LENGTH_UNSET);
+    assertThat(contentLengthAndBytesCached.second).isEqualTo(100);
   }
 
   @Test
-  public void testGetCachedNoDataKnownLength() throws Exception {
+  public void testGetCachedNoDataKnownLength() {
     mockCache.contentLength = 1000;
-    CachingCounters counters = new CachingCounters();
-    CacheUtil.getCached(
-        new DataSpec(Uri.parse("test")), mockCache, /* cacheKeyFactory= */ null, counters);
+    Pair<Long, Long> contentLengthAndBytesCached =
+        CacheUtil.getCached(
+            new DataSpec(Uri.parse("test")), mockCache, /* cacheKeyFactory= */ null);
 
-    assertCounters(counters, 0, 0, 1000);
+    assertThat(contentLengthAndBytesCached.first).isEqualTo(1000);
+    assertThat(contentLengthAndBytesCached.second).isEqualTo(0);
   }
 
   @Test
-  public void testGetCached() throws Exception {
+  public void testGetCached() {
     mockCache.contentLength = 1000;
     mockCache.spansAndGaps = new int[] {100, 100, 200};
-    CachingCounters counters = new CachingCounters();
-    CacheUtil.getCached(
-        new DataSpec(Uri.parse("test")), mockCache, /* cacheKeyFactory= */ null, counters);
+    Pair<Long, Long> contentLengthAndBytesCached =
+        CacheUtil.getCached(
+            new DataSpec(Uri.parse("test")), mockCache, /* cacheKeyFactory= */ null);
 
-    assertCounters(counters, 300, 0, 1000);
+    assertThat(contentLengthAndBytesCached.first).isEqualTo(1000);
+    assertThat(contentLengthAndBytesCached.second).isEqualTo(300);
   }
 
   @Test
-  public void testGetCachedFromNonZeroPosition() throws Exception {
+  public void testGetCachedFromNonZeroPosition() {
     mockCache.contentLength = 1000;
     mockCache.spansAndGaps = new int[] {100, 100, 200};
-    CachingCounters counters = new CachingCounters();
-    CacheUtil.getCached(
-        new DataSpec(
-            Uri.parse("test"),
-            /* absoluteStreamPosition= */ 100,
-            /* length= */ C.LENGTH_UNSET,
-            /* key= */ null),
-        mockCache,
-        /* cacheKeyFactory= */ null,
-        counters);
+    Pair<Long, Long> contentLengthAndBytesCached =
+        CacheUtil.getCached(
+            new DataSpec(
+                Uri.parse("test"),
+                /* absoluteStreamPosition= */ 100,
+                /* length= */ C.LENGTH_UNSET,
+                /* key= */ null),
+            mockCache,
+            /* cacheKeyFactory= */ null);
 
-    assertCounters(counters, 200, 0, 900);
+    assertThat(contentLengthAndBytesCached.first).isEqualTo(900);
+    assertThat(contentLengthAndBytesCached.second).isEqualTo(200);
   }
 
   @Test
@@ -208,7 +212,7 @@ public final class CacheUtilTest {
         counters,
         /* isCanceled= */ null);
 
-    assertCounters(counters, 0, 100, 100);
+    counters.assertValues(0, 100, 100);
     assertCachedData(cache, fakeDataSet);
   }
 
@@ -223,7 +227,8 @@ public final class CacheUtilTest {
     CacheUtil.cache(
         dataSpec, cache, /* cacheKeyFactory= */ null, dataSource, counters, /* isCanceled= */ null);
 
-    assertCounters(counters, 0, 20, 20);
+    counters.assertValues(0, 20, 20);
+    counters.reset();
 
     CacheUtil.cache(
         new DataSpec(testUri),
@@ -233,7 +238,7 @@ public final class CacheUtilTest {
         counters,
         /* isCanceled= */ null);
 
-    assertCounters(counters, 20, 80, 100);
+    counters.assertValues(20, 80, 100);
     assertCachedData(cache, fakeDataSet);
   }
 
@@ -249,7 +254,7 @@ public final class CacheUtilTest {
     CacheUtil.cache(
         dataSpec, cache, /* cacheKeyFactory= */ null, dataSource, counters, /* isCanceled= */ null);
 
-    assertCounters(counters, 0, 100, 100);
+    counters.assertValues(0, 100, 100);
     assertCachedData(cache, fakeDataSet);
   }
 
@@ -266,7 +271,8 @@ public final class CacheUtilTest {
     CacheUtil.cache(
         dataSpec, cache, /* cacheKeyFactory= */ null, dataSource, counters, /* isCanceled= */ null);
 
-    assertCounters(counters, 0, 20, 20);
+    counters.assertValues(0, 20, 20);
+    counters.reset();
 
     CacheUtil.cache(
         new DataSpec(testUri),
@@ -276,7 +282,7 @@ public final class CacheUtilTest {
         counters,
         /* isCanceled= */ null);
 
-    assertCounters(counters, 20, 80, 100);
+    counters.assertValues(20, 80, 100);
     assertCachedData(cache, fakeDataSet);
   }
 
@@ -291,7 +297,7 @@ public final class CacheUtilTest {
     CacheUtil.cache(
         dataSpec, cache, /* cacheKeyFactory= */ null, dataSource, counters, /* isCanceled= */ null);
 
-    assertCounters(counters, 0, 100, 1000);
+    counters.assertValues(0, 100, 1000);
     assertCachedData(cache, fakeDataSet);
   }
 
@@ -312,7 +318,7 @@ public final class CacheUtilTest {
           new byte[CacheUtil.DEFAULT_BUFFER_SIZE_BYTES],
           /* priorityTaskManager= */ null,
           /* priority= */ 0,
-          /* counters= */ null,
+          /* progressListener= */ null,
           /* isCanceled= */ null,
           /* enableEOFException= */ true);
       fail();
@@ -328,9 +334,9 @@ public final class CacheUtilTest {
         new FakeDataSet()
             .newData("test_data")
             .appendReadData(TestUtil.buildTestData(100))
-            .appendReadAction(() -> assertCounters(counters, 0, 100, 300))
+            .appendReadAction(() -> counters.assertValues(0, 100, 300))
             .appendReadData(TestUtil.buildTestData(100))
-            .appendReadAction(() -> assertCounters(counters, 0, 200, 300))
+            .appendReadAction(() -> counters.assertValues(0, 200, 300))
             .appendReadData(TestUtil.buildTestData(100))
             .endData();
     FakeDataSource dataSource = new FakeDataSource(fakeDataSet);
@@ -343,7 +349,7 @@ public final class CacheUtilTest {
         counters,
         /* isCanceled= */ null);
 
-    assertCounters(counters, 0, 300, 300);
+    counters.assertValues(0, 300, 300);
     assertCachedData(cache, fakeDataSet);
   }
 
@@ -369,7 +375,7 @@ public final class CacheUtilTest {
         new byte[CacheUtil.DEFAULT_BUFFER_SIZE_BYTES],
         /* priorityTaskManager= */ null,
         /* priority= */ 0,
-        /* counters= */ null,
+        /* progressListener= */ null,
         /* isCanceled= */ null,
         true);
     CacheUtil.remove(dataSpec, cache, /* cacheKeyFactory= */ null);
@@ -377,10 +383,34 @@ public final class CacheUtilTest {
     assertCacheEmpty(cache);
   }
 
-  private static void assertCounters(CachingCounters counters, int alreadyCachedBytes,
-      int newlyCachedBytes, int contentLength) {
-    assertThat(counters.alreadyCachedBytes).isEqualTo(alreadyCachedBytes);
-    assertThat(counters.newlyCachedBytes).isEqualTo(newlyCachedBytes);
-    assertThat(counters.contentLength).isEqualTo(contentLength);
+  private static final class CachingCounters implements CacheUtil.ProgressListener {
+
+    private long contentLength = C.LENGTH_UNSET;
+    private long bytesAlreadyCached;
+    private long bytesNewlyCached;
+    private boolean seenFirstProgressUpdate;
+
+    @Override
+    public void onProgress(long contentLength, long bytesCached, long newBytesCached) {
+      this.contentLength = contentLength;
+      if (!seenFirstProgressUpdate) {
+        bytesAlreadyCached = bytesCached;
+        seenFirstProgressUpdate = true;
+      }
+      bytesNewlyCached = bytesCached - bytesAlreadyCached;
+    }
+
+    public void assertValues(int bytesAlreadyCached, int bytesNewlyCached, int contentLength) {
+      assertThat(this.bytesAlreadyCached).isEqualTo(bytesAlreadyCached);
+      assertThat(this.bytesNewlyCached).isEqualTo(bytesNewlyCached);
+      assertThat(this.contentLength).isEqualTo(contentLength);
+    }
+
+    public void reset() {
+      contentLength = C.LENGTH_UNSET;
+      bytesAlreadyCached = 0;
+      bytesNewlyCached = 0;
+      seenFirstProgressUpdate = false;
+    }
   }
 }
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.java
index 5636c73491..2754a3341a 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.java
@@ -45,7 +45,7 @@ import java.util.List;
  * <p>Example usage:
  *
  * <pre>{@code
- * SimpleCache cache = new SimpleCache(downloadFolder, new NoOpCacheEvictor());
+ * SimpleCache cache = new SimpleCache(downloadFolder, new NoOpCacheEvictor(), databaseProvider);
  * DefaultHttpDataSourceFactory factory = new DefaultHttpDataSourceFactory("ExoPlayer", null);
  * DownloaderConstructorHelper constructorHelper =
  *     new DownloaderConstructorHelper(cache, factory);
@@ -55,7 +55,7 @@ import java.util.List;
  *     new DashDownloader(
  *         manifestUrl, Collections.singletonList(new StreamKey(0, 0, 0)), constructorHelper);
  * // Perform the download.
- * dashDownloader.download();
+ * dashDownloader.download(progressListener);
  * // Access downloaded data using CacheDataSource
  * CacheDataSource cacheDataSource =
  *     new CacheDataSource(cache, factory.createDataSource(), CacheDataSource.FLAG_BLOCK_ON_CACHE);
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
index 9eacd28f8d..b3a6b8271b 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
@@ -62,6 +62,7 @@ public class DashDownloaderTest {
 
   private SimpleCache cache;
   private File tempFolder;
+  private ProgressListener progressListener;
 
   @Before
   public void setUp() throws Exception {
@@ -69,6 +70,7 @@ public class DashDownloaderTest {
     tempFolder =
         Util.createTempDirectory(ApplicationProvider.getApplicationContext(), "ExoPlayerTest");
     cache = new SimpleCache(tempFolder, new NoOpCacheEvictor());
+    progressListener = new ProgressListener();
   }
 
   @After
@@ -77,7 +79,7 @@ public class DashDownloaderTest {
   }
 
   @Test
-  public void testCreateWithDefaultDownloaderFactory() throws Exception {
+  public void testCreateWithDefaultDownloaderFactory() {
     DownloaderConstructorHelper constructorHelper =
         new DownloaderConstructorHelper(Mockito.mock(Cache.class), DummyDataSource.FACTORY);
     DownloaderFactory factory = new DefaultDownloaderFactory(constructorHelper);
@@ -105,7 +107,7 @@ public class DashDownloaderTest {
             .setRandomData("audio_segment_3", 6);
 
     DashDownloader dashDownloader = getDashDownloader(fakeDataSet, new StreamKey(0, 0, 0));
-    dashDownloader.download();
+    dashDownloader.download(progressListener);
     assertCachedData(cache, fakeDataSet);
   }
 
@@ -124,7 +126,7 @@ public class DashDownloaderTest {
             .setRandomData("audio_segment_3", 6);
 
     DashDownloader dashDownloader = getDashDownloader(fakeDataSet, new StreamKey(0, 0, 0));
-    dashDownloader.download();
+    dashDownloader.download(progressListener);
     assertCachedData(cache, fakeDataSet);
   }
 
@@ -143,7 +145,7 @@ public class DashDownloaderTest {
 
     DashDownloader dashDownloader =
         getDashDownloader(fakeDataSet, new StreamKey(0, 0, 0), new StreamKey(0, 1, 0));
-    dashDownloader.download();
+    dashDownloader.download(progressListener);
     assertCachedData(cache, fakeDataSet);
   }
 
@@ -164,7 +166,7 @@ public class DashDownloaderTest {
             .setRandomData("period_2_segment_3", 3);
 
     DashDownloader dashDownloader = getDashDownloader(fakeDataSet);
-    dashDownloader.download();
+    dashDownloader.download(progressListener);
     assertCachedData(cache, fakeDataSet);
   }
 
@@ -186,7 +188,7 @@ public class DashDownloaderTest {
 
     DashDownloader dashDownloader =
         getDashDownloader(factory, new StreamKey(0, 0, 0), new StreamKey(0, 1, 0));
-    dashDownloader.download();
+    dashDownloader.download(progressListener);
 
     DataSpec[] openedDataSpecs = fakeDataSource.getAndClearOpenedDataSpecs();
     assertThat(openedDataSpecs.length).isEqualTo(8);
@@ -218,7 +220,7 @@ public class DashDownloaderTest {
 
     DashDownloader dashDownloader =
         getDashDownloader(factory, new StreamKey(0, 0, 0), new StreamKey(1, 0, 0));
-    dashDownloader.download();
+    dashDownloader.download(progressListener);
 
     DataSpec[] openedDataSpecs = fakeDataSource.getAndClearOpenedDataSpecs();
     assertThat(openedDataSpecs.length).isEqualTo(8);
@@ -248,12 +250,12 @@ public class DashDownloaderTest {
 
     DashDownloader dashDownloader = getDashDownloader(fakeDataSet, new StreamKey(0, 0, 0));
     try {
-      dashDownloader.download();
+      dashDownloader.download(progressListener);
       fail();
     } catch (IOException e) {
       // Expected.
     }
-    dashDownloader.download();
+    dashDownloader.download(progressListener);
     assertCachedData(cache, fakeDataSet);
   }
 
@@ -272,18 +274,17 @@ public class DashDownloaderTest {
             .setRandomData("audio_segment_3", 6);
 
     DashDownloader dashDownloader = getDashDownloader(fakeDataSet, new StreamKey(0, 0, 0));
-    assertThat(dashDownloader.getDownloadedBytes()).isEqualTo(0);
 
     try {
-      dashDownloader.download();
+      dashDownloader.download(progressListener);
       fail();
     } catch (IOException e) {
       // Failure expected after downloading init data, segment 1 and 2 bytes in segment 2.
     }
-    assertThat(dashDownloader.getDownloadedBytes()).isEqualTo(10 + 4 + 2);
+    progressListener.assertBytesDownloaded(10 + 4 + 2);
 
-    dashDownloader.download();
-    assertThat(dashDownloader.getDownloadedBytes()).isEqualTo(10 + 4 + 5 + 6);
+    dashDownloader.download(progressListener);
+    progressListener.assertBytesDownloaded(10 + 4 + 5 + 6);
   }
 
   @Test
@@ -301,7 +302,7 @@ public class DashDownloaderTest {
 
     DashDownloader dashDownloader =
         getDashDownloader(fakeDataSet, new StreamKey(0, 0, 0), new StreamKey(0, 1, 0));
-    dashDownloader.download();
+    dashDownloader.download(progressListener);
     dashDownloader.remove();
     assertCacheEmpty(cache);
   }
@@ -315,7 +316,7 @@ public class DashDownloaderTest {
 
     DashDownloader dashDownloader = getDashDownloader(fakeDataSet, new StreamKey(0, 0, 0));
     try {
-      dashDownloader.download();
+      dashDownloader.download(progressListener);
       fail();
     } catch (DownloadException e) {
       // Expected.
@@ -339,4 +340,17 @@ public class DashDownloaderTest {
     return keysList;
   }
 
+  private static final class ProgressListener implements Downloader.ProgressListener {
+
+    private long bytesDownloaded;
+
+    @Override
+    public void onProgress(long contentLength, long bytesDownloaded, float percentDownloaded) {
+      this.bytesDownloaded = bytesDownloaded;
+    }
+
+    public void assertBytesDownloaded(long bytesDownloaded) {
+      assertThat(this.bytesDownloaded).isEqualTo(bytesDownloaded);
+    }
+  }
 }
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java
index 8e744f9a77..6e6d0afd49 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java
@@ -39,7 +39,7 @@ import java.util.List;
  * <p>Example usage:
  *
  * <pre>{@code
- * SimpleCache cache = new SimpleCache(downloadFolder, new NoOpCacheEvictor());
+ * SimpleCache cache = new SimpleCache(downloadFolder, new NoOpCacheEvictor(), databaseProvider);
  * DefaultHttpDataSourceFactory factory = new DefaultHttpDataSourceFactory("ExoPlayer", null);
  * DownloaderConstructorHelper constructorHelper =
  *     new DownloaderConstructorHelper(cache, factory);
@@ -50,7 +50,7 @@ import java.util.List;
  *         Collections.singletonList(new StreamKey(HlsMasterPlaylist.GROUP_INDEX_VARIANT, 0)),
  *         constructorHelper);
  * // Perform the download.
- * hlsDownloader.download();
+ * hlsDownloader.download(progressListener);
  * // Access downloaded data using CacheDataSource
  * CacheDataSource cacheDataSource =
  *     new CacheDataSource(cache, factory.createDataSource(), CacheDataSource.FLAG_BLOCK_ON_CACHE);
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
index b92953c3b5..7d77a78316 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
@@ -67,6 +67,7 @@ public class HlsDownloaderTest {
 
   private SimpleCache cache;
   private File tempFolder;
+  private ProgressListener progressListener;
   private FakeDataSet fakeDataSet;
 
   @Before
@@ -74,7 +75,7 @@ public class HlsDownloaderTest {
     tempFolder =
         Util.createTempDirectory(ApplicationProvider.getApplicationContext(), "ExoPlayerTest");
     cache = new SimpleCache(tempFolder, new NoOpCacheEvictor());
-
+    progressListener = new ProgressListener();
     fakeDataSet =
         new FakeDataSet()
             .setData(MASTER_PLAYLIST_URI, MASTER_PLAYLIST_DATA)
@@ -94,7 +95,7 @@ public class HlsDownloaderTest {
   }
 
   @Test
-  public void testCreateWithDefaultDownloaderFactory() throws Exception {
+  public void testCreateWithDefaultDownloaderFactory() {
     DownloaderConstructorHelper constructorHelper =
         new DownloaderConstructorHelper(Mockito.mock(Cache.class), DummyDataSource.FACTORY);
     DownloaderFactory factory = new DefaultDownloaderFactory(constructorHelper);
@@ -115,17 +116,16 @@ public class HlsDownloaderTest {
   public void testCounterMethods() throws Exception {
     HlsDownloader downloader =
         getHlsDownloader(MASTER_PLAYLIST_URI, getKeys(MASTER_MEDIA_PLAYLIST_1_INDEX));
-    downloader.download();
+    downloader.download(progressListener);
 
-    assertThat(downloader.getDownloadedBytes())
-        .isEqualTo(MEDIA_PLAYLIST_DATA.length + 10 + 11 + 12);
+    progressListener.assertBytesDownloaded(MEDIA_PLAYLIST_DATA.length + 10 + 11 + 12);
   }
 
   @Test
   public void testDownloadRepresentation() throws Exception {
     HlsDownloader downloader =
         getHlsDownloader(MASTER_PLAYLIST_URI, getKeys(MASTER_MEDIA_PLAYLIST_1_INDEX));
-    downloader.download();
+    downloader.download(progressListener);
 
     assertCachedData(
         cache,
@@ -143,7 +143,7 @@ public class HlsDownloaderTest {
         getHlsDownloader(
             MASTER_PLAYLIST_URI,
             getKeys(MASTER_MEDIA_PLAYLIST_1_INDEX, MASTER_MEDIA_PLAYLIST_2_INDEX));
-    downloader.download();
+    downloader.download(progressListener);
 
     assertCachedData(cache, fakeDataSet);
   }
@@ -162,7 +162,7 @@ public class HlsDownloaderTest {
         .setRandomData(MEDIA_PLAYLIST_3_DIR + "fileSequence2.ts", 15);
 
     HlsDownloader downloader = getHlsDownloader(MASTER_PLAYLIST_URI, getKeys());
-    downloader.download();
+    downloader.download(progressListener);
 
     assertCachedData(cache, fakeDataSet);
   }
@@ -173,7 +173,7 @@ public class HlsDownloaderTest {
         getHlsDownloader(
             MASTER_PLAYLIST_URI,
             getKeys(MASTER_MEDIA_PLAYLIST_1_INDEX, MASTER_MEDIA_PLAYLIST_2_INDEX));
-    downloader.download();
+    downloader.download(progressListener);
     downloader.remove();
 
     assertCacheEmpty(cache);
@@ -182,7 +182,7 @@ public class HlsDownloaderTest {
   @Test
   public void testDownloadMediaPlaylist() throws Exception {
     HlsDownloader downloader = getHlsDownloader(MEDIA_PLAYLIST_1_URI, getKeys());
-    downloader.download();
+    downloader.download(progressListener);
 
     assertCachedData(
         cache,
@@ -205,7 +205,7 @@ public class HlsDownloaderTest {
             .setRandomData("fileSequence2.ts", 12);
 
     HlsDownloader downloader = getHlsDownloader(ENC_MEDIA_PLAYLIST_URI, getKeys());
-    downloader.download();
+    downloader.download(progressListener);
     assertCachedData(cache, fakeDataSet);
   }
 
@@ -222,4 +222,18 @@ public class HlsDownloaderTest {
     }
     return streamKeys;
   }
+
+  private static final class ProgressListener implements Downloader.ProgressListener {
+
+    private long bytesDownloaded;
+
+    @Override
+    public void onProgress(long contentLength, long bytesDownloaded, float percentDownloaded) {
+      this.bytesDownloaded = bytesDownloaded;
+    }
+
+    public void assertBytesDownloaded(long bytesDownloaded) {
+      assertThat(this.bytesDownloaded).isEqualTo(bytesDownloaded);
+    }
+  }
 }
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java
index 18820ca49c..1331fe4617 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java
@@ -37,7 +37,7 @@ import java.util.List;
  * <p>Example usage:
  *
  * <pre>{@code
- * SimpleCache cache = new SimpleCache(downloadFolder, new NoOpCacheEvictor());
+ * SimpleCache cache = new SimpleCache(downloadFolder, new NoOpCacheEvictor(), databaseProvider);
  * DefaultHttpDataSourceFactory factory = new DefaultHttpDataSourceFactory("ExoPlayer", null);
  * DownloaderConstructorHelper constructorHelper =
  *     new DownloaderConstructorHelper(cache, factory);
@@ -48,7 +48,7 @@ import java.util.List;
  *         Collections.singletonList(new StreamKey(0, 0)),
  *         constructorHelper);
  * // Perform the download.
- * ssDownloader.download();
+ * ssDownloader.download(progressListener);
  * // Access downloaded data using CacheDataSource
  * CacheDataSource cacheDataSource =
  *     new CacheDataSource(cache, factory.createDataSource(), CacheDataSource.FLAG_BLOCK_ON_CACHE);
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
index b26b8eaac4..178cd44dd3 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
@@ -75,12 +75,12 @@ public final class DownloadNotificationHelper {
         continue;
       }
       haveDownloadTasks = true;
-      float downloadPercentage = download.getDownloadPercentage();
+      float downloadPercentage = download.getPercentDownloaded();
       if (downloadPercentage != C.PERCENTAGE_UNSET) {
         allDownloadPercentagesUnknown = false;
         totalPercentage += downloadPercentage;
       }
-      haveDownloadedBytes |= download.getDownloadedBytes() > 0;
+      haveDownloadedBytes |= download.getBytesDownloaded() > 0;
       downloadTaskCount++;
     }
 
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashDownloadTest.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashDownloadTest.java
index 67c840e681..f5af2472c9 100644
--- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashDownloadTest.java
+++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashDownloadTest.java
@@ -89,7 +89,7 @@ public final class DashDownloadTest {
   @Test
   public void testDownload() throws Exception {
     DashDownloader dashDownloader = downloadContent();
-    dashDownloader.download();
+    dashDownloader.download(/* progressListener= */ null);
 
     testRunner
         .setStreamName("test_h264_fixed_download")

From b30efe968b8459d77779daea9960d15c3e6268a1 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 18 Apr 2019 23:08:43 +0100
Subject: [PATCH 794/832] Clean up database tables for launch

PiperOrigin-RevId: 244267255
---
 .../offline/DefaultDownloadIndex.java         | 131 ++++++++----------
 .../cache/CacheFileMetadataIndex.java         |   5 +-
 .../upstream/cache/CachedContentIndex.java    |  13 +-
 .../offline/DefaultDownloadIndexTest.java     |   2 +-
 4 files changed, 62 insertions(+), 89 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
index 6838c24628..252c058b88 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -23,7 +23,6 @@ import android.database.sqlite.SQLiteException;
 import android.net.Uri;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
-import android.text.TextUtils;
 import com.google.android.exoplayer2.database.DatabaseIOException;
 import com.google.android.exoplayer2.database.DatabaseProvider;
 import com.google.android.exoplayer2.database.VersionTable;
@@ -37,32 +36,22 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
 
   private static final String TABLE_PREFIX = DatabaseProvider.TABLE_PREFIX + "Downloads";
 
-  @VisibleForTesting /* package */ static final int TABLE_VERSION = 1;
+  @VisibleForTesting /* package */ static final int TABLE_VERSION = 2;
 
   private static final String COLUMN_ID = "id";
   private static final String COLUMN_TYPE = "title";
-  private static final String COLUMN_URI = "subtitle";
+  private static final String COLUMN_URI = "uri";
   private static final String COLUMN_STREAM_KEYS = "stream_keys";
-  private static final String COLUMN_CUSTOM_CACHE_KEY = "cache_key";
-  private static final String COLUMN_DATA = "custom_metadata";
+  private static final String COLUMN_CUSTOM_CACHE_KEY = "custom_cache_key";
+  private static final String COLUMN_DATA = "data";
   private static final String COLUMN_STATE = "state";
-  private static final String COLUMN_DOWNLOAD_PERCENTAGE = "download_percentage";
-  private static final String COLUMN_DOWNLOADED_BYTES = "downloaded_bytes";
-  private static final String COLUMN_TOTAL_BYTES = "total_bytes";
-  private static final String COLUMN_FAILURE_REASON = "failure_reason";
-  private static final String COLUMN_STOP_REASON = "manual_stop_reason";
   private static final String COLUMN_START_TIME_MS = "start_time_ms";
   private static final String COLUMN_UPDATE_TIME_MS = "update_time_ms";
-
-  /** @deprecated No longer used. */
-  @SuppressWarnings("DeprecatedIsStillUsed")
-  @Deprecated
-  private static final String COLUMN_STOP_FLAGS = "stop_flags";
-
-  /** @deprecated No longer used. */
-  @SuppressWarnings("DeprecatedIsStillUsed")
-  @Deprecated
-  private static final String COLUMN_NOT_MET_REQUIREMENTS = "not_met_requirements";
+  private static final String COLUMN_CONTENT_LENGTH = "content_length";
+  private static final String COLUMN_STOP_REASON = "stop_reason";
+  private static final String COLUMN_FAILURE_REASON = "failure_reason";
+  private static final String COLUMN_PERCENT_DOWNLOADED = "percent_downloaded";
+  private static final String COLUMN_BYTES_DOWNLOADED = "bytes_downloaded";
 
   private static final int COLUMN_INDEX_ID = 0;
   private static final int COLUMN_INDEX_TYPE = 1;
@@ -71,13 +60,13 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
   private static final int COLUMN_INDEX_CUSTOM_CACHE_KEY = 4;
   private static final int COLUMN_INDEX_DATA = 5;
   private static final int COLUMN_INDEX_STATE = 6;
-  private static final int COLUMN_INDEX_DOWNLOAD_PERCENTAGE = 7;
-  private static final int COLUMN_INDEX_DOWNLOADED_BYTES = 8;
-  private static final int COLUMN_INDEX_TOTAL_BYTES = 9;
-  private static final int COLUMN_INDEX_FAILURE_REASON = 10;
-  private static final int COLUMN_INDEX_STOP_REASON = 11;
-  private static final int COLUMN_INDEX_START_TIME_MS = 12;
-  private static final int COLUMN_INDEX_UPDATE_TIME_MS = 13;
+  private static final int COLUMN_INDEX_START_TIME_MS = 7;
+  private static final int COLUMN_INDEX_UPDATE_TIME_MS = 8;
+  private static final int COLUMN_INDEX_CONTENT_LENGTH = 9;
+  private static final int COLUMN_INDEX_STOP_REASON = 10;
+  private static final int COLUMN_INDEX_FAILURE_REASON = 11;
+  private static final int COLUMN_INDEX_PERCENT_DOWNLOADED = 12;
+  private static final int COLUMN_INDEX_BYTES_DOWNLOADED = 13;
 
   private static final String WHERE_ID_EQUALS = COLUMN_ID + " = ?";
   private static final String WHERE_STATE_TERMINAL =
@@ -92,13 +81,13 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
         COLUMN_CUSTOM_CACHE_KEY,
         COLUMN_DATA,
         COLUMN_STATE,
-        COLUMN_DOWNLOAD_PERCENTAGE,
-        COLUMN_DOWNLOADED_BYTES,
-        COLUMN_TOTAL_BYTES,
-        COLUMN_FAILURE_REASON,
-        COLUMN_STOP_REASON,
         COLUMN_START_TIME_MS,
-        COLUMN_UPDATE_TIME_MS
+        COLUMN_UPDATE_TIME_MS,
+        COLUMN_CONTENT_LENGTH,
+        COLUMN_STOP_REASON,
+        COLUMN_FAILURE_REASON,
+        COLUMN_PERCENT_DOWNLOADED,
+        COLUMN_BYTES_DOWNLOADED,
       };
 
   private static final String TABLE_SCHEMA =
@@ -109,32 +98,28 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
           + " TEXT NOT NULL,"
           + COLUMN_URI
           + " TEXT NOT NULL,"
+          + COLUMN_STREAM_KEYS
+          + " TEXT NOT NULL,"
           + COLUMN_CUSTOM_CACHE_KEY
           + " TEXT,"
+          + COLUMN_DATA
+          + " BLOB NOT NULL,"
           + COLUMN_STATE
           + " INTEGER NOT NULL,"
-          + COLUMN_DOWNLOAD_PERCENTAGE
-          + " REAL NOT NULL,"
-          + COLUMN_DOWNLOADED_BYTES
-          + " INTEGER NOT NULL,"
-          + COLUMN_TOTAL_BYTES
-          + " INTEGER NOT NULL,"
-          + COLUMN_FAILURE_REASON
-          + " INTEGER NOT NULL,"
-          + COLUMN_STOP_FLAGS
-          + " INTEGER NOT NULL,"
-          + COLUMN_NOT_MET_REQUIREMENTS
-          + " INTEGER NOT NULL,"
-          + COLUMN_STOP_REASON
-          + " INTEGER NOT NULL,"
           + COLUMN_START_TIME_MS
           + " INTEGER NOT NULL,"
           + COLUMN_UPDATE_TIME_MS
           + " INTEGER NOT NULL,"
-          + COLUMN_STREAM_KEYS
-          + " TEXT NOT NULL,"
-          + COLUMN_DATA
-          + " BLOB NOT NULL)";
+          + COLUMN_CONTENT_LENGTH
+          + " INTEGER NOT NULL,"
+          + COLUMN_STOP_REASON
+          + " INTEGER NOT NULL,"
+          + COLUMN_FAILURE_REASON
+          + " INTEGER NOT NULL,"
+          + COLUMN_PERCENT_DOWNLOADED
+          + " REAL NOT NULL,"
+          + COLUMN_BYTES_DOWNLOADED
+          + " INTEGER NOT NULL)";
 
   private static final String TRUE = "1";
 
@@ -170,8 +155,7 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
    *     tables in which downloads are persisted.
    */
   public DefaultDownloadIndex(DatabaseProvider databaseProvider, String name) {
-    // TODO: Remove this backward compatibility hack for launch.
-    this.name = TextUtils.isEmpty(name) ? "singleton" : name;
+    this.name = name;
     this.databaseProvider = databaseProvider;
     tableName = TABLE_PREFIX + name;
   }
@@ -211,13 +195,11 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
     values.put(COLUMN_STATE, download.state);
     values.put(COLUMN_START_TIME_MS, download.startTimeMs);
     values.put(COLUMN_UPDATE_TIME_MS, download.updateTimeMs);
-    values.put(COLUMN_TOTAL_BYTES, download.contentLength);
+    values.put(COLUMN_CONTENT_LENGTH, download.contentLength);
     values.put(COLUMN_STOP_REASON, download.stopReason);
     values.put(COLUMN_FAILURE_REASON, download.failureReason);
-    values.put(COLUMN_DOWNLOAD_PERCENTAGE, download.getPercentDownloaded());
-    values.put(COLUMN_DOWNLOADED_BYTES, download.getBytesDownloaded());
-    values.put(COLUMN_STOP_FLAGS, 0);
-    values.put(COLUMN_NOT_MET_REQUIREMENTS, 0);
+    values.put(COLUMN_PERCENT_DOWNLOADED, download.getPercentDownloaded());
+    values.put(COLUMN_BYTES_DOWNLOADED, download.getBytesDownloaded());
     try {
       SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
       writableDatabase.replaceOrThrow(tableName, /* nullColumnHack= */ null, values);
@@ -270,7 +252,7 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
     try {
       SQLiteDatabase readableDatabase = databaseProvider.getReadableDatabase();
       int version = VersionTable.getVersion(readableDatabase, VersionTable.FEATURE_OFFLINE, name);
-      if (version == VersionTable.VERSION_UNSET || version > TABLE_VERSION) {
+      if (version != TABLE_VERSION) {
         SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
         writableDatabase.beginTransaction();
         try {
@@ -282,9 +264,6 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
         } finally {
           writableDatabase.endTransaction();
         }
-      } else if (version < TABLE_VERSION) {
-        // There is no previous version currently.
-        throw new IllegalStateException();
       }
       initialized = true;
     } catch (SQLException e) {
@@ -330,23 +309,23 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
   private static Download getDownloadForCurrentRow(Cursor cursor) {
     DownloadRequest request =
         new DownloadRequest(
-            cursor.getString(COLUMN_INDEX_ID),
-            cursor.getString(COLUMN_INDEX_TYPE),
-            Uri.parse(cursor.getString(COLUMN_INDEX_URI)),
-            decodeStreamKeys(cursor.getString(COLUMN_INDEX_STREAM_KEYS)),
-            cursor.getString(COLUMN_INDEX_CUSTOM_CACHE_KEY),
-            cursor.getBlob(COLUMN_INDEX_DATA));
+            /* id= */ cursor.getString(COLUMN_INDEX_ID),
+            /* type= */ cursor.getString(COLUMN_INDEX_TYPE),
+            /* uri= */ Uri.parse(cursor.getString(COLUMN_INDEX_URI)),
+            /* streamKeys= */ decodeStreamKeys(cursor.getString(COLUMN_INDEX_STREAM_KEYS)),
+            /* customCacheKey= */ cursor.getString(COLUMN_INDEX_CUSTOM_CACHE_KEY),
+            /* data= */ cursor.getBlob(COLUMN_INDEX_DATA));
     DownloadProgress downloadProgress = new DownloadProgress();
-    downloadProgress.bytesDownloaded = cursor.getLong(COLUMN_INDEX_DOWNLOADED_BYTES);
-    downloadProgress.percentDownloaded = cursor.getFloat(COLUMN_INDEX_DOWNLOAD_PERCENTAGE);
+    downloadProgress.bytesDownloaded = cursor.getLong(COLUMN_INDEX_BYTES_DOWNLOADED);
+    downloadProgress.percentDownloaded = cursor.getFloat(COLUMN_INDEX_PERCENT_DOWNLOADED);
     return new Download(
         request,
-        cursor.getInt(COLUMN_INDEX_STATE),
-        cursor.getLong(COLUMN_INDEX_START_TIME_MS),
-        cursor.getLong(COLUMN_INDEX_UPDATE_TIME_MS),
-        cursor.getLong(COLUMN_INDEX_TOTAL_BYTES),
-        cursor.getInt(COLUMN_INDEX_STOP_REASON),
-        cursor.getInt(COLUMN_INDEX_FAILURE_REASON),
+        /* state= */ cursor.getInt(COLUMN_INDEX_STATE),
+        /* startTimeMs= */ cursor.getLong(COLUMN_INDEX_START_TIME_MS),
+        /* updateTimeMs= */ cursor.getLong(COLUMN_INDEX_UPDATE_TIME_MS),
+        /* contentLength= */ cursor.getLong(COLUMN_INDEX_CONTENT_LENGTH),
+        /* stopReason= */ cursor.getInt(COLUMN_INDEX_STOP_REASON),
+        /* failureReason= */ cursor.getInt(COLUMN_INDEX_FAILURE_REASON),
         downloadProgress);
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
index 027172e090..2a8b393ed3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
@@ -107,7 +107,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
       int version =
           VersionTable.getVersion(
               readableDatabase, VersionTable.FEATURE_CACHE_FILE_METADATA, hexUid);
-      if (version == VersionTable.VERSION_UNSET || version > TABLE_VERSION) {
+      if (version != TABLE_VERSION) {
         SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
         writableDatabase.beginTransaction();
         try {
@@ -119,9 +119,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
         } finally {
           writableDatabase.endTransaction();
         }
-      } else if (version < TABLE_VERSION) {
-        // There is no previous version currently.
-        throw new IllegalStateException();
       }
     } catch (SQLException e) {
       throw new DatabaseIOException(e);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
index 8fa04e5338..20a80a1a35 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
@@ -63,12 +63,8 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 
   /* package */ static final String FILE_NAME_ATOMIC = "cached_content_index.exi";
 
-  private static final int VERSION = 2;
-  private static final int VERSION_METADATA_INTRODUCED = 2;
   private static final int INCREMENTAL_METADATA_READ_LENGTH = 10 * 1024 * 1024;
 
-  private static final int FLAG_ENCRYPTED_INDEX = 1;
-
   private final HashMap<String, CachedContent> keyToContent;
   /**
    * Maps assigned ids to their corresponding keys. Also contains (id -> null) entries for ids that
@@ -464,6 +460,10 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   /** {@link Storage} implementation that uses an {@link AtomicFile}. */
   private static class LegacyStorage implements Storage {
 
+    private static final int VERSION = 2;
+    private static final int VERSION_METADATA_INTRODUCED = 2;
+    private static final int FLAG_ENCRYPTED_INDEX = 1;
+
     private final boolean encrypt;
     @Nullable private final Cipher cipher;
     @Nullable private final SecretKeySpec secretKeySpec;
@@ -770,7 +770,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
                 databaseProvider.getReadableDatabase(),
                 VersionTable.FEATURE_CACHE_CONTENT_METADATA,
                 hexUid);
-        if (version == VersionTable.VERSION_UNSET || version > TABLE_VERSION) {
+        if (version != TABLE_VERSION) {
           SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
           writableDatabase.beginTransaction();
           try {
@@ -779,9 +779,6 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
           } finally {
             writableDatabase.endTransaction();
           }
-        } else if (version < TABLE_VERSION) {
-          // There is no previous version currently.
-          throw new IllegalStateException();
         }
 
         try (Cursor cursor = getCursor()) {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
index f163e8d206..f42a1c6086 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
@@ -32,7 +32,7 @@ import org.junit.runner.RunWith;
 @RunWith(AndroidJUnit4.class)
 public class DefaultDownloadIndexTest {
 
-  private static final String EMPTY_NAME = "singleton";
+  private static final String EMPTY_NAME = "";
 
   private ExoDatabaseProvider databaseProvider;
   private DefaultDownloadIndex downloadIndex;

From b8cdd7e40bff8f56aa078a8e2fd760e21cedec39 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 18 Apr 2019 23:17:03 +0100
Subject: [PATCH 795/832] Fix lint warnings for 2.10

PiperOrigin-RevId: 244268855
---
 .../mediasession/MediaSessionConnector.java   | 21 ++++++++++++++-----
 .../exoplayer2/ExoPlaybackException.java      |  3 ---
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
index 35990573ad..24cf4062f7 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
@@ -1089,17 +1089,26 @@ public final class MediaSessionConnector {
     }
 
     @Override
-    public void onSetShuffleMode(int shuffleMode) {
+    public void onSetShuffleMode(@PlaybackStateCompat.ShuffleMode int shuffleMode) {
       if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE)) {
-        boolean shuffleModeEnabled =
-            shuffleMode == PlaybackStateCompat.SHUFFLE_MODE_ALL
-                || shuffleMode == PlaybackStateCompat.SHUFFLE_MODE_GROUP;
+        boolean shuffleModeEnabled;
+        switch (shuffleMode) {
+          case PlaybackStateCompat.SHUFFLE_MODE_ALL:
+          case PlaybackStateCompat.SHUFFLE_MODE_GROUP:
+            shuffleModeEnabled = true;
+            break;
+          case PlaybackStateCompat.SHUFFLE_MODE_NONE:
+          case PlaybackStateCompat.SHUFFLE_MODE_INVALID:
+          default:
+            shuffleModeEnabled = false;
+            break;
+        }
         controlDispatcher.dispatchSetShuffleModeEnabled(player, shuffleModeEnabled);
       }
     }
 
     @Override
-    public void onSetRepeatMode(int mediaSessionRepeatMode) {
+    public void onSetRepeatMode(@PlaybackStateCompat.RepeatMode int mediaSessionRepeatMode) {
       if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_SET_REPEAT_MODE)) {
         @RepeatModeUtil.RepeatToggleModes int repeatMode;
         switch (mediaSessionRepeatMode) {
@@ -1110,6 +1119,8 @@ public final class MediaSessionConnector {
           case PlaybackStateCompat.REPEAT_MODE_ONE:
             repeatMode = Player.REPEAT_MODE_ONE;
             break;
+          case PlaybackStateCompat.REPEAT_MODE_NONE:
+          case PlaybackStateCompat.REPEAT_MODE_INVALID:
           default:
             repeatMode = Player.REPEAT_MODE_OFF;
             break;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
index 4a8f8709e9..b5f8f954bb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
@@ -17,7 +17,6 @@ package com.google.android.exoplayer2;
 
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
@@ -103,7 +102,6 @@ public final class ExoPlaybackException extends Exception {
    * @param cause The cause of the failure.
    * @return The created instance.
    */
-  @VisibleForTesting
   public static ExoPlaybackException createForUnexpected(RuntimeException cause) {
     return new ExoPlaybackException(TYPE_UNEXPECTED, cause, /* rendererIndex= */ C.INDEX_UNSET);
   }
@@ -124,7 +122,6 @@ public final class ExoPlaybackException extends Exception {
    * @param cause The cause of the failure.
    * @return The created instance.
    */
-  @VisibleForTesting
   public static ExoPlaybackException createForOutOfMemoryError(OutOfMemoryError cause) {
     return new ExoPlaybackException(TYPE_OUT_OF_MEMORY, cause, /* rendererIndex= */ C.INDEX_UNSET);
   }

From 0d8146cbcab4ea9b8478d70ee06e0beaefe58dfd Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 18 Apr 2019 23:44:58 +0100
Subject: [PATCH 796/832] Further improve DownloadService action names &
 methods

- We had buildAddRequest and sendNewDownload. Converged to
  buildAddDownload and sendAddDownload.
- Also fixed a few more inconsistencies, and brought the
  action constants into line as well.

PiperOrigin-RevId: 244274041
---
 .../exoplayer2/demo/DownloadTracker.java      |  2 +-
 .../exoplayer2/offline/DownloadService.java   | 60 ++++++++++---------
 .../dash/offline/DownloadServiceDashTest.java |  2 +-
 3 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
index a860d96e43..f372a47df6 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -263,7 +263,7 @@ public class DownloadTracker {
     }
 
     private void startDownload(DownloadRequest downloadRequest) {
-      DownloadService.sendNewDownload(
+      DownloadService.sendAddDownload(
           context, DemoDownloadService.class, downloadRequest, /* foreground= */ false);
     }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index 9de6c748fb..ea79204c46 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -63,7 +63,8 @@ public abstract class DownloadService extends Service {
    *   <li>{@link #KEY_FOREGROUND} - See {@link #KEY_FOREGROUND}.
    * </ul>
    */
-  public static final String ACTION_ADD = "com.google.android.exoplayer.downloadService.action.ADD";
+  public static final String ACTION_ADD_DOWNLOAD =
+      "com.google.android.exoplayer.downloadService.action.ADD_DOWNLOAD";
 
   /**
    * Resumes all downloads except those that have a non-zero {@link Download#stopReason}. Extras:
@@ -72,8 +73,8 @@ public abstract class DownloadService extends Service {
    *   <li>{@link #KEY_FOREGROUND} - See {@link #KEY_FOREGROUND}.
    * </ul>
    */
-  public static final String ACTION_RESUME =
-      "com.google.android.exoplayer.downloadService.action.RESUME";
+  public static final String ACTION_RESUME_DOWNLOADS =
+      "com.google.android.exoplayer.downloadService.action.RESUME_DOWNLOADS";
 
   /**
    * Pauses all downloads. Extras:
@@ -82,8 +83,8 @@ public abstract class DownloadService extends Service {
    *   <li>{@link #KEY_FOREGROUND} - See {@link #KEY_FOREGROUND}.
    * </ul>
    */
-  public static final String ACTION_PAUSE =
-      "com.google.android.exoplayer.downloadService.action.PAUSE";
+  public static final String ACTION_PAUSE_DOWNLOADS =
+      "com.google.android.exoplayer.downloadService.action.PAUSE_DOWNLOADS";
 
   /**
    * Sets the stop reason for one or all downloads. To clear the stop reason, pass {@link
@@ -98,7 +99,7 @@ public abstract class DownloadService extends Service {
    * </ul>
    */
   public static final String ACTION_SET_STOP_REASON =
-      "com.google.android.exoplayer.downloadService.action.SET_MANUAL_STOP_REASON";
+      "com.google.android.exoplayer.downloadService.action.SET_STOP_REASON";
 
   /**
    * Removes a download. Extras:
@@ -108,18 +109,22 @@ public abstract class DownloadService extends Service {
    *   <li>{@link #KEY_FOREGROUND} - See {@link #KEY_FOREGROUND}.
    * </ul>
    */
-  public static final String ACTION_REMOVE =
-      "com.google.android.exoplayer.downloadService.action.REMOVE";
+  public static final String ACTION_REMOVE_DOWNLOAD =
+      "com.google.android.exoplayer.downloadService.action.REMOVE_DOWNLOAD";
 
-  /** Key for the {@link DownloadRequest} in {@link #ACTION_ADD} intents. */
+  /** Key for the {@link DownloadRequest} in {@link #ACTION_ADD_DOWNLOAD} intents. */
   public static final String KEY_DOWNLOAD_REQUEST = "download_request";
 
   /**
-   * Key for the content id in {@link #ACTION_SET_STOP_REASON} and {@link #ACTION_REMOVE} intents.
+   * Key for the content id in {@link #ACTION_SET_STOP_REASON} and {@link #ACTION_REMOVE_DOWNLOAD}
+   * intents.
    */
   public static final String KEY_CONTENT_ID = "content_id";
 
-  /** Key for the stop reason in {@link #ACTION_SET_STOP_REASON} and {@link #ACTION_ADD} intents. */
+  /**
+   * Key for the stop reason in {@link #ACTION_SET_STOP_REASON} and {@link #ACTION_ADD_DOWNLOAD}
+   * intents.
+   */
   public static final String KEY_STOP_REASON = "manual_stop_reason";
 
   /**
@@ -233,12 +238,12 @@ public abstract class DownloadService extends Service {
    * @param foreground Whether this intent will be used to start the service in the foreground.
    * @return Created Intent.
    */
-  public static Intent buildAddRequestIntent(
+  public static Intent buildAddDownloadIntent(
       Context context,
       Class<? extends DownloadService> clazz,
       DownloadRequest downloadRequest,
       boolean foreground) {
-    return buildAddRequestIntent(context, clazz, downloadRequest, STOP_REASON_NONE, foreground);
+    return buildAddDownloadIntent(context, clazz, downloadRequest, STOP_REASON_NONE, foreground);
   }
 
   /**
@@ -252,13 +257,13 @@ public abstract class DownloadService extends Service {
    * @param foreground Whether this intent will be used to start the service in the foreground.
    * @return Created Intent.
    */
-  public static Intent buildAddRequestIntent(
+  public static Intent buildAddDownloadIntent(
       Context context,
       Class<? extends DownloadService> clazz,
       DownloadRequest downloadRequest,
       int stopReason,
       boolean foreground) {
-    return getIntent(context, clazz, ACTION_ADD, foreground)
+    return getIntent(context, clazz, ACTION_ADD_DOWNLOAD, foreground)
         .putExtra(KEY_DOWNLOAD_REQUEST, downloadRequest)
         .putExtra(KEY_STOP_REASON, stopReason);
   }
@@ -274,7 +279,8 @@ public abstract class DownloadService extends Service {
    */
   public static Intent buildRemoveDownloadIntent(
       Context context, Class<? extends DownloadService> clazz, String id, boolean foreground) {
-    return getIntent(context, clazz, ACTION_REMOVE, foreground).putExtra(KEY_CONTENT_ID, id);
+    return getIntent(context, clazz, ACTION_REMOVE_DOWNLOAD, foreground)
+        .putExtra(KEY_CONTENT_ID, id);
   }
 
   /**
@@ -287,7 +293,7 @@ public abstract class DownloadService extends Service {
    */
   public static Intent buildResumeDownloadsIntent(
       Context context, Class<? extends DownloadService> clazz, boolean foreground) {
-    return getIntent(context, clazz, ACTION_RESUME, foreground);
+    return getIntent(context, clazz, ACTION_RESUME_DOWNLOADS, foreground);
   }
 
   /**
@@ -300,7 +306,7 @@ public abstract class DownloadService extends Service {
    */
   public static Intent buildPauseDownloadsIntent(
       Context context, Class<? extends DownloadService> clazz, boolean foreground) {
-    return getIntent(context, clazz, ACTION_PAUSE, foreground);
+    return getIntent(context, clazz, ACTION_PAUSE_DOWNLOADS, foreground);
   }
 
   /**
@@ -333,12 +339,12 @@ public abstract class DownloadService extends Service {
    * @param downloadRequest The request to be executed.
    * @param foreground Whether the service is started in the foreground.
    */
-  public static void sendNewDownload(
+  public static void sendAddDownload(
       Context context,
       Class<? extends DownloadService> clazz,
       DownloadRequest downloadRequest,
       boolean foreground) {
-    Intent intent = buildAddRequestIntent(context, clazz, downloadRequest, foreground);
+    Intent intent = buildAddDownloadIntent(context, clazz, downloadRequest, foreground);
     startService(context, intent, foreground);
   }
 
@@ -352,13 +358,13 @@ public abstract class DownloadService extends Service {
    *     if the download should be started.
    * @param foreground Whether the service is started in the foreground.
    */
-  public static void sendNewDownload(
+  public static void sendAddDownload(
       Context context,
       Class<? extends DownloadService> clazz,
       DownloadRequest downloadRequest,
       int stopReason,
       boolean foreground) {
-    Intent intent = buildAddRequestIntent(context, clazz, downloadRequest, stopReason, foreground);
+    Intent intent = buildAddDownloadIntent(context, clazz, downloadRequest, stopReason, foreground);
     startService(context, intent, foreground);
   }
 
@@ -412,7 +418,7 @@ public abstract class DownloadService extends Service {
    * @param stopReason An application defined stop reason.
    * @param foreground Whether the service is started in the foreground.
    */
-  public static void sendStopReason(
+  public static void sendSetStopReason(
       Context context,
       Class<? extends DownloadService> clazz,
       @Nullable String id,
@@ -488,7 +494,7 @@ public abstract class DownloadService extends Service {
       case ACTION_RESTART:
         // Do nothing.
         break;
-      case ACTION_ADD:
+      case ACTION_ADD_DOWNLOAD:
         DownloadRequest downloadRequest = intent.getParcelableExtra(KEY_DOWNLOAD_REQUEST);
         if (downloadRequest == null) {
           Log.e(TAG, "Ignored ADD: Missing " + KEY_DOWNLOAD_REQUEST + " extra");
@@ -497,10 +503,10 @@ public abstract class DownloadService extends Service {
           downloadManager.addDownload(downloadRequest, stopReason);
         }
         break;
-      case ACTION_RESUME:
+      case ACTION_RESUME_DOWNLOADS:
         downloadManager.resumeDownloads();
         break;
-      case ACTION_PAUSE:
+      case ACTION_PAUSE_DOWNLOADS:
         downloadManager.pauseDownloads();
         break;
       case ACTION_SET_STOP_REASON:
@@ -512,7 +518,7 @@ public abstract class DownloadService extends Service {
           downloadManager.setStopReason(contentId, stopReason);
         }
         break;
-      case ACTION_REMOVE:
+      case ACTION_REMOVE_DOWNLOAD:
         String contentId = intent.getStringExtra(KEY_CONTENT_ID);
         if (contentId == null) {
           Log.e(TAG, "Ignored REMOVE: Missing " + KEY_CONTENT_ID + " extra");
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
index 57e7b8de5f..5a9ce2d88e 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
@@ -215,7 +215,7 @@ public class DownloadServiceDashTest {
     dummyMainThread.runOnMainThread(
         () -> {
           Intent startIntent =
-              DownloadService.buildAddRequestIntent(
+              DownloadService.buildAddDownloadIntent(
                   context, DownloadService.class, action, /* foreground= */ false);
           dashDownloadService.onStartCommand(startIntent, 0, 0);
         });

From 7f885351dba24321dcc98b163bba4b3196d73cd6 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Fri, 19 Apr 2019 00:00:53 +0100
Subject: [PATCH 797/832] Upgrade dependency versions

---
 extensions/cronet/build.gradle       | 2 +-
 extensions/mediasession/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle
index ad45f61d98..76972a3530 100644
--- a/extensions/cronet/build.gradle
+++ b/extensions/cronet/build.gradle
@@ -31,7 +31,7 @@ android {
 }
 
 dependencies {
-    api 'org.chromium.net:cronet-embedded:72.3626.96'
+    api 'org.chromium.net:cronet-embedded:73.3683.76'
     implementation project(modulePrefix + 'library-core')
     implementation 'androidx.annotation:annotation:1.0.2'
     testImplementation project(modulePrefix + 'library')
diff --git a/extensions/mediasession/build.gradle b/extensions/mediasession/build.gradle
index 186fdb1621..6c6ddf4ce4 100644
--- a/extensions/mediasession/build.gradle
+++ b/extensions/mediasession/build.gradle
@@ -32,7 +32,7 @@ android {
 
 dependencies {
     implementation project(modulePrefix + 'library-core')
-    api 'androidx.media:media:1.0.0'
+    api 'androidx.media:media:1.0.1'
 }
 
 ext {

From b4b82f5b1eb00b668d1abe5004da0e3b8c577316 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Fri, 19 Apr 2019 00:04:02 +0100
Subject: [PATCH 798/832] Remove dev-v2 section for 2.10

---
 RELEASENOTES.md | 2 --
 build.gradle    | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 015b348f68..342ca55cc9 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,7 +1,5 @@
 # Release notes #
 
-### dev-v2 (not yet released) ###
-
 ### 2.10.0 ###
 
 * Core library:
diff --git a/build.gradle b/build.gradle
index f8326dd503..723546726a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,7 +36,7 @@ allprojects {
         jcenter()
     }
     project.ext {
-        exoplayerPublishEnabled = false
+        exoplayerPublishEnabled = true
     }
     if (it.hasProperty('externalBuildDir')) {
         if (!new File(externalBuildDir).isAbsolute()) {

From 6473d46cbd9e24f9c8b480659be969c67e379937 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Fri, 19 Apr 2019 16:05:04 +0100
Subject: [PATCH 799/832] Fix tests

---
 .../source/dash/offline/DownloadManagerDashTest.java          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
index 9fc9834e1d..35db882e2a 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
@@ -32,6 +32,7 @@ import com.google.android.exoplayer2.offline.DownloadManager;
 import com.google.android.exoplayer2.offline.DownloadRequest;
 import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
 import com.google.android.exoplayer2.offline.StreamKey;
+import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.testutil.DummyMainThread;
 import com.google.android.exoplayer2.testutil.DummyMainThread.TestRunnable;
 import com.google.android.exoplayer2.testutil.FakeDataSet;
@@ -192,7 +193,6 @@ public class DownloadManagerDashTest {
   }
 
   // Disabled due to flakiness.
-  @Ignore
   @Test
   public void testHandleRemoveActionBeforeDownloadFinish() throws Throwable {
     handleDownloadRequest(fakeStreamKey1);
@@ -204,7 +204,6 @@ public class DownloadManagerDashTest {
   }
 
   // Disabled due to flakiness [Internal: b/122290449].
-  @Ignore
   @Test
   public void testHandleInterferingRemoveAction() throws Throwable {
     final ConditionVariable downloadInProgressCondition = new ConditionVariable();
@@ -260,6 +259,7 @@ public class DownloadManagerDashTest {
                   downloadIndex,
                   new DefaultDownloaderFactory(
                       new DownloaderConstructorHelper(cache, fakeDataSourceFactory)));
+          downloadManager.setRequirements(new Requirements(0));
 
           downloadManagerListener =
               new TestDownloadManagerListener(

From 3d6407a58e6a0762885f73f04add750c5eeaad15 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 23 Apr 2019 13:35:58 +0100
Subject: [PATCH 800/832] Always update loading period in
 handleSourceInfoRefreshed.

This ensures we keep the loading period in sync with the the playing period in
PlybackInfo, when the latter changes to something new.

PiperOrigin-RevId: 244838123
---
 .../com/google/android/exoplayer2/ExoPlayerImplInternal.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index a7ee6eb86e..37774bccb5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -1321,7 +1321,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
       if (!queue.updateQueuedPeriods(rendererPositionUs, getMaxRendererReadPositionUs())) {
         seekToCurrentPosition(/* sendDiscontinuity= */ false);
       }
-      handleLoadingMediaPeriodChanged(/* loadingTrackSelectionChanged= */ false);
     } else {
       // Something changed. Seek to new start position.
       MediaPeriodHolder periodHolder = queue.getFrontPeriod();
@@ -1341,6 +1340,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
           playbackInfo.copyWithNewPosition(
               newPeriodId, seekedToPositionUs, newContentPositionUs, getTotalBufferedDurationUs());
     }
+    handleLoadingMediaPeriodChanged(/* loadingTrackSelectionChanged= */ false);
   }
 
   private long getMaxRendererReadPositionUs() {

From 615513985677ad3accef8e32370915565b93e3c4 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 23 Apr 2019 15:50:30 +0100
Subject: [PATCH 801/832] Fix bug which logs errors twice if stack traces are
 disabled.

Disabling stack trackes currently logs messages twice, once with and once
without stack trace.

PiperOrigin-RevId: 244853127
---
 .../java/com/google/android/exoplayer2/util/Log.java | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Log.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Log.java
index 2c3e4f1e7c..1eb0977847 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/Log.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Log.java
@@ -88,8 +88,7 @@ public final class Log {
   public static void d(String tag, String message, @Nullable Throwable throwable) {
     if (!logStackTraces) {
       d(tag, appendThrowableMessage(message, throwable));
-    }
-    if (logLevel == LOG_LEVEL_ALL) {
+    } else if (logLevel == LOG_LEVEL_ALL) {
       android.util.Log.d(tag, message, throwable);
     }
   }
@@ -105,8 +104,7 @@ public final class Log {
   public static void i(String tag, String message, @Nullable Throwable throwable) {
     if (!logStackTraces) {
       i(tag, appendThrowableMessage(message, throwable));
-    }
-    if (logLevel <= LOG_LEVEL_INFO) {
+    } else if (logLevel <= LOG_LEVEL_INFO) {
       android.util.Log.i(tag, message, throwable);
     }
   }
@@ -122,8 +120,7 @@ public final class Log {
   public static void w(String tag, String message, @Nullable Throwable throwable) {
     if (!logStackTraces) {
       w(tag, appendThrowableMessage(message, throwable));
-    }
-    if (logLevel <= LOG_LEVEL_WARNING) {
+    } else if (logLevel <= LOG_LEVEL_WARNING) {
       android.util.Log.w(tag, message, throwable);
     }
   }
@@ -139,8 +136,7 @@ public final class Log {
   public static void e(String tag, String message, @Nullable Throwable throwable) {
     if (!logStackTraces) {
       e(tag, appendThrowableMessage(message, throwable));
-    }
-    if (logLevel <= LOG_LEVEL_ERROR) {
+    } else if (logLevel <= LOG_LEVEL_ERROR) {
       android.util.Log.e(tag, message, throwable);
     }
   }

From f7f6489f573189f84d8c3f9b0b9ab0797f648d08 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Tue, 23 Apr 2019 17:09:05 +0100
Subject: [PATCH 802/832] Add option to add entries in an ActionFile to
 DownloadIndex as completed

PiperOrigin-RevId: 244864742
---
 .../exoplayer2/demo/DemoApplication.java      | 12 +++--
 .../offline/ActionFileUpgradeUtil.java        | 14 +++--
 .../offline/ActionFileUpgradeUtilTest.java    | 51 +++++++++++++++++--
 3 files changed, 65 insertions(+), 12 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
index 2c9cd43d1e..6985d42b36 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
@@ -115,8 +115,10 @@ public class DemoApplication extends Application {
   private synchronized void initDownloadManager() {
     if (downloadManager == null) {
       DefaultDownloadIndex downloadIndex = new DefaultDownloadIndex(getDatabaseProvider());
-      upgradeActionFile(DOWNLOAD_TRACKER_ACTION_FILE, downloadIndex);
-      upgradeActionFile(DOWNLOAD_ACTION_FILE, downloadIndex);
+      upgradeActionFile(
+          DOWNLOAD_ACTION_FILE, downloadIndex, /* addNewDownloadsAsCompleted= */ false);
+      upgradeActionFile(
+          DOWNLOAD_TRACKER_ACTION_FILE, downloadIndex, /* addNewDownloadsAsCompleted= */ true);
       DownloaderConstructorHelper downloaderConstructorHelper =
           new DownloaderConstructorHelper(getDownloadCache(), buildHttpDataSourceFactory());
       downloadManager =
@@ -127,13 +129,15 @@ public class DemoApplication extends Application {
     }
   }
 
-  private void upgradeActionFile(String fileName, DefaultDownloadIndex downloadIndex) {
+  private void upgradeActionFile(
+      String fileName, DefaultDownloadIndex downloadIndex, boolean addNewDownloadsAsCompleted) {
     try {
       ActionFileUpgradeUtil.upgradeAndDelete(
           new File(getDownloadDirectory(), fileName),
           /* downloadIdProvider= */ null,
           downloadIndex,
-          /* deleteOnFailure= */ true);
+          /* deleteOnFailure= */ true,
+          addNewDownloadsAsCompleted);
     } catch (IOException e) {
       Log.e(TAG, "Failed to upgrade action file: " + fileName, e);
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java
index b601874f8d..975fc10b93 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java
@@ -52,6 +52,7 @@ public final class ActionFileUpgradeUtil {
    *     each download will be its custom cache key if one is specified, or else its URL.
    * @param downloadIndex The index into which the requests will be merged.
    * @param deleteOnFailure Whether to delete the action file if the merge fails.
+   * @param addNewDownloadsAsCompleted Whether to add new downloads as completed.
    * @throws IOException If an error occurs loading or merging the requests.
    */
   @SuppressWarnings("deprecation")
@@ -59,7 +60,8 @@ public final class ActionFileUpgradeUtil {
       File actionFilePath,
       @Nullable DownloadIdProvider downloadIdProvider,
       DefaultDownloadIndex downloadIndex,
-      boolean deleteOnFailure)
+      boolean deleteOnFailure,
+      boolean addNewDownloadsAsCompleted)
       throws IOException {
     ActionFile actionFile = new ActionFile(actionFilePath);
     if (actionFile.exists()) {
@@ -69,7 +71,7 @@ public final class ActionFileUpgradeUtil {
           if (downloadIdProvider != null) {
             request = request.copyWithId(downloadIdProvider.getId(request));
           }
-          mergeRequest(request, downloadIndex);
+          mergeRequest(request, downloadIndex, addNewDownloadsAsCompleted);
         }
         success = true;
       } finally {
@@ -85,10 +87,14 @@ public final class ActionFileUpgradeUtil {
    *
    * @param request The request to be merged.
    * @param downloadIndex The index into which the request will be merged.
+   * @param addNewDownloadAsCompleted Whether to add new downloads as completed.
    * @throws IOException If an error occurs merging the request.
    */
   /* package */ static void mergeRequest(
-      DownloadRequest request, DefaultDownloadIndex downloadIndex) throws IOException {
+      DownloadRequest request,
+      DefaultDownloadIndex downloadIndex,
+      boolean addNewDownloadAsCompleted)
+      throws IOException {
     Download download = downloadIndex.getDownload(request.id);
     if (download != null) {
       download = DownloadManager.mergeRequest(download, request, download.stopReason);
@@ -97,7 +103,7 @@ public final class ActionFileUpgradeUtil {
       download =
           new Download(
               request,
-              STATE_QUEUED,
+              addNewDownloadAsCompleted ? Download.STATE_COMPLETED : STATE_QUEUED,
               /* startTimeMs= */ nowMs,
               /* updateTimeMs= */ nowMs,
               /* contentLength= */ C.LENGTH_UNSET,
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java
index 96b8ff21bc..dba7b74e9f 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java
@@ -88,7 +88,11 @@ public class ActionFileUpgradeUtilTest {
             new byte[] {5, 4, 3, 2, 1});
 
     ActionFileUpgradeUtil.upgradeAndDelete(
-        tempFile, /* downloadIdProvider= */ null, downloadIndex, /* deleteOnFailure= */ true);
+        tempFile,
+        /* downloadIdProvider= */ null,
+        downloadIndex,
+        /* deleteOnFailure= */ true,
+        /* addNewDownloadsAsCompleted= */ false);
 
     assertDownloadIndexContainsRequest(expectedRequest1, Download.STATE_QUEUED);
     assertDownloadIndexContainsRequest(expectedRequest2, Download.STATE_QUEUED);
@@ -108,7 +112,8 @@ public class ActionFileUpgradeUtilTest {
             /* customCacheKey= */ "key123",
             data);
 
-    ActionFileUpgradeUtil.mergeRequest(request, downloadIndex);
+    ActionFileUpgradeUtil.mergeRequest(
+        request, downloadIndex, /* addNewDownloadAsCompleted= */ false);
 
     assertDownloadIndexContainsRequest(request, Download.STATE_QUEUED);
   }
@@ -135,8 +140,10 @@ public class ActionFileUpgradeUtilTest {
             asList(streamKey2),
             /* customCacheKey= */ "key123",
             new byte[] {5, 4, 3, 2, 1});
-    ActionFileUpgradeUtil.mergeRequest(request1, downloadIndex);
-    ActionFileUpgradeUtil.mergeRequest(request2, downloadIndex);
+    ActionFileUpgradeUtil.mergeRequest(
+        request1, downloadIndex, /* addNewDownloadAsCompleted= */ false);
+    ActionFileUpgradeUtil.mergeRequest(
+        request2, downloadIndex, /* addNewDownloadAsCompleted= */ false);
 
     Download download = downloadIndex.getDownload(request2.id);
     assertThat(download).isNotNull();
@@ -148,6 +155,42 @@ public class ActionFileUpgradeUtilTest {
     assertThat(download.state).isEqualTo(Download.STATE_QUEUED);
   }
 
+  @Test
+  public void mergeRequest_addNewDownloadAsCompleted() throws IOException {
+    StreamKey streamKey1 =
+        new StreamKey(/* periodIndex= */ 3, /* groupIndex= */ 4, /* trackIndex= */ 5);
+    StreamKey streamKey2 =
+        new StreamKey(/* periodIndex= */ 0, /* groupIndex= */ 1, /* trackIndex= */ 2);
+    DownloadRequest request1 =
+        new DownloadRequest(
+            "id1",
+            TYPE_PROGRESSIVE,
+            Uri.parse("https://www.test.com/download1"),
+            asList(streamKey1),
+            /* customCacheKey= */ "key123",
+            new byte[] {1, 2, 3, 4});
+    DownloadRequest request2 =
+        new DownloadRequest(
+            "id2",
+            TYPE_PROGRESSIVE,
+            Uri.parse("https://www.test.com/download2"),
+            asList(streamKey2),
+            /* customCacheKey= */ "key123",
+            new byte[] {5, 4, 3, 2, 1});
+    ActionFileUpgradeUtil.mergeRequest(
+        request1, downloadIndex, /* addNewDownloadAsCompleted= */ false);
+
+    // Merging existing download, keeps it queued.
+    ActionFileUpgradeUtil.mergeRequest(
+        request1, downloadIndex, /* addNewDownloadAsCompleted= */ true);
+    assertThat(downloadIndex.getDownload(request1.id).state).isEqualTo(Download.STATE_QUEUED);
+
+    // New download is merged as completed.
+    ActionFileUpgradeUtil.mergeRequest(
+        request2, downloadIndex, /* addNewDownloadAsCompleted= */ true);
+    assertThat(downloadIndex.getDownload(request2.id).state).isEqualTo(Download.STATE_COMPLETED);
+  }
+
   private void assertDownloadIndexContainsRequest(DownloadRequest request, int state)
       throws IOException {
     Download download = downloadIndex.getDownload(request.id);

From 4da14e46fa7ded200c11771a19946949fb9c34da Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 24 Apr 2019 11:08:00 +0100
Subject: [PATCH 803/832] Add DownloadService SET_REQUIREMENTS action

PiperOrigin-RevId: 245014381
---
 .../exoplayer2/offline/DownloadManager.java   |   4 +-
 .../exoplayer2/offline/DownloadService.java   | 103 ++++++++++++++----
 .../exoplayer2/scheduler/Requirements.java    |  34 +++++-
 3 files changed, 113 insertions(+), 28 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index d4df5cd18b..74332c08f3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -268,9 +268,9 @@ public final class DownloadManager {
   }
 
   /**
-   * Sets the requirements needed to be met to start downloads.
+   * Sets the requirements that need to be met for downloads to progress.
    *
-   * @param requirements Need to be met to start downloads.
+   * @param requirements A {@link Requirements}.
    */
   public void setRequirements(Requirements requirements) {
     if (requirements.equals(requirementsWatcher.getRequirements())) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index ea79204c46..ee00cf3d5f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -66,6 +66,17 @@ public abstract class DownloadService extends Service {
   public static final String ACTION_ADD_DOWNLOAD =
       "com.google.android.exoplayer.downloadService.action.ADD_DOWNLOAD";
 
+  /**
+   * Removes a download. Extras:
+   *
+   * <ul>
+   *   <li>{@link #KEY_CONTENT_ID} - The content id of a download to remove.
+   *   <li>{@link #KEY_FOREGROUND} - See {@link #KEY_FOREGROUND}.
+   * </ul>
+   */
+  public static final String ACTION_REMOVE_DOWNLOAD =
+      "com.google.android.exoplayer.downloadService.action.REMOVE_DOWNLOAD";
+
   /**
    * Resumes all downloads except those that have a non-zero {@link Download#stopReason}. Extras:
    *
@@ -91,10 +102,10 @@ public abstract class DownloadService extends Service {
    * Download#STOP_REASON_NONE}. Extras:
    *
    * <ul>
-   *   <li>{@link #KEY_CONTENT_ID} - The content id of a single download to update with the manual
-   *       stop reason. If omitted, all downloads will be updated.
+   *   <li>{@link #KEY_CONTENT_ID} - The content id of a single download to update with the stop
+   *       reason. If omitted, all downloads will be updated.
    *   <li>{@link #KEY_STOP_REASON} - An application provided reason for stopping the download or
-   *       downloads, or {@link Download#STOP_REASON_NONE} to clear the manual stop reason.
+   *       downloads, or {@link Download#STOP_REASON_NONE} to clear the stop reason.
    *   <li>{@link #KEY_FOREGROUND} - See {@link #KEY_FOREGROUND}.
    * </ul>
    */
@@ -102,15 +113,15 @@ public abstract class DownloadService extends Service {
       "com.google.android.exoplayer.downloadService.action.SET_STOP_REASON";
 
   /**
-   * Removes a download. Extras:
+   * Sets the requirements that need to be met for downloads to progress. Extras:
    *
    * <ul>
-   *   <li>{@link #KEY_CONTENT_ID} - The content id of a download to remove.
+   *   <li>{@link #KEY_REQUIREMENTS} - A {@link Requirements}.
    *   <li>{@link #KEY_FOREGROUND} - See {@link #KEY_FOREGROUND}.
    * </ul>
    */
-  public static final String ACTION_REMOVE_DOWNLOAD =
-      "com.google.android.exoplayer.downloadService.action.REMOVE_DOWNLOAD";
+  public static final String ACTION_SET_REQUIREMENTS =
+      "com.google.android.exoplayer.downloadService.action.SET_REQUIREMENTS";
 
   /** Key for the {@link DownloadRequest} in {@link #ACTION_ADD_DOWNLOAD} intents. */
   public static final String KEY_DOWNLOAD_REQUEST = "download_request";
@@ -125,7 +136,10 @@ public abstract class DownloadService extends Service {
    * Key for the stop reason in {@link #ACTION_SET_STOP_REASON} and {@link #ACTION_ADD_DOWNLOAD}
    * intents.
    */
-  public static final String KEY_STOP_REASON = "manual_stop_reason";
+  public static final String KEY_STOP_REASON = "stop_reason";
+
+  /** Key for the requirements in {@link #ACTION_SET_REQUIREMENTS} intents. */
+  public static final String KEY_REQUIREMENTS = "requirements";
 
   /**
    * Key for a boolean extra that can be set on any intent to indicate whether the service was
@@ -236,7 +250,7 @@ public abstract class DownloadService extends Service {
    * @param clazz The concrete download service being targeted by the intent.
    * @param downloadRequest The request to be executed.
    * @param foreground Whether this intent will be used to start the service in the foreground.
-   * @return Created Intent.
+   * @return The created intent.
    */
   public static Intent buildAddDownloadIntent(
       Context context,
@@ -255,7 +269,7 @@ public abstract class DownloadService extends Service {
    * @param stopReason An initial stop reason for the download, or {@link Download#STOP_REASON_NONE}
    *     if the download should be started.
    * @param foreground Whether this intent will be used to start the service in the foreground.
-   * @return Created Intent.
+   * @return The created intent.
    */
   public static Intent buildAddDownloadIntent(
       Context context,
@@ -275,7 +289,7 @@ public abstract class DownloadService extends Service {
    * @param clazz The concrete download service being targeted by the intent.
    * @param id The content id.
    * @param foreground Whether this intent will be used to start the service in the foreground.
-   * @return Created Intent.
+   * @return The created intent.
    */
   public static Intent buildRemoveDownloadIntent(
       Context context, Class<? extends DownloadService> clazz, String id, boolean foreground) {
@@ -289,7 +303,7 @@ public abstract class DownloadService extends Service {
    * @param context A {@link Context}.
    * @param clazz The concrete download service being targeted by the intent.
    * @param foreground Whether this intent will be used to start the service in the foreground.
-   * @return Created Intent.
+   * @return The created intent.
    */
   public static Intent buildResumeDownloadsIntent(
       Context context, Class<? extends DownloadService> clazz, boolean foreground) {
@@ -302,7 +316,7 @@ public abstract class DownloadService extends Service {
    * @param context A {@link Context}.
    * @param clazz The concrete download service being targeted by the intent.
    * @param foreground Whether this intent will be used to start the service in the foreground.
-   * @return Created Intent.
+   * @return The created intent.
    */
   public static Intent buildPauseDownloadsIntent(
       Context context, Class<? extends DownloadService> clazz, boolean foreground) {
@@ -318,7 +332,7 @@ public abstract class DownloadService extends Service {
    * @param id The content id, or {@code null} to set the stop reason for all downloads.
    * @param stopReason An application defined stop reason.
    * @param foreground Whether this intent will be used to start the service in the foreground.
-   * @return Created Intent.
+   * @return The created intent.
    */
   public static Intent buildSetStopReasonIntent(
       Context context,
@@ -331,6 +345,25 @@ public abstract class DownloadService extends Service {
         .putExtra(KEY_STOP_REASON, stopReason);
   }
 
+  /**
+   * Builds an {@link Intent} for setting the requirements that need to be met for downloads to
+   * progress.
+   *
+   * @param context A {@link Context}.
+   * @param clazz The concrete download service being targeted by the intent.
+   * @param requirements A {@link Requirements}.
+   * @param foreground Whether this intent will be used to start the service in the foreground.
+   * @return The created intent.
+   */
+  public static Intent buildSetRequirementsIntent(
+      Context context,
+      Class<? extends DownloadService> clazz,
+      Requirements requirements,
+      boolean foreground) {
+    return getIntent(context, clazz, ACTION_SET_REQUIREMENTS, foreground)
+        .putExtra(KEY_REQUIREMENTS, requirements);
+  }
+
   /**
    * Starts the service if not started already and adds a new download.
    *
@@ -428,6 +461,24 @@ public abstract class DownloadService extends Service {
     startService(context, intent, foreground);
   }
 
+  /**
+   * Starts the service if not started already and sets the requirements that need to be met for
+   * downloads to progress.
+   *
+   * @param context A {@link Context}.
+   * @param clazz The concrete download service to be started.
+   * @param requirements A {@link Requirements}.
+   * @param foreground Whether the service is started in the foreground.
+   */
+  public static void sendSetRequirements(
+      Context context,
+      Class<? extends DownloadService> clazz,
+      Requirements requirements,
+      boolean foreground) {
+    Intent intent = buildSetRequirementsIntent(context, clazz, requirements, foreground);
+    startService(context, intent, foreground);
+  }
+
   /**
    * Starts a download service to resume any ongoing downloads.
    *
@@ -479,10 +530,12 @@ public abstract class DownloadService extends Service {
     lastStartId = startId;
     taskRemoved = false;
     String intentAction = null;
+    String contentId = null;
     if (intent != null) {
       intentAction = intent.getAction();
       startedInForeground |=
           intent.getBooleanExtra(KEY_FOREGROUND, false) || ACTION_RESTART.equals(intentAction);
+      contentId = intent.getStringExtra(KEY_CONTENT_ID);
     }
     // intentAction is null if the service is restarted or no action is specified.
     if (intentAction == null) {
@@ -497,12 +550,19 @@ public abstract class DownloadService extends Service {
       case ACTION_ADD_DOWNLOAD:
         DownloadRequest downloadRequest = intent.getParcelableExtra(KEY_DOWNLOAD_REQUEST);
         if (downloadRequest == null) {
-          Log.e(TAG, "Ignored ADD: Missing " + KEY_DOWNLOAD_REQUEST + " extra");
+          Log.e(TAG, "Ignored ADD_DOWNLOAD: Missing " + KEY_DOWNLOAD_REQUEST + " extra");
         } else {
           int stopReason = intent.getIntExtra(KEY_STOP_REASON, Download.STOP_REASON_NONE);
           downloadManager.addDownload(downloadRequest, stopReason);
         }
         break;
+      case ACTION_REMOVE_DOWNLOAD:
+        if (contentId == null) {
+          Log.e(TAG, "Ignored REMOVE_DOWNLOAD: Missing " + KEY_CONTENT_ID + " extra");
+        } else {
+          downloadManager.removeDownload(contentId);
+        }
+        break;
       case ACTION_RESUME_DOWNLOADS:
         downloadManager.resumeDownloads();
         break;
@@ -511,19 +571,18 @@ public abstract class DownloadService extends Service {
         break;
       case ACTION_SET_STOP_REASON:
         if (!intent.hasExtra(KEY_STOP_REASON)) {
-          Log.e(TAG, "Ignored SET_MANUAL_STOP_REASON: Missing " + KEY_STOP_REASON + " extra");
+          Log.e(TAG, "Ignored SET_STOP_REASON: Missing " + KEY_STOP_REASON + " extra");
         } else {
-          String contentId = intent.getStringExtra(KEY_CONTENT_ID);
           int stopReason = intent.getIntExtra(KEY_STOP_REASON, Download.STOP_REASON_NONE);
           downloadManager.setStopReason(contentId, stopReason);
         }
         break;
-      case ACTION_REMOVE_DOWNLOAD:
-        String contentId = intent.getStringExtra(KEY_CONTENT_ID);
-        if (contentId == null) {
-          Log.e(TAG, "Ignored REMOVE: Missing " + KEY_CONTENT_ID + " extra");
+      case ACTION_SET_REQUIREMENTS:
+        Requirements requirements = intent.getParcelableExtra(KEY_REQUIREMENTS);
+        if (requirements == null) {
+          Log.e(TAG, "Ignored SET_REQUIREMENTS: Missing " + KEY_REQUIREMENTS + " extra");
         } else {
-          downloadManager.removeDownload(contentId);
+          downloadManager.setRequirements(requirements);
         }
         break;
       default:
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
index 28aa37ee2a..babc4e49fb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
@@ -23,6 +23,8 @@ import android.net.Network;
 import android.net.NetworkCapabilities;
 import android.net.NetworkInfo;
 import android.os.BatteryManager;
+import android.os.Parcel;
+import android.os.Parcelable;
 import android.os.PowerManager;
 import androidx.annotation.IntDef;
 import com.google.android.exoplayer2.util.Log;
@@ -31,10 +33,8 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-/**
- * Defines a set of device state requirements.
- */
-public final class Requirements {
+/** Defines a set of device state requirements. */
+public final class Requirements implements Parcelable {
 
   /**
    * Requirement flags. Possible flag values are {@link #NETWORK}, {@link #NETWORK_UNMETERED},
@@ -205,4 +205,30 @@ public final class Requirements {
   public int hashCode() {
     return requirements;
   }
+
+  // Parcelable implementation.
+
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  @Override
+  public void writeToParcel(Parcel dest, int flags) {
+    dest.writeInt(requirements);
+  }
+
+  public static final Parcelable.Creator<Requirements> CREATOR =
+      new Creator<Requirements>() {
+
+        @Override
+        public Requirements createFromParcel(Parcel in) {
+          return new Requirements(in.readInt());
+        }
+
+        @Override
+        public Requirements[] newArray(int size) {
+          return new Requirements[size];
+        }
+      };
 }

From 7626ff72de8e6d9feab54980e6dee13dcab8361f Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 25 Apr 2019 13:32:07 +0100
Subject: [PATCH 804/832] Update gradle plugin.

This also removes the build warning about the experimental flag.

PiperOrigin-RevId: 245218251
---
 gradle.properties                        | 1 -
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 364a5d03c5..4b9bfa8fa2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,5 @@
 ## Project-wide Gradle settings.
 android.useAndroidX=true
 android.enableJetifier=true
-android.useDeprecatedNdk=true
 android.enableUnitTestBinaryResources=true
 buildDir=buildout
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7061ab9fe7..6d00e1ce97 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Feb 08 20:49:20 GMT 2019
+#Thu Apr 25 13:15:25 BST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

From 249f6a77ee31c05e486df5d37e2adbab889cfdaa Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 25 Apr 2019 13:38:54 +0100
Subject: [PATCH 805/832] Update gradle plugin (part 2).

PiperOrigin-RevId: 245218900
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 723546726a..4761a1fbe0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:3.4.0'
         classpath 'com.novoda:bintray-release:0.9'
         classpath 'com.google.android.gms:strict-version-matcher-plugin:1.1.0'
     }

From c97ee9429ba8c7284268f0b9abd1b0584c23ee1c Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Fri, 26 Apr 2019 10:25:21 +0100
Subject: [PATCH 806/832] Allow content id to be set in
 DownloadHelper.getDownloadRequest

PiperOrigin-RevId: 245388082
---
 .../exoplayer2/offline/DownloadHelper.java    | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index c9b0451f41..8a15c82c89 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -578,16 +578,27 @@ public final class DownloadHelper {
 
   /**
    * Builds a {@link DownloadRequest} for downloading the selected tracks. Must not be called until
-   * after preparation completes.
+   * after preparation completes. The uri of the {@link DownloadRequest} will be used as content id.
    *
    * @param data Application provided data to store in {@link DownloadRequest#data}.
    * @return The built {@link DownloadRequest}.
    */
   public DownloadRequest getDownloadRequest(@Nullable byte[] data) {
-    String downloadId = uri.toString();
+    return getDownloadRequest(uri.toString(), data);
+  }
+
+  /**
+   * Builds a {@link DownloadRequest} for downloading the selected tracks. Must not be called until
+   * after preparation completes.
+   *
+   * @param id The unique content id.
+   * @param data Application provided data to store in {@link DownloadRequest#data}.
+   * @return The built {@link DownloadRequest}.
+   */
+  public DownloadRequest getDownloadRequest(String id, @Nullable byte[] data) {
     if (mediaSource == null) {
       return new DownloadRequest(
-          downloadId, downloadType, uri, /* streamKeys= */ Collections.emptyList(), cacheKey, data);
+          id, downloadType, uri, /* streamKeys= */ Collections.emptyList(), cacheKey, data);
     }
     assertPreparedWithMedia();
     List<StreamKey> streamKeys = new ArrayList<>();
@@ -601,7 +612,7 @@ public final class DownloadHelper {
       }
       streamKeys.addAll(mediaPreparer.mediaPeriods[periodIndex].getStreamKeys(allSelections));
     }
-    return new DownloadRequest(downloadId, downloadType, uri, streamKeys, cacheKey, data);
+    return new DownloadRequest(id, downloadType, uri, streamKeys, cacheKey, data);
   }
 
   // Initialization of array of Lists.

From fc35d5fca6b0f8c505376583a040a602a7094dfa Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Fri, 26 Apr 2019 12:05:09 +0100
Subject: [PATCH 807/832] Add simpler DownloadManager constructor

PiperOrigin-RevId: 245397736
---
 .../exoplayer2/offline/DownloadManager.java   | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 74332c08f3..bfcb5174cc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -34,8 +34,14 @@ import android.os.Message;
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.database.DatabaseProvider;
 import com.google.android.exoplayer2.scheduler.Requirements;
 import com.google.android.exoplayer2.scheduler.RequirementsWatcher;
+import com.google.android.exoplayer2.upstream.DataSource;
+import com.google.android.exoplayer2.upstream.DataSource.Factory;
+import com.google.android.exoplayer2.upstream.cache.Cache;
+import com.google.android.exoplayer2.upstream.cache.CacheEvictor;
+import com.google.android.exoplayer2.upstream.cache.NoOpCacheEvictor;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
@@ -183,6 +189,24 @@ public final class DownloadManager {
   private volatile int maxParallelDownloads;
   private volatile int minRetryCount;
 
+  /**
+   * Constructs a {@link DownloadManager}.
+   *
+   * @param context Any context.
+   * @param databaseProvider Provides the SQLite database in which downloads are persisted.
+   * @param cache A cache to be used to store downloaded data. The cache should be configured with
+   *     an {@link CacheEvictor} that will not evict downloaded content, for example {@link
+   *     NoOpCacheEvictor}.
+   * @param upstreamFactory A {@link Factory} for creating {@link DataSource}s for downloading data.
+   */
+  public DownloadManager(
+      Context context, DatabaseProvider databaseProvider, Cache cache, Factory upstreamFactory) {
+    this(
+        context,
+        new DefaultDownloadIndex(databaseProvider),
+        new DefaultDownloaderFactory(new DownloaderConstructorHelper(cache, upstreamFactory)));
+  }
+
   /**
    * Constructs a {@link DownloadManager}.
    *

From 9d03ae41095495df6e0f4f4ff6aee847610c8582 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 26 Apr 2019 12:46:48 +0100
Subject: [PATCH 808/832] Add missing getters and clarify STATE_QUEUED
 documentation

PiperOrigin-RevId: 245401274
---
 .../android/exoplayer2/offline/Download.java  | 12 +++-
 .../exoplayer2/offline/DownloadManager.java   | 64 +++++++++++++++----
 2 files changed, 62 insertions(+), 14 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
index 9f6b473208..00d81b392c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
@@ -43,7 +43,17 @@ public final class Download {
   })
   public @interface State {}
   // Important: These constants are persisted into DownloadIndex. Do not change them.
-  /** The download is waiting to be started. */
+  /**
+   * The download is waiting to be started. A download may be queued because the {@link
+   * DownloadManager}
+   *
+   * <ul>
+   *   <li>Is {@link DownloadManager#getDownloadsPaused() paused}
+   *   <li>Has {@link DownloadManager#getRequirements() Requirements} that are not met
+   *   <li>Has already started {@link DownloadManager#getMaxParallelDownloads()
+   *       maxParallelDownloads}
+   * </ul>
+   */
   public static final int STATE_QUEUED = 0;
   /** The download is stopped for a specified {@link #stopReason}. */
   public static final int STATE_STOPPED = 1;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index bfcb5174cc..0ca13e2385 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -130,7 +130,7 @@ public final class DownloadManager {
 
   // Messages posted to the background handler.
   private static final int MSG_INITIALIZE = 0;
-  private static final int MSG_SET_DOWNLOADS_RESUMED = 1;
+  private static final int MSG_SET_DOWNLOADS_PAUSED = 1;
   private static final int MSG_SET_NOT_MET_REQUIREMENTS = 2;
   private static final int MSG_SET_STOP_REASON = 3;
   private static final int MSG_ADD_DOWNLOAD = 4;
@@ -178,11 +178,12 @@ public final class DownloadManager {
   private int activeDownloadCount;
   private boolean initialized;
   private boolean released;
+  private boolean downloadsPaused;
   private RequirementsWatcher requirementsWatcher;
 
   // Mutable fields that are accessed on the internal thread.
   @Requirements.RequirementFlags private int notMetRequirements;
-  private boolean downloadsResumed;
+  private boolean downloadsPausedInternal;
   private int parallelDownloads;
 
   // TODO: Fix these to properly support changes at runtime.
@@ -221,6 +222,8 @@ public final class DownloadManager {
     this.downloaderFactory = downloaderFactory;
     maxParallelDownloads = DEFAULT_MAX_PARALLEL_DOWNLOADS;
     minRetryCount = DEFAULT_MIN_RETRY_COUNT;
+    downloadsPaused = true;
+    downloadsPausedInternal = true;
 
     downloadInternals = new ArrayList<>();
     downloads = new ArrayList<>();
@@ -306,6 +309,11 @@ public final class DownloadManager {
     onRequirementsStateChanged(requirementsWatcher, notMetRequirements);
   }
 
+  /** Returns the maximum number of parallel downloads. */
+  public int getMaxParallelDownloads() {
+    return maxParallelDownloads;
+  }
+
   /**
    * Sets the maximum number of parallel downloads.
    *
@@ -316,6 +324,14 @@ public final class DownloadManager {
     this.maxParallelDownloads = maxParallelDownloads;
   }
 
+  /**
+   * Returns the minimum number of times that a download will be retried. A download will fail if
+   * the specified number of retries is exceeded without any progress being made.
+   */
+  public int getMinRetryCount() {
+    return minRetryCount;
+  }
+
   /**
    * Sets the minimum number of times that a download will be retried. A download will fail if the
    * specified number of retries is exceeded without any progress being made.
@@ -341,19 +357,41 @@ public final class DownloadManager {
     return Collections.unmodifiableList(new ArrayList<>(downloads));
   }
 
-  /** Resumes all downloads except those that have a non-zero {@link Download#stopReason}. */
+  /** Returns whether downloads are currently paused. */
+  public boolean getDownloadsPaused() {
+    return downloadsPaused;
+  }
+
+  /**
+   * Resumes downloads.
+   *
+   * <p>If the {@link #setRequirements(Requirements) Requirements} are met up to {@link
+   * #getMaxParallelDownloads() maxParallelDownloads} will be started, excluding those with non-zero
+   * {@link Download#stopReason stopReasons}.
+   */
   public void resumeDownloads() {
+    if (!downloadsPaused) {
+      return;
+    }
+    downloadsPaused = false;
     pendingMessages++;
     internalHandler
-        .obtainMessage(MSG_SET_DOWNLOADS_RESUMED, /* downloadsResumed */ 1, /* unused */ 0)
+        .obtainMessage(MSG_SET_DOWNLOADS_PAUSED, /* downloadsPaused */ 0, /* unused */ 0)
         .sendToTarget();
   }
 
-  /** Pauses all downloads. */
+  /**
+   * Pauses downloads. Downloads that would otherwise be making progress transition to {@link
+   * Download#STATE_QUEUED}.
+   */
   public void pauseDownloads() {
+    if (downloadsPaused) {
+      return;
+    }
+    downloadsPaused = true;
     pendingMessages++;
     internalHandler
-        .obtainMessage(MSG_SET_DOWNLOADS_RESUMED, /* downloadsResumed */ 0, /* unused */ 0)
+        .obtainMessage(MSG_SET_DOWNLOADS_PAUSED, /* downloadsPaused */ 1, /* unused */ 0)
         .sendToTarget();
   }
 
@@ -536,9 +574,9 @@ public final class DownloadManager {
         int notMetRequirements = message.arg1;
         initializeInternal(notMetRequirements);
         break;
-      case MSG_SET_DOWNLOADS_RESUMED:
-        boolean downloadsResumed = message.arg1 != 0;
-        setDownloadsResumed(downloadsResumed);
+      case MSG_SET_DOWNLOADS_PAUSED:
+        boolean downloadsPaused = message.arg1 != 0;
+        setDownloadsPausedInternal(downloadsPaused);
         break;
       case MSG_SET_NOT_MET_REQUIREMENTS:
         notMetRequirements = message.arg1;
@@ -604,11 +642,11 @@ public final class DownloadManager {
     }
   }
 
-  private void setDownloadsResumed(boolean downloadsResumed) {
-    if (this.downloadsResumed == downloadsResumed) {
+  private void setDownloadsPausedInternal(boolean downloadsPaused) {
+    if (this.downloadsPausedInternal == downloadsPaused) {
       return;
     }
-    this.downloadsResumed = downloadsResumed;
+    this.downloadsPausedInternal = downloadsPaused;
     for (int i = 0; i < downloadInternals.size(); i++) {
       downloadInternals.get(i).updateStopState();
     }
@@ -820,7 +858,7 @@ public final class DownloadManager {
   }
 
   private boolean canStartDownloads() {
-    return downloadsResumed && notMetRequirements == 0;
+    return !downloadsPausedInternal && notMetRequirements == 0;
   }
 
   /* package */ static Download mergeRequest(

From d187d9ec8fa252fdd25333a90116b3e11a9a3afb Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 26 Apr 2019 13:30:48 +0100
Subject: [PATCH 809/832] Post maxParallelDownload and minRetryCount changes

PiperOrigin-RevId: 245405316
---
 .../exoplayer2/offline/DownloadManager.java   | 68 +++++++++++++++----
 1 file changed, 53 insertions(+), 15 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 0ca13e2385..91a767cfab 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -133,11 +133,13 @@ public final class DownloadManager {
   private static final int MSG_SET_DOWNLOADS_PAUSED = 1;
   private static final int MSG_SET_NOT_MET_REQUIREMENTS = 2;
   private static final int MSG_SET_STOP_REASON = 3;
-  private static final int MSG_ADD_DOWNLOAD = 4;
-  private static final int MSG_REMOVE_DOWNLOAD = 5;
-  private static final int MSG_DOWNLOAD_THREAD_STOPPED = 6;
-  private static final int MSG_CONTENT_LENGTH_CHANGED = 7;
-  private static final int MSG_RELEASE = 8;
+  private static final int MSG_SET_MAX_PARALLEL_DOWNLOADS = 4;
+  private static final int MSG_SET_MIN_RETRY_COUNT = 5;
+  private static final int MSG_ADD_DOWNLOAD = 6;
+  private static final int MSG_REMOVE_DOWNLOAD = 7;
+  private static final int MSG_DOWNLOAD_THREAD_STOPPED = 8;
+  private static final int MSG_CONTENT_LENGTH_CHANGED = 9;
+  private static final int MSG_RELEASE = 10;
 
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
@@ -179,17 +181,17 @@ public final class DownloadManager {
   private boolean initialized;
   private boolean released;
   private boolean downloadsPaused;
+  private int maxParallelDownloads;
+  private int minRetryCount;
   private RequirementsWatcher requirementsWatcher;
 
   // Mutable fields that are accessed on the internal thread.
   @Requirements.RequirementFlags private int notMetRequirements;
   private boolean downloadsPausedInternal;
+  private int maxParallelDownloadsInternal;
+  private int minRetryCountInternal;
   private int parallelDownloads;
 
-  // TODO: Fix these to properly support changes at runtime.
-  private volatile int maxParallelDownloads;
-  private volatile int minRetryCount;
-
   /**
    * Constructs a {@link DownloadManager}.
    *
@@ -221,7 +223,9 @@ public final class DownloadManager {
     this.downloadIndex = downloadIndex;
     this.downloaderFactory = downloaderFactory;
     maxParallelDownloads = DEFAULT_MAX_PARALLEL_DOWNLOADS;
+    maxParallelDownloadsInternal = DEFAULT_MAX_PARALLEL_DOWNLOADS;
     minRetryCount = DEFAULT_MIN_RETRY_COUNT;
+    minRetryCountInternal = DEFAULT_MIN_RETRY_COUNT;
     downloadsPaused = true;
     downloadsPausedInternal = true;
 
@@ -319,9 +323,15 @@ public final class DownloadManager {
    *
    * @param maxParallelDownloads The maximum number of parallel downloads.
    */
-  // TODO: Fix to properly support changes at runtime.
   public void setMaxParallelDownloads(int maxParallelDownloads) {
+    if (this.maxParallelDownloads == maxParallelDownloads) {
+      return;
+    }
     this.maxParallelDownloads = maxParallelDownloads;
+    pendingMessages++;
+    internalHandler
+        .obtainMessage(MSG_SET_MAX_PARALLEL_DOWNLOADS, maxParallelDownloads, /* unused */ 0)
+        .sendToTarget();
   }
 
   /**
@@ -338,9 +348,15 @@ public final class DownloadManager {
    *
    * @param minRetryCount The minimum number of times that a download will be retried.
    */
-  // TODO: Fix to properly support changes at runtime.
   public void setMinRetryCount(int minRetryCount) {
+    if (this.minRetryCount == minRetryCount) {
+      return;
+    }
     this.minRetryCount = minRetryCount;
+    pendingMessages++;
+    internalHandler
+        .obtainMessage(MSG_SET_MIN_RETRY_COUNT, minRetryCount, /* unused */ 0)
+        .sendToTarget();
   }
 
   /** Returns the used {@link DownloadIndex}. */
@@ -587,6 +603,14 @@ public final class DownloadManager {
         int stopReason = message.arg1;
         setStopReasonInternal(id, stopReason);
         break;
+      case MSG_SET_MAX_PARALLEL_DOWNLOADS:
+        int maxParallelDownloads = message.arg1;
+        setMaxParallelDownloadsInternal(maxParallelDownloads);
+        break;
+      case MSG_SET_MIN_RETRY_COUNT:
+        int minRetryCount = message.arg1;
+        setMinRetryCountInternal(minRetryCount);
+        break;
       case MSG_ADD_DOWNLOAD:
         DownloadRequest request = (DownloadRequest) message.obj;
         stopReason = message.arg1;
@@ -688,6 +712,15 @@ public final class DownloadManager {
     }
   }
 
+  private void setMaxParallelDownloadsInternal(int maxParallelDownloads) {
+    maxParallelDownloadsInternal = maxParallelDownloads;
+    // TODO: Start or stop downloads if necessary.
+  }
+
+  private void setMinRetryCountInternal(int minRetryCount) {
+    minRetryCountInternal = minRetryCount;
+  }
+
   private void addDownloadInternal(DownloadRequest request, int stopReason) {
     DownloadInternal downloadInternal = getDownload(request.id);
     if (downloadInternal != null) {
@@ -736,14 +769,14 @@ public final class DownloadManager {
     boolean tryToStartDownloads = false;
     if (!downloadThread.isRemove) {
       // If maxParallelDownloads was hit, there might be a download waiting for a slot.
-      tryToStartDownloads = parallelDownloads == maxParallelDownloads;
+      tryToStartDownloads = parallelDownloads == maxParallelDownloadsInternal;
       parallelDownloads--;
     }
     getDownload(downloadId)
         .onDownloadThreadStopped(downloadThread.isCanceled, downloadThread.finalError);
     if (tryToStartDownloads) {
       for (int i = 0;
-          parallelDownloads < maxParallelDownloads && i < downloadInternals.size();
+          parallelDownloads < maxParallelDownloadsInternal && i < downloadInternals.size();
           i++) {
         downloadInternals.get(i).start();
       }
@@ -804,7 +837,7 @@ public final class DownloadManager {
     }
     boolean isRemove = downloadInternal.isInRemoveState();
     if (!isRemove) {
-      if (parallelDownloads == maxParallelDownloads) {
+      if (parallelDownloads == maxParallelDownloadsInternal) {
         return START_THREAD_TOO_MANY_DOWNLOADS;
       }
       parallelDownloads++;
@@ -813,7 +846,12 @@ public final class DownloadManager {
     DownloadProgress downloadProgress = downloadInternal.download.progress;
     DownloadThread downloadThread =
         new DownloadThread(
-            request, downloader, downloadProgress, isRemove, minRetryCount, internalHandler);
+            request,
+            downloader,
+            downloadProgress,
+            isRemove,
+            minRetryCountInternal,
+            internalHandler);
     downloadThreads.put(downloadId, downloadThread);
     downloadThread.start();
     logd("Download is started", downloadInternal);

From 56520b7c731ca41088f18e6a7c3ded28f7346a00 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 26 Apr 2019 13:53:58 +0100
Subject: [PATCH 810/832] Move DownloadManager internal logic into isolated
 inner class

There are no logic changes here. It's just moving code around and removing
the "internal" part of names where no longer required.

PiperOrigin-RevId: 245407238
---
 .../exoplayer2/offline/DownloadManager.java   | 767 +++++++++---------
 1 file changed, 388 insertions(+), 379 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 91a767cfab..aa0cd12231 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -160,38 +160,21 @@ public final class DownloadManager {
 
   private final Context context;
   private final WritableDownloadIndex downloadIndex;
-  private final DownloaderFactory downloaderFactory;
   private final Handler mainHandler;
-  private final HandlerThread internalThread;
-  private final Handler internalHandler;
+  private final InternalHandler internalHandler;
   private final RequirementsWatcher.Listener requirementsListener;
-  private final Object releaseLock;
 
-  // Collections that are accessed on the main thread.
   private final CopyOnWriteArraySet<Listener> listeners;
   private final ArrayList<Download> downloads;
 
-  // Collections that are accessed on the internal thread.
-  private final ArrayList<DownloadInternal> downloadInternals;
-  private final HashMap<String, DownloadThread> downloadThreads;
-
-  // Mutable fields that are accessed on the main thread.
   private int pendingMessages;
   private int activeDownloadCount;
   private boolean initialized;
-  private boolean released;
   private boolean downloadsPaused;
   private int maxParallelDownloads;
   private int minRetryCount;
   private RequirementsWatcher requirementsWatcher;
 
-  // Mutable fields that are accessed on the internal thread.
-  @Requirements.RequirementFlags private int notMetRequirements;
-  private boolean downloadsPausedInternal;
-  private int maxParallelDownloadsInternal;
-  private int minRetryCountInternal;
-  private int parallelDownloads;
-
   /**
    * Constructs a {@link DownloadManager}.
    *
@@ -221,31 +204,29 @@ public final class DownloadManager {
       Context context, WritableDownloadIndex downloadIndex, DownloaderFactory downloaderFactory) {
     this.context = context.getApplicationContext();
     this.downloadIndex = downloadIndex;
-    this.downloaderFactory = downloaderFactory;
     maxParallelDownloads = DEFAULT_MAX_PARALLEL_DOWNLOADS;
-    maxParallelDownloadsInternal = DEFAULT_MAX_PARALLEL_DOWNLOADS;
     minRetryCount = DEFAULT_MIN_RETRY_COUNT;
-    minRetryCountInternal = DEFAULT_MIN_RETRY_COUNT;
     downloadsPaused = true;
-    downloadsPausedInternal = true;
-
-    downloadInternals = new ArrayList<>();
     downloads = new ArrayList<>();
-    downloadThreads = new HashMap<>();
     listeners = new CopyOnWriteArraySet<>();
-    releaseLock = new Object();
-
     requirementsListener = this::onRequirementsStateChanged;
-
-    mainHandler = new Handler(Util.getLooper(), this::handleMainMessage);
-    internalThread = new HandlerThread("DownloadManager file i/o");
-    internalThread.start();
-    internalHandler = new Handler(internalThread.getLooper(), this::handleInternalMessage);
-
     requirementsWatcher =
         new RequirementsWatcher(context, requirementsListener, DEFAULT_REQUIREMENTS);
     int notMetRequirements = requirementsWatcher.start();
 
+    mainHandler = new Handler(Util.getLooper(), this::handleMainMessage);
+    HandlerThread internalThread = new HandlerThread("DownloadManager file i/o");
+    internalThread.start();
+    internalHandler =
+        new InternalHandler(
+            internalThread,
+            downloadIndex,
+            downloaderFactory,
+            mainHandler,
+            maxParallelDownloads,
+            minRetryCount,
+            downloadsPaused);
+
     pendingMessages = 1;
     internalHandler
         .obtainMessage(MSG_INITIALIZE, notMetRequirements, /* unused */ 0)
@@ -464,15 +445,15 @@ public final class DownloadManager {
    * download index. The manager must not be accessed after this method has been called.
    */
   public void release() {
-    synchronized (releaseLock) {
-      if (released) {
+    synchronized (internalHandler) {
+      if (internalHandler.released) {
         return;
       }
       internalHandler.sendEmptyMessage(MSG_RELEASE);
       boolean wasInterrupted = false;
-      while (!released) {
+      while (!internalHandler.released) {
         try {
-          releaseLock.wait();
+          internalHandler.wait();
         } catch (InterruptedException e) {
           wasInterrupted = true;
         }
@@ -581,324 +562,6 @@ public final class DownloadManager {
     return C.INDEX_UNSET;
   }
 
-  // Internal thread message handling.
-
-  private boolean handleInternalMessage(Message message) {
-    boolean processedExternalMessage = true;
-    switch (message.what) {
-      case MSG_INITIALIZE:
-        int notMetRequirements = message.arg1;
-        initializeInternal(notMetRequirements);
-        break;
-      case MSG_SET_DOWNLOADS_PAUSED:
-        boolean downloadsPaused = message.arg1 != 0;
-        setDownloadsPausedInternal(downloadsPaused);
-        break;
-      case MSG_SET_NOT_MET_REQUIREMENTS:
-        notMetRequirements = message.arg1;
-        setNotMetRequirementsInternal(notMetRequirements);
-        break;
-      case MSG_SET_STOP_REASON:
-        String id = (String) message.obj;
-        int stopReason = message.arg1;
-        setStopReasonInternal(id, stopReason);
-        break;
-      case MSG_SET_MAX_PARALLEL_DOWNLOADS:
-        int maxParallelDownloads = message.arg1;
-        setMaxParallelDownloadsInternal(maxParallelDownloads);
-        break;
-      case MSG_SET_MIN_RETRY_COUNT:
-        int minRetryCount = message.arg1;
-        setMinRetryCountInternal(minRetryCount);
-        break;
-      case MSG_ADD_DOWNLOAD:
-        DownloadRequest request = (DownloadRequest) message.obj;
-        stopReason = message.arg1;
-        addDownloadInternal(request, stopReason);
-        break;
-      case MSG_REMOVE_DOWNLOAD:
-        id = (String) message.obj;
-        removeDownloadInternal(id);
-        break;
-      case MSG_DOWNLOAD_THREAD_STOPPED:
-        DownloadThread downloadThread = (DownloadThread) message.obj;
-        onDownloadThreadStoppedInternal(downloadThread);
-        processedExternalMessage = false; // This message is posted internally.
-        break;
-      case MSG_CONTENT_LENGTH_CHANGED:
-        downloadThread = (DownloadThread) message.obj;
-        onDownloadThreadContentLengthChangedInternal(downloadThread);
-        processedExternalMessage = false; // This message is posted internally.
-        break;
-      case MSG_RELEASE:
-        releaseInternal();
-        return true; // Don't post back to mainHandler on release.
-      default:
-        throw new IllegalStateException();
-    }
-    mainHandler
-        .obtainMessage(MSG_PROCESSED, processedExternalMessage ? 1 : 0, downloadThreads.size())
-        .sendToTarget();
-    return true;
-  }
-
-  private void initializeInternal(int notMetRequirements) {
-    this.notMetRequirements = notMetRequirements;
-    ArrayList<Download> loadedStates = new ArrayList<>();
-    try (DownloadCursor cursor =
-        downloadIndex.getDownloads(
-            STATE_QUEUED, STATE_STOPPED, STATE_DOWNLOADING, STATE_REMOVING, STATE_RESTARTING)) {
-      while (cursor.moveToNext()) {
-        loadedStates.add(cursor.getDownload());
-      }
-      logd("Downloads are loaded.");
-    } catch (Throwable e) {
-      Log.e(TAG, "Download state loading failed.", e);
-      loadedStates.clear();
-    }
-    for (Download download : loadedStates) {
-      addDownloadForState(download);
-    }
-    logd("Downloads are created.");
-    mainHandler.obtainMessage(MSG_INITIALIZED, loadedStates).sendToTarget();
-    for (int i = 0; i < downloadInternals.size(); i++) {
-      downloadInternals.get(i).start();
-    }
-  }
-
-  private void setDownloadsPausedInternal(boolean downloadsPaused) {
-    if (this.downloadsPausedInternal == downloadsPaused) {
-      return;
-    }
-    this.downloadsPausedInternal = downloadsPaused;
-    for (int i = 0; i < downloadInternals.size(); i++) {
-      downloadInternals.get(i).updateStopState();
-    }
-  }
-
-  private void setNotMetRequirementsInternal(
-      @Requirements.RequirementFlags int notMetRequirements) {
-    if (this.notMetRequirements == notMetRequirements) {
-      return;
-    }
-    this.notMetRequirements = notMetRequirements;
-    logdFlags("Not met requirements are changed", notMetRequirements);
-    for (int i = 0; i < downloadInternals.size(); i++) {
-      downloadInternals.get(i).updateStopState();
-    }
-  }
-
-  private void setStopReasonInternal(@Nullable String id, int stopReason) {
-    if (id != null) {
-      DownloadInternal downloadInternal = getDownload(id);
-      if (downloadInternal != null) {
-        logd("download stop reason is set to : " + stopReason, downloadInternal);
-        downloadInternal.setStopReason(stopReason);
-        return;
-      }
-    } else {
-      for (int i = 0; i < downloadInternals.size(); i++) {
-        downloadInternals.get(i).setStopReason(stopReason);
-      }
-    }
-    try {
-      if (id != null) {
-        downloadIndex.setStopReason(id, stopReason);
-      } else {
-        downloadIndex.setStopReason(stopReason);
-      }
-    } catch (IOException e) {
-      Log.e(TAG, "setStopReason failed", e);
-    }
-  }
-
-  private void setMaxParallelDownloadsInternal(int maxParallelDownloads) {
-    maxParallelDownloadsInternal = maxParallelDownloads;
-    // TODO: Start or stop downloads if necessary.
-  }
-
-  private void setMinRetryCountInternal(int minRetryCount) {
-    minRetryCountInternal = minRetryCount;
-  }
-
-  private void addDownloadInternal(DownloadRequest request, int stopReason) {
-    DownloadInternal downloadInternal = getDownload(request.id);
-    if (downloadInternal != null) {
-      downloadInternal.addRequest(request, stopReason);
-      logd("Request is added to existing download", downloadInternal);
-    } else {
-      Download download = loadDownload(request.id);
-      if (download == null) {
-        long nowMs = System.currentTimeMillis();
-        download =
-            new Download(
-                request,
-                stopReason != Download.STOP_REASON_NONE ? STATE_STOPPED : STATE_QUEUED,
-                /* startTimeMs= */ nowMs,
-                /* updateTimeMs= */ nowMs,
-                /* contentLength= */ C.LENGTH_UNSET,
-                stopReason,
-                Download.FAILURE_REASON_NONE);
-        logd("Download state is created for " + request.id);
-      } else {
-        download = mergeRequest(download, request, stopReason);
-        logd("Download state is loaded for " + request.id);
-      }
-      addDownloadForState(download);
-    }
-  }
-
-  private void removeDownloadInternal(String id) {
-    DownloadInternal downloadInternal = getDownload(id);
-    if (downloadInternal != null) {
-      downloadInternal.remove();
-    } else {
-      Download download = loadDownload(id);
-      if (download != null) {
-        addDownloadForState(copyWithState(download, STATE_REMOVING));
-      } else {
-        logd("Can't remove download. No download with id: " + id);
-      }
-    }
-  }
-
-  private void onDownloadThreadStoppedInternal(DownloadThread downloadThread) {
-    logd("Download is stopped", downloadThread.request);
-    String downloadId = downloadThread.request.id;
-    downloadThreads.remove(downloadId);
-    boolean tryToStartDownloads = false;
-    if (!downloadThread.isRemove) {
-      // If maxParallelDownloads was hit, there might be a download waiting for a slot.
-      tryToStartDownloads = parallelDownloads == maxParallelDownloadsInternal;
-      parallelDownloads--;
-    }
-    getDownload(downloadId)
-        .onDownloadThreadStopped(downloadThread.isCanceled, downloadThread.finalError);
-    if (tryToStartDownloads) {
-      for (int i = 0;
-          parallelDownloads < maxParallelDownloadsInternal && i < downloadInternals.size();
-          i++) {
-        downloadInternals.get(i).start();
-      }
-    }
-  }
-
-  private void onDownloadThreadContentLengthChangedInternal(DownloadThread downloadThread) {
-    String downloadId = downloadThread.request.id;
-    getDownload(downloadId).setContentLength(downloadThread.contentLength);
-  }
-
-  private void releaseInternal() {
-    for (DownloadThread downloadThread : downloadThreads.values()) {
-      downloadThread.cancel(/* released= */ true);
-    }
-    downloadThreads.clear();
-    downloadInternals.clear();
-    internalThread.quit();
-    synchronized (releaseLock) {
-      released = true;
-      releaseLock.notifyAll();
-    }
-  }
-
-  private void onDownloadChangedInternal(DownloadInternal downloadInternal, Download download) {
-    logd("Download state is changed", downloadInternal);
-    try {
-      downloadIndex.putDownload(download);
-    } catch (IOException e) {
-      Log.e(TAG, "Failed to update index", e);
-    }
-    if (downloadInternal.state == STATE_COMPLETED || downloadInternal.state == STATE_FAILED) {
-      downloadInternals.remove(downloadInternal);
-    }
-    mainHandler.obtainMessage(MSG_DOWNLOAD_CHANGED, download).sendToTarget();
-  }
-
-  private void onDownloadRemovedInternal(DownloadInternal downloadInternal, Download download) {
-    logd("Download is removed", downloadInternal);
-    try {
-      downloadIndex.removeDownload(download.request.id);
-    } catch (IOException e) {
-      Log.e(TAG, "Failed to remove from index", e);
-    }
-    downloadInternals.remove(downloadInternal);
-    mainHandler.obtainMessage(MSG_DOWNLOAD_REMOVED, download).sendToTarget();
-  }
-
-  @StartThreadResults
-  private int startDownloadThread(DownloadInternal downloadInternal) {
-    DownloadRequest request = downloadInternal.download.request;
-    String downloadId = request.id;
-    if (downloadThreads.containsKey(downloadId)) {
-      if (stopDownloadThreadInternal(downloadId)) {
-        return START_THREAD_WAIT_DOWNLOAD_CANCELLATION;
-      }
-      return START_THREAD_WAIT_REMOVAL_TO_FINISH;
-    }
-    boolean isRemove = downloadInternal.isInRemoveState();
-    if (!isRemove) {
-      if (parallelDownloads == maxParallelDownloadsInternal) {
-        return START_THREAD_TOO_MANY_DOWNLOADS;
-      }
-      parallelDownloads++;
-    }
-    Downloader downloader = downloaderFactory.createDownloader(request);
-    DownloadProgress downloadProgress = downloadInternal.download.progress;
-    DownloadThread downloadThread =
-        new DownloadThread(
-            request,
-            downloader,
-            downloadProgress,
-            isRemove,
-            minRetryCountInternal,
-            internalHandler);
-    downloadThreads.put(downloadId, downloadThread);
-    downloadThread.start();
-    logd("Download is started", downloadInternal);
-    return START_THREAD_SUCCEEDED;
-  }
-
-  private boolean stopDownloadThreadInternal(String downloadId) {
-    DownloadThread downloadThread = downloadThreads.get(downloadId);
-    if (downloadThread != null && !downloadThread.isRemove) {
-      downloadThread.cancel(/* released= */ false);
-      logd("Download is cancelled", downloadThread.request);
-      return true;
-    }
-    return false;
-  }
-
-  @Nullable
-  private DownloadInternal getDownload(String id) {
-    for (int i = 0; i < downloadInternals.size(); i++) {
-      DownloadInternal downloadInternal = downloadInternals.get(i);
-      if (downloadInternal.download.request.id.equals(id)) {
-        return downloadInternal;
-      }
-    }
-    return null;
-  }
-
-  private Download loadDownload(String id) {
-    try {
-      return downloadIndex.getDownload(id);
-    } catch (IOException e) {
-      Log.e(TAG, "loadDownload failed", e);
-    }
-    return null;
-  }
-
-  private void addDownloadForState(Download download) {
-    DownloadInternal downloadInternal = new DownloadInternal(this, download);
-    downloadInternals.add(downloadInternal);
-    logd("Download is added", downloadInternal);
-    downloadInternal.initialize();
-  }
-
-  private boolean canStartDownloads() {
-    return !downloadsPausedInternal && notMetRequirements == 0;
-  }
-
   /* package */ static Download mergeRequest(
       Download download, DownloadRequest request, int stopReason) {
     @Download.State int state = download.state;
@@ -955,9 +618,355 @@ public final class DownloadManager {
     }
   }
 
+  private static final class InternalHandler extends Handler {
+
+    public boolean released;
+
+    private final HandlerThread thread;
+    private final WritableDownloadIndex downloadIndex;
+    private final DownloaderFactory downloaderFactory;
+    private final Handler mainHandler;
+    private final ArrayList<DownloadInternal> downloadInternals;
+    private final HashMap<String, DownloadThread> downloadThreads;
+
+    // Mutable fields that are accessed on the internal thread.
+    @Requirements.RequirementFlags private int notMetRequirements;
+    private boolean downloadsPaused;
+    private int maxParallelDownloads;
+    private int minRetryCount;
+    private int parallelDownloads;
+
+    public InternalHandler(
+        HandlerThread thread,
+        WritableDownloadIndex downloadIndex,
+        DownloaderFactory downloaderFactory,
+        Handler mainHandler,
+        int maxParallelDownloads,
+        int minRetryCount,
+        boolean downloadsPaused) {
+      super(thread.getLooper());
+      this.thread = thread;
+      this.downloadIndex = downloadIndex;
+      this.downloaderFactory = downloaderFactory;
+      this.mainHandler = mainHandler;
+      this.maxParallelDownloads = maxParallelDownloads;
+      this.minRetryCount = minRetryCount;
+      this.downloadsPaused = downloadsPaused;
+      downloadInternals = new ArrayList<>();
+      downloadThreads = new HashMap<>();
+    }
+
+    @Override
+    public void handleMessage(Message message) {
+      boolean processedExternalMessage = true;
+      switch (message.what) {
+        case MSG_INITIALIZE:
+          int notMetRequirements = message.arg1;
+          initialize(notMetRequirements);
+          break;
+        case MSG_SET_DOWNLOADS_PAUSED:
+          boolean downloadsPaused = message.arg1 != 0;
+          setDownloadsPaused(downloadsPaused);
+          break;
+        case MSG_SET_NOT_MET_REQUIREMENTS:
+          notMetRequirements = message.arg1;
+          setNotMetRequirements(notMetRequirements);
+          break;
+        case MSG_SET_STOP_REASON:
+          String id = (String) message.obj;
+          int stopReason = message.arg1;
+          setStopReason(id, stopReason);
+          break;
+        case MSG_SET_MAX_PARALLEL_DOWNLOADS:
+          int maxParallelDownloads = message.arg1;
+          setMaxParallelDownloads(maxParallelDownloads);
+          break;
+        case MSG_SET_MIN_RETRY_COUNT:
+          int minRetryCount = message.arg1;
+          setMinRetryCount(minRetryCount);
+          break;
+        case MSG_ADD_DOWNLOAD:
+          DownloadRequest request = (DownloadRequest) message.obj;
+          stopReason = message.arg1;
+          addDownload(request, stopReason);
+          break;
+        case MSG_REMOVE_DOWNLOAD:
+          id = (String) message.obj;
+          removeDownload(id);
+          break;
+        case MSG_DOWNLOAD_THREAD_STOPPED:
+          DownloadThread downloadThread = (DownloadThread) message.obj;
+          onDownloadThreadStopped(downloadThread);
+          processedExternalMessage = false; // This message is posted internally.
+          break;
+        case MSG_CONTENT_LENGTH_CHANGED:
+          downloadThread = (DownloadThread) message.obj;
+          onDownloadThreadContentLengthChanged(downloadThread);
+          processedExternalMessage = false; // This message is posted internally.
+          break;
+        case MSG_RELEASE:
+          release();
+          return; // Don't post back to mainHandler on release.
+        default:
+          throw new IllegalStateException();
+      }
+      mainHandler
+          .obtainMessage(MSG_PROCESSED, processedExternalMessage ? 1 : 0, downloadThreads.size())
+          .sendToTarget();
+    }
+
+    private void initialize(int notMetRequirements) {
+      this.notMetRequirements = notMetRequirements;
+      ArrayList<Download> loadedStates = new ArrayList<>();
+      try (DownloadCursor cursor =
+          downloadIndex.getDownloads(
+              STATE_QUEUED, STATE_STOPPED, STATE_DOWNLOADING, STATE_REMOVING, STATE_RESTARTING)) {
+        while (cursor.moveToNext()) {
+          loadedStates.add(cursor.getDownload());
+        }
+        logd("Downloads are loaded.");
+      } catch (Throwable e) {
+        Log.e(TAG, "Download state loading failed.", e);
+        loadedStates.clear();
+      }
+      for (Download download : loadedStates) {
+        addDownloadForState(download);
+      }
+      logd("Downloads are created.");
+      mainHandler.obtainMessage(MSG_INITIALIZED, loadedStates).sendToTarget();
+      for (int i = 0; i < downloadInternals.size(); i++) {
+        downloadInternals.get(i).start();
+      }
+    }
+
+    private void setDownloadsPaused(boolean downloadsPaused) {
+      this.downloadsPaused = downloadsPaused;
+      for (int i = 0; i < downloadInternals.size(); i++) {
+        downloadInternals.get(i).updateStopState();
+      }
+    }
+
+    private void setNotMetRequirements(@Requirements.RequirementFlags int notMetRequirements) {
+      // TODO: Move this deduplication check to the main thread.
+      if (this.notMetRequirements == notMetRequirements) {
+        return;
+      }
+      this.notMetRequirements = notMetRequirements;
+      logdFlags("Not met requirements are changed", notMetRequirements);
+      for (int i = 0; i < downloadInternals.size(); i++) {
+        downloadInternals.get(i).updateStopState();
+      }
+    }
+
+    private void setStopReason(@Nullable String id, int stopReason) {
+      if (id != null) {
+        DownloadInternal downloadInternal = getDownload(id);
+        if (downloadInternal != null) {
+          logd("download stop reason is set to : " + stopReason, downloadInternal);
+          downloadInternal.setStopReason(stopReason);
+          return;
+        }
+      } else {
+        for (int i = 0; i < downloadInternals.size(); i++) {
+          downloadInternals.get(i).setStopReason(stopReason);
+        }
+      }
+      try {
+        if (id != null) {
+          downloadIndex.setStopReason(id, stopReason);
+        } else {
+          downloadIndex.setStopReason(stopReason);
+        }
+      } catch (IOException e) {
+        Log.e(TAG, "setStopReason failed", e);
+      }
+    }
+
+    private void setMaxParallelDownloads(int maxParallelDownloads) {
+      this.maxParallelDownloads = maxParallelDownloads;
+      // TODO: Start or stop downloads if necessary.
+    }
+
+    private void setMinRetryCount(int minRetryCount) {
+      this.minRetryCount = minRetryCount;
+    }
+
+    private void addDownload(DownloadRequest request, int stopReason) {
+      DownloadInternal downloadInternal = getDownload(request.id);
+      if (downloadInternal != null) {
+        downloadInternal.addRequest(request, stopReason);
+        logd("Request is added to existing download", downloadInternal);
+      } else {
+        Download download = loadDownload(request.id);
+        if (download == null) {
+          long nowMs = System.currentTimeMillis();
+          download =
+              new Download(
+                  request,
+                  stopReason != Download.STOP_REASON_NONE ? STATE_STOPPED : STATE_QUEUED,
+                  /* startTimeMs= */ nowMs,
+                  /* updateTimeMs= */ nowMs,
+                  /* contentLength= */ C.LENGTH_UNSET,
+                  stopReason,
+                  Download.FAILURE_REASON_NONE);
+          logd("Download state is created for " + request.id);
+        } else {
+          download = mergeRequest(download, request, stopReason);
+          logd("Download state is loaded for " + request.id);
+        }
+        addDownloadForState(download);
+      }
+    }
+
+    private void removeDownload(String id) {
+      DownloadInternal downloadInternal = getDownload(id);
+      if (downloadInternal != null) {
+        downloadInternal.remove();
+      } else {
+        Download download = loadDownload(id);
+        if (download != null) {
+          addDownloadForState(copyWithState(download, STATE_REMOVING));
+        } else {
+          logd("Can't remove download. No download with id: " + id);
+        }
+      }
+    }
+
+    private void onDownloadThreadStopped(DownloadThread downloadThread) {
+      logd("Download is stopped", downloadThread.request);
+      String downloadId = downloadThread.request.id;
+      downloadThreads.remove(downloadId);
+      boolean tryToStartDownloads = false;
+      if (!downloadThread.isRemove) {
+        // If maxParallelDownloads was hit, there might be a download waiting for a slot.
+        tryToStartDownloads = parallelDownloads == maxParallelDownloads;
+        parallelDownloads--;
+      }
+      getDownload(downloadId)
+          .onDownloadThreadStopped(downloadThread.isCanceled, downloadThread.finalError);
+      if (tryToStartDownloads) {
+        for (int i = 0;
+            parallelDownloads < maxParallelDownloads && i < downloadInternals.size();
+            i++) {
+          downloadInternals.get(i).start();
+        }
+      }
+    }
+
+    private void onDownloadThreadContentLengthChanged(DownloadThread downloadThread) {
+      String downloadId = downloadThread.request.id;
+      getDownload(downloadId).setContentLength(downloadThread.contentLength);
+    }
+
+    private void release() {
+      for (DownloadThread downloadThread : downloadThreads.values()) {
+        downloadThread.cancel(/* released= */ true);
+      }
+      downloadThreads.clear();
+      downloadInternals.clear();
+      thread.quit();
+      synchronized (this) {
+        released = true;
+        notifyAll();
+      }
+    }
+
+    private void onDownloadChangedInternal(DownloadInternal downloadInternal, Download download) {
+      logd("Download state is changed", downloadInternal);
+      try {
+        downloadIndex.putDownload(download);
+      } catch (IOException e) {
+        Log.e(TAG, "Failed to update index", e);
+      }
+      if (downloadInternal.state == STATE_COMPLETED || downloadInternal.state == STATE_FAILED) {
+        downloadInternals.remove(downloadInternal);
+      }
+      mainHandler.obtainMessage(MSG_DOWNLOAD_CHANGED, download).sendToTarget();
+    }
+
+    private void onDownloadRemovedInternal(DownloadInternal downloadInternal, Download download) {
+      logd("Download is removed", downloadInternal);
+      try {
+        downloadIndex.removeDownload(download.request.id);
+      } catch (IOException e) {
+        Log.e(TAG, "Failed to remove from index", e);
+      }
+      downloadInternals.remove(downloadInternal);
+      mainHandler.obtainMessage(MSG_DOWNLOAD_REMOVED, download).sendToTarget();
+    }
+
+    @StartThreadResults
+    private int startDownloadThread(DownloadInternal downloadInternal) {
+      DownloadRequest request = downloadInternal.download.request;
+      String downloadId = request.id;
+      if (downloadThreads.containsKey(downloadId)) {
+        if (stopDownloadThreadInternal(downloadId)) {
+          return START_THREAD_WAIT_DOWNLOAD_CANCELLATION;
+        }
+        return START_THREAD_WAIT_REMOVAL_TO_FINISH;
+      }
+      boolean isRemove = downloadInternal.isInRemoveState();
+      if (!isRemove) {
+        if (parallelDownloads == maxParallelDownloads) {
+          return START_THREAD_TOO_MANY_DOWNLOADS;
+        }
+        parallelDownloads++;
+      }
+      Downloader downloader = downloaderFactory.createDownloader(request);
+      DownloadProgress downloadProgress = downloadInternal.download.progress;
+      DownloadThread downloadThread =
+          new DownloadThread(request, downloader, downloadProgress, isRemove, minRetryCount, this);
+      downloadThreads.put(downloadId, downloadThread);
+      downloadThread.start();
+      logd("Download is started", downloadInternal);
+      return START_THREAD_SUCCEEDED;
+    }
+
+    private boolean stopDownloadThreadInternal(String downloadId) {
+      DownloadThread downloadThread = downloadThreads.get(downloadId);
+      if (downloadThread != null && !downloadThread.isRemove) {
+        downloadThread.cancel(/* released= */ false);
+        logd("Download is cancelled", downloadThread.request);
+        return true;
+      }
+      return false;
+    }
+
+    @Nullable
+    private DownloadInternal getDownload(String id) {
+      for (int i = 0; i < downloadInternals.size(); i++) {
+        DownloadInternal downloadInternal = downloadInternals.get(i);
+        if (downloadInternal.download.request.id.equals(id)) {
+          return downloadInternal;
+        }
+      }
+      return null;
+    }
+
+    private Download loadDownload(String id) {
+      try {
+        return downloadIndex.getDownload(id);
+      } catch (IOException e) {
+        Log.e(TAG, "loadDownload failed", e);
+      }
+      return null;
+    }
+
+    private void addDownloadForState(Download download) {
+      DownloadInternal downloadInternal = new DownloadInternal(this, download);
+      downloadInternals.add(downloadInternal);
+      logd("Download is added", downloadInternal);
+      downloadInternal.initialize();
+    }
+
+    private boolean canStartDownloads() {
+      return !downloadsPaused && notMetRequirements == 0;
+    }
+  }
+
   private static final class DownloadInternal {
 
-    private final DownloadManager downloadManager;
+    private final InternalHandler internalHandler;
 
     private Download download;
 
@@ -967,8 +976,8 @@ public final class DownloadManager {
     private int stopReason;
     @MonotonicNonNull @Download.FailureReason private int failureReason;
 
-    private DownloadInternal(DownloadManager downloadManager, Download download) {
-      this.downloadManager = downloadManager;
+    private DownloadInternal(InternalHandler internalHandler, Download download) {
+      this.internalHandler = internalHandler;
       this.download = download;
       state = download.state;
       contentLength = download.contentLength;
@@ -1016,7 +1025,7 @@ public final class DownloadManager {
       if (state == STATE_QUEUED || state == STATE_DOWNLOADING) {
         startOrQueue();
       } else if (isInRemoveState()) {
-        downloadManager.startDownloadThread(this);
+        internalHandler.startDownloadThread(this);
       }
     }
 
@@ -1034,7 +1043,7 @@ public final class DownloadManager {
         return;
       }
       this.contentLength = contentLength;
-      downloadManager.onDownloadChangedInternal(this, getUpdatedDownload());
+      internalHandler.onDownloadChangedInternal(this, getUpdatedDownload());
     }
 
     private void updateStopState() {
@@ -1045,12 +1054,12 @@ public final class DownloadManager {
         }
       } else {
         if (state == STATE_DOWNLOADING || state == STATE_QUEUED) {
-          downloadManager.stopDownloadThreadInternal(download.request.id);
+          internalHandler.stopDownloadThreadInternal(download.request.id);
           setState(STATE_STOPPED);
         }
       }
       if (oldDownload == download) {
-        downloadManager.onDownloadChangedInternal(this, getUpdatedDownload());
+        internalHandler.onDownloadChangedInternal(this, getUpdatedDownload());
       }
     }
 
@@ -1059,24 +1068,24 @@ public final class DownloadManager {
       // state immediately.
       state = initialState;
       if (isInRemoveState()) {
-        downloadManager.startDownloadThread(this);
+        internalHandler.startDownloadThread(this);
       } else if (canStart()) {
         startOrQueue();
       } else {
         setState(STATE_STOPPED);
       }
       if (state == initialState) {
-        downloadManager.onDownloadChangedInternal(this, getUpdatedDownload());
+        internalHandler.onDownloadChangedInternal(this, getUpdatedDownload());
       }
     }
 
     private boolean canStart() {
-      return downloadManager.canStartDownloads() && stopReason == STOP_REASON_NONE;
+      return internalHandler.canStartDownloads() && stopReason == STOP_REASON_NONE;
     }
 
     private void startOrQueue() {
       Assertions.checkState(!isInRemoveState());
-      @StartThreadResults int result = downloadManager.startDownloadThread(this);
+      @StartThreadResults int result = internalHandler.startDownloadThread(this);
       Assertions.checkState(result != START_THREAD_WAIT_REMOVAL_TO_FINISH);
       if (result == START_THREAD_SUCCEEDED || result == START_THREAD_WAIT_DOWNLOAD_CANCELLATION) {
         setState(STATE_DOWNLOADING);
@@ -1088,7 +1097,7 @@ public final class DownloadManager {
     private void setState(@Download.State int newState) {
       if (state != newState) {
         state = newState;
-        downloadManager.onDownloadChangedInternal(this, getUpdatedDownload());
+        internalHandler.onDownloadChangedInternal(this, getUpdatedDownload());
       }
     }
 
@@ -1097,9 +1106,9 @@ public final class DownloadManager {
         return;
       }
       if (isCanceled) {
-        downloadManager.startDownloadThread(this);
+        internalHandler.startDownloadThread(this);
       } else if (state == STATE_REMOVING) {
-        downloadManager.onDownloadRemovedInternal(this, getUpdatedDownload());
+        internalHandler.onDownloadRemovedInternal(this, getUpdatedDownload());
       } else if (state == STATE_RESTARTING) {
         initialize(STATE_QUEUED);
       } else { // STATE_DOWNLOADING
@@ -1122,7 +1131,7 @@ public final class DownloadManager {
     private final boolean isRemove;
     private final int minRetryCount;
 
-    private volatile Handler updateHandler;
+    private volatile InternalHandler internalHandler;
     private volatile boolean isCanceled;
     private Throwable finalError;
 
@@ -1134,13 +1143,13 @@ public final class DownloadManager {
         DownloadProgress downloadProgress,
         boolean isRemove,
         int minRetryCount,
-        Handler updateHandler) {
+        InternalHandler internalHandler) {
       this.request = request;
       this.downloader = downloader;
       this.downloadProgress = downloadProgress;
       this.isRemove = isRemove;
       this.minRetryCount = minRetryCount;
-      this.updateHandler = updateHandler;
+      this.internalHandler = internalHandler;
       contentLength = C.LENGTH_UNSET;
     }
 
@@ -1150,7 +1159,7 @@ public final class DownloadManager {
         // cancellation to complete depends on the implementation of the downloader being used. We
         // null the handler reference here so that it doesn't prevent garbage collection of the
         // download manager whilst cancellation is ongoing.
-        updateHandler = null;
+        internalHandler = null;
       }
       isCanceled = true;
       downloader.cancel();
@@ -1192,9 +1201,9 @@ public final class DownloadManager {
       } catch (Throwable e) {
         finalError = e;
       }
-      Handler updateHandler = this.updateHandler;
-      if (updateHandler != null) {
-        updateHandler.obtainMessage(MSG_DOWNLOAD_THREAD_STOPPED, this).sendToTarget();
+      Handler internalHandler = this.internalHandler;
+      if (internalHandler != null) {
+        internalHandler.obtainMessage(MSG_DOWNLOAD_THREAD_STOPPED, this).sendToTarget();
       }
     }
 
@@ -1204,9 +1213,9 @@ public final class DownloadManager {
       downloadProgress.percentDownloaded = percentDownloaded;
       if (contentLength != this.contentLength) {
         this.contentLength = contentLength;
-        Handler updateHandler = this.updateHandler;
-        if (updateHandler != null) {
-          updateHandler.obtainMessage(MSG_CONTENT_LENGTH_CHANGED, this).sendToTarget();
+        Handler internalHandler = this.internalHandler;
+        if (internalHandler != null) {
+          internalHandler.obtainMessage(MSG_CONTENT_LENGTH_CHANGED, this).sendToTarget();
         }
       }
     }

From b55e17588b2328c77a33586e5c81cd9413ff6201 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 26 Apr 2019 14:35:51 +0100
Subject: [PATCH 811/832] Link blog post from release notes

PiperOrigin-RevId: 245411528
---
 RELEASENOTES.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 342ca55cc9..0beec1ef81 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -3,8 +3,10 @@
 ### 2.10.0 ###
 
 * Core library:
-  * Improve decoder re-use between playbacks. TODO: Write and link a blog post
-    here ([#2826](https://github.com/google/ExoPlayer/issues/2826)).
+  * Improve decoder re-use between playbacks
+    ([#2826](https://github.com/google/ExoPlayer/issues/2826)). Read
+    [this blog post](https://medium.com/google-exoplayer/improved-decoder-reuse-in-exoplayer-ef4c6d99591d)
+    for more details.
   * Rename `ExtractorMediaSource` to `ProgressiveMediaSource`.
   * Fix issue where using `ProgressiveMediaSource.Factory` would mean that
     `DefaultExtractorsFactory` would be kept by proguard. Custom

From f62fa434dd8513a1766e688e59febb258762e968 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 26 Apr 2019 18:14:55 +0100
Subject: [PATCH 812/832] Log warnings when extension libraries can't be used

Issue: #5788
PiperOrigin-RevId: 245440858
---
 RELEASENOTES.md                                      |  5 +++++
 .../android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java | 12 +++++++++++-
 .../android/exoplayer2/util/LibraryLoader.java       |  8 +++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 0beec1ef81..bb612ea319 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -115,6 +115,11 @@
     order when in shuffle mode.
   * Allow handling of custom commands via `registerCustomCommandReceiver`.
   * Add ability to include an extras `Bundle` when reporting a custom error.
+* LoadControl: Set minimum buffer for playbacks with video equal to maximum
+  buffer ([#2083](https://github.com/google/ExoPlayer/issues/2083)).
+* Log warnings when extension native libraries can't be used, to help with
+  diagnosing playback failures
+  ([#5788](https://github.com/google/ExoPlayer/issues/5788)).
 
 ### 2.9.6 ###
 
diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java
index bc36fc4f3b..58109c1666 100644
--- a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java
+++ b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java
@@ -19,6 +19,7 @@ import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.util.LibraryLoader;
+import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.MimeTypes;
 
 /**
@@ -30,6 +31,8 @@ public final class FfmpegLibrary {
     ExoPlayerLibraryInfo.registerModule("goog.exo.ffmpeg");
   }
 
+  private static final String TAG = "FfmpegLibrary";
+
   private static final LibraryLoader LOADER =
       new LibraryLoader("avutil", "avresample", "avcodec", "ffmpeg");
 
@@ -69,7 +72,14 @@ public final class FfmpegLibrary {
       return false;
     }
     String codecName = getCodecName(mimeType, encoding);
-    return codecName != null && ffmpegHasDecoder(codecName);
+    if (codecName == null) {
+      return false;
+    }
+    if (!ffmpegHasDecoder(codecName)) {
+      Log.w(TAG, "No " + codecName + " decoder available. Check the FFmpeg build configuration.");
+      return false;
+    }
+    return true;
   }
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/LibraryLoader.java b/library/core/src/main/java/com/google/android/exoplayer2/util/LibraryLoader.java
index c12bae0a07..7ee88d8f0f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/LibraryLoader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/LibraryLoader.java
@@ -15,11 +15,15 @@
  */
 package com.google.android.exoplayer2.util;
 
+import java.util.Arrays;
+
 /**
  * Configurable loader for native libraries.
  */
 public final class LibraryLoader {
 
+  private static final String TAG = "LibraryLoader";
+
   private String[] nativeLibraries;
   private boolean loadAttempted;
   private boolean isAvailable;
@@ -54,7 +58,9 @@ public final class LibraryLoader {
       }
       isAvailable = true;
     } catch (UnsatisfiedLinkError exception) {
-      // Do nothing.
+      // Log a warning as an attempt to check for the library indicates that the app depends on an
+      // extension and generally would expect its native libraries to be available.
+      Log.w(TAG, "Failed to load " + Arrays.toString(nativeLibraries));
     }
     return isAvailable;
   }

From 9463c31cded5cd6523769c4deab04cc4204eeb3c Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 23 Apr 2019 11:00:55 +0100
Subject: [PATCH 813/832] Update default min duration for playbacks with video
 to match max duration.

Experiments show this is beneficial for rebuffers with only minor impact
on battery usage.

Configurations which explicitly set a minimum buffer duration are unaffected.

Issue:#2083
PiperOrigin-RevId: 244823642
---
 .../exoplayer2/DefaultLoadControl.java        | 77 +++++++++++++++----
 1 file changed, 60 insertions(+), 17 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java b/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
index 83cb5b723c..972f651a41 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
@@ -29,12 +29,14 @@ public class DefaultLoadControl implements LoadControl {
 
   /**
    * The default minimum duration of media that the player will attempt to ensure is buffered at all
-   * times, in milliseconds.
+   * times, in milliseconds. This value is only applied to playbacks without video.
    */
   public static final int DEFAULT_MIN_BUFFER_MS = 15000;
 
   /**
    * The default maximum duration of media that the player will attempt to buffer, in milliseconds.
+   * For playbacks with video, this is also the default minimum duration of media that the player
+   * will attempt to ensure is buffered.
    */
   public static final int DEFAULT_MAX_BUFFER_MS = 50000;
 
@@ -69,7 +71,8 @@ public class DefaultLoadControl implements LoadControl {
   public static final class Builder {
 
     private DefaultAllocator allocator;
-    private int minBufferMs;
+    private int minBufferAudioMs;
+    private int minBufferVideoMs;
     private int maxBufferMs;
     private int bufferForPlaybackMs;
     private int bufferForPlaybackAfterRebufferMs;
@@ -81,7 +84,8 @@ public class DefaultLoadControl implements LoadControl {
 
     /** Constructs a new instance. */
     public Builder() {
-      minBufferMs = DEFAULT_MIN_BUFFER_MS;
+      minBufferAudioMs = DEFAULT_MIN_BUFFER_MS;
+      minBufferVideoMs = DEFAULT_MAX_BUFFER_MS;
       maxBufferMs = DEFAULT_MAX_BUFFER_MS;
       bufferForPlaybackMs = DEFAULT_BUFFER_FOR_PLAYBACK_MS;
       bufferForPlaybackAfterRebufferMs = DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS;
@@ -125,7 +129,18 @@ public class DefaultLoadControl implements LoadControl {
         int bufferForPlaybackMs,
         int bufferForPlaybackAfterRebufferMs) {
       Assertions.checkState(!createDefaultLoadControlCalled);
-      this.minBufferMs = minBufferMs;
+      assertGreaterOrEqual(bufferForPlaybackMs, 0, "bufferForPlaybackMs", "0");
+      assertGreaterOrEqual(
+          bufferForPlaybackAfterRebufferMs, 0, "bufferForPlaybackAfterRebufferMs", "0");
+      assertGreaterOrEqual(minBufferMs, bufferForPlaybackMs, "minBufferMs", "bufferForPlaybackMs");
+      assertGreaterOrEqual(
+          minBufferMs,
+          bufferForPlaybackAfterRebufferMs,
+          "minBufferMs",
+          "bufferForPlaybackAfterRebufferMs");
+      assertGreaterOrEqual(maxBufferMs, minBufferMs, "maxBufferMs", "minBufferMs");
+      this.minBufferAudioMs = minBufferMs;
+      this.minBufferVideoMs = minBufferMs;
       this.maxBufferMs = maxBufferMs;
       this.bufferForPlaybackMs = bufferForPlaybackMs;
       this.bufferForPlaybackAfterRebufferMs = bufferForPlaybackAfterRebufferMs;
@@ -173,6 +188,7 @@ public class DefaultLoadControl implements LoadControl {
      */
     public Builder setBackBuffer(int backBufferDurationMs, boolean retainBackBufferFromKeyframe) {
       Assertions.checkState(!createDefaultLoadControlCalled);
+      assertGreaterOrEqual(backBufferDurationMs, 0, "backBufferDurationMs", "0");
       this.backBufferDurationMs = backBufferDurationMs;
       this.retainBackBufferFromKeyframe = retainBackBufferFromKeyframe;
       return this;
@@ -187,7 +203,8 @@ public class DefaultLoadControl implements LoadControl {
       }
       return new DefaultLoadControl(
           allocator,
-          minBufferMs,
+          minBufferAudioMs,
+          minBufferVideoMs,
           maxBufferMs,
           bufferForPlaybackMs,
           bufferForPlaybackAfterRebufferMs,
@@ -200,7 +217,8 @@ public class DefaultLoadControl implements LoadControl {
 
   private final DefaultAllocator allocator;
 
-  private final long minBufferUs;
+  private final long minBufferAudioUs;
+  private final long minBufferVideoUs;
   private final long maxBufferUs;
   private final long bufferForPlaybackUs;
   private final long bufferForPlaybackAfterRebufferUs;
@@ -211,6 +229,7 @@ public class DefaultLoadControl implements LoadControl {
 
   private int targetBufferSize;
   private boolean isBuffering;
+  private boolean hasVideo;
 
   /** Constructs a new instance, using the {@code DEFAULT_*} constants defined in this class. */
   @SuppressWarnings("deprecation")
@@ -220,16 +239,18 @@ public class DefaultLoadControl implements LoadControl {
 
   /** @deprecated Use {@link Builder} instead. */
   @Deprecated
-  @SuppressWarnings("deprecation")
   public DefaultLoadControl(DefaultAllocator allocator) {
     this(
         allocator,
-        DEFAULT_MIN_BUFFER_MS,
+        /* minBufferAudioMs= */ DEFAULT_MIN_BUFFER_MS,
+        /* minBufferVideoMs= */ DEFAULT_MAX_BUFFER_MS,
         DEFAULT_MAX_BUFFER_MS,
         DEFAULT_BUFFER_FOR_PLAYBACK_MS,
         DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS,
         DEFAULT_TARGET_BUFFER_BYTES,
-        DEFAULT_PRIORITIZE_TIME_OVER_SIZE_THRESHOLDS);
+        DEFAULT_PRIORITIZE_TIME_OVER_SIZE_THRESHOLDS,
+        DEFAULT_BACK_BUFFER_DURATION_MS,
+        DEFAULT_RETAIN_BACK_BUFFER_FROM_KEYFRAME);
   }
 
   /** @deprecated Use {@link Builder} instead. */
@@ -244,7 +265,8 @@ public class DefaultLoadControl implements LoadControl {
       boolean prioritizeTimeOverSizeThresholds) {
     this(
         allocator,
-        minBufferMs,
+        /* minBufferAudioMs= */ minBufferMs,
+        /* minBufferVideoMs= */ minBufferMs,
         maxBufferMs,
         bufferForPlaybackMs,
         bufferForPlaybackAfterRebufferMs,
@@ -256,7 +278,8 @@ public class DefaultLoadControl implements LoadControl {
 
   protected DefaultLoadControl(
       DefaultAllocator allocator,
-      int minBufferMs,
+      int minBufferAudioMs,
+      int minBufferVideoMs,
       int maxBufferMs,
       int bufferForPlaybackMs,
       int bufferForPlaybackAfterRebufferMs,
@@ -267,17 +290,27 @@ public class DefaultLoadControl implements LoadControl {
     assertGreaterOrEqual(bufferForPlaybackMs, 0, "bufferForPlaybackMs", "0");
     assertGreaterOrEqual(
         bufferForPlaybackAfterRebufferMs, 0, "bufferForPlaybackAfterRebufferMs", "0");
-    assertGreaterOrEqual(minBufferMs, bufferForPlaybackMs, "minBufferMs", "bufferForPlaybackMs");
     assertGreaterOrEqual(
-        minBufferMs,
+        minBufferAudioMs, bufferForPlaybackMs, "minBufferAudioMs", "bufferForPlaybackMs");
+    assertGreaterOrEqual(
+        minBufferVideoMs, bufferForPlaybackMs, "minBufferVideoMs", "bufferForPlaybackMs");
+    assertGreaterOrEqual(
+        minBufferAudioMs,
         bufferForPlaybackAfterRebufferMs,
-        "minBufferMs",
+        "minBufferAudioMs",
         "bufferForPlaybackAfterRebufferMs");
-    assertGreaterOrEqual(maxBufferMs, minBufferMs, "maxBufferMs", "minBufferMs");
+    assertGreaterOrEqual(
+        minBufferVideoMs,
+        bufferForPlaybackAfterRebufferMs,
+        "minBufferVideoMs",
+        "bufferForPlaybackAfterRebufferMs");
+    assertGreaterOrEqual(maxBufferMs, minBufferAudioMs, "maxBufferMs", "minBufferAudioMs");
+    assertGreaterOrEqual(maxBufferMs, minBufferVideoMs, "maxBufferMs", "minBufferVideoMs");
     assertGreaterOrEqual(backBufferDurationMs, 0, "backBufferDurationMs", "0");
 
     this.allocator = allocator;
-    this.minBufferUs = C.msToUs(minBufferMs);
+    this.minBufferAudioUs = C.msToUs(minBufferAudioMs);
+    this.minBufferVideoUs = C.msToUs(minBufferVideoMs);
     this.maxBufferUs = C.msToUs(maxBufferMs);
     this.bufferForPlaybackUs = C.msToUs(bufferForPlaybackMs);
     this.bufferForPlaybackAfterRebufferUs = C.msToUs(bufferForPlaybackAfterRebufferMs);
@@ -295,6 +328,7 @@ public class DefaultLoadControl implements LoadControl {
   @Override
   public void onTracksSelected(Renderer[] renderers, TrackGroupArray trackGroups,
       TrackSelectionArray trackSelections) {
+    hasVideo = hasVideo(renderers, trackSelections);
     targetBufferSize =
         targetBufferBytesOverwrite == C.LENGTH_UNSET
             ? calculateTargetBufferSize(renderers, trackSelections)
@@ -330,7 +364,7 @@ public class DefaultLoadControl implements LoadControl {
   @Override
   public boolean shouldContinueLoading(long bufferedDurationUs, float playbackSpeed) {
     boolean targetBufferSizeReached = allocator.getTotalBytesAllocated() >= targetBufferSize;
-    long minBufferUs = this.minBufferUs;
+    long minBufferUs = hasVideo ? minBufferVideoUs : minBufferAudioUs;
     if (playbackSpeed > 1) {
       // The playback speed is faster than real time, so scale up the minimum required media
       // duration to keep enough media buffered for a playout duration of minBufferUs.
@@ -384,6 +418,15 @@ public class DefaultLoadControl implements LoadControl {
     }
   }
 
+  private static boolean hasVideo(Renderer[] renderers, TrackSelectionArray trackSelectionArray) {
+    for (int i = 0; i < renderers.length; i++) {
+      if (renderers[i].getTrackType() == C.TRACK_TYPE_VIDEO && trackSelectionArray.get(i) != null) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   private static void assertGreaterOrEqual(int value1, int value2, String name1, String name2) {
     Assertions.checkArgument(value1 >= value2, name1 + " cannot be less than " + name2);
   }

From e4f1f89f5ca4a21c064f34d70b76a4094fb42cb9 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Fri, 26 Apr 2019 18:26:24 +0100
Subject: [PATCH 814/832] Downloading documentation

PiperOrigin-RevId: 245443109
---
 RELEASENOTES.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index bb612ea319..80650974e7 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -23,7 +23,8 @@
     ([#5520](https://github.com/google/ExoPlayer/issues/5520)).
 * Offline:
   * Improve offline support. `DownloadManager` now tracks all offline content,
-    not just tasks in progress. TODO: Write and link a blog post here.
+    not just tasks in progress.  Read [this page](https://exoplayer.dev/downloading-media.html) for
+    more details.
 * Caching:
   * Improve performance of `SimpleCache`
     ([#4253](https://github.com/google/ExoPlayer/issues/4253)).

From 0128cebce1e1cb04c5a4974f25006354579fe286 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Fri, 26 Apr 2019 12:05:09 +0100
Subject: [PATCH 815/832] Add simpler DownloadManager constructor

PiperOrigin-RevId: 245397736
---
 .../exoplayer2/offline/DownloadManager.java    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index aa0cd12231..2caf89155a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -193,6 +193,24 @@ public final class DownloadManager {
         new DefaultDownloaderFactory(new DownloaderConstructorHelper(cache, upstreamFactory)));
   }
 
+  /**
+   * Constructs a {@link DownloadManager}.
+   *
+   * @param context Any context.
+   * @param databaseProvider Provides the SQLite database in which downloads are persisted.
+   * @param cache A cache to be used to store downloaded data. The cache should be configured with
+   *     an {@link CacheEvictor} that will not evict downloaded content, for example {@link
+   *     NoOpCacheEvictor}.
+   * @param upstreamFactory A {@link Factory} for creating {@link DataSource}s for downloading data.
+   */
+  public DownloadManager(
+      Context context, DatabaseProvider databaseProvider, Cache cache, Factory upstreamFactory) {
+    this(
+        context,
+        new DefaultDownloadIndex(databaseProvider),
+        new DefaultDownloaderFactory(new DownloaderConstructorHelper(cache, upstreamFactory)));
+  }
+
   /**
    * Constructs a {@link DownloadManager}.
    *

From 5eb36f86a25a3f988771ad38fd746f3b9bd25c66 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Fri, 26 Apr 2019 18:49:45 +0100
Subject: [PATCH 816/832] Fix line break

---
 RELEASENOTES.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 80650974e7..aac46647cc 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -23,8 +23,8 @@
     ([#5520](https://github.com/google/ExoPlayer/issues/5520)).
 * Offline:
   * Improve offline support. `DownloadManager` now tracks all offline content,
-    not just tasks in progress.  Read [this page](https://exoplayer.dev/downloading-media.html) for
-    more details.
+    not just tasks in progress. Read
+    [this page](https://exoplayer.dev/downloading-media.html) for more details.
 * Caching:
   * Improve performance of `SimpleCache`
     ([#4253](https://github.com/google/ExoPlayer/issues/4253)).

From 590140c1a6c7b48d968c71c9157bd1ea00c5a849 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Fri, 26 Apr 2019 20:41:29 +0100
Subject: [PATCH 817/832] Fix bad merge

---
 .../exoplayer2/offline/DownloadManager.java    | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 2caf89155a..aa0cd12231 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -193,24 +193,6 @@ public final class DownloadManager {
         new DefaultDownloaderFactory(new DownloaderConstructorHelper(cache, upstreamFactory)));
   }
 
-  /**
-   * Constructs a {@link DownloadManager}.
-   *
-   * @param context Any context.
-   * @param databaseProvider Provides the SQLite database in which downloads are persisted.
-   * @param cache A cache to be used to store downloaded data. The cache should be configured with
-   *     an {@link CacheEvictor} that will not evict downloaded content, for example {@link
-   *     NoOpCacheEvictor}.
-   * @param upstreamFactory A {@link Factory} for creating {@link DataSource}s for downloading data.
-   */
-  public DownloadManager(
-      Context context, DatabaseProvider databaseProvider, Cache cache, Factory upstreamFactory) {
-    this(
-        context,
-        new DefaultDownloadIndex(databaseProvider),
-        new DefaultDownloaderFactory(new DownloaderConstructorHelper(cache, upstreamFactory)));
-  }
-
   /**
    * Constructs a {@link DownloadManager}.
    *

From 618d97db1c6fbb917740ed53848fc120cad957d1 Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Mon, 29 Apr 2019 15:56:41 +0100
Subject: [PATCH 818/832] Never set null as a session meta data object.

Issue: #5810
PiperOrigin-RevId: 245745646
---
 .../ext/mediasession/MediaSessionConnector.java          | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
index 24cf4062f7..9c80fabc50 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
@@ -146,6 +146,9 @@ public final class MediaSessionConnector {
   private static final int EDITOR_MEDIA_SESSION_FLAGS =
       BASE_MEDIA_SESSION_FLAGS | MediaSessionCompat.FLAG_HANDLES_QUEUE_COMMANDS;
 
+  private static final MediaMetadataCompat METADATA_EMPTY =
+      new MediaMetadataCompat.Builder().build();
+
   /** Receiver of media commands sent by a media controller. */
   public interface CommandReceiver {
     /**
@@ -639,8 +642,8 @@ public final class MediaSessionConnector {
     MediaMetadataCompat metadata =
         mediaMetadataProvider != null && player != null
             ? mediaMetadataProvider.getMetadata(player)
-            : null;
-    mediaSession.setMetadata(metadata);
+            : METADATA_EMPTY;
+    mediaSession.setMetadata(metadata != null ? metadata : METADATA_EMPTY);
   }
 
   /**
@@ -888,7 +891,7 @@ public final class MediaSessionConnector {
     @Override
     public MediaMetadataCompat getMetadata(Player player) {
       if (player.getCurrentTimeline().isEmpty()) {
-        return null;
+        return METADATA_EMPTY;
       }
       MediaMetadataCompat.Builder builder = new MediaMetadataCompat.Builder();
       if (player.isPlayingAd()) {

From 6b34ade908dfe750f6d26c2ca74636a542556ac3 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 30 Apr 2019 10:56:23 +0100
Subject: [PATCH 819/832] Rename DownloadThread to Task

This resolves some naming confusion that previously existed
as a result of DownloadThread also being used for removals.
Some related variables (e.g. activeDownloadCount) would refer
to both download and removal tasks, whilst others
(e.g. maxParallelDownloads) would refer only to downloads.
This change renames those that refer to both to use "task"
terminology.

This change also includes minor test edits.

PiperOrigin-RevId: 245913671
---
 .../exoplayer2/offline/DownloadManager.java   | 121 +++++++++---------
 .../exoplayer2/offline/DownloadBuilder.java   |   4 +-
 .../offline/DownloadManagerTest.java          |   4 +-
 3 files changed, 68 insertions(+), 61 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index aa0cd12231..7ad22e000a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -137,7 +137,7 @@ public final class DownloadManager {
   private static final int MSG_SET_MIN_RETRY_COUNT = 5;
   private static final int MSG_ADD_DOWNLOAD = 6;
   private static final int MSG_REMOVE_DOWNLOAD = 7;
-  private static final int MSG_DOWNLOAD_THREAD_STOPPED = 8;
+  private static final int MSG_TASK_STOPPED = 8;
   private static final int MSG_CONTENT_LENGTH_CHANGED = 9;
   private static final int MSG_RELEASE = 10;
 
@@ -168,7 +168,7 @@ public final class DownloadManager {
   private final ArrayList<Download> downloads;
 
   private int pendingMessages;
-  private int activeDownloadCount;
+  private int activeTaskCount;
   private boolean initialized;
   private boolean downloadsPaused;
   private int maxParallelDownloads;
@@ -244,7 +244,7 @@ public final class DownloadManager {
    * download requirements are not met).
    */
   public boolean isIdle() {
-    return activeDownloadCount == 0 && pendingMessages == 0;
+    return activeTaskCount == 0 && pendingMessages == 0;
   }
 
   /**
@@ -465,7 +465,7 @@ public final class DownloadManager {
       mainHandler.removeCallbacksAndMessages(/* token= */ null);
       // Reset state.
       pendingMessages = 0;
-      activeDownloadCount = 0;
+      activeTaskCount = 0;
       initialized = false;
       downloads.clear();
     }
@@ -503,8 +503,8 @@ public final class DownloadManager {
         break;
       case MSG_PROCESSED:
         int processedMessageCount = message.arg1;
-        int activeDownloadCount = message.arg2;
-        onMessageProcessed(processedMessageCount, activeDownloadCount);
+        int activeTaskCount = message.arg2;
+        onMessageProcessed(processedMessageCount, activeTaskCount);
         break;
       default:
         throw new IllegalStateException();
@@ -543,9 +543,9 @@ public final class DownloadManager {
     }
   }
 
-  private void onMessageProcessed(int processedMessageCount, int activeDownloadCount) {
+  private void onMessageProcessed(int processedMessageCount, int activeTaskCount) {
     this.pendingMessages -= processedMessageCount;
-    this.activeDownloadCount = activeDownloadCount;
+    this.activeTaskCount = activeTaskCount;
     if (isIdle()) {
       for (Listener listener : listeners) {
         listener.onIdle(this);
@@ -627,7 +627,7 @@ public final class DownloadManager {
     private final DownloaderFactory downloaderFactory;
     private final Handler mainHandler;
     private final ArrayList<DownloadInternal> downloadInternals;
-    private final HashMap<String, DownloadThread> downloadThreads;
+    private final HashMap<String, Task> activeTasks;
 
     // Mutable fields that are accessed on the internal thread.
     @Requirements.RequirementFlags private int notMetRequirements;
@@ -653,7 +653,7 @@ public final class DownloadManager {
       this.minRetryCount = minRetryCount;
       this.downloadsPaused = downloadsPaused;
       downloadInternals = new ArrayList<>();
-      downloadThreads = new HashMap<>();
+      activeTasks = new HashMap<>();
     }
 
     @Override
@@ -694,14 +694,14 @@ public final class DownloadManager {
           id = (String) message.obj;
           removeDownload(id);
           break;
-        case MSG_DOWNLOAD_THREAD_STOPPED:
-          DownloadThread downloadThread = (DownloadThread) message.obj;
-          onDownloadThreadStopped(downloadThread);
+        case MSG_TASK_STOPPED:
+          Task task = (Task) message.obj;
+          onTaskStopped(task);
           processedExternalMessage = false; // This message is posted internally.
           break;
         case MSG_CONTENT_LENGTH_CHANGED:
-          downloadThread = (DownloadThread) message.obj;
-          onDownloadThreadContentLengthChanged(downloadThread);
+          task = (Task) message.obj;
+          onContentLengthChanged(task);
           processedExternalMessage = false; // This message is posted internally.
           break;
         case MSG_RELEASE:
@@ -711,7 +711,7 @@ public final class DownloadManager {
           throw new IllegalStateException();
       }
       mainHandler
-          .obtainMessage(MSG_PROCESSED, processedExternalMessage ? 1 : 0, downloadThreads.size())
+          .obtainMessage(MSG_PROCESSED, processedExternalMessage ? 1 : 0, activeTasks.size())
           .sendToTarget();
     }
 
@@ -832,18 +832,17 @@ public final class DownloadManager {
       }
     }
 
-    private void onDownloadThreadStopped(DownloadThread downloadThread) {
-      logd("Download is stopped", downloadThread.request);
-      String downloadId = downloadThread.request.id;
-      downloadThreads.remove(downloadId);
+    private void onTaskStopped(Task task) {
+      logd("Task is stopped", task.request);
+      String downloadId = task.request.id;
+      activeTasks.remove(downloadId);
       boolean tryToStartDownloads = false;
-      if (!downloadThread.isRemove) {
+      if (!task.isRemove) {
         // If maxParallelDownloads was hit, there might be a download waiting for a slot.
         tryToStartDownloads = parallelDownloads == maxParallelDownloads;
         parallelDownloads--;
       }
-      getDownload(downloadId)
-          .onDownloadThreadStopped(downloadThread.isCanceled, downloadThread.finalError);
+      getDownload(downloadId).onTaskStopped(task.isCanceled, task.finalError);
       if (tryToStartDownloads) {
         for (int i = 0;
             parallelDownloads < maxParallelDownloads && i < downloadInternals.size();
@@ -853,16 +852,16 @@ public final class DownloadManager {
       }
     }
 
-    private void onDownloadThreadContentLengthChanged(DownloadThread downloadThread) {
-      String downloadId = downloadThread.request.id;
-      getDownload(downloadId).setContentLength(downloadThread.contentLength);
+    private void onContentLengthChanged(Task task) {
+      String downloadId = task.request.id;
+      getDownload(downloadId).setContentLength(task.contentLength);
     }
 
     private void release() {
-      for (DownloadThread downloadThread : downloadThreads.values()) {
-        downloadThread.cancel(/* released= */ true);
+      for (Task task : activeTasks.values()) {
+        task.cancel(/* released= */ true);
       }
-      downloadThreads.clear();
+      activeTasks.clear();
       downloadInternals.clear();
       thread.quit();
       synchronized (this) {
@@ -871,7 +870,7 @@ public final class DownloadManager {
       }
     }
 
-    private void onDownloadChangedInternal(DownloadInternal downloadInternal, Download download) {
+    private void onDownloadChanged(DownloadInternal downloadInternal, Download download) {
       logd("Download state is changed", downloadInternal);
       try {
         downloadIndex.putDownload(download);
@@ -884,7 +883,7 @@ public final class DownloadManager {
       mainHandler.obtainMessage(MSG_DOWNLOAD_CHANGED, download).sendToTarget();
     }
 
-    private void onDownloadRemovedInternal(DownloadInternal downloadInternal, Download download) {
+    private void onDownloadRemoved(DownloadInternal downloadInternal, Download download) {
       logd("Download is removed", downloadInternal);
       try {
         downloadIndex.removeDownload(download.request.id);
@@ -896,11 +895,11 @@ public final class DownloadManager {
     }
 
     @StartThreadResults
-    private int startDownloadThread(DownloadInternal downloadInternal) {
+    private int startTask(DownloadInternal downloadInternal) {
       DownloadRequest request = downloadInternal.download.request;
       String downloadId = request.id;
-      if (downloadThreads.containsKey(downloadId)) {
-        if (stopDownloadThreadInternal(downloadId)) {
+      if (activeTasks.containsKey(downloadId)) {
+        if (stopDownloadTask(downloadId)) {
           return START_THREAD_WAIT_DOWNLOAD_CANCELLATION;
         }
         return START_THREAD_WAIT_REMOVAL_TO_FINISH;
@@ -914,19 +913,25 @@ public final class DownloadManager {
       }
       Downloader downloader = downloaderFactory.createDownloader(request);
       DownloadProgress downloadProgress = downloadInternal.download.progress;
-      DownloadThread downloadThread =
-          new DownloadThread(request, downloader, downloadProgress, isRemove, minRetryCount, this);
-      downloadThreads.put(downloadId, downloadThread);
-      downloadThread.start();
-      logd("Download is started", downloadInternal);
+      Task task =
+          new Task(
+              request,
+              downloader,
+              downloadProgress,
+              isRemove,
+              minRetryCount,
+              /* internalHandler= */ this);
+      activeTasks.put(downloadId, task);
+      task.start();
+      logd("Task is started", downloadInternal);
       return START_THREAD_SUCCEEDED;
     }
 
-    private boolean stopDownloadThreadInternal(String downloadId) {
-      DownloadThread downloadThread = downloadThreads.get(downloadId);
-      if (downloadThread != null && !downloadThread.isRemove) {
-        downloadThread.cancel(/* released= */ false);
-        logd("Download is cancelled", downloadThread.request);
+    private boolean stopDownloadTask(String downloadId) {
+      Task task = activeTasks.get(downloadId);
+      if (task != null && !task.isRemove) {
+        task.cancel(/* released= */ false);
+        logd("Task is cancelled", task.request);
         return true;
       }
       return false;
@@ -1025,7 +1030,7 @@ public final class DownloadManager {
       if (state == STATE_QUEUED || state == STATE_DOWNLOADING) {
         startOrQueue();
       } else if (isInRemoveState()) {
-        internalHandler.startDownloadThread(this);
+        internalHandler.startTask(this);
       }
     }
 
@@ -1043,7 +1048,7 @@ public final class DownloadManager {
         return;
       }
       this.contentLength = contentLength;
-      internalHandler.onDownloadChangedInternal(this, getUpdatedDownload());
+      internalHandler.onDownloadChanged(this, getUpdatedDownload());
     }
 
     private void updateStopState() {
@@ -1054,12 +1059,12 @@ public final class DownloadManager {
         }
       } else {
         if (state == STATE_DOWNLOADING || state == STATE_QUEUED) {
-          internalHandler.stopDownloadThreadInternal(download.request.id);
+          internalHandler.stopDownloadTask(download.request.id);
           setState(STATE_STOPPED);
         }
       }
       if (oldDownload == download) {
-        internalHandler.onDownloadChangedInternal(this, getUpdatedDownload());
+        internalHandler.onDownloadChanged(this, getUpdatedDownload());
       }
     }
 
@@ -1068,14 +1073,14 @@ public final class DownloadManager {
       // state immediately.
       state = initialState;
       if (isInRemoveState()) {
-        internalHandler.startDownloadThread(this);
+        internalHandler.startTask(this);
       } else if (canStart()) {
         startOrQueue();
       } else {
         setState(STATE_STOPPED);
       }
       if (state == initialState) {
-        internalHandler.onDownloadChangedInternal(this, getUpdatedDownload());
+        internalHandler.onDownloadChanged(this, getUpdatedDownload());
       }
     }
 
@@ -1085,7 +1090,7 @@ public final class DownloadManager {
 
     private void startOrQueue() {
       Assertions.checkState(!isInRemoveState());
-      @StartThreadResults int result = internalHandler.startDownloadThread(this);
+      @StartThreadResults int result = internalHandler.startTask(this);
       Assertions.checkState(result != START_THREAD_WAIT_REMOVAL_TO_FINISH);
       if (result == START_THREAD_SUCCEEDED || result == START_THREAD_WAIT_DOWNLOAD_CANCELLATION) {
         setState(STATE_DOWNLOADING);
@@ -1097,18 +1102,18 @@ public final class DownloadManager {
     private void setState(@Download.State int newState) {
       if (state != newState) {
         state = newState;
-        internalHandler.onDownloadChangedInternal(this, getUpdatedDownload());
+        internalHandler.onDownloadChanged(this, getUpdatedDownload());
       }
     }
 
-    private void onDownloadThreadStopped(boolean isCanceled, @Nullable Throwable error) {
+    private void onTaskStopped(boolean isCanceled, @Nullable Throwable error) {
       if (isIdle()) {
         return;
       }
       if (isCanceled) {
-        internalHandler.startDownloadThread(this);
+        internalHandler.startTask(this);
       } else if (state == STATE_REMOVING) {
-        internalHandler.onDownloadRemovedInternal(this, getUpdatedDownload());
+        internalHandler.onDownloadRemoved(this, getUpdatedDownload());
       } else if (state == STATE_RESTARTING) {
         initialize(STATE_QUEUED);
       } else { // STATE_DOWNLOADING
@@ -1123,7 +1128,7 @@ public final class DownloadManager {
     }
   }
 
-  private static class DownloadThread extends Thread implements Downloader.ProgressListener {
+  private static class Task extends Thread implements Downloader.ProgressListener {
 
     private final DownloadRequest request;
     private final Downloader downloader;
@@ -1137,7 +1142,7 @@ public final class DownloadManager {
 
     private long contentLength;
 
-    private DownloadThread(
+    private Task(
         DownloadRequest request,
         Downloader downloader,
         DownloadProgress downloadProgress,
@@ -1203,7 +1208,7 @@ public final class DownloadManager {
       }
       Handler internalHandler = this.internalHandler;
       if (internalHandler != null) {
-        internalHandler.obtainMessage(MSG_DOWNLOAD_THREAD_STOPPED, this).sendToTarget();
+        internalHandler.obtainMessage(MSG_TASK_STOPPED, this).sendToTarget();
       }
     }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadBuilder.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadBuilder.java
index f901b00f53..e07166a21c 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadBuilder.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadBuilder.java
@@ -40,7 +40,7 @@ import java.util.List;
   @Nullable private String cacheKey;
   private byte[] customMetadata;
 
-  private int state;
+  @Download.State private int state;
   private long startTimeMs;
   private long updateTimeMs;
   private long contentLength;
@@ -111,7 +111,7 @@ import java.util.List;
     return this;
   }
 
-  public DownloadBuilder setState(int state) {
+  public DownloadBuilder setState(@Download.State int state) {
     this.state = state;
     return this;
   }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index 5798e9df8c..92c6debdd8 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -359,7 +359,7 @@ public class DownloadManagerTest {
   }
 
   @Test
-  public void stopAndResume() throws Throwable {
+  public void pauseAndResume() throws Throwable {
     DownloadRunner runner1 = new DownloadRunner(uri1);
     DownloadRunner runner2 = new DownloadRunner(uri2);
     DownloadRunner runner3 = new DownloadRunner(uri3);
@@ -370,10 +370,12 @@ public class DownloadManagerTest {
 
     runOnMainThread(() -> downloadManager.pauseDownloads());
 
+    // TODO: This should be assertQueued. Fix implementation and update test.
     runner1.getTask().assertStopped();
 
     // remove requests aren't stopped.
     runner2.getDownloader(1).unblock().assertReleased();
+    // TODO: This should be assertQueued. Fix implementation and update test.
     runner2.getTask().assertStopped();
     // Although remove2 is finished, download2 doesn't start.
     runner2.getDownloader(2).assertDoesNotStart();

From 4a5b8e17de84d9ae34af3f0964147f9a2bffcd49 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 30 Apr 2019 12:25:04 +0100
Subject: [PATCH 820/832] DownloadManager improvements

- Do requirements TODO
- Add useful helper method to retrieve not met requirements
- Fix WritableDownloadIndex Javadoc

PiperOrigin-RevId: 245922903
---
 .../exoplayer2/offline/DownloadManager.java   | 25 +++++++++++++-----
 .../offline/WritableDownloadIndex.java        | 26 +++++++++----------
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 7ad22e000a..8502a56ea7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -173,6 +173,7 @@ public final class DownloadManager {
   private boolean downloadsPaused;
   private int maxParallelDownloads;
   private int minRetryCount;
+  private int notMetRequirements;
   private RequirementsWatcher requirementsWatcher;
 
   /**
@@ -212,7 +213,7 @@ public final class DownloadManager {
     requirementsListener = this::onRequirementsStateChanged;
     requirementsWatcher =
         new RequirementsWatcher(context, requirementsListener, DEFAULT_REQUIREMENTS);
-    int notMetRequirements = requirementsWatcher.start();
+    notMetRequirements = requirementsWatcher.start();
 
     mainHandler = new Handler(Util.getLooper(), this::handleMainMessage);
     HandlerThread internalThread = new HandlerThread("DownloadManager file i/o");
@@ -274,11 +275,21 @@ public final class DownloadManager {
     listeners.remove(listener);
   }
 
-  /** Returns the requirements needed to be met to start downloads. */
+  /** Returns the requirements needed to be met to progress. */
   public Requirements getRequirements() {
     return requirementsWatcher.getRequirements();
   }
 
+  /**
+   * Returns the requirements needed for downloads to progress that are not currently met.
+   *
+   * @return The not met {@link Requirements.RequirementFlags}, or 0 if all requirements are met.
+   */
+  @Requirements.RequirementFlags
+  public int getNotMetRequirements() {
+    return getRequirements().getNotMetRequirements(context);
+  }
+
   /**
    * Sets the requirements that need to be met for downloads to progress.
    *
@@ -413,7 +424,7 @@ public final class DownloadManager {
    * @param request The download request.
    */
   public void addDownload(DownloadRequest request) {
-    addDownload(request, Download.STOP_REASON_NONE);
+    addDownload(request, STOP_REASON_NONE);
   }
 
   /**
@@ -478,6 +489,10 @@ public final class DownloadManager {
     for (Listener listener : listeners) {
       listener.onRequirementsStateChanged(this, requirements, notMetRequirements);
     }
+    if (this.notMetRequirements == notMetRequirements) {
+      return;
+    }
+    this.notMetRequirements = notMetRequirements;
     pendingMessages++;
     internalHandler
         .obtainMessage(MSG_SET_NOT_MET_REQUIREMENTS, notMetRequirements, /* unused */ 0)
@@ -747,10 +762,6 @@ public final class DownloadManager {
     }
 
     private void setNotMetRequirements(@Requirements.RequirementFlags int notMetRequirements) {
-      // TODO: Move this deduplication check to the main thread.
-      if (this.notMetRequirements == notMetRequirements) {
-        return;
-      }
       this.notMetRequirements = notMetRequirements;
       logdFlags("Not met requirements are changed", notMetRequirements);
       for (int i = 0; i < downloadInternals.size(); i++) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/WritableDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/WritableDownloadIndex.java
index 2306363cf5..00b08dc76a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/WritableDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/WritableDownloadIndex.java
@@ -17,43 +17,43 @@ package com.google.android.exoplayer2.offline;
 
 import java.io.IOException;
 
-/** An writable index of {@link Download Downloads}. */
+/** A writable index of {@link Download Downloads}. */
 public interface WritableDownloadIndex extends DownloadIndex {
 
   /**
    * Adds or replaces a {@link Download}.
    *
    * @param download The {@link Download} to be added.
-   * @throws throws IOException If an error occurs setting the state.
+   * @throws IOException If an error occurs setting the state.
    */
   void putDownload(Download download) throws IOException;
 
   /**
-   * Removes the {@link Download} with the given {@code id}.
+   * Removes the download with the given ID. Does nothing if a download with the given ID does not
+   * exist.
    *
-   * @param id ID of a {@link Download}.
-   * @throws throws IOException If an error occurs removing the state.
+   * @param id The ID of the download to remove.
+   * @throws IOException If an error occurs removing the state.
    */
   void removeDownload(String id) throws IOException;
+
   /**
    * Sets the stop reason of the downloads in a terminal state ({@link Download#STATE_COMPLETED},
    * {@link Download#STATE_FAILED}).
    *
    * @param stopReason The stop reason.
-   * @throws throws IOException If an error occurs updating the state.
+   * @throws IOException If an error occurs updating the state.
    */
   void setStopReason(int stopReason) throws IOException;
 
   /**
-   * Sets the stop reason of the download with the given {@code id} in a terminal state ({@link
-   * Download#STATE_COMPLETED}, {@link Download#STATE_FAILED}).
+   * Sets the stop reason of the download with the given ID in a terminal state ({@link
+   * Download#STATE_COMPLETED}, {@link Download#STATE_FAILED}). Does nothing if a download with the
+   * given ID does not exist, or if it's not in a terminal state.
    *
-   * <p>If there's no {@link Download} with the given {@code id} or it isn't in a terminal state,
-   * then nothing happens.
-   *
-   * @param id ID of a {@link Download}.
+   * @param id The ID of the download to update.
    * @param stopReason The stop reason.
-   * @throws throws IOException If an error occurs updating the state.
+   * @throws IOException If an error occurs updating the state.
    */
   void setStopReason(String id, int stopReason) throws IOException;
 }

From 6c1065c6d25d682521d8bcdf0728f5712d5a3ab2 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Tue, 30 Apr 2019 12:26:39 +0100
Subject: [PATCH 821/832] Prevent index out of bounds exceptions in some live
 HLS scenarios

Can happen if the load position falls behind in every playlist and
when we try to load the next segment, the adaptive selection logic
decides to change variant.

Issue:#5816
PiperOrigin-RevId: 245923006
---
 RELEASENOTES.md                                      |  2 ++
 .../exoplayer2/source/hls/HlsChunkSource.java        | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index aac46647cc..9e69bcc917 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -103,6 +103,8 @@
     ([#5441](https://github.com/google/ExoPlayer/issues/5441)).
   * Parse `EXT-X-MEDIA` `CHARACTERISTICS` attribute into `Format.roleFlags`.
   * Add metadata entry for HLS tracks to expose master playlist information.
+  * Prevent `IndexOutOfBoundsException` in some live HLS scenarios
+    ([#5816](https://github.com/google/ExoPlayer/issues/5816)).
 * Support for playing spherical videos on Daydream.
 * Cast extension: Work around Cast framework returning a limited-size queue
   items list ([#4964](https://github.com/google/ExoPlayer/issues/4964)).
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
index 92756f19cf..261c9b531c 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
@@ -278,8 +278,7 @@ import java.util.Map;
     long chunkMediaSequence =
         getChunkMediaSequence(
             previous, switchingTrack, mediaPlaylist, startOfPlaylistInPeriodUs, loadPositionUs);
-    if (chunkMediaSequence < mediaPlaylist.mediaSequence) {
-      if (previous != null && switchingTrack) {
+    if (chunkMediaSequence < mediaPlaylist.mediaSequence && previous != null && switchingTrack) {
         // We try getting the next chunk without adapting in case that's the reason for falling
         // behind the live window.
         selectedTrackIndex = oldTrackIndex;
@@ -289,10 +288,11 @@ import java.util.Map;
         startOfPlaylistInPeriodUs =
             mediaPlaylist.startTimeUs - playlistTracker.getInitialStartTimeUs();
         chunkMediaSequence = previous.getNextChunkIndex();
-      } else {
-        fatalError = new BehindLiveWindowException();
-        return;
-      }
+    }
+
+    if (chunkMediaSequence < mediaPlaylist.mediaSequence) {
+      fatalError = new BehindLiveWindowException();
+      return;
     }
 
     int segmentIndexInPlaylist = (int) (chunkMediaSequence - mediaPlaylist.mediaSequence);

From d215b81167f1b8768a2fb24ada4cfd72b2837bd1 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 1 May 2019 19:19:02 +0100
Subject: [PATCH 822/832] Rework DownloadManager to fix remaining TODOs

- Removed DownloadInternal and its sometimes-out-of-sync
  duplicate state
- Fixed downloads being in STOPPED rather than QUEUED state
  when the manager is paused
- Fixed setMaxParallelDownloads to start/stop downloads if
  necessary when the value changes
- Fixed isWaitingForRequirements

PiperOrigin-RevId: 246164845
---
 .../offline/ActionFileUpgradeUtil.java        |   9 +-
 .../offline/DefaultDownloadIndex.java         |  24 +-
 .../exoplayer2/offline/DownloadManager.java   | 836 +++++++++---------
 .../offline/WritableDownloadIndex.java        |   7 +
 .../offline/ActionFileUpgradeUtilTest.java    |  14 +-
 .../offline/DownloadManagerTest.java          |  54 +-
 6 files changed, 473 insertions(+), 471 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java
index 975fc10b93..baf47772ab 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java
@@ -67,11 +67,12 @@ public final class ActionFileUpgradeUtil {
     if (actionFile.exists()) {
       boolean success = false;
       try {
+        long nowMs = System.currentTimeMillis();
         for (DownloadRequest request : actionFile.load()) {
           if (downloadIdProvider != null) {
             request = request.copyWithId(downloadIdProvider.getId(request));
           }
-          mergeRequest(request, downloadIndex, addNewDownloadsAsCompleted);
+          mergeRequest(request, downloadIndex, addNewDownloadsAsCompleted, nowMs);
         }
         success = true;
       } finally {
@@ -93,13 +94,13 @@ public final class ActionFileUpgradeUtil {
   /* package */ static void mergeRequest(
       DownloadRequest request,
       DefaultDownloadIndex downloadIndex,
-      boolean addNewDownloadAsCompleted)
+      boolean addNewDownloadAsCompleted,
+      long nowMs)
       throws IOException {
     Download download = downloadIndex.getDownload(request.id);
     if (download != null) {
-      download = DownloadManager.mergeRequest(download, request, download.stopReason);
+      download = DownloadManager.mergeRequest(download, request, download.stopReason, nowMs);
     } else {
-      long nowMs = System.currentTimeMillis();
       download =
           new Download(
               request,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
index 252c058b88..06f308d1e9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
@@ -69,7 +69,9 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
   private static final int COLUMN_INDEX_BYTES_DOWNLOADED = 13;
 
   private static final String WHERE_ID_EQUALS = COLUMN_ID + " = ?";
-  private static final String WHERE_STATE_TERMINAL =
+  private static final String WHERE_STATE_IS_DOWNLOADING =
+      COLUMN_STATE + " = " + Download.STATE_DOWNLOADING;
+  private static final String WHERE_STATE_IS_TERMINAL =
       getStateQuery(Download.STATE_COMPLETED, Download.STATE_FAILED);
 
   private static final String[] COLUMNS =
@@ -218,6 +220,19 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
     }
   }
 
+  @Override
+  public void setDownloadingStatesToQueued() throws DatabaseIOException {
+    ensureInitialized();
+    try {
+      ContentValues values = new ContentValues();
+      values.put(COLUMN_STATE, Download.STATE_QUEUED);
+      SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
+      writableDatabase.update(tableName, values, WHERE_STATE_IS_DOWNLOADING, /* whereArgs= */ null);
+    } catch (SQLException e) {
+      throw new DatabaseIOException(e);
+    }
+  }
+
   @Override
   public void setStopReason(int stopReason) throws DatabaseIOException {
     ensureInitialized();
@@ -225,7 +240,7 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
       ContentValues values = new ContentValues();
       values.put(COLUMN_STOP_REASON, stopReason);
       SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
-      writableDatabase.update(tableName, values, WHERE_STATE_TERMINAL, /* whereArgs= */ null);
+      writableDatabase.update(tableName, values, WHERE_STATE_IS_TERMINAL, /* whereArgs= */ null);
     } catch (SQLException e) {
       throw new DatabaseIOException(e);
     }
@@ -239,7 +254,10 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
       values.put(COLUMN_STOP_REASON, stopReason);
       SQLiteDatabase writableDatabase = databaseProvider.getWritableDatabase();
       writableDatabase.update(
-          tableName, values, WHERE_STATE_TERMINAL + " AND " + WHERE_ID_EQUALS, new String[] {id});
+          tableName,
+          values,
+          WHERE_STATE_IS_TERMINAL + " AND " + WHERE_ID_EQUALS,
+          new String[] {id});
     } catch (SQLException e) {
       throw new DatabaseIOException(e);
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 8502a56ea7..b528d91759 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -31,7 +31,6 @@ import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
 import android.os.Message;
-import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.database.DatabaseProvider;
@@ -46,14 +45,11 @@ import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArraySet;
-import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 /**
  * Manages downloads.
@@ -125,8 +121,7 @@ public final class DownloadManager {
   // Messages posted to the main handler.
   private static final int MSG_INITIALIZED = 0;
   private static final int MSG_PROCESSED = 1;
-  private static final int MSG_DOWNLOAD_CHANGED = 2;
-  private static final int MSG_DOWNLOAD_REMOVED = 3;
+  private static final int MSG_DOWNLOAD_UPDATE = 2;
 
   // Messages posted to the background handler.
   private static final int MSG_INITIALIZE = 0;
@@ -141,31 +136,14 @@ public final class DownloadManager {
   private static final int MSG_CONTENT_LENGTH_CHANGED = 9;
   private static final int MSG_RELEASE = 10;
 
-  @Retention(RetentionPolicy.SOURCE)
-  @IntDef({
-    START_THREAD_SUCCEEDED,
-    START_THREAD_WAIT_REMOVAL_TO_FINISH,
-    START_THREAD_WAIT_DOWNLOAD_CANCELLATION,
-    START_THREAD_TOO_MANY_DOWNLOADS
-  })
-  private @interface StartThreadResults {}
-
-  private static final int START_THREAD_SUCCEEDED = 0;
-  private static final int START_THREAD_WAIT_REMOVAL_TO_FINISH = 1;
-  private static final int START_THREAD_WAIT_DOWNLOAD_CANCELLATION = 2;
-  private static final int START_THREAD_TOO_MANY_DOWNLOADS = 3;
-
   private static final String TAG = "DownloadManager";
-  private static final boolean DEBUG = false;
 
   private final Context context;
   private final WritableDownloadIndex downloadIndex;
   private final Handler mainHandler;
   private final InternalHandler internalHandler;
   private final RequirementsWatcher.Listener requirementsListener;
-
   private final CopyOnWriteArraySet<Listener> listeners;
-  private final ArrayList<Download> downloads;
 
   private int pendingMessages;
   private int activeTaskCount;
@@ -174,6 +152,7 @@ public final class DownloadManager {
   private int maxParallelDownloads;
   private int minRetryCount;
   private int notMetRequirements;
+  private List<Download> downloads;
   private RequirementsWatcher requirementsWatcher;
 
   /**
@@ -205,11 +184,13 @@ public final class DownloadManager {
       Context context, WritableDownloadIndex downloadIndex, DownloaderFactory downloaderFactory) {
     this.context = context.getApplicationContext();
     this.downloadIndex = downloadIndex;
+
     maxParallelDownloads = DEFAULT_MAX_PARALLEL_DOWNLOADS;
     minRetryCount = DEFAULT_MIN_RETRY_COUNT;
     downloadsPaused = true;
-    downloads = new ArrayList<>();
+    downloads = Collections.emptyList();
     listeners = new CopyOnWriteArraySet<>();
+
     requirementsListener = this::onRequirementsStateChanged;
     requirementsWatcher =
         new RequirementsWatcher(context, requirementsListener, DEFAULT_REQUIREMENTS);
@@ -253,8 +234,14 @@ public final class DownloadManager {
    * reason that the {@link #getRequirements() Requirements} are not met.
    */
   public boolean isWaitingForRequirements() {
-    // TODO: Fix this to return the right thing.
-    return !downloads.isEmpty();
+    if (!downloadsPaused && notMetRequirements != 0) {
+      for (int i = 0; i < downloads.size(); i++) {
+        if (downloads.get(i).state == STATE_QUEUED) {
+          return true;
+        }
+      }
+    }
+    return false;
   }
 
   /**
@@ -362,7 +349,7 @@ public final class DownloadManager {
    * #getDownloadIndex()} instead.
    */
   public List<Download> getCurrentDownloads() {
-    return Collections.unmodifiableList(new ArrayList<>(downloads));
+    return downloads;
   }
 
   /** Returns whether downloads are currently paused. */
@@ -475,10 +462,10 @@ public final class DownloadManager {
       }
       mainHandler.removeCallbacksAndMessages(/* token= */ null);
       // Reset state.
+      downloads = Collections.emptyList();
       pendingMessages = 0;
       activeTaskCount = 0;
       initialized = false;
-      downloads.clear();
     }
   }
 
@@ -508,13 +495,9 @@ public final class DownloadManager {
         List<Download> downloads = (List<Download>) message.obj;
         onInitialized(downloads);
         break;
-      case MSG_DOWNLOAD_CHANGED:
-        Download state = (Download) message.obj;
-        onDownloadChanged(state);
-        break;
-      case MSG_DOWNLOAD_REMOVED:
-        state = (Download) message.obj;
-        onDownloadRemoved(state);
+      case MSG_DOWNLOAD_UPDATE:
+        DownloadUpdate update = (DownloadUpdate) message.obj;
+        onDownloadUpdate(update);
         break;
       case MSG_PROCESSED:
         int processedMessageCount = message.arg1;
@@ -529,32 +512,23 @@ public final class DownloadManager {
 
   private void onInitialized(List<Download> downloads) {
     initialized = true;
-    this.downloads.addAll(downloads);
+    this.downloads = Collections.unmodifiableList(downloads);
     for (Listener listener : listeners) {
       listener.onInitialized(DownloadManager.this);
     }
   }
 
-  private void onDownloadChanged(Download download) {
-    int downloadIndex = getDownloadIndex(download.request.id);
-    if (download.isTerminalState()) {
-      if (downloadIndex != C.INDEX_UNSET) {
-        downloads.remove(downloadIndex);
+  private void onDownloadUpdate(DownloadUpdate update) {
+    downloads = Collections.unmodifiableList(update.downloads);
+    Download updatedDownload = update.download;
+    if (update.isRemove) {
+      for (Listener listener : listeners) {
+        listener.onDownloadRemoved(this, updatedDownload);
       }
-    } else if (downloadIndex != C.INDEX_UNSET) {
-      downloads.set(downloadIndex, download);
     } else {
-      downloads.add(download);
-    }
-    for (Listener listener : listeners) {
-      listener.onDownloadChanged(this, download);
-    }
-  }
-
-  private void onDownloadRemoved(Download download) {
-    downloads.remove(getDownloadIndex(download.request.id));
-    for (Listener listener : listeners) {
-      listener.onDownloadRemoved(this, download);
+      for (Listener listener : listeners) {
+        listener.onDownloadChanged(this, updatedDownload);
+      }
     }
   }
 
@@ -568,18 +542,14 @@ public final class DownloadManager {
     }
   }
 
-  private int getDownloadIndex(String id) {
-    for (int i = 0; i < downloads.size(); i++) {
-      if (downloads.get(i).request.id.equals(id)) {
-        return i;
-      }
-    }
-    return C.INDEX_UNSET;
-  }
-
   /* package */ static Download mergeRequest(
-      Download download, DownloadRequest request, int stopReason) {
+      Download download, DownloadRequest request, int stopReason, long nowMs) {
     @Download.State int state = download.state;
+    // Treat the merge as creating a new download if we're currently removing the existing one, or
+    // if the existing download is in a terminal state. Else treat the merge as updating the
+    // existing download.
+    long startTimeMs =
+        state == STATE_REMOVING || download.isTerminalState() ? nowMs : download.startTimeMs;
     if (state == STATE_REMOVING || state == STATE_RESTARTING) {
       state = STATE_RESTARTING;
     } else if (stopReason != STOP_REASON_NONE) {
@@ -587,8 +557,6 @@ public final class DownloadManager {
     } else {
       state = STATE_QUEUED;
     }
-    long nowMs = System.currentTimeMillis();
-    long startTimeMs = download.isTerminalState() ? nowMs : download.startTimeMs;
     return new Download(
         download.request.copyWithMergedRequest(request),
         state,
@@ -599,40 +567,6 @@ public final class DownloadManager {
         FAILURE_REASON_NONE);
   }
 
-  private static Download copyWithState(Download download, @Download.State int state) {
-    return new Download(
-        download.request,
-        state,
-        download.startTimeMs,
-        /* updateTimeMs= */ System.currentTimeMillis(),
-        download.contentLength,
-        download.stopReason,
-        FAILURE_REASON_NONE,
-        download.progress);
-  }
-
-  private static void logd(String message) {
-    if (DEBUG) {
-      Log.d(TAG, message);
-    }
-  }
-
-  private static void logd(String message, DownloadInternal downloadInternal) {
-    logd(message, downloadInternal.download.request);
-  }
-
-  private static void logd(String message, DownloadRequest request) {
-    if (DEBUG) {
-      logd(message + ": " + request);
-    }
-  }
-
-  private static void logdFlags(String message, int flags) {
-    if (DEBUG) {
-      logd(message + ": " + Integer.toBinaryString(flags));
-    }
-  }
-
   private static final class InternalHandler extends Handler {
 
     public boolean released;
@@ -641,15 +575,14 @@ public final class DownloadManager {
     private final WritableDownloadIndex downloadIndex;
     private final DownloaderFactory downloaderFactory;
     private final Handler mainHandler;
-    private final ArrayList<DownloadInternal> downloadInternals;
+    private final ArrayList<Download> downloads;
     private final HashMap<String, Task> activeTasks;
 
-    // Mutable fields that are accessed on the internal thread.
     @Requirements.RequirementFlags private int notMetRequirements;
     private boolean downloadsPaused;
     private int maxParallelDownloads;
     private int minRetryCount;
-    private int parallelDownloads;
+    private int activeDownloadTaskCount;
 
     public InternalHandler(
         HandlerThread thread,
@@ -667,7 +600,7 @@ public final class DownloadManager {
       this.maxParallelDownloads = maxParallelDownloads;
       this.minRetryCount = minRetryCount;
       this.downloadsPaused = downloadsPaused;
-      downloadInternals = new ArrayList<>();
+      downloads = new ArrayList<>();
       activeTasks = new HashMap<>();
     }
 
@@ -732,70 +665,91 @@ public final class DownloadManager {
 
     private void initialize(int notMetRequirements) {
       this.notMetRequirements = notMetRequirements;
-      ArrayList<Download> loadedStates = new ArrayList<>();
-      try (DownloadCursor cursor =
-          downloadIndex.getDownloads(
-              STATE_QUEUED, STATE_STOPPED, STATE_DOWNLOADING, STATE_REMOVING, STATE_RESTARTING)) {
+      DownloadCursor cursor = null;
+      try {
+        downloadIndex.setDownloadingStatesToQueued();
+        cursor =
+            downloadIndex.getDownloads(
+                STATE_QUEUED, STATE_STOPPED, STATE_DOWNLOADING, STATE_REMOVING, STATE_RESTARTING);
         while (cursor.moveToNext()) {
-          loadedStates.add(cursor.getDownload());
+          downloads.add(cursor.getDownload());
         }
-        logd("Downloads are loaded.");
-      } catch (Throwable e) {
-        Log.e(TAG, "Download state loading failed.", e);
-        loadedStates.clear();
-      }
-      for (Download download : loadedStates) {
-        addDownloadForState(download);
-      }
-      logd("Downloads are created.");
-      mainHandler.obtainMessage(MSG_INITIALIZED, loadedStates).sendToTarget();
-      for (int i = 0; i < downloadInternals.size(); i++) {
-        downloadInternals.get(i).start();
+      } catch (IOException e) {
+        Log.e(TAG, "Failed to load index.", e);
+        downloads.clear();
+      } finally {
+        Util.closeQuietly(cursor);
       }
+      // A copy must be used for the message to ensure that subsequent changes to the downloads list
+      // are not visible to the main thread when it processes the message.
+      ArrayList<Download> downloadsForMessage = new ArrayList<>(downloads);
+      mainHandler.obtainMessage(MSG_INITIALIZED, downloadsForMessage).sendToTarget();
+      syncTasks();
     }
 
     private void setDownloadsPaused(boolean downloadsPaused) {
       this.downloadsPaused = downloadsPaused;
-      for (int i = 0; i < downloadInternals.size(); i++) {
-        downloadInternals.get(i).updateStopState();
-      }
+      syncTasks();
     }
 
     private void setNotMetRequirements(@Requirements.RequirementFlags int notMetRequirements) {
       this.notMetRequirements = notMetRequirements;
-      logdFlags("Not met requirements are changed", notMetRequirements);
-      for (int i = 0; i < downloadInternals.size(); i++) {
-        downloadInternals.get(i).updateStopState();
-      }
+      syncTasks();
     }
 
     private void setStopReason(@Nullable String id, int stopReason) {
-      if (id != null) {
-        DownloadInternal downloadInternal = getDownload(id);
-        if (downloadInternal != null) {
-          logd("download stop reason is set to : " + stopReason, downloadInternal);
-          downloadInternal.setStopReason(stopReason);
-          return;
+      if (id == null) {
+        for (int i = 0; i < downloads.size(); i++) {
+          setStopReason(downloads.get(i), stopReason);
+        }
+        try {
+          // Set the stop reason for downloads in terminal states as well.
+          downloadIndex.setStopReason(stopReason);
+        } catch (IOException e) {
+          Log.e(TAG, "Failed to set manual stop reason", e);
         }
       } else {
-        for (int i = 0; i < downloadInternals.size(); i++) {
-          downloadInternals.get(i).setStopReason(stopReason);
+        Download download = getDownload(id, /* loadFromIndex= */ false);
+        if (download != null) {
+          setStopReason(download, stopReason);
+        } else {
+          try {
+            // Set the stop reason if the download is in a terminal state.
+            downloadIndex.setStopReason(id, stopReason);
+          } catch (IOException e) {
+            Log.e(TAG, "Failed to set manual stop reason: " + id, e);
+          }
         }
       }
-      try {
-        if (id != null) {
-          downloadIndex.setStopReason(id, stopReason);
-        } else {
-          downloadIndex.setStopReason(stopReason);
+      syncTasks();
+    }
+
+    private void setStopReason(Download download, int stopReason) {
+      if (stopReason == STOP_REASON_NONE) {
+        if (download.state == STATE_STOPPED) {
+          putDownloadWithState(download, STATE_QUEUED);
         }
-      } catch (IOException e) {
-        Log.e(TAG, "setStopReason failed", e);
+      } else if (stopReason != download.stopReason) {
+        @Download.State int state = download.state;
+        if (state == STATE_QUEUED || state == STATE_DOWNLOADING) {
+          state = STATE_STOPPED;
+        }
+        putDownload(
+            new Download(
+                download.request,
+                state,
+                download.startTimeMs,
+                /* updateTimeMs= */ System.currentTimeMillis(),
+                download.contentLength,
+                stopReason,
+                FAILURE_REASON_NONE,
+                download.progress));
       }
     }
 
     private void setMaxParallelDownloads(int maxParallelDownloads) {
       this.maxParallelDownloads = maxParallelDownloads;
-      // TODO: Start or stop downloads if necessary.
+      syncTasks();
     }
 
     private void setMinRetryCount(int minRetryCount) {
@@ -803,77 +757,44 @@ public final class DownloadManager {
     }
 
     private void addDownload(DownloadRequest request, int stopReason) {
-      DownloadInternal downloadInternal = getDownload(request.id);
-      if (downloadInternal != null) {
-        downloadInternal.addRequest(request, stopReason);
-        logd("Request is added to existing download", downloadInternal);
+      Download download = getDownload(request.id, /* loadFromIndex= */ true);
+      long nowMs = System.currentTimeMillis();
+      if (download != null) {
+        putDownload(mergeRequest(download, request, stopReason, nowMs));
       } else {
-        Download download = loadDownload(request.id);
-        if (download == null) {
-          long nowMs = System.currentTimeMillis();
-          download =
-              new Download(
-                  request,
-                  stopReason != Download.STOP_REASON_NONE ? STATE_STOPPED : STATE_QUEUED,
-                  /* startTimeMs= */ nowMs,
-                  /* updateTimeMs= */ nowMs,
-                  /* contentLength= */ C.LENGTH_UNSET,
-                  stopReason,
-                  Download.FAILURE_REASON_NONE);
-          logd("Download state is created for " + request.id);
-        } else {
-          download = mergeRequest(download, request, stopReason);
-          logd("Download state is loaded for " + request.id);
-        }
-        addDownloadForState(download);
+        putDownload(
+            new Download(
+                request,
+                stopReason != STOP_REASON_NONE ? STATE_STOPPED : STATE_QUEUED,
+                /* startTimeMs= */ nowMs,
+                /* updateTimeMs= */ nowMs,
+                /* contentLength= */ C.LENGTH_UNSET,
+                stopReason,
+                FAILURE_REASON_NONE));
       }
+      syncTasks();
     }
 
     private void removeDownload(String id) {
-      DownloadInternal downloadInternal = getDownload(id);
-      if (downloadInternal != null) {
-        downloadInternal.remove();
-      } else {
-        Download download = loadDownload(id);
-        if (download != null) {
-          addDownloadForState(copyWithState(download, STATE_REMOVING));
-        } else {
-          logd("Can't remove download. No download with id: " + id);
-        }
+      Download download = getDownload(id, /* loadFromIndex= */ true);
+      if (download == null) {
+        Log.e(TAG, "Failed to remove nonexistent download: " + id);
+        return;
       }
-    }
-
-    private void onTaskStopped(Task task) {
-      logd("Task is stopped", task.request);
-      String downloadId = task.request.id;
-      activeTasks.remove(downloadId);
-      boolean tryToStartDownloads = false;
-      if (!task.isRemove) {
-        // If maxParallelDownloads was hit, there might be a download waiting for a slot.
-        tryToStartDownloads = parallelDownloads == maxParallelDownloads;
-        parallelDownloads--;
-      }
-      getDownload(downloadId).onTaskStopped(task.isCanceled, task.finalError);
-      if (tryToStartDownloads) {
-        for (int i = 0;
-            parallelDownloads < maxParallelDownloads && i < downloadInternals.size();
-            i++) {
-          downloadInternals.get(i).start();
-        }
-      }
-    }
-
-    private void onContentLengthChanged(Task task) {
-      String downloadId = task.request.id;
-      getDownload(downloadId).setContentLength(task.contentLength);
+      putDownloadWithState(download, STATE_REMOVING);
+      syncTasks();
     }
 
     private void release() {
       for (Task task : activeTasks.values()) {
         task.cancel(/* released= */ true);
       }
-      activeTasks.clear();
-      downloadInternals.clear();
+      try {
+        downloadIndex.setDownloadingStatesToQueued();
+      } catch (IOException e) {
+        Log.e(TAG, "Failed to update index.", e);
+      }
+      downloads.clear();
       thread.quit();
       synchronized (this) {
         released = true;
@@ -881,261 +802,293 @@ public final class DownloadManager {
       }
     }
 
-    private void onDownloadChanged(DownloadInternal downloadInternal, Download download) {
-      logd("Download state is changed", downloadInternal);
+    // Start and cancel tasks based on the current download and manager states.
+
+    private void syncTasks() {
+      int accumulatingDownloadTaskCount = 0;
+      for (int i = 0; i < downloads.size(); i++) {
+        Download download = downloads.get(i);
+        Task activeTask = activeTasks.get(download.request.id);
+        switch (download.state) {
+          case STATE_STOPPED:
+            syncStoppedDownload(activeTask);
+            break;
+          case STATE_QUEUED:
+            activeTask = syncQueuedDownload(activeTask, download);
+            break;
+          case STATE_DOWNLOADING:
+            activeTask = Assertions.checkNotNull(activeTask);
+            syncDownloadingDownload(activeTask, download, accumulatingDownloadTaskCount);
+            break;
+          case STATE_REMOVING:
+          case STATE_RESTARTING:
+            syncRemovingDownload(activeTask, download);
+            break;
+          case STATE_COMPLETED:
+          case STATE_FAILED:
+          default:
+            throw new IllegalStateException();
+        }
+        if (activeTask != null && !activeTask.isRemove) {
+          accumulatingDownloadTaskCount++;
+        }
+      }
+    }
+
+    private void syncStoppedDownload(@Nullable Task activeTask) {
+      if (activeTask != null) {
+        // We have a task, which must be a download task. Cancel it.
+        Assertions.checkState(!activeTask.isRemove);
+        activeTask.cancel(/* released= */ false);
+      }
+    }
+
+    private Task syncQueuedDownload(@Nullable Task activeTask, Download download) {
+      if (activeTask != null) {
+        // We have a task, which must be a download task. If the download state is queued we need to
+        // cancel it and start a new one, since a new request has been merged into the download.
+        Assertions.checkState(!activeTask.isRemove);
+        activeTask.cancel(/* released= */ false);
+        return activeTask;
+      }
+
+      if (!canDownloadsRun() || activeDownloadTaskCount >= maxParallelDownloads) {
+        return null;
+      }
+
+      // We can start a download task.
+      download = putDownloadWithState(download, STATE_DOWNLOADING);
+      Downloader downloader = downloaderFactory.createDownloader(download.request);
+      activeTask =
+          new Task(
+              download.request,
+              downloader,
+              download.progress,
+              /* isRemove= */ false,
+              minRetryCount,
+              /* internalHandler= */ this);
+      activeTasks.put(download.request.id, activeTask);
+      activeDownloadTaskCount++;
+      activeTask.start();
+      return activeTask;
+    }
+
+    private void syncDownloadingDownload(
+        Task activeTask, Download download, int accumulatingDownloadTaskCount) {
+      Assertions.checkState(!activeTask.isRemove);
+      if (!canDownloadsRun() || accumulatingDownloadTaskCount >= maxParallelDownloads) {
+        putDownloadWithState(download, STATE_QUEUED);
+        activeTask.cancel(/* released= */ false);
+      }
+    }
+
+    private void syncRemovingDownload(@Nullable Task activeTask, Download download) {
+      if (activeTask != null) {
+        if (!activeTask.isRemove) {
+          // Cancel the downloading task.
+          activeTask.cancel(/* released= */ false);
+        }
+        // The activeTask is either a remove task, or a downloading task that we just cancelled. In
+        // the latter case we need to wait for the task to stop before we start a remove task.
+        return;
+      }
+
+      // We can start a remove task.
+      Downloader downloader = downloaderFactory.createDownloader(download.request);
+      activeTask =
+          new Task(
+              download.request,
+              downloader,
+              download.progress,
+              /* isRemove= */ true,
+              minRetryCount,
+              /* internalHandler= */ this);
+      activeTasks.put(download.request.id, activeTask);
+      activeTask.start();
+    }
+
+    // Task event processing.
+
+    private void onContentLengthChanged(Task task) {
+      String downloadId = task.request.id;
+      long contentLength = task.contentLength;
+      Download download = getDownload(downloadId, /* loadFromIndex= */ false);
+      if (contentLength == download.contentLength || contentLength == C.LENGTH_UNSET) {
+        return;
+      }
+      putDownload(
+          new Download(
+              download.request,
+              download.state,
+              download.startTimeMs,
+              /* updateTimeMs= */ System.currentTimeMillis(),
+              contentLength,
+              download.stopReason,
+              download.failureReason,
+              download.progress));
+    }
+
+    private void onTaskStopped(Task task) {
+      String downloadId = task.request.id;
+      activeTasks.remove(downloadId);
+
+      boolean isRemove = task.isRemove;
+      if (!isRemove) {
+        activeDownloadTaskCount--;
+      }
+
+      if (task.isCanceled) {
+        syncTasks();
+        return;
+      }
+
+      Throwable finalError = task.finalError;
+      if (finalError != null) {
+        Log.e(TAG, "Task failed: " + task.request + ", " + isRemove, finalError);
+      }
+
+      Download download =
+          Assertions.checkNotNull(getDownload(downloadId, /* loadFromIndex= */ false));
+      switch (download.state) {
+        case STATE_DOWNLOADING:
+          Assertions.checkState(!isRemove);
+          onDownloadTaskStopped(download, finalError);
+          break;
+        case STATE_REMOVING:
+        case STATE_RESTARTING:
+          Assertions.checkState(isRemove);
+          onRemoveTaskStopped(download);
+          break;
+        case STATE_QUEUED:
+        case STATE_STOPPED:
+        case STATE_COMPLETED:
+        case STATE_FAILED:
+        default:
+          throw new IllegalStateException();
+      }
+
+      syncTasks();
+    }
+
+    private void onDownloadTaskStopped(Download download, @Nullable Throwable finalError) {
+      download =
+          new Download(
+              download.request,
+              finalError == null ? STATE_COMPLETED : STATE_FAILED,
+              download.startTimeMs,
+              /* updateTimeMs= */ System.currentTimeMillis(),
+              download.contentLength,
+              download.stopReason,
+              finalError == null ? FAILURE_REASON_NONE : FAILURE_REASON_UNKNOWN,
+              download.progress);
+      // The download is now in a terminal state, so should not be in the downloads list.
+      downloads.remove(getDownloadIndex(download.request.id));
+      // We still need to update the download index and main thread.
       try {
         downloadIndex.putDownload(download);
       } catch (IOException e) {
-        Log.e(TAG, "Failed to update index", e);
+        Log.e(TAG, "Failed to update index.", e);
       }
-      if (downloadInternal.state == STATE_COMPLETED || downloadInternal.state == STATE_FAILED) {
-        downloadInternals.remove(downloadInternal);
-      }
-      mainHandler.obtainMessage(MSG_DOWNLOAD_CHANGED, download).sendToTarget();
+      DownloadUpdate update =
+          new DownloadUpdate(download, /* isRemove= */ false, new ArrayList<>(downloads));
+      mainHandler.obtainMessage(MSG_DOWNLOAD_UPDATE, update).sendToTarget();
     }
 
-    private void onDownloadRemoved(DownloadInternal downloadInternal, Download download) {
-      logd("Download is removed", downloadInternal);
-      try {
-        downloadIndex.removeDownload(download.request.id);
-      } catch (IOException e) {
-        Log.e(TAG, "Failed to remove from index", e);
-      }
-      downloadInternals.remove(downloadInternal);
-      mainHandler.obtainMessage(MSG_DOWNLOAD_REMOVED, download).sendToTarget();
-    }
-
-    @StartThreadResults
-    private int startTask(DownloadInternal downloadInternal) {
-      DownloadRequest request = downloadInternal.download.request;
-      String downloadId = request.id;
-      if (activeTasks.containsKey(downloadId)) {
-        if (stopDownloadTask(downloadId)) {
-          return START_THREAD_WAIT_DOWNLOAD_CANCELLATION;
+    private void onRemoveTaskStopped(Download download) {
+      if (download.state == STATE_RESTARTING) {
+        putDownloadWithState(
+            download, download.stopReason == STOP_REASON_NONE ? STATE_QUEUED : STATE_STOPPED);
+        syncTasks();
+      } else {
+        int removeIndex = getDownloadIndex(download.request.id);
+        downloads.remove(removeIndex);
+        try {
+          downloadIndex.removeDownload(download.request.id);
+        } catch (IOException e) {
+          Log.e(TAG, "Failed to remove from database");
         }
-        return START_THREAD_WAIT_REMOVAL_TO_FINISH;
+        DownloadUpdate update =
+            new DownloadUpdate(download, /* isRemove= */ true, new ArrayList<>(downloads));
+        mainHandler.obtainMessage(MSG_DOWNLOAD_UPDATE, update).sendToTarget();
       }
-      boolean isRemove = downloadInternal.isInRemoveState();
-      if (!isRemove) {
-        if (parallelDownloads == maxParallelDownloads) {
-          return START_THREAD_TOO_MANY_DOWNLOADS;
-        }
-        parallelDownloads++;
-      }
-      Downloader downloader = downloaderFactory.createDownloader(request);
-      DownloadProgress downloadProgress = downloadInternal.download.progress;
-      Task task =
-          new Task(
-              request,
-              downloader,
-              downloadProgress,
-              isRemove,
-              minRetryCount,
-              /* internalHandler= */ this);
-      activeTasks.put(downloadId, task);
-      task.start();
-      logd("Task is started", downloadInternal);
-      return START_THREAD_SUCCEEDED;
     }
 
-    private boolean stopDownloadTask(String downloadId) {
-      Task task = activeTasks.get(downloadId);
-      if (task != null && !task.isRemove) {
-        task.cancel(/* released= */ false);
-        logd("Task is cancelled", task.request);
-        return true;
-      }
-      return false;
-    }
+    // Helper methods.
 
-    @Nullable
-    private DownloadInternal getDownload(String id) {
-      for (int i = 0; i < downloadInternals.size(); i++) {
-        DownloadInternal downloadInternal = downloadInternals.get(i);
-        if (downloadInternal.download.request.id.equals(id)) {
-          return downloadInternal;
-        }
-      }
-      return null;
-    }
-
-    private Download loadDownload(String id) {
-      try {
-        return downloadIndex.getDownload(id);
-      } catch (IOException e) {
-        Log.e(TAG, "loadDownload failed", e);
-      }
-      return null;
-    }
-
-    private void addDownloadForState(Download download) {
-      DownloadInternal downloadInternal = new DownloadInternal(this, download);
-      downloadInternals.add(downloadInternal);
-      logd("Download is added", downloadInternal);
-      downloadInternal.initialize();
-    }
-
-    private boolean canStartDownloads() {
+    private boolean canDownloadsRun() {
       return !downloadsPaused && notMetRequirements == 0;
     }
-  }
 
-  private static final class DownloadInternal {
-
-    private final InternalHandler internalHandler;
-
-    private Download download;
-
-    // TODO: Get rid of these and use download directly.
-    @Download.State private int state;
-    private long contentLength;
-    private int stopReason;
-    @MonotonicNonNull @Download.FailureReason private int failureReason;
-
-    private DownloadInternal(InternalHandler internalHandler, Download download) {
-      this.internalHandler = internalHandler;
-      this.download = download;
-      state = download.state;
-      contentLength = download.contentLength;
-      stopReason = download.stopReason;
-      failureReason = download.failureReason;
-    }
-
-    private void initialize() {
-      initialize(download.state);
-    }
-
-    public void addRequest(DownloadRequest newRequest, int stopReason) {
-      download = mergeRequest(download, newRequest, stopReason);
-      initialize();
-    }
-
-    public void remove() {
-      initialize(STATE_REMOVING);
-    }
-
-    public Download getUpdatedDownload() {
-      download =
+    private Download putDownloadWithState(Download download, @Download.State int state) {
+      // Downloads in terminal states shouldn't be in the downloads list. This method cannot be used
+      // to set STATE_STOPPED either, because it doesn't have a stopReason argument.
+      Assertions.checkState(
+          state != STATE_COMPLETED && state != STATE_FAILED && state != STATE_STOPPED);
+      return putDownload(
           new Download(
               download.request,
               state,
               download.startTimeMs,
               /* updateTimeMs= */ System.currentTimeMillis(),
-              contentLength,
-              stopReason,
-              state != STATE_FAILED ? FAILURE_REASON_NONE : failureReason,
-              download.progress);
+              download.contentLength,
+              /* stopReason= */ 0,
+              FAILURE_REASON_NONE,
+              download.progress));
+    }
+
+    private Download putDownload(Download download) {
+      // Downloads in terminal states shouldn't be in the downloads list.
+      Assertions.checkState(download.state != STATE_COMPLETED && download.state != STATE_FAILED);
+      int changedIndex = getDownloadIndex(download.request.id);
+      if (changedIndex == C.INDEX_UNSET) {
+        downloads.add(download);
+        Collections.sort(downloads, InternalHandler::compareStartTimes);
+      } else {
+        boolean needsSort = download.startTimeMs != downloads.get(changedIndex).startTimeMs;
+        downloads.set(changedIndex, download);
+        if (needsSort) {
+          Collections.sort(downloads, InternalHandler::compareStartTimes);
+        }
+      }
+      try {
+        downloadIndex.putDownload(download);
+      } catch (IOException e) {
+        Log.e(TAG, "Failed to update index.", e);
+      }
+      DownloadUpdate update =
+          new DownloadUpdate(download, /* isRemove= */ false, new ArrayList<>(downloads));
+      mainHandler.obtainMessage(MSG_DOWNLOAD_UPDATE, update).sendToTarget();
       return download;
     }
 
-    public boolean isIdle() {
-      return state != STATE_DOWNLOADING && state != STATE_REMOVING && state != STATE_RESTARTING;
-    }
-
-    @Override
-    public String toString() {
-      return download.request.id + ' ' + Download.getStateString(state);
-    }
-
-    public void start() {
-      if (state == STATE_QUEUED || state == STATE_DOWNLOADING) {
-        startOrQueue();
-      } else if (isInRemoveState()) {
-        internalHandler.startTask(this);
+    @Nullable
+    private Download getDownload(String id, boolean loadFromIndex) {
+      int index = getDownloadIndex(id);
+      if (index != C.INDEX_UNSET) {
+        return downloads.get(index);
       }
-    }
-
-    public void setStopReason(int stopReason) {
-      this.stopReason = stopReason;
-      updateStopState();
-    }
-
-    public boolean isInRemoveState() {
-      return state == STATE_REMOVING || state == STATE_RESTARTING;
-    }
-
-    public void setContentLength(long contentLength) {
-      if (this.contentLength == contentLength) {
-        return;
-      }
-      this.contentLength = contentLength;
-      internalHandler.onDownloadChanged(this, getUpdatedDownload());
-    }
-
-    private void updateStopState() {
-      Download oldDownload = download;
-      if (canStart()) {
-        if (state == STATE_STOPPED) {
-          startOrQueue();
-        }
-      } else {
-        if (state == STATE_DOWNLOADING || state == STATE_QUEUED) {
-          internalHandler.stopDownloadTask(download.request.id);
-          setState(STATE_STOPPED);
+      if (loadFromIndex) {
+        try {
+          return downloadIndex.getDownload(id);
+        } catch (IOException e) {
+          Log.e(TAG, "Failed to load download: " + id, e);
         }
       }
-      if (oldDownload == download) {
-        internalHandler.onDownloadChanged(this, getUpdatedDownload());
-      }
+      return null;
     }
 
-    private void initialize(int initialState) {
-      // Don't notify listeners with initial state until we make sure we don't switch to another
-      // state immediately.
-      state = initialState;
-      if (isInRemoveState()) {
-        internalHandler.startTask(this);
-      } else if (canStart()) {
-        startOrQueue();
-      } else {
-        setState(STATE_STOPPED);
-      }
-      if (state == initialState) {
-        internalHandler.onDownloadChanged(this, getUpdatedDownload());
-      }
-    }
-
-    private boolean canStart() {
-      return internalHandler.canStartDownloads() && stopReason == STOP_REASON_NONE;
-    }
-
-    private void startOrQueue() {
-      Assertions.checkState(!isInRemoveState());
-      @StartThreadResults int result = internalHandler.startTask(this);
-      Assertions.checkState(result != START_THREAD_WAIT_REMOVAL_TO_FINISH);
-      if (result == START_THREAD_SUCCEEDED || result == START_THREAD_WAIT_DOWNLOAD_CANCELLATION) {
-        setState(STATE_DOWNLOADING);
-      } else {
-        setState(STATE_QUEUED);
-      }
-    }
-
-    private void setState(@Download.State int newState) {
-      if (state != newState) {
-        state = newState;
-        internalHandler.onDownloadChanged(this, getUpdatedDownload());
-      }
-    }
-
-    private void onTaskStopped(boolean isCanceled, @Nullable Throwable error) {
-      if (isIdle()) {
-        return;
-      }
-      if (isCanceled) {
-        internalHandler.startTask(this);
-      } else if (state == STATE_REMOVING) {
-        internalHandler.onDownloadRemoved(this, getUpdatedDownload());
-      } else if (state == STATE_RESTARTING) {
-        initialize(STATE_QUEUED);
-      } else { // STATE_DOWNLOADING
-        if (error != null) {
-          Log.e(TAG, "Download failed: " + download.request.id, error);
-          failureReason = FAILURE_REASON_UNKNOWN;
-          setState(STATE_FAILED);
-        } else {
-          setState(STATE_COMPLETED);
+    private int getDownloadIndex(String id) {
+      for (int i = 0; i < downloads.size(); i++) {
+        Download download = downloads.get(i);
+        if (download.request.id.equals(id)) {
+          return i;
         }
       }
+      return C.INDEX_UNSET;
+    }
+
+    private static int compareStartTimes(Download first, Download second) {
+      return Util.compareLong(first.startTimeMs, second.startTimeMs);
     }
   }
 
@@ -1177,16 +1130,17 @@ public final class DownloadManager {
         // download manager whilst cancellation is ongoing.
         internalHandler = null;
       }
-      isCanceled = true;
-      downloader.cancel();
-      interrupt();
+      if (!isCanceled) {
+        isCanceled = true;
+        downloader.cancel();
+        interrupt();
+      }
     }
 
     // Methods running on download thread.
 
     @Override
     public void run() {
-      logd("Download started", request);
       try {
         if (isRemove) {
           downloader.remove();
@@ -1201,14 +1155,12 @@ public final class DownloadManager {
               if (!isCanceled) {
                 long bytesDownloaded = downloadProgress.bytesDownloaded;
                 if (bytesDownloaded != errorPosition) {
-                  logd("Reset error count. bytesDownloaded = " + bytesDownloaded, request);
                   errorPosition = bytesDownloaded;
                   errorCount = 0;
                 }
                 if (++errorCount > minRetryCount) {
                   throw e;
                 }
-                logd("Download error. Retry " + errorCount, request);
                 Thread.sleep(getRetryDelayMillis(errorCount));
               }
             }
@@ -1240,4 +1192,18 @@ public final class DownloadManager {
       return Math.min((errorCount - 1) * 1000, 5000);
     }
   }
+
+  private static final class DownloadUpdate {
+
+    private final Download download;
+    private final boolean isRemove;
+
+    private final List<Download> downloads;
+
+    public DownloadUpdate(Download download, boolean isRemove, List<Download> downloads) {
+      this.download = download;
+      this.isRemove = isRemove;
+      this.downloads = downloads;
+    }
+  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/WritableDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/WritableDownloadIndex.java
index 00b08dc76a..ae634f8544 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/WritableDownloadIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/WritableDownloadIndex.java
@@ -37,6 +37,13 @@ public interface WritableDownloadIndex extends DownloadIndex {
    */
   void removeDownload(String id) throws IOException;
 
+  /**
+   * Sets all {@link Download#STATE_DOWNLOADING} states to {@link Download#STATE_QUEUED}.
+   *
+   * @throws IOException If an error occurs updating the state.
+   */
+  void setDownloadingStatesToQueued() throws IOException;
+
   /**
    * Sets the stop reason of the downloads in a terminal state ({@link Download#STATE_COMPLETED},
    * {@link Download#STATE_FAILED}).
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java
index dba7b74e9f..2f36b7f48c 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java
@@ -38,6 +38,8 @@ import org.junit.runner.RunWith;
 @RunWith(AndroidJUnit4.class)
 public class ActionFileUpgradeUtilTest {
 
+  private static final long NOW_MS = 1234;
+
   private File tempFile;
   private ExoDatabaseProvider databaseProvider;
   private DefaultDownloadIndex downloadIndex;
@@ -113,7 +115,7 @@ public class ActionFileUpgradeUtilTest {
             data);
 
     ActionFileUpgradeUtil.mergeRequest(
-        request, downloadIndex, /* addNewDownloadAsCompleted= */ false);
+        request, downloadIndex, /* addNewDownloadAsCompleted= */ false, NOW_MS);
 
     assertDownloadIndexContainsRequest(request, Download.STATE_QUEUED);
   }
@@ -141,9 +143,9 @@ public class ActionFileUpgradeUtilTest {
             /* customCacheKey= */ "key123",
             new byte[] {5, 4, 3, 2, 1});
     ActionFileUpgradeUtil.mergeRequest(
-        request1, downloadIndex, /* addNewDownloadAsCompleted= */ false);
+        request1, downloadIndex, /* addNewDownloadAsCompleted= */ false, NOW_MS);
     ActionFileUpgradeUtil.mergeRequest(
-        request2, downloadIndex, /* addNewDownloadAsCompleted= */ false);
+        request2, downloadIndex, /* addNewDownloadAsCompleted= */ false, NOW_MS);
 
     Download download = downloadIndex.getDownload(request2.id);
     assertThat(download).isNotNull();
@@ -178,16 +180,16 @@ public class ActionFileUpgradeUtilTest {
             /* customCacheKey= */ "key123",
             new byte[] {5, 4, 3, 2, 1});
     ActionFileUpgradeUtil.mergeRequest(
-        request1, downloadIndex, /* addNewDownloadAsCompleted= */ false);
+        request1, downloadIndex, /* addNewDownloadAsCompleted= */ false, NOW_MS);
 
     // Merging existing download, keeps it queued.
     ActionFileUpgradeUtil.mergeRequest(
-        request1, downloadIndex, /* addNewDownloadAsCompleted= */ true);
+        request1, downloadIndex, /* addNewDownloadAsCompleted= */ true, NOW_MS);
     assertThat(downloadIndex.getDownload(request1.id).state).isEqualTo(Download.STATE_QUEUED);
 
     // New download is merged as completed.
     ActionFileUpgradeUtil.mergeRequest(
-        request2, downloadIndex, /* addNewDownloadAsCompleted= */ true);
+        request2, downloadIndex, /* addNewDownloadAsCompleted= */ true, NOW_MS);
     assertThat(downloadIndex.getDownload(request2.id).state).isEqualTo(Download.STATE_COMPLETED);
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index 92c6debdd8..2b9ef11235 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -61,6 +61,8 @@ public class DownloadManagerTest {
   private static final int APP_STOP_REASON = 1;
   /** The minimum number of times a task must be retried before failing. */
   private static final int MIN_RETRY_COUNT = 3;
+  /** Dummy value for the current time. */
+  private static final long NOW_MS = 1234;
 
   private Uri uri1;
   private Uri uri2;
@@ -132,6 +134,7 @@ public class DownloadManagerTest {
     task.assertCompleted();
     runner.assertCreatedDownloaderCount(1);
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
+    assertThat(downloadManager.getCurrentDownloads()).isEmpty();
   }
 
   @Test
@@ -143,6 +146,7 @@ public class DownloadManagerTest {
     task.assertRemoved();
     runner.assertCreatedDownloaderCount(2);
     downloadManagerListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
+    assertThat(downloadManager.getCurrentDownloads()).isEmpty();
   }
 
   @Test
@@ -158,6 +162,7 @@ public class DownloadManagerTest {
     downloader.assertReleased().assertStartCount(MIN_RETRY_COUNT + 1);
     runner.getTask().assertFailed();
     downloadManagerListener.blockUntilTasksComplete();
+    assertThat(downloadManager.getCurrentDownloads()).isEmpty();
   }
 
   @Test
@@ -174,6 +179,7 @@ public class DownloadManagerTest {
     downloader.assertReleased().assertStartCount(MIN_RETRY_COUNT + 1);
     runner.getTask().assertCompleted();
     downloadManagerListener.blockUntilTasksComplete();
+    assertThat(downloadManager.getCurrentDownloads()).isEmpty();
   }
 
   @Test
@@ -341,7 +347,7 @@ public class DownloadManagerTest {
   }
 
   @Test
-  public void getTasks_returnTasks() {
+  public void getCurrentDownloads_returnsCurrentDownloads() {
     TaskWrapper task1 = new DownloadRunner(uri1).postDownloadRequest().getTask();
     TaskWrapper task2 = new DownloadRunner(uri2).postDownloadRequest().getTask();
     TaskWrapper task3 =
@@ -370,13 +376,11 @@ public class DownloadManagerTest {
 
     runOnMainThread(() -> downloadManager.pauseDownloads());
 
-    // TODO: This should be assertQueued. Fix implementation and update test.
-    runner1.getTask().assertStopped();
+    runner1.getTask().assertQueued();
 
     // remove requests aren't stopped.
     runner2.getDownloader(1).unblock().assertReleased();
-    // TODO: This should be assertQueued. Fix implementation and update test.
-    runner2.getTask().assertStopped();
+    runner2.getTask().assertQueued();
     // Although remove2 is finished, download2 doesn't start.
     runner2.getDownloader(2).assertDoesNotStart();
 
@@ -397,7 +401,7 @@ public class DownloadManagerTest {
   }
 
   @Test
-  public void manuallyStopAndResumeSingleDownload() throws Throwable {
+  public void setAndClearSingleDownloadStopReason() throws Throwable {
     DownloadRunner runner = new DownloadRunner(uri1).postDownloadRequest();
     TaskWrapper task = runner.getTask();
 
@@ -415,7 +419,7 @@ public class DownloadManagerTest {
   }
 
   @Test
-  public void manuallyStoppedDownloadCanBeCancelled() throws Throwable {
+  public void setSingleDownloadStopReasonThenRemove_removesDownload() throws Throwable {
     DownloadRunner runner = new DownloadRunner(uri1).postDownloadRequest();
     TaskWrapper task = runner.getTask();
 
@@ -433,7 +437,7 @@ public class DownloadManagerTest {
   }
 
   @Test
-  public void manuallyStoppedSingleDownload_doesNotAffectOthers() throws Throwable {
+  public void setSingleDownloadStopReason_doesNotAffectOtherDownloads() throws Throwable {
     DownloadRunner runner1 = new DownloadRunner(uri1);
     DownloadRunner runner2 = new DownloadRunner(uri2);
     DownloadRunner runner3 = new DownloadRunner(uri3);
@@ -455,21 +459,22 @@ public class DownloadManagerTest {
   }
 
   @Test
-  public void mergeRequest_removingDownload_becomesRestarting() {
+  public void mergeRequest_removing_becomesRestarting() {
     DownloadRequest downloadRequest = createDownloadRequest();
     DownloadBuilder downloadBuilder =
         new DownloadBuilder(downloadRequest).setState(Download.STATE_REMOVING);
     Download download = downloadBuilder.build();
 
     Download mergedDownload =
-        DownloadManager.mergeRequest(download, downloadRequest, download.stopReason);
+        DownloadManager.mergeRequest(download, downloadRequest, download.stopReason, NOW_MS);
 
-    Download expectedDownload = downloadBuilder.setState(Download.STATE_RESTARTING).build();
-    assertEqualIgnoringTimeFields(mergedDownload, expectedDownload);
+    Download expectedDownload =
+        downloadBuilder.setStartTimeMs(NOW_MS).setState(Download.STATE_RESTARTING).build();
+    assertEqualIgnoringUpdateTime(mergedDownload, expectedDownload);
   }
 
   @Test
-  public void mergeRequest_failedDownload_becomesQueued() {
+  public void mergeRequest_failed_becomesQueued() {
     DownloadRequest downloadRequest = createDownloadRequest();
     DownloadBuilder downloadBuilder =
         new DownloadBuilder(downloadRequest)
@@ -478,18 +483,19 @@ public class DownloadManagerTest {
     Download download = downloadBuilder.build();
 
     Download mergedDownload =
-        DownloadManager.mergeRequest(download, downloadRequest, download.stopReason);
+        DownloadManager.mergeRequest(download, downloadRequest, download.stopReason, NOW_MS);
 
     Download expectedDownload =
         downloadBuilder
+            .setStartTimeMs(NOW_MS)
             .setState(Download.STATE_QUEUED)
             .setFailureReason(Download.FAILURE_REASON_NONE)
             .build();
-    assertEqualIgnoringTimeFields(mergedDownload, expectedDownload);
+    assertEqualIgnoringUpdateTime(mergedDownload, expectedDownload);
   }
 
   @Test
-  public void mergeRequest_stoppedDownload_staysStopped() {
+  public void mergeRequest_stopped_staysStopped() {
     DownloadRequest downloadRequest = createDownloadRequest();
     DownloadBuilder downloadBuilder =
         new DownloadBuilder(downloadRequest)
@@ -498,13 +504,13 @@ public class DownloadManagerTest {
     Download download = downloadBuilder.build();
 
     Download mergedDownload =
-        DownloadManager.mergeRequest(download, downloadRequest, download.stopReason);
+        DownloadManager.mergeRequest(download, downloadRequest, download.stopReason, NOW_MS);
 
-    assertEqualIgnoringTimeFields(mergedDownload, download);
+    assertEqualIgnoringUpdateTime(mergedDownload, download);
   }
 
   @Test
-  public void mergeRequest_stopReasonSetButNotStopped_becomesStopped() {
+  public void mergeRequest_completedWithStopReason_becomesStopped() {
     DownloadRequest downloadRequest = createDownloadRequest();
     DownloadBuilder downloadBuilder =
         new DownloadBuilder(downloadRequest)
@@ -513,10 +519,11 @@ public class DownloadManagerTest {
     Download download = downloadBuilder.build();
 
     Download mergedDownload =
-        DownloadManager.mergeRequest(download, downloadRequest, download.stopReason);
+        DownloadManager.mergeRequest(download, downloadRequest, download.stopReason, NOW_MS);
 
-    Download expectedDownload = downloadBuilder.setState(Download.STATE_STOPPED).build();
-    assertEqualIgnoringTimeFields(mergedDownload, expectedDownload);
+    Download expectedDownload =
+        downloadBuilder.setStartTimeMs(NOW_MS).setState(Download.STATE_STOPPED).build();
+    assertEqualIgnoringUpdateTime(mergedDownload, expectedDownload);
   }
 
   private void setUpDownloadManager(final int maxParallelDownloads) throws Exception {
@@ -554,9 +561,10 @@ public class DownloadManagerTest {
     dummyMainThread.runTestOnMainThread(r);
   }
 
-  private static void assertEqualIgnoringTimeFields(Download download, Download that) {
+  private static void assertEqualIgnoringUpdateTime(Download download, Download that) {
     assertThat(download.request).isEqualTo(that.request);
     assertThat(download.state).isEqualTo(that.state);
+    assertThat(download.startTimeMs).isEqualTo(that.startTimeMs);
     assertThat(download.contentLength).isEqualTo(that.contentLength);
     assertThat(download.failureReason).isEqualTo(that.failureReason);
     assertThat(download.stopReason).isEqualTo(that.stopReason);

From 214a372e062f9740644d73501c0a08e338ac5657 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 1 May 2019 20:06:11 +0100
Subject: [PATCH 823/832] Periodically persist progress to index whilst
 downloading

PiperOrigin-RevId: 246173972
---
 .../exoplayer2/offline/DownloadManager.java   | 37 +++++++++++++++----
 .../exoplayer2/offline/DownloadService.java   |  4 +-
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index b528d91759..3e0375718b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -134,7 +134,8 @@ public final class DownloadManager {
   private static final int MSG_REMOVE_DOWNLOAD = 7;
   private static final int MSG_TASK_STOPPED = 8;
   private static final int MSG_CONTENT_LENGTH_CHANGED = 9;
-  private static final int MSG_RELEASE = 10;
+  private static final int MSG_UPDATE_PROGRESS = 10;
+  private static final int MSG_RELEASE = 11;
 
   private static final String TAG = "DownloadManager";
 
@@ -569,6 +570,8 @@ public final class DownloadManager {
 
   private static final class InternalHandler extends Handler {
 
+    private static final int UPDATE_PROGRESS_INTERVAL_MS = 5000;
+
     public boolean released;
 
     private final HandlerThread thread;
@@ -650,11 +653,13 @@ public final class DownloadManager {
         case MSG_CONTENT_LENGTH_CHANGED:
           task = (Task) message.obj;
           onContentLengthChanged(task);
-          processedExternalMessage = false; // This message is posted internally.
-          break;
+          return; // No need to post back to mainHandler.
+        case MSG_UPDATE_PROGRESS:
+          updateProgress();
+          return; // No need to post back to mainHandler.
         case MSG_RELEASE:
           release();
-          return; // Don't post back to mainHandler on release.
+          return; // No need to post back to mainHandler.
         default:
           throw new IllegalStateException();
       }
@@ -868,7 +873,9 @@ public final class DownloadManager {
               minRetryCount,
               /* internalHandler= */ this);
       activeTasks.put(download.request.id, activeTask);
-      activeDownloadTaskCount++;
+      if (activeDownloadTaskCount++ == 0) {
+        sendEmptyMessageDelayed(MSG_UPDATE_PROGRESS, UPDATE_PROGRESS_INTERVAL_MS);
+      }
       activeTask.start();
       return activeTask;
     }
@@ -933,8 +940,8 @@ public final class DownloadManager {
       activeTasks.remove(downloadId);
 
       boolean isRemove = task.isRemove;
-      if (!isRemove) {
-        activeDownloadTaskCount--;
+      if (!isRemove && --activeDownloadTaskCount == 0) {
+        removeMessages(MSG_UPDATE_PROGRESS);
       }
 
       if (task.isCanceled) {
@@ -1013,6 +1020,22 @@ public final class DownloadManager {
       }
     }
 
+    // Progress updates.
+
+    private void updateProgress() {
+      for (int i = 0; i < downloads.size(); i++) {
+        Download download = downloads.get(i);
+        if (download.state == STATE_DOWNLOADING) {
+          try {
+            downloadIndex.putDownload(download);
+          } catch (IOException e) {
+            Log.e(TAG, "Failed to update index.", e);
+          }
+        }
+      }
+      sendEmptyMessageDelayed(MSG_UPDATE_PROGRESS, UPDATE_PROGRESS_INTERVAL_MS);
+    }
+
     // Helper methods.
 
     private boolean canDownloadsRun() {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index ee00cf3d5f..ce9087c6c8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -683,7 +683,7 @@ public abstract class DownloadService extends Service {
     // Do nothing.
   }
 
-  private void notifyDownloadChange(Download download) {
+  private void notifyDownloadChanged(Download download) {
     onDownloadChanged(download);
     if (foregroundNotificationUpdater != null) {
       if (download.state == Download.STATE_DOWNLOADING
@@ -834,7 +834,7 @@ public abstract class DownloadService extends Service {
     @Override
     public void onDownloadChanged(DownloadManager downloadManager, Download download) {
       if (downloadService != null) {
-        downloadService.notifyDownloadChange(download);
+        downloadService.notifyDownloadChanged(download);
       }
     }
 

From 9f9cf316bd3c7740c3fa1fa5ccbfa0d5dd3c417b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 1 May 2019 20:50:44 +0100
Subject: [PATCH 824/832] Remove unnecessary logging

As justification for why we should not have this type of logging,
it would scale up to about 13K LOC, 1800 Strings, and 36K (after
pro-guarding - in the case of the demo app) if we did it through
the whole code base*. It makes the code messier to read, and in
most cases doesn't add significant value.

Note: I left the Scheduler logging because it logs interactions
with some awkward library components outside of ExoPlayer, so is
perhaps a bit more justified.

* This is a bit unfair since realistically we wouldn't ever add
  lots of logging into trivial classes. But I think it is fair
  to say that the deltas would be non-negligible.

PiperOrigin-RevId: 246181421
---
 .../jobdispatcher/JobDispatcherScheduler.java |  1 +
 .../android/exoplayer2/offline/Download.java  | 22 ---------------
 .../exoplayer2/offline/DownloadService.java   | 27 +++++--------------
 .../scheduler/PlatformScheduler.java          |  1 +
 .../exoplayer2/scheduler/Requirements.java    | 12 ---------
 .../scheduler/RequirementsWatcher.java        | 23 ----------------
 .../exoplayer2/scheduler/Scheduler.java       |  2 --
 .../testutil/TestDownloadManagerListener.java | 22 +--------------
 8 files changed, 10 insertions(+), 100 deletions(-)

diff --git a/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java b/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java
index 790f5ca4e5..d79dead0d7 100644
--- a/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java
+++ b/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java
@@ -57,6 +57,7 @@ import com.google.android.exoplayer2.util.Util;
  */
 public final class JobDispatcherScheduler implements Scheduler {
 
+  private static final boolean DEBUG = false;
   private static final String TAG = "JobDispatcherScheduler";
   private static final String KEY_SERVICE_ACTION = "service_action";
   private static final String KEY_SERVICE_PACKAGE = "service_package";
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
index 00d81b392c..97dff8394e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
@@ -81,28 +81,6 @@ public final class Download {
   /** The download isn't stopped. */
   public static final int STOP_REASON_NONE = 0;
 
-  /** Returns the state string for the given state value. */
-  public static String getStateString(@State int state) {
-    switch (state) {
-      case STATE_QUEUED:
-        return "QUEUED";
-      case STATE_STOPPED:
-        return "STOPPED";
-      case STATE_DOWNLOADING:
-        return "DOWNLOADING";
-      case STATE_COMPLETED:
-        return "COMPLETED";
-      case STATE_FAILED:
-        return "FAILED";
-      case STATE_REMOVING:
-        return "REMOVING";
-      case STATE_RESTARTING:
-        return "RESTARTING";
-      default:
-        throw new IllegalStateException();
-    }
-  }
-
   /** The download request. */
   public final DownloadRequest request;
   /** The state of the download. */
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index ce9087c6c8..fdd7163a2c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -127,18 +127,18 @@ public abstract class DownloadService extends Service {
   public static final String KEY_DOWNLOAD_REQUEST = "download_request";
 
   /**
-   * Key for the content id in {@link #ACTION_SET_STOP_REASON} and {@link #ACTION_REMOVE_DOWNLOAD}
-   * intents.
+   * Key for the {@link String} content id in {@link #ACTION_SET_STOP_REASON} and {@link
+   * #ACTION_REMOVE_DOWNLOAD} intents.
    */
   public static final String KEY_CONTENT_ID = "content_id";
 
   /**
-   * Key for the stop reason in {@link #ACTION_SET_STOP_REASON} and {@link #ACTION_ADD_DOWNLOAD}
-   * intents.
+   * Key for the integer stop reason in {@link #ACTION_SET_STOP_REASON} and {@link
+   * #ACTION_ADD_DOWNLOAD} intents.
    */
   public static final String KEY_STOP_REASON = "stop_reason";
 
-  /** Key for the requirements in {@link #ACTION_SET_REQUIREMENTS} intents. */
+  /** Key for the {@link Requirements} in {@link #ACTION_SET_REQUIREMENTS} intents. */
   public static final String KEY_REQUIREMENTS = "requirements";
 
   /**
@@ -155,7 +155,6 @@ public abstract class DownloadService extends Service {
   public static final long DEFAULT_FOREGROUND_NOTIFICATION_UPDATE_INTERVAL = 1000;
 
   private static final String TAG = "DownloadService";
-  private static final boolean DEBUG = false;
 
   // Keep DownloadManagerListeners for each DownloadService as long as there are downloads (and the
   // process is running). This allows DownloadService to restart when there's no scheduler.
@@ -506,7 +505,6 @@ public abstract class DownloadService extends Service {
 
   @Override
   public void onCreate() {
-    logd("onCreate");
     if (channelId != null) {
       NotificationUtil.createNotificationChannel(
           this, channelId, channelNameResourceId, NotificationUtil.IMPORTANCE_LOW);
@@ -541,7 +539,6 @@ public abstract class DownloadService extends Service {
     if (intentAction == null) {
       intentAction = ACTION_INIT;
     }
-    logd("onStartCommand action: " + intentAction + " startId: " + startId);
     switch (intentAction) {
       case ACTION_INIT:
       case ACTION_RESTART:
@@ -573,7 +570,7 @@ public abstract class DownloadService extends Service {
         if (!intent.hasExtra(KEY_STOP_REASON)) {
           Log.e(TAG, "Ignored SET_STOP_REASON: Missing " + KEY_STOP_REASON + " extra");
         } else {
-          int stopReason = intent.getIntExtra(KEY_STOP_REASON, Download.STOP_REASON_NONE);
+          int stopReason = intent.getIntExtra(KEY_STOP_REASON, /* defaultValue= */ 0);
           downloadManager.setStopReason(contentId, stopReason);
         }
         break;
@@ -598,13 +595,11 @@ public abstract class DownloadService extends Service {
 
   @Override
   public void onTaskRemoved(Intent rootIntent) {
-    logd("onTaskRemoved rootIntent: " + rootIntent);
     taskRemoved = true;
   }
 
   @Override
   public void onDestroy() {
-    logd("onDestroy");
     isDestroyed = true;
     DownloadManagerHelper downloadManagerHelper = downloadManagerListeners.get(getClass());
     boolean unschedule = !downloadManager.isWaitingForRequirements();
@@ -713,16 +708,8 @@ public abstract class DownloadService extends Service {
     }
     if (Util.SDK_INT < 28 && taskRemoved) { // See [Internal: b/74248644].
       stopSelf();
-      logd("stopSelf()");
     } else {
-      boolean stopSelfResult = stopSelfResult(lastStartId);
-      logd("stopSelf(" + lastStartId + ") result: " + stopSelfResult);
-    }
-  }
-
-  private void logd(String message) {
-    if (DEBUG) {
-      Log.d(TAG, message);
+      stopSelfResult(lastStartId);
     }
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java
index fc8e8b61a5..8572c9c7ca 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java
@@ -44,6 +44,7 @@ import com.google.android.exoplayer2.util.Util;
 @TargetApi(21)
 public final class PlatformScheduler implements Scheduler {
 
+  private static final boolean DEBUG = false;
   private static final String TAG = "PlatformScheduler";
   private static final String KEY_SERVICE_ACTION = "service_action";
   private static final String KEY_SERVICE_PACKAGE = "service_package";
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
index babc4e49fb..30cf452572 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
@@ -27,7 +27,6 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.PowerManager;
 import androidx.annotation.IntDef;
-import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -56,8 +55,6 @@ public final class Requirements implements Parcelable {
   /** Requirement that the device is charging. */
   public static final int DEVICE_CHARGING = 1 << 3;
 
-  private static final String TAG = "Requirements";
-
   @RequirementFlags private final int requirements;
 
   /** @param requirements A combination of requirement flags. */
@@ -135,7 +132,6 @@ public final class Requirements implements Parcelable {
     if (networkInfo == null
         || !networkInfo.isConnected()
         || !isInternetConnectivityValidated(connectivityManager)) {
-      logd("No network info, connection or connectivity.");
       return requirements & (NETWORK | NETWORK_UNMETERED);
     }
 
@@ -172,7 +168,6 @@ public final class Requirements implements Parcelable {
     }
     Network activeNetwork = connectivityManager.getActiveNetwork();
     if (activeNetwork == null) {
-      logd("No active network.");
       return false;
     }
     NetworkCapabilities networkCapabilities =
@@ -180,16 +175,9 @@ public final class Requirements implements Parcelable {
     boolean validated =
         networkCapabilities == null
             || !networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
-    logd("Network capability validated: " + validated);
     return !validated;
   }
 
-  private static void logd(String message) {
-    if (Scheduler.DEBUG) {
-      Log.d(TAG, message);
-    }
-  }
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
index d2ad357ff6..f0d0f37cdf 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
@@ -28,7 +28,6 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.PowerManager;
 import androidx.annotation.RequiresApi;
-import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
 
 /**
@@ -53,8 +52,6 @@ public final class RequirementsWatcher {
         @Requirements.RequirementFlags int notMetRequirements);
   }
 
-  private static final String TAG = "RequirementsWatcher";
-
   private final Context context;
   private final Listener listener;
   private final Requirements requirements;
@@ -75,7 +72,6 @@ public final class RequirementsWatcher {
     this.listener = listener;
     this.requirements = requirements;
     handler = new Handler(Util.getLooper());
-    logd(this + " created");
   }
 
   /**
@@ -110,7 +106,6 @@ public final class RequirementsWatcher {
     }
     receiver = new DeviceStatusChangeReceiver();
     context.registerReceiver(receiver, filter, null, handler);
-    logd(this + " started");
     return notMetRequirements;
   }
 
@@ -121,7 +116,6 @@ public final class RequirementsWatcher {
     if (networkCallback != null) {
       unregisterNetworkCallback();
     }
-    logd(this + " stopped");
   }
 
   /** Returns watched {@link Requirements}. */
@@ -129,14 +123,6 @@ public final class RequirementsWatcher {
     return requirements;
   }
 
-  @Override
-  public String toString() {
-    if (!Scheduler.DEBUG) {
-      return super.toString();
-    }
-    return "RequirementsWatcher{" + requirements + '}';
-  }
-
   @TargetApi(23)
   private void registerNetworkCallbackV23() {
     ConnectivityManager connectivityManager =
@@ -163,22 +149,14 @@ public final class RequirementsWatcher {
     int notMetRequirements = requirements.getNotMetRequirements(context);
     if (this.notMetRequirements != notMetRequirements) {
       this.notMetRequirements = notMetRequirements;
-      logd("notMetRequirements has changed: " + notMetRequirements);
       listener.onRequirementsStateChanged(this, notMetRequirements);
     }
   }
 
-  private static void logd(String message) {
-    if (Scheduler.DEBUG) {
-      Log.d(TAG, message);
-    }
-  }
-
   private class DeviceStatusChangeReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
       if (!isInitialStickyBroadcast()) {
-        logd(RequirementsWatcher.this + " received " + intent.getAction());
         checkRequirements();
       }
     }
@@ -200,7 +178,6 @@ public final class RequirementsWatcher {
       handler.post(
           () -> {
             if (networkCallback != null) {
-              logd(RequirementsWatcher.this + " NetworkCallback");
               checkRequirements();
             }
           });
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Scheduler.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Scheduler.java
index 1b225d9a4d..b5a6f40424 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Scheduler.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Scheduler.java
@@ -22,8 +22,6 @@ import android.content.Intent;
 /** Schedules a service to be started in the foreground when some {@link Requirements} are met. */
 public interface Scheduler {
 
-  /* package */ boolean DEBUG = false;
-
   /**
    * Schedules a service to be started in the foreground when some {@link Requirements} are met.
    * Anything that was previously scheduled will be canceled.
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
index 9d6223b8b1..4c334992b5 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
@@ -22,9 +22,7 @@ import android.os.ConditionVariable;
 import com.google.android.exoplayer2.offline.Download;
 import com.google.android.exoplayer2.offline.Download.State;
 import com.google.android.exoplayer2.offline.DownloadManager;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Locale;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -138,7 +136,6 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
   }
 
   private void assertStateInternal(String taskId, int expectedState, int timeoutMs) {
-    ArrayList<Integer> receivedStates = new ArrayList<>();
     while (true) {
       Integer state = null;
       try {
@@ -150,25 +147,8 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
         if (expectedState == state) {
           return;
         }
-        receivedStates.add(state);
       } else {
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < receivedStates.size(); i++) {
-          if (i > 0) {
-            sb.append(',');
-          }
-          int receivedState = receivedStates.get(i);
-          String receivedStateString =
-              receivedState == STATE_REMOVED ? "REMOVED" : Download.getStateString(receivedState);
-          sb.append(receivedStateString);
-        }
-        fail(
-            String.format(
-                Locale.US,
-                "for download (%s) expected:<%s> but was:<%s>",
-                taskId,
-                Download.getStateString(expectedState),
-                sb));
+        fail("Didn't receive expected state: " + expectedState);
       }
     }
   }

From 241ce2df490bc024814d33b08c26950f56c67920 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 2 May 2019 10:37:31 +0100
Subject: [PATCH 825/832] Post-submit fixes for
 https://github.com/google/ExoPlayer/commit/eed5d957d87d44cb9c716f1a4c80f39ad2a6a442.

One wrong return value, a useless assignment, unusual visibility of private
class fields and some nullability issues.

PiperOrigin-RevId: 246282995
---
 .../exoplayer2/offline/DownloadManager.java   | 34 ++++++++++++-------
 .../google/android/exoplayer2/util/Util.java  |  4 +--
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 3e0375718b..e8b7eaf9b2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -31,6 +31,7 @@ import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
 import android.os.Message;
+import androidx.annotation.CheckResult;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.database.DatabaseProvider;
@@ -192,12 +193,9 @@ public final class DownloadManager {
     downloads = Collections.emptyList();
     listeners = new CopyOnWriteArraySet<>();
 
-    requirementsListener = this::onRequirementsStateChanged;
-    requirementsWatcher =
-        new RequirementsWatcher(context, requirementsListener, DEFAULT_REQUIREMENTS);
-    notMetRequirements = requirementsWatcher.start();
-
-    mainHandler = new Handler(Util.getLooper(), this::handleMainMessage);
+    @SuppressWarnings("methodref.receiver.bound.invalid")
+    Handler mainHandler = Util.createHandler(this::handleMainMessage);
+    this.mainHandler = mainHandler;
     HandlerThread internalThread = new HandlerThread("DownloadManager file i/o");
     internalThread.start();
     internalHandler =
@@ -210,6 +208,13 @@ public final class DownloadManager {
             minRetryCount,
             downloadsPaused);
 
+    @SuppressWarnings("methodref.receiver.bound.invalid")
+    RequirementsWatcher.Listener requirementsListener = this::onRequirementsStateChanged;
+    this.requirementsListener = requirementsListener;
+    requirementsWatcher =
+        new RequirementsWatcher(context, requirementsListener, DEFAULT_REQUIREMENTS);
+    notMetRequirements = requirementsWatcher.start();
+
     pendingMessages = 1;
     internalHandler
         .obtainMessage(MSG_INITIALIZE, notMetRequirements, /* unused */ 0)
@@ -822,7 +827,7 @@ public final class DownloadManager {
             activeTask = syncQueuedDownload(activeTask, download);
             break;
           case STATE_DOWNLOADING:
-            activeTask = Assertions.checkNotNull(activeTask);
+            Assertions.checkNotNull(activeTask);
             syncDownloadingDownload(activeTask, download, accumulatingDownloadTaskCount);
             break;
           case STATE_REMOVING:
@@ -848,6 +853,8 @@ public final class DownloadManager {
       }
     }
 
+    @Nullable
+    @CheckResult
     private Task syncQueuedDownload(@Nullable Task activeTask, Download download) {
       if (activeTask != null) {
         // We have a task, which must be a download task. If the download state is queued we need to
@@ -919,7 +926,8 @@ public final class DownloadManager {
     private void onContentLengthChanged(Task task) {
       String downloadId = task.request.id;
       long contentLength = task.contentLength;
-      Download download = getDownload(downloadId, /* loadFromIndex= */ false);
+      Download download =
+          Assertions.checkNotNull(getDownload(downloadId, /* loadFromIndex= */ false));
       if (contentLength == download.contentLength || contentLength == C.LENGTH_UNSET) {
         return;
       }
@@ -1125,7 +1133,7 @@ public final class DownloadManager {
 
     private volatile InternalHandler internalHandler;
     private volatile boolean isCanceled;
-    private Throwable finalError;
+    @Nullable private Throwable finalError;
 
     private long contentLength;
 
@@ -1145,6 +1153,7 @@ public final class DownloadManager {
       contentLength = C.LENGTH_UNSET;
     }
 
+    @SuppressWarnings("nullness:assignment.type.incompatible")
     public void cancel(boolean released) {
       if (released) {
         // Download threads are GC roots for as long as they're running. The time taken for
@@ -1218,10 +1227,9 @@ public final class DownloadManager {
 
   private static final class DownloadUpdate {
 
-    private final Download download;
-    private final boolean isRemove;
-
-    private final List<Download> downloads;
+    public final Download download;
+    public final boolean isRemove;
+    public final List<Download> downloads;
 
     public DownloadUpdate(Download download, boolean isRemove, List<Download> downloads) {
       this.download = download;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
index c05486bedf..97bcb68708 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
@@ -390,7 +390,7 @@ public final class Util {
    *
    * @param dataSource The {@link DataSource} to close.
    */
-  public static void closeQuietly(DataSource dataSource) {
+  public static void closeQuietly(@Nullable DataSource dataSource) {
     try {
       if (dataSource != null) {
         dataSource.close();
@@ -406,7 +406,7 @@ public final class Util {
    *
    * @param closeable The {@link Closeable} to close.
    */
-  public static void closeQuietly(Closeable closeable) {
+  public static void closeQuietly(@Nullable Closeable closeable) {
     try {
       if (closeable != null) {
         closeable.close();

From c33835b4785f4253133c0951e46847894bfa39ba Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 2 May 2019 11:41:06 +0100
Subject: [PATCH 826/832] Fix SmoothStreaming links

NOTE: Streams are working on ExoPlayer but querying them from
other platforms yields "bad request".

The new links:
+ Match Microsoft's test server.
+ Allow querying from clients other than ExoPlayer, like curl.

PiperOrigin-RevId: 246289755
---
 demos/main/src/main/assets/media.exolist.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/demos/main/src/main/assets/media.exolist.json b/demos/main/src/main/assets/media.exolist.json
index c2acf3990b..bcb3ef4ad1 100644
--- a/demos/main/src/main/assets/media.exolist.json
+++ b/demos/main/src/main/assets/media.exolist.json
@@ -330,11 +330,11 @@
     "samples": [
       {
         "name": "Super speed",
-        "uri": "https://playready.directtaps.net/smoothstreaming/SSWSS720H264/SuperSpeedway_720.ism"
+        "uri": "https://playready.directtaps.net/smoothstreaming/SSWSS720H264/SuperSpeedway_720.ism/Manifest"
       },
       {
         "name": "Super speed (PlayReady)",
-        "uri": "https://playready.directtaps.net/smoothstreaming/SSWSS720H264PR/SuperSpeedway_720.ism",
+        "uri": "https://playready.directtaps.net/smoothstreaming/SSWSS720H264PR/SuperSpeedway_720.ism/Manifest",
         "drm_scheme": "playready"
       }
     ]

From 116602d8c04ec977dbc364841ae0e1e882c3d155 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 2 May 2019 17:35:30 +0100
Subject: [PATCH 827/832] Minor download documentation tweaks

PiperOrigin-RevId: 246333281
---
 .../android/exoplayer2/offline/DefaultDownloaderFactory.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java
index ca20c769dc..d8126d4736 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java
@@ -112,7 +112,7 @@ public class DefaultDownloaderFactory implements DownloaderFactory {
           .getConstructor(Uri.class, List.class, DownloaderConstructorHelper.class);
     } catch (NoSuchMethodException e) {
       // The downloader is present, but the expected constructor is missing.
-      throw new RuntimeException("DASH downloader constructor missing", e);
+      throw new RuntimeException("Downloader constructor missing", e);
     }
   }
   // LINT.ThenChange(../../../../../../../../proguard-rules.txt)

From 71d7e0afe20e02fd83063bba024907c3da84be30 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 3 May 2019 13:14:38 +0100
Subject: [PATCH 828/832] Add a couple of assertions to DownloadManager set
 methods

PiperOrigin-RevId: 246491511
---
 .../google/android/exoplayer2/offline/DownloadManager.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index e8b7eaf9b2..3bf03dd3e8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -306,9 +306,10 @@ public final class DownloadManager {
   /**
    * Sets the maximum number of parallel downloads.
    *
-   * @param maxParallelDownloads The maximum number of parallel downloads.
+   * @param maxParallelDownloads The maximum number of parallel downloads. Must be greater than 0.
    */
   public void setMaxParallelDownloads(int maxParallelDownloads) {
+    Assertions.checkArgument(maxParallelDownloads > 0);
     if (this.maxParallelDownloads == maxParallelDownloads) {
       return;
     }
@@ -334,6 +335,7 @@ public final class DownloadManager {
    * @param minRetryCount The minimum number of times that a download will be retried.
    */
   public void setMinRetryCount(int minRetryCount) {
+    Assertions.checkArgument(minRetryCount >= 0);
     if (this.minRetryCount == minRetryCount) {
       return;
     }

From ce37c799687315a8d488e2f524cc3321c71823ee Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Fri, 3 May 2019 21:12:02 +0100
Subject: [PATCH 829/832] Fix Javadoc

---
 .../android/exoplayer2/drm/OfflineLicenseHelper.java      | 4 ++--
 .../java/com/google/android/exoplayer2/util/GlUtil.java   | 4 ++--
 .../android/exoplayer2/ui/spherical/CanvasRenderer.java   | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/OfflineLicenseHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/OfflineLicenseHelper.java
index ed77f41c83..55a7a901ac 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/OfflineLicenseHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/OfflineLicenseHelper.java
@@ -92,7 +92,7 @@ public final class OfflineLicenseHelper<T extends ExoMediaCrypto> {
    * @throws UnsupportedDrmException If the Widevine DRM scheme is unsupported or cannot be
    *     instantiated.
    * @see DefaultDrmSessionManager#DefaultDrmSessionManager(java.util.UUID, ExoMediaDrm,
-   *     MediaDrmCallback, HashMap, Handler, DefaultDrmSessionEventListener)
+   *     MediaDrmCallback, HashMap)
    */
   public static OfflineLicenseHelper<FrameworkMediaCrypto> newWidevineInstance(
       String defaultLicenseUrl,
@@ -115,7 +115,7 @@ public final class OfflineLicenseHelper<T extends ExoMediaCrypto> {
    * @param optionalKeyRequestParameters An optional map of parameters to pass as the last argument
    *     to {@link MediaDrm#getKeyRequest(byte[], byte[], String, int, HashMap)}. May be null.
    * @see DefaultDrmSessionManager#DefaultDrmSessionManager(java.util.UUID, ExoMediaDrm,
-   *     MediaDrmCallback, HashMap, Handler, DefaultDrmSessionEventListener)
+   *     MediaDrmCallback, HashMap)
    */
   public OfflineLicenseHelper(
       UUID uuid,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/GlUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/util/GlUtil.java
index 915e855d23..7fc46dc363 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/GlUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/GlUtil.java
@@ -51,7 +51,7 @@ public final class GlUtil {
   }
 
   /**
-   * Builds a GL shader program from vertex & fragment shader code.
+   * Builds a GL shader program from vertex and fragment shader code.
    *
    * @param vertexCode GLES20 vertex shader program as arrays of strings. Strings are joined by
    *     adding a new line character in between each of them.
@@ -64,7 +64,7 @@ public final class GlUtil {
   }
 
   /**
-   * Builds a GL shader program from vertex & fragment shader code.
+   * Builds a GL shader program from vertex and fragment shader code.
    *
    * @param vertexCode GLES20 vertex shader program.
    * @param fragmentCode GLES20 fragment shader program.
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java
index fdd59101e7..3d7e57bbd2 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java
@@ -72,7 +72,7 @@ public final class CanvasRenderer {
     "}"
   };
 
-  // The quad has 2 triangles built from 4 total vertices. Each vertex has 3 position & 2 texture
+  // The quad has 2 triangles built from 4 total vertices. Each vertex has 3 position and 2 texture
   // coordinates.
   private static final int POSITION_COORDS_PER_VERTEX = 3;
   private static final int TEXTURE_COORDS_PER_VERTEX = 2;
@@ -253,8 +253,8 @@ public final class CanvasRenderer {
    * Translates an orientation into pixel coordinates on the canvas.
    *
    * <p>This is a minimal hit detection system that works for this quad because it has no model
-   * matrix. All the math is based on the fact that its size & distance are hard-coded into this
-   * class. For a more complex 3D mesh, a general bounding box & ray collision system would be
+   * matrix. All the math is based on the fact that its size and distance are hard-coded into this
+   * class. For a more complex 3D mesh, a general bounding box and ray collision system would be
    * required.
    *
    * @param yaw Yaw of the orientation in radians.
@@ -287,7 +287,7 @@ public final class CanvasRenderer {
       return null;
     }
     // Convert from the polar coordinates of the controller to the rectangular coordinates of the
-    // View. Note the negative yaw & pitch used to generate Android-compliant x & y coordinates.
+    // View. Note the negative yaw and pitch used to generate Android-compliant x and y coordinates.
     float clickXPixel = (float) (widthPixel - clickXUnit * widthPixel / widthUnit);
     float clickYPixel = (float) (heightPixel - clickYUnit * heightPixel / heightUnit);
     return new PointF(clickXPixel, clickYPixel);

From 8b2d436d7c5483272cf034eca87eadaaecb6c206 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Sun, 5 May 2019 17:25:48 +0100
Subject: [PATCH 830/832] Prevent CachedContentIndex.idToKey from growing
 without bound

PiperOrigin-RevId: 246727723
---
 .../upstream/cache/CachedContentIndex.java    | 43 +++++++++++++------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
index 20a80a1a35..bc5443f365 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
@@ -89,6 +89,8 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
    * efficiently when the index is next stored.
    */
   private final SparseBooleanArray removedIds;
+  /** Tracks ids that are new since the index was last stored. */
+  private final SparseBooleanArray newIds;
 
   private Storage storage;
   @Nullable private Storage previousStorage;
@@ -150,6 +152,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     keyToContent = new HashMap<>();
     idToKey = new SparseArray<>();
     removedIds = new SparseBooleanArray();
+    newIds = new SparseBooleanArray();
     Storage databaseStorage =
         databaseProvider != null ? new DatabaseStorage(databaseProvider) : null;
     Storage legacyStorage =
@@ -206,6 +209,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
       idToKey.remove(removedIds.keyAt(i));
     }
     removedIds.clear();
+    newIds.clear();
   }
 
   /**
@@ -250,11 +254,19 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     CachedContent cachedContent = keyToContent.get(key);
     if (cachedContent != null && cachedContent.isEmpty() && !cachedContent.isLocked()) {
       keyToContent.remove(key);
-      storage.onRemove(cachedContent);
-      // Keep an entry in idToKey to stop the id from being reused until the index is next stored.
-      idToKey.put(cachedContent.id, /* value= */ null);
-      // Track that the entry should be removed from idToKey when the index is next stored.
-      removedIds.put(cachedContent.id, /* value= */ true);
+      int id = cachedContent.id;
+      boolean neverStored = newIds.get(id);
+      storage.onRemove(cachedContent, neverStored);
+      if (neverStored) {
+        // The id can be reused immediately.
+        idToKey.remove(id);
+        newIds.delete(id);
+      } else {
+        // Keep an entry in idToKey to stop the id from being reused until the index is next stored,
+        // and add an entry to removedIds to track that it should be removed when this does happen.
+        idToKey.put(id, /* value= */ null);
+        removedIds.put(id, /* value= */ true);
+      }
     }
   }
 
@@ -297,8 +309,9 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   private CachedContent addNew(String key) {
     int id = getNewId(idToKey);
     CachedContent cachedContent = new CachedContent(id, key);
-    keyToContent.put(cachedContent.key, cachedContent);
-    idToKey.put(cachedContent.id, cachedContent.key);
+    keyToContent.put(key, cachedContent);
+    idToKey.put(id, key);
+    newIds.put(id, true);
     storage.onUpdate(cachedContent);
     return cachedContent;
   }
@@ -435,7 +448,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     /**
      * Ensures incremental changes to the index since the initial {@link #initialize(long)} or last
      * {@link #storeFully(HashMap)} are persisted. The storage will have been notified of all such
-     * changes via {@link #onUpdate(CachedContent)} and {@link #onRemove(CachedContent)}.
+     * changes via {@link #onUpdate(CachedContent)} and {@link #onRemove(CachedContent, boolean)}.
      *
      * @param content The key to content map to persist.
      * @throws IOException If an error occurs persisting the index.
@@ -453,8 +466,10 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
      * Called when a {@link CachedContent} is removed.
      *
      * @param cachedContent The removed {@link CachedContent}.
+     * @param neverStored True if the {@link CachedContent} was added more recently than when the
+     *     index was last stored.
      */
-    void onRemove(CachedContent cachedContent);
+    void onRemove(CachedContent cachedContent, boolean neverStored);
   }
 
   /** {@link Storage} implementation that uses an {@link AtomicFile}. */
@@ -540,7 +555,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     }
 
     @Override
-    public void onRemove(CachedContent cachedContent) {
+    public void onRemove(CachedContent cachedContent, boolean neverStored) {
       changed = true;
     }
 
@@ -856,8 +871,12 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     }
 
     @Override
-    public void onRemove(CachedContent cachedContent) {
-      pendingUpdates.put(cachedContent.id, null);
+    public void onRemove(CachedContent cachedContent, boolean neverStored) {
+      if (neverStored) {
+        pendingUpdates.delete(cachedContent.id);
+      } else {
+        pendingUpdates.put(cachedContent.id, null);
+      }
     }
 
     private Cursor getCursor() {

From 90cb157985891d3cabb20a86965b9dccf003ba1b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Sun, 5 May 2019 17:58:33 +0100
Subject: [PATCH 831/832] Update translations

PiperOrigin-RevId: 246729123
---
 library/ui/src/main/res/values-af/strings.xml | 2 +-
 library/ui/src/main/res/values-cs/strings.xml | 2 +-
 library/ui/src/main/res/values-hi/strings.xml | 4 ++--
 library/ui/src/main/res/values-hy/strings.xml | 2 +-
 library/ui/src/main/res/values-ja/strings.xml | 2 +-
 library/ui/src/main/res/values-ka/strings.xml | 2 +-
 library/ui/src/main/res/values-sw/strings.xml | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/library/ui/src/main/res/values-af/strings.xml b/library/ui/src/main/res/values-af/strings.xml
index 9e0fc245fc..8a983c543a 100644
--- a/library/ui/src/main/res/values-af/strings.xml
+++ b/library/ui/src/main/res/values-af/strings.xml
@@ -21,7 +21,7 @@
   <string name="exo_download_removing">Verwyder tans aflaaie</string>
   <string name="exo_track_selection_title_video">Video</string>
   <string name="exo_track_selection_title_audio">Oudio</string>
-  <string name="exo_track_selection_title_text">SMS</string>
+  <string name="exo_track_selection_title_text">Teks</string>
   <string name="exo_track_selection_none">Geen</string>
   <string name="exo_track_selection_auto">Outo</string>
   <string name="exo_track_unknown">Onbekend</string>
diff --git a/library/ui/src/main/res/values-cs/strings.xml b/library/ui/src/main/res/values-cs/strings.xml
index 8c73c01d74..1568074f9f 100644
--- a/library/ui/src/main/res/values-cs/strings.xml
+++ b/library/ui/src/main/res/values-cs/strings.xml
@@ -21,7 +21,7 @@
   <string name="exo_download_removing">Odstraňování staženého obsahu</string>
   <string name="exo_track_selection_title_video">Videa</string>
   <string name="exo_track_selection_title_audio">Zvuk</string>
-  <string name="exo_track_selection_title_text">SMS</string>
+  <string name="exo_track_selection_title_text">Text</string>
   <string name="exo_track_selection_none">Žádné</string>
   <string name="exo_track_selection_auto">Automaticky</string>
   <string name="exo_track_unknown">Neznámé</string>
diff --git a/library/ui/src/main/res/values-hi/strings.xml b/library/ui/src/main/res/values-hi/strings.xml
index da606cd166..8ba92054ff 100644
--- a/library/ui/src/main/res/values-hi/strings.xml
+++ b/library/ui/src/main/res/values-hi/strings.xml
@@ -31,8 +31,8 @@
   <string name="exo_track_surround">सराउंड साउंड</string>
   <string name="exo_track_surround_5_point_1">5.1 सराउंड साउंड</string>
   <string name="exo_track_surround_7_point_1">7.1 सराउंड साउंड</string>
-  <string name="exo_track_role_alternate">वैकल्पिक</string>
-  <string name="exo_track_role_supplementary">अतिरिक्त</string>
+  <string name="exo_track_role_alternate">विकल्प</string>
+  <string name="exo_track_role_supplementary">सप्लिमेंट्री</string>
   <string name="exo_track_role_commentary">कमेंट्री</string>
   <string name="exo_track_role_closed_captions">सबटाइटल</string>
   <string name="exo_track_bitrate">%1$.2f एमबीपीएस</string>
diff --git a/library/ui/src/main/res/values-hy/strings.xml b/library/ui/src/main/res/values-hy/strings.xml
index 11a9124f54..04a2aeb140 100644
--- a/library/ui/src/main/res/values-hy/strings.xml
+++ b/library/ui/src/main/res/values-hy/strings.xml
@@ -35,6 +35,6 @@
   <string name="exo_track_role_supplementary">Լրացուցիչ</string>
   <string name="exo_track_role_commentary">Մեկնաբանություններ</string>
   <string name="exo_track_role_closed_captions">Ենթագրեր</string>
-  <string name="exo_track_bitrate">%1$.2f մբ/վ</string>
+  <string name="exo_track_bitrate">%1$.2f Մբիթ/վ</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ja/strings.xml b/library/ui/src/main/res/values-ja/strings.xml
index aef5a12a96..b4158736a8 100644
--- a/library/ui/src/main/res/values-ja/strings.xml
+++ b/library/ui/src/main/res/values-ja/strings.xml
@@ -21,7 +21,7 @@
   <string name="exo_download_removing">ダウンロードを削除しています</string>
   <string name="exo_track_selection_title_video">動画</string>
   <string name="exo_track_selection_title_audio">音声</string>
-  <string name="exo_track_selection_title_text">SMS</string>
+  <string name="exo_track_selection_title_text">文字</string>
   <string name="exo_track_selection_none">なし</string>
   <string name="exo_track_selection_auto">自動</string>
   <string name="exo_track_unknown">不明</string>
diff --git a/library/ui/src/main/res/values-ka/strings.xml b/library/ui/src/main/res/values-ka/strings.xml
index f7b8272bcc..13ceaaf51f 100644
--- a/library/ui/src/main/res/values-ka/strings.xml
+++ b/library/ui/src/main/res/values-ka/strings.xml
@@ -21,7 +21,7 @@
   <string name="exo_download_removing">მიმდინარეობს ჩამოტვირთვების ამოშლა</string>
   <string name="exo_track_selection_title_video">ვიდეო</string>
   <string name="exo_track_selection_title_audio">აუდიო</string>
-  <string name="exo_track_selection_title_text">SMS</string>
+  <string name="exo_track_selection_title_text">ტექსტი</string>
   <string name="exo_track_selection_none">არცერთი</string>
   <string name="exo_track_selection_auto">ავტომატური</string>
   <string name="exo_track_unknown">უცნობი</string>
diff --git a/library/ui/src/main/res/values-sw/strings.xml b/library/ui/src/main/res/values-sw/strings.xml
index af58d417d6..1cdd325278 100644
--- a/library/ui/src/main/res/values-sw/strings.xml
+++ b/library/ui/src/main/res/values-sw/strings.xml
@@ -21,7 +21,7 @@
   <string name="exo_download_removing">Inaondoa vipakuliwa</string>
   <string name="exo_track_selection_title_video">Video</string>
   <string name="exo_track_selection_title_audio">Sauti</string>
-  <string name="exo_track_selection_title_text">SMS</string>
+  <string name="exo_track_selection_title_text">Maandishi</string>
   <string name="exo_track_selection_none">Hamna</string>
   <string name="exo_track_selection_auto">Otomatiki</string>
   <string name="exo_track_unknown">Haijulikani</string>

From 7d430423d7bf37a87561af2d084f4655ecb636be Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Sun, 5 May 2019 19:42:42 +0100
Subject: [PATCH 832/832] Merge pull request #5760 from
 matamegger:feature/hex_format_tags_in_url_template

PiperOrigin-RevId: 246733842
---
 .../android/exoplayer2/source/dash/manifest/UrlTemplate.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplate.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplate.java
index a7ce7eb9a0..7d13993655 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplate.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplate.java
@@ -139,7 +139,10 @@ public final class UrlTemplate {
           String formatTag = DEFAULT_FORMAT_TAG;
           if (formatTagIndex != -1) {
             formatTag = identifier.substring(formatTagIndex);
-            if (!formatTag.endsWith("d")) {
+            // Allowed conversions are decimal integer (which is the only conversion allowed by the
+            // DASH specification) and hexadecimal integer (due to existing content that uses it).
+            // Else we assume that the conversion is missing, and that it should be decimal integer.
+            if (!formatTag.endsWith("d") && !formatTag.endsWith("x")) {
               formatTag += "d";
             }
             identifier = identifier.substring(0, formatTagIndex);